diff --git a/.github/workflows/mvp-ci.yml b/.github/workflows/mvp-ci.yml
index f7af955de..560dadb0e 100644
--- a/.github/workflows/mvp-ci.yml
+++ b/.github/workflows/mvp-ci.yml
@@ -20,7 +20,6 @@ jobs:
     runs-on: ubuntu-latest
     timeout-minutes: 60
     env:
-      # The full workspace links multiple DataFusion-heavy process test binaries.
       CARGO_PROFILE_DEV_DEBUG: "0"
       CARGO_PROFILE_TEST_DEBUG: "0"
       CARGO_INCREMENTAL: "0"
@@ -33,9 +32,6 @@ jobs:
       - name: Install Rust components
         run: rustup component add rustfmt clippy
 
-      - name: Install protobuf compiler
-        run: sudo apt-get update && sudo apt-get install --yes protobuf-compiler
-
       - name: Configure private Cargo dependencies
         env:
           ASAP_CI_REPO_TOKEN: ${{ secrets.ASAP_CI_REPO_TOKEN }}
@@ -57,9 +53,7 @@ jobs:
 
       - name: Check workspace formatting
         working-directory: ASAPQuery-backend
-        # `--all` also follows this workspace's sibling path dependencies.
-        # Keep the gate scoped to every backend-owned workspace member.
-        run: cargo fmt -p control_plane -p data_plane -p asap_types -p asap_otel_proto -- --check
+        run: cargo fmt -p control_plane -p data_plane -- --check
 
       - name: Check workspace
         env:
@@ -71,15 +65,10 @@ jobs:
         env:
           CARGO_NET_GIT_FETCH_WITH_CLI: "true"
         working-directory: ASAPQuery-backend
-        # Preserve the existing warning policy while expanding runtime coverage.
         run: cargo clippy --workspace --all-targets --locked -- -D warnings
 
       - name: Test workspace
         env:
           CARGO_NET_GIT_FETCH_WITH_CLI: "true"
-          # Give background flusher/sealer waits headroom on hosted runners.
-          ASAP_TEST_TIMEOUT_SCALE: "4"
         working-directory: ASAPQuery-backend
-        # Persistence tests wait on background flushers with bounded deadlines.
-        # Match scripts/e2e.sh to avoid competing flushers exhausting those waits.
-        run: cargo test --workspace --locked -- --test-threads=1
+        run: cargo test --workspace --locked
diff --git a/Cargo.lock b/Cargo.lock
index 471b047ab..cac83d6d0 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2,26 +2,6 @@
 # It is not intended for manual editing.
 version = 4
 
-[[package]]
-name = "adler2"
-version = "2.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "320119579fcad9c21884f5c4861d16174d0e06250625266f50fe6898340abefa"
-
-[[package]]
-name = "ahash"
-version = "0.8.12"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5a15f179cd60c4584b8a8c596927aadc462e27f2ca70c04e0071964a73ba7a75"
-dependencies = [
- "cfg-if",
- "const-random",
- "getrandom 0.3.4",
- "once_cell",
- "version_check",
- "zerocopy",
-]
-
 [[package]]
 name = "aho-corasick"
 version = "1.1.5"
@@ -31,27 +11,6 @@ dependencies = [
  "memchr",
 ]
 
-[[package]]
-name = "alloc-no-stdlib"
-version = "2.0.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cc7bb162ec39d46ab1ca8c77bf72e890535becd1751bb45f64c597edb4c8c6b3"
-
-[[package]]
-name = "alloc-stdlib"
-version = "0.2.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0e76a019e91224d279006ff972f1e984179a6e9feb050adba6ce8274aef23195"
-dependencies = [
- "alloc-no-stdlib",
-]
-
-[[package]]
-name = "allocator-api2"
-version = "0.2.21"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "683d7910e743518b0e34f1186f92494becacb047c7b6bf616c96772180fef923"
-
 [[package]]
 name = "android-tzdata"
 version = "0.1.1"
@@ -67,12 +26,6 @@ dependencies = [
  "libc",
 ]
 
-[[package]]
-name = "anes"
-version = "0.1.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4b46cbb362ab8752921c97e041f5e366ee6297bd428a31275b9fcf1e380f7299"
-
 [[package]]
 name = "anstream"
 version = "1.0.0"
@@ -130,323 +83,82 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "330a5ed07fa54e4702c9d6c4174f74427fc0ef6e214bbd677ae50a5099946470"
 
 [[package]]
-name = "arc-swap"
-version = "1.9.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c049c0be4daef0b145cb3555416b3b8ef5b7888a38aea1a3a155801fe7b0810b"
-dependencies = [
- "rustversion",
-]
-
-[[package]]
-name = "arrayvec"
-version = "0.7.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d3fb67a6e08acf24fdeccbac2cb6ac4305825bd1f117462e0e6f2f193345ad56"
-
-[[package]]
-name = "arrow"
-version = "53.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d3a3ec4fe573f9d1f59d99c085197ef669b00b088ba1d7bb75224732d9357a74"
-dependencies = [
- "arrow-arith",
- "arrow-array",
- "arrow-buffer",
- "arrow-cast",
- "arrow-csv",
- "arrow-data",
- "arrow-ipc",
- "arrow-json",
- "arrow-ord",
- "arrow-row",
- "arrow-schema",
- "arrow-select",
- "arrow-string",
-]
-
-[[package]]
-name = "arrow-arith"
-version = "53.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6dcf19f07792d8c7f91086c67b574a79301e367029b17fcf63fb854332246a10"
-dependencies = [
- "arrow-array",
- "arrow-buffer",
- "arrow-data",
- "arrow-schema",
- "chrono",
- "half",
- "num",
-]
-
-[[package]]
-name = "arrow-array"
-version = "53.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7845c32b41f7053e37a075b3c2f29c6f5ea1b3ca6e5df7a2d325ee6e1b4a63cf"
-dependencies = [
- "ahash",
- "arrow-buffer",
- "arrow-data",
- "arrow-schema",
- "chrono",
- "chrono-tz",
- "half",
- "hashbrown 0.15.5",
- "num",
-]
-
-[[package]]
-name = "arrow-buffer"
-version = "53.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5b5c681a99606f3316f2a99d9c8b6fa3aad0b1d34d8f6d7a1b471893940219d8"
-dependencies = [
- "bytes",
- "half",
- "num",
-]
-
-[[package]]
-name = "arrow-cast"
-version = "53.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6365f8527d4f87b133eeb862f9b8093c009d41a210b8f101f91aa2392f61daac"
-dependencies = [
- "arrow-array",
- "arrow-buffer",
- "arrow-data",
- "arrow-schema",
- "arrow-select",
- "atoi",
- "base64 0.22.1",
- "chrono",
- "comfy-table",
- "half",
- "lexical-core",
- "num",
- "ryu",
-]
-
-[[package]]
-name = "arrow-csv"
-version = "53.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "30dac4d23ac769300349197b845e0fd18c7f9f15d260d4659ae6b5a9ca06f586"
+name = "asap-executor"
+version = "0.1.0"
+source = "git+https://github.com/ProjectASAP/ASAPPlanner?rev=b517fbf256a17621d48fa3f8508c5d5ca1017bad#b517fbf256a17621d48fa3f8508c5d5ca1017bad"
 dependencies = [
- "arrow-array",
- "arrow-buffer",
- "arrow-cast",
- "arrow-data",
- "arrow-schema",
+ "asap-types",
+ "asap_sketchlib 0.3.0 (git+https://github.com/ProjectASAP/asap_sketchlib?rev=5f03ccbd798ed5fec62bdd839bcb331123cab369)",
  "chrono",
- "csv",
- "csv-core",
- "lazy_static",
- "lexical-core",
+ "futures",
  "regex",
-]
-
-[[package]]
-name = "arrow-data"
-version = "53.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cd962fc3bf7f60705b25bcaa8eb3318b2545aa1d528656525ebdd6a17a6cd6fb"
-dependencies = [
- "arrow-buffer",
- "arrow-schema",
- "half",
- "num",
-]
-
-[[package]]
-name = "arrow-ipc"
-version = "53.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c3527365b24372f9c948f16e53738eb098720eea2093ae73c7af04ac5e30a39b"
-dependencies = [
- "arrow-array",
- "arrow-buffer",
- "arrow-cast",
- "arrow-data",
- "arrow-schema",
- "flatbuffers",
- "lz4_flex",
-]
-
-[[package]]
-name = "arrow-json"
-version = "53.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "acdec0024749fc0d95e025c0b0266d78613727b3b3a5d4cf8ea47eb6d38afdd1"
-dependencies = [
- "arrow-array",
- "arrow-buffer",
- "arrow-cast",
- "arrow-data",
- "arrow-schema",
- "chrono",
- "half",
- "indexmap 2.14.2",
- "lexical-core",
- "num",
  "serde",
  "serde_json",
+ "thiserror 2.0.20",
+ "tracing",
 ]
 
 [[package]]
-name = "arrow-ord"
-version = "53.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "79af2db0e62a508d34ddf4f76bfd6109b6ecc845257c9cba6f939653668f89ac"
-dependencies = [
- "arrow-array",
- "arrow-buffer",
- "arrow-data",
- "arrow-schema",
- "arrow-select",
- "half",
- "num",
-]
-
-[[package]]
-name = "arrow-row"
-version = "53.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "da30e9d10e9c52f09ea0cf15086d6d785c11ae8dcc3ea5f16d402221b6ac7735"
-dependencies = [
- "ahash",
- "arrow-array",
- "arrow-buffer",
- "arrow-data",
- "arrow-schema",
- "half",
-]
-
-[[package]]
-name = "arrow-schema"
-version = "53.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "35b0f9c0c3582dd55db0f136d3b44bfa0189df07adcf7dc7f2f2e74db0f52eb8"
-
-[[package]]
-name = "arrow-select"
-version = "53.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "92fc337f01635218493c23da81a364daf38c694b05fc20569c3193c11c561984"
-dependencies = [
- "ahash",
- "arrow-array",
- "arrow-buffer",
- "arrow-data",
- "arrow-schema",
- "num",
-]
-
-[[package]]
-name = "arrow-string"
-version = "53.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d596a9fc25dae556672d5069b090331aca8acb93cae426d8b7dcdf1c558fa0ce"
-dependencies = [
- "arrow-array",
- "arrow-buffer",
- "arrow-data",
- "arrow-schema",
- "arrow-select",
- "memchr",
- "num",
- "regex",
- "regex-syntax",
-]
-
-[[package]]
-name = "asap-aware-mapping"
+name = "asap-frontend-common"
 version = "0.1.0"
-source = "git+https://github.com/ProjectASAP/ASAPPlanner?rev=4b0839ce1733aab8231eb90944c876063a4551f9#4b0839ce1733aab8231eb90944c876063a4551f9"
+source = "git+https://github.com/ProjectASAP/ASAPPlanner?rev=b517fbf256a17621d48fa3f8508c5d5ca1017bad#b517fbf256a17621d48fa3f8508c5d5ca1017bad"
 dependencies = [
  "asap-types",
- "asap_sketchlib 0.3.0 (git+https://github.com/ProjectASAP/asap_sketchlib)",
  "serde",
- "serde_json",
  "thiserror 2.0.20",
 ]
 
 [[package]]
 name = "asap-frontend-promql"
 version = "0.1.0"
-source = "git+https://github.com/ProjectASAP/ASAPPlanner?rev=4b0839ce1733aab8231eb90944c876063a4551f9#4b0839ce1733aab8231eb90944c876063a4551f9"
+source = "git+https://github.com/ProjectASAP/ASAPPlanner?rev=b517fbf256a17621d48fa3f8508c5d5ca1017bad#b517fbf256a17621d48fa3f8508c5d5ca1017bad"
 dependencies = [
+ "asap-frontend-common",
  "asap-types",
- "promql-parser 0.10.0 (git+https://github.com/ProjectASAP/promql-parser?rev=9fede7eecca923c9882fe256484d00d37f8706cb)",
+ "promql-parser",
 ]
 
 [[package]]
-name = "asap-frontend-sql"
+name = "asap-logical-optimizer"
 version = "0.1.0"
-source = "git+https://github.com/ProjectASAP/ASAPPlanner?rev=4b0839ce1733aab8231eb90944c876063a4551f9#4b0839ce1733aab8231eb90944c876063a4551f9"
+source = "git+https://github.com/ProjectASAP/ASAPPlanner?rev=b517fbf256a17621d48fa3f8508c5d5ca1017bad#b517fbf256a17621d48fa3f8508c5d5ca1017bad"
 dependencies = [
- "asap-sql-function-catalog",
  "asap-types",
- "datafusion",
+ "asap_sketchlib 0.3.0 (git+https://github.com/ProjectASAP/asap_sketchlib)",
  "serde_json",
+ "thiserror 2.0.20",
 ]
 
 [[package]]
-name = "asap-physical-operators"
+name = "asap-physical-optimizer"
 version = "0.1.0"
-source = "git+https://github.com/ProjectASAP/ASAPPlanner?rev=4b0839ce1733aab8231eb90944c876063a4551f9#4b0839ce1733aab8231eb90944c876063a4551f9"
+source = "git+https://github.com/ProjectASAP/ASAPPlanner?rev=b517fbf256a17621d48fa3f8508c5d5ca1017bad#b517fbf256a17621d48fa3f8508c5d5ca1017bad"
 dependencies = [
  "asap-types",
- "asap_sketch_codec",
- "asap_sketchlib 0.3.0 (git+https://github.com/ProjectASAP/asap_sketchlib?rev=5f03ccbd798ed5fec62bdd839bcb331123cab369)",
- "base64 0.21.7",
- "bincode",
- "futures",
- "prost",
- "rmp-serde",
- "serde",
- "serde_json",
  "thiserror 2.0.20",
- "tracing",
- "xxhash-rust",
 ]
 
 [[package]]
-name = "asap-sql-function-catalog"
-version = "0.1.0"
-source = "git+https://github.com/ProjectASAP/ASAPPlanner?rev=4b0839ce1733aab8231eb90944c876063a4551f9#4b0839ce1733aab8231eb90944c876063a4551f9"
-
-[[package]]
-name = "asap-types"
+name = "asap-plan-selection"
 version = "0.1.0"
-source = "git+https://github.com/ProjectASAP/ASAPPlanner?rev=4b0839ce1733aab8231eb90944c876063a4551f9#4b0839ce1733aab8231eb90944c876063a4551f9"
+source = "git+https://github.com/ProjectASAP/ASAPPlanner?rev=b517fbf256a17621d48fa3f8508c5d5ca1017bad#b517fbf256a17621d48fa3f8508c5d5ca1017bad"
 dependencies = [
+ "asap-logical-optimizer",
+ "asap-physical-optimizer",
+ "asap-types",
  "serde",
  "serde_json",
- "sha2",
  "thiserror 2.0.20",
 ]
 
 [[package]]
-name = "asap_otel_proto"
-version = "0.1.0"
-dependencies = [
- "prost",
- "prost-build",
- "protoc-bin-vendored",
- "tonic",
- "tonic-build",
-]
-
-[[package]]
-name = "asap_sketch_codec"
+name = "asap-types"
 version = "0.1.0"
-source = "git+https://github.com/ProjectASAP/ASAPPlanner?rev=4b0839ce1733aab8231eb90944c876063a4551f9#4b0839ce1733aab8231eb90944c876063a4551f9"
+source = "git+https://github.com/ProjectASAP/ASAPPlanner?rev=b517fbf256a17621d48fa3f8508c5d5ca1017bad#b517fbf256a17621d48fa3f8508c5d5ca1017bad"
 dependencies = [
- "asap_sketchlib 0.3.0 (git+https://github.com/ProjectASAP/asap_sketchlib?rev=5f03ccbd798ed5fec62bdd839bcb331123cab369)",
- "prost",
+ "serde",
+ "serde_json",
+ "thiserror 2.0.20",
 ]
 
 [[package]]
@@ -463,7 +175,7 @@ dependencies = [
  "serde-big-array",
  "serde_bytes",
  "smallvec",
- "twox-hash 2.1.4",
+ "twox-hash",
  "xxhash-rust",
 ]
 
@@ -480,70 +192,10 @@ dependencies = [
  "serde-big-array",
  "serde_bytes",
  "smallvec",
- "twox-hash 2.1.4",
- "xxhash-rust",
-]
-
-[[package]]
-name = "asap_types"
-version = "0.1.0"
-dependencies = [
- "anyhow",
- "asap-aware-mapping",
- "asap-physical-operators",
- "asap-types",
- "base64 0.21.7",
- "clap",
- "promql-parser 0.10.0 (git+https://github.com/ProjectASAP/promql-parser)",
- "serde",
- "serde_json",
- "serde_yaml",
- "sha2",
- "thiserror 1.0.69",
- "tracing",
+ "twox-hash",
  "xxhash-rust",
 ]
 
-[[package]]
-name = "async-compression"
-version = "0.4.19"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "06575e6a9673580f52661c92107baabffbf41e2141373441cbcdc47cb733003c"
-dependencies = [
- "bzip2 0.5.2",
- "flate2",
- "futures-core",
- "futures-io",
- "memchr",
- "pin-project-lite",
- "tokio",
- "xz2",
- "zstd",
- "zstd-safe",
-]
-
-[[package]]
-name = "async-stream"
-version = "0.3.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0b5a71a6f37880a80d1d7f19efd781e4b5de42c88f0722cc13bcb6cc2cfe8476"
-dependencies = [
- "async-stream-impl",
- "futures-core",
- "pin-project-lite",
-]
-
-[[package]]
-name = "async-stream-impl"
-version = "0.3.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c7c24de15d275a1ecfd47a380fb4d5ec9bfe0933f309ed5e705b775596a3574d"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.119",
-]
-
 [[package]]
 name = "async-trait"
 version = "0.1.92"
@@ -555,15 +207,6 @@ dependencies = [
  "syn 3.0.5",
 ]
 
-[[package]]
-name = "atoi"
-version = "2.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f28d99ec8bfea296261ca1af174f24225171fea9664ba9003cbebee704810528"
-dependencies = [
- "num-traits",
-]
-
 [[package]]
 name = "atomic-waker"
 version = "1.1.2"
@@ -584,7 +227,6 @@ checksum = "edca88bc138befd0323b20752846e6587272d3b03b0343c8ea28a6f819e6e71f"
 dependencies = [
  "async-trait",
  "axum-core",
- "base64 0.22.1",
  "bytes",
  "futures-util",
  "http",
@@ -603,11 +245,9 @@ dependencies = [
  "serde_json",
  "serde_path_to_error",
  "serde_urlencoded",
- "sha1",
  "sync_wrapper",
  "tokio",
- "tokio-tungstenite 0.24.0",
- "tower 0.5.3",
+ "tower",
  "tower-layer",
  "tower-service",
  "tracing",
@@ -634,12 +274,6 @@ dependencies = [
  "tracing",
 ]
 
-[[package]]
-name = "base64"
-version = "0.21.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567"
-
 [[package]]
 name = "base64"
 version = "0.22.1"
@@ -655,129 +289,30 @@ dependencies = [
  "serde",
 ]
 
-[[package]]
-name = "bitflags"
-version = "1.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
-
 [[package]]
 name = "bitflags"
 version = "2.13.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3ded4057c258ba199e2d26386d3af3780957ecaee6c4ef4041c6b4b8b97c0b06"
 
-[[package]]
-name = "blake2"
-version = "0.10.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "46502ad458c9a52b69d4d4d32775c788b7a1b85e8bc9d482d92250fc0e3f8efe"
-dependencies = [
- "digest",
-]
-
-[[package]]
-name = "blake3"
-version = "1.8.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6d9e454fc11f76977dc803893aff6304ed33d6a26efae8696573bea74baa27ae"
-dependencies = [
- "arrayvec",
- "cc",
- "cfg-if",
- "constant_time_eq",
- "cpufeatures 0.3.1",
-]
-
-[[package]]
-name = "block-buffer"
-version = "0.10.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71"
-dependencies = [
- "generic-array",
-]
-
-[[package]]
-name = "brotli"
-version = "7.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cc97b8f16f944bba54f0433f07e30be199b6dc2bd25937444bbad560bcea29bd"
-dependencies = [
- "alloc-no-stdlib",
- "alloc-stdlib",
- "brotli-decompressor",
-]
-
-[[package]]
-name = "brotli-decompressor"
-version = "4.0.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a334ef7c9e23abf0ce748e8cd309037da93e606ad52eb372e4ce327a0dcfbdfd"
-dependencies = [
- "alloc-no-stdlib",
- "alloc-stdlib",
-]
-
 [[package]]
 name = "bumpalo"
 version = "3.20.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "72f5acc6cb2ba439de613abc23857ec3d78374d8ed5ac84e9d11336e87da8649"
 
-[[package]]
-name = "byteorder"
-version = "1.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b"
-
 [[package]]
 name = "bytes"
 version = "1.12.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fc652a48c352aef3ea3aed32080501cf3ef6ed5da78602a020c991775b0aff04"
 
-[[package]]
-name = "bzip2"
-version = "0.4.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bdb116a6ef3f6c3698828873ad02c3014b3c85cadb88496095628e3ef1e347f8"
-dependencies = [
- "bzip2-sys",
- "libc",
-]
-
-[[package]]
-name = "bzip2"
-version = "0.5.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "49ecfb22d906f800d4fe833b6282cf4dc1c298f5057ca0b5445e5c209735ca47"
-dependencies = [
- "bzip2-sys",
-]
-
-[[package]]
-name = "bzip2-sys"
-version = "0.1.13+1.0.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "225bff33b2141874fe80d71e07d6eec4f85c5c216453dd96388240f96e1acc14"
-dependencies = [
- "cc",
- "pkg-config",
-]
-
 [[package]]
 name = "cactus"
 version = "1.0.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "acbc26382d871df4b7442e3df10a9402bf3cf5e55cbd66f12be38861425f0564"
 
-[[package]]
-name = "cast"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "37b2a672a2cb129a2e41c10b1224bb368f9f37a2b16b612598138befd7b37eb5"
-
 [[package]]
 name = "cc"
 version = "1.4.5"
@@ -785,8 +320,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "005ec2760ca554fae18df7a11195552ec576cd665632a881bc011d5bb2fd4d80"
 dependencies = [
  "find-msvc-tools",
- "jobserver",
- "libc",
  "shlex",
 ]
 
@@ -808,7 +341,7 @@ version = "0.13.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7fe45e18904af7af10e4312df7c97251e98af98c70f42f1f2587aecfcbee56bf"
 dependencies = [
- "indexmap 2.14.2",
+ "indexmap",
  "lazy_static",
  "num-traits",
  "regex",
@@ -823,7 +356,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "65c35e4b699c7e15ccbe7ee35c005e4fc0a278d22238a2857e6ce2dadeda1b06"
 dependencies = [
  "cfg-if",
- "cpufeatures 0.3.1",
+ "cpufeatures",
  "rand_core 0.10.1",
 ]
 
@@ -837,51 +370,13 @@ dependencies = [
  "iana-time-zone",
  "js-sys",
  "num-traits",
- "serde",
  "wasm-bindgen",
  "windows-targets",
 ]
 
 [[package]]
-name = "chrono-tz"
-version = "0.10.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a6139a8597ed92cf816dfb33f5dd6cf0bb93a6adc938f11039f371bc5bcd26c3"
-dependencies = [
- "chrono",
- "phf",
-]
-
-[[package]]
-name = "ciborium"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "42e69ffd6f0917f5c029256a24d0161db17cea3997d185db0d35926308770f0e"
-dependencies = [
- "ciborium-io",
- "ciborium-ll",
- "serde",
-]
-
-[[package]]
-name = "ciborium-io"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "05afea1e0a06c9be33d539b876f1ce3692f4afea2cb41f740e7743225ed1c757"
-
-[[package]]
-name = "ciborium-ll"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "57663b653d948a338bfb3eeba9bb2fd5fcfaecb9e199e87e1eda4d9e8b240fd9"
-dependencies = [
- "ciborium-io",
- "half",
-]
-
-[[package]]
-name = "clap"
-version = "4.6.6"
+name = "clap"
+version = "4.6.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "473c7e07f409a8d772161724aa8db6a765a2532a70f9667eeb7b49d3d02fbdca"
 dependencies = [
@@ -925,75 +420,19 @@ version = "1.0.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1d07550c9036bf2ae0c684c4297d503f838287c83c53686d05370d0e139ae570"
 
-[[package]]
-name = "comfy-table"
-version = "7.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "958c5d6ecf1f214b4c2bbbbf6ab9523a864bd136dcf71a7e8904799acfe1ad47"
-dependencies = [
- "unicode-segmentation",
- "unicode-width",
-]
-
-[[package]]
-name = "const-random"
-version = "0.1.18"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "87e00182fe74b066627d63b85fd550ac2998d4b0bd86bfed477a0ae4c7c71359"
-dependencies = [
- "const-random-macro",
-]
-
-[[package]]
-name = "const-random-macro"
-version = "0.1.16"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f9d839f2a20b0aee515dc581a6172f2321f96cab76c1a38a4c584a194955390e"
-dependencies = [
- "getrandom 0.2.17",
- "once_cell",
- "tiny-keccak",
-]
-
-[[package]]
-name = "constant_time_eq"
-version = "0.4.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3d52eff69cd5e647efe296129160853a42795992097e8af39800e1060caeea9b"
-
 [[package]]
 name = "control_plane"
 version = "0.1.0"
 dependencies = [
  "anyhow",
- "asap-aware-mapping",
+ "asap-executor",
  "asap-frontend-promql",
- "asap-frontend-sql",
- "asap-physical-operators",
+ "asap-plan-selection",
  "asap-types",
- "asap_types",
- "axum",
- "bytes",
- "chrono",
- "futures-util",
- "http-body-util",
- "parking_lot",
- "prometheus",
- "promql-parser 0.10.0 (git+https://github.com/ProjectASAP/promql-parser)",
- "prost",
- "prost-build",
- "reqwest",
+ "clap",
  "serde",
  "serde_json",
- "serde_yaml",
- "sha2",
  "thiserror 1.0.69",
- "tokio",
- "tokio-tungstenite 0.21.0",
- "toml",
- "tonic",
- "tonic-build",
- "tower 0.4.13",
  "tracing",
  "tracing-subscriber",
 ]
@@ -1004,15 +443,6 @@ version = "0.8.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b"
 
-[[package]]
-name = "cpufeatures"
-version = "0.2.17"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "59ed5838eebb26a2bb2e58f6d5b5316989ae9d08bab10e0e6d103e656d1b0280"
-dependencies = [
- "libc",
-]
-
 [[package]]
 name = "cpufeatures"
 version = "0.3.1"
@@ -1022,616 +452,26 @@ dependencies = [
  "libc",
 ]
 
-[[package]]
-name = "crc32fast"
-version = "1.5.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8498c871161e1742aaa9d52551b2d6ebdd4c3d45a3be423e3728f33b955be550"
-dependencies = [
- "cfg-if",
-]
-
-[[package]]
-name = "criterion"
-version = "0.5.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f2b12d017a929603d80db1831cd3a24082f8137ce19c69e6447f54f5fc8d692f"
-dependencies = [
- "anes",
- "cast",
- "ciborium",
- "clap",
- "criterion-plot",
- "is-terminal",
- "itertools 0.10.5",
- "num-traits",
- "once_cell",
- "oorandom",
- "plotters",
- "rayon",
- "regex",
- "serde",
- "serde_derive",
- "serde_json",
- "tinytemplate",
- "walkdir",
-]
-
-[[package]]
-name = "criterion-plot"
-version = "0.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6b50826342786a51a89e2da3a28f1c32b06e387201bc2d19791f622c673706b1"
-dependencies = [
- "cast",
- "itertools 0.10.5",
-]
-
-[[package]]
-name = "crossbeam-channel"
-version = "0.5.17"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "98b0cc327b5bc766e7fda9c9260cc0fa81b43a8e240440422dff70788e3f9ef1"
-dependencies = [
- "crossbeam-utils",
-]
-
-[[package]]
-name = "crossbeam-deque"
-version = "0.8.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "622f3fc73690be383c7214310406f28a90e6edeadc3cea882f9d71e495b9711a"
-dependencies = [
- "crossbeam-epoch",
- "crossbeam-utils",
-]
-
-[[package]]
-name = "crossbeam-epoch"
-version = "0.9.21"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc74980687109a3b14c72fd458107bf0baa1da1a1a805e178d15501ba9b86d9d"
-dependencies = [
- "crossbeam-utils",
-]
-
-[[package]]
-name = "crossbeam-utils"
-version = "0.8.23"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a31eee39dddec8330830986fcd7625edb5a24ec90ea038215273bbc3adb08ac6"
-
-[[package]]
-name = "crunchy"
-version = "0.2.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "460fbee9c2c2f33933d720630a6a0bac33ba7053db5344fac858d4b8952d77d5"
-
-[[package]]
-name = "crypto-common"
-version = "0.1.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "78c8292055d1c1df0cce5d180393dc8cce0abec0a7102adb6c7b1eef6016d60a"
-dependencies = [
- "generic-array",
- "typenum",
-]
-
-[[package]]
-name = "csv"
-version = "1.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "52cd9d68cf7efc6ddfaaee42e7288d3a99d613d4b50f76ce9827ae0c6e14f938"
-dependencies = [
- "csv-core",
- "itoa",
- "ryu",
- "serde_core",
-]
-
-[[package]]
-name = "csv-core"
-version = "0.1.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "704a3c26996a80471189265814dbc2c257598b96b8a7feae2d31ace646bb9782"
-dependencies = [
- "memchr",
-]
-
-[[package]]
-name = "dashmap"
-version = "5.5.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "978747c1d849a7d2ee5e8adc0159961c48fb7e5db2f06af6723b80123bb53856"
-dependencies = [
- "cfg-if",
- "hashbrown 0.14.5",
- "lock_api",
- "once_cell",
- "parking_lot_core",
-]
-
-[[package]]
-name = "dashmap"
-version = "6.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e6361d5c062261c78a176addb82d4c821ae42bed6089de0e12603cd25de2059c"
-dependencies = [
- "cfg-if",
- "crossbeam-utils",
- "hashbrown 0.14.5",
- "lock_api",
- "once_cell",
- "parking_lot_core",
-]
-
-[[package]]
-name = "data-encoding"
-version = "2.11.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4583a4551df46e2792f82ceeac45e850d2e2d5debba0b91f102385cda5b11f06"
-
 [[package]]
 name = "data_plane"
 version = "0.1.0"
 dependencies = [
  "anyhow",
- "arc-swap",
- "arrow",
- "asap-aware-mapping",
- "asap-frontend-promql",
- "asap-physical-operators",
  "asap-types",
- "asap_otel_proto",
- "asap_sketch_codec",
- "asap_sketchlib 0.3.0 (git+https://github.com/ProjectASAP/asap_sketchlib?rev=5f03ccbd798ed5fec62bdd839bcb331123cab369)",
- "asap_types",
- "async-trait",
  "axum",
- "base64 0.21.7",
- "bincode",
- "chrono",
- "chrono-tz",
  "clap",
  "control_plane",
- "crc32fast",
- "criterion",
- "dashmap 5.5.3",
- "flate2",
- "form_urlencoded",
- "fs2",
- "futures",
- "hex",
  "http-body-util",
- "lazy_static",
- "memmap2",
- "moka",
- "prometheus",
- "promql-parser 0.10.0 (git+https://github.com/ProjectASAP/promql-parser)",
  "prost",
- "regex",
  "reqwest",
- "rmp-serde",
  "serde",
  "serde_json",
- "serde_yaml",
- "sha2",
  "snap",
- "tempfile",
  "thiserror 1.0.69",
  "tokio",
- "tokio-stream",
- "tonic",
- "tower 0.5.3",
+ "tower",
  "tracing",
- "tracing-appender",
  "tracing-subscriber",
- "xxhash-rust",
-]
-
-[[package]]
-name = "datafusion"
-version = "43.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cbba0799cf6913b456ed07a94f0f3b6e12c62a5d88b10809e2284a0f2b915c05"
-dependencies = [
- "ahash",
- "arrow",
- "arrow-array",
- "arrow-ipc",
- "arrow-schema",
- "async-compression",
- "async-trait",
- "bytes",
- "bzip2 0.4.4",
- "chrono",
- "dashmap 6.2.1",
- "datafusion-catalog",
- "datafusion-common",
- "datafusion-common-runtime",
- "datafusion-execution",
- "datafusion-expr",
- "datafusion-functions",
- "datafusion-functions-aggregate",
- "datafusion-functions-nested",
- "datafusion-functions-window",
- "datafusion-optimizer",
- "datafusion-physical-expr",
- "datafusion-physical-expr-common",
- "datafusion-physical-optimizer",
- "datafusion-physical-plan",
- "datafusion-sql",
- "flate2",
- "futures",
- "glob",
- "half",
- "hashbrown 0.14.5",
- "indexmap 2.14.2",
- "itertools 0.13.0",
- "log",
- "num_cpus",
- "object_store",
- "parking_lot",
- "parquet",
- "paste",
- "pin-project-lite",
- "rand 0.8.8",
- "sqlparser",
- "tempfile",
- "tokio",
- "tokio-util",
- "url",
- "uuid",
- "xz2",
- "zstd",
-]
-
-[[package]]
-name = "datafusion-catalog"
-version = "43.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7493c5c2d40eec435b13d92e5703554f4efc7059451fcb8d3a79580ff0e45560"
-dependencies = [
- "arrow-schema",
- "async-trait",
- "datafusion-common",
- "datafusion-execution",
- "datafusion-expr",
- "datafusion-physical-plan",
- "parking_lot",
-]
-
-[[package]]
-name = "datafusion-common"
-version = "43.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "24953049ebbd6f8964f91f60aa3514e121b5e81e068e33b60e77815ab369b25c"
-dependencies = [
- "ahash",
- "arrow",
- "arrow-array",
- "arrow-buffer",
- "arrow-schema",
- "chrono",
- "half",
- "hashbrown 0.14.5",
- "indexmap 2.14.2",
- "instant",
- "libc",
- "num_cpus",
- "object_store",
- "parquet",
- "paste",
- "sqlparser",
- "tokio",
-]
-
-[[package]]
-name = "datafusion-common-runtime"
-version = "43.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f06df4ef76872e11c924d3c814fd2a8dd09905ed2e2195f71c857d78abd19685"
-dependencies = [
- "log",
- "tokio",
-]
-
-[[package]]
-name = "datafusion-execution"
-version = "43.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6bbdcb628d690f3ce5fea7de81642b514486d58ff9779a51f180a69a4eadb361"
-dependencies = [
- "arrow",
- "chrono",
- "dashmap 6.2.1",
- "datafusion-common",
- "datafusion-expr",
- "futures",
- "hashbrown 0.14.5",
- "log",
- "object_store",
- "parking_lot",
- "rand 0.8.8",
- "tempfile",
- "url",
-]
-
-[[package]]
-name = "datafusion-expr"
-version = "43.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8036495980e3131f706b7d33ab00b4492d73dc714e3cb74d11b50f9602a73246"
-dependencies = [
- "ahash",
- "arrow",
- "arrow-array",
- "arrow-buffer",
- "chrono",
- "datafusion-common",
- "datafusion-expr-common",
- "datafusion-functions-aggregate-common",
- "datafusion-functions-window-common",
- "datafusion-physical-expr-common",
- "indexmap 2.14.2",
- "paste",
- "serde_json",
- "sqlparser",
- "strum",
- "strum_macros",
-]
-
-[[package]]
-name = "datafusion-expr-common"
-version = "43.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4da0f3cb4669f9523b403d6b5a0ec85023e0ab3bf0183afd1517475b3e64fdd2"
-dependencies = [
- "arrow",
- "datafusion-common",
- "itertools 0.13.0",
- "paste",
-]
-
-[[package]]
-name = "datafusion-functions"
-version = "43.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f52c4012648b34853e40a2c6bcaa8772f837831019b68aca384fb38436dba162"
-dependencies = [
- "arrow",
- "arrow-buffer",
- "base64 0.22.1",
- "blake2",
- "blake3",
- "chrono",
- "datafusion-common",
- "datafusion-execution",
- "datafusion-expr",
- "hashbrown 0.14.5",
- "hex",
- "itertools 0.13.0",
- "log",
- "md-5",
- "rand 0.8.8",
- "regex",
- "sha2",
- "unicode-segmentation",
- "uuid",
-]
-
-[[package]]
-name = "datafusion-functions-aggregate"
-version = "43.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e5b8bb624597ba28ed7446df4a9bd7c7a7bde7c578b6b527da3f47371d5f6741"
-dependencies = [
- "ahash",
- "arrow",
- "arrow-schema",
- "datafusion-common",
- "datafusion-execution",
- "datafusion-expr",
- "datafusion-functions-aggregate-common",
- "datafusion-physical-expr",
- "datafusion-physical-expr-common",
- "half",
- "indexmap 2.14.2",
- "log",
- "paste",
-]
-
-[[package]]
-name = "datafusion-functions-aggregate-common"
-version = "43.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6fb06208fc470bc8cf1ce2d9a1159d42db591f2c7264a8c1776b53ad8f675143"
-dependencies = [
- "ahash",
- "arrow",
- "datafusion-common",
- "datafusion-expr-common",
- "datafusion-physical-expr-common",
- "rand 0.8.8",
-]
-
-[[package]]
-name = "datafusion-functions-nested"
-version = "43.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fca25bbb87323716d05e54114666e942172ccca23c5a507e9c7851db6e965317"
-dependencies = [
- "arrow",
- "arrow-array",
- "arrow-buffer",
- "arrow-ord",
- "arrow-schema",
- "datafusion-common",
- "datafusion-execution",
- "datafusion-expr",
- "datafusion-functions",
- "datafusion-functions-aggregate",
- "datafusion-physical-expr-common",
- "itertools 0.13.0",
- "log",
- "paste",
- "rand 0.8.8",
-]
-
-[[package]]
-name = "datafusion-functions-window"
-version = "43.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5ae23356c634e54c59f7c51acb7a5b9f6240ffb2cf997049a1a24a8a88598dbe"
-dependencies = [
- "datafusion-common",
- "datafusion-expr",
- "datafusion-functions-window-common",
- "datafusion-physical-expr",
- "datafusion-physical-expr-common",
- "log",
- "paste",
-]
-
-[[package]]
-name = "datafusion-functions-window-common"
-version = "43.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d4b3d6ff7794acea026de36007077a06b18b89e4f9c3fea7f2215f9f7dd9059b"
-dependencies = [
- "datafusion-common",
- "datafusion-physical-expr-common",
-]
-
-[[package]]
-name = "datafusion-optimizer"
-version = "43.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bec6241eb80c595fa0e1a8a6b69686b5cf3bd5fdacb8319582a0943b0bd788aa"
-dependencies = [
- "arrow",
- "async-trait",
- "chrono",
- "datafusion-common",
- "datafusion-expr",
- "datafusion-physical-expr",
- "hashbrown 0.14.5",
- "indexmap 2.14.2",
- "itertools 0.13.0",
- "log",
- "paste",
- "regex-syntax",
-]
-
-[[package]]
-name = "datafusion-physical-expr"
-version = "43.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3370357b8fc75ec38577700644e5d1b0bc78f38babab99c0b8bd26bafb3e4335"
-dependencies = [
- "ahash",
- "arrow",
- "arrow-array",
- "arrow-buffer",
- "arrow-ord",
- "arrow-schema",
- "arrow-string",
- "chrono",
- "datafusion-common",
- "datafusion-expr",
- "datafusion-expr-common",
- "datafusion-functions-aggregate-common",
- "datafusion-physical-expr-common",
- "half",
- "hashbrown 0.14.5",
- "indexmap 2.14.2",
- "itertools 0.13.0",
- "log",
- "paste",
- "petgraph 0.6.5",
-]
-
-[[package]]
-name = "datafusion-physical-expr-common"
-version = "43.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b8b7734d94bf2fa6f6e570935b0ddddd8421179ce200065be97874e13d46a47b"
-dependencies = [
- "ahash",
- "arrow",
- "datafusion-common",
- "datafusion-expr-common",
- "hashbrown 0.14.5",
- "rand 0.8.8",
-]
-
-[[package]]
-name = "datafusion-physical-optimizer"
-version = "43.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7eee8c479522df21d7b395640dff88c5ed05361852dce6544d7c98e9dbcebffe"
-dependencies = [
- "arrow",
- "arrow-schema",
- "datafusion-common",
- "datafusion-execution",
- "datafusion-expr-common",
- "datafusion-physical-expr",
- "datafusion-physical-plan",
- "itertools 0.13.0",
-]
-
-[[package]]
-name = "datafusion-physical-plan"
-version = "43.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "17e1fc2e2c239d14e8556f2622b19a726bf6bc6962cc00c71fc52626274bee24"
-dependencies = [
- "ahash",
- "arrow",
- "arrow-array",
- "arrow-buffer",
- "arrow-ord",
- "arrow-schema",
- "async-trait",
- "chrono",
- "datafusion-common",
- "datafusion-common-runtime",
- "datafusion-execution",
- "datafusion-expr",
- "datafusion-functions-aggregate-common",
- "datafusion-functions-window-common",
- "datafusion-physical-expr",
- "datafusion-physical-expr-common",
- "futures",
- "half",
- "hashbrown 0.14.5",
- "indexmap 2.14.2",
- "itertools 0.13.0",
- "log",
- "once_cell",
- "parking_lot",
- "pin-project-lite",
- "rand 0.8.8",
- "tokio",
-]
-
-[[package]]
-name = "datafusion-sql"
-version = "43.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "63e3a4ed41dbee20a5d947a59ca035c225d67dc9cbe869c10f66dcdf25e7ce51"
-dependencies = [
- "arrow",
- "arrow-array",
- "arrow-schema",
- "datafusion-common",
- "datafusion-expr",
- "indexmap 2.14.2",
- "log",
- "regex",
- "sqlparser",
- "strum",
 ]
 
 [[package]]
@@ -1640,17 +480,6 @@ version = "0.5.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7cd812cc2bc1d69d4764bd80df88b4317eaef9e773c75226407d9bc0876b211c"
 
-[[package]]
-name = "digest"
-version = "0.10.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292"
-dependencies = [
- "block-buffer",
- "crypto-common",
- "subtle",
-]
-
 [[package]]
 name = "displaydoc"
 version = "0.2.7"
@@ -1684,12 +513,6 @@ dependencies = [
  "windows-sys 0.59.0",
 ]
 
-[[package]]
-name = "fastrand"
-version = "2.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "da7c62ceae207dd37ea5b845da6a0696c799f85e97da1ab5b7910be3c1c80223"
-
 [[package]]
 name = "filetime"
 version = "0.2.29"
@@ -1706,39 +529,6 @@ version = "0.1.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3e0f1c7c3a72c66fd80abe965175f7523475c0489a87d3ff9d6e8c87d87a9d2d"
 
-[[package]]
-name = "fixedbitset"
-version = "0.4.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80"
-
-[[package]]
-name = "fixedbitset"
-version = "0.5.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1d674e81391d1e1ab681a28d99df07927c6d4aa5b027d7da16ba32d1d21ecd99"
-
-[[package]]
-name = "flatbuffers"
-version = "24.12.23"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4f1baf0dbf96932ec9a3038d57900329c015b0bfb7b63d904f3bc27e2b02a096"
-dependencies = [
- "bitflags 1.3.2",
- "rustc_version",
-]
-
-[[package]]
-name = "flate2"
-version = "1.1.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6e634e2e0ebac1ee034020da1ca582e17ffe4e0f5e985823721e168928136dcb"
-dependencies = [
- "crc32fast",
- "miniz_oxide",
- "zlib-rs",
-]
-
 [[package]]
 name = "fnv"
 version = "1.0.7"
@@ -1754,16 +544,6 @@ dependencies = [
  "percent-encoding",
 ]
 
-[[package]]
-name = "fs2"
-version = "0.4.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9564fc758e15025b46aa6643b1b77d047d1a56a1aea6e01002ac0c7026876213"
-dependencies = [
- "libc",
- "winapi",
-]
-
 [[package]]
 name = "futures"
 version = "0.3.34"
@@ -1852,16 +632,6 @@ dependencies = [
  "slab",
 ]
 
-[[package]]
-name = "generic-array"
-version = "0.14.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a"
-dependencies = [
- "typenum",
- "version_check",
-]
-
 [[package]]
 name = "getopts"
 version = "0.2.24"
@@ -1910,65 +680,6 @@ dependencies = [
  "wasm-bindgen",
 ]
 
-[[package]]
-name = "glob"
-version = "0.3.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e4eba85ea1d0a966a983acd07deee566e67395d2d96b6fb39e62b5a833f1eb0b"
-
-[[package]]
-name = "h2"
-version = "0.4.19"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ef8e5e5a340588f4452631496976cf8636d4a7ecf600239fdc27615d2530bc16"
-dependencies = [
- "atomic-waker",
- "bytes",
- "fnv",
- "futures-core",
- "futures-sink",
- "http",
- "indexmap 2.14.2",
- "slab",
- "tokio",
- "tokio-util",
- "tracing",
-]
-
-[[package]]
-name = "half"
-version = "2.7.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6ea2d84b969582b4b1864a92dc5d27cd2b77b622a8d79306834f1be5ba20d84b"
-dependencies = [
- "cfg-if",
- "crunchy",
- "num-traits",
- "zerocopy",
-]
-
-[[package]]
-name = "hashbrown"
-version = "0.12.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888"
-
-[[package]]
-name = "hashbrown"
-version = "0.14.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1"
-dependencies = [
- "ahash",
- "allocator-api2",
-]
-
-[[package]]
-name = "hashbrown"
-version = "0.15.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9229cfe53dfd69f0609a49f65461bd93001ea1ef889cd5529dd176593f5338a1"
-
 [[package]]
 name = "hashbrown"
 version = "0.17.1"
@@ -1981,18 +692,6 @@ version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea"
 
-[[package]]
-name = "hermit-abi"
-version = "0.5.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e17592d60ebacc7d5e169f4663c5f84f9161cc90328abcfe8456f41e4dfcb284"
-
-[[package]]
-name = "hex"
-version = "0.4.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"
-
 [[package]]
 name = "http"
 version = "1.5.0"
@@ -2038,12 +737,6 @@ version = "1.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9"
 
-[[package]]
-name = "humantime"
-version = "2.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "15cdd26707701c53297e2fa6afb323d55fbc1d0810c3aec078ae3ef0424c3c15"
-
 [[package]]
 name = "hyper"
 version = "1.11.1"
@@ -2054,7 +747,6 @@ dependencies = [
  "bytes",
  "futures-channel",
  "futures-core",
- "h2",
  "http",
  "http-body",
  "httparse",
@@ -2082,26 +774,13 @@ dependencies = [
  "webpki-roots",
 ]
 
-[[package]]
-name = "hyper-timeout"
-version = "0.5.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2b90d566bffbce6a75bd8b09a05aa8c2cb1fabb6cb348f8840c9e4c90a0d83b0"
-dependencies = [
- "hyper",
- "hyper-util",
- "pin-project-lite",
- "tokio",
- "tower-service",
-]
-
 [[package]]
 name = "hyper-util"
 version = "0.1.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "96547c2556ec9d12fb1578c4eaf448b04993e7fb79cbaad930a656880a6bdfa0"
 dependencies = [
- "base64 0.22.1",
+ "base64",
  "bytes",
  "futures-channel",
  "futures-util",
@@ -2242,18 +921,8 @@ version = "1.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "cb68373c0d6620ef8105e855e7745e18b0d00d3bdb07fb532e434244cdb9a714"
 dependencies = [
- "icu_normalizer",
- "icu_properties",
-]
-
-[[package]]
-name = "indexmap"
-version = "1.9.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99"
-dependencies = [
- "autocfg",
- "hashbrown 0.12.3",
+ "icu_normalizer",
+ "icu_properties",
 ]
 
 [[package]]
@@ -2263,44 +932,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "cc4e190f5d26ca7051642629da2c52fc03bde85a03197c99408dcd291734c855"
 dependencies = [
  "equivalent",
- "hashbrown 0.17.1",
-]
-
-[[package]]
-name = "instant"
-version = "0.1.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e0242819d153cba4b4b05a5a8f2a7e9bbf97b6055b2a002b395c96b5ff3c0222"
-dependencies = [
- "cfg-if",
- "js-sys",
- "wasm-bindgen",
- "web-sys",
+ "hashbrown",
 ]
 
-[[package]]
-name = "integer-encoding"
-version = "3.0.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8bb03732005da905c88227371639bf1ad885cc712789c011c31c5fb3ab3ccf02"
-
 [[package]]
 name = "ipnet"
 version = "2.12.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "791930b43c0d5973160d90a8f3894509f2b273430f5c5c73b668636d0287c5c0"
 
-[[package]]
-name = "is-terminal"
-version = "0.4.17"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3640c1c38b8e4e43584d8df18be5fc6b0aa314ce6ebf51b53313d4306cca8e46"
-dependencies = [
- "hermit-abi",
- "libc",
- "windows-sys 0.59.0",
-]
-
 [[package]]
 name = "is_terminal_polyfill"
 version = "1.70.2"
@@ -2316,31 +956,12 @@ dependencies = [
  "either",
 ]
 
-[[package]]
-name = "itertools"
-version = "0.13.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "413ee7dfc52ee1a4949ceeb7dbc8a33f2d6c088194d9f922fb8318faf1f01186"
-dependencies = [
- "either",
-]
-
 [[package]]
 name = "itoa"
 version = "1.0.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8f42a60cbdf9a97f5d2305f08a87dc4e09308d1276d28c869c684d7777685682"
 
-[[package]]
-name = "jobserver"
-version = "0.1.35"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1c00acbd29eabad4a2392fa0e921c874934dbbf4194312ad20f04a0ed67a3cb3"
-dependencies = [
- "getrandom 0.4.3",
- "libc",
-]
-
 [[package]]
 name = "js-sys"
 version = "0.3.105"
@@ -2358,87 +979,12 @@ version = "1.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe"
 
-[[package]]
-name = "lexical-core"
-version = "1.0.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7d8d125a277f807e55a77304455eb7b1cb52f2b18c143b60e766c120bd64a594"
-dependencies = [
- "lexical-parse-float",
- "lexical-parse-integer",
- "lexical-util",
- "lexical-write-float",
- "lexical-write-integer",
-]
-
-[[package]]
-name = "lexical-parse-float"
-version = "1.0.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "52a9f232fbd6f550bc0137dcb5f99ab674071ac2d690ac69704593cb4abbea56"
-dependencies = [
- "lexical-parse-integer",
- "lexical-util",
-]
-
-[[package]]
-name = "lexical-parse-integer"
-version = "1.0.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9a7a039f8fb9c19c996cd7b2fcce303c1b2874fe1aca544edc85c4a5f8489b34"
-dependencies = [
- "lexical-util",
-]
-
-[[package]]
-name = "lexical-util"
-version = "1.0.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2604dd126bb14f13fb5d1bd6a66155079cb9fa655b37f875b3a742c705dbed17"
-
-[[package]]
-name = "lexical-write-float"
-version = "1.0.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "50c438c87c013188d415fbabbb1dceb44249ab81664efbd31b14ae55dabb6361"
-dependencies = [
- "lexical-util",
- "lexical-write-integer",
-]
-
-[[package]]
-name = "lexical-write-integer"
-version = "1.0.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "409851a618475d2d5796377cad353802345cba92c867d9fbcde9cf4eac4e14df"
-dependencies = [
- "lexical-util",
-]
-
 [[package]]
 name = "libc"
 version = "0.2.189"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3eaf3ede3fee6db1a4c2ee091bf8a8b4dccdc6d17f656fb07896ee72867612f2"
 
-[[package]]
-name = "libm"
-version = "0.2.16"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b6d2cec3eae94f9f509c767b45932f1ada8350c4bdb85af2fcab4a3c14807981"
-
-[[package]]
-name = "linux-raw-sys"
-version = "0.4.15"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d26c52dbd32dccf2d10cac7725f8eae5296885fb5703b261f7d0a0739ec807ab"
-
-[[package]]
-name = "linux-raw-sys"
-version = "0.12.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "32a66949e030da00e8c7d4434b251670a91556f4144941d37452769c25d58a53"
-
 [[package]]
 name = "litemap"
 version = "0.8.3"
@@ -2488,7 +1034,7 @@ dependencies = [
  "cactus",
  "cfgrammar",
  "filetime",
- "indexmap 2.14.2",
+ "indexmap",
  "lazy_static",
  "lrtable",
  "num-traits",
@@ -2520,26 +1066,6 @@ version = "0.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "112b39cec0b298b6c1999fee3e31427f74f676e4cb9879ed1a121b43661a4154"
 
-[[package]]
-name = "lz4_flex"
-version = "0.11.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "373f5eceeeab7925e0c1098212f2fbc4d416adec9d35051a6ab251e824c1854a"
-dependencies = [
- "twox-hash 2.1.4",
-]
-
-[[package]]
-name = "lzma-sys"
-version = "0.1.20"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5fda04ab3764e6cde78b9974eec4f779acaba7c4e84b36eca3cf77c581b85d27"
-dependencies = [
- "cc",
- "libc",
- "pkg-config",
-]
-
 [[package]]
 name = "matchers"
 version = "0.2.0"
@@ -2555,47 +1081,18 @@ version = "0.7.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0e7465ac9959cc2b1404e8e2367b43684a6d13790fe23056cc8c6c5a6b7bcb94"
 
-[[package]]
-name = "md-5"
-version = "0.10.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d89e7ee0cfbedfc4da3340218492196241d89eefb6dab27de5df917a6d2e78cf"
-dependencies = [
- "cfg-if",
- "digest",
-]
-
 [[package]]
 name = "memchr"
 version = "2.8.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "cf8baf1c55e62ffcace7a9f06f4bd9cd3f0c4beb022d3b367256b91b87513d98"
 
-[[package]]
-name = "memmap2"
-version = "0.9.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d1219ed1b7f229ee7104d281dd01d6802fe28bb6e95d292942c4daacdeb798c0"
-dependencies = [
- "libc",
-]
-
 [[package]]
 name = "mime"
 version = "0.3.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a"
 
-[[package]]
-name = "miniz_oxide"
-version = "0.9.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b63fbc4a50860e98e7b2aa7804ded1db5cbc3aff9193adaff57a6931bf7c4b4c"
-dependencies = [
- "adler2",
- "simd-adler32",
-]
-
 [[package]]
 name = "mio"
 version = "1.2.3"
@@ -2607,29 +1104,6 @@ dependencies = [
  "windows-sys 0.61.2",
 ]
 
-[[package]]
-name = "moka"
-version = "0.12.16"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4293f18e7567a1caf3c584855554377025c65e0aa445344d04171f5ad63d19b9"
-dependencies = [
- "crossbeam-channel",
- "crossbeam-epoch",
- "crossbeam-utils",
- "equivalent",
- "parking_lot",
- "portable-atomic",
- "smallvec",
- "tagptr",
- "uuid",
-]
-
-[[package]]
-name = "multimap"
-version = "0.10.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1d87ecb2933e8aeadb3e3a02b828fed80a7528047e68b4f424523a0981a3a084"
-
 [[package]]
 name = "nu-ansi-term"
 version = "0.50.3"
@@ -2639,75 +1113,12 @@ dependencies = [
  "windows-sys 0.59.0",
 ]
 
-[[package]]
-name = "num"
-version = "0.4.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "35bd024e8b2ff75562e5f34e7f4905839deb4b22955ef5e73d2fea1b9813cb23"
-dependencies = [
- "num-bigint",
- "num-complex",
- "num-integer",
- "num-iter",
- "num-rational",
- "num-traits",
-]
-
-[[package]]
-name = "num-bigint"
-version = "0.4.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c89e69e7e0f03bea5ef08013795c25018e101932225a656383bd384495ecc367"
-dependencies = [
- "num-integer",
- "num-traits",
-]
-
-[[package]]
-name = "num-complex"
-version = "0.4.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "73f88a1307638156682bada9d7604135552957b7818057dcef22705b4d509495"
-dependencies = [
- "num-traits",
-]
-
 [[package]]
 name = "num-conv"
 version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "521739c6d2bac4aa25192232afe6841231376b2b26d4d9fae5ecf8ca5772e441"
 
-[[package]]
-name = "num-integer"
-version = "0.1.47"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ce2d95d4b3734dc35aa2f45e1aa22cd416814592a4f9d9205e11affd5b8e10b"
-dependencies = [
- "num-traits",
-]
-
-[[package]]
-name = "num-iter"
-version = "0.1.46"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c92800bd69a1eac91786bcfe9da64a897eb72911b8dc3095decbd07429e8048b"
-dependencies = [
- "num-integer",
- "num-traits",
-]
-
-[[package]]
-name = "num-rational"
-version = "0.4.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f83d14da390562dca69fc84082e73e548e1ad308d24accdedd2720017cb37824"
-dependencies = [
- "num-bigint",
- "num-integer",
- "num-traits",
-]
-
 [[package]]
 name = "num-traits"
 version = "0.2.19"
@@ -2715,17 +1126,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841"
 dependencies = [
  "autocfg",
- "libm",
-]
-
-[[package]]
-name = "num_cpus"
-version = "1.17.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "91df4bbde75afed763b708b7eee1e8e7651e02d97f6d5dd763e89367e957b23b"
-dependencies = [
- "hermit-abi",
- "libc",
 ]
 
 [[package]]
@@ -2737,27 +1137,6 @@ dependencies = [
  "libc",
 ]
 
-[[package]]
-name = "object_store"
-version = "0.11.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3cfccb68961a56facde1163f9319e0d15743352344e7808a11795fb99698dcaf"
-dependencies = [
- "async-trait",
- "bytes",
- "chrono",
- "futures",
- "humantime",
- "itertools 0.13.0",
- "parking_lot",
- "percent-encoding",
- "snafu",
- "tokio",
- "tracing",
- "url",
- "walkdir",
-]
-
 [[package]]
 name = "once_cell"
 version = "1.21.4"
@@ -2770,21 +1149,6 @@ version = "1.70.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "384b8ab6d37215f3c5301a95a4accb5d64aa607f1fcb26a11b5303878451b4fe"
 
-[[package]]
-name = "oorandom"
-version = "11.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d6790f58c7ff633d8771f42965289203411a5e5c68388703c06e14f24770b41e"
-
-[[package]]
-name = "ordered-float"
-version = "2.10.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "68f19d67e5a2795c94e73e0bb1cc1a7edeb2e28efd39e2e1c9b7a40c1108b11c"
-dependencies = [
- "num-traits",
-]
-
 [[package]]
 name = "packedvec"
 version = "1.2.5"
@@ -2815,160 +1179,20 @@ dependencies = [
  "libc",
  "redox_syscall",
  "smallvec",
- "windows-link",
-]
-
-[[package]]
-name = "parquet"
-version = "53.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2f8cf58b29782a7add991f655ff42929e31a7859f5319e53db9e39a714cb113c"
-dependencies = [
- "ahash",
- "arrow-array",
- "arrow-buffer",
- "arrow-cast",
- "arrow-data",
- "arrow-ipc",
- "arrow-schema",
- "arrow-select",
- "base64 0.22.1",
- "brotli",
- "bytes",
- "chrono",
- "flate2",
- "futures",
- "half",
- "hashbrown 0.15.5",
- "lz4_flex",
- "num",
- "num-bigint",
- "object_store",
- "paste",
- "seq-macro",
- "snap",
- "thrift",
- "tokio",
- "twox-hash 1.6.3",
- "zstd",
- "zstd-sys",
-]
-
-[[package]]
-name = "paste"
-version = "1.0.15"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a"
-
-[[package]]
-name = "percent-encoding"
-version = "2.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9b4f627cb1b25917193a259e49bdad08f671f8d9708acfd5fe0a8c1455d87220"
-
-[[package]]
-name = "petgraph"
-version = "0.6.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b4c5cc86750666a3ed20bdaf5ca2a0344f9c67674cae0515bec2da16fbaa47db"
-dependencies = [
- "fixedbitset 0.4.2",
- "indexmap 2.14.2",
-]
-
-[[package]]
-name = "petgraph"
-version = "0.7.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3672b37090dbd86368a4145bc067582552b29c27377cad4e0a306c97f9bd7772"
-dependencies = [
- "fixedbitset 0.5.7",
- "indexmap 2.14.2",
-]
-
-[[package]]
-name = "phf"
-version = "0.12.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "913273894cec178f401a31ec4b656318d95473527be05c0752cc41cdc32be8b7"
-dependencies = [
- "phf_shared",
-]
-
-[[package]]
-name = "phf_shared"
-version = "0.12.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "06005508882fb681fd97892ecff4b7fd0fee13ef1aa569f8695dae7ab9099981"
-dependencies = [
- "siphasher",
-]
-
-[[package]]
-name = "pin-project"
-version = "1.1.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2466b2336ed02bcdca6b294417127b90ec92038d1d5c4fbeac971a922e0e0924"
-dependencies = [
- "pin-project-internal",
-]
-
-[[package]]
-name = "pin-project-internal"
-version = "1.1.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c96395f0a926bc13b1c17622aaddda1ecb55d49c8f1bf9777e4d877800a43f8b"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.119",
-]
-
-[[package]]
-name = "pin-project-lite"
-version = "0.2.17"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a89322df9ebe1c1578d689c92318e070967d1042b512afbe49518723f4e6d5cd"
-
-[[package]]
-name = "pkg-config"
-version = "0.3.34"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f6b464fbc74e149a392436b17d523f769e057cb6877f6a5c4618bc6f11800548"
-
-[[package]]
-name = "plotters"
-version = "0.3.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5aeb6f403d7a4911efb1e33402027fc44f29b5bf6def3effcc22d7bb75f2b747"
-dependencies = [
- "num-traits",
- "plotters-backend",
- "plotters-svg",
- "wasm-bindgen",
- "web-sys",
+ "windows-link",
 ]
 
 [[package]]
-name = "plotters-backend"
-version = "0.3.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "df42e13c12958a16b3f7f4386b9ab1f3e7933914ecea48da7139435263a4172a"
-
-[[package]]
-name = "plotters-svg"
-version = "0.3.7"
+name = "percent-encoding"
+version = "2.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "51bae2ac328883f7acdfea3d66a7c35751187f870bc81f94563733a154d7a670"
-dependencies = [
- "plotters-backend",
-]
+checksum = "9b4f627cb1b25917193a259e49bdad08f671f8d9708acfd5fe0a8c1455d87220"
 
 [[package]]
-name = "portable-atomic"
-version = "1.15.0"
+name = "pin-project-lite"
+version = "0.2.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "05c8b63e8d9609db387f0324918f81d68fe27748f084ef092fb35954d0539a85"
+checksum = "a89322df9ebe1c1578d689c92318e070967d1042b512afbe49518723f4e6d5cd"
 
 [[package]]
 name = "potential_utf"
@@ -2994,16 +1218,6 @@ dependencies = [
  "zerocopy",
 ]
 
-[[package]]
-name = "prettyplease"
-version = "0.2.37"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "479ca8adacdd7ce8f1fb39ce9ecccbfe93a3f1344b3d0d97f20bc0196208f62b"
-dependencies = [
- "proc-macro2",
- "syn 2.0.119",
-]
-
 [[package]]
 name = "proc-macro2"
 version = "1.0.107"
@@ -3013,46 +1227,6 @@ dependencies = [
  "unicode-ident",
 ]
 
-[[package]]
-name = "procfs"
-version = "0.16.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "731e0d9356b0c25f16f33b5be79b1c57b562f141ebfcdb0ad8ac2c13a24293b4"
-dependencies = [
- "bitflags 2.13.2",
- "hex",
- "lazy_static",
- "procfs-core",
- "rustix 0.38.44",
-]
-
-[[package]]
-name = "procfs-core"
-version = "0.16.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2d3554923a69f4ce04c4a754260c338f505ce22642d3830e049a399fc2059a29"
-dependencies = [
- "bitflags 2.13.2",
- "hex",
-]
-
-[[package]]
-name = "prometheus"
-version = "0.13.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3d33c28a30771f7f96db69893f78b857f7450d7e0237e9c8fc6427a81bae7ed1"
-dependencies = [
- "cfg-if",
- "fnv",
- "lazy_static",
- "libc",
- "memchr",
- "parking_lot",
- "procfs",
- "protobuf",
- "thiserror 1.0.69",
-]
-
 [[package]]
 name = "promql-parser"
 version = "0.10.0"
@@ -3066,19 +1240,6 @@ dependencies = [
  "regex",
 ]
 
-[[package]]
-name = "promql-parser"
-version = "0.10.0"
-source = "git+https://github.com/ProjectASAP/promql-parser#9fede7eecca923c9882fe256484d00d37f8706cb"
-dependencies = [
- "cfgrammar",
- "chrono",
- "lazy_static",
- "lrlex",
- "lrpar",
- "regex",
-]
-
 [[package]]
 name = "prost"
 version = "0.13.5"
@@ -3089,26 +1250,6 @@ dependencies = [
  "prost-derive",
 ]
 
-[[package]]
-name = "prost-build"
-version = "0.13.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "be769465445e8c1474e9c5dac2018218498557af32d9ed057325ec9a41ae81bf"
-dependencies = [
- "heck",
- "itertools 0.10.5",
- "log",
- "multimap",
- "once_cell",
- "petgraph 0.7.1",
- "prettyplease",
- "prost",
- "prost-types",
- "regex",
- "syn 2.0.119",
- "tempfile",
-]
-
 [[package]]
 name = "prost-derive"
 version = "0.13.5"
@@ -3116,91 +1257,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8a56d757972c98b346a9b766e3f02746cde6dd1cd1d1d563472929fdd74bec4d"
 dependencies = [
  "anyhow",
- "itertools 0.10.5",
+ "itertools",
  "proc-macro2",
  "quote",
  "syn 2.0.119",
 ]
 
-[[package]]
-name = "prost-types"
-version = "0.13.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "52c2c1bf36ddb1a1c396b3601a3cec27c2462e45f07c386894ec3ccf5332bd16"
-dependencies = [
- "prost",
-]
-
-[[package]]
-name = "protobuf"
-version = "2.28.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "106dd99e98437432fed6519dedecfade6a06a73bb7b2a1e019fdd2bee5778d94"
-
-[[package]]
-name = "protoc-bin-vendored"
-version = "3.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d1c381df33c98266b5f08186583660090a4ffa0889e76c7e9a5e175f645a67fa"
-dependencies = [
- "protoc-bin-vendored-linux-aarch_64",
- "protoc-bin-vendored-linux-ppcle_64",
- "protoc-bin-vendored-linux-s390_64",
- "protoc-bin-vendored-linux-x86_32",
- "protoc-bin-vendored-linux-x86_64",
- "protoc-bin-vendored-macos-aarch_64",
- "protoc-bin-vendored-macos-x86_64",
- "protoc-bin-vendored-win32",
-]
-
-[[package]]
-name = "protoc-bin-vendored-linux-aarch_64"
-version = "3.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c350df4d49b5b9e3ca79f7e646fde2377b199e13cfa87320308397e1f37e1a4c"
-
-[[package]]
-name = "protoc-bin-vendored-linux-ppcle_64"
-version = "3.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a55a63e6c7244f19b5c6393f025017eb5d793fd5467823a099740a7a4222440c"
-
-[[package]]
-name = "protoc-bin-vendored-linux-s390_64"
-version = "3.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1dba5565db4288e935d5330a07c264a4ee8e4a5b4a4e6f4e83fad824cc32f3b0"
-
-[[package]]
-name = "protoc-bin-vendored-linux-x86_32"
-version = "3.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8854774b24ee28b7868cd71dccaae8e02a2365e67a4a87a6cd11ee6cdbdf9cf5"
-
-[[package]]
-name = "protoc-bin-vendored-linux-x86_64"
-version = "3.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b38b07546580df720fa464ce124c4b03630a6fb83e05c336fea2a241df7e5d78"
-
-[[package]]
-name = "protoc-bin-vendored-macos-aarch_64"
-version = "3.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "89278a9926ce312e51f1d999fee8825d324d603213344a9a706daa009f1d8092"
-
-[[package]]
-name = "protoc-bin-vendored-macos-x86_64"
-version = "3.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "81745feda7ccfb9471d7a4de888f0652e806d5795b61480605d4943176299756"
-
-[[package]]
-name = "protoc-bin-vendored-win32"
-version = "3.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "95067976aca6421a523e491fce939a3e65249bac4b977adee0ee9771568e8aa3"
-
 [[package]]
 name = "quinn"
 version = "0.11.11"
@@ -3278,24 +1340,13 @@ version = "6.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f8dcc9c7d52a811697d2151c701e0d08956f92b0e24136cf4cf27b57a6a0d9bf"
 
-[[package]]
-name = "rand"
-version = "0.8.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e058c7de0b26af77780c769414d6257830bb240f3c38477dbc2c16e5f54d6d4c"
-dependencies = [
- "libc",
- "rand_chacha 0.3.1",
- "rand_core 0.6.4",
-]
-
 [[package]]
 name = "rand"
 version = "0.9.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b9ef1d0d795eb7d84685bca4f72f3649f064e6641543d3a8c415898726a57b41"
 dependencies = [
- "rand_chacha 0.9.0",
+ "rand_chacha",
  "rand_core 0.9.5",
 ]
 
@@ -3310,16 +1361,6 @@ dependencies = [
  "rand_core 0.10.1",
 ]
 
-[[package]]
-name = "rand_chacha"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88"
-dependencies = [
- "ppv-lite86",
- "rand_core 0.6.4",
-]
-
 [[package]]
 name = "rand_chacha"
 version = "0.9.0"
@@ -3330,15 +1371,6 @@ dependencies = [
  "rand_core 0.9.5",
 ]
 
-[[package]]
-name = "rand_core"
-version = "0.6.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c"
-dependencies = [
- "getrandom 0.2.17",
-]
-
 [[package]]
 name = "rand_core"
 version = "0.9.5"
@@ -3363,33 +1395,13 @@ dependencies = [
  "rand_core 0.10.1",
 ]
 
-[[package]]
-name = "rayon"
-version = "1.12.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fb39b166781f92d482534ef4b4b1b2568f42613b53e5b6c160e24cfbfa30926d"
-dependencies = [
- "either",
- "rayon-core",
-]
-
-[[package]]
-name = "rayon-core"
-version = "1.13.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "22e18b0f0062d30d4230b2e85ff77fdfe4326feb054b9783a3460d8435c8ab91"
-dependencies = [
- "crossbeam-deque",
- "crossbeam-utils",
-]
-
 [[package]]
 name = "redox_syscall"
 version = "0.5.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ed2bf2547551a7053d6fdfafda3f938979645c44812fbfcda098faae3f1a362d"
 dependencies = [
- "bitflags 2.13.2",
+ "bitflags",
 ]
 
 [[package]]
@@ -3427,7 +1439,7 @@ version = "0.12.28"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "eddd3ca559203180a307f12d114c268abf583f59b03cb906fd0b3ff8646c1147"
 dependencies = [
- "base64 0.22.1",
+ "base64",
  "bytes",
  "futures-core",
  "http",
@@ -3449,7 +1461,7 @@ dependencies = [
  "sync_wrapper",
  "tokio",
  "tokio-rustls",
- "tower 0.5.3",
+ "tower",
  "tower-http",
  "tower-service",
  "url",
@@ -3498,41 +1510,6 @@ version = "2.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6b1e7f9a428571be2dc5bc0505c13fb6bf936822b894ec87abf8a08a4e51742d"
 
-[[package]]
-name = "rustc_version"
-version = "0.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cfcb3a22ef46e85b45de6ee7e79d063319ebb6594faafcf1c225ea92ab6e9b92"
-dependencies = [
- "semver",
-]
-
-[[package]]
-name = "rustix"
-version = "0.38.44"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fdb5bc1ae2baa591800df16c9ca78619bf65c0488b41b96ccec5d11220d8c154"
-dependencies = [
- "bitflags 2.13.2",
- "errno",
- "libc",
- "linux-raw-sys 0.4.15",
- "windows-sys 0.59.0",
-]
-
-[[package]]
-name = "rustix"
-version = "1.1.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b6fe4565b9518b83ef4f91bb47ce29620ca828bd32cb7e408f0062e9930ba190"
-dependencies = [
- "bitflags 2.13.2",
- "errno",
- "libc",
- "linux-raw-sys 0.12.1",
- "windows-sys 0.59.0",
-]
-
 [[package]]
 name = "rustls"
 version = "0.23.44"
@@ -3580,33 +1557,12 @@ version = "1.0.23"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9774ba4a74de5f7b1c1451ed6cd5285a32eddb5cccb8cc655a4e50009e06477f"
 
-[[package]]
-name = "same-file"
-version = "1.0.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502"
-dependencies = [
- "winapi-util",
-]
-
 [[package]]
 name = "scopeguard"
 version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49"
 
-[[package]]
-name = "semver"
-version = "1.0.28"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8a7852d02fc848982e0c167ef163aaff9cd91dc640ba85e263cb1ce46fae51cd"
-
-[[package]]
-name = "seq-macro"
-version = "0.3.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1bc711410fbe7399f390ca1c3b60ad0f53f80e95c5eb935e52268a0e2cd49acc"
-
 [[package]]
 name = "serde"
 version = "1.0.229"
@@ -3680,15 +1636,6 @@ dependencies = [
  "serde_core",
 ]
 
-[[package]]
-name = "serde_spanned"
-version = "0.6.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bf41e0cfaf7226dca15e8197172c295a782857fcb97fad1808a166870dee75a3"
-dependencies = [
- "serde",
-]
-
 [[package]]
 name = "serde_urlencoded"
 version = "0.7.1"
@@ -3701,41 +1648,6 @@ dependencies = [
  "serde",
 ]
 
-[[package]]
-name = "serde_yaml"
-version = "0.9.34+deprecated"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6a8b1a1a2ebf674015cc02edccce75287f1a0130d394307b36743c2f5d504b47"
-dependencies = [
- "indexmap 2.14.2",
- "itoa",
- "ryu",
- "serde",
- "unsafe-libyaml",
-]
-
-[[package]]
-name = "sha1"
-version = "0.10.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a978451301f4db1d02937a4ab3ccce137717b81826e79b7d49ffe3244a13c3b8"
-dependencies = [
- "cfg-if",
- "cpufeatures 0.2.17",
- "digest",
-]
-
-[[package]]
-name = "sha2"
-version = "0.10.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a7507d819769d01a365ab707794a4084392c824f54a7a6a7862f8c3d0892b283"
-dependencies = [
- "cfg-if",
- "cpufeatures 0.2.17",
- "digest",
-]
-
 [[package]]
 name = "sharded-slab"
 version = "0.1.7"
@@ -3761,18 +1673,6 @@ dependencies = [
  "libc",
 ]
 
-[[package]]
-name = "simd-adler32"
-version = "0.3.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3a219298ac11a56ea9a6d2120044824d6f01aeb034955e7af7bc16858527deea"
-
-[[package]]
-name = "siphasher"
-version = "1.0.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ee5873ec9cce0195efcb7a4e9507a04cd49aec9c83d0389df45b1ef7ba2e649"
-
 [[package]]
 name = "slab"
 version = "0.4.12"
@@ -3785,27 +1685,6 @@ version = "1.16.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ba467056f1b547ed52077911161fc86985becbc60e8e1857c8a144dab0def891"
 
-[[package]]
-name = "snafu"
-version = "0.8.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6e84b3f4eacbf3a1ce05eac6763b4d629d60cbc94d632e4092c54ade71f1e1a2"
-dependencies = [
- "snafu-derive",
-]
-
-[[package]]
-name = "snafu-derive"
-version = "0.8.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c1c97747dbf44bb1ca44a561ece23508e99cb592e862f22222dcf42f51d1e451"
-dependencies = [
- "heck",
- "proc-macro2",
- "quote",
- "syn 2.0.119",
-]
-
 [[package]]
 name = "snap"
 version = "1.1.2"
@@ -3844,27 +1723,6 @@ dependencies = [
  "vob 3.0.6",
 ]
 
-[[package]]
-name = "sqlparser"
-version = "0.51.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5fe11944a61da0da3f592e19a45ebe5ab92dc14a779907ff1f08fbb797bfefc7"
-dependencies = [
- "log",
- "sqlparser_derive",
-]
-
-[[package]]
-name = "sqlparser_derive"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "01b2e185515564f15375f593fb966b5718bc624ba77fe49fa4616ad619690554"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.119",
-]
-
 [[package]]
 name = "stable_deref_trait"
 version = "1.2.1"
@@ -3875,47 +1733,19 @@ checksum = "6ce2be8dc25455e1f91df71bfa12ad37d7af1092ae736f3a6cd0e37bc7810596"
 name = "static_assertions"
 version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f"
-
-[[package]]
-name = "strsim"
-version = "0.11.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f"
-
-[[package]]
-name = "strum"
-version = "0.26.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8fec0f0aef304996cf250b31b5a10dee7980c85da9d759361292b8bca5a18f06"
-dependencies = [
- "strum_macros",
-]
-
-[[package]]
-name = "strum_macros"
-version = "0.26.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4c6bee85a5a24955dc440386795aa378cd9cf82acd5f764469152d2270e581be"
-dependencies = [
- "heck",
- "proc-macro2",
- "quote",
- "rustversion",
- "syn 2.0.119",
-]
+checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f"
 
 [[package]]
-name = "subtle"
-version = "2.6.1"
+name = "strsim"
+version = "0.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292"
+checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f"
 
 [[package]]
-name = "symlink"
-version = "0.1.0"
+name = "subtle"
+version = "2.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a7973cce6668464ea31f176d85b13c7ab3bba2cb3b77a2ed26abd7801688010a"
+checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292"
 
 [[package]]
 name = "syn"
@@ -3959,25 +1789,6 @@ dependencies = [
  "syn 2.0.119",
 ]
 
-[[package]]
-name = "tagptr"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7b2093cf4c8eb1e67749a6762251bc9cd836b6fc171623bd0a9d324d37af2417"
-
-[[package]]
-name = "tempfile"
-version = "3.27.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "32497e9a4c7b38532efcdebeef879707aa9f794296a4f0244f6f69e9bc8574bd"
-dependencies = [
- "fastrand",
- "getrandom 0.4.3",
- "once_cell",
- "rustix 1.1.4",
- "windows-sys 0.59.0",
-]
-
 [[package]]
 name = "thiserror"
 version = "1.0.69"
@@ -4027,17 +1838,6 @@ dependencies = [
  "cfg-if",
 ]
 
-[[package]]
-name = "thrift"
-version = "0.17.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7e54bc85fc7faa8bc175c4bab5b92ba8d9a3ce893d0e9f42cc455c8ab16a9e09"
-dependencies = [
- "byteorder",
- "integer-encoding",
- "ordered-float",
-]
-
 [[package]]
 name = "time"
 version = "0.3.55"
@@ -4070,15 +1870,6 @@ dependencies = [
  "time-core",
 ]
 
-[[package]]
-name = "tiny-keccak"
-version = "2.0.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2c9d3793400a45f954c52e73d068316d76b6f4e36977e3fcebb13a2721e80237"
-dependencies = [
- "crunchy",
-]
-
 [[package]]
 name = "tinystr"
 version = "0.8.4"
@@ -4089,16 +1880,6 @@ dependencies = [
  "zerovec",
 ]
 
-[[package]]
-name = "tinytemplate"
-version = "1.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "be4d6b5f19ff7664e8c98d03e2139cb510db9b0a60b55f8e8709b689d939b6bc"
-dependencies = [
- "serde",
- "serde_json",
-]
-
 [[package]]
 name = "tinyvec"
 version = "1.13.2"
@@ -4152,161 +1933,6 @@ dependencies = [
  "tokio",
 ]
 
-[[package]]
-name = "tokio-stream"
-version = "0.1.19"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a3d06f0b082ba57c26b79407372e57cf2a1e28124f78e9479fe80322cf53420b"
-dependencies = [
- "futures-core",
- "pin-project-lite",
- "tokio",
-]
-
-[[package]]
-name = "tokio-tungstenite"
-version = "0.21.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c83b561d025642014097b66e6c1bb422783339e0909e4429cde4749d1990bc38"
-dependencies = [
- "futures-util",
- "log",
- "tokio",
- "tungstenite 0.21.0",
-]
-
-[[package]]
-name = "tokio-tungstenite"
-version = "0.24.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "edc5f74e248dc973e0dbb7b74c7e0d6fcc301c694ff50049504004ef4d0cdcd9"
-dependencies = [
- "futures-util",
- "log",
- "tokio",
- "tungstenite 0.24.0",
-]
-
-[[package]]
-name = "tokio-util"
-version = "0.7.19"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "494815d09bf52b5548659851081238f0ca39ff638363907596da739561c62c52"
-dependencies = [
- "bytes",
- "futures-core",
- "futures-sink",
- "libc",
- "pin-project-lite",
- "tokio",
-]
-
-[[package]]
-name = "toml"
-version = "0.8.23"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc1beb996b9d83529a9e75c17a1686767d148d70663143c7854d8b4a09ced362"
-dependencies = [
- "serde",
- "serde_spanned",
- "toml_datetime",
- "toml_edit",
-]
-
-[[package]]
-name = "toml_datetime"
-version = "0.6.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "22cddaf88f4fbc13c51aebbf5f8eceb5c7c5a9da2ac40a13519eb5b0a0e8f11c"
-dependencies = [
- "serde",
-]
-
-[[package]]
-name = "toml_edit"
-version = "0.22.27"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "41fe8c660ae4257887cf66394862d21dbca4a6ddd26f04a3560410406a2f819a"
-dependencies = [
- "indexmap 2.14.2",
- "serde",
- "serde_spanned",
- "toml_datetime",
- "toml_write",
- "winnow",
-]
-
-[[package]]
-name = "toml_write"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5d99f8c9a7727884afe522e9bd5edbfc91a3312b36a77b5fb8926e4c31a41801"
-
-[[package]]
-name = "tonic"
-version = "0.12.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "877c5b330756d856ffcc4553ab34a5684481ade925ecc54bcd1bf02b1d0d4d52"
-dependencies = [
- "async-stream",
- "async-trait",
- "axum",
- "base64 0.22.1",
- "bytes",
- "flate2",
- "h2",
- "http",
- "http-body",
- "http-body-util",
- "hyper",
- "hyper-timeout",
- "hyper-util",
- "percent-encoding",
- "pin-project",
- "prost",
- "socket2 0.5.10",
- "tokio",
- "tokio-stream",
- "tower 0.4.13",
- "tower-layer",
- "tower-service",
- "tracing",
-]
-
-[[package]]
-name = "tonic-build"
-version = "0.12.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9557ce109ea773b399c9b9e5dca39294110b74f1f342cb347a80d1fce8c26a11"
-dependencies = [
- "prettyplease",
- "proc-macro2",
- "prost-build",
- "prost-types",
- "quote",
- "syn 2.0.119",
-]
-
-[[package]]
-name = "tower"
-version = "0.4.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b8fa9be0de6cf49e536ce1851f987bd21a43b771b09473c3549a6c853db37c1c"
-dependencies = [
- "futures-core",
- "futures-util",
- "indexmap 1.9.3",
- "pin-project",
- "pin-project-lite",
- "rand 0.8.8",
- "slab",
- "tokio",
- "tokio-util",
- "tower-layer",
- "tower-service",
- "tracing",
-]
-
 [[package]]
 name = "tower"
 version = "0.5.3"
@@ -4329,13 +1955,13 @@ version = "0.6.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4cfcf7e2740e6fc6d4d688b4ef00650406bb94adf4731e43c096c3a19fe40840"
 dependencies = [
- "bitflags 2.13.2",
+ "bitflags",
  "bytes",
  "futures-util",
  "http",
  "http-body",
  "pin-project-lite",
- "tower 0.5.3",
+ "tower",
  "tower-layer",
  "tower-service",
  "url",
@@ -4365,19 +1991,6 @@ dependencies = [
  "tracing-core",
 ]
 
-[[package]]
-name = "tracing-appender"
-version = "0.2.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "050686193eb999b4bb3bc2acfa891a13da00f79734704c4b8b4ef1a10b368a3c"
-dependencies = [
- "crossbeam-channel",
- "symlink",
- "thiserror 2.0.20",
- "time",
- "tracing-subscriber",
-]
-
 [[package]]
 name = "tracing-attributes"
 version = "0.1.31"
@@ -4434,53 +2047,6 @@ version = "0.2.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b"
 
-[[package]]
-name = "tungstenite"
-version = "0.21.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9ef1a641ea34f399a848dea702823bbecfb4c486f911735368f1f137cb8257e1"
-dependencies = [
- "byteorder",
- "bytes",
- "data-encoding",
- "http",
- "httparse",
- "log",
- "rand 0.8.8",
- "sha1",
- "thiserror 1.0.69",
- "url",
- "utf-8",
-]
-
-[[package]]
-name = "tungstenite"
-version = "0.24.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "18e5b8366ee7a95b16d32197d0b2604b43a0be89dc5fac9f8e96ccafbaedda8a"
-dependencies = [
- "byteorder",
- "bytes",
- "data-encoding",
- "http",
- "httparse",
- "log",
- "rand 0.8.8",
- "sha1",
- "thiserror 1.0.69",
- "utf-8",
-]
-
-[[package]]
-name = "twox-hash"
-version = "1.6.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "97fee6b57c6a41524a810daee9286c02d7752c4253064d0b05472833a438f675"
-dependencies = [
- "cfg-if",
- "static_assertions",
-]
-
 [[package]]
 name = "twox-hash"
 version = "2.1.4"
@@ -4490,36 +2056,18 @@ dependencies = [
  "rand 0.10.2",
 ]
 
-[[package]]
-name = "typenum"
-version = "1.20.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b6f5e870be6c3b371b77fe0ee0bafb859fa4964b4404c27de1d380043c4dda20"
-
 [[package]]
 name = "unicode-ident"
 version = "1.0.24"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e6e4313cd5fcd3dad5cafa179702e2b244f760991f45397d14d4ebf38247da75"
 
-[[package]]
-name = "unicode-segmentation"
-version = "1.13.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c6f5d3c3b1bf09027a88a6bc961fc00497d651009560b5463668dc81b0fa87a8"
-
 [[package]]
 name = "unicode-width"
 version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b4ac048d71ede7ee76d585517add45da530660ef4390e49b098733c6e897f254"
 
-[[package]]
-name = "unsafe-libyaml"
-version = "0.2.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "673aac59facbab8a9007c7f6108d11f63b603f7cabff99fabf650fea5c32b861"
-
 [[package]]
 name = "untrusted"
 version = "0.9.0"
@@ -4538,12 +2086,6 @@ dependencies = [
  "serde",
 ]
 
-[[package]]
-name = "utf-8"
-version = "0.7.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9"
-
 [[package]]
 name = "utf8_iter"
 version = "1.0.4"
@@ -4556,17 +2098,6 @@ version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821"
 
-[[package]]
-name = "uuid"
-version = "1.26.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2ef6dac1e96601b4fb3acccccff2139741fcb757cb9a36089bf5be91cfb285ce"
-dependencies = [
- "getrandom 0.4.3",
- "js-sys",
- "wasm-bindgen",
-]
-
 [[package]]
 name = "valuable"
 version = "0.1.1"
@@ -4584,12 +2115,6 @@ dependencies = [
  "time",
 ]
 
-[[package]]
-name = "version_check"
-version = "0.9.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a"
-
 [[package]]
 name = "vob"
 version = "3.0.6"
@@ -4610,16 +2135,6 @@ dependencies = [
  "serde",
 ]
 
-[[package]]
-name = "walkdir"
-version = "2.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "29790946404f91d9c5d06f9874efddea1dc06c5efe94541a7d6863108e3a5e4b"
-dependencies = [
- "same-file",
- "winapi-util",
-]
-
 [[package]]
 name = "want"
 version = "0.3.1"
@@ -4728,37 +2243,6 @@ dependencies = [
  "rustls-pki-types",
 ]
 
-[[package]]
-name = "winapi"
-version = "0.3.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419"
-dependencies = [
- "winapi-i686-pc-windows-gnu",
- "winapi-x86_64-pc-windows-gnu",
-]
-
-[[package]]
-name = "winapi-i686-pc-windows-gnu"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
-
-[[package]]
-name = "winapi-util"
-version = "0.1.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c2a7b1c03c876122aa43f3020e6c3c3ee5c05081c9a00739faf7503aeba10d22"
-dependencies = [
- "windows-sys 0.59.0",
-]
-
-[[package]]
-name = "winapi-x86_64-pc-windows-gnu"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
-
 [[package]]
 name = "windows-core"
 version = "0.62.2"
@@ -4909,15 +2393,6 @@ version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"
 
-[[package]]
-name = "winnow"
-version = "0.7.15"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "df79d97927682d2fd8adb29682d1140b343be4ac0f08fd68b7765d9c059d3945"
-dependencies = [
- "memchr",
-]
-
 [[package]]
 name = "wit-bindgen"
 version = "0.57.1"
@@ -4936,15 +2411,6 @@ version = "0.8.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "aee1b19627c7c60102ab80d3a9cbe18de90bfe03bfa6c3715447681f0e8c8af6"
 
-[[package]]
-name = "xz2"
-version = "0.1.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "388c44dc09d76f1536602ead6d325eb532f5c122f17782bd57fb47baeeb767e2"
-dependencies = [
- "lzma-sys",
-]
-
 [[package]]
 name = "yoke"
 version = "0.8.3"
@@ -5048,42 +2514,8 @@ dependencies = [
  "syn 3.0.5",
 ]
 
-[[package]]
-name = "zlib-rs"
-version = "0.6.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "34b31d188d9d685a4f9c7b46d6e36631b07058d2cfe190267adce54dc230bf12"
-
 [[package]]
 name = "zmij"
 version = "1.0.23"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "29666d0abbfad1e3dc4dcf6144730dd3a3ab225bbbdac83319345b1b44ccfc1b"
-
-[[package]]
-name = "zstd"
-version = "0.13.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e91ee311a569c327171651566e07972200e76fcfe2242a4fa446149a3881c08a"
-dependencies = [
- "zstd-safe",
-]
-
-[[package]]
-name = "zstd-safe"
-version = "7.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "54a3ab4db68cea366acc5c897c7b4d4d1b8994a9cd6e6f841f8964566a419059"
-dependencies = [
- "zstd-sys",
-]
-
-[[package]]
-name = "zstd-sys"
-version = "2.0.13+zstd.1.5.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38ff0f21cfee8f97d94cef41359e0c89aa6113028ab0291aa8ca0038995a95aa"
-dependencies = [
- "cc",
- "pkg-config",
-]
diff --git a/Cargo.toml b/Cargo.toml
index 9040dbf29..b4a9cbb4f 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,44 +1,27 @@
 [workspace]
 resolver = "2"
-members = [
-    "crates/asap_otel_proto",
-    "crates/asap_types",
-    "data_plane",
-    "control_plane",
-]
+members = ["control_plane", "data_plane"]
 
 [workspace.package]
 edition = "2021"
 version = "0.1.0"
 
 [workspace.dependencies]
-# Keep Planner frontends, selection, and IR on the same immutable revision.
-# Alias upstream asap-types because this workspace also defines asap_types.
-planner-types = { package = "asap-types", git = "https://github.com/ProjectASAP/ASAPPlanner", rev = "4b0839ce1733aab8231eb90944c876063a4551f9" }
-asap-aware-mapping = { git = "https://github.com/ProjectASAP/ASAPPlanner", rev = "4b0839ce1733aab8231eb90944c876063a4551f9" }
-asap-frontend-promql = { git = "https://github.com/ProjectASAP/ASAPPlanner", rev = "4b0839ce1733aab8231eb90944c876063a4551f9" }
-asap-frontend-sql = { git = "https://github.com/ProjectASAP/ASAPPlanner", rev = "4b0839ce1733aab8231eb90944c876063a4551f9" }
+# Keep every Planner crate on the same immutable revision. Alias upstream
+# asap-types as planner-types to name its origin at use sites.
+planner-types = { package = "asap-types", git = "https://github.com/ProjectASAP/ASAPPlanner", rev = "b517fbf256a17621d48fa3f8508c5d5ca1017bad" }
+asap-frontend-promql = { git = "https://github.com/ProjectASAP/ASAPPlanner", rev = "b517fbf256a17621d48fa3f8508c5d5ca1017bad" }
+asap-plan-selection = { git = "https://github.com/ProjectASAP/ASAPPlanner", rev = "b517fbf256a17621d48fa3f8508c5d5ca1017bad" }
+asap-executor = { git = "https://github.com/ProjectASAP/ASAPPlanner", rev = "b517fbf256a17621d48fa3f8508c5d5ca1017bad" }
 
-# Shared external deps (used by 2+ crates)
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
-serde_yaml = "0.9"
 thiserror = "1.0"
 anyhow = "1.0"
 tracing = "0.1"
 tracing-subscriber = { version = "0.3", features = ["env-filter"] }
 clap = { version = "4.0", features = ["derive", "env"] }
-chrono = { version = "0.4", features = ["serde"] }
-# One parser source for backend parsing. Member crates inherit the current
-# ProjectASAP default branch through `workspace = true`.
-promql-parser = { git = "https://github.com/ProjectASAP/promql-parser" }
 tokio = { version = "1.0", features = ["full"] }
-arc-swap = "1.7"
+axum = "0.7"
 reqwest = { version = "0.12", default-features = false, features = ["json", "rustls-tls"] }
-
-# Internal crates
-asap-physical-operators = { git = "https://github.com/ProjectASAP/ASAPPlanner", rev = "4b0839ce1733aab8231eb90944c876063a4551f9" }
-asap_sketch_codec = { git = "https://github.com/ProjectASAP/ASAPPlanner", rev = "4b0839ce1733aab8231eb90944c876063a4551f9" }
-asap_types = { path = "crates/asap_types" }
-asap_otel_proto = { path = "crates/asap_otel_proto" }
-indexmap = { version = "2.0", features = ["serde"] }
+control_plane = { path = "control_plane" }
diff --git a/README.md b/README.md
index f9391cbc1..d1ec53935 100644
--- a/README.md
+++ b/README.md
@@ -2,616 +2,64 @@
 
 # ASAPQuery-backend
 
-ASAPQuery-backend compiles and executes planned observability queries using
-materialized exact accumulators and sketches, with configured exact backends
-for unsupported or unavailable results. It contains the backend control plane,
-summary storage, precompute runtime and query adapters. Query semantics and
-post-ASAP candidate generation come from the external
-[ASAPPlanner](https://github.com/ProjectASAP/ASAPPlanner) dependency.
+ASAPQuery-backend is the deployment that executes
+[ASAPPlanner](https://github.com/ProjectASAP/ASAPPlanner)'s plans for PromQL
+workloads over Prometheus Remote Write data.
 
-Start with the [E2E physical-DAG walkthrough](docs/evaluation/e2e-physical-dag.md)
-for workload inputs, ERP evidence, selected plans, sample ingestion, storage
-inspection and query execution. The [documentation index](docs/README.md) links
-the detailed guides. This README describes the repository entry points; it does
-not promise a universal latency improvement or a single accuracy bound across
-summary families.
-
-## Planning, state and execution
+Following the Planner's
+[planning stages](https://github.com/ProjectASAP/ASAPPlanner/blob/main/docs/design_docs/proposals/planner-layering.md),
+the Planner decides everything about a plan: which summaries to use, how to
+share them, what to materialize and which plan is cheapest. The backend
+supplies its capabilities, then executes the one selected `PhysicalASAPDAG` as
+given.
 
 ```text
-Workload + capabilities + cost/accuracy evidence
-                    |
-          external ASAPPlanner
-          selected post-ASAP DAG
-                    |
-       backend PhysicalCompiler
-                    |
-       authoritative SummaryCatalog
-       + shared physical-plan publication
-           /                        \
-   PrecomputePlan                 QueryPlan
-   producer/input subDAGs         query/readout subDAGs
-           |                        |
-    SummaryStore <---- bound state reads
-           |                        |
-   physical instances       result or exact fallback
-```
-
-The backend compiler consumes the selected Planner DAG and places supported
-operations. It preserves semantic nodes and bindings rather than rediscovering
-query intent from metric names. ERP evidence can influence eligible choices;
-its presence alone does not prove selection or measured benefit.
-
-| Contract or component | Responsibility |
-| --- | --- |
-| `SummaryCatalog` | Authoritative generation and descriptors for data, summary semantics, population, windows and materialization identity. Sibling plans validate against the same catalog. |
-| `PrecomputePlan` | Materializations, input schemas, producer bindings and installed precompute subDAGs. Window size, slide, layout and origin are explicit contracts. |
-| `ProducerContract`, `CollectorPlan`, `TransmissionPlan` | Producer/materialization authorization, external collector work and state-frame encoding/sequence rules. They are shared producer/consumer contracts; backend-local Remote Write does not require ASAPCollector. |
-| `QueryPlan` | Language-tagged query entries, exact dependencies, typed operations and materialization/readout bindings. Query subDAGs execute against the active installed snapshot. |
-| SummaryStore (`SketchStore`) | Physical state, indexes, lifecycle and persistence. A `SummaryDefinitionId` identifies the planned materialization. SID identifies a physical stored series/lifetime; `SummaryInstanceId` identifies a concrete definition/window/group instance. Planner node IDs are not storage IDs. |
-| Physical-plan publication | Publishes catalog, precompute, query, collector and transmission views together; invalid bindings reject installation rather than silently selecting replacement state. |
-
-See the [physical compiler](docs/developer_docs/control-plane/physical-compiler.md),
-[catalog/runtime design](docs/developer_docs/query-engine/catalog-physical-plan-runtime.md)
-and [maintenance protocol](docs/developer_docs/maintenance-replay.md).
-
-## Interfaces and support boundaries
-
-```mermaid
-flowchart TB
-  subgraph planning["Planning and installed contracts"]
-    PL["External ASAPPlanner"] --> CP["Backend control plane"]
-    CP --> CAT["Authoritative SummaryCatalog"]
-    CP --> PP["PrecomputePlan"]
-    CP --> QP["QueryPlan"]
-    CP --> PC["Producer contracts / CollectorPlan"]
-    CP --> TP["TransmissionPlan"]
-  end
-
-  subgraph ingest["Sample and state ingestion"]
-    RW["Prometheus Remote Write v1"] --> RX["RW receiver / bounded queue"]
-    RX --> PD["Precompute DAG"]
-    EP["External producers: modified OTLP / state"] --> PV["Producer / transmission validation"]
-    PV --> PD
-    PD --> SS["SummaryStore: physical series and window/group instances"]
-  end
-
-  subgraph queries["Query adapters and execution"]
-    PQ["PromQL"] --> QD["PromQL query DAG"]
-    MQ["MetricsQL"] --> MA["MetricsQL adapter"]
-    SQL["ClickHouse SQL"] --> SD["Typed SQL query DAG"]
-    QD --> QR["Shared query runtime"]
-    MA --> QR
-    SD --> QR
-    QR -->|"bound state reads"| SS
-    QD -->|"unsupported / unavailable"| PE["Prometheus exact backend"]
-    MA -->|"unsupported / unavailable"| VE["VictoriaMetrics exact backend"]
-    SD -->|"unsupported / unavailable"| CE["ClickHouse exact backend"]
-    QR --> W["Warm: successful summary execution"]
-    QR --> H["Hybrid: summaries plus supported exact dependencies"]
-    PE --> F["Exact fallback result"]
-    VE --> F
-    CE --> F
-    CE -->|"supported exact SQL subtree"| SD
-  end
-
-  subgraph completion["Independent completion authority"]
-    B["Typed watermark / barrier: installed producer and partition scope"]
-    B --> CC["Continuous coordinator: closure activation gated"]
-    CC -.->|"gated completion contract"| PD
-  end
-
-  PP -.-> PD
-  QP -.-> QR
-  PC -.-> PV
-  TP -.-> PV
-  PC -.-> B
-  CAT -.-> SS
-  CAT -.-> QR
+PlanningWorkload (JSON)             DeploymentCapabilities
+          \                             /
+           control_plane: ASAPPlanner stages 0-3
+                         |
+           plan.json: selected PhysicalASAPDAG + query per root
+                         |
+           data_plane: Remote Write in, Prometheus query API out
 ```
 
-Dotted edges show installed contracts or explicitly gated paths. The barrier is
-independent of Remote Write samples; this figure does not advertise a public
-barrier endpoint or continuous/sliding activation. Warm and hybrid labels apply
-only to successful execution with the corresponding actual summary reads;
-external-only DAG execution is not acceleration.
-
-| Surface | Current path and boundary |
-| --- | --- |
-| Prometheus | `/api/v1/write` accepts Remote Write **v1** scalar samples. PromQL instant/range queries use installed plans with configured Prometheus exact fallback. The collector-free `asapquery` profile is a bounded compatibility profile, not every distributed/persistent deployment option. |
-| VictoriaMetrics | A separate MetricsQL adapter and listener lower supported expressions through Planner and the shared runtime. Unsupported syntax or unavailable coverage retains VictoriaMetrics exact fallback. See [MetricsQL support](docs/developer_docs/query-engine/victoriametrics-metricsql-support.md). |
-| ClickHouse | An optional SQL HTTP adapter uses the same catalog/publication with typed relational and mixed exact/summary DAG execution. Supported collection/scalar operations are explicit; arbitrary SQL, lambdas and counter queries are not implied. External-only DAG execution is not summary acceleration. See [SQL support](docs/developer_docs/query-engine/clickhouse-sql-support.md). |
-| External producers | The distributed path accepts configured collector/state input, including modified OTLP. It is distinct from standard Prometheus Remote Write and uses the shared producer/transmission contracts. |
-
-### Query workload input
-
-Planning input and serving traffic are separate. Sending a PromQL request from
-Grafana does not declare that it is a recurring dashboard query. Declare known
-query classes through the control plane; send each evaluation to the data-plane
-query endpoint.
-
-At startup, set `CONTROLLER_WORKLOADS` to a YAML registry containing the query
-text and deployment hints:
-
-```yaml
-- metric_name: http_requests_total
-  query_string: "sum by (region) (rate(http_requests_total[5m]))"
-  accuracy_sla: 0.99
-  assign_to_role: agent
-  grouping_labels: [region]
-  repeat_every: 30s
-```
-
-`query_string` is the preferred source for metric, aggregation, filters,
-grouping and range-window semantics. Optional registry fields include
-`sketch_family_override`, `sample_p`, `distinct_keys_per_window`, `item_label`,
-`monitor` and `repeat_every`. `accuracy_sla` is the legacy success fraction:
-`1.0` requests exact results and `0.99` permits epsilon `0.01`. An unknown key
-is rejected rather than ignored, and a registry file that exists but does not
-parse fails startup instead of degrading to an empty registry.
-
-The startup registry and the legacy planning API carry the same evaluation
-cadence, so a declaration is costed identically through either entry point.
-`POST /api/v1/plan` (`CONTROLLER_ADDR`, default port `8080`):
-
-```bash
-curl -X POST http://localhost:8080/api/v1/plan \
-  -H 'Content-Type: application/json' \
-  -d '{
-    "query_string": "sum by (region) (rate(http_requests_total[5m]))",
-    "repeat_every": "30s",
-    "accuracy_sla": 0.99,
-    "latency_sla": "1s",
-    "workload": {
-      "series_count": 100000,
-      "samples_per_sec_per_series": 0.0667,
-      "bytes_per_raw_sample": 100,
-      "distinct_keys_per_window": null,
-      "data_distribution": "zipf",
-      "memory_budget_bytes": 268435456
-    }
-  }'
-```
-
-`repeat_every` describes an expected cadence—for example, a dashboard panel
-refreshed every 30 seconds—but does not schedule evaluations. Its current use is
-narrow: the legacy deployment cost path uses it as the flush-period proxy for
-batch-mode plans. Window-mode plans use their configured window duration, and
-the canonical physical-plan request does not yet model general query recurrence.
-Do not assume that changing `repeat_every` will change summary selection.
-
-The `workload` object describes the incoming data stream and may be omitted to
-use conservative defaults. The API also accepts explicit `metric_name`,
-`aggregations`, `time_window`, `group_by_labels` and `label_filters` instead of
-a query string.
+## Status
 
-Once the matching physical plan is installed and its state is ready, clients
-execute the query through the data plane's Prometheus-compatible API:
-
-```bash
-curl -G http://localhost:8088/api/v1/query \
-  --data-urlencode 'query=sum by (region) (rate(http_requests_total[5m]))'
-```
-
-Range evaluations use `/api/v1/query_range` with `query`, `start`, `end` and
-`step`. Serving requests do not update `repeat_every` automatically. End-to-end
-dashboard-frequency-aware planning still requires a typed recurrence field on
-the canonical workload/publication path and an observer or explicit workload
-registration to populate it.
-
-Remote Write `204` acknowledges atomic bounded queue admission, **not** durable
-accumulator publication or a raw write-ahead log. Deduplication is in memory;
-there is no durable raw-WAL replay guarantee. Stale markers are recognized and
-excluded from numeric aggregation, not propagated as general lifecycle events.
-Native histograms and exemplars are rejected in this v1 path.
-
-Remote Write does not carry an authoritative completion watermark. Installed
-producer partition rosters and typed barriers define a separate completion
-scope; roster membership alone does not provide authentication, durable progress
-or continuous scheduling. Finite immutable maintenance has explicit source,
-population, window and operator gates. Continuous/sliding activation must not be
-inferred from available metadata or a successful ingest response.
-
-Fallback and execution provenance must reflect the path that actually produced
-a successful result. Missing coverage and unsupported operations must not be
-reported as warm success. Accuracy and benefit claims need the selected family's
-contract and workload-specific evidence. Thanos/object-store integrations are
-optional deployment paths, not the default architecture or a required quickstart.
-
-## Build and inspect: shared setup
-
-Run these steps in Bash on Linux. The Docker commands below use host networking;
-other platforms need equivalent port/address configuration. Each backend runbook
-has its own ports and artifacts and can be run independently after this setup.
-
-### 1. Check out the backend and its sibling dependencies
-
-```bash
-mkdir -p asap-workspace
-cd asap-workspace
-git clone https://github.com/ProjectASAP/ASAPQuery-backend.git
-git clone https://github.com/ProjectASAP/ASAPCollector.git
-git clone https://github.com/ProjectASAP/asap_sketchlib.git
-cd ASAPQuery-backend
-# Follow this backend revision's CI dependency pin, rather than a copied SHA.
-ASAP_SKETCH_REF="$(awk '/repository: ProjectASAP\/asap_sketchlib/{found=1;next} found && /^[[:space:]]*ref:/{print $2;exit}' .github/workflows/mvp-ci.yml)"
-git -C ../asap_sketchlib checkout "${ASAP_SKETCH_REF:-main}"
-git -C ../ASAPCollector checkout main
-```
-
-[MVP CI](.github/workflows/mvp-ci.yml) is the source for compatible dependency
-checkouts; currently Collector uses its default branch. For reproducible runs,
-record the exact revisions. ASAPPlanner is fetched at the revision pinned in
-the Cargo manifests; do not substitute an unrelated local planner checkout.
-
-### 2. Check prerequisites and build
-
-Install Rust through rustup and install `protoc`, `curl`, `jq`, Python 3 and Git
-using your system package manager. Docker is needed only for the real
-Prometheus/Pushgateway demo below. Rust 1.98.0 is the toolchain used for these
-local command checks.
-
-```bash
-rustup toolchain install 1.98.0 --profile minimal --component rustfmt --component clippy
-rustc +1.98.0 --version
-protoc --version
-curl --version
-jq --version
-python3 --version
-# For Docker-backed demos only:
-docker version
-
-cargo +1.98.0 fetch --locked
-cargo +1.98.0 build --locked -p control_plane -p data_plane
-cargo +1.98.0 build --locked -p control_plane \
-  --example calibration_candidates --example compile_workload_artifact \
-  --example compile_clickhouse_workload
-target/debug/data_plane --help
-mkdir -p target/readme-evidence
-{
-  git rev-parse HEAD
-  git -C ../ASAPCollector rev-parse HEAD
-  git -C ../asap_sketchlib rev-parse HEAD
-} > target/readme-evidence/revisions.txt
-```
-
-The executable is `target/debug/data_plane`, or `target/release/data_plane` if
-you build with `--release`. Access to the pinned Git dependencies is required.
-
-### 3. Export candidates and select a deployable plan by complete cost
-
-```bash
-target/debug/examples/calibration_candidates \
-  docs/examples/asapquery-compatibility-demo-snapshot.json \
-  > target/readme-evidence/candidates.json
-jq '.candidates[] | {candidate_index, unavailable_reason}' \
-  target/readme-evidence/candidates.json
-
-target/debug/examples/compile_workload_artifact \
-  "$ASAPQUERY_PLANNING_SNAPSHOT" \
-  --dot target/readme-evidence/selected.dot \
-  > target/readme-evidence/selected.json
-jq '.cost_comparison' target/readme-evidence/selected.json
-jq '.summary_catalog' target/readme-evidence/selected.json
-jq '.precompute_plan | {materializations, executable_dags}' \
-  target/readme-evidence/selected.json
-jq '.query_plan.entries' target/readme-evidence/selected.json
-jq '.precompute_plan.schemas[] | {materialization, schema_id}' \
-  target/readme-evidence/selected.json
-dot -Tsvg target/readme-evidence/selected.dot \
-  -o target/readme-evidence/selected.svg
-```
+The backend is being rebuilt on the Planner's physical DAG:
 
-Candidate discovery accepts the checked-in unquoted templates. Deployment and
-selected-plan inspection require `ASAPQUERY_PLANNING_SNAPSHOT` to point to a
-snapshot with complete, valid workload cost evidence. Prepare that input using
-the [cost evidence workflow](docs/examples/workload-cost-evidence.md).
-There is one snapshot compiler: it compares complete executable alternatives,
-including exact fallback. Materialization IDs are definitions, not physical SIDs.
-For `--metricsql`, collect quotes for the MetricsQL frontend.
+| Part | State |
+|---|---|
+| Control plane: plan a PromQL workload, write `plan.json` | done |
+| Data plane: load and validate `plan.json`, accept Remote Write | done |
+| Stored summaries (SDS) | next |
+| Precompute engine: run ingestion-time nodes per pane | planned |
+| Query engine: run query-time nodes over stored panes and raw data | planned |
 
-## Prometheus runbook
+Until the query engine lands, the data plane forwards every query to
+Prometheus and marks the response `x-asap-execution: forwarded`. SQL and
+ClickHouse are not supported yet.
 
-### Start real Prometheus and Pushgateway, then the backend
+## Running
 
-The checked-in [Prometheus YAML](demos/asapquery/prometheus.yml) scrapes
-Pushgateway at `127.0.0.1:19092` every second and includes:
+```sh
+# Plan #509 Example 1 with this backend's capabilities.
+cargo run -p control_plane -- \
+  --workload examples/planner-layering-example1.json --out plan.json
 
-```yaml
-remote_write:
-  - url: http://127.0.0.1:19091/api/v1/write
-    queue_config:
-      min_shards: 1
-      max_shards: 1
-      batch_send_deadline: 1s
+# Serve Remote Write on /api/v1/write and the query API on /api/v1/query[_range].
+cargo run -p data_plane -- --plan plan.json --prometheus-url http://localhost:9090
 ```
 
-Use unused ports 19090–19092 and container names below. Prometheus must be healthy
-before the `asapquery` profile starts. Initial Remote Write retries while the
-backend starts are expected.
+`--capabilities caps.json` replaces the default capabilities, which are the
+Planner executor's capabilities without state kept across query evaluations.
 
-```bash
-mkdir -p target/readme-evidence/prometheus
-docker run -d --name asap-readme-pushgateway --network host \
-  prom/pushgateway:v1.9.0 --web.listen-address=:19092
-docker run -d --name asap-readme-prometheus --network host \
-  -v "$PWD/demos/asapquery/prometheus.yml:/etc/prometheus/prometheus.yml:ro" \
-  prom/prometheus:v2.55.1 --config.file=/etc/prometheus/prometheus.yml \
-  --storage.tsdb.path=/prometheus --web.listen-address=:19090
-for attempt in $(seq 1 60); do
-  curl -fsS http://127.0.0.1:19090/-/healthy && break
-  sleep 1
-done
-curl -fsS http://127.0.0.1:19090/-/healthy
+## Development
 
-target/debug/data_plane --profile asapquery \
-  --planning-snapshot "$ASAPQUERY_PLANNING_SNAPSHOT" \
-  --prometheus-server http://127.0.0.1:19090 \
-  --forward-unsupported-queries --http-port 19091 \
-  --output-dir target/readme-evidence/prometheus/runtime \
-  > target/readme-evidence/prometheus/backend.log 2>&1 &
-echo $! > target/readme-evidence/prometheus/backend.pid
-for attempt in $(seq 1 60); do
-  curl -fsS http://127.0.0.1:19091/api/v1/health && break
-  sleep 1
-done
-curl -fsS http://127.0.0.1:19091/api/v1/health
+```sh
+cargo fmt --all -- --check
+cargo clippy --workspace --all-targets --locked -- -D warnings
+cargo test --workspace --locked
 ```
 
-### Send samples and inspect execution
-
-Pushgateway accepts exposition text; Prometheus performs the real scrape and
-Snappy/protobuf Remote Write encoding. Do not post this text to `/api/v1/write`.
-
-```bash
-for sample in $(seq 1 15); do
-  printf '# TYPE asap_demo_gauge gauge\nasap_demo_gauge %s\n' "$sample" |
-    curl -fsS --data-binary @- http://127.0.0.1:19092/metrics/job/asapquery-demo
-  sleep 1
-done
-curl -fsS http://127.0.0.1:19091/api/v1/physical-plan/status \
-  | tee target/readme-evidence/prometheus/status.json | jq .
-curl -fsS http://127.0.0.1:19091/api/v1/summary-inventory \
-  | tee target/readme-evidence/prometheus/inventory.json | jq .
-curl -sS -D target/readme-evidence/prometheus/query.headers --get \
-  http://127.0.0.1:19091/api/v1/query \
-  --data-urlencode 'query=sum(sum_over_time(asap_demo_gauge[5s]))' \
-  > target/readme-evidence/prometheus/query.json
-jq '{status, data, infos}' target/readme-evidence/prometheus/query.json
-cat target/readme-evidence/prometheus/query.headers
-```
-
-Check actual response provenance and window coverage; a successful HTTP response
-alone is not warm execution. For **a separately completed finite replay only**,
-after every input has been delivered, the closure operation is:
-
-```bash
-curl -fsS -X POST http://127.0.0.1:19091/api/v1/precompute/drain | jq .
-```
-
-Do not run that command against the live scraping setup above: it closes that
-receiver generation and later writes are rejected. It is not a periodic flush
-or an implicit continuous watermark. The real finite maintenance process test
-is available separately:
-
-```bash
-cargo +1.98.0 test --locked -p data_plane --test asapquery_compatibility_process_e2e \
-  immutable_maintenance_process::complete_group_maintenance_is_automatic_and_durable \
-  -- --exact --nocapture
-```
-
-### Validate and clean up
-
-The focused protocol matrix uses the real backend process with a **mock exact
-upstream**, and removes temporary artifacts. The second command runs the
-separate **real Prometheus/Pushgateway** demo and handles its own cleanup.
-Stop the manual setup before the real demo because it uses the same ports.
-
-```bash
-kill "$(cat target/readme-evidence/prometheus/backend.pid)"
-docker rm -f asap-readme-prometheus asap-readme-pushgateway
-cargo +1.98.0 test --locked -p data_plane --test asapquery_compatibility_process_e2e \
-  collector_free_profile_serves_complete_matrix_and_falls_back_exactly -- --exact
-export ASAPQUERY_PLANNING_SNAPSHOT=/absolute/path/priced-snapshot.json
-./scripts/e2e.sh asapquery-demo
-```
-
-Keep `target/readme-evidence/prometheus/` and
-`target/asapquery-demo-evidence/` for inspection; delete them yourself only after
-you no longer need the logs, outputs and runtime state.
-
-## VictoriaMetrics / MetricsQL runbook
-
-This repository has a real backend-process MetricsQL fixture, but not a bundled
-self-contained native VictoriaMetrics deployment demo. The fixture starts the
-backend, installs an actual MetricsQL plan, sends Remote Write samples, checks
-labeled results, and shuts down its child process. Its exact upstream is a
-health-only test service, **not native VictoriaMetrics**.
-
-```bash
-mkdir -p target/readme-evidence/victoriametrics
-cargo +1.98.0 test --locked -p data_plane --test asapquery_compatibility_process_e2e \
-  distinct_planning_process::distinct_range_uses_planner_selected_hll_and_source_labels \
-  -- --exact --nocapture \
-  > target/readme-evidence/victoriametrics/process.log 2>&1
-```
-
-`DISTINCT_PLANNED` and `DISTINCT_INSTALLED` in the log expose selection and the
-shared installed publication. The fixture checks the actual MetricsQL listener;
-it is not a native differential or a performance benchmark.
-
-For an **existing native VM service** at port 8428, the following independently
-starts an exact-fallback adapter. Load the intended dataset into that service
-using its normal ingestion setup first. The empty bootstrap deliberately has
-no accelerated bindings; this smoke request must not be called warm.
-
-```bash
-printf 'aggregations: []\n' > target/readme-evidence/victoriametrics/bootstrap.yaml
-target/debug/data_plane \
-  --streaming-config target/readme-evidence/victoriametrics/bootstrap.yaml \
-  --http-port 19080 --victoriametrics-http-port 19081 \
-  --victoriametrics-url http://127.0.0.1:8428 \
-  --output-dir target/readme-evidence/victoriametrics/runtime \
-  > target/readme-evidence/victoriametrics/backend.log 2>&1 &
-echo $! > target/readme-evidence/victoriametrics/backend.pid
-for attempt in $(seq 1 60); do
-  curl -fsS http://127.0.0.1:19080/api/v1/health && break
-  sleep 1
-done
-curl -fsS http://127.0.0.1:19080/api/v1/health
-curl -sS -D target/readme-evidence/victoriametrics/query.headers --get \
-  http://127.0.0.1:19081/api/v1/query \
-  --data-urlencode 'query=default_rollup(asap_demo_gauge[5s])' \
-  > target/readme-evidence/victoriametrics/query.json
-jq . target/readme-evidence/victoriametrics/query.json
-curl -fsS http://127.0.0.1:19080/api/v1/physical-plan/status | jq .
-kill "$(cat target/readme-evidence/victoriametrics/backend.pid)"
-```
-
-To inspect supported MetricsQL planning independently:
-
-```bash
-target/debug/examples/compile_workload_artifact \
-  "$ASAPQUERY_PLANNING_SNAPSHOT" --metricsql \
-  > target/readme-evidence/victoriametrics/selected.json
-jq '.query_plan.entries' \
-  target/readme-evidence/victoriametrics/selected.json
-```
-
-This does not install or ingest the artifact by itself. Use the fixture's normal
-stage/activate path for an integrated example. Keep the logs, headers and JSON
-under `target/readme-evidence/victoriametrics/`; see
-[MetricsQL support](docs/developer_docs/query-engine/victoriametrics-metricsql-support.md)
-for tenant paths and unsupported constructs.
-
-## ClickHouse / SQL runbook
-
-Use a **dedicated test ClickHouse server** at `http://127.0.0.1:8123`, with
-credentials supplied through `CLICKHOUSE_USER`/`CLICKHOUSE_PASSWORD` if needed.
-The real process fixture drops and recreates `default.telemetry` and
-`default.divisors` at the start of each scenario, and leaves the final tables
-on the dedicated server; do not point it at a production database. It loads samples,
-compiles an actual mixed query, publishes the shared plans, queries the backend,
-and cleans up its child backend. The native server remains yours to manage.
-
-```bash
-mkdir -p target/readme-evidence/clickhouse
-export CLICKHOUSE_URL=http://127.0.0.1:8123
-curl -fsS --user "${CLICKHOUSE_USER:-default}:${CLICKHOUSE_PASSWORD:-}" \
-  "$CLICKHOUSE_URL/ping"
-CLICKHOUSE_PLANNING_ARTIFACT="$PWD/target/readme-evidence/clickhouse/planning.json" \
-  cargo +1.98.0 test --locked -p data_plane --test clickhouse_differential_e2e \
-  compiled_publication_executes_mixed_dag_in_data_plane_process \
-  -- --exact --nocapture \
-  > target/readme-evidence/clickhouse/process.log 2>&1
-jq '{selection_trace, catalog: .publication.summary_catalog}' \
-  target/readme-evidence/clickhouse/planning.json
-```
-
-The fixture runs SUM, COUNT and MAX scenarios. `planning.json` is overwritten
-per scenario and retains the last publication; keep `process.log` for the complete
-run. Without `CLICKHOUSE_URL` the real-server test skips; that is not a successful
-native test. See [SQL support](docs/developer_docs/query-engine/clickhouse-sql-support.md)
-for the typed backfill and format boundaries.
-
-### Compile a concrete SQL input without preset materializations
-
-The example reads `ClickHouseSqlAutomaticWorkload` JSON from stdin, not a
-Prometheus snapshot. Reuse the current compiler envelope from the shared setup
-and provide a typed table schema plus a fixed evaluation interval:
-
-```bash
-python3 - <<'PY'
-import json
-from pathlib import Path
-root = Path('target/readme-evidence')
-envelope = json.loads((root / 'selected.json').read_text())['precompute_plan']['envelope']
-envelope['plan_id'] = 9001
-envelope['plan_version'] = 1
-workload = {
-    'envelope': envelope,
-    'tables': {'telemetry': {
-        'columns': [
-            {'name': 'timestamp_ms', 'dtype': 'timestamp', 'nullable': False},
-            {'name': 'value', 'dtype': 'float64', 'nullable': False},
-            {'name': 'metric', 'dtype': 'utf8', 'nullable': False}],
-        'time_index': 0, 'unique_keys': [], 'closed': True}},
-    'accuracy': 'Exact',
-    'queries': [{'sql': 'SELECT sum(value) FROM telemetry WHERE timestamp_ms >= 0 AND timestamp_ms < 2000',
-                 'start_ms': 0, 'end_ms': 2000, 'cumulative': True}]}
-(root / 'clickhouse/workload.json').write_text(json.dumps(workload, indent=2))
-PY
-target/debug/examples/compile_clickhouse_workload \
-  < target/readme-evidence/clickhouse/workload.json \
-  > target/readme-evidence/clickhouse/compiled.json
-jq '{selection_trace, catalog: .install.summary_catalog, query: .install.query_plan}' \
-  target/readme-evidence/clickhouse/compiled.json
-```
-
-The fixture above supplies real table data and exercises publication/execution;
-this offline command alone does neither. For a standalone **exact-fallback**
-listener against that native service:
-
-```bash
-printf 'aggregations: []\n' > target/readme-evidence/clickhouse/bootstrap.yaml
-target/debug/data_plane \
-  --streaming-config target/readme-evidence/clickhouse/bootstrap.yaml \
-  --http-port 19082 --clickhouse-http-port 19083 \
-  --clickhouse-url "$CLICKHOUSE_URL" --clickhouse-database default \
-  --output-dir target/readme-evidence/clickhouse/runtime \
-  > target/readme-evidence/clickhouse/backend.log 2>&1 &
-echo $! > target/readme-evidence/clickhouse/backend.pid
-for attempt in $(seq 1 60); do
-  curl -fsS http://127.0.0.1:19082/api/v1/health && break
-  sleep 1
-done
-curl -fsS http://127.0.0.1:19082/api/v1/health
-curl -sS -D target/readme-evidence/clickhouse/query.headers --get \
-  --user "${CLICKHOUSE_USER:-default}:${CLICKHOUSE_PASSWORD:-}" \
-  http://127.0.0.1:19083/ --data-urlencode 'query=SELECT 1 FORMAT JSON' \
-  > target/readme-evidence/clickhouse/query.json
-jq . target/readme-evidence/clickhouse/query.json
-curl -fsS http://127.0.0.1:19082/api/v1/physical-plan/status | jq .
-kill "$(cat target/readme-evidence/clickhouse/backend.pid)"
-```
-
-For authenticated requests, set `CLICKHOUSE_USER` and `CLICKHOUSE_PASSWORD`
-for the curl commands above, or send `X-ClickHouse-User` and `X-ClickHouse-Key`
-headers. The proxy forwards incoming authentication headers. Backend
-`--clickhouse-user` and `--clickhouse-password` configure backfill access; they
-do not automatically authenticate proxy fallback requests. The process fixture
-uses its matching environment variables. Retain planning/selection artifacts, response headers,
-JSON and process logs. A successful SQL response can be exact fallback or an
-external-only DAG; only actual summary reads establish ASAP/hybrid execution.
-The fixture's mixed-DAG assertions are stronger than a successful `SELECT 1`.
-
-For recorded datasets, see the [replay guide](docs/user_guide/o11y-replay.md) and
-[execution calibration](tools/o11y-execution/CALIBRATION.md). For synthetic fake
-metrics, Google and Alibaba query expressions and cross-engine measurements, see
-the [dataset-specific accuracy evaluation](tools/shared-workload/ACCURACY_E2E.md).
-Report correctness,
-fallbacks, build/update cost and whole-deployment resources separately from
-query latency. Manual examples leave evidence directories intact; remove them
-only when no longer needed. PID-file cleanup commands apply only to the
-still-running backend started by that manual run. The ClickHouse fixture leaves
-its final tables on your dedicated native server; remove those test tables or
-discard that test server separately after collecting evidence.
-
-## Repository map
-
-| Path | Contents |
-| --- | --- |
-| [control_plane/](control_plane/) | Planner adapters, physical compilation, placement/cost evaluation, publication and runtime configuration. |
-| [crates/asap_types/](crates/asap_types/) | Shared catalog, SDS identities, plan, grouping, window and producer contracts. |
-| [crates/asap_otel_proto/](crates/asap_otel_proto/) | Modified OTLP protobuf bindings for supported external state ingestion. |
-| [data_plane/src/precompute_engine/](data_plane/src/precompute_engine/) | Ingest-time operators, coordination and immutable maintenance execution. |
-| [data_plane/src/storage_engines/sketch_db/](data_plane/src/storage_engines/sketch_db/) | SummaryStore implementation, physical indexes, lifecycle, backfill and persistence. |
-| [data_plane/src/query_engines/](data_plane/src/query_engines/) | Summary readout, shared DAG execution, protocol adapters and exact routing. |
-| [data_plane/src/drivers/](data_plane/src/drivers/) | HTTP, ingestion and control-plane interfaces. |
-| [data_plane/tests/](data_plane/tests/) | Runtime and process integration tests. |
-| [demos/](demos/), [scripts/](scripts/), [tools/](tools/) | Runnable demonstrations, validation and workload/evaluation tooling. |
-| [docs/](docs/README.md) | Architecture, operator guides, support boundaries and evaluation evidence. |
-
-## License
-
-MIT — see [LICENSE](LICENSE).
+The Planner revision is pinned in `Cargo.toml`; see
+[scripts/ci/README.md](scripts/ci/README.md).
diff --git a/control_plane/.gitignore b/control_plane/.gitignore
deleted file mode 100644
index 2f7896d1d..000000000
--- a/control_plane/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-target/
diff --git a/control_plane/Cargo.toml b/control_plane/Cargo.toml
index 63b866090..8c08f7a90 100644
--- a/control_plane/Cargo.toml
+++ b/control_plane/Cargo.toml
@@ -1,53 +1,17 @@
 [package]
 name = "control_plane"
-version = "0.1.0"
-edition = "2021"
-
-[lib]
-name = "control_plane"
-path = "src/lib.rs"
-
-[[bin]]
-name = "control_plane"
-path = "src/main.rs"
+version.workspace = true
+edition.workspace = true
 
 [dependencies]
-tokio       = { version = "1",    features = ["full"] }
-axum        = { version = "0.7",  features = ["ws"] }
-futures-util = "0.3"
-serde       = { version = "1",    features = ["derive"] }
-serde_json  = "1"
-sha2 = "0.10"
-serde_yaml  = "0.9"
-reqwest.workspace = true
-anyhow      = "1"
-thiserror   = "1"
-tracing     = "0.1"
-tracing-subscriber = { version = "0.3", features = ["env-filter", "fmt"] }
-chrono      = { version = "0.4",  features = ["serde"] }
-promql-parser.workspace = true
-prost          = "0.13"
-bytes          = "1"
-parking_lot    = "0.12"
-prometheus     = { version = "0.13", default-features = false, features = ["process"] }
-tonic          = { version = "0.12", features = ["gzip"] }
-asap_types.workspace = true
-asap-physical-operators.workspace = true
-
-# Planner's IR, replacement search, and frontends share the workspace pin.
 planner-types.workspace = true
-asap-aware-mapping.workspace = true
 asap-frontend-promql.workspace = true
-asap-frontend-sql.workspace = true
-
-[dev-dependencies]
-tokio = { version = "1", features = ["full", "test-util"] }
-tower = { version = "0.4", features = ["util"] }
-axum = { version = "0.7", features = ["ws"] }
-http-body-util = "0.1"
-tokio-tungstenite = "0.21"
-
-[build-dependencies]
-toml = "0.8"
-prost-build = "0.13"
-tonic-build = "0.12"
+asap-plan-selection.workspace = true
+asap-executor.workspace = true
+serde.workspace = true
+serde_json.workspace = true
+thiserror.workspace = true
+anyhow.workspace = true
+tracing.workspace = true
+tracing-subscriber.workspace = true
+clap.workspace = true
diff --git a/control_plane/Dockerfile b/control_plane/Dockerfile
deleted file mode 100644
index 0ca9f984f..000000000
--- a/control_plane/Dockerfile
+++ /dev/null
@@ -1,32 +0,0 @@
-# Builds the control_plane (controller) binary → asap/control-plane:dev.
-#
-# Build from the backend checkout; Cargo fetches public Git dependencies
-# at the revisions recorded in Cargo.lock.
-#
-#   docker build -f control_plane/Dockerfile -t asap/control-plane:dev .
-FROM rust:1.90-bookworm AS build
-WORKDIR /src
-
-# protoc for control_plane/build.rs (prost-build/tonic-build compile
-# proto/opamp.proto + proto/feedback.proto); git for git-dep fetches.
-RUN apt-get update && \
-    apt-get install -y --no-install-recommends \
-        protobuf-compiler git ca-certificates && \
-    rm -rf /var/lib/apt/lists/*
-
-COPY . ASAPQuery-backend
-
-RUN cd ASAPQuery-backend && cargo build --locked --release --bin control_plane
-
-# Runtime image: binary + CA certs.
-FROM debian:bookworm-slim
-RUN apt-get update && \
-    apt-get install -y --no-install-recommends ca-certificates && \
-    rm -rf /var/lib/apt/lists/*
-COPY --from=build /src/ASAPQuery-backend/target/release/control_plane \
-    /usr/local/bin/control_plane
-
-ENV RUST_LOG=info
-# OpAMP ws 4320, controller gRPC 4321, controller HTTP 8080.
-EXPOSE 4320 4321 8080
-ENTRYPOINT ["/usr/local/bin/control_plane"]
diff --git a/control_plane/build.rs b/control_plane/build.rs
deleted file mode 100644
index 7af15c0b3..000000000
--- a/control_plane/build.rs
+++ /dev/null
@@ -1,77 +0,0 @@
-use std::path::{Path, PathBuf};
-use std::process::Command;
-
-fn git_output(repo: &Path, args: &[&str]) -> Option<String> {
-    let output = Command::new("git")
-        .arg("-C")
-        .arg(repo)
-        .args(args)
-        .output()
-        .ok()?;
-    if !output.status.success() {
-        return None;
-    }
-    String::from_utf8(output.stdout)
-        .ok()
-        .map(|value| value.trim().to_owned())
-}
-
-fn git_path(repo: &Path, name: &str) -> Option<PathBuf> {
-    let path = PathBuf::from(git_output(repo, &["rev-parse", "--git-path", name])?);
-    let path = if path.is_absolute() {
-        path
-    } else {
-        repo.join(path)
-    };
-    Some(path.canonicalize().unwrap_or(path))
-}
-
-fn main() -> Result<(), Box<dyn std::error::Error>> {
-    let manifest_dir = PathBuf::from(std::env::var("CARGO_MANIFEST_DIR")?);
-    let repo = manifest_dir.parent().unwrap_or(&manifest_dir);
-    let lock_path = repo.join("Cargo.lock");
-    println!("cargo:rerun-if-changed={}", lock_path.display());
-    let lock: toml::Value = std::fs::read_to_string(&lock_path)?.parse()?;
-    let planner_source = lock
-        .get("package")
-        .and_then(toml::Value::as_array)
-        .into_iter()
-        .flatten()
-        .find(|package| package.get("name").and_then(toml::Value::as_str) == Some("asap-types"))
-        .and_then(|package| package.get("source"))
-        .and_then(toml::Value::as_str)
-        .ok_or("Cargo.lock has no resolved ASAPPlanner types source")?;
-    let planner_revision = planner_source
-        .rsplit_once('#')
-        .filter(|(_, revision)| {
-            revision.len() == 40 && revision.bytes().all(|b| b.is_ascii_hexdigit())
-        })
-        .map(|(_, revision)| revision)
-        .ok_or("ASAPPlanner source must resolve to a Git commit")?;
-    println!("cargo:rustc-env=ASAPPLANNER_REVISION={planner_revision}");
-    let revision = std::env::var("ASAPQUERY_BACKEND_REVISION")
-        .ok()
-        .or_else(|| git_output(repo, &["rev-parse", "HEAD"]))
-        .unwrap_or_else(|| "unknown".to_owned());
-    println!("cargo:rustc-env=ASAPQUERY_BACKEND_REVISION={revision}");
-    println!("cargo:rerun-if-env-changed=ASAPQUERY_BACKEND_REVISION");
-    if let Some(head) = git_path(repo, "HEAD") {
-        println!("cargo:rerun-if-changed={}", head.display());
-    }
-    if let Some(symbolic_ref) = git_output(repo, &["symbolic-ref", "-q", "HEAD"]) {
-        if let Some(reference) = git_path(repo, &symbolic_ref) {
-            println!("cargo:rerun-if-changed={}", reference.display());
-        }
-    }
-    prost_build::compile_protos(&["proto/opamp.proto"], &["proto/"])?;
-    // asap.runtime.v1.RuntimeSamples service — receives
-    // PushExporter batches from agents. Must stay in lockstep
-    // with `sketch-bench/sketch-runtime/proto/feedback.proto`.
-    tonic_build::configure()
-        .build_server(true)
-        // Keep the generated client available for black-box process E2E tests
-        // and for downstream agents that share this crate's wire contract.
-        .build_client(true)
-        .compile_protos(&["proto/feedback.proto"], &["proto/"])?;
-    Ok(())
-}
diff --git a/control_plane/docs/candidate-physical-explain.md b/control_plane/docs/candidate-physical-explain.md
deleted file mode 100644
index f6c0dddfe..000000000
--- a/control_plane/docs/candidate-physical-explain.md
+++ /dev/null
@@ -1,29 +0,0 @@
-# Candidate and physical alternative diagnostics
-
-The compiler preserves diagnostic associations from the original Planner search through physical quote comparison. These fields explain the existing decision; they do not alter candidate ranking, introduce a resource model, or enable provider-driven re-selection.
-
-`logical_selection` contains the original ranked groups, legal candidates, accuracy rejections, and selected roots. Group ordinals and `query_index` are local to that invocation. `target_id`, `candidate_id`, and `logical_root_id` use versioned semantic digests instead. Post-ASAP digests reuse Planner's canonical executable exporter, including operator payloads, schemas, guarantees, edge roles and execution states. They exclude assigned executable node IDs and incidental `Rc` sharing. The Planner revision is part of the digest domain.
-
-The trace's `roots` describe Planner selection. `committed_roots` and `deployment_overrides` describe any subsequent ERP exact fallback. Physical alternatives reference their own `logical_root_ids`; the added native alternative therefore does not masquerade as a selected summary candidate. Canonical values must round-trip without loss, so non-finite floats cannot alias through JSON null. No identity is fabricated when lossless canonical export is unavailable: the corresponding identity is null, and physical explanations include `identity_unavailable_reason`.
-
-`AlternativeCost` retains an `alternative_id`, concrete `physical_alternative_id` once binding succeeds, and status:
-
-* `bound`: manifest preparation succeeded; no quote decision yet.
-* `selected` / `unselected`: a complete valid quote was considered by the existing selector.
-* `bind_failed`: compilation or manifest construction failed; `unavailable_reason` is retained even without a plan ID.
-* `evidence_missing` / `evidence_invalid`: no unambiguous matching quote, or malformed/incomplete component evidence.
-* `rejected`: the provider reports that the implementation is unavailable.
-
-Physical identity combines the logical/mask alternative with existing materialization IDs, selected window implementation IDs and ingest mode. Activation time, plan version and quoted numeric prices are not semantic identities. Quotes still match the complete existing manifest, including its generation constraints; diagnostic IDs never replace quote validation or catalog identity.
-
-The read-only `/api/v1/physical-plan/cost-manifests` and MetricsQL equivalent retain their default manifest-array response. Add `"explain": true` to the existing request to receive `{ "manifests": [...], "alternatives": [...], "logical_selection": [...] }`. Failed alternatives remain alongside usable manifests. When none can bind or be completely priced, the error retains an `all_infeasible` report and every accumulated alternative rather than only a generic message.
-
-Snapshot compilation exposes the same logical trace on `CompiledPhysicalPlan`; `compile_workload_artifact` serializes it as `planner_selection_trace`. Compile-and-publish returns the trace without adding it to executable wire DTOs. SQL's existing selection trace gains the same semantic candidate/root identities.
-
-These are bounded explanations: they cover the actual Planner search and the existing physical materialization/exact inventory, not every possible placement or resource-constrained cluster assignment. Missing numeric measurements remain missing. The next provider integration must occur before logical commitment and reuse Planner's provider/resource contracts.
-
-## Realization providers
-
-The internal `RealizationProvider` boundary reuses the existing window implementation, physical plan, manifest and quote contracts. The current provider delegates to the established compiler and ThreeStage allocator/emitter. It preserves supplied implementation IDs and validates their evidence; it does not create algorithms from display names, change selected families, or infer panes from slides.
-
-Complete alternatives continue to report `AlternativeCost` identities, capability-bound quote availability, costs and rejection reasons. Missing or stale evidence is unavailable, not a zero-cost alternative. `try_split_typed` retains allocation and emission errors; the legacy ThreeStage compatibility wrapper logs the concrete error before its existing fallback. SingleStage/ZeroStage allocator support and continuous/sliding derived maintenance remain gated. Backend-local compilation remains available through its existing independent compiler path.
diff --git a/control_plane/docs/design-erp-deployment.md b/control_plane/docs/design-erp-deployment.md
deleted file mode 100644
index 89543a5cb..000000000
--- a/control_plane/docs/design-erp-deployment.md
+++ /dev/null
@@ -1,91 +0,0 @@
-# ERP deployment integration
-
-The compile-and-publish request and backend-local planning snapshot may carry
-an optional `erp` object. It contains the versioned sketch-bench artifact, the
-deployment's current distribution descriptor, workload operation counts,
-resource weights, error metric, minimum trial count, accuracy mode, and runtime
-capabilities.
-
-Planning is query-workload-aware: ASAPPlanner still owns legal families and the
-materialization DAG, while the backend adapter translates the selected ERP
-parameter JSON into its typed runtime `SketchParams`.
-
-Hybrid mode has three observable outcomes:
-
-1. exact distribution and implementation match, sufficient trials, acceptable
-   measured error, and supported parameters: use the least-cost ERP point;
-2. ERP miss, invalid artifact, unparseable parameters, or distribution drift:
-   use ASAPPlanner's theoretical parameters when runtime capabilities accept
-   them; and
-3. neither empirical nor theoretical state is deployable: preserve the
-   pre-ASAP subtree for exact execution.
-
-Empirical mode does not silently claim a theoretical fallback: an ERP miss
-goes directly to exact execution. Selection and fallback reasons are emitted as
-structured tracing events. ERP observations remain empirical and must not be
-rendered as formal `(epsilon, delta)` guarantees.
-
-Without an observation, ERP matches the complete distribution JSON by equality.
-With an observation, Planner first checks a matching empirical fingerprint and
-then evaluates all admissible fitted families against benchmark shapes. Custom
-datasets can use bounded shape matching when their exact fingerprint is absent.
-A caller supplies a fresh observation with every new plan generation.
-
-## Validation and current scope
-
-This section is for developers validating the deployment contract. Workload
-selection must use the empirical accuracy model as well as the ERP cost model;
-otherwise the default theoretical bound rejects the smaller measured state.
-The deployment currently admits empirical accuracy only for epsilon-only KLL
-rank queries using `kll-percall` / `lib` and `max_rank_err`. Other metrics,
-implementations, and explicit `(epsilon, delta)` requests take the mode's
-theoretical/exact fallback. Empirical provenance carries an unknown failure
-probability, never an invented confidence guarantee.
-
-The checked-in [measured fixture](../tests/fixtures/erp-kll-measured.json)
-comes from sketch-bench revision `dedc2d4`: KLL k=32, 1,000 uniform samples,
-seed 42, and measured maximum rank error 0.051. Its ten resource trials are
-**not** ten independent accuracy trials (`accuracy_runs` is one). Resource
-timings are machine-specific. This is a reproducible integration fixture,
-not evidence of a distribution-independent error bound.
-
-Shape-aware mode consumes Planner's shared `ErpShapeObservation`, with multiple
-family/parameter fits, goodness-of-fit, fit-quality confidence, cardinality and
-observed events. Benchmark rows retain `ErpDataShape`. The bounded keyed observer
-fits uniform and Zipf rank masses without collapsing them into one family.
-Numeric-value distribution fitting is a separate observation problem: unique
-numeric values alone do not reveal a normal or uniform value distribution.
-Callers may supply other families through the same shared contract. Unsupported,
-ambiguous and out-of-distribution observations use the configured fallback.
-
-Run from the backend repository:
-
-```sh
-cargo test -p control_plane measured_erp_kll_parameters_survive_workload_selection
-cargo test -p data_plane --test asapquery_compatibility_process_e2e erp_measured_kll_collector_to_query_oracle
-cargo test -p data_plane --test all_sketches_process_oracle_e2e --test e2e_controller_plans_and_backend_serves --test asapquery_compatibility_process_e2e
-```
-
-The first regression checks k=32 survives workload selection and physical
-compilation; descriptor drift, implementation mismatch, and explicit delta
-requirements select theoretical sizing with a distinct materialization
-identity; an unsupported runtime preserves the exact subtree.
-
-The process test installs a real physical plan, runs the Collector's KLL
-precompute runtime over a separate deterministic 1,000-value input, sends its
-compacted portable state through OTLP to the backend binary, and checks a warm
-PromQL result against an exact rank oracle (error <= 0.06). It has no exact
-fallback server. It covers the supported distributed-collector path, not an
-ERP-enabled raw-ingest deployment or an online drift detector. The older
-transport fixtures install explicit QueryPlan/SummaryCatalog bindings and
-exercise actual frame validation; they do not substitute for planner E2E.
-
-To regenerate the benchmark fixture with the matching sketch-bench revision,
-use a new report path for each run (benchmark reports append):
-
-```sh
-approxbench sketchbench --variant kll-percall --library lib --config 'k=32' --dataset uniform --size 1000 --cardinality 1 --dtype f64 --runs 10 --warmup-runs 1 --operations insert,query,merge --metrics throughput,cpu,memory --report erp.raw.jsonl
-approxbench sketchbench --variant kll-percall --library lib --config 'k=32' --dataset uniform --size 1000 --cardinality 1 --dtype f64 --runs 10 --warmup-runs 1 --operations query --metrics accuracy --report erp.raw.jsonl
-approxbench flatten erp.raw.jsonl --output erp.flat.jsonl
-approxbench erp erp.flat.jsonl --producer-version dedc2d4 --output erp.json
-```
diff --git a/control_plane/docs/offline-sketch-evidence.md b/control_plane/docs/offline-sketch-evidence.md
deleted file mode 100644
index a67df43b5..000000000
--- a/control_plane/docs/offline-sketch-evidence.md
+++ /dev/null
@@ -1,86 +0,0 @@
-# Offline sketch evidence replay
-
-Audience: developers evaluating planner integration without a deployed data plane.
-
-`ControlPlaneCostModel::with_offline_evidence` accepts the planner's validated
-offline provider. Candidate ordering compares update CPU nanoseconds only when
-every candidate has compatible evidence for the exact parameters returned by
-this deployment's sizing policy. Missing, stale, incompatible, or ambiguous
-measurements preserve the existing order. Offline errors never change formal
-accuracy guarantees. Existing physical and lifecycle costs retain their units;
-CPU nanoseconds are not added to legacy dimensionless costs.
-
-For explicit integer-key point-frequency queries,
-`with_offline_frequency_comparison(evidence, request)` additionally compares
-query-matched sketch measurements against an exact snapshot baseline. The
-request supplies the observed mean-error budget, number of reads, retained
-state count, horizon and CPU/memory weights. This is a fixed-snapshot offline
-comparison: the caller asserts the recorded integer-key distribution and probe
-population apply. The mean-error threshold applies to that recorded population,
-not to each queried key or future live data.
-
-The backend restricts candidates to measured power-of-two CMS layouts before
-comparison and supplies its own formal minimum parameters from the tighter
-workload and query accuracy. Observed error may select a larger measured sketch,
-but never weakens formal sizing. Missing evidence, an unacceptable error budget,
-or an exact winner yields `PassThrough`, preserving exact execution. Unfiltered
-legacy frequency totals and `count_over_time` never receive point-frequency
-error acceptance. `offline_frequency_recommendation(payload)` exposes the same
-decision and rejection reasons used by the binder.
-
-The typed frequency example reads real comparison artifacts without starting a
-data plane, using the planner revision pinned in this backend:
-
-```bash
-cargo run -p control_plane --example offline_frequency_plan -- \
-  comparison-evidence.json comparison-request.json 7 0.01
-```
-
-It binds a named integer-key source and reports the chosen parameters, exact
-alternative, cost estimates and preserved point readout. It does not certify
-that an existing Prometheus metric or deployed materialization uses that source.
-
-Run the PromQL replay using the pinned planner dependency:
-
-```bash
-cargo run -p control_plane --example offline_planner_replay -- \
-  o11y_bench_promql.txt planner-evidence.json context.json > control-plane-o11y.json
-```
-
-For development against unpublished planner changes, the optional local-checkout
-wrapper supplies source patches and records the checkout revisions:
-
-```bash
-python3 tools/run-offline-planner-replay.py \
-  --planner /path/to/ASAPPlanner \
-  --queries /path/to/ASAPPlanner/crates/frontend-promql/tests/observability/data/o11y_bench_promql.txt \
-  --evidence /path/to/planner-evidence.json \
-  --context /path/to/context.json \
-  --output /tmp/control-plane-o11y.json
-```
-
-The wrapper supplies local Cargo source patches for all three planner crates,
-preserving a single set of IR types. It also changes Cargo.lock; normal use of
-the pinned dependency requires no source patches. The normal backend sibling
-dependencies (ASAPCollector and asap_sketchlib)
-must remain available at the paths in its workspace manifests.
-
-The replay calls the real control-plane parser and typed summary binder for
-exact, default, and empirical modes. It records per-query rejection/fallback,
-selected summary states, matching update/state evidence, provenance, and elapsed
-planning time. The selected offline context is an explicit simulation assumption;
-it is not an assertion that an o11y metric has that measured distribution.
-Source scans beneath summaries count as raw subtrees, so they are not themselves
-evidence that the whole query fell back. Root fallback is a separate field.
-Bare selectors, sort roots and comparison/filter roots retain the complete
-original query as `KeepPreAsap`. They bind successfully while preserving label
-predicates, ordering and filtering. Executable query compilation marks these
-roots `ExactFallback` and requests no summary materializations; successful
-binding therefore does not mean they are served by the warm tier.
-
-This is binding coverage, not successful deployment compilation or execution.
-No collectors or query servers start. Point-frequency benchmark errors are
-exported as observations with `error_applies_to_current_query: false`.
-Whole-plan resource savings remain null without matched raw/residual physical
-operator evidence. Unsupported summary binary operators lower to explicit warm
-tier fallback; they are not silently executed with different semantics.
diff --git a/control_plane/examples/audit_clickhouse_corpus.rs b/control_plane/examples/audit_clickhouse_corpus.rs
deleted file mode 100644
index d7488a927..000000000
--- a/control_plane/examples/audit_clickhouse_corpus.rs
+++ /dev/null
@@ -1,174 +0,0 @@
-#[path = "support/automatic_clickhouse_corpus.rs"]
-mod automatic;
-use asap_frontend_sql::SqlCatalog;
-use asap_types::{AggregationType, KeyByLabelNames, PrecomputeMaterialization, WindowKind};
-use control_plane::clickhouse::{ClickHouseSqlWorkload, ClickHouseSqlWorkloadEntry};
-use control_plane::physical::compiler::{
-    PlanEnvelope, PrecomputePlan, BACKEND_COMPAT, PLANNER_REVISION,
-};
-use planner_types::pre_asap::{Column, DataType, Schema};
-use planner_types::types::AccuracyTarget;
-use serde::Deserialize;
-use serde_json::json;
-use std::{fs, path::PathBuf};
-
-#[derive(Deserialize)]
-struct Corpus {
-    queries: Vec<Row>,
-}
-
-#[derive(Deserialize)]
-struct Row {
-    id: String,
-    clickhouse_sql: Option<String>,
-    operators: Vec<String>,
-}
-
-fn publication_inputs(schema: &Schema, sql: String) -> ClickHouseSqlWorkload {
-    let mut materialization = PrecomputeMaterialization::new(
-        AggregationType::Max,
-        String::new(),
-        std::collections::HashMap::from([("variant".into(), json!(2))]),
-        KeyByLabelNames::new(vec!["labels".into()]),
-        KeyByLabelNames::empty(),
-        KeyByLabelNames::empty(),
-        String::new(),
-        60,
-        60,
-        WindowKind::Tumbling,
-        String::new(),
-        "raw_samples.value".into(),
-        None,
-        Some("raw_samples".into()),
-        Some("value".into()),
-    );
-    materialization.pane_origin_ms = Some(0);
-    let envelope = PlanEnvelope {
-        plan_id: 27,
-        plan_version: 1,
-        generated_at_unix_ms: 1_788_891_296_000,
-        activation_unix_ms: 1_788_891_296_000,
-        expiry_unix_ms: None,
-        backend_compat: BACKEND_COMPAT.into(),
-        planner_revision: PLANNER_REVISION.into(),
-        capability_snapshot_id: "sql27-main-eval".into(),
-    };
-    let mut precompute_plan =
-        PrecomputePlan::build_backend_local(envelope.clone(), vec![materialization.clone()])
-            .unwrap();
-    let mut transmission_plan = control_plane::physical::compiler::build_transmission_plan(
-        envelope,
-        &precompute_plan,
-        &Default::default(),
-    )
-    .unwrap();
-    let sds = asap_types::summary_catalog::SummaryCatalog::from_materializations(
-        27,
-        1,
-        &[materialization],
-    )
-    .unwrap();
-    let reference = sds.reference().unwrap();
-    precompute_plan.bind_catalog(&sds).unwrap();
-    transmission_plan.summary_catalog = Some(reference);
-    ClickHouseSqlWorkload {
-        summary_catalog: sds,
-        precompute_plan,
-        transmission_plan,
-        tables: std::collections::HashMap::from([("raw_samples".into(), schema.clone())]),
-        accuracy: AccuracyTarget::Epsilon(0.01),
-        queries: vec![ClickHouseSqlWorkloadEntry {
-            sql,
-            start_ms: 1_788_848_096_000,
-            end_ms: 1_788_891_296_000,
-            cumulative: false,
-        }],
-    }
-}
-
-#[tokio::main]
-async fn main() {
-    if std::env::args().nth(1).as_deref() == Some("--automatic") {
-        automatic::run().await;
-        return;
-    }
-    let path = std::env::args_os()
-        .nth(1)
-        .map(PathBuf::from)
-        .expect("usage: audit_clickhouse_corpus CORPUS.json");
-    let corpus: Corpus = serde_json::from_slice(&fs::read(path).unwrap()).unwrap();
-    let schema = Schema::with_time_index(
-        vec![
-            Column::new("metric", DataType::Utf8, false),
-            Column::new("labels", DataType::Utf8, false),
-            Column::new("ts_ms", DataType::Timestamp, false),
-            Column::new("value", DataType::Float64, false),
-        ],
-        2,
-        vec![],
-    );
-    let catalog = SqlCatalog::new().with_table("raw_samples", schema.clone());
-    let accuracy = AccuracyTarget::Epsilon(0.01);
-    let mut rows = Vec::new();
-    for row in corpus.queries {
-        let Some(sql) = row.clickhouse_sql else {
-            rows.push(json!({
-                "id": row.id,
-                "operators": row.operators,
-                "parser_planner": "failure",
-                "reason": "missing ClickHouse SQL mapping"
-            }));
-            continue;
-        };
-        let sql = sql.replace("{eval_ms}", "1788891296000");
-        match control_plane::clickhouse::plan_clickhouse_sql(&sql, &catalog, accuracy.clone()).await
-        {
-            Ok(planned) => {
-                let publication = control_plane::clickhouse::compile_clickhouse_workload(
-                    &publication_inputs(&schema, sql.clone()),
-                )
-                .await;
-                match publication {
-                    Ok(publication) => rows.push(json!({
-                        "id": row.id,
-                        "operators": row.operators,
-                        "parser_planner": "pass",
-                        "publication": "pass",
-                        "classification": "publication_ready",
-                        "query_plan_nodes": publication.query_plan.entries.values().next().map(|entry| &entry.nodes),
-                        "canonical_sql": planned.canonical_sql,
-                        "physical": format!("{:?}", planned.physical),
-                        "sql": sql,
-                    })),
-                    Err(error) => rows.push(json!({
-                        "id": row.id,
-                        "operators": row.operators,
-                        "parser_planner": "pass",
-                        "publication": "failure",
-                        "classification": "failure",
-                        "reason": error.to_string(),
-                        "canonical_sql": planned.canonical_sql,
-                        "physical": format!("{:?}", planned.physical),
-                        "sql": sql,
-                    })),
-                }
-            }
-            Err(error) => rows.push(json!({
-                "id": row.id,
-                "operators": row.operators,
-                "parser_planner": "failure",
-                "reason": error.to_string(),
-                "sql": sql,
-            })),
-        }
-    }
-    println!(
-        "{}",
-        serde_json::to_string_pretty(&json!({
-            "baseline": env!("CARGO_PKG_VERSION"),
-            "query_count": rows.len(),
-            "queries": rows,
-        }))
-        .unwrap()
-    );
-}
diff --git a/control_plane/examples/calibration_candidates.rs b/control_plane/examples/calibration_candidates.rs
deleted file mode 100644
index 928dc1475..000000000
--- a/control_plane/examples/calibration_candidates.rs
+++ /dev/null
@@ -1,183 +0,0 @@
-//! Export every bindable candidate for isolated measurement, without selecting a winner.
-use control_plane::physical::{
-    compiler::{BackendLocalPlanningInput, DeploymentPlanCompiler},
-    workload_cost,
-};
-use planner_types::post_asap::{SummaryExpr, SummaryNode};
-use serde_json::{json, Value};
-use std::{collections::BTreeMap, rc::Rc};
-
-// Planner IR does not implement Serialize. Preserve actual DAG identity and
-// typed variant/edges; leaf metadata uses explicitly labelled Debug encoding.
-fn planner_forest(queries: &[control_plane::physical::compiler::QueryCompilationInput]) -> Value {
-    fn visit(
-        node: &Rc<SummaryNode>,
-        seen: &mut BTreeMap<usize, usize>,
-        nodes: &mut BTreeMap<usize, Value>,
-    ) -> usize {
-        let pointer = Rc::as_ptr(node) as usize;
-        if let Some(id) = seen.get(&pointer) {
-            return *id;
-        }
-        let id = seen.len();
-        seen.insert(pointer, id);
-        let (kind, children, detail): (&str, Vec<&Rc<SummaryNode>>, Value) = match &node.expr {
-            SummaryExpr::KeepPreAsap(expr) => (
-                "KeepPreAsap",
-                vec![],
-                json!({"query_expr_debug":format!("{expr:#?}")}),
-            ),
-            SummaryExpr::BinaryOp {
-                lhs,
-                rhs,
-                operator,
-                timing,
-            } => (
-                "BinaryOp",
-                vec![lhs, rhs],
-                json!({"operator_debug":format!("{operator:?}"),"timing_debug":format!("{timing:?}")}),
-            ),
-
-            SummaryExpr::ValueOperation {
-                child,
-                operation,
-                timing,
-            } => (
-                "ValueOperation",
-                vec![child],
-                json!({"operation_debug":format!("{operation:?}"),"timing_debug":format!("{timing:?}")}),
-            ),
-            SummaryExpr::SummaryAgg {
-                child,
-                family,
-                reduction,
-                grouping,
-                input,
-                ..
-            } => (
-                "SummaryAgg",
-                vec![child],
-                json!({"family_debug":format!("{family:?}"),"reduction_debug":format!("{reduction:?}"),"grouping_debug":format!("{grouping:?}"),"input_debug":format!("{input:?}")}),
-            ),
-            SummaryExpr::SummaryJoin {
-                outer,
-                inner,
-                key,
-                family,
-            } => (
-                "SummaryJoin",
-                vec![outer, inner],
-                json!({"key_debug":format!("{key:?}"),"family_debug":format!("{family:?}")}),
-            ),
-            SummaryExpr::RelationalJoin {
-                left,
-                right,
-                kind,
-                pred,
-                ..
-            } => (
-                "RelationalJoin",
-                vec![left, right],
-                json!({"kind_debug":format!("{kind:?}"),"predicate_debug":format!("{pred:?}")}),
-            ),
-            SummaryExpr::SummarySubtract { left, right } => {
-                ("SummarySubtract", vec![left, right], json!({}))
-            }
-            SummaryExpr::SummaryDelete { summary_input, key } => (
-                "SummaryDelete",
-                vec![summary_input],
-                json!({"key_debug":format!("{key:?}")}),
-            ),
-            SummaryExpr::SummaryEstimate {
-                summary_input,
-                query,
-            } => (
-                "SummaryEstimate",
-                vec![summary_input],
-                json!({"query_debug":format!("{query:?}")}),
-            ),
-            SummaryExpr::SummaryMerge { children, .. } => {
-                ("SummaryMerge", children.iter().collect(), json!({}))
-            }
-        };
-        let inputs: Vec<_> = children
-            .into_iter()
-            .map(|child| visit(child, seen, nodes))
-            .collect();
-        nodes.insert(id,json!({"kind":kind,"inputs":inputs,"detail":detail,"schema_debug":format!("{:?}",node.schema),"guarantee_debug":format!("{:?}",node.guarantee)}));
-        id
-    }
-    let mut seen = BTreeMap::new();
-    let mut nodes = BTreeMap::new();
-    let roots:Vec<_>=queries.iter().map(|q|json!({"query_id":q.query_id,"original_promql":q.query_string,"root":visit(&q.selected_plan_root,&mut seen,&mut nodes)})).collect();
-    json!({"encoding":"structured_graph_with_debug_metadata_v1","scope":"actual candidate Planner post-ASAP input before physical binding; not reconstructed from installed nodes","roots":roots,"nodes":nodes})
-}
-
-fn main() -> Result<(), Box<dyn std::error::Error>> {
-    let path = std::env::args()
-        .nth(1)
-        .ok_or("usage: calibration_candidates SNAPSHOT.json [--metricsql]")?;
-    let metricsql = std::env::args().skip(2).any(|arg| arg == "--metricsql");
-    let snapshot: BackendLocalPlanningInput = serde_json::from_slice(&std::fs::read(path)?)?;
-    let (request, environment) = snapshot.into_physical_compilation_request()?;
-    let mut results = Vec::new();
-    for (index, candidate) in workload_cost::enumerate_exact_and_materialized_candidates(request)?
-        .into_iter()
-        .enumerate()
-    {
-        let queries = candidate.queries.clone();
-        let enabled_materialization_keys = candidate.enabled_materialization_keys.clone();
-        let planner_selected_queries = planner_forest(&queries);
-        let compiled = if metricsql {
-            DeploymentPlanCompiler.compile_metricsql(candidate, environment.clone())
-        } else {
-            DeploymentPlanCompiler.compile_promql(candidate, environment.clone())
-        };
-        let plan = match compiled {
-            Ok(plan) => plan,
-            Err(error) => {
-                results.push(
-                    json!({"candidate_index": index, "materialization_policy": enabled_materialization_keys, "planner_selected_queries": planner_selected_queries, "unavailable_reason": error.to_string()}),
-                );
-                continue;
-            }
-        };
-        let manifest = match workload_cost::manifest(&plan, &queries) {
-            Ok(manifest) => manifest,
-            Err(error) => {
-                results.push(
-                    json!({"candidate_index": index, "materialization_policy": enabled_materialization_keys, "planner_selected_queries": planner_selected_queries, "unavailable_reason": error.to_string()}),
-                );
-                continue;
-            }
-        };
-        results.push(json!({
-            "candidate_index": index,
-            "materialization_policy": enabled_materialization_keys,
-            "planner_selected_queries": planner_selected_queries,
-            "manifest": manifest,
-            "lifecycle_estimates": plan.lifecycle_estimates,
-            "install_request": {
-                "summary_catalog": plan.summary_catalog,
-                "collector_plans": plan.collector_plans,
-                "precompute_plan": plan.precompute_plan,
-                "transmission_plan": plan.transmission_plan,
-                "query_plan": plan.query_plan,
-                "storage_routing": null,
-                "adaptation_evidence": []
-            }
-        }));
-    }
-    println!(
-        "{}",
-        serde_json::to_string_pretty(&json!({
-            "purpose":"calibration_only",
-            "compiler_identity": {
-                "backend_revision": control_plane::physical::compiler::BACKEND_REVISION,
-                "planner_revision": control_plane::physical::compiler::PLANNER_REVISION
-            },
-            "candidates":results
-        }))?
-    );
-    Ok(())
-}
diff --git a/control_plane/examples/compile_clickhouse_workload.rs b/control_plane/examples/compile_clickhouse_workload.rs
deleted file mode 100644
index dccc30157..000000000
--- a/control_plane/examples/compile_clickhouse_workload.rs
+++ /dev/null
@@ -1,22 +0,0 @@
-//! Compile a SQL workload through the real Planner without preset materializations.
-use std::io::Read;
-
-#[tokio::main]
-async fn main() -> Result<(), Box<dyn std::error::Error>> {
-    let mut input = String::new();
-    std::io::stdin().read_to_string(&mut input)?;
-    let workload: control_plane::clickhouse::ClickHouseSqlAutomaticWorkload =
-        serde_json::from_str(&input)?;
-    let (publication, selection_trace) =
-        control_plane::clickhouse::compile_automatic_clickhouse_workload(&workload).await?;
-    let install = publication.install_request(None, Vec::new())?;
-    serde_json::to_writer_pretty(
-        std::io::stdout(),
-        &serde_json::json!({
-            "publication": publication,
-            "selection_trace": selection_trace,
-            "install": install,
-        }),
-    )?;
-    Ok(())
-}
diff --git a/control_plane/examples/compile_workload_artifact.rs b/control_plane/examples/compile_workload_artifact.rs
deleted file mode 100644
index 0513ea1ed..000000000
--- a/control_plane/examples/compile_workload_artifact.rs
+++ /dev/null
@@ -1,31 +0,0 @@
-//! Control-plane entry point: cost-select a workload and emit its atomic install request.
-use control_plane::physical::compiler::BackendLocalPlanningInput;
-
-fn main() -> Result<(), Box<dyn std::error::Error>> {
-    let mut args = std::env::args().skip(1);
-    let path = args
-        .next()
-        .ok_or("usage: compile_workload_artifact SNAPSHOT.json [--metricsql] [--dot OUTPUT.dot]")?;
-    let mut metricsql = false;
-    let mut dot_path = None;
-    while let Some(argument) = args.next() {
-        match argument.as_str() {
-            "--metricsql" => metricsql = true,
-            "--dot" => {
-                dot_path = Some(args.next().ok_or("--dot requires an output path")?);
-            }
-            _ => return Err(format!("unexpected argument `{argument}`").into()),
-        }
-    }
-    let snapshot: BackendLocalPlanningInput = serde_json::from_slice(&std::fs::read(path)?)?;
-    let plan = if metricsql {
-        snapshot.compile_metricsql()?
-    } else {
-        snapshot.compile_promql()?
-    };
-    if let Some(path) = dot_path {
-        std::fs::write(path, control_plane::physical::plan_dot::render(&plan))?;
-    }
-    println!("{}", serde_json::to_string_pretty(&plan)?);
-    Ok(())
-}
diff --git a/control_plane/examples/offline_frequency_plan.rs b/control_plane/examples/offline_frequency_plan.rs
deleted file mode 100644
index 218571bff..000000000
--- a/control_plane/examples/offline_frequency_plan.rs
+++ /dev/null
@@ -1,81 +0,0 @@
-//! Bind a typed fixed-snapshot point-frequency query using offline evidence.
-use std::rc::Rc;
-
-use anyhow::{bail, Result};
-use asap_aware_mapping::empirical_comparison::{
-    OfflineComparisonEvidence, OfflineComparisonRequest,
-};
-use control_plane::{
-    physical::post_asap::{bind_query_expr_with_cost_model, cost_model::ControlPlaneCostModel},
-    planner_selection::frequency,
-    types::AccuracyTarget,
-};
-use planner_types::pre_asap::{AggIntent, Column, DataType, QueryExpr, Reduction, Schema, Source};
-use serde_json::json;
-
-fn main() -> Result<()> {
-    let args: Vec<_> = std::env::args().skip(1).collect();
-    if args.len() != 4 {
-        bail!("usage: offline_frequency_plan COMPARISON.json REQUEST.json INTEGER_KEY EPSILON");
-    }
-    let evidence: OfflineComparisonEvidence =
-        serde_json::from_str(&std::fs::read_to_string(&args[0])?)?;
-    let request: OfflineComparisonRequest =
-        serde_json::from_str(&std::fs::read_to_string(&args[1])?)?;
-    let item: i64 = args[2].parse()?;
-    let epsilon: f64 = args[3].parse()?;
-    if !epsilon.is_finite() || epsilon <= 0.0 || epsilon >= 1.0 {
-        bail!("epsilon must be finite and strictly between zero and one");
-    }
-    let accuracy = AccuracyTarget::Epsilon(epsilon);
-    let model = ControlPlaneCostModel::new(accuracy.clone())
-        .with_offline_frequency_comparison(evidence, request.clone());
-    let intent = frequency(accuracy, Some(("key".into(), item.to_string())));
-    let AggIntent::Extension { payload, .. } = &intent else {
-        unreachable!()
-    };
-    let recommendation = model.offline_frequency_recommendation(payload);
-    let query = QueryExpr::Aggregate {
-        reduction: Reduction::PerEntity,
-        measures: vec![intent],
-        output_names: vec![],
-        having: None,
-        child: Rc::new(QueryExpr::Scan {
-            source: Source::TimeSeries {
-                metric: "offline_integer_snapshot".into(),
-            },
-            predicates: vec![],
-            schema: Schema::with_time_index(
-                vec![
-                    Column::new("ts", DataType::Timestamp, false),
-                    Column::new("key", DataType::Int64, false),
-                    Column::new("value", DataType::Float64, false),
-                ],
-                0,
-                vec![],
-            ),
-        }),
-    };
-    let bound = bind_query_expr_with_cost_model(&query, &model)?;
-    let root_raw_fallback = matches!(&bound,
-        control_plane::physical::post_asap::PhysicalExpr::Committed(
-            control_plane::physical::post_asap::PostAsapPlan::Summary(node)
-        ) if matches!(node.expr, planner_types::post_asap::SummaryExpr::KeepPreAsap(_)));
-    let (recommendation, unavailable_reason) = match recommendation {
-        Ok(value) => (Some(value), None),
-        Err(reason) => (None, Some(reason)),
-    };
-    serde_json::to_writer_pretty(
-        std::io::stdout(),
-        &json!({
-            "scope":"typed offline point-frequency recommendation and control-plane binding",
-            "request":request, "item":item, "formal_epsilon":epsilon,
-            "recommendation":recommendation,"unavailable_reason":unavailable_reason,
-        "bound_plan":format!("{bound:#?}"), "root_raw_fallback":root_raw_fallback,
-            "limitations":["The caller asserts the fixed-snapshot integer-key benchmark context",
-                "Observed mean error applies to the recorded offline probe population, not an individual key guarantee",
-                "No materializations deployed or data-plane execution performed"]
-        }),
-    )?;
-    Ok(())
-}
diff --git a/control_plane/examples/offline_planner_replay.rs b/control_plane/examples/offline_planner_replay.rs
deleted file mode 100644
index 78b6e1dd0..000000000
--- a/control_plane/examples/offline_planner_replay.rs
+++ /dev/null
@@ -1,160 +0,0 @@
-//! Offline control-plane binding, without starting collectors or query servers.
-use std::{collections::HashSet, rc::Rc, time::Instant};
-
-use anyhow::{bail, Context, Result};
-use asap_aware_mapping::empirical_cost::{
-    EmpiricalEvidenceProvider, EvidenceArtifact, EvidenceContext,
-};
-use control_plane::{
-    physical::post_asap::{
-        bind_query_expr_with_cost_model, cost_model::ControlPlaneCostModel, PhysicalExpr,
-        PostAsapPlan,
-    },
-    query_parser::parse_query_expr_canonical,
-    types::AccuracyTarget,
-};
-use planner_types::post_asap::{SummaryExpr, SummaryFamilyType, SummaryNode};
-use serde_json::{json, Value};
-
-fn inspect(
-    node: &Rc<SummaryNode>,
-    model: &ControlPlaneCostModel,
-    seen: &mut HashSet<usize>,
-    states: &mut Vec<Value>,
-    raw: &mut usize,
-) {
-    if !seen.insert(Rc::as_ptr(node) as usize) {
-        return;
-    }
-    match &node.expr {
-        SummaryExpr::KeepPreAsap(_) => *raw += 1,
-        SummaryExpr::SummaryAgg { family, child, .. } => {
-            if let SummaryFamilyType::Sketch(kind, _) = family {
-                let lookup = model
-                    .offline_evidence()
-                    .map(|provider| provider.lookup(kind.algorithm(), kind.params()));
-                let (measurement, reason) = match lookup {
-                    Some(Ok(row)) => (
-                        Some(json!({
-                            "record_id": row.id,
-                            "provenance": row.provenance,
-                            "update_cpu_ns": row.metrics.resources.cpu.update_cpu_ns,
-                            "retained_bytes": row.metrics.resources.retained_memory_bytes,
-                            "offline_error_observation": row.error,
-                            "error_applies_to_current_query": false,
-                        })),
-                        None,
-                    ),
-                    Some(Err(error)) => (None, Some(error.to_string())),
-                    None => (None, Some("offline evidence not supplied".into())),
-                };
-                states.push(json!({"algorithm":kind.algorithm(), "params":kind.params(), "measurement":measurement, "unavailable_reason":reason}));
-            } else {
-                states.push(json!({"exact_family":format!("{family:?}")}));
-            }
-            inspect(child, model, seen, states, raw);
-        }
-        SummaryExpr::SummaryEstimate { summary_input, .. }
-        | SummaryExpr::SummaryDelete { summary_input, .. } => {
-            inspect(summary_input, model, seen, states, raw)
-        }
-        SummaryExpr::ValueOperation { child, .. } => inspect(child, model, seen, states, raw),
-        SummaryExpr::SummaryMerge { children, .. } => {
-            for child in children {
-                inspect(child, model, seen, states, raw);
-            }
-        }
-        SummaryExpr::SummaryJoin {
-            outer: lhs,
-            inner: rhs,
-            ..
-        }
-        | SummaryExpr::SummarySubtract {
-            left: lhs,
-            right: rhs,
-        }
-        | SummaryExpr::RelationalJoin {
-            left: lhs,
-            right: rhs,
-            ..
-        }
-        | SummaryExpr::BinaryOp { lhs, rhs, .. } => {
-            inspect(lhs, model, seen, states, raw);
-            inspect(rhs, model, seen, states, raw);
-        }
-    }
-}
-
-fn main() -> Result<()> {
-    let args: Vec<_> = std::env::args().skip(1).collect();
-    if args.len() != 1 && args.len() != 3 {
-        bail!("usage: offline_planner_replay QUERIES.txt [EVIDENCE.json CONTEXT.json]");
-    }
-    let corpus = std::fs::read_to_string(&args[0])?;
-    let evidence = if args.len() == 3 {
-        let artifact: EvidenceArtifact = serde_json::from_str(&std::fs::read_to_string(&args[1])?)?;
-        let context: EvidenceContext = serde_json::from_str(&std::fs::read_to_string(&args[2])?)?;
-        Some((artifact, context))
-    } else {
-        None
-    };
-    let mut rows = Vec::new();
-    let mut modes = vec!["exact", "default"];
-    if evidence.is_some() {
-        modes.push("empirical");
-    }
-    for mode in modes {
-        let accuracy = if mode == "exact" {
-            AccuracyTarget::Exact
-        } else {
-            AccuracyTarget::Epsilon(0.01)
-        };
-        let mut model = ControlPlaneCostModel::new(accuracy.clone());
-        if mode == "empirical" {
-            let (artifact, context) = evidence.as_ref().context("missing evidence")?;
-            model = model.with_offline_evidence(EmpiricalEvidenceProvider::new(
-                artifact.clone(),
-                context.clone(),
-            )?);
-        }
-        for query in corpus
-            .lines()
-            .map(str::trim)
-            .filter(|q| !q.is_empty() && !q.starts_with('#'))
-        {
-            let start = Instant::now();
-            let result = parse_query_expr_canonical(query, accuracy.clone()).and_then(|expr| {
-                bind_query_expr_with_cost_model(&expr, &model).map_err(Into::into)
-            });
-            let elapsed_ns = start.elapsed().as_nanos();
-            let result = match result {
-                Ok(PhysicalExpr::Committed(PostAsapPlan::Summary(node))) => {
-                    let mut states = Vec::new();
-                    let mut raw = 0;
-                    inspect(&node, &model, &mut HashSet::new(), &mut states, &mut raw);
-                    json!({"status":"bound", "states":states, "raw_subtrees":raw,
-                        "root_raw_fallback":matches!(node.expr, SummaryExpr::KeepPreAsap(_)),
-                        "summary_plan":format!("{node:#?}")})
-                }
-                Ok(plan) => json!({"status":"other_physical_plan", "plan":format!("{plan:?}")}),
-                Err(error) => json!({"status":"rejected", "reason":error.to_string()}),
-            };
-            rows.push(
-                json!({"query":query,"mode":mode,"planning_elapsed_ns":elapsed_ns,"result":result}),
-            );
-        }
-    }
-    serde_json::to_writer_pretty(
-        std::io::stdout(),
-        &json!({
-            "schema_version":1,
-            "evaluation":"offline control-plane parser and typed summary binder",
-            "corpus_path":args[0],
-            "offline_context":evidence.as_ref().map(|(_, context)|context),
-            "limitations":["No deployed execution or measured end-to-end speedup", "Binding does not establish executable placement or complete physical cost", "Offline point-frequency errors do not establish current query guarantees", "raw_subtrees includes necessary source scans beneath summaries"],
-            "estimated_end_to_end_savings":null,
-            "rows":rows
-        }),
-    )?;
-    Ok(())
-}
diff --git a/control_plane/examples/support/automatic_clickhouse_corpus.rs b/control_plane/examples/support/automatic_clickhouse_corpus.rs
deleted file mode 100644
index 71cd2dfd3..000000000
--- a/control_plane/examples/support/automatic_clickhouse_corpus.rs
+++ /dev/null
@@ -1,139 +0,0 @@
-use control_plane::clickhouse::{ClickHouseSqlAutomaticWorkload, ClickHouseSqlWorkloadEntry};
-use control_plane::physical::compiler::{PlanEnvelope, BACKEND_COMPAT, PLANNER_REVISION};
-use planner_types::pre_asap::{Column, DataType, Schema};
-use planner_types::types::AccuracyTarget;
-use serde::Deserialize;
-use serde_json::json;
-use std::{fs, path::PathBuf};
-
-#[derive(Deserialize)]
-struct Corpus {
-    queries: Vec<Row>,
-}
-
-#[derive(Deserialize)]
-struct Row {
-    id: String,
-    clickhouse_sql: Option<String>,
-    operators: Vec<String>,
-    promql: String,
-}
-
-fn publication_inputs(
-    schema: &Schema,
-    sql: String,
-    window_ms: u64,
-) -> ClickHouseSqlAutomaticWorkload {
-    ClickHouseSqlAutomaticWorkload {
-        envelope: PlanEnvelope {
-            plan_id: 27,
-            plan_version: 1,
-            generated_at_unix_ms: 1_788_891_296_000,
-            activation_unix_ms: 1_788_891_296_000,
-            expiry_unix_ms: None,
-            backend_compat: BACKEND_COMPAT.into(),
-            planner_revision: PLANNER_REVISION.into(),
-            capability_snapshot_id: "sql27-automatic-eval".into(),
-        },
-        tables: std::collections::HashMap::from([("raw_samples".into(), schema.clone())]),
-        accuracy: AccuracyTarget::Epsilon(0.01),
-        queries: vec![ClickHouseSqlWorkloadEntry {
-            sql,
-            start_ms: 1_788_891_296_001 - window_ms,
-            end_ms: 1_788_891_296_001,
-            cumulative: false,
-        }],
-    }
-}
-
-pub async fn run() {
-    let path = std::env::args_os()
-        .nth(2)
-        .map(PathBuf::from)
-        .expect("usage: audit_clickhouse_corpus --automatic CORPUS.json");
-    let corpus: Corpus = serde_json::from_slice(&fs::read(path).unwrap()).unwrap();
-    let schema = Schema::with_time_index(
-        vec![
-            Column::new("metric", DataType::Utf8, false),
-            Column::new(
-                "labels",
-                DataType::Map {
-                    key: Box::new(DataType::Utf8),
-                    value: Box::new(DataType::Utf8),
-                    value_nullable: false,
-                },
-                false,
-            ),
-            Column::new("ts_ms", DataType::Int64, false),
-            Column::new("value", DataType::Float64, false),
-        ],
-        2,
-        vec![],
-    );
-    let mut rows = Vec::new();
-    for row in corpus.queries {
-        let Some(sql) = row.clickhouse_sql else {
-            rows.push(json!({
-                "id": row.id,
-                "operators": row.operators,
-                "parser_planner": "failure",
-                "reason": "missing ClickHouse SQL mapping"
-            }));
-            continue;
-        };
-        let sql = sql.replace("{eval_ms}", "1788891296000");
-        // Evaluation span only: SQL source boundaries are still validated by the compiler.
-        let window_ms = row
-            .promql
-            .split('[')
-            .skip(1)
-            .filter_map(|range| {
-                let digits = range.chars().take_while(char::is_ascii_digit).count();
-                let number = range[..digits].parse::<u64>().ok()?;
-                let unit = range.as_bytes().get(digits)?;
-                let multiplier = match unit {
-                    b's' => 1_000,
-                    b'm' => 60_000,
-                    b'h' => 3_600_000,
-                    b'd' => 86_400_000,
-                    _ => return None,
-                };
-                Some(number * multiplier)
-            })
-            .max()
-            .unwrap_or(300_000);
-        match control_plane::clickhouse::compile_automatic_clickhouse_workload(&publication_inputs(
-            &schema,
-            sql.clone(),
-            window_ms,
-        ))
-        .await
-        {
-            Ok((publication, traces)) => rows.push(json!({
-                "id": row.id, "operators": row.operators, "sql": sql,
-                "publication": "pass", "execution": "not_run",
-                "selection_traces": traces,
-                "window_start_ms": 1_788_891_296_001u64 - window_ms,
-                "window_end_ms": 1_788_891_296_001u64,
-                "install": publication.install_request(None, Vec::new()).unwrap(),
-                "summary_catalog": publication.summary_catalog,
-                "precompute_plan": publication.precompute_plan,
-                "query_plan": publication.query_plan,
-            })),
-            Err(error) => rows.push(json!({
-                "id": row.id, "operators": row.operators, "sql": sql,
-                "publication": "failure", "execution": "not_run", "reason": error.to_string(),
-            })),
-        }
-    }
-
-    println!(
-        "{}",
-        serde_json::to_string_pretty(&json!({
-            "baseline": env!("CARGO_PKG_VERSION"),
-            "query_count": rows.len(),
-            "queries": rows,
-        }))
-        .unwrap()
-    );
-}
diff --git a/control_plane/examples/workload_cost_manifest.rs b/control_plane/examples/workload_cost_manifest.rs
deleted file mode 100644
index f01fd0574..000000000
--- a/control_plane/examples/workload_cost_manifest.rs
+++ /dev/null
@@ -1,28 +0,0 @@
-//! Emit pricing requirements; never fabricate quotes or publish a plan.
-use control_plane::physical::{
-    compiler::BackendLocalPlanningInput, compiler::DeploymentPlanCompiler, workload_cost,
-};
-
-fn main() -> Result<(), Box<dyn std::error::Error>> {
-    let path = std::env::args()
-        .nth(1)
-        .ok_or("usage: workload_cost_manifest SNAPSHOT.json")?;
-    let snapshot: BackendLocalPlanningInput =
-        serde_json::from_str(&std::fs::read_to_string(path)?)?;
-    let (request, environment) = snapshot.into_physical_compilation_request()?;
-    let manifests = workload_cost::enumerate_exact_and_materialized_candidates(request)?
-        .into_iter()
-        .filter_map(|candidate| {
-            let queries = candidate.queries.clone();
-            DeploymentPlanCompiler
-                .compile_promql(candidate, environment.clone())
-                .and_then(|plan| workload_cost::manifest(&plan, &queries))
-                .ok()
-        })
-        .collect::<Vec<_>>();
-    if manifests.is_empty() {
-        return Err("no bindable workload cost manifests".into());
-    }
-    println!("{}", serde_json::to_string_pretty(&manifests)?);
-    Ok(())
-}
diff --git a/control_plane/proto/anyvalue.proto b/control_plane/proto/anyvalue.proto
deleted file mode 100644
index 8ed973152..000000000
--- a/control_plane/proto/anyvalue.proto
+++ /dev/null
@@ -1,67 +0,0 @@
-// Copyright 2019, OpenTelemetry Authors
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// This file is copied and modified from https://github.com/open-telemetry/opentelemetry-proto/blob/main/opentelemetry/proto/common/v1/common.proto
-// Modifications:
-//  - Removal of unneeded InstrumentationLibrary and StringKeyValue messages.
-//  - Change of go_package to reference a package in this repo.
-//  - Removal of gogoproto usage.
-
-syntax = "proto3";
-
-package opamp.proto;
-
-option go_package = "github.com/open-telemetry/opamp-go/protobufs";
-
-// AnyValue is used to represent any type of attribute value. AnyValue may contain a
-// primitive value such as a string or integer or it may contain an arbitrary nested
-// object containing arrays, key-value lists and primitives.
-message AnyValue {
-  // The value is one of the listed fields. It is valid for all values to be unspecified
-  // in which case this AnyValue is considered to be "null".
-  oneof value {
-    string string_value = 1;
-    bool bool_value = 2;
-    int64 int_value = 3;
-    double double_value = 4;
-    ArrayValue array_value = 5;
-    KeyValueList kvlist_value = 6;
-    bytes bytes_value = 7;
-  }
-}
-
-// ArrayValue is a list of AnyValue messages. We need ArrayValue as a message
-// since oneof in AnyValue does not allow repeated fields.
-message ArrayValue {
-  // Array of values. The array may be empty (contain 0 elements).
-  repeated AnyValue values = 1;
-}
-
-// KeyValueList is a list of KeyValue messages. We need KeyValueList as a message
-// since `oneof` in AnyValue does not allow repeated fields. Everywhere else where we need
-// a list of KeyValue messages (e.g. in Span) we use `repeated KeyValue` directly to
-// avoid unnecessary extra wrapping (which slows down the protocol). The 2 approaches
-// are semantically equivalent.
-message KeyValueList {
-  // A collection of key/value pairs of key-value pairs. The list may be empty (may
-  // contain 0 elements).
-  repeated KeyValue values = 1;
-}
-
-// KeyValue is a key-value pair that is used to store Span attributes, Link
-// attributes, etc.
-message KeyValue {
-  string key = 1;
-  AnyValue value = 2;
-}
diff --git a/control_plane/proto/control_plane.proto b/control_plane/proto/control_plane.proto
deleted file mode 100644
index de1bb002f..000000000
--- a/control_plane/proto/control_plane.proto
+++ /dev/null
@@ -1,115 +0,0 @@
-syntax = "proto3";
-
-package control_plane.v1;
-
-option go_package = "github.com/ProjectASAP/control_plane/proto/control_planev1";
-
-import "google/protobuf/duration.proto";
-import "google/protobuf/timestamp.proto";
-
-// ── Enumerations ──────────────────────────────────────────────────────────────
-
-enum AggType {
-  AGG_TYPE_UNSPECIFIED = 0;
-  AGG_TYPE_QUANTILE    = 1;
-  AGG_TYPE_CARDINALITY = 2;
-  AGG_TYPE_FREQUENCY   = 3;
-}
-
-enum SketchType {
-  SKETCH_TYPE_UNSPECIFIED      = 0;
-  SKETCH_TYPE_DDSKETCH         = 1;
-  SKETCH_TYPE_KLL              = 2;
-  SKETCH_TYPE_HLL              = 3;
-  SKETCH_TYPE_COUNT_SKETCH     = 4;
-  SKETCH_TYPE_COUNT_MIN_SKETCH = 5;
-}
-
-enum OutputMode {
-  OUTPUT_MODE_UNSPECIFIED = 0;
-  OUTPUT_MODE_RAW         = 1;
-  OUTPUT_MODE_SKETCH      = 2;
-}
-
-enum ProcessorMode {
-  PROCESSOR_MODE_UNSPECIFIED = 0;
-  PROCESSOR_MODE_BATCH       = 1;
-  PROCESSOR_MODE_WINDOW      = 2;
-}
-
-// ── Core types ────────────────────────────────────────────────────────────────
-
-message QueryWorkload {
-  string   metric_name    = 1;
-  map<string, string> label_filters  = 2;
-  repeated string     group_by_labels = 3;
-  repeated AggType    aggregations    = 4;
-  google.protobuf.Duration time_window   = 5;
-  google.protobuf.Duration repeat_every  = 6;
-  double   accuracy_sla  = 7;  // relative error, e.g. 0.01
-  google.protobuf.Duration latency_sla   = 8;
-}
-
-message SketchParams {
-  double   relative_accuracy = 1;  // DDSketch
-  int32    k                 = 2;  // KLL
-  int32    precision         = 3;  // HLL
-  int32    rows              = 4;  // CountSketch / CountMinSketch
-  int32    cols              = 5;
-  repeated double quantiles  = 6;
-}
-
-message AgentCollectorConfig {
-  OutputMode    output_mode      = 1;
-  SketchType    sketch_type      = 2;
-  SketchParams  sketch_params    = 3;
-  repeated string aggregate_by  = 4;
-  repeated string label_matchers = 5;
-  google.protobuf.Duration window_duration = 6;
-  ProcessorMode mode             = 7;
-  bool          transmit_sketch  = 8;
-  bool          drop_original    = 9;
-}
-
-message GatewayCollectorConfig {
-  bool passthrough = 1;
-}
-
-message BackendCollectorConfig {
-  SketchType  merge_sketch_type = 1;
-  repeated string group_by     = 2;
-}
-
-message CollectionPlan {
-  AgentCollectorConfig   agent_config   = 1;
-  GatewayCollectorConfig gateway_config = 2;
-  BackendCollectorConfig backend_config = 3;
-  reserved 4;
-  reserved "precompute";
-  google.protobuf.Timestamp valid_until = 5;
-}
-
-// ── RPCs ──────────────────────────────────────────────────────────────────────
-
-message PlanRequest {
-  QueryWorkload workload = 1;
-}
-
-message PlanResponse {
-  CollectionPlan plan   = 1;
-  string         status = 2;
-}
-
-message PlanStatusRequest {
-  string metric_name = 1;
-}
-
-message PlanStatusResponse {
-  CollectionPlan current_plan = 1;
-  string         status       = 2;
-}
-
-service ControllerService {
-  rpc Plan(PlanRequest) returns (PlanResponse);
-  rpc GetPlanStatus(PlanStatusRequest) returns (PlanStatusResponse);
-}
diff --git a/control_plane/proto/feedback.proto b/control_plane/proto/feedback.proto
deleted file mode 100644
index 235a46707..000000000
--- a/control_plane/proto/feedback.proto
+++ /dev/null
@@ -1,52 +0,0 @@
-// ASAP runtime-samples wire schema.
-//
-// Carries batches of `sketch-core::report::Record` from an
-// agent's `sketch-runtime::GrpcExporter` into the control plane's
-// real-time decision loop. The Record payload is forwarded as
-// JSON so the control plane stays forward-compatible with new
-// v1 schema fields without a proto rebump.
-//
-// Schema version is `sketch-core::report::SCHEMA_VERSION` (1
-// today). A bump implies both sides get recompiled.
-
-syntax = "proto3";
-
-package asap.runtime.v1;
-
-// One record per emitted bench window. Mirrors
-// `sketch-core::report::Record`: the `source` / `sketch` /
-// `impl_name` tuple is the per-key routing handle on the
-// control-plane side (→ `RuntimeSamplesStore`'s `SampleKey`);
-// the rest of the record rides in `payload_json` so new
-// fields on `Record` flow through without a proto change.
-message RuntimeRecord {
-  string source      = 1;
-  string sketch      = 2;
-  string impl_name   = 3;
-  uint32 schema_version = 4;
-  string payload_json = 5;
-}
-
-// A batched push. `GrpcExporter`'s default batch is 64 records
-// / 100 ms (whichever triggers first) — small enough to keep
-// decision latency bounded, large enough to amortize gRPC
-// per-call overhead.
-message PushBatch {
-  repeated RuntimeRecord records = 1;
-}
-
-message PushAck {
-  // Number of records the server accepted (could be less than
-  // records.size() if a few failed validation; log + continue
-  // on the client side in that case).
-  uint64 accepted = 1;
-}
-
-service RuntimeSamples {
-  // Unary RPC per batch — simpler than bidi streaming, and the
-  // client already batches before pushing so HTTP/2 mux handles
-  // throughput without a per-message acks-on-stream dance.
-  // tonic negotiates gzip if `Accept-Encoding: gzip` is set on
-  // the server.
-  rpc Push(PushBatch) returns (PushAck);
-}
diff --git a/control_plane/proto/opamp.proto b/control_plane/proto/opamp.proto
deleted file mode 100644
index 219118c8c..000000000
--- a/control_plane/proto/opamp.proto
+++ /dev/null
@@ -1,1079 +0,0 @@
-// Copyright 2021, OpenTelemetry Authors
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// OpAMP: Open Agent Management Protocol (https://github.com/open-telemetry/opamp-spec)
-
-syntax = "proto3";
-
-package opamp.proto;
-
-import "anyvalue.proto";
-
-option go_package = "github.com/open-telemetry/opamp-go/protobufs";
-
-message AgentToServer {
-    // Globally unique identifier of the running instance of the Agent. SHOULD remain
-    // unchanged for the lifetime of the Agent process.
-    // MUST be 16 bytes long and SHOULD be generated using the UUID v7 spec.
-    bytes instance_uid = 1;
-
-    // The sequence number is incremented by 1 for every AgentToServer sent
-    // by the Agent. This allows the Server to detect that it missed a message when
-    // it notices that the sequence_num is not exactly by 1 greater than the previously
-    // received one.
-    uint64 sequence_num = 2;
-
-    // Data that describes the Agent, its type, where it runs, etc.
-    // May be omitted if nothing changed since last AgentToServer message.
-    AgentDescription agent_description = 3;
-
-    // Bitmask of flags defined by AgentCapabilities enum.
-    // All bits that are not defined in AgentCapabilities enum MUST be set to 0 by
-    // the Agent. This allows extending the protocol and the AgentCapabilities enum
-    // in the future such that old Agents automatically report that they don't
-    // support the new capability.
-    // This field MUST be always set.
-    uint64 capabilities = 4;
-
-    // The current health of the Agent and sub-components. The top-level ComponentHealth represents
-    // the health of the Agent overall. May be omitted if nothing changed since last AgentToServer
-    // message.
-    // Status: [Beta]
-    ComponentHealth health = 5;
-
-    // The current effective configuration of the Agent. The effective configuration is
-    // the one that is currently used by the Agent. The effective configuration may be
-    // different from the remote configuration received from the Server earlier, e.g.
-    // because the Agent uses a local configuration instead (or in addition).
-    //
-    // This field SHOULD be unset if the effective config is unchanged since the last
-    // AgentToServer message.
-    EffectiveConfig effective_config = 6;
-
-    // The status of the remote config that was previously received from the Server.
-    // This field SHOULD be unset if the remote config status is unchanged since the
-    // last AgentToServer message.
-    RemoteConfigStatus remote_config_status = 7;
-
-    // The list of the Agent packages, including package statuses. This field SHOULD be
-    // unset if this information is unchanged since the last AgentToServer message for
-    // this Agent was sent in the stream.
-    // Status: [Beta]
-    PackageStatuses package_statuses = 8;
-
-    // AgentDisconnect MUST be set in the last AgentToServer message sent from the
-    // Agent to the Server.
-    AgentDisconnect agent_disconnect = 9;
-
-    // Bit flags as defined by AgentToServerFlags bit masks.
-    uint64 flags = 10;
-
-    // A request to create connection settings. This field is set for flows where
-    // the Agent initiates the creation of connection settings.
-    // Status: [Development]
-    ConnectionSettingsRequest connection_settings_request = 11;
-
-    // A message indicating custom capabilities supported by the Agent.
-    // Status: [Development]
-    CustomCapabilities custom_capabilities = 12;
-
-    // A custom message sent from an Agent to the Server.
-    // Status: [Development]
-    CustomMessage custom_message = 13;
-
-    // A message indicating the components that are available for configuration on the agent.
-    // Status: [Development]
-    AvailableComponents available_components = 14;
-
-    // The status of the OfferedConnectionSettings that was previously received
-    // from the Server. This field SHOULD be unset if the offered connection
-    // settings status is unchanged since the last AgentToServer message.
-    // Status: [Development]
-    ConnectionSettingsStatus connection_settings_status = 15;
-}
-
-enum AgentToServerFlags {
-    AgentToServerFlags_Unspecified = 0;
-
-    // AgentToServerFlags is a bit mask. Values below define individual bits.
-
-    // The Agent requests Server go generate a new instance_uid, which will
-    // be sent back in ServerToAgent message
-    AgentToServerFlags_RequestInstanceUid     = 0x00000001;
-}
-
-// AgentDisconnect is the last message sent from the Agent to the Server. The Server
-// SHOULD forget the association of the Agent instance with the message stream.
-//
-// If the message stream is closed in the transport layer then the Server SHOULD
-// forget association of all Agent instances that were previously established for
-// this message stream using AgentConnect message, even if the corresponding
-// AgentDisconnect message were not explicitly received from the Agent.
-message AgentDisconnect {
-}
-
-// ConnectionSettingsRequest is a request from the Agent to the Server to create
-// and respond with an offer of connection settings for the Agent.
-// Status: [Development]
-message ConnectionSettingsRequest {
-    // Request for OpAMP connection settings. If this field is unset
-    // then the ConnectionSettingsRequest message is empty and is not actionable
-    // for the Server.
-    OpAMPConnectionSettingsRequest opamp = 1;
-
-    // In the future we can add request fields for non-OpAMP connection types
-    // (own telemetry, other connections).
-}
-
-// OpAMPConnectionSettingsRequest is a request for the Server to produce
-// a OpAMPConnectionSettings in its response.
-// Status: [Development]
-message OpAMPConnectionSettingsRequest {
-    // A request to create a client certificate. This is used to initiate a
-    // Client Signing Request (CSR) flow.
-    // Required.
-    CertificateRequest certificate_request = 1;
-}
-
-// Status: [Development]
-message CertificateRequest {
-    // PEM-encoded Client Certificate Signing Request (CSR), signed by client's private key.
-    // The Server SHOULD validate the request and SHOULD respond with a
-    // OpAMPConnectionSettings where the certificate.cert contains the issued
-    // certificate.
-    bytes csr = 1;
-}
-
-// AvailableComponents contains metadata relating to the components included
-// within the agent.
-// status: [Development]
-message AvailableComponents {
-    // A map of a unique component ID to details about the component.
-    // This may be omitted from the message if the server has not
-    // explicitly requested it be sent by setting the ReportAvailableComponents
-    // flag in the previous ServerToAgent message.
-    map<string, ComponentDetails> components = 1;
-
-    // Agent-calculated hash of the components.
-    // This hash should be included in every AvailableComponents message.
-    bytes hash = 2;
- }
-
-message ComponentDetails {
-    // Extra key/value pairs that may be used to describe the component.
-    // The key/value pairs are according to semantic conventions, see:
-    // https://opentelemetry.io/docs/specs/semconv/
-    //
-    // For example, you may use the "code" semantic conventions to
-    // report the location of the code for a specific component:
-    // https://opentelemetry.io/docs/specs/semconv/attributes-registry/code/
-    //
-    // Or you may use the "vcs" semantic conventions to report the
-    // repository the component may be a part of:
-    // https://opentelemetry.io/docs/specs/semconv/attributes-registry/vcs/
-    repeated KeyValue metadata = 1;
-
-    // A map of component ID to sub components details. It can nest as deeply as needed to
-    // describe the underlying system.
-    map<string, ComponentDetails> sub_component_map = 2;
-}
-
-
-message ServerToAgent {
-    // Agent instance uid. MUST match the instance_uid field in AgentToServer message.
-    // Used for multiplexing messages from/to multiple agents using one message stream.
-    bytes instance_uid = 1;
-
-    // error_response is set if the Server wants to indicate that something went wrong
-    // during processing of an AgentToServer message. If error_response is set then
-    // all other fields below must be unset and vice versa, if any of the fields below is
-    // set then error_response must be unset.
-    ServerErrorResponse error_response = 2;
-
-    // remote_config field is set when the Server has a remote config offer for the Agent.
-    AgentRemoteConfig remote_config = 3;
-
-    // This field is set when the Server wants the Agent to change one or more
-    // of its client connection settings (destination, headers, certificate, etc).
-    // Status: [Beta]
-    ConnectionSettingsOffers connection_settings = 4;
-
-    // This field is set when the Server has packages to offer to the Agent.
-    // Status: [Beta]
-    PackagesAvailable packages_available = 5;
-
-    // Bit flags as defined by ServerToAgentFlags bit masks.
-    uint64 flags = 6;
-
-    // Bitmask of flags defined by ServerCapabilities enum.
-    // All bits that are not defined in ServerCapabilities enum MUST be set to 0
-    // by the Server. This allows extending the protocol and the ServerCapabilities
-    // enum in the future such that old Servers automatically report that they
-    // don't support the new capability.
-    // This field MUST be set in the first ServerToAgent sent by the Server and MAY
-    // be omitted in subsequent ServerToAgent messages by setting it to
-    // UnspecifiedServerCapability value.
-    uint64 capabilities = 7;
-
-    // Properties related to identification of the Agent, which can be overridden
-    // by the Server if needed.
-    AgentIdentification agent_identification = 8;
-
-    // Allows the Server to instruct the Agent to perform a command, e.g. RESTART. This field should not be specified
-    // with fields other than instance_uid and capabilities. If specified, other fields will be ignored and the command
-    // will be performed.
-    // Status: [Beta]
-    ServerToAgentCommand command = 9;
-
-    // A message indicating custom capabilities supported by the Server.
-    // Status: [Development]
-    CustomCapabilities custom_capabilities = 10;
-
-    // A custom message sent from the Server to an Agent.
-    // Status: [Development]
-    CustomMessage custom_message = 11;
-}
-
-enum ServerToAgentFlags {
-    ServerToAgentFlags_Unspecified = 0;
-
-    // Flags is a bit mask. Values below define individual bits.
-
-    // ReportFullState flag can be used by the Server if the Agent did not include the
-    // particular bit of information in the last status report (which is an allowed
-    // optimization) but the Server detects that it does not have it (e.g. was
-    // restarted and lost state). The detection happens using
-    // AgentToServer.sequence_num values.
-    // The Server asks the Agent to report full status.
-    ServerToAgentFlags_ReportFullState = 0x00000001;
-
-    // ReportAvailableComponents flag can be used by the server if the Agent did
-    // not include the full AvailableComponents message, but only the hash.
-    // If this flag is specified, the agent will populate available_components.components
-    // with a full description of the agent's components.
-    // Status: [Development]
-    ServerToAgentFlags_ReportAvailableComponents = 0x00000002;
-}
-
-enum ServerCapabilities {
-    // The capabilities field is unspecified.
-    ServerCapabilities_Unspecified = 0;
-
-    // The Server can accept status reports. This bit MUST be set, since all Server
-    // MUST be able to accept status reports.
-    ServerCapabilities_AcceptsStatus            = 0x00000001;
-    // The Server can offer remote configuration to the Agent.
-    ServerCapabilities_OffersRemoteConfig       = 0x00000002;
-    // The Server can accept EffectiveConfig in AgentToServer.
-    ServerCapabilities_AcceptsEffectiveConfig   = 0x00000004;
-    // The Server can offer Packages.
-    // Status: [Beta]
-    ServerCapabilities_OffersPackages           = 0x00000008;
-    // The Server can accept Packages status.
-    // Status: [Beta]
-    ServerCapabilities_AcceptsPackagesStatus    = 0x00000010;
-    // The Server can offer connection settings.
-    // Status: [Beta]
-    ServerCapabilities_OffersConnectionSettings = 0x00000020;
-    // The Server can accept ConnectionSettingsRequest and respond with an offer.
-    // Status: [Development]
-    ServerCapabilities_AcceptsConnectionSettingsRequest = 0x00000040;
-
-    // Add new capabilities here, continuing with the least significant unused bit.
-}
-
-// The OpAMPConnectionSettings message is a collection of fields which comprise an
-// offer from the Server to the Agent to use the specified settings for OpAMP
-// connection.
-// Status: [Beta]
-message OpAMPConnectionSettings {
-    // OpAMP Server URL This MUST be a WebSocket or HTTP URL and MUST be non-empty, for
-    // example: "wss://example.com:4318/v1/opamp"
-    string destination_endpoint = 1;
-
-    // Optional headers to use when connecting. Typically used to set access tokens or
-    // other authorization headers. For HTTP-based protocols the Agent should
-    // set these in the request headers.
-    // For example:
-    // key="Authorization", Value="Basic YWxhZGRpbjpvcGVuc2VzYW1l".
-    Headers headers = 2;
-
-    // The Agent should use the offered certificate to connect to the destination
-    // from now on. If the Agent is able to validate and connect using the offered
-    // certificate the Agent SHOULD forget any previous client certificates
-    // for this connection.
-    // This field is optional: if omitted the client SHOULD NOT use a client-side certificate.
-    // This field can be used to perform a client certificate revocation/rotation.
-    TLSCertificate certificate = 3;
-
-    // The Agent MUST periodically send an AgentToServer message if the
-    // AgentCapabilities_ReportsHeartbeat capability is true. At a minimum the instance_uid
-    // field MUST be set.
-    //
-    // An HTTP Client MUST use the value as polling interval, if heartbeat_interval_seconds is non-zero.
-    //
-    // A heartbeat is used to keep the connection active and inform the server that the Agent
-    // is still alive and active.
-    //
-    // If this field has no value or is set to 0, the Agent should not send any heartbeats.
-    // Status: [Development]
-    uint64 heartbeat_interval_seconds = 4;
-
-    // Optional connection specific TLS settings.
-    // Status: [Development]
-    TLSConnectionSettings tls = 5;
-
-    // Optional connection specific proxy settings.
-    // Status: [Development]
-    ProxyConnectionSettings proxy = 6;
-}
-
-// The TelemetryConnectionSettings message is a collection of fields which comprise an
-// offer from the Server to the Agent to use the specified settings for a network
-// connection to report own telemetry.
-// Status: [Beta]
-message TelemetryConnectionSettings {
-    // The value MUST be a full URL an OTLP/HTTP/Protobuf receiver with path. Schema
-    // SHOULD begin with "https://", for example "https://example.com:4318/v1/metrics"
-    // The Agent MAY refuse to send the telemetry if the URL begins with "http://".
-    string destination_endpoint = 1;
-
-    // Optional headers to use when connecting. Typically used to set access tokens or
-    // other authorization headers. For HTTP-based protocols the Agent should
-    // set these in the request headers.
-    // For example:
-    // key="Authorization", Value="Basic YWxhZGRpbjpvcGVuc2VzYW1l".
-    Headers headers = 2;
-
-    // The Agent should use the offered certificate to connect to the destination
-    // from now on. If the Agent is able to validate and connect using the offered
-    // certificate the Agent SHOULD forget any previous client certificates
-    // for this connection.
-    // This field is optional: if omitted the client SHOULD NOT use a client-side certificate.
-    // This field can be used to perform a client certificate revocation/rotation.
-    TLSCertificate certificate = 3;
-
-    // Optional connection specific TLS settings.
-    // Status: [Development]
-    TLSConnectionSettings tls = 4;
-
-    // Optional connection specific proxy settings.
-    // Status: [Development]
-    ProxyConnectionSettings proxy = 5;
-}
-
-// The OtherConnectionSettings message is a collection of fields which comprise an
-// offer from the Server to the Agent to use the specified settings for a network
-// connection. It is not required that all fields in this message are specified.
-// The Server may specify only some of the fields, in which case it means that
-// the Server offers the Agent to change only those fields, while keeping the
-// rest of the fields unchanged.
-//
-// For example the Server may send a ConnectionSettings message with only the
-// certificate field set, while all other fields are unset. This means that
-// the Server wants the Agent to use a new certificate and continue sending to
-// the destination it is currently sending using the current header and other
-// settings.
-//
-// For fields which reference other messages the field is considered unset
-// when the reference is unset.
-//
-// For primitive field (string) we rely on the "flags" to describe that the
-// field is not set (this is done to overcome the limitation of old protoc
-// compilers don't generate methods that allow to check for the presence of
-// the field.
-// Status: [Beta]
-message OtherConnectionSettings {
-    // A URL, host:port or some other destination specifier.
-    string destination_endpoint = 1;
-
-    // Optional headers to use when connecting. Typically used to set access tokens or
-    // other authorization headers. For HTTP-based protocols the Agent should
-    // set these in the request headers.
-    // For example:
-    // key="Authorization", Value="Basic YWxhZGRpbjpvcGVuc2VzYW1l".
-    Headers headers = 2;
-
-    // The Agent should use the offered certificate to connect to the destination
-    // from now on. If the Agent is able to validate and connect using the offered
-    // certificate the Agent SHOULD forget any previous client certificates
-    // for this connection.
-    // This field is optional: if omitted the client SHOULD NOT use a client-side certificate.
-    // This field can be used to perform a client certificate revocation/rotation.
-    TLSCertificate certificate = 3;
-
-    // Other connection settings. These are Agent-specific and are up to the Agent
-    // interpret.
-    map<string, string> other_settings = 4;
-
-    // Optional connection specific TLS settings.
-    // Status: [Development]
-    TLSConnectionSettings tls = 5;
-
-    // Optional connection specific proxy settings.
-    // Status: [Development]
-    ProxyConnectionSettings proxy = 6;
-}
-
-
-// TLSConnectionSettings are optional connection settings that can be passed to
-// the client in order to specify TLS configuration.
-// Status: [Development]
-message TLSConnectionSettings {
-  // Provides CA cert contents as a string.
-  string ca_pem_contents = 1;
-
-  // Load system CA pool alongside any passed CAs.
-  bool include_system_ca_certs_pool = 2;
-
-  // skip certificate verification.
-  bool insecure_skip_verify = 3;
-
-  // Miniumum accepted TLS version; default "1.2".
-  string min_version = 4;
-
-  // Maxiumum accepted TLS version; default "".
-  string max_version = 5;
-
-  // Explicit list of cipher suites.
-  repeated string cipher_suites = 6;
-}
-
-// Status: [Development]
-message ProxyConnectionSettings {
-    // A URL, host:port or some other destination specifier.
-    string url = 1;
-
-    // Optional headers to send to proxies during CONNECT requests.
-    // These headers can be ignored for non-HTTP based proxies.
-    // For example:
-    // key="Authorization", Value="Basic YWxhZGRpbjpvcGVuc2VzYW1l".
-    Headers connect_headers = 2;
-}
-
-// Status: [Beta]
-message Headers {
-    repeated Header headers = 1;
-}
-
-// Status: [Beta]
-message Header {
-    string key = 1;
-    string value = 2;
-}
-
-// Status: [Beta]
-message TLSCertificate {
-    // The (cert,private_key) pair should be issued and signed by a Certificate
-    // Authority (CA) that the destination Server recognizes.
-    //
-    // It is highly recommended that the private key of the CA certificate is NOT
-    // stored on the destination Server otherwise compromising the Server will allow
-    // a malicious actor to issue valid Server certificates which will be automatically
-    // trusted by all agents and will allow the actor to trivially MITM Agent-to-Server
-    // traffic of all servers that use this CA certificate for their Server-side
-    // certificates.
-    //
-    // Alternatively the certificate may be self-signed, assuming the Server can
-    // verify the certificate.
-
-    // PEM-encoded certificate. Required.
-    bytes cert = 1;
-
-    // PEM-encoded private key of the certificate. Required.
-    bytes private_key = 2;
-
-    // PEM-encoded certificate of the signing CA.
-    // Optional. MUST be specified if the certificate is CA-signed.
-    // Can be stored by TLS-terminating intermediary proxies in order to verify
-    // the connecting client's certificate in the future.
-    // It is not recommended that the Agent accepts this CA as an authority for
-    // any purposes.
-    bytes ca_cert = 3;
-}
-
-// Status: [Beta]
-message ConnectionSettingsOffers {
-    // Hash of all settings, including settings that may be omitted from this message
-    // because they are unchanged.
-    bytes hash = 1;
-
-    // Settings to connect to the OpAMP Server.
-    // If this field is not set then the Agent should assume that the settings are
-    // unchanged and should continue using existing settings.
-    // The Agent MUST verify the offered connection settings by actually connecting
-    // before accepting the setting to ensure it does not loose access to the OpAMP
-    // Server due to invalid settings.
-    OpAMPConnectionSettings opamp = 2;
-
-    // Settings to connect to an OTLP metrics backend to send Agent's own metrics to.
-    // If this field is not set then the Agent should assume that the settings
-    // are unchanged.
-    //
-    // Once accepted the Agent should periodically send to the specified destination
-    // its own metrics, i.e. metrics of the Agent process and any custom metrics that
-    // describe the Agent state.
-    //
-    // All attributes specified in the identifying_attributes field in AgentDescription
-    // message SHOULD be also specified in the Resource of the reported OTLP metrics.
-    //
-    // Attributes specified in the non_identifying_attributes field in
-    // AgentDescription message may be also specified in the Resource of the reported
-    // OTLP metrics, in which case they SHOULD have exactly the same values.
-    //
-    // Process metrics MUST follow the conventions for processes:
-    // https://github.com/open-telemetry/opentelemetry-specification/blob/main/specification/metrics/semantic_conventions/process-metrics.md
-    TelemetryConnectionSettings own_metrics = 3;
-
-    // Similar to own_metrics, but for traces.
-    TelemetryConnectionSettings own_traces = 4;
-
-    // Similar to own_metrics, but for logs.
-    TelemetryConnectionSettings own_logs = 5;
-
-    // Another set of connection settings, with a string name associated with each.
-    // How the Agent uses these is Agent-specific. Typically the name represents
-    // the name of the destination to connect to (as it is known to the Agent).
-    // If this field is not set then the Agent should assume that the other_connections
-    // settings are unchanged.
-    map<string,OtherConnectionSettings> other_connections = 6;
-}
-
-// List of packages that the Server offers to the Agent.
-// Status: [Beta]
-message PackagesAvailable {
-    // Map of packages. Keys are package names, values are the packages available for download.
-    map<string, PackageAvailable> packages = 1;
-
-    // Aggregate hash of all remotely installed packages. The Agent SHOULD include this
-    // value in subsequent PackageStatuses messages. This in turn allows the management
-    // Server to identify that a different set of packages is available for the Agent
-    // and specify the available packages in the next ServerToAgent message.
-    //
-    // This field MUST be always set if the management Server supports packages
-    // of agents.
-    //
-    // The hash is calculated as an aggregate of all packages names and content.
-    bytes all_packages_hash = 2;
-}
-
-// Each Agent is composed of one or more packages. A package has a name and
-// content stored in a file. The content of the files, functionality
-// provided by the packages, how they are stored and used by the Agent side is Agent
-// type-specific and is outside the concerns of the OpAMP protocol.
-//
-// If the Agent does not have an installed package with the specified name then
-// it SHOULD download it from the specified URL and install it.
-//
-// If the Agent already has an installed package with the specified name
-// but with a different hash then the Agent SHOULD download and
-// install the package again, since it is a different version of the same package.
-//
-// If the Agent has an installed package with the specified name and the same
-// hash then the Agent does not need to do anything, it already
-// has the right version of the package.
-// Status: [Beta]
-message PackageAvailable {
-    PackageType type = 1;
-
-    // The package version that is available on the Server side. The Agent may for
-    // example use this information to avoid downloading a package that was previously
-    // already downloaded and failed to install.
-    string version = 2;
-
-    // The downloadable file of the package.
-    DownloadableFile file = 3;
-
-    // The hash of the package. SHOULD be calculated based on all other fields of the
-    // PackageAvailable message and content of the file of the package. The hash is
-    // used by the Agent to determine if the package it has is different from the
-    // package the Server is offering.
-    bytes hash = 4;
-}
-
-// The type of the package, either an addon or a top-level package.
-// Status: [Beta]
-enum PackageType {
-    PackageType_TopLevel = 0;
-    PackageType_Addon    = 1;
-}
-
-// Status: [Beta]
-message DownloadableFile {
-    // The URL from which the file can be downloaded using HTTP GET request.
-    // The Server at the specified URL SHOULD support range requests
-    // to allow for resuming downloads.
-    string download_url = 1;
-
-    // The hash of the file content. Can be used by the Agent to verify that the file
-    // was downloaded correctly.
-    bytes content_hash = 2;
-
-    // Optional signature of the file content. Can be used by the Agent to verify the
-    // authenticity of the downloaded file, for example can be the
-    // [detached GPG signature](https://www.gnupg.org/gph/en/manual/x135.html#AEN160).
-    // The exact signing and verification method is Agent specific. See
-    // https://github.com/open-telemetry/opamp-spec/blob/main/specification.md#code-signing
-    // for recommendations.
-    bytes signature = 3;
-
-    // Optional headers to use when downloading a file. Typically used to set
-    // access tokens or other authorization headers. For HTTP-based protocols
-    // the Agent should set these in the request headers.
-    // For example:
-    // key="Authorization", Value="Basic YWxhZGRpbjpvcGVuc2VzYW1l".
-    // Status: [Development]
-    Headers headers = 4;
-}
-
-message ServerErrorResponse {
-    ServerErrorResponseType type = 1;
-
-    // Error message in the string form, typically human readable.
-    string error_message = 2;
-
-    oneof Details {
-        // Additional information about retrying if type==UNAVAILABLE.
-        RetryInfo retry_info = 3;
-    }
-}
-
-enum ServerErrorResponseType {
-    // Unknown error. Something went wrong, but it is not known what exactly.
-    // The Agent SHOULD NOT retry the message.
-    // The error_message field may contain a description of the problem.
-    ServerErrorResponseType_Unknown = 0;
-
-    // The AgentToServer message was malformed. The Agent SHOULD NOT retry
-    // the message.
-    ServerErrorResponseType_BadRequest = 1;
-
-    // The Server is overloaded and unable to process the request. The Agent
-    // should retry the message later. retry_info field may be optionally
-    // set with additional information about retrying.
-    ServerErrorResponseType_Unavailable = 2;
-}
-
-message RetryInfo {
-    uint64 retry_after_nanoseconds = 1;
-}
-
-// ServerToAgentCommand is sent from the Server to the Agent to request that the Agent
-// perform a command.
-// Status: [Beta]
-message ServerToAgentCommand {
-    CommandType type = 1;
-}
-
-// Status: [Beta]
-enum CommandType {
-    // The Agent should restart. This request will be ignored if the Agent does not
-    // support restart.
-    CommandType_Restart = 0;
-}
-
-////////////////////////////////////////////////////////////////////////////////////
-// Status reporting
-
-message AgentDescription {
-    // Attributes that identify the Agent.
-    // Keys/values are according to OpenTelemetry semantic conventions, see:
-    // https://github.com/open-telemetry/opentelemetry-specification/tree/main/specification/resource/semantic_conventions
-    //
-    // For standalone running Agents (such as OpenTelemetry Collector) the following
-    // attributes SHOULD be specified:
-    // - service.name should be set to a reverse FQDN that uniquely identifies the
-    //   Agent type, e.g. "io.opentelemetry.collector"
-    // - service.namespace if it is used in the environment where the Agent runs.
-    // - service.version should be set to version number of the Agent build.
-    // - service.instance.id should be set. It may be set equal to the Agent's
-    //   instance uid (equal to ServerToAgent.instance_uid field) or any other value
-    //   that uniquely identifies the Agent in combination with other attributes.
-    // - any other attributes that are necessary for uniquely identifying the Agent's
-    //   own telemetry.
-    //
-    // The Agent SHOULD also include these attributes in the Resource of its own
-    // telemetry. The combination of identifying attributes SHOULD be sufficient to
-    // uniquely identify the Agent's own telemetry in the destination system to which
-    // the Agent sends its own telemetry.
-    repeated KeyValue identifying_attributes = 1;
-
-    // Attributes that do not necessarily identify the Agent but help describe
-    // where it runs.
-    // The following attributes SHOULD be included:
-    // - os.type, os.version - to describe where the Agent runs.
-    // - host.* to describe the host the Agent runs on.
-    // - cloud.* to describe the cloud where the host is located.
-    // - any other relevant Resource attributes that describe this Agent and the
-    //   environment it runs in.
-    // - any user-defined attributes that the end user would like to associate
-    //   with this Agent.
-    repeated KeyValue non_identifying_attributes = 2;
-
-    // TODO: add ability to specify related entities (such as the Service the Agent is
-    // is responsible/associated with).
-}
-
-enum AgentCapabilities {
-    // The capabilities field is unspecified.
-    AgentCapabilities_Unspecified = 0;
-    // The Agent can report status. This bit MUST be set, since all Agents MUST
-    // report status.
-    AgentCapabilities_ReportsStatus                   = 0x00000001;
-    // The Agent can accept remote configuration from the Server.
-    AgentCapabilities_AcceptsRemoteConfig             = 0x00000002;
-    // The Agent will report EffectiveConfig in AgentToServer.
-    AgentCapabilities_ReportsEffectiveConfig          = 0x00000004;
-    // The Agent can accept package offers.
-    // Status: [Beta]
-    AgentCapabilities_AcceptsPackages                 = 0x00000008;
-    // The Agent can report package status.
-    // Status: [Beta]
-    AgentCapabilities_ReportsPackageStatuses          = 0x00000010;
-    // The Agent can report own trace to the destination specified by
-    // the Server via ConnectionSettingsOffers.own_traces field.
-    // Status: [Beta]
-    AgentCapabilities_ReportsOwnTraces                = 0x00000020;
-    // The Agent can report own metrics to the destination specified by
-    // the Server via ConnectionSettingsOffers.own_metrics field.
-    // Status: [Beta]
-    AgentCapabilities_ReportsOwnMetrics               = 0x00000040;
-    // The Agent can report own logs to the destination specified by
-    // the Server via ConnectionSettingsOffers.own_logs field.
-    // Status: [Beta]
-    AgentCapabilities_ReportsOwnLogs                  = 0x00000080;
-    // The can accept connections settings for OpAMP via
-    // ConnectionSettingsOffers.opamp field.
-    // Status: [Beta]
-    AgentCapabilities_AcceptsOpAMPConnectionSettings  = 0x00000100;
-    // The can accept connections settings for other destinations via
-    // ConnectionSettingsOffers.other_connections field.
-    // Status: [Beta]
-    AgentCapabilities_AcceptsOtherConnectionSettings  = 0x00000200;
-    // The Agent can accept restart requests.
-    // Status: [Beta]
-    AgentCapabilities_AcceptsRestartCommand           = 0x00000400;
-    // The Agent will report Health via AgentToServer.health field.
-    AgentCapabilities_ReportsHealth                   = 0x00000800;
-    // The Agent will report RemoteConfig status via AgentToServer.remote_config_status field.
-    AgentCapabilities_ReportsRemoteConfig             = 0x00001000;
-    // The Agent can report heartbeats.
-    // This is specified by the ServerToAgent.OpAMPConnectionSettings.heartbeat_interval_seconds field.
-    // If this capability is true, but the Server does not set a heartbeat_interval_seconds field, the
-    // Agent should use its own configured interval, which by default will be 30s. The Server may not
-    // know the configured interval and should not make assumptions about it.
-    // Status: [Development]
-    AgentCapabilities_ReportsHeartbeat                = 0x00002000;
-    // The agent will report AvailableComponents via the AgentToServer.available_components field.
-    // Status: [Development]
-    AgentCapabilities_ReportsAvailableComponents      = 0x00004000;
-    // The agent will report ConnectionSettingsOffers status via AgentToServer.connection_settings_status field.
-    // Status: [Development]
-    AgentCapabilities_ReportsConnectionSettingsStatus = 0x00008000;
-    // Add new capabilities here, continuing with the least significant unused bit.
-}
-
-// The health of the Agent and sub-components
-// Status: [Beta]
-message ComponentHealth {
-    // Set to true if the component is up and healthy.
-    bool healthy = 1;
-
-    // Timestamp since the component is up, i.e. when the component was started.
-    // Value is UNIX Epoch time in nanoseconds since 00:00:00 UTC on 1 January 1970.
-    // If the component is not running MUST be set to 0.
-    fixed64 start_time_unix_nano = 2;
-
-    // Human-readable error message if the component is in erroneous state. SHOULD be set
-    // when healthy==false.
-    string last_error = 3;
-
-    // Component status represented as a string. The status values are defined by agent-specific
-    // semantics and not at the protocol level.
-    string status = 4;
-
-    // The time when the component status was observed. Value is UNIX Epoch time in
-    // nanoseconds since 00:00:00 UTC on 1 January 1970.
-    fixed64 status_time_unix_nano = 5;
-
-    // A map to store more granular, sub-component health. It can nest as deeply as needed to
-    // describe the underlying system.
-    map<string, ComponentHealth> component_health_map = 6;
-}
-
-message EffectiveConfig {
-    // The effective config of the Agent.
-    AgentConfigMap config_map = 1;
-}
-
-message RemoteConfigStatus {
-    // The hash of the remote config that was last received by this Agent in the
-    // AgentRemoteConfig.config_hash field.
-    // The Server SHOULD compare this hash with the config hash
-    // it has for the Agent and if the hashes are different the Server MUST include
-    // the remote_config field in the response in the ServerToAgent message.
-    bytes last_remote_config_hash = 1;
-
-    RemoteConfigStatuses status = 2;
-
-    // Optional error message if status==FAILED.
-    string error_message = 3;
-}
-
-// Status: [Development]
-message ConnectionSettingsStatus {
-    // The hash of the connection settings that was last recieved by this Agent
-    // in the connection_settings.hash field. The Server SHOULD compare this
-    // hash with the OfferedConnectionSettings hash it has for the Agent and if
-    // the hashes are different the Server MUST include the connection_settings
-    // field in the response in the ServerToAgent message.
-    bytes last_connection_settings_hash = 1;
-
-    ConnectionSettingsStatuses status = 2;
-
-    // Optional error message if status==FAILED.
-    string error_message = 3;
-}
-
-// Status: [Development]
-enum ConnectionSettingsStatuses {
-    // The value of status field is not set.
-    ConnectionSettingsStatuses_UNSET = 0;
-
-    // ConnectionSettings were successfully applied by the Agent.
-    ConnectionSettingsStatuses_APPLIED = 1;
-
-    // Agent is currently applying the ConnectionSettings that it received.
-    ConnectionSettingsStatuses_APPLYING = 2;
-
-    // Agent tried to apply the ConnectionSettings it received earlier, but failed.
-    // See error_message for more details.
-    ConnectionSettingsStatuses_FAILED = 3;
-}
-
-enum RemoteConfigStatuses {
-    // The value of status field is not set.
-    RemoteConfigStatuses_UNSET = 0;
-
-    // Remote config was successfully applied by the Agent.
-    RemoteConfigStatuses_APPLIED = 1;
-
-    // Agent is currently applying the remote config that it received earlier.
-    RemoteConfigStatuses_APPLYING = 2;
-
-    // Agent tried to apply the config received earlier, but it failed.
-    // See error_message for more details.
-    RemoteConfigStatuses_FAILED = 3;
-}
-
-// The PackageStatuses message describes the status of all packages that the Agent
-// has or was offered.
-// Status: [Beta]
-message PackageStatuses {
-    // A map of PackageStatus messages, where the keys are package names.
-    // The key MUST match the name field of PackageStatus message.
-    map<string, PackageStatus> packages = 1;
-
-    // The aggregate hash of all packages that this Agent previously received from the
-    // Server via PackagesAvailable message.
-    //
-    // The Server SHOULD compare this hash to the aggregate hash of all packages that
-    // it has for this Agent and if the hashes are different the Server SHOULD send
-    // an PackagesAvailable message to the Agent.
-    bytes server_provided_all_packages_hash = 2;
-
-    // This field is set if the Agent encountered an error when processing the
-    // PackagesAvailable message and that error is not related to any particular single
-    // package.
-    // The field must be unset is there were no processing errors.
-    string error_message = 3;
-}
-
-// The status of a single package.
-// Status: [Beta]
-message PackageStatus {
-    // Package name. MUST be always set and MUST match the key in the packages field
-    // of PackageStatuses message.
-    string name = 1;
-
-    // The version of the package that the Agent has.
-    // MUST be set if the Agent has this package.
-    // MUST be empty if the Agent does not have this package. This may be the case
-    // for example if the package was offered by the Server but failed to install
-    // and the Agent did not have this package previously.
-    string agent_has_version = 2;
-
-    // The hash of the package that the Agent has.
-    // MUST be set if the Agent has this package.
-    // MUST be empty if the Agent does not have this package. This may be the case for
-    // example if the package was offered by the Server but failed to install and the
-    // Agent did not have this package previously.
-    bytes agent_has_hash = 3;
-
-    // The version of the package that the Server offered to the Agent.
-    // MUST be set if the installation of the package is initiated by an earlier offer
-    // from the Server to install this package.
-    //
-    // MUST be empty if the Agent has this package but it was installed locally and
-    // was not offered by the Server.
-    //
-    // Note that it is possible for both agent_has_version and server_offered_version
-    // fields to be set and to have different values. This is for example possible if
-    // the Agent already has a version of the package successfully installed, the Server
-    // offers a different version, but the Agent fails to install that version.
-    string server_offered_version = 4;
-
-    // The hash of the package that the Server offered to the Agent.
-    // MUST be set if the installation of the package is initiated by an earlier
-    // offer from the Server to install this package.
-    //
-    // MUST be empty if the Agent has this package but it was installed locally and
-    // was not offered by the Server.
-    //
-    // Note that it is possible for both agent_has_hash and server_offered_hash
-    // fields to be set and to have different values. This is for example possible if
-    // the Agent already has a version of the package successfully installed, the
-    // Server offers a different version, but the Agent fails to install that version.
-    bytes server_offered_hash = 5;
-
-    PackageStatusEnum status = 6;
-
-    // Error message if the status is erroneous.
-    string error_message = 7;
-
-    // Optional details that may be of interest to a user.
-    // Should only be set if status is Downloading.
-    // Status: [Development]
-    PackageDownloadDetails download_details = 8;
-}
-
-
-// Additional details that an agent can use to describe an in-progress package download.
-// Status: [Development]
-message PackageDownloadDetails {
-    // The package download progress as a percentage.
-    double download_percent = 1;
-
-    // The current package download rate in bytes per second.
-    double download_bytes_per_second = 2;
-}
-
-// The status of this package.
-// Status: [Beta]
-enum PackageStatusEnum {
-    // Package is successfully installed by the Agent.
-    // The error_message field MUST NOT be set.
-    PackageStatusEnum_Installed = 0;
-
-    // Installation of this package has not yet started.
-    PackageStatusEnum_InstallPending = 1;
-
-    // Agent is currently installing the package.
-    // server_offered_hash field MUST be set to indicate the version that the
-    // Agent is installing. The error_message field MUST NOT be set.
-    PackageStatusEnum_Installing = 2;
-
-    // Agent tried to install the package but installation failed.
-    // server_offered_hash field MUST be set to indicate the version that the Agent
-    // tried to install. The error_message may also contain more details about
-    // the failure.
-    PackageStatusEnum_InstallFailed = 3;
-
-    // Agent is currently downloading the package.
-    // server_offered_hash field MUST be set to indicate the version that the
-    // Agent is installing. The error_message field MUST NOT be set.
-    // Status: [Development]
-    PackageStatusEnum_Downloading = 4;
-}
-
-// Properties related to identification of the Agent, which can be overridden
-// by the Server if needed
-message AgentIdentification {
-    // When new_instance_uid is set, Agent MUST update instance_uid
-    // to the value provided and use it for all further communication.
-    // MUST be 16 bytes long and SHOULD be generated using the UUID v7 spec.
-    bytes new_instance_uid = 1;
-}
-
-/////////////////////////////////////////////////////////////////////////////////////
-// Config messages
-/////////////////////////////////////////////////////////////////////////////////////
-
-message AgentRemoteConfig {
-    // Agent config offered by the management Server to the Agent instance. SHOULD NOT be
-    // set if the config for this Agent has not changed since it was last requested (i.e.
-    // AgentConfigRequest.last_remote_config_hash field is equal to
-    // AgentConfigResponse.config_hash field).
-    AgentConfigMap config = 1;
-
-    // Hash of "config". The Agent SHOULD include this value in subsequent
-    // RemoteConfigStatus messages in the last_remote_config_hash field. This in turn
-    // allows the management Server to identify that a new config is available for the Agent.
-    //
-    // This field MUST be always set if the management Server supports remote configuration
-    // of agents.
-    //
-    // Management Server must choose a hashing function that guarantees lack of hash
-    // collisions in practice.
-    bytes config_hash = 2;
-}
-
-message AgentConfigMap {
-    // Map of configs. Keys are config file names or config section names.
-    // The configuration is assumed to be a collection of one or more named config files
-    // or sections.
-    // For agents that use a single config file or section the map SHOULD contain a single
-    // entry and the key may be an empty string.
-    map<string, AgentConfigFile> config_map = 1;
-}
-
-message AgentConfigFile {
-    // Config file or section body. The content, format and encoding depends on the Agent
-    // type. The content_type field may optionally describe the MIME type of the body.
-    bytes body = 1;
-
-    // Optional MIME Content-Type that describes what's in the body field, for
-    // example "text/yaml".
-    string content_type = 2;
-}
-
-/////////////////////////////////////////////////////////////////////////////////////
-// Custom messages
-/////////////////////////////////////////////////////////////////////////////////////
-
-message CustomCapabilities {
-    // A list of custom capabilities that are supported. Each capability is a reverse FQDN
-    // with optional version information that uniquely identifies the custom capability
-    // and should match a capability specified in a supported CustomMessage.
-    // Status: [Development]
-    repeated string capabilities = 1;
-}
-
-message CustomMessage {
-    // A reverse FQDN that uniquely identifies the capability and matches one of the
-    // capabilities in the CustomCapabilities message.
-    // Status: [Development]
-    string capability = 1;
-
-    // Type of message within the capability. The capability defines the types of custom
-    // messages that are used to implement the capability. The type must only be unique
-    // within the capability.
-    // Status: [Development]
-    string type = 2;
-
-    // Binary data of the message. The capability must specify the format of the contents
-    // of the data for each custom message type it defines.
-    // Status: [Development]
-    bytes data = 3;
-}
diff --git a/control_plane/sketch_capabilities.yml b/control_plane/sketch_capabilities.yml
deleted file mode 100644
index c3daa3cba..000000000
--- a/control_plane/sketch_capabilities.yml
+++ /dev/null
@@ -1,66 +0,0 @@
-# Sketch capability profiles.
-#
-# These numbers describe the performance characteristics of each sketch
-# implementation. The optimizer and physical planner use them to decide
-# which sketch fits within a stage's budget.
-#
-# Source: initial values are estimates. Run benchmarks to calibrate:
-#   ./e2esdkbench --sketch-type=ddsketch --series=1000 --duration=60s
-# Then update this file with measured values.
-#
-# Env var: CONTROLLER_SKETCH_CAPABILITIES=path/to/this/file.yml
-
-ddsketch:
-  insert_throughput: 10000000.0    # samples/sec (single core)
-  query_throughput: 50000000.0     # queries/sec (single core)
-  memory_bytes_per_series: 4096    # bytes
-  cpu_micros_per_insert: 0.1       # µs/sample
-  transmission_bytes: 4096         # bytes per flush
-  supported_intents: [quantile, extrema]
-  mergeable: true
-  supports_delta: true
-  supports_sliding_window: false
-
-kll:
-  insert_throughput: 5000000.0
-  query_throughput: 20000000.0
-  memory_bytes_per_series: 8192
-  cpu_micros_per_insert: 0.2
-  transmission_bytes: 8192
-  supported_intents: [quantile, extrema]
-  mergeable: true
-  supports_delta: false            # KLL uses random compaction, not additive
-  supports_sliding_window: false
-
-hll:
-  insert_throughput: 20000000.0
-  query_throughput: 100000000.0
-  memory_bytes_per_series: 16384   # 2^14 registers
-  cpu_micros_per_insert: 0.05
-  transmission_bytes: 16384
-  supported_intents: [cardinality]
-  mergeable: true
-  supports_delta: true
-  supports_sliding_window: false
-
-count_sketch:
-  insert_throughput: 8000000.0
-  query_throughput: 10000000.0
-  memory_bytes_per_series: 80000   # 2000 width × 5 depth × 8 bytes
-  cpu_micros_per_insert: 0.5
-  transmission_bytes: 80000
-  supported_intents: [frequency]
-  mergeable: true
-  supports_delta: true
-  supports_sliding_window: false
-
-count_min_sketch:
-  insert_throughput: 8000000.0
-  query_throughput: 10000000.0
-  memory_bytes_per_series: 80000
-  cpu_micros_per_insert: 0.5
-  transmission_bytes: 80000
-  supported_intents: [frequency]
-  mergeable: true
-  supports_delta: true
-  supports_sliding_window: false
diff --git a/control_plane/sketch_params_default.yml b/control_plane/sketch_params_default.yml
deleted file mode 100644
index e978b433f..000000000
--- a/control_plane/sketch_params_default.yml
+++ /dev/null
@@ -1,36 +0,0 @@
-# Sketch parameter defaults for the control plane planner.
-#
-# All values here are the compiled-in defaults.  Override any field to
-# customise sketch sizing without recompiling.
-#
-# Env var: CONTROLLER_SKETCH_DEFAULTS=path/to/this/file.yaml
-
-# Quantile grid used when the query does not specify explicit φ values.
-quantile_grid: [0.0, 0.25, 0.5, 0.75, 0.9, 0.99, 1.0]
-
-ddsketch:
-  # DDSketch relative accuracy (α).  Lower = more buckets = higher memory.
-  relative_accuracy: 0.01
-
-kll:
-  # Minimum k parameter (clamped from ⌈1/accuracy_sla⌉).
-  min_k: 32
-
-hll:
-  # HLL precision for coarse SLA (accuracy > precision_threshold).
-  precision_coarse: 10
-  # HLL precision for fine SLA (accuracy ≤ precision_threshold).
-  precision_fine: 14
-  # SLA boundary between coarse and fine precision bands.
-  precision_threshold: 0.02
-
-count_sketch:
-  # Relative error bound (ε ≈ 1/√cols for equivalent width).
-  epsilon: 0.022
-  # Error probability (δ ≈ e^(−rows) for equivalent depth).
-  delta: 0.007
-
-count_min_sketch:
-  rows: 5
-  cols: 2048
-  metric_name: "countsketch_partition"
diff --git a/control_plane/src/accuracy.rs b/control_plane/src/accuracy.rs
deleted file mode 100644
index 4f52b0d9d..000000000
--- a/control_plane/src/accuracy.rs
+++ /dev/null
@@ -1,150 +0,0 @@
-//! Adapt planner sketch parameters to ASAPPlanner accuracy guarantees.
-
-use crate::types::SketchParams;
-pub use asap_types::accuracy::{AccuracyKind, AccuracyProfile};
-use planner_types::post_asap::SketchParams as PlannerParams;
-
-pub fn derive(params: &SketchParams) -> AccuracyProfile {
-    let normalized = match params {
-        SketchParams::CountMinSketch { rows, cols, .. } => PlannerParams::Cms {
-            depth: (*rows).max(1),
-            width: (*cols).max(1),
-        },
-        SketchParams::CountSketch { epsilon, delta } => {
-            return AccuracyProfile {
-                epsilon: *epsilon,
-                delta: Some(*delta),
-                kind: AccuracyKind::AdditiveFrequency,
-            }
-        }
-        SketchParams::HLL { precision } => PlannerParams::Hll {
-            precision: u8::try_from(*precision).unwrap_or(14),
-        },
-        SketchParams::KLL { k, .. } => PlannerParams::Kll { k: (*k).max(1) },
-        SketchParams::DDSketch {
-            relative_accuracy, ..
-        } => PlannerParams::DDSketch {
-            alpha: *relative_accuracy,
-        },
-    };
-    AccuracyProfile::from_sketch_params(&normalized)
-        .expect("shared family has a numeric planner bound")
-}
-
-/// Source adapter for planner configuration parameters.
-pub trait PlannerAccuracyProfile {
-    fn derive(params: &SketchParams) -> Self;
-}
-impl PlannerAccuracyProfile for AccuracyProfile {
-    fn derive(params: &SketchParams) -> Self {
-        derive(params)
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    #[test]
-    fn cms_bound_is_e_over_w() {
-        let p = derive(&SketchParams::CountMinSketch {
-            rows: 3,
-            cols: 1000,
-            metric_name: "m".into(),
-        });
-        assert_eq!(p.kind, AccuracyKind::AdditiveFrequency);
-        assert!((p.epsilon - std::f64::consts::E / 1000.0).abs() < 1e-12);
-        assert!((p.delta.unwrap() - (-3.0_f64).exp()).abs() < 1e-12);
-    }
-
-    #[test]
-    fn countsketch_passes_through_user_supplied_bounds() {
-        let p = derive(&SketchParams::CountSketch {
-            epsilon: 0.01,
-            delta: 0.001,
-        });
-        assert_eq!(p.kind, AccuracyKind::AdditiveFrequency);
-        assert_eq!(p.epsilon, 0.01);
-        assert_eq!(p.delta, Some(0.001));
-    }
-
-    #[test]
-    fn hll_p14_matches_flajolet_bound() {
-        let p = derive(&SketchParams::HLL { precision: 14 });
-        assert_eq!(p.kind, AccuracyKind::RelativeCardinality);
-        // 1.04 / √16384 = 0.008125
-        assert!((p.epsilon - 0.008125).abs() < 1e-9);
-    }
-
-    #[test]
-    fn kll_k200_matches_karnin_lang_liberty_bound() {
-        let p = derive(&SketchParams::KLL {
-            k: 200,
-            quantiles: vec![0.5, 0.95, 0.99],
-        });
-        assert_eq!(p.kind, AccuracyKind::RankQuantile);
-        assert!((p.epsilon - 2.296 / 200.0_f64.powf(0.9723)).abs() < 1e-12);
-        assert!((p.delta.unwrap() - 0.01).abs() < 1e-12);
-    }
-
-    #[test]
-    fn ddsketch_alpha_passes_through_verbatim() {
-        for alpha in [0.005, 0.01, 0.02, 0.05] {
-            let p = derive(&SketchParams::DDSketch {
-                relative_accuracy: alpha,
-                quantiles: vec![0.5, 0.99],
-            });
-            assert_eq!(p.kind, AccuracyKind::RelativeQuantile);
-            assert_eq!(p.epsilon, alpha);
-            assert_eq!(p.delta, Some(0.0));
-        }
-    }
-
-    /// Keep the user-facing summary explicit about unknown HLL confidence.
-    #[test]
-    fn golden_parity_with_backend() {
-        // HLL precision=14: ε = 0.008125, kind = relative_cardinality
-        let p = derive(&SketchParams::HLL { precision: 14 });
-        assert_eq!(
-            p.summary(),
-            "accuracy: ε=0.008125, δ=unknown, kind=relative_cardinality"
-        );
-
-        // KLL k=200: ε = 2.296 / 200^0.9723, kind = rank_quantile, δ = 0.01
-        let p = derive(&SketchParams::KLL {
-            k: 200,
-            quantiles: vec![],
-        });
-        let expected_eps = 2.296_f64 / 200.0_f64.powf(0.9723);
-        assert_eq!(
-            p.summary(),
-            format!("accuracy: ε={}, δ=0.01, kind=rank_quantile", expected_eps)
-        );
-
-        // DDSketch α=0.02: passes verbatim, δ=0, kind=relative_quantile
-        let p = derive(&SketchParams::DDSketch {
-            relative_accuracy: 0.02,
-            quantiles: vec![],
-        });
-        assert_eq!(p.summary(), "accuracy: ε=0.02, δ=0, kind=relative_quantile");
-    }
-
-    #[test]
-    fn kind_serialises_to_snake_case() {
-        let p = derive(&SketchParams::HLL { precision: 14 });
-        let json = serde_json::to_string(&p).unwrap();
-        assert!(json.contains("\"kind\":\"relative_cardinality\""));
-    }
-
-    #[test]
-    fn round_trip_through_serde() {
-        let src = AccuracyProfile {
-            epsilon: 0.008125,
-            delta: None,
-            kind: AccuracyKind::RelativeCardinality,
-        };
-        let json = serde_json::to_string(&src).unwrap();
-        let back: AccuracyProfile = serde_json::from_str(&json).unwrap();
-        assert_eq!(back, src);
-    }
-}
diff --git a/control_plane/src/backend_client.rs b/control_plane/src/backend_client.rs
deleted file mode 100644
index dc356a00c..000000000
--- a/control_plane/src/backend_client.rs
+++ /dev/null
@@ -1,724 +0,0 @@
-//! Publish and activate complete physical-plan generations on the backend.
-
-use std::time::Duration;
-
-#[cfg(test)]
-use anyhow::{Context, Result};
-use reqwest::Client;
-#[cfg(test)]
-use tracing::debug;
-#[cfg(test)]
-use tracing::warn;
-
-/// Classification of an HTTP push failure used by the retry layer in
-/// [`crate::emit::backend_push`]. Transient errors are safe to retry
-/// (the controller raced ahead of the backend's route bind, the host
-/// hasn't finished accepting TCP yet, a transient 5xx during backend
-/// startup, etc.); permanent errors indicate the call itself is wrong
-/// (bad payload, 4xx other than 404) and retrying just amplifies the
-/// log noise without improving the outcome.
-///
-/// This type sits next to [`BackendClient`] because the classification
-/// is a property of how the backend responded, not of how the caller
-/// retries — keeping the classifier here lets every endpoint method
-/// share the same transient/permanent definition.
-#[derive(Debug)]
-pub enum BackendPostError {
-    /// Worth another attempt after backoff: connection refused,
-    /// connect timeout, DNS resolution failure, 404 (route not yet
-    /// registered), or any 5xx.
-    Transient(anyhow::Error),
-    /// Will fail again the same way: 4xx other than 404 (bad payload,
-    /// auth, etc.). The retry layer surfaces these immediately.
-    Permanent(anyhow::Error),
-}
-
-impl BackendPostError {
-    pub fn is_transient(&self) -> bool {
-        matches!(self, BackendPostError::Transient(_))
-    }
-
-    pub fn into_inner(self) -> anyhow::Error {
-        match self {
-            BackendPostError::Transient(e) | BackendPostError::Permanent(e) => e,
-        }
-    }
-}
-
-impl std::fmt::Display for BackendPostError {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        match self {
-            BackendPostError::Transient(e) => write!(f, "transient: {e}"),
-            BackendPostError::Permanent(e) => write!(f, "permanent: {e}"),
-        }
-    }
-}
-
-impl std::error::Error for BackendPostError {}
-
-/// Inspect a `reqwest::Error` and decide whether the failure is worth
-/// retrying. Connection-level failures (no TCP socket / DNS / connect
-/// timeout) and request-side timeouts are transient — the backend is
-/// likely still coming up.
-fn classify_reqwest_error(err: reqwest::Error) -> BackendPostError {
-    if err.is_connect() || err.is_timeout() || err.is_request() {
-        BackendPostError::Transient(anyhow::Error::new(err))
-    } else {
-        // body decode, redirect loops, etc. — these will not resolve
-        // themselves on retry.
-        BackendPostError::Permanent(anyhow::Error::new(err))
-    }
-}
-
-/// Map a non-2xx HTTP status to a [`BackendPostError`]. 404 and 5xx
-/// are transient; every other 4xx is permanent.
-fn classify_http_status(status: reqwest::StatusCode, body: String, what: &str) -> BackendPostError {
-    let err = anyhow::anyhow!("backend returned {} for {}: {}", status, what, body);
-    if status == reqwest::StatusCode::NOT_FOUND || status.is_server_error() {
-        BackendPostError::Transient(err)
-    } else {
-        BackendPostError::Permanent(err)
-    }
-}
-
-/// Minimal HTTP client for ASAPQuery-backend's physical-plan endpoint.
-/// Built once at control-plane startup from the
-/// `CONTROL_PLANE_BACKEND_ENDPOINT` environment variable and shared
-/// via `Arc` with the replanner.
-#[derive(Debug, Clone)]
-pub struct BackendClient {
-    endpoint: String,
-    http: Client,
-}
-
-impl BackendClient {
-    /// Construct a client pointing at the backend's plan-push endpoint.
-    /// `endpoint` should be the full URL, e.g.
-    /// `http://backend.svc:8088/api/v1/physical-plan`.
-    ///
-    /// A 5-second timeout bounds the duration a slow or unreachable
-    /// backend can stall the replanner — consistent with the symmetric
-    /// 5-second timeout on ASAPQuery-backend's `HttpControlPlaneClient`
-    /// (the reverse direction in the same loop).
-    pub fn new(endpoint: impl Into<String>) -> Self {
-        let http = Client::builder()
-            .timeout(Duration::from_secs(5))
-            .build()
-            .unwrap_or_else(|_| Client::new());
-        Self {
-            endpoint: endpoint.into(),
-            http,
-        }
-    }
-
-    /// Construct with an explicit `reqwest::Client`. Used by tests that
-    /// need to inject a mock-server URL without reconfiguring the
-    /// timeout setup.
-    pub fn with_http(endpoint: impl Into<String>, http: Client) -> Self {
-        Self {
-            endpoint: endpoint.into(),
-            http,
-        }
-    }
-
-    pub fn endpoint(&self) -> &str {
-        &self.endpoint
-    }
-
-    /// Test-only transport helper: POST the given YAML to the backend. Returns
-    /// `Ok(())` on any 2xx status, otherwise an error carrying the
-    /// status code and response body. The caller (typically
-    /// [`Replanner::replan_metric`]) logs the error and moves on — the
-    /// next replan cycle will retry with the latest plan.
-    #[cfg(test)]
-    pub async fn push_streaming_config(&self, yaml: String) -> Result<()> {
-        debug!(
-            endpoint = %self.endpoint,
-            yaml_bytes = yaml.len(),
-            "pushing streaming-config YAML to ASAPQuery-backend"
-        );
-        let resp = self
-            .http
-            .post(&self.endpoint)
-            .header("content-type", "application/x-yaml")
-            .body(yaml)
-            .send()
-            .await
-            .context("failed to POST streaming-config to backend")?;
-
-        let status = resp.status();
-        if status.is_success() {
-            Ok(())
-        } else {
-            let body = resp.text().await.unwrap_or_default();
-            Err(anyhow::anyhow!(
-                "backend returned {} for streaming-config POST: {}",
-                status,
-                body
-            ))
-        }
-    }
-
-    #[cfg(test)]
-    /// Post streaming configuration as `application/json`. The backend accepts
-    /// both JSON and YAML; a non-2xx response is an error for the caller to log.
-    pub async fn post_streaming_config_json(&self, json: String) -> Result<()> {
-        debug!(
-            endpoint = %self.endpoint,
-            json_bytes = json.len(),
-            "posting streaming-config JSON to ASAPQuery-backend"
-        );
-        let resp = self
-            .http
-            .post(&self.endpoint)
-            .header("content-type", "application/json")
-            .body(json)
-            .send()
-            .await
-            .context("failed to POST streaming-config JSON to backend")?;
-
-        let status = resp.status();
-        if status.is_success() {
-            Ok(())
-        } else {
-            let body = resp.text().await.unwrap_or_default();
-            Err(anyhow::anyhow!(
-                "backend returned {} for streaming-config JSON POST: {}",
-                status,
-                body
-            ))
-        }
-    }
-
-    #[cfg(test)]
-    /// Typed sibling of [`Self::post_streaming_config_json`] for the
-    /// retry layer. Returns the same `Ok(())` on 2xx, but on failure
-    /// classifies the underlying cause as [`BackendPostError::Transient`]
-    /// or [`BackendPostError::Permanent`] so the caller can decide
-    /// whether another attempt is worthwhile.
-    ///
-    /// Public-interface preservation: the existing
-    /// [`Self::post_streaming_config_json`] remains untouched — callers
-    /// that don't need retry semantics keep their `anyhow::Result`
-    /// shape. The retry layer in `emit::backend_push` uses this typed
-    /// variant.
-    #[cfg(test)]
-    pub async fn post_streaming_config_json_typed(
-        &self,
-        json: String,
-    ) -> std::result::Result<(), BackendPostError> {
-        debug!(
-            endpoint = %self.endpoint,
-            json_bytes = json.len(),
-            "posting streaming-config JSON to ASAPQuery-backend (typed)"
-        );
-        let resp = self
-            .http
-            .post(&self.endpoint)
-            .header("content-type", "application/json")
-            .body(json)
-            .send()
-            .await
-            .map_err(classify_reqwest_error)?;
-
-        let status = resp.status();
-        if status.is_success() {
-            Ok(())
-        } else {
-            let body = resp.text().await.unwrap_or_default();
-            Err(classify_http_status(
-                status,
-                body,
-                "streaming-config JSON POST",
-            ))
-        }
-    }
-
-    #[cfg(test)]
-    /// Post backend storage-routing JSON. Derive the URL by replacing the
-    /// `/api/v1/physical-plan` suffix with `/api/v1/storage_routing`; URLs
-    /// without that suffix are used verbatim.
-    pub async fn post_storage_routing_json(&self, json: String) -> Result<()> {
-        let url = derive_storage_routing_url(&self.endpoint);
-        debug!(
-            endpoint = %url,
-            json_bytes = json.len(),
-            "posting storage-routing JSON to ASAPQuery-backend"
-        );
-        let resp = self
-            .http
-            .post(&url)
-            .header("content-type", "application/json")
-            .body(json)
-            .send()
-            .await
-            .context("failed to POST storage-routing JSON to backend")?;
-
-        let status = resp.status();
-        if status.is_success() {
-            Ok(())
-        } else {
-            let body = resp.text().await.unwrap_or_default();
-            Err(anyhow::anyhow!(
-                "backend returned {} for storage-routing JSON POST: {}",
-                status,
-                body
-            ))
-        }
-    }
-
-    /// Publish one authoritative catalog generation and all plans that reference it.
-    pub async fn post_catalog_plan_typed(
-        &self,
-        publication: &crate::physical::publication::PhysicalPlanPublication,
-        storage_routing: Option<serde_json::Value>,
-        adaptation_evidence: &[crate::physical::compiler::RuntimeAdaptationEvidence],
-    ) -> std::result::Result<(), BackendPostError> {
-        let body = publication
-            .install_request(storage_routing, adaptation_evidence.to_vec())
-            .map_err(|error| BackendPostError::Permanent(anyhow::anyhow!(error)))?;
-        let response = self
-            .http
-            .post(derive_physical_plan_url(&self.endpoint))
-            .json(&body)
-            .send()
-            .await
-            .map_err(classify_reqwest_error)?;
-        let status = response.status();
-        if status.is_success() {
-            Ok(())
-        } else {
-            let body = response.text().await.unwrap_or_default();
-            Err(classify_http_status(
-                status,
-                body,
-                "catalog physical-plan POST",
-            ))
-        }
-    }
-
-    pub async fn discard_staged_physical_plan(
-        &self,
-        plan_id: u64,
-        plan_version: u64,
-    ) -> std::result::Result<(), BackendPostError> {
-        let response = self
-            .http
-            .post(format!(
-                "{}/discard",
-                derive_physical_plan_url(&self.endpoint)
-            ))
-            .json(&serde_json::json!({"plan_id": plan_id, "plan_version": plan_version}))
-            .send()
-            .await
-            .map_err(classify_reqwest_error)?;
-        let status = response.status();
-        if status.is_success() {
-            Ok(())
-        } else {
-            Err(classify_http_status(
-                status,
-                response.text().await.unwrap_or_default(),
-                "PhysicalPlan discard POST",
-            ))
-        }
-    }
-
-    pub async fn activate_physical_plan(
-        &self,
-        plan_id: u64,
-        plan_version: u64,
-    ) -> std::result::Result<(), BackendPostError> {
-        let url = format!("{}/activate", derive_physical_plan_url(&self.endpoint));
-        let response = self
-            .http
-            .post(&url)
-            .json(&serde_json::json!({
-                "plan_id": plan_id,
-                "plan_version": plan_version,
-            }))
-            .send()
-            .await
-            .map_err(classify_reqwest_error)?;
-        let status = response.status();
-        if status.is_success() {
-            Ok(())
-        } else {
-            let body = response.text().await.unwrap_or_default();
-            Err(classify_http_status(
-                status,
-                body,
-                "PhysicalPlan activation POST",
-            ))
-        }
-    }
-}
-
-fn derive_physical_plan_url(endpoint: &str) -> String {
-    endpoint.to_string()
-}
-
-/// Map a physical-plan endpoint URL to the sibling storage-routing
-/// endpoint by rewriting the trailing path component. URLs that don't
-/// end with `/api/v1/physical-plan` (or `/api/v1/physical_plan` —
-/// either spelling is supported) pass through unchanged so tests can
-/// inject a mock-server URL directly.
-#[cfg(test)]
-fn derive_storage_routing_url(endpoint: &str) -> String {
-    const STREAMING_PATH_DASH: &str = "/api/v1/physical-plan";
-    const STREAMING_PATH_UNDERSCORE: &str = "/api/v1/physical_plan";
-    const ROUTING_PATH: &str = "/api/v1/storage_routing";
-    if let Some(stripped) = endpoint.strip_suffix(STREAMING_PATH_DASH) {
-        return format!("{stripped}{ROUTING_PATH}");
-    }
-    if let Some(stripped) = endpoint.strip_suffix(STREAMING_PATH_UNDERSCORE) {
-        return format!("{stripped}{ROUTING_PATH}");
-    }
-    endpoint.to_string()
-}
-
-#[cfg(test)]
-/// Fire-and-forget convenience helper used by the replanner. Logs
-/// errors at WARN and never propagates them — the replanner should
-/// never fail an entire replan because the backend was temporarily
-/// unreachable.
-pub async fn push_or_log(client: &BackendClient, metric: &str, yaml: String) {
-    match client.push_streaming_config(yaml).await {
-        Ok(()) => {
-            debug!(metric, endpoint = %client.endpoint, "streaming-config push succeeded");
-        }
-        Err(e) => {
-            warn!(
-                metric,
-                endpoint = %client.endpoint,
-                error = %e,
-                "streaming-config push to ASAPQuery-backend failed; \
-                 next replan cycle will retry"
-            );
-        }
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use axum::extract::State;
-    use axum::routing::post;
-    use axum::Router;
-    use std::sync::{Arc as StdArc, Mutex};
-
-    #[derive(Clone)]
-    struct SharedSink(StdArc<Mutex<Vec<String>>>);
-
-    async fn start_mock_backend(sink: SharedSink, status: axum::http::StatusCode) -> String {
-        let app = Router::new()
-            .route(
-                "/api/v1/physical-plan",
-                post(
-                    move |State(sink): State<SharedSink>, body: axum::body::Bytes| async move {
-                        let yaml = String::from_utf8_lossy(&body).to_string();
-                        sink.0.lock().unwrap().push(yaml);
-                        status
-                    },
-                ),
-            )
-            .with_state(sink);
-        let listener = tokio::net::TcpListener::bind("127.0.0.1:0").await.unwrap();
-        let addr = listener.local_addr().unwrap();
-        tokio::spawn(async move {
-            axum::serve(listener, app).await.unwrap();
-        });
-        tokio::time::sleep(Duration::from_millis(50)).await;
-        format!("http://{addr}/api/v1/physical-plan")
-    }
-
-    #[tokio::test]
-    async fn success_path_round_trips_yaml() {
-        let sink = SharedSink(StdArc::new(Mutex::new(Vec::new())));
-        let url = start_mock_backend(sink.clone(), axum::http::StatusCode::OK).await;
-
-        let client = BackendClient::new(url);
-        let yaml = "aggregations:\n  - metric: cpu\n".to_string();
-        client
-            .push_streaming_config(yaml.clone())
-            .await
-            .expect("push ok");
-
-        let received = sink.0.lock().unwrap();
-        assert_eq!(received.len(), 1);
-        assert_eq!(received[0], yaml);
-    }
-
-    #[tokio::test]
-    async fn non_2xx_status_is_reported_as_error() {
-        let sink = SharedSink(StdArc::new(Mutex::new(Vec::new())));
-        let url =
-            start_mock_backend(sink.clone(), axum::http::StatusCode::INTERNAL_SERVER_ERROR).await;
-
-        let client = BackendClient::new(url);
-        let result = client.push_streaming_config("whatever".to_string()).await;
-        assert!(result.is_err(), "expected error on 500, got {result:?}");
-        let msg = result.unwrap_err().to_string();
-        assert!(msg.contains("500"), "error msg should mention 500: {msg}");
-    }
-
-    #[tokio::test]
-    async fn push_or_log_swallows_errors() {
-        // Point at an unreachable port so the request fails fast.
-        let client = BackendClient::new("http://127.0.0.1:1/api/v1/physical-plan");
-        // Must not panic or propagate — fire-and-forget semantics.
-        push_or_log(&client, "cpu_usage", "content".to_string()).await;
-    }
-
-    /// the JSON variant POSTs the body verbatim, returns
-    /// `Ok(())` on a 2xx, and surfaces non-2xx as `Err`. Mock backend
-    /// captures the body so we can verify it round-trips.
-    #[tokio::test]
-    async fn json_post_round_trips_body() {
-        let sink = SharedSink(StdArc::new(Mutex::new(Vec::new())));
-        let url = start_mock_backend(sink.clone(), axum::http::StatusCode::OK).await;
-
-        let client = BackendClient::new(url);
-        let json = r#"{"aggregations":[{"metric":"latency"}]}"#.to_string();
-        client
-            .post_streaming_config_json(json.clone())
-            .await
-            .expect("json post ok");
-
-        let received = sink.0.lock().unwrap();
-        assert_eq!(received.len(), 1);
-        assert_eq!(received[0], json);
-    }
-
-    /// non-2xx from the backend surfaces as an error so the
-    /// caller (handle_plan) can log + move on.
-    #[tokio::test]
-    async fn json_post_non_2xx_is_error() {
-        let sink = SharedSink(StdArc::new(Mutex::new(Vec::new())));
-        let url = start_mock_backend(sink.clone(), axum::http::StatusCode::BAD_REQUEST).await;
-
-        let client = BackendClient::new(url);
-        let result = client.post_streaming_config_json("{}".to_string()).await;
-        assert!(result.is_err(), "expected error on 400, got {result:?}");
-        let msg = result.unwrap_err().to_string();
-        assert!(msg.contains("400"), "error msg should mention 400: {msg}");
-    }
-
-    /// storage-routing-URL derivation rewrites the path
-    /// component when the configured endpoint ends in
-    /// `/api/v1/physical-plan`, leaving everything else untouched.
-    #[test]
-    fn storage_routing_url_rewrites_streaming_path() {
-        assert_eq!(
-            derive_storage_routing_url("http://backend:8088/api/v1/physical-plan"),
-            "http://backend:8088/api/v1/storage_routing"
-        );
-        assert_eq!(
-            derive_storage_routing_url("http://backend:8088/api/v1/physical_plan"),
-            "http://backend:8088/api/v1/storage_routing"
-        );
-    }
-
-    #[test]
-    fn storage_routing_url_preserves_unknown_paths_for_tests() {
-        // Test escape hatch — a mock-server URL pointing directly at
-        // `/api/v1/storage_routing` already passes through unchanged.
-        assert_eq!(
-            derive_storage_routing_url("http://127.0.0.1:1/api/v1/storage_routing"),
-            "http://127.0.0.1:1/api/v1/storage_routing"
-        );
-        // Unrelated path passes through too — no surprise rewriting.
-        assert_eq!(derive_storage_routing_url("http://x/foo"), "http://x/foo");
-    }
-
-    #[tokio::test]
-    async fn catalog_publication_posts_canonical_document_without_legacy_bytes() {
-        let snapshot: crate::physical::compiler::BackendLocalPlanningInput = serde_json::from_str(
-            include_str!("../../docs/examples/asapquery-planning-snapshot.json"),
-        )
-        .unwrap();
-        let publication = crate::physical::compiler::tests::quoted_snapshot(
-            snapshot,
-            crate::physical::compiler::QueryFrontend::PromQl,
-        )
-        .compile_promql()
-        .unwrap()
-        .to_publication_artifact()
-        .unwrap();
-        let hits: StdArc<Mutex<Vec<serde_json::Value>>> = StdArc::new(Mutex::new(Vec::new()));
-        let route_hits = hits.clone();
-        let app = Router::new().route(
-            "/api/v1/physical-plan",
-            post(move |axum::Json(body): axum::Json<serde_json::Value>| {
-                let hits = route_hits.clone();
-                async move {
-                    hits.lock().unwrap().push(body);
-                    axum::http::StatusCode::OK
-                }
-            }),
-        );
-        let listener = tokio::net::TcpListener::bind("127.0.0.1:0").await.unwrap();
-        let addr = listener.local_addr().unwrap();
-        let server = tokio::spawn(async move {
-            axum::serve(listener, app).await.unwrap();
-        });
-        let client = BackendClient::new(format!("http://{addr}/api/v1/physical-plan"));
-        client
-            .post_catalog_plan_typed(&publication, None, &[])
-            .await
-            .unwrap();
-        let bodies = hits.lock().unwrap();
-        assert_eq!(bodies.len(), 1);
-        let envelope: crate::physical::publication::PhysicalPlanInstallRequest =
-            serde_json::from_value(bodies[0].clone()).unwrap();
-        assert!(envelope.storage_routing.is_none());
-        assert!(envelope.adaptation_evidence.is_empty());
-        for field in [
-            "summary_catalog",
-            "precompute_plan",
-            "collector_plans",
-            "transmission_plan",
-            "query_plan",
-            "storage_routing",
-            "adaptation_evidence",
-        ] {
-            assert!(bodies[0].get(field).is_some(), "missing {field}");
-        }
-        server.abort();
-    }
-
-    /// full happy path. A mock backend hosts the storage
-    /// routing endpoint; the client POSTs the control-plane-emitted JSON
-    /// and the body round-trips verbatim. Mirrors `json_post_round_trips_body`.
-    async fn start_mock_routing_backend(
-        sink: SharedSink,
-        status: axum::http::StatusCode,
-    ) -> String {
-        let app = Router::new()
-            .route(
-                "/api/v1/storage_routing",
-                post(
-                    move |State(sink): State<SharedSink>, body: axum::body::Bytes| async move {
-                        let json = String::from_utf8_lossy(&body).to_string();
-                        sink.0.lock().unwrap().push(json);
-                        status
-                    },
-                ),
-            )
-            .with_state(sink);
-        let listener = tokio::net::TcpListener::bind("127.0.0.1:0").await.unwrap();
-        let addr = listener.local_addr().unwrap();
-        tokio::spawn(async move {
-            axum::serve(listener, app).await.unwrap();
-        });
-        tokio::time::sleep(Duration::from_millis(50)).await;
-        // Return the streaming-config URL — the client will rewrite
-        // the path before issuing the POST.
-        format!("http://{addr}/api/v1/physical-plan")
-    }
-
-    #[tokio::test]
-    async fn storage_routing_post_round_trips_body_via_url_rewrite() {
-        let sink = SharedSink(StdArc::new(Mutex::new(Vec::new())));
-        let url = start_mock_routing_backend(sink.clone(), axum::http::StatusCode::OK).await;
-
-        let client = BackendClient::new(url);
-        let json = r#"{"default_engine":"sketch_store","metrics":[{"name":"x","targets":[]}]}"#
-            .to_string();
-        client
-            .post_storage_routing_json(json.clone())
-            .await
-            .expect("routing post ok");
-
-        let received = sink.0.lock().unwrap();
-        assert_eq!(received.len(), 1);
-        assert_eq!(received[0], json);
-    }
-
-    /// Typed-variant classification: 404 from the backend is
-    /// transient (route not yet registered during startup race).
-    #[tokio::test]
-    async fn typed_streaming_config_404_is_transient() {
-        let sink = SharedSink(StdArc::new(Mutex::new(Vec::new())));
-        let url = start_mock_backend(sink.clone(), axum::http::StatusCode::NOT_FOUND).await;
-
-        let client = BackendClient::new(url);
-        let err = client
-            .post_streaming_config_json_typed("{}".to_string())
-            .await
-            .expect_err("404 should surface as Err");
-        assert!(err.is_transient(), "404 must classify as transient: {err}");
-    }
-
-    /// Typed-variant classification: 500 is transient.
-    #[tokio::test]
-    async fn typed_streaming_config_500_is_transient() {
-        let sink = SharedSink(StdArc::new(Mutex::new(Vec::new())));
-        let url =
-            start_mock_backend(sink.clone(), axum::http::StatusCode::INTERNAL_SERVER_ERROR).await;
-
-        let client = BackendClient::new(url);
-        let err = client
-            .post_streaming_config_json_typed("{}".to_string())
-            .await
-            .expect_err("500 should surface as Err");
-        assert!(err.is_transient(), "500 must classify as transient: {err}");
-    }
-
-    /// Typed-variant classification: 400 (other 4xx) is permanent —
-    /// retrying won't fix a malformed payload.
-    #[tokio::test]
-    async fn typed_streaming_config_400_is_permanent() {
-        let sink = SharedSink(StdArc::new(Mutex::new(Vec::new())));
-        let url = start_mock_backend(sink.clone(), axum::http::StatusCode::BAD_REQUEST).await;
-
-        let client = BackendClient::new(url);
-        let err = client
-            .post_streaming_config_json_typed("{}".to_string())
-            .await
-            .expect_err("400 should surface as Err");
-        assert!(!err.is_transient(), "400 must classify as permanent: {err}");
-    }
-
-    /// Typed-variant classification: connection refused (no listener
-    /// on the target port) is transient — the backend may still be
-    /// binding.
-    #[tokio::test]
-    async fn typed_connection_refused_is_transient() {
-        // Port 1 on loopback is reserved and refuses connections.
-        let client = BackendClient::new("http://127.0.0.1:1/api/v1/physical-plan");
-        let err = client
-            .post_streaming_config_json_typed("{}".to_string())
-            .await
-            .expect_err("connection refused should surface as Err");
-        assert!(
-            err.is_transient(),
-            "connection-refused must classify as transient: {err}"
-        );
-    }
-
-    /// Typed-variant happy path: 2xx returns Ok.
-    #[tokio::test]
-    async fn typed_streaming_config_success_is_ok() {
-        let sink = SharedSink(StdArc::new(Mutex::new(Vec::new())));
-        let url = start_mock_backend(sink.clone(), axum::http::StatusCode::OK).await;
-        let client = BackendClient::new(url);
-        client
-            .post_streaming_config_json_typed("{}".to_string())
-            .await
-            .expect("2xx must be Ok");
-    }
-
-    #[tokio::test]
-    async fn storage_routing_post_non_2xx_is_error() {
-        let sink = SharedSink(StdArc::new(Mutex::new(Vec::new())));
-        let url =
-            start_mock_routing_backend(sink.clone(), axum::http::StatusCode::INTERNAL_SERVER_ERROR)
-                .await;
-        let client = BackendClient::new(url);
-        let result = client.post_storage_routing_json("{}".to_string()).await;
-        assert!(result.is_err(), "expected error on 500, got {result:?}");
-        let msg = result.unwrap_err().to_string();
-        assert!(msg.contains("500"), "error msg should mention 500: {msg}");
-    }
-}
diff --git a/control_plane/src/clickhouse.rs b/control_plane/src/clickhouse.rs
deleted file mode 100644
index 6b5f8cd88..000000000
--- a/control_plane/src/clickhouse.rs
+++ /dev/null
@@ -1,1756 +0,0 @@
-//! ClickHouse SQL planning entry point.
-//!
-//! ASAPPlanner owns SQL parsing and canonicalization. This module only joins
-//! that frontend to the same post-ASAP physical mapping used by PromQL.
-
-use asap_frontend_sql::{lower_sql_dialect, SqlCatalog};
-use planner_types::pre_asap::QueryExpr;
-use planner_types::types::AccuracyTarget;
-use planner_types::workload::SqlDialect;
-
-use crate::physical::compiler::{PrecomputePlan, TransmissionPlan};
-use crate::physical::post_asap::{cost_model::ControlPlaneCostModel, PhysicalExpr};
-use crate::query_plan::{
-    ClickHousePlanningContext, FallbackPolicy, FixedEvaluationRange, InstantExecution,
-    MaterializationBinding, PhysicalGrouping, QueryLanguage, QueryPlan, QueryPlanEntry,
-};
-use asap_types::summary_catalog::SummaryCatalog;
-use serde::Deserialize;
-use std::collections::HashMap;
-use std::rc::Rc;
-
-#[derive(Debug, thiserror::Error)]
-pub enum ClickHousePlanningError {
-    #[error("SQL lowering failed: {0}")]
-    Lower(String),
-    #[error("physical mapping failed: {0}")]
-    Bind(#[from] crate::planner_selection::SelectionError),
-}
-
-pub struct ClickHousePlannedQuery {
-    pub canonical: QueryExpr,
-    pub canonical_sql: String,
-    pub physical: PhysicalExpr,
-    pub selection_trace: serde_json::Value,
-}
-
-pub async fn plan_clickhouse_sql(
-    sql: &str,
-    catalog: &SqlCatalog,
-    accuracy: AccuracyTarget,
-) -> Result<ClickHousePlannedQuery, ClickHousePlanningError> {
-    let canonical = lower_sql_dialect(sql, catalog, SqlDialect::ClickhouseSQL, accuracy.clone())
-        .await
-        .map_err(|error| ClickHousePlanningError::Lower(error.to_string()))?;
-    // SQL keeps relational parents such as Project and Filter above a
-    // summary-capable Aggregate. Use ASAPPlanner's recursive selector here;
-    // the PromQL deployment lowering retains its existing conservative rules.
-    let cost_model = ControlPlaneCostModel::new(accuracy.clone());
-    let (selected, selection_trace) =
-        crate::planner_selection::select_workload_with_accuracy_model_and_trace(
-            vec![(0, Rc::new(canonical.clone()))],
-            accuracy,
-            &cost_model,
-            &asap_aware_mapping::NoAccuracyEvidence,
-            &asap_aware_mapping::DefaultAccuracyModel,
-        )?;
-    let selected = selected
-        .into_iter()
-        .next()
-        .map(|(_, node)| node)
-        .ok_or_else(|| {
-            crate::planner_selection::SelectionError::Workload(
-                "SQL workload search returned no root".into(),
-            )
-        })?;
-    let physical = PhysicalExpr::committed(selected);
-    Ok(ClickHousePlannedQuery {
-        canonical_sql: canonical_sql_identity(&canonical),
-        canonical,
-        physical,
-        selection_trace,
-    })
-}
-
-#[cfg(test)]
-pub async fn canonicalize_clickhouse_sql(
-    sql: &str,
-    catalog: &SqlCatalog,
-    accuracy: AccuracyTarget,
-) -> Result<String, ClickHousePlanningError> {
-    let canonical = lower_sql_dialect(sql, catalog, SqlDialect::ClickhouseSQL, accuracy)
-        .await
-        .map_err(|error| ClickHousePlanningError::Lower(error.to_string()))?;
-    Ok(canonical_sql_identity(&canonical))
-}
-
-/// Resolve a request once, retaining the fixed identity for older publications.
-pub async fn bind_clickhouse_sql(
-    sql: &str,
-    catalog: &SqlCatalog,
-    accuracy: AccuracyTarget,
-) -> Result<(String, String, Option<(u64, u64)>), ClickHousePlanningError> {
-    let canonical = lower_sql_dialect(sql, catalog, SqlDialect::ClickhouseSQL, accuracy)
-        .await
-        .map_err(|error| ClickHousePlanningError::Lower(error.to_string()))?;
-    let fixed = format!("{canonical:?}");
-    let binding = moving_window(&canonical);
-    Ok(match binding {
-        Some((identity, range)) => (fixed, identity, Some(range)),
-        None => (fixed.clone(), fixed, None),
-    })
-}
-
-/// Only the source bounds of a single-table aggregate are runtime parameters.
-/// Expressions in projections, aggregate arguments and other predicates stay
-/// in the identity, so changing them cannot reuse the installed computation.
-pub fn canonical_sql_identity(canonical: &QueryExpr) -> String {
-    moving_window(canonical)
-        .map(|(identity, _)| identity)
-        .unwrap_or_else(|| format!("{canonical:?}"))
-}
-
-fn moving_window(canonical: &QueryExpr) -> Option<(String, (u64, u64))> {
-    use planner_types::pre_asap::{CompareOpKind, ScalarValue, Source};
-    let mut template = canonical.clone();
-    let aggregate = match &mut template {
-        QueryExpr::Project { child, .. } => Rc::make_mut(child),
-        expr => expr,
-    };
-    let QueryExpr::Aggregate { child, .. } = aggregate else {
-        return None;
-    };
-    let QueryExpr::Scan {
-        source: Source::Table { .. },
-        predicates,
-        schema,
-    } = Rc::make_mut(child)
-    else {
-        return None;
-    };
-    let time = schema.time_index?;
-    fn bounds(
-        expr: &QueryExpr,
-        time: usize,
-        lower: &mut Option<i64>,
-        upper: &mut Option<i64>,
-    ) -> Option<()> {
-        match expr {
-            QueryExpr::BoolAnd(children) => {
-                for child in children {
-                    bounds(child, time, lower, upper)?;
-                }
-            }
-            QueryExpr::Compare { left, op, right } if matches!(left.as_ref(), QueryExpr::Column(col) if *col == time) =>
-            {
-                let value = constant_int64(right)?;
-                let (target, value) = match op {
-                    CompareOpKind::Ge => (lower, value),
-                    CompareOpKind::Gt => (lower, value.checked_add(1)?),
-                    CompareOpKind::Lt => (upper, value),
-                    CompareOpKind::Le => (upper, value.checked_add(1)?),
-                    _ => return None,
-                };
-                // Redundant bounds are deliberately not generalized.
-                if target.replace(value).is_some() {
-                    return None;
-                }
-            }
-            _ => {}
-        }
-        Some(())
-    }
-    let (mut lower, mut upper) = (None, None);
-    for predicate in predicates.iter() {
-        bounds(&predicate.0, time, &mut lower, &mut upper)?;
-    }
-    let (start, end) = (u64::try_from(lower?).ok()?, u64::try_from(upper?).ok()?);
-    if start >= end {
-        return None;
-    }
-    fn normalize(expr: &mut QueryExpr, time: usize, width: i64) {
-        match expr {
-            QueryExpr::BoolAnd(children) => {
-                for child in children {
-                    normalize(child, time, width);
-                }
-            }
-            QueryExpr::Compare { left, op, right } if matches!(left.as_ref(), QueryExpr::Column(col) if *col == time) =>
-            {
-                // `bounds` has checked the integer expressions and overflow.
-                // Preserve membership by converting both edges to [start,end).
-                let value = match op {
-                    CompareOpKind::Ge | CompareOpKind::Gt => {
-                        *op = CompareOpKind::Ge;
-                        0
-                    }
-                    CompareOpKind::Lt | CompareOpKind::Le => {
-                        *op = CompareOpKind::Lt;
-                        width
-                    }
-                    _ => return,
-                };
-                *right = Rc::new(QueryExpr::Literal(ScalarValue::Int64(value)));
-            }
-            _ => {}
-        }
-    }
-    for predicate in predicates {
-        normalize(Rc::make_mut(&mut predicate.0), time, (end - start) as i64);
-    }
-    Some((format!("moving-window-v1:{template:?}"), (start, end)))
-}
-
-pub use asap_frontend_sql::SqlCatalog as ClickHouseSqlCatalog;
-
-#[derive(Debug, Deserialize)]
-#[serde(deny_unknown_fields)]
-pub struct ClickHouseSqlWorkload {
-    #[serde(rename = "sds")]
-    pub summary_catalog: SummaryCatalog,
-    pub precompute_plan: PrecomputePlan,
-    pub transmission_plan: TransmissionPlan,
-    pub tables: HashMap<String, planner_types::pre_asap::Schema>,
-    pub accuracy: AccuracyTarget,
-    pub queries: Vec<ClickHouseSqlWorkloadEntry>,
-}
-
-#[derive(Debug, Deserialize)]
-pub struct ClickHouseSqlWorkloadEntry {
-    pub sql: String,
-    pub start_ms: u64,
-    pub end_ms: u64,
-    pub cumulative: bool,
-}
-
-/// Workload input without predeclared summary families or materialization IDs.
-#[derive(Debug, Deserialize)]
-#[serde(deny_unknown_fields)]
-pub struct ClickHouseSqlAutomaticWorkload {
-    pub envelope: asap_types::precompute_plan::PlanEnvelope,
-    pub tables: HashMap<String, planner_types::pre_asap::Schema>,
-    pub accuracy: AccuracyTarget,
-    pub queries: Vec<ClickHouseSqlWorkloadEntry>,
-}
-
-pub async fn compile_automatic_clickhouse_workload(
-    request: &ClickHouseSqlAutomaticWorkload,
-) -> Result<
-    (
-        crate::physical::publication::PhysicalPlanPublication,
-        std::collections::BTreeMap<String, serde_json::Value>,
-    ),
-    ClickHousePlanningError,
-> {
-    let catalog = SqlCatalog {
-        tables: request.tables.clone(),
-    };
-    let mut entries = std::collections::BTreeMap::new();
-    let mut window_templates = std::collections::BTreeMap::<String, Vec<String>>::new();
-    let mut installed_dags = std::collections::BTreeMap::new();
-    let mut selected_dags = std::collections::BTreeMap::new();
-    let mut materializations = std::collections::BTreeMap::new();
-    let mut selection_traces = std::collections::BTreeMap::new();
-    for query in &request.queries {
-        validate_sql_evaluation(query)?;
-        // Selection runs once. Compilation installs only SummaryAgg nodes
-        // actually visited in this selected DAG, never a scripted family.
-        let mut planned =
-            plan_clickhouse_sql(&query.sql, &catalog, request.accuracy.clone()).await?;
-        let selection_trace = std::mem::take(&mut planned.selection_trace);
-        let template = planned.canonical_sql.clone();
-        let (entry, installed) = compile_selected_sql(query, planned, |node, family| {
-            let config = materialize_selected_sql(node, family, query)
-                .map_err(crate::query_plan::QueryPlanError::Invalid)?;
-            let binding = MaterializationBinding {
-                full_window_slide_ms: matches!(
-                    config.window_layout,
-                    asap_types::WindowMaterializationLayout::FullWindow
-                )
-                .then_some(config.slide_interval.saturating_mul(1_000)),
-                materialization: config.policy_fingerprint().into(),
-                stored_output_reference: asap_types::sds::StoredOutputReference::for_output(
-                    config.policy_fingerprint().into(),
-                ),
-                output_grouping: PhysicalGrouping::Reduce(config.grouping_labels.names()),
-                window_ms: config.stored_window_ms(),
-                pane_origin_ms: config.pane_origin_ms,
-                readout_lookback_ms: Some(query.end_ms - query.start_ms),
-                item_labels: config.aggregated_labels.labels.clone(),
-            };
-            materializations
-                .entry(config.policy_fingerprint())
-                .or_insert(config);
-            Ok(binding)
-        })?;
-        index_sql_template(&mut window_templates, template, &entry);
-        selection_traces.insert(entry.canonical_query.clone(), selection_trace);
-        let key = QueryPlan::catalog_key(QueryLanguage::ClickHouseSql, &entry.canonical_query);
-        if entries.insert(key, entry).is_some() {
-            return Err(ClickHousePlanningError::Lower(
-                "duplicate canonical SQL query identity".into(),
-            ));
-        }
-        selected_dags.insert(query.sql.clone(), installed.document.clone());
-        installed_dags.insert(
-            query.sql.clone(),
-            installed
-                .precompute_projection()
-                .map_err(ClickHousePlanningError::Lower)?,
-        );
-    }
-    let configs: Vec<_> = materializations.into_values().collect();
-    let sds = SummaryCatalog::from_materializations(
-        request.envelope.plan_id,
-        request.envelope.plan_version,
-        &configs,
-    )
-    .map_err(|error| ClickHousePlanningError::Lower(error.to_string()))?;
-    let mut precompute = PrecomputePlan::build_backend_local(request.envelope.clone(), configs)
-        .map_err(|error| ClickHousePlanningError::Lower(error.to_string()))?;
-    precompute.executable_dags = installed_dags;
-    precompute
-        .bind_catalog(&sds)
-        .map_err(|error| ClickHousePlanningError::Lower(error.to_string()))?;
-    let mut transmission = crate::physical::compiler::build_transmission_plan(
-        request.envelope.clone(),
-        &precompute,
-        &std::collections::BTreeMap::new(),
-    )
-    .map_err(|error| ClickHousePlanningError::Lower(error.to_string()))?;
-    transmission.summary_catalog = precompute.summary_catalog.clone();
-    let mut publication = crate::physical::publication::PhysicalPlanPublication {
-        summary_catalog: sds,
-        precompute_plan: precompute,
-        collector_plans: Vec::new(),
-        transmission_plan: transmission,
-        query_plan: QueryPlan {
-            plan_id: request.envelope.plan_id,
-            plan_version: request.envelope.plan_version,
-            clickhouse_context: Some(ClickHousePlanningContext {
-                window_templates,
-                tables: request.tables.clone(),
-                accuracy: request.accuracy.clone(),
-            }),
-            selected_dags,
-            entries,
-        },
-    };
-    publication
-        .query_plan
-        .bind_catalog(&publication.summary_catalog)
-        .map_err(|error| ClickHousePlanningError::Lower(error.to_string()))?;
-    publication
-        .validate()
-        .map_err(ClickHousePlanningError::Lower)?;
-    Ok((publication, selection_traces))
-}
-
-fn materialize_selected_sql(
-    node: &planner_types::post_asap::SummaryNode,
-    family: &planner_types::post_asap::SummaryFamilyType,
-    query: &ClickHouseSqlWorkloadEntry,
-) -> Result<asap_types::PrecomputeMaterialization, String> {
-    use crate::physical::backend_stage::{AggregationInput, BackendAggregation};
-    use planner_types::{post_asap::SummaryExpr, pre_asap::Reduction};
-    let SummaryExpr::SummaryAgg {
-        reduction: Reduction::Reduce(keys),
-        child,
-        ..
-    } = &node.expr
-    else {
-        return Err("SQL materialization requires a supported reduction".into());
-    };
-    if keys.is_without() {
-        return Err("SQL grouping exclusion requires a resolved projection".into());
-    }
-    let SummaryExpr::KeepPreAsap(source) = &child.expr else {
-        return Err("SQL grouping requires a typed source subtree".into());
-    };
-    let source_schema = source.output_schema().map_err(|error| error.to_string())?;
-    let mut columns = Vec::new();
-    for key in keys.keys() {
-        let mut column = source_schema
-            .columns
-            .get(*key)
-            .cloned()
-            .ok_or("SQL grouping column is absent from source schema")?;
-        column.table = None;
-        columns.push(column);
-    }
-    let grouping = asap_types::GroupingProjection::new(columns);
-    grouping.validate_table_group_codec()?;
-    let leaf = clickhouse_materialization_leaf_contract(node, query.start_ms, query.end_ms)?;
-    let ClickHouseMaterializationLeaf {
-        table,
-        value,
-        value_source_column,
-        window_secs: window,
-        population,
-        timestamp_column: timestamp,
-    } = leaf;
-    let window_secs = window.ok_or("SQL materialization requires a bounded window")?;
-    let aggregation = BackendAggregation {
-        aggregation_id: String::new(),
-        metric_name: format!("{table}.{}", value.column().unwrap_or("constant")),
-        family: family.clone(),
-        window_secs,
-        spatial_filter: String::new(),
-        grouping: grouping.names(),
-        item_label: None,
-        heap_update_mode: None,
-        aggregation_input: AggregationInput::Raw,
-    };
-    let mut config = crate::physical::compiler::aggregation_config_for_materialization(
-        &aggregation,
-        asap_types::QueryLanguage::ClickHouseSql,
-    )
-    .map_err(|error| error.to_string())?;
-    config.table_name = Some(table);
-    config.grouping_labels = grouping;
-    config.value_projection = Some(value);
-    config.table_timestamp_column = Some(timestamp);
-    config.table_population = Some(population);
-    config.value_source_column = value_source_column;
-    config.partitioning = Some(asap_types::sds::PopulationPartitioning::Grouped);
-    config.pane_origin_ms = Some(
-        i64::try_from(query.start_ms)
-            .map_err(|_| "SQL evaluation timestamp exceeds runtime range")?,
-    );
-    config.num_aggregates_to_retain = Some(2);
-    Ok(config)
-}
-
-pub async fn compile_clickhouse_workload(
-    request: &ClickHouseSqlWorkload,
-) -> Result<crate::physical::publication::PhysicalPlanPublication, ClickHousePlanningError> {
-    request
-        .precompute_plan
-        .validate_against_catalog(&request.summary_catalog)
-        .map_err(|error| ClickHousePlanningError::Lower(error.to_string()))?;
-    request
-        .transmission_plan
-        .validate(&request.precompute_plan)
-        .map_err(|error| ClickHousePlanningError::Lower(error.to_string()))?;
-    let catalog = SqlCatalog {
-        tables: request.tables.clone(),
-    };
-    let mut entries = std::collections::BTreeMap::new();
-    let mut window_templates = std::collections::BTreeMap::<String, Vec<String>>::new();
-    let mut installed_dags = std::collections::BTreeMap::new();
-    let mut selected_dags = std::collections::BTreeMap::new();
-    for query in &request.queries {
-        let planned = plan_clickhouse_sql(&query.sql, &catalog, request.accuracy.clone()).await?;
-        let template = planned.canonical_sql.clone();
-        let (executable, installed) = compile_selected_sql(query, planned, |node, family| {
-            bind_selected_node(node, family, query, request)
-        })?;
-        index_sql_template(&mut window_templates, template, &executable);
-        selected_dags.insert(query.sql.clone(), installed.document.clone());
-        installed_dags.insert(
-            query.sql.clone(),
-            installed
-                .precompute_projection()
-                .map_err(ClickHousePlanningError::Lower)?,
-        );
-        let identity =
-            QueryPlan::catalog_key(QueryLanguage::ClickHouseSql, &executable.canonical_query);
-        if entries.insert(identity.clone(), executable).is_some() {
-            return Err(ClickHousePlanningError::Lower(format!(
-                "duplicate canonical SQL query identity `{identity}`"
-            )));
-        }
-    }
-    let mut precompute_plan = request.precompute_plan.clone();
-    precompute_plan.executable_dags = installed_dags;
-    let mut publication = crate::physical::publication::PhysicalPlanPublication {
-        summary_catalog: request.summary_catalog.clone(),
-        precompute_plan,
-        collector_plans: Vec::new(),
-        transmission_plan: request.transmission_plan.clone(),
-        query_plan: QueryPlan {
-            plan_id: request.summary_catalog.plan_id,
-            plan_version: request.summary_catalog.plan_version,
-            clickhouse_context: Some(ClickHousePlanningContext {
-                window_templates,
-                tables: request.tables.clone(),
-                accuracy: request.accuracy.clone(),
-            }),
-            selected_dags,
-            entries,
-        },
-    };
-    publication
-        .query_plan
-        .bind_catalog(&publication.summary_catalog)
-        .map_err(|error| ClickHousePlanningError::Lower(error.to_string()))?;
-    publication
-        .validate()
-        .map_err(ClickHousePlanningError::Lower)?;
-    Ok(publication)
-}
-
-fn index_sql_template(
-    templates: &mut std::collections::BTreeMap<String, Vec<String>>,
-    template: String,
-    entry: &QueryPlanEntry,
-) {
-    // External subqueries still contain fixed SQL literals.
-    if template.starts_with("moving-window-v1:")
-        && !entry
-            .nodes
-            .values()
-            .any(|node| matches!(node, crate::query_plan::QueryPlanNode::ExternalExact { .. }))
-    {
-        templates
-            .entry(template)
-            .or_default()
-            .push(entry.canonical_query.clone());
-    }
-}
-
-fn compile_selected_sql<F>(
-    query: &ClickHouseSqlWorkloadEntry,
-    planned: ClickHousePlannedQuery,
-    mut bind: F,
-) -> Result<
-    (
-        QueryPlanEntry,
-        crate::physical::executable_binding::InstalledPostAsapDag,
-    ),
-    ClickHousePlanningError,
->
-where
-    F: FnMut(
-        &Rc<planner_types::post_asap::SummaryNode>,
-        &planner_types::post_asap::SummaryFamilyType,
-    ) -> Result<MaterializationBinding, crate::query_plan::QueryPlanError>,
-{
-    validate_sql_evaluation(query)?;
-    let PhysicalExpr::Committed(crate::physical::post_asap::PostAsapPlan::Summary(root)) =
-        planned.physical
-    else {
-        return Err(ClickHousePlanningError::Lower(
-            "SQL did not produce a summary DAG".into(),
-        ));
-    };
-    let semantic = planner_types::post_asap::compile_executable_dag_with_node_ids(&root)
-        .map_err(|error| ClickHousePlanningError::Lower(error.to_string()))?;
-    let mut materialization_nodes = std::collections::BTreeMap::new();
-    let mut query_nodes = std::collections::BTreeMap::new();
-    let executable = crate::query_plan::compile_bound_relational_mapped(
-        query.sql.clone(),
-        format!("{:?}", planned.canonical),
-        &root,
-        FixedEvaluationRange {
-            start_ms: query.start_ms,
-            end_ms: query.end_ms,
-            cumulative: query.cumulative,
-        },
-        InstantExecution {
-            lookback_ms: query.end_ms.saturating_sub(query.start_ms),
-            full_history: query.start_ms == 0,
-            cumulative_readout: query.cumulative,
-        },
-        FallbackPolicy::ExactBackend,
-        |node, family| {
-            let binding = bind(node, family)?;
-            let id = semantic.node_ids.node_id(node).ok_or_else(|| {
-                crate::query_plan::QueryPlanError::Invalid(
-                    "selected SQL node is absent from semantic DAG".into(),
-                )
-            })?;
-            materialization_nodes.insert(id, binding.materialization);
-            Ok(binding)
-        },
-        |node, query_node| {
-            if let Some(id) = semantic.node_ids.node_id(node) {
-                query_nodes.insert(id, query_node);
-            }
-        },
-    )
-    .map_err(|error| ClickHousePlanningError::Lower(error.to_string()))?;
-    let installed = crate::physical::executable_binding::install_selected_dag(
-        query.sql.clone(),
-        &semantic.dag,
-        executable.root,
-        |id| materialization_nodes.get(&id).copied(),
-        |id| query_nodes.get(&id).copied(),
-    )
-    .map_err(ClickHousePlanningError::Lower)?;
-    crate::physical::executable_binding::validate_query_plan(&installed, &executable)
-        .map_err(ClickHousePlanningError::Lower)?;
-    if executable
-        .nodes
-        .values()
-        .any(|node| matches!(node, crate::query_plan::QueryPlanNode::ExactFallback { .. }))
-    {
-        return Err(ClickHousePlanningError::Lower(
-            "compiled SQL contains an unsupported operator; publication refused".into(),
-        ));
-    }
-    Ok((executable, installed))
-}
-
-fn validate_sql_evaluation(
-    query: &ClickHouseSqlWorkloadEntry,
-) -> Result<(), ClickHousePlanningError> {
-    if query.start_ms >= query.end_ms || query.end_ms > i64::MAX as u64 {
-        return Err(ClickHousePlanningError::Lower(
-            "SQL evaluation requires start_ms < end_ms within signed Unix milliseconds".into(),
-        ));
-    }
-    Ok(())
-}
-
-fn bind_selected_node(
-    node: &planner_types::post_asap::SummaryNode,
-    family: &planner_types::post_asap::SummaryFamilyType,
-    query: &ClickHouseSqlWorkloadEntry,
-    request: &ClickHouseSqlWorkload,
-) -> Result<MaterializationBinding, crate::query_plan::QueryPlanError> {
-    let ClickHouseMaterializationLeaf {
-        table: table_ref,
-        value: value_column,
-        window_secs: source_window,
-        population: spatial_filter,
-        timestamp_column,
-        ..
-    } = clickhouse_materialization_leaf_contract(node, query.start_ms, query.end_ms)
-        .map_err(crate::query_plan::QueryPlanError::Invalid)?;
-    let expected = family.clone();
-    let selected = select_materialization(
-        &request.precompute_plan.materializations,
-        &table_ref,
-        &value_column,
-        &spatial_filter.canonical(),
-        &expected,
-        source_window.unwrap_or((query.end_ms.saturating_sub(query.start_ms)) / 1000),
-    )?;
-    if selected.table_timestamp_column.as_deref() != Some(timestamp_column.as_str()) {
-        return Err(crate::query_plan::QueryPlanError::Invalid(
-            "SQL timestamp projection differs from the installed materialization".into(),
-        ));
-    }
-    Ok(MaterializationBinding {
-        full_window_slide_ms: matches!(
-            selected.window_layout,
-            asap_types::WindowMaterializationLayout::FullWindow
-        )
-        .then_some(selected.slide_interval.saturating_mul(1_000)),
-        materialization: selected.policy_fingerprint().into(),
-        stored_output_reference: asap_types::sds::StoredOutputReference::for_output(
-            selected.policy_fingerprint().into(),
-        ),
-        output_grouping: PhysicalGrouping::Reduce(selected.grouping_labels.names()),
-        window_ms: selected.stored_window_ms(),
-        pane_origin_ms: selected.pane_origin_ms,
-        readout_lookback_ms: source_window.map(|seconds| seconds.saturating_mul(1000)),
-        item_labels: selected.aggregated_labels.labels.clone(),
-    })
-}
-
-/// Evaluate only exact integer constant arithmetic at the installation boundary.
-/// No SQL text rewrite, floating coercion, or runtime-column evaluation is allowed.
-fn constant_int64(expr: &QueryExpr) -> Option<i64> {
-    use planner_types::pre_asap::{ArithmeticOpKind, ScalarValue};
-    match expr {
-        QueryExpr::Literal(ScalarValue::Int64(value)) => Some(*value),
-        QueryExpr::Arithmetic { op, left, right } => {
-            let left = constant_int64(left)?;
-            let right = constant_int64(right)?;
-            match op {
-                ArithmeticOpKind::Add => left.checked_add(right),
-                ArithmeticOpKind::Sub => left.checked_sub(right),
-                ArithmeticOpKind::Mul => left.checked_mul(right),
-                _ => None,
-            }
-        }
-        _ => None,
-    }
-}
-
-/// The table leaf a SQL summary materialization is admitted against.
-#[derive(Debug)]
-struct ClickHouseMaterializationLeaf {
-    table: String,
-    value: asap_types::sds::ValueProjectionIdentity,
-    /// Producer typing for a column projection: what the ingest path must know
-    /// to read the column safely (integer exactness, NULL skipping). `None`
-    /// for constant projections, which carry their own literal.
-    value_source_column: Option<planner_types::pre_asap::Column>,
-    window_secs: Option<u64>,
-    population: asap_types::table_population::TablePopulation,
-    timestamp_column: String,
-}
-
-fn clickhouse_materialization_leaf_contract(
-    node: &planner_types::post_asap::SummaryNode,
-    evaluation_start_ms: u64,
-    evaluation_end_ms: u64,
-) -> Result<ClickHouseMaterializationLeaf, String> {
-    use planner_types::{
-        post_asap::SummaryExpr,
-        pre_asap::{CompareOpKind, QueryExpr, ScalarValue, Source},
-    };
-    let SummaryExpr::SummaryAgg {
-        child,
-        input,
-        family,
-        ..
-    } = &node.expr
-    else {
-        return Err("SQL materialization leaf is not a summary aggregate".into());
-    };
-    if input.item.is_some() {
-        return Err("SQL item/weight summary inputs require an explicit item projection".into());
-    }
-    let SummaryExpr::KeepPreAsap(expr) = &child.expr else {
-        return Err("SQL materialization leaf has no tabular source".into());
-    };
-    fn table_scan(
-        expr: &QueryExpr,
-    ) -> Option<(
-        &str,
-        &[planner_types::pre_asap::Predicate],
-        &planner_types::pre_asap::Schema,
-    )> {
-        match expr {
-            QueryExpr::Scan {
-                source: Source::Table { table_ref },
-                predicates,
-                schema,
-            } => Some((table_ref, predicates, schema)),
-            _ => None,
-        }
-    }
-    let (source, explicit_window) = match expr.as_ref() {
-        QueryExpr::TimeRange { child, range }
-            if range.as_millis() > 0 && range.as_millis() % 1_000 == 0 =>
-        {
-            (child.as_ref(), Some(range.as_secs()))
-        }
-        source => (source, None),
-    };
-    let Some((table_ref, predicates, schema)) = table_scan(source) else {
-        return Err("SQL materialization leaf has no table scan".into());
-    };
-    use asap_types::sds::ValueProjectionIdentity;
-    use planner_types::post_asap::SummaryInputExpr;
-    let mut value_source_column = None;
-    let value_projection = match &input.weight {
-        SummaryInputExpr::Column(
-            planner_types::pre_asap::ColumnRef::Wildcard
-            | planner_types::pre_asap::ColumnRef::SampleValue,
-        ) if matches!(
-            family,
-            planner_types::post_asap::SummaryFamilyType::ExactAggregate(
-                planner_types::post_asap::ExactKind::Count,
-                _
-            )
-        ) =>
-        {
-            ValueProjectionIdentity::Constant {
-                value: ScalarValue::Int64(1),
-            }
-        }
-        SummaryInputExpr::Column(
-            planner_types::pre_asap::ColumnRef::Named(name)
-            | planner_types::pre_asap::ColumnRef::Qualified { name, .. },
-        ) => {
-            let column = schema
-                .columns
-                .iter()
-                .find(|column| column.name == *name)
-                .ok_or("SQL summary value projection is not a source column")?;
-            // Numeric source columns are admitted with their declared type and
-            // nullability, which the ingest reader honours: integers get an
-            // exactness guard on the way into f64 summary state, and NULL rows
-            // are skipped the way a SQL aggregate skips them. Non-numeric
-            // columns have no value semantics to summarise and stay refused.
-            if !matches!(
-                column.dtype,
-                planner_types::pre_asap::DataType::Float64
-                    | planner_types::pre_asap::DataType::Int64
-            ) {
-                return Err(format!(
-                    "SQL value readout requires a numeric source column; `{name}` is {:?}",
-                    column.dtype
-                ));
-            }
-            let mut source_column = column.clone();
-            source_column.table = None;
-            value_source_column = Some(source_column);
-            ValueProjectionIdentity::Column { name: name.clone() }
-        }
-        SummaryInputExpr::Constant(value) if value.is_finite() => {
-            let value = if value.fract() == 0.0 && value.abs() <= (1_u64 << 53) as f64 {
-                ScalarValue::Int64(*value as i64)
-            } else {
-                ScalarValue::Float64(*value)
-            };
-            ValueProjectionIdentity::Constant { value }
-        }
-        _ => return Err("SQL summary requires a named column or finite numeric update".into()),
-    };
-
-    fn comparisons<'a>(expr: &'a QueryExpr, out: &mut Vec<&'a QueryExpr>) {
-        if let QueryExpr::BoolAnd(children) = expr {
-            for child in children {
-                comparisons(child, out);
-            }
-        } else {
-            out.push(expr);
-        }
-    }
-    let mut lower_ms = None;
-    let mut upper_ms = None;
-    let mut leaves = Vec::new();
-    let mut population = asap_types::table_population::TablePopulation::default();
-    for predicate in predicates {
-        comparisons(&predicate.0, &mut leaves);
-    }
-    for leaf in leaves {
-        let QueryExpr::Compare { left, op, right } = leaf else {
-            return Err("SQL materialization predicate is not a comparison".into());
-        };
-        let QueryExpr::Column(column) = left.as_ref() else {
-            return Err("SQL materialization predicate must reference a column".into());
-        };
-        let name = schema
-            .columns
-            .get(*column)
-            .map(|column| column.name.as_str())
-            .ok_or_else(|| {
-                "SQL materialization predicate references an unknown column".to_string()
-            })?;
-        let folded =
-            constant_int64(right).map(|value| QueryExpr::Literal(ScalarValue::Int64(value)));
-        let right = folded.as_ref().unwrap_or(right.as_ref());
-        match (name, op, right) {
-            (
-                name,
-                CompareOpKind::Gt | CompareOpKind::Ge,
-                QueryExpr::Literal(ScalarValue::Int64(value)),
-            ) if schema
-                .time_index
-                .is_some_and(|index| schema.columns[index].name == name) =>
-            {
-                let bound = if matches!(op, CompareOpKind::Gt) {
-                    value
-                        .checked_add(1)
-                        .ok_or("SQL exclusive lower timestamp overflows")?
-                } else {
-                    *value
-                };
-                lower_ms = Some(lower_ms.map_or(bound, |previous: i64| previous.max(bound)));
-            }
-            (
-                name,
-                CompareOpKind::Lt | CompareOpKind::Le,
-                QueryExpr::Literal(ScalarValue::Int64(value)),
-            ) if schema
-                .time_index
-                .is_some_and(|index| schema.columns[index].name == name) =>
-            {
-                let bound = if matches!(op, CompareOpKind::Le) {
-                    value
-                        .checked_add(1)
-                        .ok_or("SQL inclusive upper timestamp overflows")?
-                } else {
-                    *value
-                };
-                upper_ms = Some(upper_ms.map_or(bound, |previous: i64| previous.min(bound)));
-            }
-            (_, _, QueryExpr::Literal(value))
-                if !schema
-                    .time_index
-                    .is_some_and(|index| schema.columns[index].name == name) =>
-            {
-                population
-                    .predicates
-                    .push(asap_types::table_population::TableColumnPredicate {
-                        column: name.into(),
-                        operator: op.clone(),
-                        value: value.clone(),
-                    });
-            }
-            _ => {
-                return Err(format!(
-                    "SQL population predicate on {name} needs a canonical catalog filter"
-                ))
-            }
-        }
-    }
-    population.validate()?;
-    if let (Some(lower), Some(upper)) = (lower_ms, upper_ms) {
-        if u64::try_from(lower).ok() != Some(evaluation_start_ms)
-            || u64::try_from(upper).ok() != Some(evaluation_end_ms)
-        {
-            return Err(
-                "SQL source timestamp bounds differ from the fixed evaluation range".into(),
-            );
-        }
-    }
-    let inferred_window = match (lower_ms, upper_ms) {
-        (Some(lower), Some(upper)) if upper > lower && (upper - lower) % 1_000 == 0 => {
-            Some((upper - lower) as u64 / 1_000)
-        }
-        (None, None) => None,
-        _ => {
-            return Err("SQL timestamp range must provide compatible lower and upper bounds".into())
-        }
-    };
-    let window_secs = explicit_window.or(inferred_window).ok_or_else(|| {
-        "SQL table summary requires a positive whole-second timestamp range".to_string()
-    })?;
-    Ok(ClickHouseMaterializationLeaf {
-        table: table_ref.to_owned(),
-        value: value_projection,
-        value_source_column,
-        window_secs: Some(window_secs),
-        population,
-        timestamp_column: schema
-            .time_index
-            .and_then(|index| schema.columns.get(index))
-            .ok_or("SQL summary source has no timestamp projection")?
-            .name
-            .clone(),
-    })
-}
-
-fn select_materialization<'a>(
-    materializations: &'a [asap_types::PrecomputeMaterialization],
-    table_ref: &str,
-    value_projection: &asap_types::sds::ValueProjectionIdentity,
-    spatial_filter: &str,
-    expected: &planner_types::post_asap::SummaryFamilyType,
-    semantic_window_seconds: u64,
-) -> Result<&'a asap_types::PrecomputeMaterialization, crate::query_plan::QueryPlanError> {
-    let mut matches = materializations.iter().filter(|candidate| {
-        candidate.table_name.as_deref() == Some(table_ref)
-            && candidate.effective_value_projection() == value_projection
-            && candidate.population_filter_canonical().ok().as_deref() == Some(spatial_filter)
-            && candidate
-                .accumulator_spec()
-                .ok()
-                .is_some_and(|spec| spec.family == *expected)
-            && semantic_window_seconds
-                .checked_mul(1000)
-                .is_some_and(|window| window % candidate.window_size.saturating_mul(1000) == 0)
-    });
-    let selected = matches.next().ok_or_else(|| {
-        crate::query_plan::QueryPlanError::Invalid(format!(
-            "no precompute materialization matches {table_ref}/{value_projection:?}/{expected:?}"
-        ))
-    })?;
-    if matches.next().is_some() {
-        return Err(crate::query_plan::QueryPlanError::Invalid(format!(
-            "ambiguous precompute materializations match {table_ref}/{value_projection:?}/{expected:?}"
-        )));
-    }
-    Ok(selected)
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use asap_types::{AggregationType, KeyByLabelNames, PrecomputeMaterialization, WindowKind};
-    use planner_types::pre_asap::{Column, DataType, Schema};
-
-    // A dashboard refresh must reuse the installed identity without treating
-    // value thresholds or window length as runtime parameters.
-    #[tokio::test]
-    async fn moving_sql_window_reuses_identity() {
-        let catalog = SqlCatalog {
-            tables: HashMap::from([(
-                "telemetry".into(),
-                Schema {
-                    columns: vec![
-                        Column::new("timestamp_ms", DataType::Int64, false),
-                        Column::new("value", DataType::Float64, false),
-                    ],
-                    time_index: Some(0),
-                    ..Default::default()
-                },
-            )]),
-        };
-        let identity = |start, end, threshold| {
-            format!(
-            "SELECT sum(value) FROM telemetry WHERE timestamp_ms >= {start} AND timestamp_ms < {end} AND value > {threshold}"
-        )
-        };
-        let first =
-            canonicalize_clickhouse_sql(&identity(1000, 3000, 5), &catalog, AccuracyTarget::Exact)
-                .await
-                .unwrap();
-        let shifted =
-            canonicalize_clickhouse_sql(&identity(2000, 4000, 5), &catalog, AccuracyTarget::Exact)
-                .await
-                .unwrap();
-        assert_eq!(first, shifted);
-        let wider =
-            canonicalize_clickhouse_sql(&identity(1000, 4000, 5), &catalog, AccuracyTarget::Exact)
-                .await
-                .unwrap();
-        let threshold =
-            canonicalize_clickhouse_sql(&identity(2000, 4000, 6), &catalog, AccuracyTarget::Exact)
-                .await
-                .unwrap();
-        assert_ne!(first, wider);
-        assert_ne!(first, threshold);
-        let (_, template, range) =
-            bind_clickhouse_sql(&identity(2000, 4000, 5), &catalog, AccuracyTarget::Exact)
-                .await
-                .unwrap();
-        assert_eq!(template, first);
-        assert_eq!(range, Some((2000, 4000)));
-
-        // Dashboard bounds may use arithmetic and an inclusive upper edge.
-        let (_, inclusive, range) = bind_clickhouse_sql(
-            "SELECT sum(value) FROM telemetry WHERE timestamp_ms > 3999 - 2000 AND timestamp_ms <= 3999 AND value > 5",
-            &catalog,
-            AccuracyTarget::Exact,
-        ).await.unwrap();
-        assert_eq!(inclusive, first);
-        assert_eq!(range, Some((2000, 4000)));
-
-        // Projection constants are query semantics, never time parameters.
-        let projected = |start, end| {
-            format!("SELECT sum(value), {start} AS window_start FROM telemetry WHERE timestamp_ms >= {start} AND timestamp_ms < {end}")
-        };
-        assert_ne!(
-            canonicalize_clickhouse_sql(&projected(1000, 3000), &catalog, AccuracyTarget::Exact)
-                .await
-                .unwrap(),
-            canonicalize_clickhouse_sql(&projected(2000, 4000), &catalog, AccuracyTarget::Exact)
-                .await
-                .unwrap(),
-        );
-        // Unsupported bound shapes and non-aggregate scans retain fixed keys.
-        for sql in [
-            "SELECT sum(value) FROM telemetry",
-            "SELECT sum(value) FROM telemetry WHERE timestamp_ms >= 1000 AND timestamp_ms <= 9223372036854775807",
-            "SELECT value FROM telemetry WHERE timestamp_ms >= 1000 AND timestamp_ms < 3000",
-        ] {
-            let (fixed, template, range) =
-                bind_clickhouse_sql(sql, &catalog, AccuracyTarget::Exact)
-                    .await
-                    .unwrap();
-            assert_eq!(fixed, template);
-            assert_eq!(range, None);
-        }
-    }
-
-    fn materialization(
-        agg: AggregationType,
-        value_column: &str,
-        window: u64,
-        slide: u64,
-        parameter: (&str, serde_json::Value),
-    ) -> PrecomputeMaterialization {
-        let mut value = PrecomputeMaterialization::new(
-            agg,
-            String::new(),
-            std::collections::HashMap::from([(parameter.0.into(), parameter.1)]),
-            KeyByLabelNames::empty(),
-            KeyByLabelNames::empty(),
-            KeyByLabelNames::empty(),
-            String::new(),
-            window,
-            slide,
-            WindowKind::Tumbling,
-            String::new(),
-            format!("telemetry.{value_column}"),
-            None,
-            Some("telemetry".into()),
-            Some(value_column.into()),
-        );
-        value.pane_origin_ms = Some(0);
-        value.table_timestamp_column = Some("timestamp_ms".into());
-        value
-    }
-
-    /// A table leaf whose value column has the given producer typing.
-    fn typed_value_leaf(
-        dtype: planner_types::pre_asap::DataType,
-        nullable: bool,
-    ) -> planner_types::post_asap::SummaryNode {
-        use planner_types::post_asap::{
-            SummaryExpr, SummaryInputExpr, SummaryNode, SummarySchema, SummaryUpdate,
-        };
-        use planner_types::pre_asap::{
-            Column, ColumnRef, CompareOpKind, DataType, Predicate, QueryExpr, Reduction,
-            ScalarValue, Schema, Source,
-        };
-        let schema = Schema::with_time_index(
-            vec![
-                Column::new("timestamp_ms", DataType::Timestamp, false),
-                Column::new("value", dtype, nullable),
-            ],
-            0,
-            Vec::new(),
-        );
-        let bound = |op: CompareOpKind, at: i64| {
-            Predicate(std::rc::Rc::new(QueryExpr::Compare {
-                left: std::rc::Rc::new(QueryExpr::Column(0)),
-                op,
-                right: std::rc::Rc::new(QueryExpr::Literal(ScalarValue::Int64(at))),
-            }))
-        };
-        let scan = QueryExpr::Scan {
-            source: Source::Table {
-                table_ref: "telemetry".into(),
-            },
-            predicates: vec![
-                bound(CompareOpKind::Ge, 0),
-                bound(CompareOpKind::Lt, 60_000),
-            ],
-            schema,
-        };
-        let family = materialization(
-            AggregationType::Sum,
-            "value",
-            60,
-            60,
-            ("variant", serde_json::json!(1)),
-        )
-        .accumulator_spec()
-        .unwrap()
-        .family;
-        let summary_schema = SummarySchema {
-            fields: vec![],
-            time_index: None,
-        };
-        SummaryNode {
-            expr: SummaryExpr::SummaryAgg {
-                child: std::rc::Rc::new(SummaryNode {
-                    expr: SummaryExpr::KeepPreAsap(std::rc::Rc::new(scan)),
-                    schema: summary_schema.clone(),
-                    guarantee: Default::default(),
-                }),
-                family,
-                input: SummaryUpdate {
-                    item: None,
-                    weight: SummaryInputExpr::Column(ColumnRef::Named("value".into())),
-                    weight_domain: Default::default(),
-                },
-                reduction: Reduction::Reduce(vec![].into()),
-                grouping: Default::default(),
-            },
-            schema: summary_schema,
-            guarantee: Default::default(),
-        }
-    }
-
-    /// Numeric source columns are admitted with their producer typing, which
-    /// the ingest reader needs to read them safely. Before this the contract
-    /// took non-null `Float64` only, so an ordinary nullable or integer
-    /// ClickHouse column could not be automatically materialized at all.
-    #[test]
-    fn numeric_value_columns_are_admitted_with_their_producer_typing() {
-        use planner_types::pre_asap::DataType;
-        for (dtype, nullable) in [
-            (DataType::Float64, false),
-            (DataType::Float64, true),
-            (DataType::Int64, false),
-            (DataType::Int64, true),
-        ] {
-            let leaf = clickhouse_materialization_leaf_contract(
-                &typed_value_leaf(dtype.clone(), nullable),
-                0,
-                60_000,
-            )
-            .unwrap_or_else(|error| panic!("{dtype:?}/{nullable}: {error}"));
-            assert_eq!(
-                leaf.value,
-                asap_types::sds::ValueProjectionIdentity::Column {
-                    name: "value".into()
-                }
-            );
-            let column = leaf
-                .value_source_column
-                .expect("a column projection carries its producer typing");
-            assert_eq!(column.dtype, dtype);
-            assert_eq!(column.nullable, nullable);
-            // Typing is a read concern, not an identity one: the same column
-            // is the same policy however it is declared.
-            assert_eq!(column.table, None);
-        }
-    }
-
-    /// Non-numeric columns have no value semantics to summarise. Refusing them
-    /// protects the result; it is not a gap to be widened.
-    #[test]
-    fn non_numeric_value_columns_stay_refused() {
-        use planner_types::pre_asap::DataType;
-        for dtype in [DataType::Utf8, DataType::Bool, DataType::Timestamp] {
-            let error = clickhouse_materialization_leaf_contract(
-                &typed_value_leaf(dtype.clone(), false),
-                0,
-                60_000,
-            )
-            .unwrap_err();
-            assert!(
-                error.contains("numeric source column"),
-                "{dtype:?}: {error}"
-            );
-        }
-    }
-
-    #[test]
-    fn keyed_summary_input_is_not_replaced_by_its_unit_weight() {
-        use planner_types::post_asap::{
-            SummaryExpr, SummaryInputExpr, SummaryNode, SummarySchema, SummaryUpdate,
-        };
-        use planner_types::pre_asap::{ColumnRef, QueryExpr, Reduction, ScalarValue};
-        let schema = SummarySchema {
-            fields: vec![],
-            time_index: None,
-        };
-        let family = materialization(
-            AggregationType::Sum,
-            "value",
-            60,
-            60,
-            ("variant", serde_json::json!(1)),
-        )
-        .accumulator_spec()
-        .unwrap()
-        .family;
-        let node = SummaryNode {
-            expr: SummaryExpr::SummaryAgg {
-                child: std::rc::Rc::new(SummaryNode {
-                    expr: SummaryExpr::KeepPreAsap(std::rc::Rc::new(QueryExpr::Literal(
-                        ScalarValue::Int64(1),
-                    ))),
-                    schema: schema.clone(),
-                    guarantee: Default::default(),
-                }),
-                family,
-                input: SummaryUpdate {
-                    item: Some(SummaryInputExpr::Column(ColumnRef::Named("value".into()))),
-                    weight: SummaryInputExpr::Constant(1.0),
-                    weight_domain: Default::default(),
-                },
-                reduction: Reduction::Reduce(vec![].into()),
-                grouping: Default::default(),
-            },
-            schema,
-            guarantee: Default::default(),
-        };
-        assert!(clickhouse_materialization_leaf_contract(&node, 0, 60_000)
-            .unwrap_err()
-            .contains("explicit item projection"));
-    }
-
-    #[test]
-    fn selected_nodes_bind_unique_family_parameters_source_and_window() {
-        let sum_60 = materialization(
-            AggregationType::Sum,
-            "requests",
-            60,
-            10,
-            ("variant", serde_json::json!(1)),
-        );
-        let count_60 = materialization(
-            AggregationType::Max,
-            "requests",
-            60,
-            10,
-            ("variant", serde_json::json!(2)),
-        );
-        let sum_300 = materialization(
-            AggregationType::Sum,
-            "requests",
-            300,
-            30,
-            ("variant", serde_json::json!(3)),
-        );
-        let other = materialization(
-            AggregationType::Sum,
-            "latency",
-            60,
-            10,
-            ("variant", serde_json::json!(1)),
-        );
-        let dd_2 = materialization(
-            AggregationType::DDSketch,
-            "requests",
-            60,
-            10,
-            ("relativeAccuracy", serde_json::json!(0.02)),
-        );
-        let dd_5 = materialization(
-            AggregationType::DDSketch,
-            "requests",
-            60,
-            10,
-            ("relativeAccuracy", serde_json::json!(0.05)),
-        );
-        let configs = vec![
-            sum_60.clone(),
-            count_60.clone(),
-            sum_300,
-            other,
-            dd_2.clone(),
-            dd_5,
-        ];
-        let sum_family = sum_60.accumulator_spec().unwrap().family;
-        let count_family = count_60.accumulator_spec().unwrap().family;
-        assert_eq!(
-            select_materialization(
-                &configs,
-                "telemetry",
-                &asap_types::sds::ValueProjectionIdentity::Column {
-                    name: "requests".into()
-                },
-                "",
-                &sum_family,
-                60
-            )
-            .unwrap()
-            .policy_fingerprint(),
-            sum_60.policy_fingerprint()
-        );
-        let dd_family = dd_2.accumulator_spec().unwrap().family;
-        assert_eq!(
-            select_materialization(
-                &configs,
-                "telemetry",
-                &asap_types::sds::ValueProjectionIdentity::Column {
-                    name: "requests".into()
-                },
-                "",
-                &dd_family,
-                60
-            )
-            .unwrap()
-            .policy_fingerprint(),
-            dd_2.policy_fingerprint()
-        );
-        assert_eq!(
-            select_materialization(
-                &configs,
-                "telemetry",
-                &asap_types::sds::ValueProjectionIdentity::Column {
-                    name: "requests".into()
-                },
-                "",
-                &count_family,
-                60
-            )
-            .unwrap()
-            .policy_fingerprint(),
-            count_60.policy_fingerprint()
-        );
-        assert!(select_materialization(
-            &configs,
-            "telemetry",
-            &asap_types::sds::ValueProjectionIdentity::Column {
-                name: "missing".into()
-            },
-            "",
-            &sum_family,
-            60
-        )
-        .is_err());
-        let mut ambiguous = configs.clone();
-        ambiguous.push(sum_60);
-        assert!(select_materialization(
-            &ambiguous,
-            "telemetry",
-            &asap_types::sds::ValueProjectionIdentity::Column {
-                name: "requests".into()
-            },
-            "",
-            &sum_family,
-            60
-        )
-        .unwrap_err()
-        .to_string()
-        .contains("ambiguous"));
-    }
-
-    #[test]
-    fn constant_integer_boundaries_reject_overflow_and_dynamic_values() {
-        use planner_types::pre_asap::{ArithmeticOpKind, ScalarValue};
-        let literal = |value| QueryExpr::Literal(ScalarValue::Int64(value));
-        let subtract = |left, right| QueryExpr::Arithmetic {
-            op: ArithmeticOpKind::Sub,
-            left: std::rc::Rc::new(left),
-            right: std::rc::Rc::new(right),
-        };
-        assert_eq!(
-            constant_int64(&subtract(literal(1_788_891_296_000), literal(43_200_000))),
-            Some(1_788_848_096_000)
-        );
-        assert_eq!(
-            constant_int64(&subtract(literal(i64::MIN), literal(1))),
-            None
-        );
-        assert_eq!(
-            constant_int64(&subtract(QueryExpr::Column(0), literal(1))),
-            None
-        );
-        assert_eq!(
-            constant_int64(&QueryExpr::Literal(ScalarValue::Float64(1.0))),
-            None
-        );
-    }
-
-    #[test]
-    fn sql_evaluation_rejects_empty_reversed_and_unrepresentable_ranges() {
-        for (start_ms, end_ms) in [(2, 1), (1, 1), (0, u64::MAX)] {
-            assert!(validate_sql_evaluation(&ClickHouseSqlWorkloadEntry {
-                sql: "SELECT sum(value) FROM telemetry".into(),
-                start_ms,
-                end_ms,
-                cumulative: true,
-            })
-            .is_err());
-        }
-    }
-
-    #[tokio::test]
-    async fn rejects_mixed_snapshots_and_preserves_local_sql_contracts() {
-        let config = materialization(
-            AggregationType::Sum,
-            "value",
-            2,
-            2,
-            ("variant", serde_json::json!(1)),
-        );
-        let sds =
-            SummaryCatalog::from_materializations(71, 1, std::slice::from_ref(&config)).unwrap();
-        let envelope = crate::physical::compiler::PlanEnvelope {
-            plan_id: 71,
-            plan_version: 1,
-            generated_at_unix_ms: 0,
-            activation_unix_ms: 0,
-            expiry_unix_ms: None,
-            backend_compat: crate::physical::compiler::BACKEND_COMPAT.into(),
-            planner_revision: crate::physical::compiler::PLANNER_REVISION.into(),
-            capability_snapshot_id: "clickhouse-mixed-compile-test".into(),
-        };
-        let mut precompute =
-            PrecomputePlan::build_backend_local(envelope.clone(), vec![config]).unwrap();
-        precompute.bind_catalog(&sds).unwrap();
-        let mut transmission = crate::physical::compiler::build_transmission_plan(
-            envelope,
-            &precompute,
-            &std::collections::BTreeMap::new(),
-        )
-        .unwrap();
-        transmission.summary_catalog = Some(sds.reference().unwrap());
-        let timestamped = |time_name: &str, value_name: &str| {
-            Schema::with_time_index(
-                vec![
-                    Column::new(time_name, DataType::Timestamp, false),
-                    Column::new(value_name, DataType::Float64, false),
-                ],
-                0,
-                vec![],
-            )
-        };
-        let mut request = ClickHouseSqlWorkload {
-            summary_catalog: sds,
-            precompute_plan: precompute,
-            transmission_plan: transmission,
-            tables: HashMap::from([
-                ("telemetry".into(), timestamped("timestamp_ms", "value")),
-                (
-                    "divisors".into(),
-                    Schema::new(vec![
-                        Column::new("timestamp", DataType::Int64, false),
-                        Column::new("divisor", DataType::Float64, false),
-                    ]),
-                ),
-            ]),
-            accuracy: AccuracyTarget::Exact,
-            queries: vec![ClickHouseSqlWorkloadEntry {
-                sql: "SELECT sums.timestamp, sums.total / divisors.divisor AS ratio FROM (SELECT 2000 AS timestamp, sum(value) AS total FROM telemetry WHERE timestamp_ms >= 0 AND timestamp_ms < 2000) AS sums INNER JOIN divisors ON sums.timestamp = divisors.timestamp".into(),
-                start_ms: 0,
-                end_ms: 2_000,
-                cumulative: true,
-            }],
-        };
-        let Err(error) = compile_clickhouse_workload(&request).await else {
-            panic!("local summary joined to an external table needs a common snapshot proof");
-        };
-        assert!(
-            error.to_string().contains("common snapshot proof"),
-            "{error}"
-        );
-        request.queries[0].sql =
-            "SELECT sum(value) FROM telemetry WHERE timestamp_ms >= 0 AND timestamp_ms < 2000"
-                .into();
-        let publication = compile_clickhouse_workload(&request).await.unwrap();
-        // A simple installed aggregate publishes the same key as a refresh.
-        let simple_sql =
-            "SELECT sum(value) FROM telemetry WHERE timestamp_ms >= 0 AND timestamp_ms < 2000";
-        let simple = compile_clickhouse_workload(&ClickHouseSqlWorkload {
-            summary_catalog: request.summary_catalog.clone(),
-            precompute_plan: request.precompute_plan.clone(),
-            transmission_plan: request.transmission_plan.clone(),
-            tables: request.tables.clone(),
-            accuracy: request.accuracy.clone(),
-            queries: vec![ClickHouseSqlWorkloadEntry {
-                sql: simple_sql.into(),
-                start_ms: 0,
-                end_ms: 2000,
-                cumulative: true,
-            }],
-        })
-        .await
-        .unwrap();
-        let shifted = canonicalize_clickhouse_sql(
-            "SELECT sum(value) FROM telemetry WHERE timestamp_ms >= 2000 AND timestamp_ms < 4000",
-            &SqlCatalog {
-                tables: request.tables.clone(),
-            },
-            AccuracyTarget::Exact,
-        )
-        .await
-        .unwrap();
-        assert_eq!(
-            simple
-                .query_plan
-                .clickhouse_context
-                .as_ref()
-                .unwrap()
-                .window_templates[&shifted]
-                .len(),
-            1
-        );
-        assert!(shifted.starts_with("moving-window-v1:"));
-        // Different windows remain distinct publications even with one template.
-        let windows = || {
-            vec![
-            ClickHouseSqlWorkloadEntry { sql: simple_sql.into(), start_ms: 0, end_ms: 2000, cumulative: true },
-            ClickHouseSqlWorkloadEntry {
-                sql: "SELECT sum(value) FROM telemetry WHERE timestamp_ms >= 2000 AND timestamp_ms < 4000".into(),
-                start_ms: 2000, end_ms: 4000, cumulative: true,
-            },
-        ]
-        };
-        let multiple = compile_clickhouse_workload(&ClickHouseSqlWorkload {
-            summary_catalog: request.summary_catalog.clone(),
-            precompute_plan: request.precompute_plan.clone(),
-            transmission_plan: request.transmission_plan.clone(),
-            tables: request.tables.clone(),
-            accuracy: request.accuracy.clone(),
-            queries: windows(),
-        })
-        .await
-        .unwrap();
-        assert_eq!(multiple.query_plan.entries.len(), 2);
-        let (multiple_auto, multiple_traces) =
-            compile_automatic_clickhouse_workload(&ClickHouseSqlAutomaticWorkload {
-                envelope: request.precompute_plan.envelope.clone(),
-                tables: request.tables.clone(),
-                accuracy: request.accuracy.clone(),
-                queries: windows(),
-            })
-            .await
-            .unwrap();
-        assert_eq!(multiple_auto.query_plan.entries.len(), 2);
-        for plan in [&multiple.query_plan, &multiple_auto.query_plan] {
-            let identities = &plan.clickhouse_context.as_ref().unwrap().window_templates[&shifted];
-            assert_eq!(identities.len(), 2);
-            assert_ne!(identities[0], identities[1]);
-            for identity in identities {
-                assert!(plan.lookup_clickhouse(identity).is_ok());
-            }
-        }
-        assert_eq!(multiple_traces.len(), 2);
-        assert_eq!(multiple_auto.precompute_plan.executable_dags.len(), 2);
-        multiple_auto.validate().unwrap();
-        let bindings = multiple_auto
-            .query_plan
-            .entries
-            .values()
-            .map(|entry| entry.materialization_bindings()[0].materialization)
-            .collect::<std::collections::BTreeSet<_>>();
-        assert_eq!(
-            bindings.len(),
-            2,
-            "different pane origins must retain distinct materializations"
-        );
-        let mut invalid = multiple_auto.clone();
-        invalid
-            .query_plan
-            .clickhouse_context
-            .as_mut()
-            .unwrap()
-            .window_templates
-            .values_mut()
-            .next()
-            .unwrap()
-            .push("missing concrete query".into());
-        assert!(invalid.validate().is_err());
-        let (automatic, traces) =
-            compile_automatic_clickhouse_workload(&ClickHouseSqlAutomaticWorkload {
-                envelope: request.precompute_plan.envelope.clone(),
-                tables: request.tables.clone(),
-                accuracy: request.accuracy.clone(),
-                queries: request
-                    .queries
-                    .iter()
-                    .map(|query| ClickHouseSqlWorkloadEntry {
-                        sql: query.sql.clone(),
-                        start_ms: query.start_ms,
-                        end_ms: query.end_ms,
-                        cumulative: query.cumulative,
-                    })
-                    .collect(),
-            })
-            .await
-            .unwrap();
-        assert_eq!(automatic.precompute_plan.materializations.len(), 1);
-        assert_eq!(traces.len(), 1);
-        assert!(traces
-            .values()
-            .any(
-                |trace| trace["groups"]
-                    .as_array()
-                    .unwrap()
-                    .iter()
-                    .any(|group| group["candidates"]
-                        .as_array()
-                        .unwrap()
-                        .iter()
-                        .any(|candidate| candidate["selected"] == true))
-            ));
-        assert_eq!(automatic.precompute_plan.executable_dags.len(), 1);
-        automatic.validate().unwrap();
-        let mut integer_source = ClickHouseSqlAutomaticWorkload {
-            envelope: request.precompute_plan.envelope.clone(),
-            tables: request.tables.clone(),
-            accuracy: request.accuracy.clone(),
-            queries: request
-                .queries
-                .iter()
-                .map(|query| ClickHouseSqlWorkloadEntry {
-                    sql: query.sql.clone(),
-                    start_ms: query.start_ms,
-                    end_ms: query.end_ms,
-                    cumulative: query.cumulative,
-                })
-                .collect(),
-        };
-        // An Int64 source is admitted and carries its declared type into the
-        // materialization, which is what lets the ingest reader widen the
-        // column explicitly and fail loudly on a value beyond the exact
-        // Float64 range instead of silently summarising a rounded one.
-        integer_source.tables.get_mut("telemetry").unwrap().columns[1].dtype = DataType::Int64;
-        let (integer_plan, _) = compile_automatic_clickhouse_workload(&integer_source)
-            .await
-            .expect("an Int64 source is admitted with its producer typing");
-        assert_eq!(
-            integer_plan.precompute_plan.materializations[0]
-                .value_source_column
-                .as_ref()
-                .expect("column projections carry their producer typing")
-                .dtype,
-            DataType::Int64
-        );
-        integer_source.tables.get_mut("telemetry").unwrap().columns[1].dtype = DataType::Float64;
-        integer_source.queries[0].sql = integer_source.queries[0].sql.replace(
-            "FROM telemetry WHERE",
-            "FROM (SELECT timestamp_ms, value * 2 AS value FROM telemetry) doubled WHERE",
-        );
-        assert!(
-            compile_automatic_clickhouse_workload(&integer_source)
-                .await
-                .is_err(),
-            "a producer projection must not be erased while binding its original table"
-        );
-        let installed = publication
-            .precompute_plan
-            .executable_dags
-            .get(&request.queries[0].sql)
-            .unwrap();
-        installed.validate().unwrap();
-        assert_eq!(installed.binding.precompute_sinks.len(), 1);
-        assert_eq!(
-            installed.binding.nodes.len(),
-            installed.document.nodes.len()
-        );
-        assert!(!installed.binding.nodes.values().any(|binding| matches!(
-            binding,
-            crate::physical::executable_binding::BackendNodeBinding::Query { .. }
-        )));
-        assert!(
-            publication.query_plan.selected_dags[&request.queries[0].sql]
-                .nodes
-                .len()
-                > installed.document.nodes.len()
-        );
-        let entry = publication.query_plan.entries.values().next().unwrap();
-        assert!(!entry
-            .nodes
-            .values()
-            .any(|node| matches!(node, crate::query_plan::QueryPlanNode::ExternalExact { .. })));
-        assert!(!entry.materialization_bindings().is_empty());
-        let original = request.queries[0].sql.clone();
-        let schema = request.tables.get_mut("telemetry").unwrap();
-        schema.columns[schema.time_index.unwrap()].name = "other_timestamp".into();
-        request.queries[0].sql = original.replace("timestamp_ms", "other_timestamp");
-        assert!(
-            compile_clickhouse_workload(&request).await.is_err(),
-            "a summary cannot bind a different timestamp projection"
-        );
-        let schema = request.tables.get_mut("telemetry").unwrap();
-        schema.columns[schema.time_index.unwrap()].name = "timestamp_ms".into();
-        request.queries[0].sql = original.replace("timestamp_ms < 2000", "timestamp_ms <= 1999");
-        assert!(compile_clickhouse_workload(&request).await.is_ok());
-        request.queries[0].sql = original.replace("timestamp_ms < 2000", "timestamp_ms <= 2000");
-        assert!(compile_clickhouse_workload(&request).await.is_err());
-        request.queries[0].sql = original
-            .replace("timestamp_ms >= 0", "timestamp_ms >= 1000")
-            .replace("timestamp_ms < 2000", "timestamp_ms < 3000");
-        assert!(compile_clickhouse_workload(&request).await.is_err());
-
-        request
-            .tables
-            .get_mut("telemetry")
-            .unwrap()
-            .columns
-            .push(Column::new("metric", DataType::Utf8, false));
-        request.queries[0].sql = original.replace(
-            "WHERE timestamp_ms",
-            "WHERE metric = 'requests' AND timestamp_ms",
-        );
-        assert!(
-            compile_clickhouse_workload(&request).await.is_err(),
-            "an unfiltered summary cannot satisfy a filtered query"
-        );
-        let mut config = request.precompute_plan.materializations[0].clone();
-        config.table_population = Some(asap_types::table_population::TablePopulation {
-            predicates: vec![asap_types::table_population::TableColumnPredicate {
-                column: "metric".into(),
-                operator: planner_types::pre_asap::CompareOpKind::Eq,
-                value: planner_types::pre_asap::ScalarValue::Utf8("requests".into()),
-            }],
-        });
-        request.summary_catalog =
-            SummaryCatalog::from_materializations(71, 1, &[config.clone()]).unwrap();
-        let envelope = request.precompute_plan.envelope.clone();
-        request.precompute_plan =
-            PrecomputePlan::build_backend_local(envelope.clone(), vec![config]).unwrap();
-        request
-            .precompute_plan
-            .bind_catalog(&request.summary_catalog)
-            .unwrap();
-        request.transmission_plan = crate::physical::compiler::build_transmission_plan(
-            envelope,
-            &request.precompute_plan,
-            &std::collections::BTreeMap::new(),
-        )
-        .unwrap();
-        request.transmission_plan.summary_catalog =
-            Some(request.summary_catalog.reference().unwrap());
-        assert!(compile_clickhouse_workload(&request).await.is_ok());
-    }
-}
diff --git a/control_plane/src/emit/backend_wire.rs b/control_plane/src/emit/backend_wire.rs
deleted file mode 100644
index ff294e8ce..000000000
--- a/control_plane/src/emit/backend_wire.rs
+++ /dev/null
@@ -1,344 +0,0 @@
-//! Backend wire construction for a compiled physical plan.
-//!
-//! Two documents, one classifier each:
-//!
-//! * the storage-routing table, which maps each metric's materialized summary
-//!   families to the query shapes the ASAP tier serves natively versus the
-//!   ones that belong to the archive;
-//! * the aggregation and readout JSON the backend's `PrecomputeMaterialization`
-//!   parser consumes.
-//!
-//! `backend_plan::from_stage_config` reuses [`build_backend_aggregation_json`]
-//! rather than re-deriving the field mapping, so `BackendPlan` materializations
-//! and the JSON wire format share one `PolicyFingerprint` identity space.
-
-use planner_types::post_asap::{ExactKind, SketchAlgorithm, SketchParams, SummaryFamilyType};
-use serde_json::{json, Value as JsonValue};
-
-use crate::physical::backend_stage::{AggregationInput, BackendAggregation};
-
-// ── Window-size clamping (MVP blocker B4) ─────────────────────────────────────
-//
-// The controller derives `window_secs` from the workload's matrix-selector
-// range (`metric[30s]` → 30s). Two bounds keep the emitted value sane:
-//
-//   * Lower bound 5s — below this the sketch processor mints a new
-//     window before it has enough samples for the family's quality
-//     guarantees, and the per-flush cardinality on the sid catalog
-//     explodes (one (sid, window) row per few seconds).
-//   * Upper bound 60s — above this the user's query range no longer
-//     contains a closed sketch window, and replay queries return NoData
-//     while the warm tier still owns the metric. 60s is also the
-//     historical default the legacy single-pipeline emitter shipped with,
-//     so clamping here preserves backwards-compat for plans without an
-//     explicit range.
-//
-// `None` means "no `Window` node in the typed L5 — agent runs in batch
-// mode, no window_duration in the YAML"; we pass that straight through.
-//
-// Centralised here so [`build_edge_processor_block`] (sketch processor
-// `window_duration`) and the [`BackendAggregation`] consumer
-// ([`emit_backend_streaming_config_json`]) clamp to the same bounds. The
-// downstream backend's reducer keys windows by the emitted value, so
-// the two MUST agree or replay-vs-warm answers go out of sync.
-
-/// Lower bound for [`clamp_window_secs`].
-pub const MIN_WINDOW_SECS: u64 = 5;
-
-/// Upper bound for [`clamp_window_secs`]. Matches the legacy default
-/// the pre-B4 emitter shipped with.
-pub const MAX_WINDOW_SECS: u64 = 60;
-
-/// Cardinality at which a per-series HLL is emitted DENSE rather than sparse
-/// (ASAPCollector#472 follow-up to PR #358).
-///
-/// The sketchlib-go in-memory sparse HLL base (`NewHLLWrapperSparse`)
-/// auto-promotes to the dense register array once roughly this many registers
-/// become non-zero (the sparse representation stops saving memory past that
-/// point). A per-series HLL whose known distinct-key count
-/// ([`crate::workload::WorkloadEntry::distinct_keys_per_window`]) is at or
-/// above this crossover would promote almost immediately, so starting it sparse
-/// only pays one-time promotion churn — we emit it dense instead.
-///
-/// This is a HEURISTIC: distinct *keys* map to non-zero *registers* only
-/// approximately (hash collisions mean registers < keys at high cardinality),
-/// so the crossover is fuzzy. Being slightly off has NO correctness or accuracy
-/// impact — the sparse base is lossless and serializes byte-identically to
-/// dense for the same inputs; an over- or under-estimate at worst costs (or
-/// saves) a single in-memory sparse→dense promotion. The value tracks the
-/// in-memory promotion threshold (~4096 non-zero registers); the wire-crossover
-/// constant the agent uses elsewhere is larger (~6000).
-pub const DENSE_CROSSOVER: u64 = 4096;
-
-/// Clamp a derived window size to `[MIN_WINDOW_SECS, MAX_WINDOW_SECS]`.
-/// `None` is preserved as `None` so callers can keep the
-/// "no-window / batch-mode" branch distinguishable from a clamped value.
-pub fn clamp_window_secs(w: Option<u64>) -> Option<u64> {
-    w.map(|s| s.clamp(MIN_WINDOW_SECS, MAX_WINDOW_SECS))
-}
-
-pub const DEFAULT_TENANT: &str = "default";
-
-pub fn storage_routing_document(
-    tenant: &str,
-    metric_algorithms: &[(String, Vec<SketchAlgorithm>)],
-) -> JsonValue {
-    let metrics_json: Vec<JsonValue> = metric_algorithms
-        .iter()
-        .map(|(metric_name, algorithms)| build_routing_entry(metric_name, algorithms))
-        .collect();
-    json!({
-        "tenant": tenant,
-        "default_engine": "asap_query",
-        "metrics": metrics_json,
-    })
-}
-// ── Internals ─────────────────────────────────────────────────────────────────
-
-/// Build the JSON `metrics:` entry for one metric — picks per-shape targets
-/// from the summary families the plan landed at the backend.
-///
-/// Returns a JSON object of shape:
-/// ```text
-/// { "name": <metric>, "targets": [<target>, ...] }
-/// ```
-/// where each `<target>` is either `{ "engine": <engine>, "applies_to_query_shape": [...] }`
-/// or `{ "engine": <engine> }` for the default slot.
-fn build_routing_entry(metric_name: &str, algorithms: &[SketchAlgorithm]) -> JsonValue {
-    // Sketch-eligible shapes — the ASAP tier serves these natively
-    // because we planned a sketch for them.
-    let mut warm_shapes: Vec<&'static str> = Vec::new();
-    let has_quantile_sketch = algorithms
-        .iter()
-        .any(|k| matches!(k, SketchAlgorithm::DDSketch | SketchAlgorithm::Kll));
-    if has_quantile_sketch {
-        warm_shapes.push("quantile");
-        warm_shapes.push("quantile_over_time");
-    }
-    let has_hll = algorithms.iter().any(|k| matches!(k, SketchAlgorithm::Hll));
-    if has_hll {
-        warm_shapes.push("count");
-    }
-    // Heap-bearing frequency sketches also contribute their routing capability.
-    let has_count_sketch = algorithms.iter().any(|k| {
-        matches!(
-            k,
-            SketchAlgorithm::CountSketch | SketchAlgorithm::CountSketchWithHeap
-        )
-    });
-    if has_count_sketch {
-        warm_shapes.push("topk");
-    }
-    let has_cms = algorithms
-        .iter()
-        .any(|k| matches!(k, SketchAlgorithm::Cms | SketchAlgorithm::CmsWithHeap));
-    if has_cms {
-        // CMS's `Estimate` readout serves point-count / count queries.
-        // If HLL also planned, `count` is already in the list — push
-        // only when not already there (keep order stable).
-        if !warm_shapes.contains(&"count") {
-            warm_shapes.push("count");
-        }
-    }
-    // Sketch-planned `rate / sum / avg / min / max` over the planned
-    // ranges — every sketch family the planner emits also tracks the
-    // range aggregation needed to answer these from the ASAP tier
-    // (the gateway merge processor produces a windowed accumulator).
-    if !algorithms.is_empty() {
-        warm_shapes.push("rate");
-        warm_shapes.push("sum");
-        warm_shapes.push("avg");
-        warm_shapes.push("min");
-        warm_shapes.push("max");
-    }
-
-    // One target: the ASAP tier, as the unfiltered default slot. #746
-    // deleted the archive tier, so there is no second engine to claim the
-    // shapes the sketches cannot answer — the backend forwards those to its
-    // Prometheus fallback instead. We do NOT attach
-    // `applies_to_query_shape` to this slot: that would make it
-    // shape-specific and leave unanticipated shapes with no target at all.
-    let targets: Vec<JsonValue> = vec![json!({
-        "engine": "asap_query",
-    })];
-
-    // The warm-shape list is informational — surface it on a side
-    // field for operators / tests to spot-check what the controller
-    // decided the ASAP tier serves natively. The backend ignores
-    // unknown fields (`#[serde(default)]` on the parser side).
-    let mut entry = json!({
-        "name": metric_name,
-        "targets": targets,
-    });
-    if !warm_shapes.is_empty() {
-        entry["asap_tier_native_shapes"] = json!(warm_shapes);
-    }
-    entry
-}
-
-pub(crate) fn build_backend_aggregation_json(agg: &BackendAggregation) -> JsonValue {
-    // Option B (post-PR-#287): when `agg_type_override` is set, use
-    // it as the wire `aggregationType` and emit an empty
-    // `parameters` object — bypasses the sketch_kind → backend type
-    // mapping for ExactAgg(Sum/Increase/Count) rows the Replanner
-    // synthesizes for non-sketch (Sum-shaped) workloads. The
-    // `sketch_kind` / `sketch_params` fields carry sentinel values
-    // in this case and are not emitted on the wire.
-    let (aggregation_type, mut parameters) = match &agg.family {
-        SummaryFamilyType::ExactAggregate(kind, _) => (
-            match kind {
-                ExactKind::Sum => "Sum",
-                ExactKind::Count => "Count",
-                ExactKind::Min => "Min",
-                ExactKind::Max => "Max",
-                ExactKind::Increase => "Increase",
-                ExactKind::Rate => "Rate",
-                ExactKind::IRate => "IRate",
-            }
-            .to_string(),
-            json!({}),
-        ),
-        SummaryFamilyType::Sketch(kind, _) => (
-            sketch_algorithm_to_backend_type(kind.algorithm()).to_string(),
-            sketch_params_to_json(kind.params()),
-        ),
-        other => panic!("backend emitter cannot encode summary family {other:?}"),
-    };
-    // Carry the per-item dimension (e.g. "endpoint"/"service") into the
-    // policy parameters so the data-plane ingest can record it on the CMS
-    // sid and answer per-item estimate(key). Only set for item_label-mode
-    // frequency sketches; a subset content-match keeps policy resolution
-    // working for sketches that don't carry it.
-    if let Some(label) = &agg.item_label {
-        if let Some(obj) = parameters.as_object_mut() {
-            obj.insert("item_label".to_string(), JsonValue::String(label.clone()));
-        }
-    }
-    if let Some(mode) = agg.heap_update_mode {
-        if let Some(obj) = parameters.as_object_mut() {
-            obj.insert("weight_mode".into(), JsonValue::String(mode.into()));
-            if mode == "counter_delta" {
-                obj.insert("weight_scale".into(), json!(1_000_000));
-            }
-        }
-    }
-    // PromQL range selectors are (start, end]. Encode the boundary convention
-    // in state identity so legacy half-open panes cannot satisfy this binding.
-    if matches!(agg.aggregation_input, AggregationInput::Raw) {
-        parameters["promql_right_closed"] = json!(true);
-    }
-    let aggregation_input = match agg.aggregation_input {
-        AggregationInput::SketchEnvelope => "sketch_envelope",
-        AggregationInput::Raw => "raw",
-    };
-    // MVP blocker B4: clamp `windowSize` so the backend's reducer keys
-    // windows by the SAME size the agent's sketch processor uses. The
-    // backend's `streaming-config.window_size` must match the agent's
-    // `window_duration` exactly — drift here de-syncs the warm tier
-    // and replay queries return NoData (the backend's pre-compute
-    // engine looks for closed windows at the streaming-config size).
-    // `agg.window_secs` is u64 (not Option) here; passing through
-    // `clamp_window_secs(Some(_))` and unwrapping keeps the contract
-    // explicit.
-    let window_size =
-        clamp_window_secs(Some(agg.window_secs)).expect("clamp_window_secs preserves Some");
-    json!({
-        "aggregationType": aggregation_type,
-        "aggregationSubType": "",
-        "metric": agg.metric_name,
-        "labels": {
-            "grouping": agg.grouping,
-            "rollup": Vec::<String>::new(),
-            "aggregated": agg.item_label.iter().cloned().collect::<Vec<_>>(),
-        },
-        "parameters": parameters,
-        "windowSize": window_size,
-        "windowType": "tumbling",
-        "spatialFilter": agg.spatial_filter,
-        "aggregationInput": aggregation_input,
-    })
-}
-
-/// Map a `SketchAlgorithm` to the backend's `AggregationType::Display`
-/// string — the same mapping
-/// [`crate::config::asapquery_backend::map_sketch_type_to_agg_type`] uses
-/// (the strings must match `AggregationType::FromStr` in the backend's
-/// `promql_utilities::query_logics::enums`).
-///
-/// Heap-bearing is now identity, not a params flag (`SketchAlgorithm::CmsWithHeap`
-/// / `CountSketchWithHeap`, set by `BindCountSketchOnTopK` — see
-/// `physical::post_asap::rules::bind_cms_topk`), so this maps on `kind` alone;
-/// `params` is unused but kept for call-site stability. This is what
-/// lets the backend's `policy_capability` lookup return
-/// `FrequencyTopk(*WithHeap)` for heap-bearing aggregations — required
-/// for `topk(...)` queries to bind to the right sids.
-fn sketch_algorithm_to_backend_type(kind: &SketchAlgorithm) -> &'static str {
-    match kind {
-        SketchAlgorithm::UnivMon => "UnivMon",
-        SketchAlgorithm::DDSketch => "DDSketch",
-        SketchAlgorithm::Kll => "DatasketchesKLL",
-        SketchAlgorithm::Hll => "HLL",
-        SketchAlgorithm::CountSketchWithHeap => "CountSketchWithHeap",
-        SketchAlgorithm::CountSketch => "CountSketch",
-        SketchAlgorithm::CmsWithHeap => "CountMinSketchWithHeap",
-        SketchAlgorithm::Cms => "CountMinSketch",
-        SketchAlgorithm::Kmv | SketchAlgorithm::Theta => unreachable!(
-            "sketch_algorithm_to_backend_type: unsupported SketchAlgorithm; \
-             no Bind* rule in this repo produces one"
-        ),
-    }
-}
-
-/// Serialize a `SketchParams` payload to a flat JSON object the backend
-/// can read directly without round-tripping through the controller's
-/// internally-tagged enum form.
-fn sketch_params_to_json(p: &SketchParams) -> JsonValue {
-    match p {
-        SketchParams::UnivMon {
-            heap_size,
-            sketch_rows,
-            sketch_cols,
-            layers,
-        } => json!({
-            "heap_size": heap_size, "sketch_rows": sketch_rows, "sketch_cols": sketch_cols, "layers": layers,
-        }),
-        SketchParams::Kll { k } => json!({ "k": k }),
-        SketchParams::DDSketch { alpha } => json!({ "alpha": alpha }),
-        SketchParams::Hll { precision } => json!({ "precision": precision }),
-        SketchParams::Cms { width, depth } => json!({ "w": width, "d": depth }),
-        SketchParams::CmsWithHeap {
-            width,
-            depth,
-            heap_size,
-        } => json!({
-            "w": width,
-            "d": depth,
-            "with_heap": true,
-            "heap_size": heap_size,
-        }),
-        // CountSketch/CountSketchWithHeap: the old arm always emitted
-        // `with_heap` (from `CountSketchParams.with_heap: bool`);
-        // that boolean is now the kind identity itself.
-        SketchParams::CountSketch { width, depth } => {
-            json!({ "w": width, "d": depth, "with_heap": false })
-        }
-        SketchParams::CountSketchWithHeap {
-            width,
-            depth,
-            heap_size,
-        } => json!({
-            "w": width,
-            "d": depth,
-            "with_heap": true,
-            "heap_size": heap_size,
-        }),
-        // Exact accumulators never reach here -- see
-        // `sketch_kind_to_backend_type`'s doc.
-        SketchParams::Kmv { .. } | SketchParams::Theta { .. } => {
-            unreachable!(
-                "sketch_params_to_json: non-sketch or unsupported SummaryParams; \
-             no Bind* rule in this repo produces one"
-            )
-        }
-    }
-}
diff --git a/control_plane/src/emit/mod.rs b/control_plane/src/emit/mod.rs
deleted file mode 100644
index a56536256..000000000
--- a/control_plane/src/emit/mod.rs
+++ /dev/null
@@ -1,69 +0,0 @@
-//! Backend-facing emission for a compiled physical plan.
-//!
-//! * [`backend_wire`] builds the storage-routing table and the aggregation /
-//!   readout JSON the backend's `PrecomputeMaterialization` parser consumes.
-//! * [`monitor`] carries the CDM monitor declarations.
-
-pub mod backend_wire;
-pub mod monitor;
-
-use crate::physical::post_asap::deployment_expr::PostAsapPlan;
-use crate::physical::post_asap::PhysicalExpr;
-use planner_types::post_asap::{SketchAlgorithm, SummaryExpr, SummaryNode};
-use std::rc::Rc;
-
-/// Walk a `PhysicalExpr` tree and return the first `SketchAgg::sketch_type`
-/// (or the `RawAtEdgeSketchAtBackend::family` Mode-2 equivalent). The
-/// canonical shape produced by `bind_workload_typed` is
-/// `SketchEstimate { child: SketchAgg { sketch_type, … } }`, so this is
-/// effectively a one-level descent — but we walk recursively to stay
-/// robust against future shape changes (e.g. Bind* rules wrapping
-/// in `LetBinding` for fan-in shared sketches).
-///
-/// Returns `None` only for trees that carry no sketch commitment
-/// (`Logical`-only, unresolved `Ref`, raw Mode-3 archive). These map
-/// onto the raw-passthrough default pipeline in the routing emitter,
-/// which is correct.
-pub fn extract_root_sketch_algorithm(expr: &PhysicalExpr) -> Option<SketchAlgorithm> {
-    match expr {
-        PhysicalExpr::Committed(plan) => extract_from_plan(plan),
-        PhysicalExpr::RawAtEdgeSketchAtBackend { family, .. } => Some(family.clone()),
-        PhysicalExpr::RawAtEdgePrometheusArchive { .. } => None,
-    }
-}
-
-fn extract_from_plan(plan: &PostAsapPlan) -> Option<SketchAlgorithm> {
-    match plan {
-        PostAsapPlan::Summary(node) => extract_from_node(node),
-        PostAsapPlan::LetBinding { expr, child, .. } => {
-            extract_from_plan(expr).or_else(|| extract_from_plan(child))
-        }
-        PostAsapPlan::Ref { .. } => None,
-    }
-}
-
-fn extract_from_node(node: &Rc<SummaryNode>) -> Option<SketchAlgorithm> {
-    match &node.expr {
-        // The `family` variant distinguishes exact accumulators from sketches.
-        SummaryExpr::SummaryAgg {
-            family: planner_types::post_asap::SummaryFamilyType::Sketch(kind, _),
-            ..
-        } => Some(kind.algorithm().clone()),
-        // An exact accumulator has no sketch family beneath it (its own
-        // child is always a plain `Logical` leaf) — same as the old
-        // `ExactAgg` case.
-        SummaryExpr::SummaryAgg { .. } => None,
-        SummaryExpr::SummaryEstimate { summary_input, .. } => extract_from_node(summary_input),
-        SummaryExpr::SummaryMerge { children, .. } => children.iter().find_map(extract_from_node),
-        SummaryExpr::ValueOperation { child, .. } => extract_from_node(child),
-
-        // Not surfaced by any `Bind*` path yet (gated on rules that
-        // haven't landed — see `deployment_expr.rs`'s module docs).
-        SummaryExpr::BinaryOp { .. }
-        | SummaryExpr::RelationalJoin { .. }
-        | SummaryExpr::SummaryJoin { .. }
-        | SummaryExpr::SummarySubtract { .. }
-        | SummaryExpr::SummaryDelete { .. }
-        | SummaryExpr::KeepPreAsap(_) => None,
-    }
-}
diff --git a/control_plane/src/emit/monitor.rs b/control_plane/src/emit/monitor.rs
deleted file mode 100644
index 59776f3a8..000000000
--- a/control_plane/src/emit/monitor.rs
+++ /dev/null
@@ -1,192 +0,0 @@
-//! Continuous-monitoring (CDM) auto-emission helpers.
-//!
-//! These render the two artifacts a monitored standing query needs, both keyed
-//! by the SAME content-addressed `agg_id` the Go edge derives from the metric
-//! name (so the edge's per-window sketch and the coordinator's monitor line up):
-//!
-//!   1. [`edge_threshold_block`] — the `threshold:` YAML mapping that goes into
-//!      the fused `asap_edge` processor's per-metric `metrics[]` entry (consumed
-//!      by `asapedgeprocessor.ThresholdConfig`). The edge derives the agg_id
-//!      from the metric name itself, so this block carries no agg_id.
-//!   2. [`streaming_config_monitor_entry`] — the `monitors[]` JSON object for the
-//!      backend `InstalledPrecomputePlan` (consumed by `asap_types::MonitorSpec`), where
-//!      `agg_id` IS carried and MUST equal [`agg_id_for_metric`].
-//!
-//! The functions are pure so they can be unit-tested and called from whichever
-//! planner stage gains a monitor-intent slot. See
-//! `ASAPCollector/docs/continuous-monitoring-tumbling-cost-analysis.md`.
-
-pub use asap_types::MonitorFunctional as Functional;
-#[cfg(test)]
-use serde_yaml::{Mapping, Value};
-
-/// One monitored standing-query intent: "alert when the global Σ of `metric`'s
-/// `functional` crosses `tau`". τ/ε/window are authoritative at the coordinator;
-/// the edge copies are advisory.
-#[derive(Debug, Clone)]
-pub struct MonitorIntent {
-    pub metric: String,
-    pub functional: Functional,
-    /// CMS point-frequency key x (cms_point only); empty otherwise.
-    pub key: String,
-    /// Non-negative linear coefficients (linear_buckets only).
-    pub coeffs: Vec<f64>,
-    /// Coordinator MonitorService gRPC endpoint, e.g. "data-plane:4319".
-    pub coordinator_url: String,
-    pub tau: f64,
-    pub epsilon: f64,
-    pub window_ms: u64,
-}
-
-/// Content-addressed aggregation id for a metric name. This MUST byte-match the
-/// Go edge's `asapedgeprocessor.fnv64` (FNV-1a-64 with the exact constants used
-/// there) so a controller-emitted `monitors[]` entry targets the same agg_id the
-/// edge stamps on its per-window sketch.
-pub fn agg_id_for_metric(metric: &str) -> u64 {
-    // NOTE: the edge uses the literal offset basis 1469598103934665603 and prime
-    // 1099511628211; replicate verbatim (do NOT "correct" to the textbook FNV
-    // basis — the two sides must agree, not match the spec).
-    let mut h: u64 = 1469598103934665603;
-    for b in metric.as_bytes() {
-        h ^= *b as u64;
-        h = h.wrapping_mul(1099511628211);
-    }
-    h
-}
-
-#[cfg(test)]
-/// Render the edge `threshold:` YAML mapping for the fused asap_edge processor's
-/// per-metric entry. Omits `key`/`coeffs` when not applicable to the functional.
-pub fn edge_threshold_block(intent: &MonitorIntent) -> Value {
-    let mut m = Mapping::new();
-    m.insert("enabled".into(), Value::Bool(true));
-    m.insert(
-        "functional".into(),
-        Value::String(intent.functional.as_str().to_string()),
-    );
-    if intent.functional == Functional::CmsPoint && !intent.key.is_empty() {
-        m.insert("key".into(), Value::String(intent.key.clone()));
-    }
-    if intent.functional == Functional::LinearBuckets && !intent.coeffs.is_empty() {
-        m.insert(
-            "coeffs".into(),
-            Value::Sequence(
-                intent
-                    .coeffs
-                    .iter()
-                    .map(|c| Value::Number((*c).into()))
-                    .collect(),
-            ),
-        );
-    }
-    m.insert(
-        "coordinator_url".into(),
-        Value::String(intent.coordinator_url.clone()),
-    );
-    m.insert("tau".into(), Value::Number(intent.tau.into()));
-    m.insert("epsilon".into(), Value::Number(intent.epsilon.into()));
-    Value::Mapping(m)
-}
-
-/// Render the backend `InstalledPrecomputePlan.monitors[]` JSON entry for this intent,
-/// stamping the cross-language `agg_id`.
-pub fn streaming_config_monitor_entry(intent: &MonitorIntent) -> serde_json::Value {
-    serde_json::json!({
-        "agg_id": agg_id_for_metric(&intent.metric),
-        "functional": intent.functional.as_str(),
-        "key": intent.key,
-        "tau": intent.tau,
-        "epsilon": intent.epsilon,
-        "window_ms": intent.window_ms,
-    })
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    #[test]
-    fn agg_id_matches_go_fnv64() {
-        // Pinned against the Go edge's fnv64 (asapedgeprocessor/warm_sketch.go),
-        // computed directly from that implementation.
-        assert_eq!(agg_id_for_metric("bytes_sent"), 10036451356866642109);
-        assert_eq!(
-            agg_id_for_metric("http_requests_total"),
-            16346598078036168951
-        );
-        assert_eq!(agg_id_for_metric("x"), 4953295298048672641);
-    }
-
-    fn sum_intent() -> MonitorIntent {
-        MonitorIntent {
-            metric: "bytes_sent".into(),
-            functional: Functional::Sum,
-            key: String::new(),
-            coeffs: Vec::new(),
-            coordinator_url: "data-plane:4319".into(),
-            tau: 100.0,
-            epsilon: 0.05,
-            window_ms: 60_000,
-        }
-    }
-
-    #[test]
-    fn edge_threshold_block_sum_shape() {
-        let v = edge_threshold_block(&sum_intent());
-        let m = v.as_mapping().unwrap();
-        assert_eq!(m.get(Value::from("enabled")).unwrap(), &Value::Bool(true));
-        assert_eq!(
-            m.get(Value::from("functional")).unwrap().as_str().unwrap(),
-            "sum"
-        );
-        assert_eq!(
-            m.get(Value::from("coordinator_url"))
-                .unwrap()
-                .as_str()
-                .unwrap(),
-            "data-plane:4319"
-        );
-        // Sum carries no key/coeffs.
-        assert!(m.get(Value::from("key")).is_none());
-        assert!(m.get(Value::from("coeffs")).is_none());
-    }
-
-    #[test]
-    fn edge_threshold_block_cms_point_carries_key() {
-        let mut intent = sum_intent();
-        intent.functional = Functional::CmsPoint;
-        intent.key = "svc=checkout".into();
-        let v = edge_threshold_block(&intent);
-        let m = v.as_mapping().unwrap();
-        assert_eq!(
-            m.get(Value::from("functional")).unwrap().as_str().unwrap(),
-            "cms_point"
-        );
-        assert_eq!(
-            m.get(Value::from("key")).unwrap().as_str().unwrap(),
-            "svc=checkout"
-        );
-    }
-
-    #[test]
-    fn streaming_entry_agg_id_matches_edge() {
-        let entry = streaming_config_monitor_entry(&sum_intent());
-        assert_eq!(
-            entry["agg_id"].as_u64().unwrap(),
-            agg_id_for_metric("bytes_sent")
-        );
-        assert_eq!(entry["tau"].as_f64().unwrap(), 100.0);
-        assert_eq!(entry["window_ms"].as_u64().unwrap(), 60_000);
-    }
-
-    #[test]
-    fn streaming_entry_deserializes_as_monitor_spec() {
-        // The emitted JSON must round-trip into the backend's MonitorSpec.
-        let entry = streaming_config_monitor_entry(&sum_intent());
-        let spec: asap_types::MonitorSpec =
-            serde_json::from_value(entry).expect("MonitorSpec deserialize");
-        assert_eq!(spec.agg_id, agg_id_for_metric("bytes_sent"));
-        assert_eq!(spec.tau, 100.0);
-        assert_eq!(spec.window_ms, 60_000);
-    }
-}
diff --git a/control_plane/src/epsilon_alloc.rs b/control_plane/src/epsilon_alloc.rs
deleted file mode 100644
index 7f322fabd..000000000
--- a/control_plane/src/epsilon_alloc.rs
+++ /dev/null
@@ -1,117 +0,0 @@
-//! Autonomous allocation, slice 3: derive the per-metric **knobs** — sampling
-//! probability `p` and the CDM delta-transmission threshold `δ` — from the
-//! target accuracy `ε`.
-//!
-//! Slice 2 ([`crate::query_planning`]) answered *which sketches* a query set
-//! needs. This slice answers *how to run them*: it attaches `p` and `δ` to each
-//! planned metric, completing `(ε, queries) → {sketches, p, δ}`.
-//!
-//! Two derivations, with an important asymmetry:
-//!   * **`p` is fully autonomous** from `(ε, rate)` via the unified ε-floor law
-//!     `p = 1/(1+ε²·rate)` — same law the data plane applies per-edge
-//!     ([`epsilon_sample_floor`]). `rate` is the per-window update count.
-//!   * **`δ` is only *sized* by ε.** The CDM threshold `τ` (the value of
-//!     interest the monitor alerts on) is a *user/query input*, not derivable
-//!     from ε. Given `τ` and the site count `k`, the even-split per-site slack
-//!     is `δ = ε·τ / k`. Metrics with no monitored threshold get no `δ`.
-//!
-//! [`epsilon_sample_floor`]: (mirrors `data_plane::monitor::sampling_alloc::epsilon_sample_floor`;
-//! control_plane has no dependency on data_plane, so the canonical one-liner is
-//! re-stated here — keep the two in sync.)
-
-/// Admission sampling probability under the unified ε-floor law,
-/// `p = 1/(1 + ε²·rate)`.
-///
-/// `rate` is the per-window update count for the metric (NOT a probability).
-/// Degenerate inputs (`rate ≤ 0` or `ε ≤ 0`) mean "no sampling" → `1.0`.
-/// Mirrors `data_plane::monitor::sampling_alloc::epsilon_sample_floor`.
-pub fn derive_sample_p(epsilon: f64, rate: f64) -> f64 {
-    if rate <= 0.0 || epsilon <= 0.0 {
-        return 1.0;
-    }
-    1.0 / (1.0 + epsilon * epsilon * rate)
-}
-
-/// GOS budget split (design §7, Layer B) — **exact linear peel**.
-///
-/// The staleness term `ε_st` is a *deterministic worst-case* bound, so it adds
-/// **linearly** to the random error (Theorem 1): the composition is
-/// `√(ε_sk² + ε_sa²) + ε_st ≤ ε_q`, NOT a three-way quadrature. This deriver
-/// therefore peels `ε_st` off linearly first and splits only the *random*
-/// residual between the sketch and sampling:
-///
-/// 1. linear headroom above the sketch: `excess = ε_q − ε_sk` (0 if the sketch
-///    already consumes the budget);
-/// 2. give a fraction `t = w_comm/(w_edge+w_comm)` of it to staleness:
-///    `ε_st = t·excess` (more comm-weight ⇒ looser thresholds ⇒ larger `ε_st`);
-/// 3. the remaining *random* budget is `ε_rand = ε_q − ε_st`, split in
-///    quadrature: `ε_sa = √(ε_rand² − ε_sk²)`.
-///
-/// This satisfies `√(ε_sk² + ε_sa²) + ε_st = ε_q` **exactly**. Limits:
-///   * `w_edge = 0` ⇒ `t=1` ⇒ `ε_st = ε_q−ε_sk`, `ε_rand=ε_sk`, `ε_sa=0` ⇒
-///     **no sampling** (`p=1`), cheap communication;
-///   * `w_comm = 0` ⇒ `t=0` ⇒ `ε_st=0`, `ε_sa=√(ε_q²−ε_sk²)` ⇒ coarse sampling,
-///     tight thresholds.
-pub fn split_budget(eps_total: f64, eps_sketch: f64, w_edge: f64, w_comm: f64) -> (f64, f64) {
-    if eps_total <= eps_sketch {
-        return (0.0, 0.0); // the sketch already uses the whole ε budget
-    }
-    let excess = eps_total - eps_sketch; // linear headroom above the sketch
-    let t = if w_edge + w_comm <= 0.0 {
-        0.0
-    } else {
-        w_comm / (w_edge + w_comm)
-    };
-    let eps_st = t * excess;
-    let eps_rand = eps_total - eps_st; // random budget after the linear peel
-    let eps_sa = (eps_rand * eps_rand - eps_sketch * eps_sketch)
-        .max(0.0)
-        .sqrt();
-    (eps_sa, eps_st)
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    #[test]
-    fn sample_p_follows_epsilon_floor() {
-        // p = 1/(1+ε²·rate); ε=0.05, rate=1000 → 1/(1+2.5) = 0.2857…
-        let p = derive_sample_p(0.05, 1000.0);
-        assert!((p - 1.0 / 3.5).abs() < 1e-9, "got {p}");
-    }
-
-    #[test]
-    fn split_budget_linear_peel_and_limits() {
-        // Exact linear composition: √(ε_sk² + ε_sa²) + ε_st = ε_q.
-        let (eq, esk) = (0.1, 0.03);
-        let (sa, st) = split_budget(eq, esk, 1.0, 1.0);
-        assert!(((esk * esk + sa * sa).sqrt() + st - eq).abs() < 1e-12);
-        // No edge-CPU concern ⇒ no sampling (ε_sa=0), all headroom to staleness.
-        let (sa, st) = split_budget(eq, esk, 0.0, 1.0);
-        assert!(sa.abs() < 1e-12);
-        assert!((st - (eq - esk)).abs() < 1e-12);
-        // No comm concern ⇒ no staleness, ε_sa = √(ε_q²−ε_sk²).
-        let (sa, st) = split_budget(eq, esk, 1.0, 0.0);
-        assert_eq!(st, 0.0);
-        assert!((sa - (eq * eq - esk * esk).sqrt()).abs() < 1e-12);
-        // Higher edge weight ⇒ more of the budget to sampling (larger ε_sa).
-        let (sa_hi, _) = split_budget(eq, esk, 4.0, 1.0);
-        let (sa_lo, _) = split_budget(eq, esk, 1.0, 1.0);
-        assert!(sa_hi > sa_lo);
-        // Sketch consumes the whole budget ⇒ nothing left.
-        assert_eq!(split_budget(0.03, 0.05, 1.0, 1.0), (0.0, 0.0));
-    }
-
-    #[test]
-    fn sample_p_degenerate_inputs_disable_sampling() {
-        assert_eq!(derive_sample_p(0.0, 1000.0), 1.0); // ε=0
-        assert_eq!(derive_sample_p(0.05, 0.0), 1.0); // rate=0
-    }
-
-    #[test]
-    fn sample_p_monotonic_decreasing_in_rate_and_epsilon() {
-        assert!(derive_sample_p(0.05, 100.0) > derive_sample_p(0.05, 10_000.0));
-        assert!(derive_sample_p(0.01, 1000.0) > derive_sample_p(0.10, 1000.0));
-    }
-}
diff --git a/control_plane/src/lib.rs b/control_plane/src/lib.rs
index 99f2fa936..0483c8165 100644
--- a/control_plane/src/lib.rs
+++ b/control_plane/src/lib.rs
@@ -1,79 +1,134 @@
-//! Backend control-plane library and standalone service.
+//! Backend control plane: asks ASAPPlanner for the workload's plan and
+//! writes it for the data plane to install.
 //!
-//! ASAPPlanner owns canonical semantic IR and legal logical selection. This
-//! crate adapts workload/evidence inputs, compiles physical candidates, checks
-//! provider quotes, and publishes one consistent catalog-backed generation.
-//! Shared execution and installation contracts live in `asap_types`.
-//!
-//! `physical::compiler`, `physical::workload_cost`, and `clickhouse` are the
-//! current compilation paths. Metric stage emission consumes the same canonical
-//! workload model through a registration adapter. Public modules are integration APIs,
-//! not an independent wire schema or a second semantic planner.
+//! The Planner runs every planning stage, including plan selection. This
+//! crate only supplies the deployment's capabilities and records which query
+//! each root of the selected `PhysicalASAPDAG` answers.
+
+use std::path::Path;
 
-#![allow(
-    clippy::collapsible_match,
-    clippy::doc_lazy_continuation,
-    clippy::doc_overindented_list_items,
-    clippy::field_reassign_with_default,
-    clippy::large_enum_variant,
-    clippy::map_identity,
-    clippy::result_large_err,
-    clippy::too_many_arguments,
-    clippy::type_complexity,
-    clippy::vec_init_then_push
-)]
+use asap_plan_selection::{plan_stages, PlanningModels};
+use planner_types::deployment::DeploymentCapabilities;
+use planner_types::ir::physical_export::PhysicalASAPDAGDocument;
+use planner_types::ir::schema_support::with_promql_series_identity;
+use planner_types::ir::QueryRoot;
+use planner_types::workload::{PlanningWorkload, QueryLanguage, RootDemand};
+use serde::{Deserialize, Serialize};
 
-pub mod accuracy;
-pub mod backend_client;
-pub mod clickhouse;
-pub mod emit;
-pub mod epsilon_alloc;
-pub mod metrics_exposer;
-pub mod opamp;
-pub mod physical;
-pub mod planner_selection;
-pub mod query_parser;
-pub mod query_plan;
-pub mod runtime_samples;
-pub mod types;
-pub mod workload;
+/// The plan the data plane installs: the Planner's selected physical DAG and
+/// the query each of its roots answers.
+#[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
+#[serde(deny_unknown_fields)]
+pub struct InstalledPlan {
+    /// PromQL text of each root of `dag`, in root order.
+    pub queries: Vec<String>,
+    pub dag: PhysicalASAPDAGDocument,
+}
 
-/// Crate-wide test-only utilities for serialising access to process-global
-/// state (environment variables).
-///
-/// `cargo test` runs `#[test]`/`#[tokio::test]` functions on multiple
-/// threads within a SINGLE process, and `std::env::set_var` /
-/// `std::env::remove_var` mutate the one process-global environment table.
-/// Those C `setenv`/`unsetenv` calls are not thread-safe — concurrent
-/// invocations (even on different keys) are documented as unsound and can
-/// corrupt the table — and any test that READS an env var via
-/// `std::env::var` can transiently observe a value another test set
-/// mid-emit. Both classes of failure are non-deterministic and surface as
-/// flaky test results.
-///
-/// Every unit test in this crate that reads OR writes a process-global env
-/// var (`ASAP_EDGE_FUSED`, `ASAP_AGENT_MEMORY_LIMIT_MIB`,
-/// `USE_TYPED_STAGE_SPLIT`, …) must serialise behind the SINGLE
-/// [`env_lock()`] below — one shared lock so no two such tests ever run
-/// concurrently, regardless of which module they live in. Tests that
-/// mutate env should use [`EnvVarGuard`] so the prior value is restored on
-/// drop (panic-safe), preventing state from leaking between tests.
-#[cfg(test)]
-pub(crate) mod test_support {
-    use std::rc::Rc;
+#[derive(Debug, thiserror::Error)]
+pub enum PlanError {
+    #[error("only PromQL workloads are supported, got {0:?}")]
+    UnsupportedLanguage(QueryLanguage),
+    #[error("query {0} lowers to a scalar, which the physical DAG cannot carry yet")]
+    ScalarRoot(usize),
+    #[error("PromQL lowering: {0}")]
+    Lowering(String),
+    #[error("planning: {0}")]
+    Planning(String),
+    #[error("invalid physical DAG: {0}")]
+    InvalidDag(String),
+    #[error("the DAG has {roots} roots for {queries} queries")]
+    RootCount { roots: usize, queries: usize },
+    #[error("{path}: {message}")]
+    File { path: String, message: String },
+}
 
-    use planner_types::pre_asap::{CompareOpKind, Predicate, QueryExpr, ScalarValue, Schema};
+impl InstalledPlan {
+    pub fn validate(&self) -> Result<(), PlanError> {
+        self.dag
+            .validate()
+            .map_err(|e| PlanError::InvalidDag(e.to_string()))?;
+        let roots = self.dag.dag.roots.len();
+        if roots != self.queries.len() {
+            return Err(PlanError::RootCount {
+                roots,
+                queries: self.queries.len(),
+            });
+        }
+        Ok(())
+    }
+
+    /// Reads and validates a plan written by [`InstalledPlan::save`].
+    pub fn load(path: &Path) -> Result<Self, PlanError> {
+        let file_error = |message: String| PlanError::File {
+            path: path.display().to_string(),
+            message,
+        };
+        let text = std::fs::read_to_string(path).map_err(|e| file_error(e.to_string()))?;
+        let plan: Self = serde_json::from_str(&text).map_err(|e| file_error(e.to_string()))?;
+        plan.validate()?;
+        Ok(plan)
+    }
+
+    pub fn save(&self, path: &Path) -> Result<(), PlanError> {
+        let text = serde_json::to_string_pretty(self).expect("plans serialize");
+        std::fs::write(path, text).map_err(|e| PlanError::File {
+            path: path.display().to_string(),
+            message: e.to_string(),
+        })
+    }
+}
+
+/// Plans `workload` with the Planner's #509 stage pipeline and returns the
+/// selected plan. `capabilities` are what this deployment can execute; the
+/// Planner rejects every candidate that needs more.
+pub fn plan_workload(
+    workload: &PlanningWorkload,
+    capabilities: &DeploymentCapabilities,
+) -> Result<InstalledPlan, PlanError> {
+    let language = &workload.query_workload.language;
+    if *language != QueryLanguage::PromQL {
+        return Err(PlanError::UnsupportedLanguage(language.clone()));
+    }
+    let roots = asap_frontend_promql::lower_promql_query_workload(workload, 0)
+        .map_err(|e| PlanError::Lowering(e.to_string()))?
+        .into_iter()
+        .enumerate()
+        .map(|(i, root)| match root {
+            // Rows carry each series' full identity: the representation
+            // per-series state needs at runtime.
+            QueryRoot::Operator(node) => with_promql_series_identity(&node)
+                .map(|node| (i, QueryRoot::Operator(node)))
+                .map_err(|e| PlanError::Lowering(e.to_string())),
+            QueryRoot::Scalar(_) => Err(PlanError::ScalarRoot(i)),
+        })
+        .collect::<Result<Vec<_>, _>>()?;
+    let entries: Vec<_> = workload.query_workload.entries().collect();
+    let demand: Vec<RootDemand> = entries.iter().map(RootDemand::from).collect();
+    let data = workload.data_workload.clone().unwrap_or_default();
+    let models = PlanningModels::builtin().with_capabilities(capabilities);
+    let run = plan_stages(roots, &demand, &data, models, 0)
+        .map_err(|e| PlanError::Planning(e.to_string()))?;
+    let physical = run.plan.physical;
+    tracing::info!(
+        candidate = %physical.id,
+        label = %physical.label,
+        materialization = %physical.materialization,
+        "selected physical plan"
+    );
+    let plan = InstalledPlan {
+        queries: entries.into_iter().map(|e| e.query.0).collect(),
+        dag: PhysicalASAPDAGDocument::new(physical.dag),
+    };
+    plan.validate()?;
+    Ok(plan)
+}
 
-    pub(crate) fn label_eq_predicate(
-        label: &str,
-        value: &str,
-        schema: &Schema,
-    ) -> Option<Predicate> {
-        let column = schema.column_id(label)?;
-        Some(Predicate(Rc::new(QueryExpr::Compare {
-            left: Rc::new(QueryExpr::Column(column)),
-            op: CompareOpKind::Eq,
-            right: Rc::new(QueryExpr::Literal(ScalarValue::Utf8(value.to_string()))),
-        })))
+/// What this backend's data plane can execute: the Planner executor it
+/// runs, without state kept across query evaluations.
+pub fn backend_capabilities() -> DeploymentCapabilities {
+    DeploymentCapabilities {
+        query_time_retention: false,
+        ..asap_executor::capabilities()
     }
 }
diff --git a/control_plane/src/main.rs b/control_plane/src/main.rs
index fae7acbb2..cb262967c 100644
--- a/control_plane/src/main.rs
+++ b/control_plane/src/main.rs
@@ -1,1130 +1,50 @@
-#![allow(clippy::doc_lazy_continuation, clippy::type_complexity)]
-
-use control_plane::backend_client;
-use control_plane::clickhouse;
-use control_plane::metrics_exposer;
-use control_plane::opamp;
-use control_plane::physical;
-use control_plane::runtime_samples;
-use control_plane::types;
-
-use axum::{
-    extract::State,
-    http::StatusCode,
-    response::{IntoResponse, Response},
-    routing::{get, post},
-    Json, Router,
-};
-use serde::{Deserialize, Serialize};
-use serde_json::json;
-use std::collections::HashMap;
-use std::sync::Arc;
-use std::time::Duration;
-use tracing::info;
-
-use opamp::OpampServer;
-use physical::deployment_cost::online as online_cost_model;
-use physical::deployment_cost::online::{init_store as init_online_store, OnlineMetricsStore};
-use physical::deployment_cost::tco;
-
-// ── Shared state ──────────────────────────────────────────────────────────────
-
-#[derive(Clone)]
-struct AppState {
-    opamp: Arc<OpampServer>,
-    online_store: OnlineMetricsStore,
-    /// Bounded ring buffer for runtime-sample push batches from
-    /// agents' `sketch-runtime::PushExporter`. Read by decision
-    /// loops in the replanner.
-    runtime_samples: Arc<runtime_samples::RuntimeSamplesStore>,
-    /// The successfully activated typed catalog is authoritative for live ERP
-    /// input identity; incoming telemetry cannot supply its own descriptors.
-    active_summary_catalog:
-        Arc<tokio::sync::Mutex<Option<Arc<asap_types::summary_catalog::SummaryCatalog>>>>,
-    /// Shared client for publishing physical plans from HTTP planning and replanning.
-    /// `None` when `CONTROLLER_BACKEND_ENDPOINT` is unset; pushes are then skipped.
-    backend_client: Option<Arc<backend_client::BackendClient>>,
-}
-
-// ── Entry point ───────────────────────────────────────────────────────────────
-
-#[tokio::main]
-async fn main() {
-    tracing_subscriber::fmt::init();
-
-    let api_addr = std::env::var("CONTROLLER_ADDR").unwrap_or_else(|_| "0.0.0.0:8080".into());
-    let opamp_addr =
-        std::env::var("CONTROLLER_OPAMP_ADDR").unwrap_or_else(|_| "0.0.0.0:4320".into());
-    let backend_endpoint = std::env::var("CONTROLLER_BACKEND_ENDPOINT").ok();
-
-    // ── SP-5: Online EMA cost store ───────────────────────────────────────────
-    let online_store = init_online_store();
-
-    // ── OpAMP server ──────────────────────────────────────────────────────────
-    // Collector plans are published on demand by the physical-plan path; the
-    // server itself carries no plan-push hooks.
-    let opamp_srv: Arc<OpampServer> = Arc::new(OpampServer::new());
-
-    let backend_client_shared: Option<Arc<backend_client::BackendClient>> =
-        backend_endpoint.as_ref().map(|endpoint| {
-            info!(
-                endpoint = %endpoint,
-                "ASAPQuery-backend InstalledPrecomputePlan push enabled"
-            );
-            Arc::new(backend_client::BackendClient::new(endpoint.clone()))
-        });
-    if backend_client_shared.is_none() {
-        info!(
-            "ASAPQuery-backend physical-plan publication disabled \
-             (set CONTROLLER_BACKEND_ENDPOINT=<url> to enable)"
-        );
-    }
-
-    let runtime_samples_store = runtime_samples::RuntimeSamplesStore::new(1024);
-    let state = AppState {
-        opamp: Arc::clone(&opamp_srv),
-        online_store: Arc::clone(&online_store),
-        runtime_samples: Arc::clone(&runtime_samples_store),
-        active_summary_catalog: Arc::new(tokio::sync::Mutex::new(None)),
-        backend_client: backend_client_shared,
-    };
-
-    // ── OpAMP WebSocket listener ──────────────────────────────────────────────
-    let opamp_router = Router::new()
-        .route("/v1/opamp", get(OpampServer::ws_handler))
-        .with_state(Arc::clone(&opamp_srv));
-
-    tokio::spawn(async move {
-        let listener = tokio::net::TcpListener::bind(&opamp_addr).await.unwrap();
-        info!("OpAMP server listening on {opamp_addr}");
-        axum::serve(listener, opamp_router).await.unwrap();
-    });
-
-    // ── gRPC runtime-samples service (was HTTP+JSONL) ─────────────────────────
-    // Agents' `sketch-runtime::GrpcExporter` call
-    // `asap.runtime.v1.RuntimeSamples.Push` on this port. See
-    // commit message for the HTTP → gRPC pivot rationale.
-    let runtime_samples_state = Arc::clone(&state.runtime_samples);
-    let grpc_addr = std::env::var("CONTROLLER_GRPC_ADDR").unwrap_or_else(|_| "0.0.0.0:4321".into());
-    let grpc_store = Arc::clone(&runtime_samples_state);
-    tokio::spawn(async move {
-        let addr: std::net::SocketAddr = grpc_addr.parse().expect("CONTROLLER_GRPC_ADDR");
-        info!("runtime-samples gRPC server listening on {addr}");
-        let svc = runtime_samples::RuntimeSamplesService::new(grpc_store).into_server();
-        if let Err(e) = tonic::transport::Server::builder()
-            .add_service(svc)
-            .serve(addr)
-            .await
-        {
-            tracing::error!(error = %e, "runtime-samples gRPC server exited");
-        }
-    });
-
-    // /metrics — same exposer as before, unchanged. Prom scrapes
-    // the control plane HTTP port; gRPC is the push side only.
-    let metrics_registry = metrics_exposer::MetricsRegistry::new();
-    let metrics_state = metrics_exposer::MetricsState {
-        registry: Arc::clone(&metrics_registry),
-        store: Arc::clone(&runtime_samples_state),
-        stats: runtime_samples_state.stats_handle(),
-    };
-    let metrics_router = Router::new()
-        .route(
-            "/metrics",
-            axum::routing::get(metrics_exposer::handle_metrics),
-        )
-        .with_state(metrics_state);
-
-    let app = Router::new()
-        .route(
-            "/api/v1/physical-plan/cost-manifests",
-            post(handle_workload_cost_manifests),
-        )
-        .route(
-            "/api/v1/metricsql/physical-plan/cost-manifests",
-            post(handle_metricsql_workload_cost_manifests),
-        )
-        .route(
-            "/api/v1/physical-plan/compile-and-publish",
-            post(handle_compile_and_publish_physical_plan),
-        )
-        .route(
-            "/api/v1/metricsql/physical-plan/compile-and-publish",
-            post(handle_compile_and_publish_metricsql_physical_plan),
-        )
-        .route(
-            "/api/v1/clickhouse-plan/compile-and-publish",
-            post(handle_compile_and_publish_clickhouse_plan),
-        )
-        .route(
-            "/api/v1/clickhouse-plan/automatic/compile-and-publish",
-            post(handle_compile_and_publish_automatic_clickhouse_plan),
-        )
-        .route("/api/v1/cost-model", get(handle_cost_model))
-        .route("/api/v1/tco", post(handle_tco))
-        .with_state(state)
-        .merge(metrics_router);
-
-    let listener = tokio::net::TcpListener::bind(&api_addr).await.unwrap();
-    info!("control plane API listening on {api_addr}");
-    axum::serve(listener, app).await.unwrap();
-}
-
-#[derive(Debug, Deserialize)]
-#[serde(deny_unknown_fields)]
-struct PhysicalPlanQueryRequest {
-    query_id: String,
-    query_string: String,
-    metric: String,
-    window_secs: u64,
-    #[serde(default)]
-    group_by: Vec<String>,
-    accuracy: types::AccuracyTarget,
-    lifecycle: physical::compiler::SummaryLifecyclePlanningInputs,
-    window_cost_model: physical::compiler::WindowCostModel,
-    evaluation_phase_ms: u64,
-    #[serde(default)]
-    runtime_policy: physical::compiler::RuntimeRulePolicy,
-}
-
-#[derive(Debug, Deserialize)]
-#[serde(deny_unknown_fields)]
-struct CompileAndPublishPhysicalPlanRequest {
-    /// Opt-in additive response for quote preparation; the default remains a manifest array.
-    #[serde(default)]
-    explain: bool,
-    #[serde(default = "default_physical_deployment_target")]
-    target: physical::compiler::PhysicalDeploymentTarget,
-    #[serde(default)]
-    workload_cost_evidence: Option<physical::workload_cost::WorkloadCostEvidence>,
-    queries: Vec<PhysicalPlanQueryRequest>,
-    data_workload: planner_types::workload::DataWorkload,
-    dataset_identity: planner_types::post_asap::LogicalDatasetIdentity,
-    #[serde(rename = "collector_ids")]
-    target_collector_ids: Vec<String>,
-    capability_snapshot_id: String,
-    #[serde(default)]
-    evidence: HashMap<String, physical::compiler::TopKMembershipEvidence>,
-    #[serde(default)]
-    exact_composition_costs:
-        HashMap<String, Vec<physical::post_asap::cost_model::ExactCompositionCostEvidence>>,
-    #[serde(default)]
-    erp: Option<physical::erp::ErpPlanningInput>,
-    #[serde(default)]
-    runtime_adaptation_evidence: Vec<physical::compiler::RuntimeAdaptationEvidence>,
-    planner_revision: String,
-    max_evidence_age_ms: u64,
-    plan_version: u64,
-    activation_unix_ms: u64,
-    expiry_unix_ms: Option<u64>,
-    backend_compat: String,
-    #[serde(default = "default_physical_plan_timeout_ms")]
-    apply_timeout_ms: u64,
-}
-
-fn default_physical_deployment_target() -> physical::compiler::PhysicalDeploymentTarget {
-    physical::compiler::PhysicalDeploymentTarget::DistributedCollectors
-}
-
-fn default_physical_plan_timeout_ms() -> u64 {
-    10_000
-}
-
-use physical::compiler::QueryFrontend;
-
-#[derive(Debug, Serialize)]
-struct CompileAndPublishPhysicalPlanResponse {
-    cost_comparison: Option<physical::workload_cost::CandidatePlanSelectionReport>,
-    #[serde(rename = "logical_selection")]
-    planner_selection_trace: Vec<serde_json::Value>,
-    plan_id: u64,
-    plan_version: u64,
-    status: &'static str,
-    generated_at_unix_ms: u64,
-    #[serde(rename = "collector_ids")]
-    target_collector_ids: Vec<String>,
-    lifecycle_estimates: Vec<physical::compiler::MaterializationLifecycleEstimate>,
-}
-
-/// Compile one Planner IR decision into one catalog-backed physical plan and
-/// install it atomically before publishing collector projections.
-async fn handle_compile_and_publish_physical_plan(
-    State(st): State<AppState>,
-    Json(request): Json<CompileAndPublishPhysicalPlanRequest>,
-) -> Response {
-    compile_and_publish_physical_plan(st, request, QueryFrontend::PromQl).await
-}
-
-async fn handle_compile_and_publish_metricsql_physical_plan(
-    State(st): State<AppState>,
-    Json(request): Json<CompileAndPublishPhysicalPlanRequest>,
-) -> Response {
-    compile_and_publish_physical_plan(st, request, QueryFrontend::MetricsQl).await
-}
-
-async fn compile_and_publish_physical_plan(
-    st: AppState,
-    mut request: CompileAndPublishPhysicalPlanRequest,
-    frontend: QueryFrontend,
-) -> Response {
-    // Serialize typed activations so an older response cannot overwrite the
-    // catalog recorded after a newer backend activation.
-    let mut active_catalog = st.active_summary_catalog.lock().await;
-    if let Some(erp) = &mut request.erp {
-        if let Err(error) = erp.hydrate_observed_shape(&st.runtime_samples) {
-            return (StatusCode::UNPROCESSABLE_ENTITY, error).into_response();
-        }
-        let catalog = active_catalog.clone();
-        erp.resolve_population_data_descriptor(catalog.as_deref());
-    }
-    let (bundle, target_collector_ids, apply_timeout, adaptation_evidence, _) =
-        match compile_physical_plan_request(request, false, frontend) {
-            Ok((Some(bundle), ids, timeout, adaptation, manifests)) => {
-                (bundle, ids, timeout, adaptation, manifests)
-            }
-            Ok((None, ..)) => {
-                return (
-                    StatusCode::INTERNAL_SERVER_ERROR,
-                    "publication requires a selected plan",
-                )
-                    .into_response()
-            }
-            Err(response) => return physical_compile_failure(response),
-        };
-
-    let Some(backend) = st.backend_client.as_ref() else {
-        return (
-            StatusCode::SERVICE_UNAVAILABLE,
-            "CONTROLLER_BACKEND_ENDPOINT is required for physical-plan publication".to_string(),
-        )
-            .into_response();
-    };
-    if let Err(error) = st
-        .opamp
-        .ensure_collector_plan_targets(&bundle.collector_plans, apply_timeout)
-        .await
-    {
-        return (
-            StatusCode::BAD_GATEWAY,
-            format!("collector physical-plan preflight failed: {error}"),
-        )
-            .into_response();
-    }
-    let publication = match bundle.to_publication_artifact() {
-        Ok(publication) => publication,
-        Err(error) => {
-            return (
-                StatusCode::INTERNAL_SERVER_ERROR,
-                format!("invalid catalog publication: {error}"),
-            )
-                .into_response()
-        }
-    };
-    if let Err(error) = backend
-        .post_catalog_plan_typed(
-            &publication,
-            Some(bundle.storage_routing.clone()),
-            &adaptation_evidence,
-        )
-        .await
-    {
-        return (
-            StatusCode::BAD_GATEWAY,
-            format!("backend rejected physical plan: {error}"),
-        )
-            .into_response();
-    }
-    if let Err(error) = st
-        .opamp
-        .publish_collector_plans(&bundle.collector_plans, apply_timeout)
-        .await
-    {
-        let cleanup = backend
-            .discard_staged_physical_plan(bundle.envelope.plan_id, bundle.envelope.plan_version)
-            .await;
-        return (
-            StatusCode::BAD_GATEWAY,
-            format!("collector physical-plan publication failed: {error}; staged backend cleanup: {cleanup:?}"),
-        )
-            .into_response();
-    }
-    let now = std::time::SystemTime::now()
-        .duration_since(std::time::UNIX_EPOCH)
-        .unwrap_or_default()
-        .as_millis() as u64;
-    let activation_wait = bundle.envelope.activation_unix_ms.saturating_sub(now);
-    if activation_wait > apply_timeout.as_millis() as u64 {
-        return (
-            StatusCode::GATEWAY_TIMEOUT,
-            "activation time exceeds apply_timeout_ms; backend remains staged".to_string(),
-        )
-            .into_response();
-    }
-    if activation_wait > 0 {
-        tokio::time::sleep(Duration::from_millis(activation_wait)).await;
-    }
-    if let Err(error) = backend
-        .activate_physical_plan(bundle.envelope.plan_id, bundle.envelope.plan_version)
-        .await
-    {
-        return (
-            StatusCode::BAD_GATEWAY,
-            format!("backend physical-plan activation failed: {error}"),
-        )
-            .into_response();
-    }
-
-    *active_catalog = Some(Arc::new(bundle.summary_catalog));
-
-    Json(CompileAndPublishPhysicalPlanResponse {
-        cost_comparison: bundle.cost_comparison,
-        planner_selection_trace: bundle.planner_selection_trace,
-        plan_id: bundle.envelope.plan_id,
-        plan_version: bundle.envelope.plan_version,
-        status: "active",
-        generated_at_unix_ms: bundle.envelope.generated_at_unix_ms,
-        target_collector_ids,
-        lifecycle_estimates: bundle.lifecycle_estimates,
-    })
-    .into_response()
-}
-
-async fn handle_compile_and_publish_clickhouse_plan(
-    State(state): State<AppState>,
-    Json(request): Json<clickhouse::ClickHouseSqlWorkload>,
-) -> impl IntoResponse {
-    let publication = match clickhouse::compile_clickhouse_workload(&request).await {
-        Ok(publication) => publication,
-        Err(error) => return (StatusCode::BAD_REQUEST, error.to_string()).into_response(),
-    };
-    publish_clickhouse_plan(&state, publication, None).await
-}
-
-async fn handle_compile_and_publish_automatic_clickhouse_plan(
-    State(state): State<AppState>,
-    Json(request): Json<clickhouse::ClickHouseSqlAutomaticWorkload>,
-) -> impl IntoResponse {
-    let (publication, trace) =
-        match clickhouse::compile_automatic_clickhouse_workload(&request).await {
-            Ok(publication) => publication,
-            Err(error) => return (StatusCode::BAD_REQUEST, error.to_string()).into_response(),
-        };
-    publish_clickhouse_plan(&state, publication, Some(serde_json::json!(trace))).await
-}
-
-async fn publish_clickhouse_plan(
-    state: &AppState,
-    publication: physical::publication::PhysicalPlanPublication,
-    selection_trace: Option<serde_json::Value>,
-) -> axum::response::Response {
-    let mut active_catalog = state.active_summary_catalog.lock().await;
-    let plan_id = publication.summary_catalog.plan_id;
-    let plan_version = publication.summary_catalog.plan_version;
-    let Some(client) = state.backend_client.as_ref() else {
-        return (
-            StatusCode::SERVICE_UNAVAILABLE,
-            "backend publication is not configured",
-        )
-            .into_response();
-    };
-    if let Err(error) = client
-        .post_catalog_plan_typed(&publication, None, &[])
-        .await
-    {
-        return (StatusCode::BAD_GATEWAY, error.to_string()).into_response();
-    }
-    if let Err(error) = client.activate_physical_plan(plan_id, plan_version).await {
-        let _ = client
-            .discard_staged_physical_plan(plan_id, plan_version)
-            .await;
-        return (StatusCode::BAD_GATEWAY, error.to_string()).into_response();
-    }
-    *active_catalog = Some(Arc::new(publication.summary_catalog));
-    Json(serde_json::json!({
-        "plan_id": plan_id,
-        "plan_version": plan_version,
-        "status": "active",
-        "selection_trace": selection_trace,
-    }))
-    .into_response()
-}
-
-// Keep Planner's Rc-backed rewrite DAG outside the async handler's future.
-// Only the Send-safe compiled bundle crosses an await point.
-fn compile_physical_plan_request(
-    request: CompileAndPublishPhysicalPlanRequest,
-    manifests_only: bool,
-    frontend: QueryFrontend,
-) -> Result<
-    (
-        Option<physical::compiler::CompiledPhysicalPlan>,
-        Vec<String>,
-        Duration,
-        Vec<physical::compiler::RuntimeAdaptationEvidence>,
-        (
-            Vec<physical::workload_cost::WorkloadCostManifest>,
-            Vec<physical::workload_cost::CandidatePlanEvaluation>,
-            Vec<serde_json::Value>,
-        ),
-    ),
-    (StatusCode, serde_json::Value),
-> {
-    if request.queries.is_empty()
-        || (request.target == physical::compiler::PhysicalDeploymentTarget::DistributedCollectors
-            && request.target_collector_ids.is_empty())
-        || (request.target == physical::compiler::PhysicalDeploymentTarget::BackendLocalRemoteWrite
-            && !request.target_collector_ids.is_empty())
-    {
-        return Err((
-            StatusCode::UNPROCESSABLE_ENTITY,
-            "queries must be non-empty; distributed deployment requires collectors and backend-local deployment requires none".to_string().into(),
-        ));
-    }
-    if request.max_evidence_age_ms == 0 || request.apply_timeout_ms == 0 {
-        return Err((
-            StatusCode::UNPROCESSABLE_ENTITY,
-            "max_evidence_age_ms and apply_timeout_ms must be non-zero"
-                .to_string()
-                .into(),
-        ));
-    }
-    if request.plan_version == 0
-        || request.activation_unix_ms == 0
-        || request.backend_compat != control_plane::physical::compiler::BACKEND_COMPAT
-        || request
-            .expiry_unix_ms
-            .is_some_and(|expiry| expiry <= request.activation_unix_ms)
-    {
-        return Err((
-            StatusCode::UNPROCESSABLE_ENTITY,
-            "plan_version, activation_unix_ms, backend_compat and expiry are invalid"
-                .to_string()
-                .into(),
-        ));
-    }
-
-    let now = std::time::SystemTime::now()
-        .duration_since(std::time::UNIX_EPOCH)
-        .unwrap_or_default()
-        .as_millis() as u64;
-    for query in &request.queries {
-        if query.query_id.trim().is_empty()
-            || query.metric.trim().is_empty()
-            || query.window_secs == 0
-        {
-            return Err((
-                StatusCode::UNPROCESSABLE_ENTITY,
-                "query_id, metric, and window_secs must be non-empty/non-zero"
-                    .to_string()
-                    .into(),
-            ));
-        }
-    }
-    let workload_entries = request
-        .queries
-        .iter()
-        .map(|query| planner_types::workload::RepeatingEntry {
-            query: planner_types::workload::Query(query.query_string.clone()),
-            demand: planner_types::workload::RepeatedDemand::FixedIntervalAt {
-                interval: planner_types::workload::RepetitionInterval(
-                    query.lifecycle.evaluation_interval_ms,
-                ),
-                evaluation_phase: planner_types::workload::TimestampMs(query.evaluation_phase_ms),
-            },
-            requirements: planner_types::workload::QueryRequirements {
-                accuracy: planner_types::workload::AccuracyRequirement::Explicit(
-                    query.accuracy.clone(),
-                ),
-                ..Default::default()
-            },
-            predictability: planner_types::workload::Predictability::Predictable { known_at: None },
-            time_selection: planner_types::workload::TimeSelection {
-                lookback: Some(planner_types::workload::DurationMs(
-                    query.window_secs.saturating_mul(1_000),
-                )),
-                ..Default::default()
-            },
-        })
-        .collect();
-    let query_workload = planner_types::workload::QueryWorkload {
-        language: planner_types::workload::QueryLanguage::PromQL,
-        query_batch: None,
-        repeating_queries: Some(workload_entries),
-    };
-    request
-        .data_workload
-        .validate()
-        .map_err(|error| (StatusCode::UNPROCESSABLE_ENTITY, error.to_string().into()))?;
-    let lowered = match frontend {
-        QueryFrontend::PromQl => asap_frontend_promql::lower_promql_workload(
-            &planner_types::workload::PlanningWorkload {
-                query_workload: query_workload.clone(),
-                data_workload: Some(request.data_workload.clone()),
-            },
-            now,
-        )
-        .map_err(|error| (StatusCode::UNPROCESSABLE_ENTITY, error.to_string().into()))?,
-        QueryFrontend::MetricsQl => request
-            .queries
-            .iter()
-            .map(|query| frontend.parse(&query.query_string, query.accuracy.clone()))
-            .collect::<Result<Vec<_>, _>>()
-            .map_err(|error| (StatusCode::UNPROCESSABLE_ENTITY, error.to_string().into()))?,
-    };
-
-    let mut queries = Vec::with_capacity(request.queries.len());
-    let mut canonical_roots = Vec::with_capacity(request.queries.len());
-    let mut window_models = Vec::new();
-    for (query, expr) in request.queries.into_iter().zip(lowered) {
-        let post_asap = match control_plane::planner_selection::keep_pre_asap(&expr) {
-            Ok(plan) => plan,
-            Err(error) => return Err((StatusCode::UNPROCESSABLE_ENTITY, error.to_string().into())),
-        };
-        canonical_roots.push(std::rc::Rc::new(expr));
-        window_models.push(query.window_cost_model);
-        queries.push(physical::compiler::QueryCompilationInput {
-            query_id: query.query_id,
-            query_string: query.query_string,
-            selected_plan_root: post_asap,
-            legacy_query_source: planner_types::pre_asap::Source::TimeSeries {
-                metric: query.metric,
-            },
-            query_lookback_seconds: query.window_secs,
-            group_by_labels: query.group_by,
-            accuracy_target: query.accuracy,
-            summary_lifecycle_inputs: query.lifecycle,
-            window_realization_candidates: Vec::new(),
-            materialization_runtime_policy: query.runtime_policy,
-        });
-    }
-
-    let planner_selection_trace = match physical::compiler::select_logical_roots_with_trace(
-        &mut queries,
-        canonical_roots.clone(),
-        &request.evidence,
-        &request.exact_composition_costs,
-        request.erp.as_ref(),
-    ) {
-        Ok(trace) => trace,
-        Err(error) => return Err((StatusCode::UNPROCESSABLE_ENTITY, error.to_string().into())),
-    };
-
-    for (query, model) in queries.iter_mut().zip(window_models) {
-        physical::compiler::prepare_window_implementations(query, &model, request.target, 0)
-            .map_err(|error| (StatusCode::UNPROCESSABLE_ENTITY, error.to_string().into()))?;
-    }
-    let compilation_request = physical::compiler::PhysicalCompilationRequest {
-        planner_selection_trace,
-        query_workload: Some(query_workload),
-        data_workload: Some(request.data_workload),
-        canonical_roots,
-        queries,
-        allow_mixed_summary_and_exact_execution: request.target
-            == physical::compiler::PhysicalDeploymentTarget::BackendLocalRemoteWrite,
-        enabled_materialization_keys: None,
-        topk_membership_evidence_by_query_id: request.evidence,
-        exact_composition_costs: request.exact_composition_costs,
-        erp: request.erp,
-        planner_revision: request.planner_revision,
-        scrape_interval_ms: None,
-        query_retention_margin_ms: 0,
-        retained_summary_memory_budget_bytes: None,
-    };
-    let environment = physical::compiler::PhysicalDeploymentContext {
-        dataset_identity: request.dataset_identity,
-        target: request.target,
-        target_collector_ids: request.target_collector_ids.clone(),
-        capability_snapshot_id: request.capability_snapshot_id,
-        observed_at_unix_ms: now,
-        max_evidence_age_ms: request.max_evidence_age_ms,
-        plan_version: request.plan_version,
-        activation_unix_ms: request.activation_unix_ms,
-        expiry_unix_ms: request.expiry_unix_ms,
-        backend_compat: request.backend_compat,
-    };
-    let candidates = physical::workload_cost::enumerate_exact_and_materialized_candidates(
-        compilation_request.clone(),
-    )
-    .map_err(|error| (StatusCode::UNPROCESSABLE_ENTITY, error.to_string().into()))?;
-    let planner_selection_trace = compilation_request.planner_selection_trace.clone();
-    let (manifests, candidate_evaluations) =
-        physical::workload_cost::compile_candidates_for_pricing(
-            candidates.clone(),
-            environment.clone(),
-            frontend,
-        );
-    let apply_timeout = Duration::from_millis(request.apply_timeout_ms);
-    // Quote preparation enumerates feasible bindings; it does not select the
-    // default warm candidate, which may be unavailable while exact is valid.
-    if manifests_only {
-        if manifests.is_empty() {
-            return Err((
-                StatusCode::UNPROCESSABLE_ENTITY,
-                serde_json::json!({"status": "all_infeasible", "candidates": candidate_evaluations,
-                    "logical_selection": compilation_request.planner_selection_trace}),
-            ));
-        }
-        return Ok((
-            None,
-            request.target_collector_ids,
-            apply_timeout,
-            request.runtime_adaptation_evidence,
-            (manifests, candidate_evaluations, planner_selection_trace),
-        ));
-    }
-    let compiled = match request.workload_cost_evidence {
-        Some(evidence) => match frontend {
-            QueryFrontend::PromQl => physical::workload_cost::select_lowest_cost_candidate(
-                candidates,
-                environment,
-                &evidence,
-            ),
-            QueryFrontend::MetricsQl => {
-                physical::workload_cost::select_lowest_cost_metricsql_candidate(
-                    candidates,
-                    environment,
-                    &evidence,
-                )
-            }
-        },
-        None => frontend.compile(compilation_request, environment),
-    };
-    let bundle = match compiled {
-        Ok(bundle) => bundle,
-        Err(physical::compiler::CompileError::Candidates(report)) => {
-            return Err((StatusCode::UNPROCESSABLE_ENTITY, report))
-        }
-        Err(error) => return Err((StatusCode::UNPROCESSABLE_ENTITY, error.to_string().into())),
-    };
-    Ok((
-        Some(bundle),
-        request.target_collector_ids,
-        apply_timeout,
-        request.runtime_adaptation_evidence,
-        (manifests, candidate_evaluations, planner_selection_trace),
-    ))
-}
-
-/// Read-only preparation: no OpAMP, staging, activation or data-plane writes.
-async fn handle_workload_cost_manifests(
-    Json(request): Json<CompileAndPublishPhysicalPlanRequest>,
-) -> impl IntoResponse {
-    workload_cost_manifests(request, QueryFrontend::PromQl)
-}
-
-async fn handle_metricsql_workload_cost_manifests(
-    Json(request): Json<CompileAndPublishPhysicalPlanRequest>,
-) -> impl IntoResponse {
-    workload_cost_manifests(request, QueryFrontend::MetricsQl)
-}
-
-fn physical_compile_failure((status, report): (StatusCode, serde_json::Value)) -> Response {
-    match report {
-        serde_json::Value::String(message) => (status, message).into_response(),
-        report => (status, Json(report)).into_response(),
-    }
-}
-
-fn workload_cost_manifests(
-    request: CompileAndPublishPhysicalPlanRequest,
-    frontend: QueryFrontend,
-) -> Response {
-    if request.workload_cost_evidence.is_some() {
-        return (
-            StatusCode::UNPROCESSABLE_ENTITY,
-            "omit quotes when requesting manifests",
-        )
-            .into_response();
-    }
-    let explain = request.explain;
-    match compile_physical_plan_request(request, true, frontend) {
-        Ok((_, _, _, _, (manifests, candidates, planner_selection_trace))) => {
-            if explain {
-                Json(serde_json::json!({"manifests": manifests, "candidates": candidates, "logical_selection": planner_selection_trace}))
-                    .into_response()
-            } else {
-                Json(manifests).into_response()
-            }
-        }
-        Err(error) => physical_compile_failure(error),
-    }
-}
-
-// ── Handlers ──────────────────────────────────────────────────────────────────
-
-/// Returns the current EMA cost model state — blended benchmark + observed costs
-/// per sketch type.  Useful for diagnosing whether the online cost model has
-/// received sufficient observations to meaningfully influence plan selection.
-async fn handle_cost_model(State(st): State<AppState>) -> impl IntoResponse {
-    let table = online_cost_model::effective_table(&st.online_store);
-    let raw = st.online_store.try_read();
-
-    let entries: Vec<serde_json::Value> = table
-        .iter()
-        .map(|(sketch_type, costs)| {
-            let observations = raw
-                .as_ref()
-                .ok()
-                .and_then(|m| m.get(sketch_type))
-                .map(|o| o.observations)
-                .unwrap_or(0);
-            json!({
-                "sketch_type":               sketch_type.to_string(),
-                "bw_bytes_per_series_per_sec": costs.bytes_per_series_per_sec,
-                "cpu_micros_per_sample":       costs.cpu_micros_per_sample,
-                "base_memory_bytes":           costs.base_memory_bytes,
-                "relative_error":              costs.relative_error_at_default,
-                "observations":                observations,
-            })
-        })
-        .collect();
-
-    (StatusCode::OK, Json(json!({ "sketches": entries }))).into_response()
-}
-
-// ── TCO endpoint ─────────────────────────────────────────────────────────────
-
-#[derive(serde::Deserialize)]
-struct TcoRequest {
-    workload: tco::TcoWorkload,
-    pricing: Option<tco::CloudPricing>,
-}
-
-async fn handle_tco(Json(req): Json<TcoRequest>) -> impl IntoResponse {
-    let pricing = req.pricing.unwrap_or_default();
-    let estimate = tco::estimate_tco(&req.workload, &pricing);
-    (StatusCode::OK, Json(estimate))
-}
-
-// ── Test helpers ──────────────────────────────────────────────────────────────
-
-/// Builds a minimal `AppState` + `Router` for integration tests.
-/// No background tasks are started; OpAMP/scraper hold no real connections.
-#[cfg(test)]
-fn test_app() -> (AppState, axum::Router) {
-    test_app_with_backend(None)
-}
-
-/// Build a test server with an optional mock backend URL. `None` disables
-/// backend pushes; `Some(url)` exercises typed backend JSON delivery.
-#[cfg(test)]
-fn test_app_with_backend(backend_url: Option<String>) -> (AppState, axum::Router) {
-    let state = AppState {
-        opamp: Arc::new(OpampServer::new()),
-        online_store: init_online_store(),
-        runtime_samples: runtime_samples::RuntimeSamplesStore::new(64),
-        active_summary_catalog: Arc::new(tokio::sync::Mutex::new(None)),
-        backend_client: backend_url.map(|u| Arc::new(backend_client::BackendClient::new(u))),
-    };
-    let router = axum::Router::new()
-        .route("/api/v1/cost-model", axum::routing::get(handle_cost_model))
-        .route("/api/v1/tco", axum::routing::post(handle_tco))
-        .with_state(state.clone());
-    (state, router)
-}
-
-#[cfg(test)]
-mod api_tests {
-    use super::*;
-    use axum::body::Body;
-    use axum::http::{Request, StatusCode};
-    use http_body_util::BodyExt;
-    use tower::ServiceExt;
-
-    // A missing warm implementation must not hide the executable exact quote.
-    #[tokio::test]
-    async fn cost_manifests_survive_unavailable_warm_candidate() {
-        let snapshot: physical::compiler::BackendLocalPlanningInput = serde_json::from_str(
-            include_str!("../../docs/examples/asapquery-planning-snapshot.json"),
-        )
-        .unwrap();
-        let (planning, _) = snapshot
-            .clone()
-            .into_physical_compilation_request()
-            .unwrap();
-        let query = &planning.queries[0];
-        let now = std::time::SystemTime::now()
-            .duration_since(std::time::UNIX_EPOCH)
-            .unwrap()
-            .as_millis() as u64;
-        let mut request_body = serde_json::json!({
-            "data_workload": snapshot.data_workload,
-            "queries": [{
-                "query_id": query.query_id, "query_string": query.query_string,
-                "metric": "m", "window_secs": 60, "accuracy": query.accuracy_target,
-                "lifecycle": query.summary_lifecycle_inputs, "evaluation_phase_ms": 0, "window_cost_model": snapshot.physical_inputs.window_cost_model
-            }],
-            "dataset_identity": snapshot.environment.dataset_identity,
-            "collector_ids": ["test"], "capability_snapshot_id": "test",
-            "planner_revision": physical::compiler::PLANNER_REVISION,
-            "max_evidence_age_ms": 60000, "plan_version": 1,
-            "activation_unix_ms": now, "backend_compat": control_plane::physical::compiler::BACKEND_COMPAT
-        });
-        for explain in [false, true] {
-            request_body["explain"] = serde_json::json!(explain);
-            let request = serde_json::from_value(request_body.clone()).unwrap();
-            let response = handle_workload_cost_manifests(Json(request))
-                .await
-                .into_response();
-            assert_eq!(response.status(), StatusCode::OK);
-            let manifests = body_json(response).await;
-            if explain {
-                assert_eq!(manifests["manifests"].as_array().unwrap().len(), 1);
-                let candidates = manifests["candidates"].as_array().unwrap();
-                assert_eq!(candidates.len(), 2);
-                assert_eq!(candidates[0]["status"], "bind_failed");
-                assert!(candidates[0]["unavailable_reason"].is_string());
-                assert_eq!(candidates[1]["status"], "bound");
-                assert!(candidates[1]["physical_candidate_id"].is_string());
-                assert!(!manifests["logical_selection"]
-                    .as_array()
-                    .unwrap()
-                    .is_empty());
-            } else {
-                assert_eq!(manifests.as_array().unwrap().len(), 1);
-            }
-        }
-        request_body["planner_revision"] = serde_json::json!("unavailable-compiler");
-        let response =
-            handle_workload_cost_manifests(Json(serde_json::from_value(request_body).unwrap()))
-                .await
-                .into_response();
-        assert_eq!(response.status(), StatusCode::UNPROCESSABLE_ENTITY);
-        assert_eq!(response.headers()["content-type"], "application/json");
-        let report = body_json(response).await;
-        assert_eq!(report["status"], "all_infeasible");
-        assert_eq!(report["candidates"].as_array().unwrap().len(), 2);
-        assert!(report["candidates"]
-            .as_array()
-            .unwrap()
-            .iter()
-            .all(|item| item["status"] == "bind_failed"));
-    }
-
-    #[test]
-    fn backend_local_typed_request_compiles_without_collectors() {
-        let snapshot: physical::compiler::BackendLocalPlanningInput = serde_json::from_str(
-            include_str!("../../docs/examples/asapquery-compatibility-demo-snapshot.json"),
-        )
-        .unwrap();
-        let (planning, _) = snapshot
-            .clone()
-            .into_physical_compilation_request()
-            .unwrap();
-        let mut query = planning.queries[0].clone();
-        let now = std::time::SystemTime::now()
-            .duration_since(std::time::UNIX_EPOCH)
-            .unwrap()
-            .as_millis() as u64;
-        query.summary_lifecycle_inputs.evidence_observed_at_unix_ms = now;
-        for implementation in &mut query.window_realization_candidates {
-            implementation.cost.observed_at_unix_ms = now;
-        }
-        let planner_types::pre_asap::Source::TimeSeries { metric } = &query.legacy_query_source
-        else {
-            panic!("expected time series fixture");
-        };
-        let value = serde_json::json!({
-            "data_workload": snapshot.data_workload,
-            "target": "backend_local_remote_write",
-            "queries": [{
-                "query_id": query.query_id, "query_string": query.query_string,
-                "metric": metric, "window_secs": query.query_lookback_seconds, "accuracy": query.accuracy_target,
-                "lifecycle": query.summary_lifecycle_inputs, "evaluation_phase_ms": 0, "window_cost_model": { "implementation_id": "test", "cost": query.window_realization_candidates[0].cost }
-            }],
-            "dataset_identity": snapshot.environment.dataset_identity,
-            "collector_ids": [], "capability_snapshot_id": "test",
-            "planner_revision": physical::compiler::PLANNER_REVISION,
-            "max_evidence_age_ms": 60000, "plan_version": 1,
-            "activation_unix_ms": now, "backend_compat": physical::compiler::BACKEND_COMPAT
-        });
-        let request = serde_json::from_value(value.clone()).unwrap();
-        let (plan, collectors, _, _, _) =
-            compile_physical_plan_request(request, false, QueryFrontend::PromQl).unwrap();
-        let plan = plan.unwrap();
-        assert!(collectors.is_empty());
-        assert!(plan.collector_plans.is_empty());
-        assert_eq!(
-            plan.precompute_plan.ingest.protocol,
-            physical::compiler::IngestProtocol::PrometheusRemoteWriteV1
-        );
-        assert!(!plan.precompute_plan.materializations.is_empty());
-        // HTTP lowering uses the current planning clock, not a timeless compatibility parse.
-        let mut stale = value.clone();
-        stale["data_workload"]["data_ingestion_interval"]["observed_at_ms"] = serde_json::json!(0);
-        stale["data_workload"]["data_ingestion_interval"]["valid_for_ms"] = serde_json::json!(0);
-        let error = compile_physical_plan_request(
-            serde_json::from_value(stale).unwrap(),
-            false,
-            QueryFrontend::PromQl,
-        )
-        .expect_err("expired cadence must fail HTTP planning");
-        assert_eq!(error.0, StatusCode::UNPROCESSABLE_ENTITY);
-        assert!(error
-            .1
-            .to_string()
-            .contains("evidence is unavailable at planning time"));
-        let mut distributed = value;
-        distributed["target"] = serde_json::json!("distributed_collectors");
-        assert!(compile_physical_plan_request(
-            serde_json::from_value(distributed).unwrap(),
-            false,
-            QueryFrontend::PromQl
-        )
-        .is_err());
-    }
-
-    async fn body_json(resp: axum::response::Response) -> serde_json::Value {
-        let bytes = resp.into_body().collect().await.unwrap().to_bytes();
-        serde_json::from_slice(&bytes).unwrap()
-    }
-
-    // ── AppState.backend_client wiring ───────────────────────────────
-
-    /// Default-constructed AppState (no `CONTROLLER_BACKEND_ENDPOINT`)
-    /// must leave `backend_client` as `None` so the typed L5 backend
-    /// JSON push silently no-ops, matching the Phase B fire-and-forget
-    /// contract.
-    #[test]
-    fn app_state_backend_client_none_by_default() {
-        let (state, _router) = test_app();
-        assert!(
-            state.backend_client.is_none(),
-            "backend_client should default to None when no endpoint is configured"
-        );
-    }
-
-    /// When constructed with a backend URL (the production path takes
-    /// it from `CONTROLLER_BACKEND_ENDPOINT`), the field is populated
-    /// and ready for the Phase C `handle_plan` push.
-    #[test]
-    fn app_state_backend_client_some_when_constructed_with_url() {
-        let (state, _router) =
-            test_app_with_backend(Some("http://127.0.0.1:1/api/v1/physical-plan".into()));
-        let bc = state.backend_client.expect("backend_client must be Some");
-        assert_eq!(bc.endpoint(), "http://127.0.0.1:1/api/v1/physical-plan");
-    }
-
-    // ── POST /api/v1/plan ─────────────────────────────────────────────────────
-
-    // ── GET /api/v1/plan/:metric ──────────────────────────────────────────────
-
-    #[tokio::test]
-    async fn get_plan_not_found_returns_404() {
-        let (_, app) = test_app();
-        let req = Request::builder()
-            .uri("/api/v1/plan/nonexistent")
-            .body(Body::empty())
-            .unwrap();
-        let resp = app.oneshot(req).await.unwrap();
-        assert_eq!(resp.status(), StatusCode::NOT_FOUND);
-    }
-
-    // ── GET /api/v1/cost-model ────────────────────────────────────────────────
-
-    #[tokio::test]
-    async fn cost_model_returns_all_sketch_types() {
-        let (_, app) = test_app();
-        let req = Request::builder()
-            .uri("/api/v1/cost-model")
-            .body(Body::empty())
-            .unwrap();
-        let resp = app.oneshot(req).await.unwrap();
-        assert_eq!(resp.status(), StatusCode::OK);
-        let body = body_json(resp).await;
-        let sketches = body["sketches"].as_array().unwrap();
-        assert!(sketches.len() >= 4, "expected at least 4 sketch types");
-        for s in sketches {
-            assert!(s["sketch_type"].as_str().is_some());
-            assert!(s["observations"].as_u64().is_some());
-        }
-    }
-
-    // ── POST /api/v1/tco ─────────────────────────────────────────────────────
-
-    #[tokio::test]
-    async fn tco_returns_valid_estimate() {
-        let (_, app) = test_app();
-        let body = serde_json::json!({
-            "workload": {
-                "series_count": 100000,
-                "samples_per_sec": 1.0,
-                "bytes_per_sample": 100,
-                "scrape_interval_secs": 15,
-                "queries_per_sec": 1.0,
-                "query_window_secs": 300,
-                "retention_days": 30,
-                "sketch_compression_ratio": 0.05,
-                "delta_compression_ratio": 0.3
-            }
-        });
-        let req = Request::builder()
-            .method("POST")
-            .uri("/api/v1/tco")
-            .header("content-type", "application/json")
-            .body(Body::from(body.to_string()))
-            .unwrap();
-        let resp = app.oneshot(req).await.unwrap();
-        assert_eq!(resp.status(), StatusCode::OK);
-        let body = body_json(resp).await;
-        assert!(body["before"]["total_dollars"].as_f64().unwrap() > 0.0);
-        assert!(body["after"]["total_dollars"].as_f64().unwrap() > 0.0);
-        assert!(body["savings_percent"].as_f64().unwrap() > 0.0);
-    }
-
-    // ── Integration: control plane ↔ collector wiring ─────────────────────────
-
-    #[tokio::test]
-    async fn tco_with_custom_pricing() {
-        let (_, app) = test_app();
-        let body = serde_json::json!({
-            "workload": {
-                "series_count": 50000,
-                "samples_per_sec": 1.0,
-                "bytes_per_sample": 100,
-                "scrape_interval_secs": 15,
-                "queries_per_sec": 1.0,
-                "query_window_secs": 300,
-                "retention_days": 30,
-                "sketch_compression_ratio": 0.05,
-                "delta_compression_ratio": 0.3
-            },
-            "pricing": {
-                "grafana_per_1k_series_1dpm": 8.0,
-                "s3_storage_per_gb_month": 0.023,
-                "s3_put_per_1k": 0.005,
-                "s3_get_per_1k": 0.0004,
-                "s3_transfer_per_gb": 0.09,
-                "ec2_sketch_instance_per_hour": 0.384
-            }
-        });
-        let req = Request::builder()
-            .method("POST")
-            .uri("/api/v1/tco")
-            .header("content-type", "application/json")
-            .body(Body::from(body.to_string()))
-            .unwrap();
-        let resp = app.oneshot(req).await.unwrap();
-        assert_eq!(resp.status(), StatusCode::OK);
-        let body = body_json(resp).await;
-        // With higher Grafana pricing, before cost should be higher.
-        assert!(body["before"]["ingestion_dollars"].as_f64().unwrap() > 0.0);
-        assert!(body["monthly_savings_dollars"].as_f64().unwrap() > 0.0);
-    }
-
-    // Bootstrap and plan-push must use the same typed emission pipeline.
-
-    // ── MVP §46: planner ↔ 5-sketch emitter stitch (PR #339 ↔ PR #340) ─────────
-    //
-    // The acceptance contract: register the six contract metrics in the
-    // workload registry, hit the bootstrap GET endpoint, and verify the
-    // emitted YAML carries the 5-sketch routing-connector wire shape —
-    // every sketched metric routed to its family-specific pipeline,
-    // raw `http_requests_total` falling through to
-    // `metrics/raw_passthrough`.
-    //
-    // Without the stitch wired in `emit_bootstrap_typed`, the
-    // EdgeStageConfig.metric_to_family HashMap stays empty and the
-    // emitter falls back to single-pipeline DDSketch — none of the
-    // assertions below pass.
+use std::path::PathBuf;
+
+use anyhow::Context;
+use clap::Parser;
+use control_plane::{backend_capabilities, plan_workload};
+use planner_types::deployment::DeploymentCapabilities;
+use planner_types::workload::PlanningWorkload;
+
+/// Plan a workload with ASAPPlanner and write the selected plan.
+#[derive(Parser)]
+struct Args {
+    /// Planner `PlanningWorkload` (JSON).
+    #[arg(long)]
+    workload: PathBuf,
+    /// Planner `DeploymentCapabilities` (JSON); defaults to what this
+    /// backend's data plane executes.
+    #[arg(long)]
+    capabilities: Option<PathBuf>,
+    /// Where to write the plan the data plane installs.
+    #[arg(long)]
+    out: PathBuf,
+}
+
+fn main() -> anyhow::Result<()> {
+    tracing_subscriber::fmt()
+        .with_env_filter(tracing_subscriber::EnvFilter::from_default_env())
+        .init();
+    let args = Args::parse();
+    let text = std::fs::read_to_string(&args.workload)
+        .with_context(|| format!("reading {}", args.workload.display()))?;
+    let workload: PlanningWorkload = serde_json::from_str(&text)
+        .with_context(|| format!("parsing {}", args.workload.display()))?;
+    let capabilities: DeploymentCapabilities = match &args.capabilities {
+        Some(path) => serde_json::from_str(
+            &std::fs::read_to_string(path)
+                .with_context(|| format!("reading {}", path.display()))?,
+        )
+        .with_context(|| format!("parsing {}", path.display()))?,
+        None => backend_capabilities(),
+    };
+    let plan = plan_workload(&workload, &capabilities)?;
+    plan.save(&args.out)?;
+    println!(
+        "wrote {} ({} queries, {} nodes)",
+        args.out.display(),
+        plan.queries.len(),
+        plan.dag.dag.nodes.len()
+    );
+    Ok(())
 }
diff --git a/control_plane/src/metrics_exposer.rs b/control_plane/src/metrics_exposer.rs
deleted file mode 100644
index 33721a132..000000000
--- a/control_plane/src/metrics_exposer.rs
+++ /dev/null
@@ -1,360 +0,0 @@
-//! `GET /metrics` — the control plane as a Prometheus exporter.
-//!
-//! The control plane already holds per-agent runtime samples in
-//! [`RuntimeSamplesStore`](crate::runtime_samples::RuntimeSamplesStore)
-//! (fed by the agents' `sketch-runtime` push pipeline). This
-//! module renders that store's state on demand in Prometheus
-//! exposition format so a bog-standard Prom `scrape_configs`
-//! entry pointed at `control_plane:8080/metrics` picks up every
-//! paper §6 signal without any extra agent-side plumbing.
-//!
-//! ## Rendering contract
-//!
-//! For each `(source, sketch, impl)` key in the store we emit
-//! the **latest** sample's headline gauges. That's what a
-//! scrape is — point-in-time, not history. Prom does retention;
-//! we do fan-out-to-labels.
-//!
-//! Control-plane-wide counters (batches received, decode errors,
-//! evictions) come from `RuntimeSamplesStats` and are pure
-//! `Counter`s.
-//!
-//! ## What lives in the registry
-//!
-//! All gauges are labelled `{source, sketch, impl}`:
-//!
-//! | Metric | Type | Source field (in `bench`) |
-//! |---|---|---|
-//! | `asap_runtime_throughput_items_per_sec` | Gauge | `throughput_items_per_sec.mean` |
-//! | `asap_runtime_latency_p50_ns` | Gauge | `latency_ns.p50` |
-//! | `asap_runtime_latency_p99_ns` | Gauge | `latency_ns.p99` |
-//! | `asap_runtime_memory_bytes` | Gauge | `memory_bytes` |
-//! | `asap_runtime_last_seen_unix_seconds` | Gauge | record `timestamp` (freshness signal) |
-//!
-//! Control-plane-wide (no labels):
-//!
-//! | Metric | Type |
-//! |---|---|
-//! | `asap_runtime_samples_batches_received_total` | Counter |
-//! | `asap_runtime_samples_records_stored_total` | Counter |
-//! | `asap_runtime_samples_records_evicted_total` | Counter |
-//! | `asap_runtime_samples_decode_errors_total` | Counter |
-
-use std::sync::atomic::Ordering;
-use std::sync::Arc;
-
-use axum::extract::State;
-use axum::http::{header, StatusCode};
-use axum::response::{IntoResponse, Response};
-use prometheus::{Encoder, GaugeVec, IntCounter, Opts, Registry, TextEncoder};
-
-use crate::runtime_samples::RuntimeSamplesStats;
-use crate::runtime_samples::RuntimeSamplesStore;
-
-const LABELS: &[&str] = &["source", "sketch", "impl"];
-
-/// The Prometheus registry + pre-built metric handles. Built
-/// once at startup; the `/metrics` handler pulls the latest
-/// sample per key out of the store on each scrape and updates
-/// the gauge vecs before encoding.
-pub struct MetricsRegistry {
-    registry: Registry,
-    throughput: GaugeVec,
-    latency_p50: GaugeVec,
-    latency_p99: GaugeVec,
-    memory_bytes: GaugeVec,
-    last_seen_unix: GaugeVec,
-    // control-plane-wide counters, refreshed from atomic stats
-    batches_received: IntCounter,
-    records_stored: IntCounter,
-    records_evicted: IntCounter,
-    decode_errors: IntCounter,
-}
-
-impl MetricsRegistry {
-    pub fn new() -> Arc<Self> {
-        let registry = Registry::new();
-
-        let throughput = GaugeVec::new(
-            Opts::new(
-                "asap_runtime_throughput_items_per_sec",
-                "Latest runtime throughput reported by each (source, sketch, impl)",
-            ),
-            LABELS,
-        )
-        .expect("valid gauge vec");
-        let latency_p50 = GaugeVec::new(
-            Opts::new(
-                "asap_runtime_latency_p50_ns",
-                "Latest p50 latency ns reported by each (source, sketch, impl)",
-            ),
-            LABELS,
-        )
-        .unwrap();
-        let latency_p99 = GaugeVec::new(
-            Opts::new(
-                "asap_runtime_latency_p99_ns",
-                "Latest p99 latency ns reported by each (source, sketch, impl)",
-            ),
-            LABELS,
-        )
-        .unwrap();
-        let memory_bytes = GaugeVec::new(
-            Opts::new(
-                "asap_runtime_memory_bytes",
-                "Latest memory footprint of each (source, sketch, impl)",
-            ),
-            LABELS,
-        )
-        .unwrap();
-        let last_seen_unix = GaugeVec::new(
-            Opts::new(
-                "asap_runtime_last_seen_unix_seconds",
-                "Unix timestamp of the latest sample received from each (source, sketch, impl). \
-                 Compare against `time() - N` to alert on a stale agent.",
-            ),
-            LABELS,
-        )
-        .unwrap();
-
-        let batches_received = IntCounter::new(
-            "asap_runtime_samples_batches_received_total",
-            "Count of push batches accepted by /api/v1/runtime-samples",
-        )
-        .unwrap();
-        let records_stored = IntCounter::new(
-            "asap_runtime_samples_records_stored_total",
-            "Count of individual records stored in the ring buffer",
-        )
-        .unwrap();
-        let records_evicted = IntCounter::new(
-            "asap_runtime_samples_records_evicted_total",
-            "Count of records evicted by the per-key ring-buffer FIFO",
-        )
-        .unwrap();
-        let decode_errors = IntCounter::new(
-            "asap_runtime_samples_decode_errors_total",
-            "Count of decode / parse failures on incoming batches",
-        )
-        .unwrap();
-
-        registry.register(Box::new(throughput.clone())).unwrap();
-        registry.register(Box::new(latency_p50.clone())).unwrap();
-        registry.register(Box::new(latency_p99.clone())).unwrap();
-        registry.register(Box::new(memory_bytes.clone())).unwrap();
-        registry.register(Box::new(last_seen_unix.clone())).unwrap();
-        registry
-            .register(Box::new(batches_received.clone()))
-            .unwrap();
-        registry.register(Box::new(records_stored.clone())).unwrap();
-        registry
-            .register(Box::new(records_evicted.clone()))
-            .unwrap();
-        registry.register(Box::new(decode_errors.clone())).unwrap();
-
-        Arc::new(Self {
-            registry,
-            throughput,
-            latency_p50,
-            latency_p99,
-            memory_bytes,
-            last_seen_unix,
-            batches_received,
-            records_stored,
-            records_evicted,
-            decode_errors,
-        })
-    }
-
-    /// Walk the store and push the latest sample per key into
-    /// the gauge vecs. Called at scrape time, not per-record —
-    /// cost scales with (# keys), not (# records).
-    fn refresh_gauges(&self, store: &RuntimeSamplesStore) {
-        for key in store.keys() {
-            let Some(rec) = store.latest(&key) else {
-                continue;
-            };
-            let labels = &[
-                key.source.as_str(),
-                key.sketch.as_str(),
-                key.impl_name.as_str(),
-            ];
-
-            // Pull the interesting numeric fields from the
-            // opaque JSON payload. Missing fields silently stay
-            // at their last value — an agent that dropped a
-            // metric briefly won't zap the gauge to 0.
-            let bench = rec.payload.get("bench");
-            if let Some(v) = bench
-                .and_then(|b| b.get("throughput_items_per_sec"))
-                .and_then(|t| t.get("mean"))
-                .and_then(|m| m.as_f64())
-            {
-                self.throughput.with_label_values(labels).set(v);
-            }
-            if let Some(v) = bench
-                .and_then(|b| b.get("latency_ns"))
-                .and_then(|l| l.get("p50"))
-                .and_then(|m| m.as_f64())
-            {
-                self.latency_p50.with_label_values(labels).set(v);
-            }
-            if let Some(v) = bench
-                .and_then(|b| b.get("latency_ns"))
-                .and_then(|l| l.get("p99"))
-                .and_then(|m| m.as_f64())
-            {
-                self.latency_p99.with_label_values(labels).set(v);
-            }
-            if let Some(v) = bench
-                .and_then(|b| b.get("memory_bytes"))
-                .and_then(|m| m.as_f64())
-            {
-                self.memory_bytes.with_label_values(labels).set(v);
-            }
-            if let Some(ts) = rec.payload.get("timestamp").and_then(|t| t.as_str()) {
-                if let Ok(parsed) = chrono::DateTime::parse_from_rfc3339(ts) {
-                    self.last_seen_unix
-                        .with_label_values(labels)
-                        .set(parsed.timestamp() as f64);
-                }
-            }
-        }
-    }
-
-    /// Sync control-plane-wide counters from the store's atomic
-    /// stats. `IntCounter` only exposes `.inc()` — so we pump
-    /// in the delta since the last scrape rather than `.set()`.
-    fn refresh_counters(&self, stats: &RuntimeSamplesStats) {
-        fn delta(target: &IntCounter, snapshot: u64) {
-            let have = target.get();
-            if snapshot > have {
-                target.inc_by(snapshot - have);
-            }
-        }
-        delta(
-            &self.batches_received,
-            stats.batches_received.load(Ordering::Relaxed),
-        );
-        delta(
-            &self.records_stored,
-            stats.records_stored.load(Ordering::Relaxed),
-        );
-        delta(
-            &self.records_evicted,
-            stats.records_evicted.load(Ordering::Relaxed),
-        );
-        delta(
-            &self.decode_errors,
-            stats.decode_errors.load(Ordering::Relaxed),
-        );
-    }
-}
-
-#[derive(Clone)]
-pub struct MetricsState {
-    pub registry: Arc<MetricsRegistry>,
-    pub store: Arc<RuntimeSamplesStore>,
-    pub stats: Arc<RuntimeSamplesStats>,
-}
-
-pub async fn handle_metrics(State(state): State<MetricsState>) -> Response {
-    state.registry.refresh_gauges(&state.store);
-    state.registry.refresh_counters(&state.stats);
-
-    let metric_families = state.registry.registry.gather();
-    let encoder = TextEncoder::new();
-    let mut buf = Vec::with_capacity(1024);
-    if let Err(e) = encoder.encode(&metric_families, &mut buf) {
-        return (
-            StatusCode::INTERNAL_SERVER_ERROR,
-            format!("prom encode failed: {e}"),
-        )
-            .into_response();
-    }
-    (
-        StatusCode::OK,
-        [(header::CONTENT_TYPE, encoder.format_type())],
-        buf,
-    )
-        .into_response()
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use crate::runtime_samples::RuntimeRecord;
-    use serde_json::json;
-
-    fn seeded_store() -> (Arc<RuntimeSamplesStore>, Arc<RuntimeSamplesStats>) {
-        let store = RuntimeSamplesStore::new(16);
-        let stats = store.stats();
-        for (source, sketch, impl_name, tp, p99, mem) in [
-            ("dc-a", "cms", "oxide", 4.2e7, 120u64, 40960u64),
-            ("dc-a", "hll", "lib", 7.4e7, 21, 16384),
-        ] {
-            // Build a record whose payload mirrors the v1 bench
-            // shape — exactly what the store would have stored
-            // after receiving a PushExporter batch.
-            let payload = json!({
-                "schema_version": 1,
-                "mode": "runtime",
-                "timestamp": "2026-04-21T19:00:00Z",
-                "bench": {
-                    "throughput_items_per_sec": { "mean": tp, "stddev": 0.0 },
-                    "latency_ns": { "p50": 10, "p99": p99 },
-                    "memory_bytes": mem,
-                }
-            });
-            let rec = RuntimeRecord {
-                source: source.into(),
-                sketch: sketch.into(),
-                impl_name: impl_name.into(),
-                schema_version: 1,
-                payload,
-            };
-            // Inject via the public append-by-record shim we
-            // use in tests: the store's `append` is crate-public
-            // from `runtime_samples::tests` only, so go through
-            // the handler-side entry point with a JSON body in
-            // a real integration; here we lean on the trait.
-            // Shortcut: use store's pub `stats` + manual push
-            // by serialising + using the handler path. Simpler
-            // for this unit test: add a test-only helper below.
-            insert_for_test(&store, rec);
-        }
-        (store, stats)
-    }
-
-    // Test-only shim — uses the `append_for_test` hook the
-    // `runtime_samples` module exposes under `cfg(test)`.
-    fn insert_for_test(store: &RuntimeSamplesStore, rec: RuntimeRecord) {
-        store.append_for_test(rec);
-    }
-
-    #[tokio::test]
-    async fn metrics_scrape_reflects_latest_per_key_sample() {
-        let (store, stats) = seeded_store();
-        let registry = MetricsRegistry::new();
-        let metric_state = MetricsState {
-            registry: Arc::clone(&registry),
-            store: Arc::clone(&store),
-            stats: Arc::clone(&stats),
-        };
-        let resp = handle_metrics(State(metric_state)).await;
-        let status = resp.status();
-        assert_eq!(status, StatusCode::OK);
-        let body = axum::body::to_bytes(resp.into_body(), 64 * 1024)
-            .await
-            .unwrap();
-        let text = String::from_utf8(body.to_vec()).unwrap();
-        // Sanity: exposition format + at least one of our
-        // gauges should be present per key.
-        assert!(text.contains("# TYPE asap_runtime_throughput_items_per_sec gauge"));
-        assert!(text.contains(
-            "asap_runtime_throughput_items_per_sec{impl=\"oxide\",sketch=\"cms\",source=\"dc-a\"}"
-        ));
-        assert!(text
-            .contains("asap_runtime_latency_p99_ns{impl=\"lib\",sketch=\"hll\",source=\"dc-a\"}"));
-    }
-}
diff --git a/control_plane/src/opamp/mod.rs b/control_plane/src/opamp/mod.rs
deleted file mode 100644
index 33759262a..000000000
--- a/control_plane/src/opamp/mod.rs
+++ /dev/null
@@ -1,1160 +0,0 @@
-/// OpAMP server implemented over WebSocket via axum.
-///
-/// Speaks the standard OpAMP protobuf protocol (ServerToAgent / AgentToServer)
-/// so the `opampextension` in OTel Collectors can connect directly.
-///
-/// Each OTel collector connects as an "agent" identified by the `X-Agent-ID`
-/// request header.  The role (`agent` vs `backend`) is determined by the
-/// optional `X-Agent-Role` header (defaults to `agent`).
-///
-/// The server pushes `RemoteConfig` as an OpAMP `ServerToAgent.remote_config`
-/// message (protobuf binary frame) and receives `AgentToServer` status reports.
-use std::collections::{HashMap, HashSet};
-use std::sync::Arc;
-use std::time::Duration;
-
-use axum::extract::ws::{Message, WebSocket, WebSocketUpgrade};
-use axum::extract::State;
-use axum::http::{HeaderMap, StatusCode};
-use axum::response::IntoResponse;
-use futures_util::sink::SinkExt;
-use futures_util::stream::StreamExt;
-use prost::Message as ProstMessage;
-use serde::{Deserialize, Serialize};
-use tokio::sync::{mpsc, Notify, RwLock};
-use tracing::{info, warn};
-
-/// Generated OpAMP protobuf types (from proto/opamp.proto).
-pub mod opamp_proto {
-    include!(concat!(env!("OUT_DIR"), "/opamp.proto.rs"));
-}
-
-// ── Wire types ────────────────────────────────────────────────────────────────
-
-/// Config message pushed to an agent collector.
-#[derive(Debug, Clone, Serialize, Deserialize)]
-pub struct RemoteConfig {
-    pub config_hash: String,
-    pub yaml: String,
-}
-
-/// Status report sent back from an agent after applying a config.
-#[derive(Debug, Clone, Serialize, Deserialize)]
-pub struct AgentStatus {
-    pub agent_id: String,
-    pub config_hash: String,
-    pub healthy: bool,
-    pub error: Option<String>,
-}
-
-pub const COLLECTOR_PLAN_CAPABILITY: &str = "io.projectasap.collector-plan.v1";
-pub const COLLECTOR_PLAN_MESSAGE: &str = "collector_plan";
-pub const PLAN_STATUS_MESSAGE: &str = "plan_status";
-
-#[derive(Debug, Clone, Serialize, Deserialize, PartialEq, Eq)]
-#[serde(rename_all = "SCREAMING_SNAKE_CASE")]
-pub enum CollectorPlanStatusKind {
-    Staged,
-    Applied,
-    Failed,
-}
-
-#[derive(Debug, Clone, Serialize, Deserialize, PartialEq, Eq)]
-#[serde(deny_unknown_fields)]
-pub struct CollectorPlanStatus {
-    pub plan_id: u64,
-    pub plan_version: u64,
-    pub status: CollectorPlanStatusKind,
-    #[serde(default)]
-    pub error: Option<String>,
-}
-
-#[derive(Debug, thiserror::Error)]
-pub enum CollectorPlanPublishError {
-    #[error("collector {collector_id} did not advertise {COLLECTOR_PLAN_CAPABILITY}")]
-    CapabilityTimeout { collector_id: String },
-    #[error("collector {collector_id} disconnected before plan publication")]
-    Disconnected { collector_id: String },
-    #[error("compiled bundle contains duplicate collector target {collector_id}")]
-    DuplicateTarget { collector_id: String },
-    #[error("collector {collector_id} plan serialization failed: {source}")]
-    Serialize {
-        collector_id: String,
-        #[source]
-        source: serde_json::Error,
-    },
-    #[error(
-        "collector {collector_id} did not report plan {plan_id}/{plan_version} before timeout"
-    )]
-    StatusTimeout {
-        collector_id: String,
-        plan_id: u64,
-        plan_version: u64,
-    },
-    #[error("collector {collector_id} rejected plan {plan_id}/{plan_version}: {error}")]
-    Rejected {
-        collector_id: String,
-        plan_id: u64,
-        plan_version: u64,
-        error: String,
-    },
-}
-
-// ── Role ──────────────────────────────────────────────────────────────────────
-
-/// Role of a connected OTel collector.
-#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
-#[serde(rename_all = "lowercase")]
-pub enum AgentRole {
-    /// Edge / agent collector that produces sketches.
-    Agent,
-    /// Mid-tier gateway collector that forwards / merges sketches
-    /// between edge agents and the backend. Phase C (MVP v6) wires
-    /// this role through OpAMP so the typed L5 stage_split path can
-    /// push the gateway YAML directly via `push_to_role`.
-    Gateway,
-    /// Backend / aggregation collector that merges sketches.
-    Backend,
-}
-
-impl AgentRole {
-    /// Parse the `X-Agent-Role` header value into an `AgentRole`.
-    /// Recognises `backend`, `gateway`, and `agent` (case-insensitive);
-    /// any other value (including the empty string) defaults to
-    /// `Agent` so legacy / mis-configured collectors keep working.
-    pub fn from_header(value: &str) -> Self {
-        match value.trim().to_lowercase().as_str() {
-            "backend" => AgentRole::Backend,
-            "gateway" => AgentRole::Gateway,
-            _ => AgentRole::Agent,
-        }
-    }
-}
-
-// ── Server ────────────────────────────────────────────────────────────────────
-
-#[derive(Debug, Clone)]
-enum OutboundMessage {
-    RemoteConfig(RemoteConfig),
-    CollectorPlan(Vec<u8>),
-}
-
-struct AgentConnection {
-    tx: mpsc::Sender<OutboundMessage>,
-    role: AgentRole,
-    custom_capabilities: HashSet<String>,
-}
-
-type AgentMap = HashMap<String, AgentConnection>;
-type PlanStatusMap = HashMap<(String, u64, u64), CollectorPlanStatus>;
-
-pub type OnConnectFn = Arc<dyn Fn(String, AgentRole) + Send + Sync>;
-pub type OnDisconnectFn = Arc<dyn Fn(String) + Send + Sync>;
-
-pub struct OpampServer {
-    agents: Arc<RwLock<AgentMap>>,
-    plan_statuses: Arc<RwLock<PlanStatusMap>>,
-    state_changed: Arc<Notify>,
-    on_connect: Option<OnConnectFn>,
-    on_disconnect: Option<OnDisconnectFn>,
-}
-
-impl Default for OpampServer {
-    fn default() -> Self {
-        Self {
-            agents: Arc::new(RwLock::new(HashMap::new())),
-            plan_statuses: Arc::new(RwLock::new(HashMap::new())),
-            state_changed: Arc::new(Notify::new()),
-            on_connect: None,
-            on_disconnect: None,
-        }
-    }
-}
-
-impl Clone for OpampServer {
-    fn clone(&self) -> Self {
-        Self {
-            agents: Arc::clone(&self.agents),
-            plan_statuses: Arc::clone(&self.plan_statuses),
-            state_changed: Arc::clone(&self.state_changed),
-            on_connect: self.on_connect.clone(),
-            on_disconnect: self.on_disconnect.clone(),
-        }
-    }
-}
-
-impl OpampServer {
-    pub fn new() -> Self {
-        Self::default()
-    }
-
-    /// Register a callback invoked when an agent connects.
-    pub fn with_on_connect(
-        mut self,
-        f: impl Fn(String, AgentRole) + Send + Sync + 'static,
-    ) -> Self {
-        self.on_connect = Some(Arc::new(f));
-        self
-    }
-
-    /// Register a callback invoked when an agent disconnects.
-    pub fn with_on_disconnect(mut self, f: impl Fn(String) + Send + Sync + 'static) -> Self {
-        self.on_disconnect = Some(Arc::new(f));
-        self
-    }
-
-    /// axum handler: `GET /v1/opamp` — upgrades to WebSocket.
-    /// Agents must include `X-Agent-ID: <id>` in the upgrade request.
-    /// Optional `X-Agent-Role: agent|backend` (default: `agent`).
-    pub async fn ws_handler(
-        ws: WebSocketUpgrade,
-        headers: HeaderMap,
-        State(srv): State<Arc<OpampServer>>,
-    ) -> impl IntoResponse {
-        let agent_id = headers
-            .get("X-Agent-ID")
-            .and_then(|v| v.to_str().ok())
-            .unwrap_or("")
-            .to_string();
-
-        if agent_id.is_empty() {
-            return (StatusCode::BAD_REQUEST, "X-Agent-ID header required").into_response();
-        }
-
-        let role = headers
-            .get("X-Agent-Role")
-            .and_then(|v| v.to_str().ok())
-            .map(AgentRole::from_header)
-            .unwrap_or(AgentRole::Agent);
-
-        ws.on_upgrade(move |socket| handle_socket(socket, agent_id, role, srv))
-            .into_response()
-    }
-
-    /// Pushes a config to a specific agent. Returns false if not connected.
-    pub async fn push(&self, agent_id: &str, cfg: RemoteConfig) -> bool {
-        let tx = self
-            .agents
-            .read()
-            .await
-            .get(agent_id)
-            .map(|connection| connection.tx.clone());
-        match tx {
-            Some(tx) => tx.send(OutboundMessage::RemoteConfig(cfg)).await.is_ok(),
-            None => false,
-        }
-    }
-
-    /// Broadcasts a config only to agents matching the given role.
-    pub async fn push_to_role(&self, role: AgentRole, cfg: RemoteConfig) {
-        let ids: Vec<String> = self
-            .agents
-            .read()
-            .await
-            .iter()
-            .filter(|(_, connection)| connection.role == role)
-            .map(|(id, _)| id.clone())
-            .collect();
-        for id in ids {
-            self.push(&id, cfg.clone()).await;
-        }
-    }
-
-    /// Returns the IDs of currently connected agents (all roles).
-    pub async fn connected_agents(&self) -> Vec<String> {
-        self.agents.read().await.keys().cloned().collect()
-    }
-
-    /// Returns a map of agent_id → role for all connected agents.
-    pub async fn connected_agents_with_roles(&self) -> HashMap<String, AgentRole> {
-        self.agents
-            .read()
-            .await
-            .iter()
-            .map(|(id, connection)| (id.clone(), connection.role.clone()))
-            .collect()
-    }
-
-    /// Publish all per-target physical plans and require an exact semantic
-    /// STAGED report from every Collector. Activation is synchronized later at
-    /// the envelope timestamp; config hashes are not accepted as evidence.
-    pub async fn publish_collector_plans(
-        &self,
-        plans: &[crate::physical::compiler::CollectorPlan],
-        timeout: Duration,
-    ) -> Result<Vec<CollectorPlanStatus>, CollectorPlanPublishError> {
-        self.ensure_collector_plan_targets(plans, timeout).await?;
-
-        for plan in plans {
-            let body = serde_json::to_vec(plan).map_err(|source| {
-                CollectorPlanPublishError::Serialize {
-                    collector_id: plan.collector_id.clone(),
-                    source,
-                }
-            })?;
-            self.plan_statuses.write().await.remove(&(
-                plan.collector_id.clone(),
-                plan.envelope.plan_id,
-                plan.envelope.plan_version,
-            ));
-            let sent = self.send_collector_plan(&plan.collector_id, body).await;
-            if !sent {
-                return Err(CollectorPlanPublishError::Disconnected {
-                    collector_id: plan.collector_id.clone(),
-                });
-            }
-        }
-
-        let mut reports = Vec::with_capacity(plans.len());
-        for plan in plans {
-            let report = self
-                .wait_for_plan_status(
-                    &plan.collector_id,
-                    plan.envelope.plan_id,
-                    plan.envelope.plan_version,
-                    timeout,
-                )
-                .await
-                .ok_or_else(|| CollectorPlanPublishError::StatusTimeout {
-                    collector_id: plan.collector_id.clone(),
-                    plan_id: plan.envelope.plan_id,
-                    plan_version: plan.envelope.plan_version,
-                })?;
-            if report.status != CollectorPlanStatusKind::Staged {
-                return Err(CollectorPlanPublishError::Rejected {
-                    collector_id: plan.collector_id.clone(),
-                    plan_id: report.plan_id,
-                    plan_version: report.plan_version,
-                    error: report.error.clone().unwrap_or_else(|| "unspecified".into()),
-                });
-            }
-            reports.push(report);
-        }
-        Ok(reports)
-    }
-
-    /// Validate target uniqueness and wait for every target to advertise the
-    /// physical-plan capability. The orchestrator calls this before changing
-    /// backend state, then publication repeats it to close disconnect races.
-    pub async fn ensure_collector_plan_targets(
-        &self,
-        plans: &[crate::physical::compiler::CollectorPlan],
-        timeout: Duration,
-    ) -> Result<(), CollectorPlanPublishError> {
-        let mut targets = HashSet::with_capacity(plans.len());
-        for plan in plans {
-            if !targets.insert(plan.collector_id.as_str()) {
-                return Err(CollectorPlanPublishError::DuplicateTarget {
-                    collector_id: plan.collector_id.clone(),
-                });
-            }
-        }
-        for plan in plans {
-            if !self
-                .wait_for_capability(&plan.collector_id, COLLECTOR_PLAN_CAPABILITY, timeout)
-                .await
-            {
-                return Err(CollectorPlanPublishError::CapabilityTimeout {
-                    collector_id: plan.collector_id.clone(),
-                });
-            }
-        }
-
-        Ok(())
-    }
-
-    async fn send_collector_plan(&self, agent_id: &str, body: Vec<u8>) -> bool {
-        let agents = self.agents.read().await;
-        let Some(connection) = agents.get(agent_id) else {
-            return false;
-        };
-        if !connection
-            .custom_capabilities
-            .contains(COLLECTOR_PLAN_CAPABILITY)
-        {
-            return false;
-        }
-        let tx = connection.tx.clone();
-        drop(agents);
-        tx.send(OutboundMessage::CollectorPlan(body)).await.is_ok()
-    }
-
-    async fn wait_for_capability(
-        &self,
-        agent_id: &str,
-        capability: &str,
-        timeout: Duration,
-    ) -> bool {
-        let deadline = tokio::time::Instant::now() + timeout;
-        loop {
-            let changed = self.state_changed.notified();
-            if self
-                .agents
-                .read()
-                .await
-                .get(agent_id)
-                .is_some_and(|agent| agent.custom_capabilities.contains(capability))
-            {
-                return true;
-            }
-            let remaining = deadline.saturating_duration_since(tokio::time::Instant::now());
-            if remaining.is_zero() || tokio::time::timeout(remaining, changed).await.is_err() {
-                return false;
-            }
-        }
-    }
-
-    async fn wait_for_plan_status(
-        &self,
-        agent_id: &str,
-        plan_id: u64,
-        plan_version: u64,
-        timeout: Duration,
-    ) -> Option<CollectorPlanStatus> {
-        let key = (agent_id.to_string(), plan_id, plan_version);
-        let deadline = tokio::time::Instant::now() + timeout;
-        loop {
-            let changed = self.state_changed.notified();
-            if let Some(status) = self.plan_statuses.read().await.get(&key).cloned() {
-                return Some(status);
-            }
-            let remaining = deadline.saturating_duration_since(tokio::time::Instant::now());
-            if remaining.is_zero() || tokio::time::timeout(remaining, changed).await.is_err() {
-                return None;
-            }
-        }
-    }
-}
-
-async fn handle_socket(
-    socket: WebSocket,
-    agent_id: String,
-    role: AgentRole,
-    srv: Arc<OpampServer>,
-) {
-    let (tx, mut rx) = mpsc::channel::<OutboundMessage>(16);
-    srv.agents.write().await.insert(
-        agent_id.clone(),
-        AgentConnection {
-            tx,
-            role: role.clone(),
-            custom_capabilities: HashSet::new(),
-        },
-    );
-    srv.state_changed.notify_waiters();
-    info!(agent = %agent_id, ?role, "agent connected");
-
-    if let Some(cb) = &srv.on_connect {
-        cb(agent_id.clone(), role);
-    }
-
-    let (mut ws_tx, mut ws_rx) = socket.split();
-
-    // Forward channel messages → WebSocket as standard OpAMP protobuf.
-    //
-    // OpAMP WS wire format prepends each binary frame with a varint
-    // header (`uint64(0)` today). See `opamp-go/internal/wsmessage.go`.
-    // Without the header, the agent's `DecodeWSMessage` falls back to
-    // "old format" and decodes successfully — which is why pushes
-    // worked even before this fix. We add the header for spec
-    // conformance so the agent never has to take the legacy path.
-    let writer_id = agent_id.clone();
-    let write_task = tokio::spawn(async move {
-        while let Some(message) = rx.recv().await {
-            let (server_to_agent, description) = match message {
-                OutboundMessage::RemoteConfig(cfg) => (
-                    encode_remote_config(&cfg),
-                    format!("remote config hash={}", cfg.config_hash),
-                ),
-                OutboundMessage::CollectorPlan(body) => (
-                    encode_collector_plan(body),
-                    "typed CollectorPlan".to_string(),
-                ),
-            };
-            let mut payload = Vec::new();
-            if server_to_agent.encode(&mut payload).is_err() {
-                warn!(agent = %writer_id, "failed to encode OpAMP protobuf");
-                continue;
-            }
-            // Prepend the wsMsgHeader varint (zero byte today; the
-            // varint is `0u64`, which encodes to a single 0x00).
-            let mut buf = Vec::with_capacity(1 + payload.len());
-            buf.push(0u8);
-            buf.extend_from_slice(&payload);
-            if ws_tx.send(Message::Binary(buf)).await.is_err() {
-                break;
-            }
-            info!(agent = %writer_id, message = %description, "message pushed (OpAMP protobuf)");
-        }
-    });
-
-    // Receive AgentToServer protobuf messages.
-    //
-    // Strip the OpAMP wire-format header before decoding. Per
-    // `opamp-go/internal/wsmessage.go::DecodeWSMessage`, the spec
-    // header is a varint-encoded `uint64(0)` and is detected by a
-    // leading 0 byte. Older clients send raw protobuf with no header
-    // — in that case the first byte is the protobuf field tag and is
-    // never zero (a tag-0 wire type is illegal), so the
-    // "first-byte-is-zero" check is unambiguous.
-    while let Some(Ok(msg)) = ws_rx.next().await {
-        match msg {
-            Message::Binary(data) => {
-                let payload: &[u8] = if !data.is_empty() && data[0] == 0 {
-                    // Spec format. Decode the varint header (always
-                    // 0 today) and skip it.
-                    match prost::encoding::decode_varint(&mut &data[..]) {
-                        Ok(_hdr) => {
-                            // Recompute consumed bytes = varint length.
-                            // For the canonical zero header this is 1
-                            // byte; for any future non-zero header
-                            // it's `n` bytes from the unsigned LEB128
-                            // encoding.
-                            let mut tmp: &[u8] = data.as_ref();
-                            let _ = prost::encoding::decode_varint(&mut tmp);
-                            let consumed = data.len() - tmp.len();
-                            &data[consumed..]
-                        }
-                        Err(_) => &data[..],
-                    }
-                } else {
-                    &data[..]
-                };
-                match opamp_proto::AgentToServer::decode(payload) {
-                    Ok(ats) => {
-                        info!(agent = %agent_id, "received AgentToServer (OpAMP protobuf)");
-                        if let Some(capabilities) = &ats.custom_capabilities {
-                            if let Some(connection) = srv.agents.write().await.get_mut(&agent_id) {
-                                connection.custom_capabilities =
-                                    capabilities.capabilities.iter().cloned().collect();
-                            }
-                            srv.state_changed.notify_waiters();
-                        }
-                        if let Some(message) = &ats.custom_message {
-                            if message.capability == COLLECTOR_PLAN_CAPABILITY
-                                && message.r#type == PLAN_STATUS_MESSAGE
-                            {
-                                match serde_json::from_slice::<CollectorPlanStatus>(&message.data) {
-                                    Ok(status) => {
-                                        srv.plan_statuses.write().await.insert(
-                                            (agent_id.clone(), status.plan_id, status.plan_version),
-                                            status,
-                                        );
-                                        srv.state_changed.notify_waiters();
-                                    }
-                                    Err(error) => warn!(
-                                        agent = %agent_id,
-                                        %error,
-                                        "invalid typed CollectorPlan status"
-                                    ),
-                                }
-                            }
-                        }
-                        // Log effective config if reported. Triggered by
-                        // the `ReportFullState` flag on our outgoing
-                        // ServerToAgent (see `encode_remote_config`).
-                        if let Some(ec) = &ats.effective_config {
-                            if let Some(cm) = &ec.config_map {
-                                for (name, file) in &cm.config_map {
-                                    let body_preview = String::from_utf8_lossy(
-                                        &file.body[..file.body.len().min(160)],
-                                    );
-                                    info!(
-                                        agent = %agent_id,
-                                        config_name = %name,
-                                        bytes = file.body.len(),
-                                        preview = %body_preview.replace('\n', " ⏎ "),
-                                        "agent reported effective config",
-                                    );
-                                }
-                            }
-                        }
-                        // Log remote-config apply state — this is the
-                        // signal that "the agent received our pushed
-                        // RemoteConfig, attempted to apply it, and ended
-                        // up in {Applied | Failed | Applying}".
-                        // RemoteConfigStatuses enum values:
-                        //   0 = Unset
-                        //   1 = Applied
-                        //   2 = Applying
-                        //   3 = Failed
-                        if let Some(rcs) = &ats.remote_config_status {
-                            let status_str = match rcs.status {
-                                0 => "Unset",
-                                1 => "Applied",
-                                2 => "Applying",
-                                3 => "Failed",
-                                n => {
-                                    // Future spec-defined values fall through
-                                    // here; surface the raw int rather than
-                                    // claim a meaning.
-                                    return_unknown_status(n)
-                                }
-                            };
-                            let last_hash_hex = rcs
-                                .last_remote_config_hash
-                                .iter()
-                                .map(|b| format!("{:02x}", b))
-                                .collect::<String>();
-                            if rcs.status == 3 {
-                                warn!(
-                                    agent = %agent_id,
-                                    status = status_str,
-                                    last_hash = %last_hash_hex,
-                                    error = %rcs.error_message,
-                                    "agent reported remote-config status",
-                                );
-                            } else {
-                                info!(
-                                    agent = %agent_id,
-                                    status = status_str,
-                                    last_hash = %last_hash_hex,
-                                    "agent reported remote-config status",
-                                );
-                            }
-                        }
-                        // Log health if reported.
-                        if let Some(health) = &ats.health {
-                            info!(agent = %agent_id, healthy = health.healthy, "agent health");
-                        }
-                    }
-                    Err(e) => {
-                        warn!(agent = %agent_id, error = %e, "failed to decode AgentToServer")
-                    }
-                }
-            }
-            // Also accept JSON for backward compatibility.
-            Message::Text(text) => match serde_json::from_str::<AgentStatus>(&text) {
-                Ok(s) => {
-                    info!(agent = %s.agent_id, healthy = s.healthy, "agent status (legacy JSON)")
-                }
-                Err(_) => warn!(agent = %agent_id, "unexpected text message"),
-            },
-            Message::Close(_) => break,
-            _ => {}
-        }
-    }
-
-    write_task.abort();
-    srv.agents.write().await.remove(&agent_id);
-    srv.state_changed.notify_waiters();
-    info!(agent = %agent_id, "agent disconnected");
-
-    if let Some(cb) = &srv.on_disconnect {
-        cb(agent_id);
-    }
-}
-
-/// Encode a `RemoteConfig` as a standard OpAMP `ServerToAgent` protobuf message.
-///
-/// The YAML config body is wrapped in:
-///   ServerToAgent.remote_config.config.config_map[""].body = yaml_bytes
-///
-/// Format an unknown `RemoteConfigStatuses` int as a stable string
-/// for logs. Pulled out into a helper to keep the match arm above
-/// borrow-checker-friendly (returning a `&'static str`).
-fn return_unknown_status(n: i32) -> &'static str {
-    // Leak the formatted int into a `'static str` only if needed.
-    // For diagnostic logs we accept the cost of a Box::leak per
-    // unrecognised value since this is an "out-of-spec status"
-    // signal that should be rare. Avoids reworking the surrounding
-    // match into String.
-    Box::leak(format!("Unknown({})", n).into_boxed_str())
-}
-
-/// This is the standard OpAMP way to push collector configuration.
-/// The opampextension in the OTel Collector decodes this and applies the config.
-///
-/// Two protocol bits the control plane sets per spec:
-///
-/// 1. `flags = ReportFullState` (`0x01`) asks the agent's next
-///    `AgentToServer` to include the full status block —
-///    `effective_config` (the YAML the agent ended up running)
-///    and `remote_config_status` (Applied / Failed / Applying).
-///    Without this, the agent is allowed to elide both fields as
-///    an optimization once the control plane has acknowledged a
-///    given sequence_num, and we lose visibility into whether the
-///    push actually took.
-///
-/// 2. `capabilities` advertises what the control plane can accept
-///    back. `AcceptsStatus` is mandatory; `OffersRemoteConfig`
-///    must be set whenever we send `remote_config`;
-///    `AcceptsEffectiveConfig` tells the agent it's worth
-///    populating the field (some agents skip it if the server
-///    didn't claim it could parse it).
-fn encode_remote_config(cfg: &RemoteConfig) -> opamp_proto::ServerToAgent {
-    let config_file = opamp_proto::AgentConfigFile {
-        body: cfg.yaml.as_bytes().to_vec(),
-        content_type: "text/yaml".to_string(),
-    };
-
-    let mut config_map = HashMap::new();
-    config_map.insert(String::new(), config_file); // empty key = single config file
-
-    let agent_config_map = opamp_proto::AgentConfigMap { config_map };
-
-    let remote_config = opamp_proto::AgentRemoteConfig {
-        config: Some(agent_config_map),
-        config_hash: cfg.config_hash.as_bytes().to_vec(),
-    };
-
-    // ServerToAgentFlags_ReportFullState = 0x01.
-    const FLAG_REPORT_FULL_STATE: u64 = 0x0000_0001;
-    // ServerCapabilities bitmask:
-    //   AcceptsStatus            = 0x01
-    //   OffersRemoteConfig       = 0x02
-    //   AcceptsEffectiveConfig   = 0x04
-    const CAPS_DEFAULT: u64 = 0x01 | 0x02 | 0x04;
-
-    opamp_proto::ServerToAgent {
-        remote_config: Some(remote_config),
-        flags: FLAG_REPORT_FULL_STATE,
-        capabilities: CAPS_DEFAULT,
-        ..Default::default()
-    }
-}
-
-fn encode_collector_plan(body: Vec<u8>) -> opamp_proto::ServerToAgent {
-    opamp_proto::ServerToAgent {
-        capabilities: 0x01,
-        custom_capabilities: Some(opamp_proto::CustomCapabilities {
-            capabilities: vec![COLLECTOR_PLAN_CAPABILITY.into()],
-        }),
-        custom_message: Some(opamp_proto::CustomMessage {
-            capability: COLLECTOR_PLAN_CAPABILITY.into(),
-            r#type: COLLECTOR_PLAN_MESSAGE.into(),
-            data: body,
-        }),
-        ..Default::default()
-    }
-}
-
-// ── Tests ─────────────────────────────────────────────────────────────────────
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use axum::{routing::get, Router};
-
-    #[tokio::test]
-    async fn no_agents_push_returns_false() {
-        let srv = Arc::new(OpampServer::new());
-        let sent = srv
-            .push(
-                "unknown",
-                RemoteConfig {
-                    config_hash: "h".into(),
-                    yaml: "y".into(),
-                },
-            )
-            .await;
-        assert!(!sent);
-    }
-
-    #[tokio::test]
-    async fn connected_agents_empty_initially() {
-        let srv = Arc::new(OpampServer::new());
-        assert!(srv.connected_agents().await.is_empty());
-    }
-
-    #[test]
-    fn role_from_header() {
-        assert_eq!(AgentRole::from_header("backend"), AgentRole::Backend);
-        assert_eq!(AgentRole::from_header("agent"), AgentRole::Agent);
-        assert_eq!(AgentRole::from_header(""), AgentRole::Agent);
-        assert_eq!(AgentRole::from_header("BACKEND"), AgentRole::Backend);
-    }
-
-    /// `Gateway` is a recognised role and round-trips through
-    /// the OpAMP `X-Agent-Role` header parser. This locks in the wire
-    /// vocabulary that the typed L5 stage_split path relies on when it
-    /// calls `push_to_role(AgentRole::Gateway, ...)` and expects to
-    /// reach gateway-role collectors only.
-    #[test]
-    fn role_from_header_recognises_gateway() {
-        assert_eq!(AgentRole::from_header("gateway"), AgentRole::Gateway);
-        assert_eq!(AgentRole::from_header("Gateway"), AgentRole::Gateway);
-        assert_eq!(AgentRole::from_header("GATEWAY"), AgentRole::Gateway);
-        // Round-trip through serde lowercase rename.
-        let s = serde_json::to_string(&AgentRole::Gateway).unwrap();
-        assert_eq!(s, "\"gateway\"");
-        let back: AgentRole = serde_json::from_str(&s).unwrap();
-        assert_eq!(back, AgentRole::Gateway);
-        // Still distinct from the other two roles.
-        assert_ne!(AgentRole::Gateway, AgentRole::Agent);
-        assert_ne!(AgentRole::Gateway, AgentRole::Backend);
-    }
-
-    /// a gateway-role client connecting via WebSocket appears
-    /// in `connected_agents_with_roles` tagged as `Gateway`. Together
-    /// with the from_header test above this proves the role plumbs
-    /// through the connect path that `push_to_role` selects on.
-    #[tokio::test]
-    async fn gateway_role_round_trips_through_connection() {
-        let (srv, addr) = start_server().await;
-        let _gateway_ws = connect_ws_client(addr, "gw-1", "gateway").await;
-
-        // Wait for server-side registration to complete.
-        for _ in 0..20 {
-            tokio::time::sleep(std::time::Duration::from_millis(25)).await;
-            let map = srv.connected_agents_with_roles().await;
-            if map.get("gw-1") == Some(&AgentRole::Gateway) {
-                return;
-            }
-        }
-        let map = srv.connected_agents_with_roles().await;
-        panic!("gateway role never registered; map = {:?}", map);
-    }
-
-    /// Helper: start a real OpAMP server on a random port, return the server
-    /// Arc and the bound address.
-    async fn start_server() -> (Arc<OpampServer>, std::net::SocketAddr) {
-        let srv = Arc::new(OpampServer::new());
-        let app = Router::new()
-            .route("/v1/opamp", get(OpampServer::ws_handler))
-            .with_state(Arc::clone(&srv));
-        let listener = tokio::net::TcpListener::bind("127.0.0.1:0").await.unwrap();
-        let addr = listener.local_addr().unwrap();
-        tokio::spawn(async move { axum::serve(listener, app).await.unwrap() });
-        (srv, addr)
-    }
-
-    /// Connect a WebSocket client with a given agent-id and role.
-    async fn connect_ws_client(
-        addr: std::net::SocketAddr,
-        agent_id: &str,
-        role: &str,
-    ) -> tokio_tungstenite::WebSocketStream<tokio_tungstenite::MaybeTlsStream<tokio::net::TcpStream>>
-    {
-        use tokio_tungstenite::tungstenite::http::Request;
-        let req = Request::builder()
-            .uri(format!("ws://{addr}/v1/opamp"))
-            .header("Host", addr.to_string())
-            .header("X-Agent-ID", agent_id)
-            .header("X-Agent-Role", role)
-            .header("Upgrade", "websocket")
-            .header("Connection", "Upgrade")
-            .header("Sec-WebSocket-Key", "dGhlIHNhbXBsZSBub25jZQ==")
-            .header("Sec-WebSocket-Version", "13")
-            .body(())
-            .unwrap();
-        let (ws, _) = tokio_tungstenite::connect_async(req).await.unwrap();
-        ws
-    }
-
-    fn decode_server_to_agent_frame(data: &[u8]) -> opamp_proto::ServerToAgent {
-        let payload = if !data.is_empty() && data[0] == 0 {
-            &data[1..]
-        } else {
-            data
-        };
-        opamp_proto::ServerToAgent::decode(payload).expect("valid protobuf")
-    }
-
-    /// `push_to_role` delivers a RemoteConfig to a connected agent-role client.
-    #[tokio::test]
-    async fn push_to_role_delivers_yaml_to_agent_role() {
-        let (srv, addr) = start_server().await;
-        let mut agent_ws = connect_ws_client(addr, "agent-1", "agent").await;
-
-        // Allow the server to register the connection.
-        tokio::time::sleep(std::time::Duration::from_millis(50)).await;
-
-        let yaml_payload = "ddsketch:\n  mode: window\n";
-        srv.push_to_role(
-            AgentRole::Agent,
-            RemoteConfig {
-                config_hash: "hash-1".into(),
-                yaml: yaml_payload.to_string(),
-            },
-        )
-        .await;
-
-        let msg = tokio::time::timeout(
-            std::time::Duration::from_secs(2),
-            futures_util::StreamExt::next(&mut agent_ws),
-        )
-        .await
-        .expect("timed out waiting for message")
-        .unwrap()
-        .unwrap();
-
-        // Decode standard OpAMP protobuf binary frame.
-        let data = msg.into_data();
-        let sta = decode_server_to_agent_frame(data.as_ref());
-        let rc = sta.remote_config.expect("should have remote_config");
-        let config = rc.config.expect("should have config");
-        let file = config
-            .config_map
-            .get("")
-            .expect("should have empty-key entry");
-        let yaml = String::from_utf8(file.body.clone()).unwrap();
-        assert_eq!(yaml, yaml_payload, "delivered yaml must match");
-        assert_eq!(
-            String::from_utf8(rc.config_hash).unwrap(),
-            "hash-1",
-            "delivered hash must match"
-        );
-    }
-
-    /// Phase C integration test: gateway YAML emitted from the typed L5
-    /// stage_split path is queued onto the gateway-role connection and
-    /// not onto agent-role / backend-role connections. We don't decode
-    /// the protobuf (an unrelated decode-tag-zero issue affects sibling
-    /// tests today); we only assert *delivery routing* — the gateway
-    /// client receives a non-empty binary frame within the timeout, the
-    /// other roles receive nothing.
-    #[tokio::test]
-    async fn push_to_role_gateway_routes_only_to_gateway_role() {
-        use futures_util::StreamExt;
-        let (srv, addr) = start_server().await;
-        let mut agent_ws = connect_ws_client(addr, "agent-1", "agent").await;
-        let mut gateway_ws = connect_ws_client(addr, "gateway-1", "gateway").await;
-        let mut backend_ws = connect_ws_client(addr, "backend-1", "backend").await;
-
-        tokio::time::sleep(std::time::Duration::from_millis(50)).await;
-
-        // Mirror the call site that handle_plan now exercises:
-        //   emit_gateway_yaml(...) → push_to_role(Gateway, ...).
-        // We use a stand-in YAML payload here; the emitter has its own
-        // tests in stage_config.rs.
-        let yaml = "extensions:\n  opamp: {}\n".to_string();
-        srv.push_to_role(
-            AgentRole::Gateway,
-            RemoteConfig {
-                config_hash: "hash-gw".into(),
-                yaml,
-            },
-        )
-        .await;
-
-        // Gateway must receive exactly one frame.
-        let msg = tokio::time::timeout(std::time::Duration::from_secs(2), gateway_ws.next())
-            .await
-            .expect("gateway timed out")
-            .unwrap()
-            .unwrap();
-        let bytes = msg.into_data();
-        assert!(!bytes.is_empty(), "gateway must receive a non-empty frame");
-
-        // Other roles must receive nothing within a short window.
-        let agent_result =
-            tokio::time::timeout(std::time::Duration::from_millis(200), agent_ws.next()).await;
-        assert!(
-            agent_result.is_err(),
-            "agent-role client must not receive gateway-role push"
-        );
-        let backend_result =
-            tokio::time::timeout(std::time::Duration::from_millis(200), backend_ws.next()).await;
-        assert!(
-            backend_result.is_err(),
-            "backend-role client must not receive gateway-role push"
-        );
-    }
-
-    /// `push_to_role(Agent)` must not deliver to a backend-role client.
-    #[tokio::test]
-    async fn push_to_agent_role_does_not_reach_backend_role() {
-        use futures_util::StreamExt;
-        let (srv, addr) = start_server().await;
-        let mut agent_ws = connect_ws_client(addr, "agent-1", "agent").await;
-        let mut backend_ws = connect_ws_client(addr, "backend-1", "backend").await;
-
-        tokio::time::sleep(std::time::Duration::from_millis(50)).await;
-
-        srv.push_to_role(
-            AgentRole::Agent,
-            RemoteConfig {
-                config_hash: "hash-agent".into(),
-                yaml: "ddsketch:\n  mode: batch\n".to_string(),
-            },
-        )
-        .await;
-
-        // Agent must receive the message.
-        let msg = tokio::time::timeout(std::time::Duration::from_secs(2), agent_ws.next())
-            .await
-            .expect("agent timed out")
-            .unwrap()
-            .unwrap();
-        let data = msg.into_data();
-        let sta = decode_server_to_agent_frame(data.as_ref());
-        let rc = sta.remote_config.expect("should have remote_config");
-        assert_eq!(String::from_utf8(rc.config_hash).unwrap(), "hash-agent");
-
-        // Backend must receive nothing within a short window.
-        let backend_result =
-            tokio::time::timeout(std::time::Duration::from_millis(200), backend_ws.next()).await;
-        assert!(
-            backend_result.is_err(),
-            "backend-role client must not receive agent-role push"
-        );
-    }
-
-    fn test_collector_plan(
-        collector_id: &str,
-        plan_id: u64,
-    ) -> crate::physical::compiler::CollectorPlan {
-        crate::physical::compiler::CollectorPlan {
-            summary_catalog: None,
-            collector_id: collector_id.into(),
-            envelope: crate::physical::compiler::PlanEnvelope {
-                plan_id,
-                plan_version: 1,
-                generated_at_unix_ms: 1,
-                activation_unix_ms: 1,
-                expiry_unix_ms: None,
-                backend_compat: "asap-query-backend.v1".into(),
-                planner_revision: crate::physical::compiler::PLANNER_REVISION.into(),
-                capability_snapshot_id: "caps-1".into(),
-            },
-            materializations: vec![crate::physical::compiler::CollectorMaterialization {
-                query_id: "q".into(),
-                materialization: asap_types::PolicyFingerprint(1).into(),
-                metric: "requests".into(),
-                algorithm: "hll".into(),
-                parameters: serde_json::json!({"precision": 14}),
-                group_by: vec!["service".into()],
-                window_secs: 60,
-                abstract_window_framework:
-                    planner_types::post_asap::SummaryWindowFramework::Tumbling,
-                window_realization_id: "collector-tumbling-v1".into(),
-                slide_secs: 60,
-                pane_origin_ms: Some(0),
-                window_layout: asap_types::WindowMaterializationLayout::Pane { pane_secs: 60 },
-                evidence_source: None,
-                lifecycle: crate::physical::compiler::CollectorLifecycle {
-                    kind: "continuously_maintained".into(),
-                    maintenance_mode: "incremental".into(),
-                    evaluation_schedule: "per_update".into(),
-                    output_representation: "summary_state".into(),
-                },
-            }],
-            transmission_rules: vec![crate::physical::compiler::TransmissionRule {
-                materialization: asap_types::PolicyFingerprint(1).into(),
-                producer_id: collector_id.into(),
-                schema_id: "asap-query-backend.v1:summary-state:v1:1".into(),
-                mode: crate::physical::compiler::TransmissionMode::Full,
-                encoding: crate::physical::compiler::StateEncoding::SketchlibProtobufV1,
-                emit_every_ms: 60_000,
-                full_checkpoint_every_ms: None,
-                destination_ref: "asapquery-backend".into(),
-                runtime_policy: crate::physical::compiler::RuntimeRulePolicy::default(),
-            }],
-        }
-    }
-
-    async fn send_agent_message(
-        ws: &mut tokio_tungstenite::WebSocketStream<
-            tokio_tungstenite::MaybeTlsStream<tokio::net::TcpStream>,
-        >,
-        message: opamp_proto::AgentToServer,
-    ) {
-        use futures_util::SinkExt;
-        let mut protobuf = Vec::new();
-        message.encode(&mut protobuf).unwrap();
-        let mut frame = vec![0];
-        frame.extend(protobuf);
-        ws.send(tokio_tungstenite::tungstenite::Message::Binary(frame))
-            .await
-            .unwrap();
-    }
-
-    #[tokio::test]
-    async fn typed_plan_publication_waits_for_capability_and_exact_staged_status() {
-        let (srv, addr) = start_server().await;
-        let mut agent_ws = connect_ws_client(addr, "edge-a", "agent").await;
-
-        send_agent_message(
-            &mut agent_ws,
-            opamp_proto::AgentToServer {
-                custom_capabilities: Some(opamp_proto::CustomCapabilities {
-                    capabilities: vec![COLLECTOR_PLAN_CAPABILITY.into()],
-                }),
-                ..Default::default()
-            },
-        )
-        .await;
-
-        let publisher = Arc::clone(&srv);
-        let plan = test_collector_plan("edge-a", 42);
-        let publish = tokio::spawn(async move {
-            publisher
-                .publish_collector_plans(&[plan], Duration::from_secs(2))
-                .await
-        });
-
-        let frame = tokio::time::timeout(Duration::from_secs(2), agent_ws.next())
-            .await
-            .expect("typed plan timed out")
-            .unwrap()
-            .unwrap();
-        let message = decode_server_to_agent_frame(&frame.into_data());
-        let custom = message.custom_message.expect("custom message");
-        assert_eq!(custom.capability, COLLECTOR_PLAN_CAPABILITY);
-        assert_eq!(custom.r#type, COLLECTOR_PLAN_MESSAGE);
-        let wire_plan: crate::physical::compiler::CollectorPlan =
-            serde_json::from_slice(&custom.data).unwrap();
-        assert_eq!(wire_plan.collector_id, "edge-a");
-        assert_eq!(wire_plan.envelope.plan_id, 42);
-
-        let status = serde_json::to_vec(&CollectorPlanStatus {
-            plan_id: 42,
-            plan_version: 1,
-            status: CollectorPlanStatusKind::Staged,
-            error: None,
-        })
-        .unwrap();
-        send_agent_message(
-            &mut agent_ws,
-            opamp_proto::AgentToServer {
-                custom_message: Some(opamp_proto::CustomMessage {
-                    capability: COLLECTOR_PLAN_CAPABILITY.into(),
-                    r#type: PLAN_STATUS_MESSAGE.into(),
-                    data: status,
-                }),
-                ..Default::default()
-            },
-        )
-        .await;
-
-        let reports = publish.await.unwrap().unwrap();
-        assert_eq!(reports.len(), 1);
-        assert_eq!(reports[0].plan_id, 42);
-        assert_eq!(reports[0].plan_version, 1);
-        assert_eq!(reports[0].status, CollectorPlanStatusKind::Staged);
-    }
-
-    #[tokio::test]
-    async fn typed_plan_publication_fails_without_advertised_capability() {
-        let (srv, addr) = start_server().await;
-        let _agent_ws = connect_ws_client(addr, "edge-a", "agent").await;
-        let error = srv
-            .publish_collector_plans(
-                &[test_collector_plan("edge-a", 42)],
-                Duration::from_millis(30),
-            )
-            .await
-            .unwrap_err();
-        assert!(matches!(
-            error,
-            CollectorPlanPublishError::CapabilityTimeout { collector_id }
-                if collector_id == "edge-a"
-        ));
-    }
-
-    #[tokio::test]
-    async fn typed_plan_publication_rejects_duplicate_targets_before_sending() {
-        let srv = OpampServer::new();
-        let plan = test_collector_plan("edge-a", 42);
-        let error = srv
-            .publish_collector_plans(&[plan.clone(), plan], Duration::from_millis(1))
-            .await
-            .unwrap_err();
-        assert!(matches!(
-            error,
-            CollectorPlanPublishError::DuplicateTarget { collector_id }
-                if collector_id == "edge-a"
-        ));
-    }
-}
diff --git a/control_plane/src/physical/backend_stage.rs b/control_plane/src/physical/backend_stage.rs
deleted file mode 100644
index bc60cf45a..000000000
--- a/control_plane/src/physical/backend_stage.rs
+++ /dev/null
@@ -1,87 +0,0 @@
-//! Backend-facing projection of one planning cycle.
-//!
-//! These types are the input to [`crate::backend_plan::from_stage_config`] and
-//! to `emit::backend_wire`'s backend JSON builders. `DeploymentPlanCompiler` builds
-//! them directly from the summaries ASAPPlanner selected.
-//!
-//! They are deliberately not `Serialize`/`Deserialize`: `SummaryFamilyType`
-//! and `SketchQuery` have no serde impls upstream, and the wire payload is
-//! produced by `emit::backend_wire::build_backend_aggregation_json`, a
-//! hand-written JSON builder reading these fields, never a whole-struct
-//! serialize. `backend_plan::from_stage_config` reuses that same builder so
-//! the two wire formats share one `PolicyFingerprint` identity space.
-
-use planner_types::post_asap::{SketchQuery, SummaryFamilyType};
-use serde::{Deserialize, Serialize};
-
-/// Everything the backend must materialize and serve for one planning cycle.
-#[derive(Debug, Clone)]
-pub struct BackendStageConfig {
-    /// One entry per materialization the backend maintains.
-    pub aggregations: Vec<BackendAggregation>,
-    /// One readout per summary-estimate node — what the backend returns to
-    /// the query evaluator.
-    pub readouts: Vec<BackendReadout>,
-}
-
-/// One summary the backend must accept and maintain.
-///
-/// `aggregation_id` is internal plumbing: it threads a selected summary to
-/// its readout while compiling. It is not emitted on the wire — the backend
-/// content-addresses identity via `PolicyFingerprint`, derived from
-/// `metric_name`, the summary family, grouping labels and `spatial_filter`.
-#[derive(Debug, Clone, PartialEq)]
-pub struct BackendAggregation {
-    /// Internal-only id (see struct doc). Not on the wire.
-    pub aggregation_id: String,
-    /// Source metric the aggregation runs over. Required by the backend's
-    /// `PrecomputeMaterialization` parser.
-    pub metric_name: String,
-    /// Planner-owned committed summary identity. Sketch entries carry a
-    /// validated `SketchKind` (category + algorithm + params); exact entries
-    /// carry the matching `ExactKind`/`ExactParams` pair.
-    pub family: SummaryFamilyType,
-    /// Window size in seconds. The backend's parser rejects a zero window.
-    pub window_secs: u64,
-    /// Spatial filter (comma-joined `k=v` pairs). Empty when none applies.
-    pub spatial_filter: String,
-    /// Group-by label names — keys in `labels.grouping` on the backend side,
-    /// where the precompute engine keys per-aggregation state by the
-    /// projected attribute set.
-    pub grouping: Vec<String>,
-    /// Per-item dimension (the data-point attribute name, e.g. `endpoint`)
-    /// for an item_label-mode frequency sketch. Emitted into the
-    /// aggregation's `parameters["item_label"]` so data-plane ingest records
-    /// it on the sid and can answer per-item `estimate(key)`.
-    pub item_label: Option<String>,
-    /// Runtime accumulator mode derived from the summary's input weight,
-    /// never from the TopK readout. `None` retains the value-update default.
-    pub heap_update_mode: Option<&'static str>,
-    /// What wire shape the backend ingests for this aggregation.
-    pub aggregation_input: AggregationInput,
-}
-
-/// What wire shape the backend ingests for an aggregation: whether it builds
-/// the summary from raw samples or accepts pre-built state from upstream.
-#[derive(Debug, Clone, Copy, Default, PartialEq, Eq, Serialize, Deserialize)]
-#[serde(rename_all = "snake_case")]
-pub enum AggregationInput {
-    /// The backend receives summary-state envelopes.
-    #[default]
-    SketchEnvelope,
-    /// The backend receives raw OTLP samples and builds the summary at
-    /// ingest.
-    Raw,
-}
-
-/// One readout entry — what the backend's query evaluator asks for.
-///
-/// Not `PartialEq`/`Serialize`/`Deserialize`: `op: SketchQuery` has none of
-/// those upstream.
-#[derive(Debug, Clone)]
-pub struct BackendReadout {
-    /// Aggregation this readout reads from.
-    pub aggregation_id: String,
-    /// Readout op (mirror of `SummaryExpr::SummaryEstimate::query`).
-    pub op: SketchQuery,
-}
diff --git a/control_plane/src/physical/compiler.rs b/control_plane/src/physical/compiler.rs
deleted file mode 100644
index d90199c2a..000000000
--- a/control_plane/src/physical/compiler.rs
+++ /dev/null
@@ -1,8151 +0,0 @@
-//! Backend-owned physical compilation over ASAPPlanner's selected post-ASAP IR.
-//!
-//! Planner owns semantic candidates and guarantees. This module owns the
-//! deployment decision: evidence freshness, target capabilities, windows, the
-//! Collector execution projection, SummaryCatalog, and executable plans.
-
-use std::collections::{BTreeMap, BTreeSet, HashMap};
-use std::rc::Rc;
-
-use asap_aware_mapping::cost_model::Cost;
-#[cfg(test)]
-use asap_aware_mapping::DefaultAccuracyModel;
-use asap_aware_mapping::{
-    plan_summary_maintenance_lifecycles, AccuracyEvidenceProvider, CostRate, Horizon,
-    PropagationStats, SummaryMaintenanceCapabilities, SummaryMaintenanceLifecycleCapabilities,
-    SummaryMaintenanceLifecycleCostInputs, WorkloadDemand,
-};
-use planner_types::post_asap::{
-    CompositionOperator, EvaluationSchedule, ExecutableDagCompilation, OutputRepresentation,
-    PostAsapNodeId, SketchAlgorithm, SketchParams, SketchQuery, SummaryExpr, SummaryFamilyType,
-    SummaryMaintenanceLifecycle, SummaryMaintenanceMode, SummaryNode, SummaryWindowFramework,
-};
-use planner_types::pre_asap::QueryExpr;
-use planner_types::workload::{
-    AccuracyRequirement, DataArrival, DataWorkload, DurationMs, Evidence, EvidenceSource,
-    Predictability, Query, QueryLanguage, QueryRecurrence, QueryRequirements, QueryTimeScope,
-    QueryWorkload, Rate, RepeatedDemand, RepeatingEntry, RepetitionInterval, TimeSelection,
-};
-use serde::{de::Error as _, Deserialize, Deserializer, Serialize};
-use serde_json::{json, Value};
-use thiserror::Error;
-
-use crate::physical::backend_stage::{AggregationInput, BackendAggregation};
-use crate::physical::post_asap::cost_model::{ControlPlaneCostModel, ExactCompositionCostEvidence};
-use crate::query_plan::{
-    canonical_promql, FallbackPolicy, InstantExecution, MaterializationBinding, PhysicalGrouping,
-    QueryPlan, QueryPlanEntry,
-};
-use crate::types::AccuracyTarget;
-use planner_types::pre_asap::Source;
-
-mod windows;
-pub(super) use windows::gcd;
-pub use windows::{prepare_window_implementations, WindowCostModel};
-
-pub const PLANNER_REVISION: &str = env!("ASAPPLANNER_REVISION");
-pub const BACKEND_REVISION: &str = env!("ASAPQUERY_BACKEND_REVISION");
-pub use asap_types::precompute_plan::BACKEND_COMPAT;
-/// Matches the data plane's default persistence memory limit. A backend-local
-/// summary candidate must fit its complete retained state inside this budget.
-pub const DEFAULT_RETAINED_SUMMARY_MEMORY_BUDGET_BYTES: u64 = 2 * 1024 * 1024 * 1024;
-
-fn default_retained_summary_memory_budget_bytes() -> u64 {
-    DEFAULT_RETAINED_SUMMARY_MEMORY_BUDGET_BYTES
-}
-
-fn is_default_retained_summary_memory_budget_bytes(value: &u64) -> bool {
-    *value == DEFAULT_RETAINED_SUMMARY_MEMORY_BUDGET_BYTES
-}
-
-#[derive(Debug, Clone)]
-pub struct QueryCompilationInput {
-    pub query_id: String,
-    /// Catalog expression used only to build the stable QueryPlan identity.
-    /// The selected implementation comes from `selected_plan_root`, never this text.
-    pub query_string: String,
-    /// Planner-selected post-ASAP DAG. The physical compiler must not
-    /// re-select a summary family from pre-ASAP input.
-    pub selected_plan_root: Rc<SummaryNode>,
-    /// Legacy catalog source retained for request compatibility. Physical
-    /// materialization sources are derived from each post-ASAP SummaryAgg;
-    /// it also remains part of the cost manifest workload identity.
-    pub legacy_query_source: Source,
-    pub query_lookback_seconds: u64,
-    /// Label names are deployment metadata because Planner's canonical IR
-    /// currently carries positional column IDs at this boundary.
-    pub group_by_labels: Vec<String>,
-    pub accuracy_target: AccuracyTarget,
-    pub summary_lifecycle_inputs: SummaryLifecyclePlanningInputs,
-    /// Executor-feasible concrete realizations offered to Planner for its
-    /// abstract window-framework decision. The compiler retains physical
-    /// identities and exposes only framework + complete weighted cost to
-    /// Planner. An empty or stale set fails closed.
-    pub window_realization_candidates: Vec<WindowRealizationCandidate>,
-    /// Physical runtime policy selected for this Planner materialization.
-    /// It is validated against the selected summary family during physical
-    /// compilation and becomes part of the immutable plan generation.
-    pub materialization_runtime_policy: RuntimeRulePolicy,
-}
-
-#[derive(Debug, Clone, Serialize, Deserialize, PartialEq)]
-#[serde(deny_unknown_fields)]
-pub struct WindowRealizationCostQuote {
-    pub model_version: String,
-    pub workload_fingerprint: String,
-    pub observed_at_unix_ms: u64,
-    pub valid_for_ms: u64,
-    pub horizon_seconds: f64,
-    /// Measured build plus incremental-update CPU over `horizon_seconds`.
-    pub cpu_cost: f64,
-    pub peak_memory_bytes: u64,
-    pub network_bytes: u64,
-    pub storage_bytes: u64,
-    pub source_scan_bytes: u64,
-    /// Dimensionally calibrated scalar passed to Planner for comparison. The
-    /// evidence producer must price update CPU, query-time merges at the
-    /// workload's read frequency, retained memory, storage, source scans, and
-    /// network traffic. Keeping the components alongside this quote makes the
-    /// selected tradeoff auditable without teaching Planner backend units.
-    pub weighted_cost: f64,
-}
-
-#[derive(Debug, Clone, Serialize, Deserialize, PartialEq)]
-#[serde(deny_unknown_fields)]
-pub struct WindowRealizationCandidate {
-    /// Backend-owned identity; never copied into Planner IR.
-    #[serde(rename = "implementation_id")]
-    pub realization_id: String,
-    pub framework: SummaryWindowFramework,
-    pub window_secs: u64,
-    pub slide_secs: u64,
-    pub layout: asap_types::WindowMaterializationLayout,
-    pub cost: WindowRealizationCostQuote,
-    /// Only compiler-generated quotes may be repriced after changing their layout.
-    /// Serialized input always becomes provider evidence.
-    #[serde(skip)]
-    pub derived: bool,
-    /// This offer was generated for a restricted derived-maintenance cohort,
-    /// whose cadence cannot satisfy ordinary raw-state consumers of the same W.
-    #[serde(skip)]
-    pub cohort_only: bool,
-}
-
-#[derive(Debug, Clone, Serialize, Deserialize, PartialEq)]
-#[serde(deny_unknown_fields)]
-pub struct LifecycleUnitCosts {
-    pub build: f64,
-    pub maintenance_per_update: f64,
-    pub read: f64,
-    pub retention_per_second: f64,
-    pub retirement: f64,
-}
-
-#[derive(Debug, Clone, Serialize, Deserialize, PartialEq)]
-#[serde(deny_unknown_fields)]
-pub struct SummaryLifecyclePlanningInputs {
-    pub evaluation_interval_ms: u32,
-    pub ingestion_rate_per_second: f64,
-    pub evidence_observed_at_unix_ms: u64,
-    pub evidence_valid_for_ms: u64,
-    pub horizon_seconds: f64,
-    pub costs: LifecycleUnitCosts,
-}
-
-#[derive(Debug, Clone, Default)]
-pub struct PhysicalCompilationRequest {
-    /// Diagnostic projections of the original Planner search; never consumed by selection.
-    pub planner_selection_trace: Vec<serde_json::Value>,
-    /// Enable a composable DAG with SummaryStore materializations and Prometheus exact subtrees.
-    pub allow_mixed_summary_and_exact_execution: bool,
-    /// Enabled optional candidate keys: None enables all eligible keys; an
-    /// explicitly empty set enables none. These are not catalog definition IDs.
-    pub enabled_materialization_keys: Option<BTreeSet<String>>,
-    /// Original dashboard demand, in the same order as queries. None is legacy input.
-    pub query_workload: Option<QueryWorkload>,
-    /// Source evidence supplied independently from query demand.
-    pub data_workload: Option<DataWorkload>,
-    /// Workload-lowered roots retained across physical alternative enumeration.
-    pub canonical_roots: Vec<Rc<QueryExpr>>,
-    pub queries: Vec<QueryCompilationInput>,
-    pub topk_membership_evidence_by_query_id: HashMap<String, TopKMembershipEvidence>,
-    /// Fresh measured costs for Planner exact/summary composition sites,
-    /// scoped to query IDs just like accuracy evidence.
-    pub exact_composition_costs: HashMap<String, Vec<ExactCompositionCostEvidence>>,
-    /// Optional Error–Resource Profile inputs and distribution-conditioned sizing. Hybrid
-    /// mode falls back to theoretical sizing and then exact execution.
-    pub erp: Option<super::erp::ErpPlanningInput>,
-    pub planner_revision: String,
-    /// Source cadence used to bound current-series input lag.
-    pub scrape_interval_ms: Option<u64>,
-    /// How far behind the newest ingested sample an admitted query may be
-    /// evaluated. This extends physical retention only; it never changes the
-    /// PromQL range selector used for readout.
-    pub query_retention_margin_ms: u64,
-    /// Maximum aggregate encoded footprint of every retained summary pane.
-    /// `None` uses the backend's default persistence-memory limit.
-    pub retained_summary_memory_budget_bytes: Option<u64>,
-}
-
-#[derive(Debug, Clone, Serialize, Deserialize, PartialEq)]
-pub struct TopKMembershipEvidence {
-    pub selected_lower_bound: f64,
-    pub excluded_upper_bound: f64,
-    pub interval_failure_probability: f64,
-    pub observed_at_unix_ms: u64,
-    pub source: String,
-}
-
-#[derive(Debug, Clone, Serialize, Deserialize, PartialEq, Eq)]
-#[serde(deny_unknown_fields)]
-pub struct PhysicalDeploymentContext {
-    /// Semantic dataset served by this deployment's input channel; never an endpoint.
-    pub dataset_identity: planner_types::post_asap::LogicalDatasetIdentity,
-    pub target: PhysicalDeploymentTarget,
-    #[serde(rename = "collector_ids")]
-    pub target_collector_ids: Vec<String>,
-    pub capability_snapshot_id: String,
-    pub observed_at_unix_ms: u64,
-    pub max_evidence_age_ms: u64,
-    pub plan_version: u64,
-    pub activation_unix_ms: u64,
-    pub expiry_unix_ms: Option<u64>,
-    pub backend_compat: String,
-}
-
-#[derive(Debug, Clone, Copy, Serialize, Deserialize, PartialEq, Eq)]
-#[serde(rename_all = "snake_case")]
-pub enum PhysicalDeploymentTarget {
-    DistributedCollectors,
-    BackendLocalRemoteWrite,
-}
-
-/// Startup and candidate-discovery input for backend-local planning.
-/// Version 3 requires an explicit logical dataset identity; it is the sole supported schema; deployment always requires quotes.
-/// The one workload-snapshot schema this backend accepts.
-///
-/// Every producer of a snapshot has to agree with this number, and they are
-/// written in different languages, so the number cannot live in each of them.
-/// It lives here, and `snapshot_version_is_declared_once` fails if a shipped
-/// example or a tool in `tools/` disagrees. Bumping the schema is then a single
-/// edit plus whatever that test reports, instead of a literal that some
-/// producers follow and others quietly do not.
-pub const WORKLOAD_SNAPSHOT_VERSION: u32 = 3;
-
-/// Query/data semantics use ASAPPlanner's canonical workload types directly;
-/// this wrapper adds only backend-owned implementation evidence and lifecycle
-/// identity required to choose a concrete physical realization.
-#[derive(Debug, Clone, Serialize, Deserialize, PartialEq)]
-#[serde(deny_unknown_fields)]
-pub struct BackendLocalPlanningInput {
-    /// Must equal [`WORKLOAD_SNAPSHOT_VERSION`].
-    #[serde(rename = "snapshot_version")]
-    pub schema_version: u32,
-    /// May be absent during candidate discovery, never during deployment.
-    #[serde(default, skip_serializing_if = "Option::is_none")]
-    pub workload_cost_evidence: Option<super::workload_cost::WorkloadCostEvidence>,
-    #[serde(deserialize_with = "deserialize_snapshot_query_workload")]
-    pub query_workload: QueryWorkload,
-    pub data_workload: DataWorkload,
-    #[serde(rename = "implementation")]
-    pub physical_inputs: BackendLocalPhysicalInputs,
-    pub environment: PhysicalDeploymentContext,
-}
-
-#[derive(Debug, Clone, Serialize, Deserialize, PartialEq)]
-#[serde(deny_unknown_fields)]
-pub struct BackendLocalPhysicalInputs {
-    pub lifecycle_costs: LifecycleUnitCosts,
-    pub evidence_observed_at_unix_ms: u64,
-    pub evidence_valid_for_ms: u64,
-    pub horizon_seconds: f64,
-    pub window_cost_model: WindowCostModel,
-    /// Prometheus source scrape cadence. Rangeless instant-vector expressions
-    /// use this as their derived readout window. This backend-local planning
-    /// default is distinct from Prometheus instant-selector lookback delta.
-    pub scrape_interval_ms: u64,
-    #[serde(default, skip_serializing_if = "u64_is_zero")]
-    #[serde(rename = "query_staleness_margin_ms")]
-    pub query_retention_margin_ms: u64,
-    /// Admission budget for all retained panes and estimated partitions.
-    /// Missing legacy snapshots inherit the backend default.
-    #[serde(
-        default = "default_retained_summary_memory_budget_bytes",
-        skip_serializing_if = "is_default_retained_summary_memory_budget_bytes"
-    )]
-    #[serde(rename = "max_retained_summary_bytes")]
-    pub retained_summary_memory_budget_bytes: u64,
-    /// Certificates keyed by exact registered PromQL; converted to root IDs
-    /// before workload selection so one query cannot borrow another's evidence.
-    #[serde(default, skip_serializing_if = "HashMap::is_empty")]
-    pub topk_evidence: HashMap<String, TopKMembershipEvidence>,
-    /// Measured exact/summary composition profiles keyed by registered
-    /// PromQL. Missing rows keep the corresponding Planner site opaque.
-    #[serde(default, skip_serializing_if = "HashMap::is_empty")]
-    pub exact_composition_costs: HashMap<String, Vec<ExactCompositionCostEvidence>>,
-    #[serde(default, skip_serializing_if = "Option::is_none")]
-    pub erp: Option<super::erp::ErpPlanningInput>,
-}
-
-/// Snapshot lookback is derived from PromQL and the declared scrape interval;
-/// accepting it here would silently restore the competing legacy input.
-fn deserialize_snapshot_query_workload<'de, D>(deserializer: D) -> Result<QueryWorkload, D::Error>
-where
-    D: Deserializer<'de>,
-{
-    let value = Value::deserialize(deserializer)?;
-    let has_legacy_lookback = value
-        .get("repeating_queries")
-        .and_then(Value::as_array)
-        .is_some_and(|entries| {
-            entries.iter().any(|entry| {
-                entry
-                    .get("time_selection")
-                    .and_then(Value::as_object)
-                    .and_then(|selection| selection.get("lookback"))
-                    .is_some_and(|lookback| !lookback.is_null())
-            })
-        });
-    if has_legacy_lookback {
-        return Err(D::Error::custom(
-            "query_workload.repeating_queries[].time_selection.lookback is not supported; it is derived from PromQL",
-        ));
-    }
-    serde_json::from_value(value).map_err(D::Error::custom)
-}
-
-fn u64_is_zero(value: &u64) -> bool {
-    *value == 0
-}
-
-pub use asap_types::precompute_plan::{
-    ExactStateKind, IngestContract, IngestProtocol, PlanEnvelope, PrecomputePlan,
-    PrecomputePlanError, ProducerContract, StateEncoding, StateFamilyContract, StateSchemaContract,
-    StateWindowContract, TimestampUnit,
-};
-
-pub use asap_types::producer_plan::{
-    AdaptiveF64Bounds, AdaptiveU64Bounds, CollectorLifecycle, CollectorMaterialization,
-    CollectorPlan, DeltaPolicy, FrameIdentityContract, GosPolicy, GosThresholdMode,
-    RuntimeAdaptationEvidence, RuntimeAdaptationPolicy, RuntimeRulePolicy, SamplingEstimator,
-    SamplingPolicy, SequenceScope, SummaryFrameIdentity, SummaryFrameKind, TransmissionMode,
-    TransmissionPlan, TransmissionPlanError, TransmissionRule,
-};
-
-#[cfg(test)]
-/// Build the fixed physical knob from the controller's canonical
-/// epsilon-floor allocator. Degenerate budgets/rates disable sampling.
-pub fn sampling_policy_from_accuracy_budget(
-    epsilon_sampling: f64,
-    updates_per_window: f64,
-    estimator: SamplingEstimator,
-) -> SamplingPolicy {
-    if !epsilon_sampling.is_finite()
-        || epsilon_sampling <= 0.0
-        || !updates_per_window.is_finite()
-        || updates_per_window <= 0.0
-    {
-        return SamplingPolicy::Disabled;
-    }
-    let probability = crate::epsilon_alloc::derive_sample_p(epsilon_sampling, updates_per_window);
-    if probability >= 1.0 {
-        SamplingPolicy::Disabled
-    } else {
-        SamplingPolicy::Fixed {
-            probability,
-            estimator,
-        }
-    }
-}
-
-#[cfg(test)]
-/// Allocate the deterministic staleness share with the same linear-peel
-/// composition used by `epsilon_alloc`. `None` means the selected sketch
-/// already consumes the budget or communication has no allocated weight.
-pub fn gos_policy_from_accuracy_budget(
-    epsilon_total: f64,
-    epsilon_sketch: f64,
-    sites: u32,
-    edge_cpu_weight: f64,
-    communication_weight: f64,
-    threshold_mode: GosThresholdMode,
-) -> Option<GosPolicy> {
-    if !epsilon_total.is_finite()
-        || !epsilon_sketch.is_finite()
-        || !(0.0..=1.0).contains(&epsilon_total)
-        || epsilon_sketch < 0.0
-        || !edge_cpu_weight.is_finite()
-        || edge_cpu_weight < 0.0
-        || !communication_weight.is_finite()
-        || communication_weight <= 0.0
-    {
-        return None;
-    }
-    let (_, epsilon_staleness) = crate::epsilon_alloc::split_budget(
-        epsilon_total,
-        epsilon_sketch,
-        edge_cpu_weight,
-        communication_weight,
-    );
-    (epsilon_staleness.is_finite() && epsilon_staleness > 0.0).then_some(GosPolicy {
-        epsilon_staleness,
-        sites: sites.max(1),
-        threshold_mode,
-    })
-}
-
-pub fn build_transmission_plan(
-    envelope: PlanEnvelope,
-    precompute: &PrecomputePlan,
-    runtime_policies: &BTreeMap<asap_types::PolicyFingerprint, RuntimeRulePolicy>,
-) -> Result<TransmissionPlan, TransmissionPlanError> {
-    if envelope != precompute.envelope {
-        return Err(TransmissionPlanError::EnvelopeMismatch);
-    }
-    let schemas: BTreeMap<_, _> = precompute
-        .schemas
-        .iter()
-        .map(|schema| (schema.materialization, schema))
-        .collect();
-    let rules = precompute
-        .producers
-        .iter()
-        .map(|producer| {
-            let schema = schemas
-                .get(&producer.materialization)
-                .expect("validated PrecomputePlan schema binding");
-            let materialization = precompute
-                .materializations
-                .iter()
-                .find(|m| m.policy_fingerprint() == producer.materialization.fingerprint())
-                .expect("validated PrecomputePlan materialization binding");
-            let runtime_policy = runtime_policies
-                .get(&producer.materialization.fingerprint())
-                .cloned()
-                .unwrap_or_default();
-            let mode = if runtime_policy.delta.is_some() {
-                TransmissionMode::Delta
-            } else {
-                TransmissionMode::Full
-            };
-            let emit_every_ms = materialization.window_size.saturating_mul(1_000);
-            TransmissionRule {
-                materialization: producer.materialization,
-                producer_id: producer.producer_id.clone(),
-                schema_id: producer.schema_id.clone(),
-                mode,
-                encoding: schema.encodings[0].clone(),
-                emit_every_ms,
-                full_checkpoint_every_ms: (mode == TransmissionMode::Delta)
-                    .then(|| emit_every_ms.saturating_mul(10)),
-                destination_ref: "asapquery-backend".into(),
-                runtime_policy,
-            }
-        })
-        .collect();
-    let plan = TransmissionPlan {
-        summary_catalog: precompute.summary_catalog.clone(),
-        envelope,
-        frame_identity: FrameIdentityContract {
-            identity_version: 1,
-            sequence_scope: SequenceScope::MaterializationSeriesProducerEpoch,
-            require_checkpoint_for_full: true,
-            require_base_checkpoint_for_delta: true,
-        },
-        rules,
-    };
-    plan.validate(precompute)?;
-    Ok(plan)
-}
-
-/// Complete physical projection of one post-ASAP planning decision.
-/// All three child plans share the same envelope and are compiled together.
-/// Complete selected physical plan, serializable for developer inspection.
-///
-/// The serialized form is an inspection artifact emitted by
-/// `compile_workload_artifact`; it is not an input accepted by the compiler.
-#[derive(Debug, Clone, Serialize)]
-pub struct CompiledPhysicalPlan {
-    pub envelope: PlanEnvelope,
-    pub summary_catalog: super::summary_catalog::SummaryCatalog,
-    pub collector_plans: Vec<CollectorPlan>,
-    pub precompute_plan: PrecomputePlan,
-    pub transmission_plan: TransmissionPlan,
-    pub query_plan: QueryPlan,
-    /// Backend storage-routing table for the metrics this plan materializes.
-    /// Published alongside the plan so the query-shape → engine split always
-    /// describes the generation that is actually installed; without it the
-    /// backend falls back to its default engine and archive-shape queries miss.
-    pub storage_routing: serde_json::Value,
-    /// Lifecycle component only, not a complete physical-plan comparison.
-    pub lifecycle_estimates: Vec<MaterializationLifecycleEstimate>,
-    pub cost_comparison: Option<super::workload_cost::CandidatePlanSelectionReport>,
-    pub planner_selection_trace: Vec<serde_json::Value>,
-}
-
-#[derive(Debug, Clone, Serialize, Deserialize, PartialEq)]
-pub struct MaterializationLifecycleEstimate {
-    pub materialization: asap_types::sds::StoredOutputId,
-    pub consumer_query_ids: Vec<String>,
-    #[serde(rename = "window_implementation_id")]
-    pub window_realization_id: String,
-    pub horizon_seconds: f64,
-    pub expected_reads: f64,
-    pub expected_updates: f64,
-    pub lifecycle_cost: f64,
-}
-
-#[derive(Debug, Error)]
-pub enum CompileError {
-    #[error("invalid backend-local workload snapshot: {0}")]
-    Snapshot(String),
-    #[error("no feasible completely costed alternative: {0}")]
-    Candidates(serde_json::Value),
-    #[error("planner revision mismatch: request={request}, compiler={compiler}")]
-    PlannerRevision {
-        request: String,
-        compiler: &'static str,
-    },
-    #[error("query {query_id}: {reason}")]
-    Query { query_id: String, reason: String },
-    #[error("query {query_id}: TopK evidence is stale or invalid: {reason}")]
-    InvalidEvidence { query_id: String, reason: String },
-    #[error("query {query_id}: lifecycle planning failed: {reason}")]
-    Lifecycle { query_id: String, reason: String },
-    #[error("failed to construct a physical materialization: {0}")]
-    Materialization(#[from] anyhow::Error),
-    #[error("failed to construct QueryPlan: {0}")]
-    QueryPlan(#[from] crate::query_plan::QueryPlanError),
-}
-
-struct QueryEvidence<'a>(Option<&'a TopKMembershipEvidence>);
-
-impl AccuracyEvidenceProvider for QueryEvidence<'_> {
-    fn propagation_stats(
-        &self,
-        op: &CompositionOperator,
-        _family: &SummaryFamilyType,
-        _query: Option<&SketchQuery>,
-    ) -> PropagationStats {
-        match (op, self.0) {
-            (CompositionOperator::TopKSelection, Some(e)) => PropagationStats {
-                topk_selected_lower_bound: Some(e.selected_lower_bound),
-                topk_excluded_upper_bound: Some(e.excluded_upper_bound),
-                topk_interval_failure_probability: Some(e.interval_failure_probability),
-                ..Default::default()
-            },
-            _ => PropagationStats::default(),
-        }
-    }
-}
-
-#[derive(Debug, Default)]
-pub struct DeploymentPlanCompiler;
-
-impl BackendLocalPlanningInput {
-    /// Invoke the pinned Planner from canonical startup workloads and compile
-    /// one backend-local CompiledPhysicalPlan. No CollectorPlan is produced and no
-    /// precompiled serving artifact is accepted at this boundary.
-    pub fn compile_promql(self) -> Result<CompiledPhysicalPlan, CompileError> {
-        self.compile_frontend(QueryFrontend::PromQl)
-    }
-
-    /// Use the shared parser subset with MetricsQL serving and exact routing.
-    pub fn compile_metricsql(self) -> Result<CompiledPhysicalPlan, CompileError> {
-        self.compile_frontend(QueryFrontend::MetricsQl)
-    }
-
-    fn compile_frontend(
-        self,
-        frontend: QueryFrontend,
-    ) -> Result<CompiledPhysicalPlan, CompileError> {
-        let evidence = self.workload_cost_evidence.clone().ok_or_else(|| {
-            CompileError::Snapshot(
-                "deployment requires complete workload cost evidence; export candidates and price them before compiling".into(),
-            )
-        })?;
-        let (request, environment) = self.into_physical_compilation_request()?;
-        let candidates =
-            super::workload_cost::enumerate_exact_and_materialized_candidates(request)?;
-        if frontend == QueryFrontend::MetricsQl {
-            super::workload_cost::select_lowest_cost_metricsql_candidate(
-                candidates,
-                environment,
-                &evidence,
-            )
-        } else {
-            super::workload_cost::select_lowest_cost_candidate(candidates, environment, &evidence)
-        }
-    }
-
-    /// Build Planner-authorized candidates for evidence collection without publishing.
-    pub fn into_physical_compilation_request(
-        self,
-    ) -> Result<(PhysicalCompilationRequest, PhysicalDeploymentContext), CompileError> {
-        if self.schema_version != WORKLOAD_SNAPSHOT_VERSION {
-            return Err(CompileError::Snapshot(format!(
-                "unsupported workload snapshot version {}; only version {} is supported",
-                self.schema_version, WORKLOAD_SNAPSHOT_VERSION
-            )));
-        }
-        if self.environment.target != PhysicalDeploymentTarget::BackendLocalRemoteWrite {
-            return Err(CompileError::Snapshot(
-                "compatibility workload requires backend_local_remote_write target".into(),
-            ));
-        }
-        let workload = self.query_workload;
-        let mut data_workload = self.data_workload.clone();
-        if data_workload.data_ingestion_interval.value.is_none()
-            && self.physical_inputs.scrape_interval_ms > 0
-        {
-            data_workload.data_ingestion_interval = Evidence {
-                value: Some(DurationMs(self.physical_inputs.scrape_interval_ms)),
-                source: EvidenceSource::Declared,
-                observed_at_ms: None,
-                valid_for_ms: None,
-            };
-        }
-        data_workload
-            .validate()
-            .map_err(|error| CompileError::Snapshot(error.to_string()))?;
-        workload
-            .validate()
-            .map_err(|error| CompileError::Snapshot(error.to_string()))?;
-        if workload.language != QueryLanguage::PromQL {
-            return Err(CompileError::Snapshot(
-                "ASAPQuery compatibility profile accepts PromQL workloads only".into(),
-            ));
-        }
-        let ingestion_rate = data_workload
-            .ingestion_rate
-            .value_at(self.environment.observed_at_unix_ms)
-            .copied()
-            .ok_or_else(|| {
-                CompileError::Snapshot("DataWorkload requires fresh ingestion_rate evidence".into())
-            })?;
-        let entries = workload.entries().collect::<Vec<_>>();
-        if entries.is_empty() {
-            return Err(CompileError::Snapshot(
-                "QueryWorkload must contain at least one query".into(),
-            ));
-        }
-        let canonical_queries = asap_frontend_promql::lower_promql_workload(
-            &planner_types::workload::PlanningWorkload {
-                query_workload: workload.clone(),
-                data_workload: Some(data_workload.clone()),
-            },
-            self.environment.observed_at_unix_ms,
-        )
-        .map_err(|error| CompileError::Snapshot(error.to_string()))?;
-        let mut queries = Vec::with_capacity(entries.len());
-        let mut canonical_roots = Vec::with_capacity(entries.len());
-        let mut topk_evidence_by_id = HashMap::new();
-        for (index, (entry, parsed)) in entries.into_iter().zip(canonical_queries).enumerate() {
-            let evaluation_interval_ms = match entry.recurrence {
-                QueryRecurrence::Repeated(RepeatedDemand::FixedIntervalAt {
-                    interval, ..
-                }) => interval.0,
-                _ => {
-                    return Err(CompileError::Snapshot(format!(
-                        "query {index} must use phase-bearing fixed-interval repeated demand in the MVP profile"
-                    )))
-                }
-            };
-            if self.physical_inputs.scrape_interval_ms == 0
-                || !self
-                    .physical_inputs
-                    .scrape_interval_ms
-                    .is_multiple_of(1_000)
-            {
-                return Err(CompileError::Snapshot(
-                    "scrape_interval_ms must be a positive whole number of seconds".into(),
-                ));
-            }
-            let accuracy = entry.requirements.accuracy.target();
-            let query_string = entry.query.0;
-            let lookback_ms =
-                query_history_window_ms(&parsed, self.physical_inputs.scrape_interval_ms)
-                    .map_err(|error| CompileError::Snapshot(format!("query {index}: {error}")))?;
-            let metadata = crate::query_parser::qe_to_parsed_query(&parsed);
-            let source_metrics = super::workload_cost::exact_source_metrics(&parsed)?;
-            let source_hint = source_metrics.iter().next().cloned().ok_or_else(|| {
-                CompileError::Snapshot(format!("query {index} has no named time-series source"))
-            })?;
-            let lifecycle = SummaryLifecyclePlanningInputs {
-                evaluation_interval_ms,
-                ingestion_rate_per_second: ingestion_rate.0,
-                evidence_observed_at_unix_ms: self.physical_inputs.evidence_observed_at_unix_ms,
-                evidence_valid_for_ms: self.physical_inputs.evidence_valid_for_ms,
-                horizon_seconds: self.physical_inputs.horizon_seconds,
-                costs: self.physical_inputs.lifecycle_costs.clone(),
-            };
-            let post_asap = crate::planner_selection::keep_pre_asap(&parsed)
-                .map_err(|error| CompileError::Snapshot(format!("query {index}: {error}")))?;
-            canonical_roots.push(Rc::new(parsed));
-            let query_id = format!("compat-query-{index}");
-            if let Some(evidence) = self.physical_inputs.topk_evidence.get(&query_string) {
-                topk_evidence_by_id.insert(query_id.clone(), evidence.clone());
-            }
-            queries.push(QueryCompilationInput {
-                query_id,
-                query_string: query_string.clone(),
-                selected_plan_root: post_asap,
-                legacy_query_source: Source::TimeSeries {
-                    metric: source_hint,
-                },
-                query_lookback_seconds: lookback_ms / 1_000,
-                group_by_labels: metadata.group_by_labels,
-                accuracy_target: accuracy,
-                summary_lifecycle_inputs: lifecycle,
-                window_realization_candidates: Vec::new(),
-                materialization_runtime_policy: RuntimeRulePolicy::default(),
-            });
-        }
-        let mut exact_costs_by_id = HashMap::new();
-        for (index, entry) in workload.entries().enumerate() {
-            if let Some(rows) = self
-                .physical_inputs
-                .exact_composition_costs
-                .get(&entry.query.0)
-            {
-                for row in rows {
-                    row.validate(
-                        self.environment.observed_at_unix_ms,
-                        self.environment.max_evidence_age_ms,
-                    )
-                    .map_err(|reason| {
-                        CompileError::Snapshot(format!(
-                            "query {index}: invalid exact-composition evidence: {reason}"
-                        ))
-                    })?;
-                }
-                exact_costs_by_id.insert(format!("compat-query-{index}"), rows.clone());
-            }
-        }
-        let planner_selection_trace = select_logical_roots_with_trace(
-            &mut queries,
-            canonical_roots.clone(),
-            &topk_evidence_by_id,
-            &exact_costs_by_id,
-            self.physical_inputs.erp.as_ref(),
-        )?;
-        for query in &mut queries {
-            prepare_window_implementations(
-                query,
-                &self.physical_inputs.window_cost_model,
-                self.environment.target,
-                self.physical_inputs.query_retention_margin_ms,
-            )?;
-        }
-        // Composable lowering defers unsafe leaves to query time individually; retain Planner siblings.
-        Ok((
-            PhysicalCompilationRequest {
-                planner_selection_trace,
-                allow_mixed_summary_and_exact_execution: true,
-                enabled_materialization_keys: None,
-                query_workload: Some(workload),
-                data_workload: Some(data_workload),
-                canonical_roots,
-                queries,
-                topk_membership_evidence_by_query_id: topk_evidence_by_id,
-                exact_composition_costs: exact_costs_by_id,
-                erp: self.physical_inputs.erp,
-                planner_revision: PLANNER_REVISION.into(),
-                scrape_interval_ms: Some(self.physical_inputs.scrape_interval_ms),
-                query_retention_margin_ms: self.physical_inputs.query_retention_margin_ms,
-                retained_summary_memory_budget_bytes: Some(
-                    self.physical_inputs.retained_summary_memory_budget_bytes,
-                ),
-            },
-            self.environment,
-        ))
-    }
-}
-
-/// Admit per-entity raw state only when the installed partition contract and
-/// scalar input evaluator preserve source rows. Composite updates still require
-/// an executable maintenance evaluator; a partition flag cannot authorize them.
-fn has_unsafe_raw_entity_leaf(
-    node: &Rc<SummaryNode>,
-    selected: &[Rc<SummaryNode>],
-    pooling: bool,
-) -> bool {
-    use planner_types::post_asap::ExactKind;
-    use planner_types::pre_asap::Reduction;
-    match &node.expr {
-        SummaryExpr::SummaryAgg {
-            child,
-            reduction,
-            family,
-            ..
-        } => {
-            if selected.iter().any(|selected| Rc::ptr_eq(selected, node)) {
-                let preserves_series_state = matches!(
-                    family,
-                    SummaryFamilyType::ExactAggregate(
-                        ExactKind::Increase | ExactKind::Rate | ExactKind::Min | ExactKind::Max,
-                        _
-                    )
-                );
-                let scalar_series_input = matches!(&node.expr,
-                    SummaryExpr::SummaryAgg { input, family, .. }
-                    if !matches!(family, SummaryFamilyType::Sketch(kind, _) if matches!(kind.algorithm(), SketchAlgorithm::UnivMon))
-                        && asap_types::accumulator_spec::is_scalar_sample_value(input));
-                let frequency_series_input = matches!(&node.expr,
-                    SummaryExpr::SummaryAgg { input, family: SummaryFamilyType::Sketch(kind, _), .. }
-                    if matches!(kind.algorithm(), SketchAlgorithm::Hll | SketchAlgorithm::UnivMon)
-                        && asap_types::accumulator_spec::is_unit_sample_frequency(input));
-                return matches!(reduction, Reduction::PerEntity)
-                    && !pooling
-                    && !(preserves_series_state || scalar_series_input || frequency_series_input);
-            }
-            let additive_reduction = matches!(reduction, Reduction::Reduce(_))
-                && matches!(family, SummaryFamilyType::ExactAggregate(ExactKind::Sum, _))
-                && matches!(
-                    &child.expr,
-                    SummaryExpr::SummaryAgg {
-                        family: SummaryFamilyType::ExactAggregate(
-                            ExactKind::Sum | ExactKind::Count,
-                            _
-                        ),
-                        ..
-                    }
-                );
-            has_unsafe_raw_entity_leaf(child, selected, additive_reduction)
-        }
-        SummaryExpr::BinaryOp { lhs, rhs, .. } => {
-            has_unsafe_raw_entity_leaf(lhs, selected, false)
-                || has_unsafe_raw_entity_leaf(rhs, selected, false)
-        }
-        SummaryExpr::SummaryEstimate { summary_input, .. } => {
-            has_unsafe_raw_entity_leaf(summary_input, selected, false)
-        }
-        SummaryExpr::SummaryMerge { children, .. } => children
-            .iter()
-            .any(|child| has_unsafe_raw_entity_leaf(child, selected, false)),
-        _ => false,
-    }
-}
-
-fn original_root(
-    query: &QueryCompilationInput,
-    index: usize,
-    roots: &[Rc<QueryExpr>],
-) -> Result<QueryExpr, CompileError> {
-    if let Some(root) = roots.get(index) {
-        return Ok(root.as_ref().clone());
-    }
-    crate::query_parser::parse_query_expr_canonical(
-        &query.query_string,
-        query.accuracy_target.clone(),
-    )
-    .map_err(|error| CompileError::Query {
-        query_id: query.query_id.clone(),
-        reason: error.to_string(),
-    })
-}
-
-/// Preserve native execution for raw states that cannot preserve source semantics.
-fn preserve_native_unsafe_raw_roots(
-    queries: &mut [QueryCompilationInput],
-    canonical_roots: &[Rc<QueryExpr>],
-) -> Result<(), CompileError> {
-    for (index, query) in queries.iter_mut().enumerate() {
-        let selected = collect_selected_materializations(&query.selected_plan_root, false)
-            .map_err(|reason| CompileError::Query {
-                query_id: query.query_id.clone(),
-                reason,
-            })?;
-        if selected.is_empty() {
-            continue;
-        }
-        let selected_nodes = selected
-            .iter()
-            .map(|state| Rc::clone(&state.node))
-            .collect::<Vec<_>>();
-        let unsafe_entities =
-            has_unsafe_raw_entity_leaf(&query.selected_plan_root, &selected_nodes, false);
-        if unsafe_entities {
-            let parsed = original_root(query, index, canonical_roots)?;
-            query.selected_plan_root =
-                crate::planner_selection::keep_pre_asap(&parsed).map_err(|error| {
-                    CompileError::Query {
-                        query_id: query.query_id.clone(),
-                        reason: error.to_string(),
-                    }
-                })?;
-        }
-    }
-    Ok(())
-}
-
-/// Canonicalize Planner candidates that have no backend-maintained state at
-/// the physical compiler boundary. Their selected post-ASAP shape may be
-/// intentionally unsupported (and therefore invalid as an executable
-/// maintenance DAG), but the original query remains a valid exact plan.
-fn preserve_invalid_exact_fallback_roots(
-    queries: &mut [QueryCompilationInput],
-    canonical_roots: &[Rc<QueryExpr>],
-    composable: bool,
-) -> Result<(), CompileError> {
-    for (index, query) in queries.iter_mut().enumerate() {
-        let selected = collect_selected_materializations(&query.selected_plan_root, composable)
-            .map_err(|reason| CompileError::Query {
-                query_id: query.query_id.clone(),
-                reason,
-            })?;
-        let invalid_executable =
-            selected.is_empty() && validate_executable_subdag(&query.selected_plan_root).is_err();
-        if invalid_executable
-            && !matches!(query.selected_plan_root.expr, SummaryExpr::KeepPreAsap(_))
-        {
-            let parsed = original_root(query, index, canonical_roots)?;
-            query.selected_plan_root =
-                crate::planner_selection::keep_pre_asap(&parsed).map_err(|error| {
-                    CompileError::Query {
-                        query_id: query.query_id.clone(),
-                        reason: error.to_string(),
-                    }
-                })?;
-        }
-    }
-    Ok(())
-}
-
-/// A MetricsQL query whose only selected states are Prometheus-specific
-/// counter readouts has no backend materialization to bind. Keep the original
-/// query as one native exact root. Mixed queries retain their other selected
-/// summaries and let query-time lowering cut only the counter branches.
-fn preserve_metricsql_counter_only_roots(
-    queries: &mut [QueryCompilationInput],
-    canonical_roots: &[Rc<QueryExpr>],
-    composable: bool,
-) -> Result<(), CompileError> {
-    for (index, query) in queries.iter_mut().enumerate() {
-        let selected = collect_selected_materializations(&query.selected_plan_root, composable)
-            .map_err(|reason| CompileError::Query {
-                query_id: query.query_id.clone(),
-                reason,
-            })?;
-        if selected.is_empty()
-            || !selected.iter().all(|state| {
-                matches!(
-                    state.family,
-                    SummaryFamilyType::ExactAggregate(
-                        planner_types::post_asap::ExactKind::Rate
-                            | planner_types::post_asap::ExactKind::Increase,
-                        _
-                    )
-                )
-            })
-        {
-            continue;
-        }
-        let parsed = original_root(query, index, canonical_roots)?;
-        query.selected_plan_root =
-            crate::planner_selection::keep_pre_asap(&parsed).map_err(|error| {
-                CompileError::Query {
-                    query_id: query.query_id.clone(),
-                    reason: error.to_string(),
-                }
-            })?;
-    }
-    Ok(())
-}
-
-impl DeploymentPlanCompiler {
-    pub fn compile_promql(
-        &self,
-        request: PhysicalCompilationRequest,
-        environment: PhysicalDeploymentContext,
-    ) -> Result<CompiledPhysicalPlan, CompileError> {
-        self.compile_for_frontend(request, environment, QueryFrontend::PromQl)
-    }
-
-    pub fn compile_metricsql(
-        &self,
-        request: PhysicalCompilationRequest,
-        environment: PhysicalDeploymentContext,
-    ) -> Result<CompiledPhysicalPlan, CompileError> {
-        self.compile_for_frontend(request, environment, QueryFrontend::MetricsQl)
-    }
-
-    pub fn compile_for_frontend(
-        &self,
-        mut request: PhysicalCompilationRequest,
-        environment: PhysicalDeploymentContext,
-        frontend: QueryFrontend,
-    ) -> Result<CompiledPhysicalPlan, CompileError> {
-        environment
-            .dataset_identity
-            .validate()
-            .map_err(CompileError::Snapshot)?;
-        if let Some(data) = &request.data_workload {
-            data.validate()
-                .map_err(|error| CompileError::Snapshot(error.to_string()))?;
-        }
-        if super::maintained_population::supported(&request)
-            && (frontend != QueryFrontend::PromQl
-                || environment.target != PhysicalDeploymentTarget::BackendLocalRemoteWrite)
-        {
-            return Err(CompileError::Snapshot(
-                "current-series maintenance requires backend-local PromQL deployment".into(),
-            ));
-        }
-        if request.allow_mixed_summary_and_exact_execution
-            && environment.target != PhysicalDeploymentTarget::BackendLocalRemoteWrite
-        {
-            return Err(CompileError::Snapshot(
-                "hybrid execution requires backend-local deployment".into(),
-            ));
-        }
-        if request.planner_revision != PLANNER_REVISION {
-            return Err(CompileError::PlannerRevision {
-                request: request.planner_revision,
-                compiler: PLANNER_REVISION,
-            });
-        }
-        if environment.target == PhysicalDeploymentTarget::BackendLocalRemoteWrite
-            && !environment.target_collector_ids.is_empty()
-        {
-            return Err(CompileError::Query {
-                query_id: "deployment-target".into(),
-                reason: "backend-local target cannot declare Collector producers".into(),
-            });
-        }
-        let query_ids = request
-            .queries
-            .iter()
-            .map(|query| query.query_id.as_str())
-            .collect::<BTreeSet<_>>();
-        if query_ids.len() != request.queries.len() {
-            return Err(CompileError::Snapshot(
-                "planning query IDs must be unique within a plan generation".into(),
-            ));
-        }
-
-        if let Some(workload) = &request.query_workload {
-            let entries = workload.entries().collect::<Vec<_>>();
-            if entries.len() != request.queries.len()
-                || entries
-                    .iter()
-                    .zip(&request.queries)
-                    .any(|(entry, query)| entry.query.0 != query.query_string)
-            {
-                return Err(CompileError::Snapshot("original workload and planning queries must have identical order and query text".into()));
-            }
-        }
-
-        if frontend == QueryFrontend::MetricsQl {
-            preserve_metricsql_counter_only_roots(
-                &mut request.queries,
-                &request.canonical_roots,
-                request.allow_mixed_summary_and_exact_execution,
-            )?;
-        }
-        preserve_invalid_exact_fallback_roots(
-            &mut request.queries,
-            &request.canonical_roots,
-            request.allow_mixed_summary_and_exact_execution,
-        )?;
-
-        if environment.target == PhysicalDeploymentTarget::BackendLocalRemoteWrite
-            && !request.allow_mixed_summary_and_exact_execution
-        {
-            preserve_native_unsafe_raw_roots(&mut request.queries, &request.canonical_roots)?;
-        }
-
-        let roots = request
-            .queries
-            .iter()
-            .enumerate()
-            .map(|(id, query)| (id, Rc::clone(&query.selected_plan_root)))
-            .collect();
-        for (id, root) in planner_types::post_asap::share_common_summary_subtrees(roots) {
-            request.queries[id].selected_plan_root = root;
-        }
-        let mut compiled_materializations = Vec::with_capacity(request.queries.len());
-        let mut collector_materializations = Vec::with_capacity(request.queries.len());
-        let mut plan_materializations = Vec::with_capacity(request.queries.len());
-        let mut shared_materializations = BTreeMap::new();
-        let mut runtime_policies = BTreeMap::new();
-        // Binding is established while compiling the physical
-        // materializations, then consumed by QueryPlan lowering. The key is
-        // the planner DAG node identity across the workload; serving never scans
-        // downstream components to rediscover this decision.
-        let mut executable_dags = vec![None::<ExecutableDagCompilation>; request.queries.len()];
-        let mut node_bindings =
-            BTreeMap::<(usize, PostAsapNodeId), asap_types::PolicyFingerprint>::new();
-        let mut query_node_bindings =
-            BTreeMap::<(usize, PostAsapNodeId), crate::query_plan::QueryNodeId>::new();
-        let consumers = materialization_consumers(
-            &request.queries,
-            environment.target,
-            request.allow_mixed_summary_and_exact_execution,
-        )?;
-        let mut lifecycle_estimates =
-            BTreeMap::<asap_types::PolicyFingerprint, MaterializationLifecycleEstimate>::new();
-        // Per-metric sketch families this cycle materializes. The storage-routing
-        // classifier turns them into the warm/archive shape split, so routing is
-        // derived from the same decisions that produced the materializations
-        // rather than from a separately maintained table.
-        let mut routed_algorithms =
-            BTreeMap::<String, Vec<planner_types::post_asap::SketchAlgorithm>>::new();
-
-        for (query_index, query) in request.queries.iter().enumerate() {
-            let evidence = request
-                .topk_membership_evidence_by_query_id
-                .get(&query.query_id);
-            if let Some(e) = evidence {
-                validate_evidence(&query.query_id, e, &environment)?;
-            }
-            let node = query.selected_plan_root.clone();
-            reject_uncertified_readouts(&query.query_id, &node)?;
-            let selected = collect_selected_materializations(
-                &node,
-                request.allow_mixed_summary_and_exact_execution,
-            )
-            .map_err(|reason| CompileError::Query {
-                query_id: query.query_id.clone(),
-                reason,
-            })?;
-            let selected = selected
-                .into_iter()
-                .filter(|state| {
-                    // Counter readout implements Prometheus extrapolation. Native
-                    // MetricsQL includes boundary samples differently, so retain
-                    // these leaves as external exact dependencies until its
-                    // counter semantics have a dedicated implementation.
-                    !(frontend == QueryFrontend::MetricsQl && matches!(state.family,
-                        SummaryFamilyType::ExactAggregate(
-                            planner_types::post_asap::ExactKind::Rate
-                                | planner_types::post_asap::ExactKind::Increase, _)))
-                    && (!request.allow_mixed_summary_and_exact_execution
-                        || state.window_secs.is_none_or(|window| {
-                            query
-                                .window_realization_candidates
-                                .iter()
-                                .any(|candidate| candidate.window_secs == window)
-                        }))
-                        && (!matches!(
-                            state.family,
-                            SummaryFamilyType::ExactAggregate(
-                                planner_types::post_asap::ExactKind::Max,
-                                _
-                            )
-                        ) || crate::query_plan::query_time::selected_range_max_materialization(
-                            &query.query_string,
-                            &state.node,
-                        )
-                        .ok()
-                        .flatten()
-                        .is_some())
-                        && request.enabled_materialization_keys.as_ref().is_none_or(|policy| {
-                            let key = crate::query_plan::query_time::selected_counter_materialization(
-                                &query.query_string,
-                                &state.node,
-                            )
-                            .ok()
-                            .flatten()
-                            .or_else(|| {
-                                crate::query_plan::query_time::selected_range_max_materialization(
-                                    &query.query_string,
-                                    &state.node,
-                                )
-                                .ok()
-                                .flatten()
-                            });
-                            // Masks enumerate counter/max choices only. Other selected
-                            // summaries remain required by this physical alternative.
-                            key.is_none_or(|key| policy.contains(&key))
-                        })
-                })
-                .collect::<Vec<_>>();
-            // An exact native fallback has no maintained state and must not
-            // depend on evidence for unused window/state implementations.
-            if selected.is_empty()
-                && super::maintained_population::operator(&request, query)?.is_none()
-            {
-                continue;
-            }
-            let executable = planner_types::post_asap::compile_executable_dag_with_node_ids(
-                &query.selected_plan_root,
-            )
-            .map_err(|error| CompileError::Query {
-                query_id: query.query_id.clone(),
-                reason: format!("invalid executable subDAG: {error}"),
-            })?;
-            executable_dags[query_index] = Some(executable);
-            if selected.is_empty() {
-                continue;
-            }
-            validate_lifecycle_input(&query.query_id, &query.summary_lifecycle_inputs)?;
-            if environment.target == PhysicalDeploymentTarget::DistributedCollectors
-                && selected.iter().any(|state| {
-                    matches!(
-                        state.family,
-                        SummaryFamilyType::ExactAggregate(
-                            planner_types::post_asap::ExactKind::Count,
-                            _
-                        )
-                    )
-                })
-            {
-                return Err(CompileError::Query {
-                    query_id: query.query_id.clone(),
-                    reason: "observation-count readout requires the backend precompute producer"
-                        .into(),
-                });
-            }
-            match &query.legacy_query_source {
-                Source::TimeSeries { .. } => {}
-                Source::Table { .. } => {
-                    return Err(CompileError::Query {
-                        query_id: query.query_id.clone(),
-                        reason: "MVP physical compiler supports time-series sources only".into(),
-                    })
-                }
-            }
-            // Choose the population protocol before any source fingerprint or
-            // derived frontier binding is created. Only the actual selected
-            // global maintenance program and its raw inputs opt into it.
-            let mut canonical_nodes = std::collections::HashSet::new();
-            if environment.target == PhysicalDeploymentTarget::BackendLocalRemoteWrite {
-                for state in &selected {
-                    if matches!(&state.node.expr, SummaryExpr::SummaryAgg {
-                        reduction: planner_types::pre_asap::Reduction::Reduce(keys), ..
-                    } if keys.is_empty())
-                    {
-                        if let Some(sources) = immutable_materialization_sources(&state.node) {
-                            canonical_nodes.insert(Rc::as_ptr(&state.node) as usize);
-                            canonical_nodes
-                                .extend(sources.iter().map(|source| Rc::as_ptr(source) as usize));
-                        }
-                    }
-                }
-            }
-            let cohort_nodes = windows::cohort_nodes(&selected);
-            for (ordinal, selected) in selected.into_iter().enumerate() {
-                let mut branch_query = query.clone();
-                branch_query.query_lookback_seconds =
-                    selected.window_secs.unwrap_or(query.query_lookback_seconds);
-                branch_query.group_by_labels = selected
-                    .group_by
-                    .clone()
-                    .unwrap_or_else(|| query.group_by_labels.clone());
-                branch_query
-                    .window_realization_candidates
-                    .retain(|candidate| {
-                        candidate.window_secs == branch_query.query_lookback_seconds
-                            && if cohort_nodes.contains(&(Rc::as_ptr(&selected.node) as usize)) {
-                                windows::is_full_cohort(candidate)
-                            } else {
-                                !candidate.cohort_only
-                            }
-                    });
-                let query = &branch_query;
-                let lifecycle_costs = SummaryMaintenanceLifecycleCostInputs {
-                    build_cost: Some(Cost(query.summary_lifecycle_inputs.costs.build)),
-                    maintenance_cost_per_update: Some(Cost(
-                        query.summary_lifecycle_inputs.costs.maintenance_per_update,
-                    )),
-                    summary_read_cost: Some(Cost(query.summary_lifecycle_inputs.costs.read)),
-                    retention_cost_rate: Some(CostRate(
-                        query.summary_lifecycle_inputs.costs.retention_per_second,
-                    )),
-                    retirement_cost: Some(Cost(query.summary_lifecycle_inputs.costs.retirement)),
-                };
-                let window_costs = super::realization::RealizationProvider::windows(
-                    &super::realization::ExistingRealizations,
-                    query,
-                    &environment,
-                )?;
-                let model = ControlPlaneCostModel::new(query.accuracy_target.clone())
-                    .with_summary_maintenance(
-                        lifecycle_costs,
-                        SummaryMaintenanceCapabilities {
-                            incremental_update: true,
-                            merge: true,
-                            delete: environment.target
-                                == PhysicalDeploymentTarget::BackendLocalRemoteWrite,
-                        },
-                    )
-                    .with_window_implementation_costs(window_costs);
-                let metric = selected.metric.clone();
-                let aggregation_id = format!("{}:{ordinal}:{}", query.query_id, metric);
-                let physical_family = selected.family.clone();
-                let physical_algorithm = match &physical_family {
-                    SummaryFamilyType::ExactAggregate(kind, _) => {
-                        format!("{kind:?}").to_ascii_lowercase()
-                    }
-                    _ => selected.algorithm.clone(),
-                };
-                let mut aggregation = physical_aggregation(
-                    query,
-                    &selected,
-                    aggregation_id.clone(),
-                    environment.target,
-                );
-                if let SummaryFamilyType::Sketch(kind, _) = &aggregation.family {
-                    routed_algorithms
-                        .entry(aggregation.metric_name.clone())
-                        .or_default()
-                        .push(kind.algorithm().clone());
-                }
-                let precompute_materialization =
-                    scoped_materialization(&aggregation, &selected.node)?;
-                let materialization = precompute_materialization.policy_fingerprint();
-                let consumer_indices = consumers[&materialization]
-                    .iter()
-                    .copied()
-                    .filter(|&index| {
-                        let Some(workload) = &request.query_workload else {
-                            return true;
-                        };
-                        let other = &request.queries[index];
-                        if other.summary_lifecycle_inputs.evaluation_interval_ms
-                            != query.summary_lifecycle_inputs.evaluation_interval_ms
-                        {
-                            return false;
-                        }
-                        let phases = workload
-                            .entries()
-                            .map(|entry| match entry.recurrence {
-                                QueryRecurrence::Repeated(RepeatedDemand::FixedIntervalAt {
-                                    evaluation_phase,
-                                    ..
-                                }) => Some(evaluation_phase.0),
-                                _ => None,
-                            })
-                            .collect::<Vec<_>>();
-                        match (phases[query_index], phases[index]) {
-                            (Some(a), Some(b)) => {
-                                let cadence = u64::from(
-                                    query.summary_lifecycle_inputs.evaluation_interval_ms,
-                                );
-                                let window = query.query_lookback_seconds.saturating_mul(1_000);
-                                a % cadence == b % cadence && a % window == b % window
-                            }
-                            _ => index == query_index,
-                        }
-                    })
-                    .collect::<Vec<_>>();
-                let state_consumers = consumer_indices
-                    .iter()
-                    .map(|index| &request.queries[*index])
-                    .collect::<Vec<_>>();
-                let planner_selection = select_lifecycle(
-                    query,
-                    &selected.node,
-                    &model,
-                    &environment,
-                    &state_consumers,
-                    request.query_workload.as_ref().map(|workload| {
-                        (
-                            workload,
-                            request.data_workload.as_ref(),
-                            consumer_indices.clone(),
-                        )
-                    }),
-                )?;
-                let window_implementation = query.window_realization_candidates.iter()
-                    .find(|candidate| candidate.realization_id == planner_selection.window_realization_id
-                        && candidate.framework == planner_selection.window_framework)
-                    .ok_or_else(|| CompileError::Lifecycle {
-                        query_id: query.query_id.clone(),
-                        reason: "Planner selected a window framework without a retained concrete implementation".into(),
-                    })?;
-                // The logical consumer group is identified above. The installed state
-                // identity includes the actual pane width selected by Planner.
-                // Preserve semantic window and evaluation cadence independently
-                // from the selected storage representation.
-                aggregation.window_secs = window_implementation.window_secs;
-                let mut runtime_materialization =
-                    scoped_materialization(&aggregation, &selected.node)?;
-                if canonical_nodes.contains(&(Rc::as_ptr(&selected.node) as usize)) {
-                    runtime_materialization.population_key_encoding =
-                        asap_types::PopulationKeyEncoding::CanonicalLabelsV1;
-                }
-                runtime_materialization.window_size = window_implementation.window_secs;
-                runtime_materialization.slide_interval = window_implementation.slide_secs;
-                runtime_materialization.window_type =
-                    if window_implementation.slide_secs == window_implementation.window_secs {
-                        asap_types::WindowKind::Tumbling
-                    } else {
-                        asap_types::WindowKind::Sliding
-                    };
-                runtime_materialization.window_layout = window_implementation.layout.clone();
-                let pane_width_ms = match &window_implementation.layout {
-                    asap_types::WindowMaterializationLayout::FullWindow => {
-                        window_implementation.slide_secs
-                    }
-                    layout => layout.base_pane_secs(),
-                }
-                .saturating_mul(1_000);
-                runtime_materialization.pane_origin_ms = shared_pane_origin_ms(
-                    request.query_workload.as_ref(),
-                    [query_index],
-                    pane_width_ms,
-                )
-                .map_err(|reason| CompileError::Query {
-                    query_id: query.query_id.clone(),
-                    reason,
-                })?;
-                if matches!(
-                    window_implementation.layout,
-                    asap_types::WindowMaterializationLayout::FullWindow
-                ) {
-                    runtime_materialization.pane_origin_ms =
-                        runtime_materialization.pane_origin_ms.map(|end_phase| {
-                            (i128::from(end_phase)
-                                - i128::from(window_implementation.window_secs) * 1_000)
-                                .rem_euclid(i128::from(pane_width_ms))
-                                as i64
-                        });
-                }
-                if let Some(source) = immutable_materialization_sources(&selected.node) {
-                    if environment.target != PhysicalDeploymentTarget::BackendLocalRemoteWrite {
-                        return Err(CompileError::Query {
-                            query_id: query.query_id.clone(),
-                            reason: "immutable derived state requires backend-local execution"
-                                .into(),
-                        });
-                    }
-                    let compiled = executable_dags[query_index].as_ref().expect("compiled DAG");
-                    let mut frontiers = BTreeMap::new();
-                    let mut source_configs = Vec::new();
-                    for source in source {
-                        let source_node = compiled.node_ids.node_id(&source).ok_or_else(|| {
-                            CompileError::Query {
-                                query_id: query.query_id.clone(),
-                                reason: "derived source absent from selected DAG".into(),
-                            }
-                        })?;
-                        let source_id = node_bindings
-                            .get(&(query_index, source_node))
-                            .copied()
-                            .ok_or_else(|| CompileError::Query {
-                                query_id: query.query_id.clone(),
-                                reason: "derived source was not installed before consumer".into(),
-                            })?;
-                        frontiers.insert(source_node, source_id.into());
-                        let config = compiled_materializations
-                            .iter()
-                            .find(|config: &&asap_types::PrecomputeMaterialization| {
-                                config.policy_fingerprint() == source_id
-                            })
-                            .ok_or_else(|| CompileError::Query {
-                                query_id: query.query_id.clone(),
-                                reason: "derived source config missing".into(),
-                            })?;
-                        if !source_configs.iter().any(
-                            |existing: &&asap_types::PrecomputeMaterialization| {
-                                existing.policy_fingerprint() == source_id
-                            },
-                        ) {
-                            source_configs.push(config);
-                        }
-                    }
-                    asap_types::precompute_plan::validated_source_window_cohort(
-                        &runtime_materialization,
-                        &source_configs,
-                    )
-                    .map_err(|error| CompileError::Query {
-                        query_id: query.query_id.clone(),
-                        reason: error.to_string(),
-                    })?;
-                    if runtime_materialization.window_size != runtime_materialization.slide_interval
-                    {
-                        return Err(CompileError::Query { query_id: query.query_id.clone(),
-                            reason: "immutable scalar composition runtime requires nonoverlapping windows".into() });
-                    }
-                    let SummaryExpr::SummaryAgg { child, .. } = &selected.node.expr else {
-                        unreachable!()
-                    };
-                    let input_node = compiled
-                        .node_ids
-                        .node_id(child)
-                        .expect("selected input node");
-                    let document = asap_types::executable_plan::OwnedPostAsapDag::from_executable(
-                        query.query_id.clone(),
-                        &compiled.dag,
-                    )
-                    .map_err(|reason| CompileError::Query {
-                        query_id: query.query_id.clone(),
-                        reason,
-                    })?;
-                    runtime_materialization.derived_input = Some(
-                        asap_types::derived_input::DerivedInputIdentity::from_dag(
-                            &document, input_node, &frontiers,
-                        )
-                        .map_err(|reason| CompileError::Query {
-                            query_id: query.query_id.clone(),
-                            reason,
-                        })?,
-                    );
-                }
-                let compiled_dag = executable_dags[query_index].as_ref().expect("selected DAG");
-                let semantic_root =
-                    compiled_dag
-                        .node_ids
-                        .node_id(&selected.node)
-                        .ok_or_else(|| CompileError::Query {
-                            query_id: query.query_id.clone(),
-                            reason: "persisted semantic root is absent".into(),
-                        })?;
-                runtime_materialization.semantic_fragment = Some(
-                    asap_types::semantic_fragment::SemanticFragment::from_stored_output_in_dataset(
-                        &compiled_dag.dag,
-                        semantic_root,
-                        environment.dataset_identity.clone(),
-                    )
-                    .map_err(|reason| CompileError::Query {
-                        query_id: query.query_id.clone(),
-                        reason,
-                    })?,
-                );
-                let materialization = runtime_materialization.policy_fingerprint();
-                let consumer_query_ids = state_consumers
-                    .iter()
-                    .map(|query| query.query_id.clone())
-                    .collect::<Vec<_>>();
-                // Lifecycle demand was priced before choosing pane width. Two
-                // distinct logical cohorts can now collide on one physical
-                // fingerprint; retaining either quote would omit consumers.
-                if lifecycle_estimates
-                    .get(&materialization)
-                    .is_some_and(|existing| existing.consumer_query_ids != consumer_query_ids)
-                {
-                    return Err(CompileError::Lifecycle {
-                        query_id: query.query_id.clone(),
-                        reason: "selected pane coalesces distinct logical consumer cohorts; joint physical-pane lifecycle evidence is required".into(),
-                    });
-                }
-                lifecycle_estimates
-                    .entry(materialization)
-                    .or_insert_with(|| MaterializationLifecycleEstimate {
-                        materialization: materialization.into(),
-                        consumer_query_ids,
-                        window_realization_id: window_implementation.realization_id.clone(),
-                        horizon_seconds: query.summary_lifecycle_inputs.horizon_seconds,
-                        expected_reads: planner_selection.expected_reads,
-                        expected_updates: planner_selection.expected_updates,
-                        lifecycle_cost: planner_selection.lifecycle_cost,
-                    });
-                let node_id = executable_dags[query_index]
-                    .as_ref()
-                    .expect("selected query has a compiled executable DAG")
-                    .node_ids
-                    .node_id(&selected.node)
-                    .ok_or_else(|| CompileError::Query {
-                        query_id: query.query_id.clone(),
-                        reason: "selected materialization is absent from the compiled Planner DAG"
-                            .into(),
-                    })?;
-                let binding_key = (query_index, node_id);
-                if let Some(existing) = node_bindings.insert(binding_key, materialization) {
-                    if existing != materialization {
-                        return Err(CompileError::Query {
-                            query_id: query.query_id.clone(),
-                            reason: "one post-ASAP node resolved to conflicting materializations"
-                                .into(),
-                        });
-                    }
-                }
-                if let Some(existing) = runtime_policies.insert(
-                    materialization,
-                    query.materialization_runtime_policy.clone(),
-                ) {
-                    if existing != query.materialization_runtime_policy {
-                        return Err(CompileError::Query {
-                            query_id: query.query_id.clone(),
-                            reason: "queries sharing one materialization specify different runtime policies"
-                                .into(),
-                        });
-                    }
-                }
-                let physical_group_by = aggregation.grouping.clone();
-                compiled_materializations.push(runtime_materialization.clone());
-                let collector_materialization = CollectorMaterialization {
-                    query_id: format!("state-{}", materialization.0),
-                    materialization: materialization.into(),
-                    metric: metric.clone(),
-                    algorithm: physical_algorithm,
-                    parameters: selected.parameters,
-                    group_by: physical_group_by,
-                    window_secs: runtime_materialization.window_size,
-                    abstract_window_framework: planner_selection.window_framework.clone(),
-                    window_realization_id: window_implementation.realization_id.clone(),
-                    slide_secs: runtime_materialization.slide_interval,
-                    pane_origin_ms: runtime_materialization.pane_origin_ms,
-                    window_layout: window_implementation.layout.clone(),
-                    evidence_source: evidence.map(|e| e.source.clone()),
-                    lifecycle: planner_selection.lifecycle.clone(),
-                };
-                // The store fingerprint identifies state, not its concrete
-                // deployment. Consumers may share it only when their selected
-                // implementations agree; otherwise publication would install
-                // conflicting producers for the same state identity.
-                let mut shared_contract = collector_materialization.clone();
-                // Keep every consumer in the existing plan identity even
-                // though the executable producer declaration is deduplicated.
-                plan_materializations.push(collector_materialization.clone());
-                shared_contract.query_id.clear();
-                if let Some(existing) = shared_materializations.get(&materialization) {
-                    if existing != &shared_contract {
-                        return Err(CompileError::Query {
-                            query_id: query.query_id.clone(),
-                            reason: format!(
-                                "queries sharing one materialization specify conflicting deployment contracts: existing={existing:?}, requested={shared_contract:?}"
-                            ),
-                        });
-                    }
-                } else {
-                    shared_materializations.insert(materialization, shared_contract);
-                    if runtime_materialization.derived_input.is_none() {
-                        collector_materializations.push(collector_materialization);
-                    }
-                }
-            }
-        }
-
-        if environment.target == PhysicalDeploymentTarget::BackendLocalRemoteWrite {
-            super::pane_reuse::share_additive_panes(
-                &request,
-                &mut compiled_materializations,
-                &mut collector_materializations,
-                &mut plan_materializations,
-                &mut node_bindings,
-                &mut runtime_policies,
-                &mut lifecycle_estimates,
-            );
-        }
-
-        let plan_id = if request.allow_mixed_summary_and_exact_execution
-            || super::maintained_population::supported(&request)
-        {
-            use std::hash::{Hash, Hasher};
-            let mut hash = std::collections::hash_map::DefaultHasher::new();
-            stable_workload_plan_id(&plan_materializations, &request.queries).hash(&mut hash);
-            "typed-local-residual-v3-counter-index".hash(&mut hash);
-            super::maintained_population::supported(&request).hash(&mut hash);
-            request.enabled_materialization_keys.hash(&mut hash);
-            for query in &request.queries {
-                format!("{:?}", query.selected_plan_root).hash(&mut hash);
-            }
-            hash.finish()
-        } else {
-            stable_workload_plan_id(&plan_materializations, &request.queries)
-        };
-        let envelope = PlanEnvelope {
-            plan_id,
-            plan_version: environment.plan_version,
-            generated_at_unix_ms: environment.observed_at_unix_ms,
-            activation_unix_ms: environment.activation_unix_ms,
-            expiry_unix_ms: environment.expiry_unix_ms,
-            backend_compat: environment.backend_compat.clone(),
-            planner_revision: PLANNER_REVISION.into(),
-            capability_snapshot_id: environment.capability_snapshot_id,
-        };
-        let producer_ids = match environment.target {
-            PhysicalDeploymentTarget::DistributedCollectors => {
-                environment.target_collector_ids.clone()
-            }
-            PhysicalDeploymentTarget::BackendLocalRemoteWrite => Vec::new(),
-        };
-        // Several queries/readouts may intentionally share one maintained
-        // summary. PrecomputePlan is keyed by physical identity, not query ID.
-        let mut materializations_by_fingerprint = BTreeMap::new();
-        for materialization in compiled_materializations {
-            if materializations_by_fingerprint
-                .get(&materialization.policy_fingerprint())
-                .is_some_and(|old: &asap_types::PrecomputeMaterialization| {
-                    old.semantic_fragment != materialization.semantic_fragment
-                })
-            {
-                return Err(CompileError::Query {
-                    query_id: "shared-output".into(),
-                    reason: "one deployed output cannot have different semantic definitions".into(),
-                });
-            }
-            materializations_by_fingerprint
-                .entry(materialization.policy_fingerprint())
-                .or_insert(materialization);
-        }
-        let mut materializations: Vec<asap_types::PrecomputeMaterialization> =
-            materializations_by_fingerprint.into_values().collect();
-        let materialization_fingerprints: BTreeSet<_> = materializations
-            .iter()
-            .map(asap_types::PrecomputeMaterialization::policy_fingerprint)
-            .collect();
-        let mut query_entries = BTreeMap::new();
-        for (query_index, query) in request.queries.iter().enumerate() {
-            // VictoriaMetrics acceleration accepts only the shared
-            // PromQL-compatible parser contract. MetricsQL-only syntax fails
-            // closed here and remains eligible for exact VM execution.
-            let canonical =
-                canonical_promql(&query.query_string).map_err(|error| CompileError::Query {
-                    query_id: query.query_id.clone(),
-                    reason: format!("promql-compatible identity: {error}"),
-                })?;
-            let binding = |node: &Rc<SummaryNode>, node_family: &SummaryFamilyType| -> Result<MaterializationBinding, crate::query_plan::QueryPlanError> {
-                    if immutable_materialization_sources(node).is_none() {
-                        summary_agg_metric(node).ok_or_else(|| {
-                            crate::query_plan::QueryPlanError::Invalid(
-                                "materialized node has no unique time-series source".into(),
-                            )
-                        })?;
-                    }
-                    let node_id = executable_dags[query_index]
-                        .as_ref()
-                        .ok_or_else(|| {
-                            crate::query_plan::QueryPlanError::Invalid(
-                                "materialized query has no compiled executable DAG".into(),
-                            )
-                        })?
-                        .node_ids
-                        .node_id(node)
-                        .ok_or_else(|| {
-                            crate::query_plan::QueryPlanError::Invalid(
-                                "query materialization is absent from the compiled Planner DAG".into(),
-                            )
-                        })?;
-                    let fingerprint = node_bindings
-                        .get(&(query_index, node_id))
-                        .copied()
-                        .ok_or_else(|| {
-                            crate::query_plan::QueryPlanError::Invalid(format!(
-                                "post-ASAP node has no compiled physical binding for {node_family:?}"
-                            ))
-                        })?;
-                    let materialization = materializations
-                        .iter()
-                        .find(|candidate| candidate.policy_fingerprint() == fingerprint)
-                        .ok_or_else(|| {
-                            crate::query_plan::QueryPlanError::Invalid(format!(
-                                "compiled binding {} is absent from PrecomputePlan",
-                                fingerprint.0
-                            ))
-                        })?;
-                    let stored_interval_ms = materializations
-                        .iter()
-                        .find(|candidate| candidate.policy_fingerprint() == fingerprint)
-                        .map(asap_types::PrecomputeMaterialization::stored_window_ms)
-                        .ok_or_else(|| {
-                            crate::query_plan::QueryPlanError::Invalid(format!(
-                                "compiled binding {} has no precompute materialization",
-                                fingerprint.0
-                            ))
-                        })?;
-                    let (_, source_window, _) = selected_input_contract(node)
-                        .map_err(crate::query_plan::QueryPlanError::Invalid)?;
-                    let materialization_family = materialization.accumulator_spec()
-                        .map_err(|error| crate::query_plan::QueryPlanError::Invalid(error.to_string()))?
-                        .family;
-                    let window_ms = materialization.window_size.saturating_mul(1_000);
-                    if materialization_family != *node_family
-                        || window_ms == 0
-                        || source_window.unwrap_or(query.query_lookback_seconds).saturating_mul(1_000)
-                            % window_ms != 0
-                    {
-                        return Err(crate::query_plan::QueryPlanError::Invalid(format!(
-                            "compiled binding {} disagrees with post-ASAP/deployment semantics",
-                            fingerprint.0
-                        )));
-                    }
-                    Ok(MaterializationBinding {
-                        full_window_slide_ms: matches!(materialization.window_layout, asap_types::WindowMaterializationLayout::FullWindow)
-                            .then_some(materialization.slide_interval.saturating_mul(1_000)),
-                        readout_lookback_ms: source_window.map(|seconds| seconds.saturating_mul(1_000)),
-                        materialization: fingerprint.into(),
-                        stored_output_reference: asap_types::sds::StoredOutputReference::for_output(fingerprint.into()),
-                        output_grouping: PhysicalGrouping::Reduce(
-                            materialization.grouping_labels.names(),
-                        ),
-                        item_labels: materialization.aggregated_labels.labels.clone(),
-                        window_ms: stored_interval_ms,
-                        pane_origin_ms: materialization.pane_origin_ms,
-                    })
-            };
-            let instant = InstantExecution {
-                lookback_ms: query.query_lookback_seconds.saturating_mul(1_000),
-                full_history: false,
-                cumulative_readout: true,
-            };
-            // A whole-query native fallback need not be expressible in the local
-            // query-time algebra (for example an ERP-rejected entropy readout).
-            // Retain its native boundary without discarding other workload roots.
-            let native_root = request.allow_mixed_summary_and_exact_execution
-                && if let SummaryExpr::KeepPreAsap(expr) = &query.selected_plan_root.expr {
-                    let original = original_root(query, query_index, &request.canonical_roots)?;
-                    expr.as_ref() == &original
-                        && crate::query_plan::query_time::compile_logical(
-                            query.query_id.clone(),
-                            canonical.clone(),
-                            instant,
-                            FallbackPolicy::ExactBackend,
-                        )
-                        .is_err()
-                } else {
-                    false
-                };
-            let mut entry = if let Some(operator) =
-                super::maintained_population::operator(&request, query)?
-            {
-                let root = crate::query_plan::QueryNodeId(0);
-                let compiled = executable_dags[query_index]
-                    .as_ref()
-                    .expect("compiled Planner DAG");
-                query_node_bindings.insert((query_index, compiled.dag.root), root);
-                Ok(crate::query_plan::QueryPlanEntry {
-                    language: crate::query_plan::QueryLanguage::PromQl,
-                    query_id: query.query_id.clone(),
-                    canonical_query: canonical.clone(),
-                    fixed_evaluation: None,
-                    root,
-                    nodes: BTreeMap::from([(
-                        root,
-                        crate::query_plan::QueryPlanNode::Logical {
-                            operator,
-                            inputs: vec![],
-                        },
-                    )]),
-                    instant,
-                    fallback: FallbackPolicy::ExactBackend,
-                })
-            } else if !request.allow_mixed_summary_and_exact_execution
-                && executable_dags[query_index].is_none()
-                && !collect_selected_materializations(
-                    &query.selected_plan_root,
-                    request.allow_mixed_summary_and_exact_execution,
-                )
-                .map_err(|reason| CompileError::Query {
-                    query_id: query.query_id.clone(),
-                    reason,
-                })?
-                .is_empty()
-            {
-                // The selected state has no supported physical implementation.
-                // Keep native semantics instead of lowering an unbound summary.
-                let root = crate::query_plan::QueryNodeId(0);
-                Ok(crate::query_plan::QueryPlanEntry {
-                    language: crate::query_plan::QueryLanguage::PromQl,
-                    query_id: query.query_id.clone(),
-                    canonical_query: canonical.clone(),
-                    fixed_evaluation: None,
-                    root,
-                    nodes: BTreeMap::from([(
-                        root,
-                        crate::query_plan::QueryPlanNode::ExactFallback {
-                            reason: "selected summary has no supported physical implementation"
-                                .into(),
-                        },
-                    )]),
-                    instant,
-                    fallback: FallbackPolicy::ExactBackend,
-                })
-            } else if request.allow_mixed_summary_and_exact_execution && !native_root {
-                crate::query_plan::compile_bound_composable_mapped(
-                    query.query_id.clone(),
-                    canonical.clone(),
-                    &query.selected_plan_root,
-                    instant,
-                    FallbackPolicy::ExactBackend,
-                    binding,
-                    |node, query_node| {
-                        if let Some(post_asap_node) = executable_dags[query_index]
-                            .as_ref()
-                            .and_then(|compiled| compiled.node_ids.node_id(node))
-                        {
-                            query_node_bindings.insert((query_index, post_asap_node), query_node);
-                        }
-                    },
-                )
-            } else {
-                crate::query_plan::compile_bound_mapped(
-                    query.query_id.clone(),
-                    canonical.clone(),
-                    &query.selected_plan_root,
-                    instant,
-                    FallbackPolicy::ExactBackend,
-                    binding,
-                    |node, query_node| {
-                        if let Some(post_asap_node) = executable_dags[query_index]
-                            .as_ref()
-                            .and_then(|compiled| compiled.node_ids.node_id(node))
-                        {
-                            query_node_bindings.insert((query_index, post_asap_node), query_node);
-                        }
-                    },
-                )
-            }?;
-            if request.allow_mixed_summary_and_exact_execution {
-                // Any Planner-selected leaf without a physical summary binding
-                // is an exact subtree boundary. Deployed plans never retain a
-                // backend-local range index leaf.
-                crate::query_plan::query_time::finalize_query_time_nodes(&mut entry)?;
-            }
-            if frontend == QueryFrontend::MetricsQl {
-                entry.language = crate::query_plan::QueryLanguage::MetricsQl;
-            }
-            let catalog_key = QueryPlan::catalog_key(entry.language, &canonical);
-            if query_entries.insert(catalog_key, entry).is_some() {
-                return Err(CompileError::Query {
-                    query_id: query.query_id.clone(),
-                    reason: format!("duplicate canonical query identity `{canonical}`"),
-                });
-            }
-        }
-        let mut query_plan = QueryPlan {
-            plan_id,
-            plan_version: envelope.plan_version,
-            clickhouse_context: None,
-            selected_dags: BTreeMap::new(),
-            entries: query_entries,
-        };
-        let mut installed_dags = BTreeMap::new();
-        for (query_index, compiled) in executable_dags.iter().enumerate() {
-            let Some(compiled) = compiled else { continue };
-            let query_id = request.queries[query_index].query_id.clone();
-            let query_plan_sink = query_plan
-                .entries
-                .values()
-                .find(|entry| entry.query_id == query_id)
-                .expect("compiled query entry exists")
-                .root;
-            let installed = super::executable_binding::install_selected_dag(
-                query_id.clone(),
-                &compiled.dag,
-                query_plan_sink,
-                |id| {
-                    node_bindings
-                        .get(&(query_index, id))
-                        .copied()
-                        .map(Into::into)
-                },
-                |id| query_node_bindings.get(&(query_index, id)).copied(),
-            )
-            .map_err(|reason| CompileError::Query {
-                query_id: query_id.clone(),
-                reason,
-            })?;
-            query_plan
-                .selected_dags
-                .insert(query_id.clone(), installed.document.clone());
-            installed_dags.insert(query_id, installed);
-        }
-        for materialization in &mut materializations {
-            let fingerprint = materialization.policy_fingerprint();
-            let max_lookback_ms = query_plan
-                .entries
-                .values()
-                .flat_map(QueryPlanEntry::materialization_bindings)
-                .filter(|binding| binding.materialization.fingerprint() == fingerprint)
-                .filter_map(|binding| binding.readout_lookback_ms)
-                .max();
-            if let Some(lookback_ms) = max_lookback_ms {
-                materialization.num_aggregates_to_retain = Some(retained_state_count(
-                    lookback_ms,
-                    request.query_retention_margin_ms,
-                    materialization.slide_interval.saturating_mul(1_000),
-                    &materialization.window_layout,
-                ));
-            }
-        }
-        validate_retained_summary_footprint(
-            &materializations,
-            request
-                .data_workload
-                .as_ref()
-                .and_then(|data| {
-                    data.input_cardinality
-                        .value_at(environment.observed_at_unix_ms)
-                })
-                .copied(),
-            request
-                .retained_summary_memory_budget_bytes
-                .unwrap_or(DEFAULT_RETAINED_SUMMARY_MEMORY_BUDGET_BYTES),
-        )?;
-        query_plan.validate(&materialization_fingerprints)?;
-        for (query_id, installed) in &installed_dags {
-            let entry = query_plan
-                .entries
-                .values()
-                .find(|entry| &entry.query_id == query_id)
-                .ok_or_else(|| CompileError::Query {
-                    query_id: query_id.clone(),
-                    reason: "installed post-ASAP DAG has no query-plan entry".into(),
-                })?;
-            super::executable_binding::validate_query_plan(installed, entry).map_err(|reason| {
-                CompileError::Query {
-                    query_id: query_id.clone(),
-                    reason,
-                }
-            })?;
-        }
-        // QueryPlan already owns executable readout nodes. Persist only
-        // maintenance ancestors under PrecomputePlan.
-        installed_dags = installed_dags
-            .into_iter()
-            .filter(|(_, installed)| !installed.binding.precompute_sinks.is_empty())
-            .map(|(query_id, installed)| {
-                installed
-                    .precompute_projection()
-                    .map(|projected| (query_id.clone(), projected))
-                    .map_err(|reason| CompileError::Query { query_id, reason })
-            })
-            .collect::<Result<_, _>>()?;
-        let mut precompute_plan = match environment.target {
-            PhysicalDeploymentTarget::DistributedCollectors => {
-                PrecomputePlan::build(envelope.clone(), materializations, &producer_ids).and_then(
-                    |mut plan| {
-                        plan.executable_dags = installed_dags;
-                        plan.validate()?;
-                        Ok(plan)
-                    },
-                )
-            }
-            PhysicalDeploymentTarget::BackendLocalRemoteWrite => {
-                PrecomputePlan::build_backend_local_with_dags(
-                    envelope.clone(),
-                    materializations,
-                    installed_dags,
-                )
-            }
-        }
-        .map_err(|error| CompileError::Query {
-            query_id: "precompute-plan".into(),
-            reason: error.to_string(),
-        })?;
-        precompute_plan.ingest.dataset_identity = Some(environment.dataset_identity.clone());
-        let mut transmission_plan = crate::physical::compiler::build_transmission_plan(
-            envelope.clone(),
-            &precompute_plan,
-            &runtime_policies,
-        )
-        .map_err(|error| CompileError::Query {
-            query_id: "transmission-plan".into(),
-            reason: error.to_string(),
-        })?;
-        let mut collector_plans = producer_ids
-            .into_iter()
-            .map(|collector_id| CollectorPlan {
-                summary_catalog: transmission_plan.summary_catalog.clone(),
-                transmission_rules: transmission_plan
-                    .rules
-                    .iter()
-                    .filter(|rule| rule.producer_id == collector_id)
-                    .cloned()
-                    .collect(),
-                collector_id,
-                envelope: envelope.clone(),
-                materializations: collector_materializations.clone(),
-            })
-            .collect::<Vec<_>>();
-        let summary_catalog = super::summary_catalog::SummaryCatalog::from_materializations(
-            envelope.plan_id,
-            envelope.plan_version,
-            &precompute_plan.materializations,
-        )
-        .map_err(|error| CompileError::Query {
-            query_id: "summary-catalog".into(),
-            reason: error.to_string(),
-        })?;
-        precompute_plan
-            .bind_catalog(&summary_catalog)
-            .map_err(|error| CompileError::Query {
-                query_id: "precompute-catalog".into(),
-                reason: error.to_string(),
-            })?;
-        transmission_plan.summary_catalog = precompute_plan.summary_catalog.clone();
-        for collector in &mut collector_plans {
-            collector.summary_catalog = precompute_plan.summary_catalog.clone();
-        }
-        transmission_plan
-            .validate_against_catalog(&summary_catalog)
-            .map_err(|error| CompileError::Query {
-                query_id: "summary-catalog".into(),
-                reason: error.to_string(),
-            })?;
-        for collector in &collector_plans {
-            collector
-                .validate_against_catalog(&summary_catalog)
-                .map_err(|error| CompileError::Query {
-                    query_id: "summary-catalog".into(),
-                    reason: error.to_string(),
-                })?;
-        }
-        query_plan.bind_catalog(&summary_catalog)?;
-        let storage_routing = crate::emit::backend_wire::storage_routing_document(
-            crate::emit::backend_wire::DEFAULT_TENANT,
-            &routed_algorithms.into_iter().collect::<Vec<_>>(),
-        );
-        Ok(CompiledPhysicalPlan {
-            envelope,
-            summary_catalog,
-            collector_plans,
-            precompute_plan,
-            transmission_plan,
-            query_plan,
-            storage_routing,
-            lifecycle_estimates: lifecycle_estimates.into_values().collect(),
-            cost_comparison: None,
-            planner_selection_trace: request.planner_selection_trace,
-        })
-    }
-}
-
-fn summary_agg_metric(node: &SummaryNode) -> Option<String> {
-    fn walk(node: &SummaryNode, metrics: &mut BTreeSet<String>) {
-        match &node.expr {
-            SummaryExpr::KeepPreAsap(expr) => {
-                let parsed = crate::query_parser::qe_to_parsed_query(expr);
-                if !parsed.metric_name.is_empty() {
-                    metrics.insert(parsed.metric_name);
-                }
-            }
-            SummaryExpr::SummaryAgg { child, .. } => walk(child, metrics),
-
-            SummaryExpr::ValueOperation { child, .. } => walk(child, metrics),
-            SummaryExpr::SummaryEstimate { summary_input, .. } => walk(summary_input, metrics),
-            SummaryExpr::SummaryMerge { children, .. } => {
-                for child in children {
-                    walk(child, metrics);
-                }
-            }
-            SummaryExpr::SummaryJoin {
-                outer: left,
-                inner: right,
-                ..
-            }
-            | SummaryExpr::RelationalJoin { left, right, .. }
-            | SummaryExpr::SummarySubtract { left, right }
-            | SummaryExpr::BinaryOp {
-                lhs: left,
-                rhs: right,
-                ..
-            } => {
-                walk(left, metrics);
-                walk(right, metrics);
-            }
-            SummaryExpr::SummaryDelete { summary_input, .. } => walk(summary_input, metrics),
-        }
-    }
-    let mut metrics = BTreeSet::new();
-    walk(node, &mut metrics);
-    (metrics.len() == 1)
-        .then(|| metrics.into_iter().next())
-        .flatten()
-}
-
-/// Shared selection boundary for canonical startup and compile-and-publish.
-/// Certificate-bearing roots stay isolated: equal certificate values do not
-/// establish that the certificate's source scope covers another query.
-pub fn select_logical_roots_for_queries(
-    queries: &mut [QueryCompilationInput],
-    roots: Vec<Rc<QueryExpr>>,
-    evidence: &HashMap<String, TopKMembershipEvidence>,
-    exact_costs: &HashMap<String, Vec<ExactCompositionCostEvidence>>,
-) -> Result<(), CompileError> {
-    select_logical_roots_with_error_resource_profiles(queries, roots, evidence, exact_costs, None)
-}
-
-fn observed_population_matches_root(
-    policy: &super::erp::ErpPlanningInput,
-    root: &QueryExpr,
-) -> bool {
-    use asap_types::sds::{PopulationPartitioning, ValueProjectionIdentity};
-    use planner_types::pre_asap::{AggIntent, Reduction};
-    let (Some(data), Some(observed)) = (
-        &policy.resolved_data_descriptor,
-        &policy.observed_populations,
-    ) else {
-        return false;
-    };
-    let QueryExpr::Aggregate {
-        reduction: Reduction::PerEntity,
-        measures,
-        having: None,
-        child,
-        ..
-    } = root
-    else {
-        return false;
-    };
-    if measures.is_empty()
-        || !measures.iter().all(|intent| {
-            matches!(intent, AggIntent::Cardinality { cols, .. } if cols.is_empty())
-                || matches!(
-                    intent,
-                    AggIntent::FrequencyL2 { col: None, .. }
-                        | AggIntent::FrequencyEntropy { col: None, .. }
-                )
-        })
-    {
-        return false;
-    }
-    let Ok((metric, Some(window), filter)) = raw_time_series_input_contract(child, false) else {
-        return false;
-    };
-    data.time_series_metric() == Some(metric.as_str())
-        && data.population_filter_canonical == filter
-        && data.value_projection == ValueProjectionIdentity::SampleValue
-        && data.partitioning == Some(PopulationPartitioning::PerEntity)
-        && data.group_by_keys.is_empty()
-        && data.observation_semantics == asap_types::sds::TIMESTAMPED_OBSERVATION_SEMANTICS
-        && observed.window_end_ms.checked_sub(observed.window_start_ms)
-            == i64::try_from(window.saturating_mul(1000)).ok()
-}
-
-pub fn select_logical_roots_with_error_resource_profiles(
-    queries: &mut [QueryCompilationInput],
-    roots: Vec<Rc<QueryExpr>>,
-    evidence: &HashMap<String, TopKMembershipEvidence>,
-    exact_costs: &HashMap<String, Vec<ExactCompositionCostEvidence>>,
-    erp: Option<&super::erp::ErpPlanningInput>,
-) -> Result<(), CompileError> {
-    select_logical_roots_with_trace(queries, roots, evidence, exact_costs, erp).map(|_| ())
-}
-
-pub fn select_logical_roots_with_trace(
-    queries: &mut [QueryCompilationInput],
-    roots: Vec<Rc<QueryExpr>>,
-    evidence: &HashMap<String, TopKMembershipEvidence>,
-    exact_costs: &HashMap<String, Vec<ExactCompositionCostEvidence>>,
-    erp: Option<&super::erp::ErpPlanningInput>,
-) -> Result<Vec<serde_json::Value>, CompileError> {
-    let mut traces = Vec::new();
-    if roots.len() != queries.len() {
-        return Err(CompileError::Snapshot(
-            "canonical root/query mapping is incomplete".into(),
-        ));
-    }
-    let mut cohorts: Vec<(AccuracyTarget, Option<String>, Vec<(usize, Rc<QueryExpr>)>)> =
-        Vec::new();
-    let original_roots = roots.clone();
-    for (index, root) in roots.into_iter().enumerate() {
-        let accuracy = &queries[index].accuracy_target;
-        let certificate_scope = (evidence.contains_key(&queries[index].query_id)
-            || exact_costs.contains_key(&queries[index].query_id))
-        .then(|| queries[index].query_id.clone());
-        if let Some((_, _, roots)) = cohorts
-            .iter_mut()
-            .find(|(target, scope, _)| target == accuracy && scope == &certificate_scope)
-        {
-            roots.push((index, root));
-        } else {
-            cohorts.push((accuracy.clone(), certificate_scope, vec![(index, root)]));
-        }
-    }
-    for (accuracy, scope, roots) in cohorts {
-        // ERP v1 has no calibrated failure probability. Preserve explicit
-        // confidence requirements through theoretical/exact fallback.
-        let scoped_erp = erp.map(|policy| {
-            let mut policy = policy.clone();
-            if !matches!(accuracy, AccuracyTarget::Epsilon(_)) {
-                policy.artifact.records.clear();
-            }
-            if policy.observed_populations.is_some()
-                && !roots
-                    .iter()
-                    .all(|(_, root)| observed_population_matches_root(&policy, root))
-            {
-                if let Some(observed) = &mut policy.observed_populations {
-                    observed.invalid_reason =
-                        Some("candidate input differs from observed catalog data semantics".into());
-                    observed.populations.clear();
-                }
-            }
-            // A benchmark of a different KLL implementation is not evidence
-            // for the collector's sketchlib KLL, even with the same k.
-            policy.artifact.records.retain(|row| {
-                (row.sketch == "kll-percall" && row.implementation == "lib")
-                    || (row.sketch == "hll"
-                        && row.implementation == "asap-sketchlib-hll-regular-v1")
-                    || (row.sketch == "univmon"
-                        && row.implementation == "asap-sketchlib-univmon-standard-v1")
-            });
-            policy
-        });
-        let erp = scoped_erp.as_ref();
-        let mut model = ControlPlaneCostModel::new(accuracy.clone()).with_exact_composition_costs(
-            scope
-                .as_ref()
-                .and_then(|id| exact_costs.get(id))
-                .cloned()
-                .unwrap_or_default(),
-        );
-        if let Some(erp) = erp {
-            model = model.with_erp(erp.clone());
-        }
-        let certificate = scope.as_ref().and_then(|id| evidence.get(id));
-        let accuracy_model = super::erp::ErpAccuracyModel {
-            policy: erp,
-            max_error: match accuracy {
-                AccuracyTarget::Epsilon(e) | AccuracyTarget::EpsilonDelta { epsilon: e, .. } => e,
-                AccuracyTarget::Exact => 0.0,
-            },
-        };
-        let (selected, mut trace) =
-            crate::planner_selection::select_workload_with_accuracy_model_and_trace(
-                roots,
-                accuracy,
-                &model,
-                &QueryEvidence(certificate),
-                &accuracy_model,
-            )
-            .map_err(|error| CompileError::Snapshot(error.to_string()))?;
-        trace["deployment_overrides"] = serde_json::json!([]);
-        let selected_indices = selected.iter().map(|(index, _)| *index).collect::<Vec<_>>();
-        for (index, node) in selected {
-            if erp.is_some_and(|policy| {
-                requires_exact_erp_fallback(&node, &queries[index].accuracy_target, policy)
-            }) {
-                if let Some(values) = trace["deployment_overrides"].as_array_mut() {
-                    values.push(
-                        serde_json::json!({"query_index": index, "status": "rejected",
-                        "reason": "ERP requires exact fallback"}),
-                    );
-                }
-                queries[index].selected_plan_root =
-                    crate::planner_selection::keep_pre_asap(&original_roots[index])
-                        .map_err(|error| CompileError::Snapshot(error.to_string()))?;
-            } else {
-                queries[index].selected_plan_root = node;
-            }
-        }
-        trace["committed_roots"] = serde_json::json!(selected_indices.into_iter().map(|index|
-            serde_json::json!({"query_index": index,
-                "logical_root_id": crate::planner_selection::explained_root_id(&queries[index].selected_plan_root, &queries[index].accuracy_target)
-            })).collect::<Vec<_>>());
-        traces.push(trace);
-    }
-    Ok(traces)
-}
-
-fn requires_exact_erp_fallback(
-    node: &SummaryNode,
-    accuracy: &AccuracyTarget,
-    erp: &super::erp::ErpPlanningInput,
-) -> bool {
-    fn walk(
-        node: &SummaryNode,
-        out: &mut Vec<(
-            SketchAlgorithm,
-            SketchParams,
-            Option<super::erp::ReadoutEvidence>,
-        )>,
-    ) {
-        match &node.expr {
-            SummaryExpr::SummaryAgg { child, .. } => {
-                walk(child, out);
-            }
-            SummaryExpr::SummaryEstimate {
-                summary_input,
-                query,
-                ..
-            } => {
-                for field in &summary_input.schema.fields {
-                    if node.guarantee.as_ref().is_some_and(|g| g.is_exact()) {
-                        continue;
-                    }
-                    let SummaryFamilyType::Sketch(kind, _) = &field.dtype else {
-                        continue;
-                    };
-                    out.push((
-                        kind.algorithm().clone(),
-                        kind.params().clone(),
-                        super::erp::ReadoutEvidence::for_query(kind.algorithm(), query),
-                    ));
-                }
-                walk(summary_input, out);
-            }
-            SummaryExpr::SummaryDelete { summary_input, .. }
-            | SummaryExpr::ValueOperation {
-                child: summary_input,
-                ..
-            } => walk(summary_input, out),
-            SummaryExpr::SummaryMerge { children, .. } => {
-                children.iter().for_each(|child| walk(child, out))
-            }
-            SummaryExpr::SummaryJoin { outer, inner, .. } => {
-                walk(outer, out);
-                walk(inner, out);
-            }
-            SummaryExpr::SummarySubtract { left, right }
-            | SummaryExpr::RelationalJoin { left, right, .. }
-            | SummaryExpr::BinaryOp {
-                lhs: left,
-                rhs: right,
-                ..
-            } => {
-                walk(left, out);
-                walk(right, out);
-            }
-
-            SummaryExpr::KeepPreAsap(_) => {}
-        }
-    }
-    let max_error = match accuracy {
-        AccuracyTarget::Epsilon(value) | AccuracyTarget::EpsilonDelta { epsilon: value, .. } => {
-            *value
-        }
-        AccuracyTarget::Exact => return false,
-    };
-    let mut sketches = Vec::new();
-    walk(node, &mut sketches);
-    sketches.into_iter().any(|(algorithm, params, readout)| {
-        let decision = match readout {
-            Some(readout) => erp.select_readout(algorithm, readout, max_error, params),
-            None => erp.select(algorithm, max_error, params),
-        };
-        matches!(
-            decision,
-            super::erp::ErpParameterDecision::ExactFallback { .. }
-        )
-    })
-}
-
-#[cfg(test)]
-/// Planner-adapter selection step used before physical compilation. Keeping
-/// this separate makes the ownership boundary explicit: callers supply the
-/// selected post-ASAP DAG to [`DeploymentPlanCompiler::compile`].
-pub fn select_post_asap(
-    expr: &QueryExpr,
-    accuracy: AccuracyTarget,
-    lifecycle: &SummaryLifecyclePlanningInputs,
-    evidence: Option<&TopKMembershipEvidence>,
-) -> Result<Rc<SummaryNode>, crate::planner_selection::SelectionError> {
-    let model = ControlPlaneCostModel::new(accuracy).with_summary_maintenance(
-        SummaryMaintenanceLifecycleCostInputs {
-            build_cost: Some(Cost(lifecycle.costs.build)),
-            maintenance_cost_per_update: Some(Cost(lifecycle.costs.maintenance_per_update)),
-            summary_read_cost: Some(Cost(lifecycle.costs.read)),
-            retention_cost_rate: Some(CostRate(lifecycle.costs.retention_per_second)),
-            retirement_cost: Some(Cost(lifecycle.costs.retirement)),
-        },
-        SummaryMaintenanceCapabilities {
-            incremental_update: true,
-            merge: true,
-            delete: false,
-        },
-    );
-    // These fixtures exercise collector heap transport. Collector fixtures do
-    // not offer backend-only temporal value readouts as a physical capability.
-    struct CollectorFixtureModel(ControlPlaneCostModel);
-    impl asap_aware_mapping::CostModel for CollectorFixtureModel {
-        fn rank_candidates(
-            &self,
-            intent: &planner_types::pre_asap::AggIntent,
-            candidates: &[planner_types::post_asap::SketchAlgorithm],
-        ) -> Vec<planner_types::post_asap::SketchAlgorithm> {
-            self.0.rank_candidates(intent, candidates)
-        }
-        fn size_params(
-            &self,
-            kind: planner_types::post_asap::SketchAlgorithm,
-            intent: &planner_types::pre_asap::AggIntent,
-            eps: f64,
-            delta: f64,
-        ) -> planner_types::post_asap::SketchParams {
-            self.0.size_params(kind, intent, eps, delta)
-        }
-        fn candidate_cost(
-            &self,
-            candidate: &asap_aware_mapping::ReplacementSubDAG,
-            target: &asap_aware_mapping::TargetSubDAG<'_>,
-        ) -> Option<Cost> {
-            self.0.candidate_cost(candidate, target)
-        }
-        fn summary_support_evidence(&self, summary: &SummaryNode) -> Option<bool> {
-            if matches!(
-                summary.expr,
-                SummaryExpr::ValueOperation {
-                    operation: planner_types::post_asap::ValueOperation::Limit { .. },
-                    ..
-                }
-            ) {
-                return Some(false);
-            }
-            self.0.summary_support_evidence(summary)
-        }
-    }
-    crate::planner_selection::select_query_with_models(
-        expr,
-        &CollectorFixtureModel(model),
-        &DefaultAccuracyModel,
-        &QueryEvidence(evidence),
-    )
-}
-
-fn validate_evidence(
-    query_id: &str,
-    evidence: &TopKMembershipEvidence,
-    env: &PhysicalDeploymentContext,
-) -> Result<(), CompileError> {
-    let age = env
-        .observed_at_unix_ms
-        .saturating_sub(evidence.observed_at_unix_ms);
-    let valid = evidence.observed_at_unix_ms <= env.observed_at_unix_ms
-        && evidence.selected_lower_bound.is_finite()
-        && evidence.excluded_upper_bound.is_finite()
-        && evidence.selected_lower_bound > evidence.excluded_upper_bound
-        && (0.0..=1.0).contains(&evidence.interval_failure_probability)
-        && !evidence.source.trim().is_empty()
-        && age <= env.max_evidence_age_ms;
-    if valid {
-        Ok(())
-    } else {
-        Err(CompileError::InvalidEvidence {
-            query_id: query_id.into(),
-            reason: format!("margin/failure/source invalid or age {age}ms exceeds policy"),
-        })
-    }
-}
-
-fn validate_lifecycle_input(
-    query_id: &str,
-    input: &SummaryLifecyclePlanningInputs,
-) -> Result<(), CompileError> {
-    let costs = [
-        input.costs.build,
-        input.costs.maintenance_per_update,
-        input.costs.read,
-        input.costs.retention_per_second,
-        input.costs.retirement,
-    ];
-    if input.evaluation_interval_ms == 0
-        || input.evidence_valid_for_ms == 0
-        || !input.ingestion_rate_per_second.is_finite()
-        || input.ingestion_rate_per_second < 0.0
-        || !input.horizon_seconds.is_finite()
-        || input.horizon_seconds <= 0.0
-        || costs.iter().any(|cost| !cost.is_finite() || *cost < 0.0)
-    {
-        return Err(CompileError::Lifecycle {
-            query_id: query_id.into(),
-            reason: "rates, horizon, validity, intervals, and costs must be finite and non-negative (interval/horizon/validity non-zero)".into(),
-        });
-    }
-    Ok(())
-}
-
-/// Price one derived layout from the snapshot's own lifecycle unit costs.
-///
-/// `WindowRealizationCostQuote` is normally measured evidence, and its
-/// `weighted_cost` doc puts pricing update CPU, query-time merges, retained
-/// memory, storage, scans and network on the evidence producer. When a
-/// snapshot prices no candidate, the control plane becomes that producer for
-/// the derived shapes — and it does so without inventing a single magnitude.
-/// Every unit cost below is supplied evidence (`LifecycleUnitCosts`, from
-/// `implementation.lifecycle_costs`); every multiplier is a structural count
-/// that follows from the layout's definition. Nothing here is a measurement.
-///
-/// Over `horizon_seconds`, for window `W`, slide `S` and the layout's own
-/// shape:
-///
-/// - **states created**: a `Pane { P }` seals a state every `P`, a
-///   `FullWindow` every `S`. Each one is built once and retired once, so
-///   `build` and `retirement` are charged per created state.
-/// - **update fanout**: this is the layout's whole point (`worker.rs`'s
-///   `stores_full_windows` branch). A pane takes each sample exactly once; a
-///   full window takes it into every overlapping window that contains it,
-///   averaging `W / S` under the supplied stationary ingestion-rate model.
-///   The maximum simultaneously open count is separately charged as residency.
-/// - **finalizations per read**: the mirror image. A full window is read
-///   whole; `W / P` panes are composed into one answer. Charged at the
-///   query's own evaluation cadence.
-/// - **retention**: `retained_state_count`, the same function that fills
-///   `num_aggregates_to_retain`, so the quote and the plan cannot disagree.
-///   Open worker accumulators are charged separately from published states;
-///   updating a state and keeping it resident are different resources.
-///
-/// The byte fields are left exactly as the snapshot supplied them: state size
-/// needs sketch parameters that do not exist yet at this point, and guessing
-/// them would be the fabrication this function otherwise avoids. Only
-/// `cpu_cost` and `weighted_cost` are derived, and only those two are read —
-/// by `validate_window_implementations` and by the `min_by` that ranks
-/// candidates. `model_version` records that the quote is derived.
-pub(super) fn derived_window_cost(
-    template: &WindowRealizationCostQuote,
-    lifecycle: &SummaryLifecyclePlanningInputs,
-    window_secs: u64,
-    slide_secs: u64,
-    layout: &asap_types::WindowMaterializationLayout,
-    staleness_margin_ms: u64,
-) -> WindowRealizationCostQuote {
-    let costs = &lifecycle.costs;
-    let horizon = lifecycle.horizon_seconds.max(0.0);
-    let window = window_secs.max(1) as f64;
-    let slide = slide_secs.max(1) as f64;
-    let (seal_interval, update_fanout, finalizations_per_read) = match layout {
-        asap_types::WindowMaterializationLayout::FullWindow => (slide, window / slide, 1.0),
-        asap_types::WindowMaterializationLayout::Pane { pane_secs } => {
-            let pane = (*pane_secs).max(1) as f64;
-            (pane, 1.0, (window / pane).ceil())
-        }
-        asap_types::WindowMaterializationLayout::HierarchicalRollup { base_pane_secs, .. } => {
-            let pane = (*base_pane_secs).max(1) as f64;
-            (pane, 1.0, (window / pane).ceil())
-        }
-    };
-    let states_created = horizon / seal_interval;
-    let updates = lifecycle.ingestion_rate_per_second.max(0.0) * horizon * update_fanout;
-    let evaluation_secs = (f64::from(lifecycle.evaluation_interval_ms) / 1_000.0).max(1.0);
-    let reads = horizon / evaluation_secs;
-    let retained = retained_state_count(
-        window_secs.saturating_mul(1_000),
-        staleness_margin_ms,
-        slide_secs.saturating_mul(1_000),
-        layout,
-    ) as f64;
-    // Store retention does not include worker accumulators that are still open.
-    let active = match layout {
-        asap_types::WindowMaterializationLayout::FullWindow => (window / slide).ceil(),
-        _ => 1.0,
-    };
-
-    let build = costs.build * states_created;
-    let maintenance = costs.maintenance_per_update * updates;
-    let read = costs.read * reads * finalizations_per_read;
-    let retention = costs.retention_per_second * horizon * (retained + active);
-    let retirement = costs.retirement * states_created;
-    let cpu_cost = build + maintenance;
-    let weighted_cost = cpu_cost + read + retention + retirement;
-
-    WindowRealizationCostQuote {
-        model_version: format!(
-            "{}+derived-window-layout-v1",
-            template
-                .model_version
-                .trim_end_matches("+derived-window-layout-v1")
-        ),
-        cpu_cost,
-        weighted_cost,
-        ..template.clone()
-    }
-}
-
-/// The furthest point in the past that evaluating `expr` can read, in ms.
-///
-/// A range selector and a subquery each evaluate their child over prior
-/// history; a positive offset moves that history further back. The result is a
-/// lower-bound horizon, not a claim that the entire interval is read. For
-/// example, `a[1m] offset 1h` selects `(t - 61m, t - 60m]`.
-fn query_history_window_ms(expr: &QueryExpr, scrape_interval_ms: u64) -> Result<u64, CompileError> {
-    fn duration_ms(duration: std::time::Duration) -> Result<u64, CompileError> {
-        if duration.subsec_nanos() != 0 {
-            return Err(CompileError::Snapshot(
-                "PromQL ranges must be a whole number of seconds in the backend-local profile"
-                    .into(),
-            ));
-        }
-        u64::try_from(duration.as_millis())
-            .map_err(|_| CompileError::Snapshot("PromQL range exceeds supported history".into()))
-    }
-
-    fn add(left: u64, right: u64) -> Result<u64, CompileError> {
-        left.checked_add(right).ok_or_else(|| {
-            CompileError::Snapshot("PromQL history exceeds supported duration".into())
-        })
-    }
-
-    fn visit(
-        expr: &QueryExpr,
-        scrape_interval_ms: u64,
-        in_range: bool,
-    ) -> Result<u64, CompileError> {
-        match expr {
-            // A subquery evaluates instant expressions at earlier timestamps;
-            // those leaves still need their own default readout window.
-            QueryExpr::PromqlSubquery { range, child, .. } => add(
-                duration_ms(*range)?,
-                visit(child, scrape_interval_ms, false)?,
-            ),
-            QueryExpr::TimeRange { range, child } => add(
-                duration_ms(*range)?,
-                visit(child, scrape_interval_ms, true)?,
-            ),
-            QueryExpr::TimeShift { shift, child } => {
-                if !shift.offset_ms.unsigned_abs().is_multiple_of(1_000) {
-                    return Err(CompileError::Snapshot(
-                        "PromQL offsets must be a whole number of seconds in the backend-local profile".into(),
-                    ));
-                }
-                add(
-                    shift.offset_ms.max(0) as u64,
-                    visit(child, scrape_interval_ms, in_range)?,
-                )
-            }
-            QueryExpr::PromqlScalarBridge(child)
-            | QueryExpr::PromqlVectorFromScalar(child)
-            | QueryExpr::PromqlScalarFromVector(child)
-            | QueryExpr::PromqlRelabel { child, .. }
-            | QueryExpr::PromqlSeriesSample { child, .. }
-            | QueryExpr::Filter { child, .. }
-            | QueryExpr::Project { child, .. }
-            | QueryExpr::Aggregate { child, .. }
-            | QueryExpr::Dedup { child, .. }
-            | QueryExpr::Sort { child, .. }
-            | QueryExpr::Limit { child, .. } => visit(child, scrape_interval_ms, in_range),
-            QueryExpr::BinaryOp {
-                lhs: left,
-                rhs: right,
-                ..
-            }
-            | QueryExpr::Join { left, right, .. }
-            | QueryExpr::SetOp { left, right, .. } => Ok(visit(
-                left,
-                scrape_interval_ms,
-                in_range,
-            )?
-            .max(visit(right, scrape_interval_ms, in_range)?)),
-            QueryExpr::Concat { children, .. } => children.iter().try_fold(0, |history, child| {
-                Ok(history.max(visit(child, scrape_interval_ms, in_range)?))
-            }),
-            QueryExpr::Scan { .. } if !in_range => Ok(scrape_interval_ms),
-            _ => Ok(0),
-        }
-    }
-
-    visit(expr, scrape_interval_ms, false)
-}
-
-/// Every distinct range-selector window in `expr`, as seconds.
-///
-/// A single query can carry several. `sum(sum_over_time(a[1m])) / sum(sum_over_time(b[5m]))`
-/// has two, and each one becomes its own materialization with its own window.
-/// These are materialization contracts. Enclosing subquery ranges and offsets
-/// affect a query's furthest lookback but do not change a leaf contract.
-#[cfg(test)]
-fn range_selector_windows_secs(expr: &QueryExpr) -> BTreeSet<u64> {
-    fn visit(expr: &QueryExpr, windows: &mut BTreeSet<u64>) {
-        if let QueryExpr::TimeRange { range, .. } = expr {
-            let secs = range.as_secs();
-            if secs != 0 {
-                windows.insert(secs);
-            }
-        }
-        match expr {
-            QueryExpr::PromqlScalarBridge(child)
-            | QueryExpr::PromqlVectorFromScalar(child)
-            | QueryExpr::PromqlScalarFromVector(child)
-            | QueryExpr::PromqlRelabel { child, .. }
-            | QueryExpr::PromqlSeriesSample { child, .. }
-            | QueryExpr::Filter { child, .. }
-            | QueryExpr::Project { child, .. }
-            | QueryExpr::Aggregate { child, .. }
-            | QueryExpr::Dedup { child, .. }
-            | QueryExpr::Sort { child, .. }
-            | QueryExpr::Limit { child, .. }
-            | QueryExpr::PromqlSubquery { child, .. }
-            | QueryExpr::TimeRange { child, .. }
-            | QueryExpr::TimeShift { child, .. } => visit(child, windows),
-            QueryExpr::BinaryOp {
-                lhs: left,
-                rhs: right,
-                ..
-            }
-            | QueryExpr::Join { left, right, .. }
-            | QueryExpr::SetOp { left, right, .. } => {
-                visit(left, windows);
-                visit(right, windows);
-            }
-            _ => {}
-        }
-    }
-    let mut windows = BTreeSet::new();
-    visit(expr, &mut windows);
-    windows
-}
-
-/// Derive and price one implementation per supported layout for each range.
-/// Derived maintenance cohorts are restricted to their supported full windows;
-/// raw additive pane producers may subsequently be shared by Planner.
-#[cfg(test)]
-fn derived_window_candidates(
-    implementation_id: &str,
-    expr: &QueryExpr,
-    lookback_ms: u64,
-    evaluation_interval_ms: u32,
-    cost: WindowRealizationCostQuote,
-    lifecycle: &SummaryLifecyclePlanningInputs,
-    staleness_margin_ms: u64,
-) -> Vec<WindowRealizationCandidate> {
-    let mut windows = range_selector_windows_secs(expr);
-    if windows.is_empty() {
-        windows.insert(lookback_ms / 1_000);
-    }
-    let mut lifecycle = lifecycle.clone();
-    lifecycle.evaluation_interval_ms = evaluation_interval_ms;
-    windows
-        .into_iter()
-        .flat_map(|window| {
-            windows::derive(
-                &WindowCostModel {
-                    implementation_id: implementation_id.into(),
-                    cost: cost.clone(),
-                    quotes: Vec::new(),
-                },
-                &lifecycle,
-                window,
-                false,
-                PhysicalDeploymentTarget::BackendLocalRemoteWrite,
-                staleness_margin_ms,
-            )
-        })
-        .collect()
-}
-
-pub(super) fn validate_window_implementations(
-    query: &QueryCompilationInput,
-    environment: &PhysicalDeploymentContext,
-) -> Result<Vec<(String, SummaryWindowFramework, Cost)>, CompileError> {
-    let mut ids = BTreeSet::new();
-    let mut candidates = Vec::new();
-    for candidate in &query.window_realization_candidates {
-        let evidence = &candidate.cost;
-        let age = environment
-            .observed_at_unix_ms
-            .saturating_sub(evidence.observed_at_unix_ms);
-        let valid = evidence.observed_at_unix_ms <= environment.observed_at_unix_ms
-            && !candidate.realization_id.trim().is_empty()
-            && ids.insert(candidate.realization_id.clone())
-            && !evidence.model_version.trim().is_empty()
-            && !evidence.workload_fingerprint.trim().is_empty()
-            && evidence.valid_for_ms != 0
-            && age <= environment.max_evidence_age_ms.min(evidence.valid_for_ms)
-            && evidence.horizon_seconds.is_finite()
-            && (evidence.horizon_seconds - query.summary_lifecycle_inputs.horizon_seconds).abs()
-                <= f64::EPSILON
-            && evidence.cpu_cost.is_finite()
-            && evidence.cpu_cost >= 0.0
-            && evidence.weighted_cost.is_finite()
-            && evidence.weighted_cost >= 0.0
-            && candidate.window_secs == query.query_lookback_seconds
-            && candidate
-                .layout
-                .validate(candidate.window_secs, candidate.slide_secs)
-                .is_ok()
-            && windows::supported(candidate, environment.target);
-        if !valid {
-            return Err(CompileError::Lifecycle {
-                query_id: query.query_id.clone(),
-                reason: format!(
-                    "window implementation `{}` has incomplete, stale, incompatible, or duplicate physical evidence",
-                    candidate.realization_id
-                ),
-            });
-        }
-        candidates.push((
-            candidate.realization_id.clone(),
-            candidate.framework.clone(),
-            Cost(evidence.weighted_cost),
-        ));
-    }
-    if candidates.is_empty() {
-        return Err(CompileError::Lifecycle {
-            query_id: query.query_id.clone(),
-            reason: "no complete executor-feasible window implementation evidence".into(),
-        });
-    }
-    Ok(candidates)
-}
-
-pub(super) fn retained_state_count(
-    lookback_ms: u64,
-    staleness_margin_ms: u64,
-    slide_ms: u64,
-    layout: &asap_types::WindowMaterializationLayout,
-) -> u64 {
-    match layout {
-        asap_types::WindowMaterializationLayout::FullWindow => staleness_margin_ms
-            .div_ceil(slide_ms.max(1))
-            .saturating_add(1),
-        asap_types::WindowMaterializationLayout::Pane { pane_secs } => lookback_ms
-            .saturating_add(staleness_margin_ms)
-            .div_ceil(pane_secs.saturating_mul(1_000).max(1))
-            .saturating_add(1),
-        asap_types::WindowMaterializationLayout::HierarchicalRollup { base_pane_secs, .. } => {
-            lookback_ms
-                .saturating_add(staleness_margin_ms)
-                .div_ceil(base_pane_secs.saturating_mul(1_000).max(1))
-                .saturating_add(1)
-        }
-    }
-}
-
-/// Estimate the encoded bytes retained by one physical state. Sketch matrix
-/// cells use two words here, covering the counter plus observed serialization
-/// overhead. Heap and exact-state estimates include container slack.
-fn retained_state_bytes(materialization: &asap_types::PrecomputeMaterialization) -> u128 {
-    estimated_state_bytes(
-        &materialization.aggregation_type,
-        &materialization.parameters,
-    )
-}
-
-pub(super) fn estimated_state_bytes(
-    aggregation: &asap_types::AggregationType,
-    parameters: &HashMap<String, Value>,
-) -> u128 {
-    use asap_types::AggregationType as A;
-
-    let parameter = |names: &[&str], fallback: u64| {
-        names
-            .iter()
-            .find_map(|name| parameters.get(*name).and_then(Value::as_u64))
-            .unwrap_or(fallback) as u128
-    };
-    match aggregation {
-        A::CountMinSketch | A::CountSketch => {
-            parameter(&["width", "w", "col_num", "col"], 1)
-                * parameter(&["depth", "d", "row_num", "row"], 1)
-                * 16
-        }
-        A::CountMinSketchWithHeap | A::CountSketchWithHeap => {
-            parameter(&["width", "w", "col_num", "col"], 1)
-                * parameter(&["depth", "d", "row_num", "row"], 1)
-                * 16
-                + parameter(&["heap_size"], 1) * 256
-        }
-        A::DatasketchesKLL => parameter(&["k"], 200) * 32,
-        A::UnivMon => {
-            parameter(&["layers"], 4)
-                * (parameter(&["sketch_rows"], 5) * parameter(&["sketch_cols"], 1024) * 16
-                    + parameter(&["heap_size"], 32) * 256)
-        }
-        A::HydraKLL => parameter(&["k"], 200) * parameter(&["col", "cols"], 1) * 32,
-        A::HLL => 1u128 << parameter(&["precision", "p"], 14).min(24),
-        A::DDSketch => 64 * 1024,
-        A::Sum
-        | A::Count
-        | A::Increase
-        | A::Rate
-        | A::Min
-        | A::Max
-        | A::SingleSubpopulation
-        | A::MultipleSubpopulation => 256,
-    }
-}
-
-fn retained_partition_count(
-    materialization: &asap_types::PrecomputeMaterialization,
-    input_cardinality: Option<u64>,
-) -> u128 {
-    use asap_types::AggregationType as A;
-
-    // Reset-aware and min/max state remains source-series scoped even with an
-    // empty output grouping. Grouped states have at most one partition per
-    // input series. Other empty groupings are the Reduce([]) global singleton.
-    if materialization.partitioning == Some(asap_types::sds::PopulationPartitioning::PerEntity)
-        || matches!(
-            materialization.aggregation_type,
-            A::Increase | A::Rate | A::Min | A::Max
-        )
-        || !materialization.grouping_labels.names().is_empty()
-    {
-        u128::from(input_cardinality.unwrap_or(1).max(1))
-    } else {
-        1
-    }
-}
-
-fn validate_retained_summary_footprint(
-    materializations: &[asap_types::PrecomputeMaterialization],
-    input_cardinality: Option<u64>,
-    budget_bytes: u64,
-) -> Result<(), CompileError> {
-    let estimated_bytes = materializations
-        .iter()
-        .fold(0u128, |total, materialization| {
-            total.saturating_add(
-                retained_state_bytes(materialization)
-                    .saturating_mul(u128::from(
-                        materialization.num_aggregates_to_retain.unwrap_or(1),
-                    ))
-                    .saturating_mul(retained_partition_count(materialization, input_cardinality)),
-            )
-        });
-    if estimated_bytes > u128::from(budget_bytes) {
-        return Err(CompileError::Query {
-            query_id: "retained-summary-footprint".into(),
-            reason: format!(
-                "estimated retained summary footprint {estimated_bytes} bytes exceeds budget {budget_bytes} bytes across panes and partitions"
-            ),
-        });
-    }
-    Ok(())
-}
-
-struct PlannerPhysicalSelection {
-    window_realization_id: String,
-    lifecycle: CollectorLifecycle,
-    window_framework: SummaryWindowFramework,
-    expected_reads: f64,
-    expected_updates: f64,
-    lifecycle_cost: f64,
-}
-
-fn select_lifecycle(
-    query: &QueryCompilationInput,
-    node: &SummaryNode,
-    model: &ControlPlaneCostModel,
-    environment: &PhysicalDeploymentContext,
-    consumers: &[&QueryCompilationInput],
-    original_workload: Option<(&QueryWorkload, Option<&DataWorkload>, Vec<usize>)>,
-) -> Result<PlannerPhysicalSelection, CompileError> {
-    // Current lifecycle evidence is per producer with one unit read cost.
-    // Conflicting source/rate/horizon/cost snapshots cannot be averaged into
-    // invented evidence. Only recurrence may differ between consumers.
-    let mut common = query.summary_lifecycle_inputs.clone();
-    common.evaluation_interval_ms = 0;
-    for consumer in consumers {
-        let mut input = consumer.summary_lifecycle_inputs.clone();
-        input.evaluation_interval_ms = 0;
-        if input != common {
-            return Err(CompileError::Lifecycle {
-                query_id: consumer.query_id.clone(),
-                reason: "shared producer consumers have conflicting lifecycle evidence".into(),
-            });
-        }
-    }
-    let workload = QueryWorkload {
-        language: QueryLanguage::PromQL,
-        query_batch: None,
-        repeating_queries: Some(
-            consumers
-                .iter()
-                .map(|query| RepeatingEntry {
-                    query: Query(query.query_id.clone()),
-                    demand: RepeatedDemand::FixedInterval(RepetitionInterval(
-                        query.summary_lifecycle_inputs.evaluation_interval_ms,
-                    )),
-                    requirements: QueryRequirements {
-                        accuracy: AccuracyRequirement::Explicit(query.accuracy_target.clone()),
-                        ..QueryRequirements::default()
-                    },
-                    predictability: Predictability::Predictable { known_at: None },
-                    time_selection: TimeSelection {
-                        // Collector windows are retired as whole states. They do not
-                        // claim deletion support for moving-window retractions.
-                        scope: QueryTimeScope::Unknown,
-                        lookback: Some(DurationMs(
-                            raw_materialization_input_contract(node)
-                                .ok()
-                                .and_then(|(_, window, _)| window)
-                                .unwrap_or(query.query_lookback_seconds)
-                                .saturating_mul(1_000),
-                        )),
-                        as_of: None,
-                    },
-                })
-                .collect(),
-        ),
-    };
-    let fallback_data = DataWorkload {
-        arrival: DataArrival::ContinuouslyIngesting,
-        // This workload is an internal lifecycle projection, not a
-        // plan-ready query input. Use the compatibility profile cadence
-        // when there is no original workload to carry source evidence.
-        data_ingestion_interval: Evidence {
-            value: Some(DurationMs(1_000)),
-            source: EvidenceSource::Declared,
-            observed_at_ms: None,
-            valid_for_ms: None,
-        },
-        ingestion_rate: Evidence {
-            value: Some(Rate(
-                query.summary_lifecycle_inputs.ingestion_rate_per_second,
-            )),
-            source: EvidenceSource::Observed,
-            observed_at_ms: Some(query.summary_lifecycle_inputs.evidence_observed_at_unix_ms),
-            valid_for_ms: Some(query.summary_lifecycle_inputs.evidence_valid_for_ms),
-        },
-        ..DataWorkload::default()
-    };
-    let (workload, data, indices) = match original_workload {
-        Some((original, data, indices)) => (original, data.unwrap_or(&fallback_data), indices),
-        None => (&workload, &fallback_data, (0..consumers.len()).collect()),
-    };
-    let plan = plan_summary_maintenance_lifecycles(
-        Rc::new(node.clone()),
-        WorkloadDemand::new_with_data(workload, data, &indices),
-        environment.observed_at_unix_ms,
-        Some(Horizon(query.summary_lifecycle_inputs.horizon_seconds)),
-        SummaryMaintenanceLifecycleCapabilities {
-            supports_ephemeral: false,
-            supports_prepared: false,
-            supports_shared: false,
-            supports_continuously_maintained: true,
-        },
-        model,
-    )
-    .map_err(|error| CompileError::Lifecycle {
-        query_id: query.query_id.clone(),
-        reason: error.to_string(),
-    })?;
-    let guarantee = plan
-        .deployments
-        .first()
-        .and_then(|deployment| deployment.summary_maintenance_lifecycle_guarantee.as_ref())
-        .ok_or_else(|| CompileError::Lifecycle {
-            query_id: query.query_id.clone(),
-            reason: "latest ASAPPlanner selected no executable Collector lifecycle".into(),
-        })?;
-    let window_framework = plan
-        .deployments
-        .first()
-        .and_then(|deployment| deployment.selected_window_framework.clone())
-        .ok_or_else(|| CompileError::Lifecycle {
-            query_id: query.query_id.clone(),
-            reason: "latest ASAPPlanner selected no window framework from the supplied physical evidence".into(),
-        })?;
-    Ok(PlannerPhysicalSelection {
-        window_realization_id: plan
-            .selected_window_implementation_id
-            .clone()
-            .ok_or_else(|| CompileError::Lifecycle {
-                query_id: query.query_id.clone(),
-                reason: "Planner returned no concrete window implementation identity".into(),
-            })?,
-        expected_reads: plan.expected_reads.ok_or_else(|| CompileError::Lifecycle {
-            query_id: query.query_id.clone(),
-            reason: "missing joint read demand".into(),
-        })?,
-        expected_updates: plan
-            .update_rate
-            .ok_or_else(|| CompileError::Lifecycle {
-                query_id: query.query_id.clone(),
-                reason: "missing source update demand".into(),
-            })?
-            .0
-            * query.summary_lifecycle_inputs.horizon_seconds,
-        lifecycle_cost: plan.deployments[0]
-            .alternatives
-            .iter()
-            .find(|alternative| {
-                alternative.rejection.is_none()
-                    && alternative.summary_maintenance_lifecycle
-                        == guarantee.summary_maintenance_lifecycle
-            })
-            .and_then(|alternative| alternative.total_cost)
-            .ok_or_else(|| CompileError::Lifecycle {
-                query_id: query.query_id.clone(),
-                reason: "missing selected lifecycle cost".into(),
-            })?
-            .0,
-        lifecycle: CollectorLifecycle {
-            kind: match guarantee.summary_maintenance_lifecycle {
-                SummaryMaintenanceLifecycle::Ephemeral => "ephemeral",
-                SummaryMaintenanceLifecycle::Prepared { .. } => "prepared",
-                SummaryMaintenanceLifecycle::Shared { .. } => "shared",
-                SummaryMaintenanceLifecycle::ContinuouslyMaintained => "continuously_maintained",
-            }
-            .into(),
-            maintenance_mode: match guarantee.summary_maintenance_mode {
-                SummaryMaintenanceMode::DirectBuild => "direct_build",
-                SummaryMaintenanceMode::Incremental => "incremental",
-            }
-            .into(),
-            evaluation_schedule: match guarantee.evaluation_schedule {
-                EvaluationSchedule::OneShot => "one_shot",
-                EvaluationSchedule::PerUpdate => "per_update",
-                EvaluationSchedule::OnRead => "on_read",
-            }
-            .into(),
-            output_representation: match guarantee.output_representation {
-                OutputRepresentation::PlainRows => "plain_rows",
-                OutputRepresentation::SummaryState => "summary_state",
-                OutputRepresentation::FinalizedValue => "finalized_value",
-            }
-            .into(),
-        },
-        window_framework,
-    })
-}
-
-/// A warm producer may consume only a source whose semantics its precompute accumulator
-/// implements. Predicates and shifted ranges remain executable query-time nodes.
-pub(crate) fn raw_materialization_input_contract(
-    node: &SummaryNode,
-) -> Result<(String, Option<u64>, String), String> {
-    let SummaryExpr::SummaryAgg { child, .. } = &node.expr else {
-        return Err("materialization requires a SummaryAgg leaf".into());
-    };
-    let SummaryExpr::KeepPreAsap(expr) = &child.expr else {
-        return Err("materialization input is not a raw source".into());
-    };
-    raw_time_series_input_contract(
-        expr,
-        matches!(
-            &node.expr,
-            SummaryExpr::SummaryAgg {
-                family: SummaryFamilyType::ExactAggregate(..),
-                ..
-            }
-        ),
-    )
-}
-
-pub fn raw_time_series_input_contract(
-    expr: &QueryExpr,
-    exact: bool,
-) -> Result<(String, Option<u64>, String), String> {
-    use planner_types::pre_asap::{CompareOpKind, ScalarValue};
-    let (source, window_secs) = match expr {
-        QueryExpr::TimeRange { child, range } => {
-            if range.as_millis() == 0 || range.as_millis() % 1000 != 0 {
-                return Err("warm producer requires a positive whole-second range".into());
-            }
-            (child.as_ref(), Some(range.as_secs()))
-        }
-        QueryExpr::Scan { .. } if exact => {
-            return Err(
-                "instantaneous sample selection is not a temporal accumulator readout".into(),
-            );
-        }
-        source => (source, None),
-    };
-    match source {
-        QueryExpr::Scan {
-            source: Source::TimeSeries { metric },
-            predicates,
-            schema,
-        } if !metric.is_empty() => {
-            let mut matchers = Vec::with_capacity(predicates.len());
-            for predicate in predicates {
-                let QueryExpr::Compare { left, op, right } = predicate.0.as_ref() else {
-                    return Err("materialization filter is not a label comparison".into());
-                };
-                let (QueryExpr::Column(column), QueryExpr::Literal(ScalarValue::Utf8(value))) =
-                    (left.as_ref(), right.as_ref())
-                else {
-                    return Err("materialization filter must compare a label with a string".into());
-                };
-                let label = schema
-                    .columns
-                    .get(*column)
-                    .map(|field| field.name.as_str())
-                    .ok_or_else(|| {
-                        "materialization filter references an unknown column".to_string()
-                    })?;
-                let operator = match op {
-                    CompareOpKind::Eq => "=",
-                    CompareOpKind::Ne => "!=",
-                    CompareOpKind::Regex => "=~",
-                    CompareOpKind::NotRegex => "!~",
-                    _ => return Err("materialization filter uses a non-PromQL comparison".into()),
-                };
-                let encoded = serde_json::to_string(value).map_err(|error| error.to_string())?;
-                matchers.push(format!("{label}{operator}{encoded}"));
-            }
-            matchers.sort();
-            let spatial_filter = if matchers.is_empty() {
-                String::new()
-            } else {
-                format!("{{{}}}", matchers.join(","))
-            };
-            Ok((metric.clone(), window_secs, spatial_filter))
-        }
-        _ => {
-            Err("source predicates or temporal modifiers require a Prometheus exact subtree".into())
-        }
-    }
-}
-
-/// Immutable inputs may combine explicit exact accumulator readouts using
-/// maintenance-time arithmetic. Population and window closure are checked by
-/// the installed runtime, not inferred from the presence of this syntax.
-fn immutable_materialization_sources(node: &SummaryNode) -> Option<Vec<Rc<SummaryNode>>> {
-    use planner_types::post_asap::{ExactKind, ExecutionTiming, SummaryInputExpr};
-    let SummaryExpr::SummaryAgg {
-        child,
-        input,
-        family: SummaryFamilyType::Sketch(..),
-        ..
-    } = &node.expr
-    else {
-        // Existing exact spatial reductions execute over read-time values.
-        // They must not acquire a new durable maintenance dependency merely
-        // because Planner made the exact accumulator boundary explicit.
-        return None;
-    };
-    if input.item.is_some()
-        || !matches!(
-            input.weight,
-            SummaryInputExpr::Column(planner_types::pre_asap::ColumnRef::SampleValue)
-        )
-    {
-        return None;
-    }
-    fn collect(node: &Rc<SummaryNode>, sources: &mut Vec<Rc<SummaryNode>>) -> Option<()> {
-        match &node.expr {
-            SummaryExpr::BinaryOp {
-                lhs,
-                rhs,
-                operator,
-                timing: ExecutionTiming::IngestionTime,
-            } if operator.vector_match.is_none()
-                && matches!(
-                    operator.kind,
-                    planner_types::pre_asap::BinaryOpKind::Arithmetic(_)
-                ) =>
-            {
-                collect(lhs, sources)?;
-                collect(rhs, sources)?;
-            }
-            SummaryExpr::ValueOperation {
-                child: source,
-                operation: planner_types::post_asap::ValueOperation::FinalizeExactAccumulator,
-                timing: ExecutionTiming::IngestionTime,
-            } if matches!(&source.expr,
-                    SummaryExpr::SummaryAgg { family: SummaryFamilyType::ExactAggregate(ExactKind::Sum | ExactKind::Count, _), child, .. }
-                    if matches!(child.expr, SummaryExpr::KeepPreAsap(_))) =>
-            {
-                if !sources.iter().any(|old| Rc::ptr_eq(old, source)) {
-                    sources.push(source.clone());
-                }
-            }
-            _ => return None,
-        }
-        Some(())
-    }
-    let mut sources = Vec::new();
-    collect(child, &mut sources)?;
-    Some(sources)
-}
-
-fn selected_input_contract(node: &SummaryNode) -> Result<(String, Option<u64>, String), String> {
-    if let Some(source) = immutable_materialization_sources(node) {
-        raw_materialization_input_contract(&source[0])
-    } else {
-        raw_materialization_input_contract(node)
-    }
-}
-
-struct SelectedMaterialization {
-    node: Rc<SummaryNode>,
-    metric: String,
-    window_secs: Option<u64>,
-    spatial_filter: String,
-    group_by: Option<Vec<String>>,
-    item_label: Option<String>,
-    family: SummaryFamilyType,
-    algorithm: String,
-    parameters: Value,
-}
-
-fn validate_executable_subdag(node: &Rc<SummaryNode>) -> Result<(), String> {
-    let executable = planner_types::post_asap::compile_executable_dag(node)
-        .map_err(|error| format!("invalid executable subDAG: {error}"))?;
-    if let Some(edge) = executable.edges.iter().find(|edge| {
-        edge.grouping == planner_types::post_asap::GroupingEdgeCompatibility::Incompatible
-    }) {
-        return Err(format!(
-            "executable subDAG contains incompatible grouping edge {} -> {} ({:?})",
-            edge.producer.0, edge.consumer.0, edge.role
-        ));
-    }
-    Ok(())
-}
-
-fn reject_uncertified_readouts(query_id: &str, root: &Rc<SummaryNode>) -> Result<(), CompileError> {
-    let dag = planner_types::post_asap::compile_executable_dag(root).map_err(|error| {
-        CompileError::Query {
-            query_id: query_id.into(),
-            reason: format!("invalid executable subDAG: {error}"),
-        }
-    })?;
-    for node in &dag.nodes {
-        if matches!(
-            node.payload,
-            planner_types::post_asap::ExecutableOperatorPayload::SummaryEstimate { .. }
-        ) && node
-            .guarantee
-            .as_ref()
-            .is_none_or(planner_types::post_asap::ResultGuarantee::has_unknown)
-        {
-            return Err(CompileError::Query {
-                query_id: query_id.into(),
-                reason: "selected summary readout has no certified accuracy guarantee; provide scoped evidence or use exact execution".into(),
-            });
-        }
-    }
-    Ok(())
-}
-
-fn physical_aggregation(
-    query: &QueryCompilationInput,
-    selected: &SelectedMaterialization,
-    aggregation_id: String,
-    target: PhysicalDeploymentTarget,
-) -> BackendAggregation {
-    BackendAggregation {
-        aggregation_id,
-        metric_name: selected.metric.clone(),
-        family: selected.family.clone(),
-        window_secs: selected.window_secs.unwrap_or(query.query_lookback_seconds),
-        spatial_filter: selected.spatial_filter.clone(),
-        grouping: selected
-            .group_by
-            .clone()
-            .unwrap_or_else(|| query.group_by_labels.clone()),
-        item_label: selected.item_label.clone(),
-        heap_update_mode: selected.parameters.get("weight_mode").and_then(|mode| {
-            match mode.as_str() {
-                Some("count") => Some("count"),
-                Some("value") => Some("value"),
-                Some("counter_delta") => Some("counter_delta"),
-                _ => None,
-            }
-        }),
-        aggregation_input: match target {
-            PhysicalDeploymentTarget::DistributedCollectors => AggregationInput::SketchEnvelope,
-            PhysicalDeploymentTarget::BackendLocalRemoteWrite => AggregationInput::Raw,
-        },
-    }
-}
-
-/// Convert the typed physical aggregation into the runtime's canonical
-/// content-addressed materialization contract. This is the one conversion
-/// shared by the physical compiler and the compatibility replanner; it does
-/// not create a second registry or wire plan.
-fn scoped_materialization(
-    aggregation: &BackendAggregation,
-    node: &SummaryNode,
-) -> anyhow::Result<asap_types::PrecomputeMaterialization> {
-    let mut config =
-        aggregation_config_for_materialization(aggregation, asap_types::QueryLanguage::PromQl)?;
-    if !matches!(aggregation.aggregation_input, AggregationInput::Raw) {
-        return Ok(config);
-    }
-    let SummaryExpr::SummaryAgg { reduction, .. } = &node.expr else {
-        anyhow::bail!("materialization lacks SummaryAgg partition contract");
-    };
-    config.partitioning = Some(match reduction {
-        planner_types::pre_asap::Reduction::PerEntity => {
-            asap_types::sds::PopulationPartitioning::PerEntity
-        }
-        planner_types::pre_asap::Reduction::Reduce(_) => {
-            asap_types::sds::PopulationPartitioning::Grouped
-        }
-    });
-    Ok(config)
-}
-
-pub(crate) fn aggregation_config_for_materialization(
-    aggregation: &BackendAggregation,
-    language: asap_types::QueryLanguage,
-) -> anyhow::Result<asap_types::PrecomputeMaterialization> {
-    use anyhow::Context as _;
-    let mut json = crate::emit::backend_wire::build_backend_aggregation_json(aggregation);
-    // The selected physical duration is authoritative. The legacy edge emitter's
-    // 5..60 second clamp must not silently change a backend materialization.
-    json["windowSize"] = serde_json::json!(aggregation.window_secs);
-    if language == asap_types::QueryLanguage::ClickHouseSql {
-        // Raw input does not imply PromQL's (start,end] convention. SQL bounds
-        // are normalized and bound explicitly by the SQL compiler.
-        json["parameters"]
-            .as_object_mut()
-            .expect("emitter parameters are an object")
-            .remove("promql_right_closed");
-    }
-    let yaml = serde_yaml::to_value(json).context("convert physical aggregation fields")?;
-    asap_types::PrecomputeMaterialization::from_yaml_data(
-        &yaml,
-        None,
-        asap_types::QueryLanguage::PromQl,
-    )
-    .context("build materialization from physical aggregation")
-}
-
-fn materialization_consumers(
-    queries: &[QueryCompilationInput],
-    target: PhysicalDeploymentTarget,
-    composable: bool,
-) -> Result<BTreeMap<asap_types::PolicyFingerprint, BTreeSet<usize>>, CompileError> {
-    let mut consumers = BTreeMap::<_, BTreeSet<_>>::new();
-    // Until logical lifecycle costing carries a derived-program identity,
-    // never combine unrelated programs under the legacy raw-state key.
-    let mut cohort_programs =
-        BTreeMap::<asap_types::PolicyFingerprint, Option<*const SummaryNode>>::new();
-    for (index, query) in queries.iter().enumerate() {
-        let states = collect_selected_materializations(&query.selected_plan_root, composable)
-            .map_err(|reason| CompileError::Query {
-                query_id: query.query_id.clone(),
-                reason,
-            })?;
-        for state in states {
-            if composable
-                && state.window_secs.is_some_and(|window| {
-                    !query
-                        .window_realization_candidates
-                        .iter()
-                        .any(|candidate| candidate.window_secs == window)
-                })
-            {
-                continue;
-            }
-            let config = scoped_materialization(
-                &physical_aggregation(query, &state, query.query_id.clone(), target),
-                &state.node,
-            )?;
-            let program =
-                immutable_materialization_sources(&state.node).map(|_| Rc::as_ptr(&state.node));
-            if let Some(previous) = cohort_programs.insert(config.policy_fingerprint(), program) {
-                if previous != program && (previous.is_some() || program.is_some()) {
-                    return Err(CompileError::Query {
-                        query_id: query.query_id.clone(),
-                        reason:
-                            "distinct immutable programs require separate lifecycle cost cohorts"
-                                .into(),
-                    });
-                }
-            }
-            consumers
-                .entry(config.policy_fingerprint())
-                .or_default()
-                .insert(index);
-        }
-    }
-    Ok(consumers)
-}
-
-fn shared_pane_origin_ms(
-    workload: Option<&QueryWorkload>,
-    consumer_indices: impl IntoIterator<Item = usize>,
-    pane_width_ms: u64,
-) -> Result<Option<i64>, String> {
-    if pane_width_ms == 0 {
-        return Err("materialized pane width is zero".into());
-    }
-    let pane_width = i64::try_from(pane_width_ms)
-        .map_err(|_| "materialized pane width exceeds runtime timestamp range".to_string())?;
-    let Some(workload) = workload else {
-        // Compatibility-only PhysicalCompilationRequest callers do not claim a certified
-        // phase. The read path rejects this binding and uses exact fallback.
-        return Ok(None);
-    };
-    let entries = workload.entries().collect::<Vec<_>>();
-    let mut selected_phase = None;
-    for index in consumer_indices {
-        let entry = entries
-            .get(index)
-            .ok_or_else(|| format!("consumer index {index} is absent from QueryWorkload"))?;
-        let QueryRecurrence::Repeated(demand @ RepeatedDemand::FixedIntervalAt { .. }) =
-            &entry.recurrence
-        else {
-            return Err(format!(
-                "shared pane-only summary consumer {index} has unknown evaluation phase"
-            ));
-        };
-        let layout = planner_types::post_asap::plan_pane_phase(demand, pane_width_ms)
-            .map_err(|error| format!("invalid pane phase for consumer {index}: {error:?}"))?;
-        let origin = layout.pane_origin_ms.ok_or_else(|| {
-            format!("shared pane-only summary consumer {index} has unknown evaluation phase")
-        })?;
-        let phase = origin.rem_euclid(pane_width);
-        if selected_phase.is_some_and(|selected| selected != phase) {
-            return Err(format!(
-                "shared pane-only summary consumers have conflicting phases {selected_phase:?} and {phase} for pane width {pane_width_ms}ms"
-            ));
-        }
-        selected_phase = Some(phase);
-    }
-    selected_phase
-        .ok_or_else(|| "materialized summary has no workload consumers".to_string())
-        .map(Some)
-}
-
-/// Collect every executable materialization leaf in the selected post-ASAP
-/// graph. Readout context flows through merge nodes, so a graph such as
-/// `Estimate(Merge(Agg(a), Agg(b)))` creates two physical bindings while the
-/// serialized QueryPlan retains the merge edges. Unsupported operators are
-/// intentionally not traversed: QueryPlan lowers them to an explicit exact
-/// fallback node and no unused warm state is provisioned.
-/// Admit per-entity raw state only when the installed partition contract and
-/// scalar input evaluator preserve source rows. Composite updates still require
-/// an executable maintenance evaluator; a partition flag cannot authorize them.
-fn collect_selected_materializations(
-    node: &Rc<SummaryNode>,
-    composable: bool,
-) -> Result<Vec<SelectedMaterialization>, String> {
-    fn walk(
-        node: &Rc<SummaryNode>,
-        readout: Option<&SketchQuery>,
-        composable: bool,
-        inherited_grouping: Option<Vec<String>>,
-        selected: &mut Vec<SelectedMaterialization>,
-    ) -> Result<(), String> {
-        let grouping = if composable {
-            if let SummaryExpr::SummaryAgg {
-                reduction, child, ..
-            } = &node.expr
-            {
-                if let Some(keys) = reduction.group_keys() {
-                    Some(
-                        keys.keys()
-                            .iter()
-                            .map(|id| {
-                                child
-                                    .schema
-                                    .fields
-                                    .get(*id)
-                                    .map(|field| field.name.clone())
-                                    .ok_or_else(|| {
-                                        format!("unresolved producer grouping column {id}")
-                                    })
-                            })
-                            .collect::<Result<Vec<_>, _>>()?,
-                    )
-                } else {
-                    inherited_grouping
-                }
-            } else {
-                inherited_grouping
-            }
-        } else {
-            None
-        };
-        if let Some(source) = immutable_materialization_sources(node) {
-            for source in source {
-                walk(&source, None, composable, None, selected)?;
-            }
-        }
-        match &node.expr {
-            SummaryExpr::RelationalJoin {
-                left: values,
-                right: candidates,
-                kind: planner_types::pre_asap::JoinKind::Semi,
-                pruning: Some(_),
-                ..
-            } => {
-                walk(candidates, readout, composable, grouping.clone(), selected)?;
-                // Explicit external authoritative values do not need duplicate local state.
-                if !composable {
-                    walk(values, readout, composable, grouping.clone(), selected)?;
-                }
-            }
-            SummaryExpr::ValueOperation { child, .. } => {
-                walk(child, readout, composable, grouping.clone(), selected)?;
-            }
-            SummaryExpr::RelationalJoin { left, right, .. } => {
-                walk(left, readout, composable, grouping.clone(), selected)?;
-                walk(right, readout, composable, grouping.clone(), selected)?;
-            }
-            SummaryExpr::BinaryOp { lhs, rhs, .. }
-                if composable || crate::query_plan::exact_value_executable(node) =>
-            {
-                walk(lhs, readout, composable, grouping.clone(), selected)?;
-                walk(rhs, readout, composable, grouping.clone(), selected)?;
-            }
-            SummaryExpr::SummaryAgg {
-                child,
-                family:
-                    SummaryFamilyType::ExactAggregate(planner_types::post_asap::ExactKind::Sum, _),
-                ..
-            } if !matches!(child.expr, SummaryExpr::KeepPreAsap(_))
-                && ((composable
-                    && crate::query_plan::exact_accumulator_value_source(child).is_some())
-                    || crate::query_plan::exact_value_executable(node)) =>
-            {
-                walk(child, readout, composable, grouping.clone(), selected)?;
-            }
-            SummaryExpr::SummaryAgg { child, .. }
-                if !matches!(child.expr, SummaryExpr::KeepPreAsap(_))
-                    && immutable_materialization_sources(node).is_none() => {}
-            SummaryExpr::SummaryAgg {
-                family:
-                    SummaryFamilyType::ExactAggregate(planner_types::post_asap::ExactKind::Count, _),
-                ..
-            } if !crate::query_plan::exact_value_executable(node) => {}
-            SummaryExpr::SummaryEstimate {
-                summary_input,
-                query,
-            } => walk(
-                summary_input,
-                Some(query),
-                composable,
-                grouping.clone(),
-                selected,
-            )?,
-            SummaryExpr::SummaryMerge { children, .. } => {
-                for child in children {
-                    walk(child, readout, composable, grouping.clone(), selected)?;
-                }
-            }
-            SummaryExpr::SummaryAgg {
-                family: SummaryFamilyType::Sketch(kind, _),
-                input,
-                ..
-            } => {
-                // Planner can model these families, but no backend state
-                // implementation exists. Leave an exact boundary unbound.
-                if matches!(
-                    kind.algorithm(),
-                    SketchAlgorithm::Kmv | SketchAlgorithm::Theta
-                ) {
-                    return Ok(());
-                }
-                if let Some(readout) = readout {
-                    let mut parameters = sketch_params_json(kind.params());
-                    let mut item_label = None;
-                    if matches!(readout, SketchQuery::TopK { .. }) {
-                        use planner_types::post_asap::SummaryInputExpr;
-                        item_label = match &input.item {
-                            Some(SummaryInputExpr::Column(
-                                planner_types::pre_asap::ColumnRef::Named(label),
-                            )) => Some(label.clone()),
-                            Some(SummaryInputExpr::Column(
-                                planner_types::pre_asap::ColumnRef::Qualified { name, .. },
-                            )) => Some(name.clone()),
-                            // Legacy/direct TopK plans did not carry an item
-                            // projection. Keep their generic item-key behavior;
-                            // typed Planner plans name the inner aggregate
-                            // identity explicitly through SummaryUpdate.item.
-                            _ => None,
-                        };
-                        let mode = match &input.weight {
-                            SummaryInputExpr::Constant(value) if *value == 1.0 => "count",
-                            SummaryInputExpr::Column(
-                                planner_types::pre_asap::ColumnRef::SampleValue,
-                            ) => "value",
-                            _ => return Err("unsupported TopK SummaryUpdate weight".into()),
-                        };
-                        parameters["weight_mode"] = mode.into();
-                    }
-                    let (metric, window_secs, spatial_filter) = match selected_input_contract(node)
-                    {
-                        Ok(contract) => contract,
-                        Err(_) if composable => return Ok(()),
-                        Err(error) => return Err(error),
-                    };
-                    selected.push(SelectedMaterialization {
-                        node: Rc::clone(node),
-                        metric,
-                        window_secs,
-                        spatial_filter,
-                        group_by: grouping.clone(),
-                        item_label,
-                        family: SummaryFamilyType::Sketch(
-                            kind.clone(),
-                            planner_types::post_asap::GroupingStrategy::PerSubpopulationInstance,
-                        ),
-                        algorithm: format!("{:?}", kind.algorithm()).to_ascii_lowercase(),
-                        parameters,
-                    });
-                }
-            }
-            SummaryExpr::SummaryAgg {
-                family: SummaryFamilyType::ExactAggregate(kind, params),
-                ..
-            } => {
-                let (metric, window_secs, spatial_filter) = match selected_input_contract(node) {
-                    Ok(contract) => contract,
-                    Err(_) if composable => return Ok(()),
-                    Err(error) => return Err(error),
-                };
-                selected.push(SelectedMaterialization {
-                    node: Rc::clone(node),
-                    metric,
-                    window_secs,
-                    spatial_filter,
-                    group_by: grouping.clone(),
-                    item_label: None,
-                    family: SummaryFamilyType::ExactAggregate(kind.clone(), params.clone()),
-                    algorithm: format!("{kind:?}").to_ascii_lowercase(),
-                    parameters: Value::Object(Default::default()),
-                });
-            }
-            SummaryExpr::BinaryOp { .. }
-            | SummaryExpr::KeepPreAsap(_)
-            | SummaryExpr::SummaryAgg { .. }
-            | SummaryExpr::SummaryJoin { .. }
-            | SummaryExpr::SummarySubtract { .. }
-            | SummaryExpr::SummaryDelete { .. } => {}
-        }
-        Ok(())
-    }
-
-    let mut selected = Vec::new();
-    walk(node, None, composable, None, &mut selected)?;
-    if composable {
-        selected
-            .retain(|state| !has_unsafe_raw_entity_leaf(node, &[Rc::clone(&state.node)], false));
-    }
-    if !selected.is_empty() {
-        validate_executable_subdag(node)?;
-    }
-    Ok(selected)
-}
-
-pub(super) fn sketch_params_json(params: &planner_types::post_asap::SketchParams) -> Value {
-    use planner_types::post_asap::SketchParams as P;
-    match params {
-        P::UnivMon {
-            heap_size,
-            sketch_rows,
-            sketch_cols,
-            layers,
-        } => json!({"heap_size": heap_size, "sketch_rows": sketch_rows,
-                "sketch_cols": sketch_cols, "layers": layers}),
-        P::Kll { k } => json!({"k": k}),
-        P::Cms { width, depth } => json!({"width": width, "depth": depth}),
-        P::Hll { precision } => json!({"precision": precision}),
-        P::DDSketch { alpha } => json!({"alpha": alpha}),
-        P::CmsWithHeap {
-            width,
-            depth,
-            heap_size,
-        } => json!({"width": width, "depth": depth, "heap_size": heap_size}),
-        P::Kmv { k } | P::Theta { k } => json!({"k": k}),
-        P::CountSketch { width, depth } => json!({"width": width, "depth": depth}),
-        P::CountSketchWithHeap {
-            width,
-            depth,
-            heap_size,
-        } => json!({"width": width, "depth": depth, "heap_size": heap_size}),
-    }
-}
-
-fn stable_plan_id(materializations: &[CollectorMaterialization]) -> u64 {
-    use std::hash::{Hash, Hasher};
-    let bytes = serde_json::to_vec(materializations).unwrap_or_default();
-    let mut hasher = std::collections::hash_map::DefaultHasher::new();
-    bytes.hash(&mut hasher);
-    hasher.finish()
-}
-
-fn stable_workload_plan_id(
-    materializations: &[CollectorMaterialization],
-    queries: &[QueryCompilationInput],
-) -> u64 {
-    use std::hash::{Hash, Hasher};
-    let mut hasher = std::collections::hash_map::DefaultHasher::new();
-    stable_plan_id(materializations).hash(&mut hasher);
-    for query in queries {
-        query.query_id.hash(&mut hasher);
-        query.query_string.hash(&mut hasher);
-    }
-    hasher.finish()
-}
-
-/// Parser/executor frontend for the time-series physical compiler. SQL has its
-/// own compilation input and must not silently enter this path.
-#[derive(Debug, Clone, Copy, PartialEq, Eq)]
-pub enum QueryFrontend {
-    PromQl,
-    MetricsQl,
-}
-impl QueryFrontend {
-    pub fn parse(
-        self,
-        query: &str,
-        accuracy: crate::types::AccuracyTarget,
-    ) -> Result<planner_types::pre_asap::QueryExpr, String> {
-        crate::query_parser::parse_query_expr_canonical(query, accuracy).map_err(|error| match self
-        {
-            Self::PromQl => format!("frontend.promql: {error}"),
-            Self::MetricsQl => format!("victoriametrics.promql_subset: {error}"),
-        })
-    }
-    pub fn compile(
-        self,
-        request: PhysicalCompilationRequest,
-        environment: PhysicalDeploymentContext,
-    ) -> Result<CompiledPhysicalPlan, CompileError> {
-        DeploymentPlanCompiler.compile_for_frontend(request, environment, self)
-    }
-}
-#[cfg(test)]
-pub(crate) mod tests {
-    use super::*;
-
-    /// Multiple current-value quantiles and TopK limits share one maintained population.
-    #[test]
-    fn current_series_quantiles_and_topk_have_a_shared_executable_candidate() {
-        let mut snapshot: BackendLocalPlanningInput = serde_json::from_str(include_str!(
-            "../../../docs/examples/asapquery-planning-snapshot.json"
-        ))
-        .unwrap();
-        snapshot.schema_version = 3;
-        snapshot.data_workload.data_ingestion_interval.value = Some(DurationMs(1_000));
-        let template = snapshot.query_workload.repeating_queries.as_ref().unwrap()[0].clone();
-        let queries = [
-            "quantile by (job) (0.5, a)",
-            "quantile by (job) (0.9, a)",
-            "quantile by (job) (0.95, a)",
-            "quantile by (job) (0.99, a)",
-            "topk by (job) (1, a)",
-            "topk by (job) (5, a)",
-        ];
-        snapshot.query_workload.repeating_queries = Some(
-            queries
-                .iter()
-                .map(|q| {
-                    let mut entry = template.clone();
-                    entry.query = planner_types::workload::Query((*q).into());
-                    entry
-                })
-                .collect(),
-        );
-        let (request, environment) = snapshot.into_physical_compilation_request().unwrap();
-        let plans: Vec<_> =
-            super::super::workload_cost::enumerate_exact_and_materialized_candidates(request)
-                .unwrap()
-                .into_iter()
-                .filter_map(|r| {
-                    DeploymentPlanCompiler
-                        .compile_promql(r, environment.clone())
-                        .ok()
-                })
-                .collect();
-        let plan = plans
-            .iter()
-            .find(|plan| {
-                plan.query_plan.entries.values().all(|entry| {
-                    entry.nodes.values().any(|node| {
-                        matches!(node, crate::query_plan::QueryPlanNode::Logical {
-                operator: crate::query_plan::query_time::QueryTimeOperator::CurrentSeries { .. }, ..
-            })
-                    })
-                })
-            })
-            .expect("no shared current-series candidate");
-        let mut populations = BTreeSet::new();
-        for entry in plan.query_plan.entries.values() {
-            for node in entry.nodes.values() {
-                if let crate::query_plan::QueryPlanNode::Logical {
-                    operator:
-                        crate::query_plan::query_time::QueryTimeOperator::CurrentSeries {
-                            population,
-                            ..
-                        },
-                    ..
-                } = node
-                {
-                    // A longer scrape cadence cannot extend the declared selector horizon.
-                    assert_eq!(population.max_input_lag_ms, 1_000);
-                    assert_eq!(population.lookback_ms, 1_000);
-                    assert_eq!(population.max_k, 5);
-                    assert!(population.quantiles);
-                    populations.insert(population.key());
-                }
-            }
-        }
-        assert_eq!(populations.len(), 1);
-        let installed = serde_json::to_string(&plan.precompute_plan.executable_dags).unwrap();
-        assert!(
-            !installed.contains("MaintainPopulation"),
-            "query-only population readout must not be executable maintenance"
-        );
-    }
-
-    // Physical lowering follows selected Planner IR, independent of catalog text.
-    #[test]
-    fn current_series_lowering_uses_selected_ir_not_query_text() {
-        let mut request = request("ir", "quantile(0.5, a)");
-        let root = Rc::new(
-            crate::query_parser::parse_query_expr_canonical(
-                "quantile(0.5, a)",
-                AccuracyTarget::Exact,
-            )
-            .unwrap(),
-        );
-        let strategy = asap_aware_mapping::maintained_population::MaintainedPopulationStrategy::new(
-            std::slice::from_ref(&root),
-        );
-        request.queries[0].selected_plan_root = strategy.candidate(&root).unwrap();
-        let before = super::super::maintained_population::operator(&request, &request.queries[0])
-            .unwrap()
-            .unwrap();
-        request.queries[0].query_string = "quantile(0.99, b)".into();
-        let after = super::super::maintained_population::operator(&request, &request.queries[0])
-            .unwrap()
-            .unwrap();
-        assert_eq!(before, after);
-        request.queries[0].selected_plan_root =
-            crate::planner_selection::keep_pre_asap(&root).unwrap();
-        assert!(
-            super::super::maintained_population::operator(&request, &request.queries[0])
-                .unwrap()
-                .is_none()
-        );
-    }
-
-    // A valid table-row DAG cannot be served by remote-write latest-series state.
-    #[test]
-    fn maintained_table_population_requires_a_compatible_executor() {
-        let mut request = request("sql", "quantile(0.5, a)");
-        let mut root = crate::query_parser::parse_query_expr_canonical(
-            "quantile(0.5, a)",
-            AccuracyTarget::Exact,
-        )
-        .unwrap();
-        let planner_types::pre_asap::QueryExpr::Aggregate { child, .. } = &mut root else {
-            unreachable!()
-        };
-        // SQL rows have no PromQL instant-selector time range.
-        if let QueryExpr::TimeRange { child: scan, .. } = child.as_ref() {
-            *child = Rc::clone(scan);
-        }
-        let planner_types::pre_asap::QueryExpr::Scan { source, schema, .. } = Rc::make_mut(child)
-        else {
-            unreachable!()
-        };
-        *source = planner_types::pre_asap::Source::Table {
-            table_ref: "samples".into(),
-        };
-        schema.closed = true;
-        let root = Rc::new(root);
-        let rule = asap_aware_mapping::maintained_population::MaintainedPopulationStrategy::new(
-            std::slice::from_ref(&root),
-        );
-        let candidate = rule.candidate(&root).unwrap();
-        planner_types::post_asap::compile_executable_dag(&candidate).unwrap();
-        assert!(!super::super::maintained_population::supported_node(
-            &candidate
-        ));
-        request.queries[0].selected_plan_root = candidate;
-        let error = super::super::maintained_population::operator(&request, &request.queries[0])
-            .unwrap_err();
-        assert!(error.to_string().contains("row-update executor"), "{error}");
-    }
-
-    // Compiler preserves the Planner's conditional-average execution guard.
-    #[test]
-    fn temporal_average_lowers_with_finite_division_guard() {
-        let mut environment = environment(10_000);
-        environment.target = PhysicalDeploymentTarget::BackendLocalRemoteWrite;
-        environment.target_collector_ids.clear();
-        let request = request("average", "avg_over_time(a[1m])");
-        let plan = DeploymentPlanCompiler
-            .compile_promql(request, environment)
-            .unwrap();
-        assert!(
-            plan.query_plan
-                .entries
-                .values()
-                .flat_map(|e| e.nodes.values())
-                .any(|node| matches!(
-                    node,
-                    crate::query_plan::QueryPlanNode::Logical {
-                        operator: asap_types::query_plan::query_time::QueryTimeOperator::Binary {
-                            operation:
-                                asap_types::query_plan::query_time::BinaryOperation::FiniteDiv,
-                            ..
-                        },
-                        ..
-                    }
-                )),
-            "{plan:#?}"
-        );
-    }
-
-    // The Planner's minimum state lowers without reconstructing direction from text.
-    #[test]
-    fn minimum_retains_its_typed_direction() {
-        let mut env = environment(10_000);
-        env.target = PhysicalDeploymentTarget::BackendLocalRemoteWrite;
-        env.target_collector_ids.clear();
-        let mut input = request("minimum", "min_over_time(data[1m])");
-        input.allow_mixed_summary_and_exact_execution = true;
-        let plan = DeploymentPlanCompiler.compile_promql(input, env).unwrap();
-        assert_eq!(plan.precompute_plan.materializations.len(), 1);
-        assert_eq!(
-            plan.precompute_plan.materializations[0].aggregation_type,
-            asap_types::AggregationType::Min
-        );
-        assert!(plan
-            .query_plan
-            .entries
-            .values()
-            .all(|entry| entry.nodes.values().any(|node| matches!(
-                node,
-                crate::query_plan::QueryPlanNode::ExactReadout {
-                    readout: crate::query_plan::ExactReadout::Min,
-                    ..
-                }
-            ))));
-    }
-
-    // Every metric the plan materializes must carry a routing entry, or the
-    // backend falls through to its default engine and archive-shape queries
-    // miss. Publication passes this document straight to the data plane.
-    #[test]
-    fn compiled_plan_routes_every_materialized_metric() {
-        let plan = quoted_snapshot(planning_snapshot(), QueryFrontend::PromQl)
-            .compile_promql()
-            .unwrap();
-        let routing = &plan.storage_routing;
-        assert_eq!(routing["default_engine"], "asap_query");
-        let routed: std::collections::BTreeSet<String> = routing["metrics"]
-            .as_array()
-            .expect("routing document carries a metrics array")
-            .iter()
-            .map(|entry| entry["name"].as_str().unwrap().to_string())
-            .collect();
-        assert!(
-            !routed.is_empty(),
-            "a plan with materializations emitted an empty routing table: {routing}"
-        );
-        // Archive-shape claims are what the default engine cannot serve; a
-        // routing entry without them would silently widen the warm tier.
-        for entry in routing["metrics"].as_array().unwrap() {
-            let engines: Vec<&str> = entry["targets"]
-                .as_array()
-                .unwrap()
-                .iter()
-                .map(|t| t["engine"].as_str().unwrap())
-                .collect();
-            assert!(
-                engines.contains(&"asap_query"),
-                "metric {} lost its warm target: {entry}",
-                entry["name"]
-            );
-        }
-    }
-
-    // Complete deployment quotes must preserve one producer with two window readouts.
-    #[test]
-    fn complete_cost_selection_preserves_shared_sum_panes() {
-        let mut snapshot = planning_snapshot();
-        let entry = &mut snapshot.query_workload.repeating_queries.as_mut().unwrap()[0];
-        entry.query = Query("sum_over_time(a[1m]) / sum_over_time(a[10m])".into());
-        entry.requirements.accuracy = AccuracyRequirement::Explicit(AccuracyTarget::Exact);
-        let plan = quoted_snapshot(snapshot, crate::physical::compiler::QueryFrontend::PromQl)
-            .compile_promql()
-            .unwrap();
-        assert!(plan.cost_comparison.is_some());
-        assert_eq!(plan.precompute_plan.materializations.len(), 1);
-        let bindings = plan
-            .query_plan
-            .entries
-            .values()
-            .next()
-            .unwrap()
-            .materialization_bindings();
-        assert_eq!(bindings[0].materialization, bindings[1].materialization);
-        assert_eq!(
-            bindings
-                .iter()
-                .filter_map(|b| b.readout_lookback_ms)
-                .collect::<BTreeSet<_>>(),
-            BTreeSet::from([60_000, 600_000])
-        );
-    }
-
-    // Synthetic quotes exercise deployment selection in tests, never production defaults.
-    pub(crate) fn quoted_snapshot(
-        mut snapshot: BackendLocalPlanningInput,
-        frontend: QueryFrontend,
-    ) -> BackendLocalPlanningInput {
-        use super::super::workload_cost::{
-            enumerate_exact_and_materialized_candidates, manifest, WorkloadCostEvidence,
-            WorkloadQuote,
-        };
-        let (request, environment) = snapshot
-            .clone()
-            .into_physical_compilation_request()
-            .unwrap();
-        let quotes = enumerate_exact_and_materialized_candidates(request)
-            .unwrap()
-            .into_iter()
-            .enumerate()
-            .filter_map(|(index, candidate)| {
-                let plan = if frontend == QueryFrontend::MetricsQl {
-                    DeploymentPlanCompiler.compile_metricsql(candidate.clone(), environment.clone())
-                } else {
-                    DeploymentPlanCompiler.compile_promql(candidate.clone(), environment.clone())
-                }
-                .ok()?;
-                let manifest = manifest(&plan, &candidate.queries).unwrap();
-                Some(WorkloadQuote {
-                    unit_costs: manifest
-                        .components
-                        .keys()
-                        .map(|key| (key.clone(), if index == 0 { 1.0 } else { 1e12 }))
-                        .collect(),
-                    manifest,
-                    executable: true,
-                })
-            })
-            .collect();
-        snapshot.workload_cost_evidence = Some(WorkloadCostEvidence {
-            backend_revision: BACKEND_REVISION.into(),
-            planner_revision: PLANNER_REVISION.into(),
-            data_snapshot_id: "compiler-unit-fixture".into(),
-            model_version: "test-only-unit-costs".into(),
-            observed_at_unix_ms: environment.observed_at_unix_ms,
-            valid_for_ms: environment.max_evidence_age_ms,
-            quotes,
-        });
-        snapshot
-    }
-
-    // Issue workloads must expose executable maintained candidates under the schema-2 API.
-    #[test]
-    fn issue_701_702_temporal_workloads_have_warm_candidates() {
-        for text in [
-            "avg_over_time(data[5m])",
-            "min_over_time(data[5m])",
-            "quantile_over_time(0.9,data[5m])",
-        ] {
-            let mut snapshot = planning_snapshot();
-            let entry = &mut snapshot.query_workload.repeating_queries.as_mut().unwrap()[0];
-            entry.query = Query(text.into());
-            if !text.contains("quantile") {
-                entry.requirements.accuracy = AccuracyRequirement::Explicit(AccuracyTarget::Exact);
-            }
-            let (request, environment) = snapshot.into_physical_compilation_request().unwrap();
-            let candidates =
-                super::super::workload_cost::enumerate_exact_and_materialized_candidates(request)
-                    .unwrap();
-            let mut reasons = vec![];
-            assert!(
-                candidates.into_iter().any(|candidate| {
-                    match DeploymentPlanCompiler.compile_promql(candidate, environment.clone()) {
-                        Ok(plan) => {
-                            !plan.precompute_plan.materializations.is_empty()
-                                && plan
-                                    .query_plan
-                                    .entries
-                                    .values()
-                                    .all(|entry| !entry.materialization_bindings().is_empty())
-                        }
-                        Err(error) => {
-                            reasons.push(error.to_string());
-                            false
-                        }
-                    }
-                }),
-                "no warm candidate for {text}: {reasons:?}"
-            );
-        }
-    }
-
-    // Quantile rank error does not certify relative error of a quotient.
-    #[test]
-    fn uncertified_quantile_ratios_retain_exact_execution() {
-        for text in [
-            "quantile_over_time(0.9,data[5m])/quantile_over_time(0.5,data[5m])",
-            "avg_over_time(data[5m])/quantile_over_time(0.5,data[5m])",
-        ] {
-            let mut snapshot = planning_snapshot();
-            snapshot.query_workload.repeating_queries.as_mut().unwrap()[0].query =
-                Query(text.into());
-            let (request, environment) = snapshot.into_physical_compilation_request().unwrap();
-            let plan = DeploymentPlanCompiler
-                .compile_promql(request, environment)
-                .unwrap();
-            assert!(plan.precompute_plan.materializations.is_empty(), "{text}");
-            assert!(
-                plan.query_plan
-                    .entries
-                    .values()
-                    .all(|entry| entry.nodes.values().any(|node| matches!(
-                        node,
-                        crate::query_plan::QueryPlanNode::ExactFallback { .. }
-                    ))),
-                "{text}"
-            );
-        }
-    }
-
-    /// Optional counter masks must retain the workload's mandatory sketch bindings.
-    #[test]
-    fn costed_mixed_workload_retains_sketches_and_counter_readouts() {
-        let snapshot: BackendLocalPlanningInput = serde_json::from_str(include_str!(
-            "../../../docs/examples/asapquery-compatibility-demo-snapshot.json"
-        ))
-        .unwrap();
-        let plan = quoted_snapshot(snapshot, crate::physical::compiler::QueryFrontend::PromQl)
-            .compile_promql()
-            .unwrap();
-        assert!(!plan.precompute_plan.materializations.is_empty());
-        for entry in plan.query_plan.entries.values() {
-            assert!(!entry.materialization_bindings().is_empty(), "{entry:#?}");
-        }
-    }
-
-    /// A schema marker cannot opt into a legacy deployment policy.
-    #[test]
-    fn only_current_snapshot_schema_is_accepted() {
-        let snapshot: BackendLocalPlanningInput = serde_json::from_str(include_str!(
-            "../../../docs/examples/asapquery-planning-snapshot.json"
-        ))
-        .unwrap();
-        for version in [0, 1, 2, 4] {
-            let mut old = snapshot.clone();
-            old.schema_version = version;
-            assert!(old
-                .clone()
-                .into_physical_compilation_request()
-                .unwrap_err()
-                .to_string()
-                .contains("only version 3"));
-            assert!(old.compile_promql().is_err());
-        }
-        assert!(snapshot.into_physical_compilation_request().is_ok());
-    }
-
-    #[test]
-    fn installed_partition_must_match_the_bound_dag_reduction() {
-        let mut env = environment(10_000);
-        env.target = PhysicalDeploymentTarget::BackendLocalRemoteWrite;
-        env.target_collector_ids.clear();
-        let mut plan = DeploymentPlanCompiler
-            .compile_promql(request("scope", "sum_over_time(m[1m])"), env)
-            .unwrap();
-        let installed = plan
-            .precompute_plan
-            .executable_dags
-            .values_mut()
-            .next()
-            .unwrap();
-        let mut dag = installed.document.decode().unwrap();
-        let node = dag
-            .nodes
-            .iter_mut()
-            .find(|node| {
-                matches!(
-                    node.payload,
-                    planner_types::post_asap::ExecutableOperatorPayload::SummaryAgg { .. }
-                )
-            })
-            .unwrap();
-        if let planner_types::post_asap::ExecutableOperatorPayload::SummaryAgg {
-            reduction, ..
-        } = &mut node.payload
-        {
-            *reduction = planner_types::pre_asap::Reduction::by(vec![]);
-        }
-        installed.document = asap_types::executable_plan::OwnedPostAsapDag::from_executable(
-            installed.document.query_id.clone(),
-            &dag,
-        )
-        .unwrap();
-        installed.document.schema_version =
-            asap_types::executable_plan::PRECOMPUTE_DAG_SCHEMA_VERSION;
-        assert!(plan
-            .precompute_plan
-            .validate()
-            .unwrap_err()
-            .to_string()
-            .contains("partition"));
-    }
-
-    #[test]
-    fn raw_per_entity_state_carries_explicit_isolation() {
-        for query in [
-            "sum_over_time(m[1m])",
-            "quantile_over_time(0.99, m[1m])",
-            // Planner's certified sum/count decomposition, including its division guard.
-            "avg_over_time(m[1m])",
-        ] {
-            let mut environment = environment(10_000);
-            environment.target = PhysicalDeploymentTarget::BackendLocalRemoteWrite;
-            environment.target_collector_ids.clear();
-            let plan = DeploymentPlanCompiler
-                .compile_promql(request("per-entity", query), environment)
-                .unwrap();
-            assert!(
-                plan.precompute_plan
-                    .materializations
-                    .iter()
-                    .all(|state| state.partitioning
-                        == Some(asap_types::sds::PopulationPartitioning::PerEntity)),
-                "{query} pooled source entities"
-            );
-        }
-        for query in [
-            "sum(sum_over_time(m[1m]))",
-            "sum by (job) (sum_over_time(m[1m]))",
-        ] {
-            let mut environment = environment(10_000);
-            environment.target = PhysicalDeploymentTarget::BackendLocalRemoteWrite;
-            environment.target_collector_ids.clear();
-            let plan = DeploymentPlanCompiler
-                .compile_promql(request("reduced", query), environment)
-                .unwrap();
-            assert!(
-                !plan.precompute_plan.materializations.is_empty(),
-                "{query} lost safe additive state"
-            );
-        }
-    }
-
-    #[test]
-    fn backend_local_materializes_counter_with_per_series_state() {
-        let request = request("counter", "sum(rate(m[1m]))");
-        let mut environment = environment(10_000);
-        environment.target = PhysicalDeploymentTarget::BackendLocalRemoteWrite;
-        environment.target_collector_ids.clear();
-        let plan = DeploymentPlanCompiler
-            .compile_promql(request, environment)
-            .unwrap();
-        assert_eq!(plan.precompute_plan.materializations.len(), 1);
-        assert_eq!(
-            plan.precompute_plan.materializations[0].num_aggregates_to_retain,
-            Some(2),
-            "the explicitly selected one-minute pane plus a boundary pane is retained"
-        );
-        assert!(plan
-            .query_plan
-            .entries
-            .values()
-            .all(|entry| entry.nodes.values().any(|node| matches!(
-                node,
-                crate::query_plan::QueryPlanNode::ExactReadout {
-                    readout: crate::query_plan::ExactReadout::Rate,
-                    ..
-                }
-            ))));
-    }
-
-    #[test]
-    fn raw_counter_artifact_is_valid_for_backend_precompute() {
-        let plan = DeploymentPlanCompiler
-            .compile_promql(request("counter", "rate(m[1m])"), environment(10_000))
-            .unwrap();
-        plan.precompute_plan.validate().unwrap();
-        let catalog = plan.summary_catalog.clone();
-        let mut raw = plan.precompute_plan;
-        raw.ingest.protocol = IngestProtocol::PrometheusRemoteWriteV1;
-        raw.ingest.endpoint_path = "/api/v1/write".into();
-        raw.ingest.timestamp_unit = TimestampUnit::UnixMilliseconds;
-        raw.ingest.require_plan_identity = false;
-        raw.ingest.require_stored_output_identity = false;
-        raw.ingest.require_registered_producer = false;
-        raw.producers.clear();
-        raw.bind_catalog(&catalog).unwrap();
-        raw.validate().unwrap();
-    }
-
-    // Counter fallback does not disable an independent safe summary in the same workload.
-    #[test]
-    fn counter_fallback_preserves_other_workload_summaries() {
-        let mut workload = request("counter", "sum(rate(m[1m]))");
-        workload
-            .queries
-            .extend(request("gauge", "sum(sum_over_time(g[1m]))").queries);
-        let mut environment = environment(10_000);
-        environment.target = PhysicalDeploymentTarget::BackendLocalRemoteWrite;
-        environment.target_collector_ids.clear();
-        let plan = DeploymentPlanCompiler
-            .compile_promql(workload, environment)
-            .unwrap();
-        assert_eq!(plan.precompute_plan.materializations.len(), 2);
-        assert_eq!(
-            plan.query_plan
-                .lookup("sum(rate(m[1m]))")
-                .unwrap()
-                .materialization_bindings()
-                .len(),
-            1
-        );
-        assert_eq!(
-            plan.query_plan
-                .lookup("sum(sum_over_time(g[1m]))")
-                .unwrap()
-                .materialization_bindings()
-                .len(),
-            1
-        );
-    }
-
-    // Capability normalization precedes candidate enumeration, avoiding duplicate exact quotes.
-    #[test]
-    fn counter_only_snapshot_has_distinct_local_and_native_cost_alternatives() {
-        let mut snapshot: BackendLocalPlanningInput = serde_json::from_str(include_str!(
-            "../../../docs/examples/asapquery-planning-snapshot.json"
-        ))
-        .unwrap();
-        let entry = &mut snapshot.query_workload.repeating_queries.as_mut().unwrap()[0];
-        entry.query = Query("rate(m[1m])".into());
-        entry.requirements.accuracy = AccuracyRequirement::Explicit(AccuracyTarget::Exact);
-        let (request, _) = snapshot.into_physical_compilation_request().unwrap();
-        assert_eq!(
-            super::super::workload_cost::enumerate_exact_and_materialized_candidates(request)
-                .unwrap()
-                .len(),
-            3
-        );
-    }
-
-    // Count and value rankings must configure different state update contracts.
-    #[test]
-    fn temporal_topk_binds_planner_update_weight() {
-        for (query, mode) in [
-            ("topk(1, sum_over_time(m[1m]))", "value"),
-            ("topk(1, count_over_time(m[1m]))", "count"),
-        ] {
-            let evidence = TopKMembershipEvidence {
-                selected_lower_bound: 101.0,
-                excluded_upper_bound: 100.0,
-                interval_failure_probability: 0.001,
-                observed_at_unix_ms: 9500,
-                source: "unit-fixture".into(),
-            };
-            let request = request_with_evidence("topk", query, Some(evidence)).unwrap();
-            let plan = DeploymentPlanCompiler
-                .compile_promql(request, environment(10000))
-                .unwrap();
-            assert_eq!(plan.precompute_plan.materializations.len(), 1, "{query}");
-            assert_eq!(
-                plan.precompute_plan.materializations[0].parameters["weight_mode"], mode,
-                "{query}"
-            );
-        }
-    }
-
-    // The explicit rate-value frontier cannot be rebound as raw counter deltas.
-    #[test]
-    fn unsupported_rate_heap_uses_explicit_exact_route() {
-        let query = "topk(2, sum by (job) (rate(m[1m])))";
-        let evidence = TopKMembershipEvidence {
-            selected_lower_bound: 101.0,
-            excluded_upper_bound: 100.0,
-            interval_failure_probability: 0.001,
-            observed_at_unix_ms: 9_500,
-            source: "unit-fixture".into(),
-        };
-        let request = request_with_evidence("topk-rate", query, Some(evidence)).unwrap();
-        let plan = DeploymentPlanCompiler
-            .compile_promql(request, environment(10_000))
-            .unwrap();
-        let entry = plan.query_plan.lookup(query).unwrap();
-        assert!(matches!(
-            &entry.nodes[&entry.root],
-            crate::query_plan::QueryPlanNode::ExactFallback { .. }
-        ));
-        assert_eq!(
-            entry.fallback,
-            crate::query_plan::FallbackPolicy::ExactBackend
-        );
-        assert_eq!(entry.canonical_query, query);
-        assert!(plan.precompute_plan.materializations.is_empty());
-    }
-
-    // Native exact values remain explicit; unsupported heaps publish no stored state.
-    #[test]
-    fn hybrid_rate_topk_preserves_the_original_exact_subquery() {
-        let query = "topk(2, sum by (job) (rate(m[1m])))";
-        let evidence = TopKMembershipEvidence {
-            selected_lower_bound: 101.0,
-            excluded_upper_bound: 100.0,
-            interval_failure_probability: 0.001,
-            observed_at_unix_ms: 9_500,
-            source: "unit-fixture".into(),
-        };
-        let mut request = request_with_evidence("topk-rate", query, Some(evidence)).unwrap();
-        request.allow_mixed_summary_and_exact_execution = true;
-        let mut environment = environment(10_000);
-        environment.target = PhysicalDeploymentTarget::BackendLocalRemoteWrite;
-        environment.target_collector_ids.clear();
-
-        let plan = DeploymentPlanCompiler
-            .compile_promql(request, environment)
-            .unwrap();
-        let entry = plan.query_plan.lookup(query).unwrap();
-        use crate::query_plan::{query_time::QueryTimeOperator, QueryPlanNode};
-        assert!(matches!(
-            &entry.nodes[&entry.root],
-            QueryPlanNode::Logical {
-                operator: QueryTimeOperator::Limit { n: 2, .. },
-                ..
-            }
-        ));
-        assert_eq!(
-            entry
-                .nodes
-                .values()
-                .filter(|node| matches!(node, QueryPlanNode::Logical {
-            operator: QueryTimeOperator::ExactSubquery { query }, ..
-        } if query == "sum by (job) (rate(m[1m]))"))
-                .count(),
-            1
-        );
-        assert!(entry.materialization_bindings().is_empty());
-        assert!(plan.precompute_plan.materializations.is_empty());
-        let artifact = plan.to_publication_artifact().unwrap();
-        artifact.validate().unwrap();
-        let encoded = serde_json::to_value(&artifact).unwrap();
-        assert!(!encoded.to_string().contains("counter_delta"));
-    }
-
-    #[test]
-    fn retained_footprint_rejects_eval_sized_cms_across_all_panes() {
-        let evidence = TopKMembershipEvidence {
-            selected_lower_bound: 101.0,
-            excluded_upper_bound: 100.0,
-            interval_failure_probability: 0.001,
-            observed_at_unix_ms: 9_500,
-            source: "unit-fixture".into(),
-        };
-        let plan = DeploymentPlanCompiler
-            .compile_promql(
-                request_with_evidence(
-                    "topk-rate",
-                    "topk(2, count_over_time(m[1m]))",
-                    Some(evidence),
-                )
-                .unwrap(),
-                environment(10_000),
-            )
-            .unwrap();
-        let mut materializations = plan.precompute_plan.materializations;
-        let cms = materializations
-            .iter_mut()
-            .find(|materialization| {
-                materialization.aggregation_type
-                    == asap_types::AggregationType::CountMinSketchWithHeap
-            })
-            .unwrap();
-        cms.parameters.remove("width");
-        cms.parameters.remove("depth");
-        cms.parameters.insert("w".into(), json!(524_288));
-        cms.parameters.insert("d".into(), json!(7));
-        cms.num_aggregates_to_retain = Some(80);
-
-        let error = validate_retained_summary_footprint(
-            &materializations,
-            Some(5),
-            DEFAULT_RETAINED_SUMMARY_MEMORY_BUDGET_BYTES,
-        )
-        .unwrap_err();
-        assert!(error.to_string().contains("exceeds budget"));
-
-        let cms = materializations
-            .iter_mut()
-            .find(|materialization| {
-                materialization.aggregation_type
-                    == asap_types::AggregationType::CountMinSketchWithHeap
-            })
-            .unwrap();
-        cms.parameters.insert("w".into(), json!(4_096));
-        validate_retained_summary_footprint(
-            &materializations,
-            Some(5),
-            DEFAULT_RETAINED_SUMMARY_MEMORY_BUDGET_BYTES,
-        )
-        .unwrap();
-
-        let mut request = request("bounded", "sum(sum_over_time(m[1m]))");
-        request.retained_summary_memory_budget_bytes = Some(1);
-        let error = DeploymentPlanCompiler
-            .compile_promql(request, environment(10_000))
-            .unwrap_err();
-        assert!(error.to_string().contains("retained summary footprint"));
-    }
-
-    #[test]
-    fn snapshot_uses_retained_memory_default_and_canonical_override() {
-        let source = include_str!("../../../docs/examples/asapquery-planning-snapshot.json");
-        let snapshot: BackendLocalPlanningInput = serde_json::from_str(source).unwrap();
-        assert_eq!(
-            snapshot
-                .physical_inputs
-                .retained_summary_memory_budget_bytes,
-            DEFAULT_RETAINED_SUMMARY_MEMORY_BUDGET_BYTES
-        );
-
-        let mut value: Value = serde_json::from_str(source).unwrap();
-        value["implementation"]["max_retained_summary_bytes"] = json!(123_456);
-        let snapshot: BackendLocalPlanningInput = serde_json::from_value(value).unwrap();
-        assert_eq!(
-            snapshot
-                .physical_inputs
-                .retained_summary_memory_budget_bytes,
-            123_456
-        );
-    }
-
-    /// Dataset changes alter persisted meaning; relocating the same input does not.
-    #[test]
-    fn dataset_identity_survives_binding_and_rejects_wrong_input() {
-        let compile = |env| {
-            DeploymentPlanCompiler
-                .compile_promql(request("q", "sum_over_time(m[1m])"), env)
-                .unwrap()
-        };
-        let first = compile(environment(10_000));
-        assert!(!first.summary_catalog.definitions.is_empty());
-        let mut other = environment(10_000);
-        other.dataset_identity.namespace = "other-tenant".into();
-        let second = compile(other);
-        assert_ne!(
-            first.summary_catalog.definitions.keys().collect::<Vec<_>>(),
-            second
-                .summary_catalog
-                .definitions
-                .keys()
-                .collect::<Vec<_>>()
-        );
-        let mut relocated = environment(10_000);
-        relocated.target_collector_ids = vec!["relocated-source".into()];
-        let relocated = compile(relocated);
-        assert_eq!(
-            first.summary_catalog.definitions,
-            relocated.summary_catalog.definitions
-        );
-        let mut forged = first.precompute_plan.clone();
-        forged.ingest.dataset_identity.as_mut().unwrap().namespace = "other-tenant".into();
-        assert!(forged
-            .validate()
-            .unwrap_err()
-            .to_string()
-            .contains("dataset"));
-        forged.ingest.dataset_identity = None;
-        assert!(forged.validate().is_err());
-    }
-
-    fn environment(now: u64) -> PhysicalDeploymentContext {
-        PhysicalDeploymentContext {
-            dataset_identity: planner_types::post_asap::LogicalDatasetIdentity {
-                namespace: "test".into(),
-                dataset: "metrics".into(),
-            },
-            target: PhysicalDeploymentTarget::DistributedCollectors,
-            target_collector_ids: vec!["edge-a".into(), "edge-b".into()],
-            capability_snapshot_id: "caps-7".into(),
-            observed_at_unix_ms: now,
-            max_evidence_age_ms: 60_000,
-            plan_version: 1,
-            activation_unix_ms: now,
-            expiry_unix_ms: None,
-            backend_compat: "asap-query-backend.v1".into(),
-        }
-    }
-
-    fn request_with_evidence(
-        query_id: &str,
-        promql: &str,
-        evidence: Option<TopKMembershipEvidence>,
-    ) -> Result<PhysicalCompilationRequest, crate::planner_selection::SelectionError> {
-        let accuracy = AccuracyTarget::EpsilonDelta {
-            epsilon: 0.01,
-            delta: 0.01,
-        };
-        let parsed = crate::query_parser::parse_query_expr_canonical(promql, accuracy.clone())
-            .expect("canonical query");
-        let lifecycle = SummaryLifecyclePlanningInputs {
-            evaluation_interval_ms: 10_000,
-            ingestion_rate_per_second: 100.0,
-            evidence_observed_at_unix_ms: 9_500,
-            evidence_valid_for_ms: 60_000,
-            horizon_seconds: 300.0,
-            costs: LifecycleUnitCosts {
-                build: 10.0,
-                maintenance_per_update: 0.001,
-                read: 0.1,
-                retention_per_second: 0.001,
-                retirement: 1.0,
-            },
-        };
-        let post_asap = select_post_asap(&parsed, accuracy.clone(), &lifecycle, evidence.as_ref())?;
-        let mut evidence_by_query = HashMap::new();
-        if let Some(evidence) = evidence {
-            evidence_by_query.insert(query_id.to_string(), evidence);
-        }
-        Ok(PhysicalCompilationRequest {
-            planner_selection_trace: Vec::new(),
-            canonical_roots: Vec::new(),
-            allow_mixed_summary_and_exact_execution: false,
-            enabled_materialization_keys: None,
-            query_workload: None,
-            data_workload: None,
-            queries: vec![QueryCompilationInput {
-                query_id: query_id.into(),
-                query_string: promql.into(),
-                selected_plan_root: post_asap,
-                legacy_query_source: Source::TimeSeries { metric: "m".into() },
-                query_lookback_seconds: 60,
-                group_by_labels: vec![],
-                accuracy_target: accuracy,
-                summary_lifecycle_inputs: lifecycle,
-                window_realization_candidates: vec![WindowRealizationCandidate {
-                    derived: false,
-                    cohort_only: false,
-                    realization_id: "collector-tumbling-v1".into(),
-                    framework: SummaryWindowFramework::Tumbling,
-                    window_secs: 60,
-                    slide_secs: 60,
-                    layout: asap_types::WindowMaterializationLayout::Pane { pane_secs: 60 },
-                    cost: WindowRealizationCostQuote {
-                        model_version: "test-cost-v1".into(),
-                        workload_fingerprint: "test-workload".into(),
-                        observed_at_unix_ms: 9_500,
-                        valid_for_ms: 60_000,
-                        horizon_seconds: 300.0,
-                        cpu_cost: 1.0,
-                        peak_memory_bytes: 1_024,
-                        network_bytes: 512,
-                        storage_bytes: 512,
-                        source_scan_bytes: 0,
-                        weighted_cost: 1.0,
-                    },
-                }],
-                materialization_runtime_policy: RuntimeRulePolicy::default(),
-            }],
-            topk_membership_evidence_by_query_id: evidence_by_query,
-            erp: None,
-            exact_composition_costs: HashMap::new(),
-            planner_revision: PLANNER_REVISION.into(),
-            scrape_interval_ms: None,
-            query_retention_margin_ms: 0,
-            retained_summary_memory_budget_bytes: None,
-        })
-    }
-
-    fn request(query_id: &str, promql: &str) -> PhysicalCompilationRequest {
-        request_with_evidence(query_id, promql, None).expect("post-ASAP selection")
-    }
-
-    #[test]
-    fn unshared_immutable_nodes_do_not_share_legacy_raw_cost_cohort() {
-        let sum = request("sum", "quantile(0.9, sum_over_time(m[1m]))");
-        let count = request("other", "quantile(0.5, sum_over_time(m[1m]))");
-        let queries = vec![sum.queries[0].clone(), count.queries[0].clone()];
-        let error = materialization_consumers(
-            &queries,
-            PhysicalDeploymentTarget::BackendLocalRemoteWrite,
-            true,
-        )
-        .unwrap_err();
-        assert!(
-            error
-                .to_string()
-                .contains("separate lifecycle cost cohorts"),
-            "{error}"
-        );
-    }
-
-    #[test]
-    fn immutable_nested_summary_keeps_actual_source_and_derived_bindings() {
-        let mut workload = request("nested", "quantile(0.9, sum_over_time(m[1m]))");
-        workload.allow_mixed_summary_and_exact_execution = true;
-        let states =
-            collect_selected_materializations(&workload.queries[0].selected_plan_root, true)
-                .unwrap();
-        assert_eq!(states.len(), 2, "source and consumer must both be selected");
-        assert!(immutable_materialization_sources(&states[0].node).is_none());
-        assert!(immutable_materialization_sources(&states[1].node).is_some());
-        let mut deployment = environment(10_000);
-        deployment.target = PhysicalDeploymentTarget::BackendLocalRemoteWrite;
-        deployment.target_collector_ids.clear();
-        let plan = DeploymentPlanCompiler
-            .compile_promql(workload, deployment)
-            .unwrap();
-        assert_eq!(plan.precompute_plan.materializations.len(), 2);
-        let derived = plan
-            .precompute_plan
-            .materializations
-            .iter()
-            .find(|m| m.derived_input.is_some())
-            .unwrap();
-        let source = plan
-            .precompute_plan
-            .materializations
-            .iter()
-            .find(|m| m.derived_input.is_none())
-            .unwrap();
-        assert_eq!(
-            derived.derived_input.as_ref().unwrap().inputs,
-            BTreeSet::from([source.policy_fingerprint().into()])
-        );
-        let entry = plan.query_plan.entries.values().next().unwrap();
-        assert!(entry.nodes.values().any(|node| matches!(
-            node,
-            crate::query_plan::QueryPlanNode::ReadMaterialization { .. }
-        )));
-        assert!(!entry
-            .nodes
-            .values()
-            .any(|node| matches!(node, crate::query_plan::QueryPlanNode::ExactFallback { .. })));
-    }
-    #[test]
-    fn immutable_two_sources_keep_actual_frontiers_and_bindings() {
-        let mut workload = request(
-            "nested",
-            "quantile(0.9, sum_over_time(m[1m]) + sum_over_time(n[1m]))",
-        );
-        workload.allow_mixed_summary_and_exact_execution = true;
-        let states =
-            collect_selected_materializations(&workload.queries[0].selected_plan_root, true)
-                .unwrap();
-        assert_eq!(states.len(), 3, "source and consumer must both be selected");
-        assert!(immutable_materialization_sources(&states[0].node).is_none());
-        assert!(immutable_materialization_sources(&states[2].node).is_some());
-        let mut deployment = environment(10_000);
-        deployment.target = PhysicalDeploymentTarget::BackendLocalRemoteWrite;
-        deployment.target_collector_ids.clear();
-        let plan = DeploymentPlanCompiler
-            .compile_promql(workload, deployment)
-            .unwrap();
-        assert_eq!(plan.precompute_plan.materializations.len(), 3);
-        assert!(plan
-            .precompute_plan
-            .materializations
-            .iter()
-            .all(|config| config.population_key_encoding
-                == asap_types::PopulationKeyEncoding::CanonicalLabelsV1));
-        let mut mixed = plan.precompute_plan.clone();
-        mixed
-            .materializations
-            .iter_mut()
-            .find(|config| config.derived_input.is_none())
-            .unwrap()
-            .population_key_encoding = asap_types::PopulationKeyEncoding::LegacyDelimited;
-        assert!(
-            mixed.validate().is_err(),
-            "canonical target cannot use legacy source identity"
-        );
-        let derived = plan
-            .precompute_plan
-            .materializations
-            .iter()
-            .find(|m| m.derived_input.is_some())
-            .unwrap();
-        let sources = plan
-            .precompute_plan
-            .materializations
-            .iter()
-            .filter(|m| m.derived_input.is_none())
-            .map(|m| m.policy_fingerprint().into())
-            .collect::<BTreeSet<_>>();
-        assert_eq!(derived.derived_input.as_ref().unwrap().inputs, sources);
-        assert_eq!(sources.len(), 2);
-        let entry = plan.query_plan.entries.values().next().unwrap();
-        assert!(entry.nodes.values().any(|node| matches!(
-            node,
-            crate::query_plan::QueryPlanNode::ReadMaterialization { .. }
-        )));
-        assert!(!entry
-            .nodes
-            .values()
-            .any(|node| matches!(node, crate::query_plan::QueryPlanNode::ExactFallback { .. })));
-    }
-
-    /// An externally supplied unknown guarantee must not bypass global selection.
-    #[test]
-    fn supplied_uncertified_readout_is_rejected() {
-        use asap_aware_mapping::{
-            Replacement, ReplacementStrategy, SketchAlgorithmStrategy, TargetSubDAG,
-        };
-        let mut workload = request("unknown", "distinct_over_time(m[1m])");
-        let root = Rc::new(
-            crate::query_parser::parse_query_expr_canonical(
-                "distinct_over_time(m[1m])",
-                AccuracyTarget::Epsilon(0.05),
-            )
-            .unwrap(),
-        );
-        let model = ControlPlaneCostModel::new(AccuracyTarget::Epsilon(0.05));
-        workload.queries[0].selected_plan_root = SketchAlgorithmStrategy::new(&model)
-            .replacements(&TargetSubDAG::new(&root))
-            .into_iter()
-            .find_map(|candidate| {
-                if !candidate.has_missing_accuracy_evidence() {
-                    return None;
-                }
-                match candidate.replacement {
-                    Replacement::Summary(node) => Some(node),
-                    _ => None,
-                }
-            })
-            .expect("unknown HLL candidate stays inspectable");
-        let result = DeploymentPlanCompiler.compile_metricsql(workload, environment(10_000));
-        assert!(
-            matches!(result, Err(CompileError::Query { reason, .. }) if reason.contains("no certified accuracy guarantee"))
-        );
-    }
-
-    /// HLL without a confidence proof remains exact under canonical selection.
-    #[test]
-    fn uncertified_distinct_range_remains_exact() {
-        let mut deployment = environment(10_000);
-        deployment.target = PhysicalDeploymentTarget::BackendLocalRemoteWrite;
-        deployment.target_collector_ids.clear();
-        let mut workload = request("distinct", "distinct_over_time(m{job=\"api\"}[1m])");
-        let query = &mut workload.queries[0];
-        // HLL's modeled RSE does not certify a failure probability.
-        query.accuracy_target = AccuracyTarget::Epsilon(0.05);
-        let parsed = crate::query_parser::parse_query_expr_canonical(
-            &query.query_string,
-            query.accuracy_target.clone(),
-        )
-        .unwrap();
-        query.selected_plan_root = select_post_asap(
-            &parsed,
-            query.accuracy_target.clone(),
-            &query.summary_lifecycle_inputs,
-            None,
-        )
-        .unwrap();
-        let plan = DeploymentPlanCompiler
-            .compile_metricsql(workload, deployment)
-            .unwrap();
-        assert!(plan.precompute_plan.materializations.is_empty());
-        assert!(matches!(
-            plan.query_plan
-                .entries
-                .values()
-                .next()
-                .unwrap()
-                .nodes
-                .values()
-                .next()
-                .unwrap(),
-            crate::query_plan::QueryPlanNode::ExactFallback { .. }
-        ));
-    }
-
-    /// Mixed execution does not authorize an uncertified cardinality sketch.
-    #[test]
-    fn uncertified_cardinality_is_not_materialized() {
-        let mut deployment = environment(10_000);
-        deployment.target = PhysicalDeploymentTarget::BackendLocalRemoteWrite;
-        deployment.target_collector_ids.clear();
-        let mut workload = request("confidence", "distinct_over_time(m[1m])");
-        workload.allow_mixed_summary_and_exact_execution = true;
-        let result = DeploymentPlanCompiler.compile_metricsql(workload, deployment);
-        assert!(result.unwrap().precompute_plan.materializations.is_empty());
-    }
-
-    #[test]
-    fn snapshot_metricsql_entry_uses_the_shared_serving_language_contract() {
-        let snapshot: BackendLocalPlanningInput = serde_json::from_str(include_str!(
-            "../../../docs/examples/asapquery-compatibility-demo-snapshot.json"
-        ))
-        .unwrap();
-        let plan = quoted_snapshot(
-            snapshot,
-            crate::physical::compiler::QueryFrontend::MetricsQl,
-        )
-        .compile_metricsql()
-        .unwrap();
-        assert!(!plan.query_plan.entries.is_empty());
-        assert!(plan
-            .query_plan
-            .entries
-            .values()
-            .all(|entry| entry.language == crate::query_plan::QueryLanguage::MetricsQl));
-    }
-
-    #[test]
-    fn duplicate_query_ids_cannot_overwrite_installed_dag_documents() {
-        let mut workload = request("shared-id", "max_over_time(a[1m])");
-        let mut second = workload.queries[0].clone();
-        second.query_string = "max_over_time(b[1m])".into();
-        workload.queries.push(second);
-
-        let error = DeploymentPlanCompiler
-            .compile_promql(workload, environment(10_000))
-            .unwrap_err();
-        assert!(matches!(
-            error,
-            CompileError::Snapshot(reason)
-                if reason == "planning query IDs must be unique within a plan generation"
-        ));
-    }
-
-    #[test]
-    fn metricsql_counter_readouts_remain_external_exact() {
-        for text in [
-            "rate(counter_probe{case=\"reset\"}[5s])",
-            "increase(counter_probe{case=\"reset\"}[5s])",
-        ] {
-            let mut workload = request("counter", text);
-            workload.allow_mixed_summary_and_exact_execution = true;
-            let mut deployment = environment(10_000);
-            deployment.target = PhysicalDeploymentTarget::BackendLocalRemoteWrite;
-            deployment.target_collector_ids.clear();
-            let plan = DeploymentPlanCompiler
-                .compile_metricsql(workload, deployment)
-                .unwrap();
-            assert!(plan.precompute_plan.materializations.is_empty());
-            let entry = plan.query_plan.entries.values().next().unwrap();
-            assert!(entry.materialization_bindings().is_empty());
-            assert_eq!(entry.language, crate::query_plan::QueryLanguage::MetricsQl);
-        }
-    }
-
-    #[test]
-    fn metricsql_counter_gate_rejects_mixed_input_snapshots() {
-        let mut workload = request("mixed", "max_over_time(m[1m]) + rate(m[1m])");
-        workload.allow_mixed_summary_and_exact_execution = true;
-        let mut deployment = environment(10_000);
-        deployment.target = PhysicalDeploymentTarget::BackendLocalRemoteWrite;
-        deployment.target_collector_ids.clear();
-        let Err(error) = DeploymentPlanCompiler.compile_metricsql(workload, deployment) else {
-            panic!("mixed local/external snapshots must fail deployment binding");
-        };
-        assert!(
-            error.to_string().contains("common snapshot proof"),
-            "{error}"
-        );
-    }
-
-    #[test]
-    fn metricsql_compilation_publishes_a_language_tagged_query_entry() {
-        let query = "mad_over_time(m[1m])";
-        let mut workload = request("vm-q", "last_over_time(m[1m])");
-        let accuracy = workload.queries[0].accuracy_target.clone();
-        let canonical =
-            crate::query_parser::parse_query_expr_canonical(query, accuracy.clone()).unwrap();
-        workload.queries[0].query_string = query.into();
-        workload.queries[0].selected_plan_root =
-            crate::planner_selection::keep_pre_asap(&canonical).unwrap();
-        let plan = DeploymentPlanCompiler
-            .compile_metricsql(workload, environment(10_000))
-            .unwrap();
-        let identity = canonical_promql(query).unwrap();
-        let entry = plan
-            .query_plan
-            .lookup_canonical(crate::query_plan::QueryLanguage::MetricsQl, &identity)
-            .unwrap();
-        assert_eq!(entry.query_id, "vm-q");
-        assert_eq!(entry.language, crate::query_plan::QueryLanguage::MetricsQl);
-    }
-
-    #[test]
-    fn hybrid_erp_capability_miss_preserves_exact_subtree() {
-        let mut workload = request("q", "quantile_over_time(0.9, m[1m])");
-        let roots = vec![Rc::new(
-            crate::query_parser::parse_query_expr_canonical(
-                &workload.queries[0].query_string,
-                workload.queries[0].accuracy_target.clone(),
-            )
-            .unwrap(),
-        )];
-        let erp = super::super::erp::ErpPlanningInput {
-            artifact: asap_aware_mapping::erp::ErpArtifact {
-                schema_version: asap_aware_mapping::erp::ERP_SCHEMA_VERSION,
-                producer_version: "bench-rev".into(),
-                records: vec![],
-            },
-            distribution: serde_json::json!({"synthetic":{"kind":"zipf"}}),
-            implementation: None,
-            error_metric: "relative_error".into(),
-            min_trials: 10,
-            expected_updates: 1000.0,
-            expected_queries: 10.0,
-            expected_merges: 0.0,
-            retention_seconds: 60.0,
-            cpu_weight: 1.0,
-            byte_second_weight: 1e-9,
-            mode: super::super::erp::ErpAccuracyMode::Hybrid,
-            observed_shape: None,
-            observed_populations: None,
-            resolved_data_descriptor: None,
-            observed_shape_source: None,
-            shape_match: None,
-            runtime: super::super::erp::ErpRuntimeCapabilities {
-                allowed_algorithms: vec![SketchAlgorithm::Hll],
-                max_memory_bytes: None,
-            },
-        };
-        select_logical_roots_with_error_resource_profiles(
-            &mut workload.queries,
-            roots,
-            &workload.topk_membership_evidence_by_query_id,
-            &workload.exact_composition_costs,
-            Some(&erp),
-        )
-        .unwrap();
-        assert!(matches!(
-            workload.queries[0].selected_plan_root.expr,
-            SummaryExpr::KeepPreAsap(_)
-        ));
-    }
-
-    // Frozen sketch-bench output exercises the same wire schema on every CI run.
-    #[test]
-    fn measured_erp_without_failure_probability_uses_exact_fallback() {
-        use super::super::erp::{
-            ErpAccuracyMode, ErpParameterDecision, ErpPlanningInput, ErpRuntimeCapabilities,
-        };
-
-        let artifact: asap_aware_mapping::erp::ErpArtifact =
-            serde_json::from_str(include_str!("../../tests/fixtures/erp-kll-measured.json"))
-                .unwrap();
-        let row = artifact
-            .records
-            .first()
-            .expect("nonempty measured artifact");
-        let erp = ErpPlanningInput {
-            distribution: row.distribution.clone(),
-            implementation: Some("lib".into()),
-            artifact,
-            error_metric: "max_rank_err".into(),
-            min_trials: 10,
-            expected_updates: 1000.0,
-            expected_queries: 10.0,
-            expected_merges: 0.0,
-            retention_seconds: 60.0,
-            cpu_weight: 1.0,
-            byte_second_weight: 1e-9,
-            mode: ErpAccuracyMode::Hybrid,
-            observed_shape: None,
-            observed_populations: None,
-            resolved_data_descriptor: None,
-            observed_shape_source: None,
-            shape_match: None,
-            runtime: ErpRuntimeCapabilities {
-                allowed_algorithms: vec![SketchAlgorithm::Kll],
-                max_memory_bytes: None,
-            },
-        };
-        assert!(
-            matches!(
-                erp.select(SketchAlgorithm::Kll, 0.06, SketchParams::Kll { k: 269 }),
-                ErpParameterDecision::Empirical {
-                    params: SketchParams::Kll { k: 32 },
-                    ..
-                }
-            ),
-            "the measured row must pass adapter selection before testing the planner"
-        );
-
-        let mut workload = request("q", "quantile_over_time(0.9, m[1m])");
-        workload.queries[0].accuracy_target = AccuracyTarget::Epsilon(0.06);
-        let root = Rc::new(
-            crate::query_parser::parse_query_expr_canonical(
-                &workload.queries[0].query_string,
-                workload.queries[0].accuracy_target.clone(),
-            )
-            .unwrap(),
-        );
-        select_logical_roots_with_error_resource_profiles(
-            &mut workload.queries,
-            vec![root],
-            &workload.topk_membership_evidence_by_query_id,
-            &workload.exact_composition_costs,
-            Some(&erp),
-        )
-        .unwrap();
-
-        assert!(matches!(
-            workload.queries[0].selected_plan_root.expr,
-            SummaryExpr::KeepPreAsap(_)
-        ));
-        let plan = DeploymentPlanCompiler
-            .compile_promql(workload, environment(10000))
-            .unwrap();
-        assert!(plan.precompute_plan.materializations.is_empty());
-    }
-
-    fn measured_exact_composition_rows(
-        expr: &QueryExpr,
-        observed_at_unix_ms: u64,
-    ) -> Vec<ExactCompositionCostEvidence> {
-        fn visit(
-            expr: &QueryExpr,
-            observed_at_unix_ms: u64,
-            rows: &mut Vec<ExactCompositionCostEvidence>,
-        ) {
-            use planner_types::post_asap::ExactOperation;
-            match expr {
-                QueryExpr::Aggregate {
-                    reduction,
-                    measures,
-                    output_names,
-                    having,
-                    child,
-                } => {
-                    rows.push(ExactCompositionCostEvidence {
-                        target: serde_json::to_value(expr).unwrap(),
-                        operation: serde_json::to_value(ExactOperation::Aggregate {
-                            reduction: reduction.clone(),
-                            measures: measures.clone(),
-                            output_names: output_names.clone(),
-                            having: having.clone(),
-                        })
-                        .unwrap(),
-                        placement:
-                            crate::physical::post_asap::cost_model::ExactOperationPlacement::Read,
-                        expected_input_rows: 100.0,
-                        expected_output_rows: 10.0,
-                        exact_cpu_ns_per_row: 2.0,
-                        summary_maintenance_cpu_ns_per_update: 3.0,
-                        summary_read_cpu_ns: 20.0,
-                        update_rate_per_second: 100.0,
-                        evaluation_rate_per_second: 0.1,
-                        raw_recompute_cpu_ns: 100_000.0,
-                        observed_peak_memory_bytes: 4096,
-                        data_snapshot_id: "topk-planning-fixture".into(),
-                        model_version: "measured-test-v1".into(),
-                        observed_at_unix_ms,
-                        valid_for_ms: 60_000,
-                    });
-                    visit(child, observed_at_unix_ms, rows);
-                }
-                QueryExpr::Sort { child, .. }
-                | QueryExpr::Limit { child, .. }
-                | QueryExpr::TimeRange { child, .. }
-                | QueryExpr::Filter { child, .. }
-                | QueryExpr::Project { child, .. }
-                | QueryExpr::PromqlSubquery { child, .. }
-                | QueryExpr::TimeShift { child, .. }
-                | QueryExpr::PromqlScalarBridge(child)
-                | QueryExpr::PromqlVectorFromScalar(child)
-                | QueryExpr::PromqlScalarFromVector(child)
-                | QueryExpr::PromqlRelabel { child, .. }
-                | QueryExpr::PromqlSeriesSample { child, .. }
-                | QueryExpr::Dedup { child, .. } => visit(child, observed_at_unix_ms, rows),
-                _ => {}
-            }
-        }
-        let mut rows = Vec::new();
-        visit(expr, observed_at_unix_ms, &mut rows);
-        rows
-    }
-
-    #[test]
-    fn sum_rate_uses_summary_child_only_with_measured_composition_costs() {
-        let promql = "sum by (job) (rate(m[1m]))";
-        let mut with_evidence = request("topk-rate", promql);
-        with_evidence.allow_mixed_summary_and_exact_execution = true;
-        let root = Rc::new(
-            crate::query_parser::parse_query_expr_canonical(
-                promql,
-                with_evidence.queries[0].accuracy_target.clone(),
-            )
-            .unwrap(),
-        );
-        with_evidence.exact_composition_costs.insert(
-            "topk-rate".into(),
-            measured_exact_composition_rows(&root, 9_500),
-        );
-        select_logical_roots_for_queries(
-            &mut with_evidence.queries,
-            vec![root],
-            &with_evidence.topk_membership_evidence_by_query_id,
-            &with_evidence.exact_composition_costs,
-        )
-        .unwrap();
-        let mut backend = environment(10_000);
-        backend.target = PhysicalDeploymentTarget::BackendLocalRemoteWrite;
-        backend.target_collector_ids.clear();
-        let plan = DeploymentPlanCompiler
-            .compile_promql(with_evidence, backend)
-            .unwrap();
-        assert!(
-            !plan.summary_catalog.outputs.is_empty(),
-            "measured exact-composition evidence must expose the rate child as a SummaryStore binding"
-        );
-    }
-
-    #[test]
-    fn sum_rate_without_composition_costs_does_not_invent_a_composition_cost() {
-        let promql = "sum by (job) (rate(m[1m]))";
-        let mut unavailable = request("topk-rate", promql);
-        unavailable.allow_mixed_summary_and_exact_execution = true;
-        let root = Rc::new(
-            crate::query_parser::parse_query_expr_canonical(
-                promql,
-                unavailable.queries[0].accuracy_target.clone(),
-            )
-            .unwrap(),
-        );
-        select_logical_roots_for_queries(
-            &mut unavailable.queries,
-            vec![root],
-            &unavailable.topk_membership_evidence_by_query_id,
-            &unavailable.exact_composition_costs,
-        )
-        .unwrap();
-        let mut backend = environment(10_000);
-        backend.target = PhysicalDeploymentTarget::BackendLocalRemoteWrite;
-        backend.target_collector_ids.clear();
-        let plan = DeploymentPlanCompiler
-            .compile_promql(unavailable, backend)
-            .unwrap();
-        // Planner 54f can realize this particular shape directly as an exact
-        // counter readout plus a query-time reduce; it does not require an
-        // ExactComposition candidate. The absence of evidence must therefore
-        // leave that direct legal path intact rather than inventing a composed
-        // cost or forcing an exact fallback.
-        assert!(!plan.summary_catalog.outputs.is_empty());
-        let entry = plan
-            .query_plan
-            .entries
-            .values()
-            .find(|entry| entry.query_id == "topk-rate")
-            .unwrap();
-        assert!(entry
-            .nodes
-            .values()
-            .any(|node| matches!(node, crate::query_plan::QueryPlanNode::ExactReadout { .. })));
-    }
-
-    fn phase_workload(phases: &[u64]) -> QueryWorkload {
-        QueryWorkload {
-            language: QueryLanguage::PromQL,
-            query_batch: None,
-            repeating_queries: Some(
-                phases
-                    .iter()
-                    .enumerate()
-                    .map(|(index, phase)| RepeatingEntry {
-                        query: Query(format!("q{index}")),
-                        demand: RepeatedDemand::FixedIntervalAt {
-                            interval: RepetitionInterval(10_000),
-                            evaluation_phase: planner_types::workload::TimestampMs(*phase),
-                        },
-                        requirements: QueryRequirements::default(),
-                        predictability: Predictability::Predictable { known_at: None },
-                        time_selection: TimeSelection::default(),
-                    })
-                    .collect(),
-            ),
-        }
-    }
-
-    #[test]
-    fn shared_summary_requires_one_consumer_phase() {
-        let aligned = phase_workload(&[7_000, 67_000]);
-        assert_eq!(
-            shared_pane_origin_ms(Some(&aligned), [0, 1], 60_000).unwrap(),
-            Some(7_000)
-        );
-
-        let conflicting = phase_workload(&[7_000, 8_000]);
-        assert!(shared_pane_origin_ms(Some(&conflicting), [0, 1], 60_000)
-            .unwrap_err()
-            .contains("conflicting phases"));
-
-        let mut unknown = phase_workload(&[7_000]);
-        unknown.repeating_queries.as_mut().unwrap()[0].demand =
-            RepeatedDemand::FixedInterval(RepetitionInterval(10_000));
-        assert!(shared_pane_origin_ms(Some(&unknown), [0], 60_000)
-            .unwrap_err()
-            .contains("unknown evaluation phase"));
-    }
-
-    #[test]
-    fn query_staleness_extends_retention_without_changing_readout_lookback() {
-        let panes = asap_types::WindowMaterializationLayout::Pane { pane_secs: 30 };
-        assert_eq!(
-            retained_state_count(6 * 60 * 60_000, 19 * 60_000, 30_000, &panes),
-            759
-        );
-        assert_eq!(
-            retained_state_count(6 * 60 * 60_000, 0, 30_000, &panes),
-            721
-        );
-        assert_eq!(
-            retained_state_count(
-                6 * 60 * 60_000,
-                19 * 60_000,
-                30_000,
-                &asap_types::WindowMaterializationLayout::FullWindow,
-            ),
-            39
-        );
-    }
-
-    // Both production adapters preserve canonical root identity and select the
-    // whole evidence-free cohort, rather than independently binding roots.
-    #[test]
-    fn shared_selection_adapter_preserves_query_mapping() {
-        let mut workload = request("q90", "quantile_over_time(0.9, m[1m])");
-        workload
-            .queries
-            .extend(request("q99", "quantile_over_time(0.99, m[1m])").queries);
-        let roots = workload
-            .queries
-            .iter()
-            .map(|query| {
-                Rc::new(
-                    crate::query_parser::parse_query_expr_canonical(
-                        &query.query_string,
-                        query.accuracy_target.clone(),
-                    )
-                    .unwrap(),
-                )
-            })
-            .collect();
-        select_logical_roots_for_queries(
-            &mut workload.queries,
-            roots,
-            &workload.topk_membership_evidence_by_query_id,
-            &workload.exact_composition_costs,
-        )
-        .unwrap();
-        let bundle = DeploymentPlanCompiler
-            .compile_promql(workload, environment(10000))
-            .unwrap();
-        assert_eq!(bundle.query_plan.entries.len(), 2);
-        assert_eq!(bundle.collector_plans[0].materializations.len(), 1);
-        assert_eq!(
-            bundle
-                .query_plan
-                .entries
-                .values()
-                .map(|entry| entry.query_id.as_str())
-                .collect::<BTreeSet<_>>(),
-            BTreeSet::from(["q90", "q99"])
-        );
-    }
-
-    // A broken input mapping must be rejected, never silently drop a root.
-    #[test]
-    fn shared_selection_rejects_incomplete_root_mapping() {
-        let mut workload = request("q", "quantile_over_time(0.9, m[1m])");
-        assert!(select_logical_roots_for_queries(
-            &mut workload.queries,
-            vec![],
-            &workload.topk_membership_evidence_by_query_id,
-            &workload.exact_composition_costs,
-        )
-        .is_err());
-    }
-
-    // Adding another readout adds recurring reads, not another update stream.
-    #[test]
-    fn joint_lifecycle_charges_shared_updates_once() {
-        let baseline = DeploymentPlanCompiler
-            .compile_promql(
-                request("q90", "quantile_over_time(0.9, m[1m])"),
-                environment(10000),
-            )
-            .unwrap();
-        let mut workload = request("q90", "quantile_over_time(0.9, m[1m])");
-        let mut second = request("q99", "quantile_over_time(0.99, m[1m])")
-            .queries
-            .remove(0);
-        second.summary_lifecycle_inputs.evaluation_interval_ms = 20000;
-        workload.queries.push(second);
-        let shared = DeploymentPlanCompiler
-            .compile_promql(workload, environment(10000))
-            .unwrap();
-        assert_eq!(shared.lifecycle_estimates.len(), 1);
-        let estimate = &shared.lifecycle_estimates[0];
-        assert_eq!(estimate.consumer_query_ids, vec!["q90", "q99"]);
-        assert_eq!(estimate.expected_reads, 45.0);
-        assert_eq!(estimate.expected_updates, 30000.0);
-        assert!((estimate.lifecycle_cost - 45.8).abs() < 1e-9);
-        assert_eq!(
-            estimate.expected_updates,
-            baseline.lifecycle_estimates[0].expected_updates
-        );
-        assert!(
-            (estimate.lifecycle_cost - baseline.lifecycle_estimates[0].lifecycle_cost - 1.5).abs()
-                < 1e-9
-        );
-    }
-
-    // Unknown joint provenance cannot be replaced by whichever root came first.
-    #[test]
-    fn shared_lifecycle_rejects_conflicting_source_evidence() {
-        let mut workload = request("q90", "quantile_over_time(0.9, m[1m])");
-        let mut second = request("q99", "quantile_over_time(0.99, m[1m])")
-            .queries
-            .remove(0);
-        second.summary_lifecycle_inputs.ingestion_rate_per_second = 200.0;
-        workload.queries.push(second);
-        assert!(matches!(
-            DeploymentPlanCompiler.compile_promql(workload, environment(10000)),
-            Err(CompileError::Lifecycle { .. })
-        ));
-    }
-
-    #[test]
-    fn shared_materialization_is_emitted_once_for_every_runtime() {
-        for target in [
-            PhysicalDeploymentTarget::DistributedCollectors,
-            PhysicalDeploymentTarget::BackendLocalRemoteWrite,
-        ] {
-            let (first, second) = if target == PhysicalDeploymentTarget::BackendLocalRemoteWrite {
-                ("sum(rate(m[1m]))", "sum by (job) (rate(m[1m]))")
-            } else {
-                (
-                    "quantile_over_time(0.90, m[1m])",
-                    "quantile_over_time(0.99, m[1m])",
-                )
-            };
-            let mut workload = request("first", first);
-            workload.queries.extend(request("second", second).queries);
-            let mut env = environment(10_000);
-            env.target = target;
-            if target == PhysicalDeploymentTarget::BackendLocalRemoteWrite {
-                env.target_collector_ids.clear();
-            }
-            let bundle = DeploymentPlanCompiler
-                .compile_promql(workload, env)
-                .expect("shared compile");
-            assert_eq!(bundle.query_plan.entries.len(), 2);
-            assert_eq!(bundle.summary_catalog.outputs.len(), 1);
-            assert_eq!(bundle.precompute_plan.materializations.len(), 1);
-            assert_eq!(bundle.precompute_plan.schemas.len(), 1);
-            let bindings = bundle
-                .query_plan
-                .entries
-                .values()
-                .map(|entry| entry.materialization_bindings()[0].materialization)
-                .collect::<BTreeSet<_>>();
-            assert_eq!(bindings.len(), 1);
-            for collector in &bundle.collector_plans {
-                assert_eq!(collector.materializations.len(), 1);
-                assert!(bindings.contains(&collector.materializations[0].materialization));
-            }
-        }
-    }
-
-    #[test]
-    fn adding_shared_consumer_changes_plan_identity() {
-        let workload = request("q90", "quantile_over_time(0.90, m[1m])");
-        let one = DeploymentPlanCompiler
-            .compile_promql(workload, environment(10_000))
-            .unwrap();
-        let mut workload = request("q90", "quantile_over_time(0.90, m[1m])");
-        workload
-            .queries
-            .extend(request("q99", "quantile_over_time(0.99, m[1m])").queries);
-        let two = DeploymentPlanCompiler
-            .compile_promql(workload, environment(10_000))
-            .unwrap();
-        assert_ne!(one.envelope.plan_id, two.envelope.plan_id);
-        assert_eq!(two.collector_plans[0].materializations.len(), 1);
-    }
-
-    #[test]
-    fn different_sources_do_not_share_materializations() {
-        let mut workload = request("qm", "quantile_over_time(0.90, m[1m])");
-        let mut other = request("qn", "quantile_over_time(0.90, n[1m])");
-        other.queries[0].legacy_query_source = Source::TimeSeries { metric: "n".into() };
-        workload.queries.extend(other.queries);
-        let bundle = DeploymentPlanCompiler
-            .compile_promql(workload, environment(10_000))
-            .unwrap();
-        assert_eq!(bundle.summary_catalog.outputs.len(), 2);
-        assert_eq!(bundle.precompute_plan.materializations.len(), 2);
-        for collector in &bundle.collector_plans {
-            assert_eq!(collector.materializations.len(), 2);
-        }
-    }
-
-    #[test]
-    fn rate_and_increase_keep_planner_families_distinct() {
-        let mut workload = request("rate", "rate(m[1m])");
-        workload
-            .queries
-            .extend(request("increase", "increase(m[1m])").queries);
-        let bundle = DeploymentPlanCompiler
-            .compile_promql(workload, environment(10_000))
-            .unwrap();
-        assert_eq!(bundle.query_plan.entries.len(), 2);
-        assert_eq!(bundle.precompute_plan.materializations.len(), 2);
-        for collector in &bundle.collector_plans {
-            let algorithms: std::collections::BTreeSet<_> = collector
-                .materializations
-                .iter()
-                .map(|materialization| materialization.algorithm.as_str())
-                .collect();
-            assert_eq!(algorithms, ["increase", "rate"].into());
-        }
-    }
-
-    #[test]
-    fn shared_materialization_rejects_conflicting_deployment_contracts() {
-        let mut workload = request("q90", "quantile_over_time(0.90, m[1m])");
-        let mut other = request("q99", "quantile_over_time(0.99, m[1m])");
-        other.queries[0].window_realization_candidates[0].realization_id =
-            "another-implementation".into();
-        workload.queries.extend(other.queries);
-        let error = DeploymentPlanCompiler
-            .compile_promql(workload, environment(10_000))
-            .expect_err("conflicting shared state must fail before publication");
-        assert!(error
-            .to_string()
-            .contains("conflicting deployment contracts"));
-    }
-
-    #[test]
-    fn exact_dashboard_preserves_distinct_sum_and_count_producers() {
-        let mut snapshot: BackendLocalPlanningInput = serde_json::from_str(include_str!(
-            "../../../docs/examples/asapquery-planning-snapshot.json"
-        ))
-        .unwrap();
-        let entries = snapshot.query_workload.repeating_queries.as_mut().unwrap();
-        entries[0].query = Query("sum by (service) (sum_over_time(m[1m]))".into());
-        entries[0].requirements.accuracy = AccuracyRequirement::Explicit(AccuracyTarget::Exact);
-        let mut mean = entries[0].clone();
-        mean.query = Query(
-            "sum by (service) (sum_over_time(m[1m])) / sum by (service) (count_over_time(m[1m]))"
-                .into(),
-        );
-        entries.push(mean);
-        let (request, env) = snapshot.into_physical_compilation_request().unwrap();
-        let bundle = DeploymentPlanCompiler.compile_promql(request, env).unwrap();
-        assert_eq!(bundle.precompute_plan.materializations.len(), 2);
-        assert_eq!(bundle.query_plan.entries.len(), 2);
-        for entry in bundle.query_plan.entries.values() {
-            assert!(
-                !entry.nodes.values().any(|node| matches!(
-                    node,
-                    crate::query_plan::QueryPlanNode::ExactFallback { .. }
-                )),
-                "{entry:?}"
-            );
-            assert!(!entry.materialization_bindings().is_empty());
-        }
-        assert!(bundle
-            .query_plan
-            .entries
-            .values()
-            .any(|entry| entry.nodes.values().any(|node| matches!(
-                node,
-                crate::query_plan::QueryPlanNode::Logical {
-                    operator: crate::query_plan::query_time::QueryTimeOperator::Binary { .. },
-                    ..
-                }
-            ))));
-    }
-
-    #[test]
-    fn invalid_unselected_candidate_is_canonicalized_to_exact_fallback() {
-        let mut snapshot: BackendLocalPlanningInput = serde_json::from_str(include_str!(
-            "../../../docs/examples/asapquery-planning-snapshot.json"
-        ))
-        .unwrap();
-        let entry = &mut snapshot.query_workload.repeating_queries.as_mut().unwrap()[0];
-        entry.query =
-            Query("sum by (service) (sum_over_time(m[1m]) / count_over_time(m[1m]))".into());
-        entry.requirements.accuracy = AccuracyRequirement::Explicit(AccuracyTarget::Exact);
-        let (mut request, _) = snapshot.into_physical_compilation_request().unwrap();
-        // Exercise the invalid externally supplied graph, independent of the
-        // global selector (which now already chooses an exact fallback).
-        use asap_aware_mapping::ReplacementStrategy;
-        let candidates = asap_aware_mapping::SketchAlgorithmStrategy::new(
-            &ControlPlaneCostModel::new(AccuracyTarget::Exact),
-        )
-        .replacements(&asap_aware_mapping::TargetSubDAG::new(
-            &request.canonical_roots[0],
-        ));
-        request.queries[0].selected_plan_root = candidates
-            .into_iter()
-            .find_map(|candidate| match candidate.replacement {
-                asap_aware_mapping::Replacement::Summary(node)
-                    if !matches!(node.expr, SummaryExpr::KeepPreAsap(_)) =>
-                {
-                    Some(node)
-                }
-                _ => None,
-            })
-            .expect("invalid summary fixture");
-        assert!(!matches!(
-            request.queries[0].selected_plan_root.expr,
-            SummaryExpr::KeepPreAsap(_)
-        ));
-
-        preserve_invalid_exact_fallback_roots(&mut request.queries, &request.canonical_roots, true)
-            .unwrap();
-
-        assert!(matches!(
-            request.queries[0].selected_plan_root.expr,
-            SummaryExpr::KeepPreAsap(_)
-        ));
-    }
-
-    #[test]
-    fn selected_maintenance_dependency_still_requires_a_valid_executable_dag() {
-        let mut request = request("invalid-dependency", "sum_over_time(m[1m])");
-        let selected_root = request.queries[0].selected_plan_root.clone();
-        let selected = match &selected_root.expr {
-            SummaryExpr::SummaryEstimate { summary_input, .. } => summary_input.clone(),
-            SummaryExpr::SummaryAgg { .. } => selected_root.clone(),
-            SummaryExpr::ValueOperation {
-                child,
-                operation: planner_types::post_asap::ValueOperation::FinalizeExactAccumulator,
-                ..
-            } => child.clone(),
-            _ => panic!("expected maintained aggregate fixture"),
-        };
-        request.queries[0].selected_plan_root = Rc::new(SummaryNode {
-            expr: SummaryExpr::BinaryOp {
-                timing: planner_types::post_asap::ExecutionTiming::QueryTime,
-                lhs: selected.clone(),
-                rhs: selected.clone(),
-                operator: planner_types::post_asap::BinaryOperator {
-                    checked_relative_division: false,
-                    checked_finite_division: false,
-                    kind: planner_types::pre_asap::BinaryOpKind::Arithmetic(
-                        planner_types::pre_asap::ArithmeticOpKind::Add,
-                    ),
-                    vector_match: None,
-                },
-            },
-            schema: selected.schema.clone(),
-            guarantee: None,
-        });
-        request.allow_mixed_summary_and_exact_execution = true;
-        let mut environment = environment(10_000);
-        environment.target = PhysicalDeploymentTarget::BackendLocalRemoteWrite;
-        environment.target_collector_ids.clear();
-
-        let error = DeploymentPlanCompiler
-            .compile_promql(request, environment)
-            .unwrap_err();
-
-        assert!(error.to_string().contains("invalid executable subDAG"));
-    }
-
-    // Grouping must not move through non-additive arithmetic during physical
-    // packing: SUM(instance SUM / instance COUNT) is not pooled SUM / COUNT.
-    #[test]
-    fn non_additive_entity_reduction_does_not_bind_pooled_state() {
-        for query in [
-            "sum by (service) (sum_over_time(m[1m]) / count_over_time(m[1m]))",
-            "sum by (service) (sum_over_time(m[1m])) / sum by (region) (count_over_time(m[1m]))",
-            "sum(m) / sum_over_time(m[1m])",
-            "sum_over_time(m[1m]) / count_over_time(m[5m])",
-            "sum_over_time(m[1m] offset 1h) / count_over_time(m[1m] offset 1h)",
-        ] {
-            let mut snapshot: BackendLocalPlanningInput = serde_json::from_str(include_str!(
-                "../../../docs/examples/asapquery-planning-snapshot.json"
-            ))
-            .unwrap();
-            let entries = snapshot.query_workload.repeating_queries.as_mut().unwrap();
-            entries[0].query = Query(query.into());
-            entries[0].requirements.accuracy = AccuracyRequirement::Explicit(AccuracyTarget::Exact);
-            let (mut request, environment) = snapshot.into_physical_compilation_request().unwrap();
-            request.allow_mixed_summary_and_exact_execution = false;
-            let bundle = DeploymentPlanCompiler
-                .compile_promql(request, environment)
-                .unwrap();
-            assert!(bundle.precompute_plan.materializations.is_empty());
-            assert!(bundle.query_plan.entries.values().all(|entry| matches!(
-                entry.nodes[&entry.root],
-                crate::query_plan::QueryPlanNode::ExactFallback { .. }
-            )));
-        }
-    }
-
-    // Local composition must evaluate per-series division before the outer sum.
-    #[test]
-    fn composable_non_additive_rollup_does_not_pool_raw_producers() {
-        let mut snapshot: BackendLocalPlanningInput = serde_json::from_str(include_str!(
-            "../../../docs/examples/asapquery-planning-snapshot.json"
-        ))
-        .unwrap();
-        let entry = &mut snapshot.query_workload.repeating_queries.as_mut().unwrap()[0];
-        entry.query =
-            Query("sum by (service) (sum_over_time(m[1m]) / count_over_time(m[1m]))".into());
-        entry.requirements.accuracy = AccuracyRequirement::Explicit(AccuracyTarget::Exact);
-        let (request, environment) = snapshot.into_physical_compilation_request().unwrap();
-        let candidates =
-            super::super::workload_cost::enumerate_exact_and_materialized_candidates(request)
-                .unwrap();
-        match DeploymentPlanCompiler.compile_promql(candidates[0].clone(), environment.clone()) {
-            Ok(plan) => assert!(plan.precompute_plan.materializations.is_empty()),
-            Err(error) => assert!(error
-                .to_string()
-                .contains("semantically identical original subtree witness")),
-        }
-        let native = DeploymentPlanCompiler
-            .compile_promql(candidates.last().unwrap().clone(), environment)
-            .unwrap();
-        assert!(native.precompute_plan.materializations.is_empty());
-    }
-
-    #[test]
-    fn composable_per_entity_window_installs_isolated_state() {
-        use crate::query_plan::QueryPlanNode;
-        let mut snapshot: BackendLocalPlanningInput = serde_json::from_str(include_str!(
-            "../../../docs/examples/asapquery-planning-snapshot.json"
-        ))
-        .unwrap();
-        let entry = &mut snapshot.query_workload.repeating_queries.as_mut().unwrap()[0];
-        entry.query = Query("sum_over_time(m[1m])".into());
-        entry.requirements.accuracy = AccuracyRequirement::Explicit(AccuracyTarget::Exact);
-        let (request, env) = snapshot.into_physical_compilation_request().unwrap();
-        let plan = DeploymentPlanCompiler.compile_promql(request, env).unwrap();
-        assert_eq!(plan.precompute_plan.materializations.len(), 1);
-        assert_eq!(
-            plan.precompute_plan.materializations[0].partitioning,
-            Some(asap_types::sds::PopulationPartitioning::PerEntity)
-        );
-        let entry = plan.query_plan.lookup("sum_over_time(m[1m])").unwrap();
-        assert!(entry
-            .nodes
-            .values()
-            .any(|node| matches!(node, QueryPlanNode::ReadMaterialization { .. })));
-    }
-
-    // Each operand retains its source and semantic range; a smaller shared pane
-    // remains valid for both readouts.
-    #[test]
-    fn composable_binary_binds_independent_source_windows() {
-        let mut snapshot: BackendLocalPlanningInput = serde_json::from_str(include_str!(
-            "../../../docs/examples/asapquery-planning-snapshot.json"
-        ))
-        .unwrap();
-        let entry = &mut snapshot.query_workload.repeating_queries.as_mut().unwrap()[0];
-        entry.query = Query("sum(sum_over_time(a[1m])) / sum(sum_over_time(b[5m]))".into());
-        entry.requirements.accuracy = AccuracyRequirement::Explicit(AccuracyTarget::Exact);
-        // The derivation now covers both range selectors, so this no longer
-        // needs a hand-supplied 5m candidate to keep `b` from falling back.
-        let (request, env) = snapshot.into_physical_compilation_request().unwrap();
-        let plan = DeploymentPlanCompiler.compile_promql(request, env).unwrap();
-        let bindings = plan
-            .query_plan
-            .entries
-            .values()
-            .next()
-            .unwrap()
-            .materialization_bindings();
-        let actual = bindings
-            .iter()
-            .map(|binding| {
-                let identity = &plan.summary_catalog.outputs[&binding.materialization];
-                let data = &plan.summary_catalog.data_descriptors[&identity.data_descriptor_id];
-                (
-                    data.time_series_metric().unwrap(),
-                    binding.window_ms,
-                    binding.readout_lookback_ms,
-                )
-            })
-            .collect::<BTreeSet<_>>();
-        // `window_ms` is the stored pane width, `readout_lookback_ms` the
-        // semantic range. Each operand keeps its own range -- 1m for `a`, 5m
-        // for `b` -- while both store 10s panes, because the snapshot
-        // evaluates every 10s and the derivation now covers both selectors.
-        assert_eq!(
-            actual,
-            BTreeSet::from([("a", 10_000, Some(60_000)), ("b", 10_000, Some(300_000)),])
-        );
-        assert_eq!(plan.precompute_plan.materializations.len(), 2);
-    }
-
-    // Derived programs and their raw inputs must keep a runtime-supported cohort.
-    #[test]
-    fn derived_window_regression_nested_snapshot() {
-        for rate in [0.0, 100.0] {
-            let mut value: Value = serde_json::from_str(include_str!(
-                "../../../docs/examples/asapquery-planning-snapshot.json"
-            ))
-            .unwrap();
-            value["query_workload"]["repeating_queries"][0]["query"] =
-                json!("quantile(0.9, sum_over_time(m[1m]))");
-            value["data_workload"]["ingestion_rate"]["value"] = json!(rate);
-            let snapshot: BackendLocalPlanningInput = serde_json::from_value(value).unwrap();
-            let (request, env) = snapshot.into_physical_compilation_request().unwrap();
-            let plan = DeploymentPlanCompiler.compile_promql(request, env).unwrap();
-            assert!(plan
-                .precompute_plan
-                .materializations
-                .iter()
-                .any(|m| m.derived_input.is_some()));
-            assert!(plan
-                .precompute_plan
-                .materializations
-                .iter()
-                .all(|m| m.window_size == m.slide_interval));
-        }
-    }
-
-    // A derived cohort must not impose its maintenance cadence on an unrelated raw leaf at the same W.
-    #[test]
-    fn raw_leaf_keeps_its_cadence_beside_a_same_window_derived_cohort() {
-        let mut snapshot = planning_snapshot();
-        let model = snapshot.physical_inputs.window_cost_model.clone();
-        let entry = &mut snapshot.query_workload.repeating_queries.as_mut().unwrap()[0];
-        entry.query = Query("quantile(0.9, sum_over_time(m[1m]))".into());
-        entry.demand = RepeatedDemand::FixedIntervalAt {
-            interval: RepetitionInterval(45_000),
-            evaluation_phase: planner_types::workload::TimestampMs(0),
-        };
-        let mut right = snapshot.clone();
-        right.query_workload.repeating_queries.as_mut().unwrap()[0].query =
-            Query("sum_over_time(n[1m])".into());
-        let (mut request, env) = snapshot.into_physical_compilation_request().unwrap();
-        let (right, _) = right.into_physical_compilation_request().unwrap();
-        let left = request.queries[0].selected_plan_root.clone();
-        let right = right.queries[0].selected_plan_root.clone();
-        request.queries[0].selected_plan_root = Rc::new(SummaryNode {
-            expr: SummaryExpr::BinaryOp {
-                timing: planner_types::post_asap::ExecutionTiming::QueryTime,
-                lhs: left.clone(),
-                rhs: right,
-                operator: planner_types::post_asap::BinaryOperator {
-                    checked_relative_division: false,
-                    checked_finite_division: false,
-                    kind: planner_types::pre_asap::BinaryOpKind::Arithmetic(
-                        planner_types::pre_asap::ArithmeticOpKind::Add,
-                    ),
-                    vector_match: None,
-                },
-            },
-            schema: left.schema.clone(),
-            guarantee: None,
-        });
-        let text = "quantile(0.9, sum_over_time(m[1m])) + sum_over_time(n[1m])";
-        request.queries[0].query_string = text.into();
-        request
-            .query_workload
-            .as_mut()
-            .unwrap()
-            .repeating_queries
-            .as_mut()
-            .unwrap()[0]
-            .query = Query(text.into());
-        prepare_window_implementations(&mut request.queries[0], &model, env.target, 0).unwrap();
-        request.queries[0]
-            .window_realization_candidates
-            .retain(|candidate| {
-                matches!(
-                    candidate.layout,
-                    asap_types::WindowMaterializationLayout::Pane { .. }
-                )
-            });
-        let plan = DeploymentPlanCompiler.compile_promql(request, env).unwrap();
-        assert!(plan
-            .precompute_plan
-            .materializations
-            .iter()
-            .any(|m| m.derived_input.is_some()));
-        let raw = plan
-            .precompute_plan
-            .materializations
-            .iter()
-            .find(|m| m.metric == "n")
-            .unwrap();
-        assert_eq!(raw.slide_interval, 45);
-        assert_eq!(raw.window_layout.base_pane_secs(), 15);
-    }
-
-    // A full-window producer keeps overlapping accumulators alive even before publication.
-    #[test]
-    fn derived_window_regression_resident_cost() {
-        let template = planning_snapshot().physical_inputs.window_cost_model.cost;
-        let mut lifecycle = planning_lifecycle();
-        lifecycle.costs = LifecycleUnitCosts {
-            build: 0.0,
-            maintenance_per_update: 0.0,
-            read: 0.0,
-            retention_per_second: 1.0,
-            retirement: 0.0,
-        };
-        let full = derived_window_cost(
-            &template,
-            &lifecycle,
-            300,
-            30,
-            &asap_types::WindowMaterializationLayout::FullWindow,
-            0,
-        );
-        assert!(full.weighted_cost >= lifecycle.horizon_seconds * 11.0);
-    }
-
-    // Temporal SUM readouts share raw state only for identical source populations.
-    #[test]
-    fn derived_window_regression_shared_sum_panes() {
-        for interval in [10_000, 60_000] {
-            for (rhs, expected_states) in [("a", 1), ("b", 2), ("a{job=\"x\"}", 2)] {
-                let mut snapshot = planning_snapshot();
-                let query = format!("sum_over_time(a[1m]) / sum_over_time({rhs}[10m])");
-                let entry = &mut snapshot.query_workload.repeating_queries.as_mut().unwrap()[0];
-                entry.query = Query(query);
-                entry.requirements.accuracy = AccuracyRequirement::Explicit(AccuracyTarget::Exact);
-                entry.demand = RepeatedDemand::FixedIntervalAt {
-                    interval: RepetitionInterval(interval),
-                    evaluation_phase: planner_types::workload::TimestampMs(0),
-                };
-                let (request, env) = snapshot.into_physical_compilation_request().unwrap();
-                let plan = DeploymentPlanCompiler.compile_promql(request, env).unwrap();
-                assert_eq!(plan.precompute_plan.materializations.len(), expected_states);
-                let entry = plan.query_plan.entries.values().next().unwrap();
-                let bindings = entry.materialization_bindings();
-                assert_eq!(
-                    bindings
-                        .iter()
-                        .filter_map(|b| b.readout_lookback_ms)
-                        .collect::<BTreeSet<_>>(),
-                    BTreeSet::from([60_000, 600_000])
-                );
-                if rhs == "a" {
-                    assert_eq!(bindings[0].materialization, bindings[1].materialization);
-                    assert_eq!(
-                        plan.precompute_plan.materializations[0].num_aggregates_to_retain,
-                        Some(600_000 / u64::from(interval) + 1)
-                    );
-                }
-            }
-        }
-    }
-
-    // Distinct workload entries share one producer and retain both lifecycle consumers.
-    #[test]
-    fn shared_panes_preserve_workload_consumers_and_phase() {
-        for phase in [0, 5_000] {
-            let mut snapshot = planning_snapshot();
-            let entries = snapshot.query_workload.repeating_queries.as_mut().unwrap();
-            entries[0].query = Query("sum_over_time(a[1m])".into());
-            entries[0].requirements.accuracy = AccuracyRequirement::Explicit(AccuracyTarget::Exact);
-            let mut second = entries[0].clone();
-            second.query = Query("sum_over_time(a[10m])".into());
-            second.demand = RepeatedDemand::FixedIntervalAt {
-                interval: RepetitionInterval(10_000),
-                evaluation_phase: planner_types::workload::TimestampMs(phase),
-            };
-            entries.push(second);
-            let (request, env) = snapshot.into_physical_compilation_request().unwrap();
-            let plan = DeploymentPlanCompiler.compile_promql(request, env).unwrap();
-            assert_eq!(
-                plan.precompute_plan.materializations.len(),
-                if phase == 0 { 1 } else { 2 }
-            );
-            if phase == 0 {
-                assert_eq!(plan.lifecycle_estimates.len(), 1);
-                let estimate = &plan.lifecycle_estimates[0];
-                assert_eq!(estimate.consumer_query_ids.len(), 2);
-                assert_eq!(estimate.expected_reads, 60.0);
-                assert_eq!(estimate.expected_updates, 30_000.0);
-            }
-        }
-    }
-
-    // Overflow must fail candidate validation, never turn an expensive layout into a free one.
-    #[test]
-    fn derived_cost_overflow_is_rejected() {
-        let snapshot = planning_snapshot();
-        let (mut request, env) = snapshot.into_physical_compilation_request().unwrap();
-        let query = &mut request.queries[0];
-        let mut lifecycle = query.summary_lifecycle_inputs.clone();
-        lifecycle.costs.build = f64::MAX;
-        let candidate = &mut query.window_realization_candidates[0];
-        candidate.cost = derived_window_cost(
-            &candidate.cost,
-            &lifecycle,
-            candidate.window_secs,
-            candidate.slide_secs,
-            &candidate.layout,
-            0,
-        );
-        assert!(validate_window_implementations(query, &env).is_err());
-    }
-
-    // Serialized derived quotes become authoritative when a deployment supplies them explicitly.
-    #[test]
-    fn explicit_window_quotes_are_not_repriced_for_sharing() {
-        let mut snapshot = planning_snapshot();
-        let query = "sum_over_time(a[1m]) / sum_over_time(a[10m])";
-        let entry = &mut snapshot.query_workload.repeating_queries.as_mut().unwrap()[0];
-        entry.query = Query(query.into());
-        entry.requirements.accuracy = AccuracyRequirement::Explicit(AccuracyTarget::Exact);
-        let (derived, _) = snapshot
-            .clone()
-            .into_physical_compilation_request()
-            .unwrap();
-        snapshot.physical_inputs.window_cost_model.quotes =
-            derived.queries[0].window_realization_candidates.clone();
-        let (request, env) = snapshot.into_physical_compilation_request().unwrap();
-        assert!(request.queries[0]
-            .window_realization_candidates
-            .iter()
-            .any(|c| !c.derived));
-        let plan = DeploymentPlanCompiler.compile_promql(request, env).unwrap();
-        assert_eq!(plan.precompute_plan.materializations.len(), 2);
-    }
-
-    fn planning_lifecycle() -> SummaryLifecyclePlanningInputs {
-        planning_snapshot()
-            .into_physical_compilation_request()
-            .unwrap()
-            .0
-            .queries[0]
-            .summary_lifecycle_inputs
-            .clone()
-    }
-
-    fn planning_snapshot() -> BackendLocalPlanningInput {
-        serde_json::from_str(include_str!(
-            "../../../docs/examples/asapquery-planning-snapshot.json"
-        ))
-        .unwrap()
-    }
-
-    fn derived_query_window_secs(query: &str) -> u64 {
-        let mut snapshot = planning_snapshot();
-        let entry = &mut snapshot.query_workload.repeating_queries.as_mut().unwrap()[0];
-        entry.query = Query(query.into());
-        entry.requirements.accuracy = AccuracyRequirement::Explicit(AccuracyTarget::Exact);
-        snapshot
-            .into_physical_compilation_request()
-            .unwrap()
-            .0
-            .queries[0]
-            .query_lookback_seconds
-    }
-
-    fn set_data_ingestion_interval(
-        snapshot: &mut BackendLocalPlanningInput,
-        interval_ms: Option<u64>,
-    ) {
-        let evidence = Evidence {
-            value: interval_ms.map(DurationMs),
-            source: EvidenceSource::Declared,
-            observed_at_ms: None,
-            valid_for_ms: None,
-        };
-        snapshot.data_workload.data_ingestion_interval = evidence;
-    }
-
-    // Plan-ready lowering uses workload cadence, not the backend-local migration field.
-    #[test]
-    fn instant_aggregate_uses_data_ingestion_interval() {
-        let mut snapshot = planning_snapshot();
-        snapshot.query_workload.repeating_queries.as_mut().unwrap()[0].query =
-            Query("sum(data)".into());
-        set_data_ingestion_interval(&mut snapshot, Some(1_000));
-
-        let (request, _) = snapshot.into_physical_compilation_request().unwrap();
-        assert_eq!(request.queries[0].query_lookback_seconds, 1);
-    }
-
-    // Snapshot lowering must use the environment clock for cadence freshness.
-    #[test]
-    fn snapshot_rejects_unavailable_cadence_evidence() {
-        for (observed, valid_for) in [
-            (Some(0), Some(0)),
-            (Some(u64::MAX), None),
-            (None, Some(100)),
-        ] {
-            let mut snapshot = planning_snapshot();
-            snapshot
-                .data_workload
-                .data_ingestion_interval
-                .observed_at_ms = observed;
-            snapshot.data_workload.data_ingestion_interval.valid_for_ms = valid_for;
-            let error = snapshot.into_physical_compilation_request().unwrap_err();
-            assert!(
-                error
-                    .to_string()
-                    .contains("evidence is unavailable at planning time"),
-                "{error}"
-            );
-        }
-    }
-
-    // Legacy snapshots migrate their explicit scrape cadence into DataWorkload.
-    #[test]
-    fn missing_data_ingestion_interval_migrates_scrape_interval() {
-        let mut snapshot = planning_snapshot();
-        snapshot.query_workload.repeating_queries.as_mut().unwrap()[0].query =
-            Query("sum(data)".into());
-        set_data_ingestion_interval(&mut snapshot, None);
-
-        let (request, _) = snapshot.into_physical_compilation_request().unwrap();
-        assert_eq!(
-            request.data_workload.unwrap().data_ingestion_interval.value,
-            Some(DurationMs(5_000))
-        );
-        assert_eq!(request.queries[0].query_lookback_seconds, 5);
-    }
-
-    // An explicitly invalid interval must not be replaced by the migration value.
-    #[test]
-    fn zero_data_ingestion_interval_is_rejected() {
-        let mut snapshot = planning_snapshot();
-        set_data_ingestion_interval(&mut snapshot, Some(0));
-
-        let error = snapshot
-            .into_physical_compilation_request()
-            .expect_err("zero interval must fail")
-            .to_string();
-        assert!(error.contains("data_ingestion_interval must be greater than zero"));
-    }
-
-    // Every concatenated histogram result contributes its source history.
-    #[test]
-    fn derived_history_visits_concat_branches() {
-        assert_eq!(derived_query_window_secs(
-            "histogram_quantiles(rate(request_duration_seconds_bucket[5m]), \"quantile\", 0.5, 0.9)"
-        ), 300);
-    }
-
-    // A short ranged sibling must not suppress a raw selector's default window.
-    #[test]
-    fn derived_history_applies_cadence_at_each_rangeless_source() {
-        assert_eq!(
-            derived_query_window_secs("sum(a) + sum(sum_over_time(b[1s]))"),
-            5
-        );
-        assert_eq!(derived_query_window_secs("sum(a offset 1h)"), 3605);
-        assert_eq!(derived_query_window_secs("sum_over_time(a[1s])"), 1);
-    }
-
-    // The seconds-based backend must fail explicitly instead of shrinking history.
-    #[test]
-    fn derived_history_rejects_fractional_seconds() {
-        for query in [
-            "sum_over_time(a[1500ms])",
-            "sum_over_time(a[500ms])",
-            "sum_over_time(a[1500ms] offset 500ms)",
-            "sum_over_time(a[1s]) + sum(sum_over_time(b[500ms]))",
-            "avg_over_time((sum(a))[1500ms:])",
-            "sum(a offset 500ms)",
-        ] {
-            let mut snapshot = planning_snapshot();
-            snapshot.query_workload.repeating_queries.as_mut().unwrap()[0].query =
-                Query(query.into());
-            let error = snapshot
-                .into_physical_compilation_request()
-                .expect_err(query)
-                .to_string();
-            assert!(
-                error.contains("whole number of seconds"),
-                "{query}: {error}"
-            );
-        }
-    }
-
-    #[test]
-    fn snapshot_rejects_manual_lookback() {
-        let mut wire = serde_json::to_value(planning_snapshot()).unwrap();
-        wire["query_workload"]["repeating_queries"][0]["time_selection"]["lookback"] =
-            60_000.into();
-        let error = serde_json::from_value::<BackendLocalPlanningInput>(wire)
-            .expect_err("manual lookback must not be accepted")
-            .to_string();
-        assert!(error.contains("lookback is not supported"), "{error}");
-    }
-
-    #[test]
-    fn subquery_range_derives_the_query_window() {
-        assert_eq!(
-            derived_query_window_secs("avg_over_time((sum(a))[6h:])"),
-            6 * 60 * 60 + 5
-        );
-    }
-
-    #[test]
-    fn offset_extends_the_query_furthest_lookback() {
-        // Evaluated at t, `a[1m] offset 1h` selects `(t - 61m, t - 60m]`.
-        assert_eq!(
-            derived_query_window_secs("sum_over_time(a[1m] offset 1h)"),
-            61 * 60
-        );
-    }
-
-    // A workload evaluated more often than its window is wide must advance its
-    // state at that cadence. Planning it as one lookback-wide tumbling window
-    // answers with results that only change once per window.
-    #[test]
-    fn derived_window_candidate_follows_the_evaluation_cadence() {
-        let cost = planning_snapshot().physical_inputs.window_cost_model.cost;
-        let expr = crate::query_parser::parse_query_expr_canonical(
-            "quantile_over_time(0.5, data[5m])",
-            AccuracyTarget::Exact,
-        )
-        .unwrap();
-        let derived =
-            derived_window_candidates("id", &expr, 300_000, 30_000, cost, &planning_lifecycle(), 0);
-        // A sliding shape has two legal layouts, so both are offered and the
-        // cost model picks between them.
-        assert_eq!(
-            derived
-                .iter()
-                .map(|c| (c.realization_id.as_str(), c.layout.clone()))
-                .collect::<Vec<_>>(),
-            vec![
-                (
-                    "id-300s-slide-30s-pane-30s",
-                    asap_types::WindowMaterializationLayout::Pane { pane_secs: 30 }
-                ),
-                (
-                    "id-300s-slide-30s-full-window",
-                    asap_types::WindowMaterializationLayout::FullWindow
-                ),
-            ]
-        );
-        let candidate = &derived[0];
-        assert_eq!(candidate.framework, SummaryWindowFramework::Sliding);
-        assert_eq!((candidate.window_secs, candidate.slide_secs), (300, 30));
-        assert_eq!(
-            candidate.layout,
-            asap_types::WindowMaterializationLayout::Pane { pane_secs: 30 }
-        );
-    }
-
-    // The layout choice is a write-amplification-versus-read-amplification
-    // trade, and the derived quote has to price it in the right direction: a
-    // full window takes every sample into all ten overlapping windows but is
-    // read whole, panes take each sample once but compose ten per read. Which
-    // wins depends on how hard the source is pushing, so pin the crossover,
-    // not the magnitudes.
-    #[test]
-    fn derived_window_layout_prices_write_against_read_amplification() {
-        let cost = planning_snapshot().physical_inputs.window_cost_model.cost;
-        let expr = crate::query_parser::parse_query_expr_canonical(
-            "quantile_over_time(0.5, data[5m])",
-            AccuracyTarget::Exact,
-        )
-        .unwrap();
-        let quote = |rate: f64| {
-            let mut lifecycle = planning_lifecycle();
-            lifecycle.ingestion_rate_per_second = rate;
-            let derived = derived_window_candidates(
-                "id",
-                &expr,
-                300_000,
-                30_000,
-                cost.clone(),
-                &lifecycle,
-                0,
-            );
-            let weighted = |layout: &asap_types::WindowMaterializationLayout| {
-                derived
-                    .iter()
-                    .find(|c| c.layout == *layout)
-                    .expect("both layouts offered")
-                    .cost
-                    .weighted_cost
-            };
-            (
-                weighted(&asap_types::WindowMaterializationLayout::Pane { pane_secs: 30 }),
-                weighted(&asap_types::WindowMaterializationLayout::FullWindow),
-            )
-        };
-        let (idle_pane, idle_full) = quote(0.0);
-        assert!(
-            idle_full < idle_pane,
-            "with no arriving data the fanout is free and the merges are not: \
-             pane {idle_pane} full {idle_full}"
-        );
-        let (busy_pane, busy_full) = quote(100.0);
-        assert!(
-            busy_pane < busy_full,
-            "under load the tenfold update fanout dominates: pane {busy_pane} full {busy_full}"
-        );
-    }
-
-    // A tumbling shape pairs only with `Pane` in the validator's
-    // framework/layout table, so there is no alternative to price against it.
-    #[test]
-    fn tumbling_shapes_have_no_layout_alternative_to_rank() {
-        let cost = planning_snapshot().physical_inputs.window_cost_model.cost;
-        let expr = crate::query_parser::parse_query_expr_canonical(
-            "quantile_over_time(0.5, data[5m])",
-            AccuracyTarget::Exact,
-        )
-        .unwrap();
-        let derived = derived_window_candidates(
-            "id",
-            &expr,
-            300_000,
-            300_000,
-            cost,
-            &planning_lifecycle(),
-            0,
-        );
-        assert_eq!(derived.len(), 1);
-        assert_eq!(derived[0].realization_id, "id-300s-slide-300s-pane-300s");
-        assert_eq!(derived[0].framework, SummaryWindowFramework::Tumbling);
-    }
-
-    // Every shape this function can emit must survive the validator, or a bad
-    // derivation would reach a plan instead of a compile error.
-    #[test]
-    fn derived_window_candidate_shapes_are_accepted_by_validation() {
-        let snapshot = planning_snapshot();
-        let (request, environment) = snapshot.into_physical_compilation_request().unwrap();
-        let cost = planning_snapshot().physical_inputs.window_cost_model.cost;
-        for (lookback_ms, evaluation_ms) in [
-            (300_000, 30_000),
-            (300_000, 300_000),
-            (300_000, 45_000),
-            (60_000, 90_000),
-        ] {
-            let mut query = request.queries[0].clone();
-            query.query_lookback_seconds = lookback_ms / 1_000;
-            let expr = crate::query_parser::parse_query_expr_canonical(
-                &format!("quantile_over_time(0.5, data[{}s])", lookback_ms / 1_000),
-                AccuracyTarget::Exact,
-            )
-            .unwrap();
-            query.window_realization_candidates = derived_window_candidates(
-                "derived",
-                &expr,
-                lookback_ms,
-                evaluation_ms,
-                cost.clone(),
-                &planning_lifecycle(),
-                0,
-            );
-            validate_window_implementations(&query, &environment).unwrap_or_else(|error| {
-                panic!("lookback {lookback_ms} cadence {evaluation_ms}: {error:?}")
-            });
-        }
-    }
-
-    // Compilation keeps the demand grid while publishing independently sized panes or full windows.
-    #[test]
-    fn scheduled_window_layouts_preserve_cadence_phase_and_readout() {
-        for (evaluation, pane) in [(20, 20), (45, 15), (60, 60), (120, 60), (90, 30)] {
-            for phase in [0, 5_000] {
-                for full in [false, true] {
-                    if full && evaluation == 60 {
-                        continue;
-                    }
-                    let mut snapshot = planning_snapshot();
-                    let entry = &mut snapshot.query_workload.repeating_queries.as_mut().unwrap()[0];
-                    entry.query = Query("sum_over_time(a[1m])".into());
-                    entry.requirements.accuracy =
-                        AccuracyRequirement::Explicit(AccuracyTarget::Exact);
-                    entry.demand = RepeatedDemand::FixedIntervalAt {
-                        interval: RepetitionInterval(evaluation * 1_000),
-                        evaluation_phase: planner_types::workload::TimestampMs(phase),
-                    };
-                    let (mut request, env) = snapshot.into_physical_compilation_request().unwrap();
-                    request.queries[0]
-                        .window_realization_candidates
-                        .retain(|c| {
-                            matches!(
-                                c.layout,
-                                asap_types::WindowMaterializationLayout::FullWindow
-                            ) == full
-                        });
-                    let plan = DeploymentPlanCompiler.compile_promql(request, env).unwrap();
-                    let config = &plan.precompute_plan.materializations[0];
-                    assert_eq!(config.slide_interval, u64::from(evaluation));
-                    assert_eq!(config.window_size, 60);
-                    assert_eq!(
-                        config.stored_window_ms(),
-                        if full { 60_000 } else { pane * 1_000 }
-                    );
-                    let entry = plan.query_plan.entries.values().next().unwrap();
-                    let binding = entry.materialization_bindings()[0];
-                    for tick in 3..6 {
-                        let end = phase + u64::from(evaluation) * 1_000 * tick;
-                        assert!(
-                            binding.covers_range(end - 60_000, end),
-                            "{evaluation} {phase} {full}"
-                        );
-                        assert!(!binding.covers_range(end - 60_000 + 1, end + 1));
-                    }
-                }
-            }
-        }
-    }
-
-    // Smaller common panes are selected only when saved maintenance exceeds extra merge work.
-    #[test]
-    fn different_cadences_share_common_panes_only_when_cheaper() {
-        for read_cost in [0.0, 1_000_000.0] {
-            let mut snapshot = planning_snapshot();
-            snapshot.physical_inputs.lifecycle_costs.read = read_cost;
-            snapshot
-                .physical_inputs
-                .lifecycle_costs
-                .maintenance_per_update = 1.0;
-            let entries = snapshot.query_workload.repeating_queries.as_mut().unwrap();
-            entries[0].query = Query("sum_over_time(a[1m])".into());
-            entries[0].requirements.accuracy = AccuracyRequirement::Explicit(AccuracyTarget::Exact);
-            entries[0].demand = RepeatedDemand::FixedIntervalAt {
-                interval: RepetitionInterval(20_000),
-                evaluation_phase: planner_types::workload::TimestampMs(0),
-            };
-            let mut second = entries[0].clone();
-            second.query = Query("sum_over_time(a[90s])".into());
-            second.demand = RepeatedDemand::FixedIntervalAt {
-                interval: RepetitionInterval(30_000),
-                evaluation_phase: planner_types::workload::TimestampMs(0),
-            };
-            entries.push(second);
-            let (mut request, env) = snapshot.into_physical_compilation_request().unwrap();
-            for query in &mut request.queries {
-                query.window_realization_candidates.retain(|c| {
-                    matches!(
-                        c.layout,
-                        asap_types::WindowMaterializationLayout::Pane { .. }
-                    )
-                });
-            }
-            let plan = DeploymentPlanCompiler.compile_promql(request, env).unwrap();
-            assert_eq!(
-                plan.precompute_plan.materializations.len(),
-                if read_cost == 0.0 { 1 } else { 2 }
-            );
-            if read_cost == 0.0 {
-                assert_eq!(
-                    plan.precompute_plan.materializations[0].stored_window_ms(),
-                    10_000
-                );
-                assert_eq!(plan.lifecycle_estimates[0].expected_reads, 25.0);
-                assert_eq!(plan.lifecycle_estimates[0].expected_updates, 30_000.0);
-            }
-        }
-    }
-
-    // An incompatible third consumer cannot disable sharing between the first two.
-    #[test]
-    fn sharing_keeps_profitable_subsets_with_other_phases_or_finer_cadences() {
-        for (third_phase, third_interval) in [(5_000, 20_000), (0, 1_000)] {
-            let mut snapshot = planning_snapshot();
-            snapshot
-                .physical_inputs
-                .lifecycle_costs
-                .maintenance_per_update = 1.0;
-            snapshot.physical_inputs.lifecycle_costs.read =
-                if third_interval == 1_000 { 100.0 } else { 0.0 };
-            let entries = snapshot.query_workload.repeating_queries.as_mut().unwrap();
-            let template = entries[0].clone();
-            entries.clear();
-            for (window, phase, interval) in [
-                (60, 0, 20_000),
-                (120, 0, 20_000),
-                (180, third_phase, third_interval),
-            ] {
-                let mut entry = template.clone();
-                entry.query = Query(format!("sum_over_time(a[{window}s])"));
-                entry.requirements.accuracy = AccuracyRequirement::Explicit(AccuracyTarget::Exact);
-                entry.demand = RepeatedDemand::FixedIntervalAt {
-                    interval: RepetitionInterval(interval),
-                    evaluation_phase: planner_types::workload::TimestampMs(phase),
-                };
-                entries.push(entry);
-            }
-            let (mut request, env) = snapshot.into_physical_compilation_request().unwrap();
-            for query in &mut request.queries {
-                query.window_realization_candidates.retain(|c| {
-                    matches!(
-                        c.layout,
-                        asap_types::WindowMaterializationLayout::Pane { .. }
-                    )
-                });
-            }
-            let plan = DeploymentPlanCompiler.compile_promql(request, env).unwrap();
-            assert_eq!(plan.precompute_plan.materializations.len(), 2);
-            assert!(plan
-                .lifecycle_estimates
-                .iter()
-                .any(|e| e.consumer_query_ids.len() == 2));
-        }
-    }
-
-    // A subsecond cadence cannot be rounded into a different supported query schedule.
-    #[test]
-    fn fractional_cadence_uses_native_fallback_without_truncation() {
-        let mut snapshot = planning_snapshot();
-        let entry = &mut snapshot.query_workload.repeating_queries.as_mut().unwrap()[0];
-        entry.query = Query("sum_over_time(a[1m])".into());
-        entry.demand = RepeatedDemand::FixedIntervalAt {
-            interval: RepetitionInterval(1_500),
-            evaluation_phase: planner_types::workload::TimestampMs(0),
-        };
-        let (request, env) = snapshot.into_physical_compilation_request().unwrap();
-        assert!(request.queries[0].window_realization_candidates.is_empty());
-        let plan = DeploymentPlanCompiler.compile_promql(request, env).unwrap();
-        assert!(plan.precompute_plan.materializations.is_empty());
-    }
-
-    // Every supported cadence has panes that exactly tile each scheduled range.
-    #[test]
-    fn derived_window_candidates_cover_dividing_nondividing_and_sparse_cadences() {
-        let expr = crate::query_parser::parse_query_expr_canonical(
-            "sum_over_time(data[1m])",
-            AccuracyTarget::Exact,
-        )
-        .unwrap();
-        for (evaluation_secs, pane_secs) in [(20, 20), (45, 15), (60, 60), (120, 60), (90, 30)] {
-            let candidates = derived_window_candidates(
-                "id",
-                &expr,
-                60_000,
-                evaluation_secs * 1_000,
-                planning_snapshot().physical_inputs.window_cost_model.cost,
-                &planning_lifecycle(),
-                0,
-            );
-            let pane = candidates
-                .iter()
-                .find(|c| {
-                    matches!(
-                        c.layout,
-                        asap_types::WindowMaterializationLayout::Pane { .. }
-                    )
-                })
-                .unwrap();
-            assert_eq!(pane.slide_secs, u64::from(evaluation_secs));
-            assert_eq!(
-                pane.layout,
-                asap_types::WindowMaterializationLayout::Pane { pane_secs }
-            );
-            assert!(pane
-                .layout
-                .validate(pane.window_secs, pane.slide_secs)
-                .is_ok());
-        }
-    }
-
-    // A measured quote replaces only the matching shape, leaving other legal layouts available.
-    #[test]
-    fn measured_window_quote_preserves_shape_and_price() {
-        let mut snapshot = planning_snapshot();
-        let (derived, _) = snapshot
-            .clone()
-            .into_physical_compilation_request()
-            .unwrap();
-        let mut quote = derived.queries[0].window_realization_candidates[0].clone();
-        quote.realization_id = "measured-pane".into();
-        quote.cost.weighted_cost = 8.0;
-        quote.derived = false;
-        snapshot
-            .physical_inputs
-            .window_cost_model
-            .quotes
-            .push(quote.clone());
-        let (request, _) = snapshot.into_physical_compilation_request().unwrap();
-        assert!(request.queries[0]
-            .window_realization_candidates
-            .contains(&quote));
-        assert!(request.queries[0]
-            .window_realization_candidates
-            .iter()
-            .any(|candidate| candidate.derived));
-    }
-
-    // End to end: the retained-state count is derived from the pane width, so
-    // fixing the shape fixes it too. Six 10s panes cover the 1m lookback, plus
-    // the one still being filled.
-    #[test]
-    fn retained_state_count_follows_the_derived_pane_width() {
-        let snapshot = planning_snapshot();
-        let (request, environment) = snapshot.into_physical_compilation_request().unwrap();
-        let plan = DeploymentPlanCompiler
-            .compile_promql(request, environment)
-            .unwrap();
-        assert_eq!(
-            plan.precompute_plan.materializations[0].num_aggregates_to_retain,
-            Some(7)
-        );
-    }
-
-    // The reported case: two 5m-lookback quantiles evaluated every 30s. The
-    // whole chain has to land — sliding framework, 30s panes, and the retained
-    // count that falls out of the pane width — or the answer only changes once
-    // every five minutes.
-    #[test]
-    fn five_minute_lookback_evaluated_every_thirty_seconds_slides_by_thirty() {
-        let mut snapshot = planning_snapshot();
-        {
-            let entry = &mut snapshot.query_workload.repeating_queries.as_mut().unwrap()[0];
-            entry.query = Query("quantile_over_time(0.5, data[5m])".into());
-            entry.demand = RepeatedDemand::FixedIntervalAt {
-                interval: RepetitionInterval(30_000),
-                evaluation_phase: planner_types::workload::TimestampMs(0),
-            };
-        }
-        let (request, environment) = snapshot.into_physical_compilation_request().unwrap();
-        let plan = DeploymentPlanCompiler
-            .compile_promql(request, environment)
-            .unwrap();
-        let materialization = &plan.precompute_plan.materializations[0];
-        assert_eq!(
-            (
-                materialization.window_size,
-                materialization.slide_interval,
-                materialization.window_type,
-                materialization.window_layout.clone(),
-                materialization.num_aggregates_to_retain,
-            ),
-            (
-                300,
-                30,
-                asap_types::WindowKind::Sliding,
-                asap_types::WindowMaterializationLayout::Pane { pane_secs: 30 },
-                // Ten 30s panes cover the 5m lookback, plus the one still filling.
-                Some(11),
-            )
-        );
-    }
-
-    // A filtered operand gets a summary over its own filtered population,
-    // with each operand keeping its own range.
-    #[test]
-    fn composable_binary_summarizes_each_prometheus_filtered_operand() {
-        use crate::query_plan::{query_time::QueryTimeOperator, QueryPlanNode};
-        let mut snapshot: BackendLocalPlanningInput = serde_json::from_str(include_str!(
-            "../../../docs/examples/asapquery-planning-snapshot.json"
-        ))
-        .unwrap();
-        let entry = &mut snapshot.query_workload.repeating_queries.as_mut().unwrap()[0];
-        entry.query =
-            Query("sum(sum_over_time(a[1m])) / sum(sum_over_time(b{job!=\"x\"}[5m]))".into());
-        entry.requirements.accuracy = AccuracyRequirement::Explicit(AccuracyTarget::Exact);
-        let (request, env) = snapshot.into_physical_compilation_request().unwrap();
-        let plan = DeploymentPlanCompiler.compile_promql(request, env).unwrap();
-        let query = plan.query_plan.entries.values().next().unwrap();
-        let bindings = query.materialization_bindings();
-        // Both operands now hold a summary. The filtered denominator is no
-        // longer query-time only: its 5m range has a candidate, so it gets
-        // its own summary over the filtered population rather than exact
-        // execution. Nothing about the filter forced query-time execution -- the
-        // missing 5m window candidate did, and this test previously pinned
-        // that artifact as intended behavior.
-        let bound = bindings
-            .iter()
-            .map(|binding| {
-                let identity = &plan.summary_catalog.outputs[&binding.materialization];
-                let data = &plan.summary_catalog.data_descriptors[&identity.data_descriptor_id];
-                (
-                    data.time_series_metric().unwrap(),
-                    data.population_filter_canonical.clone(),
-                    binding.readout_lookback_ms,
-                )
-            })
-            .collect::<BTreeSet<_>>();
-        assert_eq!(
-            bound,
-            BTreeSet::from([
-                ("a", String::new(), Some(60_000)),
-                ("b", "{job!=\"x\"}".to_string(), Some(300_000)),
-            ])
-        );
-        assert!(!query
-            .nodes
-            .values()
-            .any(|node| matches!(node, QueryPlanNode::ExactFallback { .. })));
-        assert!(!query.nodes.values().any(|node| matches!(
-            node,
-            QueryPlanNode::Logical {
-                operator: QueryTimeOperator::Scan { .. },
-                ..
-            }
-        )));
-        assert_eq!(plan.precompute_plan.materializations.len(), 2);
-    }
-
-    #[test]
-    fn warm_leaf_contract_preserves_prometheus_matchers_and_rejects_offsets() {
-        for query in [
-            "sum_over_time(m{job=\"a\"}[1m])",
-            "sum_over_time(m{job!=\"a\"}[1m])",
-            "sum_over_time(m{job=~\"a.*\"}[1m])",
-            "sum_over_time(m{job!~\"a.*\"}[1m])",
-        ] {
-            let request = request("scope", query);
-            let selected =
-                collect_selected_materializations(&request.queries[0].selected_plan_root, false);
-            let selected = selected.unwrap();
-            assert_eq!(selected.len(), 1, "{query}");
-            assert!(!selected[0].spatial_filter.is_empty(), "{query}");
-        }
-        let request = request("scope", "sum_over_time(m[1m] offset 1h)");
-        let selected =
-            collect_selected_materializations(&request.queries[0].selected_plan_root, false);
-        assert!(selected.is_err() || selected.unwrap().is_empty());
-    }
-
-    // Unsupported producer filters/multiple sources retain executable native fallback.
-    #[test]
-    fn snapshot_accepts_filtered_and_multisource_exact_fallback() {
-        for query in [
-            "sum(rate(http_requests_total{job=\"order-service\"}[5m]))",
-            "sum(rate(a[5m])) / sum(rate(b[5m]))",
-            "sum(avg_over_time(m{job=~\".+\"}[6h]))",
-            "sum(rate(m[5m] offset 1h))",
-        ] {
-            let mut snapshot: BackendLocalPlanningInput = serde_json::from_str(include_str!(
-                "../../../docs/examples/asapquery-planning-snapshot.json"
-            ))
-            .unwrap();
-            let entry = &mut snapshot.query_workload.repeating_queries.as_mut().unwrap()[0];
-            entry.query = Query(query.into());
-            entry.requirements.accuracy = AccuracyRequirement::Explicit(AccuracyTarget::Exact);
-            let (mut request, environment) = snapshot.into_physical_compilation_request().unwrap();
-            request =
-                super::super::workload_cost::enumerate_exact_and_materialized_candidates(request)
-                    .unwrap()
-                    .pop()
-                    .unwrap();
-            let bundle = DeploymentPlanCompiler
-                .compile_promql(request, environment)
-                .unwrap();
-            assert!(bundle.precompute_plan.materializations.is_empty());
-            assert!(bundle.query_plan.entries.values().all(|entry| matches!(
-                entry.nodes[&entry.root],
-                crate::query_plan::QueryPlanNode::ExactFallback { .. }
-            )));
-        }
-    }
-
-    // Projections reference one immutable snapshot and reject drift or foreign state.
-    #[test]
-    fn catalog_projection_rejects_missing_stale_and_foreign_references() {
-        let snapshot: BackendLocalPlanningInput = serde_json::from_str(include_str!(
-            "../../../docs/examples/asapquery-planning-snapshot.json"
-        ))
-        .unwrap();
-        let bundle = quoted_snapshot(snapshot, crate::physical::compiler::QueryFrontend::PromQl)
-            .compile_promql()
-            .unwrap();
-        let catalog = &bundle.summary_catalog;
-        let mut transmission = bundle.transmission_plan.clone();
-        transmission.validate_against_catalog(catalog).unwrap();
-        assert_eq!(
-            transmission.summary_catalog.as_ref(),
-            Some(&catalog.reference().unwrap())
-        );
-        transmission
-            .summary_catalog
-            .as_mut()
-            .unwrap()
-            .snapshot_sha256
-            .push('0');
-        assert!(transmission.validate_against_catalog(catalog).is_err());
-        assert!(transmission.validate(&bundle.precompute_plan).is_err());
-        transmission.summary_catalog = None;
-        assert!(transmission.validate_against_catalog(catalog).is_err());
-        let mut collector = CollectorPlan {
-            summary_catalog: Some(catalog.reference().unwrap()),
-            collector_id: "collector-test".into(),
-            envelope: bundle.envelope.clone(),
-            materializations: vec![],
-            transmission_rules: vec![],
-        };
-        collector.validate_against_catalog(catalog).unwrap();
-        collector.envelope.plan_version += 1;
-        assert!(collector.validate_against_catalog(catalog).is_err());
-        let mut unknown_materialization = bundle.transmission_plan.clone();
-        unknown_materialization.rules.push(TransmissionRule {
-            materialization: asap_types::PolicyFingerprint(u64::MAX).into(),
-            producer_id: "foreign".into(),
-            schema_id: "foreign".into(),
-            mode: TransmissionMode::Full,
-            encoding: StateEncoding::ExactAccumulatorV1,
-            emit_every_ms: 60_000,
-            full_checkpoint_every_ms: None,
-            destination_ref: "backend".into(),
-            runtime_policy: Default::default(),
-        });
-        assert!(unknown_materialization
-            .validate_against_catalog(catalog)
-            .is_err());
-        let encoded = serde_json::to_value(&collector).unwrap();
-        assert!(encoded["summary_catalog"]
-            .get("summary_descriptors")
-            .is_none());
-        for actual in &bundle.collector_plans {
-            actual.validate_against_catalog(catalog).unwrap();
-            assert_eq!(
-                actual.summary_catalog,
-                bundle.transmission_plan.summary_catalog
-            );
-        }
-    }
-
-    #[test]
-    fn canonical_snapshot_preserves_shared_bindings_after_serialization() {
-        // Two different registered readouts survive publication with one state.
-        let mut snapshot: BackendLocalPlanningInput = serde_json::from_str(include_str!(
-            "../../../docs/examples/asapquery-planning-snapshot.json"
-        ))
-        .unwrap();
-        let entries = snapshot.query_workload.repeating_queries.as_mut().unwrap();
-        entries[0].query = Query("sum(sum_over_time(m[1m]))".into());
-        let mut second = entries[0].clone();
-        second.query = Query("sum(sum_over_time(m[1m])) * 2".into());
-        entries.push(second);
-        let bundle = quoted_snapshot(snapshot, crate::physical::compiler::QueryFrontend::PromQl)
-            .compile_promql()
-            .unwrap();
-        assert_eq!(bundle.query_plan.entries.len(), 2);
-        assert_eq!(bundle.precompute_plan.materializations.len(), 1);
-        let query_plan: QueryPlan =
-            serde_json::from_slice(&serde_json::to_vec(&bundle.query_plan).unwrap()).unwrap();
-        let bindings = query_plan
-            .entries
-            .values()
-            .flat_map(|entry| entry.materialization_bindings())
-            .map(|binding| binding.materialization.fingerprint())
-            .collect::<BTreeSet<_>>();
-        assert_eq!(bindings.len(), 1);
-        query_plan.validate(&bindings).unwrap();
-        let stored_outputs = query_plan
-            .entries
-            .values()
-            .flat_map(|entry| entry.materialization_bindings())
-            .map(|binding| binding.stored_output_reference.clone())
-            .collect::<Vec<_>>();
-        assert_eq!(stored_outputs.len(), 2);
-        assert_eq!(stored_outputs[0], stored_outputs[1]);
-        assert_eq!(
-            stored_outputs[0],
-            bundle.precompute_plan.schemas[0].stored_output_reference
-        );
-        asap_types::plan_publication::validate_stored_output_references(
-            &bundle.precompute_plan,
-            &query_plan,
-        )
-        .unwrap();
-        // Output identity is independent of definition identity, but changing
-        // only the writer must still invalidate every unchanged reader binding.
-        let mut rebound_writer = bundle.precompute_plan.clone();
-        rebound_writer.schemas[0]
-            .stored_output_reference
-            .stored_output_id = asap_types::sds::StoredOutputId(123);
-        assert!(rebound_writer
-            .validate_against_catalog(&bundle.summary_catalog)
-            .is_err());
-        assert!(
-            asap_types::plan_publication::validate_stored_output_references(
-                &rebound_writer,
-                &query_plan,
-            )
-            .is_err()
-        );
-    }
-
-    #[test]
-    fn precompute_catalog_validates_without_backend_projection() {
-        let bundle = DeploymentPlanCompiler
-            .compile_promql(
-                request("catalog", "quantile_over_time(0.99, m[1m])"),
-                environment(10_000),
-            )
-            .unwrap();
-        let original = &bundle.precompute_plan;
-        let catalog = &bundle.summary_catalog;
-        let roundtrip: PrecomputePlan =
-            serde_json::from_slice(&serde_json::to_vec(original).unwrap()).unwrap();
-        roundtrip.validate_against_catalog(catalog).unwrap();
-        let mut legacy = serde_json::to_value(original).unwrap();
-        for schema in legacy["schemas"].as_array_mut().unwrap() {
-            schema.as_object_mut().unwrap().remove("value_projection");
-            schema["value_column"] = serde_json::json!("SampleValue");
-        }
-        assert!(serde_json::from_value::<PrecomputePlan>(legacy).is_err());
-        let reject =
-            |mutated: PrecomputePlan| assert!(mutated.validate_against_catalog(catalog).is_err());
-        let mut bad = original.clone();
-        bad.schemas[0].source = planner_types::pre_asap::Source::TimeSeries {
-            metric: "other".into(),
-        };
-        reject(bad);
-        let mut bad = original.clone();
-        bad.schemas[0].value_projection = asap_types::sds::ValueProjectionIdentity::Column {
-            name: "other".into(),
-        };
-        reject(bad);
-        let mut bad = original.clone();
-        bad.schemas[0].group_by.push("other".into());
-        reject(bad);
-        let mut bad = original.clone();
-        bad.schemas[0].window.size_ms += 1;
-        reject(bad);
-        let mut bad = original.clone();
-        bad.materializations[0].num_aggregates_to_retain = Some(0);
-        reject(bad);
-        let mut bad = original.clone();
-        bad.summary_catalog
-            .as_mut()
-            .unwrap()
-            .snapshot_sha256
-            .push('0');
-        reject(bad);
-        let mut corrupt_catalog = catalog.clone();
-        corrupt_catalog.data_descriptors.clear();
-        assert!(original.validate_against_catalog(&corrupt_catalog).is_err());
-        let mut legacy = original.clone();
-        legacy.summary_catalog = None;
-        legacy.validate().unwrap();
-        assert!(legacy.validate_against_catalog(catalog).is_err());
-    }
-
-    #[test]
-    fn publication_is_catalog_authoritative_and_round_trips() {
-        let bundle = DeploymentPlanCompiler
-            .compile_promql(
-                request("publication", "quantile_over_time(0.99, m[1m])"),
-                environment(10_000),
-            )
-            .unwrap();
-        let publication = bundle.to_publication_artifact().unwrap();
-        let json = serde_json::to_value(&publication).unwrap();
-        let mut decoded: super::super::publication::PhysicalPlanPublication =
-            serde_json::from_value(json).unwrap();
-        decoded.validate().unwrap();
-        decoded.collector_plans.clear();
-        assert!(decoded.validate().is_err());
-        let mut decoded = publication.clone();
-        decoded.summary_catalog.plan_version += 1;
-        assert!(decoded.validate().is_err());
-        let mut decoded = publication;
-        decoded
-            .collector_plans
-            .push(decoded.collector_plans[0].clone());
-        assert!(decoded.validate().is_err());
-    }
-
-    #[test]
-    fn compiles_one_decision_into_matching_collector_and_backend_views() {
-        let bundle = DeploymentPlanCompiler
-            .compile_promql(
-                request("q-quantile", "quantile_over_time(0.99, m[1m])"),
-                environment(10_000),
-            )
-            .expect("compile");
-        assert_eq!(bundle.collector_plans.len(), 2);
-        bundle.summary_catalog.validate().expect("catalog contract");
-        assert_eq!(bundle.summary_catalog.plan_id, bundle.envelope.plan_id);
-        assert_eq!(
-            bundle.summary_catalog.plan_version,
-            bundle.envelope.plan_version
-        );
-        assert_eq!(
-            bundle
-                .summary_catalog
-                .outputs
-                .keys()
-                .cloned()
-                .collect::<BTreeSet<_>>(),
-            bundle
-                .precompute_plan
-                .materializations
-                .iter()
-                .map(|config| config.policy_fingerprint().into())
-                .collect::<BTreeSet<_>>()
-        );
-        assert_eq!(bundle.precompute_plan.envelope, bundle.envelope);
-        assert_eq!(bundle.precompute_plan.materializations.len(), 1);
-        assert_eq!(bundle.precompute_plan.schemas.len(), 1);
-        assert_eq!(bundle.precompute_plan.producers.len(), 2);
-        assert_eq!(bundle.precompute_plan.ingest.endpoint_path, "/v1/metrics");
-        bundle.precompute_plan.validate().expect("runtime contract");
-        bundle
-            .transmission_plan
-            .validate(&bundle.precompute_plan)
-            .expect("transmission contract");
-        assert_eq!(bundle.transmission_plan.rules.len(), 2);
-        let rule = &bundle.transmission_plan.rules[0];
-        let frame = SummaryFrameIdentity {
-            identity_version: 1,
-            plan_id: bundle.envelope.plan_id,
-            plan_version: bundle.envelope.plan_version,
-            backend_compat: bundle.envelope.backend_compat.clone(),
-            materialization: rule.materialization,
-            series_identity: "service=checkout,zone=a".into(),
-            schema_id: rule.schema_id.clone(),
-            producer_id: rule.producer_id.clone(),
-            producer_epoch: "boot-1".into(),
-            window_start_unix_nano: 1,
-            window_end_unix_nano: 2,
-            sequence: 1,
-            kind: SummaryFrameKind::Full,
-            encoding: rule.encoding.clone(),
-            checkpoint_id: Some("checkpoint-1".into()),
-            base_checkpoint_id: None,
-        };
-        bundle
-            .transmission_plan
-            .validate_frame(&frame)
-            .expect("matching frame identity");
-        let mut wrong_version = frame;
-        wrong_version.plan_version += 1;
-        assert!(matches!(
-            bundle.transmission_plan.validate_frame(&wrong_version),
-            Err(TransmissionPlanError::InvalidFrame(_))
-        ));
-        assert_eq!(bundle.summary_catalog.outputs.len(), 1);
-        assert_eq!(
-            bundle
-                .query_plan
-                .entries
-                .values()
-                .flat_map(QueryPlanEntry::materialization_bindings)
-                .count(),
-            1
-        );
-        assert_eq!(bundle.query_plan.plan_id, bundle.envelope.plan_id);
-        let entry = bundle
-            .query_plan
-            .lookup("quantile_over_time( 0.99, m[1m] )")
-            .expect("canonical QueryPlan lookup");
-        assert_eq!(entry.query_id, "q-quantile");
-        assert_eq!(
-            entry
-                .nodes
-                .values()
-                .filter(|node| matches!(
-                    node,
-                    crate::query_plan::QueryPlanNode::ReadMaterialization { .. }
-                ))
-                .count(),
-            1
-        );
-        entry
-            .validate(
-                &bundle
-                    .precompute_plan
-                    .materializations
-                    .iter()
-                    .map(asap_types::PrecomputeMaterialization::policy_fingerprint)
-                    .collect(),
-            )
-            .expect("executable physical DAG");
-        let wire = serde_json::to_vec(&bundle.query_plan).expect("serialize QueryPlan");
-        let decoded: QueryPlan = serde_json::from_slice(&wire).expect("deserialize QueryPlan");
-        assert_eq!(decoded, bundle.query_plan);
-        for plan in &bundle.collector_plans {
-            assert_eq!(plan.envelope, bundle.envelope);
-            assert_eq!(plan.materializations[0].metric, "m");
-            assert_eq!(plan.materializations[0].window_secs, 60);
-            assert_eq!(plan.transmission_rules.len(), 1);
-            assert_eq!(
-                plan.materializations[0].abstract_window_framework,
-                SummaryWindowFramework::Tumbling
-            );
-            assert_eq!(
-                plan.materializations[0].window_realization_id,
-                "collector-tumbling-v1"
-            );
-            assert_eq!(plan.materializations[0].slide_secs, 60);
-            assert_eq!(
-                plan.materializations[0].lifecycle,
-                CollectorLifecycle {
-                    kind: "continuously_maintained".into(),
-                    maintenance_mode: "incremental".into(),
-                    evaluation_schedule: "per_update".into(),
-                    output_representation: "summary_state".into(),
-                }
-            );
-            assert!(matches!(
-                plan.materializations[0].algorithm.as_str(),
-                "ddsketch" | "kll"
-            ));
-        }
-    }
-
-    #[test]
-    fn backend_local_hll_and_envelope_ingest_are_supported() {
-        let bundle = DeploymentPlanCompiler
-            .compile_promql(
-                request("q", "quantile_over_time(0.99, m[1m])"),
-                environment(10_000),
-            )
-            .unwrap();
-        let mut materializations = bundle.precompute_plan.materializations;
-        materializations[0].aggregation_type = asap_types::AggregationType::HLL;
-        materializations[0].parameters.clear();
-        let mut envelope_plan = PrecomputePlan::build(
-            bundle.envelope.clone(),
-            materializations.clone(),
-            &["collector".into()],
-        )
-        .unwrap();
-        envelope_plan.ingest = IngestContract {
-            dataset_identity: envelope_plan.ingest.dataset_identity.clone(),
-            protocol: IngestProtocol::PrometheusRemoteWriteV1,
-            endpoint_path: "/api/v1/write".into(),
-            timestamp_unit: TimestampUnit::UnixMilliseconds,
-            require_plan_identity: false,
-            require_stored_output_identity: false,
-            require_registered_producer: false,
-        };
-        envelope_plan.producers.clear();
-        envelope_plan.validate().unwrap();
-        PrecomputePlan::build_backend_local(bundle.envelope, materializations).unwrap();
-    }
-
-    #[test]
-    fn backend_local_precompute_contract_has_no_collector_producers() {
-        let bundle = DeploymentPlanCompiler
-            .compile_promql(
-                request("q-quantile", "quantile_over_time(0.99, m[1m])"),
-                environment(10_000),
-            )
-            .expect("compile");
-        let plan = PrecomputePlan::build_backend_local(
-            bundle.envelope.clone(),
-            bundle.precompute_plan.materializations.clone(),
-        )
-        .expect("backend-local contract");
-
-        assert_eq!(
-            plan.ingest.protocol,
-            IngestProtocol::PrometheusRemoteWriteV1
-        );
-        assert_eq!(plan.ingest.endpoint_path, "/api/v1/write");
-        assert_eq!(plan.ingest.timestamp_unit, TimestampUnit::UnixMilliseconds);
-        assert!(plan.producers.is_empty());
-        plan.validate().expect("valid backend-local projection");
-        crate::physical::compiler::build_transmission_plan(
-            bundle.envelope,
-            &plan,
-            &BTreeMap::new(),
-        )
-        .expect("empty backend-local transmission contract")
-        .validate(&plan)
-        .expect("valid empty transmission plan");
-    }
-
-    #[test]
-    fn canonical_workload_snapshot_invokes_backend_local_planning() {
-        let data_workload = DataWorkload {
-            arrival: DataArrival::ContinuouslyIngesting,
-            ingestion_rate: Evidence {
-                value: Some(Rate(100.0)),
-                source: EvidenceSource::Declared,
-                observed_at_ms: None,
-                valid_for_ms: None,
-            },
-            ..DataWorkload::default()
-        };
-        let query_workload = QueryWorkload {
-            language: QueryLanguage::PromQL,
-            query_batch: None,
-            repeating_queries: Some(vec![RepeatingEntry {
-                query: Query("sum(sum_over_time(m[1m]))".into()),
-                demand: RepeatedDemand::FixedIntervalAt {
-                    interval: RepetitionInterval(10_000),
-                    evaluation_phase: planner_types::workload::TimestampMs(7_000),
-                },
-                requirements: QueryRequirements {
-                    accuracy: AccuracyRequirement::Explicit(AccuracyTarget::EpsilonDelta {
-                        epsilon: 0.01,
-                        delta: 0.01,
-                    }),
-                    ..QueryRequirements::default()
-                },
-                predictability: Predictability::Predictable { known_at: None },
-                time_selection: TimeSelection {
-                    scope: QueryTimeScope::RealTime,
-                    lookback: None,
-                    as_of: None,
-                },
-            }]),
-        };
-        let mut environment = environment(10_000);
-        environment.target = PhysicalDeploymentTarget::BackendLocalRemoteWrite;
-        environment.target_collector_ids.clear();
-        let template = request("template", "sum(sum_over_time(m[1m]))")
-            .queries
-            .remove(0);
-        let snapshot = BackendLocalPlanningInput {
-            schema_version: 3,
-            workload_cost_evidence: None,
-            query_workload,
-            data_workload,
-            physical_inputs: BackendLocalPhysicalInputs {
-                lifecycle_costs: template.summary_lifecycle_inputs.costs,
-                evidence_observed_at_unix_ms: 9_500,
-                evidence_valid_for_ms: 60_000,
-                horizon_seconds: 300.0,
-                window_cost_model: WindowCostModel {
-                    implementation_id: "backend-tumbling-v1".into(),
-                    cost: template.window_realization_candidates[0].cost.clone(),
-                    quotes: Vec::new(),
-                },
-                scrape_interval_ms: 1_000,
-                query_retention_margin_ms: 0,
-                retained_summary_memory_budget_bytes: DEFAULT_RETAINED_SUMMARY_MEMORY_BUDGET_BYTES,
-                topk_evidence: HashMap::new(),
-                exact_composition_costs: HashMap::new(),
-                erp: None,
-            },
-            environment,
-        };
-        assert_eq!(
-            snapshot
-                .clone()
-                .into_physical_compilation_request()
-                .unwrap()
-                .0
-                .query_workload
-                .as_ref(),
-            Some(&snapshot.query_workload)
-        );
-        let first = quoted_snapshot(
-            snapshot.clone(),
-            crate::physical::compiler::QueryFrontend::PromQl,
-        )
-        .compile_promql()
-        .expect("first deterministic plan");
-        let second = quoted_snapshot(
-            snapshot.clone(),
-            crate::physical::compiler::QueryFrontend::PromQl,
-        )
-        .compile_promql()
-        .expect("second deterministic plan");
-        assert_eq!(first.envelope, second.envelope);
-        assert_eq!(first.summary_catalog, second.summary_catalog);
-        assert_eq!(first.query_plan, second.query_plan);
-        assert_eq!(first.transmission_plan, second.transmission_plan);
-        assert_eq!(
-            serde_json::to_value(&first.precompute_plan).unwrap(),
-            serde_json::to_value(&second.precompute_plan).unwrap()
-        );
-
-        let encoded = serde_json::to_vec(&snapshot).expect("serialize startup snapshot");
-        let decoded: BackendLocalPlanningInput =
-            serde_json::from_slice(&encoded).expect("deserialize startup snapshot");
-        let bundle = quoted_snapshot(decoded, crate::physical::compiler::QueryFrontend::PromQl)
-            .compile_promql()
-            .expect("canonical startup planning");
-
-        assert!(bundle.collector_plans.is_empty());
-        assert!(bundle.transmission_plan.rules.is_empty());
-        assert_eq!(
-            bundle.precompute_plan.ingest.protocol,
-            IngestProtocol::PrometheusRemoteWriteV1
-        );
-        assert!(bundle.precompute_plan.producers.is_empty());
-        assert_eq!(bundle.query_plan.entries.len(), 1);
-        assert_eq!(bundle.envelope.planner_revision, PLANNER_REVISION);
-        let config = &bundle.precompute_plan.materializations[0];
-        assert_eq!(config.pane_origin_ms, Some(7_000));
-        assert_eq!(
-            bundle.precompute_plan.schemas[0].window.pane_origin_ms,
-            Some(7_000)
-        );
-        assert!(bundle.summary_catalog.outputs.contains_key(
-            &asap_types::sds::StoredOutputId::from(config.policy_fingerprint())
-        ));
-        assert_eq!(
-            bundle
-                .query_plan
-                .entries
-                .values()
-                .next()
-                .unwrap()
-                .materialization_bindings()[0]
-                .pane_origin_ms,
-            Some(7_000)
-        );
-    }
-
-    #[test]
-    fn backend_local_compiler_materializes_declared_exact_promql_cases() {
-        for (query_id, promql, expected_readout) in [
-            (
-                "q-rate",
-                "rate(m[1m])",
-                crate::query_plan::ExactReadout::Rate,
-            ),
-            (
-                "q-increase",
-                "increase(m[1m])",
-                crate::query_plan::ExactReadout::Increase,
-            ),
-            (
-                "q-sum",
-                "sum(sum_over_time(m[1m]))",
-                crate::query_plan::ExactReadout::Sum,
-            ),
-        ] {
-            let mut deployment = environment(10_000);
-            deployment.target = PhysicalDeploymentTarget::BackendLocalRemoteWrite;
-            deployment.target_collector_ids.clear();
-            let compiled =
-                DeploymentPlanCompiler.compile_promql(request(query_id, promql), deployment);
-            let plan = compiled.unwrap_or_else(|error| panic!("{promql} must compile: {error}"));
-            assert_eq!(plan.summary_catalog.outputs.len(), 1, "{promql}");
-            assert_eq!(plan.query_plan.entries.len(), 1, "{promql}");
-            assert!(plan.collector_plans.is_empty(), "{promql}");
-            let entry = plan.query_plan.entries.values().next().unwrap();
-            assert!(matches!(
-                entry.nodes.values().find(|node| matches!(node, crate::query_plan::QueryPlanNode::ExactReadout { .. })),
-                Some(crate::query_plan::QueryPlanNode::ExactReadout { readout, .. })
-                    if *readout == expected_readout
-            ));
-            if expected_readout == crate::query_plan::ExactReadout::Rate {
-                let materialization = plan.precompute_plan.materializations.first().unwrap();
-                assert_eq!(
-                    materialization.accumulator_spec().unwrap().family,
-                    SummaryFamilyType::ExactAggregate(
-                        planner_types::post_asap::ExactKind::Rate,
-                        planner_types::post_asap::ExactParams::Rate,
-                    )
-                );
-            }
-        }
-    }
-
-    #[test]
-    fn checked_in_per_entity_snapshot_preserves_native_alternative() {
-        let source = include_str!("../../../docs/examples/asapquery-planning-snapshot.json");
-        let snapshot: BackendLocalPlanningInput =
-            serde_json::from_str(source).expect("strict canonical workload fixture");
-        let encoded = serde_json::to_value(&snapshot).expect("canonical snapshot value");
-        let fixture: serde_json::Value = serde_json::from_str(source).expect("fixture JSON");
-        assert_eq!(encoded, fixture);
-
-        assert!(
-            snapshot.clone().compile_promql().is_err(),
-            "discovery fixtures must be priced before deployment"
-        );
-        let (local, env) = snapshot
-            .clone()
-            .into_physical_compilation_request()
-            .unwrap();
-        let isolated = DeploymentPlanCompiler.compile_promql(local, env).unwrap();
-        assert!(!isolated.precompute_plan.materializations.is_empty());
-        assert!(isolated
-            .precompute_plan
-            .materializations
-            .iter()
-            .all(|state| state.partitioning.is_some()));
-        let (request, environment) = snapshot.into_physical_compilation_request().unwrap();
-        let native =
-            crate::physical::workload_cost::enumerate_exact_and_materialized_candidates(request)
-                .unwrap()
-                .pop()
-                .unwrap();
-        let plan = DeploymentPlanCompiler
-            .compile_promql(native, environment)
-            .expect("native fixture compiles");
-        assert!(plan.precompute_plan.materializations.is_empty());
-        assert!(plan.collector_plans.is_empty());
-        assert!(plan.transmission_plan.rules.is_empty());
-        assert_eq!(
-            plan.precompute_plan.ingest.protocol,
-            IngestProtocol::PrometheusRemoteWriteV1
-        );
-        assert_eq!(plan.query_plan.entries.len(), 1);
-    }
-
-    #[test]
-    fn compatibility_demo_preserves_complete_native_query_matrix() {
-        let source =
-            include_str!("../../../docs/examples/asapquery-compatibility-demo-snapshot.json");
-        let snapshot: BackendLocalPlanningInput =
-            serde_json::from_str(source).expect("strict compatibility demo fixture");
-        assert!(
-            snapshot.clone().compile_promql().is_err(),
-            "discovery fixtures must be priced before deployment"
-        );
-        let (local, env) = snapshot
-            .clone()
-            .into_physical_compilation_request()
-            .unwrap();
-        let isolated = DeploymentPlanCompiler.compile_promql(local, env).unwrap();
-        assert!(!isolated.precompute_plan.materializations.is_empty());
-        assert!(isolated
-            .precompute_plan
-            .materializations
-            .iter()
-            .all(|state| state.partitioning.is_some()));
-        let (request, environment) = snapshot.into_physical_compilation_request().unwrap();
-        let native =
-            crate::physical::workload_cost::enumerate_exact_and_materialized_candidates(request)
-                .unwrap()
-                .pop()
-                .unwrap();
-        let plan = DeploymentPlanCompiler
-            .compile_promql(native, environment)
-            .expect("native demo compiles");
-
-        assert!(plan.collector_plans.is_empty());
-        assert!(plan.transmission_plan.rules.is_empty());
-        assert_eq!(plan.query_plan.entries.len(), 6);
-        assert!(plan.precompute_plan.materializations.is_empty());
-        for query in [
-            "rate(asap_demo_counter_total[5s])",
-            "increase(asap_demo_counter_total[5s])",
-            "sum(sum_over_time(asap_demo_gauge[5s]))",
-            "quantile_over_time(0.5, asap_demo_latency_ms[5s])",
-            "topk(1, sum_over_time(asap_demo_gauge[5s]))",
-            "topk(1, count_over_time(asap_demo_gauge[5s]))",
-        ] {
-            assert!(plan.query_plan.lookup(query).is_ok(), "missing {query}");
-        }
-    }
-
-    #[test]
-    fn multiple_readouts_share_one_precompute_materialization() {
-        let mut compilation_request = request("q-p90", "quantile_over_time(0.90, m[1m])");
-        for (id, q) in [("q-p50", 0.5), ("q-p95", 0.95), ("q-p99", 0.99)] {
-            compilation_request.queries.push(
-                request(id, &format!("quantile_over_time({q}, m[1m])"))
-                    .queries
-                    .remove(0),
-            );
-        }
-        let bundle = DeploymentPlanCompiler
-            .compile_promql(compilation_request, environment(10_000))
-            .unwrap();
-
-        assert_eq!(bundle.query_plan.entries.len(), 4);
-        assert_eq!(bundle.summary_catalog.outputs.len(), 1);
-        assert_eq!(bundle.precompute_plan.materializations.len(), 1);
-        assert_eq!(bundle.precompute_plan.schemas.len(), 1);
-        assert_eq!(bundle.precompute_plan.producers.len(), 2);
-    }
-
-    #[test]
-    fn compiles_every_materialization_leaf_in_a_merge_dag() {
-        let mut compilation_request = request("q-merge", "quantile_over_time(0.90, m[1m])");
-        let right_request = request("q-right", "quantile_over_time(0.90, n[1m])");
-        let left_root = compilation_request.queries[0].selected_plan_root.clone();
-        let right_root = right_request.queries[0].selected_plan_root.clone();
-        let (left, query) = match &left_root.expr {
-            SummaryExpr::SummaryEstimate {
-                summary_input,
-                query,
-            } => (summary_input.clone(), query.clone()),
-            other => panic!("expected selected estimate, got {other:?}"),
-        };
-        let right = match &right_root.expr {
-            SummaryExpr::SummaryEstimate { summary_input, .. } => summary_input.clone(),
-            other => panic!("expected selected estimate, got {other:?}"),
-        };
-        let merge = Rc::new(SummaryNode {
-            expr: SummaryExpr::SummaryMerge {
-                timing: planner_types::post_asap::ExecutionTiming::QueryTime,
-                children: vec![left.clone(), right.clone()],
-            },
-            schema: left.schema.clone(),
-            guarantee: None,
-        });
-        compilation_request.queries[0].selected_plan_root = Rc::new(SummaryNode {
-            expr: SummaryExpr::SummaryEstimate {
-                summary_input: merge,
-                query,
-            },
-            schema: left_root.schema.clone(),
-            guarantee: left_root.guarantee.clone(),
-        });
-
-        let bundle = DeploymentPlanCompiler
-            .compile_promql(compilation_request, environment(10_000))
-            .expect("compile merged post-ASAP DAG");
-        assert_eq!(bundle.summary_catalog.outputs.len(), 2);
-        assert_eq!(bundle.precompute_plan.materializations.len(), 2);
-        assert_eq!(
-            bundle
-                .query_plan
-                .entries
-                .values()
-                .flat_map(QueryPlanEntry::materialization_bindings)
-                .count(),
-            2
-        );
-        let entry = bundle.query_plan.entries.values().next().unwrap();
-        assert_eq!(
-            entry
-                .nodes
-                .values()
-                .filter(|node| matches!(
-                    node,
-                    crate::query_plan::QueryPlanNode::ReadMaterialization { .. }
-                ))
-                .count(),
-            2
-        );
-        assert!(entry.nodes.values().any(|node| matches!(
-            node,
-            crate::query_plan::QueryPlanNode::SummaryMerge { inputs } if inputs.len() == 2
-        )));
-        let bound_metrics = entry
-            .nodes
-            .values()
-            .filter_map(|node| match node {
-                crate::query_plan::QueryPlanNode::ReadMaterialization { binding } => Some(
-                    bundle.summary_catalog.data_descriptors[&bundle.summary_catalog.outputs
-                        [&binding.materialization]
-                        .data_descriptor_id]
-                        .time_series_metric()
-                        .unwrap(),
-                ),
-                _ => None,
-            })
-            .collect::<BTreeSet<_>>();
-        assert_eq!(bound_metrics, BTreeSet::from(["m", "n"]));
-    }
-
-    #[test]
-    fn precompute_schema_must_match_materialization_semantics() {
-        let bundle = DeploymentPlanCompiler
-            .compile_promql(
-                request("q-quantile", "quantile_over_time(0.99, m[1m])"),
-                environment(10_000),
-            )
-            .unwrap();
-        let mut plan = bundle.precompute_plan.clone();
-        plan.schemas[0].group_by.push("invented".into());
-        assert!(matches!(
-            plan.validate(),
-            Err(PrecomputePlanError::InvalidSchema { .. })
-        ));
-    }
-
-    // Concrete candidates with the same framework survive selection; changing
-    // their quoted costs changes installed state, not the query's lookback.
-    #[test]
-    fn pane_sizes_are_selected_by_cost_without_changing_semantic_window() {
-        for (small_cost, expected_pane_secs, expected_id) in
-            [(0.1, 10, "small"), (10.0, 60, "large")]
-        {
-            let mut request = request("q", "sum(sum_over_time(m[1m]))");
-            let query = &mut request.queries[0];
-            let mut small = query.window_realization_candidates[0].clone();
-            small.realization_id = "small".into();
-            small.layout = asap_types::WindowMaterializationLayout::Pane { pane_secs: 10 };
-            small.cost.weighted_cost = small_cost;
-            query.window_realization_candidates[0].realization_id = "large".into();
-            query.window_realization_candidates.push(small);
-            let mut env = environment(10_000);
-            env.target = PhysicalDeploymentTarget::BackendLocalRemoteWrite;
-            env.target_collector_ids.clear();
-            let bundle = DeploymentPlanCompiler.compile_promql(request, env).unwrap();
-            let materialization = bundle.precompute_plan.materializations.first().unwrap();
-            assert_eq!(materialization.window_size, 60);
-            assert_eq!(
-                materialization.window_layout.base_pane_secs(),
-                expected_pane_secs
-            );
-            let entry = bundle
-                .query_plan
-                .lookup("sum(sum_over_time(m[1m]))")
-                .unwrap();
-            assert_eq!(entry.instant.lookback_ms, 60_000);
-            assert_eq!(
-                entry.materialization_bindings()[0].window_ms,
-                expected_pane_secs * 1000
-            );
-            assert_eq!(
-                bundle.lifecycle_estimates[0].window_realization_id,
-                expected_id
-            );
-        }
-    }
-
-    #[test]
-    fn sliding_layout_cost_selects_query_or_update_optimized_state() {
-        for (full_cost, expected_id, full_selected) in [
-            (0.1, "full-window", true),
-            (100.0, "mergeable-panes", false),
-        ] {
-            let mut request = request("q", "sum(sum_over_time(m[1m]))");
-            let query = &mut request.queries[0];
-            let mut panes = query.window_realization_candidates[0].clone();
-            panes.realization_id = "mergeable-panes".into();
-            panes.framework = SummaryWindowFramework::Sliding;
-            panes.slide_secs = 10;
-            panes.layout = asap_types::WindowMaterializationLayout::Pane { pane_secs: 10 };
-            panes.cost.weighted_cost = 1.0;
-            panes.cost.cpu_cost = 0.2;
-            panes.cost.storage_bytes = 1_024;
-
-            let mut full = panes.clone();
-            full.realization_id = "full-window".into();
-            full.layout = asap_types::WindowMaterializationLayout::FullWindow;
-            full.cost.weighted_cost = full_cost;
-            // Full windows spend more update CPU and retained bytes, while
-            // avoiding query-time pane merges. The provider's weighted quote
-            // includes the workload's measured read frequency and cardinality.
-            full.cost.cpu_cost = 20.0;
-            full.cost.storage_bytes = 64 * 1_024;
-            query.window_realization_candidates = vec![panes, full];
-
-            let mut env = environment(10_000);
-            env.target = PhysicalDeploymentTarget::BackendLocalRemoteWrite;
-            env.target_collector_ids.clear();
-            let bundle = DeploymentPlanCompiler.compile_promql(request, env).unwrap();
-            assert_eq!(
-                bundle.lifecycle_estimates[0].window_realization_id,
-                expected_id
-            );
-            assert_eq!(
-                matches!(
-                    bundle.precompute_plan.materializations[0].window_layout,
-                    asap_types::WindowMaterializationLayout::FullWindow
-                ),
-                full_selected
-            );
-            // Publication validates stored extent independently of slide cadence.
-            // In particular the full-window candidate stores 60s at a 10s slide.
-            bundle
-                .to_publication_artifact()
-                .unwrap()
-                .validate()
-                .unwrap();
-            assert_eq!(bundle.precompute_plan.materializations[0].window_size, 60);
-            assert_eq!(
-                bundle.precompute_plan.materializations[0].slide_interval,
-                10
-            );
-        }
-    }
-
-    // Distinct semantic windows remain distinct definitions even when they use
-    // an equal base-pane width and implementation provider.
-    #[test]
-    fn selected_panes_reject_unpriced_cross_cohort_coalescing() {
-        let mut workload = request("q20", "sum(sum_over_time(m[20s]))");
-        let mut second = request("q40", "sum(sum_over_time(m[40s]))")
-            .queries
-            .remove(0);
-        workload.queries[0].query_lookback_seconds = 20;
-        workload.queries[0].window_realization_candidates[0].window_secs = 20;
-        second.query_lookback_seconds = 40;
-        second.summary_lifecycle_inputs.evaluation_interval_ms = 20_000;
-        second.window_realization_candidates[0].window_secs = 40;
-        workload.queries.push(second);
-        for query in &mut workload.queries {
-            query.window_realization_candidates[0].framework = SummaryWindowFramework::Sliding;
-            query.window_realization_candidates[0].slide_secs = 10;
-            query.window_realization_candidates[0].layout =
-                asap_types::WindowMaterializationLayout::Pane { pane_secs: 10 };
-            query.window_realization_candidates[0].realization_id = "shared-ten-second-pane".into();
-        }
-        let mut env = environment(10_000);
-        env.target = PhysicalDeploymentTarget::BackendLocalRemoteWrite;
-        env.target_collector_ids.clear();
-        let bundle = DeploymentPlanCompiler
-            .compile_promql(workload, env)
-            .unwrap();
-        assert_eq!(bundle.precompute_plan.materializations.len(), 2);
-    }
-
-    // Non-divisor panes cannot reconstruct a lookback from whole states.
-    #[test]
-    fn tumbling_sizes_reject_non_divisors() {
-        let mut request = request("q", "sum(sum_over_time(m[1m]))");
-        request.queries[0].window_realization_candidates[0].layout =
-            asap_types::WindowMaterializationLayout::Pane { pane_secs: 7 };
-        let mut env = environment(10_000);
-        env.target = PhysicalDeploymentTarget::BackendLocalRemoteWrite;
-        assert!(DeploymentPlanCompiler.compile_promql(request, env).is_err());
-    }
-
-    #[test]
-    fn missing_window_implementation_evidence_fails_closed() {
-        let mut request = request("q-window", "quantile_over_time(0.99, m[1m])");
-        request.queries[0].window_realization_candidates.clear();
-        let error = DeploymentPlanCompiler
-            .compile_promql(request, environment(10_000))
-            .expect_err("Planner must not receive a zero-cost invented window");
-        assert!(matches!(error, CompileError::Lifecycle { .. }));
-    }
-
-    #[test]
-    fn precompute_plan_rejects_schema_or_producer_drift() {
-        let bundle = DeploymentPlanCompiler
-            .compile_promql(
-                request("q-quantile", "quantile_over_time(0.99, m[1m])"),
-                environment(10_000),
-            )
-            .expect("compile");
-
-        let mut schema_drift = bundle.precompute_plan.clone();
-        schema_drift.schemas[0].schema_version = 0;
-        assert!(matches!(
-            schema_drift.validate(),
-            Err(PrecomputePlanError::InvalidSchema { .. })
-        ));
-
-        let mut producer_drift = bundle.precompute_plan;
-        producer_drift.producers[0].schema_id = "wrong".into();
-        assert!(matches!(
-            producer_drift.validate(),
-            Err(PrecomputePlanError::InvalidProducer { .. })
-        ));
-    }
-
-    #[test]
-    fn precompute_plan_rejects_empty_or_duplicate_schema_ids() {
-        let bundle = DeploymentPlanCompiler
-            .compile_promql(
-                request("q-quantile", "quantile_over_time(0.99, m[1m])"),
-                environment(10_000),
-            )
-            .expect("compile schema");
-
-        let mut empty = bundle.precompute_plan.clone();
-        empty.schemas[0].schema_id.clear();
-        assert!(matches!(
-            empty.validate(),
-            Err(PrecomputePlanError::InvalidSchema { .. })
-        ));
-
-        let mut duplicate = bundle.precompute_plan;
-        duplicate.schemas.push(duplicate.schemas[0].clone());
-        assert!(matches!(
-            duplicate.validate(),
-            Err(PrecomputePlanError::InvalidSchema { .. })
-        ));
-    }
-
-    #[test]
-    fn topk_fails_closed_without_membership_evidence() {
-        let request = request_with_evidence("q-topk", "topk(5, m)", None).unwrap();
-        assert!(request.queries[0]
-            .selected_plan_root
-            .guarantee
-            .as_ref()
-            .unwrap()
-            .is_exact());
-    }
-
-    #[test]
-    fn stale_topk_evidence_is_rejected_before_planner_selection() {
-        let request = request_with_evidence(
-            "q-topk",
-            "topk(5, count_over_time(m[1m]))",
-            Some(TopKMembershipEvidence {
-                selected_lower_bound: 101.0,
-                excluded_upper_bound: 100.0,
-                interval_failure_probability: 0.005,
-                observed_at_unix_ms: 1,
-                source: "runtime-margin-monitor".into(),
-            }),
-        )
-        .expect("selection accepts evidence before freshness validation");
-        let error = DeploymentPlanCompiler
-            .compile_promql(request, environment(100_000))
-            .expect_err("stale certificate must fail");
-        assert!(matches!(error, CompileError::InvalidEvidence { .. }));
-    }
-
-    #[test]
-    fn future_topk_and_window_evidence_are_rejected() {
-        let topk = request_with_evidence(
-            "q-topk",
-            "topk(5, count_over_time(m[1m]))",
-            Some(TopKMembershipEvidence {
-                selected_lower_bound: 101.0,
-                excluded_upper_bound: 100.0,
-                interval_failure_probability: 0.005,
-                observed_at_unix_ms: 10_001,
-                source: "runtime-margin-monitor".into(),
-            }),
-        )
-        .expect("selection occurs before deployment-time freshness validation");
-        assert!(matches!(
-            DeploymentPlanCompiler.compile_promql(topk, environment(10_000)),
-            Err(CompileError::InvalidEvidence { .. })
-        ));
-
-        let mut window = request("q-window", "quantile_over_time(0.99, m[1m])");
-        window.queries[0].window_realization_candidates[0]
-            .cost
-            .observed_at_unix_ms = 10_001;
-        assert!(matches!(
-            DeploymentPlanCompiler.compile_promql(window, environment(10_000)),
-            Err(CompileError::Lifecycle { .. })
-        ));
-    }
-
-    #[test]
-    fn fresh_topk_evidence_enables_physical_compilation() {
-        let request = request_with_evidence(
-            "q-topk",
-            "topk(5, count_over_time(m[1m]))",
-            Some(TopKMembershipEvidence {
-                selected_lower_bound: 101.0,
-                excluded_upper_bound: 100.0,
-                interval_failure_probability: 0.005,
-                observed_at_unix_ms: 9_500,
-                source: "runtime-margin-monitor".into(),
-            }),
-        )
-        .expect("selection accepts valid evidence");
-        let bundle = DeploymentPlanCompiler
-            .compile_promql(request, environment(10_000))
-            .expect("certified TopK compiles");
-        assert_eq!(bundle.summary_catalog.outputs.len(), 1);
-        assert_eq!(
-            bundle.collector_plans[0].materializations[0]
-                .evidence_source
-                .as_deref(),
-            Some("runtime-margin-monitor")
-        );
-    }
-
-    #[test]
-    fn planner_revision_is_part_of_the_compile_contract() {
-        let mut request = request("q", "quantile_over_time(0.9, m[1m])");
-        request.planner_revision = "different".into();
-        assert!(matches!(
-            DeploymentPlanCompiler.compile_promql(request, environment(10_000)),
-            Err(CompileError::PlannerRevision { .. })
-        ));
-    }
-
-    #[test]
-    fn stale_lifecycle_evidence_fails_closed() {
-        let mut request = request("q", "quantile_over_time(0.9, m[1m])");
-        request.queries[0]
-            .summary_lifecycle_inputs
-            .evidence_observed_at_unix_ms = 1;
-        request.queries[0]
-            .summary_lifecycle_inputs
-            .evidence_valid_for_ms = 10;
-        assert!(matches!(
-            DeploymentPlanCompiler.compile_promql(request, environment(10_000)),
-            Err(CompileError::Lifecycle { .. })
-        ));
-    }
-
-    #[test]
-    fn runtime_policy_uses_canonical_sampling_and_gos_allocators() {
-        let sampling = sampling_policy_from_accuracy_budget(
-            0.05,
-            1_000.0,
-            SamplingEstimator::GeometricAdmission,
-        );
-        let SamplingPolicy::Fixed { probability, .. } = sampling else {
-            panic!("positive budget and rate must enable sampling");
-        };
-        assert!((probability - 1.0 / 3.5).abs() < 1e-9);
-
-        let gos =
-            gos_policy_from_accuracy_budget(0.1, 0.03, 4, 1.0, 1.0, GosThresholdMode::Isotropic)
-                .expect("positive communication allocation");
-        assert!((gos.epsilon_staleness - 0.035).abs() < 1e-12);
-        assert_eq!(gos.sites, 4);
-    }
-
-    #[test]
-    fn runtime_policy_encoding_is_checked() {
-        let bundle = DeploymentPlanCompiler
-            .compile_promql(
-                request("q", "quantile_over_time(0.99, m[1m])"),
-                environment(10_000),
-            )
-            .expect("compile");
-        let mut invalid_encoding = bundle.transmission_plan.clone();
-        invalid_encoding.rules[0].encoding = StateEncoding::ExactAccumulatorV1;
-        assert!(matches!(
-            invalid_encoding.validate(&bundle.precompute_plan),
-            Err(TransmissionPlanError::InvalidRule(_))
-        ));
-    }
-
-    #[test]
-    fn compiler_emits_delta_rule_and_accepts_periodic_full_checkpoint() {
-        let mut request = request_with_evidence(
-            "q-topk",
-            "topk(5, count_over_time(m[1m]))",
-            Some(TopKMembershipEvidence {
-                selected_lower_bound: 101.0,
-                excluded_upper_bound: 100.0,
-                interval_failure_probability: 0.005,
-                observed_at_unix_ms: 9_500,
-                source: "runtime-margin-monitor".into(),
-            }),
-        )
-        .expect("frequency selection");
-        request.queries[0].materialization_runtime_policy.delta = Some(DeltaPolicy {
-            absolute_threshold: 0.0,
-            gos: None,
-        });
-        let bundle = DeploymentPlanCompiler
-            .compile_promql(request, environment(10_000))
-            .expect("delta-capable physical plan");
-        let rule = &bundle.transmission_plan.rules[0];
-        assert_eq!(rule.mode, TransmissionMode::Delta);
-        assert!(rule.full_checkpoint_every_ms.is_some());
-
-        for (kind, sequence) in [(SummaryFrameKind::Full, 1), (SummaryFrameKind::Delta, 2)] {
-            let frame = SummaryFrameIdentity {
-                identity_version: 1,
-                plan_id: bundle.envelope.plan_id,
-                plan_version: bundle.envelope.plan_version,
-                backend_compat: bundle.envelope.backend_compat.clone(),
-                materialization: rule.materialization,
-                series_identity: "service=checkout,zone=a".into(),
-                schema_id: rule.schema_id.clone(),
-                producer_id: rule.producer_id.clone(),
-                producer_epoch: "boot-1".into(),
-                window_start_unix_nano: 1,
-                window_end_unix_nano: 2,
-                sequence,
-                encoding: rule.encoding.clone(),
-                checkpoint_id: (kind == SummaryFrameKind::Full).then(|| "cp-1".into()),
-                base_checkpoint_id: (kind == SummaryFrameKind::Delta).then(|| "cp-1".into()),
-                kind,
-            };
-            bundle
-                .transmission_plan
-                .validate_frame(&frame)
-                .expect("delta rule accepts its deltas and recovery full frames");
-        }
-    }
-
-    #[test]
-    fn runtime_adaptation_requires_fresh_exact_evidence_and_successor_version() {
-        let bundle = DeploymentPlanCompiler
-            .compile_promql(
-                request("q", "quantile_over_time(0.99, m[1m])"),
-                environment(10_000),
-            )
-            .expect("compile");
-        let mut current = bundle.transmission_plan;
-        let rule = &mut current.rules[0];
-        rule.runtime_policy.adaptation = RuntimeAdaptationPolicy {
-            enabled: true,
-            not_before_unix_ms: 10_500,
-            max_evidence_age_ms: 5_000,
-            min_evidence_samples: 100,
-            sample_probability: None,
-            emit_every_ms: Some(AdaptiveU64Bounds {
-                min: 30_000,
-                max: 120_000,
-                max_step: 10_000,
-            }),
-            delta_threshold: None,
-            gos_epsilon_staleness: None,
-        };
-        let mut successor = current.clone();
-        successor.envelope.plan_version += 1;
-        successor.envelope.generated_at_unix_ms = 11_000;
-        successor.envelope.activation_unix_ms = 11_000;
-        successor.rules[0].emit_every_ms += 5_000;
-        let evidence = RuntimeAdaptationEvidence {
-            plan_id: current.envelope.plan_id,
-            plan_version: current.envelope.plan_version,
-            materialization: current.rules[0].materialization,
-            producer_id: current.rules[0].producer_id.clone(),
-            schema_id: current.rules[0].schema_id.clone(),
-            producer_version: "collector.v1".into(),
-            observed_at_unix_ms: 10_900,
-            sample_count: 100,
-        };
-        current
-            .authorize_successor(&successor, std::slice::from_ref(&evidence), 11_000)
-            .expect("bounded change with exact fresh evidence");
-
-        let mut oversized = successor.clone();
-        oversized.rules[0].emit_every_ms += 20_000;
-        assert!(matches!(
-            current.authorize_successor(&oversized, std::slice::from_ref(&evidence), 11_000),
-            Err(TransmissionPlanError::AdaptationOutOfBounds { .. })
-        ));
-        let stale = RuntimeAdaptationEvidence {
-            observed_at_unix_ms: 1,
-            ..evidence.clone()
-        };
-        assert!(matches!(
-            current.authorize_successor(&successor, &[stale], 11_000),
-            Err(TransmissionPlanError::InvalidAdaptationEvidence(_))
-        ));
-        let future = RuntimeAdaptationEvidence {
-            observed_at_unix_ms: 11_001,
-            ..evidence
-        };
-        assert!(matches!(
-            current.authorize_successor(&successor, &[future], 11_000),
-            Err(TransmissionPlanError::InvalidAdaptationEvidence(_))
-        ));
-        let mut different_plan_id = successor.clone();
-        different_plan_id.envelope.plan_id += 1;
-        assert!(matches!(
-            current.authorize_successor(&different_plan_id, &[], 11_000),
-            Err(TransmissionPlanError::InvalidSuccessor(_))
-        ));
-        let mut in_place = successor;
-        in_place.envelope.plan_version = current.envelope.plan_version;
-        assert!(matches!(
-            current.authorize_successor(&in_place, &[], 11_000),
-            Err(TransmissionPlanError::InvalidSuccessor(_))
-        ));
-    }
-}
diff --git a/control_plane/src/physical/compiler/windows.rs b/control_plane/src/physical/compiler/windows.rs
deleted file mode 100644
index 072ee7c2e..000000000
--- a/control_plane/src/physical/compiler/windows.rs
+++ /dev/null
@@ -1,377 +0,0 @@
-//! Generate feasible layouts from selected state requirements before pricing them.
-use super::*;
-use asap_types::WindowMaterializationLayout;
-
-/// One input contract for snapshot and HTTP window planning. Quotes apply only
-/// to their exact shape and workload; absent quotes use the lifecycle unit costs.
-#[derive(Debug, Clone, Serialize, Deserialize, PartialEq)]
-#[serde(deny_unknown_fields)]
-pub struct WindowCostModel {
-    pub implementation_id: String,
-    pub cost: WindowRealizationCostQuote,
-    #[serde(default, skip_serializing_if = "Vec::is_empty")]
-    pub quotes: Vec<WindowRealizationCandidate>,
-}
-
-pub(in crate::physical) fn gcd(mut a: u64, mut b: u64) -> u64 {
-    while b != 0 {
-        (a, b) = (b, a % b);
-    }
-    a
-}
-
-pub(super) fn is_full_cohort(candidate: &WindowRealizationCandidate) -> bool {
-    candidate.slide_secs == candidate.window_secs
-        && candidate.layout
-            == WindowMaterializationLayout::Pane {
-                pane_secs: candidate.window_secs,
-            }
-}
-
-pub(super) fn cohort_nodes(states: &[SelectedMaterialization]) -> BTreeSet<usize> {
-    let mut nodes = BTreeSet::new();
-    for state in states {
-        if let Some(sources) = immutable_materialization_sources(&state.node) {
-            nodes.insert(Rc::as_ptr(&state.node) as usize);
-            nodes.extend(sources.iter().map(|source| Rc::as_ptr(source) as usize));
-        }
-    }
-    nodes
-}
-
-pub(super) fn supported(
-    candidate: &WindowRealizationCandidate,
-    target: PhysicalDeploymentTarget,
-) -> bool {
-    candidate
-        .layout
-        .validate(candidate.window_secs, candidate.slide_secs)
-        .is_ok()
-        && match (&candidate.framework, &candidate.layout) {
-            (
-                SummaryWindowFramework::Tumbling | SummaryWindowFramework::Sliding,
-                WindowMaterializationLayout::Pane { pane_secs },
-            ) => {
-                target == PhysicalDeploymentTarget::BackendLocalRemoteWrite
-                    || *pane_secs == candidate.window_secs
-            }
-            (SummaryWindowFramework::Sliding, WindowMaterializationLayout::FullWindow) => {
-                // Collector schedulers currently support overlapping or tumbling windows only.
-                target == PhysicalDeploymentTarget::BackendLocalRemoteWrite
-                    || candidate.slide_secs <= candidate.window_secs
-            }
-            _ => false,
-        }
-}
-
-pub(super) fn derive(
-    model: &WindowCostModel,
-    lifecycle: &SummaryLifecyclePlanningInputs,
-    window_secs: u64,
-    full_cohort: bool,
-    target: PhysicalDeploymentTarget,
-    staleness_margin_ms: u64,
-) -> Vec<WindowRealizationCandidate> {
-    let evaluation_ms = u64::from(lifecycle.evaluation_interval_ms);
-    // Runtime layouts have second precision. Never truncate a fractional cadence.
-    if window_secs == 0 || evaluation_ms == 0 || evaluation_ms % 1_000 != 0 {
-        return Vec::new();
-    }
-    let evaluation_secs = evaluation_ms / 1_000;
-    let pane_secs = if full_cohort {
-        window_secs
-    } else {
-        gcd(window_secs, evaluation_secs)
-    };
-    let slide_secs = if full_cohort {
-        window_secs
-    } else {
-        evaluation_secs
-    };
-    let mut layouts = vec![WindowMaterializationLayout::Pane { pane_secs }];
-    if !full_cohort && evaluation_secs != window_secs {
-        layouts.push(WindowMaterializationLayout::FullWindow);
-    }
-    layouts
-        .into_iter()
-        .filter_map(|layout| {
-            let suffix = match layout {
-                WindowMaterializationLayout::Pane { pane_secs } => format!("pane-{pane_secs}s"),
-                _ => "full-window".into(),
-            };
-            let candidate = WindowRealizationCandidate {
-                realization_id: format!(
-                    "{}-{window_secs}s-slide-{slide_secs}s-{suffix}",
-                    model.implementation_id
-                ),
-                framework: if slide_secs == window_secs {
-                    SummaryWindowFramework::Tumbling
-                } else {
-                    SummaryWindowFramework::Sliding
-                },
-                window_secs,
-                slide_secs,
-                cost: derived_window_cost(
-                    &model.cost,
-                    lifecycle,
-                    window_secs,
-                    slide_secs,
-                    &layout,
-                    staleness_margin_ms,
-                ),
-                layout,
-                derived: true,
-                cohort_only: full_cohort && slide_secs != evaluation_secs,
-            };
-            supported(&candidate, target).then_some(candidate)
-        })
-        .collect()
-}
-
-pub fn prepare_window_implementations(
-    query: &mut QueryCompilationInput,
-    model: &WindowCostModel,
-    target: PhysicalDeploymentTarget,
-    staleness_margin_ms: u64,
-) -> Result<(), CompileError> {
-    if model.implementation_id.trim().is_empty() {
-        return Err(CompileError::Lifecycle {
-            query_id: query.query_id.clone(),
-            reason: "window cost model requires an implementation identity".into(),
-        });
-    }
-    let mut model = model.clone();
-    let fingerprint = canonical_promql(&query.query_string).map_err(CompileError::QueryPlan)?;
-    model.cost.workload_fingerprint = fingerprint.clone();
-    model.cost.horizon_seconds = query.summary_lifecycle_inputs.horizon_seconds;
-    let states = collect_selected_materializations(
-        &query.selected_plan_root,
-        target == PhysicalDeploymentTarget::BackendLocalRemoteWrite,
-    )
-    .map_err(|reason| CompileError::Query {
-        query_id: query.query_id.clone(),
-        reason,
-    })?;
-    let cohorts = cohort_nodes(&states);
-    let requirements = states
-        .iter()
-        .map(|state| {
-            (
-                state.window_secs.unwrap_or(query.query_lookback_seconds),
-                cohorts.contains(&(Rc::as_ptr(&state.node) as usize)),
-            )
-        })
-        .collect::<BTreeSet<_>>();
-    let mut candidates = requirements
-        .iter()
-        .flat_map(|&(window, cohort)| {
-            derive(
-                &model,
-                &query.summary_lifecycle_inputs,
-                window,
-                cohort,
-                target,
-                staleness_margin_ms,
-            )
-        })
-        .collect::<Vec<_>>();
-    let mut quote_shapes = BTreeSet::new();
-    for quote in model
-        .quotes
-        .iter()
-        .filter(|q| q.cost.workload_fingerprint == fingerprint)
-    {
-        let shape = (
-            quote.window_secs,
-            quote.slide_secs,
-            serde_json::to_string(&quote.layout).unwrap(),
-        );
-        if !quote_shapes.insert(shape) {
-            return Err(CompileError::Lifecycle {
-                query_id: query.query_id.clone(),
-                reason: "duplicate measured window layout".into(),
-            });
-        }
-        let applicable = requirements.iter().any(|&(window, cohort)| {
-            quote.window_secs == window
-                && if cohort {
-                    is_full_cohort(quote)
-                } else {
-                    quote.slide_secs.saturating_mul(1_000)
-                        == u64::from(query.summary_lifecycle_inputs.evaluation_interval_ms)
-                }
-        });
-        if !applicable || !supported(quote, target) {
-            return Err(CompileError::Lifecycle {
-                query_id: query.query_id.clone(),
-                reason: format!(
-                    "window quote `{}` does not match an executable state layout",
-                    quote.realization_id
-                ),
-            });
-        }
-        candidates.retain(|candidate| {
-            !(candidate.window_secs == quote.window_secs
-                && candidate.slide_secs == quote.slide_secs
-                && candidate.layout == quote.layout)
-        });
-        let mut quote = quote.clone();
-        quote.derived = false;
-        quote.cohort_only = quote.slide_secs.saturating_mul(1_000)
-            != u64::from(query.summary_lifecycle_inputs.evaluation_interval_ms);
-        candidates.push(quote);
-    }
-    let mut unique = BTreeMap::new();
-    for candidate in &candidates {
-        if let Some(previous) = unique.insert(&candidate.realization_id, candidate) {
-            if previous != candidate {
-                return Err(CompileError::Lifecycle {
-                    query_id: query.query_id.clone(),
-                    reason: "window implementation identity describes different offers".into(),
-                });
-            }
-        }
-    }
-    let mut ids = BTreeSet::new();
-    candidates.retain(|candidate| ids.insert(candidate.realization_id.clone()));
-    query.window_realization_candidates = candidates;
-    Ok(())
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    fn snapshot() -> BackendLocalPlanningInput {
-        serde_json::from_str(include_str!(
-            "../../../../docs/examples/asapquery-planning-snapshot.json"
-        ))
-        .unwrap()
-    }
-
-    // Target constraints eliminate infeasible offers before lifecycle selection.
-    #[test]
-    fn collector_generation_excludes_partial_panes_and_sparse_full_windows() {
-        let snapshot = snapshot();
-        let model = snapshot.physical_inputs.window_cost_model.clone();
-        let (request, _) = snapshot.into_physical_compilation_request().unwrap();
-        let mut lifecycle = request.queries[0].summary_lifecycle_inputs.clone();
-        for (interval, expected_count) in [
-            (20_000, 1),
-            (45_000, 1),
-            (60_000, 1),
-            (90_000, 0),
-            (120_000, 1),
-        ] {
-            lifecycle.evaluation_interval_ms = interval;
-            let candidates = derive(
-                &model,
-                &lifecycle,
-                60,
-                false,
-                PhysicalDeploymentTarget::DistributedCollectors,
-                0,
-            );
-            assert_eq!(candidates.len(), expected_count, "{interval}");
-            assert!(candidates.iter().all(|candidate| supported(
-                candidate,
-                PhysicalDeploymentTarget::DistributedCollectors
-            )));
-        }
-    }
-
-    // A quote cannot authorize a pane that cuts scheduled ranges or an unimplemented rollup.
-    #[test]
-    fn quotes_cannot_bypass_layout_or_runtime_constraints() {
-        let snapshot = snapshot();
-        let mut model = snapshot.physical_inputs.window_cost_model.clone();
-        let (request, _) = snapshot.into_physical_compilation_request().unwrap();
-        let mut query = request.queries[0].clone();
-        query.summary_lifecycle_inputs.evaluation_interval_ms = 20_000;
-        prepare_window_implementations(
-            &mut query,
-            &model,
-            PhysicalDeploymentTarget::BackendLocalRemoteWrite,
-            0,
-        )
-        .unwrap();
-        let mut quote = query.window_realization_candidates[0].clone();
-        quote.layout = WindowMaterializationLayout::Pane { pane_secs: 30 };
-        model.quotes = vec![quote.clone()];
-        assert!(prepare_window_implementations(
-            &mut query,
-            &model,
-            PhysicalDeploymentTarget::BackendLocalRemoteWrite,
-            0
-        )
-        .is_err());
-        quote.framework = SummaryWindowFramework::ExponentialHistogram;
-        quote.layout = WindowMaterializationLayout::HierarchicalRollup {
-            base_pane_secs: 10,
-            levels_secs: vec![30],
-        };
-        assert!(quote
-            .layout
-            .validate(quote.window_secs, quote.slide_secs)
-            .is_ok());
-        assert!(!supported(
-            &quote,
-            PhysicalDeploymentTarget::BackendLocalRemoteWrite
-        ));
-        model.quotes = vec![quote];
-        let error = prepare_window_implementations(
-            &mut query,
-            &model,
-            PhysicalDeploymentTarget::BackendLocalRemoteWrite,
-            0,
-        )
-        .unwrap_err();
-        assert!(matches!(
-            error,
-            CompileError::Lifecycle { reason, .. }
-                if reason.contains("does not match an executable state layout")
-        ));
-    }
-
-    // Conflicting identities and repeated shape evidence must fail rather than silently lose an offer.
-    #[test]
-    fn conflicting_quote_ids_and_duplicate_shapes_are_rejected() {
-        let snapshot = snapshot();
-        let mut model = snapshot.physical_inputs.window_cost_model.clone();
-        let (request, _) = snapshot.into_physical_compilation_request().unwrap();
-        let mut query = request.queries[0].clone();
-        let mut quote = query.window_realization_candidates[0].clone();
-        quote.realization_id = query.window_realization_candidates[1]
-            .realization_id
-            .clone();
-        model.quotes = vec![quote.clone()];
-        assert!(prepare_window_implementations(
-            &mut query,
-            &model,
-            PhysicalDeploymentTarget::BackendLocalRemoteWrite,
-            0
-        )
-        .is_err());
-        quote.realization_id = "duplicate-shape".into();
-        model.quotes.push(quote);
-        assert!(prepare_window_implementations(
-            &mut query,
-            &model,
-            PhysicalDeploymentTarget::BackendLocalRemoteWrite,
-            0
-        )
-        .is_err());
-    }
-
-    // External serialization never grants permission to reinterpret measured prices.
-    #[test]
-    fn serialized_generated_quote_loses_compiler_provenance() {
-        let (request, _) = snapshot().into_physical_compilation_request().unwrap();
-        let candidate = &request.queries[0].window_realization_candidates[0];
-        assert!(candidate.derived);
-        let value = serde_json::to_value(candidate).unwrap();
-        assert!(value.get("derived").is_none());
-        let decoded: WindowRealizationCandidate = serde_json::from_value(value).unwrap();
-        assert!(!decoded.derived);
-    }
-}
diff --git a/control_plane/src/physical/deployment_cost/mod.rs b/control_plane/src/physical/deployment_cost/mod.rs
deleted file mode 100644
index 0c3a8d7cb..000000000
--- a/control_plane/src/physical/deployment_cost/mod.rs
+++ /dev/null
@@ -1,10 +0,0 @@
-//! Deployment cost inputs that survive outside the planner.
-//!
-//! * [`online`] — EMA-smoothed per-sketch cost observations fed by agent
-//!   runtime samples, exposed through `GET /api/v1/cost-model`.
-//! * [`tco`] — standalone cloud total-cost estimator behind `POST /api/v1/tco`.
-//! * [`wire`] — wire-cost table the post-ASAP cost model prices against.
-
-pub mod online;
-pub mod tco;
-pub mod wire;
diff --git a/control_plane/src/physical/deployment_cost/online.rs b/control_plane/src/physical/deployment_cost/online.rs
deleted file mode 100644
index ee711358c..000000000
--- a/control_plane/src/physical/deployment_cost/online.rs
+++ /dev/null
@@ -1,282 +0,0 @@
-//! SP-5 online profiling — EMA-adjusted physical cost constants.
-//!
-//! The static benchmark table in [`cost_model`] seeds initial estimates.
-//! As [`monitor::Scraper`] collects actual observations from running agents,
-//! this module blends them in via an Exponential Moving Average (EMA) so the
-//! planner's cost estimates converge toward real-world behaviour.
-//!
-//! # Blending weight
-//!
-//! After `MIN_OBS` observations the online weight reaches `MAX_ONLINE_WEIGHT`
-//! (70 %).  Below that the benchmark retains the majority share so a single
-//! noisy scrape cannot destabilise the planner.
-//!
-//! ```text
-//! online_weight = min(observations / MIN_OBS, 1.0) × MAX_ONLINE_WEIGHT
-//! effective     = online_weight × observed + (1 − online_weight) × benchmark
-//! ```
-
-use std::collections::HashMap;
-use std::sync::Arc;
-
-use tokio::sync::RwLock;
-
-use crate::types::SketchType;
-
-// ── Benchmark-derived cost table ─────────────────────────────────────────────
-//
-// Source: e2e benchmark results (2026-03-15), 1000 series x 1000 Hz row.
-// Units: bandwidth bytes/series/sec, CPU us/sample, memory bytes/sketch.
-// These are the priors the EMA smooths towards until enough runtime samples
-// arrive from the agents.
-
-#[derive(Debug, Clone, Copy)]
-pub struct SketchCosts {
-    pub bytes_per_series_per_sec: f64,
-    pub cpu_micros_per_sample: f64,
-    pub base_memory_bytes: f64,
-    pub relative_error_at_default: f64,
-}
-
-/// Public accessor used by `apply_delta_decision` to retrieve the cost table.
-pub fn benchmark_table_pub() -> HashMap<SketchType, SketchCosts> {
-    benchmark_table()
-}
-
-fn benchmark_table() -> HashMap<SketchType, SketchCosts> {
-    [
-        (
-            SketchType::DDSketch,
-            SketchCosts {
-                bytes_per_series_per_sec: 120.0,
-                cpu_micros_per_sample: 0.8,
-                base_memory_bytes: 4_096.0,
-                relative_error_at_default: 0.01,
-            },
-        ),
-        (
-            SketchType::KLL,
-            SketchCosts {
-                bytes_per_series_per_sec: 80.0,
-                cpu_micros_per_sample: 0.5,
-                base_memory_bytes: 2_048.0,
-                relative_error_at_default: 0.02,
-            },
-        ),
-        (
-            SketchType::HLL,
-            SketchCosts {
-                bytes_per_series_per_sec: 40.0,
-                cpu_micros_per_sample: 0.3,
-                base_memory_bytes: 16_384.0, // precision=14 → 16 KB
-                relative_error_at_default: 0.008,
-            },
-        ),
-        (
-            SketchType::CountSketch,
-            SketchCosts {
-                bytes_per_series_per_sec: 200.0,
-                cpu_micros_per_sample: 1.2,
-                base_memory_bytes: 40_960.0,
-                relative_error_at_default: 0.01,
-            },
-        ),
-        (
-            SketchType::CountMinSketch,
-            SketchCosts {
-                bytes_per_series_per_sec: 200.0,
-                cpu_micros_per_sample: 1.0,
-                base_memory_bytes: 40_960.0,
-                relative_error_at_default: 0.01,
-            },
-        ),
-    ]
-    .into()
-}
-
-// ── Tuning constants ──────────────────────────────────────────────────────────
-
-/// EMA smoothing factor α.  Smaller → slower adaptation, more stable.
-const EMA_ALPHA: f64 = 0.15;
-
-/// Minimum number of observations before online data gets majority weight.
-const MIN_OBS: f64 = 5.0;
-
-/// Maximum fraction of weight given to online (observed) data.
-const MAX_ONLINE_WEIGHT: f64 = 0.70;
-
-// ── Types ─────────────────────────────────────────────────────────────────────
-
-/// EMA-smoothed cost estimates for one sketch type.
-#[derive(Debug, Clone)]
-pub struct OnlineSketchCosts {
-    /// EMA of observed bytes/series/sec transmitted by agents using this sketch.
-    pub bw_bytes_per_series_per_sec: f64,
-    /// EMA of observed CPU µs/sample at the agent collector.
-    pub cpu_micros_per_sample: f64,
-    /// Number of observations incorporated so far.
-    pub observations: u64,
-}
-
-impl OnlineSketchCosts {
-    fn from_benchmark(base: &SketchCosts) -> Self {
-        Self {
-            bw_bytes_per_series_per_sec: base.bytes_per_series_per_sec,
-            cpu_micros_per_sample: base.cpu_micros_per_sample,
-            observations: 0,
-        }
-    }
-
-    /// Incorporate a new observation.
-    pub fn update(&mut self, observed_bw: f64, observed_cpu: f64) {
-        self.bw_bytes_per_series_per_sec =
-            EMA_ALPHA * observed_bw + (1.0 - EMA_ALPHA) * self.bw_bytes_per_series_per_sec;
-        self.cpu_micros_per_sample =
-            EMA_ALPHA * observed_cpu + (1.0 - EMA_ALPHA) * self.cpu_micros_per_sample;
-        self.observations += 1;
-    }
-
-    /// Returns a `SketchCosts` that blends the EMA observation with `base`.
-    /// The online weight grows with observation count, capping at 70 %.
-    pub fn effective_costs(&self, base: &SketchCosts) -> SketchCosts {
-        let online_w = (self.observations as f64 / MIN_OBS).min(1.0) * MAX_ONLINE_WEIGHT;
-        let bench_w = 1.0 - online_w;
-        SketchCosts {
-            bytes_per_series_per_sec: online_w * self.bw_bytes_per_series_per_sec
-                + bench_w * base.bytes_per_series_per_sec,
-            cpu_micros_per_sample: online_w * self.cpu_micros_per_sample
-                + bench_w * base.cpu_micros_per_sample,
-            base_memory_bytes: base.base_memory_bytes,
-            relative_error_at_default: base.relative_error_at_default,
-        }
-    }
-}
-
-// ── Store ─────────────────────────────────────────────────────────────────────
-
-/// Thread-safe map of sketch type → online EMA costs.
-/// Shared between the `Scraper`'s `on_metrics` callback and `DeploymentCostPlanner`.
-pub type OnlineMetricsStore = Arc<RwLock<HashMap<SketchType, OnlineSketchCosts>>>;
-
-/// Initialise the store from the static benchmark table.
-pub fn init_store() -> OnlineMetricsStore {
-    let map = benchmark_table_pub()
-        .iter()
-        .map(|(st, c)| (st.clone(), OnlineSketchCosts::from_benchmark(c)))
-        .collect();
-    Arc::new(RwLock::new(map))
-}
-
-/// Update the EMA for `sketch_type` with a new bandwidth/cpu observation.
-/// If `sketch_type` is not yet in the store it is inserted from the benchmark.
-pub async fn update(
-    store: &OnlineMetricsStore,
-    sketch_type: &SketchType,
-    observed_bw: f64,
-    observed_cpu: f64,
-) {
-    let mut map = store.write().await;
-    let entry = map.entry(sketch_type.clone()).or_insert_with(|| {
-        let base = benchmark_table_pub();
-        let costs = base.get(sketch_type).cloned().unwrap_or(SketchCosts {
-            bytes_per_series_per_sec: 200.0,
-            cpu_micros_per_sample: 1.0,
-            base_memory_bytes: 4096.0,
-            relative_error_at_default: 0.01,
-        });
-        OnlineSketchCosts::from_benchmark(&costs)
-    });
-    entry.update(observed_bw, observed_cpu);
-}
-
-/// Returns an effective cost table that blends online EMA data with benchmarks.
-/// Uses `try_read()` so callers in hot paths never block.
-pub fn effective_table(store: &OnlineMetricsStore) -> HashMap<SketchType, SketchCosts> {
-    let base = benchmark_table_pub();
-    match store.try_read() {
-        Ok(map) => base
-            .iter()
-            .map(|(st, b)| {
-                let eff = map
-                    .get(st)
-                    .map(|o| o.effective_costs(b))
-                    .unwrap_or_else(|| *b);
-                (st.clone(), eff)
-            })
-            .collect(),
-        Err(_) => base, // fall back to benchmark if lock is contended
-    }
-}
-
-// ── Tests ─────────────────────────────────────────────────────────────────────
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use crate::types::SketchType;
-
-    fn base() -> SketchCosts {
-        SketchCosts {
-            bytes_per_series_per_sec: 100.0,
-            cpu_micros_per_sample: 1.0,
-            base_memory_bytes: 4096.0,
-            relative_error_at_default: 0.01,
-        }
-    }
-
-    #[test]
-    fn no_observations_returns_benchmark() {
-        let o = OnlineSketchCosts::from_benchmark(&base());
-        let eff = o.effective_costs(&base());
-        assert_eq!(eff.bytes_per_series_per_sec, 100.0);
-    }
-
-    #[test]
-    fn after_min_obs_online_dominates() {
-        let mut o = OnlineSketchCosts::from_benchmark(&base());
-        for _ in 0..10 {
-            o.update(200.0, 2.0); // observed = 2× benchmark
-        }
-        let eff = o.effective_costs(&base());
-        // Online weight = 1.0 × 0.70 = 0.70
-        // effective = 0.70 × online_ema + 0.30 × benchmark
-        // online_ema after 10 EMA steps from 100→200: converging toward 200
-        assert!(
-            eff.bytes_per_series_per_sec > 100.0,
-            "effective bw should exceed benchmark after high observations: {}",
-            eff.bytes_per_series_per_sec
-        );
-    }
-
-    #[test]
-    fn single_observation_has_low_weight() {
-        let mut o = OnlineSketchCosts::from_benchmark(&base());
-        o.update(1000.0, 10.0); // extreme spike
-        let eff = o.effective_costs(&base());
-        // online_weight = (1/5).min(1.0) × 0.70 = 0.14
-        // should only move a little from benchmark
-        assert!(
-            eff.bytes_per_series_per_sec < 200.0,
-            "single spike should not dominate: {}",
-            eff.bytes_per_series_per_sec
-        );
-    }
-
-    #[tokio::test]
-    async fn store_update_and_effective_table() {
-        let store = init_store();
-        update(&store, &SketchType::DDSketch, 200.0, 2.0).await;
-        let table = effective_table(&store);
-        let eff = table.get(&SketchType::DDSketch).unwrap();
-        assert!(eff.bytes_per_series_per_sec > 0.0);
-    }
-
-    #[tokio::test]
-    async fn effective_table_falls_back_on_benchmark() {
-        // Even without any updates the store returns sensible values.
-        let store = init_store();
-        let table = effective_table(&store);
-        assert!(table.contains_key(&SketchType::HLL));
-        assert!(table.contains_key(&SketchType::KLL));
-    }
-}
diff --git a/control_plane/src/physical/deployment_cost/tco.rs b/control_plane/src/physical/deployment_cost/tco.rs
deleted file mode 100644
index 5a7469236..000000000
--- a/control_plane/src/physical/deployment_cost/tco.rs
+++ /dev/null
@@ -1,436 +0,0 @@
-//! Physical deployment total-cost-of-ownership estimator.
-
-use serde::{Deserialize, Serialize};
-
-/// Cloud pricing configuration (loaded from YAML or defaults).
-#[derive(Debug, Clone, Serialize, Deserialize)]
-#[serde(default)]
-pub struct CloudPricing {
-    /// Grafana Cloud: $/1000 active series at 1 DPM (data point per minute).
-    pub grafana_per_1k_series_1dpm: f64,
-    /// AWS S3: $/GB stored per month.
-    pub s3_storage_per_gb_month: f64,
-    /// AWS S3: $/1000 PUT requests.
-    pub s3_put_per_1k: f64,
-    /// AWS S3: $/1000 GET requests.
-    pub s3_get_per_1k: f64,
-    /// AWS S3: $/GB data transfer out.
-    pub s3_transfer_per_gb: f64,
-    /// EC2 compute cost for sketch processing ($/hour for the instance type).
-    pub ec2_sketch_instance_per_hour: f64,
-}
-
-impl Default for CloudPricing {
-    fn default() -> Self {
-        Self {
-            grafana_per_1k_series_1dpm: 6.50,
-            s3_storage_per_gb_month: 0.023,
-            s3_put_per_1k: 0.005,
-            s3_get_per_1k: 0.0004,
-            s3_transfer_per_gb: 0.09,
-            ec2_sketch_instance_per_hour: 0.384, // c6i.xlarge
-        }
-    }
-}
-
-/// Workload parameters for TCO estimation.
-#[derive(Debug, Clone, Serialize, Deserialize)]
-#[serde(default)]
-pub struct TcoWorkload {
-    /// Number of active time series.
-    pub series_count: u64,
-    /// Samples per second per series.
-    pub samples_per_sec: f64,
-    /// Bytes per raw sample (metric name + labels + value + timestamp).
-    pub bytes_per_sample: u64,
-    /// Scrape interval in seconds.
-    pub scrape_interval_secs: u64,
-    /// Average query rate (queries per second).
-    pub queries_per_sec: f64,
-    /// Average query window in seconds.
-    pub query_window_secs: u64,
-    /// Retention period in days.
-    pub retention_days: u64,
-    /// Sketch compression ratio (sketch bytes / raw bytes). Typically 0.03-0.10.
-    pub sketch_compression_ratio: f64,
-    /// Delta compression ratio (delta bytes / full sketch bytes). Typically 0.2-0.5.
-    pub delta_compression_ratio: f64,
-}
-
-impl Default for TcoWorkload {
-    fn default() -> Self {
-        Self {
-            series_count: 100_000,
-            samples_per_sec: 1.0,
-            bytes_per_sample: 100,
-            scrape_interval_secs: 15,
-            queries_per_sec: 1.0,
-            query_window_secs: 300,
-            retention_days: 30,
-            sketch_compression_ratio: 0.05,
-            delta_compression_ratio: 0.3,
-        }
-    }
-}
-
-/// TCO estimation result.
-#[derive(Debug, Clone, Serialize)]
-pub struct TcoEstimate {
-    /// Monthly cost breakdown for traditional pipeline.
-    pub before: TcoBefore,
-    /// Monthly cost breakdown for sketch pipeline.
-    pub after: TcoAfter,
-    /// Absolute monthly savings in dollars.
-    pub monthly_savings_dollars: f64,
-    /// Savings as a percentage of the before cost.
-    pub savings_percent: f64,
-}
-
-#[derive(Debug, Clone, Serialize)]
-pub struct TcoBefore {
-    pub ingestion_dollars: f64,
-    pub query_dollars: f64,
-    pub storage_dollars: f64,
-    pub total_dollars: f64,
-}
-
-#[derive(Debug, Clone, Serialize)]
-pub struct TcoAfter {
-    pub sketch_ingestion_dollars: f64,
-    pub s3_ingestion_dollars: f64,
-    pub sketch_query_dollars: f64,
-    pub s3_query_dollars: f64,
-    pub sketch_storage_dollars: f64,
-    pub s3_storage_dollars: f64,
-    pub compute_dollars: f64,
-    pub total_dollars: f64,
-}
-
-/// Seconds in a 30-day month.
-const SECS_PER_MONTH: f64 = 86_400.0 * 30.0;
-/// Hours in a 30-day month.
-const HOURS_PER_MONTH: f64 = 24.0 * 30.0;
-/// Bytes per gigabyte.
-const BYTES_PER_GB: f64 = 1_000_000_000.0;
-/// Grafana bundled storage cost approximation ($/GB/month for active series).
-const GRAFANA_STORAGE_PER_GB_MONTH: f64 = 0.10;
-/// Approximate Grafana query cost per 1000 queries (bundled in series pricing).
-const GRAFANA_QUERY_COST_PER_1K: f64 = 0.10;
-/// Series capacity per EC2 instance for sketch processing.
-const SERIES_PER_INSTANCE: f64 = 100_000.0;
-
-/// Compute a TCO estimate comparing traditional TSDB vs sketch-based pipeline.
-pub fn estimate_tco(workload: &TcoWorkload, pricing: &CloudPricing) -> TcoEstimate {
-    let before = compute_before(workload, pricing);
-    let after = compute_after(workload, pricing);
-
-    let savings = before.total_dollars - after.total_dollars;
-    let savings_pct = if before.total_dollars > 0.0 {
-        savings / before.total_dollars * 100.0
-    } else {
-        0.0
-    };
-
-    TcoEstimate {
-        before,
-        after,
-        monthly_savings_dollars: savings,
-        savings_percent: savings_pct,
-    }
-}
-
-fn compute_before(w: &TcoWorkload, p: &CloudPricing) -> TcoBefore {
-    // Data points per minute multiplier: if scrape_interval is 15s, that's 4 DPM.
-    let dpm_multiplier = if w.scrape_interval_secs > 0 {
-        60.0 / w.scrape_interval_secs as f64
-    } else {
-        1.0
-    };
-
-    // Ingestion: Grafana charges per 1000 active series at 1 DPM.
-    let ingestion =
-        (w.series_count as f64 / 1000.0) * p.grafana_per_1k_series_1dpm * dpm_multiplier;
-
-    // Storage: raw bytes over retention period.
-    let samples_per_day = w.samples_per_sec * 86_400.0;
-    let total_bytes = w.bytes_per_sample as f64
-        * samples_per_day
-        * w.series_count as f64
-        * w.retention_days as f64;
-    let storage = (total_bytes / BYTES_PER_GB) * GRAFANA_STORAGE_PER_GB_MONTH;
-
-    // Query: approximate cost based on query rate.
-    let total_queries_per_month = w.queries_per_sec * SECS_PER_MONTH;
-    let query = (total_queries_per_month / 1000.0) * GRAFANA_QUERY_COST_PER_1K;
-
-    let total = ingestion + storage + query;
-    TcoBefore {
-        ingestion_dollars: ingestion,
-        query_dollars: query,
-        storage_dollars: storage,
-        total_dollars: total,
-    }
-}
-
-fn compute_after(w: &TcoWorkload, p: &CloudPricing) -> TcoAfter {
-    let series = w.series_count as f64;
-
-    // Sketch bytes per second per series after both compression stages.
-    let sketch_bps = w.samples_per_sec
-        * w.bytes_per_sample as f64
-        * w.sketch_compression_ratio
-        * w.delta_compression_ratio;
-
-    // -- Sketch ingestion: transfer cost for sketch data --
-    let sketch_bytes_per_month = series * sketch_bps * SECS_PER_MONTH;
-    let sketch_ingestion = (sketch_bytes_per_month / BYTES_PER_GB) * p.s3_transfer_per_gb;
-
-    // -- S3 ingestion: sketch-compressed backup (storage + PUT costs) --
-    // In the sketch pipeline, S3 stores compressed sketches, not raw data.
-    let sketch_gb_per_month = sketch_bytes_per_month / BYTES_PER_GB;
-    // PUTs are batched: one PUT per flush interval (scrape_interval) containing
-    // all series in a single object, not one PUT per series.
-    // No PUTs needed if there are no series to back up.
-    let puts_per_month = if w.scrape_interval_secs > 0 && w.series_count > 0 {
-        SECS_PER_MONTH / w.scrape_interval_secs as f64
-    } else {
-        0.0
-    };
-    let s3_ingestion = sketch_gb_per_month * p.s3_storage_per_gb_month
-        + (puts_per_month / 1000.0) * p.s3_put_per_1k;
-
-    // -- Sketch query: near-zero (local sketch eval) --
-    let sketch_query = 0.0;
-
-    // -- S3 query: only for ad-hoc queries (assume 1% of total) --
-    let total_queries_per_month = w.queries_per_sec * SECS_PER_MONTH;
-    let s3_query = 0.01 * (total_queries_per_month / 1000.0) * p.s3_get_per_1k;
-
-    // -- Compute: EC2 for sketch processing --
-    let num_instances = (series / SERIES_PER_INSTANCE).ceil().max(1.0);
-    let compute = p.ec2_sketch_instance_per_hour * HOURS_PER_MONTH * num_instances;
-
-    // -- Sketch storage: in-memory sketches (small, included in compute) --
-    // Approximate: sketch data retained for query_window only, not full retention.
-    let sketch_mem_bytes = series * sketch_bps * w.query_window_secs as f64;
-    let sketch_storage = (sketch_mem_bytes / BYTES_PER_GB) * p.s3_storage_per_gb_month;
-
-    // -- S3 storage: sketch-compressed data over retention --
-    let s3_storage_bytes = sketch_bytes_per_month * w.retention_days as f64 / 30.0;
-    let s3_storage = (s3_storage_bytes / BYTES_PER_GB) * p.s3_storage_per_gb_month;
-
-    let total = sketch_ingestion
-        + s3_ingestion
-        + sketch_query
-        + s3_query
-        + sketch_storage
-        + s3_storage
-        + compute;
-
-    TcoAfter {
-        sketch_ingestion_dollars: sketch_ingestion,
-        s3_ingestion_dollars: s3_ingestion,
-        sketch_query_dollars: sketch_query,
-        s3_query_dollars: s3_query,
-        sketch_storage_dollars: sketch_storage,
-        s3_storage_dollars: s3_storage,
-        compute_dollars: compute,
-        total_dollars: total,
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    #[test]
-    fn default_pricing_is_reasonable() {
-        let p = CloudPricing::default();
-        assert!((p.grafana_per_1k_series_1dpm - 6.50).abs() < f64::EPSILON);
-        assert!((p.s3_storage_per_gb_month - 0.023).abs() < f64::EPSILON);
-        assert!((p.s3_put_per_1k - 0.005).abs() < f64::EPSILON);
-        assert!((p.s3_get_per_1k - 0.0004).abs() < f64::EPSILON);
-        assert!((p.s3_transfer_per_gb - 0.09).abs() < f64::EPSILON);
-        assert!((p.ec2_sketch_instance_per_hour - 0.384).abs() < f64::EPSILON);
-    }
-
-    #[test]
-    fn test_100k_series_15s_scrape() {
-        let workload = TcoWorkload {
-            series_count: 100_000,
-            samples_per_sec: 1.0,
-            bytes_per_sample: 100,
-            scrape_interval_secs: 15,
-            queries_per_sec: 1.0,
-            query_window_secs: 300,
-            retention_days: 30,
-            sketch_compression_ratio: 0.05,
-            delta_compression_ratio: 0.3,
-        };
-        let pricing = CloudPricing::default();
-        let est = estimate_tco(&workload, &pricing);
-
-        assert!(
-            est.before.total_dollars > 0.0,
-            "before total should be positive"
-        );
-        assert!(
-            est.after.total_dollars > 0.0,
-            "after total should be positive"
-        );
-        assert!(
-            est.savings_percent > 50.0,
-            "expected >50% savings for 100K series, got {:.1}%",
-            est.savings_percent
-        );
-        assert!(est.monthly_savings_dollars > 0.0, "should save money");
-    }
-
-    #[test]
-    fn test_1m_series_high_cardinality() {
-        let workload = TcoWorkload {
-            series_count: 1_000_000,
-            samples_per_sec: 1.0,
-            bytes_per_sample: 150,
-            scrape_interval_secs: 15,
-            queries_per_sec: 5.0,
-            query_window_secs: 600,
-            retention_days: 90,
-            sketch_compression_ratio: 0.04,
-            delta_compression_ratio: 0.25,
-        };
-        let pricing = CloudPricing::default();
-        let est = estimate_tco(&workload, &pricing);
-
-        assert!(est.before.total_dollars > est.after.total_dollars);
-        assert!(
-            est.savings_percent > 50.0,
-            "expected >50% savings at 1M series, got {:.1}%",
-            est.savings_percent
-        );
-        // At 1M series we need ceil(1M/100K) = 10 instances.
-        let expected_compute = pricing.ec2_sketch_instance_per_hour * HOURS_PER_MONTH * 10.0;
-        assert!(
-            (est.after.compute_dollars - expected_compute).abs() < 0.01,
-            "compute should be ~${:.2}, got ${:.2}",
-            expected_compute,
-            est.after.compute_dollars
-        );
-    }
-
-    #[test]
-    fn zero_series_returns_zero() {
-        let workload = TcoWorkload {
-            series_count: 0,
-            ..Default::default()
-        };
-        let pricing = CloudPricing::default();
-        let est = estimate_tco(&workload, &pricing);
-
-        // Before costs should be zero (no series).
-        assert!(
-            est.before.ingestion_dollars.abs() < f64::EPSILON,
-            "ingestion should be 0"
-        );
-        assert!(
-            est.before.storage_dollars.abs() < f64::EPSILON,
-            "storage should be 0"
-        );
-        // After still has a minimum 1-instance compute cost.
-        assert!(
-            est.after.compute_dollars > 0.0,
-            "compute has a 1-instance minimum"
-        );
-        // But sketch/s3 ingestion should be zero.
-        assert!(
-            est.after.sketch_ingestion_dollars.abs() < f64::EPSILON,
-            "sketch ingestion should be 0 for 0 series"
-        );
-        assert!(
-            est.after.s3_ingestion_dollars.abs() < f64::EPSILON,
-            "s3 ingestion should be 0 for 0 series"
-        );
-    }
-
-    #[test]
-    fn sketch_compression_ratio_affects_result() {
-        let pricing = CloudPricing::default();
-
-        let low_ratio = TcoWorkload {
-            series_count: 100_000,
-            sketch_compression_ratio: 0.03,
-            ..Default::default()
-        };
-        let high_ratio = TcoWorkload {
-            series_count: 100_000,
-            sketch_compression_ratio: 0.10,
-            ..Default::default()
-        };
-
-        let est_low = estimate_tco(&low_ratio, &pricing);
-        let est_high = estimate_tco(&high_ratio, &pricing);
-
-        // Higher compression ratio means more sketch bytes, so higher after cost.
-        assert!(
-            est_high.after.sketch_ingestion_dollars > est_low.after.sketch_ingestion_dollars,
-            "higher sketch ratio should cost more: {:.4} vs {:.4}",
-            est_high.after.sketch_ingestion_dollars,
-            est_low.after.sketch_ingestion_dollars
-        );
-        // Before cost should be the same (independent of sketch ratio).
-        assert!(
-            (est_high.before.total_dollars - est_low.before.total_dollars).abs() < f64::EPSILON,
-            "before cost should not change with sketch ratio"
-        );
-    }
-
-    #[test]
-    fn delta_compression_ratio_affects_result() {
-        let pricing = CloudPricing::default();
-
-        let low_delta = TcoWorkload {
-            series_count: 100_000,
-            delta_compression_ratio: 0.2,
-            ..Default::default()
-        };
-        let high_delta = TcoWorkload {
-            series_count: 100_000,
-            delta_compression_ratio: 0.5,
-            ..Default::default()
-        };
-
-        let est_low = estimate_tco(&low_delta, &pricing);
-        let est_high = estimate_tco(&high_delta, &pricing);
-
-        assert!(
-            est_high.after.sketch_ingestion_dollars > est_low.after.sketch_ingestion_dollars,
-            "higher delta ratio should increase sketch ingestion cost"
-        );
-    }
-
-    #[test]
-    fn retention_days_affects_storage() {
-        let pricing = CloudPricing::default();
-
-        let short = TcoWorkload {
-            retention_days: 7,
-            ..Default::default()
-        };
-        let long = TcoWorkload {
-            retention_days: 90,
-            ..Default::default()
-        };
-
-        let est_short = estimate_tco(&short, &pricing);
-        let est_long = estimate_tco(&long, &pricing);
-
-        assert!(
-            est_long.before.storage_dollars > est_short.before.storage_dollars,
-            "longer retention should cost more storage"
-        );
-        assert!(
-            est_long.after.s3_storage_dollars > est_short.after.s3_storage_dollars,
-            "longer retention should cost more S3 storage"
-        );
-    }
-}
diff --git a/control_plane/src/physical/deployment_cost/wire.rs b/control_plane/src/physical/deployment_cost/wire.rs
deleted file mode 100644
index 7eb7bf3f3..000000000
--- a/control_plane/src/physical/deployment_cost/wire.rs
+++ /dev/null
@@ -1,105 +0,0 @@
-//! Per-family OTLP wire footprints used to rank candidate sketch families.
-//!
-//! Sizes assume delta encoding where supported. KLL uses full state because its
-//! randomized compaction is not additively mergeable. Defaults are conservative
-//! estimates for observability workloads, rather than measured telemetry.
-
-use planner_types::post_asap::SketchAlgorithm;
-
-// ── Wire-cost table ──────────────────────────────────────────────────────────
-
-/// Per-window wire footprint of one sketch family.
-///
-/// `state_bytes` is the per-flush payload after delta encoding (where
-/// supported); `envelope_bytes` is the OTLP `SketchEnvelope` overhead
-/// (gRPC framing + resource attributes + scope info).
-#[derive(Debug, Clone, Copy, PartialEq)]
-pub struct SketchWireCost {
-    /// Per-flush sketch state bytes (delta-encoded where supported).
-    pub state_bytes: u64,
-    /// OTLP envelope bytes per flush — gRPC framing + resource attrs + scope.
-    pub envelope_bytes: u64,
-}
-
-impl SketchWireCost {
-    /// Total wire bytes per flush (state + envelope).
-    pub const fn per_flush(&self) -> u64 {
-        self.state_bytes + self.envelope_bytes
-    }
-}
-
-/// Phase ε.1 wire-cost table — one entry per sketch family.
-///
-/// All values are delta-encoded where a delta variant exists. KLL has no
-/// delta variant per `Implementation.tex`; uses full state. Numbers are
-/// conservative for typical observability workloads; a future iteration
-/// can refine via observed agent telemetry.
-#[derive(Debug, Clone, Copy)]
-pub struct WireCostTable {
-    /// DDSketch with sparse bucket-map delta encoding.
-    pub ddsketch_delta: SketchWireCost,
-    /// KLL — no delta variant, ships full compactor hierarchy.
-    pub kll_full: SketchWireCost,
-    /// HLL register-array delta (~60% of 16 KB full).
-    pub hll_delta: SketchWireCost,
-    /// Count-Min row-by-row delta (~70% of 6 KB full).
-    pub count_min_delta: SketchWireCost,
-    /// Count-Sketch sparse-cell delta (~60% of 400 KB full).
-    pub count_sketch_delta: SketchWireCost,
-}
-
-impl WireCostTable {
-    /// The default Phase ε.1 cost table — see module docs for the source
-    /// rationale.
-    pub const fn default_phase_eps_1() -> Self {
-        Self {
-            ddsketch_delta: SketchWireCost {
-                state_bytes: 600,
-                envelope_bytes: 200,
-            },
-            kll_full: SketchWireCost {
-                state_bytes: 3_000,
-                envelope_bytes: 200,
-            },
-            hll_delta: SketchWireCost {
-                state_bytes: 10_000,
-                envelope_bytes: 200,
-            },
-            count_min_delta: SketchWireCost {
-                state_bytes: 4_000,
-                envelope_bytes: 200,
-            },
-            count_sketch_delta: SketchWireCost {
-                state_bytes: 250_000,
-                envelope_bytes: 200,
-            },
-        }
-    }
-
-    /// Look up per-flush wire cost. Heap-bearing sketches reuse their bare family
-    /// cost; heap bytes are not priced separately. KMV and Theta reuse the HLL
-    /// estimate because no independent measurement is available.
-    pub const fn for_algorithm(&self, algorithm: &SketchAlgorithm) -> SketchWireCost {
-        match algorithm {
-            // No collector wire implementation is available for this family.
-            SketchAlgorithm::UnivMon => SketchWireCost {
-                state_bytes: u64::MAX,
-                envelope_bytes: 0,
-            },
-            SketchAlgorithm::DDSketch => self.ddsketch_delta,
-            SketchAlgorithm::Kll => self.kll_full,
-            SketchAlgorithm::Hll => self.hll_delta,
-            SketchAlgorithm::Kmv | SketchAlgorithm::Theta => self.hll_delta,
-            SketchAlgorithm::Cms => self.count_min_delta,
-            SketchAlgorithm::CmsWithHeap => self.count_min_delta,
-            SketchAlgorithm::CountSketch => self.count_sketch_delta,
-            SketchAlgorithm::CountSketchWithHeap => self.count_sketch_delta,
-        }
-    }
-}
-
-impl Default for WireCostTable {
-    fn default() -> Self {
-        Self::default_phase_eps_1()
-    }
-}
diff --git a/control_plane/src/physical/erp.rs b/control_plane/src/physical/erp.rs
deleted file mode 100644
index 72dfb3e2a..000000000
--- a/control_plane/src/physical/erp.rs
+++ /dev/null
@@ -1,1698 +0,0 @@
-//! Deployment adapter for ASAPPlanner Error–Resource Profiles.
-
-use asap_aware_mapping::erp::{
-    AccuracyMode, ErpArtifact, ErpMultiFitSelectionRequest, ErpSelectionRequest, ErpShapeFit,
-    ErpShapeObservation,
-};
-use planner_types::post_asap::{SketchAlgorithm, SketchParams};
-use serde::{Deserialize, Serialize};
-use serde_json::Value;
-use std::collections::BTreeMap;
-
-#[derive(Debug, Clone, Serialize, Deserialize, PartialEq)]
-#[serde(deny_unknown_fields)]
-pub struct ErpObservedShape {
-    pub observation: ErpShapeObservation,
-    /// Largest interval rate divided by the median non-zero interval rate.
-    pub burst_ratio: f64,
-}
-
-/// Bounded online observer fed by the same keys that enter a summary. It keeps
-/// exact sampled frequencies up to a configured cap and fails closed beyond it
-/// instead of silently under-reporting cardinality.
-#[derive(Debug)]
-pub struct ErpShapeObserver {
-    inner: asap_types::erp_observation::BoundedFrequencyObserver<String>,
-}
-impl ErpShapeObserver {
-    pub fn observed_key_count(&self) -> usize {
-        self.inner.observed_key_count()
-    }
-    pub fn new(max_keys: usize) -> Result<Self, &'static str> {
-        Self::with_limits(max_keys, 256)
-    }
-    pub fn with_limits(max_keys: usize, max_intervals: usize) -> Result<Self, &'static str> {
-        Ok(Self {
-            inner: asap_types::erp_observation::BoundedFrequencyObserver::new(
-                max_keys,
-                max_intervals,
-            )?,
-        })
-    }
-    pub fn observe(&mut self, key: &str, interval: usize) -> Result<(), &'static str> {
-        if key.len() > 4096 {
-            self.inner.invalidate();
-            return Err("ERP shape observer key size exceeded");
-        }
-        self.inner.observe(key.to_owned(), interval)
-    }
-    pub fn snapshot(&self) -> Option<ErpObservedShape> {
-        ErpObservedShape::from_empirical(&self.inner.snapshot()?)
-    }
-}
-impl ErpObservedShape {
-    pub fn from_empirical(
-        empirical: &asap_types::erp_observation::EmpiricalFrequencyObservation,
-    ) -> Option<Self> {
-        let events = empirical.event_count()?;
-        let counts = &empirical.sorted_counts;
-        let exponent = fit_zipf_exponent(counts);
-        let fits = [("uniform", 0.0), ("zipf", exponent)]
-            .into_iter()
-            // Zipf(0) is exactly uniform; duplicate models are not ambiguity.
-            .filter(|(family, _)| *family != "zipf" || counts.first() != counts.last())
-            .map(|(family, slope)| {
-                let expected: Vec<_> = (1..=counts.len())
-                    .map(|rank| (rank as f64).powf(-slope))
-                    .collect();
-                let total: f64 = expected.iter().sum();
-                let distance = counts
-                    .iter()
-                    .zip(expected)
-                    .map(|(count, expected)| {
-                        (*count as f64 / events as f64 - expected / total).abs()
-                    })
-                    .sum::<f64>()
-                    / 2.0;
-                ErpShapeFit {
-                    family: family.into(),
-                    parameters: if family == "zipf" {
-                        BTreeMap::from([("exponent".into(), slope)])
-                    } else {
-                        BTreeMap::new()
-                    },
-                    goodness_of_fit: distance,
-                    // A fit-quality score, not an estimator tail-probability claim.
-                    confidence: (1.0 - distance) * (1.0 - 1.0 / (events as f64).sqrt()),
-                }
-            })
-            .collect();
-        let mut nonzero: Vec<_> = empirical
-            .interval_counts
-            .iter()
-            .copied()
-            .filter(|count| *count > 0)
-            .collect();
-        nonzero.sort_unstable();
-        let median = nonzero.get(nonzero.len() / 2).copied().unwrap_or(1);
-        let peak = nonzero.last().copied().unwrap_or(median);
-        Some(ErpObservedShape {
-            observation: ErpShapeObservation {
-                cardinality: counts.len() as u64,
-                observed_events: events,
-                fits,
-                empirical_fingerprint: None,
-            },
-            burst_ratio: peak as f64 / median as f64,
-        })
-    }
-}
-
-fn fit_zipf_exponent(descending_counts: &[u64]) -> f64 {
-    if descending_counts.len() < 2 {
-        return 0.0;
-    }
-    let points: Vec<_> = descending_counts
-        .iter()
-        .enumerate()
-        .filter(|(_, count)| **count > 0)
-        .map(|(index, count)| (((index + 1) as f64).ln(), (*count as f64).ln()))
-        .collect();
-    let mean_x = points.iter().map(|(x, _)| x).sum::<f64>() / points.len() as f64;
-    let mean_y = points.iter().map(|(_, y)| y).sum::<f64>() / points.len() as f64;
-    let covariance = points
-        .iter()
-        .map(|(x, y)| (x - mean_x) * (y - mean_y))
-        .sum::<f64>();
-    let variance = points
-        .iter()
-        .map(|(x, _)| (x - mean_x).powi(2))
-        .sum::<f64>();
-    if variance == 0.0 {
-        0.0
-    } else {
-        (-covariance / variance).max(0.0)
-    }
-}
-
-/// The measurement units are part of the readout contract, not a property of
-/// the shared sketch state. These keys must be supplied by the benchmark.
-#[derive(Debug, Clone, Copy, PartialEq, Eq)]
-pub(crate) enum ReadoutEvidence {
-    QuantileRank,
-    DistinctRelative,
-    FrequencyL2Relative,
-    EntropyAbsoluteBits,
-}
-
-impl ReadoutEvidence {
-    pub(crate) fn for_intent(
-        algorithm: &SketchAlgorithm,
-        intent: &planner_types::pre_asap::AggIntent,
-    ) -> Option<Self> {
-        use planner_types::pre_asap::AggIntent;
-        match (algorithm, intent) {
-            (SketchAlgorithm::Kll, AggIntent::Quantile { .. }) => Some(Self::QuantileRank),
-            (SketchAlgorithm::Hll | SketchAlgorithm::UnivMon, AggIntent::Cardinality { .. }) => {
-                Some(Self::DistinctRelative)
-            }
-            (SketchAlgorithm::UnivMon, AggIntent::FrequencyL2 { .. }) => {
-                Some(Self::FrequencyL2Relative)
-            }
-            (SketchAlgorithm::UnivMon, AggIntent::FrequencyEntropy { .. }) => {
-                Some(Self::EntropyAbsoluteBits)
-            }
-            _ => None,
-        }
-    }
-
-    pub(crate) fn for_query(
-        algorithm: &SketchAlgorithm,
-        query: &planner_types::post_asap::SketchQuery,
-    ) -> Option<Self> {
-        use planner_types::post_asap::SketchQuery;
-        match (algorithm, query) {
-            (SketchAlgorithm::Kll, SketchQuery::Quantile { .. }) => Some(Self::QuantileRank),
-            (SketchAlgorithm::Hll | SketchAlgorithm::UnivMon, SketchQuery::Cardinality) => {
-                Some(Self::DistinctRelative)
-            }
-            (SketchAlgorithm::UnivMon, SketchQuery::FrequencyL2) => Some(Self::FrequencyL2Relative),
-            (SketchAlgorithm::UnivMon, SketchQuery::FrequencyEntropy) => {
-                Some(Self::EntropyAbsoluteBits)
-            }
-            _ => None,
-        }
-    }
-
-    fn metric_key(self) -> &'static str {
-        match self {
-            Self::QuantileRank => "max_rank_err",
-            Self::DistinctRelative => "max_cardinality_relative_error",
-            Self::FrequencyL2Relative => "max_frequency_l2_relative_error",
-            Self::EntropyAbsoluteBits => "max_frequency_entropy_absolute_bits_error",
-        }
-    }
-
-    fn metric(self) -> planner_types::post_asap::ErrorMetric {
-        use planner_types::post_asap::ErrorMetric;
-        match self {
-            Self::QuantileRank => ErrorMetric::Rank,
-            Self::DistinctRelative => ErrorMetric::Cardinality,
-            Self::FrequencyL2Relative => ErrorMetric::RelativeValue,
-            Self::EntropyAbsoluteBits => ErrorMetric::AbsoluteValue,
-        }
-    }
-}
-
-/// ERP v1 measures error magnitudes, not tail probabilities. Only an explicit
-/// epsilon-only request may use these observations as its accuracy contract.
-pub(crate) struct ErpAccuracyModel<'a> {
-    pub policy: Option<&'a ErpPlanningInput>,
-    pub max_error: f64,
-}
-
-impl asap_aware_mapping::AccuracyModel for ErpAccuracyModel<'_> {
-    fn exact_operation_rule(
-        &self,
-        operation: &planner_types::post_asap::ExactOperation,
-    ) -> Option<planner_types::post_asap::CompositionOperator> {
-        asap_aware_mapping::DefaultAccuracyModel.exact_operation_rule(operation)
-    }
-    fn local_guarantee(
-        &self,
-        family: &planner_types::post_asap::SummaryFamilyType,
-        query: &planner_types::post_asap::SketchQuery,
-    ) -> Option<planner_types::post_asap::ResultGuarantee> {
-        use planner_types::post_asap::*;
-        let theoretical = asap_aware_mapping::DefaultAccuracyModel.local_guarantee(family, query);
-        let (Some(policy), SummaryFamilyType::Sketch(kind, _)) = (self.policy, family) else {
-            return theoretical;
-        };
-        let Some(readout) = ReadoutEvidence::for_query(kind.algorithm(), query) else {
-            // In particular, UnivMon's total unit count is exact without
-            // empirical error evidence. No unsupported readout gets a bound.
-            if theoretical.as_ref().is_some_and(ResultGuarantee::is_exact) {
-                return theoretical;
-            }
-            return match policy.select(
-                kind.algorithm().clone(),
-                self.max_error,
-                kind.params().clone(),
-            ) {
-                ErpParameterDecision::ExactFallback { .. } => None,
-                _ => theoretical,
-            };
-        };
-        match policy.evidence_for_readout(
-            kind.algorithm().clone(),
-            readout,
-            self.max_error,
-            kind.params(),
-        ) {
-            ErpParameterDecision::ExactFallback { .. } => None,
-            ErpParameterDecision::TheoreticalFallback { .. } => theoretical,
-            ErpParameterDecision::Empirical {
-                params,
-                record_id,
-                observed_error,
-                ..
-            } => {
-                if &params != kind.params() {
-                    return None;
-                }
-                Some(ResultGuarantee {
-                    metric: readout.metric(),
-                    bound: BoundExpr::Constant {
-                        value: observed_error,
-                    },
-                    failure_probability: ProbabilityExpr::Unknown {
-                        statistic: "erp_v1_has_no_failure_probability_evidence".into(),
-                    },
-                    provenance: vec![GuaranteeSource::SketchReadout {
-                        algorithm: format!("{:?}", kind.algorithm()),
-                        contract: format!(
-                            "erp_v1_empirical:{}:{}:{}",
-                            policy.artifact.producer_version,
-                            record_id,
-                            readout.metric_key()
-                        ),
-                        params: serde_json::to_value(&params).ok()?,
-                        query: format!("{query:?}"),
-                    }],
-                })
-            }
-        }
-    }
-
-    fn propagate(
-        &self,
-        op: &planner_types::post_asap::CompositionOperator,
-        inputs: &[planner_types::post_asap::ResultGuarantee],
-        local: Option<&planner_types::post_asap::ResultGuarantee>,
-        stats: &asap_aware_mapping::PropagationStats,
-    ) -> Result<planner_types::post_asap::ResultGuarantee, planner_types::post_asap::AccuracyError>
-    {
-        asap_aware_mapping::DefaultAccuracyModel.propagate(op, inputs, local, stats)
-    }
-
-    fn satisfies(
-        &self,
-        guarantee: &planner_types::post_asap::ResultGuarantee,
-        target: &crate::types::AccuracyTarget,
-    ) -> bool {
-        asap_aware_mapping::DefaultAccuracyModel.satisfies(guarantee, target)
-    }
-}
-
-#[derive(Debug, Clone, Copy, Serialize, Deserialize, PartialEq, Eq)]
-#[serde(rename_all = "snake_case")]
-pub enum ErpAccuracyMode {
-    Empirical,
-    Hybrid,
-}
-
-#[derive(Debug, Clone, Serialize, Deserialize, PartialEq)]
-#[serde(deny_unknown_fields)]
-pub struct ErpPlanningInput {
-    pub artifact: ErpArtifact,
-    /// Current deployment distribution descriptor. ERP v1 requires exact
-    /// equality with the benchmark descriptor, so drift fails closed.
-    pub distribution: Value,
-    pub implementation: Option<String>,
-    pub error_metric: String,
-    pub min_trials: u32,
-    pub expected_updates: f64,
-    pub expected_queries: f64,
-    pub expected_merges: f64,
-    pub retention_seconds: f64,
-    pub cpu_weight: f64,
-    pub byte_second_weight: f64,
-    pub mode: ErpAccuracyMode,
-    /// Runtime-observed shape. If present, exact descriptor equality is
-    /// replaced by bounded nearest-profile matching.
-    #[serde(default)]
-    pub observed_shape: Option<ErpShapeObservation>,
-    #[serde(default)]
-    pub observed_populations:
-        Option<asap_types::erp_observation::ErpPopulationObservations<ErpObservedShape>>,
-    #[serde(skip)]
-    pub resolved_data_descriptor: Option<std::sync::Arc<asap_types::sds::DataDescriptor>>,
-    /// Runtime-samples ring key from which the backend resolves the freshest
-    /// `erp_observed_shape` payload before compiling a plan.
-    #[serde(default)]
-    pub observed_shape_source: Option<ErpObservedShapeSource>,
-    #[serde(default)]
-    pub shape_match: Option<ErpShapeMatchPolicy>,
-    #[serde(default)]
-    pub runtime: ErpRuntimeCapabilities,
-}
-
-#[derive(Debug, Clone, Serialize, Deserialize, PartialEq, Eq)]
-#[serde(deny_unknown_fields)]
-pub struct ErpObservedShapeSource {
-    pub source: String,
-    pub sketch: String,
-    pub implementation: String,
-    /// Required for catalog-scoped online evidence; absent only for legacy
-    /// offline runtime records that contain a single shape.
-    #[serde(default)]
-    pub population_scope: Option<ErpPopulationObservationScope>,
-}
-
-#[derive(Debug, Clone, Serialize, Deserialize, PartialEq, Eq)]
-#[serde(deny_unknown_fields)]
-pub struct ErpPopulationObservationScope {
-    pub catalog_generation: asap_types::sds::CatalogGeneration,
-    pub stored_output_id: asap_types::sds::StoredOutputId,
-    pub input_semantics: asap_types::erp_observation::ErpObservationInputSemantics,
-    pub freshness: asap_types::erp_observation::ErpObservationFreshness,
-}
-
-impl ErpPlanningInput {
-    /// Resolve evidence against the control plane's accepted catalog, never
-    /// descriptors supplied by the observation producer.
-    pub fn resolve_population_data_descriptor(
-        &mut self,
-        catalog: Option<&asap_types::summary_catalog::SummaryCatalog>,
-    ) {
-        self.resolved_data_descriptor = None;
-        let Some(populations) = self.observed_populations.as_mut() else {
-            return;
-        };
-        if populations.invalid_reason.is_some() {
-            return;
-        }
-        let resolved = (|| -> Result<_, String> {
-            let catalog = catalog.ok_or("no active authoritative catalog for ERP evidence")?;
-            let generation = catalog.reference().map_err(|error| error.to_string())?;
-            if generation != populations.catalog_generation {
-                return Err("ERP evidence catalog differs from the active catalog".into());
-            }
-            let materialization = catalog
-                .outputs
-                .get(&populations.stored_output_id)
-                .ok_or("ERP evidence summary is absent from the active catalog")?;
-            let summary = catalog
-                .summary_descriptors
-                .get(&materialization.summary_descriptor_id)
-                .ok_or("ERP summary descriptor is absent from the active catalog")?;
-            let actual_semantics = match &summary.operator {
-                asap_types::sds::SummaryOperator::Configured {
-                    aggregation_type: asap_types::AggregationType::HLL,
-                    ..
-                } => Some(
-                    asap_types::erp_observation::ErpObservationInputSemantics::ScalarSampleValue,
-                ),
-                asap_types::sds::SummaryOperator::Configured {
-                    aggregation_type: asap_types::AggregationType::UnivMon,
-                    ..
-                } => Some(
-                    asap_types::erp_observation::ErpObservationInputSemantics::UnitSampleFrequency,
-                ),
-                _ => None,
-            };
-            if actual_semantics != Some(populations.input_semantics) {
-                return Err(
-                    "ERP observation semantics differ from the installed summary operator".into(),
-                );
-            }
-            let data = catalog
-                .data_descriptors
-                .get(&materialization.data_descriptor_id)
-                .ok_or("ERP evidence data descriptor is absent from the active catalog")?;
-            Ok(std::sync::Arc::new(data.clone()))
-        })();
-        match resolved {
-            Ok(data) => self.resolved_data_descriptor = Some(data),
-            Err(reason) => {
-                populations.invalid_reason = Some(reason);
-                populations.populations.clear();
-            }
-        }
-    }
-
-    pub fn hydrate_observed_shape(
-        &mut self,
-        samples: &crate::runtime_samples::RuntimeSamplesStore,
-    ) -> Result<(), String> {
-        let now_ms = std::time::SystemTime::now()
-            .duration_since(std::time::UNIX_EPOCH)
-            .map_err(|error| format!("cannot timestamp ERP observation: {error}"))?
-            .as_millis()
-            .try_into()
-            .map_err(|_| "ERP observation timestamp overflows milliseconds")?;
-        self.hydrate_observed_shape_at(samples, now_ms)
-    }
-
-    pub fn hydrate_observed_shape_at(
-        &mut self,
-        samples: &crate::runtime_samples::RuntimeSamplesStore,
-        now_ms: u64,
-    ) -> Result<(), String> {
-        let Some(source) = &self.observed_shape_source else {
-            return Ok(());
-        };
-        // A reused planning request must resolve new evidence on every compile.
-        // Never keep an old inline or previously hydrated fit after drift.
-        self.observed_shape = None;
-        self.observed_populations = None;
-        let key = crate::runtime_samples::SampleKey {
-            source: source.source.clone(),
-            sketch: source.sketch.clone(),
-            impl_name: source.implementation.clone(),
-        };
-        let record = samples.latest(&key);
-        if let Some(scope) = &source.population_scope {
-            let resolved = (|| -> Result<_, String> {
-                let record = record
-                    .as_ref()
-                    .ok_or("no live ERP population observation")?;
-                let value = record
-                    .payload
-                    .get("erp_population_observations")
-                    .ok_or("latest runtime sample has no erp_population_observations")?;
-                let observed: asap_types::erp_observation::ErpPopulationObservations<
-                    asap_types::erp_observation::EmpiricalFrequencyObservation,
-                > = serde_json::from_value(value.clone())
-                    .map_err(|error| format!("invalid ERP population observations: {error}"))?;
-                observed.validate_identity_and_freshness(
-                    &scope.catalog_generation,
-                    scope.stored_output_id,
-                    now_ms,
-                    scope.freshness,
-                )?;
-                if observed.input_semantics != scope.input_semantics {
-                    return Err("ERP observation input semantics do not match the summary".into());
-                }
-                observed
-                    .try_map_shapes(|empirical| ErpObservedShape::from_empirical(&empirical))
-                    .ok_or_else(|| "invalid bounded empirical frequency observations".to_owned())
-            })();
-            // An explicit invalid envelope prevents selection from borrowing an
-            // older fit or falling back to the artifact's distribution identity.
-            // The normal ERP -> theoretical -> exact policy handles this miss.
-            self.observed_populations = Some(resolved.unwrap_or_else(|reason| {
-                asap_types::erp_observation::ErpPopulationObservations {
-                    schema_version: 1,
-                    catalog_generation: scope.catalog_generation.clone(),
-                    stored_output_id: scope.stored_output_id,
-                    observed_at_unix_ms: now_ms,
-                    window_start_ms: 0,
-                    window_end_ms: 0,
-                    input_semantics: scope.input_semantics,
-                    invalid_reason: Some(reason),
-                    populations: Vec::new(),
-                }
-            }));
-            return Ok(());
-        }
-        let record = record.ok_or_else(|| {
-            format!(
-                "no runtime shape sample for {}/{}/{}",
-                source.source, source.sketch, source.implementation
-            )
-        })?;
-        let value = record.payload.get("erp_observed_shape").ok_or_else(|| {
-            format!(
-                "latest runtime sample for {}/{}/{} has no erp_observed_shape",
-                source.source, source.sketch, source.implementation
-            )
-        })?;
-        let observed: ErpObservedShape = serde_json::from_value(value.clone())
-            .map_err(|error| format!("invalid erp_observed_shape: {error}"))?;
-        self.observed_shape = Some(observed.observation);
-        Ok(())
-    }
-}
-
-#[derive(Debug, Clone, Copy, Serialize, Deserialize, PartialEq)]
-#[serde(deny_unknown_fields)]
-pub struct ErpShapeMatchPolicy {
-    pub minimum_benchmark_events: u64,
-    pub max_log2_cardinality_distance: f64,
-    pub max_parameter_distance: f64,
-    pub max_goodness_of_fit: f64,
-    pub minimum_confidence: f64,
-    pub minimum_confidence_margin: f64,
-}
-
-#[derive(Debug, Clone, Default, Serialize, Deserialize, PartialEq)]
-#[serde(deny_unknown_fields)]
-pub struct ErpRuntimeCapabilities {
-    /// Empty means the normal backend catalog is authoritative. A non-empty
-    /// list restricts ERP/theoretical materialization to these algorithms.
-    #[serde(default)]
-    pub allowed_algorithms: Vec<SketchAlgorithm>,
-    pub max_memory_bytes: Option<f64>,
-}
-
-#[derive(Debug, Clone, PartialEq)]
-pub enum ErpParameterDecision {
-    Empirical {
-        params: SketchParams,
-        record_id: String,
-        observed_error: f64,
-        estimated_cost: f64,
-    },
-    TheoreticalFallback {
-        params: SketchParams,
-        reason: String,
-    },
-    ExactFallback {
-        reason: String,
-    },
-}
-
-impl ErpParameterDecision {
-    pub fn params(&self) -> Option<&SketchParams> {
-        match self {
-            Self::Empirical { params, .. } | Self::TheoreticalFallback { params, .. } => {
-                Some(params)
-            }
-            Self::ExactFallback { .. } => None,
-        }
-    }
-}
-
-impl ErpPlanningInput {
-    pub fn select(
-        &self,
-        algorithm: SketchAlgorithm,
-        max_error: f64,
-        theoretical: SketchParams,
-    ) -> ErpParameterDecision {
-        self.select_metric(algorithm, &self.error_metric, max_error, theoretical, None)
-    }
-
-    pub(crate) fn select_readout(
-        &self,
-        algorithm: SketchAlgorithm,
-        readout: ReadoutEvidence,
-        max_error: f64,
-        theoretical: SketchParams,
-    ) -> ErpParameterDecision {
-        self.select_metric(
-            algorithm,
-            readout.metric_key(),
-            max_error,
-            theoretical,
-            None,
-        )
-    }
-
-    /// Validate an existing state's readout independently of which new state
-    /// would be cheapest to allocate for this one consumer.
-    fn evidence_for_readout(
-        &self,
-        algorithm: SketchAlgorithm,
-        readout: ReadoutEvidence,
-        max_error: f64,
-        actual: &SketchParams,
-    ) -> ErpParameterDecision {
-        self.select_metric(
-            algorithm,
-            readout.metric_key(),
-            max_error,
-            actual.clone(),
-            Some(actual),
-        )
-    }
-
-    fn select_metric(
-        &self,
-        algorithm: SketchAlgorithm,
-        error_metric: &str,
-        max_error: f64,
-        theoretical: SketchParams,
-        required_params: Option<&SketchParams>,
-    ) -> ErpParameterDecision {
-        if let Some(populations) = &self.observed_populations {
-            // Every installed partition must support the same configuration.
-            // Never aggregate their frequency maps into a fictitious population.
-            let mut best: Option<ErpParameterDecision> = None;
-            if populations.invalid_reason.is_none() && !populations.populations.is_empty() {
-                for row in &self.artifact.records {
-                    if !sketch_name_matches(&row.sketch, &algorithm) {
-                        continue;
-                    }
-                    let Some(params) = parse_params(&algorithm, &row.parameters) else {
-                        continue;
-                    };
-                    if required_params.is_some_and(|required| required != &params) {
-                        continue;
-                    }
-                    let mut policy = self.clone();
-                    policy.observed_populations = None;
-                    policy.mode = ErpAccuracyMode::Empirical;
-                    let total_events: f64 = populations
-                        .populations
-                        .iter()
-                        .map(|p| p.shape.observation.observed_events as f64)
-                        .sum();
-                    let mut errors: f64 = 0.0;
-                    let mut cost = 0.0;
-                    let mut evidence = Vec::new();
-                    let valid = populations.populations.iter().all(|population| {
-                        policy.observed_shape = Some(population.shape.observation.clone());
-                        // expected_updates is the definition-wide demand; distribute
-                        // it across partitions instead of charging it once per series.
-                        policy.expected_updates = self.expected_updates
-                            * population.shape.observation.observed_events as f64
-                            / total_events;
-
-                        match policy.select_metric(
-                            algorithm.clone(),
-                            error_metric,
-                            max_error,
-                            theoretical.clone(),
-                            Some(&params),
-                        ) {
-                            ErpParameterDecision::Empirical {
-                                record_id,
-                                observed_error,
-                                estimated_cost,
-                                ..
-                            } => {
-                                errors = errors.max(observed_error);
-                                cost += estimated_cost;
-                                evidence.push(record_id);
-                                true
-                            }
-                            _ => false,
-                        }
-                    });
-                    if valid && cost.is_finite() && best.as_ref().is_none_or(|previous| {
-                        matches!(previous, ErpParameterDecision::Empirical { estimated_cost, .. } if cost < *estimated_cost)
-                    }) {
-                        best = Some(ErpParameterDecision::Empirical {
-                            params, record_id: serde_json::to_string(&evidence).expect("string IDs serialize"),
-                            observed_error: errors, estimated_cost: cost,
-                        });
-                    }
-                }
-            }
-            return best.unwrap_or_else(|| {
-                let reason =
-                    "ERP has no configuration valid for every observed population".to_owned();
-                if self.mode == ErpAccuracyMode::Hybrid
-                    && self.runtime.supports(&algorithm, &theoretical, None)
-                {
-                    ErpParameterDecision::TheoreticalFallback {
-                        params: theoretical,
-                        reason,
-                    }
-                } else {
-                    ErpParameterDecision::ExactFallback { reason }
-                }
-            });
-        }
-        // Runtime admissibility belongs before ranking: an unusable cheap
-        // profile must not hide a more expensive executable alternative.
-        let mut artifact = self.artifact.clone();
-        artifact.records.retain(|row| {
-            sketch_name_matches(&row.sketch, &algorithm)
-                && parse_params(&algorithm, &row.parameters).is_some_and(|params| {
-                    required_params.is_none_or(|required| required == &params)
-                        && self.runtime.supports(
-                            &algorithm,
-                            &params,
-                            Some(row.resources.memory_bytes),
-                        )
-                })
-        });
-        let allowed_sketches = artifact
-            .records
-            .iter()
-            .map(|row| row.sketch.clone())
-            .collect();
-        let request = ErpSelectionRequest {
-            distribution: self.distribution.clone(),
-            implementation: self.implementation.clone(),
-            allowed_sketches,
-            error_metric: error_metric.to_owned(),
-            max_error,
-            min_trials: self.min_trials,
-            expected_updates: self.expected_updates,
-            expected_queries: self.expected_queries,
-            expected_merges: self.expected_merges,
-            retention_seconds: self.retention_seconds,
-            cpu_weight: self.cpu_weight,
-            byte_second_weight: self.byte_second_weight,
-            mode: match self.mode {
-                ErpAccuracyMode::Empirical => AccuracyMode::Empirical,
-                ErpAccuracyMode::Hybrid => AccuracyMode::Hybrid,
-            },
-        };
-        let empirical = if request.allowed_sketches.is_empty() {
-            Err(asap_aware_mapping::erp::ErpError::NoApplicableConfiguration)
-        } else {
-            let selected = match (&self.observed_shape, self.shape_match) {
-                (Some(observed), Some(policy)) => {
-                    artifact.select_multi_fit(&ErpMultiFitSelectionRequest {
-                        selection: request.clone(),
-                        observed: observed.clone(),
-                        minimum_benchmark_events: policy.minimum_benchmark_events,
-                        max_log2_cardinality_distance: policy.max_log2_cardinality_distance,
-                        max_parameter_distance: policy.max_parameter_distance,
-                        max_goodness_of_fit: policy.max_goodness_of_fit,
-                        minimum_confidence: policy.minimum_confidence,
-                        minimum_confidence_margin: policy.minimum_confidence_margin,
-                    })
-                }
-                (None, None) => artifact.select(&request),
-                _ => Err(asap_aware_mapping::erp::ErpError::Invalid(
-                    "observed_shape and shape_match must be supplied together",
-                )),
-            };
-            selected.and_then(|selected| {
-                parse_params(&algorithm, &selected.record.parameters)
-                    .filter(|params| {
-                        self.runtime.supports(
-                            &algorithm,
-                            params,
-                            Some(selected.record.resources.memory_bytes),
-                        )
-                    })
-                    .map(|params| (selected, params))
-                    .ok_or(asap_aware_mapping::erp::ErpError::NoApplicableConfiguration)
-            })
-        };
-        match empirical {
-            Ok((selected, params)) => ErpParameterDecision::Empirical {
-                params,
-                record_id: selected.record.id.clone(),
-                observed_error: selected.observed_error,
-                estimated_cost: selected.estimated_cost,
-            },
-            Err(error) if self.mode == ErpAccuracyMode::Hybrid => {
-                if self.runtime.supports(&algorithm, &theoretical, None) {
-                    ErpParameterDecision::TheoreticalFallback {
-                        params: theoretical,
-                        reason: error.to_string(),
-                    }
-                } else {
-                    ErpParameterDecision::ExactFallback {
-                        reason: format!(
-                            "ERP unavailable ({error}); theoretical {algorithm:?} is unsupported"
-                        ),
-                    }
-                }
-            }
-            Err(error) => ErpParameterDecision::ExactFallback {
-                reason: format!("empirical ERP selection failed: {error}"),
-            },
-        }
-    }
-}
-
-impl ErpRuntimeCapabilities {
-    fn supports(
-        &self,
-        algorithm: &SketchAlgorithm,
-        params: &SketchParams,
-        measured_memory: Option<f64>,
-    ) -> bool {
-        if !self.allowed_algorithms.is_empty() && !self.allowed_algorithms.contains(algorithm) {
-            return false;
-        }
-        if let Some(limit) = self.max_memory_bytes {
-            let Some(measured) = measured_memory else {
-                // A theoretical configuration has no measured byte size in
-                // ERP v1. Do not claim it satisfies a deployment byte cap.
-                return false;
-            };
-            if !limit.is_finite() || limit < 0.0 || measured > limit {
-                return false;
-            }
-        }
-        valid_runtime_params(algorithm, params)
-    }
-}
-
-fn normalized(value: &str) -> String {
-    value
-        .chars()
-        .filter(|ch| ch.is_ascii_alphanumeric())
-        .flat_map(char::to_lowercase)
-        .collect()
-}
-
-fn sketch_name_matches(name: &str, algorithm: &SketchAlgorithm) -> bool {
-    let name = normalized(name);
-    match algorithm {
-        SketchAlgorithm::Cms | SketchAlgorithm::CmsWithHeap => {
-            name.starts_with("cms") || name.starts_with("countmin")
-        }
-        SketchAlgorithm::CountSketch | SketchAlgorithm::CountSketchWithHeap => {
-            name.starts_with("countsketch")
-        }
-        SketchAlgorithm::Hll => name.starts_with("hll") || name.starts_with("hyperloglog"),
-        SketchAlgorithm::Kll => name.starts_with("kll"),
-        SketchAlgorithm::DDSketch => name.starts_with("ddsketch"),
-        SketchAlgorithm::UnivMon => name == "univmon",
-        _ => false,
-    }
-}
-
-fn number(parameters: &Value, names: &[&str]) -> Option<f64> {
-    names
-        .iter()
-        .find_map(|name| parameters.get(name).and_then(Value::as_f64))
-        .or_else(|| {
-            parameters.get("params").and_then(|params| {
-                names
-                    .iter()
-                    .find_map(|name| params.get(name).and_then(Value::as_f64))
-            })
-        })
-}
-
-fn u32_param(parameters: &Value, names: &[&str]) -> Option<u32> {
-    let value = number(parameters, names)?;
-    (value.is_finite() && value.fract() == 0.0 && value >= 0.0 && value <= u32::MAX as f64)
-        .then_some(value as u32)
-}
-
-fn parse_params(algorithm: &SketchAlgorithm, parameters: &Value) -> Option<SketchParams> {
-    let width = || u32_param(parameters, &["width", "cols"]);
-    let depth = || u32_param(parameters, &["depth", "rows"]);
-    Some(match algorithm {
-        SketchAlgorithm::Cms => SketchParams::Cms {
-            width: width()?,
-            depth: depth()?,
-        },
-        SketchAlgorithm::CmsWithHeap => SketchParams::CmsWithHeap {
-            width: width()?,
-            depth: depth()?,
-            heap_size: u32_param(parameters, &["heap_size", "k"])?,
-        },
-        SketchAlgorithm::CountSketch => SketchParams::CountSketch {
-            width: width()?,
-            depth: depth()?,
-        },
-        SketchAlgorithm::CountSketchWithHeap => SketchParams::CountSketchWithHeap {
-            width: width()?,
-            depth: depth()?,
-            heap_size: u32_param(parameters, &["heap_size", "k"])?,
-        },
-        SketchAlgorithm::Hll => {
-            let precision = u32_param(parameters, &["precision", "lg_k", "p"])?;
-            SketchParams::Hll {
-                precision: u8::try_from(precision).ok()?,
-            }
-        }
-        SketchAlgorithm::Kll => SketchParams::Kll {
-            k: u32_param(parameters, &["k"])?,
-        },
-        SketchAlgorithm::UnivMon => SketchParams::UnivMon {
-            heap_size: u32_param(parameters, &["heap_size"])?,
-            sketch_rows: u32_param(parameters, &["sketch_rows"])?,
-            sketch_cols: u32_param(parameters, &["sketch_cols"])?,
-            layers: u8::try_from(u32_param(parameters, &["layers"])?).ok()?,
-        },
-        SketchAlgorithm::DDSketch => SketchParams::DDSketch {
-            alpha: number(parameters, &["alpha", "relative_accuracy"])?,
-        },
-        _ => return None,
-    })
-}
-
-fn valid_runtime_params(algorithm: &SketchAlgorithm, params: &SketchParams) -> bool {
-    match (algorithm, params) {
-        (SketchAlgorithm::Cms, SketchParams::Cms { width, depth })
-        | (SketchAlgorithm::CountSketch, SketchParams::CountSketch { width, depth }) => {
-            *width >= 2 && width.is_power_of_two() && *depth >= 1
-        }
-        (
-            SketchAlgorithm::CmsWithHeap,
-            SketchParams::CmsWithHeap {
-                width,
-                depth,
-                heap_size,
-            },
-        )
-        | (
-            SketchAlgorithm::CountSketchWithHeap,
-            SketchParams::CountSketchWithHeap {
-                width,
-                depth,
-                heap_size,
-            },
-        ) => *width >= 2 && width.is_power_of_two() && *depth >= 1 && *heap_size >= 1,
-        (
-            SketchAlgorithm::UnivMon,
-            SketchParams::UnivMon {
-                heap_size,
-                sketch_rows,
-                sketch_cols,
-                layers,
-            },
-        ) => {
-            *heap_size > 0
-                && *sketch_cols > 0
-                && (1..=20).contains(sketch_rows)
-                && (1..=64).contains(layers)
-                && sketch_rows
-                    .checked_mul(*sketch_cols)
-                    .and_then(|n| n.checked_mul(u32::from(*layers)))
-                    .is_some()
-        }
-        (SketchAlgorithm::Hll, SketchParams::Hll { precision }) => (4..=18).contains(precision),
-        (SketchAlgorithm::Kll, SketchParams::Kll { k }) => (8..=65_535).contains(k),
-        (SketchAlgorithm::DDSketch, SketchParams::DDSketch { alpha }) => {
-            alpha.is_finite() && (0.0..1.0).contains(alpha)
-        }
-        _ => false,
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use std::collections::BTreeMap;
-
-    use asap_aware_mapping::erp::{ErpRecord, ErpResourceProfile, ERP_SCHEMA_VERSION};
-
-    use super::*;
-
-    /// Match the collector and portable-state decoder's supported k range.
-    #[test]
-    fn kll_runtime_limits_reject_unusable_profiles() {
-        for k in [0, 2, 7, 65_536] {
-            assert!(!valid_runtime_params(
-                &SketchAlgorithm::Kll,
-                &SketchParams::Kll { k }
-            ));
-        }
-        for k in [8, 32, 65_535] {
-            assert!(valid_runtime_params(
-                &SketchAlgorithm::Kll,
-                &SketchParams::Kll { k }
-            ));
-        }
-    }
-
-    fn input(mode: ErpAccuracyMode) -> ErpPlanningInput {
-        ErpPlanningInput {
-            artifact: ErpArtifact {
-                schema_version: ERP_SCHEMA_VERSION,
-                producer_version: "bench-rev".into(),
-                records: vec![ErpRecord {
-                    id: "cms-512".into(),
-                    sketch: "cms-fastpath-vector2d".into(),
-                    implementation: "oxide".into(),
-                    parameters: serde_json::json!({"rows": 3, "cols": 512}),
-                    distribution: serde_json::json!({"synthetic":{"kind":"zipf","s":1.1}}),
-                    trials: 20,
-                    error_metrics: BTreeMap::from([("relative_error".into(), 0.009)]),
-                    resources: ErpResourceProfile {
-                        memory_bytes: 12_288.0,
-                        update_cpu_seconds: 1e-7,
-                        merge_cpu_seconds: 1e-5,
-                        query_cpu_seconds: 1e-6,
-                    },
-                }],
-            },
-            distribution: serde_json::json!({"synthetic":{"kind":"zipf","s":1.1}}),
-            implementation: Some("oxide".into()),
-            error_metric: "relative_error".into(),
-            min_trials: 10,
-            expected_updates: 1_000.0,
-            expected_queries: 100.0,
-            expected_merges: 0.0,
-            retention_seconds: 60.0,
-            cpu_weight: 1.0,
-            byte_second_weight: 1e-9,
-            mode,
-            observed_shape: None,
-            observed_populations: None,
-            resolved_data_descriptor: None,
-            observed_shape_source: None,
-            shape_match: None,
-            runtime: ErpRuntimeCapabilities::default(),
-        }
-    }
-
-    /// Structural evidence fixture, not measured calibration data.
-    #[test]
-    fn existing_univmon_readout_uses_its_own_evidence_despite_cheaper_sibling() {
-        use asap_aware_mapping::AccuracyModel;
-        use planner_types::post_asap::*;
-        let mut policy = input(ErpAccuracyMode::Empirical);
-        let small = &mut policy.artifact.records[0];
-        small.sketch = "univmon".into();
-        small.parameters =
-            serde_json::json!({"heap_size":32,"sketch_rows":5,"sketch_cols":128,"layers":4});
-        small.error_metrics =
-            BTreeMap::from([("max_frequency_entropy_absolute_bits_error".into(), 0.1)]);
-        let mut large = small.clone();
-        large.id = "larger-shared-state".into();
-        large.parameters["heap_size"] = 128.into();
-        large.resources.memory_bytes *= 2.0;
-        large
-            .error_metrics
-            .insert("max_frequency_entropy_absolute_bits_error".into(), 0.02);
-        policy.artifact.records.push(large);
-        let small_params = SketchParams::UnivMon {
-            heap_size: 32,
-            sketch_rows: 5,
-            sketch_cols: 128,
-            layers: 4,
-        };
-        let actual = SketchParams::UnivMon {
-            heap_size: 128,
-            sketch_rows: 5,
-            sketch_cols: 128,
-            layers: 4,
-        };
-        assert_eq!(
-            policy
-                .select_readout(
-                    SketchAlgorithm::UnivMon,
-                    ReadoutEvidence::EntropyAbsoluteBits,
-                    0.2,
-                    actual.clone()
-                )
-                .params(),
-            Some(&small_params)
-        );
-        let family = SummaryFamilyType::Sketch(
-            SketchKind::new(SketchAlgorithm::UnivMon, actual),
-            GroupingStrategy::PerSubpopulationInstance,
-        );
-        let model = ErpAccuracyModel {
-            policy: Some(&policy),
-            max_error: 0.2,
-        };
-        let guarantee = model
-            .local_guarantee(&family, &SketchQuery::FrequencyEntropy)
-            .unwrap();
-        assert_eq!(guarantee.bound, BoundExpr::Constant { value: 0.02 });
-        assert!(matches!(
-            guarantee.failure_probability,
-            ProbabilityExpr::Unknown { .. }
-        ));
-        policy.artifact.records[1].error_metrics.clear();
-        assert!(ErpAccuracyModel {
-            policy: Some(&policy),
-            max_error: 0.2
-        }
-        .local_guarantee(&family, &SketchQuery::FrequencyEntropy)
-        .is_none());
-    }
-
-    #[test]
-    fn hll_cardinality_uses_measured_relative_error_not_rse() {
-        use asap_aware_mapping::AccuracyModel;
-        use planner_types::post_asap::*;
-        let mut policy = input(ErpAccuracyMode::Hybrid);
-        let row = &mut policy.artifact.records[0];
-        row.sketch = "hll".into();
-        row.parameters = serde_json::json!({"precision":12});
-        row.error_metrics = BTreeMap::from([("max_cardinality_relative_error".into(), 0.04)]);
-        let family = SummaryFamilyType::Sketch(
-            SketchKind::new(SketchAlgorithm::Hll, SketchParams::Hll { precision: 12 }),
-            GroupingStrategy::PerSubpopulationInstance,
-        );
-        let model = ErpAccuracyModel {
-            policy: Some(&policy),
-            max_error: 0.05,
-        };
-        let guarantee = model
-            .local_guarantee(&family, &SketchQuery::Cardinality)
-            .unwrap();
-        assert_eq!(guarantee.metric, ErrorMetric::Cardinality);
-        assert_eq!(guarantee.bound, BoundExpr::Constant { value: 0.04 });
-        assert!(matches!(
-            guarantee.failure_probability,
-            ProbabilityExpr::Unknown { .. }
-        ));
-        assert_eq!(
-            ReadoutEvidence::for_query(&SketchAlgorithm::Hll, &SketchQuery::FrequencyEntropy),
-            None
-        );
-    }
-
-    /// Contract fixture only; the process test measures real sketch errors.
-    #[test]
-    fn readout_evidence_keeps_units_and_missing_metrics_fail_closed() {
-        use asap_aware_mapping::AccuracyModel;
-        use planner_types::post_asap::*;
-        let mut policy = input(ErpAccuracyMode::Hybrid);
-        let row = &mut policy.artifact.records[0];
-        row.sketch = "univmon".into();
-        row.parameters =
-            serde_json::json!({"heap_size": 32, "sketch_rows": 5, "sketch_cols": 128, "layers": 4});
-        row.error_metrics = BTreeMap::from([
-            ("max_cardinality_relative_error".into(), 0.03),
-            ("max_frequency_l2_relative_error".into(), 0.02),
-            ("max_frequency_entropy_absolute_bits_error".into(), 0.1),
-        ]);
-        let family = SummaryFamilyType::Sketch(
-            SketchKind::new(
-                SketchAlgorithm::UnivMon,
-                SketchParams::UnivMon {
-                    heap_size: 32,
-                    sketch_rows: 5,
-                    sketch_cols: 128,
-                    layers: 4,
-                },
-            ),
-            GroupingStrategy::PerSubpopulationInstance,
-        );
-        let model = ErpAccuracyModel {
-            policy: Some(&policy),
-            max_error: 0.2,
-        };
-        for (query, metric, bound) in [
-            (SketchQuery::Cardinality, ErrorMetric::Cardinality, 0.03),
-            (SketchQuery::FrequencyL2, ErrorMetric::RelativeValue, 0.02),
-            (
-                SketchQuery::FrequencyEntropy,
-                ErrorMetric::AbsoluteValue,
-                0.1,
-            ),
-        ] {
-            let guarantee = model.local_guarantee(&family, &query).unwrap();
-            assert_eq!(guarantee.metric, metric);
-            assert_eq!(guarantee.bound, BoundExpr::Constant { value: bound });
-            assert!(matches!(
-                guarantee.failure_probability,
-                ProbabilityExpr::Unknown { .. }
-            ));
-            assert!(!model.satisfies(
-                &guarantee,
-                &crate::types::AccuracyTarget::EpsilonDelta {
-                    epsilon: 0.2,
-                    delta: 0.01
-                }
-            ));
-        }
-        policy.artifact.records[0]
-            .error_metrics
-            .remove("max_frequency_entropy_absolute_bits_error");
-        let model = ErpAccuracyModel {
-            policy: Some(&policy),
-            max_error: 0.2,
-        };
-        assert!(model
-            .local_guarantee(&family, &SketchQuery::FrequencyEntropy)
-            .is_none());
-        assert!(model
-            .local_guarantee(&family, &SketchQuery::FrequencyL2)
-            .is_some());
-    }
-
-    /// A matching benchmark context may reduce CMS state below theory.
-    #[test]
-    fn matching_profile_selects_empirical_parameters() {
-        let decision = input(ErpAccuracyMode::Hybrid).select(
-            SketchAlgorithm::Cms,
-            0.01,
-            SketchParams::Cms {
-                width: 4096,
-                depth: 5,
-            },
-        );
-        assert!(matches!(
-            decision,
-            ErpParameterDecision::Empirical {
-                params: SketchParams::Cms {
-                    width: 512,
-                    depth: 3
-                },
-                ..
-            }
-        ));
-    }
-
-    #[test]
-    fn unusable_cheapest_profile_does_not_hide_executable_alternative() {
-        let mut policy = input(ErpAccuracyMode::Hybrid);
-        let mut unusable = policy.artifact.records[0].clone();
-        unusable.id = "invalid-cheapest".into();
-        unusable.parameters = serde_json::json!({"rows": 0, "cols": 0});
-        unusable.resources.memory_bytes = 1.0;
-        policy.artifact.records.insert(0, unusable);
-        assert!(matches!(policy.select(SketchAlgorithm::Cms, 0.01,
-            SketchParams::Cms { width: 4096, depth: 5 }),
-            ErpParameterDecision::Empirical { record_id, .. } if record_id == "cms-512"));
-    }
-
-    /// Distribution drift in Hybrid mode preserves the analytical fallback.
-    #[test]
-    fn hybrid_drift_falls_back_to_theoretical_parameters() {
-        let mut policy = input(ErpAccuracyMode::Hybrid);
-        policy.distribution = serde_json::json!({"synthetic":{"kind":"uniform"}});
-        let theory = SketchParams::Cms {
-            width: 4096,
-            depth: 5,
-        };
-        assert!(matches!(
-            policy.select(SketchAlgorithm::Cms, 0.01, theory.clone()),
-            ErpParameterDecision::TheoreticalFallback { params, .. } if params == theory
-        ));
-    }
-
-    /// When neither empirical nor theoretical state is deployable, Hybrid
-    /// explicitly requests exact execution.
-    #[test]
-    fn hybrid_capability_miss_falls_back_to_exact() {
-        let mut policy = input(ErpAccuracyMode::Hybrid);
-        policy.distribution = serde_json::json!({"synthetic":{"kind":"uniform"}});
-        policy.runtime.allowed_algorithms = vec![SketchAlgorithm::Hll];
-        assert!(matches!(
-            policy.select(
-                SketchAlgorithm::Cms,
-                0.01,
-                SketchParams::Cms {
-                    width: 4096,
-                    depth: 5,
-                }
-            ),
-            ErpParameterDecision::ExactFallback { .. }
-        ));
-    }
-
-    #[test]
-    fn observer_detects_skew_cardinality_and_burst() {
-        let mut observer = ErpShapeObserver::new(10).unwrap();
-        for _ in 0..100 {
-            observer.observe("hot", 5).unwrap();
-        }
-        for key in ["a", "b", "c"] {
-            observer.observe(key, 0).unwrap();
-        }
-        for interval in 1..5 {
-            for _ in 0..3 {
-                observer.observe("a", interval).unwrap();
-            }
-        }
-        let observed = observer.snapshot().unwrap();
-        assert_eq!(observed.observation.cardinality, 4);
-        assert_eq!(observed.observation.fits.len(), 2);
-        assert!(
-            observed
-                .observation
-                .fits
-                .iter()
-                .find(|fit| fit.family == "zipf")
-                .unwrap()
-                .parameters["exponent"]
-                > 1.0
-        );
-        assert!(observed.burst_ratio > 30.0);
-    }
-
-    #[test]
-    fn planning_input_hydrates_shape_from_runtime_feedback() {
-        let samples = crate::runtime_samples::RuntimeSamplesStore::new(4);
-        samples.append_for_test(crate::runtime_samples::RuntimeRecord {
-            source: "edge-a".into(),
-            sketch: "cms".into(),
-            impl_name: "oxide".into(),
-            schema_version: 1,
-            payload: serde_json::json!({
-                "erp_observed_shape": {
-                    "observation": {
-                        "cardinality": 1000,
-                        "observed_events": 500000,
-                        "fits": [{"family": "zipf", "parameters": {"exponent": 1.1}, "goodness_of_fit": 0.01, "confidence": 0.99}]
-                    },
-                    "burst_ratio": 2.5
-                }
-            }),
-        });
-        let mut policy = input(ErpAccuracyMode::Hybrid);
-        policy.observed_shape_source = Some(ErpObservedShapeSource {
-            source: "edge-a".into(),
-            sketch: "cms".into(),
-            implementation: "oxide".into(),
-            population_scope: None,
-        });
-        policy.hydrate_observed_shape(&samples).unwrap();
-        assert_eq!(policy.observed_shape.unwrap().cardinality, 1000);
-    }
-
-    fn online_population_fixture() -> (
-        ErpPlanningInput,
-        asap_types::erp_observation::ErpPopulationObservations<ErpObservedShape>,
-    ) {
-        use asap_types::erp_observation::*;
-        let generation = asap_types::sds::CatalogGeneration {
-            schema_version: 1,
-            plan_id: 7,
-            plan_version: 3,
-            snapshot_sha256: "test-catalog".into(),
-        };
-        let definition = asap_types::PolicyFingerprint(7).into();
-        let mut observer = ErpShapeObserver::new(4).unwrap();
-        for key in ["a", "a", "b", "b"] {
-            observer.observe(key, 0).unwrap();
-        }
-        let observed = ErpPopulationObservations {
-            schema_version: 1,
-            catalog_generation: generation.clone(),
-            stored_output_id: definition,
-            observed_at_unix_ms: 1_000,
-            window_start_ms: 0,
-            window_end_ms: 1_000,
-            input_semantics: ErpObservationInputSemantics::UnitSampleFrequency,
-            invalid_reason: None,
-            populations: vec![ErpPopulationObservation {
-                population_id: asap_types::sds::SummaryInstanceId::new("partition-a").unwrap(),
-                shape: observer.snapshot().unwrap(),
-            }],
-        };
-        let mut policy = input(ErpAccuracyMode::Hybrid);
-        policy.observed_shape_source = Some(ErpObservedShapeSource {
-            source: "backend-a".into(),
-            sketch: "univmon".into(),
-            implementation: "asap_sketchlib".into(),
-            population_scope: Some(ErpPopulationObservationScope {
-                catalog_generation: generation,
-                stored_output_id: definition,
-                input_semantics: ErpObservationInputSemantics::UnitSampleFrequency,
-                freshness: ErpObservationFreshness {
-                    max_age_ms: 100,
-                    max_future_skew_ms: 5,
-                },
-            }),
-        });
-        (policy, observed)
-    }
-
-    fn publish_population_fixture(
-        samples: &crate::runtime_samples::RuntimeSamplesStore,
-        mut payload: serde_json::Value,
-    ) {
-        if let Some(populations) = payload
-            .pointer_mut("/erp_population_observations/populations")
-            .and_then(Value::as_array_mut)
-        {
-            for population in populations {
-                if let Some(cardinality) = population
-                    .pointer("/shape/observation/cardinality")
-                    .and_then(Value::as_u64)
-                {
-                    population["shape"] = serde_json::json!({"sorted_counts":vec![2;cardinality as usize],"interval_counts":[cardinality*2]});
-                }
-            }
-        }
-        samples.append_for_test(crate::runtime_samples::RuntimeRecord {
-            source: "backend-a".into(),
-            sketch: "univmon".into(),
-            impl_name: "asap_sketchlib".into(),
-            schema_version: 1,
-            payload,
-        });
-    }
-
-    /// New live evidence replaces hydrated fits; expiry invalidates them even
-    /// when a caller reuses the same planning request.
-    #[test]
-    fn online_hydration_refreshes_and_expires_population_evidence() {
-        let (mut policy, mut observed) = online_population_fixture();
-        let samples = crate::runtime_samples::RuntimeSamplesStore::new(4);
-        publish_population_fixture(
-            &samples,
-            serde_json::json!({"erp_population_observations": observed}),
-        );
-        policy.hydrate_observed_shape_at(&samples, 1_000).unwrap();
-        assert_eq!(
-            policy.observed_populations.as_ref().unwrap().populations[0]
-                .shape
-                .observation
-                .cardinality,
-            2
-        );
-        observed.populations[0].shape.observation.cardinality = 3;
-        observed.observed_at_unix_ms = 1_010;
-        publish_population_fixture(
-            &samples,
-            serde_json::json!({"erp_population_observations": observed}),
-        );
-        policy.hydrate_observed_shape_at(&samples, 1_010).unwrap();
-        assert_eq!(
-            policy.observed_populations.as_ref().unwrap().populations[0]
-                .shape
-                .observation
-                .cardinality,
-            3
-        );
-        policy.hydrate_observed_shape_at(&samples, 1_111).unwrap();
-        let invalid = policy.observed_populations.as_ref().unwrap();
-        assert!(invalid.populations.is_empty());
-        assert!(invalid.invalid_reason.as_deref().unwrap().contains("stale"));
-        assert!(policy.observed_shape.is_none());
-    }
-
-    /// Only the activated catalog may supply a candidate's data contract.
-    #[test]
-    fn online_population_descriptor_requires_authoritative_catalog() {
-        let mut fixture: Value = serde_json::from_str(include_str!(
-            "../../../docs/examples/asapquery-compatibility-demo-snapshot.json"
-        ))
-        .unwrap();
-        let mut query = fixture["query_workload"]["repeating_queries"][3].clone();
-        query["query"] = "quantile_over_time(0.9,asap_demo_latency_ms[5s])".into();
-        query["requirements"]["accuracy"] = serde_json::json!({"explicit":{"Epsilon":0.05}});
-        fixture["query_workload"]["repeating_queries"] = serde_json::json!([query]);
-        let snapshot: crate::physical::compiler::BackendLocalPlanningInput =
-            serde_json::from_value(fixture).unwrap();
-        let plan = crate::physical::compiler::tests::quoted_snapshot(
-            snapshot,
-            crate::physical::compiler::QueryFrontend::PromQl,
-        )
-        .compile_promql()
-        .unwrap();
-        // Catalog resolution is independent of Planner selection. Build an
-        // HLL catalog fixture from a compiled source identity; production
-        // selection cannot deploy HLL without a known confidence guarantee.
-        let mut materialization = plan.precompute_plan.materializations[0].clone();
-        materialization.aggregation_type = asap_types::AggregationType::HLL;
-        materialization.parameters =
-            serde_json::from_value(serde_json::json!({"precision": 14})).unwrap();
-        let catalog = asap_types::summary_catalog::SummaryCatalog::from_materializations(
-            plan.summary_catalog.plan_id,
-            plan.summary_catalog.plan_version,
-            &[materialization],
-        )
-        .unwrap();
-        let (mut policy, mut observed) = online_population_fixture();
-        observed.catalog_generation = catalog.reference().unwrap();
-        observed.stored_output_id = *catalog.outputs.keys().next().unwrap();
-        observed.input_semantics =
-            asap_types::erp_observation::ErpObservationInputSemantics::ScalarSampleValue;
-        policy.observed_populations = Some(observed.clone());
-        policy.resolve_population_data_descriptor(Some(&catalog));
-        let expected = &catalog.outputs[&observed.stored_output_id].data_descriptor_id;
-        assert_eq!(
-            &policy.resolved_data_descriptor.as_ref().unwrap().id,
-            expected
-        );
-        policy.resolve_population_data_descriptor(None);
-        assert!(policy.resolved_data_descriptor.is_none());
-        assert!(policy
-            .observed_populations
-            .as_ref()
-            .unwrap()
-            .invalid_reason
-            .is_some());
-        assert!(policy
-            .observed_populations
-            .as_ref()
-            .unwrap()
-            .populations
-            .is_empty());
-    }
-
-    /// Missing, corrupt, foreign and overflow evidence must never recover a
-    /// previously accepted fit or the artifact's legacy distribution match.
-    #[test]
-    fn online_hydration_invalidates_unusable_latest_evidence() {
-        let (template, observed) = online_population_fixture();
-        let mut foreign = observed.clone();
-        foreign.catalog_generation.plan_version += 1;
-        let mut wrong_input = observed.clone();
-        wrong_input.input_semantics =
-            asap_types::erp_observation::ErpObservationInputSemantics::ScalarSampleValue;
-        let mut overflow = observed.clone();
-        overflow.invalid_reason = Some("population limit".into());
-        let mut future = observed.clone();
-        future.observed_at_unix_ms = 1_006;
-        for payload in [
-            None,
-            Some(serde_json::json!({})),
-            Some(serde_json::json!({"erp_population_observations": foreign})),
-            Some(serde_json::json!({"erp_population_observations": wrong_input})),
-            Some(serde_json::json!({"erp_population_observations": overflow})),
-            Some(serde_json::json!({"erp_population_observations": future})),
-        ] {
-            let mut policy = template.clone();
-            policy.observed_shape = Some(observed.populations[0].shape.observation.clone());
-            let samples = crate::runtime_samples::RuntimeSamplesStore::new(4);
-            if let Some(payload) = payload {
-                publish_population_fixture(&samples, payload);
-            }
-            policy.hydrate_observed_shape_at(&samples, 1_000).unwrap();
-            let invalid = policy.observed_populations.as_ref().unwrap();
-            assert!(invalid.invalid_reason.is_some());
-            assert!(invalid.populations.is_empty());
-            assert!(policy.observed_shape.is_none());
-            assert!(matches!(
-                policy.select(
-                    SketchAlgorithm::Hll,
-                    0.05,
-                    SketchParams::Hll { precision: 12 }
-                ),
-                ErpParameterDecision::TheoreticalFallback { .. }
-            ));
-        }
-    }
-
-    #[test]
-    fn observer_fails_loud_at_cardinality_cap() {
-        let mut observer = ErpShapeObserver::new(1).unwrap();
-        observer.observe("a", 0).unwrap();
-        assert_eq!(
-            observer.observe("b", 0),
-            Err("ERP observation key or interval budget exceeded")
-        );
-        assert!(observer.snapshot().is_none());
-        assert!(observer.observe("a", 0).is_err());
-    }
-
-    #[test]
-    fn sparse_intervals_and_overflow_cannot_publish_partial_observations() {
-        let mut observer = ErpShapeObserver::with_limits(2, 2).unwrap();
-        observer.observe("a", usize::MAX).unwrap();
-        observer.observe("a", 0).unwrap();
-        assert_eq!(observer.inner.snapshot().unwrap().interval_counts.len(), 2);
-        assert!(observer.observe("a", 1).is_err());
-        assert!(observer.snapshot().is_none());
-        assert!(ErpObservedShape::from_empirical(
-            &asap_types::erp_observation::EmpiricalFrequencyObservation {
-                sorted_counts: vec![u64::MAX, 1],
-                interval_counts: vec![u64::MAX, 1],
-            }
-        )
-        .is_none());
-    }
-
-    #[test]
-    fn uniform_observation_matches_without_degenerate_zipf_ambiguity() {
-        let mut observer = ErpShapeObserver::new(4).unwrap();
-        for _ in 0..1000 {
-            for key in ["a", "b", "c", "d"] {
-                observer.observe(key, 0).unwrap();
-            }
-        }
-        let observed = observer.snapshot().unwrap().observation;
-        assert_eq!(observed.fits.len(), 1);
-        assert_eq!(observed.fits[0].family, "uniform");
-        let mut policy = input(ErpAccuracyMode::Hybrid);
-        policy.artifact.records[0].distribution = serde_json::json!({"erp_shape": {
-            "cardinality": 4, "family": "uniform", "parameters": {},
-            "benchmark_events": 4000
-        }});
-        policy.observed_shape = Some(observed);
-        policy.shape_match = Some(ErpShapeMatchPolicy {
-            minimum_benchmark_events: 1000,
-            max_log2_cardinality_distance: 1.0,
-            max_parameter_distance: 0.1,
-            max_goodness_of_fit: 0.1,
-            minimum_confidence: 0.9,
-            minimum_confidence_margin: 0.05,
-        });
-        assert!(matches!(
-            policy.select(
-                SketchAlgorithm::Cms,
-                0.01,
-                SketchParams::Cms {
-                    width: 4096,
-                    depth: 5
-                }
-            ),
-            ErpParameterDecision::Empirical { .. }
-        ));
-    }
-
-    #[test]
-    fn nearest_profile_miss_keeps_hybrid_fallback() {
-        let mut policy = input(ErpAccuracyMode::Hybrid);
-        policy.observed_shape = Some(ErpShapeObservation {
-            cardinality: 1_000_000,
-            observed_events: 10_000,
-            fits: vec![ErpShapeFit {
-                family: "zipf".into(),
-                parameters: BTreeMap::from([("exponent".into(), 2.0)]),
-                goodness_of_fit: 0.01,
-                confidence: 0.99,
-            }],
-            empirical_fingerprint: None,
-        });
-        policy.shape_match = Some(ErpShapeMatchPolicy {
-            minimum_benchmark_events: 1_000,
-            max_log2_cardinality_distance: 1.0,
-            max_parameter_distance: 0.2,
-            max_goodness_of_fit: 0.2,
-            minimum_confidence: 0.5,
-            minimum_confidence_margin: 0.05,
-        });
-        let theory = SketchParams::Cms {
-            width: 4096,
-            depth: 5,
-        };
-        assert!(matches!(
-            policy.select(SketchAlgorithm::Cms, 0.01, theory.clone()),
-            ErpParameterDecision::TheoreticalFallback { params, .. } if params == theory
-        ));
-    }
-
-    #[test]
-    fn custom_dataset_can_match_an_evidenced_shape_without_same_identity() {
-        let mut policy = input(ErpAccuracyMode::Hybrid);
-        policy.distribution = serde_json::json!({
-            "workload": {"external": {"dataset": "customer-a"}}
-        });
-        policy.artifact.records[0].distribution = serde_json::json!({
-            "workload": {"external": {"dataset": "customer-b"}},
-            "erp_shape": {
-                "cardinality": 1000,
-                "family": "zipf",
-                "parameters": {"exponent": 1.1},
-                "benchmark_events": 100000
-            }
-        });
-        policy.observed_shape = Some(ErpShapeObservation {
-            cardinality: 1000,
-            observed_events: 100000,
-            fits: vec![ErpShapeFit {
-                family: "zipf".into(),
-                parameters: BTreeMap::from([("exponent".into(), 1.1)]),
-                goodness_of_fit: 0.01,
-                confidence: 0.99,
-            }],
-            empirical_fingerprint: None,
-        });
-        policy.shape_match = Some(ErpShapeMatchPolicy {
-            minimum_benchmark_events: 1000,
-            max_log2_cardinality_distance: 1.0,
-            max_parameter_distance: 0.2,
-            max_goodness_of_fit: 0.2,
-            minimum_confidence: 0.5,
-            minimum_confidence_margin: 0.05,
-        });
-        assert!(matches!(
-            policy.select(
-                SketchAlgorithm::Cms,
-                0.01,
-                SketchParams::Cms {
-                    width: 4096,
-                    depth: 5,
-                }
-            ),
-            ErpParameterDecision::Empirical { .. }
-        ));
-    }
-}
diff --git a/control_plane/src/physical/executable_binding.rs b/control_plane/src/physical/executable_binding.rs
deleted file mode 100644
index 93056ad3a..000000000
--- a/control_plane/src/physical/executable_binding.rs
+++ /dev/null
@@ -1,91 +0,0 @@
-//! Compiler checks relating the shared executable contract to QueryPlan.
-
-pub use asap_types::executable_plan::*;
-
-#[derive(Clone, Copy, Debug, PartialEq, Eq)]
-enum OperatorExecution {
-    Ingestion,
-    Query,
-}
-
-/// Every physical operator uses its node's placement; payload kind does not
-/// restrict execution phase. Runtime capability is checked separately.
-fn operator_execution(node: &planner_types::post_asap::ExecutableDagNode) -> OperatorExecution {
-    match node.output_state.timing {
-        planner_types::post_asap::ExecutionTiming::IngestionTime => OperatorExecution::Ingestion,
-        planner_types::post_asap::ExecutionTiming::QueryTime => OperatorExecution::Query,
-    }
-}
-
-/// Assign backend phases to a selected semantic DAG without changing its nodes.
-pub fn install_selected_dag(
-    query_id: String,
-    dag: &planner_types::post_asap::ExecutableDag,
-    query_plan_sink: QueryNodeId,
-    materialization: impl Fn(
-        planner_types::post_asap::PostAsapNodeId,
-    ) -> Option<asap_types::sds::StoredOutputId>,
-    query_node: impl Fn(planner_types::post_asap::PostAsapNodeId) -> Option<QueryNodeId>,
-) -> Result<InstalledPostAsapDag, String> {
-    let mut nodes = std::collections::BTreeMap::new();
-    let mut precompute_sinks = Vec::new();
-    for node in &dag.nodes {
-        if let planner_types::post_asap::ExecutableOperatorPayload::SummaryAgg {
-            family,
-            input,
-            grouping,
-            ..
-        } = &node.payload
-        {
-            asap_physical_operators::capability::validate_summary_kernel(family, input, grouping)
-                .map_err(|reason| format!("post-ASAP node {:?}: {reason}", node.id))?;
-        }
-        let execution = operator_execution(node);
-        let binding = if let Some(stored_output) = materialization(node.id) {
-            precompute_sinks.push(node.id);
-            BackendNodeBinding::Materialization { stored_output }
-        } else if execution == OperatorExecution::Ingestion {
-            BackendNodeBinding::MaintenanceInput
-        } else {
-            query_node(node.id).map_or(BackendNodeBinding::QueryInput, |query_node| {
-                BackendNodeBinding::Query { query_node }
-            })
-        };
-        nodes.insert(node.id, binding);
-    }
-    precompute_sinks.sort();
-    let installed = InstalledPostAsapDag {
-        document: OwnedPostAsapDag::from_executable(query_id, dag)?,
-        binding: BackendExecutableBinding {
-            nodes,
-            query_sink: dag.root,
-            query_plan_sink,
-            precompute_sinks,
-        },
-    };
-    installed.binding.validate(&installed.document.decode()?)?;
-    Ok(installed)
-}
-
-pub fn validate_query_plan(
-    installed: &InstalledPostAsapDag,
-    query: &crate::query_plan::QueryPlanEntry,
-) -> Result<(), String> {
-    if query.query_id != installed.document.query_id {
-        return Err("post-ASAP document and query plan identity disagree".into());
-    }
-    if query.root != installed.binding.query_plan_sink {
-        return Err("backend query-plan sink disagrees with installed query root".into());
-    }
-    for placement in installed.binding.nodes.values() {
-        if let BackendNodeBinding::Query { query_node } = placement {
-            if !query.nodes.contains_key(query_node) {
-                return Err(format!(
-                    "backend binding references missing query node {}",
-                    query_node.0
-                ));
-            }
-        }
-    }
-    Ok(())
-}
diff --git a/control_plane/src/physical/maintained_population.rs b/control_plane/src/physical/maintained_population.rs
deleted file mode 100644
index abe0d16f7..000000000
--- a/control_plane/src/physical/maintained_population.rs
+++ /dev/null
@@ -1,111 +0,0 @@
-//! Lower typed population operators according to executor membership capabilities.
-use super::compiler::{CompileError, PhysicalCompilationRequest, QueryCompilationInput};
-use asap_types::query_plan::{
-    current_series::{SeriesPopulation, SeriesReadout},
-    query_time::{Grouping, LabelMatch, LabelMatcher, QueryTimeOperator},
-};
-use planner_types::post_asap::{
-    maintained_population::*, SummaryExpr, SummaryNode, ValueOperation,
-};
-
-fn selected(node: &SummaryNode) -> Option<(&MaintainedPopulation, &PopulationReadout)> {
-    let SummaryExpr::ValueOperation {
-        child,
-        operation: ValueOperation::ReadPopulation { readout },
-        ..
-    } = &node.expr
-    else {
-        return None;
-    };
-    let SummaryExpr::ValueOperation {
-        operation: ValueOperation::MaintainPopulation { population },
-        ..
-    } = &child.expr
-    else {
-        return None;
-    };
-    Some((population, readout))
-}
-
-pub(super) fn supported_node(node: &SummaryNode) -> bool {
-    selected(node).is_some_and(|(population, _)| {
-        matches!(population.input, PopulationInput::CurrentSeries(_))
-    })
-}
-
-pub(super) fn supported(request: &PhysicalCompilationRequest) -> bool {
-    request
-        .queries
-        .iter()
-        .any(|q| supported_node(&q.selected_plan_root))
-}
-
-pub(super) fn operator(
-    request: &PhysicalCompilationRequest,
-    query: &QueryCompilationInput,
-) -> Result<Option<QueryTimeOperator>, CompileError> {
-    let Some((spec, readout)) = selected(&query.selected_plan_root) else {
-        return Ok(None);
-    };
-    let PopulationInput::CurrentSeries(input) = &spec.input else {
-        return Err(CompileError::Query { query_id: query.query_id.clone(), reason: "maintained table-row populations require a row-update executor; remote-write current-series state is incompatible".into() });
-    };
-    let populations: std::collections::BTreeSet<_> = request
-        .queries
-        .iter()
-        .filter_map(|q| {
-            selected(&q.selected_plan_root)
-                .map(|(p, _)| serde_json::to_string(p).expect("typed population serializes"))
-        })
-        .collect();
-    let max_bytes = request
-        .retained_summary_memory_budget_bytes
-        .unwrap_or(64 * 1024 * 1024)
-        .min(1_073_741_824)
-        / populations.len().max(1) as u64;
-    let population = SeriesPopulation {
-        metric: input.metric.clone(),
-        matchers: input
-            .matchers
-            .iter()
-            .map(|m| LabelMatcher {
-                name: m.label.clone(),
-                value: m.value.clone(),
-                operation: match m.operation {
-                    CurrentSeriesMatch::Equal => LabelMatch::Equal,
-                    CurrentSeriesMatch::NotEqual => LabelMatch::NotEqual,
-                    CurrentSeriesMatch::Regex => LabelMatch::Regex,
-                    CurrentSeriesMatch::NotRegex => LabelMatch::NotRegex,
-                },
-            })
-            .collect(),
-        grouping: Grouping {
-            labels: input.grouping.clone(),
-            without: input.without,
-        },
-        lookback_ms: input.lookback_ms,
-        history_retention_ms: request.query_retention_margin_ms,
-        max_k: spec.max_k as u64,
-        quantiles: spec.quantiles,
-        max_bytes,
-        max_series: 100_000.min((max_bytes / 1024) as usize),
-        max_input_lag_ms: request
-            .scrape_interval_ms
-            .unwrap_or(60_000)
-            .saturating_add(request.query_retention_margin_ms)
-            .max(1)
-            .min(input.lookback_ms),
-    };
-    population.validate()?;
-    let readout = match readout {
-        PopulationReadout::Quantile { q } => SeriesReadout::Quantile { q: *q },
-        PopulationReadout::TopK { k } => SeriesReadout::TopK { k: *k as u64 },
-        PopulationReadout::Sum => SeriesReadout::Sum,
-        PopulationReadout::Count => SeriesReadout::Count,
-        PopulationReadout::Average => SeriesReadout::Average,
-    };
-    Ok(Some(QueryTimeOperator::CurrentSeries {
-        population,
-        readout,
-    }))
-}
diff --git a/control_plane/src/physical/mod.rs b/control_plane/src/physical/mod.rs
deleted file mode 100644
index fb61d2c43..000000000
--- a/control_plane/src/physical/mod.rs
+++ /dev/null
@@ -1,19 +0,0 @@
-//! Physical compilation, deployment costs, sketch capabilities, and stage emission.
-
-pub mod backend_stage;
-pub mod compiler;
-pub mod deployment_cost;
-pub mod erp;
-pub mod executable_binding;
-mod pane_reuse;
-pub mod post_asap;
-pub(crate) mod realization;
-pub mod runtime_capability;
-pub mod sketch_catalog;
-pub mod summary_catalog;
-pub mod workload_cost;
-
-pub mod plan_dot;
-pub mod publication;
-
-pub(crate) mod maintained_population;
diff --git a/control_plane/src/physical/pane_reuse.rs b/control_plane/src/physical/pane_reuse.rs
deleted file mode 100644
index e1e29a4dc..000000000
--- a/control_plane/src/physical/pane_reuse.rs
+++ /dev/null
@@ -1,338 +0,0 @@
-use super::compiler::{
-    derived_window_cost, gcd, retained_state_count, CollectorMaterialization,
-    MaterializationLifecycleEstimate, PhysicalCompilationRequest, RuntimeRulePolicy,
-};
-use asap_types::WindowMaterializationLayout;
-use planner_types::post_asap::{PostAsapNodeId, SummaryWindowFramework};
-use std::collections::{BTreeMap, BTreeSet};
-
-/// Select and install cheaper shared panes without changing logical readouts.
-/// Only raw additive states are eligible; derived cohorts retain their full-window identity.
-#[allow(clippy::too_many_arguments)]
-pub(super) fn share_additive_panes(
-    request: &PhysicalCompilationRequest,
-    materializations: &mut [asap_types::PrecomputeMaterialization],
-    producers: &mut Vec<CollectorMaterialization>,
-    plan_producers: &mut [CollectorMaterialization],
-    bindings: &mut BTreeMap<(usize, PostAsapNodeId), asap_types::PolicyFingerprint>,
-    policies: &mut BTreeMap<asap_types::PolicyFingerprint, RuntimeRulePolicy>,
-    estimates: &mut BTreeMap<asap_types::PolicyFingerprint, MaterializationLifecycleEstimate>,
-) {
-    use asap_types::{AggregationType, WindowKind};
-    let derived_sources = materializations
-        .iter()
-        .filter_map(|m| m.derived_input.as_ref())
-        .flat_map(|d| d.inputs.iter().map(|id| id.fingerprint()))
-        .collect::<BTreeSet<_>>();
-    let mut seen = BTreeSet::new();
-    let mut physical = Vec::new();
-    let mut groups: Vec<Vec<usize>> = Vec::new();
-    let mut keys = Vec::new();
-    let mut member_consumers = Vec::new();
-    for m in materializations.iter() {
-        let old = m.policy_fingerprint();
-        if !seen.insert(old)
-            || m.derived_input.is_some()
-            || derived_sources.contains(&old)
-            || !matches!(m.aggregation_type, AggregationType::Sum)
-        {
-            continue;
-        }
-        let WindowMaterializationLayout::Pane { pane_secs } = m.window_layout else {
-            continue;
-        };
-        if pane_secs == 0 || m.pane_origin_ms.is_none() {
-            continue;
-        }
-        let consumers = bindings
-            .iter()
-            .filter(|(_, id)| **id == old)
-            .map(|((query, _), _)| *query)
-            .collect::<BTreeSet<_>>();
-        let Some(&first) = consumers.first() else {
-            continue;
-        };
-        let query = &request.queries[first];
-        let Some(estimate) = estimates.get(&old) else {
-            continue;
-        };
-        // Provenance belongs to the selected layout, not to its request entry point.
-        if consumers.iter().any(|index| {
-            !request.queries[*index]
-                .window_realization_candidates
-                .iter()
-                .any(|candidate| {
-                    candidate.realization_id == estimate.window_realization_id && candidate.derived
-                })
-        }) {
-            continue;
-        }
-        let Some(policy) = policies.get(&old) else {
-            continue;
-        };
-        let mut lifecycle = query.summary_lifecycle_inputs.clone();
-        lifecycle.evaluation_interval_ms = 0;
-        if consumers.iter().any(|index| {
-            let mut other = request.queries[*index].summary_lifecycle_inputs.clone();
-            other.evaluation_interval_ms = 0;
-            other != lifecycle || request.queries[*index].accuracy_target != query.accuracy_target
-        }) {
-            continue;
-        }
-        // Normalize only layout dimensions. Source, projection, grouping, state,
-        // policy and unit-cost evidence must still agree before considering reuse.
-        let mut canonical = m.clone();
-        canonical.window_size = 1;
-        canonical.slide_interval = 1;
-        canonical.window_type = WindowKind::Tumbling;
-        canonical.window_layout = WindowMaterializationLayout::Pane { pane_secs: 1 };
-        canonical.pane_origin_ms = Some(0);
-        let key = (
-            canonical.policy_fingerprint(),
-            serde_json::to_string(&lifecycle).unwrap(),
-            serde_json::to_string(policy).unwrap(),
-            serde_json::to_string(&query.accuracy_target).unwrap(),
-        );
-        let index = physical.len();
-        if let Some(group) = groups.iter_mut().find(|group| keys[group[0]] == key) {
-            group.push(index);
-        } else {
-            groups.push(vec![index]);
-        }
-        keys.push(key);
-        member_consumers.push(consumers);
-        physical.push((old, m.clone()));
-    }
-    let groups = select_shared_groups(request, &physical, &member_consumers, estimates, groups);
-    for group in &groups {
-        for &index in &group.members {
-            let canonical = &mut physical[index].1;
-            canonical.window_size = group.pane_secs;
-            canonical.slide_interval = group.pane_secs;
-            canonical.window_type = WindowKind::Tumbling;
-            canonical.window_layout = WindowMaterializationLayout::Pane {
-                pane_secs: group.pane_secs,
-            };
-            canonical.pane_origin_ms = Some(group.origin);
-        }
-    }
-    let mut target_counts = BTreeMap::new();
-    for group in &groups {
-        *target_counts
-            .entry(physical[group.members[0]].1.policy_fingerprint())
-            .or_insert(0) += 1;
-    }
-    let mut replacements = BTreeMap::new();
-    for group in groups {
-        let mut canonical = physical[group.members[0]].1.clone();
-        canonical.num_aggregates_to_retain = Some(retained_state_count(
-            group.lookback_ms,
-            request.query_retention_margin_ms,
-            canonical.slide_interval * 1000,
-            &canonical.window_layout,
-        ));
-        let new = canonical.policy_fingerprint();
-        let members = group
-            .members
-            .iter()
-            .map(|index| physical[*index].0)
-            .collect::<BTreeSet<_>>();
-        // A physical ID cannot hide a second policy/evidence cohort or an
-        // independently installed producer that was not offered for sharing.
-        if target_counts[&new] != 1
-            || materializations.iter().any(|m| {
-                let id = m.policy_fingerprint();
-                id == new && !members.contains(&id)
-            })
-        {
-            continue;
-        }
-        let mut combined = estimates[&physical[group.members[0]].0].clone();
-        combined.materialization = new.into();
-        combined.consumer_query_ids.clear();
-        combined.expected_reads = 0.0;
-        combined.expected_updates = 0.0;
-        combined.lifecycle_cost = group.cost;
-        combined.window_realization_id = format!("shared-pane-{}", new.0);
-        for index in group.members {
-            let old = physical[index].0;
-            if let Some(estimate) = estimates.remove(&old) {
-                combined
-                    .consumer_query_ids
-                    .extend(estimate.consumer_query_ids);
-                combined.expected_reads += estimate.expected_reads;
-                combined.expected_updates =
-                    combined.expected_updates.max(estimate.expected_updates);
-            }
-            replacements.insert(old, canonical.clone());
-        }
-        combined.consumer_query_ids.sort();
-        combined.consumer_query_ids.dedup();
-        estimates.insert(new, combined);
-    }
-    for m in materializations {
-        if let Some(canonical) = replacements.get(&m.policy_fingerprint()) {
-            *m = canonical.clone();
-        }
-    }
-    for id in bindings.values_mut() {
-        if let Some(canonical) = replacements.get(id) {
-            *id = canonical.policy_fingerprint();
-        }
-    }
-    for (old, canonical) in &replacements {
-        if let Some(policy) = policies.remove(old) {
-            policies.insert(canonical.policy_fingerprint(), policy);
-        }
-    }
-    for producer in producers.iter_mut().chain(plan_producers.iter_mut()) {
-        if let Some(canonical) = replacements.get(&producer.materialization.fingerprint()) {
-            let new = canonical.policy_fingerprint();
-            producer.materialization = new.into();
-            producer.query_id = format!("state-{}", new.0);
-            producer.window_secs = canonical.window_size;
-            producer.slide_secs = canonical.slide_interval;
-            producer.window_layout = canonical.window_layout.clone();
-            producer.pane_origin_ms = canonical.pane_origin_ms;
-            producer.abstract_window_framework = SummaryWindowFramework::Tumbling;
-            producer.window_realization_id = estimates[&new].window_realization_id.clone();
-        }
-    }
-    let mut seen = BTreeSet::new();
-    producers.retain(|producer| seen.insert(producer.materialization));
-}
-
-struct SharedGroup {
-    members: Vec<usize>,
-    lookback_ms: u64,
-    cost: f64,
-    savings: f64,
-    pane_secs: u64,
-    origin: i64,
-}
-
-fn select_shared_groups(
-    request: &PhysicalCompilationRequest,
-    physical: &[(
-        asap_types::PolicyFingerprint,
-        asap_types::PrecomputeMaterialization,
-    )],
-    member_consumers: &[BTreeSet<usize>],
-    estimates: &BTreeMap<asap_types::PolicyFingerprint, MaterializationLifecycleEstimate>,
-    groups: Vec<Vec<usize>>,
-) -> Vec<SharedGroup> {
-    let price = |members: Vec<usize>| {
-        if members.len() < 2 {
-            return None;
-        }
-        let pane_secs = members
-            .iter()
-            .map(|&i| physical[i].1.window_layout.base_pane_secs())
-            .reduce(gcd)
-            .unwrap();
-        let origin = physical[members[0]]
-            .1
-            .pane_origin_ms
-            .unwrap()
-            .rem_euclid((pane_secs * 1_000) as i64);
-        if members.iter().any(|&i| {
-            physical[i]
-                .1
-                .pane_origin_ms
-                .unwrap()
-                .rem_euclid((pane_secs * 1_000) as i64)
-                != origin
-        }) {
-            return None;
-        }
-        let mut independent = 0.0;
-        let mut producer = 0.0_f64;
-        let mut reads = 0.0;
-        let mut lookback_ms = 0;
-        for &index in &members {
-            let (old, m) = &physical[index];
-            let consumers = &member_consumers[index];
-            let query = &request.queries[*consumers.first().unwrap()];
-            let selected_id = &estimates[old].window_realization_id;
-            let template = &query
-                .window_realization_candidates
-                .iter()
-                .find(|candidate| &candidate.realization_id == selected_id)
-                .unwrap()
-                .cost;
-            let mut maintenance = query.summary_lifecycle_inputs.clone();
-            maintenance.costs.read = 0.0;
-            independent += derived_window_cost(
-                template,
-                &maintenance,
-                m.window_size,
-                m.slide_interval,
-                &m.window_layout,
-                request.query_retention_margin_ms,
-            )
-            .weighted_cost;
-            producer = producer.max(
-                derived_window_cost(
-                    template,
-                    &maintenance,
-                    m.window_size,
-                    m.slide_interval,
-                    &WindowMaterializationLayout::Pane { pane_secs },
-                    request.query_retention_margin_ms,
-                )
-                .weighted_cost,
-            );
-            for &consumer in consumers {
-                let lifecycle = &request.queries[consumer].summary_lifecycle_inputs;
-                let unit_reads = lifecycle.costs.read * lifecycle.horizon_seconds
-                    / (f64::from(lifecycle.evaluation_interval_ms) / 1_000.0);
-                independent +=
-                    unit_reads * (m.window_size / m.window_layout.base_pane_secs()) as f64;
-                reads += unit_reads * (m.window_size / pane_secs) as f64;
-            }
-            lookback_ms = lookback_ms.max(m.window_size.saturating_mul(1_000));
-        }
-        let cost = producer + reads;
-        if !independent.is_finite() || !cost.is_finite() || cost >= independent {
-            return None;
-        }
-        Some(SharedGroup {
-            members,
-            lookback_ms,
-            cost,
-            savings: independent - cost,
-            pane_secs,
-            origin,
-        })
-    };
-    let mut selected_groups = Vec::new();
-    for mut remaining in groups {
-        while remaining.len() >= 2 {
-            if let Some(group) = price(remaining.clone()) {
-                selected_groups.push(group);
-                break;
-            }
-            // An incompatible phase or expensive fine-pane consumer must not
-            // prevent the remaining consumers from sharing profitable state.
-            let mut best: Option<SharedGroup> = None;
-            for (position, &left) in remaining.iter().enumerate() {
-                for &right in &remaining[position + 1..] {
-                    if let Some(group) = price(vec![left, right]) {
-                        if best
-                            .as_ref()
-                            .is_none_or(|previous| group.savings > previous.savings)
-                        {
-                            best = Some(group);
-                        }
-                    }
-                }
-            }
-            let Some(group) = best else {
-                break;
-            };
-            remaining.retain(|index| !group.members.contains(index));
-            selected_groups.push(group);
-        }
-    }
-    selected_groups
-}
diff --git a/control_plane/src/physical/plan_dot.rs b/control_plane/src/physical/plan_dot.rs
deleted file mode 100644
index 22dc9ed99..000000000
--- a/control_plane/src/physical/plan_dot.rs
+++ /dev/null
@@ -1,252 +0,0 @@
-//! Graphviz inspection rendering for one selected physical plan.
-//!
-//! This is intentionally a developer-facing view: JSON remains the complete
-//! representation, while DOT keeps labels compact enough to follow execution.
-
-use super::compiler::CompiledPhysicalPlan;
-use crate::query_plan::QueryPlanNode;
-use asap_types::query_plan::query_time::QueryTimeOperator;
-
-/// Render the selected precompute and query execution DAGs as deterministic DOT.
-pub fn render(plan: &CompiledPhysicalPlan) -> String {
-    let mut dot = String::from(
-        "digraph compiled_physical_plan {\n  rankdir=LR;\n  node [shape=box, fontname=Helvetica];\n",
-    );
-
-    dot.push_str("  subgraph cluster_precompute {\n    label=\"PrecomputePlan\";\n");
-    for materialization in &plan.precompute_plan.materializations {
-        let id = materialization.policy_fingerprint();
-        let node = materialization_node(id.as_u64());
-        let label = format!(
-            "materialization\n{}\nmetric={}\nwindow_type={}\nwindow={}s / {}s\nlayout={:?}",
-            id,
-            materialization.metric,
-            materialization.window_type,
-            materialization.window_size,
-            materialization.slide_interval,
-            materialization.window_layout,
-        );
-        emit_node(&mut dot, &node, &label, "shape=component");
-    }
-    for (dag_index, (query_id, installed)) in
-        plan.precompute_plan.executable_dags.iter().enumerate()
-    {
-        dot.push_str(&format!(
-            "    subgraph cluster_precompute_dag_{dag_index} {{\n      label=\"{}\";\n",
-            escape(query_id)
-        ));
-        for node in &installed.document.nodes {
-            let id = precompute_node(dag_index, node.id.0);
-            let binding = installed
-                .binding
-                .nodes
-                .get(&node.id)
-                .map(|binding| format!("\n{:?}", binding))
-                .unwrap_or_default();
-            emit_node(
-                &mut dot,
-                &id,
-                &format!(
-                    "{} #{}{}",
-                    node.payload
-                        .get("kind")
-                        .and_then(serde_json::Value::as_str)
-                        .unwrap_or("unknown"),
-                    node.id.0,
-                    binding
-                ),
-                "",
-            );
-        }
-        for edge in &installed.document.edges {
-            dot.push_str(&format!(
-                "      {} -> {} [label=\"{:?}\"];\n",
-                precompute_node(dag_index, edge.producer.0),
-                precompute_node(dag_index, edge.consumer.0),
-                edge.role
-            ));
-        }
-        dot.push_str("    }\n");
-    }
-    dot.push_str("  }\n");
-
-    for (query_index, (query_key, entry)) in plan.query_plan.entries.iter().enumerate() {
-        dot.push_str(&format!(
-            "  subgraph cluster_query_{query_index} {{\n    label=\"QueryPlan: {}\";\n",
-            escape(query_key)
-        ));
-        for (id, node) in &entry.nodes {
-            let attributes = if *id == entry.root {
-                "shape=doubleoctagon"
-            } else {
-                ""
-            };
-            emit_node(
-                &mut dot,
-                &query_node(query_index, id.0),
-                &query_node_label(node),
-                attributes,
-            );
-            if let QueryPlanNode::ReadMaterialization { binding } = node {
-                dot.push_str(&format!(
-                    "    {} -> {} [style=dashed, color=gray40, label=\"reads\"];\n",
-                    materialization_node(binding.materialization.as_u64()),
-                    query_node(query_index, id.0),
-                ));
-            }
-        }
-        for (id, node) in &entry.nodes {
-            for input in node.inputs() {
-                dot.push_str(&format!(
-                    "    {} -> {};\n",
-                    query_node(query_index, input.0),
-                    query_node(query_index, id.0),
-                ));
-            }
-        }
-        dot.push_str("  }\n");
-    }
-    dot.push_str("}\n");
-    dot
-}
-
-fn materialization_node(id: u64) -> String {
-    format!("materialization_{id:016x}")
-}
-
-fn precompute_node(dag: usize, id: u32) -> String {
-    format!("precompute_{dag}_{id}")
-}
-
-fn query_node(query: usize, id: u64) -> String {
-    format!("query_{query}_{id}")
-}
-
-fn emit_node(dot: &mut String, id: &str, label: &str, attributes: &str) {
-    dot.push_str(&format!("    {id} [label=\"{}\"", escape(label)));
-    if !attributes.is_empty() {
-        dot.push_str(&format!(", {attributes}"));
-    }
-    dot.push_str("];\n");
-}
-
-fn escape(value: &str) -> String {
-    value
-        .replace('\\', "\\\\")
-        .replace('"', "\\\"")
-        .replace('\n', "\\n")
-}
-
-fn query_node_label(node: &QueryPlanNode) -> String {
-    match node {
-        QueryPlanNode::PhysicalFragment { dag, .. } => {
-            asap_physical_operators::physical_planner::CompiledPhysicalDag::decode(dag)
-                .map(|plan| {
-                    format!(
-                        "Physical\n{}",
-                        plan.operator_name(plan.roots()[0]).unwrap_or("Input")
-                    )
-                })
-                .unwrap_or_else(|_| "Invalid physical DAG".into())
-        }
-        QueryPlanNode::RelationalJoin { .. } => "RelationalJoin".into(),
-        QueryPlanNode::Relational { .. } => "Relational".into(),
-        QueryPlanNode::Logical { operator, .. } => {
-            format!("Logical\n{}", query_time_label(operator))
-        }
-        QueryPlanNode::Scalar { value } => format!("Scalar\n{value}"),
-        QueryPlanNode::Binary { operator, .. } => format!("Binary\n{operator:?}"),
-        QueryPlanNode::ReduceSum { .. } => "ReduceSum".into(),
-        QueryPlanNode::ReadMaterialization { binding } => format!(
-            "ReadMaterialization\n{}\nwindow={}ms\nlookback={:?}",
-            binding.materialization.fingerprint(),
-            binding.window_ms,
-            binding.readout_lookback_ms
-        ),
-        QueryPlanNode::SummaryEstimate { query, .. } => format!("SummaryEstimate\n{query:?}"),
-        QueryPlanNode::ExactReadout { readout, .. } => format!("ExactReadout\n{readout:?}"),
-        QueryPlanNode::SummaryMerge { .. } => "SummaryMerge".into(),
-        QueryPlanNode::ExternalExact { .. } => "ExternalExact".into(),
-        QueryPlanNode::ExactFallback { reason } => format!("ExactFallback\n{reason}"),
-    }
-}
-
-fn query_time_label(operator: &QueryTimeOperator) -> &'static str {
-    match operator {
-        QueryTimeOperator::CurrentSeries { .. } => "CurrentSeries",
-        QueryTimeOperator::ExactSubquery { .. } => "ExactSubquery",
-        QueryTimeOperator::CandidateExactSubquery { .. } => "CandidateExactSubquery",
-        QueryTimeOperator::Scan { .. } => "Scan",
-        QueryTimeOperator::UnaryNegate => "UnaryNegate",
-        QueryTimeOperator::VectorToScalar => "VectorToScalar",
-        QueryTimeOperator::Aggregate { .. } => "Aggregate",
-        QueryTimeOperator::Limit { .. } => "Limit",
-        QueryTimeOperator::Binary { .. } => "Binary",
-        QueryTimeOperator::Temporal { .. } => "Temporal",
-        QueryTimeOperator::Sort { .. } => "Sort",
-        QueryTimeOperator::HistogramQuantile => "HistogramQuantile",
-        QueryTimeOperator::Subquery { .. } => "Subquery",
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use crate::physical::compiler::{BackendLocalPlanningInput, QueryFrontend};
-
-    fn fixture() -> CompiledPhysicalPlan {
-        let snapshot: BackendLocalPlanningInput = serde_json::from_str(include_str!(
-            "../../../docs/examples/asapquery-planning-snapshot.json"
-        ))
-        .unwrap();
-        crate::physical::compiler::tests::quoted_snapshot(snapshot, QueryFrontend::PromQl)
-            .compile_promql()
-            .unwrap()
-    }
-
-    #[test]
-    fn render_links_query_reads_to_precompute_materializations() {
-        let dot = render(&fixture());
-        assert!(dot.contains("cluster_precompute"), "{dot}");
-        assert!(dot.contains("cluster_query_"), "{dot}");
-        assert!(dot.contains("style=dashed"), "{dot}");
-        assert!(dot.contains("ReadMaterialization"), "{dot}");
-        assert!(dot.contains("window_type="), "{dot}");
-        assert!(dot.contains("layout="), "{dot}");
-    }
-
-    #[test]
-    fn render_uses_graphviz_line_breaks_in_labels() {
-        let dot = render(&fixture());
-        assert!(
-            dot.contains("materialization\\npolicy_fp:"),
-            "expected a Graphviz line break, not a literal backslash-n: {dot}"
-        );
-        assert!(
-            !dot.contains("materialization\\\\npolicy_fp:"),
-            "label double-escaped its Graphviz line break: {dot}"
-        );
-    }
-
-    #[test]
-    fn compiled_physical_plan_serializes_each_projection() {
-        let artifact = serde_json::to_value(fixture()).unwrap();
-        for field in [
-            "envelope",
-            "summary_catalog",
-            "collector_plans",
-            "precompute_plan",
-            "transmission_plan",
-            "query_plan",
-            "storage_routing",
-            "lifecycle_estimates",
-            "cost_comparison",
-            "planner_selection_trace",
-        ] {
-            assert!(
-                artifact.get(field).is_some(),
-                "missing `{field}`: {artifact}"
-            );
-        }
-    }
-}
diff --git a/control_plane/src/physical/post_asap/cost_model.rs b/control_plane/src/physical/post_asap/cost_model.rs
deleted file mode 100644
index 9610ed0a1..000000000
--- a/control_plane/src/physical/post_asap/cost_model.rs
+++ /dev/null
@@ -1,1122 +0,0 @@
-//! Deployment family selection and parameter sizing for ASAPPlanner binding.
-//!
-//! `rank_candidates` chooses a family; `size_params` sets its parameters.
-//! Frequency extensions use `realize_extension` and `readout_extension`.
-//! Exact TopK falls back to logical execution upstream because it has no
-//! exact accumulator realization; these cost-model hooks cannot bind it.
-
-#![allow(dead_code)]
-
-use asap_aware_mapping::cost_model::{Cost, CostedSummaryDeployment};
-use asap_aware_mapping::empirical_comparison::{
-    recommend_offline, OfflineComparisonEvidence, OfflineComparisonRequest, OfflineRecommendation,
-    SketchConfiguration,
-};
-use asap_aware_mapping::empirical_cost::EmpiricalEvidenceProvider;
-use asap_aware_mapping::{
-    CompleteSummaryCandidateEstimate, CostModel, CostProvenance, EvaluationRate,
-    ExactCompositionCostInputs, ExactCompositionCostRequest, Horizon, OperationPlacement,
-    Realization, Replacement, ReplacementSubDAG, SummaryMaintenanceCapabilities,
-    SummaryMaintenanceLifecycleCostInputs, TargetSubDAG, ValueOperationCapabilities,
-};
-use planner_types::post_asap::{
-    ExecutableOperatorPayload, GroupingStrategy, SketchAlgorithm, SketchParams, SketchQuery,
-    SummaryFamilyType, SummaryWindowFramework,
-};
-use planner_types::pre_asap::expr_ir::ColumnRef;
-
-use crate::physical::deployment_cost::wire::WireCostTable;
-use crate::physical::erp::{ErpParameterDecision, ErpPlanningInput};
-use crate::planner_selection::FREQUENCY_EXT_KIND;
-use crate::types::AccuracyTarget;
-use planner_types::pre_asap::AggIntent;
-use serde::{Deserialize, Serialize};
-
-/// A local state-footprint estimate, never a complete deployment quote.
-#[derive(Debug, Serialize)]
-pub struct CandidateCostEstimate {
-    pub value: f64,
-    pub unit: &'static str,
-    pub model: &'static str,
-    pub source: &'static str,
-    pub erp_record_ids: Vec<String>,
-}
-
-fn analytical_state_bytes(family: &SummaryFamilyType) -> Option<f64> {
-    use asap_types::AggregationType as A;
-    use planner_types::post_asap::ExactKind;
-    let (aggregation, params) = match family {
-        SummaryFamilyType::ExactAggregate(kind, _) => (
-            match kind {
-                ExactKind::Sum | ExactKind::Count => A::Sum,
-                ExactKind::Min => A::Min,
-                ExactKind::Max => A::Max,
-                ExactKind::Increase | ExactKind::Rate | ExactKind::IRate => A::Increase,
-            },
-            std::collections::HashMap::new(),
-        ),
-        SummaryFamilyType::Sketch(kind, GroupingStrategy::PerSubpopulationInstance) => {
-            let aggregation = match kind.algorithm() {
-                SketchAlgorithm::DDSketch => A::DDSketch,
-                SketchAlgorithm::Kll => A::DatasketchesKLL,
-                SketchAlgorithm::Hll => A::HLL,
-                SketchAlgorithm::Cms => A::CountMinSketch,
-                SketchAlgorithm::CountSketch => A::CountSketch,
-                SketchAlgorithm::CmsWithHeap => A::CountMinSketchWithHeap,
-                SketchAlgorithm::CountSketchWithHeap => A::CountSketchWithHeap,
-                SketchAlgorithm::UnivMon => A::UnivMon,
-                SketchAlgorithm::Kmv | SketchAlgorithm::Theta => return None,
-            };
-            let params = super::super::compiler::sketch_params_json(kind.params())
-                .as_object()?
-                .iter()
-                .map(|(key, value)| (key.clone(), value.clone()))
-                .collect();
-            (aggregation, params)
-        }
-        // A shared grid needs its own population/layout model; an independent
-        // state's measurement is not a measurement of that grid.
-        _ => return None,
-    };
-    Some(super::super::compiler::estimated_state_bytes(&aggregation, &params) as f64)
-}
-
-/// One measured execution profile for an exact operator composed with a
-/// maintained summary. Values use CPU nanoseconds so every term in Planner's
-/// recurring-cost formula has the same physical unit. Peak memory is retained
-/// as measured resource evidence and reported separately; it is deliberately
-/// not converted into CPU cost by an invented weight.
-#[derive(Debug, Clone, Serialize, Deserialize, PartialEq)]
-#[serde(deny_unknown_fields)]
-pub struct ExactCompositionCostEvidence {
-    /// Exact pre-ASAP target serialized with the pinned Planner revision.
-    pub target: serde_json::Value,
-    /// Exact operation serialized with the pinned Planner revision.
-    pub operation: serde_json::Value,
-    pub placement: ExactOperationPlacement,
-    pub expected_input_rows: f64,
-    pub expected_output_rows: f64,
-    pub exact_cpu_ns_per_row: f64,
-    pub summary_maintenance_cpu_ns_per_update: f64,
-    pub summary_read_cpu_ns: f64,
-    pub update_rate_per_second: f64,
-    pub evaluation_rate_per_second: f64,
-    pub raw_recompute_cpu_ns: f64,
-    pub observed_peak_memory_bytes: u64,
-    pub data_snapshot_id: String,
-    pub model_version: String,
-    pub observed_at_unix_ms: u64,
-    pub valid_for_ms: u64,
-}
-
-#[derive(Debug, Clone, Copy, Serialize, Deserialize, PartialEq, Eq)]
-#[serde(rename_all = "snake_case")]
-pub enum ExactOperationPlacement {
-    Read,
-    Maintenance,
-}
-
-impl ExactCompositionCostEvidence {
-    pub fn validate(&self, now_unix_ms: u64, max_age_ms: u64) -> Result<(), String> {
-        let positive = [
-            self.exact_cpu_ns_per_row,
-            self.summary_maintenance_cpu_ns_per_update,
-            self.summary_read_cpu_ns,
-            self.update_rate_per_second,
-            self.evaluation_rate_per_second,
-            self.raw_recompute_cpu_ns,
-        ];
-        let rows = [self.expected_input_rows, self.expected_output_rows];
-        if positive.iter().any(|v| !v.is_finite() || *v <= 0.0)
-            || rows.iter().any(|v| !v.is_finite() || *v < 0.0)
-            || self.observed_peak_memory_bytes == 0
-            || self.data_snapshot_id.trim().is_empty()
-            || self.model_version.trim().is_empty()
-            || self.valid_for_ms == 0
-            || self.observed_at_unix_ms > now_unix_ms
-            || now_unix_ms - self.observed_at_unix_ms > self.valid_for_ms.min(max_age_ms)
-        {
-            return Err(
-                "missing, non-physical, future, or stale exact-composition evidence".into(),
-            );
-        }
-        Ok(())
-    }
-
-    fn matches(&self, request: &ExactCompositionCostRequest<'_>) -> bool {
-        let placement = match request.composition.placement {
-            OperationPlacement::Read => ExactOperationPlacement::Read,
-            OperationPlacement::Maintenance => ExactOperationPlacement::Maintenance,
-        };
-        self.placement == placement
-            && serde_json::to_value(request.target).ok().as_ref() == Some(&self.target)
-            && serde_json::to_value(&request.composition.op).ok().as_ref() == Some(&self.operation)
-    }
-}
-
-/// See module docs.
-pub struct ControlPlaneCostModel {
-    /// Workload-level accuracy policy — combined (tighter-of) with each
-    /// intent's own accuracy field, matching every `bind_*.rs` rule's old
-    /// `accuracy: &AccuracyTarget` parameter.
-    pub workload_accuracy: AccuracyTarget,
-    lifecycle_costs: SummaryMaintenanceLifecycleCostInputs,
-    summary_maintenance: SummaryMaintenanceCapabilities,
-    window_framework_costs: Vec<(Option<String>, SummaryWindowFramework, Cost)>,
-    offline_evidence: Option<EmpiricalEvidenceProvider>,
-    offline_frequency_comparison: Option<(OfflineComparisonEvidence, OfflineComparisonRequest)>,
-    exact_composition_costs: Vec<ExactCompositionCostEvidence>,
-    erp: Option<ErpPlanningInput>,
-}
-
-impl ControlPlaneCostModel {
-    pub fn candidate_cost_estimate(
-        &self,
-        candidate: &ReplacementSubDAG,
-    ) -> Option<CandidateCostEstimate> {
-        if let Replacement::Rewrite(root) = &candidate.replacement {
-            // Price a semantic rewrite through its executable summary candidates,
-            // in the same retained-state units as a direct summary candidate.
-            // Unknown realizations remain uncosted rather than receiving zero.
-            use asap_aware_mapping::{ReplacementStrategy, SketchAlgorithmStrategy, TargetSubDAG};
-            return SketchAlgorithmStrategy::new(self)
-                .replacements(&TargetSubDAG::new(root))
-                .iter()
-                .filter(|candidate| matches!(candidate.replacement, Replacement::Summary(_)))
-                .filter_map(|candidate| self.candidate_cost_estimate(candidate))
-                .min_by(|a, b| a.value.total_cmp(&b.value));
-        }
-        let Replacement::Summary(root) = &candidate.replacement else {
-            // Exact compositions have a separate measured rate model.
-            return None;
-        };
-        let dag = planner_types::post_asap::compile_executable_dag(root).ok()?;
-        let mut value = 0.0;
-        let mut states = 0;
-        for node in &dag.nodes {
-            let family = match &node.payload {
-                ExecutableOperatorPayload::SummaryAgg { family, .. }
-                | ExecutableOperatorPayload::SummaryJoin { family, .. } => family,
-                _ => continue,
-            };
-            states += 1;
-            value += analytical_state_bytes(family)?;
-        }
-        if states == 0 || !value.is_finite() {
-            return None;
-        }
-        Some(CandidateCostEstimate {
-            value,
-            unit: "bytes_per_state_partition",
-            model: "backend_state_footprint_v1",
-            source: "analytical",
-            erp_record_ids: vec![],
-        })
-    }
-
-    pub fn new(workload_accuracy: AccuracyTarget) -> Self {
-        Self {
-            workload_accuracy,
-            lifecycle_costs: SummaryMaintenanceLifecycleCostInputs::default(),
-            summary_maintenance: SummaryMaintenanceCapabilities::default(),
-            window_framework_costs: Vec::new(),
-            offline_evidence: None,
-            offline_frequency_comparison: None,
-            exact_composition_costs: Vec::new(),
-            erp: None,
-        }
-    }
-
-    pub fn with_exact_composition_costs(
-        mut self,
-        costs: Vec<ExactCompositionCostEvidence>,
-    ) -> Self {
-        self.exact_composition_costs = costs;
-        self
-    }
-
-    pub fn with_erp(mut self, erp: ErpPlanningInput) -> Self {
-        self.erp = Some(erp);
-        self
-    }
-
-    pub fn erp_parameter_decision(
-        &self,
-        algorithm: SketchAlgorithm,
-        max_error: f64,
-        theoretical: SketchParams,
-    ) -> Option<ErpParameterDecision> {
-        self.erp
-            .as_ref()
-            .map(|erp| erp.select(algorithm, max_error, theoretical))
-    }
-
-    /// Use offline update CPU evidence for algorithm ordering. Physical costs
-    /// and accuracy guarantees retain their deployment-specific contracts.
-    pub fn with_offline_evidence(mut self, evidence: EmpiricalEvidenceProvider) -> Self {
-        self.offline_evidence = Some(evidence);
-        self
-    }
-
-    pub fn offline_evidence(&self) -> Option<&EmpiricalEvidenceProvider> {
-        self.offline_evidence.as_ref()
-    }
-
-    /// Opt into a fixed-snapshot frequency comparison. The caller asserts that
-    /// the explicit point queries use the supplied integer-key distribution and
-    /// offline probe population. The observed mean is an acceptance criterion
-    /// over that population, not a per-key or real-time error guarantee.
-    pub fn with_offline_frequency_comparison(
-        mut self,
-        evidence: OfflineComparisonEvidence,
-        request: OfflineComparisonRequest,
-    ) -> Self {
-        self.offline_frequency_comparison = Some((evidence, request));
-        self
-    }
-
-    /// Explain the same recommendation used by the frequency extension binder.
-    /// Exact selection and any unavailable comparison preserve exact execution.
-    pub fn offline_frequency_recommendation(
-        &self,
-        payload: &serde_json::Value,
-    ) -> Result<OfflineRecommendation, String> {
-        let (evidence, request) = self
-            .offline_frequency_comparison
-            .as_ref()
-            .ok_or("offline frequency comparison is not configured")?;
-        if payload
-            .get("item_label")
-            .and_then(|v| v.as_str())
-            .is_none_or(str::is_empty)
-            || payload
-                .get("item_value")
-                .and_then(|v| v.as_str())
-                .and_then(|v| v.parse::<i64>().ok())
-                .is_none()
-        {
-            return Err(
-                "offline point-frequency comparison requires an explicit integer item readout"
-                    .into(),
-            );
-        }
-        let accuracy: AccuracyTarget = serde_json::from_value(
-            payload
-                .get("accuracy")
-                .cloned()
-                .ok_or("missing frequency accuracy")?,
-        )
-        .map_err(|error| error.to_string())?;
-        let (eps, delta) = self
-            .combined_eps_delta(&accuracy)
-            .ok_or("exact accuracy requires exact execution")?;
-        if !eps.is_finite()
-            || eps <= 0.0
-            || eps >= 1.0
-            || !delta.is_finite()
-            || delta <= 0.0
-            || delta >= 1.0
-        {
-            return Err("invalid frequency accuracy budget".into());
-        }
-        let (width, depth) = Self::cms_width_depth(eps, delta);
-        let width = width
-            .checked_next_power_of_two()
-            .ok_or("frequency width overflows")?;
-        let mut request = request.clone();
-        // Only CMS is supported by the backend's frequency capability table.
-        // Caller-supplied minima cannot weaken workload/intent requirements.
-        request.formal_minimums = Some(vec![SketchConfiguration {
-            algorithm: SketchAlgorithm::Cms,
-            params: SketchParams::Cms { width, depth },
-        }]);
-        evidence
-            .sketch_evidence
-            .validate()
-            .map_err(|error| error.to_string())?;
-        // Exclude layouts the backend cannot instantiate before selecting the
-        // winner, so a cheap unsupported width cannot hide a legal measured one.
-        let mut evidence = evidence.clone();
-        evidence.sketch_evidence.records.retain(|row| {
-            row.algorithm == SketchAlgorithm::Cms
-                && matches!(&row.params, SketchParams::Cms { width, .. } if width.is_power_of_two())
-        });
-        evidence.query_bindings.retain(|binding| {
-            evidence
-                .sketch_evidence
-                .records
-                .iter()
-                .any(|row| row.id == binding.record_id)
-        });
-        recommend_offline(&evidence, &request)
-    }
-
-    fn rank_with_offline_evidence(
-        &self,
-        intent: &AggIntent,
-        defaults: Vec<SketchAlgorithm>,
-    ) -> Vec<SketchAlgorithm> {
-        let Some(provider) = &self.offline_evidence else {
-            return defaults;
-        };
-        let accuracy = intent_accuracy(intent);
-        if matches!(accuracy, AccuracyTarget::Exact) {
-            return defaults;
-        }
-        let (eps, delta) = asap_aware_mapping::replacement::accuracy_budget(&accuracy);
-        // Compare the parameters this deployment will actually bind, not the
-        // planner's default sizing or another benchmark configuration.
-        let costs: Option<Vec<_>> = defaults
-            .iter()
-            .map(|algorithm| {
-                let params = self.size_params(algorithm.clone(), intent, eps, delta);
-                let row = provider.lookup(algorithm, &params).ok()?;
-                Some((
-                    algorithm.clone(),
-                    row.metrics.resources.cpu.update_cpu_ns.as_ref()?.value,
-                ))
-            })
-            .collect();
-        let Some(mut costs) = costs else {
-            return defaults;
-        };
-        costs.sort_by(|left, right| left.1.total_cmp(&right.1));
-        costs.into_iter().map(|(algorithm, _)| algorithm).collect()
-    }
-
-    /// Keep concrete physical identities in Planner's complete-candidate estimate,
-    /// including distinct pane sizes using the same abstract window framework.
-    pub fn with_window_implementation_costs(
-        mut self,
-        costs: Vec<(String, SummaryWindowFramework, Cost)>,
-    ) -> Self {
-        self.window_framework_costs = costs
-            .into_iter()
-            .map(|(id, framework, cost)| (Some(id), framework, cost))
-            .collect();
-        self
-    }
-
-    pub fn with_summary_maintenance(
-        mut self,
-        lifecycle_costs: SummaryMaintenanceLifecycleCostInputs,
-        capabilities: SummaryMaintenanceCapabilities,
-    ) -> Self {
-        self.lifecycle_costs = lifecycle_costs;
-        self.summary_maintenance = capabilities;
-        self
-    }
-
-    /// The tighter (lower) of the workload policy and an intent's own
-    /// accuracy target, as `(eps, delta)`. `None` when either side is
-    /// `Exact` — mirrors `bind_kll_quantile.rs` / `bind_ddsketch_quantile.rs`
-    /// / `bind_hll_cardinality.rs` / `bind_cms_count.rs`'s identical
-    /// `match (accuracy, &intent_accuracy) {...}` block. (`TopK` has its
-    /// own combination rule — an `Exact` side there picks the *other*
-    /// side's budget rather than bailing — see [`Self::topk_eps_delta`].)
-    fn combined_eps_delta(&self, intent_accuracy: &AccuracyTarget) -> Option<(f64, f64)> {
-        match (&self.workload_accuracy, intent_accuracy) {
-            (AccuracyTarget::Exact, _) | (_, AccuracyTarget::Exact) => None,
-            (AccuracyTarget::Epsilon(a), AccuracyTarget::Epsilon(b)) => Some((a.min(*b), 0.01)),
-            (AccuracyTarget::Epsilon(a), AccuracyTarget::EpsilonDelta { epsilon, delta })
-            | (AccuracyTarget::EpsilonDelta { epsilon, delta }, AccuracyTarget::Epsilon(a)) => {
-                Some((a.min(*epsilon), *delta))
-            }
-            (
-                AccuracyTarget::EpsilonDelta {
-                    epsilon: a,
-                    delta: da,
-                },
-                AccuracyTarget::EpsilonDelta {
-                    epsilon: b,
-                    delta: db,
-                },
-            ) => Some((a.min(*b), da.min(*db))),
-        }
-    }
-
-    /// `TopK`'s own `(eps, delta)` combination — verbatim port of
-    /// `bind_cms_topk.rs`'s `bind` match. Unlike
-    /// [`Self::combined_eps_delta`], an `Exact` side does not bail: it
-    /// picks the *other* side's budget (falling back to the catalog
-    /// default `(0.01, 0.01)` only when both sides are `Exact`). Public
-    /// (within the crate) because [`crate::physical::post_asap::lower`]'s
-    /// `TopK { accuracy: Exact }` pre-pass needs the same combination.
-    pub(crate) fn topk_eps_delta(&self, intent_accuracy: &AccuracyTarget) -> (f64, f64) {
-        match (&self.workload_accuracy, intent_accuracy) {
-            (AccuracyTarget::Exact, AccuracyTarget::Exact) => (0.01, 0.01),
-            (AccuracyTarget::Exact, other) | (other, AccuracyTarget::Exact) => match other {
-                AccuracyTarget::Epsilon(a) => (*a, 0.01),
-                AccuracyTarget::EpsilonDelta { epsilon, delta } => (*epsilon, *delta),
-                AccuracyTarget::Exact => (0.01, 0.01),
-            },
-            (AccuracyTarget::Epsilon(a), AccuracyTarget::Epsilon(b)) => (a.min(*b), 0.01),
-            (AccuracyTarget::Epsilon(a), AccuracyTarget::EpsilonDelta { epsilon, delta })
-            | (AccuracyTarget::EpsilonDelta { epsilon, delta }, AccuracyTarget::Epsilon(a)) => {
-                (a.min(*epsilon), *delta)
-            }
-            (
-                AccuracyTarget::EpsilonDelta {
-                    epsilon: a,
-                    delta: da,
-                },
-                AccuracyTarget::EpsilonDelta {
-                    epsilon: b,
-                    delta: db,
-                },
-            ) => (a.min(*b), da.min(*db)),
-        }
-    }
-
-    /// Recall-tier-filtered, wire-cost-ordered top-k family candidates.
-    /// Verbatim port of `bind_cms_topk.rs`'s `TopkRecallTier` +
-    /// `candidate_families` + `cheapest_family`. Public (within the
-    /// crate) for the same reason as [`Self::topk_eps_delta`].
-    pub(crate) fn topk_family_order(
-        &self,
-        intent_accuracy: &AccuracyTarget,
-    ) -> Vec<SketchAlgorithm> {
-        let tight = matches!(self.workload_accuracy, AccuracyTarget::Exact)
-            || matches!(intent_accuracy, AccuracyTarget::Exact);
-        let allowed: &[SketchAlgorithm] = if tight {
-            &[SketchAlgorithm::CountSketchWithHeap]
-        } else {
-            &[
-                SketchAlgorithm::CmsWithHeap,
-                SketchAlgorithm::CountSketchWithHeap,
-            ]
-        };
-        let table = WireCostTable::default();
-        let mut ranked: Vec<SketchAlgorithm> = allowed.to_vec();
-        ranked.sort_by_key(|algorithm| table.for_algorithm(algorithm).per_flush());
-        ranked
-    }
-
-    /// `(width, depth)` for a CMS-family sketch under `(eps, delta)`.
-    /// Verbatim: `w = ⌈e/eps⌉` clamped to `≥2`, `d = ⌈ln(1/delta)⌉`
-    /// clamped to `≥1`.
-    fn cms_width_depth(eps: f64, delta: f64) -> (u32, u32) {
-        let w = (std::f64::consts::E / eps).ceil().max(2.0) as u32;
-        let d = (1.0 / delta).ln().ceil().max(1.0) as u32;
-        (w, d)
-    }
-}
-
-/// The workload-level accuracy target combined with an intent's own —
-/// pulls the intent's `accuracy` field out of whichever variant carries
-/// one. `_` covers every non-approximate-capable variant, unreachable in
-/// practice (`rank_candidates`/`size_params` are only ever called for
-/// `Quantile`/`Cardinality`/`Count`/`TopK` — the shapes
-/// `replacement::SketchAlgorithmStrategy::replacements` handles).
-fn intent_accuracy(intent: &AggIntent) -> AccuracyTarget {
-    match intent {
-        AggIntent::Quantile { accuracy, .. }
-        | AggIntent::Cardinality { accuracy, .. }
-        | AggIntent::TopK { accuracy, .. }
-        | AggIntent::FrequencyL2 { accuracy, .. }
-        | AggIntent::FrequencyEntropy { accuracy, .. } => accuracy.clone(),
-        AggIntent::Count { accuracy } => accuracy.clone(),
-        _ => AccuracyTarget::Exact,
-    }
-}
-
-impl CostModel for ControlPlaneCostModel {
-    fn summary_support_evidence(
-        &self,
-        summary: &planner_types::post_asap::SummaryNode,
-    ) -> Option<bool> {
-        use planner_types::post_asap::{NonNegativeWeightProof, WeightDomain};
-        let dag =
-            planner_types::post_asap::compile_executable_dag(&std::rc::Rc::new(summary.clone()))
-                .ok()?;
-        // Counter-weighted heaps now consume explicit rate values. The raw
-        // ingestion adapter cannot bind that frontier as counter deltas.
-        let requires_rate_values = dag.nodes.iter().any(|node| matches!(&node.payload,
-            ExecutableOperatorPayload::SummaryAgg { input, family: SummaryFamilyType::Sketch(kind, _), .. }
-                if matches!(kind.algorithm(), SketchAlgorithm::CmsWithHeap | SketchAlgorithm::CountSketchWithHeap)
-                && matches!(input.weight_domain, WeightDomain::NonNegative { proof: NonNegativeWeightProof::ResetAwareCounterDerivative })));
-        requires_rate_values.then_some(false)
-    }
-
-    fn candidate_cost(
-        &self,
-        candidate: &ReplacementSubDAG,
-        _target: &TargetSubDAG<'_>,
-    ) -> Option<Cost> {
-        self.candidate_cost_estimate(candidate)
-            .map(|estimate| Cost(estimate.value))
-    }
-
-    fn value_operation_capabilities(&self) -> ValueOperationCapabilities {
-        ValueOperationCapabilities {
-            query_time: true,
-            ingestion_time: false,
-        }
-    }
-
-    fn exact_composition_cost_inputs(
-        &self,
-        request: &ExactCompositionCostRequest<'_>,
-    ) -> ExactCompositionCostInputs {
-        let provenance = || CostProvenance {
-            model: "ASAPQuery measured exact composition".into(),
-            version: "unavailable".into(),
-        };
-        let Some(row) = self
-            .exact_composition_costs
-            .iter()
-            .find(|row| row.matches(request))
-        else {
-            return ExactCompositionCostInputs::unknown(provenance());
-        };
-        ExactCompositionCostInputs {
-            exact_cost_per_row: Some(row.exact_cpu_ns_per_row),
-            expected_input_rows: Some(row.expected_input_rows),
-            expected_output_rows: Some(row.expected_output_rows),
-            summary_maintenance_cost_per_update: Some(row.summary_maintenance_cpu_ns_per_update),
-            summary_read_cost: Some(row.summary_read_cpu_ns),
-            update_rate: Some(row.update_rate_per_second),
-            evaluation_rate: Some(EvaluationRate(
-                row.evaluation_rate_per_second * request.effective_consumer_count as f64,
-            )),
-            raw_recompute_cost: Some(row.raw_recompute_cpu_ns),
-            unit: asap_aware_mapping::CostUnit::CostUnitsPerSecond,
-            provenance: CostProvenance {
-                model: format!(
-                    "ASAPQuery measured exact composition ({})",
-                    row.data_snapshot_id
-                ),
-                version: row.model_version.clone(),
-            },
-        }
-    }
-
-    fn summary_maintenance_lifecycle_cost_inputs(
-        &self,
-        _summary: &planner_types::post_asap::SummaryNode,
-    ) -> SummaryMaintenanceLifecycleCostInputs {
-        self.lifecycle_costs.clone()
-    }
-
-    fn summary_maintenance_capabilities(
-        &self,
-        _summary: &planner_types::post_asap::SummaryNode,
-    ) -> SummaryMaintenanceCapabilities {
-        self.summary_maintenance
-    }
-
-    fn complete_summary_candidate_estimate(
-        &self,
-        _root: &planner_types::post_asap::SummaryNode,
-        _target: Option<&planner_types::pre_asap::QueryExpr>,
-        deployments: &[CostedSummaryDeployment<'_>],
-        _horizon: Option<Horizon>,
-        _expected_reads: Option<f64>,
-        _required_accuracy: &[AccuracyTarget],
-    ) -> Option<CompleteSummaryCandidateEstimate> {
-        // One compiler candidate describes the complete concrete realization
-        // of this query DAG. The current executor exposes one anchored window
-        // framework across all reachable summary states; represent that full
-        // per-state assignment explicitly rather than relying on traversal
-        // order or leaving any state uncosted.
-        if deployments.is_empty() || self.window_framework_costs.is_empty() {
-            return None;
-        }
-        let lifecycle_cost: f64 = deployments
-            .iter()
-            .map(|deployment| deployment.selected_cost.0)
-            .sum();
-        self.window_framework_costs
-            .iter()
-            // GOS/error propagation is introduced by the later adaptation
-            // slice. Until then, do not claim an approximate exponential
-            // histogram window is exact.
-            .filter(|(_, framework, _)| {
-                !matches!(framework, SummaryWindowFramework::ExponentialHistogram)
-            })
-            .filter(|(_, _, cost)| cost.0.is_finite() && cost.0 >= 0.0)
-            .min_by(|left, right| {
-                left.2
-                     .0
-                    .total_cmp(&right.2 .0)
-                    .then_with(|| left.0.cmp(&right.0))
-            })
-            .map(
-                |(id, framework, physical_cost)| CompleteSummaryCandidateEstimate {
-                    physical_plan_id: id.clone(),
-                    cost: Cost(lifecycle_cost + physical_cost.0),
-                    window_frameworks: vec![Some(framework.clone()); deployments.len()],
-                    window_accuracy_guarantee: Some(
-                        planner_types::post_asap::ResultGuarantee::exact(
-                            "backend exact window implementation",
-                        ),
-                    ),
-                },
-            )
-    }
-
-    fn rank_candidates(
-        &self,
-        intent: &AggIntent,
-        candidates: &[SketchAlgorithm],
-    ) -> Vec<SketchAlgorithm> {
-        let defaults = match intent {
-            // bind_ddsketch_quantile (priority 6) always wins the old
-            // dispatcher's tie-break over bind_kll_quantile (priority 5)
-            // whenever both can bind (see bind_kll_quantile.rs's
-            // `priority()` doc — no eps-dependent split actually exists
-            // between the two rules today, both read the same combined
-            // eps). Pure static reorder: DDSketch before Kll.
-            AggIntent::Quantile { .. } => {
-                let mut v = candidates.to_vec();
-                if let Some(pos) = v.iter().position(|k| *k == SketchAlgorithm::DDSketch) {
-                    let dd = v.remove(pos);
-                    v.insert(0, dd);
-                }
-                v
-            }
-            AggIntent::TopK { .. } => {
-                let preferred = self.topk_family_order(&intent_accuracy(intent));
-                // Distinct grouping implementations can use the same algorithm.
-                // Ranking must preserve the candidate multiset, not deduplicate it.
-                let mut ranked = candidates.to_vec();
-                ranked.sort_by_key(|kind| {
-                    preferred
-                        .iter()
-                        .position(|candidate| candidate == kind)
-                        .unwrap_or(preferred.len())
-                });
-                ranked
-            }
-            // Cardinality → Hll, Count → Cms: control_plane only ever
-            // binds one family for each; asap-plan's static order already
-            // puts it first (`summary_candidates`), nothing to reorder.
-            _ => candidates.to_vec(),
-        };
-        self.rank_with_offline_evidence(intent, defaults)
-    }
-
-    fn size_params(
-        &self,
-        kind: SketchAlgorithm,
-        intent: &AggIntent,
-        eps: f64,
-        delta: f64,
-    ) -> SketchParams {
-        let (max_error, theoretical) = match intent {
-            AggIntent::TopK { k, .. } => {
-                let (eps, delta) = self.topk_eps_delta(&intent_accuracy(intent));
-                let (w, d) = Self::cms_width_depth(eps, delta);
-                // CountSketch/CMS columns MUST be a power of two: the
-                // agent (asapedgeprocessor config_validate) rejects
-                // non-pow2 cols. Round up — this only tightens the
-                // additive bound (ε ≤ e/w).
-                let w = w.next_power_of_two();
-                let heap_size = *k as u32;
-                let params = match kind {
-                    SketchAlgorithm::CmsWithHeap => SketchParams::CmsWithHeap {
-                        width: w,
-                        depth: d,
-                        heap_size,
-                    },
-                    _ => SketchParams::CountSketchWithHeap {
-                        width: w,
-                        depth: d,
-                        heap_size,
-                    },
-                };
-                (eps, params)
-            }
-            _ => {
-                let Some((eps, delta)) = self.combined_eps_delta(&intent_accuracy(intent)) else {
-                    // Either side Exact: unreachable in practice for
-                    // Quantile/Cardinality/Count (an Exact intent never
-                    // reaches the replacement strategies upstream — see
-                    // `realizations_for_intent`'s `Exact => exact_realization`
-                    // arm), kept as a safe fallback rather than a panic.
-                    return asap_aware_mapping::DefaultCostModel
-                        .size_params(kind, intent, eps, delta);
-                };
-                let params = match kind.clone() {
-                    SketchAlgorithm::Kll => SketchParams::Kll {
-                        k: kll_k_for_eps(eps),
-                    },
-                    SketchAlgorithm::DDSketch if (0.0..1.0).contains(&eps) => {
-                        SketchParams::DDSketch { alpha: eps }
-                    }
-                    SketchAlgorithm::Hll => SketchParams::Hll {
-                        precision: hll_precision_for_eps(eps),
-                    },
-                    SketchAlgorithm::Cms => {
-                        let (w, d) = Self::cms_width_depth(eps, delta);
-                        SketchParams::Cms { width: w, depth: d }
-                    }
-                    other => {
-                        asap_aware_mapping::DefaultCostModel.size_params(other, intent, eps, delta)
-                    }
-                };
-                (eps, params)
-            }
-        };
-        let decision = match (
-            &self.erp,
-            super::super::erp::ReadoutEvidence::for_intent(&kind, intent),
-        ) {
-            (Some(policy), Some(readout)) => {
-                Some(policy.select_readout(kind, readout, max_error, theoretical.clone()))
-            }
-            _ => self.erp_parameter_decision(kind, max_error, theoretical.clone()),
-        };
-        match decision {
-            Some(ErpParameterDecision::Empirical {
-                params,
-                record_id,
-                observed_error,
-                estimated_cost,
-            }) => {
-                tracing::info!(erp_record_id = %record_id, observed_error, estimated_cost, "selected empirical ERP sketch parameters");
-                params
-            }
-            Some(ErpParameterDecision::TheoreticalFallback { params, reason }) => {
-                tracing::warn!(reason = %reason, "ERP miss or drift; using theoretical sizing");
-                params
-            }
-            Some(ErpParameterDecision::ExactFallback { reason }) => {
-                tracing::warn!(reason = %reason, "ERP and theoretical sizing unavailable; exact fallback required");
-                theoretical
-            }
-            None => theoretical,
-        }
-    }
-
-    /// Realize control_plane's `Frequency` (`ext_kind: "frequency"`)
-    /// point-query intent (ASAPController#150). `SketchAlgorithm::Cms` (heap-
-    /// less — a point lookup needs no heap, unlike `TopK`) matches
-    /// `capability_matching::pick_family`'s own `Frequency → Cms` mapping
-    /// (and its `is_valid_pair` truth table, which declares `(Cms,
-    /// Frequency)` valid and has no `(CountSketch, Frequency)` entry) —
-    /// the newer, tested, currently-authoritative source of truth for this
-    /// choice, not the older `sketch_catalog::sketch_type_for_op`'s
-    /// `SketchType::CountSketch` (a genuinely different sketch algorithm
-    /// under a same-ish name — `SketchType` has separate `CountSketch`
-    /// and `CountMinSketch` variants; that mapping predates
-    /// `capability_matching` and disagrees with it). Sized the same
-    /// `e/eps` width / `ln(1/delta)` depth way every other CMS-family kind
-    /// here is. `PassThrough` for any other `ext_kind` (none exist yet)
-    /// or an unparseable/`Exact` accuracy, matching every other
-    /// approximate-capable intent's `Exact ⇒ no sketch form` policy.
-    fn realize_extension(&self, ext_kind: &str, payload: &serde_json::Value) -> Realization {
-        if ext_kind != FREQUENCY_EXT_KIND {
-            return Realization::PassThrough;
-        }
-        if self.offline_frequency_comparison.is_some() {
-            return self
-                .offline_frequency_recommendation(payload)
-                .ok()
-                .and_then(|recommendation| recommendation.selected_sketch().cloned())
-                .map(|configuration| {
-                    Realization::Sketch(planner_types::post_asap::SketchKind::new(
-                        configuration.algorithm,
-                        configuration.params,
-                    ))
-                })
-                .unwrap_or(Realization::PassThrough);
-        }
-        let Some(accuracy) = payload
-            .get("accuracy")
-            .and_then(|v| serde_json::from_value::<AccuracyTarget>(v.clone()).ok())
-        else {
-            return Realization::PassThrough;
-        };
-        let Some((eps, delta)) = self.combined_eps_delta(&accuracy) else {
-            return Realization::PassThrough;
-        };
-        let (width, depth) = Self::cms_width_depth(eps, delta);
-        Realization::Sketch(planner_types::post_asap::SketchKind::new(
-            SketchAlgorithm::Cms,
-            SketchParams::Cms {
-                width: width.next_power_of_two(),
-                depth,
-            },
-        ))
-    }
-
-    /// Build the `SketchQuery` readout for `Frequency`. `item_label`/
-    /// `item_value` are populated by `intent_algebra::agg_intent::frequency`
-    /// once the filter value is threaded through (ASAPQuery-backend Phase
-    /// 3 — not yet); until then `payload` never has them, so this
-    /// correctly falls back to the bare bucket total
-    /// (`key: SampleValue, value: None`) — the same answer a `Frequency`
-    /// intent with no item filter should give either way.
-    fn readout_extension(
-        &self,
-        ext_kind: &str,
-        payload: &serde_json::Value,
-        _col: &ColumnRef,
-    ) -> SketchQuery {
-        debug_assert_eq!(
-            ext_kind, FREQUENCY_EXT_KIND,
-            "readout_extension called for an ext_kind realize_extension never realizes as Sketch"
-        );
-        let item_label = payload.get("item_label").and_then(|v| v.as_str());
-        let item_value = payload
-            .get("item_value")
-            .and_then(|v| v.as_str())
-            .map(str::to_string);
-        match item_label {
-            Some(label) => SketchQuery::PointCount {
-                key: ColumnRef::Named(label.to_string()),
-                value: item_value,
-            },
-            None => SketchQuery::PointCount {
-                key: ColumnRef::SampleValue,
-                value: None,
-            },
-        }
-    }
-}
-
-/// A `CostModel` that forces a single family for whichever intent it's
-/// asked to rank, delegating parameter sizing to an inner
-/// [`ControlPlaneCostModel`]. Used by `physical::workload_planner::bind_workload_typed`,
-/// which already has a definitive family pick from the capability matrix
-/// (or a `sketch_type_override`) and just needs the matching binding, not
-/// a fresh selection decision.
-pub struct ForcedFamilyCostModel {
-    inner: ControlPlaneCostModel,
-    forced: SketchAlgorithm,
-}
-
-impl ForcedFamilyCostModel {
-    pub fn new(workload_accuracy: AccuracyTarget, forced: SketchAlgorithm) -> Self {
-        Self {
-            inner: ControlPlaneCostModel::new(workload_accuracy),
-            forced,
-        }
-    }
-}
-
-impl CostModel for ForcedFamilyCostModel {
-    fn summary_support_evidence(
-        &self,
-        summary: &planner_types::post_asap::SummaryNode,
-    ) -> Option<bool> {
-        self.inner.summary_support_evidence(summary)
-    }
-
-    fn candidate_cost(
-        &self,
-        candidate: &ReplacementSubDAG,
-        target: &TargetSubDAG<'_>,
-    ) -> Option<Cost> {
-        self.inner.candidate_cost(candidate, target)
-    }
-
-    fn rank_candidates(
-        &self,
-        intent: &AggIntent,
-        candidates: &[SketchAlgorithm],
-    ) -> Vec<SketchAlgorithm> {
-        let mut ranked = self.inner.rank_candidates(intent, candidates);
-        if let Some(pos) = ranked.iter().position(|kind| kind == &self.forced) {
-            let forced = ranked.remove(pos);
-            ranked.insert(0, forced);
-        }
-        ranked
-    }
-
-    fn size_params(
-        &self,
-        kind: SketchAlgorithm,
-        intent: &AggIntent,
-        eps: f64,
-        delta: f64,
-    ) -> SketchParams {
-        // Latest Planner validates the selected candidate against its own
-        // accuracy algebra.  Reuse its sizing formula for an explicitly
-        // forced family so the override changes only algorithm preference,
-        // never weakens the requested guarantee.
-        asap_aware_mapping::DefaultCostModel.size_params(kind, intent, eps, delta)
-    }
-
-    // `realize_extension`/`readout_extension` delegate to `inner` rather
-    // than falling back to the trait's default `PassThrough` — otherwise
-    // `bind_workload_typed`'s `Frequency` contract row (which binds via
-    // `ForcedFamilyCostModel`, already knowing its family pick from the
-    // capability matrix) would still decline pending #150 even after
-    // `ControlPlaneCostModel` itself learned to realize it.
-    fn realize_extension(&self, ext_kind: &str, payload: &serde_json::Value) -> Realization {
-        self.inner.realize_extension(ext_kind, payload)
-    }
-
-    fn readout_extension(
-        &self,
-        ext_kind: &str,
-        payload: &serde_json::Value,
-        col: &ColumnRef,
-    ) -> SketchQuery {
-        self.inner.readout_extension(ext_kind, payload, col)
-    }
-}
-
-/// Map an ε rank-error budget to a KLL stream-size `k`. Verbatim port of
-/// `bind_kll_quantile.rs::kll_k_for_eps` — power-of-two rungs (200, 400,
-/// 800, 2048, 8192) so the in-tree `algebra::directory` continues to
-/// recognise the parameter.
-fn kll_k_for_eps(eps: f64) -> u32 {
-    if eps <= 0.0 {
-        return 8192;
-    }
-    if eps >= 0.01 {
-        200
-    } else if eps >= 0.005 {
-        400
-    } else if eps >= 0.0025 {
-        800
-    } else if eps >= 0.001 {
-        2048
-    } else {
-        8192
-    }
-}
-
-/// Map an ε standard-error budget to the HLL `precision`. Verbatim port
-/// of `bind_hll_cardinality.rs::hll_precision_for_eps`.
-fn hll_precision_for_eps(eps: f64) -> u8 {
-    if eps <= 0.0 {
-        return 16;
-    }
-    if eps >= 0.03 {
-        10
-    } else if eps >= 0.015 {
-        12
-    } else if eps >= 0.008 {
-        14
-    } else {
-        16
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use planner_types::pre_asap::{default_cardinality, default_quantile};
-
-    fn eps(e: f64) -> AccuracyTarget {
-        AccuracyTarget::Epsilon(e)
-    }
-
-    #[test]
-    fn quantile_always_prefers_ddsketch_over_kll() {
-        let model = ControlPlaneCostModel::new(AccuracyTarget::Epsilon(0.1));
-        let ranked = model.rank_candidates(
-            &default_quantile(0.99),
-            &[SketchAlgorithm::Kll, SketchAlgorithm::DDSketch],
-        );
-        assert_eq!(
-            ranked,
-            vec![SketchAlgorithm::DDSketch, SketchAlgorithm::Kll]
-        );
-    }
-
-    #[test]
-    fn kll_k_matches_bind_kll_quantile_rungs() {
-        let model = ControlPlaneCostModel::new(AccuracyTarget::Epsilon(1.0));
-        let params = model.size_params(SketchAlgorithm::Kll, &default_quantile(0.99), 0.01, 0.01);
-        assert_eq!(params, SketchParams::Kll { k: 200 });
-
-        let model = ControlPlaneCostModel::new(AccuracyTarget::Epsilon(1.0));
-        let tight = planner_types::pre_asap::AggIntent::Quantile {
-            col: None,
-            q: 0.99,
-            accuracy: eps(0.001),
-        };
-        let params = model.size_params(SketchAlgorithm::Kll, &tight, 0.01, 0.01);
-        assert_eq!(params, SketchParams::Kll { k: 2048 });
-    }
-
-    #[test]
-    fn hll_precision_matches_bind_hll_cardinality_rungs() {
-        let model = ControlPlaneCostModel::new(AccuracyTarget::Epsilon(1.0));
-        let params = model.size_params(SketchAlgorithm::Hll, &default_cardinality(), 0.01, 0.01);
-        assert_eq!(params, SketchParams::Hll { precision: 14 });
-    }
-
-    #[test]
-    fn topk_tight_tier_forces_countsketch_even_when_ranked_from_cms() {
-        let model = ControlPlaneCostModel::new(AccuracyTarget::Exact);
-        let intent = planner_types::pre_asap::AggIntent::TopK {
-            k: 5,
-            accuracy: eps(0.01),
-        };
-        let ranked = model.rank_candidates(
-            &intent,
-            &[
-                SketchAlgorithm::CmsWithHeap,
-                SketchAlgorithm::CountSketchWithHeap,
-            ],
-        );
-        assert_eq!(
-            ranked,
-            vec![
-                SketchAlgorithm::CountSketchWithHeap,
-                SketchAlgorithm::CmsWithHeap
-            ]
-        );
-    }
-
-    // Workload search can enumerate multiple layouts for the same algorithm.
-    #[test]
-    fn topk_ranking_preserves_duplicate_candidates() {
-        let model = ControlPlaneCostModel::new(AccuracyTarget::Exact);
-        let intent = AggIntent::TopK {
-            k: 1,
-            accuracy: eps(0.01),
-        };
-        let mut candidates = vec![
-            SketchAlgorithm::CmsWithHeap,
-            SketchAlgorithm::CountSketchWithHeap,
-            SketchAlgorithm::CmsWithHeap,
-            SketchAlgorithm::CountSketchWithHeap,
-        ];
-        let mut ranked = model.rank_candidates(&intent, &candidates);
-        candidates.sort();
-        ranked.sort();
-        assert_eq!(ranked, candidates);
-    }
-
-    #[test]
-    fn topk_loose_tier_prefers_cheaper_cms_heap() {
-        let model = ControlPlaneCostModel::new(AccuracyTarget::Epsilon(0.1));
-        let intent = planner_types::pre_asap::AggIntent::TopK {
-            k: 5,
-            accuracy: eps(0.01),
-        };
-        let ranked = model.rank_candidates(
-            &intent,
-            &[
-                SketchAlgorithm::CmsWithHeap,
-                SketchAlgorithm::CountSketchWithHeap,
-            ],
-        );
-        assert_eq!(ranked[0], SketchAlgorithm::CmsWithHeap);
-    }
-
-    #[test]
-    fn topk_width_is_rounded_up_to_a_power_of_two() {
-        let model = ControlPlaneCostModel::new(AccuracyTarget::Epsilon(0.1));
-        let intent = planner_types::pre_asap::AggIntent::TopK {
-            k: 5,
-            accuracy: eps(0.01),
-        };
-        let params = model.size_params(SketchAlgorithm::CmsWithHeap, &intent, 0.0, 0.0);
-        let SketchParams::CmsWithHeap {
-            width, heap_size, ..
-        } = params
-        else {
-            panic!("expected CmsWithHeap params");
-        };
-        assert!(width.is_power_of_two());
-        assert_eq!(heap_size, 5);
-    }
-}
diff --git a/control_plane/src/physical/post_asap/deployment_expr.rs b/control_plane/src/physical/post_asap/deployment_expr.rs
deleted file mode 100644
index b0372b6a6..000000000
--- a/control_plane/src/physical/post_asap/deployment_expr.rs
+++ /dev/null
@@ -1,220 +0,0 @@
-//! Deployment wrappers around ASAPPlanner's canonical post-ASAP summary IR.
-//!
-//! [`PostAsapPlan`] adds named `LetBinding` / `Ref` sharing for sibling walks.
-//! [`PhysicalExpr`] adds edge/backend/archive placement. The lowerer produces
-//! `Committed`; the stage allocator and emitter also handle explicit raw
-//! placements supplied by callers.
-
-#![allow(dead_code)]
-
-use std::rc::Rc;
-use std::time::Duration;
-
-use planner_types::post_asap::{SketchAlgorithm, SketchParams, SummaryNode};
-
-/// Backend-local wrapper around the Planner-owned post-ASAP tree.
-///
-/// It adds only named sharing required during physical placement and emission.
-#[derive(Debug, Clone)]
-pub enum PostAsapPlan {
-    /// A committed post-ASAP sub-tree — `SummaryAgg` / `SummaryEstimate` /
-    /// `SummaryMerge` / `KeepPreAsap`, whatever the replacement strategy
-    /// (or a deployment-specific pre-pass) produced.
-    Summary(Rc<SummaryNode>),
-
-    /// SQL `WITH name AS (expr) SELECT ... FROM name` / sketch-state
-    /// fan-in: name a sub-expression so multiple parents can reference it.
-    /// Carries the two-tier fan-in described in design.md §1339 — outer
-    /// let names a `Window` output, inner let names a `SummaryAgg{Kll}`
-    /// shared by two `SummaryEstimate` parents reading different quantiles.
-    LetBinding {
-        /// Binding name; must be unique within the surrounding scope.
-        name: String,
-        /// Bound sub-expression.
-        expr: Rc<PostAsapPlan>,
-        /// In-scope sub-tree — references the binding via `Ref`.
-        child: Rc<PostAsapPlan>,
-    },
-
-    /// Reference a `LetBinding` by name. Resolution is lexical (scope
-    /// follows the surrounding `LetBinding` chain).
-    Ref {
-        /// Bound name.
-        name: String,
-    },
-}
-
-/// Physical placement — "where/how". Wraps an already-committed
-/// [`PostAsapPlan`] (summary selection is final by the time it reaches here)
-/// with placement
-/// info: build at the edge (the common case — `Committed` needs no extra
-/// annotation since the `PostAsapPlan` itself is the whole story), or one of
-/// Phase ε.1's two backend/archive placements.
-#[derive(Debug, Clone)]
-pub enum PhysicalExpr {
-    /// Sketch built at the edge — the default placement. The committed
-    /// `PostAsapPlan` alone determines the output.
-    Committed(PostAsapPlan),
-
-    /// Phase ε.1 Mode 2: no sketch processor at the edge — raw OTLP
-    /// forwards to the backend, which builds the sketch at ingest. The
-    /// `family` and `params` are the sketch the backend will build, so
-    /// the backend's `InstalledPrecomputePlan` `aggregation_input` is `raw` for
-    /// this metric.
-    RawAtEdgeSketchAtBackend {
-        /// Sketch family the backend will build at ingest.
-        family: SketchAlgorithm,
-        /// Sketch parameters (validated by the catalog at bind time).
-        params: SketchParams,
-        /// Input sub-tree — typically `Summary(Logical(Window{...}))` or
-        /// `Summary(Logical(Scan{...}))`.
-        child: Box<PostAsapPlan>,
-    },
-
-    /// Phase ε.1 Mode 3: no sketch processor at the edge — raw OTLP ships
-    /// directly to Prometheus's native OTLP receiver at
-    /// `/api/v1/otlp/v1/metrics`. The backend HTTP-forwards queries to
-    /// Prometheus's `/api/v1/query` endpoint (the `prometheus_remote`
-    /// engine). Accuracy is exact (ε = 0) — Prometheus owns the raw
-    /// samples; no sketch math is involved.
-    ///
-    /// The variant carries enough projection info for the edge agent's
-    /// pipeline to ship the right metric with the right labels, and for
-    /// the backend's storage routing to claim the metric.
-    RawAtEdgePrometheusArchive {
-        /// Metric name as it appears at the edge (and in
-        /// `BackendStorageRouting`).
-        metric: String,
-        /// Optional window — when present, the planner pre-bucketed the
-        /// metric into windowed scrape data. Prometheus stores the raw
-        /// stream regardless; the field is informational for the L5
-        /// emitter so it can size scrape intervals consistently.
-        window: Option<Duration>,
-        /// Label projection — labels promoted from OTLP resource
-        /// attributes by Prometheus's
-        /// `otlp.promote_resource_attributes` config. Default
-        /// `["service.name", "service.namespace", "service.instance.id"]`
-        /// — see `deploy/configs/prometheus-otlp-receiver.yml`.
-        label_proj: Vec<String>,
-    },
-}
-
-impl PhysicalExpr {
-    /// Convenience constructor for the common case: a committed
-    /// `SummaryNode` sketch-built at the edge, no placement wrapper.
-    pub fn committed(node: Rc<SummaryNode>) -> Self {
-        PhysicalExpr::Committed(PostAsapPlan::Summary(node))
-    }
-}
-
-// ── Tests ─────────────────────────────────────────────────────────────────────
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use asap_types::enums::WindowKind;
-    use planner_types::pre_asap::{Column, DataType, QueryExpr, Schema, Source};
-    use std::time::Duration;
-
-    fn ts_scan() -> QueryExpr {
-        let schema = Schema::with_time_index(
-            vec![
-                Column {
-                    name: "ts".into(),
-                    dtype: DataType::Timestamp,
-                    nullable: false,
-                    table: None,
-                },
-                Column {
-                    name: "service".into(),
-                    dtype: DataType::Utf8,
-                    nullable: false,
-                    table: None,
-                },
-                Column {
-                    name: "value".into(),
-                    dtype: DataType::Float64,
-                    nullable: false,
-                    table: None,
-                },
-            ],
-            0,
-            vec![vec![0, 1]],
-        );
-        let pred = crate::test_support::label_eq_predicate("service", "api", &schema)
-            .expect("service column present in schema");
-        QueryExpr::Scan {
-            source: Source::TimeSeries {
-                metric: "http_request_duration_seconds".into(),
-            },
-            predicates: vec![pred],
-            schema,
-        }
-    }
-
-    fn windowed_scan() -> QueryExpr {
-        QueryExpr::TimeRange {
-            range: Duration::from_secs(300),
-            child: Rc::new(ts_scan()),
-        }
-    }
-
-    #[test]
-    fn committed_wraps_an_implement_tree_result() {
-        let q = QueryExpr::Aggregate {
-            reduction: planner_types::pre_asap::Reduction::by(vec![]),
-            measures: vec![planner_types::pre_asap::AggIntent::Quantile {
-                col: None,
-                q: 0.99,
-                accuracy: crate::types::AccuracyTarget::Epsilon(0.01),
-            }],
-            output_names: Vec::new(),
-            having: None,
-            child: Rc::new(windowed_scan()),
-        };
-        let node = crate::planner_selection::select_query(
-            &q,
-            &crate::physical::post_asap::cost_model::ForcedFamilyCostModel::new(
-                crate::types::AccuracyTarget::Epsilon(0.01),
-                planner_types::post_asap::SketchAlgorithm::Kll,
-            ),
-        )
-        .expect("implements");
-        let e = PhysicalExpr::committed(node);
-        match e {
-            PhysicalExpr::Committed(PostAsapPlan::Summary(node)) => match &node.expr {
-                planner_types::post_asap::SummaryExpr::SummaryEstimate {
-                    query,
-                    summary_input,
-                } => {
-                    assert!(
-                        matches!(query, planner_types::post_asap::SketchQuery::Quantile { q } if *q == 0.99)
-                    );
-                    match &summary_input.expr {
-                        planner_types::post_asap::SummaryExpr::SummaryAgg {
-                            family, child, ..
-                        } => {
-                            assert_eq!(
-                                family,
-                                &planner_types::post_asap::SummaryFamilyType::Sketch(
-                                    planner_types::post_asap::SketchKind::new(
-                                        SketchAlgorithm::Kll,
-                                        SketchParams::Kll { k: 269 },
-                                    ),
-                                    planner_types::post_asap::GroupingStrategy::default(),
-                                )
-                            );
-                            assert!(matches!(
-                                child.expr,
-                                planner_types::post_asap::SummaryExpr::KeepPreAsap(_)
-                            ));
-                        }
-                        other => panic!("expected SummaryAgg, got {other:?}"),
-                    }
-                }
-                other => panic!("expected SummaryEstimate, got {other:?}"),
-            },
-            other => panic!("expected Committed(Summary(_)), got {other:?}"),
-        }
-    }
-}
diff --git a/control_plane/src/physical/post_asap/lower.rs b/control_plane/src/physical/post_asap/lower.rs
deleted file mode 100644
index aa572cdf8..000000000
--- a/control_plane/src/physical/post_asap/lower.rs
+++ /dev/null
@@ -1,124 +0,0 @@
-//! Query binding delegates selection to Planner's costed workload search.
-
-#![allow(dead_code)]
-
-use std::rc::Rc;
-
-use asap_aware_mapping::cost_model::CostModel;
-use thiserror::Error;
-
-use crate::physical::post_asap::cost_model::ControlPlaneCostModel;
-use crate::physical::post_asap::deployment_expr::{PhysicalExpr, PostAsapPlan};
-use crate::types::AccuracyTarget;
-use planner_types::pre_asap::{AggIntent, QueryExpr};
-
-/// Errors surfaced by the `bind_query_expr` lowering.
-#[derive(Debug, Error)]
-pub enum BindingError {
-    /// L3 schema derivation failed while lifting an edge to `SummarySchema` —
-    /// forwarded from `asap_aware_mapping::replacement`.
-    #[error("L3->L4 implementation failed: {0}")]
-    Implement(#[from] crate::planner_selection::SelectionError),
-}
-
-/// Lower an L3 query under the supplied accuracy target using
-/// [`ControlPlaneCostModel`]. Returns [`PhysicalExpr::Committed`]; placement
-/// is separate from summary selection.
-pub fn bind_query_expr(
-    expr: &QueryExpr,
-    accuracy: AccuracyTarget,
-) -> Result<PhysicalExpr, BindingError> {
-    let cost_model = ControlPlaneCostModel::new(accuracy);
-    bind_query_expr_with_cost_model(expr, &cost_model)
-}
-
-/// Bind a query using the explicitly supplied planning cost model.
-pub fn bind_query_expr_with_cost_model(
-    expr: &QueryExpr,
-    cost_model: &dyn CostModel,
-) -> Result<PhysicalExpr, BindingError> {
-    Ok(PhysicalExpr::Committed(bind_recursive(expr, cost_model)?))
-}
-
-fn bind_recursive(
-    expr: &QueryExpr,
-    cost_model: &dyn CostModel,
-) -> Result<PostAsapPlan, BindingError> {
-    match expr {
-        // These roots describe exact query semantics, not summary candidate
-        // sites. Preserve the complete expression so archive execution retains
-        // selector labels, ordering, and comparison filtering.
-        QueryExpr::Scan { .. }
-        | QueryExpr::Sort { .. }
-        | QueryExpr::Filter { .. }
-        | QueryExpr::BinaryOp {
-            op: planner_types::pre_asap::BinaryOpKind::Compare(_),
-            ..
-        } => Ok(PostAsapPlan::Summary(
-            crate::planner_selection::keep_pre_asap(expr)?,
-        )),
-
-        // The canonical L3 IR places `TimeRange` *above* a single-statistic
-        // sketchable `Aggregate` (`lower_promql`'s window-swap; was
-        // `Window` before the ASAPPlanner pin migration). The replacement strategy
-        // only recurses through the `Aggregate` spine (see its module
-        // docs' "conservative fallbacks" — a logical parent above a
-        // bindable aggregate subsumes it unbound), so push the range
-        // down under the aggregate and re-dispatch, exactly as the old
-        // hand-written walk did — the range then rides along inside the
-        // bound node's `Logical(...)` child.
-        QueryExpr::TimeRange { range, child }
-            if matches!(child.as_ref(), QueryExpr::Aggregate { .. }) =>
-        {
-            let QueryExpr::Aggregate {
-                reduction,
-                measures: aggs,
-                output_names,
-                having,
-                child: agg_child,
-            } = child.as_ref()
-            else {
-                unreachable!("guarded by the `matches!` above")
-            };
-            let pushed = QueryExpr::Aggregate {
-                reduction: reduction.clone(),
-                measures: aggs.clone(),
-                output_names: output_names.clone(),
-                having: having.clone(),
-                child: Rc::new(QueryExpr::TimeRange {
-                    range: *range,
-                    child: agg_child.clone(),
-                }),
-            };
-            bind_recursive(&pushed, cost_model)
-        }
-
-        // Workload-aware instant selectors retain their source horizon even
-        // when there is no aggregate to bind.
-        QueryExpr::TimeRange { .. } => Ok(PostAsapPlan::Summary(
-            crate::planner_selection::keep_pre_asap(expr)?,
-        )),
-
-        // Exact Count cannot use this deployment's Sum accumulator: it counts
-        // values rather than samples. Keep it logical for archive execution.
-        QueryExpr::Aggregate {
-            measures: aggs,
-            having: None,
-            ..
-        } if matches!(
-            aggs.as_slice(),
-            [AggIntent::Count {
-                accuracy: AccuracyTarget::Exact
-            }]
-        ) =>
-        {
-            Ok(PostAsapPlan::Summary(
-                crate::planner_selection::select_query(expr, cost_model)?,
-            ))
-        }
-
-        _ => Ok(PostAsapPlan::Summary(
-            crate::planner_selection::select_query(expr, cost_model)?,
-        )),
-    }
-}
diff --git a/control_plane/src/physical/post_asap/matcher.rs b/control_plane/src/physical/post_asap/matcher.rs
deleted file mode 100644
index 29f7d4bc9..000000000
--- a/control_plane/src/physical/post_asap/matcher.rs
+++ /dev/null
@@ -1,348 +0,0 @@
-//! The reference downstream implementation of [`asap_aware_mapping::Matcher`].
-//!
-//! `asap_aware_mapping::replacement::Matcher` is a trait with no default implementation
-//! and no shipped instance — deliberately, per its crate doc: which
-//! `Realization`s are actually *available* anywhere is entirely a
-//! downstream deployment's concern, and even the pure sketch-algebra
-//! compatibility rules (a heap-bearing top-k sketch also satisfying a bare
-//! frequency point-query) turned out to have deployment-specific competitors
-//! (single-vs-multi-population re-aggregation) that don't reduce to a fact
-//! about `SummaryKind` alone.
-//!
-//! [`SummaryFamilyMatcher`] restores exactly the family-compatibility logic
-//! that briefly lived as a concrete `Realization::is_satisfied_by` method
-//! in `asap-plan` (PR #140) before it was converted into this trait (PR
-//! #141) — the `SummaryFamily`/`summary_family` classifier below is a
-//! verbatim port. It answers only the kind-family question: "is an
-//! available `(SummaryKind, SummaryParams)` pair an acceptable substitute
-//! for a required one." It deliberately does **not** attempt the
-//! single-vs-multi-population re-aggregation question (e.g. "can a keyed
-//! `Sum` accumulator serve an unkeyed `Sum` query") — `Realization`
-//! carries no grouping information at all (grouping lives beside the kind,
-//! on whatever node carries it, not inside the kind — see
-//! `crates/asap_types/src/key_by_label_names.rs`'s module doc for the same
-//! design call made on the data-plane side), so a two-`Realization`
-//! `Matcher` cannot correctly answer that question. A caller needing that
-//! richer, grouping-aware answer must check `AggregationType` compatibility
-//! (analogous to `SummaryFamily` here) *and* `grouping_labels`
-//! subset-compatibility side by side, composed at the call site rather than
-//! inside a single `Matcher::is_satisfied_by`.
-//!
-//! Retirement note (2026-07) — reverted: this file was briefly gutted down
-//! to just [`sketch_family_satisfied`] on the assumption `SummaryFamilyMatcher`
-//! had no real consumer (true at the time — no `asap_plan` signature took
-//! `impl`/`dyn Matcher` yet). That assumption no longer holds: this struct
-//! is the intended `Matcher` implementation for the `SummaryExecutor`
-//! serving-time rollout (`data_plane/docs/l4node-plan-executor-design.md`),
-//! which is actively being built to replace
-//! `storage_engines/sketch_db/query/sketch_reducer.rs`. Restored in full.
-
-use asap_aware_mapping::{Matcher, Realization};
-use planner_types::post_asap::SketchAlgorithm;
-
-/// [`Matcher`] impl covering pure sketch-family compatibility. See the
-/// module doc for what this deliberately does not cover.
-pub struct SummaryFamilyMatcher;
-
-impl Matcher for SummaryFamilyMatcher {
-    /// `required` is what an intent needs; `available` is what some
-    /// downstream inventory (a sketch index, a policy registry, …)
-    /// already has materialized somewhere. Rules:
-    /// - `PassThrough` required is vacuously satisfied by anything — no
-    ///   summary is needed at all, so there is nothing to match.
-    /// - An `ExactAccumulator` is satisfied only by the exact same
-    ///   `SummaryKind` — accumulators carry no notion of "family"; `Sum`
-    ///   and `MinMax` answer different questions, full stop.
-    /// - A `Sketch` is satisfied by an available sketch in the same family
-    ///   (`Kll`/`DDSketch` are interchangeable quantile answers;
-    ///   `Hll`/`Theta`/`Kmv` are interchangeable cardinality answers), with
-    ///   one asymmetric exception: a heap-bearing top-k sketch
-    ///   (`CmsWithHeap`/`CountSketchWithHeap`) also answers a bare
-    ///   frequency point-query (`Cms`/`CountSketch`) — the heap is
-    ///   additional info layered on top of the same underlying matrix —
-    ///   but not the reverse (a heap-less sketch cannot enumerate top-k
-    ///   items it never tracked).
-    fn is_satisfied_by(&self, required: &Realization, available: &Realization) -> bool {
-        // ASAPController#170 had merged `Sketch`/`ExactAccumulator` into
-        // one `Summary { kind, params }` variant, recoverable via
-        // `kind.is_exact()`; ASAPPlanner#218 split them back into
-        // distinct `Sketch`/`ExactAggregate` variants (see
-        // control_plane/docs/design-asapplanner-pin-migration.md). The
-        // variant-tag mismatch this match falls through to `_ => false`
-        // for (comparing a `Sketch` against an `ExactAggregate`) is now
-        // just the natural consequence of them being separate variants
-        // again, same behavior as the `is_exact()` mismatch this replaced.
-        match (required, available) {
-            (Realization::PassThrough, _) => true,
-            (
-                Realization::ExactAggregate { kind: required, .. },
-                Realization::ExactAggregate { kind: have, .. },
-            ) => required == have,
-            (Realization::Sketch(required), Realization::Sketch(have)) => {
-                sketch_family_satisfied(required.algorithm(), have.algorithm())
-            }
-            _ => false,
-        }
-    }
-}
-
-/// Pure `SketchAlgorithm`-to-`SketchAlgorithm` family-compatibility check — the
-/// same rule [`SummaryFamilyMatcher::is_satisfied_by`] applies in its
-/// `Sketch` arm, exposed directly for callers that only have bare kinds
-/// (no [`planner_types::post_asap::SketchParams`]) to compare.
-/// `control_plane::physical::runtime_capability::Capability::is_satisfied_by`
-/// is the first such caller: its `SketchAlgorithm` query-side dispatch
-/// tag never carries params, so constructing a full
-/// `Realization::Sketch{kind, params}` just to discard the params
-/// would mean fabricating meaningless param values. See that module's
-/// doc for why `Capability`/`SketchAlgorithm` themselves aren't deleted
-/// outright (`scratchpad/artifacts/enum-unification-plan.md` §8 Step 4).
-pub fn sketch_family_satisfied(required: &SketchAlgorithm, available: &SketchAlgorithm) -> bool {
-    let req_family = summary_family(required);
-    let have_family = summary_family(available);
-    req_family.satisfied_by(have_family)
-}
-
-/// Return the family of a [`SketchAlgorithm`] for [`SummaryFamilyMatcher`].
-/// Every variant is a sketch; exact accumulators use a separate type.
-#[derive(Debug, Clone, Copy, PartialEq, Eq)]
-enum SummaryFamily {
-    Universal,
-    Quantile,
-    Cardinality,
-    /// Bare per-item frequency point-query — no heavy-hitter heap.
-    Frequency,
-    /// Frequency, augmented with a heavy-hitter heap for top-k extraction.
-    FrequencyTopk,
-}
-
-impl SummaryFamily {
-    /// True when `available` (this family) satisfies `self` (the required
-    /// family). Same family always satisfies; the one asymmetric case is
-    /// `FrequencyTopk` (heap-bearing) satisfying a bare `Frequency`
-    /// requirement — never the reverse.
-    fn satisfied_by(self, available: SummaryFamily) -> bool {
-        self == available
-            || (self == SummaryFamily::Frequency && available == SummaryFamily::FrequencyTopk)
-    }
-}
-
-fn summary_family(kind: &SketchAlgorithm) -> SummaryFamily {
-    match kind {
-        SketchAlgorithm::UnivMon => SummaryFamily::Universal,
-        SketchAlgorithm::Kll | SketchAlgorithm::DDSketch => SummaryFamily::Quantile,
-        SketchAlgorithm::Hll | SketchAlgorithm::Theta | SketchAlgorithm::Kmv => {
-            SummaryFamily::Cardinality
-        }
-        SketchAlgorithm::Cms | SketchAlgorithm::CountSketch => SummaryFamily::Frequency,
-        SketchAlgorithm::CmsWithHeap | SketchAlgorithm::CountSketchWithHeap => {
-            SummaryFamily::FrequencyTopk
-        }
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use planner_types::post_asap::{ExactKind, ExactParams, SketchParams};
-
-    /// A valid `SketchParams` for `kind` — `is_satisfied_by` only matches
-    /// on `kind`, never `params`, but the test values should still be
-    /// real, constructible `(kind, params)` pairs rather than nonsense
-    /// combinations (e.g. `Hll` paired with `Kll`'s params) that could
-    /// never arise from real code.
-    fn params_for(kind: &SketchAlgorithm) -> SketchParams {
-        match kind {
-            SketchAlgorithm::UnivMon => SketchParams::UnivMon {
-                heap_size: 32,
-                sketch_rows: 5,
-                sketch_cols: 1024,
-                layers: 4,
-            },
-            SketchAlgorithm::Kll => SketchParams::Kll { k: 200 },
-            SketchAlgorithm::Cms => SketchParams::Cms {
-                width: 100,
-                depth: 5,
-            },
-            SketchAlgorithm::Hll => SketchParams::Hll { precision: 14 },
-            SketchAlgorithm::DDSketch => SketchParams::DDSketch { alpha: 0.01 },
-            SketchAlgorithm::CmsWithHeap => SketchParams::CmsWithHeap {
-                width: 100,
-                depth: 5,
-                heap_size: 10,
-            },
-            SketchAlgorithm::Kmv => SketchParams::Kmv { k: 1024 },
-            SketchAlgorithm::Theta => SketchParams::Theta { k: 1024 },
-            SketchAlgorithm::CountSketch => SketchParams::CountSketch {
-                width: 100,
-                depth: 5,
-            },
-            SketchAlgorithm::CountSketchWithHeap => SketchParams::CountSketchWithHeap {
-                width: 100,
-                depth: 5,
-                heap_size: 10,
-            },
-        }
-    }
-
-    fn exact_params_for(kind: &ExactKind) -> ExactParams {
-        match kind {
-            ExactKind::Sum => ExactParams::Sum,
-            ExactKind::Count => ExactParams::Count,
-            ExactKind::Min => ExactParams::Min,
-            ExactKind::Max => ExactParams::Max,
-            ExactKind::Increase => ExactParams::Increase,
-            ExactKind::Rate => ExactParams::Rate,
-            ExactKind::IRate => ExactParams::IRate,
-        }
-    }
-
-    fn sketch(kind: SketchAlgorithm) -> Realization {
-        let params = params_for(&kind);
-        Realization::Sketch(planner_types::post_asap::SketchKind::new(kind, params))
-    }
-
-    fn accumulator(kind: ExactKind) -> Realization {
-        let params = exact_params_for(&kind);
-        Realization::ExactAggregate { kind, params }
-    }
-
-    #[test]
-    fn same_sketch_kind_satisfies_itself() {
-        let m = SummaryFamilyMatcher;
-        assert!(m.is_satisfied_by(&sketch(SketchAlgorithm::Kll), &sketch(SketchAlgorithm::Kll)));
-        assert!(m.is_satisfied_by(&sketch(SketchAlgorithm::Hll), &sketch(SketchAlgorithm::Hll)));
-    }
-
-    #[test]
-    fn same_family_alternate_kind_satisfies() {
-        let m = SummaryFamilyMatcher;
-        // Kll / DDSketch are interchangeable quantile answers.
-        assert!(m.is_satisfied_by(
-            &sketch(SketchAlgorithm::Kll),
-            &sketch(SketchAlgorithm::DDSketch)
-        ));
-        // Hll / Theta / Kmv are interchangeable cardinality answers.
-        assert!(m.is_satisfied_by(
-            &sketch(SketchAlgorithm::Hll),
-            &sketch(SketchAlgorithm::Theta)
-        ));
-        assert!(m.is_satisfied_by(&sketch(SketchAlgorithm::Hll), &sketch(SketchAlgorithm::Kmv)));
-    }
-
-    #[test]
-    fn cross_family_never_satisfies() {
-        let m = SummaryFamilyMatcher;
-        assert!(!m.is_satisfied_by(&sketch(SketchAlgorithm::Kll), &sketch(SketchAlgorithm::Hll)));
-        assert!(!m.is_satisfied_by(&sketch(SketchAlgorithm::Hll), &sketch(SketchAlgorithm::Kll)));
-        assert!(!m.is_satisfied_by(&sketch(SketchAlgorithm::Kll), &sketch(SketchAlgorithm::Cms)));
-    }
-
-    #[test]
-    fn heap_bearing_available_satisfies_bare_frequency_required() {
-        let m = SummaryFamilyMatcher;
-        // A CmsWithHeap instance already carries the plain CMS matrix, so
-        // it answers a bare frequency point-query too.
-        assert!(m.is_satisfied_by(
-            &sketch(SketchAlgorithm::Cms),
-            &sketch(SketchAlgorithm::CmsWithHeap)
-        ));
-        assert!(m.is_satisfied_by(
-            &sketch(SketchAlgorithm::CountSketch),
-            &sketch(SketchAlgorithm::CountSketchWithHeap)
-        ));
-    }
-
-    #[test]
-    fn bare_frequency_available_does_not_satisfy_topk_required() {
-        let m = SummaryFamilyMatcher;
-        // The reverse does not hold: a heap-less sketch never tracked the
-        // heavy-hitter heap, so it cannot enumerate top-k items.
-        assert!(!m.is_satisfied_by(
-            &sketch(SketchAlgorithm::CmsWithHeap),
-            &sketch(SketchAlgorithm::Cms)
-        ));
-        assert!(!m.is_satisfied_by(
-            &sketch(SketchAlgorithm::CountSketchWithHeap),
-            &sketch(SketchAlgorithm::CountSketch)
-        ));
-    }
-
-    #[test]
-    fn cms_and_count_sketch_are_the_same_frequency_family() {
-        let m = SummaryFamilyMatcher;
-        assert!(m.is_satisfied_by(
-            &sketch(SketchAlgorithm::Cms),
-            &sketch(SketchAlgorithm::CountSketch)
-        ));
-        assert!(m.is_satisfied_by(
-            &sketch(SketchAlgorithm::CmsWithHeap),
-            &sketch(SketchAlgorithm::CountSketchWithHeap)
-        ));
-    }
-
-    #[test]
-    fn exact_accumulator_requires_the_exact_same_kind() {
-        let m = SummaryFamilyMatcher;
-        assert!(m.is_satisfied_by(&accumulator(ExactKind::Sum), &accumulator(ExactKind::Sum)));
-        assert!(!m.is_satisfied_by(&accumulator(ExactKind::Sum), &accumulator(ExactKind::Max)));
-        assert!(!m.is_satisfied_by(
-            &accumulator(ExactKind::Increase),
-            &accumulator(ExactKind::Rate)
-        ));
-    }
-
-    #[test]
-    fn sketch_and_accumulator_never_satisfy_each_other() {
-        let m = SummaryFamilyMatcher;
-        assert!(!m.is_satisfied_by(&sketch(SketchAlgorithm::Kll), &accumulator(ExactKind::Sum)));
-        assert!(!m.is_satisfied_by(&accumulator(ExactKind::Sum), &sketch(SketchAlgorithm::Kll)));
-    }
-
-    #[test]
-    fn pass_through_required_is_vacuously_satisfied() {
-        let m = SummaryFamilyMatcher;
-        assert!(m.is_satisfied_by(&Realization::PassThrough, &sketch(SketchAlgorithm::Kll)));
-        assert!(m.is_satisfied_by(&Realization::PassThrough, &accumulator(ExactKind::Sum)));
-        assert!(m.is_satisfied_by(&Realization::PassThrough, &Realization::PassThrough));
-    }
-
-    #[test]
-    fn pass_through_available_never_satisfies_a_real_requirement() {
-        let m = SummaryFamilyMatcher;
-        assert!(!m.is_satisfied_by(&sketch(SketchAlgorithm::Kll), &Realization::PassThrough));
-        assert!(!m.is_satisfied_by(&accumulator(ExactKind::Sum), &Realization::PassThrough));
-    }
-
-    // ── sketch_family_satisfied (the bare-kind entry point) ──────────────
-
-    #[test]
-    fn sketch_family_satisfied_matches_is_satisfied_by_on_the_sketch_arm() {
-        // The free function is meant to be exactly the logic
-        // `SummaryFamilyMatcher::is_satisfied_by` applies to its `Sketch`
-        // arm, just without needing `SketchParams` to call it.
-        assert!(sketch_family_satisfied(
-            &SketchAlgorithm::Kll,
-            &SketchAlgorithm::DDSketch
-        ));
-        assert!(sketch_family_satisfied(
-            &SketchAlgorithm::Cms,
-            &SketchAlgorithm::CmsWithHeap
-        ));
-        assert!(!sketch_family_satisfied(
-            &SketchAlgorithm::CmsWithHeap,
-            &SketchAlgorithm::Cms
-        ));
-        assert!(!sketch_family_satisfied(
-            &SketchAlgorithm::Kll,
-            &SketchAlgorithm::Hll
-        ));
-    }
-
-    // The old `sketch_family_satisfied_rejects_exact_accumulator_kinds`
-    // test (passing `SummaryKind::Sum` -- an exact-accumulator kind -- to
-    // this sketch-only function) no longer type-checks at all post
-    // ASAPPlanner#218's split: `SketchAlgorithm` has no exact-accumulator
-    // variants to construct in the first place, so the property that test
-    // asserted is now enforced by the type system instead of at runtime.
-}
diff --git a/control_plane/src/physical/post_asap/mod.rs b/control_plane/src/physical/post_asap/mod.rs
deleted file mode 100644
index 469db23e4..000000000
--- a/control_plane/src/physical/post_asap/mod.rs
+++ /dev/null
@@ -1,22 +0,0 @@
-//! Physical adapters for ASAPPlanner's canonical post-ASAP IR.
-//!
-//! ASAPPlanner owns summary selection and the post-ASAP `SummaryNode` tree.
-//! This module adds only backend-specific concerns required to compile that
-//! tree into catalog-backed executable plans: deployment cost input,
-//! named sharing/placement wrappers, and runtime family matching. It belongs
-//! under `physical`; it is not another logical or sketch-algebra layer.
-
-#![allow(dead_code, unused_imports)]
-
-pub mod cost_model;
-pub mod deployment_expr;
-pub mod lower;
-pub mod matcher;
-
-// Re-exports — `crate::physical::post_asap::*` for downstream callers.
-pub use deployment_expr::{PhysicalExpr, PostAsapPlan};
-pub use lower::{bind_query_expr, bind_query_expr_with_cost_model, BindingError};
-pub use matcher::SummaryFamilyMatcher;
-
-#[cfg(test)]
-mod tests;
diff --git a/control_plane/src/physical/post_asap/tests.rs b/control_plane/src/physical/post_asap/tests.rs
deleted file mode 100644
index 917df4626..000000000
--- a/control_plane/src/physical/post_asap/tests.rs
+++ /dev/null
@@ -1,904 +0,0 @@
-//! Integration tests for the L4 IR + L3→L4 binding.
-
-#![cfg(test)]
-
-use std::rc::Rc;
-use std::time::Duration;
-
-use planner_types::post_asap::{
-    ExactKind, ExactParams, GroupingStrategy, SketchAlgorithm, SketchKind, SketchParams,
-    SketchQuery, SummaryExpr, SummaryFamilyType, SummaryNode,
-};
-use planner_types::pre_asap::expr_ir::ColumnRef;
-
-use crate::physical::post_asap::cost_model::ForcedFamilyCostModel;
-use crate::physical::post_asap::deployment_expr::{PhysicalExpr, PostAsapPlan};
-use crate::physical::post_asap::lower::bind_query_expr;
-use crate::types::AccuracyTarget;
-use planner_types::pre_asap::{AggIntent, QueryExpr, Reduction, Schema, Source};
-use planner_types::pre_asap::{Column, DataType};
-
-// Query outputs are values; inspect the explicitly retained accumulator below them.
-fn exact_query_state(node: &SummaryNode) -> &SummaryNode {
-    let SummaryExpr::ValueOperation {
-        child,
-        operation: planner_types::post_asap::ValueOperation::FinalizeExactAccumulator,
-        timing: planner_types::post_asap::ExecutionTiming::QueryTime,
-    } = &node.expr
-    else {
-        panic!("query must finalize its exact state: {:?}", node.expr)
-    };
-    assert!(node
-        .schema
-        .fields
-        .iter()
-        .all(|field| matches!(field.dtype, SummaryFamilyType::Plain(_))));
-    child
-}
-
-fn sketch_family(kind: SketchAlgorithm, params: SketchParams) -> SummaryFamilyType {
-    SummaryFamilyType::Sketch(SketchKind::new(kind, params), GroupingStrategy::default())
-}
-
-// ── Test fixtures ─────────────────────────────────────────────────────────────
-
-fn col(name: &str, dtype: DataType) -> Column {
-    Column {
-        name: name.into(),
-        dtype,
-        nullable: false,
-        table: None,
-    }
-}
-
-fn ts_scan() -> QueryExpr {
-    let schema = Schema::with_time_index(
-        vec![
-            col("ts", DataType::Timestamp),
-            col("service", DataType::Utf8),
-            col("value", DataType::Float64),
-        ],
-        0,
-        vec![vec![0, 1]],
-    );
-    let pred = crate::test_support::label_eq_predicate("service", "api", &schema)
-        .expect("service column present in schema");
-    QueryExpr::Scan {
-        source: Source::TimeSeries {
-            metric: "http_request_duration_seconds".into(),
-        },
-        predicates: vec![pred],
-        schema,
-    }
-}
-
-fn windowed_scan() -> QueryExpr {
-    QueryExpr::TimeRange {
-        range: Duration::from_secs(300),
-        child: Rc::new(ts_scan()),
-    }
-}
-
-fn agg_quantile(q: f64, accuracy: AccuracyTarget) -> QueryExpr {
-    QueryExpr::Aggregate {
-        // No `by()` and windowed (child is `Window`) — the shape
-        // `quantile_over_time(...)` lowers to: per-series, not a
-        // cross-series reduction (see #165's `Reduction`).
-        reduction: Reduction::PerEntity,
-        measures: vec![AggIntent::Quantile {
-            col: None,
-            q,
-            accuracy,
-        }],
-        output_names: Vec::new(),
-        having: None,
-        child: Rc::new(windowed_scan()),
-    }
-}
-
-/// Walk a `PhysicalExpr` tree and report whether any node's `SummaryExpr`
-/// wraps an archive-only `AggIntent` in an unbound `Logical(Aggregate)`.
-/// Mirrors `emit::mod.rs`'s classification: `Logical`-wrapped aggregates
-/// whose sole intent is `archive_only()` route the L5 emitter to the
-/// cold-store tier.
-fn binding_is_archive(expr: &PhysicalExpr) -> bool {
-    match expr {
-        PhysicalExpr::Committed(plan) => plan_is_archive(plan),
-        PhysicalExpr::RawAtEdgeSketchAtBackend { child, .. } => plan_is_archive(child),
-        PhysicalExpr::RawAtEdgePrometheusArchive { .. } => false,
-    }
-}
-
-fn plan_is_archive(plan: &PostAsapPlan) -> bool {
-    match plan {
-        PostAsapPlan::Summary(node) => node_is_archive(node),
-        PostAsapPlan::LetBinding { expr, child, .. } => {
-            plan_is_archive(expr) || plan_is_archive(child)
-        }
-        PostAsapPlan::Ref { .. } => false,
-    }
-}
-
-fn node_is_archive(node: &Rc<SummaryNode>) -> bool {
-    match &node.expr {
-        SummaryExpr::KeepPreAsap(qe) => match qe.as_ref() {
-            QueryExpr::Aggregate { measures: aggs, .. } => {
-                aggs.iter().any(crate::planner_selection::archive_only)
-            }
-            _ => false,
-        },
-        SummaryExpr::SummaryAgg { child, .. } => node_is_archive(child),
-        SummaryExpr::ValueOperation { child, .. } => node_is_archive(child),
-        SummaryExpr::SummaryEstimate { summary_input, .. } => node_is_archive(summary_input),
-        SummaryExpr::SummaryMerge { children, .. } => children.iter().any(node_is_archive),
-        SummaryExpr::SummaryJoin { outer, inner, .. } => {
-            node_is_archive(outer) || node_is_archive(inner)
-        }
-
-        SummaryExpr::SummarySubtract { left, right }
-        | SummaryExpr::RelationalJoin { left, right, .. }
-        | SummaryExpr::BinaryOp {
-            lhs: left,
-            rhs: right,
-            ..
-        } => node_is_archive(left) || node_is_archive(right),
-        SummaryExpr::SummaryDelete { summary_input, .. } => node_is_archive(summary_input),
-    }
-}
-
-// ── Bind rule tests ───────────────────────────────────────────────────────────
-
-#[test]
-fn bind_kll_quantile_basic() {
-    // Force KLL to test its binding independently of family ranking.
-    let expr = agg_quantile(0.99, AccuracyTarget::Epsilon(0.01));
-    let cost_model =
-        ForcedFamilyCostModel::new(AccuracyTarget::Epsilon(0.01), SketchAlgorithm::Kll);
-    let node = crate::planner_selection::select_query(&expr, &cost_model)
-        .expect("KLL should bind a Quantile{0.99, ε=0.01}");
-    match &node.expr {
-        SummaryExpr::SummaryEstimate {
-            query,
-            summary_input,
-        } => {
-            assert!(matches!(query, SketchQuery::Quantile { q } if *q == 0.99));
-            match &summary_input.expr {
-                SummaryExpr::SummaryAgg { family, child, .. } => {
-                    assert_eq!(
-                        family,
-                        &sketch_family(SketchAlgorithm::Kll, SketchParams::Kll { k: 269 })
-                    );
-                    assert!(matches!(child.expr, SummaryExpr::KeepPreAsap(_)));
-                }
-                other => panic!("expected SummaryAgg, got {other:?}"),
-            }
-        }
-        other => panic!("expected SummaryEstimate, got {other:?}"),
-    }
-}
-
-#[test]
-fn bind_ddsketch_quantile_basic() {
-    // Force DDSketch to test its quantile binding.
-    let expr = agg_quantile(0.99, AccuracyTarget::Epsilon(0.01));
-    let cost_model =
-        ForcedFamilyCostModel::new(AccuracyTarget::Epsilon(0.01), SketchAlgorithm::DDSketch);
-    let node = crate::planner_selection::select_query(&expr, &cost_model)
-        .expect("DDSketch should bind a Quantile{0.99, ε=0.01}");
-    match &node.expr {
-        SummaryExpr::SummaryEstimate {
-            query,
-            summary_input,
-        } => {
-            assert!(matches!(query, SketchQuery::Quantile { q } if *q == 0.99));
-            match &summary_input.expr {
-                SummaryExpr::SummaryAgg { family, .. } => match family {
-                    SummaryFamilyType::Sketch(kind, _)
-                        if kind.algorithm() == &SketchAlgorithm::DDSketch
-                            && matches!(kind.params(), SketchParams::DDSketch { .. }) =>
-                    {
-                        let SketchParams::DDSketch { alpha } = kind.params() else {
-                            unreachable!()
-                        };
-                        assert!((alpha - 0.01).abs() < 1e-12)
-                    }
-                    other => panic!("expected DDSketch family, got {other:?}"),
-                },
-                other => panic!("expected SummaryAgg, got {other:?}"),
-            }
-        }
-        other => panic!("expected SummaryEstimate, got {other:?}"),
-    }
-}
-
-/// Cost-aware rule selection: the dispatcher should pick DDSketch over
-/// KLL for an explicit ε-driven Quantile — `ControlPlaneCostModel::rank_candidates`
-/// statically reorders DDSketch first (see its doc comment), matching the
-/// legacy `algebra::directory::sketch_type_for_agg` default for SP-2/SP-4.
-#[test]
-fn bind_picks_ddsketch_over_kll_when_eps_explicit() {
-    let expr = agg_quantile(0.99, AccuracyTarget::Epsilon(0.01));
-    let bound = bind_query_expr(&expr, AccuracyTarget::Epsilon(0.01))
-        .expect("bind_query_expr should not error");
-    match bound {
-        PhysicalExpr::Committed(PostAsapPlan::Summary(node)) => match &node.expr {
-            SummaryExpr::SummaryEstimate { summary_input, .. } => match &summary_input.expr {
-                SummaryExpr::SummaryAgg { family, .. } => {
-                    assert!(
-                        matches!(family, SummaryFamilyType::Sketch(kind, _) if kind.algorithm() == &SketchAlgorithm::DDSketch),
-                        "dispatcher should pick DDSketch over KLL on ε-driven Quantile, got {family:?}"
-                    );
-                }
-                other => panic!("expected SummaryAgg, got {other:?}"),
-            },
-            other => panic!("expected SummaryEstimate, got {other:?}"),
-        },
-        other => panic!("expected Committed(Summary(_)), got {other:?}"),
-    }
-}
-
-/// Build an `Aggregate{TopK{k, accuracy}}` over the windowed scan.
-fn agg_topk(k: usize, accuracy: AccuracyTarget) -> QueryExpr {
-    QueryExpr::Aggregate {
-        // A ranking always reduces — empty `by` ranks the whole input,
-        // never per-entity (see `lower.rs`'s `LQueryExpr::TopK` handling).
-        reduction: Reduction::by(vec![]),
-        measures: vec![AggIntent::TopK { k, accuracy }],
-        output_names: Vec::new(),
-        having: None,
-        child: Rc::new(windowed_scan()),
-    }
-}
-
-/// Pull the bound `(SketchAlgorithm, w, d)` out of a top-k binding.
-/// `SketchAlgorithm` promotes `with_heap` to kind identity — the top-k cost
-/// model always binds `CmsWithHeap`/`CountSketchWithHeap` for a top-k
-/// intent, never the bare kind, so there's no separate heap flag to
-/// return anymore.
-fn topk_binding_family(bound: &PhysicalExpr) -> (SketchAlgorithm, u32, u32) {
-    match bound {
-        PhysicalExpr::Committed(PostAsapPlan::Summary(node)) => match &node.expr {
-            SummaryExpr::SummaryEstimate {
-                query,
-                summary_input,
-            } => {
-                assert!(matches!(query, SketchQuery::TopK { k } if *k == 10));
-                match &summary_input.expr {
-                    SummaryExpr::SummaryAgg { family, .. } => match family {
-                        SummaryFamilyType::Sketch(kind, _)
-                            if matches!(
-                                kind.algorithm(),
-                                SketchAlgorithm::CmsWithHeap | SketchAlgorithm::CountSketchWithHeap
-                            ) =>
-                        {
-                            match kind.params() {
-                                SketchParams::CmsWithHeap { width, depth, .. }
-                                | SketchParams::CountSketchWithHeap { width, depth, .. } => {
-                                    (kind.algorithm().clone(), *width, *depth)
-                                }
-                                other => panic!("heap algorithm has mismatched params: {other:?}"),
-                            }
-                        }
-                        other => {
-                            panic!("expected CmsWithHeap/CountSketchWithHeap family, got {other:?}")
-                        }
-                    },
-                    other => panic!("expected SummaryAgg, got {other:?}"),
-                }
-            }
-            other => panic!("expected SummaryEstimate, got {other:?}"),
-        },
-        other => panic!("expected Committed(Summary(_)), got {other:?}"),
-    }
-}
-
-/// A loose TopK target still needs membership evidence to select a sketch.
-#[test]
-fn uncertified_topk_keeps_exact_execution() {
-    let acc = AccuracyTarget::EpsilonDelta {
-        epsilon: 0.01,
-        delta: 0.001,
-    };
-    let expr = agg_topk(10, acc.clone());
-    assert!(query_is_exact(&committed_node(
-        bind_query_expr(&expr, acc).unwrap()
-    )));
-}
-
-/// An exact workload target cannot accept uncertified TopK membership.
-#[test]
-fn exact_topk_keeps_exact_execution() {
-    // Intent requests a normal (non-exact) rank so binding still
-    // happens; the workload-level policy demands exact recall.
-    let expr = agg_topk(10, AccuracyTarget::Epsilon(0.01));
-    assert!(query_is_exact(&committed_node(
-        bind_query_expr(&expr, AccuracyTarget::Exact).unwrap()
-    )));
-}
-
-/// A cheaper sketch never substitutes for missing membership evidence.
-#[test]
-fn cheap_topk_does_not_bypass_membership_evidence() {
-    use crate::physical::deployment_cost::wire::WireCostTable;
-    let table = WireCostTable::default();
-    let cms = table.for_algorithm(&SketchAlgorithm::Cms).per_flush();
-    let cs = table
-        .for_algorithm(&SketchAlgorithm::CountSketch)
-        .per_flush();
-    assert!(
-        cms < cs,
-        "CMS-heap ({cms} B) must be cheaper than CountSketch ({cs} B) on the wire"
-    );
-    // The cost gap the Fig-12 harness measured (~66×).
-    let ratio = cs as f64 / cms as f64;
-    assert!(
-        ratio > 50.0,
-        "CountSketch should be ~66× the CMS-heap wire cost; got {ratio:.1}×"
-    );
-
-    // Loose recall → the planner must land on the cost-min family (CMS).
-    let acc = AccuracyTarget::Epsilon(0.01);
-    assert!(query_is_exact(&committed_node(
-        bind_query_expr(&agg_topk(10, acc.clone()), acc).unwrap()
-    )));
-}
-
-#[test]
-fn uncertified_hll_keeps_exact_execution() {
-    let expr = QueryExpr::Aggregate {
-        reduction: Reduction::PerEntity,
-        measures: vec![AggIntent::Cardinality {
-            cols: vec![],
-            accuracy: AccuracyTarget::Epsilon(0.01),
-        }],
-        output_names: Vec::new(),
-        having: None,
-        child: Rc::new(windowed_scan()),
-    };
-    let bound = bind_query_expr(&expr, AccuracyTarget::Epsilon(0.01)).expect("no error");
-    assert!(query_is_exact(&committed_node(bound)));
-}
-
-#[test]
-fn sum_now_binds_to_exact_agg_after_pr_6_followup() {
-    // `AggIntent::Sum` binds to a readout over `SummaryAgg` with `summary:
-    // SummaryKind::Sum` and no `SummaryEstimate` wrapper (the partial
-    // state *is* the value — see `asap_aware_mapping::replacement`'s module docs). The
-    // old locally-defined `PhysicalExpr::ExactAgg { agg_type, .. }`
-    // variant (and `asap_types::AggregationType`) no longer exist at
-    // the L4 IR level: `planner_types::post_asap::SummaryExpr` unifies exact
-    // accumulators and approximate sketches into the same `SummaryAgg`
-    // node shape, keyed by `SummaryKind` (see `deployment_expr.rs`'s
-    // module docs).
-    let expr = QueryExpr::Aggregate {
-        reduction: Reduction::PerEntity,
-        measures: vec![AggIntent::Sum { col: None }],
-        output_names: Vec::new(),
-        having: None,
-        child: Rc::new(windowed_scan()),
-    };
-    let bound = bind_query_expr(&expr, AccuracyTarget::Exact).expect("no error");
-    match bound {
-        PhysicalExpr::Committed(PostAsapPlan::Summary(node)) => {
-            match &exact_query_state(&node).expr {
-                SummaryExpr::SummaryAgg { family, .. } => {
-                    assert_eq!(
-                        family,
-                        &SummaryFamilyType::ExactAggregate(ExactKind::Sum, ExactParams::Sum),
-                        "Sum should bind to SummaryAgg(Sum)"
-                    );
-                }
-                other => panic!("expected Sum state below the query readout, got {other:?}"),
-            }
-        }
-        other => panic!("expected Committed(Summary(_)), got {other:?}"),
-    }
-}
-
-#[test]
-fn bind_exact_accuracy_disables_quantile_binding() {
-    // Quantile under `AccuracyTarget::Exact` should NOT bind — the
-    // optimizer falls back to an exact path. (Per design.md §6 line
-    // ~1254 — "the summary path is selected, not mandated".)
-    let expr = agg_quantile(0.99, AccuracyTarget::Exact);
-    let bound = bind_query_expr(&expr, AccuracyTarget::Exact).expect("no error");
-    match bound {
-        PhysicalExpr::Committed(PostAsapPlan::Summary(node)) => {
-            assert!(
-                matches!(&node.expr, SummaryExpr::KeepPreAsap(qe) if matches!(**qe, QueryExpr::Aggregate { .. })),
-                "Exact accuracy should disable summary binding and pass through as Logical, got {:?}",
-                node.expr
-            );
-        }
-        other => panic!("expected Committed(Summary(_)), got {other:?}"),
-    }
-}
-
-// PromQL pattern coverage through canonical parsing and physical binding.
-
-/// `ONLY_TEMPORAL` — `quantile_over_time(0.99, m[5m])`.
-/// asap-planner-rs path: ONLY_TEMPORAL pattern 1 → KLL/DDSketch summary.
-/// Control plane path: `Aggregate{Quantile{0.99}}` over `Window` →
-/// binds a quantile-capable family → `SummaryAgg{KLL/DDSketch}`.
-#[test]
-fn phase_b_pattern_only_temporal_quantile_binds_to_sketch() {
-    let expr = QueryExpr::Aggregate {
-        reduction: Reduction::PerEntity,
-        measures: vec![AggIntent::Quantile {
-            col: None,
-            q: 0.99,
-            accuracy: AccuracyTarget::Epsilon(0.01),
-        }],
-        output_names: Vec::new(),
-        having: None,
-        child: Rc::new(windowed_scan()),
-    };
-    let bound = bind_query_expr(&expr, AccuracyTarget::Epsilon(0.01)).unwrap();
-    match bound {
-        PhysicalExpr::Committed(PostAsapPlan::Summary(node)) => match &node.expr {
-            SummaryExpr::SummaryEstimate {
-                query,
-                summary_input,
-            } => {
-                assert!(matches!(query, SketchQuery::Quantile { .. }));
-                match &summary_input.expr {
-                    SummaryExpr::SummaryAgg { family, .. } => {
-                        assert!(matches!(
-                            family,
-                            SummaryFamilyType::Sketch(kind, _)
-                                if matches!(kind.algorithm(), SketchAlgorithm::Kll | SketchAlgorithm::DDSketch)
-                        ));
-                    }
-                    other => panic!("expected SummaryAgg under SummaryEstimate, got {other:?}"),
-                }
-            }
-            other => panic!("expected SummaryEstimate, got {other:?}"),
-        },
-        other => panic!("expected Committed(Summary(_)), got {other:?}"),
-    }
-}
-
-/// `ONLY_TEMPORAL` — `sum_over_time(m[5m])` (and the count/avg/min/max
-/// variants that legacy `single_query.rs` accepts).
-///
-/// Control plane path: `Aggregate{Sum}` over `Window` → binds to a readout over
-/// `SummaryAgg{summary: SummaryKind::Sum}` (an exact mergeable
-/// accumulator — see `sum_now_binds_to_exact_agg_after_pr_6_followup`'s
-/// doc comment for the `ExactAgg` → `SummaryAgg` unification).
-#[test]
-fn phase_b_pattern_only_temporal_sum_binds_to_exact_agg() {
-    let expr = QueryExpr::Aggregate {
-        reduction: Reduction::PerEntity,
-        measures: vec![AggIntent::Sum { col: None }],
-        output_names: Vec::new(),
-        having: None,
-        child: Rc::new(windowed_scan()),
-    };
-    let bound = bind_query_expr(&expr, AccuracyTarget::Epsilon(0.01)).unwrap();
-    match bound {
-        PhysicalExpr::Committed(PostAsapPlan::Summary(node)) => {
-            match &exact_query_state(&node).expr {
-                SummaryExpr::SummaryAgg { family, .. } => {
-                    assert_eq!(
-                        family,
-                        &SummaryFamilyType::ExactAggregate(ExactKind::Sum, ExactParams::Sum)
-                    );
-                }
-                other => panic!("expected SummaryAgg(Sum), got {other:?}"),
-            }
-        }
-        other => panic!("expected Committed(Summary(_)), got {other:?}"),
-    }
-}
-
-/// `ONLY_SPATIAL` — `sum by (host) (m)`.
-/// Control plane path: `Aggregate{Sum, by=[host]}` over a bare `Scan`.
-///
-/// Family remains Sum; the reduction carries the grouping columns.
-#[test]
-fn phase_b_pattern_only_spatial_aggregate_binds_to_grouped_sum() {
-    let expr = QueryExpr::Aggregate {
-        reduction: Reduction::by(vec![1]), // service column
-        measures: vec![AggIntent::Sum { col: None }],
-        output_names: Vec::new(),
-        having: None,
-        child: Rc::new(ts_scan()),
-    };
-    let bound = bind_query_expr(&expr, AccuracyTarget::Epsilon(0.01)).unwrap();
-    match bound {
-        PhysicalExpr::Committed(PostAsapPlan::Summary(node)) => {
-            match &exact_query_state(&node).expr {
-                SummaryExpr::SummaryAgg {
-                    family, reduction, ..
-                } => {
-                    assert_eq!(
-                        family,
-                        &SummaryFamilyType::ExactAggregate(ExactKind::Sum, ExactParams::Sum)
-                    );
-                    assert_eq!(
-                        reduction.group_keys().map(|k| k.keys()),
-                        Some(&[1][..]),
-                        "Sum reduction must retain the group-by column"
-                    );
-                }
-                other => panic!("expected SummaryAgg(Sum, by=[1]), got {other:?}"),
-            }
-        }
-        other => panic!("expected Committed(Summary(_)), got {other:?}"),
-    }
-}
-
-/// `ONE_TEMPORAL_ONE_SPATIAL` — `sum by (host) (rate(m[5m]))`.
-/// Planner preserves the Rate family and the `by` reduction independently.
-#[test]
-fn phase_b_pattern_temporal_and_spatial_combined_preserves_rate() {
-    let expr = QueryExpr::Aggregate {
-        reduction: Reduction::by(vec![1]),
-        measures: vec![AggIntent::Rate],
-        output_names: Vec::new(),
-        having: None,
-        child: Rc::new(windowed_scan()),
-    };
-    let bound = bind_query_expr(&expr, AccuracyTarget::Epsilon(0.01)).unwrap();
-    match bound {
-        PhysicalExpr::Committed(PostAsapPlan::Summary(node)) => {
-            match &exact_query_state(&node).expr {
-                SummaryExpr::SummaryAgg {
-                    family, reduction, ..
-                } => {
-                    assert_eq!(
-                        family,
-                        &SummaryFamilyType::ExactAggregate(ExactKind::Rate, ExactParams::Rate)
-                    );
-                    assert_eq!(reduction.group_keys().map(|k| k.keys()), Some(&[1][..]));
-                }
-                other => panic!("expected SummaryAgg(Rate, by=[1]), got {other:?}"),
-            }
-        }
-        other => panic!("expected Committed(Summary(_)), got {other:?}"),
-    }
-}
-
-/// Archive-only intents produce logical pass-through plans.
-#[test]
-fn phase_b_pattern_archive_only_routes_to_archive() {
-    let intent = AggIntent::Absent;
-    assert!(
-        crate::planner_selection::archive_only(&intent),
-        "Phase β intent must flag archive"
-    );
-    let expr = QueryExpr::Aggregate {
-        reduction: Reduction::PerEntity,
-        measures: vec![intent.clone()],
-        output_names: Vec::new(),
-        having: None,
-        child: Rc::new(windowed_scan()),
-    };
-    let bound = bind_query_expr(&expr, AccuracyTarget::Epsilon(0.01)).unwrap();
-    // The archive-only rule's output is a Logical pass-through carrying
-    // the original Aggregate. Downstream emitters check archive_only().
-    match bound {
-        PhysicalExpr::Committed(PostAsapPlan::Summary(node)) => match &node.expr {
-            SummaryExpr::KeepPreAsap(qe) => match qe.as_ref() {
-                QueryExpr::Aggregate { measures: aggs, .. } => {
-                    assert_eq!(aggs, &vec![intent]);
-                }
-                other => panic!("expected Aggregate, got {other:?}"),
-            },
-            other => panic!("expected Logical(Aggregate(Absent)), got {other:?}"),
-        },
-        other => panic!("expected Committed(Summary(_)), got {other:?}"),
-    }
-}
-
-// Representative PromQL workloads pin the expected sketch or archive binding.
-
-/// Helper: parse a PromQL string to the canonical L3 `QueryExpr`, bind to
-/// L4. Returns the produced `PhysicalExpr` for assertion.
-/// `parse_query_expr_canonical` is the real parse path (L1 → L2 relational
-/// → L3 canonical via `lower`); `bind_query_expr` is the
-/// L3→L4 bottom-up walk under the supplied accuracy target.
-fn pipeline_l1_to_l4(query: &str, accuracy: AccuracyTarget) -> PhysicalExpr {
-    let qe = crate::query_parser::parse_query_expr_canonical(query, accuracy.clone())
-        .unwrap_or_else(|e| panic!("parse {query}: {e}"));
-    bind_query_expr(&qe, accuracy).unwrap_or_else(|e| panic!("bind {query}: {e}"))
-}
-
-/// `quantile_over_time.yaml` — the asap-planner-rs `quantile_over_time`
-/// fixture maps to a KLL or DDSketch InstalledPrecomputePlan row. The control plane
-/// path: L1 PromQL parse → L3 `Aggregate{Quantile{0.99}}` over `Window` →
-/// L4 bind picks Kll (default) or DDSketch. Either is functionally
-/// equivalent — both are quantile sketches.
-#[test]
-fn phase_b_e2e_quantile_over_time_binds_to_quantile_sketch() {
-    let bound = pipeline_l1_to_l4(
-        "quantile_over_time(0.99, http_request_duration_seconds[5m])",
-        AccuracyTarget::Epsilon(0.01),
-    );
-    let kind = crate::emit::extract_root_sketch_algorithm(&bound);
-    assert!(
-        matches!(
-            kind,
-            Some(SketchAlgorithm::Kll) | Some(SketchAlgorithm::DDSketch)
-        ),
-        "expected quantile summary family, got {kind:?}"
-    );
-    assert!(
-        !binding_is_archive(&bound),
-        "ASAP-tier quantile must not flag archive"
-    );
-}
-
-/// `sum_over_time.yaml` — the legacy planner produces an exact-sum
-/// aggregation row (no summary). Control plane path: `Aggregate{Sum}` over
-/// `Window` → binds to an exact accumulator (`SummaryAgg{Sum}`), which is
-/// neither an approximate summary (so `extract_root_sketch_algorithm`, which
-/// excludes exact accumulators — see its doc comment — returns `None`)
-/// nor archive-routed.
-#[test]
-fn phase_b_e2e_sum_over_time_falls_through_to_logical() {
-    let bound = pipeline_l1_to_l4(
-        "sum_over_time(http_requests_total[5m])",
-        AccuracyTarget::Epsilon(0.01),
-    );
-    assert!(
-        crate::emit::extract_root_sketch_algorithm(&bound).is_none(),
-        "sum_over_time should not produce an approximate summary"
-    );
-    assert!(
-        !binding_is_archive(&bound),
-        "Sum is exact-warm, not archive"
-    );
-}
-
-/// `sum_by.yaml` — `sum by (label) (sum_over_time(...))`. Spatial-and-
-/// temporal aggregation; the legacy planner emits an exact-sum row keyed
-/// on the by-label. Control plane path: `Aggregate{Sum, by=[…]}` over
-/// `Window` → binds to an exact accumulator (`SummaryAgg{Sum, by=[…]}`) —
-/// no approximate summary family. The by-label is preserved on the L3
-/// group-by-id list, which Phase α's routing emit reads to build the
-/// per-label rollup partition.
-#[test]
-fn phase_b_e2e_sum_by_preserves_grouping_label() {
-    let bound = pipeline_l1_to_l4(
-        "sum by (instance) (sum_over_time(http_requests_total[5m]))",
-        AccuracyTarget::Epsilon(0.01),
-    );
-    // No approximate summary family for plain Sum.
-    assert!(crate::emit::extract_root_sketch_algorithm(&bound).is_none());
-    // The end shape may carry `Logical(Aggregate{by, ...})` beneath a
-    // `SummaryAgg{Sum}` wrapper, or `Logical(Window{...})` when the
-    // ParsedQuery → QueryExpr lowering drops the Aggregate (legacy
-    // ParsedQuery only carries `aggregations: Vec<AggType>` not the
-    // by-axis directly). In either case the metric name + label survive
-    // somewhere in the L3 sub-tree — assert that.
-    // `PhysicalExpr` is no longer `Serialize` (see its doc) — `Debug`
-    // output still contains every string literal in the tree, so it
-    // works just as well for this substring search.
-    let dbg = format!("{bound:?}");
-    assert!(
-        dbg.contains("http_requests_total"),
-        "metric name lost through pipeline: {dbg}"
-    );
-    assert!(
-        dbg.contains("instance"),
-        "by-label `instance` lost through pipeline: {dbg}"
-    );
-}
-
-/// A Rate query keeps Planner's exact Rate family through binding. The
-/// physical emitter chooses the runtime processor without changing that
-/// family identity.
-#[test]
-fn phase_b_e2e_rate_falls_through_to_logical() {
-    let bound = pipeline_l1_to_l4(
-        "rate(http_requests_total[5m])",
-        AccuracyTarget::Epsilon(0.01),
-    );
-    assert!(crate::emit::extract_root_sketch_algorithm(&bound).is_none());
-    assert!(
-        !binding_is_archive(&bound),
-        "Rate is ASAP-tier, not archive"
-    );
-}
-
-/// Value-ranked TopK candidates with missing membership evidence remain
-/// inspectable but cannot be reported as certified selections.
-#[test]
-fn value_ranked_topk_without_membership_evidence_is_not_certified() {
-    let query = "topk(10, sum by (instance) (rate(http_requests_total[5m])))";
-    let accuracy = AccuracyTarget::Epsilon(0.05);
-    let expr = crate::query_parser::parse_query_expr_canonical(query, accuracy.clone())
-        .expect("TopK parses");
-    let (_, trace) = crate::planner_selection::select_workload_with_accuracy_model_and_trace(
-        vec![(0, std::rc::Rc::new(expr))],
-        accuracy.clone(),
-        &crate::physical::post_asap::cost_model::ControlPlaneCostModel::new(accuracy),
-        &asap_aware_mapping::NoAccuracyEvidence,
-        &asap_aware_mapping::DefaultAccuracyModel,
-    )
-    .unwrap();
-    assert!(trace["groups"]
-        .as_array()
-        .unwrap()
-        .iter()
-        .flat_map(|group| group["candidates"].as_array().unwrap())
-        .any(
-            |candidate| candidate["accuracy_status"] == "unknown" && candidate["selected"] == false
-        ));
-}
-
-/// Archive-only routing through the full L1→L3→L4 pipeline. Asserts the
-/// expected functional equivalent of asap-planner-rs's previous
-/// `is_supported() == false` behavior (refused outright); the control plane
-/// now lifts these to L3 with `archive_only() == true` and the binder
-/// emits a Logical pass-through.
-///
-/// Replaces the prior `phase_b_e2e_histogram_quantile_e2e_through_parser`
-/// — `histogram_quantile(...)` is now a PromQL/MetricsQL language-level
-/// operator that the parser substitutes (Step γ5) into a plain
-/// `Aggregate { Quantile(φ) }`, NOT an L3 intent of its own. The
-/// archive-only routing this test exercises uses `Absent` as a stable
-/// proxy (every archive-only variant follows the same code path).
-#[test]
-fn phase_b_e2e_archive_only_e2e_binding() {
-    let intent = AggIntent::Absent;
-    let expr = QueryExpr::Aggregate {
-        reduction: Reduction::PerEntity,
-        measures: vec![intent.clone()],
-        output_names: Vec::new(),
-        having: None,
-        child: Rc::new(windowed_scan()),
-    };
-    let bound = bind_query_expr(&expr, AccuracyTarget::Epsilon(0.01)).unwrap();
-    assert!(
-        binding_is_archive(&bound),
-        "archive-only intent must surface archive flag through L4 binding"
-    );
-    // No approximate summary fires for archive-only intents.
-    assert!(crate::emit::extract_root_sketch_algorithm(&bound).is_none());
-}
-
-/// Archive-only intents must produce valid logical expressions without errors.
-#[test]
-fn phase_b_archive_only_intents_round_trip_through_binder() {
-    let intents = vec![
-        AggIntent::Absent,
-        AggIntent::AbsentOverTime,
-        AggIntent::PresentOverTime,
-        AggIntent::Delta,
-        AggIntent::Deriv,
-        AggIntent::PredictLinear { seconds: 60.0 },
-        AggIntent::DoubleExpSmoothing {
-            smoothing: 0.3,
-            trend: 0.3,
-        },
-        AggIntent::IDelta,
-        AggIntent::Resets,
-        AggIntent::Changes,
-        // Spot-check a couple of the Phase 1 IR merge's new archive-only
-        // intents through the same round-trip.
-        AggIntent::HistogramCount,
-        AggIntent::Group,
-    ];
-    for intent in intents {
-        let expr = QueryExpr::Aggregate {
-            reduction: Reduction::PerEntity,
-            measures: vec![intent.clone()],
-            output_names: Vec::new(),
-            having: None,
-            child: Rc::new(windowed_scan()),
-        };
-        let bound =
-            bind_query_expr(&expr, AccuracyTarget::Epsilon(0.01)).expect("bind should succeed");
-        match bound {
-            PhysicalExpr::Committed(PostAsapPlan::Summary(node)) => match &node.expr {
-                SummaryExpr::KeepPreAsap(qe) => match qe.as_ref() {
-                    QueryExpr::Aggregate { measures: aggs, .. } => {
-                        assert_eq!(aggs.len(), 1);
-                        assert!(
-                            crate::planner_selection::archive_only(&aggs[0]),
-                            "{intent:?} should preserve archive_only() flag through bind"
-                        );
-                    }
-                    other => panic!("expected Aggregate({intent:?}), got {other:?}"),
-                },
-                other => panic!("expected Logical(Aggregate({intent:?})), got {other:?}"),
-            },
-            other => panic!("expected Committed(Summary(_)) for {intent:?}, got {other:?}"),
-        }
-    }
-}
-
-// ── Deliberate behavior changes (ASAPController#150 / #151) ──────────────────
-//
-// `AggIntent::Extension` (this deployment's `Frequency` point-query,
-// built via `crate::planner_selection::frequency(accuracy, item)`) now binds to a
-// real `Cms` summary via `ControlPlaneCostModel::realize_extension`/
-// `readout_extension` (ASAPController#150) — see `frequency_extension_binds_cms`
-// below and `physical::workload_planner::mod::tests::typed_binding_endpoint_request_freq_binds_cms`.
-// `AggIntent::TopK { accuracy: Exact }` still declines to bind
-// (`SummaryExpr::KeepPreAsap`) rather than summary — a REAL, accepted
-// behavior change from this migration that remains open
-// (`TopK{Exact}`'s `exact_realization` has no accumulator form for it —
-// see `lower.rs`'s module docs and `cost_model.rs`'s module docs,
-// ASAPController#151, still open).
-
-#[test]
-fn frequency_extension_binds_cms() {
-    // `ControlPlaneCostModel::realize_extension`/`readout_extension`
-    // (ASAPController#150) now realize `AggIntent::Extension{"frequency"}`
-    // as a real `Cms` summary instead of declining to `Logical`.
-    let intent = crate::planner_selection::frequency(AccuracyTarget::Epsilon(0.01), None);
-    let expr = QueryExpr::Aggregate {
-        reduction: Reduction::PerEntity,
-        measures: vec![intent],
-        output_names: Vec::new(),
-        having: None,
-        child: Rc::new(windowed_scan()),
-    };
-    let bound = bind_query_expr(&expr, AccuracyTarget::Epsilon(0.01)).expect("no error");
-    match bound {
-        PhysicalExpr::Committed(PostAsapPlan::Summary(node)) => {
-            let SummaryExpr::SummaryEstimate {
-                summary_input,
-                query,
-            } = &node.expr
-            else {
-                panic!("expected SummaryEstimate, got {:?}", node.expr);
-            };
-            assert!(
-                matches!(
-                    &summary_input.expr,
-                    SummaryExpr::SummaryAgg {
-                        family: SummaryFamilyType::Sketch(kind, _),
-                        ..
-                    } if kind.algorithm() == &SketchAlgorithm::Cms
-                ),
-                "expected a Cms SummaryAgg, got {:?}",
-                summary_input.expr
-            );
-            assert!(
-                matches!(
-                    query,
-                    SketchQuery::PointCount {
-                        key: ColumnRef::SampleValue,
-                        value: None
-                    }
-                ),
-                "no filter value threaded through yet (ASAPQuery-backend Phase 3) -- \
-                 should read out as the bare bucket total, got {query:?}",
-            );
-        }
-        other => panic!("expected Committed(Summary(_)), got {other:?}"),
-    }
-}
-
-#[test]
-fn topk_exact_accuracy_declines_to_bind() {
-    let expr = agg_topk(10, AccuracyTarget::Exact);
-    let bound = bind_query_expr(&expr, AccuracyTarget::Exact).expect("no error");
-    match bound {
-        PhysicalExpr::Committed(PostAsapPlan::Summary(node)) => {
-            assert!(
-                matches!(&node.expr, SummaryExpr::KeepPreAsap(_)),
-                "TopK{{accuracy: Exact}} should decline pending ASAPController#151, got {:?}",
-                node.expr
-            );
-        }
-        other => panic!("expected Committed(Summary(_)), got {other:?}"),
-    }
-}
-
-fn committed_node(bound: PhysicalExpr) -> Rc<SummaryNode> {
-    let PhysicalExpr::Committed(PostAsapPlan::Summary(node)) = bound else {
-        panic!("expected committed query")
-    };
-    node
-}
-
-fn query_is_exact(node: &SummaryNode) -> bool {
-    node.guarantee
-        .as_ref()
-        .is_some_and(|guarantee| guarantee.is_exact())
-}
diff --git a/control_plane/src/physical/publication.rs b/control_plane/src/physical/publication.rs
deleted file mode 100644
index 6bd088f35..000000000
--- a/control_plane/src/physical/publication.rs
+++ /dev/null
@@ -1,17 +0,0 @@
-//! Control-plane construction of the shared catalog publication contract.
-use super::compiler::CompiledPhysicalPlan;
-pub use asap_types::plan_publication::{PhysicalPlanInstallRequest, PhysicalPlanPublication};
-
-impl CompiledPhysicalPlan {
-    pub fn to_publication_artifact(&self) -> Result<PhysicalPlanPublication, String> {
-        let artifact = PhysicalPlanPublication {
-            summary_catalog: self.summary_catalog.clone(),
-            precompute_plan: self.precompute_plan.clone(),
-            collector_plans: self.collector_plans.clone(),
-            transmission_plan: self.transmission_plan.clone(),
-            query_plan: self.query_plan.clone(),
-        };
-        artifact.validate()?;
-        Ok(artifact)
-    }
-}
diff --git a/control_plane/src/physical/realization.rs b/control_plane/src/physical/realization.rs
deleted file mode 100644
index 0f16ebf30..000000000
--- a/control_plane/src/physical/realization.rs
+++ /dev/null
@@ -1,67 +0,0 @@
-//! Internal realization boundary over the existing compiler and cost contracts.
-//!
-//! Providers may validate and price physical implementations, never rewrite
-//! selected logical roots or infer a pane width from a query's slide.
-use super::compiler::{
-    CompileError, CompiledPhysicalPlan, DeploymentPlanCompiler, PhysicalCompilationRequest,
-    PhysicalDeploymentContext, QueryCompilationInput,
-};
-use super::workload_cost::{PricedComponents, WorkloadCostEvidence, WorkloadCostManifest};
-use asap_aware_mapping::cost_model::Cost;
-use planner_types::post_asap::SummaryWindowFramework;
-
-pub(crate) trait RealizationProvider {
-    fn windows(
-        &self,
-        query: &QueryCompilationInput,
-        environment: &PhysicalDeploymentContext,
-    ) -> Result<Vec<(String, SummaryWindowFramework, Cost)>, CompileError>;
-
-    fn compile(
-        &self,
-        request: PhysicalCompilationRequest,
-        environment: PhysicalDeploymentContext,
-        frontend: super::compiler::QueryFrontend,
-    ) -> Result<CompiledPhysicalPlan, CompileError>;
-
-    fn price(
-        &self,
-        evidence: &WorkloadCostEvidence,
-        manifest: &WorkloadCostManifest,
-    ) -> Result<PricedComponents, (super::workload_cost::CandidateEvaluationStatus, String)>;
-}
-
-/// Only the currently implemented deployment paths. Capability validation
-/// remains in the compiler; a quote cannot authorize an unsupported runtime.
-pub(crate) struct ExistingRealizations;
-
-impl RealizationProvider for ExistingRealizations {
-    fn windows(
-        &self,
-        query: &QueryCompilationInput,
-        environment: &PhysicalDeploymentContext,
-    ) -> Result<Vec<(String, SummaryWindowFramework, Cost)>, CompileError> {
-        super::compiler::validate_window_implementations(query, environment)
-    }
-
-    fn compile(
-        &self,
-        request: PhysicalCompilationRequest,
-        environment: PhysicalDeploymentContext,
-        frontend: super::compiler::QueryFrontend,
-    ) -> Result<CompiledPhysicalPlan, CompileError> {
-        if frontend == super::compiler::QueryFrontend::MetricsQl {
-            DeploymentPlanCompiler.compile_metricsql(request, environment)
-        } else {
-            DeploymentPlanCompiler.compile_promql(request, environment)
-        }
-    }
-
-    fn price(
-        &self,
-        evidence: &WorkloadCostEvidence,
-        manifest: &WorkloadCostManifest,
-    ) -> Result<PricedComponents, (super::workload_cost::CandidateEvaluationStatus, String)> {
-        evidence.price(manifest)
-    }
-}
diff --git a/control_plane/src/physical/runtime_capability.rs b/control_plane/src/physical/runtime_capability.rs
deleted file mode 100644
index 8dc48e18d..000000000
--- a/control_plane/src/physical/runtime_capability.rs
+++ /dev/null
@@ -1,1019 +0,0 @@
-//! Runtime SID capability tag and query-to-deployed-state routing adapter.
-//!
-//! Step 2a of the architectural refactor originally consolidated four
-//! overlapping capability tables into this module. The performance /
-//! cost-model half of that consolidation — [`SketchCapability`] /
-//! `default_capability_table` / `load_capability_overrides`
-//! — moved to `crate::physical::deployment_cost::sketch_capability` (Stage 4 of the
-//! `physical::post_asap` re-layering): it's a cost-model concern read by the
-//! optimizer and physical planner, not L4 IR. What's left here:
-//!
-//! - [`Capability`] / [`SketchAlgorithm`] — query-side capability tag,
-//!   used by the ASAP-tier reducer in `asap-query-engine` to dispatch
-//!   PromQL → per-Capability sketch evaluation.
-//! - [`capability_for`] — the **semantic** intent → ASAP-tier dispatch
-//!   bridge. PromQL → intent_algebra::lower → `AggIntent` → (this fn) →
-//!   `Capability`. The ASAP-tier analyzer is now a thin facade around
-//!   this single function; PromQL function-name string matching lives
-//!   only inside the lowerer.
-
-#![allow(dead_code)]
-
-use crate::physical::post_asap::matcher::sketch_family_satisfied;
-use crate::types::AccuracyTarget;
-use asap_types::AggregationType;
-pub use planner_types::post_asap::SketchAlgorithm;
-#[cfg(test)]
-use planner_types::pre_asap::AggIntent;
-
-// ── Query-side capability tag ────────────────────────────────────────────────
-
-/// Warm-tier capability tag. One variant per logical query family the
-/// ASAP tier can answer. The inner [`SketchAlgorithm`] is the
-/// implementation choice (e.g. DDSketch vs KLL for `QuantileApprox`).
-/// Query routing keys on the variant, not the implementation, so two
-/// CMS instances and one CountSketch instance for the same metric-and-
-/// group-by all map to `FrequencyTopk` and the query path picks any
-/// of them.
-///
-/// Used by both the control plane (via [`capability_for`] in the ASAP-tier
-/// analyzer) and the `asap-query-engine` backend (re-exported as the
-/// `sketch_index::Capability` it indexes sketch instances under). One
-/// canonical definition; the backend re-exports rather than duplicating.
-#[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub enum Capability {
-    /// Approximate quantile via DDSketch / KLL / t-digest. The handle's
-    /// `Any` variant means "any quantile-family sketch satisfies"; a
-    /// concrete handle means "must be exactly this family".
-    QuantileApprox(Option<SketchAlgorithm>),
-    /// Approximate cardinality via HLL / theta-sketch / linear-counting.
-    /// No inner handle — cardinality has a single canonical family
-    /// today (HLL).
-    CardinalityApprox,
-    /// Bare per-item frequency estimate (CMS / CountSketch point query,
-    /// no top-k extraction). Heap-LESS — answers `sum by (item) (rate(m[r]))`
-    /// with epsilon accuracy. Distinct from [`Capability::FrequencyTopk`]:
-    /// any heap-bearing variant ALSO satisfies bare frequency (the heap is
-    /// additional info layered on top of the sketch matrix), so
-    /// `is_satisfied_by` allows {CountMin, CountSketch, CmsWithHeap,
-    /// CountSketchWithHeap} on the available side.
-    FrequencyEstimate(Option<SketchAlgorithm>),
-    /// Heavy-hitter top-k via CMS-with-heap or CountSketch-with-heap.
-    /// Heap-BEARING — only handles that carry an item universe in their
-    /// wire format can answer this. `Any` required matches either
-    /// `CmsWithHeap` or `CountSketchWithHeap`.
-    FrequencyTopk(Option<SketchAlgorithm>),
-    /// Exact-aggregation ASAP-tier state — Sum / Count / Min / Max / Avg /
-    /// Rate / Increase / SetAggregator etc. Backed by a per-accumulator
-    /// payload (`AggPayload::ExactAgg` in the data plane). One variant
-    /// per [`AggregationType`] — the inner enum names the concrete
-    /// accumulator family.
-    ///
-    /// Distinct from the `*Approx` variants above: the `*Approx`
-    /// capabilities serve approximate sketch-bound intents; `ExactAgg`
-    /// serves the ASAP-tier exact-aggregation path (the data plane's
-    /// `AggKind::ExactAgg`-backed sids). Routing an analyzer candidate
-    /// at `Capability::ExactAgg(Sum)` to a sid whose `agg_kind` is
-    /// `AggKind::ExactAgg { agg_type: Sum, .. }` is what closes the gap
-    /// between the control plane's vocabulary and the data plane's
-    /// exact-aggregation state.
-    ///
-    /// PR 6 introduces this variant + the matching machinery. The
-    /// `capability_for(&AggIntent)` lookup deliberately does NOT route
-    /// `Sum` / `Min` / `Max` / `Rate` / `Increase` / exact-accuracy
-    /// intents to `ExactAgg` yet — that re-routing is a behavior
-    /// change deferred to a follow-up. The variant is dormant on the
-    /// analyzer side until then; the matching half (`is_satisfied_by`)
-    /// is wired so that sids whose stored `Capability` is
-    /// `ExactAgg(...)` can be filtered against an `ExactAgg(...)`
-    /// required capability once callers start populating it.
-    ExactAgg(AggregationType),
-}
-
-/// PromQL counter-function shape carried to execution without reparsing.
-/// The inner counter function wins for composed expressions.
-///
-/// Counter state contains per-window deltas:
-///
-/// * Plain sum accumulates stored deltas.
-/// * Rate sums deltas over the range and divides by covered seconds.
-/// * Increase sums deltas over the range.
-/// * Sum-over-time requires archive execution because cumulative samples
-///   cannot be reconstructed from delta state alone.
-///
-/// Rate and Increase have distinct exact-family capabilities.
-#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash, Default)]
-pub enum OuterFn {
-    /// No range-style counter function in the expression — bare selector,
-    /// `sum(metric)`, `sum by (...) (metric)`. PromQL semantics for an
-    /// instant `sum` over a counter is "current cumulative counter value,
-    /// summed per group". Over per-window deltas the engine accumulates
-    /// EVERY window in storage up to `now` into one cumulative number per
-    /// group. This is the default — `Default::default()` returns `Plain`
-    /// so candidates built without an explicit outer-fn (test fixtures,
-    /// fallback paths) get the safe accumulate-all dispatch.
-    #[default]
-    Plain,
-    /// `rate(metric[r])` or `irate(metric[r])` appears in the expression
-    /// (possibly nested inside an outer `sum by (...) (...)`). The engine
-    /// dispatches to `evaluate_exact_agg_rate`, which sums the deltas in
-    /// `[t-r, t]` and divides by `min(r, actual_coverage_seconds)` to
-    /// produce events-per-second.
-    Rate,
-    /// `increase(metric[r])` appears in the expression. PromQL semantics:
-    /// `counter(t) − counter(t−r)`. Over per-window deltas that is exactly
-    /// the sum of deltas in `[t-r, t]`. The engine dispatches to the
-    /// accumulate-across-windows path scoped to the `[t-r, t]` clip,
-    /// yielding ONE cumulative number per group (no `÷ r`).
-    Increase,
-    /// `sum_over_time(metric[r])` appears in the expression. PromQL
-    /// semantics: Σ of the (cumulative) SAMPLE values in `[r]` — a
-    /// quadratic over the storage horizon that asap CANNOT reconstruct
-    /// from stored deltas. The engine returns a capability-miss so the
-    /// query routes to the archive tier (which has raw samples) rather
-    /// than fabricating a wrong number. See issue #301 decision (a).
-    SumOverTime,
-}
-
-/// PromQL outer-aggregation operator carried on each `ASAPTierCandidate`
-/// for the shape `<agg-op> by (labels) (<inner>)` where `<inner>` is a
-/// function the analyzer ALREADY routes to a per-row ASAP-tier
-/// candidate (e.g. `quantile_over_time`, `sum_over_time`, `rate`).
-///
-/// Background: the analyzer's lowerer captures the INNER intent
-/// (`AggIntent::Quantile`, `AggIntent::Sum`, etc.) — that's what
-/// `capability_for` maps to a `Capability`. The OUTER aggregation
-/// operator (`max`, `min`, `avg`, `count`, etc.) wrapping the inner
-/// function is dropped on the floor: the lowerer either folds it into a
-/// dedicated `AggIntent` (`Sum` → `ExactAgg(Sum)`, handled separately)
-/// or returns no extra intent for the wrapper (`max`, `min`, `avg`,
-/// `count` — which are scalar folds over the inner's per-row result).
-///
-/// `OuterAgg` carries that wrapper so the engine's evaluator can
-/// fold per-row results into one row per `by`-group AFTER the inner
-/// function returns its rows. The taxonomy intentionally splits the
-/// fold operators that ARE composable on top of a per-row inner result
-/// — the inner sketch / accumulator computes per-row values, and the
-/// outer aggregation reduces across rows in each `by`-group.
-///
-/// Identity case: when the inner result already has exactly one row
-/// per `by`-group (e.g. asap's per-zone DDSketch quantile), the fold
-/// is the identity — `max(x) = min(x) = avg(x) = x`. The general fold
-/// machinery handles this naturally without a special case.
-///
-/// `None` is the default — `Default::default()` returns `None` so
-/// candidates built without an explicit outer aggregation (test
-/// fixtures, plain inner-only queries) keep the prior behavior.
-///
-/// Out of scope (separate follow-up):
-/// - PromQL `quantile(phi, vec)` (instant) over function results —
-///   needs per-group sketch merging, not a scalar fold.
-/// - `sum` is NOT included here: `sum by (...) (...)` already routes
-///   through `Capability::ExactAgg(Sum)` via the analyzer's lowerer +
-///   the `Sum` intent collapse; adding it here would double-dispatch.
-#[derive(Debug, Clone, PartialEq, Eq, Default)]
-pub enum OuterAgg {
-    /// No outer aggregation operator wraps the inner function — the
-    /// engine emits the inner result directly. This is the default.
-    #[default]
-    None,
-    /// `max by (labels) (<inner>)` — fold each `by`-group's values by
-    /// taking the maximum.
-    Max(Vec<String>),
-    /// `min by (labels) (<inner>)` — fold each `by`-group's values by
-    /// taking the minimum.
-    Min(Vec<String>),
-    /// `avg by (labels) (<inner>)` — fold each `by`-group's values by
-    /// taking the arithmetic mean.
-    Avg(Vec<String>),
-    /// `count by (labels) (<inner>)` — fold each `by`-group's values
-    /// by counting the contributing rows (cardinality of the group).
-    Count(Vec<String>),
-    /// `group by (labels) (<inner>)` — PromQL `group` operator returns
-    /// 1.0 per `by`-group (label preservation, value-erasing fold).
-    Group(Vec<String>),
-    /// `stddev by (labels) (<inner>)` — fold each `by`-group's values
-    /// by taking the population standard deviation.
-    Stddev(Vec<String>),
-    /// `stdvar by (labels) (<inner>)` — fold each `by`-group's values
-    /// by taking the population variance.
-    Stdvar(Vec<String>),
-}
-
-impl OuterAgg {
-    /// True when an outer aggregation operator is set. False for the
-    /// `None` default. Used by the engine's evaluator to skip the
-    /// fold pass when no outer aggregation applies.
-    pub fn is_some(&self) -> bool {
-        !matches!(self, OuterAgg::None)
-    }
-
-    /// The `by`-labels carried by every operator variant. `None` returns
-    /// an empty slice. Caller projects each result row's label map onto
-    /// these keys to form the group identity.
-    pub fn by_labels(&self) -> &[String] {
-        match self {
-            OuterAgg::None => &[],
-            OuterAgg::Max(l)
-            | OuterAgg::Min(l)
-            | OuterAgg::Avg(l)
-            | OuterAgg::Count(l)
-            | OuterAgg::Group(l)
-            | OuterAgg::Stddev(l)
-            | OuterAgg::Stdvar(l) => l.as_slice(),
-        }
-    }
-
-    /// Fold a slice of f64 values into a single scalar per the operator.
-    /// Returns `None` only for an empty input slice (caller drops empty
-    /// groups). All operators are defined on at least one value.
-    pub fn fold(&self, values: &[f64]) -> Option<f64> {
-        if values.is_empty() {
-            return None;
-        }
-        Some(match self {
-            // Identity / no-op — engine shouldn't call this when None,
-            // but defensively return the first value.
-            OuterAgg::None => values[0],
-            OuterAgg::Max(_) => values.iter().copied().fold(f64::NEG_INFINITY, f64::max),
-            OuterAgg::Min(_) => values.iter().copied().fold(f64::INFINITY, f64::min),
-            OuterAgg::Avg(_) => {
-                let sum: f64 = values.iter().sum();
-                sum / values.len() as f64
-            }
-            OuterAgg::Count(_) => values.len() as f64,
-            OuterAgg::Group(_) => 1.0,
-            OuterAgg::Stddev(_) => {
-                let n = values.len() as f64;
-                let mean: f64 = values.iter().sum::<f64>() / n;
-                let var: f64 = values.iter().map(|v| (v - mean).powi(2)).sum::<f64>() / n;
-                var.sqrt()
-            }
-            OuterAgg::Stdvar(_) => {
-                let n = values.len() as f64;
-                let mean: f64 = values.iter().sum::<f64>() / n;
-                values.iter().map(|v| (v - mean).powi(2)).sum::<f64>() / n
-            }
-        })
-    }
-}
-
-impl Capability {
-    /// True when an indexed sketch instance's capability satisfies the
-    /// query's required capability. `None` on the query side means any
-    /// algorithm in that capability family.
-    ///
-    /// `self` is the **required** capability (from the analyzer);
-    /// `indexed` is the **available** capability (from the sketch
-    /// index). The backend's ASAP-tier hook reads both and routes the
-    /// query to whichever sids satisfy.
-    ///
-    /// The four sketch-family variants (`QuantileApprox`,
-    /// `CardinalityApprox`, `FrequencyEstimate`, `FrequencyTopk`)
-    /// delegate their family-compatibility logic to
-    /// [`sketch_family_satisfied`] (`enum-unification-plan.md`
-    /// §5/§8 Step 4) — via [`resolve_handle`], which picks a concrete
-    /// per-family stand-in for the `Any` wildcard since `SketchAlgorithm`
-    /// has no wildcard concept of its own; family-matching subsumes it.
-    /// Exact families require identity; keyed layout is checked separately.
-    pub fn is_satisfied_by(&self, indexed: &Capability) -> bool {
-        match (self, indexed) {
-            (Capability::QuantileApprox(req), Capability::QuantileApprox(have)) => {
-                sketch_algorithms_compatible(req, SketchAlgorithm::Kll, have, SketchAlgorithm::Kll)
-            }
-            // Cardinality has no inner handle; family match is total.
-            (Capability::CardinalityApprox, Capability::CardinalityApprox) => true,
-            // Top-k: the `Any` stand-in on EITHER side must be the
-            // heap-bearing `CmsWithHeap`, not bare `Cms` — a bare
-            // stand-in would let a heap-less available sketch wrongly
-            // satisfy a top-k requirement (see `resolve_handle`'s doc).
-            (Capability::FrequencyTopk(req), Capability::FrequencyTopk(have)) => {
-                sketch_algorithms_compatible(
-                    req,
-                    SketchAlgorithm::CmsWithHeap,
-                    have,
-                    SketchAlgorithm::CmsWithHeap,
-                )
-            }
-            // Bare frequency: any frequency-family handle works on the
-            // available side — heap-LESS (CountMin / CountSketch) AND
-            // heap-bearing (CmsWithHeap / CountSketchWithHeap) all answer
-            // a point-frequency query (heap is additional info layered on
-            // the sketch matrix). A heap-bearing `FrequencyTopk` indexed
-            // capability ALSO satisfies a bare-frequency required capability.
-            (Capability::FrequencyEstimate(req), Capability::FrequencyEstimate(have)) => {
-                sketch_algorithms_compatible(req, SketchAlgorithm::Cms, have, SketchAlgorithm::Cms)
-            }
-            (Capability::FrequencyEstimate(req), Capability::FrequencyTopk(have)) => {
-                sketch_algorithms_compatible(
-                    req,
-                    SketchAlgorithm::Cms,
-                    have,
-                    SketchAlgorithm::CmsWithHeap,
-                )
-            }
-            // Exact family identity must match. Grouping compatibility is
-            // checked separately by population routing.
-            (Capability::ExactAgg(req), Capability::ExactAgg(have)) => req == have,
-            _ => false,
-        }
-    }
-}
-
-/// Resolve optional query-side algorithm constraints and delegate family
-/// compatibility to the ASAPPlanner algorithm taxonomy. `None` means any
-/// algorithm in the capability's category; it is not a fake algorithm.
-fn sketch_algorithms_compatible(
-    required: &Option<SketchAlgorithm>,
-    required_any_stand_in: SketchAlgorithm,
-    available: &Option<SketchAlgorithm>,
-    available_any_stand_in: SketchAlgorithm,
-) -> bool {
-    let required = required.as_ref().unwrap_or(&required_any_stand_in);
-    let available = available.as_ref().unwrap_or(&available_any_stand_in);
-    sketch_family_satisfied(required, available)
-}
-
-// ── AggIntent → Capability bridge ────────────────────────────────────────────
-
-#[cfg(test)]
-/// Map a semantic [`AggIntent`] to the ASAP-tier [`Capability`] that can
-/// answer it. Returns `None` when no deployed ASAP-tier capability can
-/// satisfy the intent.
-///
-/// This is a runtime routing requirement, not a summary-selection rule.
-/// ASAPPlanner owns legal implementations and candidate enumeration; this
-/// adapter describes which already-deployed SID the data plane may read.
-pub fn capability_for(intent: &AggIntent) -> Option<Capability> {
-    if let Some(accuracy) = crate::planner_selection::as_frequency(intent) {
-        return if is_exact(&accuracy) {
-            // Exact aggregation — sketch fallback is only meaningful
-            // when raw counters aren't kept at the ingest tier; with
-            // accuracy=Exact the caller wants exact `sum by (label)
-            // (rate(...))`, which routes to archive.
-            None
-        } else {
-            // Bare frequency point-query uses a frequency-family
-            // sketch — any of CMS / CountSketch / CmsWithHeap /
-            // CountSketchWithHeap works (the heap is additional
-            // info that the FrequencyTopk path uses). `Any` here
-            // means the optimizer picks the cheapest indexed sid.
-            Some(Capability::FrequencyEstimate(None))
-        };
-    }
-    match intent {
-        AggIntent::Sum { .. } => Some(Capability::ExactAgg(AggregationType::Sum)),
-        AggIntent::Count { accuracy } if is_exact(accuracy) => {
-            Some(Capability::ExactAgg(AggregationType::Count))
-        }
-        // Direction is part of the capability: a stored minimum cannot
-        // answer `max_over_time` and vice versa, so these must not
-        // collapse onto one `ExactAgg` the way they did while Planner
-        // had a single `MinMax` accumulator.
-        AggIntent::Min { .. } => Some(Capability::ExactAgg(AggregationType::Min)),
-        AggIntent::Max { .. } => Some(Capability::ExactAgg(AggregationType::Max)),
-        AggIntent::Increase => Some(Capability::ExactAgg(AggregationType::Increase)),
-        AggIntent::Rate => Some(Capability::ExactAgg(AggregationType::Rate)),
-        AggIntent::Quantile { accuracy, .. } if !is_exact(accuracy) => {
-            Some(Capability::QuantileApprox(None))
-        }
-        AggIntent::Cardinality { accuracy, .. } if !is_exact(accuracy) => {
-            Some(Capability::CardinalityApprox)
-        }
-        AggIntent::TopK { accuracy, .. } if !is_exact(accuracy) => {
-            Some(Capability::FrequencyTopk(None))
-        }
-        AggIntent::Count { accuracy } if !is_exact(accuracy) => {
-            Some(Capability::FrequencyEstimate(None))
-        }
-        _ => None,
-    }
-}
-
-/// True iff the accuracy target forbids approximation. Wraps the match
-/// so the call sites read as `if is_exact(accuracy) { ... }`.
-fn is_exact(accuracy: &AccuracyTarget) -> bool {
-    matches!(accuracy, AccuracyTarget::Exact)
-}
-
-// ── Tests ────────────────────────────────────────────────────────────────────
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    // ── capability_for: AggIntent → Capability bridge ────────────────────
-
-    #[test]
-    fn capability_for_quantile_returns_quantile_approx() {
-        let intent = AggIntent::Quantile {
-            col: None,
-            q: 0.99,
-            accuracy: AccuracyTarget::Epsilon(0.01),
-        };
-        assert_eq!(
-            capability_for(&intent),
-            Some(Capability::QuantileApprox(None))
-        );
-    }
-
-    #[test]
-    fn capability_for_quantile_exact_returns_none() {
-        let intent = AggIntent::Quantile {
-            col: None,
-            q: 0.99,
-            accuracy: AccuracyTarget::Exact,
-        };
-        // Exact quantiles must be answered by HashAgg/SortAgg — no
-        // ASAP-tier sketch in this case.
-        assert_eq!(capability_for(&intent), None);
-    }
-
-    #[test]
-    fn capability_for_cardinality_with_epsilon_returns_cardinality_approx() {
-        let intent = AggIntent::Cardinality {
-            cols: vec![],
-            accuracy: AccuracyTarget::Epsilon(0.01),
-        };
-        assert_eq!(capability_for(&intent), Some(Capability::CardinalityApprox));
-    }
-
-    #[test]
-    fn capability_for_cardinality_with_epsilon_delta_returns_cardinality_approx() {
-        let intent = AggIntent::Cardinality {
-            cols: vec![],
-            accuracy: AccuracyTarget::EpsilonDelta {
-                epsilon: 0.01,
-                delta: 0.001,
-            },
-        };
-        assert_eq!(capability_for(&intent), Some(Capability::CardinalityApprox));
-    }
-
-    #[test]
-    fn capability_for_cardinality_with_exact_returns_none() {
-        let intent = AggIntent::Cardinality {
-            cols: vec![],
-            accuracy: AccuracyTarget::Exact,
-        };
-        assert_eq!(capability_for(&intent), None);
-    }
-
-    #[test]
-    fn capability_for_count_approximate_returns_frequency_estimate() {
-        // Non-exact `Count` is a relaxed-accuracy `COUNT(*)` point query
-        // (CMS), matching ASAPController's own `bind.rs::readout`
-        // (`Count => SketchQuery::PointCount`) and this repo's
-        // `BindCmsOnCount` rule — not `CardinalityApprox`/HLL, which is
-        // `AggIntent::Cardinality`'s job (`distinct_over_time`/
-        // `COUNT(DISTINCT)` never lower to `Count`).
-        let intent = AggIntent::Count {
-            accuracy: AccuracyTarget::Epsilon(0.01),
-        };
-        assert_eq!(
-            capability_for(&intent),
-            Some(Capability::FrequencyEstimate(None))
-        );
-    }
-
-    /// The two intents must never collapse into one capability: an approximate
-    /// `Count` is a `COUNT(*)` point query (frequency sketch), while
-    /// `Cardinality` is `COUNT(DISTINCT ...)` (HLL). Routing `Count` to
-    /// `CardinalityApprox` makes a by-less `count(v)` merge HLL registers and
-    /// answer the union's distinct count instead of the number of series --
-    /// see `query_parser::tests::bare_count_is_series_count_not_distinct_cardinality`
-    /// for the lowering half of this invariant.
-    #[test]
-    fn count_and_cardinality_bind_different_sketch_capabilities() {
-        let approximate = AccuracyTarget::Epsilon(0.01);
-        let count = capability_for(&AggIntent::Count {
-            accuracy: approximate.clone(),
-        });
-        let cardinality = capability_for(&AggIntent::Cardinality {
-            cols: vec![],
-            accuracy: approximate,
-        });
-        assert_eq!(count, Some(Capability::FrequencyEstimate(None)));
-        assert_eq!(cardinality, Some(Capability::CardinalityApprox));
-        assert_ne!(
-            count, cardinality,
-            "count() must not bind the HLL capability that answers COUNT(DISTINCT)"
-        );
-    }
-
-    #[test]
-    fn capability_for_count_exact_preserves_count_family() {
-        let intent = AggIntent::Count {
-            accuracy: AccuracyTarget::Exact,
-        };
-        assert_eq!(
-            capability_for(&intent),
-            Some(Capability::ExactAgg(AggregationType::Count))
-        );
-    }
-
-    #[test]
-    fn capability_for_sum_routes_to_exact_agg_sum() {
-        // PR-6 follow-up: Sum routes to ASAP-tier ExactAgg(Sum) state.
-        // Pre-follow-up this returned `None`.
-        assert_eq!(
-            capability_for(&AggIntent::Sum { col: None }),
-            Some(Capability::ExactAgg(AggregationType::Sum))
-        );
-    }
-
-    #[test]
-    fn capability_for_avg_returns_none() {
-        // Avg is exact at L3 — no ASAP-tier sketch substitutes for it
-        // today (a sketch-bound `Avg` would fold onto `Quantile{q=0.5}`
-        // only when the cost model allows the relaxation, which is a
-        // follow-up).
-        assert_eq!(capability_for(&AggIntent::Avg { col: None }), None);
-    }
-
-    #[test]
-    fn capability_for_min_returns_exact_agg_min() {
-        // Min/Max are exact, mergeable accumulators -- no approximation
-        // needed at all -- matching ASAPController's own
-        // `crates/plan/src/boundary.rs` treatment.
-        assert_eq!(
-            capability_for(&AggIntent::Min { col: None }),
-            Some(Capability::ExactAgg(AggregationType::Min))
-        );
-    }
-
-    #[test]
-    fn capability_for_max_returns_exact_agg_max() {
-        assert_eq!(
-            capability_for(&AggIntent::Max { col: None }),
-            Some(Capability::ExactAgg(AggregationType::Max))
-        );
-    }
-
-    #[test]
-    fn exact_agg_min_and_max_do_not_satisfy_each_other() {
-        // The whole point of splitting the family: a deployed minimum
-        // sid must never be routed a `max_over_time` read.
-        assert!(!Capability::ExactAgg(AggregationType::Min)
-            .is_satisfied_by(&Capability::ExactAgg(AggregationType::Max)));
-        assert!(!Capability::ExactAgg(AggregationType::Max)
-            .is_satisfied_by(&Capability::ExactAgg(AggregationType::Min)));
-        assert!(!Capability::ExactAgg(AggregationType::Min)
-            .is_satisfied_by(&Capability::ExactAgg(AggregationType::Max)));
-    }
-
-    #[test]
-    fn capability_for_rate_and_increase_preserves_family() {
-        let exact_inc = Some(Capability::ExactAgg(AggregationType::Increase));
-        assert_eq!(
-            capability_for(&AggIntent::Rate),
-            Some(Capability::ExactAgg(AggregationType::Rate))
-        );
-        assert_eq!(capability_for(&AggIntent::Increase), exact_inc);
-    }
-
-    #[test]
-    fn capability_for_topk_returns_frequency_topk_any() {
-        // The analyzer no longer pins a concrete heap-bearing variant
-        // for top-k — `Any` lets `handles_compatible_for_topk` accept
-        // either `CmsWithHeap` or `CountSketchWithHeap` registered at
-        // ingest time. Both variants share the heap envelope and the
-        // reducer dispatches them identically.
-        let intent = AggIntent::TopK {
-            k: 10,
-            accuracy: AccuracyTarget::Epsilon(0.05),
-        };
-        assert_eq!(
-            capability_for(&intent),
-            Some(Capability::FrequencyTopk(None))
-        );
-    }
-
-    #[test]
-    fn capability_for_topk_exact_returns_none() {
-        // Exact top-k must use HashAgg+Heap; no ASAP-tier sketch.
-        let intent = AggIntent::TopK {
-            k: 10,
-            accuracy: AccuracyTarget::Exact,
-        };
-        assert_eq!(capability_for(&intent), None);
-    }
-
-    #[test]
-    fn frequency_estimate_with_epsilon_returns_frequency_estimate_approx() {
-        let intent = crate::planner_selection::frequency(AccuracyTarget::Epsilon(0.01), None);
-        assert_eq!(
-            capability_for(&intent),
-            Some(Capability::FrequencyEstimate(None))
-        );
-    }
-
-    #[test]
-    fn frequency_estimate_with_epsilon_delta_returns_frequency_estimate_approx() {
-        let intent = crate::planner_selection::frequency(
-            AccuracyTarget::EpsilonDelta {
-                epsilon: 0.01,
-                delta: 0.001,
-            },
-            None,
-        );
-        assert_eq!(
-            capability_for(&intent),
-            Some(Capability::FrequencyEstimate(None))
-        );
-    }
-
-    #[test]
-    fn frequency_estimate_with_exact_returns_none() {
-        // Exact aggregation routes to archive (sketch fallback only
-        // meaningful when raw counters aren't kept).
-        let intent = crate::planner_selection::frequency(AccuracyTarget::Exact, None);
-        assert_eq!(capability_for(&intent), None);
-    }
-
-    #[test]
-    fn capability_for_archive_only_intents_return_none() {
-        // Spot-check each archive-only variant, including a few added by
-        // the Phase 1 IR merge. `Irate` is intentionally absent — folded
-        // into `Rate` (see `agg_intent.rs` module docs); `rate`/`irate`
-        // now share `capability_for`'s `Rate` arm.
-        assert_eq!(capability_for(&AggIntent::Absent), None);
-        assert_eq!(capability_for(&AggIntent::AbsentOverTime), None);
-        assert_eq!(capability_for(&AggIntent::PresentOverTime), None);
-        assert_eq!(capability_for(&AggIntent::Delta), None);
-        assert_eq!(capability_for(&AggIntent::IDelta), None);
-        assert_eq!(capability_for(&AggIntent::HistogramCount), None);
-        assert_eq!(capability_for(&AggIntent::Group), None);
-    }
-
-    // ── Capability::is_satisfied_by ──────────────────────────────────────
-
-    #[test]
-    fn is_satisfied_by_any_wildcard_matches_concrete() {
-        let required = Capability::QuantileApprox(None);
-        let indexed_dd = Capability::QuantileApprox(Some(SketchAlgorithm::DDSketch));
-        let indexed_kll = Capability::QuantileApprox(Some(SketchAlgorithm::Kll));
-        assert!(required.is_satisfied_by(&indexed_dd));
-        assert!(required.is_satisfied_by(&indexed_kll));
-    }
-
-    #[test]
-    fn is_satisfied_by_concrete_kind_matches_same_family() {
-        // Quantile capability matching accepts either KLL or DDSketch, including
-        // when the required handle names a concrete family.
-        let required = Capability::QuantileApprox(Some(SketchAlgorithm::DDSketch));
-        let indexed_dd = Capability::QuantileApprox(Some(SketchAlgorithm::DDSketch));
-        let indexed_kll = Capability::QuantileApprox(Some(SketchAlgorithm::Kll));
-        assert!(required.is_satisfied_by(&indexed_dd));
-        assert!(required.is_satisfied_by(&indexed_kll));
-
-        // Still cross-family-incompatible: a concrete quantile requirement
-        // is never satisfied by a cardinality-family available handle.
-        let indexed_hll = Capability::QuantileApprox(Some(SketchAlgorithm::Hll));
-        assert!(!required.is_satisfied_by(&indexed_hll));
-    }
-
-    #[test]
-    fn is_satisfied_by_cardinality_is_total() {
-        let required = Capability::CardinalityApprox;
-        let indexed = Capability::CardinalityApprox;
-        assert!(required.is_satisfied_by(&indexed));
-    }
-
-    #[test]
-    fn is_satisfied_by_different_families_are_incompatible() {
-        let required = Capability::QuantileApprox(None);
-        let indexed = Capability::CardinalityApprox;
-        assert!(!required.is_satisfied_by(&indexed));
-
-        let required = Capability::FrequencyTopk(Some(SketchAlgorithm::CmsWithHeap));
-        let indexed = Capability::QuantileApprox(Some(SketchAlgorithm::DDSketch));
-        assert!(!required.is_satisfied_by(&indexed));
-    }
-
-    #[test]
-    fn is_satisfied_by_topk_handles_must_match() {
-        let required = Capability::FrequencyTopk(Some(SketchAlgorithm::CmsWithHeap));
-        let indexed_with_heap = Capability::FrequencyTopk(Some(SketchAlgorithm::CmsWithHeap));
-        let indexed_no_heap = Capability::FrequencyTopk(Some(SketchAlgorithm::Cms));
-        assert!(required.is_satisfied_by(&indexed_with_heap));
-        assert!(!required.is_satisfied_by(&indexed_no_heap));
-    }
-
-    #[test]
-    fn is_satisfied_by_frequency_topk_rejects_heapless() {
-        // Top-k REQUIRES a heap-bearing handle. Even when the available
-        // capability declares itself as `FrequencyTopk(CountMin)` (an
-        // ill-formed catalog entry), the satisfaction check must reject
-        // it — top-k cannot enumerate items off a heap-less sketch.
-        let required_any = Capability::FrequencyTopk(None);
-        let required_concrete = Capability::FrequencyTopk(Some(SketchAlgorithm::CmsWithHeap));
-        let indexed_heapless = Capability::FrequencyTopk(Some(SketchAlgorithm::Cms));
-        let indexed_heapless_cs = Capability::FrequencyTopk(Some(SketchAlgorithm::CountSketch));
-        assert!(!required_any.is_satisfied_by(&indexed_heapless));
-        assert!(!required_any.is_satisfied_by(&indexed_heapless_cs));
-        assert!(!required_concrete.is_satisfied_by(&indexed_heapless));
-    }
-
-    #[test]
-    fn is_satisfied_by_frequency_topk_any_matches_either_heap() {
-        // `Any` required for top-k accepts either heap-bearing handle.
-        let required = Capability::FrequencyTopk(None);
-        let cms_heap = Capability::FrequencyTopk(Some(SketchAlgorithm::CmsWithHeap));
-        let cs_heap = Capability::FrequencyTopk(Some(SketchAlgorithm::CountSketchWithHeap));
-        assert!(required.is_satisfied_by(&cms_heap));
-        assert!(required.is_satisfied_by(&cs_heap));
-    }
-
-    #[test]
-    fn is_satisfied_by_frequency_estimate_accepts_heap_bearing() {
-        // Bare frequency point queries can be answered by ANY
-        // frequency-family sketch — heap-less AND heap-bearing both work
-        // (the heap is additional metadata; the underlying CMS / CS
-        // matrix answers the point query either way).
-        let required = Capability::FrequencyEstimate(None);
-        let cms = Capability::FrequencyEstimate(Some(SketchAlgorithm::Cms));
-        let cs = Capability::FrequencyEstimate(Some(SketchAlgorithm::CountSketch));
-        let cms_heap = Capability::FrequencyTopk(Some(SketchAlgorithm::CmsWithHeap));
-        let cs_heap = Capability::FrequencyTopk(Some(SketchAlgorithm::CountSketchWithHeap));
-        assert!(required.is_satisfied_by(&cms));
-        assert!(required.is_satisfied_by(&cs));
-        assert!(required.is_satisfied_by(&cms_heap));
-        assert!(required.is_satisfied_by(&cs_heap));
-    }
-
-    #[test]
-    fn is_satisfied_by_frequency_estimate_rejects_non_frequency_family() {
-        let required = Capability::FrequencyEstimate(None);
-        // QuantileApprox / CardinalityApprox don't answer frequency.
-        let q = Capability::QuantileApprox(Some(SketchAlgorithm::DDSketch));
-        let c = Capability::CardinalityApprox;
-        // FrequencyEstimate with a non-frequency-family handle on the
-        // available side is also rejected (defensive).
-        let bad = Capability::FrequencyEstimate(Some(SketchAlgorithm::Hll));
-        assert!(!required.is_satisfied_by(&q));
-        assert!(!required.is_satisfied_by(&c));
-        assert!(!required.is_satisfied_by(&bad));
-    }
-
-    // ── Capability::ExactAgg — matching ──────────────────────────────────
-
-    #[test]
-    fn is_satisfied_by_exact_agg_same_type_matches() {
-        // Sum required, Sum indexed → match. Same for every concrete
-        // AggregationType — the equality check is structural.
-        let required = Capability::ExactAgg(AggregationType::Sum);
-        let indexed = Capability::ExactAgg(AggregationType::Sum);
-        assert!(required.is_satisfied_by(&indexed));
-    }
-
-    #[test]
-    fn is_satisfied_by_exact_agg_different_types_do_not_match() {
-        // Sum required, Max indexed → no match. No wildcard for
-        // ExactAgg — every agg_type stands on its own.
-        let required = Capability::ExactAgg(AggregationType::Sum);
-        let indexed = Capability::ExactAgg(AggregationType::Max);
-        assert!(!required.is_satisfied_by(&indexed));
-    }
-
-    #[test]
-    fn is_satisfied_by_exact_agg_does_not_match_other_families() {
-        // ExactAgg is its own family — no cross-family satisfaction
-        // with QuantileApprox / CardinalityApprox / FrequencyEstimate /
-        // FrequencyTopk.
-        let required = Capability::ExactAgg(AggregationType::Sum);
-        assert!(
-            !required.is_satisfied_by(&Capability::QuantileApprox(Some(SketchAlgorithm::DDSketch)))
-        );
-        assert!(!required.is_satisfied_by(&Capability::CardinalityApprox));
-        assert!(
-            !required.is_satisfied_by(&Capability::FrequencyEstimate(Some(SketchAlgorithm::Cms)))
-        );
-        assert!(!required.is_satisfied_by(&Capability::FrequencyTopk(Some(
-            SketchAlgorithm::CmsWithHeap
-        ))));
-
-        // And the reverse — a sketch-family required capability must
-        // not match an ExactAgg-backed sid.
-        let sketch_required = Capability::QuantileApprox(None);
-        let exact_indexed = Capability::ExactAgg(AggregationType::DatasketchesKLL);
-        assert!(!sketch_required.is_satisfied_by(&exact_indexed));
-    }
-
-    #[test]
-    fn exact_agg_covers_each_canonical_agg_type() {
-        // Spot-check the full AggregationType surface — each variant
-        // round-trips through Capability::ExactAgg without losing
-        // information. Documents the intended coverage of the new
-        // variant. If a future PR adds an AggregationType variant, this
-        // test (combined with the exhaustive match in `is_satisfied_by`'s
-        // `req == have` form) will not require code changes — equality
-        // is structural.
-        let cases = [
-            AggregationType::Sum,
-            AggregationType::Increase,
-            AggregationType::Min,
-            AggregationType::Max,
-            AggregationType::DatasketchesKLL,
-            AggregationType::HydraKLL,
-            AggregationType::CountMinSketch,
-            AggregationType::CountMinSketchWithHeap,
-            AggregationType::CountSketch,
-            AggregationType::HLL,
-            AggregationType::DDSketch,
-        ];
-        for t in cases {
-            let cap = Capability::ExactAgg(t);
-            assert!(
-                cap.is_satisfied_by(&Capability::ExactAgg(t)),
-                "ExactAgg({t:?}) should satisfy itself"
-            );
-        }
-    }
-
-    #[test]
-    fn sum_family_cannot_impersonate_exact_counter_state() {
-        let required = Capability::ExactAgg(AggregationType::Increase);
-        assert!(!required.is_satisfied_by(&Capability::ExactAgg(AggregationType::Sum)));
-        assert!(!required.is_satisfied_by(&Capability::ExactAgg(AggregationType::Sum)));
-
-        let required_multi = Capability::ExactAgg(AggregationType::Increase);
-        assert!(!required_multi.is_satisfied_by(&Capability::ExactAgg(AggregationType::Sum)));
-    }
-
-    #[test]
-    fn is_satisfied_by_sum_family_does_not_answer_required_multi_increase_from_single_sum() {
-        // A different exact family cannot supply counter state.
-        let required = Capability::ExactAgg(AggregationType::Increase);
-        assert!(!required.is_satisfied_by(&Capability::ExactAgg(AggregationType::Sum)));
-    }
-
-    #[test]
-    fn is_satisfied_by_increase_does_not_answer_required_sum() {
-        // The reverse direction is NOT sound: required ExactAgg(Sum) is
-        // sum_over_time semantics (Σ of raw cumulative-counter samples),
-        // which an Increase-registered sid's per-window deltas cannot
-        // reconstruct (issue #301) -- refused explicitly at the
-        // query-dispatch layer, not routed through here.
-        let required = Capability::ExactAgg(AggregationType::Sum);
-        assert!(!required.is_satisfied_by(&Capability::ExactAgg(AggregationType::Increase)));
-    }
-
-    // ── capability_for: ExactAgg dormancy ────────────────────────────────
-
-    #[test]
-    fn exact_agg_routing_keeps_sum_rate_and_increase_distinct() {
-        assert_eq!(
-            capability_for(&AggIntent::Sum { col: None }),
-            Some(Capability::ExactAgg(AggregationType::Sum))
-        );
-        assert_eq!(
-            capability_for(&AggIntent::Rate),
-            Some(Capability::ExactAgg(AggregationType::Rate))
-        );
-        assert_eq!(
-            capability_for(&AggIntent::Increase),
-            Some(Capability::ExactAgg(AggregationType::Increase))
-        );
-        // Exact count follows the Planner Count family; Avg still needs
-        // its own composition contract.
-        assert_eq!(
-            capability_for(&AggIntent::Count {
-                accuracy: AccuracyTarget::Exact,
-            }),
-            Some(Capability::ExactAgg(AggregationType::Count))
-        );
-        assert_eq!(capability_for(&AggIntent::Avg { col: None }), None);
-    }
-
-    #[test]
-    fn count_sketch_with_heap_handle_round_trips() {
-        // `CountSketchWithHeap` is the CountSketch counterpart to
-        // `CmsWithHeap`. Construct a `FrequencyTopk` capability around
-        // it and verify it satisfies an `Any`-required top-k.
-        let cap = Capability::FrequencyTopk(Some(SketchAlgorithm::CountSketchWithHeap));
-        let required = Capability::FrequencyTopk(None);
-        assert!(required.is_satisfied_by(&cap));
-        // And the concrete-against-concrete (same handle) case matches.
-        let required_concrete =
-            Capability::FrequencyTopk(Some(SketchAlgorithm::CountSketchWithHeap));
-        assert!(required_concrete.is_satisfied_by(&cap));
-        // Intentional broadening vs. this module's pre-`sketch_family_satisfied`
-        // behavior: CMS and CountSketch are the SAME frequency family in
-        // `physical::post_asap::matcher`'s reference rule table (both bare and
-        // heap-bearing — see its
-        // `cms_and_count_sketch_are_the_same_frequency_family` test), so a
-        // `CmsWithHeap` requirement IS now satisfied by a
-        // `CountSketchWithHeap` available (both heap-bearing, same
-        // family), not just an exact-handle match. Harmless in practice:
-        // `capability_for` always emits `Any` for `FrequencyTopk`, never a
-        // concrete handle, so this exact combination never arises from a
-        // real query.
-        let required_cms = Capability::FrequencyTopk(Some(SketchAlgorithm::CmsWithHeap));
-        assert!(required_cms.is_satisfied_by(&cap));
-        // Still cross-family-incompatible: a heap-bearing requirement is
-        // never satisfied by a bare (heap-less) available handle.
-        let bare = Capability::FrequencyTopk(Some(SketchAlgorithm::Cms));
-        assert!(!required_cms.is_satisfied_by(&bare));
-    }
-
-    // ── OuterAgg fold semantics ──────────────────────────────────────────
-    //
-    // Pin the fold-by-operator dispatch shape the engine reads off the
-    // typed `ASAPTierCandidate.outer_agg` field. The identity case
-    // (single-value group) is the load-bearing assertion for asap's
-    // per-zone-DDSketch shape: `max by (zone) (quantile_over_time(...))`
-    // produces one row per zone, and `OuterAgg::Max.fold([x]) == x` —
-    // the wrapper is a no-op for already-grouped inner results.
-
-    #[test]
-    fn outer_agg_default_is_none() {
-        assert_eq!(OuterAgg::default(), OuterAgg::None);
-        assert!(!OuterAgg::default().is_some());
-    }
-
-    #[test]
-    fn outer_agg_none_carries_no_by_labels() {
-        assert!(OuterAgg::None.by_labels().is_empty());
-    }
-
-    #[test]
-    fn outer_agg_max_fold_single_value_is_identity() {
-        // Issue #296 identity case: inner already emits one row per
-        // by-group; the outer max fold must return that row unchanged.
-        let v = OuterAgg::Max(vec!["zone".to_string()])
-            .fold(&[42.5])
-            .unwrap();
-        assert_eq!(v, 42.5);
-    }
-
-    #[test]
-    fn outer_agg_min_fold_single_value_is_identity() {
-        let v = OuterAgg::Min(vec!["zone".to_string()])
-            .fold(&[42.5])
-            .unwrap();
-        assert_eq!(v, 42.5);
-    }
-
-    #[test]
-    fn outer_agg_avg_fold_single_value_is_identity() {
-        let v = OuterAgg::Avg(vec!["zone".to_string()])
-            .fold(&[42.5])
-            .unwrap();
-        assert_eq!(v, 42.5);
-    }
-
-    #[test]
-    fn outer_agg_max_fold_multi_picks_largest() {
-        let v = OuterAgg::Max(vec![]).fold(&[1.0, 5.0, 3.0]).unwrap();
-        assert_eq!(v, 5.0);
-    }
-
-    #[test]
-    fn outer_agg_min_fold_multi_picks_smallest() {
-        let v = OuterAgg::Min(vec![]).fold(&[1.0, 5.0, 3.0]).unwrap();
-        assert_eq!(v, 1.0);
-    }
-
-    #[test]
-    fn outer_agg_avg_fold_multi_is_mean() {
-        let v = OuterAgg::Avg(vec![]).fold(&[1.0, 5.0, 3.0]).unwrap();
-        assert!((v - 3.0).abs() < 1e-9);
-    }
-
-    #[test]
-    fn outer_agg_count_fold_returns_cardinality() {
-        let v = OuterAgg::Count(vec![]).fold(&[1.0, 5.0, 3.0]).unwrap();
-        assert_eq!(v, 3.0);
-    }
-
-    #[test]
-    fn outer_agg_group_fold_returns_one() {
-        let v = OuterAgg::Group(vec![]).fold(&[1.0, 5.0, 3.0]).unwrap();
-        assert_eq!(v, 1.0);
-    }
-
-    #[test]
-    fn outer_agg_stddev_fold_multi_is_population_stddev() {
-        // population stddev of [1,2,3,4,5] is sqrt(2) ≈ 1.4142
-        let v = OuterAgg::Stddev(vec![])
-            .fold(&[1.0, 2.0, 3.0, 4.0, 5.0])
-            .unwrap();
-        assert!((v - 2.0_f64.sqrt()).abs() < 1e-9);
-    }
-
-    #[test]
-    fn outer_agg_stdvar_fold_multi_is_population_variance() {
-        let v = OuterAgg::Stdvar(vec![])
-            .fold(&[1.0, 2.0, 3.0, 4.0, 5.0])
-            .unwrap();
-        assert!((v - 2.0).abs() < 1e-9);
-    }
-
-    #[test]
-    fn outer_agg_empty_input_returns_none() {
-        assert_eq!(OuterAgg::Max(vec![]).fold(&[]), None);
-        assert_eq!(OuterAgg::Avg(vec![]).fold(&[]), None);
-        assert_eq!(OuterAgg::Count(vec![]).fold(&[]), None);
-    }
-}
diff --git a/control_plane/src/physical/sketch_catalog.rs b/control_plane/src/physical/sketch_catalog.rs
deleted file mode 100644
index 9be3c43f4..000000000
--- a/control_plane/src/physical/sketch_catalog.rs
+++ /dev/null
@@ -1,365 +0,0 @@
-//! Sketch directory — single source of truth for mapping aggregation
-//! operations to sketch types, parameters, and memory estimates.
-//!
-//! Previously this logic was duplicated across:
-//! - `planner/rules.rs` (`select_sketch_type`)
-//! - `planner/stage_split.rs` (`agg_op_to_sketch_type`, `agg_op_to_sketch_params`,
-//!    `estimated_sketch_memory_bytes`)
-//! - `algebra/allocator.rs` (`sketch_type_for_op`)
-//!
-//! All callers now go through this module.
-
-use crate::planner_selection::agg_accuracy;
-use crate::types::{AggType, SketchDefaults, SketchParams, SketchType};
-use planner_types::pre_asap::AggIntent;
-
-/// Physical sizing input for one independently maintained partition.
-#[derive(Debug, Clone, PartialEq)]
-pub struct PerPartitionWrap {
-    pub inner: AggIntent,
-    pub keys: Vec<String>,
-}
-
-// ── AggType → candidate SketchTypes ──────────────────────────────────────────
-
-/// Candidate sketch families per aggregation type.
-///
-/// Each aggregation type has multiple viable sketch implementations.
-/// The first entry is the default; the cost-model planner scores all
-/// candidates and picks the cheapest that meets the accuracy SLA.
-///
-/// | AggType     | Candidates (default first)  |
-/// |-------------|---------------------------- |
-/// | Quantile    | DDSketch, KLL               |
-/// | Cardinality | HLL                         |
-/// | Frequency   | CountSketch, CountMinSketch  |
-pub fn candidates_for_agg(agg: &AggType) -> &'static [SketchType] {
-    match agg {
-        AggType::Quantile => &[SketchType::DDSketch, SketchType::KLL],
-        AggType::Cardinality => &[SketchType::HLL],
-        AggType::Frequency => &[SketchType::CountSketch, SketchType::CountMinSketch],
-    }
-}
-
-/// All candidate sketch types for a workload (deduped, stable order).
-pub fn candidates_for_workload(aggs: &[AggType]) -> Vec<SketchType> {
-    let mut out = Vec::new();
-    for agg in aggs {
-        for st in candidates_for_agg(agg) {
-            if !out.contains(st) {
-                out.push(st.clone());
-            }
-        }
-    }
-    out
-}
-
-/// Pick the default sketch family from a list of aggregation types.
-///
-/// Returns the first candidate for the highest-priority aggregation.
-/// Priority: Quantile → Cardinality → Frequency.  Falls back to DDSketch.
-///
-/// For cost-optimised selection, use [`candidates_for_workload`] and score
-/// each candidate via the cost model.
-pub fn sketch_type_for_agg(aggs: &[AggType]) -> SketchType {
-    for agg in aggs {
-        let candidates = candidates_for_agg(agg);
-        if !candidates.is_empty() {
-            return candidates[0].clone();
-        }
-    }
-    SketchType::DDSketch
-}
-
-// ── AggIntent → SketchType ───────────────────────────────────────────────────
-
-/// Resolve the concrete [`SketchType`] for an [`AggIntent`] IR node.
-pub fn sketch_type_for_op(op: &AggIntent) -> SketchType {
-    if crate::planner_selection::as_frequency(op).is_some() {
-        return SketchType::CountSketch;
-    }
-    match op {
-        AggIntent::Quantile { .. } => SketchType::DDSketch,
-        AggIntent::Cardinality { .. } => SketchType::HLL,
-        // Min/Max/Sum/Count/Avg/TopK/Rate/Increase + archive-only — all
-        // historically rode the "DDSketch / exact passthrough" rails in
-        // the legacy resolver. Keep that mapping until Step γ migrates the
-        // physical planner onto canonical L4 binding.
-        _ => SketchType::DDSketch,
-    }
-}
-
-#[cfg(test)]
-/// Resolve the concrete [`SketchType`] for a `PerPartitionWrap` shape —
-/// delegates to the wrapped inner intent. Kept as a separate function so
-/// that the PerPartition structural collapse (Step γ) is a focused
-/// removal rather than a recursion-tracking refactor.
-pub fn sketch_type_for_per_partition(wrap: &PerPartitionWrap) -> SketchType {
-    sketch_type_for_op(&wrap.inner)
-}
-
-// ── AggIntent → SketchParams ────────────────────────────────────────────────
-
-/// Derive [`SketchParams`] from an [`AggIntent`] IR node.
-pub fn sketch_params_for_op(op: &AggIntent) -> SketchParams {
-    if crate::planner_selection::as_frequency(op).is_some() {
-        let acc = agg_accuracy(op);
-        return SketchParams::CountSketch {
-            epsilon: acc,
-            delta: 0.01,
-        };
-    }
-    match op {
-        AggIntent::Quantile { q, .. } => SketchParams::DDSketch {
-            relative_accuracy: agg_accuracy(op),
-            // Canonical Quantile is single-φ post Step α. Multi-φ
-            // fan-out lives at construction time (Merge of SketchAgg
-            // siblings), so this carrier always reports its single q.
-            quantiles: vec![*q],
-        },
-        AggIntent::Cardinality { .. } => {
-            let acc = agg_accuracy(op).max(f64::MIN_POSITIVE);
-            // registers ≈ (1.04/accuracy)^2, precision = log2(registers)
-            let registers = ((1.04 / acc).powi(2) as u32).next_power_of_two();
-            let precision = (registers as f64).log2() as u32;
-            SketchParams::HLL { precision }
-        }
-        // Min / Max — preserve the legacy `Extrema` mapping (DDSketch over
-        // the 0.0 / 1.0 boundary quantiles).
-        AggIntent::Min { .. } | AggIntent::Max { .. } => SketchParams::DDSketch {
-            relative_accuracy: 0.01,
-            quantiles: vec![0.0, 1.0],
-        },
-        // Sum / Count / Avg / TopK / Rate / Increase / archive-only — no
-        // sketch-specific params; the legacy `Exact(_)` arm returned
-        // `SketchParams::default()` and we preserve that.
-        _ => SketchParams::default(),
-    }
-}
-
-#[cfg(test)]
-/// Combined (type, params) lookup — convenience for callers that need both.
-pub fn sketch_type_and_params(op: &AggIntent) -> (SketchType, SketchParams) {
-    (sketch_type_for_op(op), sketch_params_for_op(op))
-}
-
-// ── AggIntent → memory estimate ─────────────────────────────────────────────
-
-/// Estimated sketch memory footprint per series (bytes).
-///
-/// Used by the physical planner's placement decision to defer a sketch
-/// build off a stage when its budget would be exceeded.
-pub fn estimated_sketch_memory_bytes(op: &AggIntent) -> u64 {
-    if crate::planner_selection::as_frequency(op).is_some() {
-        let acc = agg_accuracy(op).max(f64::MIN_POSITIVE);
-        // CMS: width ≈ e/accuracy, depth ≈ 5, memory = width*depth*8
-        let width = (std::f64::consts::E / acc) as u64;
-        return width * 5 * 8;
-    }
-    match op {
-        AggIntent::Quantile { .. } => 4_096,
-        AggIntent::Cardinality { .. } => {
-            let acc = agg_accuracy(op).max(f64::MIN_POSITIVE);
-            // HLL: registers ≈ (1.04/accuracy)^2, memory = registers
-            let registers = ((1.04 / acc).powi(2) as u64).next_power_of_two();
-            registers.max(16)
-        }
-        // Legacy `Extrema { .. }` (now canonical Min / Max) — 16 bytes.
-        AggIntent::Min { .. } | AggIntent::Max { .. } => 16,
-        // Sum / Count / Avg / TopK / Rate / Increase / archive-only — no
-        // sketch state; preserve the legacy `Exact(_) → 8` mapping.
-        _ => 8,
-    }
-}
-
-#[cfg(test)]
-/// Memory estimate for a `PerPartitionWrap` — scales the inner-intent
-/// estimate by `2 ** keys.len()` (capped at 2**10), matching the legacy
-/// `PerPartition` formula.
-pub fn estimated_sketch_memory_per_partition(wrap: &PerPartitionWrap) -> u64 {
-    let factor = 1u64 << wrap.keys.len().min(10);
-    estimated_sketch_memory_bytes(&wrap.inner).saturating_mul(factor)
-}
-
-// ── SketchType + accuracy SLA → SketchParams (configurable defaults) ─────────
-
-/// Build default [`SketchParams`] from a [`SketchDefaults`] config and accuracy SLA.
-///
-/// Query-specific quantiles override the configured grid when non-empty.
-pub fn build_sketch_params(
-    defaults: &SketchDefaults,
-    st: &SketchType,
-    accuracy_sla: f64,
-    query_quantiles: &[f64],
-) -> SketchParams {
-    let acc = if accuracy_sla <= 0.0 {
-        defaults.ddsketch.relative_accuracy
-    } else {
-        accuracy_sla
-    };
-    let quantiles: Vec<f64> = if !query_quantiles.is_empty() {
-        query_quantiles.to_vec()
-    } else {
-        defaults.quantile_grid.clone()
-    };
-    match st {
-        SketchType::DDSketch => SketchParams::DDSketch {
-            relative_accuracy: acc,
-            quantiles,
-        },
-        SketchType::KLL => {
-            let k = ((1.0 / acc) as u32).max(defaults.kll.min_k);
-            SketchParams::KLL { k, quantiles }
-        }
-        SketchType::HLL => {
-            let d = &defaults.hll;
-            let precision = if acc > d.precision_threshold {
-                d.precision_coarse
-            } else {
-                d.precision_fine
-            };
-            SketchParams::HLL { precision }
-        }
-        SketchType::CountSketch => SketchParams::CountSketch {
-            epsilon: defaults.count_sketch.epsilon,
-            delta: defaults.count_sketch.delta,
-        },
-        SketchType::CountMinSketch => SketchParams::CountMinSketch {
-            rows: defaults.count_min_sketch.rows,
-            cols: defaults.count_min_sketch.cols,
-            metric_name: defaults.count_min_sketch.metric_name.clone(),
-        },
-    }
-}
-
-/// Convenience: build default params using compiled-in defaults.
-pub fn default_sketch_params(st: &SketchType, accuracy_sla: f64) -> SketchParams {
-    build_sketch_params(&SketchDefaults::default(), st, accuracy_sla, &[])
-}
-
-// ── Tests ─────────────────────────────────────────────────────────────────────
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    #[test]
-    fn agg_type_quantile_maps_to_ddsketch() {
-        assert_eq!(
-            sketch_type_for_agg(&[AggType::Quantile]),
-            SketchType::DDSketch
-        );
-    }
-
-    #[test]
-    fn agg_type_cardinality_maps_to_hll() {
-        assert_eq!(
-            sketch_type_for_agg(&[AggType::Cardinality]),
-            SketchType::HLL
-        );
-    }
-
-    #[test]
-    fn agg_type_frequency_maps_to_countsketch() {
-        assert_eq!(
-            sketch_type_for_agg(&[AggType::Frequency]),
-            SketchType::CountSketch
-        );
-    }
-
-    #[test]
-    fn empty_aggs_default_to_ddsketch() {
-        assert_eq!(sketch_type_for_agg(&[]), SketchType::DDSketch);
-    }
-
-    #[test]
-    fn op_quantile_yields_ddsketch_type_and_params() {
-        use crate::types::AccuracyTarget;
-        let op = AggIntent::Quantile {
-            col: None,
-            q: 0.5,
-            accuracy: AccuracyTarget::Epsilon(0.01),
-        };
-        let (st, p) = sketch_type_and_params(&op);
-        assert_eq!(st, SketchType::DDSketch);
-        assert!(matches!(p, SketchParams::DDSketch { .. }));
-    }
-
-    #[test]
-    fn op_cardinality_yields_hll_type() {
-        let op = planner_types::pre_asap::default_cardinality();
-        assert_eq!(sketch_type_for_op(&op), SketchType::HLL);
-    }
-
-    #[test]
-    fn op_frequency_yields_countsketch() {
-        let op = crate::planner_selection::default_frequency();
-        assert_eq!(sketch_type_for_op(&op), SketchType::CountSketch);
-    }
-
-    #[test]
-    fn per_partition_delegates_to_inner() {
-        let wrap = PerPartitionWrap {
-            inner: planner_types::pre_asap::default_cardinality(),
-            keys: vec!["k".into()],
-        };
-        assert_eq!(sketch_type_for_per_partition(&wrap), SketchType::HLL);
-    }
-
-    #[test]
-    fn memory_quantile() {
-        use crate::types::AccuracyTarget;
-        let op = AggIntent::Quantile {
-            col: None,
-            q: 0.5,
-            accuracy: AccuracyTarget::Epsilon(0.01),
-        };
-        assert_eq!(estimated_sketch_memory_bytes(&op), 4096);
-    }
-
-    #[test]
-    fn memory_per_partition_scales_by_keys() {
-        let inner = planner_types::pre_asap::default_cardinality();
-        let base_mem = estimated_sketch_memory_bytes(&inner);
-        let wrap = PerPartitionWrap {
-            inner,
-            keys: vec!["a".into(), "b".into()],
-        };
-        assert_eq!(estimated_sketch_memory_per_partition(&wrap), base_mem * 4);
-    }
-
-    #[test]
-    fn configurable_defaults_override_quantile_grid() {
-        let mut d = SketchDefaults::default();
-        d.quantile_grid = vec![0.5, 0.99];
-        let p = build_sketch_params(&d, &SketchType::DDSketch, 0.01, &[]);
-        assert_eq!(p.quantiles(), &[0.5, 0.99]);
-    }
-
-    #[test]
-    fn query_quantiles_override_grid() {
-        let d = SketchDefaults::default();
-        let p = build_sketch_params(&d, &SketchType::DDSketch, 0.01, &[0.1, 0.9]);
-        assert_eq!(p.quantiles(), &[0.1, 0.9]);
-    }
-
-    #[test]
-    fn quantile_candidates_include_ddsketch_and_kll() {
-        let c = candidates_for_agg(&AggType::Quantile);
-        assert!(c.contains(&SketchType::DDSketch));
-        assert!(c.contains(&SketchType::KLL));
-    }
-
-    #[test]
-    fn frequency_candidates_include_cs_and_cms() {
-        let c = candidates_for_agg(&AggType::Frequency);
-        assert!(c.contains(&SketchType::CountSketch));
-        assert!(c.contains(&SketchType::CountMinSketch));
-    }
-
-    #[test]
-    fn candidates_for_workload_dedupes() {
-        let c = candidates_for_workload(&[AggType::Quantile, AggType::Quantile]);
-        assert_eq!(c.iter().filter(|s| **s == SketchType::DDSketch).count(), 1);
-    }
-}
diff --git a/control_plane/src/physical/summary_catalog.rs b/control_plane/src/physical/summary_catalog.rs
deleted file mode 100644
index 4b2d61cf7..000000000
--- a/control_plane/src/physical/summary_catalog.rs
+++ /dev/null
@@ -1,6 +0,0 @@
-//! Control-plane compatibility surface for the shared catalog wire contract.
-//!
-//! The authoritative catalog is constructed and published by the control
-//! plane, while its immutable contract is shared with every consumer.
-
-pub use asap_types::summary_catalog::*;
diff --git a/control_plane/src/physical/workload_cost.rs b/control_plane/src/physical/workload_cost.rs
deleted file mode 100644
index 045882c94..000000000
--- a/control_plane/src/physical/workload_cost.rs
+++ /dev/null
@@ -1,1502 +0,0 @@
-//! Compile physical candidates, export quoteable manifests, and select the
-//! lowest-cost feasible candidate from the supplied bounded inventory.
-//!
-//! Planner owns semantic legality. A manifest describes the exact physical
-//! demand to price; provider quotes and candidate evaluations are separate.
-
-mod materialization_candidates;
-mod status;
-pub use status::{CandidateEvaluationStatus, CandidateSearchScope};
-
-#[cfg(test)]
-use super::compiler::DeploymentPlanCompiler;
-
-use std::collections::{BTreeMap, BTreeSet};
-
-use asap_aware_mapping::cost_model::Cost;
-use serde::{Deserialize, Serialize};
-use serde_json::{json, Value};
-
-use super::compiler::{
-    CompileError, CompiledPhysicalPlan, PhysicalCompilationRequest, PhysicalDeploymentContext,
-    QueryCompilationInput,
-};
-
-#[derive(Debug, Clone, Serialize, Deserialize, PartialEq)]
-#[serde(deny_unknown_fields)]
-pub struct CostComponentDemand {
-    /// Exact implementation/configuration being priced, not merely a family.
-    pub implementation: Value,
-    /// `horizon` includes all work in the manifest's source/time scope;
-    /// `query_evaluation` is one execution of this bound query operator.
-    #[serde(rename = "unit")]
-    pub pricing_basis: String,
-    #[serde(rename = "multiplicity")]
-    pub occurrences_per_horizon: f64,
-}
-
-#[derive(Debug, Clone, Serialize, Deserialize, PartialEq)]
-#[serde(deny_unknown_fields)]
-pub struct WorkloadCostManifest {
-    pub plan_id: u64,
-    pub plan_version: u64,
-    pub planner_revision: String,
-    pub capability_snapshot_id: String,
-    pub backend_compat: String,
-    pub horizon_seconds: f64,
-    /// Canonical roots, requirements and demand must match across candidates.
-    pub workload: BTreeMap<String, Value>,
-    pub components: BTreeMap<String, CostComponentDemand>,
-}
-
-#[derive(Debug, Clone, Serialize, Deserialize, PartialEq)]
-#[serde(deny_unknown_fields)]
-pub struct WorkloadQuote {
-    pub manifest: WorkloadCostManifest,
-    /// Provider attests feasibility for this capability/data generation,
-    /// including an accessible exact backend when the plan has fallback nodes.
-    pub executable: bool,
-    /// Calibrated costs in ONE model's units. All keys are required, including
-    /// explicit zero costs. Horizon quotes include source cardinality, all
-    /// maintained groups, retention/spill and the stated partition's work.
-    pub unit_costs: BTreeMap<String, f64>,
-}
-
-#[derive(Debug, Clone, Serialize, Deserialize, PartialEq)]
-#[serde(deny_unknown_fields)]
-pub struct WorkloadCostEvidence {
-    #[serde(default)]
-    pub backend_revision: String,
-    #[serde(default)]
-    pub planner_revision: String,
-    pub data_snapshot_id: String,
-    pub model_version: String,
-    pub observed_at_unix_ms: u64,
-    pub valid_for_ms: u64,
-    pub quotes: Vec<WorkloadQuote>,
-}
-
-#[derive(Debug, Clone, Serialize, Deserialize, PartialEq)]
-/// A candidate diagnostic can precede pricing or record compilation failure.
-pub struct CandidatePlanEvaluation {
-    #[serde(rename = "candidate_id")]
-    pub candidate_id: Option<String>,
-    #[serde(default)]
-    pub logical_root_ids: Vec<String>,
-    #[serde(rename = "physical_candidate_id")]
-    pub physical_candidate_id: Option<String>,
-    pub identity_unavailable_reason: Option<String>,
-    #[serde(default)]
-    pub status: CandidateEvaluationStatus,
-    pub plan_id: Option<u64>,
-    pub total_cost: Option<f64>,
-    pub unavailable_reason: Option<String>,
-}
-
-#[derive(Debug, Clone, Serialize, Deserialize, PartialEq)]
-pub struct MaterializationSearchCoverage {
-    #[serde(rename = "eligible_leaves")]
-    pub eligible_materialization_count: usize,
-    #[serde(rename = "enumerated_local_masks")]
-    pub enumerated_candidate_key_sets: usize,
-    pub exhaustive: bool,
-    #[serde(rename = "scope")]
-    pub search_scope: CandidateSearchScope,
-}
-
-#[derive(Debug, Clone, Serialize, Deserialize, PartialEq)]
-pub struct CandidatePlanSelectionReport {
-    #[serde(default)]
-    #[serde(rename = "logical_selection")]
-    pub planner_selection_trace: Vec<Value>,
-    #[serde(default)]
-    pub materialization_search_coverage: Option<MaterializationSearchCoverage>,
-    pub data_snapshot_id: String,
-    pub model_version: String,
-    pub selected_plan_id: u64,
-    pub selected_manifest: WorkloadCostManifest,
-    pub component_costs: BTreeMap<String, f64>,
-    #[serde(rename = "candidates")]
-    pub candidate_evaluations: Vec<CandidatePlanEvaluation>,
-}
-
-fn invalid(reason: impl Into<String>) -> CompileError {
-    CompileError::Snapshot(format!("complete workload cost: {}", reason.into()))
-}
-
-pub fn manifest(
-    plan: &CompiledPhysicalPlan,
-    queries: &[QueryCompilationInput],
-) -> Result<WorkloadCostManifest, CompileError> {
-    let horizon = queries
-        .first()
-        .ok_or_else(|| invalid("empty workload"))?
-        .summary_lifecycle_inputs
-        .horizon_seconds;
-    if !horizon.is_finite() || horizon <= 0.0 {
-        return Err(invalid("invalid horizon"));
-    }
-    let mut workload = BTreeMap::new();
-    let mut reads = BTreeMap::new();
-    for query in queries {
-        if query.summary_lifecycle_inputs.horizon_seconds != horizon
-            || query.summary_lifecycle_inputs.evaluation_interval_ms == 0
-        {
-            return Err(invalid("mixed horizons or unknown recurrence"));
-        }
-        let canonical = crate::query_plan::canonical_promql(&query.query_string)?;
-        if workload
-            .insert(
-                query.query_id.clone(),
-                json!({
-                    "query": canonical, "accuracy": query.accuracy_target,
-                    "evaluation_interval_ms": query.summary_lifecycle_inputs.evaluation_interval_ms,
-                    "source": query.legacy_query_source,
-                }),
-            )
-            .is_some()
-        {
-            return Err(invalid("duplicate query ID"));
-        }
-        reads.insert(
-            query.query_id.clone(),
-            horizon * 1000.0 / f64::from(query.summary_lifecycle_inputs.evaluation_interval_ms),
-        );
-    }
-    let mut components = BTreeMap::new();
-    let mut add =
-        |id: String, implementation: Value, pricing_basis: &str, occurrences_per_horizon: f64| {
-            components.insert(
-                id,
-                CostComponentDemand {
-                    implementation,
-                    pricing_basis: pricing_basis.into(),
-                    occurrences_per_horizon,
-                },
-            );
-        };
-    // Backend merge/update, storage, and edge maintenance are separate work.
-    // The raw input is read once per source partition, not once per consumer.
-    for schema in &plan.precompute_plan.schemas {
-        let mut locations = vec!["backend".to_string()];
-        locations.extend(
-            plan.collector_plans
-                .iter()
-                .filter(|collector| {
-                    collector
-                        .materializations
-                        .iter()
-                        .any(|m| m.materialization == schema.materialization)
-                })
-                .map(|collector| format!("collector:{}", collector.collector_id)),
-        );
-        for location in locations {
-            let source = json!({"source": schema.source, "location": location, "ingest": plan.precompute_plan.ingest});
-            add(format!("source:{}", source), source, "horizon", 1.0);
-            let physical = plan
-                .precompute_plan
-                .materializations
-                .iter()
-                .find(|m| m.policy_fingerprint() == schema.materialization.fingerprint())
-                .ok_or_else(|| invalid("state has no physical implementation"))?;
-            let identity = json!({"schema": schema, "location": location, "physical": physical,
-                "window_implementation": plan.lifecycle_estimates.iter().find(|e| e.materialization == schema.materialization).map(|e| &e.window_realization_id)});
-            for operation in ["build", "update", "residency", "retire"] {
-                add(
-                    format!("state:{location}:{}:{operation}", schema.materialization.0),
-                    json!({"operation": operation, "binding": identity}),
-                    "horizon",
-                    1.0,
-                );
-            }
-        }
-    }
-    for rule in &plan.transmission_plan.rules {
-        add(
-            format!("transport:{}:{}", rule.producer_id, rule.materialization.0),
-            json!(rule),
-            "horizon",
-            1.0,
-        );
-    }
-    for entry in plan.query_plan.entries.values() {
-        let evaluations = *reads
-            .get(&entry.query_id)
-            .ok_or_else(|| invalid("unmapped query root"))?;
-        if entry
-            .nodes
-            .values()
-            .any(|node| matches!(node, crate::query_plan::QueryPlanNode::ExactFallback { .. }))
-        {
-            let query = queries
-                .iter()
-                .find(|query| query.query_id == entry.query_id)
-                .ok_or_else(|| invalid("unmapped exact source"))?;
-            // Charge the exact service's input upkeep/storage separately from
-            // per-evaluation native execution. Zero is valid only if explicitly
-            // quoted as already-provisioned/non-incremental for this decision.
-            let parsed = crate::query_parser::parse_query_expr_canonical(
-                &query.query_string,
-                query.accuracy_target.clone(),
-            )
-            .map_err(|error| invalid(error.to_string()))?;
-            for metric in exact_source_metrics(&parsed)? {
-                let source = json!({"source": planner_types::pre_asap::Source::TimeSeries { metric }, "location": "exact_backend"});
-                add(format!("source:{}", source), source, "horizon", 1.0);
-            }
-        }
-        // Typed local scans require retained input and ingest/update work even
-        // when no precomputed summary is installed. Deduplicate by source.
-        for node in entry.nodes.values() {
-            if let crate::query_plan::QueryPlanNode::Logical {
-                operator:
-                    crate::query_plan::query_time::QueryTimeOperator::CurrentSeries {
-                        population, ..
-                    },
-                ..
-            } = node
-            {
-                let key = population.key();
-                for phase in ["build", "update", "residency", "retire"] {
-                    add(
-                        format!("current-series:{key}:{phase}"),
-                        json!({"population": population, "phase": phase}),
-                        "horizon",
-                        1.0,
-                    );
-                }
-                let source = json!({"source": planner_types::pre_asap::Source::TimeSeries { metric: population.metric.clone() }, "location": "backend", "ingest": plan.precompute_plan.ingest});
-                add(format!("source:{source}"), source, "horizon", 1.0);
-            }
-            if matches!(
-                node,
-                crate::query_plan::QueryPlanNode::Logical {
-                    operator: crate::query_plan::query_time::QueryTimeOperator::Scan { .. },
-                    ..
-                }
-            ) {
-                return Err(invalid(
-                    "generic backend raw scans are outside the ASAP/Prometheus execution contract",
-                ));
-            }
-            if let crate::query_plan::QueryPlanNode::Logical {
-                operator:
-                    crate::query_plan::query_time::QueryTimeOperator::ExactSubquery { query }
-                    | crate::query_plan::query_time::QueryTimeOperator::CandidateExactSubquery {
-                        query,
-                        ..
-                    },
-                ..
-            } = node
-            {
-                let parsed = crate::query_parser::parse_query_expr_canonical(
-                    query,
-                    crate::types::AccuracyTarget::Exact,
-                )
-                .map_err(|error| invalid(error.to_string()))?;
-                for metric in exact_source_metrics(&parsed)? {
-                    let source = json!({"source": planner_types::pre_asap::Source::TimeSeries { metric }, "location": "exact_backend"});
-                    add(format!("source:{}", source), source, "horizon", 1.0);
-                }
-            }
-        }
-        // Reachability comes from QueryPlan, including materialization reads,
-        // arithmetic, reduction and a complete engine-native exact fallback.
-        for node_id in entry.topological_order()? {
-            add(
-                format!("query:{}:{}", entry.query_id, node_id.0),
-                json!({"node": entry.nodes[&node_id], "query": entry.canonical_query, "instant": entry.instant}),
-                "query_evaluation",
-                evaluations,
-            );
-        }
-        add(
-            format!("result:{}", entry.query_id),
-            json!({"query_id": entry.query_id, "root": entry.root}),
-            "query_evaluation",
-            evaluations,
-        );
-    }
-    Ok(WorkloadCostManifest {
-        plan_id: plan.envelope.plan_id,
-        plan_version: plan.envelope.plan_version,
-        planner_revision: plan.envelope.planner_revision.clone(),
-        capability_snapshot_id: plan.envelope.capability_snapshot_id.clone(),
-        backend_compat: plan.envelope.backend_compat.clone(),
-        horizon_seconds: horizon,
-        workload,
-        components,
-    })
-}
-
-/// Walk the canonical relational tree, preserving every input to binary and
-/// fan-in operators. Unsupported source discovery must not produce a partial quote.
-pub(crate) fn exact_source_metrics(
-    expr: &planner_types::pre_asap::QueryExpr,
-) -> Result<BTreeSet<String>, CompileError> {
-    use planner_types::pre_asap::{QueryExpr, Source};
-    fn visit(expr: &QueryExpr, metrics: &mut BTreeSet<String>) -> Result<(), CompileError> {
-        match expr {
-            QueryExpr::Scan {
-                source: Source::TimeSeries { metric },
-                ..
-            } if !metric.is_empty() => {
-                metrics.insert(metric.clone());
-            }
-            QueryExpr::PromqlScalarBridge(child)
-            | QueryExpr::PromqlVectorFromScalar(child)
-            | QueryExpr::PromqlScalarFromVector(child)
-            | QueryExpr::PromqlRelabel { child, .. }
-            | QueryExpr::PromqlSeriesSample { child, .. }
-            | QueryExpr::Filter { child, .. }
-            | QueryExpr::Project { child, .. }
-            | QueryExpr::Aggregate { child, .. }
-            | QueryExpr::Dedup { child, .. }
-            | QueryExpr::Sort { child, .. }
-            | QueryExpr::Limit { child, .. }
-            | QueryExpr::PromqlSubquery { child, .. }
-            | QueryExpr::TimeRange { child, .. }
-            | QueryExpr::TimeShift { child, .. } => visit(child, metrics)?,
-            QueryExpr::BinaryOp {
-                lhs: left,
-                rhs: right,
-                ..
-            }
-            | QueryExpr::Join { left, right, .. }
-            | QueryExpr::SetOp { left, right, .. } => {
-                visit(left, metrics)?;
-                visit(right, metrics)?;
-            }
-            QueryExpr::Concat { children, .. } => {
-                for child in children {
-                    visit(child, metrics)?;
-                }
-            }
-            QueryExpr::Literal(_) | QueryExpr::EvalTimestamp => {}
-            // In particular, info() has an implicit metadata source that is
-            // not a Scan child, and unnamed selectors require source discovery.
-            _ => {
-                return Err(invalid(
-                    "exact-source pricing cannot enumerate this query's sources",
-                ))
-            }
-        }
-        Ok(())
-    }
-    let mut metrics = BTreeSet::new();
-    visit(expr, &mut metrics)?;
-    Ok(metrics)
-}
-
-pub(super) type PricedComponents = (Cost, BTreeMap<String, f64>);
-
-impl WorkloadCostEvidence {
-    fn validate(&self, env: &PhysicalDeploymentContext) -> Result<(), CompileError> {
-        if self.backend_revision != super::compiler::BACKEND_REVISION
-            || self.planner_revision != super::compiler::PLANNER_REVISION
-        {
-            return Err(invalid(format!(
-                "cost evidence compiler mismatch: measured backend/planner {}/{}; running {}/{}",
-                self.backend_revision,
-                self.planner_revision,
-                super::compiler::BACKEND_REVISION,
-                super::compiler::PLANNER_REVISION
-            )));
-        }
-        if self.data_snapshot_id.trim().is_empty()
-            || self.model_version.trim().is_empty()
-            || self.valid_for_ms == 0
-            || self.observed_at_unix_ms > env.observed_at_unix_ms
-            || env.observed_at_unix_ms - self.observed_at_unix_ms
-                > self.valid_for_ms.min(env.max_evidence_age_ms)
-        {
-            return Err(invalid("missing, future or stale evidence generation"));
-        }
-        Ok(())
-    }
-
-    pub(super) fn price(
-        &self,
-        manifest: &WorkloadCostManifest,
-    ) -> Result<PricedComponents, (CandidateEvaluationStatus, String)> {
-        let quotes = self
-            .quotes
-            .iter()
-            .filter(|quote| &quote.manifest == manifest)
-            .collect::<Vec<_>>();
-        if quotes.len() != 1 {
-            return Err((
-                CandidateEvaluationStatus::EvidenceMissing,
-                "missing or ambiguous quote for exact manifest".into(),
-            ));
-        }
-        let quote = quotes[0];
-        if !quote.executable {
-            return Err((
-                CandidateEvaluationStatus::ProviderRejected,
-                "provider reports unavailable implementation".into(),
-            ));
-        }
-        if !quote.unit_costs.keys().eq(manifest.components.keys()) {
-            return Err((
-                CandidateEvaluationStatus::EvidenceInvalid,
-                "incomplete or extraneous component evidence".into(),
-            ));
-        }
-        let mut total = 0.0;
-        let mut components = BTreeMap::new();
-        for (id, demand) in &manifest.components {
-            let unit = quote.unit_costs[id];
-            let cost = unit * demand.occurrences_per_horizon;
-            if !unit.is_finite() || unit < 0.0 || !cost.is_finite() || cost < 0.0 {
-                return Err((
-                    CandidateEvaluationStatus::EvidenceInvalid,
-                    format!("invalid cost for {id}"),
-                ));
-            }
-            total += cost;
-            components.insert(id.clone(), cost);
-        }
-        if !total.is_finite() {
-            return Err((
-                CandidateEvaluationStatus::EvidenceInvalid,
-                "cost overflow".into(),
-            ));
-        }
-        Ok((Cost(total), components))
-    }
-}
-
-fn candidate_description(candidate: &PhysicalCompilationRequest) -> CandidatePlanEvaluation {
-    let root_ids = candidate
-        .queries
-        .iter()
-        .map(|query| {
-            crate::planner_selection::explained_root_id(
-                &query.selected_plan_root,
-                &query.accuracy_target,
-            )
-        })
-        .collect::<Vec<_>>();
-    let complete = root_ids.iter().all(Option::is_some);
-    let mut logical_root_ids = root_ids.into_iter().flatten().collect::<Vec<_>>();
-    logical_root_ids.sort();
-    logical_root_ids.dedup();
-    CandidatePlanEvaluation {
-        candidate_id: complete.then(|| {
-            crate::planner_selection::explain_identity(
-                "alternative",
-                &(
-                    &logical_root_ids,
-                    candidate.allow_mixed_summary_and_exact_execution,
-                    &candidate.enabled_materialization_keys,
-                ),
-            )
-        }),
-        logical_root_ids,
-        identity_unavailable_reason: (!complete)
-            .then(|| "lossless canonical executable export unavailable for a logical root".into()),
-        physical_candidate_id: None,
-        status: CandidateEvaluationStatus::CompilationFailed,
-        plan_id: None,
-        total_cost: None,
-        unavailable_reason: None,
-    }
-}
-
-fn compile_candidate_for_pricing(
-    candidate: PhysicalCompilationRequest,
-    env: PhysicalDeploymentContext,
-    frontend: super::compiler::QueryFrontend,
-) -> Result<
-    (
-        CompiledPhysicalPlan,
-        WorkloadCostManifest,
-        CandidatePlanEvaluation,
-    ),
-    Box<CandidatePlanEvaluation>,
-> {
-    let mut description = candidate_description(&candidate);
-    let queries = candidate.queries.clone();
-    let compiled = super::realization::RealizationProvider::compile(
-        &super::realization::ExistingRealizations,
-        candidate,
-        env,
-        frontend,
-    );
-    let plan = match compiled {
-        Ok(plan) => plan,
-        Err(error) => {
-            description.unavailable_reason = Some(error.to_string());
-            return Err(Box::new(description));
-        }
-    };
-    description.plan_id = Some(plan.envelope.plan_id);
-    // Reuse concrete catalog identities and selected window implementations.
-    // Deployment epochs/plan IDs and evidence prices do not identify semantics.
-    let mut bindings = plan
-        .lifecycle_estimates
-        .iter()
-        .map(|item| (item.materialization, item.window_realization_id.clone()))
-        .collect::<Vec<_>>();
-    bindings.sort();
-    let mut placement = plan
-        .collector_plans
-        .iter()
-        .map(|collector| {
-            let mut states = collector
-                .materializations
-                .iter()
-                .map(|state| state.materialization)
-                .collect::<Vec<_>>();
-            states.sort();
-            (&collector.collector_id, states)
-        })
-        .collect::<Vec<_>>();
-    placement.sort();
-    description.physical_candidate_id =
-        description
-            .candidate_id
-            .as_ref()
-            .map(|logical_candidate_id| {
-                crate::planner_selection::explain_identity(
-                    "physical",
-                    &(
-                        logical_candidate_id,
-                        bindings,
-                        placement,
-                        &plan.precompute_plan.ingest,
-                    ),
-                )
-            });
-
-    match manifest(&plan, &queries) {
-        Ok(manifest) => {
-            description.status = CandidateEvaluationStatus::AwaitingQuote;
-            Ok((plan, manifest, description))
-        }
-        Err(error) => {
-            description.unavailable_reason = Some(error.to_string());
-            Err(Box::new(description))
-        }
-    }
-}
-
-/// Preserve failed bindings alongside quoteable manifests. This does not select_lowest_cost_candidate or publish.
-pub fn compile_candidates_for_pricing(
-    candidates: Vec<PhysicalCompilationRequest>,
-    env: PhysicalDeploymentContext,
-    frontend: super::compiler::QueryFrontend,
-) -> (Vec<WorkloadCostManifest>, Vec<CandidatePlanEvaluation>) {
-    let mut manifests = Vec::new();
-    let mut candidate_evaluations = Vec::new();
-    for candidate in candidates {
-        match compile_candidate_for_pricing(candidate, env.clone(), frontend) {
-            Ok((_, manifest, description)) => {
-                manifests.push(manifest);
-                candidate_evaluations.push(description);
-            }
-            Err(description) => candidate_evaluations.push(*description),
-        }
-    }
-    (manifests, candidate_evaluations)
-}
-
-/// Compare complete Planner-authorized forests after binding. Infeasible or
-/// uncosted candidates are retained as unavailable, never assigned zero.
-pub fn select_lowest_cost_candidate(
-    candidates: Vec<PhysicalCompilationRequest>,
-    env: PhysicalDeploymentContext,
-    evidence: &WorkloadCostEvidence,
-) -> Result<CompiledPhysicalPlan, CompileError> {
-    select_candidates(
-        candidates,
-        env,
-        evidence,
-        super::compiler::QueryFrontend::PromQl,
-    )
-}
-
-pub fn select_lowest_cost_metricsql_candidate(
-    candidates: Vec<PhysicalCompilationRequest>,
-    env: PhysicalDeploymentContext,
-    evidence: &WorkloadCostEvidence,
-) -> Result<CompiledPhysicalPlan, CompileError> {
-    select_candidates(
-        candidates,
-        env,
-        evidence,
-        super::compiler::QueryFrontend::MetricsQl,
-    )
-}
-
-fn select_candidates(
-    candidates: Vec<PhysicalCompilationRequest>,
-    env: PhysicalDeploymentContext,
-    evidence: &WorkloadCostEvidence,
-    frontend: super::compiler::QueryFrontend,
-) -> Result<CompiledPhysicalPlan, CompileError> {
-    evidence.validate(&env)?;
-    if candidates.is_empty() || candidates.len() > 64 {
-        return Err(invalid(
-            "candidate inventory must contain 1..=64 candidates",
-        ));
-    }
-    let candidate_key_sets: BTreeSet<_> = candidates
-        .iter()
-        .filter(|c| c.allow_mixed_summary_and_exact_execution)
-        .filter_map(|c| c.enabled_materialization_keys.clone())
-        .collect();
-    let eligible_keys: BTreeSet<_> = candidate_key_sets
-        .iter()
-        .flat_map(|p| p.iter().cloned())
-        .collect();
-    let materialization_search_coverage =
-        (!candidate_key_sets.is_empty()).then(|| MaterializationSearchCoverage {
-            eligible_materialization_count: eligible_keys.len(),
-            enumerated_candidate_key_sets: candidate_key_sets.len(),
-            exhaustive: eligible_keys.len() < usize::BITS as usize
-                && candidate_key_sets.len() == (1usize << eligible_keys.len()),
-            search_scope: CandidateSearchScope::PlannerAuthorizedMaterializations,
-        });
-    let planner_selection_trace = candidates[0].planner_selection_trace.clone();
-    let mut comparison_workload = None;
-    let mut candidate_evaluations = Vec::new();
-    let mut best_index = 0;
-    let mut best: Option<(
-        Cost,
-        CompiledPhysicalPlan,
-        WorkloadCostManifest,
-        BTreeMap<String, f64>,
-    )> = None;
-    for candidate in candidates {
-        let (plan, manifest, mut description) =
-            match compile_candidate_for_pricing(candidate, env.clone(), frontend) {
-                Ok(bound) => bound,
-                Err(description) => {
-                    candidate_evaluations.push(*description);
-                    continue;
-                }
-            };
-        let scope = (manifest.workload.clone(), manifest.horizon_seconds);
-        if comparison_workload
-            .as_ref()
-            .is_some_and(|previous| previous != &scope)
-        {
-            return Err(invalid("candidates describe different workloads/horizons"));
-        }
-        comparison_workload = Some(scope);
-        match super::realization::RealizationProvider::price(
-            &super::realization::ExistingRealizations,
-            evidence,
-            &manifest,
-        ) {
-            Ok((cost, components)) => {
-                description.status = CandidateEvaluationStatus::Unselected;
-                description.total_cost = Some(cost.0);
-                candidate_evaluations.push(description);
-                if best.as_ref().is_none_or(|(previous, ..)| cost < *previous) {
-                    best_index = candidate_evaluations.len() - 1;
-                    best = Some((cost, plan, manifest, components));
-                }
-            }
-            Err((status, reason)) => {
-                description.status = status;
-                description.unavailable_reason = Some(reason);
-                candidate_evaluations.push(description);
-            }
-        }
-    }
-    let (_, mut plan, selected_manifest, component_costs) = best.ok_or_else(|| {
-        CompileError::Candidates(
-            json!({"status": "all_infeasible", "logical_selection": planner_selection_trace,
-            "candidates": candidate_evaluations}),
-        )
-    })?;
-    // Exactly the winner retained by the existing strict-less-than selector.
-    candidate_evaluations[best_index].status = CandidateEvaluationStatus::Selected;
-    plan.cost_comparison = Some(CandidatePlanSelectionReport {
-        planner_selection_trace,
-        materialization_search_coverage,
-        data_snapshot_id: evidence.data_snapshot_id.clone(),
-        model_version: evidence.model_version.clone(),
-        selected_plan_id: plan.envelope.plan_id,
-        selected_manifest,
-        component_costs,
-        candidate_evaluations,
-    });
-    Ok(plan)
-}
-
-/// The current executor exposes continuously maintained state and the native
-/// exact backend. Additional Planner-produced forests can use `select_lowest_cost_candidate` directly.
-pub fn enumerate_exact_and_materialized_candidates(
-    request: PhysicalCompilationRequest,
-) -> Result<Vec<PhysicalCompilationRequest>, CompileError> {
-    let already_selected = super::maintained_population::supported(&request);
-    let mut candidates = materialization_candidates(request)?;
-    if already_selected {
-        return Ok(candidates);
-    }
-    let roots: Vec<_> = candidates
-        .last()
-        .expect("exact alternative")
-        .queries
-        .iter()
-        .map(|q| match &q.selected_plan_root.expr {
-            planner_types::post_asap::SummaryExpr::KeepPreAsap(root) => std::rc::Rc::clone(root),
-            _ => unreachable!("native alternative retains canonical roots"),
-        })
-        .collect();
-    let strategy =
-        asap_aware_mapping::maintained_population::MaintainedPopulationStrategy::new(&roots);
-    let maintained_roots: Vec<_> = roots
-        .iter()
-        .map(|root| {
-            strategy
-                .candidate(root)
-                .filter(|node| super::maintained_population::supported_node(node))
-        })
-        .collect();
-    if maintained_roots.iter().any(Option::is_some) {
-        // Current-series rules are compatible with window summaries in other
-        // workload roots. Preserve each priced temporal alternative and mask.
-        let maintained: Vec<_> = candidates
-            .iter()
-            .map(|alternative| {
-                let mut candidate = alternative.clone();
-                for (query, selected) in candidate.queries.iter_mut().zip(&maintained_roots) {
-                    if let Some(selected) = selected {
-                        query.selected_plan_root = std::rc::Rc::clone(selected);
-                    }
-                }
-                if maintained_roots.iter().all(Option::is_some) {
-                    candidate.allow_mixed_summary_and_exact_execution = false;
-                    candidate.enabled_materialization_keys = None;
-                }
-                candidate
-            })
-            .collect();
-        for candidate in maintained {
-            if !candidates.iter().any(|existing| {
-                existing.allow_mixed_summary_and_exact_execution
-                    == candidate.allow_mixed_summary_and_exact_execution
-                    && existing.enabled_materialization_keys
-                        == candidate.enabled_materialization_keys
-                    && existing
-                        .queries
-                        .iter()
-                        .zip(&candidate.queries)
-                        .all(|(a, b)| a.selected_plan_root == b.selected_plan_root)
-            }) {
-                candidates.push(candidate);
-            }
-        }
-    }
-    Ok(candidates)
-}
-
-fn materialization_candidates(
-    request: PhysicalCompilationRequest,
-) -> Result<Vec<PhysicalCompilationRequest>, CompileError> {
-    let mut exact = request.clone();
-    exact.allow_mixed_summary_and_exact_execution = false;
-    exact.enabled_materialization_keys = None;
-    for (index, query) in exact.queries.iter_mut().enumerate() {
-        let parsed = if let Some(root) = request.canonical_roots.get(index) {
-            root.as_ref().clone()
-        } else {
-            crate::query_parser::parse_query_expr_canonical(
-                &query.query_string,
-                query.accuracy_target.clone(),
-            )
-            .map_err(|error| invalid(error.to_string()))?
-        };
-        query.selected_plan_root = crate::planner_selection::keep_pre_asap(&parsed)
-            .map_err(|error| invalid(error.to_string()))?;
-    }
-    if !request.allow_mixed_summary_and_exact_execution
-        && request
-            .queries
-            .iter()
-            .zip(&exact.queries)
-            .all(|(a, b)| a.selected_plan_root == b.selected_plan_root)
-    {
-        Ok(vec![request])
-    } else {
-        if !request.allow_mixed_summary_and_exact_execution
-            || request.enabled_materialization_keys.is_some()
-        {
-            return Ok(vec![request, exact]);
-        }
-        let mut keys = BTreeSet::new();
-        for query in &request.queries {
-            match crate::query_plan::query_time::eligible_materialization_keys(
-                &query.query_string,
-                &query.selected_plan_root,
-            ) {
-                Ok(found) => keys.extend(found),
-                // A failed local projection must not make the native alternative
-                // disappear. Compile/select_lowest_cost_candidate retains its concrete unavailability.
-                Err(_) => return Ok(vec![request, exact]),
-            }
-        }
-        if keys.is_empty() {
-            return Ok(vec![request, exact]);
-        }
-        let inventory = materialization_candidates::enumerate(keys);
-        debug_assert_eq!(
-            inventory.exhaustive,
-            inventory.eligible_materialization_count <= 4
-        );
-        let mut candidate_requests: Vec<_> = inventory
-            .candidate_key_sets
-            .into_iter()
-            .map(|enabled_keys| {
-                let mut candidate = request.clone();
-                candidate.enabled_materialization_keys = Some(enabled_keys);
-                candidate
-            })
-            .collect();
-        candidate_requests.push(exact);
-        Ok(candidate_requests)
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::super::compiler::BackendLocalPlanningInput;
-    use super::*;
-
-    fn fixture() -> BackendLocalPlanningInput {
-        let mut snapshot: BackendLocalPlanningInput = serde_json::from_str(include_str!(
-            "../../../docs/examples/asapquery-planning-snapshot.json"
-        ))
-        .unwrap();
-        snapshot.query_workload.repeating_queries.as_mut().unwrap()[0].query =
-            planner_types::workload::Query("sum(sum_over_time(m[1m]))".into());
-        snapshot
-    }
-
-    /// Input uses one wire contract; removed aliases are not silently accepted.
-    #[test]
-    fn snapshot_rejects_removed_input_aliases() {
-        let value = serde_json::to_value(fixture()).unwrap();
-        let decoded: BackendLocalPlanningInput = serde_json::from_value(value.clone()).unwrap();
-        assert_eq!(serde_json::to_value(decoded).unwrap(), value);
-        for (canonical, removed) in [
-            ("snapshot_version", "schema_version"),
-            ("implementation", "physical_inputs"),
-        ] {
-            let mut invalid = value.clone();
-            let field = invalid.as_object_mut().unwrap().remove(canonical).unwrap();
-            invalid[removed] = field;
-            assert!(serde_json::from_value::<BackendLocalPlanningInput>(invalid).is_err());
-        }
-    }
-
-    // Fractional demand and unavailable candidate costs preserve the current contract.
-    #[test]
-    fn demand_and_evaluation_use_candidate_wire_contracts() {
-        let old = json!({"implementation": {"op": "read"}, "unit": "query_evaluation", "multiplicity": 2.5});
-        let demand: CostComponentDemand = serde_json::from_value(old.clone()).unwrap();
-        assert_eq!(demand.pricing_basis, "query_evaluation");
-        assert_eq!(demand.occurrences_per_horizon, 2.5);
-        assert_eq!(serde_json::to_value(demand).unwrap(), old);
-        let row = json!({
-            "candidate_id": null, "physical_candidate_id": null,
-            "identity_unavailable_reason": null, "plan_id": null,
-            "total_cost": null, "unavailable_reason": null
-        });
-        let evaluation: CandidatePlanEvaluation = serde_json::from_value(row).unwrap();
-        assert_eq!(evaluation.status, CandidateEvaluationStatus::Unspecified);
-        let encoded = serde_json::to_value(evaluation).unwrap();
-        assert_eq!(encoded["status"], "");
-        assert!(encoded.get("candidate_id").is_some());
-        assert!(encoded.get("alternative_id").is_none());
-    }
-
-    // IDs describe semantics; activation/version changes do not create new candidates.
-    #[test]
-    fn explain_identity_is_stable_across_activations_and_distinguishes_native() {
-        let (request, mut env) = fixture().into_physical_compilation_request().unwrap();
-        let candidates = enumerate_exact_and_materialized_candidates(request).unwrap();
-        let (_, first) = compile_candidates_for_pricing(
-            candidates.clone(),
-            env.clone(),
-            crate::physical::compiler::QueryFrontend::PromQl,
-        );
-        env.plan_version += 1;
-        env.activation_unix_ms += 1;
-        let (_, second) = compile_candidates_for_pricing(
-            candidates,
-            env,
-            crate::physical::compiler::QueryFrontend::PromQl,
-        );
-        assert_eq!(first.len(), second.len());
-        for (a, b) in first.iter().zip(&second) {
-            assert!(a.candidate_id.is_some());
-            assert!(a.physical_candidate_id.is_some());
-            assert_eq!(a.candidate_id, b.candidate_id);
-            assert_eq!(a.physical_candidate_id, b.physical_candidate_id);
-        }
-        assert_ne!(
-            first.first().unwrap().candidate_id,
-            first.last().unwrap().candidate_id
-        );
-    }
-
-    // Bind failures remain visible even when the native manifest is usable.
-    #[test]
-    fn explain_retains_failed_bindings_and_all_missing_quotes() {
-        let (mut request, env) = fixture().into_physical_compilation_request().unwrap();
-        request.allow_mixed_summary_and_exact_execution = false;
-        request.queries[0].window_realization_candidates.clear();
-        let candidates = enumerate_exact_and_materialized_candidates(request).unwrap();
-        let (manifests, explanations) = compile_candidates_for_pricing(
-            candidates,
-            env,
-            crate::physical::compiler::QueryFrontend::PromQl,
-        );
-        assert_eq!(manifests.len(), 1);
-        assert_eq!(explanations.len(), 2);
-        assert_eq!(
-            explanations[0].status,
-            CandidateEvaluationStatus::CompilationFailed
-        );
-        assert!(explanations[0].unavailable_reason.is_some());
-        assert_eq!(
-            explanations[1].status,
-            CandidateEvaluationStatus::AwaitingQuote
-        );
-
-        let (candidates, env, mut evidence) = quoted();
-        let count = candidates.len();
-        evidence.quotes.clear();
-        let CompileError::Candidates(report) =
-            select_lowest_cost_candidate(candidates, env, &evidence).unwrap_err()
-        else {
-            panic!("expected structured all-infeasible report")
-        };
-        assert_eq!(report["status"], "all_infeasible");
-        let candidates = report["candidates"].as_array().unwrap();
-        assert_eq!(candidates.len(), count);
-        assert!(candidates
-            .iter()
-            .all(|item| item["status"] == "evidence_missing"));
-        assert!(!report["logical_selection"].as_array().unwrap().is_empty());
-    }
-
-    // Explanation records the same minimum quote selected by the existing algorithm.
-    #[test]
-    fn explain_links_selected_roots_without_changing_cost_choice() {
-        let (candidates, env, evidence) = quoted();
-        let expected = evidence
-            .quotes
-            .iter()
-            .map(|quote| {
-                let cost = evidence.price(&quote.manifest).unwrap().0 .0;
-                (cost, quote.manifest.plan_id)
-            })
-            .min_by(|a, b| a.0.total_cmp(&b.0))
-            .unwrap();
-        let plan = select_lowest_cost_candidate(candidates, env, &evidence).unwrap();
-        assert_eq!(plan.envelope.plan_id, expected.1);
-        let comparison = plan.cost_comparison.unwrap();
-        let selected = comparison
-            .candidate_evaluations
-            .iter()
-            .filter(|item| item.status == CandidateEvaluationStatus::Selected)
-            .collect::<Vec<_>>();
-        assert_eq!(selected.len(), 1);
-        assert_eq!(selected[0].total_cost, Some(expected.0));
-        assert!(selected[0].candidate_id.is_some());
-        assert!(selected[0].physical_candidate_id.is_some());
-        assert_eq!(
-            comparison.planner_selection_trace,
-            plan.planner_selection_trace
-        );
-    }
-
-    #[test]
-    fn filtered_max_materializations_have_distinct_sds_populations() {
-        let mut snapshot = fixture();
-        let entries = snapshot.query_workload.repeating_queries.as_mut().unwrap();
-        entries[0].query = planner_types::workload::Query(
-            "max_over_time(service_retry_queue_depth{job=~\".+\"}[6h])".into(),
-        );
-        entries[0].requirements.accuracy = planner_types::workload::AccuracyRequirement::Explicit(
-            planner_types::types::AccuracyTarget::Exact,
-        );
-        let mut second = entries[0].clone();
-        second.query = planner_types::workload::Query(
-            "max_over_time(service_retry_queue_depth{job=\"order-service\"}[6h])".into(),
-        );
-        entries.push(second);
-        let (request, env) = snapshot.into_physical_compilation_request().unwrap();
-        let plan = DeploymentPlanCompiler
-            .compile_promql(request.clone(), env)
-            .unwrap();
-        let costs = manifest(&plan, &request.queries).unwrap();
-        assert_eq!(
-            costs
-                .components
-                .keys()
-                .filter(|id| id.starts_with("state:"))
-                .count(),
-            8
-        );
-        assert_eq!(
-            costs
-                .components
-                .keys()
-                .filter(|id| id.starts_with("raw-state:"))
-                .count(),
-            0
-        );
-        assert_eq!(
-            plan.query_plan
-                .entries
-                .values()
-                .flat_map(|entry| entry.nodes.values())
-                .filter(|node| matches!(
-                    node,
-                    crate::query_plan::QueryPlanNode::ReadMaterialization { .. }
-                ))
-                .count(),
-            2
-        );
-    }
-
-    #[test]
-    fn materialization_masks_reject_mixed_snapshots_before_costing() {
-        let mut snapshot = fixture();
-        let q = &mut snapshot.query_workload.repeating_queries.as_mut().unwrap()[0];
-        q.query =
-            planner_types::workload::Query("max_over_time(a[1m]) + max_over_time(b[1m])".into());
-        q.requirements.accuracy = planner_types::workload::AccuracyRequirement::Explicit(
-            crate::types::AccuracyTarget::Exact,
-        );
-        let (request, environment) = snapshot.into_physical_compilation_request().unwrap();
-        let candidates = enumerate_exact_and_materialized_candidates(request).unwrap();
-        assert_eq!(
-            candidates.len(),
-            5,
-            "four proposed candidate key sets plus native"
-        );
-        let mut identities = BTreeSet::new();
-        let mut rejected = 0;
-        for candidate in &candidates[..4] {
-            let enabled = candidate
-                .enabled_materialization_keys
-                .as_ref()
-                .unwrap()
-                .len();
-            let result =
-                DeploymentPlanCompiler.compile_promql(candidate.clone(), environment.clone());
-            if enabled == 1 {
-                let Err(error) = result else {
-                    panic!("mixed snapshots must fail binding");
-                };
-                assert!(
-                    error.to_string().contains("common snapshot proof"),
-                    "{error}"
-                );
-                rejected += 1;
-                continue;
-            }
-            let plan = result.unwrap();
-            assert!(identities.insert(plan.envelope.plan_id));
-            let cost = manifest(&plan, &candidate.queries).unwrap();
-            assert_eq!(
-                cost.components
-                    .keys()
-                    .filter(|k| k.starts_with("state:backend:"))
-                    .count(),
-                enabled * 4
-            );
-            assert_eq!(
-                cost.components
-                    .keys()
-                    .filter(|k| k.starts_with("raw-state:"))
-                    .count(),
-                0
-            );
-            assert_eq!(
-                cost.components
-                    .values()
-                    .filter(|v| v.pricing_basis == "horizon"
-                        && v.implementation.get("location").and_then(Value::as_str)
-                            == Some("exact_backend"))
-                    .count(),
-                2 - enabled
-            );
-            assert!(!plan
-                .query_plan
-                .entries
-                .values()
-                .any(|entry| entry.nodes.values().any(|node| matches!(
-                    node,
-                    crate::query_plan::QueryPlanNode::ExactFallback { .. }
-                ))));
-        }
-        assert_eq!(rejected, 2);
-        assert_eq!(identities.len(), 2);
-        assert!(
-            !candidates
-                .last()
-                .unwrap()
-                .allow_mixed_summary_and_exact_execution
-        );
-    }
-
-    fn quoted() -> (
-        Vec<PhysicalCompilationRequest>,
-        PhysicalDeploymentContext,
-        WorkloadCostEvidence,
-    ) {
-        let (request, env) = fixture().into_physical_compilation_request().unwrap();
-        let candidates = enumerate_exact_and_materialized_candidates(request).unwrap();
-        let quotes = candidates
-            .iter()
-            .map(|candidate| {
-                let plan = DeploymentPlanCompiler
-                    .compile_promql(candidate.clone(), env.clone())
-                    .unwrap();
-                let manifest = manifest(&plan, &candidate.queries).unwrap();
-                let unit_costs = manifest
-                    .components
-                    .keys()
-                    .map(|id| (id.clone(), 1.0))
-                    .collect();
-                WorkloadQuote {
-                    manifest,
-                    executable: true,
-                    unit_costs,
-                }
-            })
-            .collect();
-        let evidence = WorkloadCostEvidence {
-            backend_revision: crate::physical::compiler::BACKEND_REVISION.into(),
-            planner_revision: crate::physical::compiler::PLANNER_REVISION.into(),
-            data_snapshot_id: "fixture-data-v1".into(),
-            model_version: "test-only-unit-costs".into(),
-            observed_at_unix_ms: env.observed_at_unix_ms,
-            valid_for_ms: env.max_evidence_age_ms,
-            quotes,
-        };
-        (candidates, env, evidence)
-    }
-
-    // Retained local input is priced once per metric, separate from the native service.
-    #[test]
-    fn counter_materialization_manifest_prices_owned_state_and_distinct_native_alternative() {
-        use planner_types::workload::{AccuracyRequirement, Query};
-        let mut snapshot = fixture();
-        let entry = &mut snapshot.query_workload.repeating_queries.as_mut().unwrap()[0];
-        entry.query = Query("sum(rate(a{job=\"x\"}[1m])) / sum(rate(a{job!=\"x\"}[5m]))".into());
-        entry.requirements.accuracy =
-            AccuracyRequirement::Explicit(crate::types::AccuracyTarget::Exact);
-        let (request, environment) = snapshot.into_physical_compilation_request().unwrap();
-        let candidates = enumerate_exact_and_materialized_candidates(request).unwrap();
-        assert!(candidates.len() >= 2);
-        let local = DeploymentPlanCompiler
-            .compile_promql(candidates[0].clone(), environment.clone())
-            .unwrap();
-        let native = DeploymentPlanCompiler
-            .compile_promql(candidates.last().unwrap().clone(), environment)
-            .unwrap();
-        assert_ne!(local.envelope.plan_id, native.envelope.plan_id);
-        let manifest = manifest(&local, &candidates[0].queries).unwrap();
-        assert_eq!(
-            manifest
-                .components
-                .keys()
-                .filter(|key| key.starts_with("raw-state:a:"))
-                .count(),
-            0
-        );
-        assert_eq!(
-            manifest
-                .components
-                .values()
-                .filter(|demand| demand.implementation.get("location")
-                    == Some(&serde_json::json!("backend")))
-                .count(),
-            1
-        );
-        // Both ranges are summarized now, so nothing in this workload is
-        // priced as exact backend execution. The 5m operand used to land there
-        // only because its window had no implementation candidate.
-        assert!(!manifest
-            .components
-            .values()
-            .any(|demand| demand.implementation.get("location")
-                == Some(&serde_json::json!("exact_backend"))));
-    }
-
-    // All input metrics need upkeep quotes; repeated reads share that upkeep.
-    #[test]
-    fn exact_manifest_covers_and_deduplicates_query_sources() {
-        for (query, expected) in [
-            (
-                "sum_over_time(m[1m]) + sum_over_time(n[1m])",
-                vec!["m", "n"],
-            ),
-            ("sum_over_time(m[1m]) + count_over_time(m[1m])", vec!["m"]),
-        ] {
-            let (mut request, env) = fixture().into_physical_compilation_request().unwrap();
-            request.queries[0].query_string = query.into();
-            request
-                .query_workload
-                .as_mut()
-                .unwrap()
-                .repeating_queries
-                .as_mut()
-                .unwrap()[0]
-                .query = planner_types::workload::Query(query.into());
-            let exact = enumerate_exact_and_materialized_candidates(request)
-                .unwrap()
-                .pop()
-                .unwrap();
-            let plan = DeploymentPlanCompiler
-                .compile_promql(exact.clone(), env.clone())
-                .unwrap();
-            let manifest = manifest(&plan, &exact.queries).unwrap();
-            let sources: Vec<_> = manifest
-                .components
-                .iter()
-                .filter(|(id, _)| id.starts_with("source:"))
-                .map(|(_, demand)| {
-                    demand.implementation["source"]["TimeSeries"]["metric"]
-                        .as_str()
-                        .unwrap()
-                })
-                .collect();
-            assert_eq!(sources, expected, "{query}");
-            let mut evidence = WorkloadCostEvidence {
-                backend_revision: crate::physical::compiler::BACKEND_REVISION.into(),
-                planner_revision: crate::physical::compiler::PLANNER_REVISION.into(),
-                data_snapshot_id: "test-data".into(),
-                model_version: "test-model".into(),
-                observed_at_unix_ms: env.observed_at_unix_ms,
-                valid_for_ms: env.max_evidence_age_ms,
-                quotes: vec![WorkloadQuote {
-                    unit_costs: manifest
-                        .components
-                        .keys()
-                        .map(|id| (id.clone(), 1.0))
-                        .collect(),
-                    manifest,
-                    executable: true,
-                }],
-            };
-            assert!(
-                select_lowest_cost_candidate(vec![exact.clone()], env.clone(), &evidence).is_ok()
-            );
-            let source_id = evidence.quotes[0]
-                .unit_costs
-                .keys()
-                .rfind(|id| id.starts_with("source:"))
-                .unwrap()
-                .clone();
-            evidence.quotes[0].unit_costs.remove(&source_id);
-            assert!(
-                select_lowest_cost_candidate(vec![exact], env, &evidence).is_err(),
-                "missing input upkeep must fail closed"
-            );
-        }
-    }
-
-    // Hidden or unresolved sources must not yield a partially priced manifest.
-    #[test]
-    fn exact_source_discovery_rejects_unresolved_inputs() {
-        let accuracy = fixture()
-            .into_physical_compilation_request()
-            .unwrap()
-            .0
-            .queries[0]
-            .accuracy_target
-            .clone();
-        for query in ["info(m)", "{job=\"api\"}"] {
-            let parsed =
-                crate::query_parser::parse_query_expr_canonical(query, accuracy.clone()).unwrap();
-            assert!(exact_source_metrics(&parsed).is_err(), "{query}");
-        }
-    }
-
-    #[test]
-    fn complete_cost_changes_selection_and_reports_shared_work_once() {
-        let (candidates, env, mut evidence) = quoted();
-        assert_ne!(evidence.quotes[0].manifest, evidence.quotes[1].manifest);
-        assert!(evidence.quotes[0]
-            .manifest
-            .components
-            .keys()
-            .any(|key| key.starts_with("state:")));
-        assert!(!evidence.quotes[1]
-            .manifest
-            .components
-            .keys()
-            .any(|key| key.starts_with("state:")));
-        for cost in evidence.quotes[1].unit_costs.values_mut() {
-            *cost = 1000.0;
-        }
-        let warm =
-            select_lowest_cost_candidate(candidates.clone(), env.clone(), &evidence).unwrap();
-        assert_eq!(warm.envelope.plan_id, evidence.quotes[0].manifest.plan_id);
-        let report = warm.cost_comparison.unwrap();
-        assert_eq!(
-            report.component_costs.len(),
-            report.selected_manifest.components.len()
-        );
-        assert_eq!(report.candidate_evaluations.len(), 2);
-        assert!(report
-            .candidate_evaluations
-            .iter()
-            .all(|a| a.total_cost.is_some()));
-        for (id, cost) in &mut evidence.quotes[0].unit_costs {
-            if id.ends_with(":residency") {
-                *cost = 1e9;
-            }
-        }
-        let raw = select_lowest_cost_candidate(candidates, env, &evidence).unwrap();
-        assert_eq!(raw.envelope.plan_id, evidence.quotes[1].manifest.plan_id);
-    }
-
-    #[test]
-    fn incomplete_unavailable_and_wrong_generation_quotes_are_not_free() {
-        let (candidates, env, mut evidence) = quoted();
-        evidence.quotes[0].unit_costs.pop_first();
-        let plan =
-            select_lowest_cost_candidate(candidates.clone(), env.clone(), &evidence).unwrap();
-        assert!(plan.cost_comparison.unwrap().candidate_evaluations[0]
-            .unavailable_reason
-            .is_some());
-        evidence.quotes[1].executable = false;
-        assert!(select_lowest_cost_candidate(candidates.clone(), env.clone(), &evidence).is_err());
-        let (_, _, mut evidence) = quoted();
-        evidence
-            .quotes
-            .iter_mut()
-            .for_each(|quote| quote.manifest.capability_snapshot_id.push_str("-wrong"));
-        assert!(select_lowest_cost_candidate(candidates.clone(), env.clone(), &evidence).is_err());
-        let (_, _, mut evidence) = quoted();
-        evidence.observed_at_unix_ms = env.observed_at_unix_ms + 1;
-        assert!(select_lowest_cost_candidate(candidates, env, &evidence).is_err());
-    }
-
-    #[test]
-    fn evidence_from_a_different_compiler_build_is_rejected_before_matching_quotes() {
-        let (candidates, env, mut evidence) = quoted();
-        evidence.backend_revision = "stale-backend-build".into();
-        let error = select_lowest_cost_candidate(candidates, env, &evidence)
-            .unwrap_err()
-            .to_string();
-        assert!(error.contains("cost evidence compiler mismatch"), "{error}");
-    }
-
-    #[test]
-    fn snapshot_requires_quotes_and_roundtrips_selection() {
-        let mut snapshot = fixture();
-        assert!(snapshot.clone().compile_promql().is_err());
-        let (_, _, evidence) = quoted();
-        snapshot.workload_cost_evidence = Some(evidence);
-        let snapshot: BackendLocalPlanningInput =
-            serde_json::from_str(&serde_json::to_string(&snapshot).unwrap()).unwrap();
-        assert!(snapshot.compile_promql().unwrap().cost_comparison.is_some());
-    }
-
-    #[test]
-    fn second_consumer_adds_reads_not_another_shared_state() {
-        let (request, env) = fixture().into_physical_compilation_request().unwrap();
-        let first = manifest(
-            &DeploymentPlanCompiler
-                .compile_promql(request.clone(), env.clone())
-                .unwrap(),
-            &request.queries,
-        )
-        .unwrap();
-        let mut shared = request.clone();
-        let mut second = shared.queries[0].clone();
-        second.query_id = "second-consumer".into();
-        second.query_string = "sum(sum_over_time(m[1m])) * 2".into();
-        let entries = shared
-            .query_workload
-            .as_mut()
-            .unwrap()
-            .repeating_queries
-            .as_mut()
-            .unwrap();
-        let mut demand = entries[0].clone();
-        demand.query = planner_types::workload::Query(second.query_string.clone());
-        entries.push(demand);
-        shared.queries.push(second);
-        let roots = shared
-            .queries
-            .iter()
-            .map(|query| {
-                std::rc::Rc::new(
-                    crate::query_parser::parse_query_expr_canonical(
-                        &query.query_string,
-                        query.accuracy_target.clone(),
-                    )
-                    .unwrap(),
-                )
-            })
-            .collect();
-        super::super::compiler::select_logical_roots_for_queries(
-            &mut shared.queries,
-            roots,
-            &shared.topk_membership_evidence_by_query_id,
-            &shared.exact_composition_costs,
-        )
-        .unwrap();
-        let plan = DeploymentPlanCompiler
-            .compile_promql(shared.clone(), env)
-            .unwrap();
-        assert_eq!(plan.precompute_plan.materializations.len(), 1);
-        let second = manifest(&plan, &shared.queries).unwrap();
-        let states = |m: &WorkloadCostManifest| {
-            m.components
-                .keys()
-                .filter(|key| key.starts_with("state:"))
-                .cloned()
-                .collect::<Vec<_>>()
-        };
-        assert_eq!(states(&first), states(&second));
-        assert!(second.components.len() > first.components.len());
-    }
-
-    #[test]
-    fn exact_alternative_does_not_require_unused_state_implementation_evidence() {
-        let (candidates, env, evidence) = quoted();
-        let mut exact = candidates[1].clone();
-        assert_eq!(
-            enumerate_exact_and_materialized_candidates(exact.clone())
-                .unwrap()
-                .len(),
-            1
-        );
-        exact.queries[0].window_realization_candidates.clear();
-        assert!(select_lowest_cost_candidate(vec![exact], env, &evidence).is_ok());
-    }
-
-    #[test]
-    fn altered_horizon_duplicate_and_invalid_costs_are_rejected() {
-        let (candidates, env, mut evidence) = quoted();
-        evidence
-            .quotes
-            .iter_mut()
-            .for_each(|quote| quote.manifest.horizon_seconds += 1.0);
-        assert!(select_lowest_cost_candidate(candidates.clone(), env.clone(), &evidence).is_err());
-        let (_, _, mut evidence) = quoted();
-        evidence.quotes.extend(evidence.quotes.clone());
-        assert!(select_lowest_cost_candidate(candidates.clone(), env.clone(), &evidence).is_err());
-        let (_, _, mut evidence) = quoted();
-        for quote in &mut evidence.quotes {
-            *quote.unit_costs.values_mut().next().unwrap() = -1.0;
-        }
-        assert!(select_lowest_cost_candidate(candidates, env, &evidence).is_err());
-    }
-}
diff --git a/control_plane/src/physical/workload_cost/materialization_candidates.rs b/control_plane/src/physical/workload_cost/materialization_candidates.rs
deleted file mode 100644
index 2344192f2..000000000
--- a/control_plane/src/physical/workload_cost/materialization_candidates.rs
+++ /dev/null
@@ -1,104 +0,0 @@
-//! Bounded physical implementation search; semantic leaf legality is established
-//! by the Planner-witness lowering before these stable keys are supplied.
-use std::collections::BTreeSet;
-
-#[derive(Debug)]
-pub(super) struct MaterializationCandidateSets {
-    pub candidate_key_sets: Vec<BTreeSet<String>>,
-    pub exhaustive: bool,
-    pub eligible_materialization_count: usize,
-}
-
-/// Enumerate every enabled_keys for up to four leaves. Larger forests retain all-materialized,
-/// all-exact, then singleton/complement pairs in stable key order. The caller must
-/// disclose bounded coverage; no unenumerated optimum is claimed. Reserve one
-/// of the selector's 64 candidate slots for native execution.
-pub(super) fn enumerate(keys: BTreeSet<String>) -> MaterializationCandidateSets {
-    let eligible_materialization_count = keys.len();
-    let ordered: Vec<_> = keys.iter().cloned().collect();
-    let exhaustive = eligible_materialization_count <= 4;
-    let mut candidate_key_sets = vec![keys.clone()];
-    if exhaustive {
-        for bits in 0..(1usize << eligible_materialization_count) {
-            let enabled_keys = ordered
-                .iter()
-                .enumerate()
-                .filter(|(i, _)| bits & (1 << i) != 0)
-                .map(|(_, key)| key.clone())
-                .collect();
-            if !candidate_key_sets.contains(&enabled_keys) {
-                candidate_key_sets.push(enabled_keys);
-            }
-        }
-    } else {
-        candidate_key_sets.push(BTreeSet::new());
-        for key in ordered {
-            for enabled_keys in [
-                BTreeSet::from([key.clone()]),
-                keys.difference(&BTreeSet::from([key])).cloned().collect(),
-            ] {
-                if candidate_key_sets.len() >= 63 {
-                    break;
-                }
-                if !candidate_key_sets.contains(&enabled_keys) {
-                    candidate_key_sets.push(enabled_keys);
-                }
-            }
-        }
-    }
-    MaterializationCandidateSets {
-        candidate_key_sets,
-        exhaustive,
-        eligible_materialization_count,
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    #[test]
-    fn small_forests_cover_every_mixed_path_once() {
-        let result = enumerate(BTreeSet::from(["a".into(), "b".into()]));
-        assert!(result.exhaustive);
-        assert_eq!(result.eligible_materialization_count, 2);
-        assert_eq!(result.candidate_key_sets.len(), 4);
-        assert_eq!(
-            result
-                .candidate_key_sets
-                .iter()
-                .collect::<BTreeSet<_>>()
-                .len(),
-            4
-        );
-        assert!(result
-            .candidate_key_sets
-            .contains(&BTreeSet::from(["a".into()])));
-        assert!(result
-            .candidate_key_sets
-            .contains(&BTreeSet::from(["b".into()])));
-    }
-    #[test]
-    fn large_inventory_reserves_native_slot_and_discloses_truncation() {
-        let keys = (0..100).map(|i| format!("{i:03}")).collect();
-        let result = enumerate(keys);
-        assert!(!result.exhaustive);
-        assert_eq!(result.candidate_key_sets.len(), 63);
-        assert_eq!(result.candidate_key_sets[0].len(), 100);
-        assert!(result.candidate_key_sets[1].is_empty());
-        assert_eq!(
-            result
-                .candidate_key_sets
-                .iter()
-                .collect::<BTreeSet<_>>()
-                .len(),
-            63
-        );
-    }
-    #[test]
-    fn no_materialization_has_one_exact_implementation() {
-        assert_eq!(
-            enumerate(BTreeSet::new()).candidate_key_sets,
-            vec![BTreeSet::new()]
-        );
-    }
-}
diff --git a/control_plane/src/physical/workload_cost/status.rs b/control_plane/src/physical/workload_cost/status.rs
deleted file mode 100644
index e73051e8a..000000000
--- a/control_plane/src/physical/workload_cost/status.rs
+++ /dev/null
@@ -1,124 +0,0 @@
-//! Typed candidate diagnostics with the existing string wire representation.
-use serde::{Deserialize, Serialize};
-
-#[derive(Debug, Clone, Default, Serialize, Deserialize, PartialEq, Eq)]
-#[serde(from = "String", into = "String")]
-pub enum CandidateEvaluationStatus {
-    #[default]
-    Unspecified,
-    CompilationFailed,
-    AwaitingQuote,
-    EvidenceMissing,
-    ProviderRejected,
-    EvidenceInvalid,
-    Unselected,
-    Selected,
-    /// Preserve diagnostics from other producer versions during migration.
-    Other(String),
-}
-
-impl CandidateEvaluationStatus {
-    pub fn as_str(&self) -> &str {
-        match self {
-            Self::Unspecified => "",
-            Self::CompilationFailed => "bind_failed",
-            Self::AwaitingQuote => "bound",
-            Self::EvidenceMissing => "evidence_missing",
-            Self::ProviderRejected => "rejected",
-            Self::EvidenceInvalid => "evidence_invalid",
-            Self::Unselected => "unselected",
-            Self::Selected => "selected",
-            Self::Other(value) => value,
-        }
-    }
-}
-
-impl From<String> for CandidateEvaluationStatus {
-    fn from(value: String) -> Self {
-        match value.as_str() {
-            "" => Self::Unspecified,
-            "bind_failed" => Self::CompilationFailed,
-            "bound" => Self::AwaitingQuote,
-            "evidence_missing" => Self::EvidenceMissing,
-            "rejected" => Self::ProviderRejected,
-            "evidence_invalid" => Self::EvidenceInvalid,
-            "unselected" => Self::Unselected,
-            "selected" => Self::Selected,
-            _ => Self::Other(value),
-        }
-    }
-}
-
-impl From<CandidateEvaluationStatus> for String {
-    fn from(value: CandidateEvaluationStatus) -> Self {
-        value.as_str().to_owned()
-    }
-}
-
-// Preserve the existing report text, including historical terminology, on the
-// wire. The typed variant describes the actual scope for new Rust consumers.
-const MATERIALIZATION_SEARCH_SCOPE: &str = "Backend materialization versus Prometheus exact-subquery masks over Planner-authorized leaves; native alternative separate; bounded inventory does not claim an unenumerated optimum";
-
-#[derive(Debug, Clone, Serialize, Deserialize, PartialEq, Eq)]
-#[serde(from = "String", into = "String")]
-pub enum CandidateSearchScope {
-    PlannerAuthorizedMaterializations,
-    Other(String),
-}
-
-impl From<String> for CandidateSearchScope {
-    fn from(value: String) -> Self {
-        if value == MATERIALIZATION_SEARCH_SCOPE {
-            Self::PlannerAuthorizedMaterializations
-        } else {
-            Self::Other(value)
-        }
-    }
-}
-
-impl From<CandidateSearchScope> for String {
-    fn from(value: CandidateSearchScope) -> Self {
-        match value {
-            CandidateSearchScope::PlannerAuthorizedMaterializations => {
-                MATERIALIZATION_SEARCH_SCOPE.to_owned()
-            }
-            CandidateSearchScope::Other(value) => value,
-        }
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    /// Renaming diagnostic variants does not change known or future wire values.
-    #[test]
-    fn status_wire_values_round_trip() {
-        for value in [
-            "",
-            "bind_failed",
-            "bound",
-            "evidence_missing",
-            "rejected",
-            "evidence_invalid",
-            "unselected",
-            "selected",
-            "future_status",
-        ] {
-            let status: CandidateEvaluationStatus =
-                serde_json::from_value(serde_json::json!(value)).unwrap();
-            assert_eq!(status.as_str(), value);
-            assert_eq!(serde_json::to_value(status).unwrap(), value);
-        }
-    }
-
-    /// Old search descriptions retain their exact serialized representation.
-    #[test]
-    fn scope_wire_values_round_trip() {
-        for value in [MATERIALIZATION_SEARCH_SCOPE, "future_scope"] {
-            let scope: CandidateSearchScope =
-                serde_json::from_value(serde_json::json!(value)).unwrap();
-            assert_eq!(serde_json::to_value(scope).unwrap(), value);
-        }
-    }
-}
diff --git a/control_plane/src/planner_selection.rs b/control_plane/src/planner_selection.rs
deleted file mode 100644
index 81ead342b..000000000
--- a/control_plane/src/planner_selection.rs
+++ /dev/null
@@ -1,932 +0,0 @@
-//! Deployment-owned selection at the latest ASAPPlanner boundary.
-//!
-//! ASAPPlanner enumerates a ranked candidate space and deliberately does not
-//! commit to one deployment plan.  The backend owns that decision because it
-//! also owns placement, runtime capabilities, and the physical wire contract.
-
-use std::rc::Rc;
-
-use crate::physical::post_asap::cost_model::ControlPlaneCostModel;
-use crate::types::AccuracyTarget;
-use asap_aware_mapping::{
-    AccuracyEvidenceProvider, AccuracyModel, CostModel, Replacement, ReplacementStrategy,
-    SketchAlgorithmStrategy, TargetSubDAG,
-};
-use planner_types::post_asap::{
-    SummaryExpr, SummaryFamilyType, SummaryField, SummaryNode, SummarySchema,
-};
-use planner_types::pre_asap::{agg_accuracy as planner_agg_accuracy, AggIntent};
-use planner_types::pre_asap::{QueryExpr, QueryExprError};
-use thiserror::Error;
-
-#[derive(Debug, Error)]
-pub enum SelectionError {
-    #[error("ASAPPlanner workload materialization failed: {0}")]
-    Workload(String),
-    #[error("failed to derive the pre-ASAP schema: {0}")]
-    Schema(#[from] QueryExprError),
-    #[error("ASAPPlanner produced no legal summary candidate for the target")]
-    NoLegalCandidate,
-    #[error("ASAPPlanner sketch strategy produced a logical rewrite instead of a summary")]
-    UnexpectedRewrite,
-}
-
-/// Versioned diagnostic identity over existing canonical IR, never Rc or rank IDs.
-/// Evidence/activation generations are reported separately from semantic identity.
-pub(crate) fn explain_identity(kind: &str, value: &impl serde::Serialize) -> String {
-    use sha2::{Digest, Sha256};
-    fn canonical(value: serde_json::Value) -> serde_json::Value {
-        match value {
-            serde_json::Value::Object(fields) => {
-                let sorted: std::collections::BTreeMap<_, _> = fields
-                    .into_iter()
-                    .map(|(key, value)| (key, canonical(value)))
-                    .collect();
-                serde_json::Value::Object(sorted.into_iter().collect())
-            }
-            serde_json::Value::Array(values) => {
-                serde_json::Value::Array(values.into_iter().map(canonical).collect())
-            }
-            value => value,
-        }
-    }
-    let value = canonical(serde_json::to_value(value).expect("canonical IR serializes"));
-    let bytes = serde_json::to_vec(&serde_json::json!({"kind": kind,
-        "planner_revision": crate::physical::compiler::PLANNER_REVISION, "value": value}))
-    .expect("JSON serializes");
-    format!("asap-explain-v1:{kind}:{:x}", Sha256::digest(bytes))
-}
-
-// serde_json maps non-finite floats to null. A lossy encoding must never
-// become a semantic identity, even when the runtime keeps an exact fallback.
-fn lossless_json<T: serde::Serialize + serde::de::DeserializeOwned + PartialEq>(
-    value: &T,
-) -> Option<serde_json::Value> {
-    let encoded = serde_json::to_value(value).ok()?;
-    let restored: T = serde_json::from_value(encoded.clone()).ok()?;
-    (restored == *value).then_some(encoded)
-}
-
-fn target_identity(target: &QueryExpr, accuracy: &AccuracyTarget) -> Option<String> {
-    Some(explain_identity(
-        "target",
-        &(lossless_json(target)?, lossless_json(accuracy)?),
-    ))
-}
-
-fn summary_identity(node: &SummaryNode) -> Option<String> {
-    // Canonical exporter owns operator payloads and edge semantics. Hash its
-    // structure, not assigned node IDs or the incidental sharing of Rc values.
-    let dag = planner_types::post_asap::compile_executable_dag(&Rc::new(node.clone())).ok()?;
-    lossless_json(&dag)?;
-    fn visit(
-        dag: &planner_types::post_asap::ExecutableDag,
-        id: planner_types::post_asap::PostAsapNodeId,
-        memo: &mut std::collections::HashMap<planner_types::post_asap::PostAsapNodeId, String>,
-    ) -> String {
-        if let Some(hash) = memo.get(&id) {
-            return hash.clone();
-        }
-        let node = dag
-            .nodes
-            .iter()
-            .find(|node| node.id == id)
-            .expect("exported node exists");
-        let mut inputs = dag.edges.iter().filter(|edge| edge.consumer == id).map(|edge| {
-            let child = visit(dag, edge.producer, memo);
-            serde_json::json!({"child": child, "role": edge.role, "schema": edge.intermediate_schema,
-                "state": edge.data_state, "grouping": edge.grouping, "window": edge.window})
-        }).collect::<Vec<_>>();
-        inputs.sort_by_cached_key(|input| input.to_string());
-        let hash = explain_identity(
-            "summary_node",
-            &serde_json::json!({
-            "payload": node.payload, "state": node.output_state,
-            "schema": node.output_schema, "guarantee": node.guarantee, "inputs": inputs}),
-        );
-        memo.insert(id, hash.clone());
-        hash
-    }
-    Some(visit(&dag, dag.root, &mut std::collections::HashMap::new()))
-}
-
-pub(crate) fn explained_root_id(node: &SummaryNode, accuracy: &AccuracyTarget) -> Option<String> {
-    Some(explain_identity(
-        "root",
-        &(summary_identity(node)?, lossless_json(accuracy)?),
-    ))
-}
-
-fn replacement_identity(
-    target: &QueryExpr,
-    replacement: &Replacement,
-    accuracy: &AccuracyTarget,
-) -> Option<String> {
-    let target = lossless_json(target)?;
-    let accuracy = lossless_json(accuracy)?;
-    let value = match replacement {
-        Replacement::Summary(node) => serde_json::json!({"summary": summary_identity(node)?}),
-        Replacement::Rewrite(node) => serde_json::json!({"rewrite": lossless_json(node.as_ref())?}),
-        Replacement::ExactComposition(composition) => serde_json::json!({
-            "exact_composition": {"placement": format!("{:?}", composition.placement),
-                "operation": lossless_json(&composition.op)?, "child": lossless_json(composition.child_target.as_ref())?, "schema": lossless_json(&composition.schema)?}}),
-    };
-    Some(explain_identity("candidate", &(target, accuracy, value)))
-}
-
-/// Deployment extension tag for keyed point-frequency queries. ASAPPlanner
-/// intentionally treats extension payloads as opaque; this adapter is the one
-/// backend-owned interpretation point.
-pub(crate) const FREQUENCY_EXT_KIND: &str = "frequency";
-
-pub fn frequency(accuracy: AccuracyTarget, item: Option<(String, String)>) -> AggIntent {
-    let mut payload = serde_json::json!({ "accuracy": accuracy });
-    if let Some((label, value)) = item {
-        payload["item_label"] = serde_json::Value::String(label);
-        payload["item_value"] = serde_json::Value::String(value);
-    }
-    AggIntent::Extension {
-        ext_kind: FREQUENCY_EXT_KIND.to_string(),
-        payload,
-    }
-}
-
-pub fn default_frequency() -> AggIntent {
-    frequency(AccuracyTarget::Epsilon(std::f64::consts::E / 2000.0), None)
-}
-
-pub fn as_frequency(intent: &AggIntent) -> Option<AccuracyTarget> {
-    match intent {
-        AggIntent::Extension { ext_kind, payload } if ext_kind == FREQUENCY_EXT_KIND => {
-            serde_json::from_value(payload.get("accuracy")?.clone()).ok()
-        }
-        _ => None,
-    }
-}
-
-pub fn agg_accuracy(intent: &AggIntent) -> f64 {
-    match as_frequency(intent) {
-        Some(AccuracyTarget::Exact) => 0.0,
-        Some(AccuracyTarget::Epsilon(epsilon))
-        | Some(AccuracyTarget::EpsilonDelta { epsilon, .. }) => epsilon,
-        None => planner_agg_accuracy(intent),
-    }
-}
-
-pub fn archive_only(intent: &AggIntent) -> bool {
-    if as_frequency(intent).is_some() {
-        return false;
-    }
-    matches!(
-        intent,
-        AggIntent::Absent
-            | AggIntent::AbsentOverTime
-            | AggIntent::PresentOverTime
-            | AggIntent::Delta
-            | AggIntent::Deriv
-            | AggIntent::PredictLinear { .. }
-            | AggIntent::DoubleExpSmoothing { .. }
-            | AggIntent::IDelta
-            | AggIntent::Resets
-            | AggIntent::Changes
-            | AggIntent::HistogramCount
-            | AggIntent::HistogramSum
-            | AggIntent::HistogramAvg
-            | AggIntent::HistogramStdDev
-            | AggIntent::HistogramStdVar
-            | AggIntent::HistogramFraction { .. }
-            | AggIntent::HistogramQuantile { .. }
-            | AggIntent::Math(_)
-            | AggIntent::TimeFn(_)
-            | AggIntent::Group
-            | AggIntent::CountValues { .. }
-            | AggIntent::LastOverTime
-            | AggIntent::FirstOverTime
-            | AggIntent::MadOverTime
-            | AggIntent::TsOfMinOverTime
-            | AggIntent::TsOfMaxOverTime
-            | AggIntent::TsOfFirstOverTime
-            | AggIntent::TsOfLastOverTime
-            | AggIntent::Extension { .. }
-    )
-}
-
-/// Preserve an unsupported subtree explicitly at the post-ASAP boundary.
-pub fn keep_pre_asap(expr: &QueryExpr) -> Result<Rc<SummaryNode>, SelectionError> {
-    let schema = expr.output_schema()?;
-    Ok(Rc::new(SummaryNode {
-        expr: SummaryExpr::KeepPreAsap(Rc::new(expr.clone())),
-        schema: SummarySchema {
-            fields: schema
-                .columns
-                .into_iter()
-                .map(|column| SummaryField {
-                    name: column.name,
-                    dtype: SummaryFamilyType::Plain(column.dtype),
-                    nullable: column.nullable,
-                })
-                .collect(),
-            time_index: schema.time_index,
-        },
-        guarantee: None,
-    }))
-}
-
-/// Select a complete query through the same costed Planner search as workloads.
-/// Per-operator requirements remain in the canonical expression.
-pub fn select_query(
-    expr: &QueryExpr,
-    cost_model: &dyn CostModel,
-) -> Result<Rc<SummaryNode>, SelectionError> {
-    select_query_with_models(
-        expr,
-        cost_model,
-        &asap_aware_mapping::DefaultAccuracyModel,
-        &asap_aware_mapping::NoAccuracyEvidence,
-    )
-}
-
-#[cfg(test)]
-pub(crate) fn plan_test_query(expr: &QueryExpr) -> Result<Rc<SummaryNode>, SelectionError> {
-    select_query(
-        expr,
-        &ControlPlaneCostModel::new(AccuracyTarget::Epsilon(0.01)),
-    )
-}
-
-#[cfg(test)]
-/// Search a same-requirement workload cohort through Planner's canonical CSE
-/// and replacement inventory. Physical implementation compatibility is checked
-/// later, before publication; this function never assigns runtime identities.
-pub fn select_workload(
-    roots: Vec<(usize, Rc<QueryExpr>)>,
-    accuracy: AccuracyTarget,
-    cost_model: &dyn CostModel,
-) -> Result<Vec<(usize, Rc<SummaryNode>)>, SelectionError> {
-    select_workload_with_evidence(
-        roots,
-        accuracy,
-        cost_model,
-        &asap_aware_mapping::NoAccuracyEvidence,
-    )
-}
-
-#[cfg(test)]
-/// The entire cohort uses the same scoped accuracy certificate; callers must
-/// not spread one query's evidence to unrelated workload roots.
-pub fn select_workload_with_evidence(
-    roots: Vec<(usize, Rc<QueryExpr>)>,
-    accuracy: AccuracyTarget,
-    cost_model: &dyn CostModel,
-    evidence: &dyn AccuracyEvidenceProvider,
-) -> Result<Vec<(usize, Rc<SummaryNode>)>, SelectionError> {
-    select_workload_with_accuracy_model(
-        roots,
-        accuracy,
-        cost_model,
-        evidence,
-        &asap_aware_mapping::DefaultAccuracyModel,
-    )
-}
-
-#[cfg(test)]
-/// Keep replacement legality and workload-root validation on the same model.
-pub fn select_workload_with_accuracy_model(
-    roots: Vec<(usize, Rc<QueryExpr>)>,
-    accuracy: AccuracyTarget,
-    cost_model: &dyn CostModel,
-    evidence: &dyn AccuracyEvidenceProvider,
-    accuracy_model: &dyn AccuracyModel,
-) -> Result<Vec<(usize, Rc<SummaryNode>)>, SelectionError> {
-    select_workload_impl(
-        roots,
-        accuracy,
-        cost_model,
-        evidence,
-        accuracy_model,
-        None,
-        None,
-    )
-}
-
-/// Return the candidate ranking and committed choices from the same search
-/// that produces the installed roots. Missing numeric costs remain explicit.
-pub fn select_workload_with_accuracy_model_and_trace(
-    roots: Vec<(usize, Rc<QueryExpr>)>,
-    accuracy: AccuracyTarget,
-    cost_model: &ControlPlaneCostModel,
-    evidence: &dyn AccuracyEvidenceProvider,
-    accuracy_model: &dyn AccuracyModel,
-) -> Result<(Vec<(usize, Rc<SummaryNode>)>, serde_json::Value), SelectionError> {
-    let mut trace = serde_json::Value::Null;
-    let selected = select_workload_impl(
-        roots,
-        accuracy,
-        cost_model,
-        evidence,
-        accuracy_model,
-        Some(&mut trace),
-        Some(cost_model),
-    )?;
-    Ok((selected, trace))
-}
-
-/// The [`ReplacementStrategy`] set this deployment registers, carrying its own
-/// cost and accuracy models. This is deliberately not Planner's
-/// `default_strategies_with`: two of the strategies that list would give us are
-/// excluded below, for two unrelated reasons.
-///
-/// The three workload-dependent strategies — `RollupStrategy`,
-/// `AccuracyReconciliationStrategy` and `TopKLimitReuseStrategy` — are
-/// deliberately absent and must stay absent: they are constructed from the
-/// post-CSE sibling set, which only `search_cse_workload_with` owns, so
-/// `search_workload_with_targets` registers them itself against every
-/// discovered target. Adding them here would ask each target with an empty
-/// sibling list and report nothing.
-///
-/// `SharedSubtreeStrategy` is withheld for a reason the pinned Planner has to
-/// fix first, not as a cost policy this deployment could express. Both of its
-/// arms are `Replacement::Rewrite`s of the target itself, and `rank_group`
-/// ranks that pair (its "Shape 1") ahead of every `Replacement::Summary` in
-/// the same group and returns before the sketch-family ranking runs. The
-/// winning rewrite then materializes as `KeepPreAsap`, so registering the
-/// strategy silently downgrades every shared aggregate from its selected
-/// sketch to raw execution — `shared_aggregates_keep_their_summary` pins
-/// exactly that. Sharing must decide how many copies of the summary state
-/// exist, never whether the state is a summary at all; until Planner can
-/// carry the selected summary through the share rewrite, canonical CSE
-/// inside `search_workload_with_targets` already shares these subtrees
-/// structurally and correctly.
-fn replacement_strategies<'a>(
-    cost_model: &'a dyn CostModel,
-    evidence: &'a dyn AccuracyEvidenceProvider,
-    accuracy_model: &'a dyn AccuracyModel,
-) -> Vec<Box<dyn ReplacementStrategy + 'a>> {
-    vec![
-        Box::new(
-            SketchAlgorithmStrategy::new_with_planning_inputs_and_evidence(
-                cost_model,
-                accuracy_model,
-                &asap_aware_mapping::EqualSplitAllocator,
-                evidence,
-            ),
-        ),
-        Box::new(
-            asap_aware_mapping::HydraGroupingStrategy::new_with_planning_inputs_and_evidence(
-                cost_model,
-                accuracy_model,
-                &asap_aware_mapping::EqualSplitAllocator,
-                evidence,
-            ),
-        ),
-        Box::new(asap_aware_mapping::ExactCompositionStrategy::new(
-            cost_model,
-        )),
-        Box::new(asap_aware_mapping::SemanticEquivalentRewriteStrategy),
-    ]
-}
-
-fn select_workload_impl(
-    roots: Vec<(usize, Rc<QueryExpr>)>,
-    accuracy: AccuracyTarget,
-    cost_model: &dyn CostModel,
-    evidence: &dyn AccuracyEvidenceProvider,
-    accuracy_model: &dyn AccuracyModel,
-    mut trace: Option<&mut serde_json::Value>,
-    backend_cost_model: Option<&ControlPlaneCostModel>,
-) -> Result<Vec<(usize, Rc<SummaryNode>)>, SelectionError> {
-    let strategies = replacement_strategies(cost_model, evidence, accuracy_model);
-    let space = asap_aware_mapping::search_workload_with_targets(
-        roots
-            .into_iter()
-            .map(|(id, root)| (id, root, Some(accuracy.clone())))
-            .collect(),
-        &strategies,
-        accuracy_model,
-    );
-    let selection = space.global_selection(cost_model);
-    if let Some(trace) = trace.as_deref_mut() {
-        let groups = space.cost_sorted(cost_model).iter().enumerate().map(|(index, group)| {
-            let chosen = selection.target_selections().find(|selected| Rc::ptr_eq(selected.target, group.target))
-                .and_then(|selected| selected.chosen);
-            let target = TargetSubDAG::with_consumer_count(group.target, group.consumer_count);
-            let candidates = group.candidates.iter().enumerate()
-                .map(|(rank, candidate)| {
-                    let candidate_cost = cost_model.candidate_cost(candidate, &target);
-                    let accuracy_status = if candidate.has_missing_accuracy_evidence() {
-                        "unknown"
-                    } else {
-                        "known"
-                    };
-                    let runtime_support_status = match candidate.runtime_support_evidence(cost_model) {
-                        Some(true) => "supported",
-                        Some(false) => "unsupported",
-                        None => "unknown_pending_backend_binding",
-                    };
-                    let decision_reason = if candidate.has_missing_accuracy_evidence() {
-                        "missing_accuracy_evidence"
-                    } else if candidate.runtime_support_evidence(cost_model) == Some(false) {
-                        "unsupported_runtime_operation"
-                    } else if chosen.is_some_and(|chosen| std::ptr::eq(chosen, *candidate)) {
-                        "planner_selected_pending_backend_binding"
-                    } else if candidate_cost.is_none() {
-                        "missing_comparable_cost"
-                    } else {
-                        "not_selected_by_planner"
-                    };
-                    let guarantee = match &candidate.replacement {
-                        Replacement::Summary(node) => node.guarantee.as_ref(),
-                        _ => None,
-                    };
-                    serde_json::json!({
-                    "rank": rank,
-                    "candidate_id": replacement_identity(group.target, &candidate.replacement, &accuracy),
-                    "status": if chosen.is_some_and(|chosen| std::ptr::eq(chosen, *candidate)) { "selected" } else { "unselected" },
-                    "strategy": candidate.strategy,
-                    "provenance": format!("{:?}", candidate.provenance),
-                    "rationale": candidate.rationale,
-                    "replacement_kind": match &candidate.replacement {
-                        Replacement::Summary(_) => "summary",
-                        Replacement::Rewrite(_) => "rewrite",
-                        Replacement::ExactComposition(_) => "exact_composition",
-                    },
-                    "accuracy_status": accuracy_status,
-                    "guarantee": guarantee,
-                    "runtime_support_status": runtime_support_status,
-                    "decision_reason": decision_reason,
-                    "estimated_cost": candidate_cost.map(|cost| cost.0),
-                    "estimated_cost_status": if candidate_cost.is_some() { "available" } else { "unavailable" },
-                    "cost_estimate": backend_cost_model.and_then(|model| model.candidate_cost_estimate(candidate)),
-                    "selected": chosen.is_some_and(|chosen| std::ptr::eq(chosen, *candidate)),
-                })}).collect::<Vec<_>>();
-            let rejected = space.target_subdag_candidates().find(|memo| Rc::ptr_eq(&memo.target, group.target))
-                .into_iter().flat_map(|memo| &memo.rejected).map(|candidate| serde_json::json!({
-                    "status": "rejected", "strategy": candidate.strategy,
-                    "description": candidate.description, "reason": candidate.error.to_string()
-                })).collect::<Vec<_>>();
-            serde_json::json!({ "group_id": index,
-                "target_id": target_identity(group.target, &accuracy),
-                "consumer_count": group.consumer_count, "candidates": candidates, "rejected": rejected })
-        }).collect::<Vec<_>>();
-        *trace = serde_json::json!({ "schema_version": 1, "group_id_scope": "this_selection", "groups": groups });
-    }
-    let roots = space
-        .roots
-        .iter()
-        .map(|(id, root)| {
-            selection
-                .assemble_selected_query(root)
-                .map_err(|error| SelectionError::Workload(error.to_string()))?
-                .map(|node| (*id, node))
-                .ok_or_else(|| SelectionError::Workload(format!("missing query root {id}")))
-        })
-        .collect::<Result<Vec<_>, _>>()?;
-    let roots = planner_types::post_asap::share_common_summary_subtrees(roots);
-    if let Some(trace) = trace {
-        trace["roots"] = serde_json::json!(roots
-            .iter()
-            .map(|(id, node)| serde_json::json!({
-                "query_index": id, "logical_root_id": explained_root_id(node, &accuracy)
-            }))
-            .collect::<Vec<_>>());
-    }
-    Ok(roots)
-}
-
-/// Evidence and accuracy hooks feed canonical global selection; enumeration
-/// order never authorizes a query plan.
-pub fn select_query_with_models(
-    expr: &QueryExpr,
-    cost_model: &dyn CostModel,
-    accuracy_model: &dyn AccuracyModel,
-    evidence: &dyn AccuracyEvidenceProvider,
-) -> Result<Rc<SummaryNode>, SelectionError> {
-    let strategies = replacement_strategies(cost_model, evidence, accuracy_model);
-    let space = asap_aware_mapping::search_workload_with_targets(
-        vec![(0, Rc::new(expr.clone()), None)],
-        &strategies,
-        accuracy_model,
-    );
-    space
-        .global_selection(cost_model)
-        .assemble_selected_query(&space.roots[0].1)
-        .map_err(|error| SelectionError::Workload(error.to_string()))?
-        .ok_or(SelectionError::NoLegalCandidate)
-}
-
-#[cfg(test)]
-mod workload_tests {
-    use super::*;
-    use crate::physical::post_asap::cost_model::ControlPlaneCostModel;
-
-    fn plan(queries: &[&str], accuracy: AccuracyTarget) -> Vec<(usize, Rc<SummaryNode>)> {
-        let roots = queries
-            .iter()
-            .enumerate()
-            .map(|(index, query)| {
-                (
-                    index,
-                    Rc::new(
-                        crate::query_parser::parse_query_expr_canonical(query, accuracy.clone())
-                            .unwrap(),
-                    ),
-                )
-            })
-            .collect();
-        select_workload(
-            roots,
-            accuracy.clone(),
-            &ControlPlaneCostModel::new(accuracy),
-        )
-        .unwrap()
-    }
-
-    // Allocation identities and ranking ordinals are not semantic candidate identities.
-    #[test]
-    fn explain_candidate_ids_survive_reparse_and_preserve_accuracy() {
-        fn trace(accuracy: AccuracyTarget) -> serde_json::Value {
-            let root = crate::query_parser::parse_query_expr_canonical(
-                "quantile_over_time(0.9, m[1m])",
-                accuracy.clone(),
-            )
-            .unwrap();
-            select_workload_with_accuracy_model_and_trace(
-                vec![(0, Rc::new(root))],
-                accuracy.clone(),
-                &ControlPlaneCostModel::new(accuracy),
-                &asap_aware_mapping::NoAccuracyEvidence,
-                &asap_aware_mapping::DefaultAccuracyModel,
-            )
-            .unwrap()
-            .1
-        }
-        let a = trace(AccuracyTarget::Epsilon(0.05));
-        let b = trace(AccuracyTarget::Epsilon(0.05));
-        assert_eq!(a, b);
-        assert!(a["groups"]
-            .as_array()
-            .unwrap()
-            .iter()
-            .flat_map(|group| group["candidates"].as_array().unwrap())
-            .any(|candidate| candidate["candidate_id"].is_string()));
-        assert_ne!(
-            a["roots"][0]["logical_root_id"],
-            trace(AccuracyTarget::Epsilon(0.1))["roots"][0]["logical_root_id"]
-        );
-    }
-
-    /// Explain availability from the candidate-cost API, even if a display
-    /// estimate exists, and never label an unknown guarantee as selected.
-    #[test]
-    fn explain_keeps_uncertified_and_uncosted_candidates_explicit() {
-        struct Uncosted;
-        impl CostModel for Uncosted {
-            fn rank_candidates(
-                &self,
-                _intent: &AggIntent,
-                candidates: &[planner_types::post_asap::SketchAlgorithm],
-            ) -> Vec<planner_types::post_asap::SketchAlgorithm> {
-                candidates.to_vec()
-            }
-
-            fn candidate_cost(
-                &self,
-                _candidate: &asap_aware_mapping::ReplacementSubDAG,
-                _target: &TargetSubDAG<'_>,
-            ) -> Option<asap_aware_mapping::cost_model::Cost> {
-                None
-            }
-        }
-
-        let accuracy = AccuracyTarget::Epsilon(0.05);
-        let root = crate::query_parser::parse_query_expr_canonical(
-            "quantile_over_time(0.9,m[1m]) / quantile_over_time(0.5,m[1m])",
-            accuracy.clone(),
-        )
-        .unwrap();
-        let mut trace = serde_json::Value::Null;
-        select_workload_impl(
-            vec![(0, Rc::new(root))],
-            accuracy,
-            &Uncosted,
-            &asap_aware_mapping::NoAccuracyEvidence,
-            &asap_aware_mapping::DefaultAccuracyModel,
-            Some(&mut trace),
-            None,
-        )
-        .unwrap();
-        let candidates = trace["groups"]
-            .as_array()
-            .unwrap()
-            .iter()
-            .flat_map(|group| group["candidates"].as_array().unwrap());
-        let mut saw_unknown = false;
-        for candidate in candidates {
-            assert_eq!(candidate["estimated_cost_status"], "unavailable");
-            assert!(candidate["estimated_cost"].is_null());
-            if candidate["accuracy_status"] == "unknown" {
-                saw_unknown = true;
-                assert_eq!(candidate["selected"], false);
-            }
-        }
-        assert!(saw_unknown);
-    }
-
-    // JSON must not alias NaN and infinity through its null representation.
-    #[test]
-    fn explain_nonfinite_identity_is_unavailable() {
-        for value in [f64::NAN, f64::INFINITY, f64::NEG_INFINITY] {
-            let root = QueryExpr::Literal(planner_types::pre_asap::ScalarValue::Float64(value));
-            assert!(replacement_identity(
-                &root,
-                &Replacement::Rewrite(Rc::new(root.clone())),
-                &AccuracyTarget::Exact
-            )
-            .is_none());
-        }
-    }
-
-    // Hashing excludes incidental allocation sharing but retains operand roles.
-    #[test]
-    fn explain_summary_identity_preserves_roles_and_ignores_rc_sharing() {
-        let root = plan(
-            &["sum_over_time(m[1m]) - sum_over_time(n[1m])"],
-            AccuracyTarget::Exact,
-        )[0]
-        .1
-        .clone();
-        let id = summary_identity(&root).expect("canonical binary exports");
-        let mut reversed = (*root).clone();
-        let SummaryExpr::BinaryOp { lhs, rhs, .. } = &mut reversed.expr else {
-            panic!("binary expected")
-        };
-        std::mem::swap(lhs, rhs);
-        assert_ne!(Some(id), summary_identity(&reversed));
-        let root = plan(
-            &["sum_over_time(m[1m]) + sum_over_time(m[1m])"],
-            AccuracyTarget::Exact,
-        )[0]
-        .1
-        .clone();
-        let id = summary_identity(&root).expect("canonical shared binary exports");
-        let mut unshared = (*root).clone();
-        let SummaryExpr::BinaryOp { rhs, .. } = &mut unshared.expr else {
-            panic!("binary expected")
-        };
-        *rhs = Rc::new((**rhs).clone());
-        assert_eq!(Some(id), summary_identity(&unshared));
-    }
-
-    // Distinct quantile roots retain their readouts while sharing one selected sketch.
-    #[test]
-    fn quantile_roots_share_selected_producer() {
-        let roots = plan(
-            &[
-                "quantile_over_time(0.90, m[1m])",
-                "quantile_over_time(0.99, m[1m])",
-            ],
-            AccuracyTarget::EpsilonDelta {
-                epsilon: 0.01,
-                delta: 0.01,
-            },
-        );
-        let SummaryExpr::SummaryEstimate {
-            summary_input: first,
-            query: q1,
-        } = &roots[0].1.expr
-        else {
-            panic!("{:?}", roots[0].1)
-        };
-        let SummaryExpr::SummaryEstimate {
-            summary_input: second,
-            query: q2,
-        } = &roots[1].1.expr
-        else {
-            panic!("{:?}", roots[1].1)
-        };
-        assert!(Rc::ptr_eq(first, second));
-        assert_ne!(q1, q2);
-    }
-
-    // Sharing must not collapse different source or logical-window requirements.
-    #[test]
-    fn distinct_windows_and_sources_do_not_share() {
-        let roots = plan(
-            &[
-                "sum_over_time(m[1m])",
-                "sum_over_time(m[2m])",
-                "sum_over_time(n[1m])",
-            ],
-            AccuracyTarget::Exact,
-        );
-        assert!(!Rc::ptr_eq(&roots[0].1, &roots[1].1));
-        assert!(!Rc::ptr_eq(&roots[0].1, &roots[2].1));
-    }
-
-    // Arithmetic keeps its exact operands visible and reuses the standalone sum.
-    #[test]
-    fn weighted_mean_retains_shared_sum_operand() {
-        let roots = plan(
-            &[
-                "sum_over_time(m[1m])",
-                "sum_over_time(m[1m]) / count_over_time(m[1m])",
-            ],
-            AccuracyTarget::Exact,
-        );
-        let SummaryExpr::BinaryOp { lhs, .. } = &roots[1].1.expr else {
-            panic!("{:?}", roots[1].1)
-        };
-        let shared = match &lhs.expr {
-            SummaryExpr::ValueOperation {
-                child,
-                operation: planner_types::post_asap::ValueOperation::FinalizeExactAccumulator,
-                ..
-            } => child,
-            _ => lhs,
-        };
-        let SummaryExpr::ValueOperation {
-            child: standalone,
-            operation: planner_types::post_asap::ValueOperation::FinalizeExactAccumulator,
-            ..
-        } = &roots[0].1.expr
-        else {
-            panic!("standalone query must finalize its shared state")
-        };
-        assert!(Rc::ptr_eq(standalone, shared));
-    }
-
-    // The registered set is exactly the four strategies this deployment
-    // supports, in discovery order — which is also the tie-break order
-    // `rank_group` falls back to. Both exclusions are load-bearing:
-    // `SharedSubtreeStrategy` would downgrade shared aggregates to raw
-    // execution (see `shared_aggregates_keep_their_summary`), and the
-    // workload-dependent three are already registered by
-    // `search_cse_workload_with`, which alone owns their sibling set.
-    #[test]
-    fn registered_strategies_are_exactly_the_supported_set() {
-        let accuracy = AccuracyTarget::Epsilon(0.01);
-        let cost_model = ControlPlaneCostModel::new(accuracy);
-        let names: Vec<&str> = replacement_strategies(
-            &cost_model,
-            &asap_aware_mapping::NoAccuracyEvidence,
-            &asap_aware_mapping::DefaultAccuracyModel,
-        )
-        .iter()
-        .map(|strategy| strategy.name())
-        .collect();
-        assert_eq!(
-            names,
-            [
-                "SketchAlgorithmStrategy",
-                "HydraGroupingStrategy",
-                "ExactCompositionStrategy",
-                "SemanticEquivalentRewriteStrategy",
-            ]
-        );
-    }
-
-    // Missing shared-grid evidence keeps Hydra candidates visible but
-    // uncertified. Supplying a certificate makes them eligible for selection.
-    #[test]
-    fn hydra_candidates_remain_visible_without_shared_grid_evidence() {
-        use asap_aware_mapping::{AccuracyEvidenceProvider, PropagationStats};
-        use planner_types::post_asap::{CompositionOperator, SketchQuery};
-        use planner_types::pre_asap::query_expr::Source;
-        use planner_types::pre_asap::{Column, DataType, GroupKeys, Reduction, Schema};
-
-        struct MeasuredSharedGrid;
-        impl AccuracyEvidenceProvider for MeasuredSharedGrid {
-            fn propagation_stats(
-                &self,
-                _op: &CompositionOperator,
-                _family: &SummaryFamilyType,
-                _query: Option<&SketchQuery>,
-            ) -> PropagationStats {
-                PropagationStats {
-                    hydra_shared_grid_collision_bound: Some(0.0),
-                    hydra_shared_grid_failure_probability: Some(0.0),
-                    ..Default::default()
-                }
-            }
-        }
-
-        let accuracy = AccuracyTarget::EpsilonDelta {
-            epsilon: 0.01,
-            delta: 0.01,
-        };
-        let grouped_count = Rc::new(QueryExpr::Aggregate {
-            reduction: Reduction::Reduce(GroupKeys::by(vec![2])),
-            measures: vec![AggIntent::Count {
-                accuracy: accuracy.clone(),
-            }],
-            output_names: vec![],
-            having: None,
-            child: Rc::new(QueryExpr::Scan {
-                source: Source::TimeSeries { metric: "m".into() },
-                predicates: vec![],
-                schema: Schema::with_time_index(
-                    vec![
-                        Column::new("ts", DataType::Timestamp, false),
-                        Column::new("value", DataType::Float64, false),
-                        Column::new("job", DataType::Utf8, true),
-                    ],
-                    0,
-                    vec![],
-                ),
-            }),
-        });
-        let cost_model = ControlPlaneCostModel::new(accuracy);
-        let target = TargetSubDAG::new(&grouped_count);
-        let hydra = |evidence: &dyn AccuracyEvidenceProvider| {
-            asap_aware_mapping::HydraGroupingStrategy::new_with_planning_inputs_and_evidence(
-                &cost_model,
-                &asap_aware_mapping::DefaultAccuracyModel,
-                &asap_aware_mapping::EqualSplitAllocator,
-                evidence,
-            )
-            .replacements(&target)
-        };
-        let unknown = hydra(&asap_aware_mapping::NoAccuracyEvidence);
-        assert_eq!(unknown.len(), 2);
-        assert!(unknown
-            .iter()
-            .all(|candidate| candidate.has_missing_accuracy_evidence()));
-        // HydraCms over Cms and HydraCountSketch over CountSketch.
-        let certified = hydra(&MeasuredSharedGrid);
-        assert_eq!(certified.len(), 2);
-        assert!(certified
-            .iter()
-            .all(|candidate| !candidate.has_missing_accuracy_evidence()));
-    }
-
-    // A shared aggregate must keep the sketch plan an unshared one gets:
-    // sharing decides how many copies of the state exist, never whether the
-    // state is a summary at all.
-    #[test]
-    fn shared_aggregates_keep_their_summary() {
-        use planner_types::pre_asap::query_expr::Source;
-        use planner_types::pre_asap::{Column, DataType, GroupKeys, Reduction, Schema};
-
-        let accuracy = AccuracyTarget::EpsilonDelta {
-            epsilon: 0.01,
-            delta: 0.01,
-        };
-        let grouped_count = || {
-            Rc::new(QueryExpr::Aggregate {
-                reduction: Reduction::Reduce(GroupKeys::by(vec![2])),
-                measures: vec![AggIntent::Count {
-                    accuracy: accuracy.clone(),
-                }],
-                output_names: vec![],
-                having: None,
-                child: Rc::new(QueryExpr::Scan {
-                    source: Source::TimeSeries { metric: "m".into() },
-                    predicates: vec![],
-                    schema: Schema::with_time_index(
-                        vec![
-                            Column::new("ts", DataType::Timestamp, false),
-                            Column::new("value", DataType::Float64, false),
-                            Column::new("job", DataType::Utf8, true),
-                        ],
-                        0,
-                        vec![vec![2]],
-                    ),
-                }),
-            })
-        };
-        let summarized = |roots: Vec<(usize, Rc<QueryExpr>)>| -> Vec<bool> {
-            select_workload(
-                roots,
-                accuracy.clone(),
-                &ControlPlaneCostModel::new(accuracy.clone()),
-            )
-            .unwrap()
-            .into_iter()
-            .map(|(_, node)| {
-                fn is_summary(node: &SummaryNode) -> bool {
-                    match &node.expr {
-                        SummaryExpr::SummaryAgg { .. } => true,
-                        SummaryExpr::SummaryEstimate { summary_input, .. } => {
-                            is_summary(summary_input)
-                        }
-                        SummaryExpr::ValueOperation {
-                            child,
-                            operation:
-                                planner_types::post_asap::ValueOperation::FinalizeExactAccumulator,
-                            ..
-                        } => is_summary(child),
-                        _ => false,
-                    }
-                }
-                is_summary(&node)
-            })
-            .collect()
-        };
-        assert_eq!(summarized(vec![(0, grouped_count())]), [true]);
-        assert_eq!(
-            summarized(vec![(0, grouped_count()), (1, grouped_count())]),
-            [true, true],
-            "sharing must not downgrade a summarized aggregate to raw execution"
-        );
-    }
-}
diff --git a/control_plane/src/query_parser/mod.rs b/control_plane/src/query_parser/mod.rs
deleted file mode 100644
index a8371a629..000000000
--- a/control_plane/src/query_parser/mod.rs
+++ /dev/null
@@ -1,677 +0,0 @@
-//! PromQL workload extraction through `asap_frontend_promql::lower_promql_workload`.
-//!
-//! ASAPPlanner owns parsing and intent classification. Both entry points require
-//! an explicit `AccuracyTarget` because lowering can size summaries.
-//!
-//! * [`parse_query_expr_canonical`] returns the canonical query expression.
-//! * [`parse_query`] projects it into `ParsedQuery` for workload analysis.
-
-use std::collections::HashMap;
-use std::time::Duration;
-
-use crate::types::AccuracyTarget;
-use crate::types::AggType;
-use planner_types::pre_asap::AggIntent;
-use planner_types::pre_asap::{ColumnId, CompareOpKind, ScalarValue};
-use planner_types::pre_asap::{Predicate, QueryExpr, Source};
-use planner_types::workload::{
-    AccuracyRequirement, BatchEntry, DataWorkload, DurationMs, Evidence, Query, QueryLanguage,
-    QueryRequirements, QueryWorkload, TimeSelection,
-};
-
-const COMPATIBILITY_DATA_INGESTION_INTERVAL_MS: u64 = 1_000;
-
-// ── Output types (legacy — consumed by analyzer and planner) ──────────────────
-
-/// Flat intermediate representation consumed by [`crate::analyzer::Analyzer`].
-///
-/// Produced by [`parse_query`] via [`QueryExpr`] tree walking.
-#[derive(Debug, Clone)]
-pub struct ParsedQuery {
-    /// Metric name (from the PromQL selector).
-    pub metric_name: String,
-    /// Aggregation types inferred from the query.
-    pub aggregations: Vec<AggType>,
-    /// Dimensions that must be preserved for GROUP BY / `by (dims)`.
-    pub group_by_labels: Vec<String>,
-    /// Equality label filters extracted from the query.
-    pub label_filters: HashMap<String, String>,
-    /// Time window extracted from the range vector or query context.
-    pub time_window: Duration,
-    /// True when the query requires per-sample exact values.
-    pub exact_required: bool,
-    /// Quantile φ values implied by the query.
-    pub quantiles: Vec<f64>,
-    /// Named pattern hint for domain-specific planner defaults.
-    pub hint: Option<QueryHint>,
-}
-
-/// Named query pattern recognised by the DEBS-aware planner.
-#[derive(Debug, Clone)]
-pub enum QueryHint {
-    // ── DEBS 2022 financial queries ───────────────────────────────────────────
-    /// Q1 – per-symbol EMA via quantile proxy (DDSketch / KLL).
-    DebsEma,
-    /// Q3 – top-K symbols by event count or price move (CountSketch).
-    DebsTopK { k: u64 },
-    /// Q4 – per-symbol high / low / last / range (extreme-quantile DDSketch).
-    DebsPriceStats,
-    /// Q5 / Q9 – realized volatility / Bollinger bands via IQR proxy.
-    DebsVolatility,
-    /// Q6 – distinct active symbols per window (HLL).
-    DebsCardinality,
-    /// Q7 – TWAP as median / p50 (DDSketch).
-    DebsTwap,
-    /// Q8 – price anomaly detection via IQR (DDSketch).
-    DebsAnomaly,
-    // ── Exact-only patterns ───────────────────────────────────────────────────
-    /// Query requires stateful per-sample computation; no sketch benefit.
-    ExactRequired { reason: String },
-}
-
-// ── Public entry points ───────────────────────────────────────────────────────
-
-/// Parse a PromQL query string into the **canonical** L3
-/// [`query_expr::QueryExpr`](planner_types::pre_asap::QueryExpr) IR.
-///
-/// Compatibility entry point for callers that do not own a complete workload.
-/// Plan-ready compilation lowers the complete caller-supplied workload instead.
-pub fn parse_query_expr_canonical(
-    query: &str,
-    accuracy: AccuracyTarget,
-) -> anyhow::Result<planner_types::pre_asap::QueryExpr> {
-    parse_query_expr_with_interval(query, accuracy, COMPATIBILITY_DATA_INGESTION_INTERVAL_MS)
-}
-
-pub(crate) fn parse_query_expr_with_interval(
-    query: &str,
-    accuracy: AccuracyTarget,
-    interval_ms: u64,
-) -> anyhow::Result<planner_types::pre_asap::QueryExpr> {
-    let workload = planner_types::workload::PlanningWorkload {
-        query_workload: QueryWorkload {
-            language: QueryLanguage::PromQL,
-            query_batch: Some(vec![BatchEntry {
-                query: Query(query.trim().into()),
-                requirements: QueryRequirements {
-                    accuracy: AccuracyRequirement::Explicit(accuracy),
-                    ..Default::default()
-                },
-                predictability: Default::default(),
-                invocations: 1,
-                execute_at: None,
-                time_selection: TimeSelection::default(),
-            }]),
-            repeating_queries: None,
-        },
-        data_workload: Some(DataWorkload {
-            data_ingestion_interval: Evidence {
-                value: Some(DurationMs(interval_ms)),
-                ..Default::default()
-            },
-            ..Default::default()
-        }),
-    };
-    asap_frontend_promql::lower_promql_workload(&workload, 0)?
-        .into_iter()
-        .next()
-        .ok_or_else(|| anyhow::anyhow!("PromQL compatibility workload produced no query"))
-}
-
-/// Parse a PromQL query string into a [`ParsedQuery`].
-///
-/// Flat compatibility entry point for workload metadata extraction. Internally it parses via
-/// [`parse_query_expr_canonical`] and extracts the flat summary by walking
-/// the canonical [`QueryExpr`] tree.
-pub fn parse_query(query: &str, accuracy: AccuracyTarget) -> anyhow::Result<ParsedQuery> {
-    let qe = parse_query_expr_canonical(query, accuracy)?;
-    Ok(qe_to_parsed_query(&qe))
-}
-
-/// Extract a flat [`ParsedQuery`] by walking a canonical [`QueryExpr`] tree.
-///
-/// Step γ7: the collector walks the canonical IR. `Aggregate` carries
-/// `Vec<AggIntent>` directly (the legacy `AggFunc` is gone), so the
-/// `collect_agg_func*` helpers are replaced by per-intent [`collect_op`]
-/// calls. Canonical `Scan` also carries `label_filters` inline, so they
-/// are picked up at the scan leaf as well as from any `Filter` predicate.
-pub(crate) fn qe_to_parsed_query(qe: &QueryExpr) -> ParsedQuery {
-    // The SchemaResolver-built `Scan.schema` is the complete, self-contained
-    // column universe every `ColumnId` in the tree indexes into. We grab
-    // it up-front so the `Aggregate` walk can recover group-by *names*
-    // from positional `by` ids.
-    let schema = root_scan_schema(qe);
-    let mut c = QeCollector::default();
-    c.visit(qe, schema);
-    c.build()
-}
-
-/// Find the schema carried by the tree's first `Scan` leaf. Every `Scan`
-/// in a converted tree carries the same SchemaResolver schema, so the first one
-/// found is representative.
-fn root_scan_schema(qe: &QueryExpr) -> Option<&planner_types::pre_asap::Schema> {
-    match qe {
-        QueryExpr::Scan { schema, .. } => Some(schema),
-        QueryExpr::Filter { child, .. }
-        // `TimeRange`/`TimeShift` are `lower_promql`'s range-vector-selector
-        // and offset/@ markers (L1 adoption, design-target-architecture.md
-        // Part B) -- pass-through wrappers over the same `Scan`.
-        | QueryExpr::TimeRange { child, .. }
-        | QueryExpr::TimeShift { child, .. }
-        | QueryExpr::Aggregate { child, .. }
-        | QueryExpr::Dedup { child, .. }
-        | QueryExpr::Project { child, .. }
-        | QueryExpr::Sort { child, .. }
-        | QueryExpr::Limit { child, .. }
-        | QueryExpr::PromqlSubquery { child, .. } => root_scan_schema(child),
-        QueryExpr::Concat { children, .. } => children.iter().find_map(root_scan_schema),
-        QueryExpr::Join { left, right, .. }
-        | QueryExpr::SetOp { left, right, .. }
-        | QueryExpr::BinaryOp {
-            lhs: left,
-            rhs: right,
-            ..
-        } => root_scan_schema(left).or_else(|| root_scan_schema(right)),
-        // The remaining PromQL-surface superset (Scalar/EvalTime/
-        // VectorFromScalar/ScalarFromVector/Relabel/InfoJoin/Sample/
-        // WindowFunc) is real, new capability `lower_promql` adds but this
-        // crate's flat `ParsedQuery` extraction doesn't attempt to unpack
-        // yet -- accepted gap (design-target-architecture.md Part B): these
-        // shapes weren't reachable at all before this swap, so nothing
-        // regresses; `ParsedQuery` may come back incomplete for them.
-        _ => None,
-    }
-}
-
-#[derive(Default)]
-struct QeCollector {
-    metric_name: Option<String>,
-    agg_types: Vec<AggType>,
-    group_by_labels: Vec<String>,
-    label_filters: HashMap<String, String>,
-    time_window: Option<Duration>,
-    exact_required: bool,
-    quantiles: Vec<f64>,
-    topk: Option<u64>,
-}
-
-impl QeCollector {
-    /// `schema` is the SchemaResolver-built `Scan.schema` — the complete column
-    /// universe `Aggregate.by` positional ids index into. Threaded
-    /// unchanged through the walk; only the `Aggregate` arm reads it.
-    fn visit(&mut self, expr: &QueryExpr, schema: Option<&planner_types::pre_asap::Schema>) {
-        match expr {
-            QueryExpr::Scan {
-                source,
-                predicates,
-                schema: scan_schema,
-            } => {
-                if self.metric_name.is_none() {
-                    self.metric_name = Some(match source {
-                        Source::TimeSeries { metric } => metric.clone(),
-                        Source::Table { table_ref } => table_ref.clone(),
-                    });
-                }
-                // Canonical `Scan.predicates` carries equality label
-                // filters as typed `Predicate(QueryExpr::Compare{Column, Eq,
-                // Literal(Utf8)})` trees (the shape
-                // `query_expr::label_filter_to_predicate` builds) — resolve
-                // each `Column` id back to its name via the Scan's own
-                // schema to recover the flat name/value map this legacy
-                // `ParsedQuery` output still wants.
-                for p in predicates {
-                    collect_filters_from_expr(&p.0, Some(scan_schema), &mut self.label_filters);
-                }
-            }
-            QueryExpr::Filter { pred, child } => {
-                // Extract equality label filters from the predicate tree.
-                collect_filters_from_scalar(pred, schema, &mut self.label_filters);
-                self.visit(child, schema);
-            }
-            // `TimeRange` is `lower_promql`'s range-vector-selector marker
-            // (`m[5m]` in `quantile_over_time(φ, m[5m])`) -- the range-window
-            // duration this collector's `time_window` field wants, same as
-            // `Window::size` above. `TimeShift` (`offset`/`@`) is a pure
-            // pass-through, no window/label information of its own.
-            QueryExpr::TimeRange { range, child } => {
-                if self.time_window.is_none() {
-                    self.time_window = Some(*range);
-                }
-                self.visit(child, schema);
-            }
-            QueryExpr::TimeShift { child, .. } => self.visit(child, schema),
-            QueryExpr::Aggregate {
-                reduction,
-                measures: aggs,
-                child,
-                ..
-            } => {
-                // The canonical IR folds legacy SketchAgg / WindowedAgg-inner
-                // / TopK / Aggregate into one variant carrying `AggIntent`s.
-                // `by` is positional — recover the group-by label *names*
-                // from the SchemaResolver schema (the legacy `Aggregate.keys` were
-                // names; multi-agg aggregates reach here with a non-empty
-                // `by` after the SchemaResolver resolves them). A per-entity
-                // reduction (ASAPController#163/#165) has no `by` at all —
-                // same as an empty one here, no label names to recover.
-                let by: &[ColumnId] = reduction.group_keys().map(|k| k.keys()).unwrap_or(&[]);
-                if let Some(s) = schema {
-                    for &id in by {
-                        if let Some(col) = s.columns.get(id) {
-                            if !self.group_by_labels.contains(&col.name) {
-                                self.group_by_labels.push(col.name.clone());
-                            }
-                        }
-                    }
-                }
-                for intent in aggs {
-                    if let AggIntent::TopK { k, .. } = intent {
-                        self.topk = Some(*k as u64);
-                    } else {
-                        self.collect_op(intent);
-                    }
-                }
-                self.visit(child, schema);
-            }
-            QueryExpr::Dedup { child, .. } => self.visit(child, schema),
-            QueryExpr::Concat { children, .. } => {
-                for c in children {
-                    self.visit(c, schema);
-                }
-            }
-            QueryExpr::Project { child, .. }
-            | QueryExpr::Sort { child, .. }
-            | QueryExpr::Limit { child, .. }
-            | QueryExpr::PromqlSubquery { child, .. } => self.visit(child, schema),
-            QueryExpr::Join { left, right, .. }
-            | QueryExpr::SetOp { left, right, .. }
-            | QueryExpr::BinaryOp {
-                lhs: left,
-                rhs: right,
-                ..
-            } => {
-                self.visit(left, schema);
-                self.visit(right, schema);
-            }
-            _ => {}
-        }
-    }
-
-    fn collect_op(&mut self, op: &AggIntent) {
-        // Canonical Quantile is single-φ post Step α (multi-φ legacy
-        // intents fan out into sibling SketchAggs at construction time —
-        // each one routes through this collector independently). The
-        // legacy `Extrema { min, max }` enum split into `Min` / `Max`
-        // canonical variants; map each to the corresponding boundary
-        // quantile for legacy compat.
-        match op {
-            AggIntent::Cardinality { .. } => {
-                if !self.agg_types.contains(&AggType::Cardinality) {
-                    self.agg_types.push(AggType::Cardinality);
-                }
-            }
-            op if crate::planner_selection::as_frequency(op).is_some() => {
-                if !self.agg_types.contains(&AggType::Frequency) {
-                    self.agg_types.push(AggType::Frequency);
-                }
-            }
-            AggIntent::Quantile { q, .. } => {
-                if !self.agg_types.contains(&AggType::Quantile) {
-                    self.agg_types.push(AggType::Quantile);
-                }
-                if !self.quantiles.contains(q) {
-                    self.quantiles.push(*q);
-                }
-            }
-            AggIntent::Min { .. } => {
-                if !self.agg_types.contains(&AggType::Quantile) {
-                    self.agg_types.push(AggType::Quantile);
-                }
-                if !self.quantiles.contains(&0.0) {
-                    self.quantiles.push(0.0);
-                }
-            }
-            AggIntent::Max { .. } => {
-                if !self.agg_types.contains(&AggType::Quantile) {
-                    self.agg_types.push(AggType::Quantile);
-                }
-                if !self.quantiles.contains(&1.0) {
-                    self.quantiles.push(1.0);
-                }
-            }
-            // Sum / Count / Avg / TopK / Rate / Increase / archive-only —
-            // all flip the exact_required flag (no sketch benefit at the
-            // legacy planner's level).
-            _ => {
-                self.exact_required = true;
-            }
-        }
-    }
-
-    fn build(self) -> ParsedQuery {
-        let metric_name = self.metric_name.unwrap_or_default();
-        let mut qs = self.quantiles;
-        qs.sort_by(|a, b| a.partial_cmp(b).unwrap());
-        qs.dedup();
-        let hint = debs_hint(
-            &metric_name,
-            &self.agg_types,
-            &qs,
-            self.exact_required,
-            self.topk,
-        );
-        ParsedQuery {
-            metric_name,
-            aggregations: self.agg_types,
-            group_by_labels: self.group_by_labels,
-            label_filters: self.label_filters,
-            time_window: self.time_window.unwrap_or(Duration::from_secs(300)),
-            exact_required: self.exact_required,
-            quantiles: qs,
-            hint,
-        }
-    }
-}
-
-fn collect_filters_from_scalar(
-    pred: &Predicate,
-    schema: Option<&planner_types::pre_asap::Schema>,
-    out: &mut HashMap<String, String>,
-) {
-    collect_filters_from_expr(&pred.0, schema, out);
-}
-
-/// Recover a flat name/value equality map from a canonical `QueryExpr`
-/// predicate tree — `Column(id) == Literal(Utf8(v))` conjuncts, `id`
-/// resolved back to a name via `schema` (positional `Column` carries no
-/// name of its own, unlike the pre-merge name-based `Predicate::Column`).
-fn collect_filters_from_expr(
-    expr: &QueryExpr,
-    schema: Option<&planner_types::pre_asap::Schema>,
-    out: &mut HashMap<String, String>,
-) {
-    match expr {
-        QueryExpr::Compare {
-            left,
-            op: CompareOpKind::Eq,
-            right,
-        } => {
-            if let (QueryExpr::Column(id), QueryExpr::Literal(ScalarValue::Utf8(v))) =
-                (left.as_ref(), right.as_ref())
-            {
-                if let Some(col) = schema.and_then(|s| s.columns.get(*id)) {
-                    out.entry(col.name.clone()).or_insert_with(|| v.clone());
-                }
-            }
-        }
-        QueryExpr::BoolAnd(parts) => {
-            for p in parts {
-                collect_filters_from_expr(p, schema, out);
-            }
-        }
-        _ => {}
-    }
-}
-
-// ── DEBS hint classifier (shared by both parsers via to_parsed_query) ─────────
-
-/// Returns the DEBS-specific hint for `financial.last_trade_price` queries.
-pub(super) fn debs_hint(
-    metric: &str,
-    aggs: &[AggType],
-    quantiles: &[f64],
-    exact_required: bool,
-    topk: Option<u64>,
-) -> Option<QueryHint> {
-    let is_debs = metric == "financial.last_trade_price" || metric == "financial_last_trade_price";
-    if !is_debs {
-        return None;
-    }
-
-    if exact_required {
-        return Some(QueryHint::ExactRequired {
-            reason: "query requires per-sample stateful computation".into(),
-        });
-    }
-    if let Some(k) = topk {
-        return Some(QueryHint::DebsTopK { k });
-    }
-    let primary = aggs.first()?;
-    match primary {
-        AggType::Cardinality => Some(QueryHint::DebsCardinality),
-        AggType::Frequency => Some(QueryHint::DebsTopK { k: 10 }),
-        AggType::Quantile => {
-            let qs: std::collections::HashSet<i32> = quantiles
-                .iter()
-                .map(|&q| (q * 100.0).round() as i32)
-                .collect();
-            if qs.contains(&50) && qs.len() == 1 {
-                Some(QueryHint::DebsTwap)
-            } else if qs.contains(&0) || qs.contains(&100) {
-                Some(QueryHint::DebsPriceStats)
-            } else if qs.contains(&25) && qs.contains(&75) && qs.contains(&50) {
-                Some(QueryHint::DebsAnomaly)
-            } else if qs.contains(&25) && qs.contains(&75) {
-                Some(QueryHint::DebsVolatility)
-            } else {
-                Some(QueryHint::DebsEma)
-            }
-        }
-    }
-}
-
-// ── Tests ─────────────────────────────────────────────────────────────────────
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    const ACC: AccuracyTarget = AccuracyTarget::Epsilon(0.01);
-
-    // Focused unit contracts for the PromQL parse entry point.
-
-    #[test]
-    fn promql_dispatched_correctly() {
-        // `by` belongs to the aggregate operator, not the function call.
-        let pq = parse_query("sum by (host) (quantile_over_time(0.99, latency[5m]))", ACC).unwrap();
-        assert!(pq.aggregations.contains(&AggType::Quantile));
-        assert_eq!(pq.quantiles, vec![0.99]);
-    }
-
-    #[test]
-    fn parse_query_expr_returns_expr() {
-        let pq = parse_query(
-            "topk by (symbol) (10, count_over_time(financial_last_trade_price[5m]))",
-            ACC,
-        )
-        .unwrap();
-        // Should parse without error and extract the metric name.
-        assert_eq!(pq.metric_name, "financial_last_trade_price");
-    }
-
-    // ── canonical-IR entry point ─────────────────────────────────────────────
-
-    #[test]
-    fn canonical_query_quantile_yields_aggregate_over_time_range() {
-        use planner_types::pre_asap::QueryExpr as CQueryExpr;
-        // Range-vector selectors lower to `TimeRange`; `Window` represents streaming
-        // windows. The aggregate sits directly above the range selector.
-        let expr = parse_query_expr_canonical(
-            "quantile_over_time(0.99, http_request_duration{env=\"prod\"}[5m])",
-            ACC,
-        )
-        .unwrap();
-        match expr {
-            CQueryExpr::Aggregate { child, .. } => {
-                assert!(matches!(*child, CQueryExpr::TimeRange { .. }));
-            }
-            other => panic!("expected canonical Aggregate, got {other:?}"),
-        }
-    }
-
-    #[test]
-    fn canonical_query_avg_over_time_yields_aggregate_over_time_range() {
-        use planner_types::pre_asap::QueryExpr as CQueryExpr;
-        // A bare `avg_over_time(m[w])` (no `by`) lowers to canonical
-        // `Aggregate { child: TimeRange { child: Scan } }`.
-        let expr =
-            parse_query_expr_canonical("avg_over_time(cpu_seconds_total[10m])", ACC).unwrap();
-        match expr {
-            CQueryExpr::Aggregate { child, .. } => match (*child).clone() {
-                CQueryExpr::TimeRange { child, .. } => {
-                    assert!(matches!(*child, CQueryExpr::Scan { .. }));
-                }
-                other => panic!("expected canonical TimeRange, got {other:?}"),
-            },
-            other => panic!("expected canonical Aggregate, got {other:?}"),
-        }
-    }
-    /// PromQL `count(v)` counts SERIES; it is not a distinct-item count.
-    ///
-    /// This mapping has flip-flopped across ASAPPlanner revisions: `ca7546de`
-    /// (and several around it) lowered a bare `count by (d) (...)` to
-    /// `AggIntent::Cardinality`, which binds `Capability::CardinalityApprox`
-    /// and is served by merging HLL registers. For two series holding
-    /// {a,b,c} and {d,e,f} that answers 6 -- the union's distinct cardinality --
-    /// where PromQL's answer is 2, the number of series.
-    ///
-    /// `Cardinality` belongs to the distinct-count idiom only: `distinct_over_time`,
-    /// `COUNT(DISTINCT ...)`, or an explicit `count(distinct_over_time(...))`
-    /// whose INNER node carries the intent. Keeping the two apart is what lets
-    /// `capability_for` route `Count` to a frequency sketch and `Cardinality`
-    /// to HLL, as `runtime_capability`'s own contract states.
-    #[test]
-    fn bare_count_is_series_count_not_distinct_cardinality() {
-        fn intents(query: &str) -> Vec<AggIntent> {
-            fn walk(expr: &QueryExpr, out: &mut Vec<AggIntent>) {
-                match expr {
-                    QueryExpr::Aggregate {
-                        measures, child, ..
-                    } => {
-                        out.extend(measures.iter().cloned());
-                        walk(child, out);
-                    }
-                    QueryExpr::TimeRange { child, .. } => walk(child, out),
-                    _ => {}
-                }
-            }
-            let mut out = vec![];
-            walk(&parse_query_expr_canonical(query, ACC).unwrap(), &mut out);
-            out
-        }
-
-        for query in ["count(unique_users)", "count by (svc) (unique_users)"] {
-            let found = intents(query);
-            assert!(
-                found
-                    .iter()
-                    .all(|intent| !matches!(intent, AggIntent::Cardinality { .. })),
-                "{query} must not carry a Cardinality intent -- that binds HLL and \
-                 answers the union's distinct count instead of the series count; got {found:?}"
-            );
-            assert!(
-                found
-                    .iter()
-                    .any(|intent| matches!(intent, AggIntent::Count { .. })),
-                "{query} must lower to a Count intent, got {found:?}"
-            );
-        }
-
-        // The distinct-count idiom keeps its cardinality intent, on the inner node.
-        for query in [
-            "distinct_over_time(unique_users[5m])",
-            "count(distinct_over_time(unique_users[5m]))",
-        ] {
-            let found = intents(query);
-            assert!(
-                found
-                    .iter()
-                    .any(|intent| matches!(intent, AggIntent::Cardinality { .. })),
-                "{query} is the distinct-count idiom and must keep Cardinality, got {found:?}"
-            );
-        }
-    }
-}
-
-#[cfg(test)]
-mod doc_verify_all {
-    // Pins the design.md §6 worked examples against the canonical IR
-    // `asap_frontend_promql::lower_promql` produces — the only algebra IR
-    // the parse path now emits.
-    use super::parse_query_expr_canonical;
-    use crate::types::AccuracyTarget;
-    use planner_types::pre_asap::QueryExpr;
-    use planner_types::pre_asap::{AggIntent, Reduction};
-
-    const ACC: AccuracyTarget = AccuracyTarget::Epsilon(0.01);
-
-    #[test]
-    fn example4_promql_quantile() {
-        let expr = parse_query_expr_canonical(
-            "quantile_over_time(0.99, http_request_duration{env=\"prod\"}[5m])",
-            ACC,
-        )
-        .unwrap();
-        // `Aggregate { reduction: PerEntity, [Quantile], child: TimeRange }`
-        // — no explicit `by()`, and ranged over a single non-per-series
-        // intent, so there's no grouping concept at all (see #165's
-        // `Reduction`). No `Window` wrapper -- `asap_l2::lower` models the
-        // range-vector selector itself as `TimeRange`, not `Window`.
-        match &expr {
-            QueryExpr::Aggregate {
-                reduction,
-                measures: aggs,
-                child,
-                ..
-            } => {
-                assert!(matches!(reduction, Reduction::PerEntity));
-                assert!(matches!(aggs.as_slice(), [AggIntent::Quantile { .. }]));
-                assert!(matches!(child.as_ref(), QueryExpr::TimeRange { .. }));
-            }
-            other => panic!("expected Aggregate, got {other:?}"),
-        }
-    }
-
-    #[test]
-    fn example5_promql_topk() {
-        let expr = parse_query_expr_canonical(
-            "topk by (service) (10, count_over_time(requests{env=\"prod\"}[1m]))",
-            ACC,
-        )
-        .unwrap();
-        // `topk(...)` ranking by `count_over_time(...)` is the heavy-hitter
-        // shape both this deployment and `asap_frontend_promql` route to a
-        // canonical `Aggregate` carrying `AggIntent::TopK`, over the
-        // `Window { Aggregate { by } } }` the grouped windowed count lowers
-        // to — regardless of what intent that INNER aggregate now carries
-        // (see this module's doc: no longer necessarily the `Frequency`
-        // extension), the outer `TopK` shape itself is unaffected.
-        match &expr {
-            QueryExpr::Aggregate {
-                measures: aggs,
-                child,
-                ..
-            } => {
-                assert!(matches!(aggs.as_slice(), [AggIntent::TopK { k: 10, .. }]));
-                // Inner reduction the TopK ranks by: `Aggregate { Count,
-                // child: TimeRange { child: Scan } }` -- same `TimeRange`
-                // shape as the other tests above, one level down. `Count`
-                // carries its own `AccuracyTarget` field (here `Epsilon(0.01)`,
-                // threaded from this call's `accuracy` argument) rather than
-                // being forced exact -- adopted as-is per this module's doc.
-                match child.as_ref() {
-                    QueryExpr::Aggregate {
-                        measures: inner_aggs,
-                        child: inner_child,
-                        ..
-                    } => {
-                        assert!(matches!(inner_aggs.as_slice(), [AggIntent::Count { .. }]));
-                        assert!(matches!(inner_child.as_ref(), QueryExpr::TimeRange { .. }));
-                    }
-                    other => panic!("expected inner Aggregate, got {other:?}"),
-                }
-            }
-            other => panic!("expected Aggregate with TopK intent, got {other:?}"),
-        }
-    }
-}
diff --git a/control_plane/src/query_plan.rs b/control_plane/src/query_plan.rs
deleted file mode 100644
index 04a7afd85..000000000
--- a/control_plane/src/query_plan.rs
+++ /dev/null
@@ -1,1514 +0,0 @@
-//! Control-plane lowering from Planner IR to the shared installed query DAG.
-//! Serving consumes asap_types::query_plan; compilation stays in this component.
-
-mod clickhouse_exact;
-pub mod query_time;
-
-pub use asap_types::query_plan::*;
-#[cfg(test)]
-use asap_types::PolicyFingerprint;
-use planner_types::post_asap::{SummaryExpr, SummaryFamilyType, SummaryNode};
-use planner_types::pre_asap::Reduction;
-use std::collections::BTreeMap;
-#[cfg(test)]
-use std::collections::BTreeSet;
-use std::rc::Rc;
-
-pub fn compile_bound_mapped<F, G>(
-    query_id: String,
-    canonical_query: String,
-    root: &Rc<SummaryNode>,
-    instant: InstantExecution,
-    fallback: FallbackPolicy,
-    mut bind: F,
-    mut lowered: G,
-) -> Result<QueryPlanEntry, QueryPlanError>
-where
-    F: FnMut(
-        &Rc<SummaryNode>,
-        &SummaryFamilyType,
-    ) -> Result<MaterializationBinding, QueryPlanError>,
-    G: FnMut(&Rc<SummaryNode>, QueryNodeId),
-{
-    let mut compiler = DagCompiler {
-        next_id: 0,
-        nodes: BTreeMap::new(),
-        seen: BTreeMap::new(),
-        bind: &mut bind,
-        logical_source: None,
-        preserve_relational: false,
-        lowered: Some(&mut lowered),
-    };
-    let root = compiler.lower(root)?;
-    Ok(QueryPlanEntry {
-        language: QueryLanguage::PromQl,
-        query_id,
-        canonical_query,
-        fixed_evaluation: None,
-        root,
-        nodes: compiler.nodes,
-        instant,
-        fallback,
-    })
-}
-
-/// Preserve Planner-to-runtime node identities for installed SQL DAGs.
-pub fn compile_bound_relational_mapped<F, G>(
-    query_id: String,
-    canonical_query: String,
-    root: &Rc<SummaryNode>,
-    fixed_evaluation: FixedEvaluationRange,
-    instant: InstantExecution,
-    fallback: FallbackPolicy,
-    mut bind: F,
-    mut lowered: G,
-) -> Result<QueryPlanEntry, QueryPlanError>
-where
-    F: FnMut(
-        &Rc<SummaryNode>,
-        &SummaryFamilyType,
-    ) -> Result<MaterializationBinding, QueryPlanError>,
-    G: FnMut(&Rc<SummaryNode>, QueryNodeId),
-{
-    let mut compiler = DagCompiler {
-        next_id: 0,
-        nodes: BTreeMap::new(),
-        seen: BTreeMap::new(),
-        bind: &mut bind,
-        logical_source: None,
-        preserve_relational: true,
-        lowered: Some(&mut lowered),
-    };
-    let root = compiler.lower(root)?;
-    Ok(QueryPlanEntry {
-        language: QueryLanguage::ClickHouseSql,
-        query_id,
-        canonical_query,
-        fixed_evaluation: Some(fixed_evaluation),
-        root,
-        nodes: compiler.nodes,
-        instant,
-        fallback,
-    })
-}
-
-/// Compile a composable query while exposing the stable mapping from
-/// Planner semantic nodes to installed query nodes. The control-plane
-/// physical compiler uses this to persist backend placement without
-/// relying on pointer values or reconstructing query shape later.
-pub fn compile_bound_composable_mapped<F, G>(
-    query_id: String,
-    canonical_query: String,
-    root: &Rc<SummaryNode>,
-    instant: InstantExecution,
-    fallback: FallbackPolicy,
-    mut bind: F,
-    mut lowered: G,
-) -> Result<QueryPlanEntry, QueryPlanError>
-where
-    F: FnMut(
-        &Rc<SummaryNode>,
-        &SummaryFamilyType,
-    ) -> Result<MaterializationBinding, QueryPlanError>,
-    G: FnMut(&Rc<SummaryNode>, QueryNodeId),
-{
-    let mut compiler = DagCompiler {
-        next_id: 0,
-        nodes: BTreeMap::new(),
-        seen: BTreeMap::new(),
-        bind: &mut bind,
-        logical_source: Some(canonical_query.clone()),
-        preserve_relational: false,
-        lowered: Some(&mut lowered),
-    };
-    let root = compiler.lower(root)?;
-    let mut entry = QueryPlanEntry {
-        language: QueryLanguage::PromQl,
-        query_id,
-        canonical_query,
-        fixed_evaluation: None,
-        root,
-        nodes: compiler.nodes,
-        instant,
-        fallback,
-    };
-    query_time::finalize_query_time_nodes(&mut entry)?;
-    Ok(entry)
-}
-
-fn compile_native_fragment(
-    root: &Rc<SummaryNode>,
-    query_inputs: &[QueryNodeId],
-) -> Result<QueryPlanNode, QueryPlanError> {
-    use asap_physical_operators::physical_planner::{compile, InputContract};
-    use planner_types::post_asap::{compile_executable_dag, EdgeRole};
-    let invalid = |e: String| QueryPlanError::Invalid(e);
-    let dag = compile_executable_dag(root).map_err(|e| invalid(e.to_string()))?;
-    let mut edges = dag
-        .edges
-        .iter()
-        .filter(|e| e.consumer == dag.root)
-        .collect::<Vec<_>>();
-    edges.sort_by_key(|e| match e.role {
-        EdgeRole::Left => 0,
-        EdgeRole::Input => 1,
-        EdgeRole::Right => 2,
-    });
-    if edges.len() != query_inputs.len() {
-        return Err(invalid("physical frontier arity mismatch".into()));
-    }
-    let bindings = edges
-        .iter()
-        .zip(query_inputs)
-        .map(|(edge, &id)| (u64::from(edge.producer.0), id))
-        .collect::<BTreeMap<_, _>>();
-    let contracts = edges
-        .iter()
-        .map(|edge| {
-            (
-                u64::from(edge.producer.0),
-                InputContract::bounded(std::sync::Arc::new(edge.intermediate_schema.clone())),
-            )
-        })
-        .collect();
-    let physical =
-        compile(&dag, contracts, &[u64::from(dag.root.0)]).map_err(|e| invalid(e.to_string()))?;
-    let row_input = physical
-        .input_contracts()
-        .position(|(id, _)| bindings[&id] == query_inputs[0])
-        .unwrap();
-    let pruning = if let SummaryExpr::RelationalJoin {
-        left,
-        right,
-        pred,
-        pruning: Some(completeness),
-        ..
-    } = &root.expr
-    {
-        Some(asap_types::query_plan::PruningInputContract {
-            candidate_input: physical
-                .input_contracts()
-                .position(|(id, _)| bindings[&id] == query_inputs[1])
-                .unwrap(),
-            keys: asap_physical_operators::physical_planner::equijoin_keys(
-                pred,
-                &left.schema,
-                &right.schema,
-            )
-            .map_err(|e| invalid(e.to_string()))?,
-            completeness: completeness.clone(),
-        })
-    } else {
-        None
-    };
-    Ok(QueryPlanNode::PhysicalFragment {
-        pruning,
-        row_input,
-        inputs: physical
-            .input_contracts()
-            .map(|(id, _)| bindings[&id])
-            .collect(),
-        dag: physical.encode().map_err(|e| invalid(e.to_string()))?,
-    })
-}
-
-struct DagCompiler<'a, F> {
-    next_id: u64,
-    nodes: BTreeMap<QueryNodeId, QueryPlanNode>,
-    seen: BTreeMap<usize, QueryNodeId>,
-    bind: &'a mut F,
-    logical_source: Option<String>,
-    preserve_relational: bool,
-    lowered: Option<&'a mut dyn FnMut(&Rc<SummaryNode>, QueryNodeId)>,
-}
-
-impl<F> DagCompiler<'_, F>
-where
-    F: FnMut(
-        &Rc<SummaryNode>,
-        &SummaryFamilyType,
-    ) -> Result<MaterializationBinding, QueryPlanError>,
-{
-    fn graft(
-        &mut self,
-        id: QueryNodeId,
-        root: QueryNodeId,
-        nodes: BTreeMap<QueryNodeId, QueryPlanNode>,
-    ) -> Result<QueryNodeId, QueryPlanError> {
-        let mut remap = BTreeMap::new();
-        for local in nodes.keys() {
-            let global = if *local == root {
-                id
-            } else {
-                let next = QueryNodeId(self.next_id);
-                self.next_id += 1;
-                next
-            };
-            remap.insert(*local, global);
-        }
-        for (local, mut physical) in nodes {
-            match &mut physical {
-                QueryPlanNode::PhysicalFragment { inputs, .. }
-                | QueryPlanNode::Logical { inputs, .. }
-                | QueryPlanNode::SummaryMerge { inputs }
-                | QueryPlanNode::ExternalExact { inputs, .. } => {
-                    for input in inputs {
-                        *input = remap[input];
-                    }
-                }
-                QueryPlanNode::Binary { inputs, .. }
-                | QueryPlanNode::RelationalJoin { inputs, .. } => {
-                    for input in inputs {
-                        *input = remap[input];
-                    }
-                }
-                QueryPlanNode::SummaryEstimate { input, .. }
-                | QueryPlanNode::ExactReadout { input, .. }
-                | QueryPlanNode::ReduceSum { input, .. }
-                | QueryPlanNode::Relational { input, .. } => *input = remap[input],
-                QueryPlanNode::Scalar { .. }
-                | QueryPlanNode::ReadMaterialization { .. }
-                | QueryPlanNode::ExactFallback { .. } => {}
-            }
-            self.nodes.insert(remap[&local], physical);
-        }
-        Ok(id)
-    }
-
-    fn lower(&mut self, node: &Rc<SummaryNode>) -> Result<QueryNodeId, QueryPlanError> {
-        let identity = Rc::as_ptr(node) as usize;
-        if let Some(id) = self.seen.get(&identity) {
-            return Ok(*id);
-        }
-        if let SummaryExpr::ValueOperation {
-            child,
-            operation: planner_types::post_asap::ValueOperation::FinalizeExactAccumulator,
-            ..
-        } = &node.expr
-        {
-            if exact_accumulator_value_source(node).is_none() {
-                return Err(QueryPlanError::UnsupportedNode(
-                    "exact finalization requires a direct exact accumulator".into(),
-                ));
-            }
-            // SummaryAgg lowering already emits the family-specific ExactReadout.
-            // Preserve the Planner's explicit state boundary without adding a
-            // second runtime readout node.
-            let child_id = self.lower(child)?;
-            self.seen.insert(identity, child_id);
-            if let Some(lowered) = &mut self.lowered {
-                lowered(node, child_id);
-            }
-            return Ok(child_id);
-        }
-        let id = QueryNodeId(self.next_id);
-        self.next_id += 1;
-        self.seen.insert(identity, id);
-        let query_time = match (&self.logical_source, &node.expr) {
-            (Some(original), SummaryExpr::KeepPreAsap(expr)) => {
-                Some(query_time::query_time_nodes(original, expr)?)
-            }
-            (Some(original), SummaryExpr::SummaryAgg { child, .. })
-                if matches!(child.expr, SummaryExpr::KeepPreAsap(_))
-                    && !matches!(
-                        crate::physical::compiler::raw_materialization_input_contract(node),
-                        Ok((_, Some(_), _))
-                    ) =>
-            {
-                Some(query_time::selected_query_time_nodes(original, node)?)
-            }
-            _ => None,
-        };
-        if let Some((root, nodes)) = query_time {
-            let id = self.graft(id, root, nodes)?;
-            if let Some(lowered) = &mut self.lowered {
-                lowered(node, id);
-            }
-            return Ok(id);
-        }
-
-        let physical = match &node.expr {
-            SummaryExpr::RelationalJoin {
-                left,
-                right,
-                kind,
-                pred,
-                pruning,
-            } if self.preserve_relational => QueryPlanNode::RelationalJoin {
-                inputs: [self.lower(left)?, self.lower(right)?],
-                join_kind: kind.clone(),
-                pruning: pruning.clone(),
-                pred: serde_json::to_value(pred).map_err(|error| {
-                    QueryPlanError::Invalid(format!(
-                        "cannot serialize relational join predicate: {error}"
-                    ))
-                })?,
-                left_schema: left.schema.clone(),
-                right_schema: right.schema.clone(),
-                output_schema: node.schema.clone(),
-            },
-            SummaryExpr::ValueOperation {
-                child, operation, ..
-            } if self.preserve_relational
-                && matches!(
-                    operation,
-                    planner_types::post_asap::ValueOperation::Project { .. }
-                        | planner_types::post_asap::ValueOperation::Filter { .. }
-                        | planner_types::post_asap::ValueOperation::Sort { .. }
-                        | planner_types::post_asap::ValueOperation::Limit { .. }
-                        | planner_types::post_asap::ValueOperation::Exact(
-                            planner_types::post_asap::ExactOperation::Aggregate { .. }
-                        )
-                ) =>
-            {
-                QueryPlanNode::Relational {
-                    input: self.lower(child)?,
-                    operation: serde_json::to_value(operation).map_err(|error| {
-                        QueryPlanError::UnsupportedNode(format!(
-                            "cannot serialize relational operation: {error}"
-                        ))
-                    })?,
-                    input_schema: child.schema.clone(),
-                    output_schema: node.schema.clone(),
-                }
-            }
-            SummaryExpr::ValueOperation {
-                child,
-                operation:
-                    planner_types::post_asap::ValueOperation::Exact(
-                        planner_types::post_asap::ExactOperation::Aggregate {
-                            reduction,
-                            measures,
-                            having: None,
-                            ..
-                        },
-                    ),
-                timing: planner_types::post_asap::ExecutionTiming::QueryTime,
-            } if measures.len() == 1 => {
-                use planner_types::pre_asap::AggIntent;
-                let operation = match &measures[0] {
-                    AggIntent::Sum { .. } => Some(query_time::Aggregation::Sum),
-                    AggIntent::Count { .. } => Some(query_time::Aggregation::Count),
-                    AggIntent::Min { .. } => Some(query_time::Aggregation::Min),
-                    AggIntent::Max { .. } => Some(query_time::Aggregation::Max),
-                    AggIntent::Avg { .. } => Some(query_time::Aggregation::Avg),
-                    _ => {
-                        return Err(QueryPlanError::Invalid(
-                            "unsupported exact value aggregation".into(),
-                        ))
-                    }
-                };
-                let keys = reduction.group_keys().ok_or_else(|| {
-                    QueryPlanError::Invalid(
-                        "per-entity exact value aggregation has no grouping".into(),
-                    )
-                })?;
-                let labels = keys
-                    .keys()
-                    .iter()
-                    .map(|&column| {
-                        child
-                            .schema
-                            .fields
-                            .get(column)
-                            .map(|field| field.name.clone())
-                            .ok_or_else(|| {
-                                QueryPlanError::Invalid(
-                                    "unresolved exact aggregation column".into(),
-                                )
-                            })
-                    })
-                    .collect::<Result<Vec<_>, _>>()?;
-                let grouping = query_time::Grouping {
-                    labels,
-                    without: keys.is_without(),
-                };
-                let operator = query_time::QueryTimeOperator::Aggregate {
-                    operation: operation.expect("aggregate operation"),
-                    grouping,
-                };
-                QueryPlanNode::Logical {
-                    operator,
-                    inputs: vec![self.lower(child)?],
-                }
-            }
-            SummaryExpr::ValueOperation {
-                child,
-                operation:
-                    planner_types::post_asap::ValueOperation::Limit { .. }
-                    | planner_types::post_asap::ValueOperation::Sort { .. }
-                    | planner_types::post_asap::ValueOperation::Filter { .. },
-                timing: planner_types::post_asap::ExecutionTiming::QueryTime,
-            } => {
-                let input = self.lower(child)?;
-                compile_native_fragment(node, &[input])?
-            }
-            SummaryExpr::ValueOperation { .. } => QueryPlanNode::ExactFallback {
-                reason: "unsupported post-ASAP value operation".into(),
-            },
-            SummaryExpr::RelationalJoin {
-                right: candidates,
-                left: values,
-                kind: planner_types::pre_asap::JoinKind::Semi,
-                pruning,
-                ..
-            } => {
-                let candidate_input = self.lower(candidates)?;
-                let value_input = if let Some(original) =
-                    self.logical_source.as_ref().filter(|_| pruning.is_some())
-                {
-                    let exact_expression =
-                        query_time::selected_native_expression(original, values)?;
-                    let value_id = QueryNodeId(self.next_id);
-                    self.next_id += 1;
-                    self.nodes.insert(
-                        value_id,
-                        QueryPlanNode::ExternalExact {
-                            request: ExternalExactRequest {
-                                language: QueryLanguage::PromQl,
-                                expression: exact_expression.to_string(),
-                                output: ExternalExactOutput::InstantVector,
-                                parameters: BTreeMap::new(),
-                                start_parameter: None,
-                                end_parameter: None,
-                                // The external source provides values; the Planner DAG owns matching.
-                                input_contracts: vec![],
-                            },
-                            inputs: vec![],
-                        },
-                    );
-                    value_id
-                } else {
-                    self.lower(values)?
-                };
-                compile_native_fragment(node, &[value_input, candidate_input])?
-            }
-            SummaryExpr::RelationalJoin { .. } => QueryPlanNode::ExactFallback {
-                reason: "unsupported join in vector adapter".into(),
-            },
-            SummaryExpr::BinaryOp {
-                lhs,
-                rhs,
-                operator,
-                timing: planner_types::post_asap::ExecutionTiming::QueryTime,
-            } if matches!(
-                operator.kind,
-                planner_types::pre_asap::BinaryOpKind::Arithmetic(_)
-            ) && operator.vector_match.is_none()
-                && !operator.checked_relative_division
-                && !operator.checked_finite_division
-                && node.guarantee.as_ref().is_some_and(|g| !g.has_unknown())
-                && [lhs, rhs].iter().all(|operand| {
-                    matches!(
-                        operand.expr,
-                        SummaryExpr::SummaryEstimate {
-                            query: planner_types::post_asap::SketchQuery::Quantile { .. },
-                            ..
-                        }
-                    )
-                }) =>
-            {
-                let planner_types::pre_asap::BinaryOpKind::Arithmetic(kind) = &operator.kind else {
-                    unreachable!()
-                };
-                QueryPlanNode::Binary {
-                    inputs: [self.lower(lhs)?, self.lower(rhs)?],
-                    operator: kind.clone(),
-                }
-            }
-            SummaryExpr::BinaryOp {
-                lhs,
-                rhs,
-                operator,
-                timing: planner_types::post_asap::ExecutionTiming::QueryTime,
-            } if self.logical_source.is_some()
-                || operator.checked_relative_division
-                || operator.checked_finite_division =>
-            {
-                let operator = query_time::binary_operator(operator)?;
-                QueryPlanNode::Logical {
-                    operator,
-                    inputs: vec![self.lower(lhs)?, self.lower(rhs)?],
-                }
-            }
-
-            SummaryExpr::SummaryAgg {
-                family: SummaryFamilyType::ExactAggregate(kind, _),
-                child,
-                reduction,
-                ..
-            } if self.logical_source.is_some()
-                && !matches!(child.expr, SummaryExpr::KeepPreAsap(_)) =>
-            {
-                if !matches!(
-                    kind,
-                    planner_types::post_asap::ExactKind::Sum
-                        | planner_types::post_asap::ExactKind::Count
-                ) {
-                    let operator = query_time::selected_aggregate_operator(
-                        self.logical_source.as_deref().unwrap(),
-                        node,
-                    )?;
-                    let input = self.lower(child)?;
-                    self.nodes.insert(
-                        id,
-                        QueryPlanNode::Logical {
-                            operator,
-                            inputs: vec![input],
-                        },
-                    );
-                    return Ok(id);
-                }
-                let operation = match kind {
-                    planner_types::post_asap::ExactKind::Sum => query_time::Aggregation::Sum,
-                    planner_types::post_asap::ExactKind::Count => query_time::Aggregation::Count,
-                    _ => {
-                        return Err(QueryPlanError::Invalid(
-                            "unsupported aggregation over selected summary values".into(),
-                        ))
-                    }
-                };
-                let keys = reduction.group_keys().ok_or_else(|| {
-                    QueryPlanError::Invalid(
-                        "per-entity summary reduction requires a temporal operator".into(),
-                    )
-                })?;
-                let labels = keys
-                    .keys()
-                    .iter()
-                    .map(|&column| {
-                        child
-                            .schema
-                            .fields
-                            .get(column)
-                            .map(|field| field.name.clone())
-                            .ok_or_else(|| {
-                                QueryPlanError::Invalid("unresolved logical grouping column".into())
-                            })
-                    })
-                    .collect::<Result<Vec<_>, _>>()?;
-                QueryPlanNode::Logical {
-                    operator: query_time::QueryTimeOperator::Aggregate {
-                        operation,
-                        grouping: query_time::Grouping {
-                            labels,
-                            without: keys.is_without(),
-                        },
-                    },
-                    inputs: vec![self.lower(child)?],
-                }
-            }
-            SummaryExpr::BinaryOp {
-                lhs,
-                rhs,
-                operator,
-                timing: planner_types::post_asap::ExecutionTiming::QueryTime,
-            } if exact_value_executable(node) => {
-                let planner_types::pre_asap::BinaryOpKind::Arithmetic(operator) = &operator.kind
-                else {
-                    unreachable!()
-                };
-                QueryPlanNode::Binary {
-                    inputs: [self.lower(lhs)?, self.lower(rhs)?],
-                    operator: operator.clone(),
-                }
-            }
-            SummaryExpr::KeepPreAsap(expr) if scalar_literal(expr).is_some() => {
-                QueryPlanNode::Scalar {
-                    value: scalar_literal(expr).unwrap(),
-                }
-            }
-            SummaryExpr::KeepPreAsap(expr) if self.preserve_relational => {
-                let mut expression =
-                    clickhouse_exact::render(expr).map_err(QueryPlanError::UnsupportedNode)?;
-                let mut bounded = false;
-                if let planner_types::pre_asap::QueryExpr::Scan {
-                    predicates, schema, ..
-                } = expr.as_ref()
-                {
-                    if predicates.is_empty() {
-                        if let Some(column) = schema.time_index.and_then(|i| schema.columns.get(i))
-                        {
-                            let name = format!("`{}`", column.name.replace('`', "``"));
-                            expression.push_str(&format!(
-                                " WHERE {name} >= {{from:UInt64}} AND {name} <= {{to:UInt64}}"
-                            ));
-                            bounded = true;
-                        }
-                    }
-                }
-                QueryPlanNode::ExternalExact {
-                    request: ExternalExactRequest {
-                        language: QueryLanguage::ClickHouseSql,
-                        expression,
-                        output: ExternalExactOutput::Relation {
-                            schema: serde_json::to_value(&node.schema).map_err(|error| {
-                                QueryPlanError::Invalid(format!(
-                                    "cannot serialize external exact schema: {error}"
-                                ))
-                            })?,
-                        },
-                        parameters: BTreeMap::new(),
-                        start_parameter: bounded.then(|| "from".into()),
-                        end_parameter: bounded.then(|| "to".into()),
-                        input_contracts: Vec::new(),
-                    },
-                    inputs: Vec::new(),
-                }
-            }
-            SummaryExpr::SummaryAgg {
-                family:
-                    SummaryFamilyType::ExactAggregate(planner_types::post_asap::ExactKind::Sum, _),
-                child,
-                reduction,
-                ..
-            } if !matches!(child.expr, SummaryExpr::KeepPreAsap(_))
-                && exact_value_executable(node) =>
-            {
-                QueryPlanNode::ReduceSum {
-                    input: self.lower(child)?,
-                    grouping: physical_grouping(reduction, child)?,
-                }
-            }
-            SummaryExpr::SummaryAgg {
-                child,
-                family,
-                reduction,
-                ..
-            } if !matches!(child.expr, SummaryExpr::KeepPreAsap(_)) => {
-                // A compiled immutable dependency is already materialized. Its
-                // query reads that binding instead of replaying maintenance.
-                match (self.bind)(node, family) {
-                    Ok(mut binding) => {
-                        binding.output_grouping = physical_grouping(reduction, child)?;
-                        if let Some(readout) = exact_readout(family) {
-                            let input = QueryNodeId(self.next_id);
-                            self.next_id += 1;
-                            self.nodes
-                                .insert(input, QueryPlanNode::ReadMaterialization { binding });
-                            QueryPlanNode::ExactReadout { input, readout }
-                        } else {
-                            QueryPlanNode::ReadMaterialization { binding }
-                        }
-                    }
-                    Err(_) => QueryPlanNode::ExactFallback {
-                        reason: "unsupported exact operation over summary output".into(),
-                    },
-                }
-            }
-            // Relational count bindings validate their row population and value
-            // projection in the SQL compiler; the temporal restriction belongs
-            // to the PromQL observation-count path.
-            SummaryExpr::SummaryAgg {
-                family:
-                    SummaryFamilyType::ExactAggregate(planner_types::post_asap::ExactKind::Count, _),
-                ..
-            } if !self.preserve_relational && !exact_value_executable(node) => {
-                QueryPlanNode::ExactFallback {
-                    reason: "only temporal observation counts are supported".into(),
-                }
-            }
-            SummaryExpr::BinaryOp { .. } => QueryPlanNode::ExactFallback {
-                reason: "summary binary operation is not executable by the warm tier".into(),
-            },
-            SummaryExpr::KeepPreAsap(_) => QueryPlanNode::ExactFallback {
-                reason: "post-ASAP node requires exact execution".into(),
-            },
-            SummaryExpr::SummaryAgg {
-                family,
-                reduction,
-                child,
-                ..
-            } => match family {
-                SummaryFamilyType::ExactAggregate(..) | SummaryFamilyType::Sketch(..) => {
-                    let mut binding = match (self.bind)(node, family) {
-                        Ok(binding) => binding,
-                        Err(error) => {
-                            if let Some(original) = &self.logical_source {
-                                let (root, nodes) =
-                                    query_time::selected_query_time_nodes(original, node)?;
-                                return self.graft(id, root, nodes);
-                            }
-                            return Err(error);
-                        }
-                    };
-                    binding.output_grouping = physical_grouping(reduction, child)?;
-                    if let Some(readout) = exact_readout(family) {
-                        let existing = self.nodes.iter().find_map(|(id, node)| {
-                            matches!(node, QueryPlanNode::ReadMaterialization { binding: other } if other == &binding).then_some(*id)
-                        });
-                        let input = existing.unwrap_or_else(|| {
-                            let input = QueryNodeId(self.next_id);
-                            self.next_id += 1;
-                            self.nodes
-                                .insert(input, QueryPlanNode::ReadMaterialization { binding });
-                            input
-                        });
-                        QueryPlanNode::ExactReadout { input, readout }
-                    } else {
-                        QueryPlanNode::ReadMaterialization { binding }
-                    }
-                }
-                other => QueryPlanNode::ExactFallback {
-                    reason: format!("summary family {other:?} is not executable by the warm tier"),
-                },
-            },
-            SummaryExpr::SummaryEstimate {
-                summary_input,
-                query,
-            } => QueryPlanNode::SummaryEstimate {
-                input: self.lower(summary_input)?,
-                query: query.clone().into(),
-            },
-            SummaryExpr::SummaryMerge { children, .. } => {
-                if children.is_empty() {
-                    QueryPlanNode::ExactFallback {
-                        reason: "empty summary_merge".into(),
-                    }
-                } else {
-                    QueryPlanNode::SummaryMerge {
-                        inputs: children
-                            .iter()
-                            .map(|child| self.lower(child))
-                            .collect::<Result<_, _>>()?,
-                    }
-                }
-            }
-            SummaryExpr::SummaryJoin { .. } => QueryPlanNode::ExactFallback {
-                reason: "summary_join is not executable by the warm tier".into(),
-            },
-            SummaryExpr::SummarySubtract { .. } => QueryPlanNode::ExactFallback {
-                reason: "summary_subtract is not executable by the warm tier".into(),
-            },
-            SummaryExpr::SummaryDelete { .. } => QueryPlanNode::ExactFallback {
-                reason: "summary_delete is not executable by the warm tier".into(),
-            },
-        };
-        self.nodes.insert(id, physical);
-        if let Some(lowered) = &mut self.lowered {
-            lowered(node, id);
-        }
-        Ok(id)
-    }
-}
-
-fn exact_readout(family: &SummaryFamilyType) -> Option<ExactReadout> {
-    use planner_types::post_asap::ExactKind;
-    match family {
-        SummaryFamilyType::ExactAggregate(ExactKind::Sum, _) => Some(ExactReadout::Sum),
-        SummaryFamilyType::ExactAggregate(ExactKind::Count, _) => Some(ExactReadout::Count),
-        SummaryFamilyType::ExactAggregate(ExactKind::Increase, _) => Some(ExactReadout::Increase),
-        SummaryFamilyType::ExactAggregate(ExactKind::Rate, _) => Some(ExactReadout::Rate),
-        SummaryFamilyType::ExactAggregate(ExactKind::Min, _) => Some(ExactReadout::Min),
-        SummaryFamilyType::ExactAggregate(ExactKind::Max, _) => Some(ExactReadout::Max),
-        _ => None,
-    }
-}
-
-fn scalar_literal(expr: &planner_types::pre_asap::QueryExpr) -> Option<f64> {
-    use planner_types::pre_asap::{QueryExpr, ScalarValue};
-    let value = match expr {
-        QueryExpr::PromqlScalarBridge(child) => return scalar_literal(child),
-        QueryExpr::Literal(ScalarValue::Float64(value)) => *value,
-        QueryExpr::Literal(ScalarValue::Int64(value)) => *value as f64,
-        _ => return None,
-    };
-    value.is_finite().then_some(value)
-}
-
-/// A value edge may explicitly finalize an exact accumulator at either
-/// execution time. Inspect only this typed boundary; other value operations
-/// cannot be treated as transparent producer identity.
-pub(crate) fn exact_accumulator_value_source(node: &SummaryNode) -> Option<&SummaryNode> {
-    let source = match &node.expr {
-        SummaryExpr::ValueOperation {
-            child,
-            operation: planner_types::post_asap::ValueOperation::FinalizeExactAccumulator,
-            ..
-        } => child.as_ref(),
-        _ => node,
-    };
-    matches!(
-        source.expr,
-        SummaryExpr::SummaryAgg {
-            family: SummaryFamilyType::ExactAggregate(..),
-            ..
-        }
-    )
-    .then_some(source)
-}
-
-/// The current exact arithmetic adapter is deliberately narrower than PromQL:
-/// default vector matching, scalar literals and additive temporal readouts.
-/// Unsupported operands make the complete expression fall back.
-pub(crate) fn exact_value_executable(node: &SummaryNode) -> bool {
-    use planner_types::post_asap::ExactKind;
-    if !node
-        .guarantee
-        .as_ref()
-        .is_some_and(|guarantee| guarantee.is_exact())
-    {
-        return false;
-    }
-    match &node.expr {
-        SummaryExpr::ValueOperation { .. } => {
-            exact_accumulator_value_source(node).is_some_and(exact_value_executable)
-        }
-        SummaryExpr::KeepPreAsap(expr) => scalar_literal(expr).is_some(),
-        SummaryExpr::BinaryOp {
-            lhs,
-            rhs,
-            operator,
-            timing: planner_types::post_asap::ExecutionTiming::QueryTime,
-        } => {
-            matches!(
-                operator.kind,
-                planner_types::pre_asap::BinaryOpKind::Arithmetic(_)
-            ) && operator.vector_match.is_none()
-                && exact_value_executable(lhs)
-                && exact_value_executable(rhs)
-                && value_grouping(node).is_ok()
-                && match (value_source(lhs), value_source(rhs)) {
-                    (Some(left), Some(right)) => left == right,
-                    _ => true,
-                }
-        }
-        SummaryExpr::SummaryAgg {
-            family: SummaryFamilyType::ExactAggregate(kind, _),
-            child,
-            reduction,
-            ..
-        } => {
-            if matches!(child.expr, SummaryExpr::KeepPreAsap(_)) {
-                matches!(&child.expr, SummaryExpr::KeepPreAsap(expr) if matches!(expr.as_ref(), planner_types::pre_asap::QueryExpr::TimeRange { child, .. } if matches!(child.as_ref(), planner_types::pre_asap::QueryExpr::Scan { .. })))
-                    && matches!(reduction, Reduction::PerEntity)
-                    && matches!(
-                        kind,
-                        ExactKind::Sum
-                            | ExactKind::Count
-                            | ExactKind::Increase
-                            | ExactKind::Rate
-                            | ExactKind::Min
-                            | ExactKind::Max
-                    )
-            } else {
-                // Raw producer grouping may move through additive reductions,
-                // but never through division or other value arithmetic.
-                matches!(kind, ExactKind::Sum)
-                    && exact_accumulator_value_source(child).is_some()
-                    && exact_value_executable(child)
-            }
-        }
-        _ => false,
-    }
-}
-
-fn value_grouping(node: &SummaryNode) -> Result<Option<PhysicalGrouping>, QueryPlanError> {
-    if matches!(node.expr, SummaryExpr::ValueOperation { .. }) {
-        if let Some(source) = exact_accumulator_value_source(node) {
-            return value_grouping(source);
-        }
-    }
-    match &node.expr {
-        SummaryExpr::KeepPreAsap(_) => Ok(None),
-        SummaryExpr::SummaryAgg {
-            reduction, child, ..
-        } => physical_grouping(reduction, child).map(Some),
-        SummaryExpr::BinaryOp { lhs, rhs, .. } => {
-            let left = value_grouping(lhs)?;
-            let right = value_grouping(rhs)?;
-            match (left, right) {
-                (Some(left), Some(right)) if left != right => Err(QueryPlanError::Invalid(
-                    "arithmetic operands require different producer grouping contracts".into(),
-                )),
-                (left, right) => Ok(left.or(right)),
-            }
-        }
-        _ => Err(QueryPlanError::Invalid(
-            "unsupported exact value grouping".into(),
-        )),
-    }
-}
-
-// The MVP QueryPlan evaluates all operands over one interval. Different
-// selectors/windows need per-operand time binding before they can be warm.
-fn value_source(node: &SummaryNode) -> Option<&planner_types::pre_asap::QueryExpr> {
-    match &node.expr {
-        SummaryExpr::ValueOperation { .. } => {
-            exact_accumulator_value_source(node).and_then(value_source)
-        }
-        SummaryExpr::SummaryAgg { child, .. } => match &child.expr {
-            SummaryExpr::KeepPreAsap(expr) => Some(expr),
-            _ => value_source(child),
-        },
-        SummaryExpr::BinaryOp { lhs, rhs, .. } => value_source(lhs).or_else(|| value_source(rhs)),
-        _ => None,
-    }
-}
-
-fn physical_grouping(
-    reduction: &Reduction,
-    child: &SummaryNode,
-) -> Result<PhysicalGrouping, QueryPlanError> {
-    let Some(keys) = reduction.group_keys() else {
-        return Ok(PhysicalGrouping::PerEntity);
-    };
-    let names = keys
-        .keys()
-        .iter()
-        .map(|&id| {
-            child
-                .schema
-                .fields
-                .get(id)
-                .map(|f| f.name.clone())
-                .ok_or_else(|| QueryPlanError::Invalid(format!("unresolved grouping column {id}")))
-        })
-        .collect::<Result<_, _>>()?;
-    Ok(PhysicalGrouping::Reduce(names))
-}
-
-#[cfg(test)]
-mod catalog_binding_tests {
-    use super::*;
-    use crate::physical::summary_catalog::SummaryCatalog;
-    use asap_types::{AggregationType, KeyByLabelNames, PrecomputeMaterialization, WindowKind};
-
-    fn fixture() -> (QueryPlan, SummaryCatalog) {
-        let mut config = PrecomputeMaterialization::new(
-            AggregationType::Sum,
-            String::new(),
-            Default::default(),
-            KeyByLabelNames::new(vec!["job".into()]),
-            KeyByLabelNames::empty(),
-            KeyByLabelNames::empty(),
-            String::new(),
-            10,
-            10,
-            WindowKind::Tumbling,
-            String::new(),
-            "m".into(),
-            None,
-            None,
-            None,
-        );
-        config.pane_origin_ms = Some(0);
-        let catalog = SummaryCatalog::from_materializations(7, 2, &[config.clone()]).unwrap();
-        let entry = QueryPlanEntry {
-            language: crate::query_plan::QueryLanguage::PromQl,
-            query_id: "q".into(),
-            canonical_query: "sum_over_time(m[1m])".into(),
-            fixed_evaluation: None,
-            root: QueryNodeId(1),
-            nodes: BTreeMap::from([(
-                QueryNodeId(1),
-                QueryPlanNode::ReadMaterialization {
-                    binding: MaterializationBinding {
-                        full_window_slide_ms: None,
-                        item_labels: Vec::new(),
-                        materialization: config.policy_fingerprint().into(),
-                        stored_output_reference: catalog
-                            .output_reference(config.policy_fingerprint().into())
-                            .unwrap(),
-                        output_grouping: PhysicalGrouping::PerEntity,
-                        window_ms: 10_000,
-                        pane_origin_ms: Some(0),
-                        readout_lookback_ms: Some(60_000),
-                    },
-                },
-            )]),
-            instant: InstantExecution {
-                lookback_ms: 60_000,
-                full_history: false,
-                cumulative_readout: true,
-            },
-            fallback: FallbackPolicy::ExactBackend,
-        };
-        (
-            QueryPlan {
-                plan_id: 7,
-                plan_version: 2,
-                clickhouse_context: None,
-                selected_dags: Default::default(),
-                entries: BTreeMap::from([(entry.canonical_query.clone(), entry)]),
-            },
-            catalog,
-        )
-    }
-    fn binding(plan: &mut QueryPlan) -> &mut MaterializationBinding {
-        let QueryPlanNode::ReadMaterialization { binding } = plan
-            .entries
-            .values_mut()
-            .next()
-            .unwrap()
-            .nodes
-            .values_mut()
-            .next()
-            .unwrap()
-        else {
-            panic!("fixture")
-        };
-        binding
-    }
-
-    // One pane ID is compatible with a longer semantic readout window.
-    #[test]
-    fn catalog_binding_round_trip_preserves_pane_and_readout_windows() {
-        let (plan, catalog) = fixture();
-        let wire = serde_json::to_vec(&plan).unwrap();
-        let mut decoded: QueryPlan = serde_json::from_slice(&wire).unwrap();
-        decoded.validate_against_catalog(&catalog).unwrap();
-        assert_eq!(
-            decoded
-                .lookup("sum_over_time(m[1m])")
-                .unwrap()
-                .canonical_query,
-            "sum_over_time(m[1m])"
-        );
-        assert!(String::from_utf8(wire).unwrap().contains("canonical_query"));
-        assert_eq!(binding(&mut decoded).window_ms, 10_000);
-        assert_eq!(binding(&mut decoded).readout_lookback_ms, Some(60_000));
-    }
-
-    // The catalog owns source and grouping; the binding owns only its stable ID.
-    #[test]
-    fn catalog_binding_rejects_source_grouping_and_identity_drift() {
-        let (plan, catalog) = fixture();
-        let mut broken = plan.clone();
-        binding(&mut broken).materialization = PolicyFingerprint(123).into();
-        assert!(broken.validate_against_catalog(&catalog).is_err());
-        let mut broken = plan.clone();
-        broken.plan_version += 1;
-        assert!(broken.validate_against_catalog(&catalog).is_err());
-        let mut broken = plan;
-        binding(&mut broken).window_ms = 0;
-        assert!(broken.validate_against_catalog(&catalog).is_err());
-    }
-
-    // Catalog descriptor corruption must fail even if the materialization exists.
-    #[test]
-    fn catalog_binding_rejects_broken_descriptor_reference() {
-        let (plan, mut catalog) = fixture();
-        catalog.summary_descriptors.clear();
-        assert!(plan.validate_against_catalog(&catalog).is_err());
-    }
-
-    #[test]
-    fn counter_readout_requires_counter_sds_fidelity() {
-        fn as_rate_plan(mut plan: QueryPlan) -> QueryPlan {
-            let entry = plan.entries.values_mut().next().unwrap();
-            let read = entry.root;
-            let root = QueryNodeId(2);
-            entry.root = root;
-            entry.nodes.insert(
-                root,
-                QueryPlanNode::ExactReadout {
-                    input: read,
-                    readout: ExactReadout::Rate,
-                },
-            );
-            plan
-        }
-
-        let (sum_plan, sum_catalog) = fixture();
-        assert!(as_rate_plan(sum_plan)
-            .validate_against_catalog(&sum_catalog)
-            .unwrap_err()
-            .to_string()
-            .contains("exact counter SDS"));
-
-        let mut counter = PrecomputeMaterialization::new(
-            AggregationType::Increase,
-            String::new(),
-            Default::default(),
-            KeyByLabelNames::new(vec!["job".into()]),
-            KeyByLabelNames::empty(),
-            KeyByLabelNames::empty(),
-            String::new(),
-            10,
-            10,
-            WindowKind::Tumbling,
-            String::new(),
-            "m".into(),
-            None,
-            None,
-            None,
-        );
-        counter.pane_origin_ms = Some(0);
-        let counter_catalog =
-            SummaryCatalog::from_materializations(7, 2, &[counter.clone()]).unwrap();
-        let (mut counter_plan, _) = fixture();
-        binding(&mut counter_plan).materialization = counter.policy_fingerprint().into();
-        binding(&mut counter_plan).stored_output_reference = counter_catalog
-            .output_reference(counter.policy_fingerprint().into())
-            .unwrap();
-        as_rate_plan(counter_plan)
-            .validate_against_catalog(&counter_catalog)
-            .unwrap();
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    #[test]
-    fn guarded_division_retains_checks_in_both_query_compilers() {
-        // Both compilers retain the finite/relative guard supplied by Planner.
-        let query = "avg_over_time(m[5m])";
-        let canonical = crate::query_parser::parse_query_expr_canonical(
-            query,
-            planner_types::types::AccuracyTarget::Exact,
-        )
-        .unwrap();
-        let root = crate::planner_selection::plan_test_query(&canonical).unwrap();
-        let SummaryExpr::BinaryOp { operator, .. } = &root.expr else {
-            panic!("expected the Planner's average rewrite");
-        };
-        assert!(operator.checked_finite_division);
-        for relative in [false, true] {
-            let mut guarded = root.as_ref().clone();
-            let SummaryExpr::BinaryOp { operator, .. } = &mut guarded.expr else {
-                unreachable!();
-            };
-            operator.checked_finite_division = !relative;
-            operator.checked_relative_division = relative;
-            let guarded = Rc::new(guarded);
-            for composable in [false, true] {
-                let instant = InstantExecution {
-                    lookback_ms: 300_000,
-                    full_history: false,
-                    cumulative_readout: false,
-                };
-                let bind = |_: &Rc<SummaryNode>, _: &SummaryFamilyType| {
-                    Ok(MaterializationBinding {
-                        full_window_slide_ms: None,
-                        materialization: PolicyFingerprint(7).into(),
-                        stored_output_reference: asap_types::sds::StoredOutputReference::for_output(
-                            PolicyFingerprint(7).into(),
-                        ),
-                        output_grouping: PhysicalGrouping::PerEntity,
-                        window_ms: 300_000,
-                        pane_origin_ms: Some(0),
-                        readout_lookback_ms: Some(300_000),
-                        item_labels: Vec::new(),
-                    })
-                };
-                let entry = if composable {
-                    compile_bound_composable_mapped(
-                        "guarded".into(),
-                        query.into(),
-                        &guarded,
-                        instant,
-                        FallbackPolicy::ExactBackend,
-                        bind,
-                        |_, _| {},
-                    )
-                } else {
-                    compile_bound_mapped(
-                        "guarded".into(),
-                        query.into(),
-                        &guarded,
-                        instant,
-                        FallbackPolicy::ExactBackend,
-                        bind,
-                        |_, _| {},
-                    )
-                }
-                .unwrap();
-                let QueryPlanNode::Logical {
-                    operator: query_time::QueryTimeOperator::Binary { operation, .. },
-                    ..
-                } = &entry.nodes[&entry.root]
-                else {
-                    panic!(
-                        "expected guarded division (composable={composable}): {:?}",
-                        entry.nodes
-                    );
-                };
-                assert_eq!(
-                    *operation,
-                    if relative {
-                        query_time::BinaryOperation::CheckedDiv
-                    } else {
-                        query_time::BinaryOperation::FiniteDiv
-                    }
-                );
-                assert!(!entry.materialization_bindings().is_empty());
-            }
-        }
-    }
-
-    #[test]
-    fn canonical_identity_ignores_formatting() {
-        assert_eq!(
-            canonical_promql("sum by (service) ( rate(http_requests_total[5m]) )").unwrap(),
-            canonical_promql("sum by(service)(rate(http_requests_total[5m]))").unwrap()
-        );
-    }
-
-    #[test]
-    fn language_tag_preserves_query_entry_serde() {
-        let entry = QueryPlanEntry {
-            language: crate::query_plan::QueryLanguage::PromQl,
-            query_id: "q".into(),
-            canonical_query: canonical_promql("up").unwrap(),
-            fixed_evaluation: None,
-            root: QueryNodeId(0),
-            nodes: BTreeMap::from([(
-                QueryNodeId(0),
-                QueryPlanNode::ExactFallback {
-                    reason: "fixture".into(),
-                },
-            )]),
-            instant: InstantExecution {
-                lookback_ms: 1,
-                full_history: false,
-                cumulative_readout: false,
-            },
-            fallback: FallbackPolicy::ExactBackend,
-        };
-        let before = serde_json::to_value(&entry).unwrap();
-        assert_eq!(before, serde_json::to_value(&entry).unwrap());
-        assert!(before.get("canonical_query").is_some());
-        assert!(before.get("executable").is_none());
-    }
-
-    #[test]
-    fn language_catalog_keys_keep_equal_query_text_distinct() {
-        let base = QueryPlanEntry {
-            language: QueryLanguage::PromQl,
-            query_id: "prom".into(),
-            canonical_query: "shared".into(),
-            fixed_evaluation: None,
-            root: QueryNodeId(0),
-            nodes: BTreeMap::from([(
-                QueryNodeId(0),
-                QueryPlanNode::ExactFallback {
-                    reason: "fixture".into(),
-                },
-            )]),
-            instant: InstantExecution {
-                lookback_ms: 1,
-                full_history: false,
-                cumulative_readout: false,
-            },
-            fallback: FallbackPolicy::ExactBackend,
-        };
-        let mut metricsql = base.clone();
-        metricsql.language = QueryLanguage::MetricsQl;
-        metricsql.query_id = "metrics".into();
-        let mut clickhouse = base.clone();
-        clickhouse.language = QueryLanguage::ClickHouseSql;
-        clickhouse.query_id = "sql".into();
-        clickhouse.fixed_evaluation = Some(FixedEvaluationRange {
-            start_ms: 1,
-            end_ms: 2,
-            cumulative: true,
-        });
-        let plan = QueryPlan {
-            plan_id: 0,
-            plan_version: 0,
-            clickhouse_context: Some(ClickHousePlanningContext {
-                window_templates: Default::default(),
-                tables: Default::default(),
-                accuracy: planner_types::types::AccuracyTarget::Exact,
-            }),
-            selected_dags: Default::default(),
-            entries: [base, metricsql, clickhouse]
-                .into_iter()
-                .map(|entry| (QueryPlan::catalog_key(entry.language, "shared"), entry))
-                .collect(),
-        };
-
-        assert_eq!(plan.entries.len(), 3);
-        assert_eq!(
-            plan.lookup_canonical(QueryLanguage::PromQl, "shared")
-                .unwrap()
-                .query_id,
-            "prom"
-        );
-        assert_eq!(
-            plan.lookup_canonical(QueryLanguage::MetricsQl, "shared")
-                .unwrap()
-                .query_id,
-            "metrics"
-        );
-        assert_eq!(plan.lookup_clickhouse("shared").unwrap().query_id, "sql");
-    }
-
-    // A protocol-vector binding cannot silently invent fields or reconstruct changed rows.
-    #[test]
-    fn physical_binding_rejects_invented_samples_and_changed_rows() {
-        use asap_physical_operators::{
-            operators::{Expression, Operator},
-            physical_planner::{CompiledPhysicalDag, InputContract},
-        };
-        use planner_types::{
-            post_asap::{SummaryFamilyType, SummaryField, SummarySchema},
-            pre_asap::DataType,
-        };
-        for duplicate_sample in [false, true] {
-            let schema = std::sync::Arc::new(SummarySchema {
-                fields: (0..if duplicate_sample { 2 } else { 1 })
-                    .map(|i| SummaryField {
-                        name: format!("v{i}"),
-                        dtype: SummaryFamilyType::Plain(DataType::Float64),
-                        nullable: false,
-                    })
-                    .collect(),
-                time_index: None,
-            });
-            let op = if duplicate_sample {
-                Operator::limit(schema.clone(), 1, 0, vec![]).unwrap()
-            } else {
-                Operator::project(schema.clone(), vec![("v0".into(), Expression::Column(0))])
-                    .unwrap()
-            };
-            let compiled = CompiledPhysicalDag::from_operators(
-                [(0, InputContract::bounded(schema))].into(),
-                [(1, (vec![0], op))].into(),
-                vec![1],
-            )
-            .unwrap();
-            let entry = QueryPlanEntry {
-                language: QueryLanguage::PromQl,
-                query_id: "q".into(),
-                canonical_query: "topk(1, m)".into(),
-                fixed_evaluation: None,
-                root: QueryNodeId(1),
-                nodes: BTreeMap::from([
-                    (
-                        QueryNodeId(0),
-                        QueryPlanNode::ExactFallback {
-                            reason: "prepared source".into(),
-                        },
-                    ),
-                    (
-                        QueryNodeId(1),
-                        QueryPlanNode::PhysicalFragment {
-                            inputs: vec![QueryNodeId(0)],
-                            dag: compiled.encode().unwrap(),
-                            row_input: 0,
-                            pruning: None,
-                        },
-                    ),
-                ]),
-                instant: InstantExecution {
-                    lookback_ms: 0,
-                    full_history: false,
-                    cumulative_readout: false,
-                },
-                fallback: FallbackPolicy::Reject,
-            };
-            let error = entry.validate(&BTreeSet::new()).unwrap_err().to_string();
-            assert!(
-                error.contains(if duplicate_sample {
-                    "one numeric sample"
-                } else {
-                    "preserve its bound input rows"
-                }),
-                "{error}"
-            );
-        }
-    }
-
-    #[test]
-    fn graph_validation_rejects_cycles() {
-        let mut nodes = BTreeMap::new();
-        nodes.insert(
-            QueryNodeId(0),
-            QueryPlanNode::SummaryMerge {
-                inputs: vec![QueryNodeId(0)],
-            },
-        );
-        let entry = QueryPlanEntry {
-            language: crate::query_plan::QueryLanguage::PromQl,
-            query_id: "q".into(),
-            canonical_query: "up".into(),
-            fixed_evaluation: None,
-            root: QueryNodeId(0),
-            nodes,
-            instant: InstantExecution {
-                lookback_ms: 0,
-                full_history: false,
-                cumulative_readout: false,
-            },
-            fallback: FallbackPolicy::Reject,
-        };
-        assert!(entry
-            .validate(&BTreeSet::new())
-            .unwrap_err()
-            .to_string()
-            .contains("cycle"));
-    }
-
-    #[test]
-    fn semi_join_rejects_invalid_completeness_contract() {
-        let leaf = QueryPlanNode::ExactFallback {
-            reason: "prepared".into(),
-        };
-        let entry = QueryPlanEntry {
-            language: crate::query_plan::QueryLanguage::PromQl,
-            query_id: "q".into(),
-            canonical_query: "topk(2, rate(m[5m]))".into(),
-            fixed_evaluation: None,
-            root: QueryNodeId(2),
-            nodes: BTreeMap::from([
-                (QueryNodeId(0), leaf.clone()),
-                (QueryNodeId(1), leaf),
-                (QueryNodeId(2), {
-                    let schema = planner_types::post_asap::SummarySchema {
-                        fields: vec![planner_types::post_asap::SummaryField {
-                            name: "pod".into(),
-                            dtype: planner_types::post_asap::SummaryFamilyType::Plain(
-                                planner_types::pre_asap::DataType::Utf8,
-                            ),
-                            nullable: false,
-                        }],
-                        time_index: None,
-                    };
-                    QueryPlanNode::RelationalJoin {
-                        inputs: [QueryNodeId(1), QueryNodeId(0)],
-                        join_kind: planner_types::pre_asap::JoinKind::Semi,
-                        pred: serde_json::to_value(planner_types::pre_asap::Predicate(
-                            std::rc::Rc::new(planner_types::pre_asap::QueryExpr::Compare {
-                                left: std::rc::Rc::new(planner_types::pre_asap::QueryExpr::Column(
-                                    0,
-                                )),
-                                op: planner_types::pre_asap::CompareOpKind::Eq,
-                                right: std::rc::Rc::new(
-                                    planner_types::pre_asap::QueryExpr::Column(1),
-                                ),
-                            }),
-                        ))
-                        .unwrap(),
-                        pruning: Some(CandidateCompleteness::Certified {
-                            guarantee: planner_types::post_asap::ResultGuarantee {
-                                metric: planner_types::post_asap::ErrorMetric::Frequency,
-                                bound: planner_types::post_asap::BoundExpr::Unknown {
-                                    statistic: "membership margin".into(),
-                                },
-                                failure_probability:
-                                    planner_types::post_asap::ProbabilityExpr::Unknown {
-                                        statistic: "membership confidence".into(),
-                                    },
-                                provenance: vec![],
-                            },
-                        }),
-                        left_schema: schema.clone(),
-                        right_schema: schema.clone(),
-                        output_schema: schema,
-                    }
-                }),
-            ]),
-            instant: InstantExecution {
-                lookback_ms: 300_000,
-                full_history: false,
-                cumulative_readout: false,
-            },
-            fallback: FallbackPolicy::ExactBackend,
-        };
-        assert!(entry.validate(&BTreeSet::new()).is_err());
-    }
-}
diff --git a/control_plane/src/query_plan/clickhouse_exact.rs b/control_plane/src/query_plan/clickhouse_exact.rs
deleted file mode 100644
index bcd31fb85..000000000
--- a/control_plane/src/query_plan/clickhouse_exact.rs
+++ /dev/null
@@ -1,472 +0,0 @@
-//! Render a supported canonical relational cut without changing its row population.
-//! Unsupported operators remain admission errors, never guessed SQL semantics.
-use planner_types::pre_asap::{
-    AggIntent, ArithmeticOpKind, CompareOpKind, QueryExpr, Reduction, ScalarValue, Schema, Source,
-};
-
-fn quoted(name: &str) -> String {
-    format!("`{}`", name.replace('`', "``"))
-}
-fn column(index: usize, schema: &Schema) -> Result<String, String> {
-    schema
-        .columns
-        .get(index)
-        .map(|c| quoted(&c.name))
-        .ok_or_else(|| format!("unresolved exact column {index}"))
-}
-fn scalar(expr: &QueryExpr, schema: &Schema) -> Result<String, String> {
-    Ok(match expr {
-        QueryExpr::Column(id) => column(*id, schema)?,
-        QueryExpr::Literal(value) => match value {
-            ScalarValue::Int64(v) => v.to_string(),
-            ScalarValue::Float64(v) if v.is_finite() => format!("toFloat64('{}')", v),
-            ScalarValue::Utf8(v) => format!("'{}'", v.replace('\\', "\\\\").replace('\'', "\\'")),
-            ScalarValue::Boolean(v) => if *v { "true" } else { "false" }.into(),
-            ScalarValue::Null => "NULL".into(),
-            _ => return Err("nonfinite exact literal".into()),
-        },
-        QueryExpr::Arithmetic { op, left, right } => {
-            let op = match op {
-                ArithmeticOpKind::Add => "+",
-                ArithmeticOpKind::Sub => "-",
-                ArithmeticOpKind::Mul => "*",
-                ArithmeticOpKind::Div => "/",
-                ArithmeticOpKind::Mod => "%",
-                _ => return Err("unsupported exact arithmetic".into()),
-            };
-            format!(
-                "({} {op} {})",
-                scalar(left, schema)?,
-                scalar(right, schema)?
-            )
-        }
-        QueryExpr::Compare { op, left, right } => {
-            let op = match op {
-                CompareOpKind::Eq => "=",
-                CompareOpKind::Ne => "!=",
-                CompareOpKind::Lt => "<",
-                CompareOpKind::Le => "<=",
-                CompareOpKind::Gt => ">",
-                CompareOpKind::Ge => ">=",
-                _ => return Err("unsupported exact comparison".into()),
-            };
-            format!(
-                "({} {op} {})",
-                scalar(left, schema)?,
-                scalar(right, schema)?
-            )
-        }
-        QueryExpr::BoolAnd(args) | QueryExpr::BoolOr(args) => {
-            let and = matches!(expr, QueryExpr::BoolAnd(_));
-            if args.is_empty() {
-                if and { "true" } else { "false" }.into()
-            } else {
-                format!(
-                    "({})",
-                    args.iter()
-                        .map(|e| scalar(e, schema))
-                        .collect::<Result<Vec<_>, _>>()?
-                        .join(if and { " AND " } else { " OR " })
-                )
-            }
-        }
-        QueryExpr::Not(arg) => format!("NOT ({})", scalar(arg, schema)?),
-        QueryExpr::IsNull(arg) => format!("({} IS NULL)", scalar(arg, schema)?),
-        QueryExpr::IsNotNull(arg) => format!("({} IS NOT NULL)", scalar(arg, schema)?),
-        QueryExpr::FunctionCall { name, args } => {
-            let function = match name.as_str() {
-                "map" => "map",
-                "mapconcat" => "mapConcat",
-                "asap_map_access" | "asap_element_access" => "arrayElement",
-                "asap_struct_field" => "tupleElement",
-                _ => return Err(format!("unsupported exact scalar function {name}")),
-            };
-            expr.scalar_type(schema).map_err(|e| e.to_string())?;
-            format!(
-                "{function}({})",
-                args.iter()
-                    .map(|e| scalar(e, schema))
-                    .collect::<Result<Vec<_>, _>>()?
-                    .join(", ")
-            )
-        }
-        _ => return Err("unsupported exact scalar expression".into()),
-    })
-}
-fn aggregate(intent: &AggIntent, schema: &Schema) -> Result<String, String> {
-    if let Some((arg, order)) = intent.arg_selector_columns(schema)? {
-        let AggIntent::Extension { ext_kind, .. } = intent else {
-            unreachable!()
-        };
-        let function = if ext_kind == "arg_max" {
-            "argMax"
-        } else {
-            "argMin"
-        };
-        return Ok(format!(
-            "{function}({}, {})",
-            column(arg, schema)?,
-            column(order, schema)?
-        ));
-    }
-    let (function, col) = match intent {
-        AggIntent::Count { .. } => return Ok("count()".into()),
-        AggIntent::Sum { col } => ("sum", col),
-        AggIntent::Min { col } => ("min", col),
-        AggIntent::Max { col } => ("max", col),
-        AggIntent::Avg { col } => ("avg", col),
-        _ => return Err("unsupported exact aggregate contract".into()),
-    };
-    Ok(format!(
-        "{function}({})",
-        column(
-            col.ok_or("SQL aggregate requires explicit input column")?,
-            schema
-        )?
-    ))
-}
-/// Composite cuts retain their own canonical predicates; caller bounds are not
-/// injected into descendant scans (which may belong to independent windows).
-pub(super) fn render(expr: &QueryExpr) -> Result<String, String> {
-    let output = expr.output_schema().map_err(|e| e.to_string())?;
-    // SQL names must identify a unique positional field at each nested boundary.
-    let mut names = std::collections::BTreeSet::new();
-    if output.columns.iter().any(|c| !names.insert(&c.name)) {
-        return Err("ambiguous exact output column names".into());
-    }
-    match expr {
-        QueryExpr::Scan {
-            source: Source::Table { table_ref },
-            predicates,
-            schema,
-        } => {
-            let table = table_ref
-                .split('.')
-                .map(quoted)
-                .collect::<Vec<_>>()
-                .join(".");
-            let columns = schema
-                .columns
-                .iter()
-                .map(|c| quoted(&c.name))
-                .collect::<Vec<_>>()
-                .join(", ");
-            let filters = predicates
-                .iter()
-                .map(|p| scalar(&p.0, schema))
-                .collect::<Result<Vec<_>, _>>()?;
-            Ok(format!(
-                "SELECT {columns} FROM {table}{}",
-                if filters.is_empty() {
-                    String::new()
-                } else {
-                    format!(" WHERE {}", filters.join(" AND "))
-                }
-            ))
-        }
-        QueryExpr::Filter { pred, child } => {
-            let schema = child.output_schema().map_err(|e| e.to_string())?;
-            Ok(format!(
-                "SELECT * FROM ({}) WHERE {}",
-                render(child)?,
-                scalar(&pred.0, &schema)?
-            ))
-        }
-        QueryExpr::Project { cols, child, .. } => {
-            let schema = child.output_schema().map_err(|e| e.to_string())?;
-            if cols.len() != output.columns.len() {
-                return Err("exact projection width mismatch".into());
-            }
-            let columns = cols
-                .iter()
-                .zip(&output.columns)
-                .map(|(item, col)| {
-                    Ok(format!(
-                        "{} AS {}",
-                        scalar(&item.expr, &schema)?,
-                        quoted(&col.name)
-                    ))
-                })
-                .collect::<Result<Vec<_>, String>>()?;
-            Ok(format!(
-                "SELECT {} FROM ({})",
-                columns.join(", "),
-                render(child)?
-            ))
-        }
-        QueryExpr::Aggregate {
-            reduction: Reduction::Reduce(keys),
-            measures,
-            having: None,
-            child,
-            ..
-        } if !keys.is_without() => {
-            let schema = child.output_schema().map_err(|e| e.to_string())?;
-            let groups = keys
-                .keys()
-                .iter()
-                .map(|id| column(*id, &schema))
-                .collect::<Result<Vec<_>, _>>()?;
-            let mut values = groups.clone();
-            values.extend(
-                measures
-                    .iter()
-                    .map(|m| aggregate(m, &schema))
-                    .collect::<Result<Vec<_>, _>>()?,
-            );
-            if values.len() != output.columns.len() {
-                return Err("exact aggregate width mismatch".into());
-            }
-            let values = values
-                .iter()
-                .zip(&output.columns)
-                .map(|(v, c)| format!("{v} AS {}", quoted(&c.name)))
-                .collect::<Vec<_>>();
-            Ok(format!(
-                "SELECT {} FROM ({}){}",
-                values.join(", "),
-                render(child)?,
-                if groups.is_empty() {
-                    String::new()
-                } else {
-                    format!(" GROUP BY {}", groups.join(", "))
-                }
-            ))
-        }
-        QueryExpr::Sort {
-            keys,
-            partition_by,
-            child,
-        } if partition_by.keys().is_empty() && !partition_by.is_without() => {
-            let schema = child.output_schema().map_err(|e| e.to_string())?;
-            let keys = keys
-                .iter()
-                .map(|key| {
-                    Ok(format!(
-                        "{} {} NULLS {}",
-                        scalar(&key.expr, &schema)?,
-                        if key.ascending { "ASC" } else { "DESC" },
-                        if key.nulls_first { "FIRST" } else { "LAST" }
-                    ))
-                })
-                .collect::<Result<Vec<_>, String>>()?;
-            if keys.is_empty() {
-                return Err("empty exact sort".into());
-            }
-            Ok(format!(
-                "SELECT * FROM ({}) ORDER BY {}",
-                render(child)?,
-                keys.join(", ")
-            ))
-        }
-        QueryExpr::Limit { n, offset, child } => Ok(format!(
-            "SELECT * FROM ({}) LIMIT {n} OFFSET {offset}",
-            render(child)?
-        )),
-        _ => Err("unsupported canonical ClickHouse exact subtree".into()),
-    }
-}
-
-#[cfg(test)]
-mod original_tests {
-    use super::*;
-    use asap_frontend_sql::{lower_sql_dialect, SqlCatalog};
-    use planner_types::{
-        pre_asap::{Column, DataType},
-        types::AccuracyTarget,
-        workload::SqlDialect,
-    };
-    #[tokio::test]
-    async fn original_exact_shapes_retain_native_aggregates_and_bounds() {
-        let catalog = SqlCatalog::new().with_table(
-            "raw_samples",
-            Schema::new(vec![
-                Column::new("metric", DataType::Utf8, false),
-                Column::new("ts_ms", DataType::Int64, false),
-                Column::new("value", DataType::Float64, false),
-                Column::new(
-                    "labels",
-                    DataType::Map {
-                        key: Box::new(DataType::Utf8),
-                        value: Box::new(DataType::Utf8),
-                        value_nullable: false,
-                    },
-                    false,
-                ),
-            ]),
-        );
-        for sql in [
-            include_str!("../../tests/fixtures/sql_exact_cuts/q07.sql"),
-            include_str!("../../tests/fixtures/sql_exact_cuts/q09.sql"),
-            include_str!("../../tests/fixtures/sql_exact_cuts/q12.sql"),
-            include_str!("../../tests/fixtures/sql_exact_cuts/q27.sql"),
-        ] {
-            let canonical = lower_sql_dialect(
-                sql,
-                &catalog,
-                SqlDialect::ClickhouseSQL,
-                AccuracyTarget::Exact,
-            )
-            .await
-            .unwrap();
-            let rendered = render(&canonical).unwrap();
-            assert!(rendered.contains("1788891296000"));
-            assert!(rendered.contains("`ts_ms`"));
-            assert!(!rendered.contains("{from:"));
-            if sql.contains("sum(value)") && sql.contains("argMax") {
-                use crate::physical::post_asap::{PhysicalExpr, PostAsapPlan};
-                use crate::query_plan::{
-                    FallbackPolicy, FixedEvaluationRange, InstantExecution, QueryPlanError,
-                    QueryPlanNode,
-                };
-                let planned =
-                    crate::clickhouse::plan_clickhouse_sql(sql, &catalog, AccuracyTarget::Exact)
-                        .await
-                        .unwrap();
-                let PhysicalExpr::Committed(PostAsapPlan::Summary(root)) = planned.physical else {
-                    panic!("missing selected SQL DAG")
-                };
-                let entry = crate::query_plan::compile_bound_relational_mapped(
-                    "test".into(),
-                    planned.canonical_sql,
-                    &root,
-                    FixedEvaluationRange {
-                        start_ms: 1788890996000,
-                        end_ms: 1788891296000,
-                        cumulative: false,
-                    },
-                    InstantExecution {
-                        lookback_ms: 300000,
-                        full_history: false,
-                        cumulative_readout: false,
-                    },
-                    FallbackPolicy::ExactBackend,
-                    |_, _| Err(QueryPlanError::Invalid("unexpected summary binding".into())),
-                    |_, _| {},
-                )
-                .unwrap();
-                assert!(
-                    !entry
-                        .nodes
-                        .values()
-                        .any(|node| matches!(node, QueryPlanNode::Logical { .. })),
-                    "SQL must not acquire PromQL operators"
-                );
-                assert!(entry.nodes.values().any(|node| match node {
-                    QueryPlanNode::Relational { operation, .. } => matches!(
-                        serde_json::from_value::<planner_types::post_asap::ValueOperation>(
-                            operation.clone()
-                        )
-                        .unwrap(),
-                        planner_types::post_asap::ValueOperation::Exact(
-                            planner_types::post_asap::ExactOperation::Aggregate { .. }
-                        )
-                    ),
-                    _ => false,
-                }));
-            }
-        }
-    }
-    #[test]
-    fn literal_quotes_and_backslashes_are_escaped_independently() {
-        let rendered = scalar(
-            &QueryExpr::Literal(ScalarValue::Utf8("a\\'b\n".into())),
-            &Schema::new(vec![]),
-        )
-        .unwrap();
-        assert_eq!(rendered, "'a\\\\\\'b\n'");
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use planner_types::pre_asap::{Column, DataType, Predicate, ProjectItem};
-    use std::rc::Rc;
-    #[test]
-    fn composite_cut_preserves_branch_time_and_positional_projection() {
-        let scan = Rc::new(QueryExpr::Scan {
-            source: Source::Table {
-                table_ref: "db.samples".into(),
-            },
-            schema: Schema::new(vec![
-                Column::new("ts", DataType::Int64, false),
-                Column::new("v", DataType::Float64, false),
-            ]),
-            predicates: vec![Predicate(Rc::new(QueryExpr::Compare {
-                left: Rc::new(QueryExpr::Column(0)),
-                op: CompareOpKind::Lt,
-                right: Rc::new(QueryExpr::Literal(ScalarValue::Int64(-100))),
-            }))],
-        });
-        let project = QueryExpr::Project {
-            cols: vec![ProjectItem {
-                alias: Some("result".into()),
-                expr: QueryExpr::Column(1),
-            }],
-            qualifier: None,
-            child: scan,
-        };
-        let sql = render(&project).unwrap();
-        assert!(sql.contains("`ts` < -100"));
-        assert!(sql.starts_with("SELECT `v` AS `result`"));
-        assert!(!sql.contains("{from:"));
-        assert!(!sql.contains("{to:"));
-    }
-    #[test]
-    fn typed_list_access_renders_native_element_lookup() {
-        let schema = Schema::new(vec![Column::new(
-            "samples",
-            DataType::List {
-                element: Box::new(Column::new("item", DataType::Float64, false)),
-            },
-            false,
-        )]);
-        let expr = QueryExpr::FunctionCall {
-            name: "asap_element_access".into(),
-            args: vec![
-                QueryExpr::Column(0),
-                QueryExpr::Literal(ScalarValue::Int64(-1)),
-            ],
-        };
-        assert_eq!(
-            scalar(&expr, &schema).unwrap(),
-            "arrayElement(`samples`, -1)"
-        );
-    }
-
-    #[test]
-    fn typed_struct_field_renders_native_lookup() {
-        let schema = Schema::new(vec![Column::new(
-            "sample",
-            DataType::Struct {
-                fields: vec![
-                    Column::new("ts", DataType::Int64, false),
-                    Column::new("value", DataType::Float64, true),
-                ],
-            },
-            false,
-        )]);
-        let expr = QueryExpr::FunctionCall {
-            name: "asap_struct_field".into(),
-            args: vec![
-                QueryExpr::Column(0),
-                QueryExpr::Literal(ScalarValue::Utf8("value".into())),
-            ],
-        };
-        assert_eq!(
-            scalar(&expr, &schema).unwrap(),
-            "tupleElement(`sample`, 'value')"
-        );
-    }
-
-    #[test]
-    fn unsupported_scalar_is_not_forwarded_as_arbitrary_native_code() {
-        let schema = Schema::new(vec![]);
-        let expr = QueryExpr::FunctionCall {
-            name: "unreviewedFunction".into(),
-            args: vec![],
-        };
-        assert!(scalar(&expr, &schema).is_err());
-    }
-}
diff --git a/control_plane/src/query_plan/query_time.rs b/control_plane/src/query_plan/query_time.rs
deleted file mode 100644
index 7f1afc89e..000000000
--- a/control_plane/src/query_plan/query_time.rs
+++ /dev/null
@@ -1,1767 +0,0 @@
-//! The query-time half of a plan: everything a summary did not replace.
-//!
-//! Typed operations compiled once by the control plane, never parsed at
-//! serving time. This is the counterpart to the precompute half, which runs
-//! ahead of the query and ends at stored outputs.
-use super::{
-    FallbackPolicy, InstantExecution, QueryNodeId, QueryPlanEntry, QueryPlanError, QueryPlanNode,
-};
-use promql_parser::{
-    label::MatchOp,
-    parser::{self, Expr, LabelModifier, Offset, VectorSelector},
-};
-use std::collections::BTreeMap;
-
-pub use asap_types::query_plan::query_time::*;
-
-/// Stable identity of a Planner-authorized materializable DAG leaf. This is a
-/// workload-selection key, not another physical materialization definition.
-#[derive(Debug, Clone, serde::Serialize, PartialEq)]
-struct MaterializationCandidateIdentity {
-    metric: String,
-    matchers: Vec<LabelMatcher>,
-    range_ms: u64,
-    offset_ms: i64,
-    operation: TemporalOperation,
-}
-
-fn invalid(message: impl Into<String>) -> QueryPlanError {
-    QueryPlanError::Invalid(message.into())
-}
-fn millis(duration: std::time::Duration) -> Result<u64, QueryPlanError> {
-    u64::try_from(duration.as_millis()).map_err(|_| invalid("logical duration overflow"))
-}
-fn offset(value: &Option<Offset>) -> Result<i64, QueryPlanError> {
-    match value {
-        None => Ok(0),
-        Some(Offset::Pos(d)) => i64::try_from(millis(*d)?).map_err(|_| invalid("offset overflow")),
-        Some(Offset::Neg(d)) => i64::try_from(millis(*d)?)
-            .map(|v| -v)
-            .map_err(|_| invalid("offset overflow")),
-    }
-}
-
-struct Lower {
-    nodes: BTreeMap<QueryNodeId, QueryPlanNode>,
-    seen: BTreeMap<String, QueryNodeId>,
-}
-impl Lower {
-    fn add(&mut self, node: QueryPlanNode) -> Result<QueryNodeId, QueryPlanError> {
-        let key = serde_json::to_string(&node).map_err(|e| invalid(e.to_string()))?;
-        if let Some(id) = self.seen.get(&key) {
-            return Ok(*id);
-        }
-        let id = QueryNodeId(self.nodes.len() as u64);
-        self.nodes.insert(id, node);
-        self.seen.insert(key, id);
-        Ok(id)
-    }
-    fn operation(
-        &mut self,
-        operator: QueryTimeOperator,
-        inputs: Vec<QueryNodeId>,
-    ) -> Result<QueryNodeId, QueryPlanError> {
-        operator.validate(inputs.len())?;
-        self.add(QueryPlanNode::Logical { operator, inputs })
-    }
-    fn scan(
-        &mut self,
-        s: &VectorSelector,
-        range_ms: Option<u64>,
-    ) -> Result<QueryNodeId, QueryPlanError> {
-        if s.at.is_some() || !s.matchers.or_matchers.is_empty() {
-            return Err(invalid("logical @/OR selector is not supported"));
-        }
-        let matchers = s
-            .matchers
-            .matchers
-            .iter()
-            .map(|m| LabelMatcher {
-                name: m.name.clone(),
-                value: m.value.clone(),
-                operation: match m.op {
-                    MatchOp::Equal => LabelMatch::Equal,
-                    MatchOp::NotEqual => LabelMatch::NotEqual,
-                    MatchOp::Re(_) => LabelMatch::Regex,
-                    MatchOp::NotRe(_) => LabelMatch::NotRegex,
-                },
-            })
-            .collect();
-        self.operation(
-            QueryTimeOperator::Scan {
-                metric: s.name.clone(),
-                matchers,
-                range_ms,
-                offset_ms: offset(&s.offset)?,
-            },
-            vec![],
-        )
-    }
-    fn lower(&mut self, expr: &Expr) -> Result<QueryNodeId, QueryPlanError> {
-        match expr {
-            Expr::NumberLiteral(n) if n.val.is_finite() => {
-                self.add(QueryPlanNode::Scalar { value: n.val })
-            }
-            Expr::Paren(p) => self.lower(&p.expr),
-            Expr::Unary(u) => {
-                let input = self.lower(&u.expr)?;
-                self.operation(QueryTimeOperator::UnaryNegate, vec![input])
-            }
-            Expr::VectorSelector(s) => self.scan(s, None),
-            Expr::MatrixSelector(s) => self.scan(&s.vs, Some(millis(s.range)?)),
-            Expr::Subquery(s) => {
-                if s.at.is_some() {
-                    return Err(invalid("logical subquery @ is unsupported"));
-                }
-                let input = self.lower(&s.expr)?;
-                self.operation(
-                    QueryTimeOperator::Subquery {
-                        range_ms: millis(s.range)?,
-                        // Prometheus uses its configured default evaluation
-                        // interval when `[range:]` omits the resolution. The
-                        // backend-local deployment uses the Prometheus default
-                        // of one minute; unsupported subquery operands are
-                        // externalized as one exact subtree before execution.
-                        step_ms: millis(
-                            s.step.unwrap_or_else(|| std::time::Duration::from_secs(60)),
-                        )?,
-                        offset_ms: offset(&s.offset)?,
-                    },
-                    vec![input],
-                )
-            }
-            Expr::Aggregate(a) => {
-                let grouping = match &a.modifier {
-                    None => Grouping {
-                        labels: vec![],
-                        without: false,
-                    },
-                    Some(LabelModifier::Include(labels)) => Grouping {
-                        labels: labels.labels.clone(),
-                        without: false,
-                    },
-                    Some(LabelModifier::Exclude(labels)) => Grouping {
-                        labels: labels.labels.clone(),
-                        without: true,
-                    },
-                };
-                if a.op.to_string() == "topk" {
-                    let Some(Expr::NumberLiteral(parameter)) = a.param.as_deref() else {
-                        return Err(invalid("topk requires a literal scalar parameter"));
-                    };
-                    if !parameter.val.is_finite() {
-                        return Err(invalid("topk requires a finite scalar parameter"));
-                    }
-                    // Prometheus converts the scalar parameter to int64 before
-                    // selection. Values below one produce an empty vector.
-                    let k = parameter.val as i64;
-                    // Keep the selection node local even when its operand has
-                    // unsupported syntax (for example a subquery with an
-                    // implicit resolution). Prometheus evaluates that maximal
-                    // instant-vector child; the backend still performs topk.
-                    let nodes_before = self.nodes.clone();
-                    let seen_before = self.seen.clone();
-                    let input = match self.lower(&a.expr) {
-                        Ok(input) => input,
-                        Err(_) => {
-                            self.nodes = nodes_before;
-                            self.seen = seen_before;
-                            self.operation(
-                                QueryTimeOperator::ExactSubquery {
-                                    query: a.expr.to_string(),
-                                },
-                                vec![],
-                            )?
-                        }
-                    };
-                    let sorted = self.operation(
-                        QueryTimeOperator::Sort {
-                            descending: true,
-                            grouping: grouping.clone(),
-                        },
-                        vec![input],
-                    )?;
-                    return self.operation(
-                        QueryTimeOperator::Limit {
-                            n: u64::try_from(k).unwrap_or(0),
-                            offset: 0,
-                            grouping,
-                        },
-                        vec![sorted],
-                    );
-                }
-                if a.param.is_some() {
-                    return Err(invalid("unsupported parameterized aggregate"));
-                }
-                let operation = match a.op.to_string().as_str() {
-                    "sum" => Aggregation::Sum,
-                    "max" => Aggregation::Max,
-                    "min" => Aggregation::Min,
-                    "avg" => Aggregation::Avg,
-                    "count" => Aggregation::Count,
-                    other => return Err(invalid(format!("unsupported logical aggregate {other}"))),
-                };
-                let input = self.lower(&a.expr)?;
-                self.operation(
-                    QueryTimeOperator::Aggregate {
-                        operation,
-                        grouping,
-                    },
-                    vec![input],
-                )
-            }
-            Expr::Call(c) => {
-                let operator = match c.func.name {
-                    "scalar" => QueryTimeOperator::VectorToScalar,
-                    "histogram_quantile" => QueryTimeOperator::HistogramQuantile,
-                    "sort" => QueryTimeOperator::Sort {
-                        descending: false,
-                        grouping: Grouping {
-                            labels: vec![],
-                            without: false,
-                        },
-                    },
-                    "sort_desc" => QueryTimeOperator::Sort {
-                        descending: true,
-                        grouping: Grouping {
-                            labels: vec![],
-                            without: false,
-                        },
-                    },
-                    name => QueryTimeOperator::Temporal {
-                        operation: match name {
-                            "rate" => TemporalOperation::Rate,
-                            "increase" => TemporalOperation::Increase,
-                            "avg_over_time" => TemporalOperation::Avg,
-                            "max_over_time" => TemporalOperation::Max,
-                            "min_over_time" => TemporalOperation::Min,
-                            "sum_over_time" => TemporalOperation::Sum,
-                            "count_over_time" => TemporalOperation::Count,
-                            _ => {
-                                return Err(invalid(format!("unsupported logical function {name}")))
-                            }
-                        },
-                    },
-                };
-                let inputs = c
-                    .args
-                    .args
-                    .iter()
-                    .map(|e| self.lower(e))
-                    .collect::<Result<Vec<_>, _>>()?;
-                self.operation(operator, inputs)
-            }
-            Expr::Binary(b) => {
-                if b.modifier.as_ref().is_some_and(|m| {
-                    m.matching.is_some()
-                        || !matches!(m.card, parser::VectorMatchCardinality::OneToOne)
-                }) {
-                    return Err(invalid("logical explicit vector matching unsupported"));
-                }
-                let operation = match b.op.to_string().as_str() {
-                    "+" => BinaryOperation::Add,
-                    "-" => BinaryOperation::Sub,
-                    "*" => BinaryOperation::Mul,
-                    "/" => BinaryOperation::Div,
-                    "%" => BinaryOperation::Mod,
-                    "^" => BinaryOperation::Pow,
-                    "==" => BinaryOperation::Equal,
-                    "!=" => BinaryOperation::NotEqual,
-                    "<" => BinaryOperation::Less,
-                    "<=" => BinaryOperation::LessEqual,
-                    ">" => BinaryOperation::Greater,
-                    ">=" => BinaryOperation::GreaterEqual,
-                    other => return Err(invalid(format!("unsupported logical binary {other}"))),
-                };
-                let inputs = vec![self.lower(&b.lhs)?, self.lower(&b.rhs)?];
-                self.operation(
-                    QueryTimeOperator::Binary {
-                        operation,
-                        return_bool: b.return_bool(),
-                    },
-                    inputs,
-                )
-            }
-            _ => Err(invalid("unsupported logical expression")),
-        }
-    }
-}
-
-/// Lower a Planner-authorized native fragment into typed backend operations.
-/// Callers retain a separate external-native alternative for cost comparison.
-pub fn compile_logical(
-    query_id: String,
-    canonical_query: String,
-    instant: InstantExecution,
-    fallback: FallbackPolicy,
-) -> Result<QueryPlanEntry, QueryPlanError> {
-    let expr = parser::parse(&canonical_query).map_err(|e| invalid(e.to_string()))?;
-    let mut lower = Lower {
-        nodes: BTreeMap::new(),
-        seen: BTreeMap::new(),
-    };
-    let root = lower.lower(&expr)?;
-    let entry = QueryPlanEntry {
-        language: super::QueryLanguage::PromQl,
-        query_id,
-        canonical_query,
-        fixed_evaluation: None,
-        root,
-        nodes: lower.nodes,
-        instant,
-        fallback,
-    };
-    entry.validate(&Default::default())?;
-    Ok(entry)
-}
-
-fn horizons(expr: &planner_types::pre_asap::QueryExpr, out: &mut Vec<u64>) {
-    use planner_types::pre_asap::QueryExpr;
-    if let QueryExpr::TimeRange { range, .. } = expr {
-        if let Ok(ms) = u64::try_from(range.as_millis()) {
-            out.push(ms);
-        }
-    }
-    match expr {
-        QueryExpr::PromqlScalarBridge(child)
-        | QueryExpr::PromqlVectorFromScalar(child)
-        | QueryExpr::PromqlScalarFromVector(child)
-        | QueryExpr::PromqlRelabel { child, .. }
-        | QueryExpr::PromqlSeriesSample { child, .. }
-        | QueryExpr::PromqlInfoEnrich { child, .. }
-        | QueryExpr::Filter { child, .. }
-        | QueryExpr::Project { child, .. }
-        | QueryExpr::Aggregate { child, .. }
-        | QueryExpr::Dedup { child, .. }
-        | QueryExpr::Sort { child, .. }
-        | QueryExpr::Limit { child, .. }
-        | QueryExpr::PromqlSubquery { child, .. }
-        | QueryExpr::TimeRange { child, .. }
-        | QueryExpr::TimeShift { child, .. } => horizons(child, out),
-        QueryExpr::BinaryOp { lhs, rhs, .. } => {
-            horizons(lhs, out);
-            horizons(rhs, out);
-        }
-        QueryExpr::Join { left, right, .. } | QueryExpr::SetOp { left, right, .. } => {
-            horizons(left, out);
-            horizons(right, out);
-        }
-        _ => {}
-    }
-}
-
-/// Match fragments by semantic IR equality, not display text or source names.
-/// This ensures a subtree parsed for physical lowering is the subtree Planner kept.
-/// Does this re-parsed subtree denote the same computation as the Planner
-/// fragment?
-///
-/// Not `==`, and deliberately so. Planner documents a PromQL leaf's `schema` as
-/// usage-derived: "the `(ts, value)` floor + the labels the query references",
-/// and marks it `closed: false` precisely because it does not enumerate the
-/// row. A fragment resolved inside the whole query therefore carries every
-/// label the *query* mentions, while the same fragment re-parsed on its own
-/// carries only the labels *it* mentions.
-///
-/// So `sum by (label_0) (rate(data[1m]))` yields a fragment whose leaf scan has
-/// columns `[ts, value, label_0]`, while re-parsing the subtree `rate(data[1m])`
-/// yields `[ts, value]`. Identical source, predicates, range, measures and
-/// reduction; one extra column that the isolated parse had no way to know
-/// about. Requiring equality there asks an isolated parse to reproduce
-/// whole-query context, and every other part of the comparison is what actually
-/// discriminates: a different matcher, range or metric still fails.
-///
-/// Open leaf schemas are therefore compared by containment. Containment is a
-/// *prefix*, not an arbitrary subset, because `ColumnId`s are positional: the
-/// floor comes first and context only appends, so a prefix keeps every column
-/// id in `predicates` and grouping keys meaning the same column on both sides.
-/// Closed (catalog-backed SQL) schemas do enumerate the row, so they keep exact
-/// equality.
-fn fragment_matches(
-    candidate: &planner_types::pre_asap::QueryExpr,
-    fragment: &planner_types::pre_asap::QueryExpr,
-) -> bool {
-    match (
-        serde_json::to_value(candidate),
-        serde_json::to_value(fragment),
-    ) {
-        (Ok(candidate), Ok(fragment)) => same_modulo_open_leaf_schema(&candidate, &fragment),
-        // Fall back to the strict comparison rather than accepting anything we
-        // could not inspect.
-        _ => candidate == fragment,
-    }
-}
-
-fn same_modulo_open_leaf_schema(
-    candidate: &serde_json::Value,
-    fragment: &serde_json::Value,
-) -> bool {
-    use serde_json::Value;
-    match (candidate, fragment) {
-        (Value::Object(candidate), Value::Object(fragment)) => {
-            if is_open_schema(candidate) && is_open_schema(fragment) {
-                return open_schema_is_widened(candidate, fragment);
-            }
-            candidate.len() == fragment.len()
-                && candidate.iter().all(|(key, value)| {
-                    fragment
-                        .get(key)
-                        .is_some_and(|other| same_modulo_open_leaf_schema(value, other))
-                })
-        }
-        (Value::Array(candidate), Value::Array(fragment)) => {
-            candidate.len() == fragment.len()
-                && candidate
-                    .iter()
-                    .zip(fragment)
-                    .all(|(a, b)| same_modulo_open_leaf_schema(a, b))
-        }
-        _ => candidate == fragment,
-    }
-}
-
-fn is_open_schema(value: &serde_json::Map<String, serde_json::Value>) -> bool {
-    value.get("closed") == Some(&serde_json::Value::Bool(false)) && value.contains_key("columns")
-}
-
-/// The isolated parse's columns must be a prefix of the whole-query ones:
-/// context appends the labels it references, it never removes or reorders the
-/// floor. Every other schema field still has to agree exactly.
-fn open_schema_is_widened(
-    candidate: &serde_json::Map<String, serde_json::Value>,
-    fragment: &serde_json::Map<String, serde_json::Value>,
-) -> bool {
-    let (Some(narrow), Some(wide)) = (
-        candidate.get("columns").and_then(|v| v.as_array()),
-        fragment.get("columns").and_then(|v| v.as_array()),
-    ) else {
-        return false;
-    };
-    candidate
-        .iter()
-        .filter(|(key, _)| key.as_str() != "columns")
-        .all(|(key, value)| fragment.get(key) == Some(value))
-        && narrow.len() <= wide.len()
-        && narrow.iter().zip(wide).all(|(a, b)| a == b)
-}
-
-pub(super) fn query_time_nodes(
-    original: &str,
-    fragment: &planner_types::pre_asap::QueryExpr,
-) -> Result<(QueryNodeId, BTreeMap<QueryNodeId, QueryPlanNode>), QueryPlanError> {
-    fn visit<'a>(expr: &'a Expr, out: &mut Vec<&'a Expr>) {
-        out.push(expr);
-        match expr {
-            Expr::Paren(e) => visit(&e.expr, out),
-            Expr::Unary(e) => visit(&e.expr, out),
-            Expr::Subquery(e) => visit(&e.expr, out),
-            Expr::Aggregate(e) => visit(&e.expr, out),
-            Expr::Binary(e) => {
-                visit(&e.lhs, out);
-                visit(&e.rhs, out);
-            }
-            Expr::Call(e) => {
-                for input in &e.args.args {
-                    visit(input, out);
-                }
-            }
-            _ => {}
-        }
-    }
-    let original = parser::parse(original).map_err(|e| invalid(e.to_string()))?;
-    let mut expressions = Vec::new();
-    visit(&original, &mut expressions);
-    // Reconstruct equality witnesses with the selected IR's source horizon,
-    // not the compatibility parser's default. Explicit matrix ranges remain
-    // query-owned and equality still checks the complete tree.
-    let mut intervals = vec![1_000];
-    horizons(fragment, &mut intervals);
-    intervals.sort_unstable();
-    intervals.dedup();
-    // Accuracy annotations select a candidate, but exact execution still
-    // implements that candidate's computation. Reconstruct the same typed IR
-    // before comparing it; do not erase operators or source predicates.
-    let accuracy = match fragment {
-        planner_types::pre_asap::QueryExpr::Aggregate { measures, .. } => measures
-            .iter()
-            .find_map(|intent| {
-                use planner_types::pre_asap::AggIntent;
-                match intent {
-                    AggIntent::Quantile { accuracy, .. }
-                    | AggIntent::Cardinality { accuracy, .. }
-                    | AggIntent::Count { accuracy }
-                    | AggIntent::TopK { accuracy, .. }
-                    | AggIntent::FrequencyL2 { accuracy, .. }
-                    | AggIntent::FrequencyEntropy { accuracy, .. } => Some(accuracy.clone()),
-                    _ => None,
-                }
-            })
-            .unwrap_or(planner_types::types::AccuracyTarget::Exact),
-        _ => planner_types::types::AccuracyTarget::Exact,
-    };
-    for expression in expressions {
-        for interval in &intervals {
-            if let Ok(candidate) = crate::query_parser::parse_query_expr_with_interval(
-                &expression.to_string(),
-                accuracy.clone(),
-                *interval,
-            ) {
-                if fragment_matches(&candidate, fragment) {
-                    let mut lower = Lower {
-                        nodes: BTreeMap::new(),
-                        seen: BTreeMap::new(),
-                    };
-                    let root = lower.lower(expression)?;
-                    return Ok((root, lower.nodes));
-                }
-            }
-        }
-    }
-    Err(invalid(
-        "Planner fragment does not match any original query subtree",
-    ))
-}
-
-pub(super) fn binary_operator(
-    operator: &planner_types::post_asap::BinaryOperator,
-) -> Result<QueryTimeOperator, QueryPlanError> {
-    if operator.checked_relative_division || operator.checked_finite_division {
-        if (operator.checked_relative_division && operator.checked_finite_division)
-            || operator.vector_match.is_some()
-            || !matches!(
-                operator.kind,
-                planner_types::pre_asap::BinaryOpKind::Arithmetic(
-                    planner_types::pre_asap::ArithmeticOpKind::Div
-                )
-            )
-        {
-            return Err(invalid("invalid Planner checked division contract"));
-        }
-        return Ok(QueryTimeOperator::Binary {
-            operation: if operator.checked_finite_division {
-                BinaryOperation::FiniteDiv
-            } else {
-                BinaryOperation::CheckedDiv
-            },
-            return_bool: false,
-        });
-    }
-    if operator.vector_match.is_some() {
-        return Err(invalid("explicit fragment vector matching unsupported"));
-    }
-    let operation = match operator.kind.to_string().as_str() {
-        "+" => BinaryOperation::Add,
-        "-" => BinaryOperation::Sub,
-        "*" => BinaryOperation::Mul,
-        "/" => BinaryOperation::Div,
-        "%" => BinaryOperation::Mod,
-        "^" => BinaryOperation::Pow,
-        "=" | "==" => BinaryOperation::Equal,
-        "<>" | "!=" => BinaryOperation::NotEqual,
-        "<" => BinaryOperation::Less,
-        "<=" => BinaryOperation::LessEqual,
-        ">" => BinaryOperation::Greater,
-        ">=" => BinaryOperation::GreaterEqual,
-        other => {
-            return Err(invalid(format!(
-                "unsupported Planner binary operator {other}"
-            )))
-        }
-    };
-    Ok(QueryTimeOperator::Binary {
-        operation,
-        return_bool: false,
-    })
-}
-
-/// Prove a physical-native substitute represents exactly the selected summary leaf.
-/// A second Planner invocation is an equality witness, not a replacement selection.
-pub(crate) fn selected_query_time_nodes(
-    original: &str,
-    selected: &planner_types::post_asap::SummaryNode,
-) -> Result<(QueryNodeId, BTreeMap<QueryNodeId, QueryPlanNode>), QueryPlanError> {
-    let expression = selected_native_expression(original, selected)?;
-    let mut lower = Lower {
-        nodes: BTreeMap::new(),
-        seen: BTreeMap::new(),
-    };
-    let root = lower.lower(&expression)?;
-    Ok((root, lower.nodes))
-}
-
-/// Resolve the selected exact subtree to a verified native expression before
-/// binding an external input. Never substitute the top-level query's child.
-pub(super) fn selected_native_expression(
-    original: &str,
-    selected: &planner_types::post_asap::SummaryNode,
-) -> Result<Expr, QueryPlanError> {
-    if !selected.guarantee.as_ref().is_some_and(|g| g.is_exact()) {
-        return Err(invalid(
-            "native fragment substitution requires an exact selected value",
-        ));
-    }
-    let selected = match &selected.expr {
-        planner_types::post_asap::SummaryExpr::ValueOperation {
-            child,
-            operation: planner_types::post_asap::ValueOperation::FinalizeExactAccumulator,
-            ..
-        } => child.as_ref(),
-        _ => selected,
-    };
-    fn visit<'a>(expr: &'a Expr, output: &mut Vec<&'a Expr>) {
-        output.push(expr);
-        match expr {
-            Expr::Paren(e) => visit(&e.expr, output),
-            Expr::Unary(e) => visit(&e.expr, output),
-            Expr::Subquery(e) => visit(&e.expr, output),
-            Expr::Aggregate(e) => visit(&e.expr, output),
-            Expr::Binary(e) => {
-                visit(&e.lhs, output);
-                visit(&e.rhs, output);
-            }
-            Expr::Call(e) => {
-                for input in &e.args.args {
-                    visit(input, output);
-                }
-            }
-            _ => {}
-        }
-    }
-    let parsed = parser::parse(original).map_err(|e| invalid(e.to_string()))?;
-    let mut expressions = Vec::new();
-    visit(&parsed, &mut expressions);
-    fn selected_horizons(node: &planner_types::post_asap::SummaryNode, out: &mut Vec<u64>) {
-        use planner_types::post_asap::SummaryExpr;
-        match &node.expr {
-            SummaryExpr::KeepPreAsap(expr) => horizons(expr, out),
-            SummaryExpr::ValueOperation { child, .. } | SummaryExpr::SummaryAgg { child, .. } => {
-                selected_horizons(child, out)
-            }
-            SummaryExpr::SummaryEstimate { summary_input, .. }
-            | SummaryExpr::SummaryDelete { summary_input, .. } => {
-                selected_horizons(summary_input, out)
-            }
-            SummaryExpr::BinaryOp {
-                lhs: left,
-                rhs: right,
-                ..
-            }
-            | SummaryExpr::RelationalJoin { left, right, .. }
-            | SummaryExpr::SummaryJoin {
-                outer: left,
-                inner: right,
-                ..
-            }
-            | SummaryExpr::SummarySubtract { left, right } => {
-                selected_horizons(left, out);
-                selected_horizons(right, out);
-            }
-            SummaryExpr::SummaryMerge { children, .. } => {
-                for child in children {
-                    selected_horizons(child, out);
-                }
-            }
-        }
-    }
-    let mut intervals = vec![1_000];
-    selected_horizons(selected, &mut intervals);
-    intervals.sort_unstable();
-    intervals.dedup();
-    let mut matched = None;
-    for expression in expressions {
-        for interval in &intervals {
-            let Ok(canonical) = crate::query_parser::parse_query_expr_with_interval(
-                &expression.to_string(),
-                planner_types::types::AccuracyTarget::Exact,
-                *interval,
-            ) else {
-                continue;
-            };
-            // Match provenance against all exact candidates. Do not make a
-            // second selection or assume the first enumerated candidate won.
-            use asap_aware_mapping::{
-                Replacement, ReplacementStrategy, SketchAlgorithmStrategy, TargetSubDAG,
-            };
-            let root = std::rc::Rc::new(canonical);
-            let candidates = SketchAlgorithmStrategy::new(&asap_aware_mapping::DefaultCostModel)
-                .replacements(&TargetSubDAG::new(&root));
-            if candidates.iter().any(|candidate| matches!(&candidate.replacement, Replacement::Summary(node) if node.as_ref() == selected)) {
-                let candidate = expression.clone();
-                if matched
-                    .as_ref()
-                    .is_some_and(|previous| previous != &candidate)
-                {
-                    return Err(invalid(
-                        "ambiguous original subtrees share a Planner summary representation",
-                    ));
-                }
-                matched = Some(candidate);
-            }
-        }
-    }
-    matched.ok_or_else(|| {
-        invalid("selected summary leaf has no semantically identical original subtree witness")
-    })
-}
-
-/// Read the original aggregate operation only after proving its selected-node identity.
-/// Min and max share a Planner accumulator family, so the family name alone is insufficient.
-pub(super) fn selected_aggregate_operator(
-    original: &str,
-    selected: &planner_types::post_asap::SummaryNode,
-) -> Result<QueryTimeOperator, QueryPlanError> {
-    let (root, nodes) = selected_query_time_nodes(original, selected)?;
-    match nodes.get(&root) {
-        Some(QueryPlanNode::Logical {
-            operator: operator @ QueryTimeOperator::Aggregate { .. },
-            ..
-        }) => Ok(operator.clone()),
-        _ => Err(invalid(
-            "selected value aggregation has no verified original aggregate operator",
-        )),
-    }
-}
-
-#[cfg(test)]
-mod hybrid_tests {
-    use super::*;
-    use crate::query_plan::{MaterializationBinding, PhysicalGrouping};
-    #[test]
-    fn external_binding_rejects_an_unrelated_selected_exact_subtree() {
-        let exact = crate::query_parser::parse_query_expr_with_interval(
-            "sum_over_time(other_metric[5m])",
-            planner_types::types::AccuracyTarget::Exact,
-            1_000,
-        )
-        .unwrap();
-        let selected = crate::planner_selection::plan_test_query(&exact).unwrap();
-        assert!(selected_native_expression("topk(2, sum_over_time(m[5m]))", &selected).is_err());
-        assert_eq!(
-            selected_native_expression("sum_over_time(other_metric[5m])", &selected)
-                .unwrap()
-                .to_string(),
-            "sum_over_time(other_metric[5m])"
-        );
-    }
-
-    #[test]
-    fn selected_summary_and_filtered_residual_share_installed_binary() {
-        // Both filtered and unfiltered leaves bind independently.
-        let query = "sum_over_time(m[5m]) + sum_over_time(m{job=\"api\"}[5m])";
-        let canonical = crate::query_parser::parse_query_expr_canonical(
-            query,
-            planner_types::types::AccuracyTarget::Exact,
-        )
-        .unwrap();
-        let selected = crate::planner_selection::plan_test_query(&canonical).unwrap();
-        let entry =
-            crate::query_plan::compile_bound_composable_mapped(
-                "hybrid".into(),
-                query.into(),
-                &selected,
-                InstantExecution {
-                    lookback_ms: 300_000,
-                    full_history: false,
-                    cumulative_readout: false,
-                },
-                FallbackPolicy::Reject,
-                |node, _| {
-                    let (_, _, spatial_filter) =
-                        crate::physical::compiler::raw_materialization_input_contract(node)
-                            .map_err(QueryPlanError::Invalid)?;
-                    Ok(MaterializationBinding {
-                        full_window_slide_ms: None,
-                        item_labels: Vec::new(),
-                        materialization: asap_types::PolicyFingerprint(
-                            if spatial_filter.is_empty() { 7 } else { 8 },
-                        )
-                        .into(),
-                        stored_output_reference: asap_types::sds::StoredOutputReference::for_output(
-                            asap_types::PolicyFingerprint(if spatial_filter.is_empty() {
-                                7
-                            } else {
-                                8
-                            })
-                            .into(),
-                        ),
-                        output_grouping: PhysicalGrouping::PerEntity,
-                        window_ms: 300_000,
-                        pane_origin_ms: Some(0),
-                        readout_lookback_ms: Some(300_000),
-                    })
-                },
-                |_, _| {},
-            )
-            .unwrap();
-        assert_eq!(entry.materialization_bindings().len(), 2);
-        assert!(!entry.nodes.values().any(|node| matches!(
-            node,
-            QueryPlanNode::Logical {
-                operator: QueryTimeOperator::ExactSubquery { .. },
-                ..
-            }
-        )));
-        assert!(!entry.nodes.values().any(|node| matches!(
-            node,
-            QueryPlanNode::Logical {
-                operator: QueryTimeOperator::Scan { .. },
-                ..
-            }
-        )));
-        assert!(matches!(
-            entry.nodes[&entry.root],
-            QueryPlanNode::Logical {
-                operator: QueryTimeOperator::Binary { .. },
-                ..
-            }
-        ));
-        entry
-            .validate(
-                &[
-                    asap_types::PolicyFingerprint(7),
-                    asap_types::PolicyFingerprint(8),
-                ]
-                .into_iter()
-                .collect(),
-            )
-            .unwrap();
-    }
-
-    #[test]
-    fn different_filter_cannot_witness_selected_residual() {
-        // Equality includes filter predicates, not just family, source, or window.
-        let canonical = crate::query_parser::parse_query_expr_canonical(
-            "sum_over_time(m{job=\"api\"}[5m])",
-            planner_types::types::AccuracyTarget::Exact,
-        )
-        .unwrap();
-        let selected = crate::planner_selection::plan_test_query(&canonical).unwrap();
-        assert!(
-            selected_query_time_nodes("sum_over_time(m{job=\"worker\"}[5m])", &selected).is_err()
-        );
-    }
-}
-
-#[cfg(test)]
-mod planner_workload_tests {
-    use super::*;
-    use crate::physical::compiler::{BackendLocalPlanningInput, DeploymentPlanCompiler};
-
-    fn compile_one(query: &str) -> crate::physical::compiler::CompiledPhysicalPlan {
-        let mut fixture: serde_json::Value = serde_json::from_str(include_str!(
-            "../../../docs/examples/asapquery-planning-snapshot.json"
-        ))
-        .unwrap();
-        let mut entry = fixture["query_workload"]["repeating_queries"][0].clone();
-        entry["query"] = query.into();
-        entry["requirements"]["accuracy"] = serde_json::json!({"explicit":"Exact"});
-        fixture["query_workload"]["repeating_queries"] = vec![entry].into();
-        let snapshot: BackendLocalPlanningInput = serde_json::from_value(fixture).unwrap();
-        let (request, environment) = snapshot
-            .into_physical_compilation_request()
-            .unwrap_or_else(|error| panic!("{query}: {error}"));
-        DeploymentPlanCompiler
-            .compile_promql(request, environment)
-            .unwrap_or_else(|error| panic!("{query}: {error}"))
-    }
-
-    fn assert_local_limit(node: &QueryPlanNode) {
-        match node {
-            QueryPlanNode::PhysicalFragment { dag, .. } => {
-                let plan =
-                    asap_physical_operators::physical_planner::CompiledPhysicalDag::decode(dag)
-                        .unwrap();
-                assert_eq!(plan.operator_name(plan.roots()[0]), Some("Limit"));
-            }
-            QueryPlanNode::Logical {
-                operator: QueryTimeOperator::Limit { .. },
-                ..
-            } => {}
-            _ => panic!("expected local Limit, got {node:?}"),
-        }
-    }
-
-    #[test]
-    fn evaluation_topk_queries_retain_a_local_selection_root() {
-        for query in [
-            "topk(2, sum by (job) (rate(backend_process_cpu_seconds_total[1h])))",
-            "topk(2, sum by (job) (backend_process_resident_memory_bytes))",
-            "topk(2, max_over_time(backend_retry_backlog_depth[6h]))",
-            "topk(1, sum by (job) (rate(backend_process_cpu_seconds_total[6h])))",
-            "topk(3, avg_over_time((sum by (job) (backend_process_resident_memory_bytes))[6h:]))",
-        ] {
-            let plan = compile_one(query);
-            let entry = plan.query_plan.entries.values().next().unwrap();
-            assert_local_limit(&entry.nodes[&entry.root]);
-            assert!(
-                !entry
-                    .nodes
-                    .values()
-                    .any(|node| matches!(node, QueryPlanNode::ExactFallback { .. })),
-                "{query}"
-            );
-        }
-    }
-
-    #[test]
-    fn planner_value_topk_preserves_direct_summary_children() {
-        for query in [
-            "topk(2, rate(backend_process_cpu_seconds_total[1h]))",
-            "topk(2, max_over_time(backend_retry_backlog_depth[6h]))",
-        ] {
-            let plan = compile_one(query);
-            let entry = plan.query_plan.entries.values().next().unwrap();
-            assert_local_limit(&entry.nodes[&entry.root]);
-            assert!(
-                !entry.materialization_bindings().is_empty(),
-                "{query} must retain its SummaryStore child: {:?}",
-                entry.nodes
-            );
-        }
-    }
-
-    #[test]
-    fn whole_o11y_planner_candidate_lowers_every_original_query() {
-        // AST support alone is insufficient: the actual selected Planner forest must bind too.
-        let corpus: serde_json::Value =
-            serde_json::from_str(include_str!("../../tests/fixtures/o11y_queries.json")).unwrap();
-        let mut fixture: serde_json::Value = serde_json::from_str(include_str!(
-            "../../../docs/examples/asapquery-planning-snapshot.json"
-        ))
-        .unwrap();
-        let template = fixture["query_workload"]["repeating_queries"][0].clone();
-        let mut seen = std::collections::BTreeSet::new();
-        let mut entries = Vec::new();
-        for row in corpus["queries"].as_array().unwrap() {
-            let query = row["query"].as_str().unwrap();
-            if !seen.insert(query.to_string()) {
-                continue;
-            }
-            let mut entry = template.clone();
-            entry["query"] = query.into();
-            entry["requirements"]["accuracy"] = serde_json::json!({"explicit":"Exact"});
-            entries.push(entry);
-        }
-        fixture["query_workload"]["repeating_queries"] = entries.into();
-        let snapshot: BackendLocalPlanningInput = serde_json::from_value(fixture).unwrap();
-        let (request, environment) = snapshot.into_physical_compilation_request().unwrap();
-        assert!(request.allow_mixed_summary_and_exact_execution);
-        let plan = DeploymentPlanCompiler
-            .compile_promql(request, environment)
-            .unwrap();
-        assert_eq!(plan.query_plan.entries.len(), 24);
-        assert!(plan.query_plan.entries.values().all(|entry| !entry
-            .nodes
-            .values()
-            .any(|node| matches!(node, QueryPlanNode::ExactFallback { .. }))));
-    }
-
-    #[test]
-    fn max_of_selected_values_uses_original_max_operator() {
-        // MinMax storage type does not authorize choosing min or replacing the selected operand graph.
-        let query = "max(sum_over_time(m[5m]) / 2)";
-        let canonical = crate::query_parser::parse_query_expr_canonical(
-            query,
-            planner_types::types::AccuracyTarget::Exact,
-        )
-        .unwrap();
-        use asap_aware_mapping::{
-            Replacement, ReplacementStrategy, SketchAlgorithmStrategy, TargetSubDAG,
-        };
-        let root = std::rc::Rc::new(canonical);
-        let candidates = SketchAlgorithmStrategy::new(&asap_aware_mapping::DefaultCostModel)
-            .replacements(&TargetSubDAG::new(&root));
-        let [candidate] = candidates.as_slice() else {
-            panic!("expected one exact aggregate candidate")
-        };
-        let Replacement::Summary(selected) = &candidate.replacement else {
-            panic!("expected exact summary fixture")
-        };
-        let operator = selected_aggregate_operator(query, selected).unwrap();
-        assert!(matches!(
-            operator,
-            QueryTimeOperator::Aggregate {
-                operation: Aggregation::Max,
-                ..
-            }
-        ));
-    }
-
-    #[test]
-    fn ambiguous_extremum_witness_is_rejected() {
-        // Different readouts over the same MinMax state cannot be resolved by taking the first AST match.
-        let canonical = crate::query_parser::parse_query_expr_canonical(
-            "min(m)",
-            planner_types::types::AccuracyTarget::Exact,
-        )
-        .unwrap();
-        let selected = crate::planner_selection::plan_test_query(&canonical).unwrap();
-        let maximum = crate::query_parser::parse_query_expr_canonical(
-            "max(m)",
-            planner_types::types::AccuracyTarget::Exact,
-        )
-        .unwrap();
-        let maximum = crate::planner_selection::plan_test_query(&maximum).unwrap();
-        let result = selected_query_time_nodes("min(m) + max(m)", &selected);
-        if selected == maximum {
-            assert!(result.is_err());
-        } else {
-            let (root, nodes) = result.unwrap();
-            assert!(matches!(
-                nodes[&root],
-                QueryPlanNode::Logical {
-                    operator: QueryTimeOperator::Aggregate {
-                        operation: Aggregation::Min,
-                        ..
-                    },
-                    ..
-                }
-            ));
-        }
-    }
-}
-
-/// Preserve the exact original operator direction because MinMax family alone
-/// does not distinguish min from max. The full Planner-node witness is required.
-pub(crate) fn selected_range_max_materialization(
-    original: &str,
-    node: &planner_types::post_asap::SummaryNode,
-) -> Result<Option<String>, QueryPlanError> {
-    use planner_types::post_asap::{ExactKind, SummaryExpr, SummaryFamilyType};
-    let node = match &node.expr {
-        SummaryExpr::ValueOperation {
-            child,
-            operation: planner_types::post_asap::ValueOperation::FinalizeExactAccumulator,
-            ..
-        } => child.as_ref(),
-        _ => node,
-    };
-    if !matches!(
-        &node.expr,
-        SummaryExpr::SummaryAgg {
-            family: SummaryFamilyType::ExactAggregate(ExactKind::Max, _),
-            reduction: planner_types::pre_asap::Reduction::PerEntity,
-            ..
-        }
-    ) {
-        return Ok(None);
-    }
-    let (root, nodes) = selected_query_time_nodes(original, node)?;
-    let Some(QueryPlanNode::Logical {
-        operator:
-            QueryTimeOperator::Temporal {
-                operation: TemporalOperation::Max,
-            },
-        inputs,
-    }) = nodes.get(&root)
-    else {
-        return Ok(None);
-    };
-    if inputs.len() != 1 || nodes.len() != 2 {
-        return Ok(None);
-    }
-    let Some(QueryPlanNode::Logical {
-        operator:
-            QueryTimeOperator::Scan {
-                metric: Some(metric),
-                matchers,
-                range_ms: Some(range_ms),
-                offset_ms: 0,
-            },
-        ..
-    }) = nodes.get(&inputs[0])
-    else {
-        return Ok(None);
-    };
-    Ok(Some(materialization_candidate_key(
-        MaterializationCandidateIdentity {
-            metric: metric.clone(),
-            matchers: matchers.clone(),
-            range_ms: *range_ms,
-            offset_ms: 0,
-            operation: TemporalOperation::Max,
-        },
-    )?))
-}
-
-#[cfg(test)]
-mod range_max_materialization_tests {
-    use super::*;
-    #[test]
-    fn real_gauge_queries_have_planner_authorized_exact_materializations() {
-        for (query, metric, range_ms) in [
-            (
-                r#"max_over_time(service_cache_refresh_lag_seconds{job="user-service"}[12h])"#,
-                "service_cache_refresh_lag_seconds",
-                43_200_000,
-            ),
-            (
-                r#"max_over_time(service_retry_queue_depth{job=~".+"}[6h])"#,
-                "service_retry_queue_depth",
-                21_600_000,
-            ),
-            (
-                r#"max_over_time(service_retry_queue_depth{job="order-service"}[6h])"#,
-                "service_retry_queue_depth",
-                21_600_000,
-            ),
-        ] {
-            let original = crate::query_parser::parse_query_expr_canonical(
-                query,
-                planner_types::types::AccuracyTarget::Exact,
-            )
-            .unwrap();
-            let selected = crate::planner_selection::plan_test_query(&original).unwrap();
-            let key = selected_range_max_materialization(query, &selected)
-                .unwrap()
-                .unwrap();
-            assert!(key.contains(metric));
-            assert!(key.contains(&range_ms.to_string()));
-        }
-    }
-    #[test]
-    fn min_and_shifted_or_nested_windows_do_not_become_max_materializations() {
-        for query in [
-            "min_over_time(m[1m])",
-            "max_over_time(m[1m] offset 1m)",
-            "max_over_time((m + m)[1m:1s])",
-        ] {
-            let original = crate::query_parser::parse_query_expr_canonical(
-                query,
-                planner_types::types::AccuracyTarget::Exact,
-            )
-            .unwrap();
-            let selected = crate::planner_selection::plan_test_query(&original).unwrap();
-            assert!(
-                selected_range_max_materialization(query, &selected)
-                    .unwrap()
-                    .is_none(),
-                "{query}"
-            );
-        }
-    }
-}
-
-/// Stable contract identity used by priced physical candidates, independent of node IDs.
-fn materialization_candidate_key(
-    candidate: MaterializationCandidateIdentity,
-) -> Result<String, QueryPlanError> {
-    let mut value = serde_json::to_value(candidate).map_err(|e| invalid(e.to_string()))?;
-    if let Some(object) = value.as_object_mut() {
-        // Retention is a consumer lifetime requirement, not the materialization read's
-        // semantics. Equivalent matcher conjunctions must share policy keys.
-        object.remove("retention_ms");
-        if let Some(matchers) = object.get_mut("matchers").and_then(|v| v.as_array_mut()) {
-            matchers.sort_by_cached_key(|m| m.to_string());
-        }
-    }
-    serde_json::to_string(&value).map_err(|e| invalid(e.to_string()))
-}
-
-fn counter_contract(
-    root: QueryNodeId,
-    nodes: &BTreeMap<QueryNodeId, QueryPlanNode>,
-) -> Option<MaterializationCandidateIdentity> {
-    let QueryPlanNode::Logical {
-        operator: QueryTimeOperator::Temporal { operation },
-        inputs,
-    } = nodes.get(&root)?
-    else {
-        return None;
-    };
-    if !matches!(
-        operation,
-        TemporalOperation::Rate | TemporalOperation::Increase
-    ) || inputs.len() != 1
-    {
-        return None;
-    }
-    let QueryPlanNode::Logical {
-        operator:
-            QueryTimeOperator::Scan {
-                metric: Some(metric),
-                matchers,
-                range_ms: Some(range_ms),
-                offset_ms,
-            },
-        ..
-    } = nodes.get(&inputs[0])?
-    else {
-        return None;
-    };
-    Some(MaterializationCandidateIdentity {
-        metric: metric.clone(),
-        matchers: matchers.clone(),
-        range_ms: *range_ms,
-        offset_ms: *offset_ms,
-        operation: *operation,
-    })
-}
-
-pub(crate) fn selected_counter_materialization(
-    original: &str,
-    node: &planner_types::post_asap::SummaryNode,
-) -> Result<Option<String>, QueryPlanError> {
-    use planner_types::post_asap::{ExactKind, SummaryExpr, SummaryFamilyType};
-    if !matches!(
-        &node.expr,
-        SummaryExpr::SummaryAgg {
-            family: SummaryFamilyType::ExactAggregate(ExactKind::Rate | ExactKind::Increase, _),
-            reduction: planner_types::pre_asap::Reduction::PerEntity,
-            ..
-        }
-    ) {
-        return Ok(None);
-    }
-    let (root, nodes) = selected_query_time_nodes(original, node)?;
-    counter_contract(root, &nodes)
-        .map(materialization_candidate_key)
-        .transpose()
-}
-
-fn prune(entry: &mut QueryPlanEntry) {
-    let mut seen = std::collections::BTreeSet::new();
-    let mut pending = vec![entry.root];
-    while let Some(id) = pending.pop() {
-        if seen.insert(id) {
-            if let Some(node) = entry.nodes.get(&id) {
-                pending.extend(node.inputs());
-            }
-        }
-    }
-    entry.nodes.retain(|id, _| seen.contains(id));
-}
-
-/// Finish the installed DAG by externalizing every fragment raw subtree.
-pub fn finalize_query_time_nodes(entry: &mut QueryPlanEntry) -> Result<(), QueryPlanError> {
-    externalize_query_time_nodes(entry)?;
-    assign_retention(entry)
-}
-
-pub fn eligible_materialization_keys(
-    original: &str,
-    selected: &std::rc::Rc<planner_types::post_asap::SummaryNode>,
-) -> Result<std::collections::BTreeSet<String>, QueryPlanError> {
-    use planner_types::post_asap::SummaryExpr;
-    fn visit(
-        original: &str,
-        node: &std::rc::Rc<planner_types::post_asap::SummaryNode>,
-        keys: &mut std::collections::BTreeSet<String>,
-    ) -> Result<(), QueryPlanError> {
-        if let Some(key) = selected_counter_materialization(original, node)?
-            .or(selected_range_max_materialization(original, node)?)
-        {
-            keys.insert(key);
-        }
-        match &node.expr {
-            SummaryExpr::BinaryOp { lhs, rhs, .. } => {
-                visit(original, lhs, keys)?;
-                visit(original, rhs, keys)?;
-            }
-            SummaryExpr::RelationalJoin { left, right, .. } => {
-                visit(original, left, keys)?;
-                visit(original, right, keys)?;
-            }
-
-            SummaryExpr::ValueOperation { child, .. } => visit(original, child, keys)?,
-            SummaryExpr::SummaryAgg { child, .. } => visit(original, child, keys)?,
-            SummaryExpr::SummaryEstimate { summary_input, .. }
-            | SummaryExpr::SummaryDelete { summary_input, .. } => {
-                visit(original, summary_input, keys)?
-            }
-            SummaryExpr::SummaryMerge { children, .. } => {
-                for child in children {
-                    visit(original, child, keys)?;
-                }
-            }
-            SummaryExpr::SummaryJoin { outer, inner, .. } => {
-                visit(original, outer, keys)?;
-                visit(original, inner, keys)?;
-            }
-            SummaryExpr::SummarySubtract { left, right } => {
-                visit(original, left, keys)?;
-                visit(original, right, keys)?;
-            }
-            SummaryExpr::KeepPreAsap(_) => {}
-        }
-        Ok(())
-    }
-    let mut keys = std::collections::BTreeSet::new();
-    visit(original, selected, &mut keys)?;
-    Ok(keys)
-}
-
-fn expression_shape(
-    id: QueryNodeId,
-    nodes: &BTreeMap<QueryNodeId, QueryPlanNode>,
-) -> Result<String, QueryPlanError> {
-    let node = nodes
-        .get(&id)
-        .ok_or_else(|| invalid("missing expression node"))?;
-    if let QueryPlanNode::Logical {
-        operator: QueryTimeOperator::ExactSubquery { query },
-        ..
-    } = node
-    {
-        let mut lower = Lower {
-            nodes: BTreeMap::new(),
-            seen: BTreeMap::new(),
-        };
-        let expr = parser::parse(query).map_err(|e| invalid(e.to_string()))?;
-        let root = lower.lower(&expr)?;
-        return expression_shape(root, &lower.nodes);
-    }
-    let value = match node {
-        QueryPlanNode::Logical { operator, .. } => {
-            serde_json::to_string(operator).map_err(|e| invalid(e.to_string()))?
-        }
-        QueryPlanNode::Scalar { value } => format!("scalar:{:x}", value.to_bits()),
-        _ => return Err(invalid("summary node has no raw expression shape")),
-    };
-    let children = node
-        .inputs()
-        .iter()
-        .map(|child| expression_shape(*child, nodes))
-        .collect::<Result<Vec<_>, _>>()?;
-    Ok(format!("{value}({})", children.join(";")))
-}
-
-/// Collapse only maximal exact fragment subtrees whose full typed expression is
-/// witnessed in the original query. Matrix boundaries remain inside Prometheus.
-pub fn externalize_query_time_nodes(entry: &mut QueryPlanEntry) -> Result<(), QueryPlanError> {
-    fn gather(expr: &Expr, out: &mut Vec<Expr>) {
-        if !matches!(expr, Expr::MatrixSelector(_) | Expr::Subquery(_)) {
-            out.push(expr.clone());
-        }
-        match expr {
-            Expr::Paren(e) => gather(&e.expr, out),
-            Expr::Unary(e) => gather(&e.expr, out),
-            Expr::Subquery(e) => gather(&e.expr, out),
-            Expr::Aggregate(e) => gather(&e.expr, out),
-            Expr::Binary(e) => {
-                gather(&e.lhs, out);
-                gather(&e.rhs, out);
-            }
-            Expr::Call(e) => {
-                for arg in &e.args.args {
-                    gather(arg, out);
-                }
-            }
-            _ => {}
-        }
-    }
-    let expr = parser::parse(&entry.canonical_query).map_err(|e| invalid(e.to_string()))?;
-    let mut expressions = Vec::new();
-    gather(&expr, &mut expressions);
-    let mut witnesses = BTreeMap::new();
-    for expression in expressions {
-        let mut lower = Lower {
-            nodes: BTreeMap::new(),
-            seen: BTreeMap::new(),
-        };
-        if let Ok(root) = lower.lower(&expression) {
-            witnesses.insert(
-                expression_shape(root, &lower.nodes)?,
-                expression.to_string(),
-            );
-        }
-    }
-    fn flags(id: QueryNodeId, nodes: &BTreeMap<QueryNodeId, QueryPlanNode>) -> (bool, bool) {
-        let Some(node) = nodes.get(&id) else {
-            return (true, false);
-        };
-        let mut indexed = !matches!(
-            node,
-            QueryPlanNode::Logical { .. } | QueryPlanNode::Scalar { .. }
-        ) || matches!(
-            node,
-            QueryPlanNode::Logical {
-                operator: QueryTimeOperator::Limit { .. },
-                ..
-            }
-        );
-        let mut exact = false;
-        if let QueryPlanNode::Logical { operator, .. } = node {
-            exact = matches!(
-                operator,
-                QueryTimeOperator::Scan { .. }
-                    | QueryTimeOperator::ExactSubquery { .. }
-                    | QueryTimeOperator::CandidateExactSubquery { .. }
-            );
-        }
-        for child in node.inputs() {
-            let (a, b) = flags(*child, nodes);
-            indexed |= a;
-            exact |= b;
-        }
-        (indexed, exact)
-    }
-    let mut pending = vec![entry.root];
-    while let Some(id) = pending.pop() {
-        if matches!(
-            entry.nodes.get(&id),
-            Some(QueryPlanNode::Logical {
-                operator: QueryTimeOperator::ExactSubquery { .. }
-                    | QueryTimeOperator::CandidateExactSubquery { .. },
-                ..
-            })
-        ) {
-            continue;
-        }
-        let (indexed, exact) = flags(id, &entry.nodes);
-        if !indexed && exact {
-            if let Ok(shape) = expression_shape(id, &entry.nodes) {
-                if let Some(query) = witnesses.get(&shape) {
-                    entry.nodes.insert(
-                        id,
-                        QueryPlanNode::Logical {
-                            operator: QueryTimeOperator::ExactSubquery {
-                                query: query.clone(),
-                            },
-                            inputs: vec![],
-                        },
-                    );
-                    continue;
-                }
-            }
-        }
-        pending.extend(entry.nodes[&id].inputs());
-    }
-    prune(entry);
-    if entry.nodes.values().any(|node| {
-        matches!(
-            node,
-            QueryPlanNode::Logical {
-                operator: QueryTimeOperator::Scan { .. },
-                ..
-            }
-        )
-    }) {
-        return Err(invalid(
-            "local Scan is not deployable; exact subtree requires a complete Prometheus boundary",
-        ));
-    }
-    Ok(())
-}
-
-fn assign_retention(entry: &mut QueryPlanEntry) -> Result<(), QueryPlanError> {
-    let mut pending = vec![(entry.root, 0u64)];
-    let mut depths = BTreeMap::new();
-    while let Some((id, depth)) = pending.pop() {
-        if depths.get(&id).is_some_and(|prior| *prior >= depth) {
-            continue;
-        }
-        depths.insert(id, depth);
-        let node = entry
-            .nodes
-            .get_mut(&id)
-            .ok_or_else(|| invalid("missing index ancestor"))?;
-        let mut child_depth = depth;
-        if let QueryPlanNode::Logical { operator, .. } = node {
-            if let QueryTimeOperator::Subquery {
-                range_ms,
-                offset_ms,
-                ..
-            } = operator
-            {
-                child_depth = depth
-                    .checked_add(*range_ms)
-                    .and_then(|v| v.checked_add((*offset_ms).max(0) as u64))
-                    .ok_or_else(|| invalid("retention overflow"))?;
-            }
-        }
-        pending.extend(node.inputs().iter().map(|child| (*child, child_depth)));
-    }
-    Ok(())
-}
-
-#[cfg(test)]
-mod remote_boundary_regressions {
-    use super::*;
-
-    #[test]
-    fn stored_output_identity_is_independent_of_matcher_order() {
-        let first = LabelMatcher {
-            name: "job".into(),
-            value: "orders".into(),
-            operation: LabelMatch::Equal,
-        };
-        let second = LabelMatcher {
-            name: "status".into(),
-            value: "5..".into(),
-            operation: LabelMatch::Regex,
-        };
-        let a = MaterializationCandidateIdentity {
-            metric: "requests".into(),
-            matchers: vec![first.clone(), second.clone()],
-            range_ms: 300_000,
-            offset_ms: 0,
-            operation: TemporalOperation::Rate,
-        };
-        let b = MaterializationCandidateIdentity {
-            metric: "requests".into(),
-            matchers: vec![second, first],
-            range_ms: 300_000,
-            offset_ms: 0,
-            operation: TemporalOperation::Rate,
-        };
-        assert_eq!(
-            materialization_candidate_key(a).unwrap(),
-            materialization_candidate_key(b).unwrap()
-        );
-    }
-
-    #[test]
-    fn real_error_ratio_exposes_two_independent_materialization_candidates() {
-        let query = "sum(rate(http_requests_total{job=\"order-service\",status=~\"5..\"}[5m])) / sum(rate(http_requests_total{job=\"order-service\"}[5m]))";
-        let parsed = crate::query_parser::parse_query_expr_canonical(
-            query,
-            planner_types::types::AccuracyTarget::Exact,
-        )
-        .unwrap();
-        let selected = crate::planner_selection::plan_test_query(&parsed).unwrap();
-        assert_eq!(
-            eligible_materialization_keys(query, &selected)
-                .unwrap()
-                .len(),
-            2
-        );
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    // A grouped query's fragment carries the grouping label in its leaf scan
-    // schema, because Planner resolves that schema against the whole query.
-    // Re-parsing the subtree alone cannot know the label, so requiring equal
-    // column sets rejected a fragment that is the subtree.
-    #[test]
-    fn grouped_query_residual_matches_its_own_subtree() {
-        for (query, subtree) in [
-            ("sum by (label_0) (rate(data[1m]))", "rate(data[1m])"),
-            (
-                "sum by (label_0) (sum_over_time(data[1m]))",
-                "sum_over_time(data[1m])",
-            ),
-        ] {
-            let fragment = crate::query_parser::parse_query_expr_with_interval(
-                subtree,
-                planner_types::types::AccuracyTarget::Exact,
-                60_000,
-            )
-            .unwrap();
-            assert!(
-                query_time_nodes(query, &fragment).is_ok(),
-                "{query}: fragment {subtree} must resolve against its own query"
-            );
-        }
-    }
-
-    // Widening is only accepted for the context-derived leaf columns. Anything
-    // that actually identifies the computation still has to match exactly.
-    #[test]
-    fn widened_leaf_schema_does_not_excuse_a_different_computation() {
-        let fragment = crate::query_parser::parse_query_expr_with_interval(
-            "rate(data[1m])",
-            planner_types::types::AccuracyTarget::Exact,
-            60_000,
-        )
-        .unwrap();
-        // Different metric.
-        assert!(query_time_nodes("sum by (label_0) (rate(other[1m]))", &fragment).is_err());
-        // Different range.
-        assert!(query_time_nodes("sum by (label_0) (rate(data[2m]))", &fragment).is_err());
-        // Different function.
-        assert!(query_time_nodes("sum by (label_0) (increase(data[1m]))", &fragment).is_err());
-        // Different matcher.
-        let filtered = crate::query_parser::parse_query_expr_with_interval(
-            "rate(data{job=\"api\"}[1m])",
-            planner_types::types::AccuracyTarget::Exact,
-            60_000,
-        )
-        .unwrap();
-        assert!(query_time_nodes(
-            "sum by (label_0) (rate(data{job=\"worker\"}[1m]))",
-            &filtered
-        )
-        .is_err());
-    }
-
-    // A workload horizon changes the equality witness, never its filter or explicit range.
-    #[test]
-    fn workload_horizon_residual_keeps_semantic_equality() {
-        let fragment = crate::query_parser::parse_query_expr_with_interval(
-            "sum(m{job=\"api\"})",
-            planner_types::types::AccuracyTarget::Exact,
-            5_000,
-        )
-        .unwrap();
-        assert!(query_time_nodes("sum(m{job=\"api\"})", &fragment).is_ok());
-        assert!(query_time_nodes("sum(m{job=\"worker\"})", &fragment).is_err());
-        let range = crate::query_parser::parse_query_expr_with_interval(
-            "sum_over_time(m[1m])",
-            planner_types::types::AccuracyTarget::Exact,
-            5_000,
-        )
-        .unwrap();
-        assert!(query_time_nodes("sum_over_time(m[2m])", &range).is_err());
-    }
-
-    fn instant() -> InstantExecution {
-        InstantExecution {
-            lookback_ms: 300_000,
-            full_history: false,
-            cumulative_readout: false,
-        }
-    }
-
-    #[test]
-    fn complete_o11y_corpus_lowers_to_serialized_operations() {
-        // Every original workload occurrence must compile to an executable typed graph.
-        let corpus: serde_json::Value =
-            serde_json::from_str(include_str!("../../tests/fixtures/o11y_queries.json")).unwrap();
-        for row in corpus["queries"].as_array().unwrap() {
-            let query = row["query"].as_str().unwrap();
-            let entry = crate::query_plan::query_time::compile_logical(
-                row["id"].as_str().unwrap().into(),
-                query.into(),
-                instant(),
-                FallbackPolicy::Reject,
-            )
-            .unwrap_or_else(|error| panic!("{query}: {error}"));
-            let encoded = serde_json::to_string(&entry).unwrap();
-            let restored: QueryPlanEntry = serde_json::from_str(&encoded).unwrap();
-            restored.validate(&Default::default()).unwrap();
-            assert!(!restored
-                .nodes
-                .values()
-                .any(|node| matches!(node, QueryPlanNode::ExactFallback { .. })));
-        }
-    }
-    #[test]
-    fn query_time_mapping_preserves_filters_and_rejects_different_sources() {
-        // Physical lowering must prove correspondence with the Planner-kept semantic subtree.
-        let query = "sum(rate(requests_total{job=\"api\"}[5m]))";
-        let fragment = crate::query_parser::parse_query_expr_canonical(
-            query,
-            planner_types::types::AccuracyTarget::Exact,
-        )
-        .unwrap();
-        let (_, nodes) = query_time_nodes(query, &fragment).unwrap();
-        assert!(nodes.values().any(|node| matches!(node, QueryPlanNode::Logical { operator: QueryTimeOperator::Scan { matchers, .. }, .. } if matchers.iter().any(|m| m.name == "job" && m.value == "api"))));
-        assert!(query_time_nodes("sum(rate(other_total[5m]))", &fragment).is_err());
-    }
-    #[test]
-    fn repeated_subexpressions_share_node_identity() {
-        // Serialized edges must retain CSE rather than duplicating raw work.
-        let entry = crate::query_plan::query_time::compile_logical(
-            "q".into(),
-            "sum(up) / sum(up)".into(),
-            instant(),
-            FallbackPolicy::Reject,
-        )
-        .unwrap();
-        let QueryPlanNode::Logical { inputs, .. } = &entry.nodes[&entry.root] else {
-            panic!("binary expected")
-        };
-        assert_eq!(inputs[0], inputs[1]);
-    }
-    #[test]
-    fn malformed_operator_arity_is_rejected_at_installation() {
-        // A serialized graph cannot bypass the operation's input contract.
-        assert!(QueryTimeOperator::HistogramQuantile.validate(1).is_err());
-        assert!(QueryTimeOperator::Subquery {
-            range_ms: 60_000,
-            step_ms: 0,
-            offset_ms: 0
-        }
-        .validate(1)
-        .is_err());
-    }
-
-    #[test]
-    fn real_topk_queries_lower_to_value_selection() {
-        for (query, k) in [
-            (
-                "topk(2, sum by (job) (rate(backend_process_cpu_seconds_total[1h])))",
-                2,
-            ),
-            (
-                "topk(2, sum by (job) (backend_process_resident_memory_bytes))",
-                2,
-            ),
-            ("topk(2, max_over_time(backend_retry_backlog_depth[6h]))", 2),
-            (
-                "topk(1, sum by (job) (increase(backend_http_5xx_total[6h])) / sum by (job) (increase(backend_http_requests_total[6h])))",
-                1,
-            ),
-            (
-                "topk(3, avg_over_time((sum by (job) (backend_process_resident_memory_bytes))[6h:]))",
-                3,
-            ),
-        ] {
-            let entry = crate::query_plan::query_time::compile_logical(
-                "topk".into(),
-                query.into(),
-                instant(),
-                FallbackPolicy::Reject,
-            )
-            .unwrap_or_else(|error| panic!("{query}: {error}"));
-            assert!(matches!(
-                entry.nodes[&entry.root],
-                QueryPlanNode::Logical {
-                    operator: QueryTimeOperator::Limit { n: actual, .. },
-                    ..
-                } if actual == k
-            ));
-        }
-    }
-
-    #[test]
-    fn topk_keeps_unsupported_child_as_exact_leaf() {
-        let entry = crate::query_plan::query_time::compile_logical(
-            "topk-subquery".into(),
-            "topk(3, label_replace(memory_bytes, \"dst\", \"$1\", \"src\", \"(.*)\"))".into(),
-            instant(),
-            FallbackPolicy::Reject,
-        )
-        .unwrap();
-        assert!(matches!(
-            entry.nodes[&entry.root],
-            QueryPlanNode::Logical {
-                operator: QueryTimeOperator::Limit { n: 3, .. },
-                ..
-            }
-        ));
-        assert!(entry.nodes.values().any(|node| matches!(
-            node,
-            QueryPlanNode::Logical {
-                operator: QueryTimeOperator::ExactSubquery { .. },
-                ..
-            }
-        )));
-    }
-
-    #[test]
-    fn topk_preserves_by_and_without_partitioning() {
-        for (query, labels, without) in [
-            ("topk by (cluster) (2, m)", vec!["cluster"], false),
-            ("topk without (pod) (2, m)", vec!["pod"], true),
-        ] {
-            let entry = crate::query_plan::query_time::compile_logical(
-                "topk-group".into(),
-                query.into(),
-                instant(),
-                FallbackPolicy::Reject,
-            )
-            .unwrap();
-            assert!(matches!(
-                &entry.nodes[&entry.root],
-                QueryPlanNode::Logical {
-                    operator: QueryTimeOperator::Limit { grouping, .. },
-                    ..
-                } if grouping.labels == labels && grouping.without == without
-            ));
-        }
-    }
-}
diff --git a/control_plane/src/runtime_samples.rs b/control_plane/src/runtime_samples.rs
deleted file mode 100644
index 3812b6ce9..000000000
--- a/control_plane/src/runtime_samples.rs
+++ /dev/null
@@ -1,524 +0,0 @@
-//! Receiver for agents' [`sketch-runtime::GrpcExporter`]
-//! batches — the **push side** of the control plane's real-time
-//! decision loop.
-//!
-//! Agents running an embedded `sketch-runtime` Sampler call the
-//! `asap.runtime.v1.RuntimeSamples.Push` RPC with batched
-//! records. The handler appends each record to a bounded ring
-//! buffer keyed by `(source, sketch, impl)`. Decision loops
-//! peek the tail of that buffer to see the freshest throughput
-//! / latency / accuracy signal.
-//!
-//! ## Why gRPC (vs the earlier HTTP+JSONL)
-//!
-//! HTTP/2 flow control surfaces control plane back-pressure to
-//! the agent — critical when the decision loop is real-time.
-//! See the design discussion thread for the full trade-off;
-//! the summary is in
-//! [`sketch-runtime::exporter::grpc`](https://github.com/ProjectASAP/sketch-bench/blob/main/sketch-runtime/src/exporter/grpc.rs).
-//!
-//! ## Why a ring buffer, not a stream
-//!
-//! Real-time decisions want the freshest N records, not a full
-//! replay. Bounded memory, O(1) append + peek, FIFO eviction.
-//! Longer windows live in the agent's `FileExporter` artifact.
-
-use std::collections::{HashMap, VecDeque};
-use std::sync::atomic::{AtomicU64, Ordering};
-use std::sync::Arc;
-
-use parking_lot::RwLock;
-use serde::{Deserialize, Serialize};
-use serde_json::Value;
-
-// Generated from proto/feedback.proto by build.rs.
-pub mod feedback {
-    tonic::include_proto!("asap.runtime.v1");
-}
-use feedback::runtime_samples_server::{RuntimeSamples, RuntimeSamplesServer};
-use feedback::{PushAck, PushBatch};
-
-/// One record as stored in the ring buffer. Kept as
-/// `serde_json::Value` payload for schema forward-compat — new
-/// fields on `sketch-core::report::Record` flow through without
-/// a control plane rebump. Decision loops extract numeric fields
-/// on demand.
-#[derive(Debug, Clone, Serialize, Deserialize)]
-pub struct RuntimeRecord {
-    pub source: String,
-    pub sketch: String,
-    #[serde(rename = "impl")]
-    pub impl_name: String,
-    #[serde(default)]
-    pub schema_version: u32,
-    /// The full `sketch-core::Record` payload, minus the
-    /// labelling fields already in this struct. Parsed from the
-    /// `RuntimeRecord.payload_json` field of the proto.
-    #[serde(flatten)]
-    pub payload: Value,
-}
-
-#[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct SampleKey {
-    pub source: String,
-    pub sketch: String,
-    pub impl_name: String,
-}
-
-#[derive(Debug, Default)]
-pub struct RuntimeSamplesStats {
-    pub batches_received: AtomicU64,
-    pub records_stored: AtomicU64,
-    pub records_evicted: AtomicU64,
-    pub decode_errors: AtomicU64,
-    pub records_rejected: AtomicU64,
-}
-
-impl RuntimeSamplesStats {
-    pub fn snapshot(&self) -> RuntimeSamplesStatsSnapshot {
-        RuntimeSamplesStatsSnapshot {
-            batches_received: self.batches_received.load(Ordering::Relaxed),
-            records_stored: self.records_stored.load(Ordering::Relaxed),
-            records_evicted: self.records_evicted.load(Ordering::Relaxed),
-            decode_errors: self.decode_errors.load(Ordering::Relaxed),
-            records_rejected: self.records_rejected.load(Ordering::Relaxed),
-        }
-    }
-}
-
-#[derive(Debug, Clone, Copy, Serialize)]
-pub struct RuntimeSamplesStatsSnapshot {
-    pub batches_received: u64,
-    pub records_stored: u64,
-    pub records_evicted: u64,
-    pub decode_errors: u64,
-    pub records_rejected: u64,
-}
-
-/// Bounded FIFO ring buffer of runtime records, keyed by
-/// `(source, sketch, impl)`. Each key has its own record cap. Global key and
-/// serialized-byte limits evict whole oldest keys; consumers see missing
-/// evidence rather than a partially retained observation.
-pub struct RuntimeSamplesStore {
-    buffers: RwLock<RuntimeBuffers>,
-    per_key_capacity: usize,
-    max_keys: usize,
-    max_json_bytes: usize,
-    stats: Arc<RuntimeSamplesStats>,
-}
-
-#[derive(Default)]
-struct RuntimeBuffers {
-    by_key: HashMap<SampleKey, VecDeque<(RuntimeRecord, usize)>>,
-    insertion_order: VecDeque<SampleKey>,
-    json_bytes: usize,
-}
-
-impl RuntimeBuffers {
-    fn remove(&mut self, key: &SampleKey) -> usize {
-        self.insertion_order.retain(|stored| stored != key);
-        let Some(records) = self.by_key.remove(key) else {
-            return 0;
-        };
-        self.json_bytes -= records.iter().map(|(_, bytes)| bytes).sum::<usize>();
-        records.len()
-    }
-}
-
-// Count serialized bytes without allocating another copy of the observation.
-fn encoded_size(record: &RuntimeRecord, limit: usize) -> Option<usize> {
-    struct Counter {
-        bytes: usize,
-        limit: usize,
-    }
-    impl std::io::Write for Counter {
-        fn write(&mut self, bytes: &[u8]) -> std::io::Result<usize> {
-            self.bytes = self
-                .bytes
-                .checked_add(bytes.len())
-                .filter(|size| *size <= self.limit)
-                .ok_or_else(|| std::io::Error::other("runtime record exceeds byte budget"))?;
-            Ok(bytes.len())
-        }
-        fn flush(&mut self) -> std::io::Result<()> {
-            Ok(())
-        }
-    }
-    let mut count = Counter { bytes: 0, limit };
-    serde_json::to_writer(&mut count, record).ok()?;
-    Some(count.bytes)
-}
-
-impl RuntimeSamplesStore {
-    pub fn new(per_key_capacity: usize) -> Arc<Self> {
-        Self::with_limits(per_key_capacity, 1024, 16 * 1024 * 1024)
-    }
-
-    /// Limits serialized retained metadata bytes, not allocator RSS. A zero
-    /// limit disables retention; rejected latest records invalidate older fits.
-    pub fn with_limits(
-        per_key_capacity: usize,
-        max_keys: usize,
-        max_json_bytes: usize,
-    ) -> Arc<Self> {
-        Arc::new(Self {
-            buffers: RwLock::new(RuntimeBuffers::default()),
-            per_key_capacity,
-            max_keys,
-            max_json_bytes,
-            stats: Arc::new(RuntimeSamplesStats::default()),
-        })
-    }
-
-    pub fn stats(&self) -> Arc<RuntimeSamplesStats> {
-        Arc::clone(&self.stats)
-    }
-
-    pub fn stats_handle(&self) -> Arc<RuntimeSamplesStats> {
-        Arc::clone(&self.stats)
-    }
-
-    #[cfg(test)]
-    pub(crate) fn append_for_test(&self, rec: RuntimeRecord) {
-        self.append(rec);
-    }
-
-    fn invalidate(&self, key: &SampleKey) {
-        let removed = self.buffers.write().remove(key);
-        self.stats
-            .records_evicted
-            .fetch_add(removed as u64, Ordering::Relaxed);
-    }
-
-    fn append(&self, rec: RuntimeRecord) -> bool {
-        let key = SampleKey {
-            source: rec.source.clone(),
-            sketch: rec.sketch.clone(),
-            impl_name: rec.impl_name.clone(),
-        };
-        let size = encoded_size(&rec, self.max_json_bytes);
-        if self.per_key_capacity == 0 || self.max_keys == 0 || size.is_none() {
-            self.invalidate(&key);
-            self.stats.records_rejected.fetch_add(1, Ordering::Relaxed);
-            return false;
-        }
-        let size = size.unwrap();
-        let mut buffers = self.buffers.write();
-        if let Some(records) = buffers.by_key.get_mut(&key) {
-            if records.len() >= self.per_key_capacity {
-                let (_, bytes) = records.pop_front().unwrap();
-                buffers.json_bytes -= bytes;
-                self.stats.records_evicted.fetch_add(1, Ordering::Relaxed);
-            }
-        }
-        while (buffers.by_key.len() >= self.max_keys && !buffers.by_key.contains_key(&key))
-            || buffers.json_bytes.saturating_add(size) > self.max_json_bytes
-        {
-            let oldest = buffers
-                .insertion_order
-                .front()
-                .cloned()
-                .expect("retained keys have an order");
-            let removed = buffers.remove(&oldest);
-            self.stats
-                .records_evicted
-                .fetch_add(removed as u64, Ordering::Relaxed);
-        }
-        if !buffers.by_key.contains_key(&key) {
-            buffers.insertion_order.push_back(key.clone());
-        }
-        buffers
-            .by_key
-            .entry(key)
-            .or_default()
-            .push_back((rec, size));
-        buffers.json_bytes += size;
-        self.stats.records_stored.fetch_add(1, Ordering::Relaxed);
-        true
-    }
-
-    /// Peek the latest record for a given key, or `None` if the
-    /// key has never been seen. Used by the replanner /
-    /// decision loop to read freshness signals.
-    pub fn latest(&self, key: &SampleKey) -> Option<RuntimeRecord> {
-        self.buffers
-            .read()
-            .by_key
-            .get(key)
-            .and_then(|b| b.back().map(|(record, _)| record.clone()))
-    }
-
-    /// Snapshot the full ring for a key. O(n) clone; non-hot-path only.
-    pub fn snapshot(&self, key: &SampleKey) -> Vec<RuntimeRecord> {
-        self.buffers
-            .read()
-            .by_key
-            .get(key)
-            .map(|b| b.iter().map(|(record, _)| record.clone()).collect())
-            .unwrap_or_default()
-    }
-
-    pub fn keys(&self) -> Vec<SampleKey> {
-        self.buffers.read().by_key.keys().cloned().collect()
-    }
-}
-
-/// tonic service impl. One instance wraps the shared store and
-/// is added to a tonic `Server` listening on the runtime-samples
-/// port.
-pub struct RuntimeSamplesService {
-    store: Arc<RuntimeSamplesStore>,
-}
-
-impl RuntimeSamplesService {
-    pub fn new(store: Arc<RuntimeSamplesStore>) -> Self {
-        Self { store }
-    }
-
-    /// Return the server as a tonic-routed service with gzip
-    /// compression negotiated on both sides.
-    pub fn into_server(self) -> RuntimeSamplesServer<Self> {
-        RuntimeSamplesServer::new(self)
-            .accept_compressed(tonic::codec::CompressionEncoding::Gzip)
-            .send_compressed(tonic::codec::CompressionEncoding::Gzip)
-    }
-}
-
-#[tonic::async_trait]
-impl RuntimeSamples for RuntimeSamplesService {
-    async fn push(
-        &self,
-        request: tonic::Request<PushBatch>,
-    ) -> Result<tonic::Response<PushAck>, tonic::Status> {
-        self.store
-            .stats
-            .batches_received
-            .fetch_add(1, Ordering::Relaxed);
-        let batch = request.into_inner();
-        let mut accepted = 0_u64;
-        for pb in batch.records {
-            // The agent's RuntimeRecord carries the full v1
-            // `sketch-core::Record` as JSON in `payload_json`.
-            // Parse it into our `Value`-flattened store struct;
-            // reject individual malformed records rather than
-            // failing the whole batch.
-            let mut payload: Value = match serde_json::from_str(&pb.payload_json) {
-                Ok(v) => v,
-                Err(e) => {
-                    self.store
-                        .stats
-                        .decode_errors
-                        .fetch_add(1, Ordering::Relaxed);
-                    self.store.invalidate(&SampleKey {
-                        source: pb.source.clone(),
-                        sketch: pb.sketch.clone(),
-                        impl_name: pb.impl_name.clone(),
-                    });
-                    tracing::warn!(error = %e, "runtime-samples: malformed payload_json, invalidating source evidence");
-                    continue;
-                }
-            };
-            // Strip the labelling fields out of `payload` — our
-            // RuntimeRecord carries them as typed fields, so
-            // duplicates inside payload would confuse downstream
-            // consumers.
-            if let Some(obj) = payload.as_object_mut() {
-                obj.remove("source");
-                obj.remove("sketch");
-                obj.remove("impl");
-            }
-            let rec = RuntimeRecord {
-                source: pb.source,
-                sketch: pb.sketch,
-                impl_name: pb.impl_name,
-                schema_version: pb.schema_version,
-                payload,
-            };
-            if self.store.append(rec) {
-                accepted += 1;
-            }
-        }
-        Ok(tonic::Response::new(PushAck { accepted }))
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use feedback::RuntimeRecord as PbRecord;
-
-    fn make_pb_record(source: &str, sketch: &str, impl_name: &str, tp: f64) -> PbRecord {
-        let payload = serde_json::json!({
-            "schema_version": 1,
-            "mode": "runtime",
-            "timestamp": "2026-04-21T19:00:00Z",
-            "bench": {
-                "throughput_items_per_sec": { "mean": tp, "stddev": 0.0 },
-                "latency_ns": { "p50": 10, "p99": 100 },
-                "memory_bytes": 2048
-            }
-        });
-        PbRecord {
-            source: source.into(),
-            sketch: sketch.into(),
-            impl_name: impl_name.into(),
-            schema_version: 1,
-            payload_json: payload.to_string(),
-        }
-    }
-
-    #[tokio::test]
-    async fn push_stores_records_under_per_key_rings() {
-        let store = RuntimeSamplesStore::new(16);
-        let svc = RuntimeSamplesService::new(Arc::clone(&store));
-        let batch = PushBatch {
-            records: vec![
-                make_pb_record("dc-a", "cms", "oxide", 1e6),
-                make_pb_record("dc-b", "hll", "lib", 2e6),
-                make_pb_record("dc-a", "cms", "oxide", 1.5e6),
-            ],
-        };
-        let resp = svc.push(tonic::Request::new(batch)).await.expect("ok");
-        assert_eq!(resp.into_inner().accepted, 3);
-        assert_eq!(store.keys().len(), 2);
-        let key = SampleKey {
-            source: "dc-a".into(),
-            sketch: "cms".into(),
-            impl_name: "oxide".into(),
-        };
-        assert_eq!(store.snapshot(&key).len(), 2);
-    }
-
-    #[tokio::test]
-    async fn push_rejects_malformed_payload_individually_but_accepts_rest() {
-        let store = RuntimeSamplesStore::new(16);
-        let svc = RuntimeSamplesService::new(Arc::clone(&store));
-        let good1 = make_pb_record("dc-a", "cms", "oxide", 1e6);
-        let bad = PbRecord {
-            source: "dc-a".into(),
-            sketch: "cms".into(),
-            impl_name: "oxide".into(),
-            schema_version: 1,
-            payload_json: "{not json".into(),
-        };
-        let good2 = make_pb_record("dc-a", "cms", "oxide", 2e6);
-        let batch = PushBatch {
-            records: vec![good1, bad, good2],
-        };
-        let resp = svc.push(tonic::Request::new(batch)).await.expect("ok");
-        assert_eq!(resp.into_inner().accepted, 2);
-        let snap = store.stats.snapshot();
-        assert_eq!(snap.records_stored, 2);
-        assert_eq!(snap.decode_errors, 1);
-    }
-
-    /// Replanning can create new definition keys forever; retain only a bounded
-    /// set and expose eviction as missing evidence.
-    #[tokio::test]
-    async fn global_key_limit_evicts_whole_oldest_source() {
-        let store = RuntimeSamplesStore::with_limits(4, 2, 16_384);
-        let svc = RuntimeSamplesService::new(Arc::clone(&store));
-        for source in ["old", "current", "new"] {
-            let ack = svc
-                .push(tonic::Request::new(PushBatch {
-                    records: vec![make_pb_record(source, "hll", "runtime", 10.0)],
-                }))
-                .await
-                .unwrap();
-            assert_eq!(ack.into_inner().accepted, 1);
-        }
-        assert_eq!(store.keys().len(), 2);
-        assert!(store
-            .latest(&SampleKey {
-                source: "old".into(),
-                sketch: "hll".into(),
-                impl_name: "runtime".into()
-            })
-            .is_none());
-        assert_eq!(store.stats.snapshot().records_evicted, 1);
-    }
-
-    /// Byte pressure never truncates population fits inside an observation.
-    #[tokio::test]
-    async fn byte_budget_and_oversized_latest_invalidate_old_evidence() {
-        let store = RuntimeSamplesStore::with_limits(10, 10, 600);
-        let svc = RuntimeSamplesService::new(Arc::clone(&store));
-        for source in ["a", "b", "c", "d"] {
-            svc.push(tonic::Request::new(PushBatch {
-                records: vec![make_pb_record(source, "hll", "runtime", 10.0)],
-            }))
-            .await
-            .unwrap();
-            assert!(store.buffers.read().json_bytes <= 600);
-        }
-        assert!(store.stats.snapshot().records_evicted > 0);
-        let key = SampleKey {
-            source: "d".into(),
-            sketch: "hll".into(),
-            impl_name: "runtime".into(),
-        };
-        assert!(store.latest(&key).is_some());
-        let mut oversized = make_pb_record("d", "hll", "runtime", 10.0);
-        oversized.payload_json = serde_json::json!({"large": "x".repeat(1000)}).to_string();
-        let ack = svc
-            .push(tonic::Request::new(PushBatch {
-                records: vec![oversized],
-            }))
-            .await
-            .unwrap();
-        assert_eq!(ack.into_inner().accepted, 0);
-        assert!(store.latest(&key).is_none());
-        assert_eq!(store.stats.snapshot().records_rejected, 1);
-    }
-
-    #[tokio::test]
-    async fn malformed_latest_and_disabled_retention_cannot_leave_old_fit() {
-        let store = RuntimeSamplesStore::new(2);
-        let svc = RuntimeSamplesService::new(Arc::clone(&store));
-        let mut record = make_pb_record("a", "hll", "runtime", 10.0);
-        svc.push(tonic::Request::new(PushBatch {
-            records: vec![record.clone()],
-        }))
-        .await
-        .unwrap();
-        record.payload_json = "{".into();
-        svc.push(tonic::Request::new(PushBatch {
-            records: vec![record],
-        }))
-        .await
-        .unwrap();
-        assert!(store.keys().is_empty());
-        let disabled = RuntimeSamplesStore::with_limits(0, 2, 600);
-        let service = RuntimeSamplesService::new(Arc::clone(&disabled));
-        let ack = service
-            .push(tonic::Request::new(PushBatch {
-                records: vec![make_pb_record("a", "hll", "runtime", 10.0)],
-            }))
-            .await
-            .unwrap();
-        assert_eq!(ack.into_inner().accepted, 0);
-        assert!(disabled.keys().is_empty());
-    }
-
-    #[tokio::test]
-    async fn ring_evicts_oldest_past_capacity() {
-        let store = RuntimeSamplesStore::new(3);
-        let svc = RuntimeSamplesService::new(Arc::clone(&store));
-        for _ in 0..5 {
-            svc.push(tonic::Request::new(PushBatch {
-                records: vec![make_pb_record("dc-a", "cms", "oxide", 1e6)],
-            }))
-            .await
-            .unwrap();
-        }
-        let snap = store.stats.snapshot();
-        assert_eq!(snap.records_stored, 5);
-        assert_eq!(snap.records_evicted, 2);
-        let key = SampleKey {
-            source: "dc-a".into(),
-            sketch: "cms".into(),
-            impl_name: "oxide".into(),
-        };
-        assert_eq!(store.snapshot(&key).len(), 3);
-    }
-}
diff --git a/control_plane/src/types.rs b/control_plane/src/types.rs
deleted file mode 100644
index cf9276f10..000000000
--- a/control_plane/src/types.rs
+++ /dev/null
@@ -1,823 +0,0 @@
-use chrono::{DateTime, Utc};
-use serde::{Deserialize, Serialize};
-use std::time::Duration;
-
-// ── Workload characteristics ───────────────────────────────────────────────────
-
-pub use planner_types::workload::DataDistribution;
-
-/// Observable characteristics of the incoming data stream.
-///
-/// Compatibility input and transient cost projection of canonical data facts.
-/// The registry stores Planner DataWorkload; cost routines use this view to
-/// compare raw vs. sketch-full vs. sketch-delta transmission costs and
-/// estimate the CPU / memory overhead at the SDK or agent collector.
-///
-/// All fields have conservative defaults so callers can omit the struct
-/// entirely and still get a valid (if pessimistic) decision.
-#[derive(Debug, Clone, Serialize, Deserialize)]
-pub struct WorkloadCharacteristics {
-    /// Number of distinct active time series for this metric.
-    pub series_count: u64,
-    /// Sample rate per series at the SDK / agent (Hz).
-    pub samples_per_sec_per_series: f64,
-    /// Wire size of one raw OTLP metric data point after protobuf encoding
-    /// (bytes).  Typical range: 50–200 bytes.
-    pub bytes_per_raw_sample: u32,
-    /// Known distinct key values per flush period for frequency / cardinality
-    /// sketches.  `None` → inferred analytically from inserts and distribution.
-    pub distinct_keys_per_window: Option<u64>,
-    /// Statistical distribution of keys in the stream.
-    pub data_distribution: DataDistribution,
-    /// Optional memory cap at the SDK / agent collector (bytes).
-    /// `None` → no budget constraint applied.
-    pub memory_budget_bytes: Option<u64>,
-}
-
-impl Default for WorkloadCharacteristics {
-    fn default() -> Self {
-        Self {
-            series_count: 1_000,
-            samples_per_sec_per_series: 100.0,
-            bytes_per_raw_sample: 100,
-            distinct_keys_per_window: None,
-            data_distribution: DataDistribution::Zipf,
-            memory_budget_bytes: None,
-        }
-    }
-}
-
-// ── Delta transmission decision ────────────────────────────────────────────────
-
-/// Reason the planner chose not to enable delta encoding.
-#[derive(Debug, Clone, Serialize, Deserialize)]
-#[serde(rename_all = "snake_case")]
-pub enum DeltaSkipReason {
-    /// Estimated fill rate is so high that delta compression ratio < 2×,
-    /// making snapshot overhead unjustifiable.
-    FillRateTooHigh,
-    /// Snapshot memory for all series × sketches would exceed the configured
-    /// memory budget at the agent.
-    MemoryBudgetExceeded,
-    /// This sketch type has no delta implementation (e.g. KLL).
-    SketchTypeUnsupported,
-    /// Compression ratio fell below the minimum acceptable threshold.
-    CompressionRatioBelowThreshold,
-}
-
-/// Reason the planner chose raw pass-through over sketch transmission.
-#[derive(Debug, Clone, Serialize, Deserialize)]
-#[serde(rename_all = "snake_case")]
-pub enum RawDataReason {
-    /// Series count × sample rate is so small that sketch CPU / memory
-    /// overhead is not justified by the bandwidth savings.
-    WorkloadTooSmall,
-}
-
-/// The control plane's resolved decision on transmission mode.
-#[derive(Debug, Clone, Serialize, Deserialize)]
-#[serde(tag = "mode", rename_all = "snake_case")]
-pub enum DeltaDecision {
-    /// Enable delta-compressed sketch payloads.
-    UseDelta {
-        /// Minimum absolute cell change included in a delta payload (T).
-        threshold: f64,
-        /// Estimated compression ratio (full_bytes / delta_bytes).
-        estimated_compression_ratio: f64,
-        /// Estimated outbound bandwidth with delta enabled (bytes/sec).
-        estimated_delta_bytes_per_sec: f64,
-        /// Additional CPU at the agent per sample due to snapshot diff and
-        /// sparse encoding (µs/sample), amortised over the flush period.
-        delta_cpu_overhead_micros_per_sample: f64,
-        /// Additional memory at the agent for storing snapshots (bytes).
-        delta_memory_overhead_bytes: f64,
-    },
-    /// Transmit full (non-delta) sketch payloads each flush.
-    UseFullSketch {
-        reason: DeltaSkipReason,
-        /// Estimated outbound bandwidth with full sketches (bytes/sec).
-        estimated_full_bytes_per_sec: f64,
-    },
-    /// Skip sketch aggregation; pass raw OTLP samples through.
-    UseRaw {
-        reason: RawDataReason,
-        /// Estimated outbound bandwidth with raw samples (bytes/sec).
-        estimated_raw_bytes_per_sec: f64,
-    },
-}
-
-impl Default for DeltaDecision {
-    fn default() -> Self {
-        DeltaDecision::UseFullSketch {
-            reason: DeltaSkipReason::CompressionRatioBelowThreshold,
-            estimated_full_bytes_per_sec: 0.0,
-        }
-    }
-}
-
-/// Bandwidth and overhead estimates for all three transmission strategies.
-/// Carried on every [`CollectionPlan`] for observability and debugging.
-#[derive(Debug, Clone, Default, Serialize, Deserialize)]
-pub struct TransmissionCostSummary {
-    /// Raw OTLP pass-through bandwidth (bytes/sec).
-    pub raw_bytes_per_sec: f64,
-    /// Full-sketch transmission bandwidth (bytes/sec).
-    pub sketch_full_bytes_per_sec: f64,
-    /// Delta-sketch transmission bandwidth (bytes/sec); 0 if delta not viable.
-    pub sketch_delta_bytes_per_sec: f64,
-    /// Extra CPU at the agent per sample in delta mode (µs/sample).
-    pub delta_cpu_overhead_micros_per_sample: f64,
-    /// Extra memory at the agent for delta snapshots (bytes).
-    pub delta_memory_overhead_bytes: f64,
-    /// Estimated fill rate (fraction of sketch cells changed per flush).
-    pub estimated_fill_rate: f64,
-    /// Flush rate derived from window_duration or repeat_every (Hz).
-    pub flush_rate_hz: f64,
-}
-
-// ── Enumerations ──────────────────────────────────────────────────────────────
-
-#[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub enum AggType {
-    Quantile,
-    Cardinality,
-    Frequency,
-}
-
-impl std::fmt::Display for AggType {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        match self {
-            AggType::Quantile => write!(f, "quantile"),
-            AggType::Cardinality => write!(f, "cardinality"),
-            AggType::Frequency => write!(f, "frequency"),
-        }
-    }
-}
-
-#[derive(Debug, Clone, PartialEq, Eq, Hash, Serialize, Deserialize)]
-#[serde(rename_all = "lowercase")]
-pub enum SketchType {
-    DDSketch,
-    KLL,
-    HLL,
-    CountSketch,
-    CountMinSketch,
-}
-
-impl std::fmt::Display for SketchType {
-    /// Returns the OTel Collector component type string (must match the Go
-    /// factory's `component.MustNewType(…)` in each processor).
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        match self {
-            SketchType::DDSketch => write!(f, "ddsketch"),
-            SketchType::KLL => write!(f, "KLL"),
-            SketchType::HLL => write!(f, "HLL"),
-            SketchType::CountSketch => write!(f, "countsketch"),
-            SketchType::CountMinSketch => write!(f, "countmin"),
-        }
-    }
-}
-
-// Only the five sketch families in the deployment capability table can be
-// converted to this deployment vocabulary; exact accumulators are not inputs.
-impl From<planner_types::post_asap::SketchAlgorithm> for SketchType {
-    fn from(k: planner_types::post_asap::SketchAlgorithm) -> Self {
-        use planner_types::post_asap::SketchAlgorithm;
-        match k {
-            SketchAlgorithm::Kll => SketchType::KLL,
-            SketchAlgorithm::DDSketch => SketchType::DDSketch,
-            SketchAlgorithm::Hll => SketchType::HLL,
-            SketchAlgorithm::Cms => SketchType::CountMinSketch,
-            SketchAlgorithm::CountSketch => SketchType::CountSketch,
-            other => unreachable!(
-                "SketchType::from(SketchAlgorithm): no legacy equivalent for {other:?} \
-                 (callers only pass the 5 canonical families)"
-            ),
-        }
-    }
-}
-
-/// Inverse of `From<SketchAlgorithm> for SketchType`. Round-trippable for the 5
-/// canonical families: `SketchAlgorithm::from(SketchType::from(k)) == k`.
-impl From<SketchType> for planner_types::post_asap::SketchAlgorithm {
-    fn from(t: SketchType) -> Self {
-        use planner_types::post_asap::SketchAlgorithm;
-        match t {
-            SketchType::KLL => SketchAlgorithm::Kll,
-            SketchType::DDSketch => SketchAlgorithm::DDSketch,
-            SketchType::HLL => SketchAlgorithm::Hll,
-            SketchType::CountMinSketch => SketchAlgorithm::Cms,
-            SketchType::CountSketch => SketchAlgorithm::CountSketch,
-        }
-    }
-}
-
-#[derive(Debug, Clone, PartialEq)]
-pub enum OutputMode {
-    Raw,
-    Sketch,
-}
-
-#[derive(Debug, Clone, PartialEq, Eq)]
-pub enum ProcessorMode {
-    Batch,
-    Window,
-}
-
-impl std::fmt::Display for ProcessorMode {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        match self {
-            ProcessorMode::Batch => write!(f, "batch"),
-            ProcessorMode::Window => write!(f, "window"),
-        }
-    }
-}
-
-// ── Core types ────────────────────────────────────────────────────────────────
-
-// ── Sketch defaults (YAML-configurable) ──────────────────────────────────────
-
-/// Per-sketch-type default parameters.  Loaded from a YAML config file at
-/// startup; falls back to compile-time defaults when the file is absent.
-///
-/// Example `sketch_params_default.yml`:
-/// ```yaml
-/// quantile_grid: [0.0, 0.25, 0.5, 0.75, 0.9, 0.99, 1.0]
-/// ddsketch:
-///   relative_accuracy: 0.01
-/// kll:
-///   min_k: 32
-/// hll:
-///   precision_coarse: 10
-///   precision_fine: 14
-///   precision_threshold: 0.02
-/// count_sketch:
-///   epsilon: 0.022
-///   delta: 0.007
-/// count_min_sketch:
-///   rows: 5
-///   cols: 2048
-///   metric_name: "countsketch_partition"
-/// ```
-#[derive(Debug, Clone, Serialize, Deserialize)]
-#[serde(default)]
-pub struct SketchDefaults {
-    /// Quantile grid used when no query-specific φ values are available.
-    pub quantile_grid: Vec<f64>,
-    pub ddsketch: DDSketchDefaults,
-    pub kll: KLLDefaults,
-    pub hll: HLLDefaults,
-    pub count_sketch: CountSketchDefaults,
-    pub count_min_sketch: CountMinSketchDefaults,
-}
-
-#[derive(Debug, Clone, Serialize, Deserialize)]
-#[serde(default)]
-pub struct DDSketchDefaults {
-    pub relative_accuracy: f64,
-}
-
-#[derive(Debug, Clone, Serialize, Deserialize)]
-#[serde(default)]
-pub struct KLLDefaults {
-    /// Minimum k value (clamped from 1/accuracy_sla).
-    pub min_k: u32,
-}
-
-#[derive(Debug, Clone, Serialize, Deserialize)]
-#[serde(default)]
-pub struct HLLDefaults {
-    /// Precision for coarse SLA (accuracy > threshold).
-    pub precision_coarse: u32,
-    /// Precision for fine SLA (accuracy ≤ threshold).
-    pub precision_fine: u32,
-    /// SLA boundary between coarse and fine precision.
-    pub precision_threshold: f64,
-}
-
-#[derive(Debug, Clone, Serialize, Deserialize)]
-#[serde(default)]
-pub struct CountSketchDefaults {
-    /// Relative error bound (ε ≈ 1/√cols).
-    pub epsilon: f64,
-    /// Error probability (δ ≈ e^(−rows)).
-    pub delta: f64,
-}
-
-#[derive(Debug, Clone, Serialize, Deserialize)]
-#[serde(default)]
-pub struct CountMinSketchDefaults {
-    pub rows: u32,
-    pub cols: u32,
-    pub metric_name: String,
-}
-
-impl Default for SketchDefaults {
-    fn default() -> Self {
-        Self {
-            quantile_grid: vec![0.0, 0.25, 0.5, 0.75, 0.9, 0.99, 1.0],
-            ddsketch: DDSketchDefaults::default(),
-            kll: KLLDefaults::default(),
-            hll: HLLDefaults::default(),
-            count_sketch: CountSketchDefaults::default(),
-            count_min_sketch: CountMinSketchDefaults::default(),
-        }
-    }
-}
-
-impl Default for DDSketchDefaults {
-    fn default() -> Self {
-        Self {
-            relative_accuracy: 0.01,
-        }
-    }
-}
-
-impl Default for KLLDefaults {
-    fn default() -> Self {
-        Self { min_k: 32 }
-    }
-}
-
-impl Default for HLLDefaults {
-    fn default() -> Self {
-        Self {
-            precision_coarse: 10,
-            precision_fine: 14,
-            precision_threshold: 0.02,
-        }
-    }
-}
-
-impl Default for CountSketchDefaults {
-    fn default() -> Self {
-        Self {
-            epsilon: 0.022,
-            delta: 0.007,
-        }
-    }
-}
-
-impl Default for CountMinSketchDefaults {
-    fn default() -> Self {
-        Self {
-            rows: 5,
-            cols: 2048,
-            metric_name: "countsketch_partition".into(),
-        }
-    }
-}
-
-impl SketchDefaults {
-    /// Load from a YAML file, falling back to compiled defaults on any error.
-    pub fn load(path: &str) -> Self {
-        match std::fs::read_to_string(path) {
-            Ok(contents) => serde_yaml::from_str(&contents).unwrap_or_else(|e| {
-                tracing::warn!(path, error = %e, "invalid sketch_defaults YAML; using built-in defaults");
-                Self::default()
-            }),
-            Err(_) => Self::default(),
-        }
-    }
-}
-
-/// Per-sketch-type parameters.  Each variant carries only the fields relevant
-/// to that sketch family, avoiding the "bag of unrelated fields" problem.
-#[derive(Debug, Clone, Serialize, Deserialize)]
-#[serde(tag = "type", rename_all = "snake_case")]
-pub enum SketchParams {
-    DDSketch {
-        relative_accuracy: f64,
-        quantiles: Vec<f64>,
-    },
-    KLL {
-        k: u32,
-        quantiles: Vec<f64>,
-    },
-    HLL {
-        precision: u32,
-    },
-    CountSketch {
-        /// Relative error bound (ε).
-        epsilon: f64,
-        /// Error probability (δ).
-        delta: f64,
-    },
-    CountMinSketch {
-        rows: u32,
-        cols: u32,
-        /// Metric name required by the CMS processor.
-        metric_name: String,
-    },
-}
-
-impl Default for SketchParams {
-    fn default() -> Self {
-        let d = SketchDefaults::default();
-        SketchParams::DDSketch {
-            relative_accuracy: d.ddsketch.relative_accuracy,
-            quantiles: d.quantile_grid,
-        }
-    }
-}
-
-impl SketchParams {
-    /// Extract quantiles if this sketch type supports them.
-    pub fn quantiles(&self) -> &[f64] {
-        match self {
-            SketchParams::DDSketch { quantiles, .. } | SketchParams::KLL { quantiles, .. } => {
-                quantiles
-            }
-            _ => &[],
-        }
-    }
-}
-
-/// GOS delta-gating knobs pushed to the edge (Count-Sketch families).
-/// `epsilon` = the staleness share ε_st of the metric's accuracy budget;
-/// `sites` = k (fleet size for the merged-error bound); `anisotropic` selects
-/// the per-cell {T_j} water-filling (O(d·w) edge memory) over the isotropic
-/// scalar (O(1)).
-#[derive(Debug, Clone, Copy, PartialEq)]
-pub struct GosKnobs {
-    pub epsilon: f64,
-    pub sites: u32,
-    pub anisotropic: bool,
-}
-
-impl GosKnobs {
-    /// Derive the edge delta-gate knobs from the metric's ε budget and the
-    /// edge-CPU-vs-communication cost weights: `epsilon` is the **staleness
-    /// share** ε_st from [`crate::epsilon_alloc::split_budget`] (the rest, ε_sa,
-    /// would fund sampling). `sites` = fleet size k (≥1); `anisotropic` selects
-    /// per-cell {T_j} over the isotropic scalar at the edge.
-    pub fn derive(epsilon: f64, sites: u32, w_edge: f64, w_comm: f64, anisotropic: bool) -> Self {
-        // The sketch's own ε is accounted separately (accuracy.rs), so the delta
-        // gate splits the full accuracy budget (eps_sketch=0 here).
-        let (_eps_sa, eps_st) = crate::epsilon_alloc::split_budget(epsilon, 0.0, w_edge, w_comm);
-        Self {
-            epsilon: eps_st,
-            sites: sites.max(1),
-            anisotropic,
-        }
-    }
-}
-
-#[derive(Debug, Clone)]
-pub struct AgentCollectorConfig {
-    pub output_mode: OutputMode,
-    pub sketch_type: SketchType,
-    pub sketch_params: SketchParams,
-    pub aggregate_by: Vec<String>,
-    pub label_matchers: Vec<String>,
-    pub window_duration: Option<Duration>,
-    pub mode: ProcessorMode,
-    pub enable_self_monitoring: bool,
-    pub transmit_sketch: bool,
-    pub drop_original: bool,
-    /// Whether to enable the series ID (UID) registry on the OTLP receiver.
-    /// When true, the receiver caches metric name + attributes per series and
-    /// assigns a compact `series_id`. Subsequent exports can omit attributes
-    /// and send only the ID, saving ~120 bytes per sample.
-    pub enable_series_id: bool,
-    /// TTL for series ID cache entries (seconds). 0 = use receiver default.
-    pub series_id_ttl_secs: u64,
-    /// Whether the agent processor should enable delta encoding.
-    /// Set by the delta cost model after sketch type selection.
-    pub delta_transmission: bool,
-    /// Minimum absolute cell change included in a delta payload (T).
-    /// Ignored when `delta_transmission` is false.
-    pub delta_threshold: f64,
-    /// GOS relative delta gating (design-gos-unified-edge-telemetry.md §7).
-    /// When set, the edge replaces the fixed `delta_threshold` with the
-    /// norm-adaptive GOS threshold; `None` = fixed threshold (unchanged).
-    /// Produced by the ε-budget split (`epsilon_alloc::split_budget`).
-    pub gos: Option<GosKnobs>,
-    /// Data sink the planner wants the agent to emit to. Decoupled
-    /// from the planner output (which sketch / window / projection)
-    /// because where the data goes is a deployment-scope concern,
-    /// not a planning concern. The previous hardcoded
-    /// "prometheus exporter on :8889" approach broke the moment we
-    /// tried to ship sketch types — stock Prometheus exporter
-    /// silently drops `DDSketchDataPoint` / `HLLSketchDataPoint`
-    /// etc. — so emit OTLP-to-backend for sketch deployments and
-    /// keep the prometheus path only for legacy raw-scalar pipelines.
-    pub data_sink: AgentDataSink,
-}
-
-/// What the agent's collector exports to.
-///
-/// `Otlp` — the agent's pipeline ends with an OTLP exporter
-/// pointed at the configured endpoint. Required for sketch
-/// transport: the modified-OTLP `Data::Ddsketch` / `KLLSketch` /
-/// etc. variants are carried natively over OTLP and decoded by
-/// the backend's `OtlpReceiver` + the per-sketch
-/// `from_sketchlib_proto_bytes` / `from_msgpack_bytes` decoders.
-///
-/// `PrometheusScrape` — agent exposes `/metrics` on the listed
-/// host:port for an external scraper. Loses sketch types at the
-/// translation step; only useful for raw-scalar pipelines.
-#[derive(Debug, Clone)]
-pub enum AgentDataSink {
-    /// `endpoint` is an OTLP gRPC endpoint, e.g. `data-plane:4317`.
-    /// `compression` is the transport-level codec; the canonical
-    /// path uses `none` because the backend's tonic gRPC server
-    /// rejects gzip-compressed bodies (returns Unimplemented).
-    Otlp {
-        endpoint: String,
-        compression: String,
-    },
-    /// Pre-existing path: prometheus exporter at `endpoint`. Kept
-    /// for back-compat with the legacy raw-scalar deployment.
-    PrometheusScrape { endpoint: String },
-}
-
-impl Default for AgentDataSink {
-    /// Default is OTLP-to-backend at the canonical compose
-    /// hostname. Override per-deployment via the planner's
-    /// `--agent-data-sink` flag (or future config push).
-    fn default() -> Self {
-        AgentDataSink::Otlp {
-            endpoint: "data-plane:4317".to_string(),
-            compression: "none".to_string(),
-        }
-    }
-}
-
-#[derive(Debug, Clone)]
-pub struct GatewayCollectorConfig {
-    pub passthrough: bool,
-}
-
-// ── Per-stage resource budgets ────────────────────────────────────────────────
-
-/// Per-stage resource caps. The agent cap feeds the physical planner's
-/// placement decision (sketch build deferred off the agent when it would
-/// exceed the cap).
-///
-/// `None` means unbounded (no cap enforced).  Typically sourced from
-/// [`WorkloadCharacteristics::memory_budget_bytes`] for the agent stage and
-/// from a runtime config file for backend / precompute stages.
-#[derive(Debug, Clone, Default, Serialize, Deserialize)]
-pub struct StageResourceBudgets {
-    /// Max sketch memory at the agent OTel Collector (bytes).
-    pub agent_memory_bytes: Option<u64>,
-    /// Max sketch-insertion CPU budget at the agent (µs/sample).
-    pub agent_cpu_micros_per_sample: Option<f64>,
-    /// Max sketch memory at the backend OTel Collector (bytes).
-    pub backend_memory_bytes: Option<u64>,
-    /// Max memory at the ASAPQuery Precompute Engine (bytes).
-    pub precompute_memory_bytes: Option<u64>,
-}
-
-impl StageResourceBudgets {}
-
-// ── Collection plan ───────────────────────────────────────────────────────────
-
-#[derive(Debug, Clone)]
-pub struct CollectionPlan {
-    pub agent_config: AgentCollectorConfig,
-    pub gateway_config: GatewayCollectorConfig,
-    pub valid_until: DateTime<Utc>,
-    /// Resolved delta transmission decision and rationale.
-    pub delta_decision: DeltaDecision,
-    /// Bandwidth and overhead estimates for all three transmission strategies.
-    pub transmission_cost_summary: TransmissionCostSummary,
-}
-
-pub use asap_types::QueryLanguage;
-
-// ── AccuracyTarget ────────────────────────────────────────────────────────────
-
-/// Per-target accuracy SLA, shared with ASAPPlanner's `AggIntent` fields.
-/// Uses Planner's externally tagged serde representation, e.g.
-/// `{"Epsilon": 0.02}`; `EpsilonDelta` names its bound `epsilon`.
-pub use planner_types::types::AccuracyTarget;
-
-/// Translate the legacy `accuracy_sla: f64` field -- a fractional
-/// "1.0 = exact, 0.0 = anything goes" SLA -- into the typed form.
-/// `accuracy_sla == 1.0` round-trips to `Exact`; everything else becomes
-/// `Epsilon(1.0 - accuracy_sla)` (the implied error bound). Free function,
-/// not `impl AccuracyTarget` -- Rust's orphan rules don't allow inherent
-/// impls on a foreign type.
-pub fn accuracy_target_from_legacy_accuracy_sla(accuracy_sla: f64) -> AccuracyTarget {
-    if accuracy_sla >= 1.0 {
-        AccuracyTarget::Exact
-    } else {
-        AccuracyTarget::Epsilon((1.0 - accuracy_sla).max(0.0))
-    }
-}
-
-/// Resolve the public compatibility input once, preserving typed delta/exact semantics.
-pub fn resolve_accuracy_target(
-    typed: Option<&AccuracyTarget>,
-    legacy_confidence: f64,
-) -> Result<AccuracyTarget, String> {
-    let target = if let Some(target) = typed {
-        target.clone()
-    } else {
-        if !legacy_confidence.is_finite() || !(0.0..=1.0).contains(&legacy_confidence) {
-            return Err("accuracy_sla must be finite and in [0,1]".into());
-        }
-        accuracy_target_from_legacy_accuracy_sla(legacy_confidence)
-    };
-    let valid = match target {
-        AccuracyTarget::Exact => true,
-        AccuracyTarget::Epsilon(epsilon) => epsilon.is_finite() && (0.0..=1.0).contains(&epsilon),
-        AccuracyTarget::EpsilonDelta { epsilon, delta } => {
-            epsilon.is_finite()
-                && (0.0..=1.0).contains(&epsilon)
-                && delta.is_finite()
-                && delta > 0.0
-                && delta < 1.0
-        }
-    };
-    if valid {
-        Ok(target)
-    } else {
-        Err("invalid typed accuracy requirement".into())
-    }
-}
-
-// ── QueryShape ────────────────────────────────────────────────────────────────
-
-/// How the query is *evaluated*: one-shot, continuous, or scheduled.
-///
-/// Drives L4 binding (mergeable vs one-shot sketch family) and the L5
-/// wire format (`OneShot` emits config + result; `Streaming` and
-/// `Periodic` emit a config that keeps running). Distinct from
-/// [`DataShape`] — see `design.md` §6.
-#[derive(Debug, Clone, Serialize, Deserialize, PartialEq, Default)]
-#[serde(tag = "kind", rename_all = "snake_case")]
-pub enum QueryShape {
-    /// Evaluate once. Plan, execute, return result, discard state.
-    /// One-off PromQL via `POST /plan`.
-    #[default]
-    OneShot,
-    /// Continuous query — output stream that the executor keeps emitting
-    /// as new data arrives. No fixed cadence; the runtime emits whenever
-    /// the underlying state changes. Streaming dashboards, alerting
-    /// expressions evaluated by the agent rather than by a poller.
-    Streaming,
-    /// Re-evaluated at a fixed cadence — Prometheus recording rules,
-    /// scheduled dashboard panels, alerting evaluation cycles. The
-    /// planner amortises sketch / aggregate build cost across
-    /// evaluations within the cadence and reuses state between
-    /// adjacent windows.
-    Periodic {
-        /// Re-evaluation cadence.
-        every: Duration,
-    },
-}
-
-// ── DataShape ─────────────────────────────────────────────────────────────────
-
-/// Shape of the *data* feeding the query. Workload-level summary; per-leaf
-/// detail rides on `Source::data_shape` per `design.md` §6 L3.
-///
-/// Drives L4 binding choices: an `AppendOnlyStream` unlocks incremental,
-/// mergeable sketches and retraction-free aggregation; `Batch` lets the
-/// planner pick a non-mergeable estimator (e.g. exact percentile over a
-/// sort) that wouldn't survive a distributed streaming setting; `Mutable`
-/// requires retraction-aware operators (out of scope today — the planner
-/// refuses sketch binding and falls back to re-scan).
-#[derive(Debug, Clone, Serialize, Deserialize, PartialEq, Default)]
-#[serde(rename_all = "snake_case")]
-pub enum DataShape {
-    /// Bounded relation, fully materialised at plan time. Parquet / CSV
-    /// files, in-process columnar tables.
-    Batch,
-    /// Append-only stream — events arrive over time, never updated or
-    /// deleted. Metrics, logs, event streams. The common case for the
-    /// asap-collector / asap-query deployments and so the control plane
-    /// default when the field is omitted.
-    #[default]
-    AppendOnlyStream,
-    /// Mutable relation — inserts + updates + deletes. Operational
-    /// databases, CRUD-style tables. Sketch binding is currently
-    /// refused for this shape (no retraction-aware sketches in the
-    /// catalog yet).
-    Mutable,
-    /// Join across sources of differing shape. The planner consults
-    /// `Source::data_shape` per leaf during L4; this variant exists so
-    /// callers don't have to flatten a workload-level summary.
-    Mixed,
-}
-
-// ── QueryId ───────────────────────────────────────────────────────────────────
-
-/// Stable identifier preserved across `replan` cycles so the runtime can
-/// correlate plan outputs with the originating spec, and L4 reuse rules
-/// can name shared producers across consumers in the same workload.
-///
-/// Idiomatically a string here — the control plane already round-trips
-/// metric names + agent IDs as strings (see `monitor::Endpoint`,
-/// `opamp::AgentRole`), so adding a `Uuid` dependency for one field
-/// with no DB-side semantics would be churn for no benefit. The HTTP
-/// API is JSON; callers can supply any string they want, including a
-/// stringified UUID. When omitted, `Analyzer::analyze` derives a
-/// deterministic id from the parsed metric name + accuracy target.
-#[derive(Debug, Clone, Serialize, Deserialize, PartialEq, Eq, Hash)]
-#[serde(transparent)]
-pub struct QueryId(pub String);
-
-impl std::fmt::Display for QueryId {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        f.write_str(&self.0)
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    #[test]
-    fn query_language_serde_roundtrip() {
-        let variant = QueryLanguage::PromQl;
-        let json = serde_json::to_string(&variant).unwrap();
-        let back: QueryLanguage = serde_json::from_str(&json).unwrap();
-        assert_eq!(variant, back, "round-trip failed for {variant:?}");
-    }
-
-    #[test]
-    fn accuracy_target_serde_roundtrip() {
-        let cases = [
-            AccuracyTarget::Exact,
-            AccuracyTarget::Epsilon(0.05),
-            AccuracyTarget::EpsilonDelta {
-                epsilon: 0.01,
-                delta: 0.001,
-            },
-        ];
-        for variant in cases {
-            let json = serde_json::to_string(&variant).unwrap();
-            let back: AccuracyTarget = serde_json::from_str(&json).unwrap();
-            assert_eq!(variant, back, "round-trip failed for {variant:?}");
-        }
-    }
-
-    #[test]
-    fn accuracy_target_from_legacy() {
-        // 1.0 means exact in the legacy schema.
-        assert_eq!(
-            accuracy_target_from_legacy_accuracy_sla(1.0),
-            AccuracyTarget::Exact
-        );
-        // 0.99 SLA → ε = 0.01.
-        match accuracy_target_from_legacy_accuracy_sla(0.99) {
-            AccuracyTarget::Epsilon(eps) => {
-                assert!((eps - 0.01).abs() < 1e-9, "got eps={eps}");
-            }
-            other => panic!("expected Epsilon, got {other:?}"),
-        }
-        // Out-of-range guard — analyzer rejects these upstream, but the
-        // helper itself must not panic on a 0.0 SLA.
-        match accuracy_target_from_legacy_accuracy_sla(0.0) {
-            AccuracyTarget::Epsilon(eps) => assert!((eps - 1.0).abs() < 1e-9),
-            other => panic!("expected Epsilon, got {other:?}"),
-        }
-    }
-
-    #[test]
-    fn query_shape_serde_roundtrip_and_default() {
-        assert_eq!(QueryShape::default(), QueryShape::OneShot);
-        let cases = [
-            QueryShape::OneShot,
-            QueryShape::Streaming,
-            QueryShape::Periodic {
-                every: Duration::from_secs(60),
-            },
-        ];
-        for variant in cases {
-            let json = serde_json::to_string(&variant).unwrap();
-            let back: QueryShape = serde_json::from_str(&json).unwrap();
-            assert_eq!(variant, back, "round-trip failed for {variant:?}");
-        }
-    }
-
-    #[test]
-    fn data_shape_serde_roundtrip_and_default() {
-        assert_eq!(DataShape::default(), DataShape::AppendOnlyStream);
-        for variant in [
-            DataShape::Batch,
-            DataShape::AppendOnlyStream,
-            DataShape::Mutable,
-            DataShape::Mixed,
-        ] {
-            let json = serde_json::to_string(&variant).unwrap();
-            let back: DataShape = serde_json::from_str(&json).unwrap();
-            assert_eq!(variant, back, "round-trip failed for {variant:?}");
-        }
-    }
-
-    #[test]
-    fn query_id_transparent_string_serde() {
-        let id = QueryId("metric-x@0.99".into());
-        let json = serde_json::to_string(&id).unwrap();
-        // `#[serde(transparent)]` should serialize as a bare string.
-        assert_eq!(json, "\"metric-x@0.99\"");
-        let back: QueryId = serde_json::from_str(&json).unwrap();
-        assert_eq!(id, back);
-        assert_eq!(id.0, "metric-x@0.99");
-    }
-}
diff --git a/control_plane/src/workload.rs b/control_plane/src/workload.rs
deleted file mode 100644
index 395ce65ca..000000000
--- a/control_plane/src/workload.rs
+++ /dev/null
@@ -1,1150 +0,0 @@
-//! Declarative workload registration.
-//!
-//! Loads a YAML file describing workloads and their assignments so the
-//! control plane can pre-populate the plan store and assign workloads to
-//! agents on connect without requiring an explicit HTTP `POST /api/v1/plan`.
-
-use serde::{Deserialize, Deserializer, Serialize};
-use tracing::{info, warn};
-
-use crate::types::SketchType;
-use planner_types::pre_asap::AggIntent;
-
-/// Aggregation role a single (metric, query-shape) pair plays in the planner.
-///
-/// **Why this exists** (B2 full restructure): a single metric can carry
-/// MULTIPLE aggregation roles when the workload YAML registers more than
-/// one PromQL shape for it. The canonical case is
-/// `http_requests_total`, which the MVP demo's `mvp-workload.yaml`
-/// registers three times (entries 2/3/4 of [`deploy/configs/mvp-workload.yaml`]):
-///   * `sum by (zone) (http_requests_total)` → [`AggRole::Sum`]
-///   * `sum by (zone) (rate(http_requests_total[5m]))` → [`AggRole::Rate`]
-///   * `count(http_requests_total{zone="z0"})` → [`AggRole::Count`]
-///
-/// Before this enum: the `WorkloadStore` was keyed by metric name alone
-/// and `set(metric, …)` overwrote on collision — only the LAST entry
-/// survived, so the `sum by (zone)` query (entries 2 + 3) lost its plan
-/// and the data-plane refused it with `ExactAgg(Sum) capability not
-/// satisfied` (the surviving plan was DDSketch from entry 1's quantile
-/// shape).
-///
-/// After: the store is keyed by `(metric, role)` so each shape gets its
-/// own plan, its own `PrecomputeMaterialization` on the backend's streaming
-/// config, and its own routing-connector pipeline.
-#[derive(Debug, Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash, Serialize, Deserialize)]
-#[serde(rename_all = "snake_case")]
-pub enum AggRole {
-    /// `quantile_over_time`, `quantile(...)`, `histogram_quantile(...)`,
-    /// or workload entries with `sketch_family_override: DDSketch | KLL`.
-    /// Routes to a quantile-shaped sketch (DDSketch / KLL).
-    Quantile,
-    /// Bare selector or Sum-shaped exact aggregation.
-    Sum,
-    /// Reset-aware per-second counter rate.
-    Rate,
-    /// Reset-aware counter increase over the selected window.
-    Increase,
-    /// `count(...)`, `count_over_time(...)`, `count_distinct_over_time(...)`,
-    /// or workload entries with `sketch_family_override: HLL`. Routes
-    /// to HLL when a sketch is appropriate, otherwise to exact Count.
-    Count,
-    /// `topk(...)`, or workload entries with
-    /// `sketch_family_override: CountSketch | CountMinSketch`. Routes
-    /// to CountSketch / CMS-with-heap. (`topk_over_time(...)` isn't a
-    /// real function this parser recognizes — dropped from this list;
-    /// see `agg_role_topk_query_strings`'s test comment.)
-    Topk,
-    /// Fallback bucket — specialized sketch families that don't fit the
-    /// four shapes above (e.g. CountMinSketch frequency without a topk
-    /// outer), or PromQL shapes the role-classifier can't recognise
-    /// today. Preserves "unique" semantics for the (metric, role) key
-    /// so multiple unrecognised entries still don't collide.
-    Other,
-}
-
-impl AggRole {
-    /// Stable lowercase tag for routing-connector pipeline names, log
-    /// fields, and HTTP path discriminators.
-    pub fn as_str(&self) -> &'static str {
-        match self {
-            AggRole::Quantile => "quantile",
-            AggRole::Sum => "sum",
-            AggRole::Rate => "rate",
-            AggRole::Increase => "increase",
-            AggRole::Count => "count",
-            AggRole::Topk => "topk",
-            AggRole::Other => "other",
-        }
-    }
-}
-
-impl std::fmt::Display for AggRole {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        f.write_str(self.as_str())
-    }
-}
-
-/// Classify a single workload entry into its `AggRole`.
-///
-/// Resolution order:
-/// 1. **`sketch_family_override`** wins when present:
-///    * `DDSketch` / `KLL` → [`AggRole::Quantile`]
-///    * `HLL` → [`AggRole::Count`]
-///    * `CountSketch` → [`AggRole::Topk`]
-///    * `CountMinSketch` → [`AggRole::Other`] (frequency — no
-///      single canonical shape; we keep it out of `Topk` so the topk
-///      variant stays semantically pure for sketch-with-heap families)
-/// 2. **Real `AggIntent` classification** — `query_string` is parsed
-///    through the same canonical pipeline the live serving path uses
-///    (`query_parser::parse_query_expr_canonical` →
-///    `asap_tier_analysis::collect_agg_intents`), and the OUTERMOST
-///    intent is matched, except that a Sum wrapping a counter function
-///    keeps the inner Rate or Increase role:
-///    * [`AggIntent::Quantile`] → [`AggRole::Quantile`]
-///    * [`AggIntent::TopK`] → [`AggRole::Topk`]
-///    * [`AggIntent::Cardinality`], [`AggIntent::Count`], or the
-///      windowed-Count-as-Frequency extension
-///      (`intent_algebra::as_frequency`) → [`AggRole::Count`]
-///    * [`AggIntent::Sum`], [`AggIntent::Rate`], [`AggIntent::Increase`]
-///      → their respective roles
-///    * Anything else recognised but not one of the listed shapes above
-///      (`Min`/`Max`/`Avg`/`StdDev`/histogram accessors/…) →
-///      [`AggRole::Other`].
-///    * Bare metric selector (no `Aggregate` node at all) →
-///      [`AggRole::Sum`] (matches PromQL's instant-vector semantics —
-///      a bare counter sums values across time-aligned samples).
-/// 3. Unparseable / no query string / no override → [`AggRole::Other`].
-///
-/// This used to be a PromQL-string leading-token sniff — the same
-/// duplicate-classifier smell already retired from the live serving path
-/// (see the former `analyzer-parity-matrix.md`'s "engine (duplicate)"
-/// analyzer). `AggIntent` classification is now the single source of
-/// truth for "what shape is this query," here and on the serving path.
-///
-/// Ambiguous case decisions (documented for the B2 PR, still holds under
-/// `AggIntent` classification):
-///   * `count_over_time(metric)` — Count (cardinality/frequency
-///     semantics, whichever the lowerer picks). The Sum-shaped
-///     alternative is rare in practice; users who want it write
-///     `sum_over_time(count(...))` which classifies as Sum.
-///   * `irate` currently folds onto `AggIntent::Rate` in the frontend.
-pub fn derive_agg_role(entry: &WorkloadEntry) -> AggRole {
-    // 1. `sketch_family_override` wins.
-    if let Some(family) = entry.sketch_family_override.as_ref() {
-        return match family {
-            SketchType::DDSketch | SketchType::KLL => AggRole::Quantile,
-            SketchType::HLL => AggRole::Count,
-            SketchType::CountSketch => AggRole::Topk,
-            SketchType::CountMinSketch => AggRole::Other,
-        };
-    }
-
-    // 2. Real AggIntent classification via the canonical parse/lower
-    //    pipeline — the same one `capability_for`/serving uses. Canonical
-    //    structural lowering is owned by ASAPPlanner's frontend.
-    let Some(qs) = entry.query_string.as_ref() else {
-        return AggRole::Other;
-    };
-    let accuracy = crate::types::accuracy_target_from_legacy_accuracy_sla(entry.accuracy_sla);
-    let Ok(expr) = crate::query_parser::parse_query_expr_canonical(qs, accuracy) else {
-        return AggRole::Other;
-    };
-    let mut intents: Vec<AggIntent> = Vec::new();
-    collect_agg_intents(&expr, &mut intents);
-    let Some(outer) = intents.first() else {
-        // No Aggregate node at all — a bare metric selector (or a
-        // window-only shape with no AggType to map onto). Bare
-        // selectors default to Sum per PromQL's instant-vector
-        // semantics; anything else falls through to Other below.
-        let trimmed = qs.trim_start();
-        if !trimmed.is_empty() && !trimmed.starts_with('{') {
-            return AggRole::Sum;
-        }
-        return AggRole::Other;
-    };
-    if crate::planner_selection::as_frequency(outer).is_some() {
-        return AggRole::Count;
-    }
-    // A spatial `sum by (...)` around a counter function still requires the
-    // counter family's state; using Sum as the registration key would let it
-    // overwrite a bare Sum workload for the same metric.
-    if matches!(outer, AggIntent::Sum { .. }) {
-        if intents
-            .iter()
-            .any(|intent| matches!(intent, AggIntent::Rate))
-        {
-            return AggRole::Rate;
-        }
-        if intents
-            .iter()
-            .any(|intent| matches!(intent, AggIntent::Increase))
-        {
-            return AggRole::Increase;
-        }
-    }
-    match outer {
-        AggIntent::Quantile { .. } => AggRole::Quantile,
-        AggIntent::TopK { .. } => AggRole::Topk,
-        AggIntent::Cardinality { .. } | AggIntent::Count { .. } => AggRole::Count,
-        AggIntent::Sum { .. } => AggRole::Sum,
-        AggIntent::Rate => AggRole::Rate,
-        AggIntent::Increase => AggRole::Increase,
-        _ => AggRole::Other,
-    }
-}
-
-fn collect_agg_intents(expr: &planner_types::pre_asap::QueryExpr, out: &mut Vec<AggIntent>) {
-    use planner_types::pre_asap::QueryExpr;
-    match expr {
-        QueryExpr::Aggregate {
-            measures, child, ..
-        } => {
-            out.extend(measures.iter().cloned());
-            collect_agg_intents(child, out);
-        }
-        QueryExpr::Filter { child, .. }
-        | QueryExpr::Project { child, .. }
-        | QueryExpr::Dedup { child, .. }
-        | QueryExpr::Sort { child, .. }
-        | QueryExpr::Limit { child, .. }
-        | QueryExpr::PromqlSubquery { child, .. }
-        | QueryExpr::TimeRange { child, .. }
-        | QueryExpr::TimeShift { child, .. }
-        | QueryExpr::SQLWindowFunc { child, .. } => collect_agg_intents(child, out),
-        QueryExpr::Concat { children, .. } => {
-            for child in children {
-                collect_agg_intents(child, out);
-            }
-        }
-        QueryExpr::Join { left, right, .. }
-        | QueryExpr::SetOp { left, right, .. }
-        | QueryExpr::BinaryOp {
-            lhs: left,
-            rhs: right,
-            ..
-        } => {
-            collect_agg_intents(left, out);
-            collect_agg_intents(right, out);
-        }
-        _ => {}
-    }
-}
-
-/// A single workload entry from the workloads YAML file.
-///
-/// `deny_unknown_fields`: a misspelled or unsupported key is a planning input
-/// the controller cannot honour. Accepting it silently would let the operator
-/// believe a declared cadence / hint reached the planner when it never left the
-/// YAML, so the registry rejects the file instead (see
-/// [`WorkloadRegistry::try_load`]).
-#[derive(Debug, Clone, Serialize, Deserialize)]
-#[serde(deny_unknown_fields)]
-pub struct WorkloadEntry {
-    /// Metric name this workload targets (e.g. `http_request_duration_seconds`).
-    pub metric_name: String,
-    /// PromQL / SQL query string for the planner.
-    #[serde(default)]
-    pub query_string: Option<String>,
-    /// Required accuracy SLA (0.0 – 1.0).
-    #[serde(default = "default_accuracy_sla")]
-    pub accuracy_sla: f64,
-    /// Role that should receive this workload (e.g. `"agent"`, `"backend"`).
-    #[serde(default = "default_role")]
-    pub assign_to_role: String,
-    /// Optional explicit sketch family override. When set, the planner pins
-    /// this family for the metric (modulo `(sketch, statistic)` validity
-    /// by ASAPPlanner's legal candidate enumeration). Threaded
-    /// into `RegisteredWorkload::sketch_type_override` by the registry pre-pop
-    /// path so the typed L4 binding (`bind_workload_typed`) honours it.
-    ///
-    /// MVP-§46 contract entries 5–8 in `deploy/configs/mvp-workload.yaml`
-    /// rely on this field to pin HLL / CountSketch / CountMinSketch
-    /// against metrics whose name-classified statistic class is
-    /// `Cardinality` / `TopK` / `Frequency`.
-    #[serde(default, deserialize_with = "deserialize_sketch_family")]
-    pub sketch_family_override: Option<SketchType>,
-    /// Optional storage tier hint (e.g. `"warm"`, `"archive"`). Round-trips
-    /// silently for now — kept here so the YAML schema matches the
-    /// capability_matching agent's expected shape (no rename step at
-    /// integration). Not yet read by the planner.
-    #[serde(default)]
-    pub target_path: Option<String>,
-    /// MVP blocker B3 — declarative grouping labels for the wire-attr
-    /// allowlist the agent applies before sketching. Mirrors the
-    /// streaming-config's `grouping_labels` contract: the agent's
-    /// `transform/keep_for_<metric>` OTTL processor calls
-    /// `keep_keys(datapoint.attributes, [...])` on this list, stripping
-    /// every other attr BEFORE the sketch processor mints sids.
-    ///
-    /// Why this is a separate field (not parsed from `query_string`):
-    /// the canonical MVP workload `quantile_over_time(0.99,
-    /// http_requests_total_latency_ms[30s])` carries no `by (...)`
-    /// clause, so the PromQL parser surfaces an EMPTY group_by_labels.
-    /// Without a declarative field the analyzer ends up with an empty
-    /// `RegisteredWorkload.group_by_labels` → an empty `keep_keys` list →
-    /// the agent strips ALL attrs and mints a single sid per metric
-    /// (instead of one per `(metric, zone)`), defeating the streaming-
-    /// config contract.
-    ///
-    /// Threaded into `RegisteredWorkload::group_by_labels` by the registry
-    /// pre-pop loop in `main`, so it merges with any `by (...)` keys
-    /// the PromQL parser surfaces. Empty / missing ⇒ same behaviour as
-    /// pre-B3 (no allowlist injected).
-    #[serde(default)]
-    pub grouping_labels: Vec<String>,
-    /// Optional per-metric sketch sampling probability `p` in `(0, 1]`.
-    ///
-    /// Activates the warm-sketch sampling layer (geometric admission for
-    /// the frequency families / hash-threshold for HLL) the agent's
-    /// sketch processors carry: the encoder admits a `p` fraction of
-    /// updates, stores the RAW sampled state, stamps `p` on the
-    /// `SketchEnvelope`, and the backend rescales count-like estimates by
-    /// `1/p` at query time. `1.0` (the default — also the value `0`/unset
-    /// normalises to) disables sampling so the emitted agent config and
-    /// wire bytes are byte-identical to today.
-    ///
-    /// Today this is a static operator-set knob; a dynamic
-    /// optimizer-driven `p` (tuned from runtime samples against an
-    /// accuracy/bandwidth budget) is a follow-up and is intentionally out
-    /// of scope here.
-    ///
-    /// Threaded into `EdgeStageConfig::metric_to_sample_p` by the registry
-    /// pre-pop loop in `main`, which the L5 edge emitter reads in
-    /// `build_edge_processor_block` and writes onto the per-metric
-    /// sketch-processor block (`sample_p`) only when `< 1.0`.
-    #[serde(default = "default_sample_p")]
-    pub sample_p: f64,
-    /// Optional **known distinct key (item) count per flush window** for the
-    /// cardinality / frequency sketch families — the declarative twin of
-    /// [`crate::types::WorkloadCharacteristics::distinct_keys_per_window`].
-    ///
-    /// Today this refines ONLY the HLL sparse-vs-dense base selection at the
-    /// edge: a *per-series* HLL is emitted sparse by default (PR #358), but a
-    /// per-series HLL whose cardinality is known to exceed the in-memory
-    /// sparse→dense promotion point pays only promotion churn from the sparse
-    /// base, so when this hint is `Some(n)` with `n` above that crossover the
-    /// L5 emitter emits it dense instead (completing the #358 follow-up).
-    ///
-    /// Threaded into `EdgeStageConfig::metric_to_distinct_keys` by
-    /// [`crate::emit::collect_metric_to_distinct_keys`] (registry pre-pop loop
-    /// in `main` + the replan companion), which the L5 `asap_edge` emitter
-    /// reads in `emit_edge_yaml_asap_edge`'s HLL branch. `None` / missing ⇒
-    /// the scope-based default of PR #358 (per-series ⇒ sparse), so the
-    /// emitted config stays byte-identical when the hint is absent.
-    #[serde(default)]
-    pub distinct_keys_per_window: Option<u64>,
-    /// Optional **inner high-cardinality dimension** for the item-counting
-    /// sketch families (HLL / CountSketch / CountMinSketch): the data-point
-    /// attribute whose VALUE is the "item" the sketch counts/ranks, as
-    /// opposed to a [`grouping_labels`](Self::grouping_labels) key that
-    /// splits the sketch into per-group series.
-    ///
-    /// Why this is a separate declarative field (not derivable from the
-    /// metric name or `query_string`): the inner dimension is a producer
-    /// data-point attribute name (`user_id` for the HLL metric
-    /// `unique_users_per_min`, `endpoint` for the CountSketch metric
-    /// `top_endpoint_qps` and the Count-Min metric `endpoint_request_freq`).
-    /// Neither the metric NAME nor the PromQL carries it — `count(...)` /
-    /// `topk(...)` / `rate(...)` name no attribute. Without a declarative
-    /// field the high-cardinality inner attribute stays in the sketch's
-    /// series key (one cardinality-1 HLL per `user_id` instead of one HLL
-    /// per zone), so the HLL/CMS warm queries return semantically wrong /
-    /// empty results.
-    ///
-    /// Threaded into `EdgeStageConfig::metric_to_item_label` by the registry
-    /// pre-pop loop in `main` (and the replan companion stitch), which the
-    /// L5 edge emitter reads in `emit_edge_yaml_asap_edge` and writes onto
-    /// the per-metric sketch entry as `item_label`. For CountSketch the
-    /// emitter falls back to the metric-name convention
-    /// (`countsketch_item_label_for`) when this field is unset, preserving
-    /// the prior behaviour. `None` / missing ⇒ no `item_label` is emitted
-    /// for HLL/CMS (backward-compatible).
-    #[serde(default)]
-    pub item_label: Option<String>,
-
-    /// Optional continuous-monitoring (CDM) declaration: when set, this metric
-    /// becomes a monitored standing query — the controller auto-emits the
-    /// backend coordinator's `monitors:` entry (authoritative τ) and, in
-    /// future, the edge `threshold:` block. `None` / missing ⇒ no monitor.
-    #[serde(default)]
-    pub monitor: Option<MonitorDecl>,
-
-    /// Optional evaluation cadence for this declared query class, in the same
-    /// `1h5m30s` spelling [`crate::pipeline::parse_duration`] accepts.
-    ///
-    /// Why this exists: the cadence is a **cost input**, not a scheduler knob.
-    /// [`crate::physical::deployment_cost::delta`] uses it as the batch-mode
-    /// flush-period proxy, so the same declaration costed through the HTTP
-    /// `POST /api/v1/plan` path (whose [`crate::pipeline::QuerySpec`] has
-    /// carried `repeat_every` all along) and through this YAML registry used
-    /// to reach the planner with *different* flush periods — the startup path
-    /// hardcoded `None`. Threaded into `QuerySpec::repeat_every` by the
-    /// registry pre-pop loop in `main`, which the analyzer parses into
-    /// [`crate::types::RegisteredWorkload::repeat_every`].
-    ///
-    /// `None` / missing ⇒ unchanged behaviour (the cost model falls back to
-    /// its window-derived flush rate).
-    #[serde(default)]
-    pub repeat_every: Option<String>,
-}
-
-/// User-facing continuous-monitoring declaration on a [`WorkloadEntry`]. τ/ε and
-/// the window are authoritative at the coordinator; this is the controller's
-/// source for emitting them. See `crate::emit::monitor`.
-#[derive(Debug, Clone, Serialize, Deserialize)]
-pub struct MonitorDecl {
-    /// Threshold τ the global aggregate is monitored against.
-    pub tau: f64,
-    /// Additive functional: "sum" (default), "cms_point", or "linear_buckets".
-    #[serde(default)]
-    pub functional: String,
-    /// CMS point-frequency key x (functional = cms_point).
-    #[serde(default)]
-    pub key: String,
-    /// Relative tolerance ε (the alert fires at (1−ε)τ).
-    #[serde(default = "default_monitor_epsilon")]
-    pub epsilon: f64,
-    /// Tumbling epoch length in seconds; MUST match the metric's edge window.
-    pub window_secs: u64,
-}
-
-fn default_monitor_epsilon() -> f64 {
-    0.05
-}
-
-fn default_accuracy_sla() -> f64 {
-    0.01
-}
-
-/// Default per-metric sampling probability — `1.0` (sampling disabled,
-/// exact). Keeps the emitted config byte-identical to pre-sampling when a
-/// workload entry omits `sample_p`.
-fn default_sample_p() -> f64 {
-    1.0
-}
-fn default_role() -> String {
-    "agent".into()
-}
-
-/// Case-insensitive `SketchType` deserialiser. The wire YAML in
-/// `deploy/configs/mvp-workload.yaml` spells the variants in mixed case
-/// (`KLL`, `HLL`, `CountSketch`, `CountMinSketch`, `DDSketch`) to match
-/// the capability-matching agent's schema, while `SketchType`'s
-/// `#[serde(rename_all = "lowercase")]` would otherwise reject those
-/// strings. Accepts both spellings.
-fn deserialize_sketch_family<'de, D>(deserializer: D) -> Result<Option<SketchType>, D::Error>
-where
-    D: Deserializer<'de>,
-{
-    let opt: Option<String> = Option::deserialize(deserializer)?;
-    let Some(s) = opt else { return Ok(None) };
-    let kind = match s.trim().to_ascii_lowercase().as_str() {
-        "ddsketch" => SketchType::DDSketch,
-        "kll" => SketchType::KLL,
-        "hll" => SketchType::HLL,
-        "countsketch" => SketchType::CountSketch,
-        "countminsketch" | "countmin" | "cms" => SketchType::CountMinSketch,
-        other => {
-            return Err(serde::de::Error::custom(format!(
-                "unknown sketch_family_override `{other}`; expected one of \
-             DDSketch / KLL / HLL / CountSketch / CountMinSketch"
-            )))
-        }
-    };
-    Ok(Some(kind))
-}
-
-/// Registry of declarative workloads loaded from a YAML file.
-#[derive(Debug, Clone)]
-pub struct WorkloadRegistry {
-    entries: Vec<WorkloadEntry>,
-    /// Runtime-injected entries — e.g. from the autonomous `/api/v1/plan/auto`
-    /// apply path. Kept SEPARATE from the static YAML `entries` so the static
-    /// accessors (`entries()`, `for_role()`) are byte-for-byte unchanged; only
-    /// monitor emission ([`monitor_intents`]) overlays these. `Arc<RwLock<…>>`
-    /// so cloned registries (AppState + Replanner hold clones) share the same
-    /// runtime injections.
-    runtime: std::sync::Arc<std::sync::RwLock<Vec<WorkloadEntry>>>,
-}
-
-impl WorkloadRegistry {
-    /// Collect the continuous-monitoring intents declared across all workload
-    /// entries, resolved against the given coordinator endpoint. The controller
-    /// feeds these to the backend `monitors:` emitter (and, later, the edge
-    /// `threshold:` emitter); each carries the content-addressed agg_id derived
-    /// from the metric name so it lines up with the edge's per-window sketch.
-    pub fn monitor_intents(
-        &self,
-        coordinator_url: &str,
-    ) -> Vec<crate::emit::monitor::MonitorIntent> {
-        use crate::emit::monitor::{Functional, MonitorIntent};
-        let runtime = self.runtime.read().expect("runtime registry lock poisoned");
-        self.entries
-            .iter()
-            .chain(runtime.iter())
-            .filter_map(|e| {
-                let m = e.monitor.as_ref()?;
-                Some(MonitorIntent {
-                    metric: e.metric_name.clone(),
-                    functional: Functional::from_name(&m.functional),
-                    key: m.key.clone(),
-                    coeffs: Vec::new(),
-                    coordinator_url: coordinator_url.to_string(),
-                    tau: m.tau,
-                    epsilon: m.epsilon,
-                    window_ms: m.window_secs.saturating_mul(1000),
-                })
-            })
-            .collect()
-    }
-
-    /// Inject (or replace, keyed by `metric_name`) a runtime workload entry.
-    /// Used by the autonomous-allocation apply path to register a synthesized
-    /// monitor so the next replan/repost emits it into the backend
-    /// `InstalledPrecomputePlan` (the coordinator then derives the ε-floor `p`). Shared
-    /// across registry clones via the `Arc<RwLock<…>>` overlay.
-    pub fn insert_runtime(&self, entry: WorkloadEntry) {
-        let mut rt = self
-            .runtime
-            .write()
-            .expect("runtime registry lock poisoned");
-        rt.retain(|e| e.metric_name != entry.metric_name);
-        rt.push(entry);
-    }
-
-    /// Load from a YAML file. Returns an empty registry on any error.
-    ///
-    /// Prefer [`Self::try_load`] on the startup path: a registry that parses
-    /// into nothing is indistinguishable, at every later step, from an
-    /// operator who declared no workloads at all.
-    pub fn load(path: &str) -> Self {
-        match Self::try_load(path) {
-            Ok(registry) => registry,
-            Err(error) => {
-                warn!(path, error = %error, "invalid workloads YAML; using empty registry");
-                Self::empty()
-            }
-        }
-    }
-
-    /// Load from a YAML file, reporting an unusable file instead of degrading
-    /// to an empty registry.
-    ///
-    /// A **missing** file stays non-fatal — the controller is expected to run
-    /// without a declarative registry (the process e2e tests boot it with
-    /// `CONTROLLER_WORKLOADS` pointing at a path that does not exist). A file
-    /// that exists but does not parse is fatal: it carries planning input the
-    /// operator wrote down, and silently planning *nothing* from it has the
-    /// same observable shape as a controller that planned everything.
-    pub fn try_load(path: &str) -> Result<Self, String> {
-        let contents = match std::fs::read_to_string(path) {
-            Ok(contents) => contents,
-            Err(error) if error.kind() == std::io::ErrorKind::NotFound => {
-                info!(path, "workloads file not found; using empty registry");
-                return Ok(Self::empty());
-            }
-            Err(error) => return Err(format!("cannot read workload registry: {error}")),
-        };
-        let entries = serde_yaml::from_str::<Vec<WorkloadEntry>>(&contents)
-            .map_err(|error| format!("cannot parse workload registry: {error}"))?;
-        info!(path, count = entries.len(), "loaded workload registry");
-        Ok(Self {
-            entries,
-            runtime: Default::default(),
-        })
-    }
-
-    /// Create an empty registry (no file).
-    pub fn empty() -> Self {
-        Self {
-            entries: vec![],
-            runtime: Default::default(),
-        }
-    }
-
-    /// Create a registry from in-memory entries (useful for tests and
-    /// programmatic construction).
-    pub fn from_entries(entries: Vec<WorkloadEntry>) -> Self {
-        Self {
-            entries,
-            runtime: Default::default(),
-        }
-    }
-
-    /// Returns all workload entries.
-    pub fn entries(&self) -> &[WorkloadEntry] {
-        &self.entries
-    }
-
-    #[cfg(test)]
-    /// Returns workload entries assigned to a given role.
-    pub fn for_role(&self, role: &str) -> Vec<&WorkloadEntry> {
-        self.entries
-            .iter()
-            .filter(|e| e.assign_to_role.eq_ignore_ascii_case(role))
-            .collect()
-    }
-
-    /// Returns the first workload entry for a given role, if any.
-    pub fn first_for_role(&self, role: &str) -> Option<&WorkloadEntry> {
-        self.entries
-            .iter()
-            .find(|e| e.assign_to_role.eq_ignore_ascii_case(role))
-    }
-}
-
-// ── Tests ─────────────────────────────────────────────────────────────────────
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    /// An unsupported key is planning input the controller cannot honour;
-    /// accepting the file would report a cadence / hint that never left the YAML.
-    #[test]
-    fn unknown_registry_key_is_rejected() {
-        let path = std::env::temp_dir().join(format!(
-            "asap_workload_unknown_key_{}.yaml",
-            std::process::id()
-        ));
-        std::fs::write(
-            &path,
-            "- metric_name: http_requests_total
-  accuracy_sla: 0.99
-  repeat_evry: 30s
-",
-        )
-        .unwrap();
-        let error = WorkloadRegistry::try_load(path.to_str().unwrap())
-            .expect_err("unknown key must not load");
-        assert!(error.contains("repeat_evry"), "unexpected error: {error}");
-        // The lenient wrapper still degrades, which is why startup uses `try_load`.
-        assert!(WorkloadRegistry::load(path.to_str().unwrap())
-            .entries()
-            .is_empty());
-        std::fs::remove_file(&path).unwrap();
-    }
-
-    /// Running without a declarative registry stays supported: the process e2e
-    /// tests boot the controller with `CONTROLLER_WORKLOADS` pointing nowhere.
-    #[test]
-    fn missing_registry_file_is_not_a_startup_failure() {
-        let registry = WorkloadRegistry::try_load("/definitely/missing/workloads.yaml")
-            .expect("a missing registry is not an error");
-        assert!(registry.entries().is_empty());
-    }
-
-    #[test]
-    fn load_empty_on_missing_file() {
-        let reg = WorkloadRegistry::load("/nonexistent/workloads.yaml");
-        assert!(reg.entries().is_empty());
-    }
-
-    #[test]
-    fn monitor_intents_collected_from_workload_decls() {
-        // Only the entry carrying a `monitor:` block produces an intent; the
-        // intent's agg_id MUST match the Go edge's fnv64 for the same metric.
-        let yaml = r#"
-- metric_name: bytes_sent
-  accuracy_sla: 0.95
-  assign_to_role: agent
-  monitor:
-    tau: 1000.0
-    functional: sum
-    window_secs: 60
-- metric_name: plain_metric
-  accuracy_sla: 0.95
-  assign_to_role: agent
-"#;
-        let entries: Vec<WorkloadEntry> = serde_yaml::from_str(yaml).expect("parse workload yaml");
-        let reg = WorkloadRegistry::from_entries(entries);
-        let intents = reg.monitor_intents("data-plane:4319");
-        assert_eq!(intents.len(), 1, "only the entry with a monitor decl");
-        let i = &intents[0];
-        assert_eq!(i.metric, "bytes_sent");
-        assert_eq!(i.tau, 1000.0);
-        assert_eq!(i.window_ms, 60_000);
-        assert_eq!(i.epsilon, 0.05); // serde default
-        assert_eq!(i.coordinator_url, "data-plane:4319");
-        assert!(matches!(
-            i.functional,
-            crate::emit::monitor::Functional::Sum
-        ));
-        let entry = crate::emit::monitor::streaming_config_monitor_entry(i);
-        assert_eq!(
-            entry["agg_id"].as_u64().unwrap(),
-            crate::emit::monitor::agg_id_for_metric("bytes_sent")
-        );
-    }
-
-    #[test]
-    fn empty_registry() {
-        let reg = WorkloadRegistry::empty();
-        assert!(reg.entries().is_empty());
-        assert!(reg.first_for_role("agent").is_none());
-    }
-
-    #[test]
-    fn runtime_injected_monitor_is_emitted() {
-        // autonomous apply path: insert a runtime entry carrying a monitor and
-        // assert monitor_intents() overlays it (the static accessors stay empty).
-        let reg = WorkloadRegistry::empty();
-        assert!(reg.monitor_intents("dp:4319").is_empty());
-        reg.insert_runtime(WorkloadEntry {
-            metric_name: "auto_latency".into(),
-            query_string: None,
-            accuracy_sla: 0.01,
-            assign_to_role: "agent".into(),
-            sketch_family_override: Some(crate::types::SketchType::DDSketch),
-            target_path: None,
-            grouping_labels: vec![],
-            sample_p: 1.0,
-            distinct_keys_per_window: None,
-            item_label: None,
-            monitor: Some(MonitorDecl {
-                tau: 7000.0,
-                functional: "sum".into(),
-                key: String::new(),
-                epsilon: 0.05,
-                window_secs: 30,
-            }),
-            repeat_every: None,
-        });
-        let intents = reg.monitor_intents("dp:4319");
-        assert_eq!(intents.len(), 1);
-        assert_eq!(intents[0].metric, "auto_latency");
-        assert_eq!(intents[0].tau, 7000.0);
-        assert_eq!(intents[0].epsilon, 0.05);
-        // static accessors untouched by the runtime overlay
-        assert!(reg.entries().is_empty());
-        // replace-by-metric: re-inserting the same metric does not duplicate
-        reg.insert_runtime(WorkloadEntry {
-            metric_name: "auto_latency".into(),
-            query_string: None,
-            accuracy_sla: 0.01,
-            assign_to_role: "agent".into(),
-            sketch_family_override: Some(crate::types::SketchType::DDSketch),
-            target_path: None,
-            grouping_labels: vec![],
-            sample_p: 1.0,
-            distinct_keys_per_window: None,
-            item_label: None,
-            monitor: Some(MonitorDecl {
-                tau: 9000.0,
-                functional: "sum".into(),
-                key: String::new(),
-                epsilon: 0.05,
-                window_secs: 30,
-            }),
-            repeat_every: None,
-        });
-        let intents = reg.monitor_intents("dp:4319");
-        assert_eq!(intents.len(), 1, "replaced, not duplicated");
-        assert_eq!(intents[0].tau, 9000.0);
-    }
-
-    #[test]
-    fn deserialize_entries() {
-        let yaml = r#"
-- metric_name: latency
-  query_string: "histogram_quantile(0.99, rate(http_duration_bucket[5m]))"
-  accuracy_sla: 0.01
-  assign_to_role: agent
-- metric_name: error_count
-  accuracy_sla: 0.05
-  assign_to_role: backend
-"#;
-        let entries: Vec<WorkloadEntry> = serde_yaml::from_str(yaml).unwrap();
-        assert_eq!(entries.len(), 2);
-        assert_eq!(entries[0].metric_name, "latency");
-        assert_eq!(entries[0].assign_to_role, "agent");
-        assert!(entries[0].query_string.is_some());
-        assert_eq!(entries[1].metric_name, "error_count");
-        assert!(entries[1].query_string.is_none());
-    }
-
-    #[test]
-    fn for_role_filters_correctly() {
-        let reg = WorkloadRegistry::from_entries(vec![
-            WorkloadEntry {
-                metric_name: "a".into(),
-                query_string: None,
-                accuracy_sla: 0.01,
-                assign_to_role: "agent".into(),
-                sketch_family_override: None,
-                target_path: None,
-                grouping_labels: vec![],
-                sample_p: 1.0,
-                distinct_keys_per_window: None,
-                item_label: None,
-                monitor: None,
-                repeat_every: None,
-            },
-            WorkloadEntry {
-                metric_name: "b".into(),
-                query_string: None,
-                accuracy_sla: 0.05,
-                assign_to_role: "backend".into(),
-                sketch_family_override: None,
-                target_path: None,
-                grouping_labels: vec![],
-                sample_p: 1.0,
-                distinct_keys_per_window: None,
-                item_label: None,
-                monitor: None,
-                repeat_every: None,
-            },
-            WorkloadEntry {
-                metric_name: "c".into(),
-                query_string: None,
-                accuracy_sla: 0.02,
-                assign_to_role: "agent".into(),
-                sketch_family_override: None,
-                target_path: None,
-                grouping_labels: vec![],
-                sample_p: 1.0,
-                distinct_keys_per_window: None,
-                item_label: None,
-                monitor: None,
-                repeat_every: None,
-            },
-        ]);
-        assert_eq!(reg.for_role("agent").len(), 2);
-        assert_eq!(reg.for_role("backend").len(), 1);
-        assert_eq!(reg.first_for_role("agent").unwrap().metric_name, "a");
-    }
-
-    #[test]
-    fn deserialize_sample_p_default_and_explicit() {
-        // sample_p is optional and defaults to 1.0 (sampling disabled);
-        // an explicit value round-trips. This is the operator-facing
-        // per-metric sampling knob.
-        let yaml = r#"
-- metric_name: freq_metric
-  sketch_family_override: CountMinSketch
-  sample_p: 0.1
-- metric_name: card_metric
-  sketch_family_override: HLL
-  sample_p: 0.25
-- metric_name: unset_metric
-  sketch_family_override: HLL
-"#;
-        let entries: Vec<WorkloadEntry> = serde_yaml::from_str(yaml).unwrap();
-        assert_eq!(entries.len(), 3);
-        assert!((entries[0].sample_p - 0.1).abs() < 1e-12);
-        assert!((entries[1].sample_p - 0.25).abs() < 1e-12);
-        // Unset ⇒ default 1.0 (sampling disabled / byte-identical).
-        assert!((entries[2].sample_p - 1.0).abs() < 1e-12);
-    }
-
-    #[test]
-    fn deserialize_item_label_default_and_explicit() {
-        // item_label is optional (None by default) and round-trips when
-        // declared. It names the inner high-cardinality data-point
-        // attribute the HLL/CountSketch/CMS family counts or ranks
-        // (e.g. user_id / endpoint), as opposed to a grouping_labels key.
-        let yaml = r#"
-- metric_name: unique_users_per_min
-  sketch_family_override: HLL
-  grouping_labels: [zone]
-  item_label: user_id
-- metric_name: endpoint_request_freq
-  sketch_family_override: CountMinSketch
-  grouping_labels: [zone]
-  item_label: endpoint
-- metric_name: http_requests_total_latency_ms
-  sketch_family_override: KLL
-"#;
-        let entries: Vec<WorkloadEntry> = serde_yaml::from_str(yaml).unwrap();
-        assert_eq!(entries.len(), 3);
-        assert_eq!(entries[0].item_label.as_deref(), Some("user_id"));
-        assert_eq!(entries[1].item_label.as_deref(), Some("endpoint"));
-        // Unset ⇒ None (no inner item dimension; byte-identical to before).
-        assert_eq!(entries[2].item_label, None);
-    }
-
-    #[test]
-    fn deserialize_sketch_family_override_mixed_case() {
-        // The live wire YAML in `deploy/configs/mvp-workload.yaml` spells
-        // the override values in mixed case (KLL / HLL / CountSketch /
-        // CountMinSketch). Verify deserialization picks them up — without
-        // this, MVP §46 entries 5–8 silently drop their family override
-        // (the original stitching-gap symptom).
-        let yaml = r#"
-- metric_name: a
-  sketch_family_override: KLL
-- metric_name: b
-  sketch_family_override: HLL
-- metric_name: c
-  sketch_family_override: CountSketch
-- metric_name: d
-  sketch_family_override: CountMinSketch
-- metric_name: e
-  sketch_family_override: DDSketch
-- metric_name: f
-"#;
-        let entries: Vec<WorkloadEntry> = serde_yaml::from_str(yaml).unwrap();
-        assert_eq!(entries.len(), 6);
-        assert_eq!(entries[0].sketch_family_override, Some(SketchType::KLL));
-        assert_eq!(entries[1].sketch_family_override, Some(SketchType::HLL));
-        assert_eq!(
-            entries[2].sketch_family_override,
-            Some(SketchType::CountSketch)
-        );
-        assert_eq!(
-            entries[3].sketch_family_override,
-            Some(SketchType::CountMinSketch)
-        );
-        assert_eq!(
-            entries[4].sketch_family_override,
-            Some(SketchType::DDSketch)
-        );
-        assert_eq!(entries[5].sketch_family_override, None);
-    }
-
-    // ── AggRole tests (B2 full restructure) ──────────────────────────────
-
-    fn entry(metric: &str, q: Option<&str>, override_: Option<SketchType>) -> WorkloadEntry {
-        WorkloadEntry {
-            metric_name: metric.into(),
-            query_string: q.map(|s| s.to_string()),
-            accuracy_sla: 0.01,
-            assign_to_role: "agent".into(),
-            sketch_family_override: override_,
-            target_path: None,
-            grouping_labels: vec![],
-            sample_p: 1.0,
-            distinct_keys_per_window: None,
-            item_label: None,
-            monitor: None,
-            repeat_every: None,
-        }
-    }
-
-    #[test]
-    fn agg_role_override_pins_quantile_for_dd_and_kll() {
-        assert_eq!(
-            derive_agg_role(&entry("m", None, Some(SketchType::DDSketch))),
-            AggRole::Quantile
-        );
-        assert_eq!(
-            derive_agg_role(&entry("m", None, Some(SketchType::KLL))),
-            AggRole::Quantile
-        );
-    }
-
-    #[test]
-    fn agg_role_override_pins_count_for_hll() {
-        assert_eq!(
-            derive_agg_role(&entry("m", None, Some(SketchType::HLL))),
-            AggRole::Count
-        );
-    }
-
-    #[test]
-    fn agg_role_override_pins_topk_for_countsketch() {
-        assert_eq!(
-            derive_agg_role(&entry("m", None, Some(SketchType::CountSketch))),
-            AggRole::Topk
-        );
-    }
-
-    #[test]
-    fn agg_role_override_pins_other_for_cms() {
-        // CountMinSketch is a frequency estimator without an inherent
-        // topk shape — keep it in `Other` so the topk variant stays
-        // pure for sketch-with-heap families.
-        assert_eq!(
-            derive_agg_role(&entry("m", None, Some(SketchType::CountMinSketch))),
-            AggRole::Other
-        );
-    }
-
-    #[test]
-    fn agg_role_quantile_query_strings() {
-        for q in ["quantile_over_time(0.99, m[5m])", "quantile(0.5, m)"] {
-            assert_eq!(
-                derive_agg_role(&entry("m", Some(q), None)),
-                AggRole::Quantile,
-                "query `{q}` should classify as Quantile"
-            );
-        }
-    }
-
-    #[test]
-    fn agg_role_classic_bucket_histogram_quantile_is_other() {
-        // Classic `_bucket` + `rate(...)` histogram quantiles lower to the
-        // exact-only `HistogramQuantile` intent, classified here as `Other`.
-        assert_eq!(
-            derive_agg_role(&entry(
-                "m",
-                Some("histogram_quantile(0.99, rate(m_bucket[5m]))"),
-                None
-            )),
-            AggRole::Other
-        );
-    }
-
-    #[test]
-    fn agg_role_sum_query_strings() {
-        for q in ["sum by (zone) (m)", "sum_over_time(m[5m])"] {
-            assert_eq!(
-                derive_agg_role(&entry("m", Some(q), None)),
-                AggRole::Sum,
-                "query `{q}` should classify as Sum"
-            );
-        }
-    }
-
-    #[test]
-    fn counter_functions_have_distinct_workload_roles() {
-        for (query, expected) in [
-            ("rate(m[5m])", AggRole::Rate),
-            ("sum by (zone) (rate(m[5m]))", AggRole::Rate),
-            ("increase(m[5m])", AggRole::Increase),
-            ("sum by (zone) (increase(m[5m]))", AggRole::Increase),
-        ] {
-            assert_eq!(derive_agg_role(&entry("m", Some(query), None)), expected);
-        }
-    }
-
-    #[test]
-    fn agg_role_count_query_strings() {
-        for q in [
-            "count(m)",
-            "count_over_time(m[5m])",
-            r#"count(m{zone="z0"})"#,
-        ] {
-            assert_eq!(
-                derive_agg_role(&entry("m", Some(q), None)),
-                AggRole::Count,
-                "query `{q}` should classify as Count"
-            );
-        }
-    }
-
-    #[test]
-    fn agg_role_handles_a_parenthesized_query_the_old_string_sniff_could_not() {
-        // A leading-token PromQL-string sniff (the pre-migration
-        // implementation) reads the FIRST character to find the outer
-        // function name; a redundant wrapping paren isn't an identifier
-        // character, so the old code's `token_end` search finds an
-        // empty leading token, falls through to "not a bare selector
-        // either" and mis-defaults to `Sum`. Real `AggIntent`
-        // classification parses the whole expression regardless of
-        // surface punctuation and correctly resolves the inner
-        // `quantile_over_time` shape.
-        assert_eq!(
-            derive_agg_role(&entry("m", Some("(quantile_over_time(0.9, m[5m]))"), None)),
-            AggRole::Quantile
-        );
-    }
-
-    #[test]
-    fn agg_role_topk_query_strings() {
-        // `topk_over_time` was in this list pre-migration, but it isn't a
-        // real function this parser (or vanilla PromQL) recognizes at
-        // all — confirmed via grep, it appears nowhere in
-        // query_parser/promql.rs or intent_algebra/lower.rs. A workload
-        // entry with that query_string would fail to parse anywhere else
-        // in the real pipeline too (main.rs's handle_plan included), so
-        // the old string-sniffing heuristic classifying it as Topk was
-        // itself the bug, not something this test should keep pinning.
-        // ASAPPlanner distinguishes heavy-hitter TopK from generic PromQL
-        // ranking. Only the former is a sketchable TopK intent.
-        {
-            let q = "topk(5, count_over_time(m[1m]))";
-            assert_eq!(
-                derive_agg_role(&entry("m", Some(q), None)),
-                AggRole::Topk,
-                "query `{q}` should classify as Topk"
-            );
-        }
-    }
-
-    #[test]
-    fn agg_role_bare_metric_selector_is_sum() {
-        assert_eq!(
-            derive_agg_role(&entry(
-                "http_requests_total",
-                Some("http_requests_total"),
-                None
-            )),
-            AggRole::Sum
-        );
-    }
-
-    #[test]
-    fn agg_role_no_query_string_no_override_is_other() {
-        assert_eq!(derive_agg_role(&entry("m", None, None)), AggRole::Other);
-    }
-
-    #[test]
-    fn agg_role_override_beats_query_string() {
-        // An explicit `sketch_family_override: HLL` paired with a
-        // `count(...)` query — both happen to classify as Count, but
-        // we exercise the override priority with a deliberately
-        // mismatched pair (override KLL on a count query) to pin the
-        // override-first rule.
-        let e = entry("m", Some("count(m)"), Some(SketchType::KLL));
-        assert_eq!(derive_agg_role(&e), AggRole::Quantile);
-    }
-
-    #[test]
-    fn deserialize_sketch_family_override_lowercase_aliases() {
-        // Lowercase / kebab-case spellings also accepted, plus the two
-        // CMS aliases (`countmin`, `cms`).
-        let yaml = r#"
-- metric_name: a
-  sketch_family_override: ddsketch
-- metric_name: b
-  sketch_family_override: countmin
-- metric_name: c
-  sketch_family_override: cms
-"#;
-        let entries: Vec<WorkloadEntry> = serde_yaml::from_str(yaml).unwrap();
-        assert_eq!(
-            entries[0].sketch_family_override,
-            Some(SketchType::DDSketch)
-        );
-        assert_eq!(
-            entries[1].sketch_family_override,
-            Some(SketchType::CountMinSketch)
-        );
-        assert_eq!(
-            entries[2].sketch_family_override,
-            Some(SketchType::CountMinSketch)
-        );
-    }
-
-    #[test]
-    fn three_synthetic_http_requests_total_entries_keep_distinct_roles() {
-        // Synthetic mirror of `deploy/configs/mvp-workload.yaml`
-        // entries 2/3/4 — proves `derive_agg_role` produces distinct
-        // roles for the three http_requests_total shapes. Pre-B2 the
-        // workload store collapsed these onto one key and only the
-        // last entry's plan survived; the (metric, role) keyed store
-        // + per-entry role classification fixes that.
-        let entries = [
-            entry(
-                "http_requests_total",
-                Some("sum by (zone) (http_requests_total)"),
-                None,
-            ),
-            entry(
-                "http_requests_total",
-                Some("sum by (zone) (rate(http_requests_total[5m]))"),
-                None,
-            ),
-            entry(
-                "http_requests_total",
-                Some(r#"count(http_requests_total{zone="z0"})"#),
-                None,
-            ),
-        ];
-        let roles: Vec<AggRole> = entries.iter().map(derive_agg_role).collect();
-        assert_eq!(roles, vec![AggRole::Sum, AggRole::Rate, AggRole::Count]);
-        let distinct: std::collections::HashSet<_> = roles.iter().copied().collect();
-        assert_eq!(distinct.len(), 3);
-    }
-}
diff --git a/control_plane/tests/discovery_snapshot.rs b/control_plane/tests/discovery_snapshot.rs
deleted file mode 100644
index c6e4a69b0..000000000
--- a/control_plane/tests/discovery_snapshot.rs
+++ /dev/null
@@ -1,62 +0,0 @@
-//! Discovery output must be accepted by the production snapshot planner.
-use control_plane::physical::compiler::BackendLocalPlanningInput;
-use std::{fs, path::PathBuf, process::Command};
-
-struct TempDirectory(PathBuf);
-impl Drop for TempDirectory {
-    fn drop(&mut self) {
-        let _ = fs::remove_dir_all(&self.0);
-    }
-}
-
-#[test]
-fn discovered_snapshot_plans_with_observed_cadence_and_promql_history() {
-    let root = PathBuf::from(env!("CARGO_MANIFEST_DIR"))
-        .parent()
-        .unwrap()
-        .to_path_buf();
-    let temporary = TempDirectory(
-        std::env::temp_dir().join(format!("asap-discovery-snapshot-{}", std::process::id())),
-    );
-    fs::create_dir(&temporary.0).unwrap();
-    let corpus = temporary.0.join("corpus.json");
-    let metrics = temporary.0.join("metrics.prom");
-    let output = temporary.0.join("snapshot.json");
-    fs::write(&corpus, r#"{"upstream_revision":"test","queries":[{"id":"q","query":"max_over_time(m[1m] offset 1h)","eval_timestamp_ms":120000}]}"#).unwrap();
-    fs::write(&metrics, "m{job=\"test\"} 1 60\nm{job=\"test\"} 2 120\n").unwrap();
-    let result = Command::new("python3")
-        .env("PYTHONDONTWRITEBYTECODE", "1")
-        .arg(root.join("tools/o11y-execution/discover_snapshot.py"))
-        .arg("--corpus")
-        .arg(&corpus)
-        .arg("--metrics")
-        .arg(&metrics)
-        .arg("--template")
-        .arg(root.join("docs/examples/asapquery-planning-snapshot.json"))
-        .arg("--output")
-        .arg(&output)
-        .args(["--repetitions", "1"])
-        .output()
-        .unwrap();
-    assert!(
-        result.status.success(),
-        "{}",
-        String::from_utf8_lossy(&result.stderr)
-    );
-    let snapshot: BackendLocalPlanningInput =
-        serde_json::from_str(&fs::read_to_string(&output).unwrap()).unwrap();
-    assert_eq!(snapshot.physical_inputs.scrape_interval_ms, 60_000);
-    assert_eq!(
-        snapshot.data_workload.data_ingestion_interval.value,
-        Some(planner_types::workload::DurationMs(60_000))
-    );
-    let (request, _) = snapshot
-        .clone()
-        .into_physical_compilation_request()
-        .unwrap();
-    assert_eq!(request.scrape_interval_ms, Some(60_000));
-    assert_eq!(request.queries[0].query_lookback_seconds, 3660);
-    let roundtrip: BackendLocalPlanningInput =
-        serde_json::from_value(serde_json::to_value(&snapshot).unwrap()).unwrap();
-    assert_eq!(snapshot, roundtrip);
-}
diff --git a/control_plane/tests/fixtures/erp-kll-measured.json b/control_plane/tests/fixtures/erp-kll-measured.json
deleted file mode 100644
index 154627f29..000000000
--- a/control_plane/tests/fixtures/erp-kll-measured.json
+++ /dev/null
@@ -1,54 +0,0 @@
-{
-  "schema_version": 1,
-  "producer_version": "dedc2d4",
-  "records": [
-    {
-      "id": "erp-0",
-      "sketch": "kll-percall",
-      "implementation": "lib",
-      "parameters": {
-        "algorithm": "kll-percall",
-        "params": {
-          "k": 32
-        }
-      },
-      "distribution": {
-        "synthetic": {
-          "description": {
-            "column_num": 1,
-            "column_label": [
-              "key"
-            ],
-            "column_spec": [
-              {
-                "distribution": {
-                  "kind": "uniform",
-                  "lower_bound": 0.0,
-                  "upper_bound": 1.0,
-                  "seed": 42
-                },
-                "special_rule": 0,
-                "data_type": "f64"
-              }
-            ],
-            "row_num": 1000
-          }
-        }
-      },
-      "trials": 10,
-      "error_metrics": {
-        "accuracy_runs": 1.0,
-        "grid_points": 101.0,
-        "items": 1000.0,
-        "max_rank_err": 0.051,
-        "mean_rank_err": 0.01618811881188117
-      },
-      "resources": {
-        "memory_bytes": 1024.0,
-        "update_cpu_seconds": 5.588000000000001e-7,
-        "merge_cpu_seconds": 0.000051599999999999994,
-        "query_cpu_seconds": 0.000031625742574257424
-      }
-    }
-  ]
-}
diff --git a/control_plane/tests/fixtures/o11y_queries.json b/control_plane/tests/fixtures/o11y_queries.json
deleted file mode 100644
index 9ea29a17d..000000000
--- a/control_plane/tests/fixtures/o11y_queries.json
+++ /dev/null
@@ -1,296 +0,0 @@
-{
-  "upstream_revision": "3b9567319296366c6a73640d21826fc2fb26bc7e",
-  "eval_timestamp_ms": 1788891296000,
-  "source_files": [
-    {
-      "path": "tasks-spec/prometheus_query/check-service-health.yaml",
-      "sha256": "387dff16abf294107f92cb81384c4ca3964206f1ba47d773671fd6ac7aed785c"
-    },
-    {
-      "path": "tasks-spec/prometheus_query/promql-burn-rate-assessment.yaml",
-      "sha256": "6b3aee1e2adfc3c5b6004f29abfe374edc7294b86a55792d669f03fd122e878b"
-    },
-    {
-      "path": "tasks-spec/prometheus_query/promql-cache-lag-vs-user-latency.yaml",
-      "sha256": "606e0dd923a013bc8475a0efbaafc72afa1ee6035e2f48d1c4bd5e23f164cec3"
-    },
-    {
-      "path": "tasks-spec/prometheus_query/promql-cache-refresh-lag-peak.yaml",
-      "sha256": "6a88045045cab7ac6aba1c84968ecf8e7474cdd77315f2b4db1f2c89869243b3"
-    },
-    {
-      "path": "tasks-spec/prometheus_query/promql-capacity-analysis.yaml",
-      "sha256": "0760992a9f1ad15bfcf91fe14ccab3d130232773cd4a9feaadb96ffeec2982fd"
-    },
-    {
-      "path": "tasks-spec/prometheus_query/promql-discover-http-metric.yaml",
-      "sha256": "5a70c6fb1d575ec794252085afcef88e70b66214cf89aae3bfed8cc6600c78f9"
-    },
-    {
-      "path": "tasks-spec/prometheus_query/promql-error-rate.yaml",
-      "sha256": "7756d896deddf03a8c3ebafc8b677d4d0caf953a55837d63b93c914f0dbb9d0a"
-    },
-    {
-      "path": "tasks-spec/prometheus_query/promql-highest-backend-error-ratio.yaml",
-      "sha256": "39748917439d0201c5eca505f37b48f37d0fa39200c12d3ccd1fc2ce5f20183f"
-    },
-    {
-      "path": "tasks-spec/prometheus_query/promql-label-matchers-service-errors.yaml",
-      "sha256": "db72f53039fba07ebc0b77eb16cdfa10a7cd57b06384c6a8540d95d7d6a94a2b"
-    },
-    {
-      "path": "tasks-spec/prometheus_query/promql-offset-traffic-compare.yaml",
-      "sha256": "dca456d4948de758427725139c5123194d6e6de151815365eb12b5b801194f62"
-    },
-    {
-      "path": "tasks-spec/prometheus_query/promql-order-latency-vs-traffic.yaml",
-      "sha256": "ee1df5d3d7727358c60236091e4f6c24bba77499f3928ae2a337983ad94e4018"
-    },
-    {
-      "path": "tasks-spec/prometheus_query/promql-retry-backlog-triage.yaml",
-      "sha256": "3b11a1d3afb871558908b53a19d79bd38a659f890f244320b34eea8450cfef25"
-    },
-    {
-      "path": "tasks-spec/prometheus_query/promql-subquery-peak-error-rate.yaml",
-      "sha256": "fbc6d1ea4386784ce9c6f1830f33640aa9f517c808d0909209d26d1d829bbee7"
-    },
-    {
-      "path": "tasks-spec/prometheus_query/promql-topk-5xx-share.yaml",
-      "sha256": "d19c40a904b4d09560ad6782adf61dccf8ce0aa060a18da6c835fc81cdf3779e"
-    },
-    {
-      "path": "tasks-spec/prometheus_query/query-cpu-metrics.yaml",
-      "sha256": "51058f02c2bd8616cdde085519e9139668b2eb5b5915afbabe40952062f8459c"
-    },
-    {
-      "path": "tasks-spec/prometheus_query/query-memory-usage.yaml",
-      "sha256": "7ebf61f36fa97d5398cb64ba6543737349d087b91a8719ee62e3568ca23436b9"
-    }
-  ],
-  "queries": [
-    {
-      "id": "check-service-health:rubric:0",
-      "task_id": "check-service-health",
-      "source_path": "tasks-spec/prometheus_query/check-service-health.yaml",
-      "rubric_index": 0,
-      "query": "sum(up)",
-      "eval_timestamp_ms": 1788891296000
-    },
-    {
-      "id": "check-service-health:rubric:1",
-      "task_id": "check-service-health",
-      "source_path": "tasks-spec/prometheus_query/check-service-health.yaml",
-      "rubric_index": 1,
-      "query": "max((sum by (job) (rate(http_requests_total{status=~\"5..\",job=~\"user-service|order-service|payment-service\"}[6h]))) / (sum by (job) (rate(http_requests_total{job=~\"user-service|order-service|payment-service\"}[6h]))))",
-      "eval_timestamp_ms": 1788891296000
-    },
-    {
-      "id": "promql-burn-rate-assessment:rubric:0",
-      "task_id": "promql-burn-rate-assessment",
-      "source_path": "tasks-spec/prometheus_query/promql-burn-rate-assessment.yaml",
-      "rubric_index": 0,
-      "query": "sum(increase(http_requests_total{job=\"payment-service\",status=~\"5..\"}[1h])) / sum(increase(http_requests_total{job=\"payment-service\"}[1h]))",
-      "eval_timestamp_ms": 1788891296000
-    },
-    {
-      "id": "promql-burn-rate-assessment:rubric:1",
-      "task_id": "promql-burn-rate-assessment",
-      "source_path": "tasks-spec/prometheus_query/promql-burn-rate-assessment.yaml",
-      "rubric_index": 1,
-      "query": "sum(increase(http_requests_total{job=\"payment-service\",status=~\"5..\"}[1h] offset 6h)) / sum(increase(http_requests_total{job=\"payment-service\"}[1h] offset 6h))",
-      "eval_timestamp_ms": 1788891296000
-    },
-    {
-      "id": "promql-cache-lag-vs-user-latency:rubric:0",
-      "task_id": "promql-cache-lag-vs-user-latency",
-      "source_path": "tasks-spec/prometheus_query/promql-cache-lag-vs-user-latency.yaml",
-      "rubric_index": 0,
-      "query": "max_over_time(service_cache_refresh_lag_seconds{job=\"user-service\"}[12h])",
-      "eval_timestamp_ms": 1788891296000
-    },
-    {
-      "id": "promql-cache-lag-vs-user-latency:rubric:1",
-      "task_id": "promql-cache-lag-vs-user-latency",
-      "source_path": "tasks-spec/prometheus_query/promql-cache-lag-vs-user-latency.yaml",
-      "rubric_index": 1,
-      "query": "max_over_time(histogram_quantile(0.95, sum(rate(http_request_duration_seconds_bucket{job=\"user-service\"}[5m])) by (le))[12h:1m])",
-      "eval_timestamp_ms": 1788891296000
-    },
-    {
-      "id": "promql-cache-lag-vs-user-latency:rubric:2",
-      "task_id": "promql-cache-lag-vs-user-latency",
-      "source_path": "tasks-spec/prometheus_query/promql-cache-lag-vs-user-latency.yaml",
-      "rubric_index": 2,
-      "query": "service_cache_refresh_lag_seconds{job=\"user-service\"}",
-      "eval_timestamp_ms": 1788891296000
-    },
-    {
-      "id": "promql-cache-refresh-lag-peak:rubric:0",
-      "task_id": "promql-cache-refresh-lag-peak",
-      "source_path": "tasks-spec/prometheus_query/promql-cache-refresh-lag-peak.yaml",
-      "rubric_index": 0,
-      "query": "max_over_time(service_cache_refresh_lag_seconds{job=\"user-service\"}[12h])",
-      "eval_timestamp_ms": 1788891296000
-    },
-    {
-      "id": "promql-cache-refresh-lag-peak:rubric:1",
-      "task_id": "promql-cache-refresh-lag-peak",
-      "source_path": "tasks-spec/prometheus_query/promql-cache-refresh-lag-peak.yaml",
-      "rubric_index": 1,
-      "query": "service_cache_refresh_lag_seconds{job=\"user-service\"}",
-      "eval_timestamp_ms": 1788891296000
-    },
-    {
-      "id": "promql-capacity-analysis:rubric:0",
-      "task_id": "promql-capacity-analysis",
-      "source_path": "tasks-spec/prometheus_query/promql-capacity-analysis.yaml",
-      "rubric_index": 0,
-      "query": "sum(rate(process_cpu_seconds_total[1h]))",
-      "eval_timestamp_ms": 1788891296000
-    },
-    {
-      "id": "promql-capacity-analysis:rubric:1",
-      "task_id": "promql-capacity-analysis",
-      "source_path": "tasks-spec/prometheus_query/promql-capacity-analysis.yaml",
-      "rubric_index": 1,
-      "query": "sum(process_resident_memory_bytes)",
-      "eval_timestamp_ms": 1788891296000
-    },
-    {
-      "id": "promql-capacity-analysis:rubric:2",
-      "task_id": "promql-capacity-analysis",
-      "source_path": "tasks-spec/prometheus_query/promql-capacity-analysis.yaml",
-      "rubric_index": 2,
-      "query": "max_over_time(sum(process_resident_memory_bytes)[6h:1m])",
-      "eval_timestamp_ms": 1788891296000
-    },
-    {
-      "id": "promql-discover-http-metric:rubric:0",
-      "task_id": "promql-discover-http-metric",
-      "source_path": "tasks-spec/prometheus_query/promql-discover-http-metric.yaml",
-      "rubric_index": 0,
-      "query": "sum(rate(http_requests_total{job=~\"user-service|order-service|payment-service\"}[5m]))",
-      "eval_timestamp_ms": 1788891296000
-    },
-    {
-      "id": "promql-error-rate:rubric:0",
-      "task_id": "promql-error-rate",
-      "source_path": "tasks-spec/prometheus_query/promql-error-rate.yaml",
-      "rubric_index": 0,
-      "query": "sum(rate(http_requests_total{status=~\"5..\",job=~\"user-service|order-service|payment-service\"}[1h])) / sum(rate(http_requests_total{job=~\"user-service|order-service|payment-service\"}[1h]))",
-      "eval_timestamp_ms": 1788891296000
-    },
-    {
-      "id": "promql-highest-backend-error-ratio:rubric:2",
-      "task_id": "promql-highest-backend-error-ratio",
-      "source_path": "tasks-spec/prometheus_query/promql-highest-backend-error-ratio.yaml",
-      "rubric_index": 2,
-      "query": "(sum by (job) (increase(http_requests_total{status=~\"5..\",job=~\"user-service|order-service|payment-service\"}[6h]))) / (sum by (job) (increase(http_requests_total{job=~\"user-service|order-service|payment-service\"}[6h])))",
-      "eval_timestamp_ms": 1788891296000
-    },
-    {
-      "id": "promql-highest-backend-error-ratio:rubric:3",
-      "task_id": "promql-highest-backend-error-ratio",
-      "source_path": "tasks-spec/prometheus_query/promql-highest-backend-error-ratio.yaml",
-      "rubric_index": 3,
-      "query": "(sum by (job) (increase(http_requests_total{status=~\"5..\",job=~\"user-service|order-service|payment-service\"}[6h]))) / (sum by (job) (increase(http_requests_total{job=~\"user-service|order-service|payment-service\"}[6h])))",
-      "eval_timestamp_ms": 1788891296000
-    },
-    {
-      "id": "promql-label-matchers-service-errors:rubric:0",
-      "task_id": "promql-label-matchers-service-errors",
-      "source_path": "tasks-spec/prometheus_query/promql-label-matchers-service-errors.yaml",
-      "rubric_index": 0,
-      "query": "sum by (job) (increase(http_requests_total{status=~\"5..\",job=~\".+-service\"}[24h])) > 0",
-      "eval_timestamp_ms": 1788891296000
-    },
-    {
-      "id": "promql-offset-traffic-compare:rubric:0",
-      "task_id": "promql-offset-traffic-compare",
-      "source_path": "tasks-spec/prometheus_query/promql-offset-traffic-compare.yaml",
-      "rubric_index": 0,
-      "query": "sum(rate(http_requests_total{job=\"order-service\"}[5m]))",
-      "eval_timestamp_ms": 1788891296000
-    },
-    {
-      "id": "promql-offset-traffic-compare:rubric:1",
-      "task_id": "promql-offset-traffic-compare",
-      "source_path": "tasks-spec/prometheus_query/promql-offset-traffic-compare.yaml",
-      "rubric_index": 1,
-      "query": "sum(rate(http_requests_total{job=\"order-service\"}[5m] offset 1h))",
-      "eval_timestamp_ms": 1788891296000
-    },
-    {
-      "id": "promql-order-latency-vs-traffic:rubric:0",
-      "task_id": "promql-order-latency-vs-traffic",
-      "source_path": "tasks-spec/prometheus_query/promql-order-latency-vs-traffic.yaml",
-      "rubric_index": 0,
-      "query": "sum(rate(http_requests_total{job=\"order-service\"}[5m]))",
-      "eval_timestamp_ms": 1788891296000
-    },
-    {
-      "id": "promql-order-latency-vs-traffic:rubric:1",
-      "task_id": "promql-order-latency-vs-traffic",
-      "source_path": "tasks-spec/prometheus_query/promql-order-latency-vs-traffic.yaml",
-      "rubric_index": 1,
-      "query": "histogram_quantile(0.95, sum(rate(http_request_duration_seconds_bucket{job=\"order-service\"}[5m])) by (le))",
-      "eval_timestamp_ms": 1788891296000
-    },
-    {
-      "id": "promql-retry-backlog-triage:rubric:0",
-      "task_id": "promql-retry-backlog-triage",
-      "source_path": "tasks-spec/prometheus_query/promql-retry-backlog-triage.yaml",
-      "rubric_index": 0,
-      "query": "max_over_time(service_retry_queue_depth{job=~\".+\"}[6h])",
-      "eval_timestamp_ms": 1788891296000
-    },
-    {
-      "id": "promql-retry-backlog-triage:rubric:1",
-      "task_id": "promql-retry-backlog-triage",
-      "source_path": "tasks-spec/prometheus_query/promql-retry-backlog-triage.yaml",
-      "rubric_index": 1,
-      "query": "max_over_time(service_retry_queue_depth{job=\"order-service\"}[6h])",
-      "eval_timestamp_ms": 1788891296000
-    },
-    {
-      "id": "promql-subquery-peak-error-rate:rubric:0",
-      "task_id": "promql-subquery-peak-error-rate",
-      "source_path": "tasks-spec/prometheus_query/promql-subquery-peak-error-rate.yaml",
-      "rubric_index": 0,
-      "query": "max_over_time((sum(rate(http_requests_total{job=\"order-service\",status=~\"5..\"}[5m])) / sum(rate(http_requests_total{job=\"order-service\"}[5m])))[6h:1m])",
-      "eval_timestamp_ms": 1788891296000
-    },
-    {
-      "id": "promql-topk-5xx-share:rubric:0",
-      "task_id": "promql-topk-5xx-share",
-      "source_path": "tasks-spec/prometheus_query/promql-topk-5xx-share.yaml",
-      "rubric_index": 0,
-      "query": "sum(increase(http_requests_total{job=\"order-service\",status=~\"5..\"}[24h])) / sum(increase(http_requests_total{status=~\"5..\"}[24h]))",
-      "eval_timestamp_ms": 1788891296000
-    },
-    {
-      "id": "query-cpu-metrics:rubric:0",
-      "task_id": "query-cpu-metrics",
-      "source_path": "tasks-spec/prometheus_query/query-cpu-metrics.yaml",
-      "rubric_index": 0,
-      "query": "sum by (job) (rate(process_cpu_seconds_total{job=~\".+\"}[6h]))",
-      "eval_timestamp_ms": 1788891296000
-    },
-    {
-      "id": "query-cpu-metrics:rubric:2",
-      "task_id": "query-cpu-metrics",
-      "source_path": "tasks-spec/prometheus_query/query-cpu-metrics.yaml",
-      "rubric_index": 2,
-      "query": "sort_desc(sum by (job) (rate(process_cpu_seconds_total{job=~\".+\"}[6h])))",
-      "eval_timestamp_ms": 1788891296000
-    },
-    {
-      "id": "query-memory-usage:rubric:0",
-      "task_id": "query-memory-usage",
-      "source_path": "tasks-spec/prometheus_query/query-memory-usage.yaml",
-      "rubric_index": 0,
-      "query": "sum(avg_over_time(process_resident_memory_bytes{job=~\".+\"}[6h]))",
-      "eval_timestamp_ms": 1788891296000
-    }
-  ]
-}
diff --git a/control_plane/tests/fixtures/sql_exact_cuts/q07.sql b/control_plane/tests/fixtures/sql_exact_cuts/q07.sql
deleted file mode 100644
index fd214356e..000000000
--- a/control_plane/tests/fixtures/sql_exact_cuts/q07.sql
+++ /dev/null
@@ -1 +0,0 @@
-SELECT mapConcat(labels,map('__name__','user_service_cache_refresh_lag_seconds')) AS labels, argMax(value,ts_ms) AS value FROM raw_samples WHERE metric='user_service_cache_refresh_lag_seconds' AND ts_ms>1788891296000-300000 AND ts_ms<=1788891296000 GROUP BY labels ORDER BY labels
diff --git a/control_plane/tests/fixtures/sql_exact_cuts/q09.sql b/control_plane/tests/fixtures/sql_exact_cuts/q09.sql
deleted file mode 100644
index d134dc552..000000000
--- a/control_plane/tests/fixtures/sql_exact_cuts/q09.sql
+++ /dev/null
@@ -1 +0,0 @@
-SELECT map() AS labels, sum(value) AS value FROM (SELECT labels,argMax(value,ts_ms) AS value FROM raw_samples WHERE metric='backend_process_resident_memory_bytes' AND ts_ms>1788891296000-300000 AND ts_ms<=1788891296000 GROUP BY labels)
diff --git a/control_plane/tests/fixtures/sql_exact_cuts/q12.sql b/control_plane/tests/fixtures/sql_exact_cuts/q12.sql
deleted file mode 100644
index 3d860f5eb..000000000
--- a/control_plane/tests/fixtures/sql_exact_cuts/q12.sql
+++ /dev/null
@@ -1 +0,0 @@
-SELECT map('job',job) AS labels,sum(value) AS value FROM (SELECT labels['job'] AS job,labels,argMax(value,ts_ms) AS value FROM raw_samples WHERE metric='backend_process_resident_memory_bytes' AND ts_ms>1788891296000-300000 AND ts_ms<=1788891296000 GROUP BY job,labels) GROUP BY job ORDER BY value DESC,job LIMIT 2
diff --git a/control_plane/tests/fixtures/sql_exact_cuts/q27.sql b/control_plane/tests/fixtures/sql_exact_cuts/q27.sql
deleted file mode 100644
index f3fbb3d0a..000000000
--- a/control_plane/tests/fixtures/sql_exact_cuts/q27.sql
+++ /dev/null
@@ -1 +0,0 @@
-SELECT map('job',job) labels,avg(value) value FROM (SELECT labels['job'] job,ts_ms,sum(value) value FROM raw_samples WHERE metric='backend_process_resident_memory_bytes' AND ts_ms+4000>=1788891296000-21600000 AND ts_ms+4000<=1788891296000 AND modulo(ts_ms+4000,60000)=0 GROUP BY job,ts_ms) GROUP BY job ORDER BY value DESC,job LIMIT 3
diff --git a/control_plane/tests/o11y_exact_fallback.rs b/control_plane/tests/o11y_exact_fallback.rs
deleted file mode 100644
index 3122ea088..000000000
--- a/control_plane/tests/o11y_exact_fallback.rs
+++ /dev/null
@@ -1,42 +0,0 @@
-use control_plane::{
-    physical::post_asap::{bind_query_expr, PhysicalExpr, PostAsapPlan},
-    query_parser::parse_query_expr_canonical,
-    types::AccuracyTarget,
-};
-use planner_types::post_asap::SummaryExpr;
-
-/// Non-summary o11y roots preserve labels, ordering and comparison filtering
-/// as the original exact IR, instead of failing summary candidate selection.
-#[test]
-fn o11y_non_summary_roots_preserve_exact_query_semantics() {
-    for query in [
-        "service_cache_refresh_lag_seconds{job=\"user-service\"}",
-        "sort_desc(sum by (job) (rate(process_cpu_seconds_total{job=~\".+\"}[6h])))",
-        "sum by (job) (increase(http_requests_total{status=~\"5..\",job=~\".+-service\"}[24h])) > 0",
-    ] {
-        for accuracy in [AccuracyTarget::Exact, AccuracyTarget::Epsilon(0.01)] {
-            let expr = parse_query_expr_canonical(query, accuracy.clone()).unwrap();
-            let result = bind_query_expr(&expr, accuracy)
-                .unwrap_or_else(|error| panic!("{query}: {error}"));
-            let PhysicalExpr::Committed(PostAsapPlan::Summary(node)) = result else {
-                panic!("expected an explicit exact fallback for {query}");
-            };
-            let SummaryExpr::KeepPreAsap(original) = &node.expr else {
-                panic!("expected original exact query for {query}");
-            };
-            assert_eq!(original.as_ref(), &expr, "query semantics changed: {query}");
-            assert_eq!(node.schema.fields.len(), expr.output_schema().unwrap().columns.len());
-            let executable = control_plane::query_plan::compile_bound_mapped(
-                "fixture".into(), query.into(), &node,
-                control_plane::query_plan::InstantExecution {
-                    lookback_ms: 300_000, full_history: false, cumulative_readout: false,
-                },
-                control_plane::query_plan::FallbackPolicy::Reject,
-                |_, _| panic!("exact fallback must not request summary materializations"),
-             |_, _| {}).unwrap();
-            assert!(matches!(executable.nodes[&executable.root],
-                control_plane::query_plan::QueryPlanNode::ExactFallback { .. }));
-            assert!(executable.materialization_bindings().is_empty());
-        }
-    }
-}
diff --git a/control_plane/tests/offline_evidence.rs b/control_plane/tests/offline_evidence.rs
deleted file mode 100644
index f24dddeec..000000000
--- a/control_plane/tests/offline_evidence.rs
+++ /dev/null
@@ -1,405 +0,0 @@
-//! Synthetic fixtures test integration decisions, not measured sketch benefits.
-use asap_aware_mapping::{
-    empirical_cost::{EmpiricalEvidenceProvider, EvidenceArtifact, EvidenceContext},
-    CostModel,
-};
-use control_plane::{
-    physical::post_asap::{
-        bind_query_expr_with_cost_model, cost_model::ControlPlaneCostModel, PhysicalExpr,
-        PostAsapPlan,
-    },
-    query_parser::parse_query_expr_canonical,
-    types::AccuracyTarget,
-};
-use planner_types::{
-    post_asap::{SketchAlgorithm, SketchParams, SummaryExpr, SummaryFamilyType, SummaryNode},
-    pre_asap::AggIntent,
-};
-use serde_json::json;
-
-fn frequency_comparison() -> (
-    asap_aware_mapping::empirical_comparison::OfflineComparisonEvidence,
-    asap_aware_mapping::empirical_comparison::OfflineComparisonRequest,
-) {
-    let (mut artifact, context) = fixture(&model(), &intent());
-    let query =
-        json!({"kind":"point_frequency", "value_type":"i64", "probe_set":"all_distinct_keys"});
-    artifact.records[0].algorithm = SketchAlgorithm::Cms;
-    artifact.records[0].params = SketchParams::Cms {
-        width: 512,
-        depth: 5,
-    };
-    artifact.records[0].error.as_mut().unwrap().mean = Some(0.2);
-    artifact.records[1].algorithm = SketchAlgorithm::Cms;
-    artifact.records[1].params = SketchParams::Cms {
-        width: 1024,
-        depth: 5,
-    };
-    artifact.records[1].error.as_mut().unwrap().mean = Some(0.001);
-    for row in &mut artifact.records {
-        row.error.as_mut().unwrap().query = query.clone();
-        row.metrics.resources.cpu.build_cpu_ns =
-            serde_json::from_value(json!({"value":1.0,"samples":3,"stddev":0.0})).unwrap();
-        row.metrics.resources.cpu.read_cpu_ns = row.metrics.resources.cpu.build_cpu_ns.clone();
-    }
-    let bindings: Vec<_> = artifact
-        .records
-        .iter()
-        .map(|r| json!({"record_id":r.id,"query":query}))
-        .collect();
-    let evidence = serde_json::from_value(json!({"schema_version":1,"timing_contract":"disjoint_live_state_v1",
-        "sketch_evidence":artifact, "query_bindings":bindings,
-        "exact_records":[{"id":"exact-test", "distribution":context.distribution,
-            "environment":context.environment, "query":query,
-            "measured_at_unix_seconds":100,"valid_until_unix_seconds":200,
-            "provenance":{"command":"synthetic test","dataset":"test","source_revision":"test","repetitions":3},
-            "metrics":{"empty_build_cpu_ns":{"value":1.0,"samples":3},
-                "update_cpu_ns":{"value":100.0,"samples":3},
-                "prepare_cpu_ns":{"value":1.0,"samples":3},
-                "read_cpu_ns":{"value":100.0,"samples":3}}}]})).unwrap();
-    let request = serde_json::from_value(json!({"context":context,
-        "exact_environment":context.environment,"query":query,
-        "accuracy":{"metric":"absolute relative frequency error","max_observed_mean":0.01,"minimum_trials":3},
-        "workload":{"input_items_per_state":1000,"reads_per_state":100,"merges_per_state":0,"state_instances":1,"horizon_seconds":3600.0},
-        "weights":{"cpu_ns_weight":1.0,"retained_byte_seconds_weight":0.0},"formal_minimums":null})).unwrap();
-    (evidence, request)
-}
-
-fn point_frequency(accuracy: AccuracyTarget) -> AggIntent {
-    control_plane::planner_selection::frequency(accuracy, Some(("key".into(), "7".into())))
-}
-
-/// A query-matched mean-error budget selects a larger measured CMS, while
-/// preserving the formal workload bound and the requested point readout.
-#[test]
-fn offline_frequency_error_budget_changes_configuration() {
-    let (evidence, request) = frequency_comparison();
-    let empirical = model().with_offline_frequency_comparison(evidence, request);
-    let intent = point_frequency(AccuracyTarget::Epsilon(0.01));
-    let AggIntent::Extension { ext_kind, payload } = &intent else {
-        unreachable!()
-    };
-    let asap_aware_mapping::Realization::Sketch(selected) =
-        empirical.realize_extension(ext_kind, payload)
-    else {
-        panic!(
-            "expected a measured frequency sketch: {:?}",
-            empirical.offline_frequency_recommendation(payload)
-        );
-    };
-    assert_eq!(
-        selected.params(),
-        &SketchParams::Cms {
-            width: 1024,
-            depth: 5
-        }
-    );
-    let recommendation = empirical.offline_frequency_recommendation(payload).unwrap();
-    assert!(recommendation.checked_formal_minimums);
-    assert!(recommendation.candidates[0]
-        .rejection
-        .as_ref()
-        .unwrap()
-        .contains("observed error"));
-
-    let scan =
-        parse_query_expr_canonical("offline_metric{key=~\".+\"}", AccuracyTarget::Exact).unwrap();
-    let expr = planner_types::pre_asap::QueryExpr::Aggregate {
-        reduction: planner_types::pre_asap::Reduction::PerEntity,
-        measures: vec![intent],
-        output_names: vec![],
-        having: None,
-        child: std::rc::Rc::new(scan),
-    };
-    let PhysicalExpr::Committed(PostAsapPlan::Summary(node)) =
-        bind_query_expr_with_cost_model(&expr, &empirical).unwrap()
-    else {
-        panic!("expected summary")
-    };
-    assert_eq!(
-        sketch(&node).1,
-        &SketchParams::Cms {
-            width: 1024,
-            depth: 5
-        }
-    );
-    assert!(
-        matches!(&node.expr, SummaryExpr::SummaryEstimate { query: planner_types::post_asap::SketchQuery::PointCount {
-        key: planner_types::pre_asap::ColumnRef::Named(key), value: Some(value)
-    }, .. } if key == "key" && value == "7")
-    );
-}
-
-/// An infeasible empirical budget, stale context, exact request, or missing
-/// item filter must retain exact execution, never invent a default sketch.
-#[test]
-fn offline_frequency_comparison_falls_back_when_inapplicable() {
-    for scenario in ["error", "stale", "exact", "missing_item", "formal_minimum"] {
-        let (evidence, mut request) = frequency_comparison();
-        if scenario == "error" {
-            request.accuracy.max_observed_mean = 0.0;
-        }
-        if scenario == "stale" {
-            request.context.now_unix_seconds = 201;
-        }
-        let empirical = model().with_offline_frequency_comparison(evidence, request);
-        let intent = match scenario {
-            "exact" => point_frequency(AccuracyTarget::Exact),
-            "missing_item" => {
-                control_plane::planner_selection::frequency(AccuracyTarget::Epsilon(0.01), None)
-            }
-            "formal_minimum" => point_frequency(AccuracyTarget::Epsilon(0.001)),
-            _ => point_frequency(AccuracyTarget::Epsilon(0.01)),
-        };
-        let AggIntent::Extension { ext_kind, payload } = intent else {
-            unreachable!()
-        };
-        assert!(
-            matches!(
-                empirical.realize_extension(&ext_kind, &payload),
-                asap_aware_mapping::Realization::PassThrough
-            ),
-            "{scenario}"
-        );
-    }
-}
-
-/// An unsupported cheap CMS width must not hide a valid measured alternative.
-#[test]
-fn offline_frequency_filters_backend_layout_before_comparison() {
-    let (mut evidence, request) = frequency_comparison();
-    let mut unsupported = evidence.sketch_evidence.records[1].clone();
-    unsupported.id = "unsupported-cheap-width".into();
-    unsupported.params = SketchParams::Cms {
-        width: 1500,
-        depth: 5,
-    };
-    unsupported
-        .metrics
-        .resources
-        .cpu
-        .update_cpu_ns
-        .as_mut()
-        .unwrap()
-        .value = 0.001;
-    let mut query_binding = evidence.query_bindings[1].clone();
-    query_binding.record_id = unsupported.id.clone();
-    evidence.query_bindings.push(query_binding);
-    evidence.sketch_evidence.records.push(unsupported);
-    let empirical = model().with_offline_frequency_comparison(evidence, request);
-    let AggIntent::Extension { payload, .. } = point_frequency(AccuracyTarget::Epsilon(0.01))
-    else {
-        unreachable!()
-    };
-    let recommendation = empirical
-        .offline_frequency_recommendation(&payload)
-        .unwrap();
-    assert_eq!(
-        recommendation.selected_sketch().unwrap().params,
-        SketchParams::Cms {
-            width: 1024,
-            depth: 5
-        }
-    );
-    assert!(recommendation
-        .candidates
-        .iter()
-        .all(|c| c.record_id != "unsupported-cheap-width"));
-}
-
-fn fixture(
-    model: &ControlPlaneCostModel,
-    intent: &AggIntent,
-) -> (EvidenceArtifact, EvidenceContext) {
-    let distribution = json!({"id":"synthetic-unit-test", "family":"uniform", "sample_count":1000,
-        "distinct_count":100, "parameters":{"seed":42}});
-    let environment = json!({"id":"test-machine", "cpu":"test", "os":"test", "runtime":"test",
-        "implementation":"synthetic-test-fixture", "implementation_version":"v1"});
-    let records: Vec<_> = [(SketchAlgorithm::Cms,20.0), (SketchAlgorithm::CountSketch,10.0), (SketchAlgorithm::UnivMon,30.0)].into_iter().map(|(algorithm,value)| {
-        let params = model.size_params(algorithm.clone(), intent, 0.01, 0.01);
-        json!({"id":format!("test-{algorithm:?}"), "algorithm":algorithm, "params":params,
-            "distribution":distribution, "environment":environment,
-            "measured_at_unix_seconds":100, "valid_until_unix_seconds":200,
-            "provenance":{"command":"synthetic integration fixture, not a real benchmark", "dataset":"test", "source_revision":"test", "repetitions":3},
-            "metrics":{"update_cpu_ns":{"value":value,"stddev":1.0,"samples":3}},
-            "error":{"metric":"absolute relative frequency error", "mean":0.0, "max":null, "trials":3,
-                "ground_truth_method":"synthetic fixture", "query":{"kind":"point_frequency"}}})
-    }).collect();
-    let artifact = serde_json::from_value(
-        json!({"schema_version":1,"benchmark_version":"synthetic-test-v1",
-        "model_version":"empirical-update-cpu-v1","records":records}),
-    )
-    .unwrap();
-    let context = serde_json::from_value(
-        json!({"distribution":distribution,"environment":environment,"now_unix_seconds":150}),
-    )
-    .unwrap();
-    (artifact, context)
-}
-
-fn intent() -> AggIntent {
-    AggIntent::Count {
-        accuracy: AccuracyTarget::Epsilon(0.01),
-    }
-}
-fn candidates() -> Vec<SketchAlgorithm> {
-    vec![SketchAlgorithm::Cms, SketchAlgorithm::CountSketch]
-}
-fn model() -> ControlPlaneCostModel {
-    ControlPlaneCostModel::new(AccuracyTarget::Epsilon(0.01))
-}
-
-fn bound(model: &ControlPlaneCostModel) -> std::rc::Rc<SummaryNode> {
-    let query = parse_query_expr_canonical(
-        "count_over_time(offline_metric[5m])",
-        AccuracyTarget::Epsilon(0.01),
-    )
-    .unwrap();
-    let PhysicalExpr::Committed(PostAsapPlan::Summary(node)) =
-        bind_query_expr_with_cost_model(&query, model).unwrap()
-    else {
-        panic!("expected summary binding")
-    };
-    node
-}
-
-fn sketch(node: &SummaryNode) -> (&SketchAlgorithm, &SketchParams) {
-    match &node.expr {
-        SummaryExpr::SummaryEstimate { summary_input, .. } => sketch(summary_input),
-        SummaryExpr::SummaryAgg {
-            family: SummaryFamilyType::Sketch(kind, _),
-            ..
-        } => (kind.algorithm(), kind.params()),
-        other => panic!("expected sketch, got {other:?}"),
-    }
-}
-
-fn assert_exact_count(node: &SummaryNode) {
-    match &node.expr {
-        SummaryExpr::ValueOperation {
-            child,
-            operation: planner_types::post_asap::ValueOperation::FinalizeExactAccumulator,
-            timing: planner_types::post_asap::ExecutionTiming::QueryTime,
-        } => {
-            assert!(node
-                .schema
-                .fields
-                .iter()
-                .all(|field| matches!(field.dtype, SummaryFamilyType::Plain(_))));
-            assert_exact_count(child);
-        }
-
-        SummaryExpr::SummaryEstimate { summary_input, .. } => assert_exact_count(summary_input),
-        SummaryExpr::SummaryAgg {
-            family:
-                SummaryFamilyType::ExactAggregate(
-                    planner_types::post_asap::ExactKind::Count,
-                    planner_types::post_asap::ExactParams::Count,
-                ),
-            ..
-        } => {}
-        other => panic!("expected exact total-count state, got {other:?}"),
-    }
-}
-
-/// Update evidence ranks frequency sketches but does not replace an exact
-/// total-count accumulator with a point-frequency sketch.
-#[test]
-fn offline_update_evidence_preserves_exact_count_binding() {
-    let default = model();
-    let (artifact, context) = fixture(&default, &intent());
-    let empirical =
-        model().with_offline_evidence(EmpiricalEvidenceProvider::new(artifact, context).unwrap());
-    assert_eq!(
-        default.rank_candidates(&intent(), &candidates()),
-        candidates()
-    );
-    assert_eq!(
-        empirical.rank_candidates(&intent(), &candidates()),
-        vec![SketchAlgorithm::CountSketch, SketchAlgorithm::Cms]
-    );
-    let default_bound = bound(&default);
-    let measured_bound = bound(&empirical);
-    assert_exact_count(&default_bound);
-    assert_exact_count(&measured_bound);
-    assert!(default_bound.guarantee.is_some());
-    assert!(measured_bound.guarantee.is_some());
-    // Observed zero point-frequency error has no effect on formal sizing.
-    for kind in candidates() {
-        assert_eq!(
-            empirical.size_params(kind.clone(), &intent(), 0.01, 0.01),
-            default.size_params(kind, &intent(), 0.01, 0.01)
-        );
-    }
-}
-
-/// Stale/missing/environment-mismatched data and parameters for another
-/// workload accuracy all fall back to the deployment's existing preference.
-#[test]
-fn incompatible_evidence_preserves_deployment_behavior() {
-    for scenario in ["missing", "stale", "environment", "workload_sizing"] {
-        let (mut artifact, mut context) = fixture(&model(), &intent());
-        let mut deployment = model();
-        match scenario {
-            "missing" => {
-                artifact.records.remove(1);
-            }
-            "stale" => context.now_unix_seconds = 201,
-            "environment" => context.environment.cpu = "different CPU".into(),
-            "workload_sizing" => {
-                deployment = ControlPlaneCostModel::new(AccuracyTarget::Epsilon(0.001))
-            }
-            _ => unreachable!(),
-        }
-        let empirical = deployment
-            .with_offline_evidence(EmpiricalEvidenceProvider::new(artifact, context).unwrap());
-        assert_eq!(
-            empirical.rank_candidates(&intent(), &candidates()),
-            candidates(),
-            "{scenario}"
-        );
-        assert_exact_count(&bound(&empirical));
-    }
-}
-
-/// Binary operations over these approximate sketch values retain explicit
-/// fallback even though the warm tier now supports exact additive binaries.
-#[test]
-fn binary_summary_has_explicit_warm_tier_fallback() {
-    use control_plane::query_plan::{FallbackPolicy, InstantExecution, QueryPlanNode};
-    use planner_types::{post_asap::BinaryOperator, pre_asap::BinaryOpKind};
-    let child = bound(&model());
-    let root = std::rc::Rc::new(SummaryNode {
-        expr: SummaryExpr::BinaryOp {
-            timing: planner_types::post_asap::ExecutionTiming::QueryTime,
-            lhs: child.clone(),
-            rhs: child.clone(),
-            operator: BinaryOperator {
-                checked_relative_division: false,
-                checked_finite_division: false,
-                kind: BinaryOpKind::Arithmetic(planner_types::pre_asap::ArithmeticOpKind::Div),
-                vector_match: None,
-            },
-        },
-        schema: child.schema.clone(),
-        guarantee: None,
-    });
-    let plan = control_plane::query_plan::compile_bound_mapped(
-        "test".into(),
-        "left / right".into(),
-        &root,
-        InstantExecution {
-            lookback_ms: 300000,
-            full_history: false,
-            cumulative_readout: false,
-        },
-        FallbackPolicy::Reject,
-        |_, _| panic!("unsupported binary plan must not bind a materialization"),
-        |_, _| {},
-    )
-    .unwrap();
-    assert!(
-        matches!(&plan.nodes[&plan.root], QueryPlanNode::ExactFallback { reason } if !reason.is_empty())
-    );
-    assert!(plan.materialization_bindings().is_empty());
-}
diff --git a/control_plane/tests/plan_workload.rs b/control_plane/tests/plan_workload.rs
new file mode 100644
index 000000000..d052c994a
--- /dev/null
+++ b/control_plane/tests/plan_workload.rs
@@ -0,0 +1,63 @@
+use std::path::{Path, PathBuf};
+
+use control_plane::{backend_capabilities, plan_workload, InstalledPlan, PlanError};
+use planner_types::workload::{PlanningWorkload, QueryLanguage, SqlDialect};
+
+fn example1() -> PlanningWorkload {
+    let path =
+        Path::new(env!("CARGO_MANIFEST_DIR")).join("../examples/planner-layering-example1.json");
+    serde_json::from_str(&std::fs::read_to_string(path).unwrap()).unwrap()
+}
+
+fn temp_path(name: &str) -> PathBuf {
+    std::env::temp_dir().join(format!("control-plane-{}-{name}", std::process::id()))
+}
+
+/// The Planner selects one physical DAG for #509 Example 1, with one root per
+/// query, and the plan survives the file the data plane loads.
+#[test]
+fn plans_example1_and_round_trips_the_plan() {
+    let workload = example1();
+    let plan = plan_workload(&workload, &backend_capabilities()).unwrap();
+    assert_eq!(
+        plan.queries,
+        workload
+            .query_workload
+            .entries()
+            .map(|entry| entry.query.0)
+            .collect::<Vec<_>>()
+    );
+    assert_eq!(plan.dag.dag.roots.len(), 2);
+    let path = temp_path("example1.json");
+    plan.save(&path).unwrap();
+    assert_eq!(InstalledPlan::load(&path).unwrap(), plan);
+    std::fs::remove_file(path).unwrap();
+}
+
+/// Only PromQL workloads are planned; SQL support comes later.
+#[test]
+fn rejects_sql_workloads() {
+    let mut workload = example1();
+    workload.query_workload.language = QueryLanguage::SQL(SqlDialect::ClickhouseSQL);
+    assert!(matches!(
+        plan_workload(&workload, &backend_capabilities()),
+        Err(PlanError::UnsupportedLanguage(_))
+    ));
+}
+
+/// A plan whose queries do not match the DAG's roots is not installed.
+#[test]
+fn load_rejects_a_plan_without_a_query_per_root() {
+    let mut plan = plan_workload(&example1(), &backend_capabilities()).unwrap();
+    plan.queries.pop();
+    let path = temp_path("mismatched.json");
+    plan.save(&path).unwrap();
+    assert!(matches!(
+        InstalledPlan::load(&path),
+        Err(PlanError::RootCount {
+            roots: 2,
+            queries: 1
+        })
+    ));
+    std::fs::remove_file(path).unwrap();
+}
diff --git a/control_plane/tests/snapshot_version.rs b/control_plane/tests/snapshot_version.rs
deleted file mode 100644
index 9ae7cac20..000000000
--- a/control_plane/tests/snapshot_version.rs
+++ /dev/null
@@ -1,80 +0,0 @@
-//! Every producer of a planning snapshot must declare the one schema version
-//! the backend accepts.
-//!
-//! The version had drifted before: two tools in `tools/o11y-execution/`
-//! overwrote it with a stale literal while the backend had moved on, so a
-//! snapshot built from a current template was relabelled to an old version and
-//! then rejected by the backend that had just been handed it. Nothing failed
-//! until a test deep in the stack did, with a message about the version rather
-//! than about the producer that wrote it.
-//!
-//! Producers are written in Rust, Python and JSON, so they cannot share a
-//! constant. They can share this test.
-use control_plane::physical::compiler::WORKLOAD_SNAPSHOT_VERSION;
-use std::path::{Path, PathBuf};
-
-fn repository_root() -> PathBuf {
-    Path::new(env!("CARGO_MANIFEST_DIR"))
-        .parent()
-        .expect("control_plane sits in the workspace")
-        .to_path_buf()
-}
-
-/// Shipped snapshots a user or a tool starts from.
-const EXAMPLE_SNAPSHOTS: &[&str] = &[
-    "docs/examples/asapquery-planning-snapshot.json",
-    "docs/examples/asapquery-compatibility-demo-snapshot.json",
-];
-
-/// Tools that accept or emit a snapshot and state the version they expect.
-const TOOLS: &[&str] = &[
-    "tools/o11y-execution/discover_snapshot.py",
-    "tools/o11y-execution/calibrate.py",
-    "tools/shared-workload/planned_run.py",
-];
-
-#[test]
-fn shipped_snapshots_declare_the_supported_version() {
-    let root = repository_root();
-    for relative in EXAMPLE_SNAPSHOTS {
-        let path = root.join(relative);
-        let snapshot: serde_json::Value = serde_json::from_str(
-            &std::fs::read_to_string(&path).unwrap_or_else(|error| panic!("{relative}: {error}")),
-        )
-        .unwrap_or_else(|error| panic!("{relative}: {error}"));
-        assert_eq!(
-            snapshot["snapshot_version"].as_u64(),
-            Some(u64::from(WORKLOAD_SNAPSHOT_VERSION)),
-            "{relative} declares a version the backend does not accept"
-        );
-    }
-}
-
-#[test]
-fn snapshot_tools_expect_the_supported_version() {
-    let root = repository_root();
-    let expected = format!("snapshot_version\") != {WORKLOAD_SNAPSHOT_VERSION}");
-    for relative in TOOLS {
-        let path = root.join(relative);
-        let source =
-            std::fs::read_to_string(&path).unwrap_or_else(|error| panic!("{relative}: {error}"));
-        assert!(
-            source.contains("snapshot_version"),
-            "{relative} no longer mentions snapshot_version; \
-             remove it from TOOLS or restore the check"
-        );
-        assert!(
-            source.contains(&expected),
-            "{relative} does not reject snapshots other than version \
-             {WORKLOAD_SNAPSHOT_VERSION}; a producer that guesses the version is \
-             how it drifted last time"
-        );
-        // A tool that restates the version while writing is how the literal got
-        // stale: it changes content, not schema, so it must not relabel.
-        assert!(
-            !source.contains("[\"snapshot_version\"] ="),
-            "{relative} overwrites snapshot_version; carry the input's version \
-             through instead of restating it"
-        );
-    }
-}
diff --git a/crates/asap_otel_proto/Cargo.toml b/crates/asap_otel_proto/Cargo.toml
deleted file mode 100644
index 563d742f2..000000000
--- a/crates/asap_otel_proto/Cargo.toml
+++ /dev/null
@@ -1,29 +0,0 @@
-[package]
-name = "asap_otel_proto"
-version.workspace = true
-edition.workspace = true
-
-# Vendored Rust bindings for DataCollector's modified opentelemetry-proto.
-# See ../../../../docs/pipeline-query-catalog.md §5.4 for the reasoning.
-#
-# The .proto files in proto/opentelemetry/proto/ are copied verbatim from
-# DataCollector's opentelemetry-proto submodule and add first-class sketch
-# variants (DDSketch, KLLSketch, CountSketch, CountMinSketch, HLLSketch) to
-# the standard OTLP Metric.data oneof. To re-vendor when DataCollector
-# updates its proto schema, copy the four files referenced in build.rs
-# from the corresponding paths in the DataCollector worktree.
-
-[lib]
-path = "src/lib.rs"
-
-[dependencies]
-prost = "0.13"
-tonic = { version = "0.12", features = ["transport", "codegen", "prost"] }
-
-[build-dependencies]
-prost-build = "0.13"
-tonic-build = { version = "0.12", features = ["prost"] }
-# Ship a modern protoc so the build does not depend on the host's system
-# protoc version. The system protoc on many distros is < 3.15 which
-# rejects proto3 `optional` keyword used in opentelemetry-proto.
-protoc-bin-vendored = "3"
diff --git a/crates/asap_otel_proto/build.rs b/crates/asap_otel_proto/build.rs
deleted file mode 100644
index e2ae992e3..000000000
--- a/crates/asap_otel_proto/build.rs
+++ /dev/null
@@ -1,42 +0,0 @@
-fn main() -> Result<(), Box<dyn std::error::Error>> {
-    let proto_root = "proto";
-    let proto_files = [
-        "proto/opentelemetry/proto/common/v1/common.proto",
-        "proto/opentelemetry/proto/resource/v1/resource.proto",
-        "proto/opentelemetry/proto/metrics/v1/metrics.proto",
-        "proto/opentelemetry/proto/collector/metrics/v1/metrics_service.proto",
-        // sketchlib.v1 delta messages — vendored locally because
-        // the upstream asap_sketchlib crate only exposes state
-        // types today, not delta types. See the .proto file
-        // headers for the sketchlib-go source of truth.
-        "proto/sketchlib_delta/ddsketch_delta.proto",
-        "proto/sketchlib_delta/hll_delta.proto",
-        "proto/sketchlib_delta/countsketch_delta.proto",
-        "proto/sketchlib_delta/countminsketch_delta.proto",
-    ];
-    for f in &proto_files {
-        println!("cargo:rerun-if-changed={f}");
-    }
-    println!("cargo:rerun-if-changed=build.rs");
-
-    // Use the vendored protoc binary so the build is independent of the
-    // host's system protoc version. Many distros still ship protoc < 3.15
-    // which rejects proto3 `optional` keyword used in opentelemetry-proto.
-    std::env::set_var("PROTOC", protoc_bin_vendored::protoc_bin_path()?);
-
-    tonic_build::configure()
-        .build_server(true)
-        .build_client(false)
-        .compile_protos(&proto_files, &[proto_root])?;
-
-    // Monitor service (CDM edge↔coordinator reverse channel) — needs BOTH a
-    // server (coordinator) and a client (edge sim / tests), unlike the OTLP
-    // ingest protos above which are server-only.
-    let monitor_proto = "proto/monitor/monitor.proto";
-    println!("cargo:rerun-if-changed={monitor_proto}");
-    tonic_build::configure()
-        .build_server(true)
-        .build_client(true)
-        .compile_protos(&[monitor_proto], &[proto_root])?;
-    Ok(())
-}
diff --git a/crates/asap_otel_proto/proto/monitor/monitor.proto b/crates/asap_otel_proto/proto/monitor/monitor.proto
deleted file mode 100644
index 781cb2e52..000000000
--- a/crates/asap_otel_proto/proto/monitor/monitor.proto
+++ /dev/null
@@ -1,117 +0,0 @@
-// Continuous distributed monitoring (CDM) wire contract — the edge↔coordinator
-// reverse channel for Discipline B (continuous intra-window monitoring) from
-// ASAPCollector docs/continuous-monitoring-tumbling-cost-analysis.md.
-//
-// This is the SOURCE OF TRUTH for the protocol. A byte-identical copy is
-// vendored into the Go edge runtime at
-//   ASAPCollector/asap-precompute-go/monitor/monitorpb/monitor.proto
-// for `protoc --go_out --go-grpc_out` codegen. Keep the two in sync; the
-// message field numbers and the service name are the cross-language contract.
-//
-// Protocol (Cormode–Muthukrishnan–Yi distributed functional monitoring over a
-// tumbling window; one window = one independent monitoring epoch, reset at the
-// boundary). Per monitor (agg_id, key) the coordinator runs rounds:
-//   1. Δ = τ − global_estimate. If Δ ≤ ε·τ → fire GlobalAlert, epoch done.
-//   2. local_slack = Δ/(2k), k = #edges. Broadcast SlackGrant to every edge.
-//   3. An edge sends MonitorReport when local_value − round_baseline ≥ local_slack.
-//   4. When reported mass crosses ~Δ/2 the coordinator closes the round
-//      (PollLocal every edge), sets global_estimate = Σ local_value, round += 1,
-//      and goto 1 with shrinking slack.
-// Every report/grant carries window_start_ms; messages for a non-current epoch
-// are dropped on both sides.
-//
-// NOTE: avoids the proto3 `optional` keyword so host protoc < 3.15 can compile
-// the Go side (same constraint that drives PROTOC=vendored on the Rust side).
-
-syntax = "proto3";
-
-package asap.monitor.v1;
-
-// Go import path for the vendored edge-side copy (ignored by tonic_build). The
-// generated stubs live in a SEPARATE nested Go module (monitor/grpcclient) so
-// the gRPC dependency tree never contaminates the core runtime's module graph.
-option go_package = "github.com/ProjectASAP/asap-precompute-go/monitor/grpcclient/monitorpb;monitorpb";
-
-// edge → coordinator: open-stream registration. Sent on connect and at the
-// start of every new tumbling epoch (after a window boundary).
-message MonitorRegister {
-  string edge_id = 1;          // stable per-edge identity (collector instance id)
-  uint64 agg_id = 2;           // content-addressed aggregation id (matches edge + coordinator)
-  bytes key = 3;               // CMS point-frequency key x; empty for Sum
-  uint64 epoch_window_ms = 4;  // edge's tumbling window size — coordinator alignment guard
-  uint64 window_start_ms = 5;  // edge's current epoch start — avoids coordinator clock skew
-}
-
-// edge → coordinator: the current local additive value for the named monitor,
-// emitted when the edge's local increase since round start crossed its slack,
-// or in response to a PollLocal at round close.
-message MonitorReport {
-  string edge_id = 1;
-  uint64 agg_id = 2;
-  bytes key = 3;
-  uint64 window_start_ms = 4;  // epoch this value belongs to (stale-epoch drop)
-  double local_value = 5;      // current additive local value at report time
-  uint64 round = 6;            // round this report answers
-  uint64 seq = 7;              // per-edge monotonic counter; idempotent-retransmit dedup
-  double rate = 8;  // edge's observed items/window — feeds the coordinator's p_i allocation
-}
-
-// coordinator → edge: this round's per-edge slack budget. The edge reports once
-// its local increase since the grant reaches local_slack.
-message SlackGrant {
-  uint64 agg_id = 1;
-  bytes key = 2;
-  uint64 round = 3;
-  double local_slack = 4;
-  uint64 window_start_ms = 5;
-  double sample_p = 6;  // distributed-NitroSketch update-sampling prob the coordinator allocates (0=unset/p=1); edge applies via WithSampleP at EpochReset
-}
-
-// coordinator → edge: demand the current local value now (round close).
-message PollLocal {
-  uint64 agg_id = 1;
-  bytes key = 2;
-  uint64 round = 3;
-  uint64 window_start_ms = 4;
-}
-
-// coordinator → edge: round closed; edge advances its round baseline.
-message RoundClose {
-  uint64 agg_id = 1;
-  uint64 round = 2;
-  uint64 window_start_ms = 3;
-}
-
-// Out-of-band (NOT carried on the Monitor stream): the coordinator serializes
-// this into the control-plane violation/notifier sink when the global aggregate
-// crosses τ. Defined here so both sides share the shape for logging/tests.
-message GlobalAlert {
-  uint64 agg_id = 1;
-  bytes key = 2;
-  double global_estimate = 3;
-  double tau = 4;
-  uint64 window_start_ms = 5;
-}
-
-// Upstream envelope (edge → coordinator).
-message EdgeToCoord {
-  oneof msg {
-    MonitorRegister reg = 1;
-    MonitorReport report = 2;
-  }
-}
-
-// Downstream envelope (coordinator → edge).
-message CoordToEdge {
-  oneof msg {
-    SlackGrant grant = 1;
-    PollLocal poll = 2;
-    RoundClose close = 3;
-  }
-}
-
-// One bidirectional stream per edge; the coordinator multiplexes every monitor
-// for that edge over the single stream.
-service MonitorService {
-  rpc Monitor(stream EdgeToCoord) returns (stream CoordToEdge);
-}
diff --git a/crates/asap_otel_proto/proto/opentelemetry/proto/collector/metrics/v1/metrics_service.proto b/crates/asap_otel_proto/proto/opentelemetry/proto/collector/metrics/v1/metrics_service.proto
deleted file mode 100644
index 0b4d12fe9..000000000
--- a/crates/asap_otel_proto/proto/opentelemetry/proto/collector/metrics/v1/metrics_service.proto
+++ /dev/null
@@ -1,154 +0,0 @@
-// Copyright 2019, OpenTelemetry Authors
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-syntax = "proto3";
-
-package opentelemetry.proto.collector.metrics.v1;
-
-import "opentelemetry/proto/metrics/v1/metrics.proto";
-
-option csharp_namespace = "OpenTelemetry.Proto.Collector.Metrics.V1";
-option java_multiple_files = true;
-option java_package = "io.opentelemetry.proto.collector.metrics.v1";
-option java_outer_classname = "MetricsServiceProto";
-option go_package = "go.opentelemetry.io/proto/otlp/collector/metrics/v1";
-
-// Service that can be used to push metrics between one Application
-// instrumented with OpenTelemetry and a collector, or between a collector and a
-// central collector.
-service MetricsService {
-  rpc Export(ExportMetricsServiceRequest) returns (ExportMetricsServiceResponse) {}
-
-  // Refactor-2026-05 (Phase 4): Eager batch resolution of series identifiers.
-  // Senders that have an attribute-only batch ready before the next Export
-  // can pre-resolve sids in one round-trip, then attach the returned sids
-  // to subsequent Exports without sending attributes again. The resolver
-  // is idempotent: same `(metric_name, attributes_fingerprint)` always
-  // produces the same sid for the lifetime of the cache (see design doc
-  // §5.4 "Idempotency invariant on `ResolveSeriesIDs`").
-  rpc ResolveSeriesIDs(ResolveSeriesIDsRequest) returns (ResolveSeriesIDsResponse) {}
-}
-
-message ResolveSeriesIDsRequest {
-  repeated SeriesQuery queries = 1;
-}
-
-message SeriesQuery {
-  // The metric this attribute set belongs to.
-  string metric_name = 1;
-  // Opaque fingerprint of the attribute set. Senders MUST use the same
-  // canonical fingerprint algorithm as the receiver (sorted keys joined
-  // by `key=value;`); the receiver re-derives the cache key from this
-  // bytes blob, so any disagreement on canonicalization produces a
-  // cache miss and a fresh sid.
-  bytes attributes_fingerprint = 2;
-}
-
-message ResolveSeriesIDsResponse {
-  repeated SeriesAssignment assignments = 1;
-}
-
-message ExportMetricsServiceRequest {
-  // An array of ResourceMetrics.
-  // For data coming from a single resource this array will typically contain one
-  // element. Intermediary nodes (such as OpenTelemetry Collector) that receive
-  // data from multiple origins typically batch the data before forwarding further and
-  // in that case this array will contain multiple elements.
-  repeated opentelemetry.proto.metrics.v1.ResourceMetrics resource_metrics = 1;
-}
-
-message ExportMetricsServiceResponse {
-  // The details of a partially successful export request.
-  //
-  // If the request is only partially accepted
-  // (i.e. when the server accepts only parts of the data and rejects the rest)
-  // the server MUST initialize the `partial_success` field and MUST
-  // set the `rejected_<signal>` with the number of items it rejected.
-  //
-  // Servers MAY also make use of the `partial_success` field to convey
-  // warnings/suggestions to senders even when the request was fully accepted.
-  // In such cases, the `rejected_<signal>` MUST have a value of `0` and
-  // the `error_message` MUST be non-empty.
-  //
-  // A `partial_success` message with an empty value (rejected_<signal> = 0 and
-  // `error_message` = "") is equivalent to it not being set/present. Senders
-  // SHOULD interpret it the same way as in the full success case.
-  ExportMetricsPartialSuccess partial_success = 1;
-
-  // List of compact descriptors for series IDs that were minted by the
-  // collector while processing this request. Exporters SHOULD cache these
-  // assignments and omit the associated attributes on subsequent exports once
-  // a series_id is known.
-  repeated SeriesAssignment series_assignments = 2;
-
-  // Refactor-2026-05: sids the receiver did NOT recognize in this Export.
-  // Sent when the receiver's series-id cache has diverged from the
-  // sender's (e.g., after backend restart without persistence, or any
-  // sid-cache eviction). Senders MUST evict the listed sids from their
-  // local cache; subsequent emits MUST re-attach `attributes` so the
-  // receiver can re-resolve and return fresh SeriesAssignments. This
-  // field is the universal recovery primitive — same code path that
-  // handles cold-start bootstrap also handles every cache-divergence
-  // failure mode.
-  repeated uint64 unknown_series_ids = 3;
-}
-
-message ExportMetricsPartialSuccess {
-  // The number of rejected data points.
-  //
-  // A `rejected_<signal>` field holding a `0` value indicates that the
-  // request was fully accepted.
-  int64 rejected_data_points = 1;
-
-  // A developer-facing human-readable message in English. It should be used
-  // either to explain why the server rejected parts of the data during a partial
-  // success or to convey warnings/suggestions during a full success. The message
-  // should offer guidance on how users can address such issues.
-  //
-  // error_message is an optional field. An error_message with an empty value
-  // is equivalent to it not being set.
-  string error_message = 2;
-}
-
-// SeriesAssignment communicates collector-assigned series identifiers back to
-// exporters. Identifiers are expressed using the same deterministic key format
-// as the collector's attribute de-duplication logic: resource_key and scope_key
-// are built by concatenating the schema URL with sorted attribute pairs,
-// metric_name is the OTLP Metric name, metric_type is the string form of
-// opentelemetry.proto.metrics.v1.Metric.MetricType, and attributes_fingerprint
-// is an opaque fingerprint of the sorted point-level attributes.
-message SeriesAssignment {
-  // Deterministic encoding of the Resource associated with the series. The
-  // collector MUST build this using schema_url + sorted attributes separated
-  // by '|' to match the lookup key it uses internally.
-  string resource_key = 1;
-
-  // Deterministic encoding of the instrumentation scope. Built from
-  // scope.name + scope.version + scope.schema_url + sorted attributes separated
-  // by '|'.
-  string scope_key = 2;
-
-  // Fully-qualified metric identity.
-  string metric_name = 3;
-
-  // String representation of the metric type (e.g. "Gauge", "Histogram").
-  string metric_type = 4;
-
-  // Opaque fingerprint of the data point's attribute set. The exporter MUST
-  // use the same fingerprinting algorithm when looking up cached series_ids.
-  bytes attributes_fingerprint = 5;
-
-  // The collector-assigned series identifier.
-  uint64 series_id = 6;
-}
diff --git a/crates/asap_otel_proto/proto/opentelemetry/proto/common/v1/common.proto b/crates/asap_otel_proto/proto/opentelemetry/proto/common/v1/common.proto
deleted file mode 100644
index 7f9ffab37..000000000
--- a/crates/asap_otel_proto/proto/opentelemetry/proto/common/v1/common.proto
+++ /dev/null
@@ -1,129 +0,0 @@
-// Copyright 2019, OpenTelemetry Authors
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-syntax = "proto3";
-
-package opentelemetry.proto.common.v1;
-
-option csharp_namespace = "OpenTelemetry.Proto.Common.V1";
-option java_multiple_files = true;
-option java_package = "io.opentelemetry.proto.common.v1";
-option java_outer_classname = "CommonProto";
-option go_package = "go.opentelemetry.io/proto/otlp/common/v1";
-
-// Represents any type of attribute value. AnyValue may contain a
-// primitive value such as a string or integer or it may contain an arbitrary nested
-// object containing arrays, key-value lists and primitives.
-message AnyValue {
-  // The value is one of the listed fields. It is valid for all values to be unspecified
-  // in which case this AnyValue is considered to be "empty".
-  oneof value {
-    string string_value = 1;
-    bool bool_value = 2;
-    int64 int_value = 3;
-    double double_value = 4;
-    ArrayValue array_value = 5;
-    KeyValueList kvlist_value = 6;
-    bytes bytes_value = 7;
-  }
-}
-
-// ArrayValue is a list of AnyValue messages. We need ArrayValue as a message
-// since oneof in AnyValue does not allow repeated fields.
-message ArrayValue {
-  // Array of values. The array may be empty (contain 0 elements).
-  repeated AnyValue values = 1;
-}
-
-// KeyValueList is a list of KeyValue messages. We need KeyValueList as a message
-// since `oneof` in AnyValue does not allow repeated fields. Everywhere else where we need
-// a list of KeyValue messages (e.g. in Span) we use `repeated KeyValue` directly to
-// avoid unnecessary extra wrapping (which slows down the protocol). The 2 approaches
-// are semantically equivalent.
-message KeyValueList {
-  // A collection of key/value pairs of key-value pairs. The list may be empty (may
-  // contain 0 elements).
-  //
-  // The keys MUST be unique (it is not allowed to have more than one
-  // value with the same key).
-  // The behavior of software that receives duplicated keys can be unpredictable.
-  repeated KeyValue values = 1;
-}
-
-// Represents a key-value pair that is used to store Span attributes, Link
-// attributes, etc.
-message KeyValue {
-  // The key name of the pair.
-  string key = 1;
-
-  // The value of the pair.
-  AnyValue value = 2;
-}
-
-// InstrumentationScope is a message representing the instrumentation scope information
-// such as the fully qualified name and version. 
-message InstrumentationScope {
-  // A name denoting the Instrumentation scope.
-  // An empty instrumentation scope name means the name is unknown.
-  string name = 1;
-
-  // Defines the version of the instrumentation scope.
-  // An empty instrumentation scope version means the version is unknown.
-  string version = 2;
-
-  // Additional attributes that describe the scope. [Optional].
-  // Attribute keys MUST be unique (it is not allowed to have more than one
-  // attribute with the same key).
-  // The behavior of software that receives duplicated keys can be unpredictable.
-  repeated KeyValue attributes = 3;
-
-  // The number of attributes that were discarded. Attributes
-  // can be discarded because their keys are too long or because there are too many
-  // attributes. If this value is 0, then no attributes were dropped.
-  uint32 dropped_attributes_count = 4;
-}
-
-// A reference to an Entity.
-// Entity represents an object of interest associated with produced telemetry: e.g spans, metrics, profiles, or logs.
-//
-// Status: [Development]
-message EntityRef {
-  // The Schema URL, if known. This is the identifier of the Schema that the entity data
-  // is recorded in. To learn more about Schema URL see
-  // https://opentelemetry.io/docs/specs/otel/schemas/#schema-url
-  //
-  // This schema_url applies to the data in this message and to the Resource attributes
-  // referenced by id_keys and description_keys.
-  // TODO: discuss if we are happy with this somewhat complicated definition of what
-  // the schema_url applies to.
-  //
-  // This field obsoletes the schema_url field in ResourceMetrics/ResourceSpans/ResourceLogs.
-  string schema_url = 1;
-
-  // Defines the type of the entity. MUST not change during the lifetime of the entity.
-  // For example: "service" or "host". This field is required and MUST not be empty
-  // for valid entities.
-  string type = 2;
-
-  // Attribute Keys that identify the entity.
-  // MUST not change during the lifetime of the entity. The Id must contain at least one attribute.
-  // These keys MUST exist in the containing {message}.attributes.
-  repeated string id_keys = 3;
-
-  // Descriptive (non-identifying) attribute keys of the entity.
-  // MAY change over the lifetime of the entity. MAY be empty.
-  // These attribute keys are not part of entity's identity.
-  // These keys MUST exist in the containing {message}.attributes.
-  repeated string description_keys = 4;
-}
\ No newline at end of file
diff --git a/crates/asap_otel_proto/proto/opentelemetry/proto/metrics/v1/metrics.proto b/crates/asap_otel_proto/proto/opentelemetry/proto/metrics/v1/metrics.proto
deleted file mode 100644
index 8aa6e443a..000000000
--- a/crates/asap_otel_proto/proto/opentelemetry/proto/metrics/v1/metrics.proto
+++ /dev/null
@@ -1,1047 +0,0 @@
-// Copyright 2019, OpenTelemetry Authors
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-syntax = "proto3";
-
-package opentelemetry.proto.metrics.v1;
-
-import "opentelemetry/proto/common/v1/common.proto";
-import "opentelemetry/proto/resource/v1/resource.proto";
-
-option csharp_namespace = "OpenTelemetry.Proto.Metrics.V1";
-option java_multiple_files = true;
-option java_package = "io.opentelemetry.proto.metrics.v1";
-option java_outer_classname = "MetricsProto";
-option go_package = "go.opentelemetry.io/proto/otlp/metrics/v1";
-
-// MetricsData represents the metrics data that can be stored in a persistent
-// storage, OR can be embedded by other protocols that transfer OTLP metrics
-// data but do not implement the OTLP protocol.
-//
-// MetricsData
-// └─── ResourceMetrics
-//   ├── Resource
-//   ├── SchemaURL
-//   └── ScopeMetrics
-//      ├── Scope
-//      ├── SchemaURL
-//      └── Metric
-//         ├── Name
-//         ├── Description
-//         ├── Unit
-//         └── data
-//            ├── Gauge
-//            ├── Sum
-//            ├── Histogram
-//            ├── ExponentialHistogram
-//            ├── DDSketch
-//            └── Summary
-//
-// The main difference between this message and collector protocol is that
-// in this message there will not be any "control" or "metadata" specific to
-// OTLP protocol.
-//
-// When new fields are added into this message, the OTLP request MUST be updated
-// as well.
-message MetricsData {
-  // An array of ResourceMetrics.
-  // For data coming from a single resource this array will typically contain
-  // one element. Intermediary nodes that receive data from multiple origins
-  // typically batch the data before forwarding further and in that case this
-  // array will contain multiple elements.
-  repeated ResourceMetrics resource_metrics = 1;
-}
-
-// A collection of ScopeMetrics from a Resource.
-message ResourceMetrics {
-  reserved 1000;
-
-  // The resource for the metrics in this message.
-  // If this field is not set then no resource info is known.
-  opentelemetry.proto.resource.v1.Resource resource = 1;
-
-  // A list of metrics that originate from a resource.
-  repeated ScopeMetrics scope_metrics = 2;
-
-  // The Schema URL, if known. This is the identifier of the Schema that the resource data
-  // is recorded in. Notably, the last part of the URL path is the version number of the
-  // schema: http[s]://server[:port]/path/<version>. To learn more about Schema URL see
-  // https://opentelemetry.io/docs/specs/otel/schemas/#schema-url
-  // This schema_url applies to the data in the "resource" field. It does not apply
-  // to the data in the "scope_metrics" field which have their own schema_url field.
-  string schema_url = 3;
-}
-
-// A collection of Metrics produced by an Scope.
-message ScopeMetrics {
-  // The instrumentation scope information for the metrics in this message.
-  // Semantically when InstrumentationScope isn't set, it is equivalent with
-  // an empty instrumentation scope name (unknown).
-  opentelemetry.proto.common.v1.InstrumentationScope scope = 1;
-
-  // A list of metrics that originate from an instrumentation library.
-  repeated Metric metrics = 2;
-
-  // The Schema URL, if known. This is the identifier of the Schema that the metric data
-  // is recorded in. Notably, the last part of the URL path is the version number of the
-  // schema: http[s]://server[:port]/path/<version>. To learn more about Schema URL see
-  // https://opentelemetry.io/docs/specs/otel/schemas/#schema-url
-  // This schema_url applies to the data in the "scope" field and all metrics in the
-  // "metrics" field.
-  string schema_url = 3;
-}
-
-// Defines a Metric which has one or more timeseries.  The following is a
-// brief summary of the Metric data model.  For more details, see:
-//
-//   https://github.com/open-telemetry/opentelemetry-specification/blob/main/specification/metrics/data-model.md
-//
-// The data model and relation between entities is shown in the
-// diagram below. Here, "DataPoint" is the term used to refer to any
-// one of the specific data point value types, and "points" is the term used
-// to refer to any one of the lists of points contained in the Metric.
-//
-// - Metric is composed of a metadata and data.
-// - Metadata part contains a name, description, unit.
-// - Data is one of the possible types (Sum, Gauge, Histogram, Summary).
-// - DataPoint contains timestamps, attributes, and one of the possible value type
-//   fields.
-//
-//    Metric
-//  +------------+
-//  |name        |
-//  |description |
-//  |unit        |     +------------------------------------+
-//  |data        |---> |Gauge, Sum, Histogram, Summary, ... |
-//  +------------+     +------------------------------------+
-//
-//    Data [One of Gauge, Sum, Histogram, Summary, ...]
-//  +-----------+
-//  |...        |  // Metadata about the Data.
-//  |points     |--+
-//  +-----------+  |
-//                 |      +---------------------------+
-//                 |      |DataPoint 1                |
-//                 v      |+------+------+   +------+ |
-//              +-----+   ||label |label |...|label | |
-//              |  1  |-->||value1|value2|...|valueN| |
-//              +-----+   |+------+------+   +------+ |
-//              |  .  |   |+-----+                    |
-//              |  .  |   ||value|                    |
-//              |  .  |   |+-----+                    |
-//              |  .  |   +---------------------------+
-//              |  .  |                   .
-//              |  .  |                   .
-//              |  .  |                   .
-//              |  .  |   +---------------------------+
-//              |  .  |   |DataPoint M                |
-//              +-----+   |+------+------+   +------+ |
-//              |  M  |-->||label |label |...|label | |
-//              +-----+   ||value1|value2|...|valueN| |
-//                        |+------+------+   +------+ |
-//                        |+-----+                    |
-//                        ||value|                    |
-//                        |+-----+                    |
-//                        +---------------------------+
-//
-// Each distinct type of DataPoint represents the output of a specific
-// aggregation function, the result of applying the DataPoint's
-// associated function of to one or more measurements.
-//
-// All DataPoint types have three common fields:
-// - Attributes includes key-value pairs associated with the data point
-// - TimeUnixNano is required, set to the end time of the aggregation
-// - StartTimeUnixNano is optional, but strongly encouraged for DataPoints
-//   having an AggregationTemporality field, as discussed below.
-//
-// Both TimeUnixNano and StartTimeUnixNano values are expressed as
-// UNIX Epoch time in nanoseconds since 00:00:00 UTC on 1 January 1970.
-//
-// # TimeUnixNano
-//
-// This field is required, having consistent interpretation across
-// DataPoint types.  TimeUnixNano is the moment corresponding to when
-// the data point's aggregate value was captured.
-//
-// Data points with the 0 value for TimeUnixNano SHOULD be rejected
-// by consumers.
-//
-// # StartTimeUnixNano
-//
-// StartTimeUnixNano in general allows detecting when a sequence of
-// observations is unbroken.  This field indicates to consumers the
-// start time for points with cumulative and delta
-// AggregationTemporality, and it should be included whenever possible
-// to support correct rate calculation.  Although it may be omitted
-// when the start time is truly unknown, setting StartTimeUnixNano is
-// strongly encouraged.
-message Metric {
-  reserved 4, 6, 8;
-
-  // The name of the metric.
-  string name = 1;
-
-  // A description of the metric, which can be used in documentation.
-  string description = 2;
-
-  // The unit in which the metric value is reported. Follows the format
-  // described by https://unitsofmeasure.org/ucum.html.
-  string unit = 3;
-
-  // Data determines the aggregation type (if any) of the metric, what is the
-  // reported value type for the data points, as well as the relatationship to
-  // the time interval over which they are reported.
-  oneof data {
-    Gauge gauge = 5;
-    Sum sum = 7;
-    Histogram histogram = 9;
-    ExponentialHistogram exponential_histogram = 10;
-    DDSketch ddsketch = 13;
-    Summary summary = 11;
-    KLLSketch kllsketch = 14;
-    CountSketch countsketch = 15;
-    CountMinSketch countminsketch = 16;
-    HLLSketch hllsketch = 17;
-    // Scalar Sum aggregate (AggregationKind = Sum); field 18 mirrors the
-    // collector pdata SumAgg oneof tag. Decoded into ExactAgg(Sum).
-    SumAgg sum_agg = 18;
-  }
-
-  // Additional metadata attributes that describe the metric. [Optional].
-  // Attributes are non-identifying.
-  // Consumers SHOULD NOT need to be aware of these attributes.
-  // These attributes MAY be used to encode information allowing
-  // for lossless roundtrip translation to / from another data model.
-  // Attribute keys MUST be unique (it is not allowed to have more than one
-  // attribute with the same key).
-  // The behavior of software that receives duplicated keys can be unpredictable.
-  repeated opentelemetry.proto.common.v1.KeyValue metadata = 12;
-}
-
-// Gauge represents the type of a scalar metric that always exports the
-// "current value" for every data point. It should be used for an "unknown"
-// aggregation.
-//
-// A Gauge does not support different aggregation temporalities. Given the
-// aggregation is unknown, points cannot be combined using the same
-// aggregation, regardless of aggregation temporalities. Therefore,
-// AggregationTemporality is not included. Consequently, this also means
-// "StartTimeUnixNano" is ignored for all data points.
-message Gauge {
-  // The time series data points.
-  // Note: Multiple time series may be included (same timestamp, different attributes).
-  repeated NumberDataPoint data_points = 1;
-}
-
-// Sum represents the type of a scalar metric that is calculated as a sum of all
-// reported measurements over a time interval.
-message Sum {
-  // The time series data points.
-  // Note: Multiple time series may be included (same timestamp, different attributes).
-  repeated NumberDataPoint data_points = 1;
-
-  // aggregation_temporality describes if the aggregator reports delta changes
-  // since last report time, or cumulative changes since a fixed start time.
-  AggregationTemporality aggregation_temporality = 2;
-
-  // Represents whether the sum is monotonic.
-  bool is_monotonic = 3;
-}
-
-// Histogram represents the type of a metric that is calculated by aggregating
-// as a Histogram of all reported measurements over a time interval.
-message Histogram {
-  // The time series data points.
-  // Note: Multiple time series may be included (same timestamp, different attributes).
-  repeated HistogramDataPoint data_points = 1;
-
-  // aggregation_temporality describes if the aggregator reports delta changes
-  // since last report time, or cumulative changes since a fixed start time.
-  AggregationTemporality aggregation_temporality = 2;
-}
-
-// ExponentialHistogram represents the type of a metric that is calculated by aggregating
-// as a ExponentialHistogram of all reported double measurements over a time interval.
-message ExponentialHistogram {
-  // The time series data points.
-  // Note: Multiple time series may be included (same timestamp, different attributes).
-  repeated ExponentialHistogramDataPoint data_points = 1;
-
-  // aggregation_temporality describes if the aggregator reports delta changes
-  // since last report time, or cumulative changes since a fixed start time.
-  AggregationTemporality aggregation_temporality = 2;
-}
-
-// DDSketch represents the type of a metric that encodes measurements using DDSketch buckets.
-message DDSketch {
-  // The time series data points.
-  // Note: Multiple time series may be included (same timestamp, different attributes).
-  repeated DDSketchDataPoint data_points = 1;
-
-  // aggregation_temporality describes if the aggregator reports delta changes
-  // since last report time, or cumulative changes since a fixed start time.
-  AggregationTemporality aggregation_temporality = 2;
-
-  // Refactor-2026-05: sketch instance config — DDSketch's relative
-  // accuracy (alpha). Sent ONCE per Metric emit (not per DataPoint),
-  // since this is a per-sketch-instance parameter, not per-window
-  // mutable state. Backend reads this into
-  // SketchInstanceMetadata.sketch_config on first sight and caches.
-  double relative_accuracy = 3;
-}
-
-// SumAgg represents a first-class scalar Sum aggregate (AggregationKind = Sum),
-// carried as a portable {sum,count} envelope in the sketch bytes. Not a sketch;
-// shares the modified-OTLP metric data oneof so the backend decodes it via the
-// same envelope path (into the ExactAgg(Sum) accumulator).
-message SumAgg {
-  repeated SumAggDataPoint data_points = 1;
-  AggregationTemporality aggregation_temporality = 2;
-}
-
-// SumAggDataPoint carries a scalar Sum aggregate as a {sum,count} envelope.
-message SumAggDataPoint {
-  repeated opentelemetry.proto.common.v1.KeyValue attributes = 9;
-  fixed64 start_time_unix_nano = 2;
-  fixed64 time_unix_nano = 3;
-  // Serialized SumState envelope (sketchlib SketchEnvelope{sum:SumState}).
-  bytes sketch = 8;
-  SumAggEncoding encoding = 10;
-  repeated Exemplar exemplars = 11;
-  uint32 flags = 15;
-  uint64 series_id = 16;
-}
-
-// SumAggEncoding identifies how the SumAgg payload bytes are encoded.
-enum SumAggEncoding {
-  SUM_AGG_ENCODING_UNSPECIFIED = 0;
-  SUM_AGG_ENCODING_PROTO = 1;
-  SUM_AGG_ENCODING_PROTO_DELTA = 2;
-  SUM_AGG_ENCODING_MSGPACK = 3;
-  SUM_AGG_ENCODING_MSGPACK_DELTA = 4;
-}
-
-// Summary metric data are used to convey quantile summaries,
-// a Prometheus (see: https://prometheus.io/docs/concepts/metric_types/#summary)
-// and OpenMetrics (see: https://github.com/prometheus/OpenMetrics/blob/4dbf6075567ab43296eed941037c12951faafb92/protos/prometheus.proto#L45)
-// data type. These data points cannot always be merged in a meaningful way.
-// While they can be useful in some applications, histogram data points are
-// recommended for new applications.
-// Summary metrics do not have an aggregation temporality field. This is
-// because the count and sum fields of a SummaryDataPoint are assumed to be
-// cumulative values.
-message Summary {
-  // The time series data points.
-  // Note: Multiple time series may be included (same timestamp, different attributes).
-  repeated SummaryDataPoint data_points = 1;
-}
-
-// DDSketchDataPoint is a single data point that encodes a distribution using the DDSketch format.
-//
-// Refactor-2026-05: removed precomputed/duplicated fields (count, sum,
-// min, max) — they are derivable from the sketch payload, so storing
-// them per-DataPoint duplicates state and risks cache-invalidation
-// bugs. Field numbers reserved for forward/backward compat.
-message DDSketchDataPoint {
-  reserved 1;                              // legacy "labels" (replaced by `attributes`)
-  reserved 4, 5, 6, 7, 12, 13, 14;        // refactor-2026-05: count, sum oneof, min oneof, max oneof — derivable from sketch state
-
-  // The set of key/value pairs that uniquely identify the timeseries from
-  // where this point belongs. The list MUST be omitted (or present but empty)
-  // whenever `series_id` is non-zero, and MUST be populated when `series_id`
-  // is zero so the receiver can mint a new entry.
-  // Attribute keys MUST be unique. After group-by rollup at the agent's
-  // sketch processor, `attributes.keys()` IS the group-by KEY set;
-  // `attributes` (as a map) is the group-by VALUES for this series.
-  repeated opentelemetry.proto.common.v1.KeyValue attributes = 9;
-
-  // StartTimeUnixNano is optional but strongly encouraged, see the
-  // the detailed comments above Metric.
-  fixed64 start_time_unix_nano = 2;
-
-  // TimeUnixNano is required, see the detailed comments above Metric.
-  fixed64 time_unix_nano = 3;
-
-  // Serialized DDSketch payload. The encoding is described by the encoding field.
-  bytes sketch = 8;
-
-  // Encoding that describes how the sketch bytes should be decoded.
-  DDSketchEncoding encoding = 10;
-
-  // (Optional) List of exemplars collected from
-  // measurements that were used to form the data point
-  repeated Exemplar exemplars = 11;
-
-  // Flags that apply to this specific data point.  See DataPointFlags
-  // for the available flags and their meaning.
-  uint32 flags = 15;
-
-  // series_id references a collector-assigned series descriptor. Receivers MUST
-  // reject the point unless exactly one of (`series_id` != 0, `attributes` populated)
-  // is true.
-  // After Phase 5 (centralized resolver at asap-query-backend), this id
-  // is the BACKEND-assigned global identifier for `(metric_name, attributes)`,
-  // shared across all hops in the pipeline.
-  uint64 series_id = 16;
-}
-
-// DDSketchEncoding identifies how the DDSketch payload bytes are encoded.
-enum DDSketchEncoding {
-  DDSKETCH_ENCODING_UNSPECIFIED = 0;
-
-  // DDSKETCH_ENCODING_PROTO indicates the sketch bytes contain the serialized
-  // github.com/DataDog/sketches-go/ddsketch/pb/sketchpb.DDSketch message.
-  DDSKETCH_ENCODING_PROTO = 1;
-  DDSKETCH_ENCODING_PROTO_DELTA = 2;
-  // DDSKETCH_ENCODING_MSGPACK indicates the sketch bytes are the MessagePack
-  // serialization of the cross-language sketch-core `DdSketch` struct
-  // (matching ASAPQuery-backend's `sketch_core::dd_sketch::DdSketch` and
-  // sketchlib-go's `wire/asapmsgpack.DDSketchState`).
-  DDSKETCH_ENCODING_MSGPACK = 3;
-  DDSKETCH_ENCODING_MSGPACK_DELTA = 4;
-}
-
-// KLLSketch represents the type of a metric that encodes measurements using the KLL quantile sketch.
-message KLLSketch {
-  repeated KLLSketchDataPoint data_points = 1;
-  AggregationTemporality aggregation_temporality = 2;
-
-  // Refactor-2026-05: KLL sketch parameter `k` — controls quantile
-  // error / space tradeoff. Sent once per Metric emit.
-  uint32 k = 3;
-}
-
-// KLLSketchDataPoint is a single data point that encodes a distribution using the KLL sketch format.
-//
-// Refactor-2026-05: removed count, sum, min, max — derivable from sketch state.
-message KLLSketchDataPoint {
-  reserved 4, 5, 6, 7;       // count, sum, min, max
-  repeated opentelemetry.proto.common.v1.KeyValue attributes = 1;
-  fixed64 start_time_unix_nano = 2;
-  fixed64 time_unix_nano = 3;
-  bytes sketch = 8;
-  KLLSketchEncoding encoding = 9;
-  uint32 flags = 10;
-  uint64 series_id = 11;
-}
-
-// KLLSketchEncoding identifies how the KLL sketch payload bytes are encoded.
-enum KLLSketchEncoding {
-  KLL_SKETCH_ENCODING_UNSPECIFIED = 0;
-  KLL_SKETCH_ENCODING_PROTO = 1;
-  // KLL_SKETCH_ENCODING_MSGPACK is reserved for the cross-language
-  // sketch-core `KllSketch` msgpack wire format. Not currently usable
-  // because sketchlib-go's KLL does not share a byte-level backend
-  // with ASAPQuery-backend's datasketches-rs-backed `KllSketch`
-  // (tracked as a follow-up — for KLL today, use PROTO).
-  KLL_SKETCH_ENCODING_MSGPACK = 3;
-  KLL_SKETCH_ENCODING_MSGPACK_DELTA = 4;
-}
-
-// CountSketch represents the type of a metric that encodes frequency estimations using CountSketch.
-message CountSketch {
-  repeated CountSketchDataPoint data_points = 1;
-  AggregationTemporality aggregation_temporality = 2;
-
-  // Refactor-2026-05: CountSketch matrix dimensions. depth × width.
-  // (epsilon, delta) deriveable: eps = sqrt(e/cols) for L2 estimation;
-  // delta ≈ 1/(2^(rows/2)). Backend computes these for display.
-  int32 rows = 3;     // depth
-  int32 cols = 4;     // width
-}
-
-// CountSketchDataPoint is a single data point encoding frequency estimations.
-//
-// Refactor-2026-05: removed `dimension` (legacy partition-key
-// descriptor — replaced by `attributes` keys = group-by labels);
-// removed `epsilon`/`delta` (derivable from container's rows/cols).
-message CountSketchDataPoint {
-  reserved 6, 7, 8;          // dimension, epsilon, delta
-  repeated opentelemetry.proto.common.v1.KeyValue attributes = 1;
-  fixed64 start_time_unix_nano = 2;
-  fixed64 time_unix_nano = 3;
-  bytes sketch = 4;
-  CountSketchEncoding encoding = 5;
-  uint32 flags = 9;
-  uint64 series_id = 10;
-}
-
-// CountSketchEncoding identifies how the CountSketch payload bytes are encoded.
-enum CountSketchEncoding {
-  COUNT_SKETCH_ENCODING_UNSPECIFIED = 0;
-  COUNT_SKETCH_ENCODING_PROTO = 1;
-  COUNT_SKETCH_ENCODING_DELTA = 2;
-  // COUNT_SKETCH_ENCODING_MSGPACK indicates the sketch bytes are the
-  // MessagePack serialization of the cross-language sketch-core
-  // `CountSketch` struct (matching ASAPQuery-backend's
-  // `sketch_core::count_sketch::CountSketch` and sketchlib-go's
-  // `wire/asapmsgpack.MarshalCountSketch`).
-  COUNT_SKETCH_ENCODING_MSGPACK = 3;
-  COUNT_SKETCH_ENCODING_MSGPACK_DELTA = 4;
-}
-
-// CountMinSketch represents the type of a metric encoding frequency estimations using CountMinSketch.
-message CountMinSketch {
-  repeated CountMinSketchDataPoint data_points = 1;
-  AggregationTemporality aggregation_temporality = 2;
-
-  // Refactor-2026-05: CMS matrix dimensions. depth × width.
-  // (epsilon, delta) deriveable: eps ≈ e/cols; delta ≈ exp(-rows).
-  int32 rows = 3;     // depth = ⌈ln(1/delta)⌉
-  int32 cols = 4;     // width = ⌈e/epsilon⌉
-}
-
-// CountMinSketchDataPoint is a single data point encoding frequency estimations.
-//
-// Refactor-2026-05: removed `sample_count` (derivable from sketch
-// row sums); removed `rows`/`cols` (lifted to parent container, sent
-// once per Metric emit instead of per DataPoint).
-message CountMinSketchDataPoint {
-  reserved 4, 7, 8;          // sample_count, rows, cols
-  repeated opentelemetry.proto.common.v1.KeyValue attributes = 1;
-  fixed64 start_time_unix_nano = 2;
-  fixed64 time_unix_nano = 3;
-  bytes sketch = 5;
-  CountMinSketchEncoding encoding = 6;
-  uint32 flags = 9;
-  uint64 series_id = 10;
-}
-
-// CountMinSketchEncoding identifies how the CountMinSketch payload bytes are encoded.
-enum CountMinSketchEncoding {
-  COUNT_MIN_SKETCH_ENCODING_UNSPECIFIED = 0;
-  COUNT_MIN_SKETCH_ENCODING_PROTO = 1;
-  COUNT_MIN_SKETCH_ENCODING_DELTA = 2;
-  // COUNT_MIN_SKETCH_ENCODING_MSGPACK indicates the sketch bytes are
-  // the MessagePack serialization of the cross-language sketch-core
-  // `CountMinSketch` wire struct (matching ASAPQuery-backend's
-  // `sketch_core::count_min::CountMinSketch` and sketchlib-go's
-  // `wire/asapmsgpack.MarshalCountMinSketch`).
-  COUNT_MIN_SKETCH_ENCODING_MSGPACK = 3;
-  COUNT_MIN_SKETCH_ENCODING_MSGPACK_DELTA = 4;
-}
-
-// HLLSketch represents the type of a metric that encodes cardinality estimations using HyperLogLog.
-message HLLSketch {
-  repeated HLLSketchDataPoint data_points = 1;
-  AggregationTemporality aggregation_temporality = 2;
-
-  // Refactor-2026-05: HLL register-bucket precision (= log2(register count)).
-  // Standard error ≈ 1.04 / sqrt(2^precision). Sent once per Metric emit.
-  uint32 precision = 3;
-}
-
-// HLLSketchDataPoint is a single data point encoding cardinality estimations.
-//
-// Refactor-2026-05: removed `count` (derivable from sketch register
-// state), removed `cardinality` (precomputed cache of
-// sketch.estimate() — let the receiver evaluate on demand to avoid
-// cache drift). `precision` lifted to parent container.
-message HLLSketchDataPoint {
-  reserved 4, 5, 8;          // count, cardinality, precision
-  repeated opentelemetry.proto.common.v1.KeyValue attributes = 1;
-  fixed64 start_time_unix_nano = 2;
-  fixed64 time_unix_nano = 3;
-  bytes sketch = 6;
-  HLLSketchEncoding encoding = 7;
-  uint32 flags = 9;
-  uint64 series_id = 10;
-}
-
-// HLLSketchEncoding identifies how the HLL sketch payload bytes are encoded.
-enum HLLSketchEncoding {
-  HLL_SKETCH_ENCODING_UNSPECIFIED = 0;
-  HLL_SKETCH_ENCODING_PROTO = 1;
-  HLL_SKETCH_ENCODING_DELTA = 2;
-  // HLL_SKETCH_ENCODING_MSGPACK indicates the sketch bytes are the
-  // MessagePack serialization of the cross-language sketch-core
-  // `HllSketch` struct — registers + variant + precision + HIP state
-  // (matching ASAPQuery-backend's `sketch_core::hll_sketch::HllSketch`
-  // and sketchlib-go's `wire/asapmsgpack.MarshalHLLSketch`).
-  HLL_SKETCH_ENCODING_MSGPACK = 3;
-  HLL_SKETCH_ENCODING_MSGPACK_DELTA = 4;
-}
-
-// AggregationTemporality defines how a metric aggregator reports aggregated
-// values. It describes how those values relate to the time interval over
-// which they are aggregated.
-enum AggregationTemporality {
-  // UNSPECIFIED is the default AggregationTemporality, it MUST not be used.
-  AGGREGATION_TEMPORALITY_UNSPECIFIED = 0;
-
-  // DELTA is an AggregationTemporality for a metric aggregator which reports
-  // changes since last report time. Successive metrics contain aggregation of
-  // values from continuous and non-overlapping intervals.
-  //
-  // The values for a DELTA metric are based only on the time interval
-  // associated with one measurement cycle. There is no dependency on
-  // previous measurements like is the case for CUMULATIVE metrics.
-  //
-  // For example, consider a system measuring the number of requests that
-  // it receives and reports the sum of these requests every second as a
-  // DELTA metric:
-  //
-  //   1. The system starts receiving at time=t_0.
-  //   2. A request is received, the system measures 1 request.
-  //   3. A request is received, the system measures 1 request.
-  //   4. A request is received, the system measures 1 request.
-  //   5. The 1 second collection cycle ends. A metric is exported for the
-  //      number of requests received over the interval of time t_0 to
-  //      t_0+1 with a value of 3.
-  //   6. A request is received, the system measures 1 request.
-  //   7. A request is received, the system measures 1 request.
-  //   8. The 1 second collection cycle ends. A metric is exported for the
-  //      number of requests received over the interval of time t_0+1 to
-  //      t_0+2 with a value of 2.
-  AGGREGATION_TEMPORALITY_DELTA = 1;
-
-  // CUMULATIVE is an AggregationTemporality for a metric aggregator which
-  // reports changes since a fixed start time. This means that current values
-  // of a CUMULATIVE metric depend on all previous measurements since the
-  // start time. Because of this, the sender is required to retain this state
-  // in some form. If this state is lost or invalidated, the CUMULATIVE metric
-  // values MUST be reset and a new fixed start time following the last
-  // reported measurement time sent MUST be used.
-  //
-  // For example, consider a system measuring the number of requests that
-  // it receives and reports the sum of these requests every second as a
-  // CUMULATIVE metric:
-  //
-  //   1. The system starts receiving at time=t_0.
-  //   2. A request is received, the system measures 1 request.
-  //   3. A request is received, the system measures 1 request.
-  //   4. A request is received, the system measures 1 request.
-  //   5. The 1 second collection cycle ends. A metric is exported for the
-  //      number of requests received over the interval of time t_0 to
-  //      t_0+1 with a value of 3.
-  //   6. A request is received, the system measures 1 request.
-  //   7. A request is received, the system measures 1 request.
-  //   8. The 1 second collection cycle ends. A metric is exported for the
-  //      number of requests received over the interval of time t_0 to
-  //      t_0+2 with a value of 5.
-  //   9. The system experiences a fault and loses state.
-  //   10. The system recovers and resumes receiving at time=t_1.
-  //   11. A request is received, the system measures 1 request.
-  //   12. The 1 second collection cycle ends. A metric is exported for the
-  //      number of requests received over the interval of time t_1 to
-  //      t_0+1 with a value of 1.
-  //
-  // Note: Even though, when reporting changes since last report time, using
-  // CUMULATIVE is valid, it is not recommended. This may cause problems for
-  // systems that do not use start_time to determine when the aggregation
-  // value was reset (e.g. Prometheus).
-  AGGREGATION_TEMPORALITY_CUMULATIVE = 2;
-}
-
-// DataPointFlags is defined as a protobuf 'uint32' type and is to be used as a
-// bit-field representing 32 distinct boolean flags.  Each flag defined in this
-// enum is a bit-mask.  To test the presence of a single flag in the flags of
-// a data point, for example, use an expression like:
-//
-//   (point.flags & DATA_POINT_FLAGS_NO_RECORDED_VALUE_MASK) == DATA_POINT_FLAGS_NO_RECORDED_VALUE_MASK
-//
-enum DataPointFlags {
-  // The zero value for the enum. Should not be used for comparisons.
-  // Instead use bitwise "and" with the appropriate mask as shown above.
-  DATA_POINT_FLAGS_DO_NOT_USE = 0;
-
-  // This DataPoint is valid but has no recorded value.  This value
-  // SHOULD be used to reflect explicitly missing data in a series, as
-  // for an equivalent to the Prometheus "staleness marker".
-  DATA_POINT_FLAGS_NO_RECORDED_VALUE_MASK = 1;
-
-  // Bits 2-31 are reserved for future use.
-}
-
-// NumberDataPoint is a single data point in a timeseries that describes the
-// time-varying scalar value of a metric.
-message NumberDataPoint {
-  reserved 1;
-
-  // The set of key/value pairs that uniquely identify the timeseries from
-  // where this point belongs. The list MUST be omitted (or present but empty)
-  // whenever `series_id` is non-zero, and MUST be populated when `series_id`
-  // is zero so the receiver can mint a new entry.
-  // Attribute keys MUST be unique (it is not allowed to have more than one
-  // attribute with the same key).
-  // The behavior of software that receives duplicated keys can be unpredictable.
-  repeated opentelemetry.proto.common.v1.KeyValue attributes = 7;
-
-  // StartTimeUnixNano is optional but strongly encouraged, see the
-  // the detailed comments above Metric.
-  //
-  // Value is UNIX Epoch time in nanoseconds since 00:00:00 UTC on 1 January
-  // 1970.
-  fixed64 start_time_unix_nano = 2;
-
-  // TimeUnixNano is required, see the detailed comments above Metric.
-  //
-  // Value is UNIX Epoch time in nanoseconds since 00:00:00 UTC on 1 January
-  // 1970.
-  fixed64 time_unix_nano = 3;
-
-  // The value itself.  A point is considered invalid when one of the recognized
-  // value fields is not present inside this oneof.
-  oneof value {
-    double as_double = 4;
-    sfixed64 as_int = 6;
-  }
-
-  // (Optional) List of exemplars collected from
-  // measurements that were used to form the data point
-  repeated Exemplar exemplars = 5;
-
-  // Flags that apply to this specific data point.  See DataPointFlags
-  // for the available flags and their meaning.
-  uint32 flags = 8;
-
-  // series_id references a collector-assigned series descriptor. Receivers MUST
-  // reject the point unless exactly one of (`series_id` != 0, `attributes` populated)
-  // is true.
-  uint64 series_id = 9;
-}
-
-// HistogramDataPoint is a single data point in a timeseries that describes the
-// time-varying values of a Histogram. A Histogram contains summary statistics
-// for a population of values, it may optionally contain the distribution of
-// those values across a set of buckets.
-//
-// If the histogram contains the distribution of values, then both
-// "explicit_bounds" and "bucket counts" fields must be defined.
-// If the histogram does not contain the distribution of values, then both
-// "explicit_bounds" and "bucket_counts" must be omitted and only "count" and
-// "sum" are known.
-message HistogramDataPoint {
-  reserved 1;
-
-  // The set of key/value pairs that uniquely identify the timeseries from
-  // where this point belongs. The list MUST be omitted (or present but empty)
-  // whenever `series_id` is non-zero, and MUST be populated when `series_id`
-  // is zero so the receiver can mint a new entry.
-  // Attribute keys MUST be unique (it is not allowed to have more than one
-  // attribute with the same key).
-  // The behavior of software that receives duplicated keys can be unpredictable.
-  repeated opentelemetry.proto.common.v1.KeyValue attributes = 9;
-
-  // StartTimeUnixNano is optional but strongly encouraged, see the
-  // the detailed comments above Metric.
-  //
-  // Value is UNIX Epoch time in nanoseconds since 00:00:00 UTC on 1 January
-  // 1970.
-  fixed64 start_time_unix_nano = 2;
-
-  // TimeUnixNano is required, see the detailed comments above Metric.
-  //
-  // Value is UNIX Epoch time in nanoseconds since 00:00:00 UTC on 1 January
-  // 1970.
-  fixed64 time_unix_nano = 3;
-
-  // count is the number of values in the population. Must be non-negative. This
-  // value must be equal to the sum of the "count" fields in buckets if a
-  // histogram is provided.
-  fixed64 count = 4;
-
-  // sum of the values in the population. If count is zero then this field
-  // must be zero.
-  //
-  // Note: Sum should only be filled out when measuring non-negative discrete
-  // events, and is assumed to be monotonic over the values of these events.
-  // Negative events *can* be recorded, but sum should not be filled out when
-  // doing so.  This is specifically to enforce compatibility w/ OpenMetrics,
-  // see: https://github.com/prometheus/OpenMetrics/blob/v1.0.0/specification/OpenMetrics.md#histogram
-  optional double sum = 5;
-
-  // bucket_counts is an optional field contains the count values of histogram
-  // for each bucket.
-  //
-  // The sum of the bucket_counts must equal the value in the count field.
-  //
-  // The number of elements in bucket_counts array must be by one greater than
-  // the number of elements in explicit_bounds array. The exception to this rule
-  // is when the length of bucket_counts is 0, then the length of explicit_bounds
-  // must also be 0.
-  repeated fixed64 bucket_counts = 6;
-
-  // explicit_bounds specifies buckets with explicitly defined bounds for values.
-  //
-  // The boundaries for bucket at index i are:
-  //
-  // (-infinity, explicit_bounds[i]] for i == 0
-  // (explicit_bounds[i-1], explicit_bounds[i]] for 0 < i < size(explicit_bounds)
-  // (explicit_bounds[i-1], +infinity) for i == size(explicit_bounds)
-  //
-  // The values in the explicit_bounds array must be strictly increasing.
-  //
-  // Histogram buckets are inclusive of their upper boundary, except the last
-  // bucket where the boundary is at infinity. This format is intentionally
-  // compatible with the OpenMetrics histogram definition.
-  //
-  // If bucket_counts length is 0 then explicit_bounds length must also be 0,
-  // otherwise the data point is invalid.
-  repeated double explicit_bounds = 7;
-
-  // (Optional) List of exemplars collected from
-  // measurements that were used to form the data point
-  repeated Exemplar exemplars = 8;
-
-  // Flags that apply to this specific data point.  See DataPointFlags
-  // for the available flags and their meaning.
-  uint32 flags = 10;
-
-  // min is the minimum value over (start_time, end_time].
-  optional double min = 11;
-
-  // max is the maximum value over (start_time, end_time].
-  optional double max = 12;
-
-  // series_id references a collector-assigned series descriptor. Receivers MUST
-  // reject the point unless exactly one of (`series_id` != 0, `attributes` populated)
-  // is true.
-  uint64 series_id = 13;
-}
-
-// ExponentialHistogramDataPoint is a single data point in a timeseries that describes the
-// time-varying values of a ExponentialHistogram of double values. A ExponentialHistogram contains
-// summary statistics for a population of values, it may optionally contain the
-// distribution of those values across a set of buckets.
-//
-message ExponentialHistogramDataPoint {
-  // The set of key/value pairs that uniquely identify the timeseries from
-  // where this point belongs. The list MUST be omitted (or present but empty)
-  // whenever `series_id` is non-zero, and MUST be populated when `series_id`
-  // is zero so the receiver can mint a new entry.
-  // Attribute keys MUST be unique (it is not allowed to have more than one
-  // attribute with the same key).
-  // The behavior of software that receives duplicated keys can be unpredictable.
-  repeated opentelemetry.proto.common.v1.KeyValue attributes = 1;
-
-  // StartTimeUnixNano is optional but strongly encouraged, see the
-  // the detailed comments above Metric.
-  //
-  // Value is UNIX Epoch time in nanoseconds since 00:00:00 UTC on 1 January
-  // 1970.
-  fixed64 start_time_unix_nano = 2;
-
-  // TimeUnixNano is required, see the detailed comments above Metric.
-  //
-  // Value is UNIX Epoch time in nanoseconds since 00:00:00 UTC on 1 January
-  // 1970.
-  fixed64 time_unix_nano = 3;
-
-  // The number of values in the population. Must be
-  // non-negative. This value must be equal to the sum of the "bucket_counts"
-  // values in the positive and negative Buckets plus the "zero_count" field.
-  fixed64 count = 4;
-
-  // The sum of the values in the population. If count is zero then this field
-  // must be zero.
-  //
-  // Note: Sum should only be filled out when measuring non-negative discrete
-  // events, and is assumed to be monotonic over the values of these events.
-  // Negative events *can* be recorded, but sum should not be filled out when
-  // doing so.  This is specifically to enforce compatibility w/ OpenMetrics,
-  // see: https://github.com/prometheus/OpenMetrics/blob/v1.0.0/specification/OpenMetrics.md#histogram
-  optional double sum = 5;
-
-  // scale describes the resolution of the histogram.  Boundaries are
-  // located at powers of the base, where:
-  //
-  //   base = (2^(2^-scale))
-  //
-  // The histogram bucket identified by `index`, a signed integer,
-  // contains values that are greater than (base^index) and
-  // less than or equal to (base^(index+1)).
-  //
-  // The positive and negative ranges of the histogram are expressed
-  // separately.  Negative values are mapped by their absolute value
-  // into the negative range using the same scale as the positive range.
-  //
-  // scale is not restricted by the protocol, as the permissible
-  // values depend on the range of the data.
-  sint32 scale = 6;
-
-  // The count of values that are either exactly zero or
-  // within the region considered zero by the instrumentation at the
-  // tolerated degree of precision.  This bucket stores values that
-  // cannot be expressed using the standard exponential formula as
-  // well as values that have been rounded to zero.
-  //
-  // Implementations MAY consider the zero bucket to have probability
-  // mass equal to (zero_count / count).
-  fixed64 zero_count = 7;
-
-  // positive carries the positive range of exponential bucket counts.
-  Buckets positive = 8;
-
-  // negative carries the negative range of exponential bucket counts.
-  Buckets negative = 9;
-
-  // Buckets are a set of bucket counts, encoded in a contiguous array
-  // of counts.
-  message Buckets {
-    // The bucket index of the first entry in the bucket_counts array.
-    //
-    // Note: This uses a varint encoding as a simple form of compression.
-    sint32 offset = 1;
-
-    // An array of count values, where bucket_counts[i] carries
-    // the count of the bucket at index (offset+i). bucket_counts[i] is the count
-    // of values greater than base^(offset+i) and less than or equal to
-    // base^(offset+i+1).
-    //
-    // Note: By contrast, the explicit HistogramDataPoint uses
-    // fixed64.  This field is expected to have many buckets,
-    // especially zeros, so uint64 has been selected to ensure
-    // varint encoding.
-    repeated uint64 bucket_counts = 2;
-  }
-
-  // Flags that apply to this specific data point.  See DataPointFlags
-  // for the available flags and their meaning.
-  uint32 flags = 10;
-
-  // (Optional) List of exemplars collected from
-  // measurements that were used to form the data point
-  repeated Exemplar exemplars = 11;
-
-  // The minimum value over (start_time, end_time].
-  optional double min = 12;
-
-  // The maximum value over (start_time, end_time].
-  optional double max = 13;
-
-  // ZeroThreshold may be optionally set to convey the width of the zero
-  // region. Where the zero region is defined as the closed interval
-  // [-ZeroThreshold, ZeroThreshold].
-  // When ZeroThreshold is 0, zero count bucket stores values that cannot be
-  // expressed using the standard exponential formula as well as values that
-  // have been rounded to zero.
-  double zero_threshold = 14;
-
-  // series_id references a collector-assigned series descriptor. Receivers MUST
-  // reject the point unless exactly one of (`series_id` != 0, `attributes` populated)
-  // is true.
-  uint64 series_id = 15;
-}
-
-// SummaryDataPoint is a single data point in a timeseries that describes the
-// time-varying values of a Summary metric. The count and sum fields represent
-// cumulative values.
-message SummaryDataPoint {
-  reserved 1;
-
-  // The set of key/value pairs that uniquely identify the timeseries from
-  // where this point belongs. The list MUST be omitted (or present but empty)
-  // whenever `series_id` is non-zero, and MUST be populated when `series_id`
-  // is zero so the receiver can mint a new entry.
-  // Attribute keys MUST be unique (it is not allowed to have more than one
-  // attribute with the same key).
-  // The behavior of software that receives duplicated keys can be unpredictable.
-  repeated opentelemetry.proto.common.v1.KeyValue attributes = 7;
-
-  // StartTimeUnixNano is optional but strongly encouraged, see the
-  // the detailed comments above Metric.
-  //
-  // Value is UNIX Epoch time in nanoseconds since 00:00:00 UTC on 1 January
-  // 1970.
-  fixed64 start_time_unix_nano = 2;
-
-  // TimeUnixNano is required, see the detailed comments above Metric.
-  //
-  // Value is UNIX Epoch time in nanoseconds since 00:00:00 UTC on 1 January
-  // 1970.
-  fixed64 time_unix_nano = 3;
-
-  // count is the number of values in the population. Must be non-negative.
-  fixed64 count = 4;
-
-  // sum of the values in the population. If count is zero then this field
-  // must be zero.
-  //
-  // Note: Sum should only be filled out when measuring non-negative discrete
-  // events, and is assumed to be monotonic over the values of these events.
-  // Negative events *can* be recorded, but sum should not be filled out when
-  // doing so.  This is specifically to enforce compatibility w/ OpenMetrics,
-  // see: https://github.com/prometheus/OpenMetrics/blob/v1.0.0/specification/OpenMetrics.md#summary
-  double sum = 5;
-
-  // Represents the value at a given quantile of a distribution.
-  //
-  // To record Min and Max values following conventions are used:
-  // - The 1.0 quantile is equivalent to the maximum value observed.
-  // - The 0.0 quantile is equivalent to the minimum value observed.
-  //
-  // See the following issue for more context:
-  // https://github.com/open-telemetry/opentelemetry-proto/issues/125
-  message ValueAtQuantile {
-    // The quantile of a distribution. Must be in the interval
-    // [0.0, 1.0].
-    double quantile = 1;
-
-    // The value at the given quantile of a distribution.
-    //
-    // Quantile values must NOT be negative.
-    double value = 2;
-  }
-
-  // (Optional) list of values at different quantiles of the distribution calculated
-  // from the current snapshot. The quantiles must be strictly increasing.
-  repeated ValueAtQuantile quantile_values = 6;
-
-  // Flags that apply to this specific data point.  See DataPointFlags
-  // for the available flags and their meaning.
-  uint32 flags = 8;
-
-  // series_id references a collector-assigned series descriptor. Receivers MUST
-  // reject the point unless exactly one of (`series_id` != 0, `attributes` populated)
-  // is true.
-  uint64 series_id = 9;
-}
-
-// A representation of an exemplar, which is a sample input measurement.
-// Exemplars also hold information about the environment when the measurement
-// was recorded, for example the span and trace ID of the active span when the
-// exemplar was recorded.
-message Exemplar {
-  reserved 1;
-
-  // The set of key/value pairs that were filtered out by the aggregator, but
-  // recorded alongside the original measurement. Only key/value pairs that were
-  // filtered out by the aggregator should be included
-  repeated opentelemetry.proto.common.v1.KeyValue filtered_attributes = 7;
-
-  // time_unix_nano is the exact time when this exemplar was recorded
-  //
-  // Value is UNIX Epoch time in nanoseconds since 00:00:00 UTC on 1 January
-  // 1970.
-  fixed64 time_unix_nano = 2;
-
-  // The value of the measurement that was recorded. An exemplar is
-  // considered invalid when one of the recognized value fields is not present
-  // inside this oneof.
-  oneof value {
-    double as_double = 3;
-    sfixed64 as_int = 6;
-  }
-
-  // (Optional) Span ID of the exemplar trace.
-  // span_id may be missing if the measurement is not recorded inside a trace
-  // or if the trace is not sampled.
-  bytes span_id = 4;
-
-  // (Optional) Trace ID of the exemplar trace.
-  // trace_id may be missing if the measurement is not recorded inside a trace
-  // or if the trace is not sampled.
-  bytes trace_id = 5;
-}
diff --git a/crates/asap_otel_proto/proto/opentelemetry/proto/resource/v1/resource.proto b/crates/asap_otel_proto/proto/opentelemetry/proto/resource/v1/resource.proto
deleted file mode 100644
index 42c5913cf..000000000
--- a/crates/asap_otel_proto/proto/opentelemetry/proto/resource/v1/resource.proto
+++ /dev/null
@@ -1,45 +0,0 @@
-// Copyright 2019, OpenTelemetry Authors
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-syntax = "proto3";
-
-package opentelemetry.proto.resource.v1;
-
-import "opentelemetry/proto/common/v1/common.proto";
-
-option csharp_namespace = "OpenTelemetry.Proto.Resource.V1";
-option java_multiple_files = true;
-option java_package = "io.opentelemetry.proto.resource.v1";
-option java_outer_classname = "ResourceProto";
-option go_package = "go.opentelemetry.io/proto/otlp/resource/v1";
-
-// Resource information.
-message Resource {
-  // Set of attributes that describe the resource.
-  // Attribute keys MUST be unique (it is not allowed to have more than one
-  // attribute with the same key).
-  // The behavior of software that receives duplicated keys can be unpredictable.
-  repeated opentelemetry.proto.common.v1.KeyValue attributes = 1;
-
-  // The number of dropped attributes. If the value is 0, then
-  // no attributes were dropped.
-  uint32 dropped_attributes_count = 2;
-
-  // Set of entities that participate in this Resource.
-  //
-  // Note: keys in the references MUST exist in attributes of this message.
-  //
-  // Status: [Development]
-  repeated opentelemetry.proto.common.v1.EntityRef entity_refs = 3;
-}
diff --git a/crates/asap_otel_proto/proto/sketchlib_delta/countminsketch_delta.proto b/crates/asap_otel_proto/proto/sketchlib_delta/countminsketch_delta.proto
deleted file mode 100644
index 49581a33b..000000000
--- a/crates/asap_otel_proto/proto/sketchlib_delta/countminsketch_delta.proto
+++ /dev/null
@@ -1,25 +0,0 @@
-// countminsketch_delta.proto — Delta wire format for CountMin.
-//
-// Mirrors the new packed encoding of `CountMinDelta` in
-// `sketchlib-go/proto/countminsketch/countminsketch.proto`.
-// Deprecated `cells_legacy` cells + their `d_sum` / `d_sum2`
-// accessories are omitted — new sketchlib-go producers write
-// the packed arrays instead.
-//
-// Semantics: matrix[cell_rows[i]][cell_cols[i]] += d_counts[i].
-// L1 and L2 are per-row norm deltas, transmitted for queryside
-// accuracy-accounting; not needed for the core merge.
-
-syntax = "proto3";
-
-package sketchlib.v1;
-
-message CountMinDelta {
-  uint32         rows      = 1;
-  uint32         cols      = 2;
-  repeated double l1        = 4 [packed = true];
-  repeated double l2        = 5 [packed = true];
-  repeated uint32 cell_rows = 9  [packed = true];
-  repeated uint32 cell_cols = 10 [packed = true];
-  repeated sint64 d_counts  = 11 [packed = true];
-}
diff --git a/crates/asap_otel_proto/proto/sketchlib_delta/countsketch_delta.proto b/crates/asap_otel_proto/proto/sketchlib_delta/countsketch_delta.proto
deleted file mode 100644
index c9d31042e..000000000
--- a/crates/asap_otel_proto/proto/sketchlib_delta/countsketch_delta.proto
+++ /dev/null
@@ -1,33 +0,0 @@
-// countsketch_delta.proto — Delta wire format for CountSketch.
-//
-// Mirrors the new packed encoding of `CountSketchDelta` in
-// `sketchlib-go/proto/countsketch/countsketch.proto`. Only the
-// packed `cell_rows` / `cell_cols` / `d_counts` path is modeled
-// here — the deprecated `cells_legacy` / `l2_legacy` fields and
-// the `topk` / `hh_keys` top-K carriers are omitted because:
-//
-//   * Legacy cells: new producers (sketchlib-go v0 and later)
-//     don't emit them.
-//   * Top-K on delta path: CountSketch's top-K is non-linear, so
-//     sketchlib-go transmits it in full (TopKState), not via
-//     delta. Merging top-K deltas would require re-querying the
-//     CS accumulator for each candidate key, which the backend
-//     doesn't wire today. A follow-up PR can pick this up once
-//     the §6.4 accuracy experiments flag top-K as worth chasing.
-//
-// Bucket additive semantics: `cell_rows[i]`, `cell_cols[i]` →
-// matrix[row][col] += d_counts[i]. L2 norm is per-row
-// additive.
-
-syntax = "proto3";
-
-package sketchlib.v1;
-
-message CountSketchDelta {
-  uint32         rows      = 1;
-  uint32         cols      = 2;
-  repeated uint32 cell_rows = 9  [packed = true];
-  repeated uint32 cell_cols = 10 [packed = true];
-  repeated sint64 d_counts  = 11 [packed = true];
-  repeated double l2        = 12 [packed = true];
-}
diff --git a/crates/asap_otel_proto/proto/sketchlib_delta/ddsketch_delta.proto b/crates/asap_otel_proto/proto/sketchlib_delta/ddsketch_delta.proto
deleted file mode 100644
index f2aef92fc..000000000
--- a/crates/asap_otel_proto/proto/sketchlib_delta/ddsketch_delta.proto
+++ /dev/null
@@ -1,38 +0,0 @@
-// ddsketch_delta.proto — Delta wire format for DDSketch.
-//
-// Mirrors `sketchlib-go/proto/ddsketch/ddsketch.proto` DDSketchDelta +
-// DDSketchBucketDelta messages byte-for-byte. Kept as a separate tiny
-// proto in this crate because the upstream `asap_sketchlib` Rust crate
-// only generates the state types today, not the delta types. Once
-// `asap_sketchlib` picks these up upstream this vendoring can be removed.
-//
-// See `sketches/DDSketch/delta.go::ApplyDelta` for the canonical
-// merge semantics — additive bucket counts only. The DataPoint-level
-// METRIC scalars (count/sum/min/max) were dropped from the wire format
-// (ProjectASAP/sketchlib-go#243 / asap_sketchlib#57): the total count is
-// recoverable by summing the bucket counts and the remaining aggregates
-// are carried by controller-provisioned exact aggregations.
-
-syntax = "proto3";
-
-package sketchlib.v1;
-
-// DDSketchDelta carries only the buckets that changed above threshold.
-// Bucket counts are additive. The former count/sum (tags 2-3) and
-// min/max scalars (tags 4-7) were removed from the wire format
-// (ProjectASAP/sketchlib-go#243): the count is recoverable by summing
-// the merged bucket counts; Sum/Min/Max move to exact aggregations.
-message DDSketchDelta {
-  repeated DDSketchBucketDelta buckets = 1;
-
-  // Tags 2-3 previously carried the additive count/sum deltas and tags
-  // 4-7 the lossless min/max scalars + their changed flags. Dropped from
-  // the wire format (ProjectASAP/sketchlib-go#243).
-  reserved 2, 3, 4, 5, 6, 7;
-}
-
-// DDSketchBucketDelta is the delta for one log-scale bucket.
-message DDSketchBucketDelta {
-  sint32 index   = 1;  // signed bucket index (negative for values < 1)
-  uint64 d_count = 2;  // Δcount ≥ threshold T
-}
diff --git a/crates/asap_otel_proto/proto/sketchlib_delta/hll_delta.proto b/crates/asap_otel_proto/proto/sketchlib_delta/hll_delta.proto
deleted file mode 100644
index 6e49f9c86..000000000
--- a/crates/asap_otel_proto/proto/sketchlib_delta/hll_delta.proto
+++ /dev/null
@@ -1,17 +0,0 @@
-// hll_delta.proto — Delta wire format for HLL.
-//
-// The increased registers are varint-packed as (index_delta, value) pairs in
-// ascending index order (index_delta from the previous index, starting at 0) —
-// the same layout the full sparse register state uses. HLL applies a delta with
-// max semantics: registers[idx] = max(registers[idx], value).
-//
-// No threshold is meaningful for HLL — any skipped register update causes
-// permanent underestimation.
-
-syntax = "proto3";
-
-package sketchlib.v1;
-
-message HLLDelta {
-  bytes packed_updates = 1;
-}
diff --git a/crates/asap_otel_proto/src/lib.rs b/crates/asap_otel_proto/src/lib.rs
deleted file mode 100644
index 400d3099f..000000000
--- a/crates/asap_otel_proto/src/lib.rs
+++ /dev/null
@@ -1,63 +0,0 @@
-//! Vendored Rust bindings for DataCollector's modified OTLP proto.
-//!
-//! Adds first-class `DDSketch`, `KLLSketch`, `CountSketch`, `CountMinSketch`,
-//! and `HLLSketch` variants to the `Metric.data` oneof on tags 13–17, plus
-//! per-sketch encoding enums (with full and `*_DELTA` variants) and a
-//! `series_id` field on every data point. See
-//! `docs/pipeline-query-catalog.md` §5.4 in the DataCollector repo for the
-//! full motivation and the corresponding upstream proto path.
-//!
-//! The generated Rust modules mirror `opentelemetry_proto::tonic::*` so call
-//! sites only need to swap `opentelemetry_proto` for `asap_otel_proto`.
-
-#![allow(clippy::all)]
-
-pub mod tonic {
-    pub mod common {
-        pub mod v1 {
-            tonic::include_proto!("opentelemetry.proto.common.v1");
-        }
-    }
-
-    pub mod resource {
-        pub mod v1 {
-            tonic::include_proto!("opentelemetry.proto.resource.v1");
-        }
-    }
-
-    pub mod metrics {
-        pub mod v1 {
-            tonic::include_proto!("opentelemetry.proto.metrics.v1");
-        }
-    }
-
-    pub mod collector {
-        pub mod metrics {
-            pub mod v1 {
-                tonic::include_proto!("opentelemetry.proto.collector.metrics.v1");
-            }
-        }
-    }
-}
-
-/// Delta wire-format types for DDSketch + HLL, kept separate from the
-/// main `tonic` tree because they live in `sketchlib.v1` (not
-/// `opentelemetry.proto.*`). Vendored locally until the upstream
-/// `asap_sketchlib` crate picks up the same proto definitions — see
-/// `proto/sketchlib_delta/*.proto` for the file headers that explain
-/// why the local copy exists.
-pub mod sketchlib {
-    pub mod v1 {
-        tonic::include_proto!("sketchlib.v1");
-    }
-}
-
-/// Continuous distributed monitoring (CDM) edge↔coordinator reverse channel.
-/// Generated from `proto/monitor/monitor.proto` with both server (coordinator,
-/// in `data_plane`) and client (edge sim / tests) stubs. See the .proto header
-/// for the protocol; the Go edge runtime vendors a byte-identical copy.
-pub mod monitor {
-    pub mod v1 {
-        tonic::include_proto!("asap.monitor.v1");
-    }
-}
diff --git a/crates/asap_otel_proto/tests/coupling_wire_compat.rs b/crates/asap_otel_proto/tests/coupling_wire_compat.rs
deleted file mode 100644
index d585a34ba..000000000
--- a/crates/asap_otel_proto/tests/coupling_wire_compat.rs
+++ /dev/null
@@ -1,64 +0,0 @@
-//! Cross-language wire-compat gate for the dynamic coordinator<->sampling
-//! coupling fields: bytes are emitted by the Go edge
-//! (asap-precompute-go/monitor/grpcclient/monitorpb TestCouplingFixture) and
-//! MUST decode field-for-field here via prost — proving SlackGrant.sample_p
-//! (coord->edge) and MonitorReport.rate (edge->coord) cross the wire.
-use asap_otel_proto::monitor::v1::{coord_to_edge, edge_to_coord, CoordToEdge, EdgeToCoord};
-use prost::Message;
-
-fn unhex(s: &str) -> Vec<u8> {
-    (0..s.len())
-        .step_by(2)
-        .map(|i| u8::from_str_radix(&s[i..i + 2], 16).unwrap())
-        .collect()
-}
-
-#[test]
-fn go_grant_sample_p_decodes_in_rust() {
-    let bytes = unhex("0a1d082a1807210000000000000c402880d095ffbc3131000000000000d03f");
-    let env = CoordToEdge::decode(&bytes[..]).expect("decode CoordToEdge");
-    match env.msg.expect("msg") {
-        coord_to_edge::Msg::Grant(g) => {
-            assert_eq!(g.agg_id, 42);
-            assert_eq!(g.round, 7);
-            assert!((g.sample_p - 0.25).abs() < 1e-12, "sample_p={}", g.sample_p);
-        }
-        other => panic!("expected Grant, got {:?}", other),
-    }
-}
-
-#[test]
-fn go_report_rate_decodes_in_rust() {
-    let bytes = unhex("12200a06656467652d37102a2900000000004a934030033809410000000000c09240");
-    let env = EdgeToCoord::decode(&bytes[..]).expect("decode EdgeToCoord");
-    match env.msg.expect("msg") {
-        edge_to_coord::Msg::Report(r) => {
-            assert_eq!(r.edge_id, "edge-7");
-            assert_eq!(r.agg_id, 42);
-            assert!((r.rate - 1200.0).abs() < 1e-9, "rate={}", r.rate);
-        }
-        other => panic!("expected Report, got {:?}", other),
-    }
-}
-
-#[test]
-fn rust_grant_sample_p_emit_for_go() {
-    // The REAL coord->edge direction: Rust(prost) encodes a grant; Go decodes it.
-    use asap_otel_proto::monitor::v1::SlackGrant;
-    let env = CoordToEdge {
-        msg: Some(coord_to_edge::Msg::Grant(SlackGrant {
-            agg_id: 99,
-            round: 4,
-            local_slack: 1.0,
-            window_start_ms: 1_700_000_000_000,
-            sample_p: 0.3,
-            ..Default::default()
-        })),
-    };
-    let mut buf = Vec::new();
-    env.encode(&mut buf).unwrap();
-    println!(
-        "RUST_GRANT_HEX={}",
-        buf.iter().map(|b| format!("{:02x}", b)).collect::<String>()
-    );
-}
diff --git a/crates/asap_otel_proto/tests/monitor_interop.rs b/crates/asap_otel_proto/tests/monitor_interop.rs
deleted file mode 100644
index 19ca9eb39..000000000
--- a/crates/asap_otel_proto/tests/monitor_interop.rs
+++ /dev/null
@@ -1,29 +0,0 @@
-//! Cross-language Phase-1 gate: decode the wire bytes produced by the Go edge
-//! (asap-precompute-go/monitor/grpcclient/monitorpb interop_test.go) and assert
-//! field-for-field equality. Proves the vendored Go copy and the canonical Rust
-//! proto agree on field numbers / encoding.
-use asap_otel_proto::monitor::v1::{edge_to_coord::Msg, EdgeToCoord};
-use prost::Message;
-
-#[test]
-fn decodes_go_fixture() {
-    // FIXTURE_HEX emitted by the Go TestInteropFixture.
-    let hex = "122c0a06656467652d37102a1a0c7376633d636865636b6f75742080d095ffbc312900000000004a934030033809";
-    let bytes: Vec<u8> = (0..hex.len())
-        .step_by(2)
-        .map(|i| u8::from_str_radix(&hex[i..i + 2], 16).unwrap())
-        .collect();
-
-    let env = EdgeToCoord::decode(&*bytes).expect("decode");
-    let report = match env.msg.expect("msg") {
-        Msg::Report(r) => r,
-        other => panic!("expected report, got {other:?}"),
-    };
-    assert_eq!(report.edge_id, "edge-7");
-    assert_eq!(report.agg_id, 42);
-    assert_eq!(report.key, b"svc=checkout");
-    assert_eq!(report.window_start_ms, 1_700_000_000_000);
-    assert_eq!(report.local_value, 1234.5);
-    assert_eq!(report.round, 3);
-    assert_eq!(report.seq, 9);
-}
diff --git a/crates/asap_types/Cargo.toml b/crates/asap_types/Cargo.toml
deleted file mode 100644
index d5c83ef67..000000000
--- a/crates/asap_types/Cargo.toml
+++ /dev/null
@@ -1,25 +0,0 @@
-[package]
-name = "asap_types"
-version.workspace = true
-edition.workspace = true
-
-[dependencies]
-promql-parser.workspace = true
-base64 = "0.21"
-tracing.workspace = true
-serde.workspace = true
-serde_json.workspace = true
-serde_yaml.workspace = true
-anyhow.workspace = true
-thiserror.workspace = true
-clap.workspace = true
-xxhash-rust = { version = "0.8", features = ["xxh64"] }
-sha2 = "0.10"
-
-# Use the same Planner IR as the control plane at compilation boundaries.
-planner-types.workspace = true
-
-# Accuracy metadata projects the authoritative Planner guarantees.
-asap-aware-mapping.workspace = true
-
-asap-physical-operators.workspace = true
diff --git a/crates/asap_types/src/accumulator_spec.rs b/crates/asap_types/src/accumulator_spec.rs
deleted file mode 100644
index bdf5949b4..000000000
--- a/crates/asap_types/src/accumulator_spec.rs
+++ /dev/null
@@ -1,820 +0,0 @@
-//! Validate stored materialization descriptors against Planner summary families.
-//!
-//! This projection supports catalog identity and imported state metadata. It is
-//! not an execution program. Raw and maintenance execution dispatch directly
-//! on the selected post-ASAP DAG payload; the descriptor must agree with it.
-
-use serde_json::Value;
-
-use crate::aggregation_config::PrecomputeMaterialization;
-use crate::key_by_label_names::KeyByLabelNames;
-use crate::AggregationType;
-use planner_types::post_asap::{
-    ExactKind, ExactParams, GroupingStrategy, HydraKind, HydraParams, SketchAlgorithm, SketchKind,
-    SketchParams, SummaryFamilyType,
-};
-
-/// Data_plane's typed replacement for
-/// `(aggregation_type, aggregation_sub_type, parameters)`: which
-/// accumulator to run (`kind`), with what tuning (`params`), and
-/// whether it's keyed by a group-by label set (`grouping`).
-///
-/// Computed on demand from an [`PrecomputeMaterialization`] via
-/// [`PrecomputeMaterialization::accumulator_spec`] — not stored on the config
-/// itself, so there is exactly one source of truth for the fields that
-/// feed [`crate::policy_fingerprint::PolicyFingerprint`].
-#[derive(Debug, Clone, PartialEq)]
-pub struct AccumulatorSpec {
-    /// Planner-owned committed summary identity. For sketches this is a
-    /// validated `SketchKind` (category + algorithm + params), following the
-    /// ASAP-aware-mapping vocabulary.
-    pub family: SummaryFamilyType,
-    /// Physical keyed-state layout, independent of semantic family.
-    pub grouping: Option<KeyByLabelNames>,
-}
-
-/// Typed rule for turning an input sample into an accumulator update.
-///
-/// This is execution semantics, separate from the summary family: the same
-/// CMS-with-heap state can count events, sum sample values, or sum reset-aware
-/// counter deltas. Stored descriptors encode the rule in
-/// `parameters`; callers use [`PrecomputeMaterialization::sample_update_rule`] so the
-/// runtime does not branch on ad-hoc strings.
-#[derive(Debug, Clone, Copy, PartialEq)]
-pub enum SampleUpdateRule {
-    Value { scale: f64 },
-    Count,
-    CounterDelta { scale: f64 },
-}
-
-/// The implemented raw frequency domain counts occurrences of sample values.
-pub fn is_unit_sample_frequency(update: &planner_types::post_asap::SummaryUpdate) -> bool {
-    use planner_types::post_asap::{NonNegativeWeightProof, SummaryInputExpr, WeightDomain};
-    matches!(
-        update.item,
-        Some(SummaryInputExpr::Column(
-            planner_types::pre_asap::ColumnRef::SampleValue
-        ))
-    ) && matches!(update.weight, SummaryInputExpr::Constant(1.0))
-        && matches!(
-            update.weight_domain,
-            WeightDomain::NonNegative {
-                proof: NonNegativeWeightProof::UnitCount
-            }
-        )
-}
-
-/// Raw HLL hashes the scalar sample; it does not interpret it as a frequency weight.
-pub fn is_scalar_sample_value(update: &planner_types::post_asap::SummaryUpdate) -> bool {
-    update.item.is_none()
-        && matches!(
-            update.weight,
-            planner_types::post_asap::SummaryInputExpr::Column(
-                planner_types::pre_asap::ColumnRef::SampleValue
-            )
-        )
-}
-
-impl PrecomputeMaterialization {
-    pub fn sample_update_rule(&self) -> SampleUpdateRule {
-        let scale = self
-            .parameters
-            .get("weight_scale")
-            .and_then(Value::as_f64)
-            .filter(|scale| scale.is_finite() && *scale > 0.0)
-            .unwrap_or(1.0);
-        match self
-            .parameters
-            .get("weight_mode")
-            .or_else(|| self.parameters.get("topk_weight"))
-            .and_then(Value::as_str)
-            .map(str::to_ascii_lowercase)
-            .as_deref()
-        {
-            Some("count" | "frequency" | "freq") => SampleUpdateRule::Count,
-            Some("counter_delta") => SampleUpdateRule::CounterDelta { scale },
-            _ => SampleUpdateRule::Value { scale },
-        }
-    }
-}
-
-/// A storage descriptor cannot be resolved to a supported Planner family.
-#[derive(Debug, Clone, PartialEq, Eq)]
-pub enum AccumulatorSpecError {
-    /// `aggregation_type` was `SingleSubpopulation` with an
-    /// `aggregation_sub_type` string not in the recognized alias list.
-    UnknownSingleSubpopulationSubType(String),
-    /// `aggregation_type` was `MultipleSubpopulation` with an
-    /// unrecognized `aggregation_sub_type`.
-    UnknownMultipleSubpopulationSubType(String),
-    /// `aggregation_type` itself has no accumulator-dispatch mapping.
-    /// Also returned for an invalid HLL precision. A resolved family identifies
-    /// stored state; it does not imply raw-value updater support.
-    UnmappedAggregationType(AggregationType),
-}
-
-impl std::fmt::Display for AccumulatorSpecError {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        match self {
-            Self::UnknownSingleSubpopulationSubType(s) => {
-                write!(f, "Unknown SingleSubpopulation sub_type '{s}'")
-            }
-            Self::UnknownMultipleSubpopulationSubType(s) => {
-                write!(f, "Unknown MultipleSubpopulation sub_type '{s}'")
-            }
-            Self::UnmappedAggregationType(t) => write!(f, "Unknown aggregation_type '{t:?}'"),
-        }
-    }
-}
-
-impl std::error::Error for AccumulatorSpecError {}
-
-impl PrecomputeMaterialization {
-    /// Resolve this config's `(aggregation_type, aggregation_sub_type,
-    /// parameters)` triple into a typed [`AccumulatorSpec`].
-    ///
-    /// Unsupported descriptors return an error; this projection never chooses
-    /// a fallback family and cannot authorize DAG execution.
-    pub fn accumulator_spec(&self) -> Result<AccumulatorSpec, AccumulatorSpecError> {
-        use AggregationType::*;
-
-        let sub_type = self.aggregation_sub_type.as_str();
-
-        let independent_sketch = |algorithm, params| {
-            SummaryFamilyType::Sketch(
-                SketchKind::new(algorithm, params),
-                GroupingStrategy::PerSubpopulationInstance,
-            )
-        };
-        let (family, keyed) = match self.aggregation_type {
-            Sum | Count | Increase | Rate | Min | Max => (
-                self.aggregation_type.planner_exact_family().unwrap(),
-                !self.aggregated_labels.is_empty(),
-            ),
-            DatasketchesKLL => (
-                independent_sketch(
-                    SketchAlgorithm::Kll,
-                    SketchParams::Kll {
-                        k: kll_k_param(self) as u32,
-                    },
-                ),
-                false,
-            ),
-            HydraKLL => {
-                let k = kll_k_param(self) as u32;
-                (
-                    SummaryFamilyType::Sketch(
-                        SketchKind::new(SketchAlgorithm::Kll, SketchParams::Kll { k }),
-                        GroupingStrategy::SharedMultiSubpopulation {
-                            kind: HydraKind::HydraKll,
-                            params: HydraParams::HydraKll {
-                                k,
-                                shared_buckets: k,
-                            },
-                        },
-                    ),
-                    true,
-                )
-            }
-            CountMinSketch => {
-                let (row_num, col_num) = cms_params(self);
-                (
-                    independent_sketch(
-                        SketchAlgorithm::Cms,
-                        SketchParams::Cms {
-                            width: col_num as u32,
-                            depth: row_num as u32,
-                        },
-                    ),
-                    true,
-                )
-            }
-            CountMinSketchWithHeap => {
-                let (row_num, col_num) = cms_params(self);
-                let heap_size = heap_size_param(self);
-                (
-                    independent_sketch(
-                        SketchAlgorithm::CmsWithHeap,
-                        SketchParams::CmsWithHeap {
-                            width: col_num as u32,
-                            depth: row_num as u32,
-                            heap_size: heap_size as u32,
-                        },
-                    ),
-                    true,
-                )
-            }
-            CountSketch => {
-                let (row_num, col_num) = cms_params(self);
-                (
-                    independent_sketch(
-                        SketchAlgorithm::CountSketch,
-                        SketchParams::CountSketch {
-                            width: col_num as u32,
-                            depth: row_num as u32,
-                        },
-                    ),
-                    true,
-                )
-            }
-            CountSketchWithHeap => {
-                let (row_num, col_num) = cms_params(self);
-                let heap_size = heap_size_param(self);
-                (
-                    independent_sketch(
-                        SketchAlgorithm::CountSketchWithHeap,
-                        SketchParams::CountSketchWithHeap {
-                            width: col_num as u32,
-                            depth: row_num as u32,
-                            heap_size: heap_size as u32,
-                        },
-                    ),
-                    true,
-                )
-            }
-            DDSketch => (
-                independent_sketch(
-                    SketchAlgorithm::DDSketch,
-                    SketchParams::DDSketch {
-                        alpha: ddsketch_alpha_param(self),
-                    },
-                ),
-                false,
-            ),
-            UnivMon => {
-                let param =
-                    |name: &str, default: u64, max: u64| -> Result<u32, AccumulatorSpecError> {
-                        let value = self
-                            .parameters
-                            .get(name)
-                            .map_or(Some(default), |v| v.as_u64())
-                            .ok_or(AccumulatorSpecError::UnmappedAggregationType(UnivMon))?;
-                        if value == 0 || value > max {
-                            return Err(AccumulatorSpecError::UnmappedAggregationType(UnivMon));
-                        }
-                        Ok(value as u32)
-                    };
-                (
-                    independent_sketch(
-                        SketchAlgorithm::UnivMon,
-                        SketchParams::UnivMon {
-                            heap_size: param("heap_size", 32, u32::MAX as u64)?,
-                            sketch_rows: param("sketch_rows", 5, 20)?,
-                            sketch_cols: param("sketch_cols", 1024, u32::MAX as u64)?,
-                            layers: param("layers", 4, 64)? as u8,
-                        },
-                    ),
-                    false,
-                )
-            }
-            HLL => {
-                let precision = match self.parameters.get("precision") {
-                    None => 14,
-                    Some(value) => value
-                        .as_u64()
-                        .ok_or(AccumulatorSpecError::UnmappedAggregationType(HLL))?,
-                };
-                if !(4..=18).contains(&precision) {
-                    return Err(AccumulatorSpecError::UnmappedAggregationType(HLL));
-                }
-                (
-                    independent_sketch(
-                        SketchAlgorithm::Hll,
-                        SketchParams::Hll {
-                            precision: precision as u8,
-                        },
-                    ),
-                    false,
-                )
-            }
-            SingleSubpopulation => match sub_type {
-                "Sum" | "sum" => (
-                    SummaryFamilyType::ExactAggregate(ExactKind::Sum, ExactParams::Sum),
-                    false,
-                ),
-                "Min" | "min" => (
-                    SummaryFamilyType::ExactAggregate(ExactKind::Min, ExactParams::Min),
-                    false,
-                ),
-                "Max" | "max" => (
-                    SummaryFamilyType::ExactAggregate(ExactKind::Max, ExactParams::Max),
-                    false,
-                ),
-                "Increase" | "increase" => (
-                    SummaryFamilyType::ExactAggregate(ExactKind::Increase, ExactParams::Increase),
-                    false,
-                ),
-                "DatasketchesKLL" | "datasketches_kll" | "KLL" | "kll" => (
-                    independent_sketch(
-                        SketchAlgorithm::Kll,
-                        SketchParams::Kll {
-                            k: kll_k_param(self) as u32,
-                        },
-                    ),
-                    false,
-                ),
-                other => {
-                    return Err(AccumulatorSpecError::UnknownSingleSubpopulationSubType(
-                        other.to_string(),
-                    ))
-                }
-            },
-            MultipleSubpopulation => match sub_type {
-                "Sum" | "sum" => (
-                    SummaryFamilyType::ExactAggregate(ExactKind::Sum, ExactParams::Sum),
-                    true,
-                ),
-                "Min" | "min" => (
-                    SummaryFamilyType::ExactAggregate(ExactKind::Min, ExactParams::Min),
-                    true,
-                ),
-                "Max" | "max" => (
-                    SummaryFamilyType::ExactAggregate(ExactKind::Max, ExactParams::Max),
-                    true,
-                ),
-                "Increase" | "increase" => (
-                    SummaryFamilyType::ExactAggregate(ExactKind::Increase, ExactParams::Increase),
-                    true,
-                ),
-                "CountMinSketch" | "count_min_sketch" | "CMS" | "cms" => {
-                    let (row_num, col_num) = cms_params(self);
-                    (
-                        independent_sketch(
-                            SketchAlgorithm::Cms,
-                            SketchParams::Cms {
-                                width: col_num as u32,
-                                depth: row_num as u32,
-                            },
-                        ),
-                        true,
-                    )
-                }
-                "HydraKLL" | "hydra_kll" => (
-                    independent_sketch(
-                        SketchAlgorithm::Kll,
-                        SketchParams::Kll {
-                            k: kll_k_param(self) as u32,
-                        },
-                    ),
-                    true,
-                ),
-                other => {
-                    return Err(AccumulatorSpecError::UnknownMultipleSubpopulationSubType(
-                        other.to_string(),
-                    ))
-                }
-            },
-        };
-
-        let grouping = if keyed {
-            Some(self.grouping_labels.label_names())
-        } else {
-            None
-        };
-
-        Ok(AccumulatorSpec { family, grouping })
-    }
-}
-
-// ---------------------------------------------------------------------------
-// Raw-parameter extraction helpers.
-//
-// Relocated verbatim from `data_plane::precompute_engine::accumulator_factory`
-// (same names, same behavior, same defaults) — this is now their one
-// definition; `accumulator_factory.rs` re-exports them via `use` so its
-// existing unit tests (`cms_params_reads_canonical_w_d_keys`,
-// `test_kll_k_param_capital_k`, ...) keep passing unchanged.
-// ---------------------------------------------------------------------------
-
-/// Extract the KLL `k` parameter. Capital `"K"` takes precedence over
-/// lowercase `"k"` to match the convention used by the top-level
-/// aggregation type arms. Defaults to 200.
-pub fn kll_k_param(config: &PrecomputeMaterialization) -> u16 {
-    config
-        .parameters
-        .get("K")
-        .or_else(|| config.parameters.get("k"))
-        .and_then(|v| v.as_u64())
-        .and_then(|v| u16::try_from(v).ok())
-        .unwrap_or(200)
-}
-
-/// Extract `(row_num, col_num)` for CMS / HydraKLL configs.
-///
-/// Reads canonical `d` (depth = rows) / `w` (width = cols) keys —
-/// matches what the control plane's `sketch_params_to_json` emits and
-/// what `sketch_config_to_params` uses for OTLP policy_fp content
-/// matching. Defaults to `(4, 1000)`.
-pub fn cms_params(config: &PrecomputeMaterialization) -> (usize, usize) {
-    let row_num = config
-        .parameters
-        .get("d")
-        .and_then(|v| v.as_u64())
-        .unwrap_or(4) as usize;
-    let col_num = config
-        .parameters
-        .get("w")
-        .and_then(|v| v.as_u64())
-        .unwrap_or(1000) as usize;
-    (row_num, col_num)
-}
-
-/// Top-k heap size for the `*WithHeap` configs. Reads `heap_size` / `k`
-/// from `parameters`; defaults to 20 (the heap holds the top-k
-/// candidates — it must be >= the largest `k` a query asks for).
-pub fn heap_size_param(config: &PrecomputeMaterialization) -> usize {
-    config
-        .parameters
-        .get("heap_size")
-        .or_else(|| config.parameters.get("k"))
-        .or_else(|| config.parameters.get("K"))
-        .and_then(|v| v.as_u64())
-        .map(|v| v as usize)
-        .filter(|&v| v > 0)
-        .unwrap_or(20)
-}
-
-/// Pull `relativeAccuracy` (or canonical aliases) out of a
-/// streaming-config aggregation entry. Defaults to 0.01 (1% rel-err,
-/// the same default the agent's `ddsketchprocessor` uses).
-pub fn ddsketch_alpha_param(config: &PrecomputeMaterialization) -> f64 {
-    let parsed = param_f64(config, "relativeAccuracy")
-        .or_else(|| param_f64(config, "relative_accuracy"))
-        .or_else(|| param_f64(config, "alpha"))
-        .unwrap_or(0.01);
-    if parsed > 0.0 && parsed < 1.0 {
-        parsed
-    } else {
-        tracing::warn!(
-            "DDSketch relativeAccuracy {} out of (0,1); using default 0.01",
-            parsed
-        );
-        0.01
-    }
-}
-
-fn param_f64(config: &PrecomputeMaterialization, key: &str) -> Option<f64> {
-    config.parameters.get(key).and_then(Value::as_f64)
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use crate::enums::WindowKind;
-    use crate::key_by_label_names::KeyByLabelNames;
-    use std::collections::HashMap;
-
-    fn assert_exact(spec: &AccumulatorSpec, expected: ExactKind) {
-        assert!(matches!(
-            &spec.family,
-            SummaryFamilyType::ExactAggregate(kind, _) if kind == &expected
-        ));
-    }
-
-    fn assert_sketch(
-        spec: &AccumulatorSpec,
-        expected_algorithm: planner_types::post_asap::SketchAlgorithm,
-        expected_params: planner_types::post_asap::SketchParams,
-    ) {
-        match &spec.family {
-            SummaryFamilyType::Sketch(kind, _) => {
-                assert_eq!(kind.algorithm(), &expected_algorithm);
-                assert_eq!(kind.params(), &expected_params);
-            }
-            other => panic!("expected sketch family, got {other:?}"),
-        }
-    }
-
-    #[allow(clippy::too_many_arguments)]
-    fn make_config(
-        agg_type: AggregationType,
-        sub_type: &str,
-        params: HashMap<String, Value>,
-        grouping_labels: Vec<&str>,
-    ) -> PrecomputeMaterialization {
-        PrecomputeMaterialization::new(
-            agg_type,
-            sub_type.to_string(),
-            params,
-            KeyByLabelNames::new(grouping_labels.into_iter().map(|s| s.to_string()).collect()),
-            KeyByLabelNames::empty(),
-            KeyByLabelNames::empty(),
-            String::new(),
-            60,
-            60,
-            WindowKind::Tumbling,
-            String::new(),
-            "m".to_string(),
-            None,
-            None,
-            None,
-        )
-    }
-
-    // ---- direct (non-wrapper) variants ------------------------------
-
-    #[test]
-    fn sum_is_unkeyed_sum() {
-        let cfg = make_config(AggregationType::Sum, "", HashMap::new(), vec![]);
-        let spec = cfg.accumulator_spec().expect("resolves");
-        assert_exact(&spec, ExactKind::Sum);
-        assert!(spec.grouping.is_none());
-    }
-
-    #[test]
-    fn keyed_layout_preserves_sum_family() {
-        let mut cfg = make_config(AggregationType::Sum, "", HashMap::new(), vec!["zone"]);
-        cfg.aggregated_labels = KeyByLabelNames::new(vec!["host".into()]);
-        let spec = cfg.accumulator_spec().expect("resolves");
-        assert_exact(&spec, ExactKind::Sum);
-        assert_eq!(
-            spec.grouping,
-            Some(KeyByLabelNames::new(vec!["zone".to_string()]))
-        );
-    }
-
-    #[test]
-    fn datasketches_kll_reads_k_param() {
-        let mut params = HashMap::new();
-        params.insert("k".to_string(), serde_json::json!(128));
-        let cfg = make_config(AggregationType::DatasketchesKLL, "", params, vec![]);
-        let spec = cfg.accumulator_spec().expect("resolves");
-        assert_sketch(
-            &spec,
-            planner_types::post_asap::SketchAlgorithm::Kll,
-            planner_types::post_asap::SketchParams::Kll { k: 128 },
-        );
-        assert!(spec.grouping.is_none());
-    }
-
-    #[test]
-    fn hydra_kll_is_keyed_kll() {
-        let mut params = HashMap::new();
-        params.insert("k".to_string(), serde_json::json!(64));
-        let cfg = make_config(AggregationType::HydraKLL, "", params, vec!["host"]);
-        let spec = cfg.accumulator_spec().expect("resolves");
-        assert_sketch(
-            &spec,
-            planner_types::post_asap::SketchAlgorithm::Kll,
-            planner_types::post_asap::SketchParams::Kll { k: 64 },
-        );
-        assert!(spec.grouping.is_some());
-    }
-
-    #[test]
-    fn count_min_sketch_maps_to_cms_params() {
-        let mut params = HashMap::new();
-        params.insert("d".to_string(), serde_json::json!(7));
-        params.insert("w".to_string(), serde_json::json!(2048));
-        let cfg = make_config(AggregationType::CountMinSketch, "", params, vec!["host"]);
-        let spec = cfg.accumulator_spec().expect("resolves");
-        assert_sketch(
-            &spec,
-            planner_types::post_asap::SketchAlgorithm::Cms,
-            planner_types::post_asap::SketchParams::Cms {
-                width: 2048,
-                depth: 7,
-            },
-        );
-        assert!(spec.grouping.is_some());
-    }
-
-    #[test]
-    fn count_min_sketch_with_heap_maps_to_cms_with_heap_params() {
-        let mut params = HashMap::new();
-        params.insert("d".to_string(), serde_json::json!(4));
-        params.insert("w".to_string(), serde_json::json!(256));
-        params.insert("heap_size".to_string(), serde_json::json!(8));
-        let cfg = make_config(
-            AggregationType::CountMinSketchWithHeap,
-            "",
-            params,
-            vec!["host"],
-        );
-        let spec = cfg.accumulator_spec().expect("resolves");
-        assert_sketch(
-            &spec,
-            planner_types::post_asap::SketchAlgorithm::CmsWithHeap,
-            planner_types::post_asap::SketchParams::CmsWithHeap {
-                width: 256,
-                depth: 4,
-                heap_size: 8,
-            },
-        );
-    }
-
-    /// Documented existing quirk (see `accumulator_factory.rs`): bare
-    /// `CountSketch` gets its own `SketchAlgorithm` identity here, but
-    /// `accumulator_factory` routes it through the same
-    /// `CmsAccumulatorUpdater` as bare CMS — no dedicated heap-less
-    /// Count-Sketch accumulator exists. This test locks in the *identity*
-    /// resolution only; the shared-accumulator behavior is exercised in
-    /// `accumulator_factory.rs`'s own tests.
-    #[test]
-    fn count_sketch_gets_its_own_kind_identity() {
-        let cfg = make_config(AggregationType::CountSketch, "", HashMap::new(), vec!["h"]);
-        let spec = cfg.accumulator_spec().expect("resolves");
-        assert!(matches!(
-            &spec.family,
-            SummaryFamilyType::Sketch(kind, _)
-                if kind.algorithm() == &planner_types::post_asap::SketchAlgorithm::CountSketch
-        ));
-    }
-
-    #[test]
-    fn ddsketch_reads_relative_accuracy_alpha() {
-        let mut params = HashMap::new();
-        params.insert("relativeAccuracy".to_string(), serde_json::json!(0.02));
-        let cfg = make_config(AggregationType::DDSketch, "", params, vec![]);
-        let spec = cfg.accumulator_spec().expect("resolves");
-        assert_sketch(
-            &spec,
-            planner_types::post_asap::SketchAlgorithm::DDSketch,
-            planner_types::post_asap::SketchParams::DDSketch { alpha: 0.02 },
-        );
-        assert!(spec.grouping.is_none());
-    }
-
-    #[test]
-    fn hll_has_catalog_identity_for_sketch_envelope_ingest() {
-        let cfg = make_config(AggregationType::HLL, "", HashMap::new(), vec![]);
-        let spec = cfg.accumulator_spec().unwrap();
-        assert_sketch(
-            &spec,
-            SketchAlgorithm::Hll,
-            SketchParams::Hll { precision: 14 },
-        );
-        for precision in [
-            serde_json::json!(3),
-            serde_json::json!(19),
-            serde_json::json!(4.5),
-            serde_json::json!("bad"),
-        ] {
-            let cfg = make_config(
-                AggregationType::HLL,
-                "",
-                HashMap::from([("precision".into(), precision)]),
-                vec![],
-            );
-            assert!(cfg.accumulator_spec().is_err());
-        }
-    }
-
-    // ---- wrapper (Single/MultipleSubpopulation) variants ------------
-
-    #[test]
-    fn single_subpopulation_sum_alias() {
-        for alias in ["Sum", "sum"] {
-            let cfg = make_config(
-                AggregationType::SingleSubpopulation,
-                alias,
-                HashMap::new(),
-                vec![],
-            );
-            let spec = cfg.accumulator_spec().expect("resolves");
-            assert_exact(&spec, ExactKind::Sum);
-            assert!(spec.grouping.is_none());
-        }
-    }
-
-    #[test]
-    fn multiple_subpopulation_cms_alias() {
-        for alias in ["CountMinSketch", "count_min_sketch", "CMS", "cms"] {
-            let cfg = make_config(
-                AggregationType::MultipleSubpopulation,
-                alias,
-                HashMap::new(),
-                vec!["host"],
-            );
-            let spec = cfg.accumulator_spec().expect("resolves");
-            assert!(matches!(
-                &spec.family,
-                SummaryFamilyType::Sketch(kind, _)
-                    if kind.algorithm() == &planner_types::post_asap::SketchAlgorithm::Cms
-            ));
-            assert!(spec.grouping.is_some());
-        }
-    }
-
-    #[test]
-    fn multiple_subpopulation_hydra_kll_alias() {
-        for alias in ["HydraKLL", "hydra_kll"] {
-            let cfg = make_config(
-                AggregationType::MultipleSubpopulation,
-                alias,
-                HashMap::new(),
-                vec!["host"],
-            );
-            let spec = cfg.accumulator_spec().expect("resolves");
-            assert!(matches!(
-                &spec.family,
-                SummaryFamilyType::Sketch(kind, _)
-                    if kind.algorithm() == &planner_types::post_asap::SketchAlgorithm::Kll
-            ));
-            assert!(spec.grouping.is_some());
-        }
-    }
-
-    #[test]
-    fn unknown_single_subpopulation_sub_type_errors() {
-        let cfg = make_config(
-            AggregationType::SingleSubpopulation,
-            "Bogus",
-            HashMap::new(),
-            vec![],
-        );
-        let err = cfg.accumulator_spec().expect_err("unknown sub_type");
-        assert_eq!(
-            err,
-            AccumulatorSpecError::UnknownSingleSubpopulationSubType("Bogus".to_string())
-        );
-    }
-
-    #[test]
-    fn unknown_multiple_subpopulation_sub_type_errors() {
-        let cfg = make_config(
-            AggregationType::MultipleSubpopulation,
-            "Bogus",
-            HashMap::new(),
-            vec!["host"],
-        );
-        let err = cfg.accumulator_spec().expect_err("unknown sub_type");
-        assert_eq!(
-            err,
-            AccumulatorSpecError::UnknownMultipleSubpopulationSubType("Bogus".to_string())
-        );
-    }
-
-    #[test]
-    fn error_display_matches_pre_step5_warning_text() {
-        assert_eq!(
-            AccumulatorSpecError::UnknownSingleSubpopulationSubType("Bogus".to_string())
-                .to_string(),
-            "Unknown SingleSubpopulation sub_type 'Bogus'"
-        );
-        assert_eq!(
-            AccumulatorSpecError::UnknownMultipleSubpopulationSubType("Bogus".to_string())
-                .to_string(),
-            "Unknown MultipleSubpopulation sub_type 'Bogus'"
-        );
-        assert_eq!(
-            AccumulatorSpecError::UnmappedAggregationType(AggregationType::HLL).to_string(),
-            "Unknown aggregation_type 'HLL'"
-        );
-    }
-
-    #[test]
-    fn sample_update_rule_decodes_legacy_parameters_once() {
-        let mut parameters = HashMap::new();
-        parameters.insert("weight_mode".into(), Value::String("counter_delta".into()));
-        parameters.insert("weight_scale".into(), Value::from(1_000_000.0));
-        let counter = make_config(
-            AggregationType::CountMinSketchWithHeap,
-            "",
-            parameters,
-            vec![],
-        );
-        assert_eq!(
-            counter.sample_update_rule(),
-            SampleUpdateRule::CounterDelta { scale: 1_000_000.0 }
-        );
-
-        let mut count_parameters = HashMap::new();
-        count_parameters.insert("topk_weight".into(), Value::String("frequency".into()));
-        let count = make_config(
-            AggregationType::CountSketchWithHeap,
-            "",
-            count_parameters,
-            vec![],
-        );
-        assert_eq!(count.sample_update_rule(), SampleUpdateRule::Count);
-    }
-
-    // ---- PolicyFingerprint stability guard ---------------------------
-
-    /// `accumulator_spec()` must be a pure, additional *read* of
-    /// `PrecomputeMaterialization` — it must not change what
-    /// `PolicyFingerprint::from_config` hashes. This locks in a fixed
-    /// fingerprint for a fixed config as a tripwire: if this test ever
-    /// needs its expected constant updated, `policy_fingerprint.rs`
-    /// changed in a way that breaks on-disk sid compatibility, which is
-    /// exactly what Step 5 was required not to do.
-    #[test]
-    fn accumulator_spec_does_not_perturb_policy_fingerprint() {
-        let cfg = make_config(AggregationType::DDSketch, "", HashMap::new(), vec![]);
-        let fp_before = cfg.policy_fp_u64();
-        let _ = cfg.accumulator_spec(); // takes &self — must not mutate `cfg`
-        let fp_after = cfg.policy_fp_u64();
-        assert_eq!(
-            fp_before, fp_after,
-            "calling accumulator_spec() must not change the fingerprint \
-             PolicyFingerprint::from_config computes from this config"
-        );
-
-        // An independently-built config with identical content must
-        // still agree — proves accumulator_spec() reads, never writes,
-        // the fields PolicyFingerprint::from_config hashes.
-        let cfg2 = make_config(AggregationType::DDSketch, "", HashMap::new(), vec![]);
-        assert_eq!(fp_after, cfg2.policy_fp_u64());
-    }
-}
diff --git a/crates/asap_types/src/accuracy.rs b/crates/asap_types/src/accuracy.rs
deleted file mode 100644
index 723fa5cd8..000000000
--- a/crates/asap_types/src/accuracy.rs
+++ /dev/null
@@ -1,123 +0,0 @@
-//! Accuracy wire metadata projected from ASAPPlanner guarantees.
-//! Formula ownership stays in ASAPPlanner; unknown confidence remains explicit.
-
-use serde::{Deserialize, Serialize};
-
-/// Interpretation of the reported epsilon; serialized identically across planners and serving.
-#[derive(Debug, Clone, Copy, PartialEq, Eq, Serialize, Deserialize)]
-#[serde(rename_all = "snake_case")]
-pub enum AccuracyKind {
-    Uncalibrated,
-    Exact,
-    AdditiveFrequency,
-    RelativeCardinality,
-    RankQuantile,
-    RelativeQuantile,
-    TopK,
-}
-
-impl AccuracyKind {
-    pub fn as_str(self) -> &'static str {
-        match self {
-            Self::Uncalibrated => "uncalibrated",
-            Self::Exact => "exact",
-            Self::AdditiveFrequency => "additive_frequency",
-            Self::RelativeCardinality => "relative_cardinality",
-            Self::RankQuantile => "rank_quantile",
-            Self::RelativeQuantile => "relative_quantile",
-            Self::TopK => "top_k",
-        }
-    }
-}
-
-/// Accuracy metadata shared by planning and serving.
-#[derive(Debug, Clone, Copy, PartialEq, Serialize, Deserialize)]
-pub struct AccuracyProfile {
-    pub epsilon: f64,
-    /// Failure probability; None means the planner cannot establish it.
-    pub delta: Option<f64>,
-    pub kind: AccuracyKind,
-}
-
-impl AccuracyProfile {
-    /// Exact (ε = δ = 0).
-    pub fn exact() -> Self {
-        Self {
-            epsilon: 0.0,
-            delta: Some(0.0),
-            kind: AccuracyKind::Exact,
-        }
-    }
-
-    /// One-line summary for dashboards and logs.
-    pub fn summary(&self) -> String {
-        format!(
-            "accuracy: ε={}, δ={}, kind={}",
-            self.epsilon,
-            self.delta
-                .map(|value| value.to_string())
-                .unwrap_or_else(|| "unknown".into()),
-            self.kind.as_str()
-        )
-    }
-
-    /// Project the four shared family contracts without reimplementing their
-    /// error formulas. Other families keep their backend-specific adapters.
-    pub fn from_sketch_params(params: &planner_types::post_asap::SketchParams) -> Option<Self> {
-        use asap_aware_mapping::accuracy::DefaultAccuracyModel;
-        use planner_types::post_asap::{SketchAlgorithm, SketchParams, SketchQuery};
-        use planner_types::pre_asap::ColumnRef;
-        let (algorithm, query, kind) = match params {
-            SketchParams::Cms { .. } => (
-                SketchAlgorithm::Cms,
-                SketchQuery::PointCount {
-                    key: ColumnRef::SampleValue,
-                    value: None,
-                },
-                AccuracyKind::AdditiveFrequency,
-            ),
-            SketchParams::Hll { .. } => (
-                SketchAlgorithm::Hll,
-                SketchQuery::Cardinality,
-                AccuracyKind::RelativeCardinality,
-            ),
-            SketchParams::Kll { .. } => (
-                SketchAlgorithm::Kll,
-                SketchQuery::Quantile { q: 0.5 },
-                AccuracyKind::RankQuantile,
-            ),
-            SketchParams::DDSketch { .. } => (
-                SketchAlgorithm::DDSketch,
-                SketchQuery::Quantile { q: 0.5 },
-                AccuracyKind::RelativeQuantile,
-            ),
-            _ => return None,
-        };
-        let guarantee = DefaultAccuracyModel::sketch_guarantee(&algorithm, params, &query)?;
-        Some(Self {
-            epsilon: guarantee.bound.evaluate()?,
-            delta: guarantee.failure_probability.evaluate(),
-            kind,
-        })
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    #[test]
-    fn wire_contract_round_trips_with_stable_kind_name() {
-        let profile = AccuracyProfile {
-            epsilon: 0.01,
-            delta: Some(0.001),
-            kind: AccuracyKind::AdditiveFrequency,
-        };
-        let json = serde_json::to_string(&profile).unwrap();
-        assert_eq!(
-            serde_json::from_str::<AccuracyProfile>(&json).unwrap(),
-            profile
-        );
-        assert!(json.contains("additive_frequency"));
-    }
-}
diff --git a/crates/asap_types/src/aggregation_config.rs b/crates/asap_types/src/aggregation_config.rs
deleted file mode 100644
index f256d74fd..000000000
--- a/crates/asap_types/src/aggregation_config.rs
+++ /dev/null
@@ -1,792 +0,0 @@
-use serde::{Deserialize, Serialize};
-use serde_json::Value;
-use serde_yaml;
-use std::collections::HashMap;
-
-use crate::enums::{QueryLanguage, WindowKind};
-use crate::policy_fingerprint::PolicyFingerprint;
-use crate::utils::normalize_spatial_filter;
-use crate::AggregationType;
-use crate::KeyByLabelNames;
-
-/// Physical maintenance layout for one semantic windowed summary.
-///
-/// `window_size` and `slide_interval` on [`PrecomputeMaterialization`] retain
-/// the query's window and evaluation cadence. This enum describes how that
-/// semantic window is represented in storage; it must never be inferred by
-/// overloading either semantic duration.
-#[derive(Debug, Clone, Serialize, Deserialize, PartialEq, Eq, Hash)]
-#[serde(tag = "kind", rename_all = "snake_case", deny_unknown_fields)]
-pub enum WindowMaterializationLayout {
-    /// Store disjoint mergeable states and compose a query window at read time.
-    Pane { pane_secs: u64 },
-    /// Maintain one complete state for every evaluation point.
-    FullWindow,
-    /// Store base panes plus coarser mergeable rollups. Every level is a
-    /// duration in seconds and is an integer multiple of its predecessor.
-    HierarchicalRollup {
-        base_pane_secs: u64,
-        levels_secs: Vec<u64>,
-    },
-}
-
-impl WindowMaterializationLayout {
-    pub fn base_pane_secs(&self) -> u64 {
-        match self {
-            Self::Pane { pane_secs } => *pane_secs,
-            Self::FullWindow => 0,
-            Self::HierarchicalRollup { base_pane_secs, .. } => *base_pane_secs,
-        }
-    }
-
-    pub fn validate(&self, window_secs: u64, slide_secs: u64) -> Result<(), String> {
-        if window_secs == 0 || slide_secs == 0 {
-            return Err("window and slide must be positive".into());
-        }
-        match self {
-            Self::Pane { pane_secs } => {
-                if *pane_secs == 0
-                    || !window_secs.is_multiple_of(*pane_secs)
-                    || !slide_secs.is_multiple_of(*pane_secs)
-                {
-                    return Err("pane size must divide both window size and slide".into());
-                }
-            }
-            Self::FullWindow => {}
-            Self::HierarchicalRollup {
-                base_pane_secs,
-                levels_secs,
-            } => {
-                if *base_pane_secs == 0
-                    || !window_secs.is_multiple_of(*base_pane_secs)
-                    || !slide_secs.is_multiple_of(*base_pane_secs)
-                    || levels_secs.is_empty()
-                {
-                    return Err(
-                        "rollup base pane must divide window and slide, with at least one level"
-                            .into(),
-                    );
-                }
-                let mut previous = *base_pane_secs;
-                for level in levels_secs {
-                    if *level <= previous
-                        || *level % previous != 0
-                        || !window_secs.is_multiple_of(*level)
-                    {
-                        return Err(
-                            "rollup levels must increase by integral factors and divide the window"
-                                .into(),
-                        );
-                    }
-                    previous = *level;
-                }
-            }
-        }
-        Ok(())
-    }
-}
-
-/// Physical materialization metadata with content-derived identity.
-/// This descriptor cannot authorize execution: the enclosing PrecomputePlan
-/// must bind it to a compatible Planner DAG producer.
-#[derive(Debug, Clone, Serialize, Deserialize)]
-#[serde(deny_unknown_fields)]
-pub struct PrecomputeMaterialization {
-    /// Explicit deployment output allocation; independent of semantic identity.
-    #[serde(default, skip_serializing_if = "Option::is_none")]
-    pub stored_output_id: Option<crate::sds::StoredOutputId>,
-    /// Planner-selected dependency closure ending at the persisted output.
-    #[serde(default, skip_serializing_if = "Option::is_none")]
-    pub semantic_fragment: Option<crate::semantic_fragment::SemanticFragment>,
-    pub aggregation_type: AggregationType,
-    pub aggregation_sub_type: String,
-    pub parameters: HashMap<String, Value>,
-    #[serde(serialize_with = "crate::grouping_projection::serialize_config_grouping")]
-    pub grouping_labels: crate::GroupingProjection,
-    #[serde(
-        default,
-        skip_serializing_if = "crate::grouping_projection::PopulationKeyEncoding::is_legacy"
-    )]
-    pub population_key_encoding: crate::grouping_projection::PopulationKeyEncoding,
-    #[serde(default, skip_serializing_if = "Option::is_none")]
-    pub partitioning: Option<crate::sds::PopulationPartitioning>,
-    #[serde(default, skip_serializing_if = "Option::is_none")]
-    pub derived_input: Option<crate::derived_input::DerivedInputIdentity>,
-    pub aggregated_labels: KeyByLabelNames,
-    pub rollup_labels: KeyByLabelNames,
-    pub original_yaml: String,
-
-    pub window_size: u64,        // Window size in seconds (e.g., 900s for 15m)
-    pub slide_interval: u64,     // Slide/hop interval in seconds (e.g., 30s)
-    pub window_type: WindowKind, // Tumbling or Sliding
-    pub window_layout: WindowMaterializationLayout,
-    /// Unix millisecond timestamp on the pane-boundary grid selected from
-    /// the consuming query workload. An absent origin cannot authorize certified
-    /// pane-only reads.
-    #[serde(default, skip_serializing_if = "Option::is_none")]
-    pub pane_origin_ms: Option<i64>,
-
-    pub spatial_filter: String,
-    pub spatial_filter_normalized: String,
-    pub metric: String, // PromQL mode: metric name; SQL mode: derived from table_name.value_column
-    pub num_aggregates_to_retain: Option<u64>,
-
-    // SQL-specific fields (optional, used when query_language=sql)
-    pub table_name: Option<String>, // SQL mode: table name
-    #[serde(default)]
-    pub value_projection: Option<crate::sds::ValueProjectionIdentity>,
-    /// Table timestamp projection, in Unix milliseconds.
-    #[serde(default, skip_serializing_if = "Option::is_none")]
-    pub table_timestamp_column: Option<String>,
-    #[serde(default, skip_serializing_if = "Option::is_none")]
-    pub table_population: Option<crate::table_population::TablePopulation>,
-    /// Producer typing for a SQL table value projection: the source column's
-    /// declared type and nullability.
-    ///
-    /// **Why this is separate from [`Self::value_projection`]**: the
-    /// projection is the materialization's *identity* — which column or
-    /// constant is summarised, and part of the policy fingerprint. This is how
-    /// the ingest path must *read* that column, which the identity does not
-    /// determine: an integer column needs an exactness guard on its way into
-    /// f64 summary state, and a nullable column needs SQL's "aggregates skip
-    /// NULL" rule reproduced at the reader rather than a decode failure on the
-    /// first NULL row. Two materializations over the same column are the same
-    /// policy either way, so this deliberately stays out of the fingerprint.
-    ///
-    /// `None` ⇒ PromQL-mode materializations and legacy SQL definitions, which
-    /// keep the pre-typed behaviour (read the column as it comes).
-    #[serde(default, skip_serializing_if = "Option::is_none")]
-    pub value_source_column: Option<planner_types::pre_asap::Column>,
-}
-
-/// Policy-match handles for both the key and value dimensions of a
-/// query. For single-population queries, key and value share the same
-/// fingerprint and type. For multi-population queries (e.g. Topk), they
-/// differ.
-///
-/// **PR 5**: the `aggregation_id_for_*: u64` fields now carry the
-/// `PolicyFingerprint::as_u64()` form of the matched config, NOT a
-/// controller-allocated id. Callers that need typed identity can call
-/// [`AggregationIdInfo::policy_fp_for_key`] /
-/// [`AggregationIdInfo::policy_fp_for_value`].
-#[derive(Debug, Clone)]
-pub struct AggregationIdInfo {
-    /// `PolicyFingerprint::as_u64()` of the key aggregation's config.
-    pub key_policy_fingerprint: u64,
-    /// `PolicyFingerprint::as_u64()` of the value aggregation's config.
-    pub value_policy_fingerprint: u64,
-    pub aggregation_type_for_key: AggregationType,
-    pub aggregation_type_for_value: AggregationType,
-}
-
-impl AggregationIdInfo {}
-
-impl PrecomputeMaterialization {
-    pub fn effective_value_projection(&self) -> &crate::sds::ValueProjectionIdentity {
-        self.value_projection
-            .as_ref()
-            .unwrap_or(&crate::sds::ValueProjectionIdentity::SampleValue)
-    }
-
-    /// Temporal extent of one stored base state, independent of emission cadence.
-    pub fn stored_window_ms(&self) -> u64 {
-        match &self.window_layout {
-            WindowMaterializationLayout::FullWindow => self.window_size,
-            layout => layout.base_pane_secs(),
-        }
-        .saturating_mul(1_000)
-    }
-
-    pub fn source_identity(&self) -> crate::sds::DataSourceIdentity {
-        use crate::sds::DataSourceIdentity;
-        if let Some(input) = &self.derived_input {
-            DataSourceIdentity::Derived {
-                input: input.clone(),
-            }
-        } else if let Some(table_ref) = &self.table_name {
-            DataSourceIdentity::Table {
-                table_ref: table_ref.clone(),
-            }
-        } else {
-            DataSourceIdentity::TimeSeries {
-                metric: self.metric.clone(),
-            }
-        }
-    }
-
-    pub fn population_filter_canonical(&self) -> Result<String, String> {
-        if let Some(input) = &self.derived_input {
-            input.validate()?;
-            if self.table_name.is_some()
-                || self.table_population.is_some()
-                || self.table_timestamp_column.is_some()
-                || !self.spatial_filter.is_empty()
-            {
-                return Err("derived inputs cannot also declare a raw source/filter".into());
-            }
-        }
-        self.effective_value_projection().validate()?;
-        if self.value_projection.is_some()
-            && self.table_name.is_none()
-            && self.derived_input.is_none()
-        {
-            return Err("explicit table value projection requires a table source".into());
-        }
-        if let Some(column) = &self.table_timestamp_column {
-            if self.table_name.is_none() || column.is_empty() {
-                return Err("table timestamp projection requires a table and a column".into());
-            }
-            crate::table_population::validate_column_name(column)?;
-        }
-        if self.table_name.is_some() && !self.spatial_filter.is_empty() {
-            return Err("table populations cannot use a PromQL label filter".into());
-        }
-        if let Some(population) = &self.table_population {
-            if self.table_name.is_none() || !self.spatial_filter.is_empty() {
-                return Err(
-                    "typed table population requires a table and no PromQL label filter".into(),
-                );
-            }
-            population.validate()?;
-            Ok(population.canonical())
-        } else {
-            Ok(normalize_spatial_filter(&self.spatial_filter))
-        }
-    }
-
-    #[allow(clippy::too_many_arguments)]
-    pub fn new(
-        aggregation_type: AggregationType,
-        aggregation_sub_type: String,
-        parameters: HashMap<String, Value>,
-        grouping_labels: impl Into<crate::GroupingProjection>,
-        aggregated_labels: KeyByLabelNames,
-        rollup_labels: KeyByLabelNames,
-        original_yaml: String,
-        window_size: u64,
-        slide_interval: u64,
-        window_type: WindowKind,
-        spatial_filter: String,
-        metric: String,
-        num_aggregates_to_retain: Option<u64>,
-        // SQL-specific fields
-        table_name: Option<String>,
-        value_column: Option<String>,
-    ) -> Self {
-        // Generate normalized spatial filter (placeholder implementation)
-        let spatial_filter_normalized = normalize_spatial_filter(&spatial_filter);
-
-        Self {
-            stored_output_id: None,
-            semantic_fragment: None,
-            aggregation_type,
-            aggregation_sub_type,
-            parameters,
-            grouping_labels: grouping_labels.into(),
-            population_key_encoding: Default::default(),
-            partitioning: None,
-            derived_input: None,
-            aggregated_labels,
-            rollup_labels,
-            original_yaml,
-            window_size,
-            slide_interval,
-            window_type,
-            window_layout: WindowMaterializationLayout::Pane {
-                pane_secs: if slide_interval == 0 {
-                    window_size
-                } else {
-                    slide_interval
-                },
-            },
-            pane_origin_ms: None,
-            spatial_filter,
-            spatial_filter_normalized,
-            metric,
-            num_aggregates_to_retain,
-            table_name,
-            value_projection: value_column
-                .map(|name| crate::sds::ValueProjectionIdentity::Column { name }),
-            table_population: None,
-            table_timestamp_column: None,
-            value_source_column: None,
-        }
-    }
-
-    /// Content-addressed identity for this config. Sugar over
-    /// [`PolicyFingerprint::from_config`].
-    pub fn policy_fingerprint(&self) -> PolicyFingerprint {
-        PolicyFingerprint::from_config(self)
-    }
-
-    /// `PolicyFingerprint::as_u64()` — the u64-form handle used by the
-    /// policy-fingerprint-keyed call sites (e.g. `InstalledPrecomputePlan`'s
-    /// `HashMap<StoredOutputId, PrecomputeMaterialization>` keys). **Always** equal to
-    /// `self.policy_fingerprint().as_u64()`. The value is content-
-    /// addressed identity, NOT a controller-allocated counter id.
-    pub fn policy_fp_u64(&self) -> u64 {
-        self.policy_fingerprint().as_u64()
-    }
-
-    pub fn from_yaml_data(
-        aggregation_data: &serde_yaml::Value,
-        num_aggregates_to_retain: Option<u64>,
-        query_language: QueryLanguage,
-    ) -> Result<Self, anyhow::Error> {
-        // `aggregationId` is silently dropped — identity is
-        // content-addressed via PolicyFingerprint (PR 5). Pre-PR-5
-        // fixtures that still spell out the field parse cleanly.
-
-        let labels = &aggregation_data["labels"];
-        let grouping_labels: crate::GroupingProjection =
-            serde_yaml::from_value(labels["grouping"].clone())?;
-        let aggregated_labels = KeyByLabelNames::new(
-            labels["aggregated"]
-                .as_sequence()
-                .ok_or_else(|| anyhow::anyhow!("Missing aggregated labels"))?
-                .iter()
-                .filter_map(|v| v.as_str())
-                .map(|s| s.to_string())
-                .collect(),
-        );
-        let rollup_labels = KeyByLabelNames::new(
-            labels["rollup"]
-                .as_sequence()
-                .ok_or_else(|| anyhow::anyhow!("Missing rollup labels"))?
-                .iter()
-                .filter_map(|v| v.as_str())
-                .map(|s| s.to_string())
-                .collect(),
-        );
-
-        let aggregation_type: AggregationType = aggregation_data["aggregationType"]
-            .as_str()
-            .ok_or_else(|| anyhow::anyhow!("Missing aggregationType"))?
-            .parse()
-            .map_err(|e: String| anyhow::anyhow!(e))?;
-
-        let aggregation_sub_type = aggregation_data["aggregationSubType"]
-            .as_str()
-            .ok_or_else(|| anyhow::anyhow!("Missing aggregationSubType"))?
-            .to_string();
-
-        // Convert serde_yaml::Value to serde_json::Value for parameters
-        let parameters: HashMap<String, Value> = aggregation_data["parameters"]
-            .as_mapping()
-            .ok_or_else(|| anyhow::anyhow!("Missing parameters"))?
-            .iter()
-            .map(|(k, v)| {
-                let key = k.as_str().unwrap_or("").to_string();
-                let value = serde_json::to_value(v).unwrap_or(Value::Null);
-                (key, value)
-            })
-            .collect();
-
-        let window_size = aggregation_data["windowSize"]
-            .as_u64()
-            .ok_or_else(|| anyhow::anyhow!("Missing windowSize"))?;
-
-        let window_type = aggregation_data
-            .get("windowType")
-            .and_then(|v| v.as_str())
-            .unwrap_or("tumbling")
-            .parse::<WindowKind>()
-            .unwrap_or_default();
-
-        let slide_interval = aggregation_data
-            .get("slideInterval")
-            .and_then(|v| v.as_u64())
-            .unwrap_or(window_size);
-
-        let pane_origin_ms = aggregation_data
-            .get("paneOriginMs")
-            .or_else(|| aggregation_data.get("pane_origin_ms"))
-            .and_then(|v| v.as_i64());
-
-        let spatial_filter = aggregation_data["spatialFilter"]
-            .as_str()
-            .unwrap_or("")
-            .to_string();
-
-        if [
-            "valueColumn",
-            "value_column",
-            "valueProjection",
-            "value_projection",
-        ]
-        .iter()
-        .filter(|key| {
-            aggregation_data
-                .get(**key)
-                .is_some_and(|value| !value.is_null())
-        })
-        .count()
-            > 1
-        {
-            return Err(anyhow::anyhow!(
-                "multiple value projection fields are not allowed"
-            ));
-        }
-        let typed_projection: Option<crate::sds::ValueProjectionIdentity> = aggregation_data
-            .get("valueProjection")
-            .or_else(|| aggregation_data.get("value_projection"))
-            .filter(|value| !value.is_null())
-            .map(|value| serde_json::to_value(value).and_then(serde_json::from_value))
-            .transpose()?;
-        let (metric, table_name, value_column) = match query_language {
-            QueryLanguage::PromQl | QueryLanguage::MetricsQl => {
-                let metric = aggregation_data["metric"]
-                    .as_str()
-                    .ok_or_else(|| {
-                        anyhow::anyhow!("Missing metric for time-series query language")
-                    })?
-                    .to_string();
-                (metric, None, None)
-            }
-            QueryLanguage::ClickHouseSql => {
-                let table = aggregation_data["tableName"]
-                    .as_str()
-                    .ok_or_else(|| anyhow::anyhow!("Missing tableName for ClickHouse SQL"))?
-                    .to_string();
-                let column = aggregation_data["valueColumn"]
-                    .as_str()
-                    .or_else(|| {
-                        typed_projection
-                            .as_ref()
-                            .and_then(|projection| projection.column())
-                    })
-                    .map(str::to_owned);
-                if column.is_none() && typed_projection.is_none() {
-                    return Err(anyhow::anyhow!(
-                        "Missing value projection for ClickHouse SQL"
-                    ));
-                }
-                (
-                    format!("{table}.{}", column.as_deref().unwrap_or("constant")),
-                    Some(table),
-                    column,
-                )
-            }
-        };
-
-        let mut config = Self::new(
-            aggregation_type,
-            aggregation_sub_type,
-            parameters,
-            grouping_labels,
-            aggregated_labels,
-            rollup_labels,
-            String::new(), // original_yaml - empty as in Python
-            window_size,
-            slide_interval,
-            window_type,
-            spatial_filter,
-            metric,
-            num_aggregates_to_retain,
-            table_name,
-            value_column,
-        );
-        if aggregation_data.get("windowLayout").is_some()
-            && aggregation_data.get("window_layout").is_some()
-        {
-            anyhow::bail!("multiple window layout fields are not allowed");
-        }
-        if let Some(layout) = aggregation_data
-            .get("windowLayout")
-            .or_else(|| aggregation_data.get("window_layout"))
-        {
-            config.window_layout = serde_yaml::from_value(layout.clone())?;
-            config
-                .window_layout
-                .validate(config.window_size, config.slide_interval)
-                .map_err(anyhow::Error::msg)?;
-        }
-        config.population_key_encoding = aggregation_data
-            .get("population_key_encoding")
-            .map(|value| serde_yaml::from_value(value.clone()))
-            .transpose()?
-            .unwrap_or_default();
-        config.derived_input = aggregation_data
-            .get("derived_input")
-            .filter(|v| !v.is_null())
-            .map(|v| serde_yaml::from_value(v.clone()))
-            .transpose()?;
-        config.partitioning = aggregation_data
-            .get("partitioning")
-            .filter(|value| !value.is_null())
-            .map(|value| serde_yaml::from_value(value.clone()))
-            .transpose()?;
-        if let Some(projection) = typed_projection {
-            config.value_projection = Some(projection);
-        }
-        config.pane_origin_ms = pane_origin_ms;
-        config.table_timestamp_column = aggregation_data
-            .get("tableTimestampColumn")
-            .or_else(|| aggregation_data.get("table_timestamp_column"))
-            .and_then(serde_yaml::Value::as_str)
-            .map(str::to_owned);
-        config.table_population = aggregation_data
-            .get("tablePopulation")
-            .or_else(|| aggregation_data.get("table_population"))
-            .filter(|value| !value.is_null())
-            .cloned()
-            .map(serde_yaml::from_value)
-            .transpose()?;
-        config
-            .population_filter_canonical()
-            .map_err(anyhow::Error::msg)?;
-        Ok(config)
-    }
-}
-
-#[cfg(test)]
-mod window_layout_tests {
-    use super::WindowMaterializationLayout;
-
-    #[test]
-    fn validates_multiple_slides_and_rejects_uncomposable_panes() {
-        for slide in [5, 10, 15, 30] {
-            WindowMaterializationLayout::Pane { pane_secs: 5 }
-                .validate(60, slide)
-                .unwrap();
-            WindowMaterializationLayout::FullWindow
-                .validate(60, slide)
-                .unwrap();
-        }
-        assert!(WindowMaterializationLayout::Pane { pane_secs: 7 }
-            .validate(60, 10)
-            .is_err());
-        assert!(WindowMaterializationLayout::HierarchicalRollup {
-            base_pane_secs: 5,
-            levels_secs: vec![10, 30],
-        }
-        .validate(60, 10)
-        .is_ok());
-        assert!(WindowMaterializationLayout::HierarchicalRollup {
-            base_pane_secs: 5,
-            levels_secs: vec![12],
-        }
-        .validate(60, 10)
-        .is_err());
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    fn sample_yaml(with_id: bool) -> serde_yaml::Value {
-        let id_line = if with_id { "aggregationId: 42\n" } else { "" };
-        let yaml = format!(
-            "{id_line}aggregationType: DDSketch\naggregationSubType: ''\nmetric: http_latency_ms\nlabels:\n  grouping: [zone]\n  rollup: []\n  aggregated: []\nparameters:\n  relative_accuracy: 0.01\nwindowSize: 30\nwindowType: tumbling\nspatialFilter: ''\n",
-            id_line = id_line
-        );
-        serde_yaml::from_str(&yaml).expect("yaml parses")
-    }
-
-    /// PR 5: `aggregationId` in the YAML is silently dropped — identity
-    /// is derived from content. A fixture with the field parses to the
-    /// SAME config as a fixture without it.
-    #[test]
-    fn explicit_aggregation_id_in_yaml_is_ignored() {
-        let with = PrecomputeMaterialization::from_yaml_data(
-            &sample_yaml(true),
-            None,
-            QueryLanguage::PromQl,
-        )
-        .expect("parse ok");
-        let without = PrecomputeMaterialization::from_yaml_data(
-            &sample_yaml(false),
-            None,
-            QueryLanguage::PromQl,
-        )
-        .expect("parse ok");
-        assert_eq!(
-            with.policy_fingerprint(),
-            without.policy_fingerprint(),
-            "explicit aggregationId in the YAML must not change the policy fingerprint",
-        );
-    }
-
-    /// Round-tripping the same content yields the same fingerprint.
-    #[test]
-    fn fingerprint_is_deterministic_per_content() {
-        let a = PrecomputeMaterialization::from_yaml_data(
-            &sample_yaml(false),
-            None,
-            QueryLanguage::PromQl,
-        )
-        .expect("parse a");
-        let b = PrecomputeMaterialization::from_yaml_data(
-            &sample_yaml(false),
-            None,
-            QueryLanguage::PromQl,
-        )
-        .expect("parse b");
-        assert_eq!(a.policy_fingerprint(), b.policy_fingerprint());
-        assert_ne!(
-            a.policy_fingerprint().as_u64(),
-            0,
-            "fingerprint is never the 0 sentinel for a real config",
-        );
-    }
-
-    #[test]
-    fn explicit_window_layout_survives_custom_json_and_yaml_transport() {
-        use super::WindowMaterializationLayout;
-        let mut yaml = sample_yaml(false);
-        yaml["windowSize"] = serde_yaml::to_value(60).unwrap();
-        yaml["slideInterval"] = serde_yaml::to_value(10).unwrap();
-        for layout in [
-            WindowMaterializationLayout::FullWindow,
-            WindowMaterializationLayout::Pane { pane_secs: 5 },
-            WindowMaterializationLayout::HierarchicalRollup {
-                base_pane_secs: 5,
-                levels_secs: vec![10, 30],
-            },
-        ] {
-            yaml["windowLayout"] = serde_yaml::to_value(&layout).unwrap();
-            let config =
-                PrecomputeMaterialization::from_yaml_data(&yaml, None, QueryLanguage::PromQl)
-                    .unwrap();
-            assert_eq!(config.window_layout, layout);
-            let mut wire = serde_json::to_value(&config).unwrap();
-            let decoded: PrecomputeMaterialization = serde_json::from_value(wire.clone()).unwrap();
-            assert_eq!(decoded.window_layout, layout);
-            assert_eq!(decoded.stored_window_ms(), config.stored_window_ms());
-            assert_eq!(decoded.policy_fingerprint(), config.policy_fingerprint());
-            wire["windowLayout"] = wire["window_layout"].clone();
-            assert!(serde_json::from_value::<PrecomputeMaterialization>(wire).is_err());
-        }
-        yaml.as_mapping_mut()
-            .unwrap()
-            .remove(serde_yaml::Value::from("windowLayout"));
-        let legacy =
-            PrecomputeMaterialization::from_yaml_data(&yaml, None, QueryLanguage::PromQl).unwrap();
-        assert_eq!(
-            legacy.window_layout,
-            WindowMaterializationLayout::Pane { pane_secs: 10 }
-        );
-        yaml["window_layout"] = serde_yaml::from_str("{kind: pane, pane_secs: 7}").unwrap();
-        assert!(
-            PrecomputeMaterialization::from_yaml_data(&yaml, None, QueryLanguage::PromQl).is_err()
-        );
-    }
-
-    #[test]
-    fn pane_origin_round_trips_and_changes_definition_identity() {
-        let mut epoch = PrecomputeMaterialization::from_yaml_data(
-            &sample_yaml(false),
-            None,
-            QueryLanguage::PromQl,
-        )
-        .expect("parse");
-        let unknown = epoch.policy_fingerprint();
-        epoch.pane_origin_ms = Some(7_000);
-        let planned = epoch.policy_fingerprint();
-        assert_ne!(unknown, planned);
-
-        let wire = serde_json::to_value(&epoch).unwrap();
-        assert_eq!(wire["pane_origin_ms"], serde_json::json!(7_000));
-        let mut derived = serde_json::to_value(&epoch).unwrap();
-        let origin = derived
-            .as_object_mut()
-            .unwrap()
-            .remove("pane_origin_ms")
-            .unwrap();
-        derived
-            .as_object_mut()
-            .unwrap()
-            .insert("paneOriginMs".into(), origin);
-        assert!(serde_json::from_value::<PrecomputeMaterialization>(derived).is_err());
-        let decoded: PrecomputeMaterialization =
-            serde_json::from_value(serde_json::to_value(&epoch).unwrap()).unwrap();
-        assert_eq!(decoded.pane_origin_ms, Some(7_000));
-    }
-
-    /// The `policy_fp_u64()` accessor is exactly the fingerprint u64.
-    #[test]
-    fn policy_fp_u64_accessor_equals_fingerprint_u64() {
-        let cfg = PrecomputeMaterialization::from_yaml_data(
-            &sample_yaml(false),
-            None,
-            QueryLanguage::PromQl,
-        )
-        .expect("parse");
-        assert_eq!(cfg.policy_fp_u64(), cfg.policy_fingerprint().as_u64());
-    }
-
-    /// Installed materializations reject the removed externally assigned identity.
-    #[test]
-    fn canonical_wire_rejects_aggregation_id() {
-        let cfg = PrecomputeMaterialization::from_yaml_data(
-            &sample_yaml(false),
-            None,
-            QueryLanguage::PromQl,
-        )
-        .expect("parse");
-        let mut json = serde_json::to_value(&cfg).unwrap();
-        assert!(
-            json.get("aggregationId").is_none(),
-            "aggregationId must not appear in the canonical wire format"
-        );
-        json["aggregationId"] = serde_json::json!(42);
-        assert!(serde_json::from_value::<PrecomputeMaterialization>(json).is_err());
-    }
-
-    #[test]
-    fn typed_projection_roundtrips_and_untyped_column_is_rejected() {
-        use crate::sds::ValueProjectionIdentity;
-        use planner_types::pre_asap::ScalarValue;
-        let mut config = PrecomputeMaterialization::from_yaml_data(
-            &sample_yaml(false),
-            None,
-            QueryLanguage::PromQl,
-        )
-        .unwrap();
-        config.table_name = Some("telemetry".into());
-        config.value_projection = Some(ValueProjectionIdentity::Column {
-            name: "value".into(),
-        });
-        let column_identity = config.policy_fingerprint();
-        let mut legacy = serde_json::to_value(&config).unwrap();
-        legacy.as_object_mut().unwrap().remove("value_projection");
-        legacy["value_column"] = serde_json::json!("value");
-        assert!(serde_json::from_value::<PrecomputeMaterialization>(legacy).is_err());
-        let mut untyped = serde_json::to_value(&config).unwrap();
-        untyped["value_projection"] = serde_json::json!("value");
-        assert!(serde_json::from_value::<PrecomputeMaterialization>(untyped).is_err());
-        config.value_projection = Some(ValueProjectionIdentity::Constant {
-            value: ScalarValue::Int64(1),
-        });
-        let wire = serde_json::to_value(&config).unwrap();
-        let decoded: PrecomputeMaterialization = serde_json::from_value(wire).unwrap();
-        assert_eq!(
-            decoded.effective_value_projection(),
-            config.effective_value_projection()
-        );
-        let mut yaml = sample_yaml(false);
-        yaml["tableName"] = serde_yaml::to_value("telemetry").unwrap();
-        yaml["valueProjection"] =
-            serde_yaml::to_value(serde_json::to_value(&config.value_projection).unwrap()).unwrap();
-        let decoded =
-            PrecomputeMaterialization::from_yaml_data(&yaml, None, QueryLanguage::ClickHouseSql)
-                .unwrap();
-        assert_eq!(
-            decoded.effective_value_projection(),
-            config.effective_value_projection()
-        );
-        yaml["valueColumn"] = serde_yaml::to_value("other_column").unwrap();
-        assert!(PrecomputeMaterialization::from_yaml_data(
-            &yaml,
-            None,
-            QueryLanguage::ClickHouseSql
-        )
-        .is_err());
-        assert_ne!(config.policy_fingerprint(), column_identity);
-        config.value_projection = Some(ValueProjectionIdentity::Constant {
-            value: ScalarValue::Float64(f64::NAN),
-        });
-        assert!(config.population_filter_canonical().is_err());
-    }
-}
diff --git a/crates/asap_types/src/aggregation_type.rs b/crates/asap_types/src/aggregation_type.rs
deleted file mode 100644
index 7ff2ce7ea..000000000
--- a/crates/asap_types/src/aggregation_type.rs
+++ /dev/null
@@ -1,2 +0,0 @@
-//! Kernel identity is owned by the shared physical operator library.
-pub use asap_physical_operators::AggregationType;
diff --git a/crates/asap_types/src/derived_input.rs b/crates/asap_types/src/derived_input.rs
deleted file mode 100644
index e7aba6906..000000000
--- a/crates/asap_types/src/derived_input.rs
+++ /dev/null
@@ -1,386 +0,0 @@
-//! Content identity for a maintenance sub-DAG cut at existing summary inputs.
-//! The executable program remains in OwnedPostAsapDag; this is its catalog key.
-use std::collections::{BTreeMap, BTreeSet};
-
-use planner_types::post_asap::PostAsapNodeId;
-use serde::{Deserialize, Serialize};
-use sha2::{Digest, Sha256};
-
-use crate::{executable_plan::OwnedPostAsapDag, sds::StoredOutputId};
-
-#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
-#[serde(deny_unknown_fields)]
-pub struct DerivedInputIdentity {
-    pub inputs: BTreeSet<StoredOutputId>,
-    pub program_sha256: String,
-}
-
-impl DerivedInputIdentity {
-    pub fn validate(&self) -> Result<(), String> {
-        if self.inputs.is_empty()
-            || self.inputs.iter().any(|id| id.fingerprint().is_unset())
-            || self.program_sha256.len() != 64
-            || !self
-                .program_sha256
-                .bytes()
-                .all(|b| b.is_ascii_digit() || (b'a'..=b'f').contains(&b))
-        {
-            return Err("derived input requires summary references and a canonical SHA-256".into());
-        }
-        Ok(())
-    }
-
-    /// Hash semantic nodes and edge roles, replacing input frontiers with stable
-    /// catalog IDs. Query IDs, node numbering, and catalog generations are absent.
-    pub fn from_dag(
-        document: &OwnedPostAsapDag,
-        root: PostAsapNodeId,
-        frontiers: &BTreeMap<PostAsapNodeId, StoredOutputId>,
-    ) -> Result<Self, String> {
-        if ![
-            crate::executable_plan::OWNED_POST_ASAP_DAG_SCHEMA_VERSION,
-            crate::executable_plan::PRECOMPUTE_DAG_SCHEMA_VERSION,
-        ]
-        .contains(&document.schema_version)
-        {
-            return Err("unsupported derived program document version".into());
-        }
-        let decoded = document.decode()?;
-        let literals: BTreeSet<_> = decoded
-            .nodes
-            .iter()
-            .filter_map(|node| {
-                matches!(
-                    &node.payload,
-                    planner_types::post_asap::ExecutableOperatorPayload::Fallback {
-                        expression: planner_types::pre_asap::QueryExpr::Literal(_),
-                    }
-                )
-                .then_some(node.id)
-            })
-            .collect();
-        let mut incoming: BTreeMap<_, Vec<_>> = BTreeMap::new();
-        for edge in &document.edges {
-            incoming.entry(edge.consumer).or_default().push(edge);
-        }
-        let nodes: BTreeMap<_, _> = document.nodes.iter().map(|n| (n.id, n)).collect();
-        if frontiers.contains_key(&root) {
-            return Err("derived program requires a non-frontier root".into());
-        }
-        let mut hashes = BTreeMap::new();
-        let mut visiting = BTreeSet::new();
-        let mut inputs = BTreeSet::new();
-        let mut stack = vec![(root, false)];
-        while let Some((id, finish)) = stack.pop() {
-            if hashes.contains_key(&id) {
-                continue;
-            }
-            let node = nodes
-                .get(&id)
-                .ok_or("derived program references missing node")?;
-            if let Some(summary) = frontiers.get(&id) {
-                inputs.insert(*summary);
-                hashes.insert(id, serde_json::json!({"summary": summary}));
-                continue;
-            }
-            if !finish {
-                if !visiting.insert(id) {
-                    return Err("derived program has a cycle".into());
-                }
-                stack.push((id, true));
-                if !incoming.contains_key(&id) && !literals.contains(&id) {
-                    return Err("derived program has an unbound input leaf".into());
-                }
-                for edge in incoming.get(&id).into_iter().flatten() {
-                    stack.push((edge.producer, false));
-                }
-                continue;
-            }
-            let mut edges = Vec::new();
-            for edge in incoming.get(&id).into_iter().flatten() {
-                let input = hashes
-                    .get(&edge.producer)
-                    .ok_or("derived input was not evaluated")?;
-                edges.push(
-                    serde_json::to_vec(&serde_json::json!({
-                        "input": input, "role": edge.role, "schema": edge.intermediate_schema,
-                        "state": edge.data_state, "grouping": edge.grouping, "window": edge.window,
-                    }))
-                    .map_err(|e| e.to_string())?,
-                );
-            }
-            edges.sort();
-            let bytes = serde_json::to_vec(&serde_json::json!({
-                "version": 2, "payload": node.payload,
-                "state": node.output_state, "schema": node.output_schema,
-                "guarantee": node.guarantee, "inputs": edges,
-            }))
-            .map_err(|e| e.to_string())?;
-            hashes.insert(
-                id,
-                serde_json::json!(format!("{:x}", Sha256::digest(bytes))),
-            );
-            visiting.remove(&id);
-        }
-        let identity = Self {
-            inputs,
-            program_sha256: hashes[&root]
-                .as_str()
-                .ok_or("derived root has no semantic hash")?
-                .into(),
-        };
-        identity.validate()?;
-        Ok(identity)
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use crate::summary_catalog::SummaryCatalog;
-    use crate::{AggregationType, KeyByLabelNames, PrecomputeMaterialization, WindowKind};
-
-    fn config() -> PrecomputeMaterialization {
-        PrecomputeMaterialization::new(
-            AggregationType::Sum,
-            String::new(),
-            Default::default(),
-            KeyByLabelNames::empty(),
-            KeyByLabelNames::empty(),
-            KeyByLabelNames::empty(),
-            String::new(),
-            10,
-            10,
-            WindowKind::Tumbling,
-            String::new(),
-            "m".into(),
-            None,
-            None,
-            None,
-        )
-    }
-
-    #[test]
-    fn derived_source_is_distinct_and_generation_independent() {
-        let raw = config();
-        let raw_id = StoredOutputId::from(raw.policy_fingerprint());
-        let mut derived = raw.clone();
-        derived.derived_input = Some(DerivedInputIdentity {
-            inputs: BTreeSet::from([raw_id]),
-            program_sha256: "a".repeat(64),
-        });
-        assert_ne!(raw.policy_fingerprint(), derived.policy_fingerprint());
-        let a =
-            SummaryCatalog::from_materializations(1, 1, &[raw.clone(), derived.clone()]).unwrap();
-        let b = SummaryCatalog::from_materializations(2, 9, &[raw, derived.clone()]).unwrap();
-        assert_eq!(a.outputs, b.outputs);
-        assert_eq!(a.data_descriptors, b.data_descriptors);
-        let mut renamed = derived.clone();
-        renamed.metric = "output_alias".into();
-        assert_eq!(renamed.policy_fingerprint(), derived.policy_fingerprint());
-        let json = serde_json::to_value(&derived).unwrap();
-        let decoded: PrecomputeMaterialization = serde_json::from_value(json).unwrap();
-        assert_eq!(decoded.policy_fingerprint(), derived.policy_fingerprint());
-    }
-
-    #[test]
-    fn raw_utf8_metric_cannot_impersonate_derived_policy_domain() {
-        let mut derived = config();
-        derived.derived_input = Some(DerivedInputIdentity {
-            inputs: BTreeSet::from([StoredOutputId::from(derived.policy_fingerprint())]),
-            program_sha256: "d".repeat(64),
-        });
-        let mut raw = derived.clone();
-        raw.metric = format!(
-            "derived-input-v1:{}",
-            serde_json::to_string(&derived.source_identity()).unwrap()
-        );
-        raw.derived_input = None;
-        assert_ne!(raw.policy_fingerprint(), derived.policy_fingerprint());
-    }
-
-    #[test]
-    fn catalog_rejects_missing_derived_dependencies_and_raw_source_conflicts() {
-        let mut derived = config();
-        derived.derived_input = Some(DerivedInputIdentity {
-            inputs: BTreeSet::from([StoredOutputId::from(derived.policy_fingerprint())]),
-            program_sha256: "b".repeat(64),
-        });
-        assert!(SummaryCatalog::from_materializations(1, 1, &[derived.clone()]).is_err());
-        derived.table_name = Some("table".into());
-        assert!(derived.population_filter_canonical().is_err());
-    }
-    fn program(source: u32, root: u32) -> OwnedPostAsapDag {
-        use crate::executable_plan::{OwnedPostAsapEdge, OwnedPostAsapNode};
-        use planner_types::post_asap::{
-            EdgeRole, ExecutionDataState, GroupingEdgeCompatibility, WindowEdgeCompatibility,
-        };
-        let state = ExecutionDataState::INGESTION_SUMMARY;
-        OwnedPostAsapDag {
-            schema_version: crate::executable_plan::OWNED_POST_ASAP_DAG_SCHEMA_VERSION,
-            query_id: "query-a".into(),
-            root: PostAsapNodeId(root),
-            nodes: [source, root]
-                .into_iter()
-                .map(|id| OwnedPostAsapNode {
-                    id: PostAsapNodeId(id),
-                    payload: serde_json::json!({"kind":"summary_merge"}),
-                    output_state: state,
-                    output_schema: serde_json::json!({"fields":[],"time_index":null}),
-                    guarantee: None,
-                })
-                .collect(),
-            edges: vec![OwnedPostAsapEdge {
-                producer: PostAsapNodeId(source),
-                consumer: PostAsapNodeId(root),
-                role: EdgeRole::Input,
-                intermediate_schema: serde_json::json!({"fields":[],"time_index":null}),
-                data_state: state,
-                grouping: GroupingEdgeCompatibility::Identical,
-                window: WindowEdgeCompatibility::NotApplicable,
-            }],
-        }
-    }
-
-    #[test]
-    fn semantic_signature_ignores_node_and_query_numbering_but_not_inputs() {
-        let source = StoredOutputId::from(config().policy_fingerprint());
-        let a = program(1, 2);
-        let first = DerivedInputIdentity::from_dag(
-            &a,
-            a.root,
-            &BTreeMap::from([(PostAsapNodeId(1), source)]),
-        )
-        .unwrap();
-        let mut b = program(900, 42);
-        b.query_id = "another-query".into();
-        b.nodes.reverse();
-        let second = DerivedInputIdentity::from_dag(
-            &b,
-            b.root,
-            &BTreeMap::from([(PostAsapNodeId(900), source)]),
-        )
-        .unwrap();
-        assert_eq!(first, second);
-        b.nodes
-            .iter_mut()
-            .find(|n| n.id == b.root)
-            .unwrap()
-            .output_schema = serde_json::json!({"fields":[],"time_index":0});
-        assert_ne!(
-            first,
-            DerivedInputIdentity::from_dag(
-                &b,
-                b.root,
-                &BTreeMap::from([(PostAsapNodeId(900), source)])
-            )
-            .unwrap()
-        );
-        assert!(DerivedInputIdentity::from_dag(&a, a.root, &BTreeMap::new()).is_err());
-        let mut unsupported = a.clone();
-        unsupported.schema_version = 999;
-        assert!(DerivedInputIdentity::from_dag(
-            &unsupported,
-            unsupported.root,
-            &BTreeMap::from([(PostAsapNodeId(1), source)])
-        )
-        .is_err());
-        unsupported = a.clone();
-        unsupported.nodes[1].payload = serde_json::json!({"kind":"unknown_operator"});
-        assert!(DerivedInputIdentity::from_dag(
-            &unsupported,
-            unsupported.root,
-            &BTreeMap::from([(PostAsapNodeId(1), source)])
-        )
-        .is_err());
-        let mut cycle = a.clone();
-        cycle.edges[0].producer = cycle.root;
-        assert!(DerivedInputIdentity::from_dag(&cycle, cycle.root, &BTreeMap::new()).is_err());
-        cycle.edges[0].producer = PostAsapNodeId(999);
-        assert!(DerivedInputIdentity::from_dag(&cycle, cycle.root, &BTreeMap::new()).is_err());
-    }
-
-    #[test]
-    fn catalog_rejects_self_referential_summary() {
-        use crate::sds::{
-            DataDescriptor, DataSourceIdentity, SummaryDescriptor, ValueProjectionIdentity,
-        };
-        let config = config();
-        let input = DerivedInputIdentity {
-            inputs: BTreeSet::from([StoredOutputId::from(config.policy_fingerprint())]),
-            program_sha256: "f".repeat(64),
-        };
-        let data = DataDescriptor::new_typed(
-            DataSourceIdentity::Derived { input },
-            ValueProjectionIdentity::SampleValue,
-            "",
-            Vec::<String>::new(),
-            "derived",
-        );
-        assert!(SummaryCatalog::build(
-            1,
-            1,
-            [(
-                config.policy_fingerprint(),
-                SummaryDescriptor::from_config(&config).unwrap(),
-                data,
-            )]
-        )
-        .is_err());
-    }
-    #[test]
-    fn installation_rejects_derived_inputs_without_an_installed_maintenance_dag() {
-        use crate::precompute_plan::{PlanEnvelope, PrecomputePlan};
-        let mut config = config();
-        config.derived_input = Some(DerivedInputIdentity {
-            inputs: BTreeSet::from([StoredOutputId::from(config.policy_fingerprint())]),
-            program_sha256: "c".repeat(64),
-        });
-        let envelope = PlanEnvelope {
-            plan_id: 1,
-            plan_version: 1,
-            generated_at_unix_ms: 0,
-            activation_unix_ms: 0,
-            expiry_unix_ms: None,
-            backend_compat: "asap-query-backend.v1".into(),
-            planner_revision: "test".into(),
-            capability_snapshot_id: "test".into(),
-        };
-        let error =
-            PrecomputePlan::build(envelope, vec![config], &["producer".into()]).unwrap_err();
-        assert!(error
-            .to_string()
-            .contains("installed aligned immutable maintenance DAG"));
-    }
-    #[test]
-    fn literal_leaves_are_hashed_without_inventing_materialization_references() {
-        use planner_types::{
-            post_asap::ExecutableOperatorPayload,
-            pre_asap::{QueryExpr, ScalarValue},
-        };
-        let mut dag = program(1, 2);
-        let mut literal = dag.nodes[0].clone();
-        literal.id = PostAsapNodeId(3);
-        literal.payload = serde_json::to_value(ExecutableOperatorPayload::Fallback {
-            expression: QueryExpr::Literal(ScalarValue::Int64(2)),
-        })
-        .unwrap();
-        dag.nodes.push(literal);
-        let mut edge = dag.edges[0].clone();
-        edge.producer = PostAsapNodeId(3);
-        dag.edges.push(edge);
-        let source = StoredOutputId::from(config().policy_fingerprint());
-        let frontiers = BTreeMap::from([(PostAsapNodeId(1), source)]);
-        let first = DerivedInputIdentity::from_dag(&dag, dag.root, &frontiers).unwrap();
-        assert_eq!(first.inputs, BTreeSet::from([source]));
-        dag.nodes[2].payload = serde_json::to_value(ExecutableOperatorPayload::Fallback {
-            expression: QueryExpr::Literal(ScalarValue::Int64(3)),
-        })
-        .unwrap();
-        assert_ne!(
-            first,
-            DerivedInputIdentity::from_dag(&dag, dag.root, &frontiers).unwrap()
-        );
-        assert!(DerivedInputIdentity::from_dag(&dag, PostAsapNodeId(3), &frontiers).is_err());
-    }
-}
diff --git a/crates/asap_types/src/enums.rs b/crates/asap_types/src/enums.rs
deleted file mode 100644
index ebf03534b..000000000
--- a/crates/asap_types/src/enums.rs
+++ /dev/null
@@ -1,96 +0,0 @@
-use std::fmt;
-use std::str::FromStr;
-
-pub use asap_physical_operators::Statistic;
-
-#[derive(
-    clap::ValueEnum,
-    Clone,
-    Copy,
-    Debug,
-    Default,
-    PartialEq,
-    Eq,
-    Hash,
-    serde::Serialize,
-    serde::Deserialize,
-)]
-#[serde(rename_all = "snake_case")]
-pub enum QueryLanguage {
-    #[default]
-    #[value(alias = "PROMQL", alias = "promql")]
-    PromQl,
-    MetricsQl,
-    ClickHouseSql,
-}
-
-/// Policy for cleaning up old aggregates from the store.
-/// Must be explicitly specified in inference_config.yaml.
-#[derive(Clone, Debug, Copy, PartialEq, Eq, serde::Serialize, serde::Deserialize)]
-#[serde(rename_all = "snake_case")]
-pub enum CleanupPolicy {
-    /// Keep only the N most recent aggregates (circular buffer behavior)
-    CircularBuffer,
-    /// Never clean up aggregates
-    NoCleanup,
-}
-
-impl fmt::Display for CleanupPolicy {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        match self {
-            CleanupPolicy::CircularBuffer => write!(f, "circular_buffer"),
-            CleanupPolicy::NoCleanup => write!(f, "no_cleanup"),
-        }
-    }
-}
-
-impl FromStr for CleanupPolicy {
-    type Err = String;
-
-    fn from_str(s: &str) -> Result<Self, Self::Err> {
-        match s {
-            "circular_buffer" => Ok(CleanupPolicy::CircularBuffer),
-            "no_cleanup" => Ok(CleanupPolicy::NoCleanup),
-            _ => Err(format!("Unknown cleanup policy: '{s}'")),
-        }
-    }
-}
-
-/// Window lifecycle and flush semantics owned by streaming configuration.
-/// Tumbling is the default; wire names are lowercase.
-#[derive(
-    Debug, Clone, Copy, Default, PartialEq, Eq, Hash, serde::Serialize, serde::Deserialize,
-)]
-#[serde(rename_all = "snake_case")]
-pub enum WindowKind {
-    /// Fixed, non-overlapping windows (e.g. a new 30s bucket every 30s).
-    #[default]
-    Tumbling,
-    /// Overlapping windows that advance by less than their width.
-    Sliding,
-    /// Gap-based windows that close after a period of inactivity.
-    Session,
-}
-
-impl fmt::Display for WindowKind {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        match self {
-            WindowKind::Tumbling => write!(f, "tumbling"),
-            WindowKind::Sliding => write!(f, "sliding"),
-            WindowKind::Session => write!(f, "session"),
-        }
-    }
-}
-
-impl FromStr for WindowKind {
-    type Err = String;
-
-    fn from_str(s: &str) -> Result<Self, Self::Err> {
-        match s {
-            "tumbling" => Ok(WindowKind::Tumbling),
-            "sliding" => Ok(WindowKind::Sliding),
-            "session" => Ok(WindowKind::Session),
-            _ => Err(format!("Unknown window kind: '{s}'")),
-        }
-    }
-}
diff --git a/crates/asap_types/src/erp_observation.rs b/crates/asap_types/src/erp_observation.rs
deleted file mode 100644
index df23f6f1b..000000000
--- a/crates/asap_types/src/erp_observation.rs
+++ /dev/null
@@ -1,229 +0,0 @@
-//! Versioned runtime evidence about the inputs of one installed summary.
-//! Shape is generic so the transport contract does not depend on a planner.
-use crate::sds::{CatalogGeneration, StoredOutputId, SummaryInstanceId};
-use serde::{Deserialize, Serialize};
-
-#[derive(Debug, Clone, Copy, PartialEq, Eq, Serialize, Deserialize)]
-#[serde(rename_all = "snake_case")]
-pub enum ErpObservationInputSemantics {
-    ScalarSampleValue,
-    UnitSampleFrequency,
-}
-
-#[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
-#[serde(deny_unknown_fields)]
-pub struct ErpPopulationObservation<Shape> {
-    pub population_id: SummaryInstanceId,
-    pub shape: Shape,
-}
-
-#[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
-#[serde(deny_unknown_fields)]
-pub struct ErpPopulationObservations<Shape> {
-    pub schema_version: u32,
-    pub catalog_generation: CatalogGeneration,
-    pub stored_output_id: StoredOutputId,
-    pub observed_at_unix_ms: u64,
-    pub window_start_ms: i64,
-    pub window_end_ms: i64,
-    pub input_semantics: ErpObservationInputSemantics,
-    /// Any overflow or unsupported input invalidates the entire envelope.
-    /// Invalid envelopes contain no population fits.
-    pub invalid_reason: Option<String>,
-    pub populations: Vec<ErpPopulationObservation<Shape>>,
-}
-
-#[derive(Debug, Clone, Copy, PartialEq, Eq, Serialize, Deserialize)]
-#[serde(deny_unknown_fields)]
-pub struct ErpObservationFreshness {
-    pub max_age_ms: u64,
-    pub max_future_skew_ms: u64,
-}
-
-impl<S> ErpPopulationObservations<S> {
-    pub fn validate_identity_and_freshness(
-        &self,
-        expected_generation: &CatalogGeneration,
-        expected_definition: StoredOutputId,
-        now_ms: u64,
-        freshness: ErpObservationFreshness,
-    ) -> Result<(), &'static str> {
-        if self.schema_version != 1
-            || &self.catalog_generation != expected_generation
-            || self.stored_output_id != expected_definition
-        {
-            return Err("ERP observation belongs to a different catalog or summary");
-        }
-        if self.invalid_reason.is_some()
-            || self.populations.is_empty()
-            || self.window_start_ms >= self.window_end_ms
-        {
-            return Err("ERP observation is incomplete or invalid");
-        }
-        if freshness.max_age_ms == 0
-            || self.observed_at_unix_ms > now_ms.saturating_add(freshness.max_future_skew_ms)
-            || now_ms.saturating_sub(self.observed_at_unix_ms) > freshness.max_age_ms
-        {
-            return Err("ERP observation is stale or future-dated");
-        }
-        let mut seen = std::collections::BTreeSet::new();
-        if self
-            .populations
-            .iter()
-            .any(|p| !seen.insert(&p.population_id))
-        {
-            return Err("ERP observation repeats a population");
-        }
-        Ok(())
-    }
-}
-
-/// Empirical sufficient statistics for frequency-shape fitting. No raw keys,
-/// raw samples, distribution-family assertion, or planner configuration crosses the wire.
-#[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
-#[serde(deny_unknown_fields)]
-pub struct EmpiricalFrequencyObservation {
-    pub sorted_counts: Vec<u64>,
-    pub interval_counts: Vec<u64>,
-}
-impl EmpiricalFrequencyObservation {
-    pub fn event_count(&self) -> Option<u64> {
-        if self.sorted_counts.len() > 65_536
-            || self.interval_counts.len() > 256
-            || self.sorted_counts.is_empty()
-            || self.sorted_counts.contains(&0)
-            || self.sorted_counts.windows(2).any(|w| w[0] < w[1])
-        {
-            return None;
-        }
-        let total = self
-            .sorted_counts
-            .iter()
-            .try_fold(0u64, |sum, n| sum.checked_add(*n))?;
-        let intervals = self
-            .interval_counts
-            .iter()
-            .try_fold(0u64, |sum, n| sum.checked_add(*n))?;
-        (total == intervals).then_some(total)
-    }
-}
-
-/// Bounded exact frequency counting. Fitting and ERP selection remain control-plane work.
-#[derive(Debug)]
-pub struct BoundedFrequencyObserver<K> {
-    frequencies: std::collections::HashMap<K, u64>,
-    intervals: std::collections::HashMap<usize, u64>,
-    max_keys: usize,
-    max_intervals: usize,
-    events: u64,
-    invalid: bool,
-}
-impl<K: Eq + std::hash::Hash> BoundedFrequencyObserver<K> {
-    pub fn new(max_keys: usize, max_intervals: usize) -> Result<Self, &'static str> {
-        if max_keys == 0 || max_intervals == 0 {
-            return Err("observation limits must be positive");
-        }
-        Ok(Self {
-            frequencies: Default::default(),
-            intervals: Default::default(),
-            max_keys,
-            max_intervals,
-            events: 0,
-            invalid: false,
-        })
-    }
-    pub fn observed_key_count(&self) -> usize {
-        self.frequencies.len()
-    }
-    pub fn invalidate(&mut self) {
-        self.invalid = true;
-    }
-    pub fn observe(&mut self, key: K, interval: usize) -> Result<(), &'static str> {
-        if self.invalid {
-            return Err("ERP observation was invalidated");
-        }
-        if (!self.frequencies.contains_key(&key) && self.frequencies.len() >= self.max_keys)
-            || (!self.intervals.contains_key(&interval)
-                && self.intervals.len() >= self.max_intervals)
-        {
-            self.invalid = true;
-            return Err("ERP observation key or interval budget exceeded");
-        }
-        let Some(events) = self.events.checked_add(1) else {
-            self.invalid = true;
-            return Err("ERP observation count overflow");
-        };
-        *self.frequencies.entry(key).or_default() += 1;
-        *self.intervals.entry(interval).or_default() += 1;
-        self.events = events;
-        Ok(())
-    }
-    pub fn snapshot(&self) -> Option<EmpiricalFrequencyObservation> {
-        if self.invalid || self.frequencies.is_empty() {
-            return None;
-        }
-        let mut sorted_counts: Vec<_> = self.frequencies.values().copied().collect();
-        sorted_counts.sort_unstable_by(|a, b| b.cmp(a));
-        Some(EmpiricalFrequencyObservation {
-            sorted_counts,
-            interval_counts: self.intervals.values().copied().collect(),
-        })
-    }
-}
-
-impl<S> ErpPopulationObservations<S> {
-    pub fn try_map_shapes<T>(
-        self,
-        mut convert: impl FnMut(S) -> Option<T>,
-    ) -> Option<ErpPopulationObservations<T>> {
-        let populations = self
-            .populations
-            .into_iter()
-            .map(|population| {
-                Some(ErpPopulationObservation {
-                    population_id: population.population_id,
-                    shape: convert(population.shape)?,
-                })
-            })
-            .collect::<Option<Vec<_>>>()?;
-        Some(ErpPopulationObservations {
-            schema_version: self.schema_version,
-            catalog_generation: self.catalog_generation,
-            stored_output_id: self.stored_output_id,
-            observed_at_unix_ms: self.observed_at_unix_ms,
-            window_start_ms: self.window_start_ms,
-            window_end_ms: self.window_end_ms,
-            input_semantics: self.input_semantics,
-            invalid_reason: self.invalid_reason,
-            populations,
-        })
-    }
-}
-
-#[cfg(test)]
-mod empirical_tests {
-    use super::*;
-    #[test]
-    fn count_overflow_invalidates_instead_of_publishing_prefix() {
-        let mut observer = BoundedFrequencyObserver::new(2, 2).unwrap();
-        observer.observe(1u64, 0).unwrap();
-        observer.events = u64::MAX;
-        assert!(observer.observe(1, 0).is_err());
-        assert!(observer.snapshot().is_none());
-    }
-    #[test]
-    fn malformed_frequency_counts_fail_closed() {
-        assert!(EmpiricalFrequencyObservation {
-            sorted_counts: vec![2, 1],
-            interval_counts: vec![2]
-        }
-        .event_count()
-        .is_none());
-        assert!(EmpiricalFrequencyObservation {
-            sorted_counts: vec![1, 2],
-            interval_counts: vec![3]
-        }
-        .event_count()
-        .is_none());
-    }
-}
diff --git a/crates/asap_types/src/executable_plan.rs b/crates/asap_types/src/executable_plan.rs
deleted file mode 100644
index aff1ced0d..000000000
--- a/crates/asap_types/src/executable_plan.rs
+++ /dev/null
@@ -1,401 +0,0 @@
-//! Shared backend installation contract for semantic DAGs and physical bindings.
-//!
-//! `OwnedPostAsapDag` is the Send/Sync installed representation of Planner IR;
-//! it is distinct from Planner's `PostAsapDagDocument` transport envelope.
-//! Planner payloads contain process-local `Rc` values, so they are decoded only
-//! when executing or validating a DAG. Compilation and QueryPlan cross-checks
-//! remain control-plane responsibilities.
-
-use std::collections::{BTreeMap, BTreeSet};
-
-use crate::sds::StoredOutputId;
-use planner_types::post_asap::{
-    EdgeRole, ExecutableDag, ExecutableDagEdge, ExecutableDagNode, ExecutionDataState,
-    ExecutionTiming, GroupingEdgeCompatibility, PostAsapNodeId, WindowEdgeCompatibility,
-};
-use serde::{Deserialize, Serialize};
-
-/// Identity within an installed query entry, separate from semantic Planner IDs.
-#[derive(Debug, Clone, Copy, Serialize, Deserialize, PartialEq, Eq, PartialOrd, Ord, Hash)]
-#[serde(transparent)]
-pub struct QueryNodeId(pub u64);
-
-pub const OWNED_POST_ASAP_DAG_SCHEMA_VERSION: u32 = 5;
-pub const PRECOMPUTE_DAG_SCHEMA_VERSION: u32 = 6;
-
-/// Versioned, language-neutral Planner DAG persisted with an installed plan.
-/// Plan lifecycle belongs to the enclosing `PrecomputePlan`; this document
-/// carries semantic identity only and does not duplicate its envelope.
-#[derive(Debug, Clone, Serialize, Deserialize, PartialEq)]
-#[serde(deny_unknown_fields)]
-pub struct OwnedPostAsapDag {
-    pub schema_version: u32,
-    pub query_id: String,
-    pub nodes: Vec<OwnedPostAsapNode>,
-    pub edges: Vec<OwnedPostAsapEdge>,
-    pub root: PostAsapNodeId,
-}
-
-/// Send/Sync wire form of one Planner node. Planner's in-memory payload may
-/// contain `Rc`; the canonical JSON payload preserves its tagged type without
-/// leaking that process-local ownership choice into installed runtime state.
-#[derive(Debug, Clone, Serialize, Deserialize, PartialEq)]
-#[serde(deny_unknown_fields)]
-pub struct OwnedPostAsapNode {
-    pub id: PostAsapNodeId,
-    pub payload: serde_json::Value,
-    pub output_state: ExecutionDataState,
-    pub output_schema: serde_json::Value,
-    pub guarantee: Option<serde_json::Value>,
-}
-
-#[derive(Debug, Clone, Serialize, Deserialize, PartialEq)]
-#[serde(deny_unknown_fields)]
-pub struct OwnedPostAsapEdge {
-    pub producer: PostAsapNodeId,
-    pub consumer: PostAsapNodeId,
-    pub role: EdgeRole,
-    pub intermediate_schema: serde_json::Value,
-    pub data_state: ExecutionDataState,
-    pub grouping: GroupingEdgeCompatibility,
-    pub window: WindowEdgeCompatibility,
-}
-
-impl OwnedPostAsapDag {
-    pub fn from_executable(query_id: String, dag: &ExecutableDag) -> Result<Self, String> {
-        let nodes = dag
-            .nodes
-            .iter()
-            .map(|node| {
-                Ok(OwnedPostAsapNode {
-                    id: node.id,
-                    payload: serde_json::to_value(&node.payload).map_err(|e| e.to_string())?,
-                    output_state: node.output_state,
-                    output_schema: serde_json::to_value(&node.output_schema)
-                        .map_err(|e| e.to_string())?,
-                    guarantee: node
-                        .guarantee
-                        .as_ref()
-                        .map(serde_json::to_value)
-                        .transpose()
-                        .map_err(|e| e.to_string())?,
-                })
-            })
-            .collect::<Result<Vec<_>, String>>()?;
-        let edges = dag
-            .edges
-            .iter()
-            .map(|edge| {
-                Ok(OwnedPostAsapEdge {
-                    producer: edge.producer,
-                    consumer: edge.consumer,
-                    role: edge.role,
-                    intermediate_schema: serde_json::to_value(&edge.intermediate_schema)
-                        .map_err(|e| e.to_string())?,
-                    data_state: edge.data_state,
-                    grouping: edge.grouping,
-                    window: edge.window,
-                })
-            })
-            .collect::<Result<Vec<_>, String>>()?;
-        Ok(Self {
-            schema_version: OWNED_POST_ASAP_DAG_SCHEMA_VERSION,
-            query_id,
-            nodes,
-            edges,
-            root: dag.root,
-        })
-    }
-
-    pub fn decode(&self) -> Result<ExecutableDag, String> {
-        let node_ids = self
-            .nodes
-            .iter()
-            .map(|node| node.id)
-            .collect::<BTreeSet<_>>();
-        if node_ids.len() != self.nodes.len() {
-            return Err("duplicate post-ASAP DAG node ID".into());
-        }
-        let edge_ids = self
-            .edges
-            .iter()
-            .map(|edge| {
-                (
-                    edge.producer,
-                    edge.consumer,
-                    serde_json::to_string(&edge.role).expect("EdgeRole is serializable"),
-                )
-            })
-            .collect::<BTreeSet<_>>();
-        if edge_ids.len() != self.edges.len() {
-            return Err("duplicate post-ASAP DAG edge".into());
-        }
-        let nodes = self
-            .nodes
-            .iter()
-            .map(|node| {
-                let payload: planner_types::post_asap::ExecutableOperatorPayload =
-                    serde_json::from_value(node.payload.clone()).map_err(|e| e.to_string())?;
-                Ok(ExecutableDagNode {
-                    id: node.id,
-                    payload,
-                    output_state: node.output_state,
-                    output_schema: serde_json::from_value(node.output_schema.clone())
-                        .map_err(|e| e.to_string())?,
-                    guarantee: node
-                        .guarantee
-                        .clone()
-                        .map(serde_json::from_value)
-                        .transpose()
-                        .map_err(|e| e.to_string())?,
-                })
-            })
-            .collect::<Result<Vec<_>, String>>()?;
-        let edges = self
-            .edges
-            .iter()
-            .map(|edge| {
-                Ok(ExecutableDagEdge {
-                    producer: edge.producer,
-                    consumer: edge.consumer,
-                    role: edge.role,
-                    intermediate_schema: serde_json::from_value(edge.intermediate_schema.clone())
-                        .map_err(|e| e.to_string())?,
-                    data_state: edge.data_state,
-                    grouping: edge.grouping,
-                    window: edge.window,
-                })
-            })
-            .collect::<Result<Vec<_>, String>>()?;
-        Ok(ExecutableDag {
-            nodes,
-            edges,
-            root: self.root,
-        })
-    }
-}
-
-#[derive(Debug, Clone, Serialize, Deserialize, PartialEq)]
-#[serde(deny_unknown_fields)]
-pub struct InstalledPostAsapDag {
-    pub document: OwnedPostAsapDag,
-    pub binding: BackendExecutableBinding,
-}
-
-impl InstalledPostAsapDag {
-    pub fn validate(&self) -> Result<(), String> {
-        if self.document.query_id.trim().is_empty() {
-            return Err("invalid post-ASAP DAG document identity/version".into());
-        }
-        if self.document.schema_version != PRECOMPUTE_DAG_SCHEMA_VERSION {
-            return Err("unsupported maintenance DAG document version".into());
-        }
-        self.binding.validate_precompute(&self.document.decode()?)
-    }
-
-    /// Project the selected semantic DAG onto the maintenance ancestors of its
-    /// stored outputs.
-    pub fn precompute_projection(mut self) -> Result<Self, String> {
-        if self.document.schema_version != OWNED_POST_ASAP_DAG_SCHEMA_VERSION {
-            return Err("selected DAG has an unsupported document version".into());
-        }
-        self.binding.validate(&self.document.decode()?)?;
-        if self.binding.precompute_sinks.is_empty() {
-            return Err("cannot project a DAG without maintenance sinks".into());
-        }
-        let mut included = self
-            .binding
-            .precompute_sinks
-            .iter()
-            .copied()
-            .collect::<BTreeSet<_>>();
-        let mut frontier = self.binding.precompute_sinks.clone();
-        while let Some(consumer) = frontier.pop() {
-            for edge in self
-                .document
-                .edges
-                .iter()
-                .filter(|edge| edge.consumer == consumer)
-            {
-                if included.insert(edge.producer) {
-                    frontier.push(edge.producer);
-                }
-            }
-        }
-        self.document
-            .nodes
-            .retain(|node| included.contains(&node.id));
-        self.document
-            .edges
-            .retain(|edge| included.contains(&edge.producer) && included.contains(&edge.consumer));
-        self.binding.nodes.retain(|id, _| included.contains(id));
-        self.document.root = *self.binding.precompute_sinks.first().unwrap();
-        self.document.schema_version = PRECOMPUTE_DAG_SCHEMA_VERSION;
-        self.validate()?;
-        Ok(self)
-    }
-}
-
-/// Backend-owned physical identities and sink placement for one Planner
-/// semantic DAG. Planner node IDs remain stable semantic references; the
-/// backend never assumes they equal its independently allocated query IDs.
-#[derive(Debug, Clone, Serialize, Deserialize, PartialEq, Eq)]
-#[serde(deny_unknown_fields)]
-pub struct BackendExecutableBinding {
-    pub nodes: BTreeMap<PostAsapNodeId, BackendNodeBinding>,
-    pub query_sink: PostAsapNodeId,
-    pub query_plan_sink: QueryNodeId,
-    pub precompute_sinks: Vec<PostAsapNodeId>,
-}
-
-#[derive(Debug, Clone, Serialize, Deserialize, PartialEq, Eq)]
-#[serde(tag = "placement", rename_all = "snake_case", deny_unknown_fields)]
-pub enum BackendNodeBinding {
-    Query {
-        query_node: QueryNodeId,
-    },
-    /// Semantic read node absorbed into a larger installed query node, such
-    /// as an external exact subtree boundary.
-    QueryInput,
-    MaintenanceInput,
-    Materialization {
-        stored_output: StoredOutputId,
-    },
-}
-
-impl BackendExecutableBinding {
-    pub fn node(&self, id: PostAsapNodeId) -> Option<&BackendNodeBinding> {
-        self.nodes.get(&id)
-    }
-
-    pub fn validate_precompute(&self, dag: &ExecutableDag) -> Result<(), String> {
-        let ids = dag
-            .nodes
-            .iter()
-            .map(|node| node.id)
-            .collect::<BTreeSet<_>>();
-        if ids.is_empty() || self.nodes.keys().copied().collect::<BTreeSet<_>>() != ids {
-            return Err("maintenance binding does not cover its projected DAG".into());
-        }
-        if self.precompute_sinks.is_empty()
-            || self.precompute_sinks.iter().any(|id| !ids.contains(id))
-        {
-            return Err("maintenance projection has missing sinks".into());
-        }
-        if self.precompute_sinks.iter().any(|id| {
-            !matches!(
-                self.node(*id),
-                Some(BackendNodeBinding::Materialization { .. })
-            )
-        }) {
-            return Err("maintenance sink lacks a stored-output binding".into());
-        }
-        for node in &dag.nodes {
-            match (node.output_state.timing, self.node(node.id)) {
-                (
-                    ExecutionTiming::IngestionTime,
-                    Some(
-                        BackendNodeBinding::MaintenanceInput
-                        | BackendNodeBinding::Materialization { .. },
-                    ),
-                ) => {}
-                _ => {
-                    return Err(format!(
-                        "query-owned node {} in maintenance projection",
-                        node.id.0
-                    ))
-                }
-            }
-        }
-        if dag
-            .edges
-            .iter()
-            .any(|edge| !ids.contains(&edge.producer) || !ids.contains(&edge.consumer))
-        {
-            return Err("maintenance projection has dangling edges".into());
-        }
-        Ok(())
-    }
-
-    pub fn validate(&self, dag: &ExecutableDag) -> Result<(), String> {
-        let semantic = dag
-            .nodes
-            .iter()
-            .map(|node| node.id.0)
-            .collect::<BTreeSet<_>>();
-        if !semantic.contains(&self.query_sink.0) {
-            return Err("backend query sink is absent from semantic DAG".into());
-        }
-        if self.nodes.keys().map(|id| id.0).collect::<BTreeSet<_>>() != semantic {
-            return Err("backend executable binding does not cover semantic DAG exactly".into());
-        }
-        for node in &dag.nodes {
-            match (node.output_state.timing, self.node(node.id).unwrap()) {
-                (ExecutionTiming::QueryTime, BackendNodeBinding::Query { .. })
-                | (ExecutionTiming::QueryTime, BackendNodeBinding::QueryInput)
-                | (ExecutionTiming::IngestionTime, BackendNodeBinding::MaintenanceInput)
-                | (ExecutionTiming::IngestionTime, BackendNodeBinding::Materialization { .. }) => {}
-                _ => {
-                    return Err(format!(
-                        "backend placement disagrees with node {} mode",
-                        node.id.0
-                    ))
-                }
-            }
-        }
-        for sink in &self.precompute_sinks {
-            if !matches!(
-                self.node(*sink),
-                Some(BackendNodeBinding::Materialization { .. })
-            ) {
-                return Err(format!(
-                    "backend precompute sink {} is not materialized",
-                    sink.0
-                ));
-            }
-        }
-        Ok(())
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    // Shared installation metadata must be safe to retain in cross-thread
-    // RuntimePhysicalPlan snapshots without importing the compiler crate.
-    #[test]
-    fn installed_contract_is_send_sync_and_preserves_wire_identity() {
-        fn send_sync<T: Send + Sync>() {}
-        send_sync::<InstalledPostAsapDag>();
-        let wire = serde_json::json!({
-            "schema_version": 2, "query_id": "q", "nodes": [], "edges": [], "root": 0
-        });
-        let document: OwnedPostAsapDag = serde_json::from_value(wire.clone()).unwrap();
-        assert_eq!(serde_json::to_value(document).unwrap(), wire);
-        assert_eq!(serde_json::to_value(QueryNodeId(9)).unwrap(), 9);
-    }
-
-    #[test]
-    fn installed_maintenance_dag_rejects_complete_dag_version() {
-        let installed = InstalledPostAsapDag {
-            document: OwnedPostAsapDag {
-                schema_version: OWNED_POST_ASAP_DAG_SCHEMA_VERSION,
-                query_id: "q".into(),
-                nodes: Vec::new(),
-                edges: Vec::new(),
-                root: PostAsapNodeId(0),
-            },
-            binding: BackendExecutableBinding {
-                nodes: BTreeMap::new(),
-                query_sink: PostAsapNodeId(0),
-                query_plan_sink: QueryNodeId(0),
-                precompute_sinks: Vec::new(),
-            },
-        };
-        assert!(installed
-            .validate()
-            .unwrap_err()
-            .contains("unsupported maintenance DAG"));
-    }
-}
diff --git a/crates/asap_types/src/grouping_projection.rs b/crates/asap_types/src/grouping_projection.rs
deleted file mode 100644
index 23c0ae721..000000000
--- a/crates/asap_types/src/grouping_projection.rs
+++ /dev/null
@@ -1,455 +0,0 @@
-//! Typed source columns defining one summary population key.
-use crate::KeyByLabelNames;
-use planner_types::pre_asap::{Column, DataType};
-use serde::{Deserialize, Deserializer, Serialize, Serializer};
-
-/// Version of the population-key routing contract. Choosing a new version
-/// changes materialization and data identity; it never migrates old SIDs.
-#[derive(Debug, Default, Clone, Copy, PartialEq, Eq, Hash, Serialize, Deserialize)]
-#[serde(rename_all = "snake_case")]
-pub enum PopulationKeyEncoding {
-    #[default]
-    LegacyDelimited,
-    CanonicalLabelsV1,
-}
-impl PopulationKeyEncoding {
-    pub fn is_legacy(&self) -> bool {
-        *self == Self::LegacyDelimited
-    }
-}
-
-#[derive(Debug, Clone, PartialEq, Eq)]
-pub struct GroupingProjection(Vec<Column>);
-
-impl GroupingProjection {
-    pub fn new(mut columns: Vec<Column>) -> Self {
-        columns.sort_by(|a, b| a.name.cmp(&b.name));
-        Self(columns)
-    }
-    pub fn validate(&self) -> Result<(), String> {
-        let mut previous: Option<&str> = None;
-        for column in &self.0 {
-            if column.name.is_empty()
-                || column.table.is_some()
-                || previous == Some(column.name.as_str())
-            {
-                return Err("grouping columns must be unqualified and unique".into());
-            }
-            previous = Some(&column.name);
-        }
-        Ok(())
-    }
-    pub fn validate_table_group_codec(&self) -> Result<(), String> {
-        self.validate()?;
-        for column in self.columns() {
-            crate::table_population::validate_column_name(&column.name)?;
-            if column.nullable {
-                return Err(
-                    "nullable table grouping requires an explicit null-key encoding".into(),
-                );
-            }
-            if !table_group_codec_type(&column.dtype) {
-                return Err(
-                    "table group codec requires integer, string, boolean, or supported Map values"
-                        .into(),
-                );
-            }
-        }
-        Ok(())
-    }
-    pub fn push(&mut self, name: String) {
-        self.0.push(Column::new(name, DataType::Utf8, false));
-        self.0.sort_by(|a, b| a.name.cmp(&b.name));
-        self.0.dedup();
-    }
-    pub fn columns(&self) -> &[Column] {
-        &self.0
-    }
-    pub fn iter(&self) -> impl Iterator<Item = &String> {
-        self.0.iter().map(|c| &c.name)
-    }
-    pub fn is_empty(&self) -> bool {
-        self.0.is_empty()
-    }
-    pub fn names(&self) -> Vec<String> {
-        self.0.iter().map(|c| c.name.clone()).collect()
-    }
-    pub fn label_names(&self) -> KeyByLabelNames {
-        KeyByLabelNames::new(self.names())
-    }
-    pub fn is_legacy_labels(&self) -> bool {
-        self.0
-            .iter()
-            .all(|c| c.dtype == DataType::Utf8 && !c.nullable && c.table.is_none())
-    }
-    pub fn serialize_to_json(&self) -> serde_json::Value {
-        if self.is_legacy_labels() {
-            serde_json::json!(self.names())
-        } else {
-            serde_json::to_value(self).expect("grouping projection serializes")
-        }
-    }
-    pub fn deserialize_from_json(value: &serde_json::Value) -> Result<Self, serde_json::Error> {
-        serde_json::from_value(value.clone())
-    }
-}
-// Float grouping requires SQL equality canonicalization (+0/-0 and NaNs),
-// and timestamps need explicit unit/timezone semantics. Neither is claimed by v1.
-fn table_group_codec_type(dtype: &DataType) -> bool {
-    match dtype {
-        DataType::Int64 | DataType::Utf8 | DataType::Bool => true,
-        DataType::Map { key, value, .. } => {
-            matches!(
-                key.as_ref(),
-                DataType::Int64 | DataType::Utf8 | DataType::Bool
-            ) && table_group_codec_type(value)
-        }
-        _ => false,
-    }
-}
-
-impl From<KeyByLabelNames> for GroupingProjection {
-    fn from(mut names: KeyByLabelNames) -> Self {
-        names.labels.sort();
-        names.labels.dedup();
-        Self::new(
-            names
-                .labels
-                .into_iter()
-                .map(|name| Column::new(name, DataType::Utf8, false))
-                .collect(),
-        )
-    }
-}
-impl FromIterator<String> for GroupingProjection {
-    fn from_iter<T: IntoIterator<Item = String>>(iter: T) -> Self {
-        KeyByLabelNames::new(iter.into_iter().collect()).into()
-    }
-}
-impl<'de> Deserialize<'de> for GroupingProjection {
-    fn deserialize<D: Deserializer<'de>>(deserializer: D) -> Result<Self, D::Error> {
-        #[derive(Deserialize)]
-        #[serde(untagged)]
-        enum Wire {
-            Columns(Vec<Column>),
-            Names(Vec<String>),
-            Legacy(KeyByLabelNames),
-        }
-        Ok(match Wire::deserialize(deserializer)? {
-            Wire::Columns(columns) => Self::new(columns),
-            Wire::Names(names) => KeyByLabelNames::new(names).into(),
-            Wire::Legacy(names) => names.into(),
-        })
-    }
-}
-
-#[cfg(test)]
-mod identity_tests {
-    use super::*;
-    /// A type or nullability change cannot reuse an incompatible summary population.
-    #[test]
-    fn descriptor_identity_includes_group_type_and_nullability() {
-        let legacy = crate::sds::DataDescriptor::new("m", "", vec!["tenant".into()]);
-        let same = legacy
-            .clone()
-            .with_grouping_projection(KeyByLabelNames::new(vec!["tenant".into()]).into());
-        assert_eq!(legacy.id, same.id);
-        let numeric = legacy
-            .clone()
-            .with_grouping_projection(GroupingProjection::new(vec![Column::new(
-                "tenant",
-                DataType::Int64,
-                false,
-            )]));
-        let nullable = legacy
-            .clone()
-            .with_grouping_projection(GroupingProjection::new(vec![Column::new(
-                "tenant",
-                DataType::Utf8,
-                true,
-            )]));
-        assert_ne!(legacy.id, numeric.id);
-        assert_ne!(legacy.id, nullable.id);
-        assert_ne!(numeric.id, nullable.id);
-        assert!(numeric
-            .validate()
-            .unwrap_err()
-            .to_string()
-            .contains("string labels"));
-        assert!(nullable
-            .validate()
-            .unwrap_err()
-            .to_string()
-            .contains("string labels"));
-        for grouping in [numeric.group_by_keys, nullable.group_by_keys] {
-            let table = crate::sds::DataDescriptor::new_typed(
-                crate::sds::DataSourceIdentity::Table {
-                    table_ref: "samples".into(),
-                },
-                crate::sds::ValueProjectionIdentity::Column {
-                    name: "value".into(),
-                },
-                "",
-                Vec::<String>::new(),
-                "table.samples.v1",
-            )
-            .with_grouping_projection(grouping);
-            table.validate().unwrap();
-        }
-    }
-}
-
-impl Serialize for GroupingProjection {
-    fn serialize<S: Serializer>(&self, serializer: S) -> Result<S::Ok, S::Error> {
-        if self.is_legacy_labels() {
-            self.names().serialize(serializer)
-        } else {
-            self.0.serialize(serializer)
-        }
-    }
-}
-
-/// Preserve the older precompute-config object shape for ordinary label groups.
-pub(crate) fn serialize_config_grouping<S: Serializer>(
-    grouping: &GroupingProjection,
-    serializer: S,
-) -> Result<S::Ok, S::Error> {
-    if grouping.is_legacy_labels() {
-        grouping.label_names().serialize(serializer)
-    } else {
-        grouping.serialize(serializer)
-    }
-}
-
-/// Table group values travel through the string-key index as lossless JSON bytes.
-/// Map values use ordered key/value pairs, preserving duplicate keys.
-pub const TABLE_GROUP_OBSERVATION_SEMANTICS: &str = "asap.table-column-groups.base64-json.v1";
-
-pub fn encode_table_group_value(value: &serde_json::Value) -> Result<String, String> {
-    use base64::Engine;
-    let bytes = serde_json::to_vec(value).map_err(|error| error.to_string())?;
-    Ok(base64::engine::general_purpose::STANDARD.encode(bytes))
-}
-
-pub fn decode_table_group_value(encoded: &str) -> Result<serde_json::Value, String> {
-    use base64::Engine;
-    let bytes = base64::engine::general_purpose::STANDARD
-        .decode(encoded)
-        .map_err(|error| error.to_string())?;
-    serde_json::from_slice(&bytes).map_err(|error| error.to_string())
-}
-
-#[cfg(test)]
-mod codec_tests {
-    use super::*;
-    #[test]
-    fn table_group_codec_rejects_noncanonical_float_and_timestamp_keys() {
-        for dtype in [
-            DataType::Float64,
-            DataType::Timestamp,
-            DataType::Map {
-                key: Box::new(DataType::Utf8),
-                value: Box::new(DataType::Float64),
-                value_nullable: false,
-            },
-        ] {
-            assert!(
-                GroupingProjection::new(vec![Column::new("g", dtype, false)])
-                    .validate_table_group_codec()
-                    .is_err()
-            );
-        }
-        assert!(GroupingProjection::new(vec![Column::new(
-            "g",
-            DataType::Map {
-                key: Box::new(DataType::Utf8),
-                value: Box::new(DataType::Int64),
-                value_nullable: true,
-            },
-            false
-        )])
-        .validate_table_group_codec()
-        .is_ok());
-    }
-
-    #[test]
-    fn equivalent_json_spelling_has_one_shared_group_encoding() {
-        use base64::Engine;
-        let first = base64::engine::general_purpose::STANDARD.encode(br#""a\/b""#);
-        let second = base64::engine::general_purpose::STANDARD.encode(br#""a/b""#);
-        assert_ne!(first, second);
-        let normalize = |input: &str| {
-            encode_table_group_value(&decode_table_group_value(input).unwrap()).unwrap()
-        };
-        assert_eq!(normalize(&first), normalize(&second));
-    }
-
-    /// The grouping codec preserves null, escaping, duplicate map keys and exact integers.
-    #[test]
-    fn typed_group_codec_is_lossless_at_numeric_and_string_boundaries() {
-        for value in [
-            serde_json::Value::Null,
-            serde_json::json!("a,\"b\\c\n"),
-            serde_json::json!(i64::MAX),
-            serde_json::json!(i64::MIN),
-            serde_json::json!([["k", i64::MAX], ["k", null]]),
-        ] {
-            let encoded = encode_table_group_value(&value).unwrap();
-            assert!(!encoded.contains(['\"', ',', '\\']));
-            assert_eq!(decode_table_group_value(&encoded).unwrap(), value);
-        }
-        assert!(decode_table_group_value("not base64").is_err());
-    }
-}
-
-/// Canonical label-population identity. This codec does not replace any
-/// persisted routing key implicitly: consumers must select its version as part
-/// of their contract. This key remains scoped by the existing summary/data
-/// definition; it does not replace source identity, partitioning or schema.
-/// Typed table values retain their existing value codec.
-pub const LABEL_POPULATION_KEY_PREFIX: &str = "asap.label-population.v1:";
-
-pub fn encode_label_population_key(
-    labels: &std::collections::BTreeMap<String, String>,
-) -> Result<String, String> {
-    use base64::Engine;
-    let pairs: Vec<_> = labels.iter().collect();
-    let bytes = serde_json::to_vec(&pairs).map_err(|error| error.to_string())?;
-    Ok(format!(
-        "{LABEL_POPULATION_KEY_PREFIX}{}",
-        base64::engine::general_purpose::STANDARD.encode(bytes)
-    ))
-}
-
-#[cfg(test)]
-/// Reject legacy, unknown-version, duplicate-name and noncanonical encodings.
-/// In particular, decoding must never silently collapse duplicate populations.
-pub fn decode_label_population_key(
-    encoded: &str,
-) -> Result<std::collections::BTreeMap<String, String>, String> {
-    use base64::Engine;
-    let payload = encoded
-        .strip_prefix(LABEL_POPULATION_KEY_PREFIX)
-        .ok_or("unsupported label population key version")?;
-    let bytes = base64::engine::general_purpose::STANDARD
-        .decode(payload)
-        .map_err(|error| error.to_string())?;
-    let pairs: Vec<(String, String)> =
-        serde_json::from_slice(&bytes).map_err(|error| error.to_string())?;
-    let mut labels = std::collections::BTreeMap::new();
-    for (key, value) in pairs {
-        if labels.insert(key, value).is_some() {
-            return Err("duplicate label population key".into());
-        }
-    }
-    if encode_label_population_key(&labels)? != encoded {
-        return Err("noncanonical label population key".into());
-    }
-    Ok(labels)
-}
-
-#[cfg(test)]
-mod population_key_tests {
-    use super::*;
-    use std::collections::BTreeMap;
-    #[test]
-    fn delimiter_collisions_and_order_are_unambiguous() {
-        let one = BTreeMap::from([("a".into(), "b;c=d".into())]);
-        let two = BTreeMap::from([("a".into(), "b".into()), ("c".into(), "d".into())]);
-        assert_ne!(
-            encode_label_population_key(&one).unwrap(),
-            encode_label_population_key(&two).unwrap()
-        );
-        let reversed = [("c".into(), "d".into()), ("a".into(), "b".into())]
-            .into_iter()
-            .collect();
-        assert_eq!(
-            encode_label_population_key(&two),
-            encode_label_population_key(&reversed)
-        );
-        for labels in [
-            one,
-            two,
-            BTreeMap::new(),
-            BTreeMap::from([("=;\0雪".into(), "\"\\\n\0".into())]),
-        ] {
-            let key = encode_label_population_key(&labels).unwrap();
-            assert_eq!(decode_label_population_key(&key).unwrap(), labels);
-            let serialized = serde_json::to_string(&key).unwrap();
-            assert_eq!(serde_json::from_str::<String>(&serialized).unwrap(), key);
-        }
-    }
-    #[test]
-    fn unknown_legacy_duplicate_and_noncanonical_keys_fail_closed() {
-        use base64::Engine;
-        for json in [
-            r#"[["a","1"],["a","2"]]"#,
-            r#"[["z","1"],["a","2"]]"#,
-            r#"[ ["a","1"] ]"#,
-        ] {
-            let key = format!(
-                "{LABEL_POPULATION_KEY_PREFIX}{}",
-                base64::engine::general_purpose::STANDARD.encode(json)
-            );
-            assert!(decode_label_population_key(&key).is_err());
-        }
-        for key in [
-            "a=b;",
-            "asap.label-population.v2:W10=",
-            "asap.label-population.v1:!",
-        ] {
-            assert!(decode_label_population_key(key).is_err());
-        }
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    /// Legacy label lists become one non-null string column per name.
-    #[test]
-    fn legacy_and_typed_groups_share_one_projection() {
-        let legacy: GroupingProjection =
-            serde_json::from_value(serde_json::json!({"labels":["job"]})).unwrap();
-        assert_eq!(
-            legacy.columns(),
-            &[Column::new("job", DataType::Utf8, false)]
-        );
-        let typed: GroupingProjection = serde_json::from_value(
-            serde_json::json!([{"name":"job","dtype":"utf8","nullable":false}]),
-        )
-        .unwrap();
-        assert_eq!(typed, legacy);
-        assert_eq!(typed.serialize_to_json(), serde_json::json!(["job"]));
-        assert_eq!(
-            serde_json::to_value(&typed).unwrap(),
-            serde_json::json!(["job"])
-        );
-        #[derive(Serialize)]
-        struct LegacyConfig {
-            #[serde(serialize_with = "serialize_config_grouping")]
-            grouping_labels: GroupingProjection,
-        }
-        assert_eq!(
-            serde_json::to_value(LegacyConfig {
-                grouping_labels: typed
-            })
-            .unwrap(),
-            serde_json::json!({"grouping_labels":{"labels":["job"]}})
-        );
-    }
-    /// Numeric grouping types must survive wire transport rather than become labels.
-    #[test]
-    fn typed_group_retains_type_and_rejects_duplicate_columns() {
-        let typed = GroupingProjection::new(vec![Column::new("tenant", DataType::Int64, true)]);
-        let decoded: GroupingProjection =
-            serde_json::from_value(typed.serialize_to_json()).unwrap();
-        assert_eq!(decoded, typed);
-        assert!(!decoded.is_legacy_labels());
-        let duplicate = GroupingProjection::new(vec![
-            Column::new("tenant", DataType::Int64, true),
-            Column::new("tenant", DataType::Utf8, false),
-        ]);
-        assert!(duplicate.validate().is_err());
-    }
-}
diff --git a/crates/asap_types/src/key_by_label_names.rs b/crates/asap_types/src/key_by_label_names.rs
deleted file mode 100644
index 5cd902b7d..000000000
--- a/crates/asap_types/src/key_by_label_names.rs
+++ /dev/null
@@ -1,147 +0,0 @@
-//! A sorted, set-algebra-bearing label-name key.
-//!
-//! Formerly `promql_utilities::data_model::key_by_label_names` — moved
-//! here for the same reason as [`crate::Statistic`]: `asap_types`
-//! (`PrecomputeMaterialization::grouping_labels`, `PolicyFingerprint`,
-//! `PolicyRegistry`, `capability_matching`) is its real center of
-//! gravity and the shared foundation both `control_plane`'s ecosystem
-//! and `data_plane` can depend on without a cycle. Closer to a runtime
-//! index key than a planning IR node — ASAPController's
-//! `QueryExpr::Aggregate.by` is the nearest relative in spirit, but
-//! carries positional `ColumnId`s, not a sorted, deduplicated label-name
-//! set with `Vec`-style set algebra.
-
-use serde::{Deserialize, Serialize};
-use tracing::debug;
-
-#[derive(Debug, Clone, PartialEq, Eq, Hash, Serialize, Deserialize)]
-pub struct KeyByLabelNames {
-    pub labels: Vec<String>, // Renamed from label_names to match query_logics usage
-}
-
-impl KeyByLabelNames {
-    pub fn new(label_names: Vec<String>) -> Self {
-        debug!("Creating KeyByLabelNames with {} labels", label_names.len());
-        let mut sorted_names = label_names;
-        sorted_names.sort(); // Match Python behavior - keys are sorted
-        debug!("Sorted labels: {:?}", sorted_names);
-        Self {
-            labels: sorted_names,
-        }
-    }
-
-    pub fn empty() -> Self {
-        Self::new(Vec::new())
-    }
-
-    pub fn from_names(names: Vec<String>) -> Self {
-        Self::new(names)
-    }
-
-    pub fn push(&mut self, name: String) {
-        debug!("Adding label: {}", name);
-        self.labels.push(name);
-        self.labels.sort(); // Keep sorted
-    }
-
-    /// Set difference operation - remove labels that are in the other set
-    /// Based on Python implementation: KeyByLabelNames.__sub__
-    pub fn difference(&self, other: &KeyByLabelNames) -> KeyByLabelNames {
-        debug!(
-            "Computing difference between {:?} and {:?}",
-            self.labels, other.labels
-        );
-        let other_set: std::collections::HashSet<_> = other.labels.iter().collect();
-        let result: Vec<String> = self
-            .labels
-            .iter()
-            .filter(|label| !other_set.contains(label))
-            .cloned()
-            .collect();
-        KeyByLabelNames::new(result)
-    }
-
-    /// Set union operation - combine labels from both sets
-    /// Based on Python implementation: KeyByLabelNames.__add__
-    pub fn union(&self, other: &KeyByLabelNames) -> KeyByLabelNames {
-        debug!(
-            "Computing union between {:?} and {:?}",
-            self.labels, other.labels
-        );
-        let mut combined = std::collections::HashSet::new();
-        for label in &self.labels {
-            combined.insert(label.clone());
-        }
-        for label in &other.labels {
-            combined.insert(label.clone());
-        }
-        KeyByLabelNames::new(combined.into_iter().collect())
-    }
-
-    pub fn serialize_to_json(&self) -> serde_json::Value {
-        serde_json::to_value(&self.labels).unwrap_or(serde_json::Value::Null)
-    }
-
-    pub fn deserialize_from_json(data: &serde_json::Value) -> Result<Self, serde_json::Error> {
-        let names: Vec<String> = serde_json::from_value(data.clone())?;
-        Ok(Self::new(names))
-    }
-
-    pub fn is_empty(&self) -> bool {
-        self.labels.is_empty()
-    }
-
-    pub fn len(&self) -> usize {
-        self.labels.len()
-    }
-}
-
-impl Default for KeyByLabelNames {
-    fn default() -> Self {
-        Self::empty()
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    #[test]
-    fn test_key_by_label_names() {
-        let key = KeyByLabelNames::new(vec!["instance".to_string(), "job".to_string()]);
-
-        assert_eq!(key.len(), 2);
-        assert_eq!(key.labels, vec!["instance".to_string(), "job".to_string()]);
-
-        let mut key = KeyByLabelNames::new(vec!["instance".to_string(), "job".to_string()]);
-        key.push("new_label".to_string());
-        assert_eq!(key.len(), 3);
-        // After sorting, should be in alphabetical order
-        assert!(key.labels.contains(&"instance".to_string()));
-        assert!(key.labels.contains(&"job".to_string()));
-        assert!(key.labels.contains(&"new_label".to_string()));
-    }
-
-    #[test]
-    fn test_difference() {
-        let key1 = KeyByLabelNames::new(vec!["a".to_string(), "b".to_string(), "c".to_string()]);
-        let key2 = KeyByLabelNames::new(vec!["b".to_string(), "c".to_string()]);
-
-        let diff = key1.difference(&key2);
-        assert_eq!(diff.len(), 1);
-        assert_eq!(diff.labels, vec!["a".to_string()]);
-    }
-
-    #[test]
-    fn test_union() {
-        let key1 = KeyByLabelNames::new(vec!["a".to_string(), "b".to_string()]);
-        let key2 = KeyByLabelNames::new(vec!["b".to_string(), "c".to_string()]);
-
-        let union = key1.union(&key2);
-        assert_eq!(union.len(), 3);
-        assert_eq!(
-            union.labels,
-            vec!["a".to_string(), "b".to_string(), "c".to_string()]
-        );
-    }
-}
diff --git a/crates/asap_types/src/lib.rs b/crates/asap_types/src/lib.rs
deleted file mode 100644
index 1d4af2fef..000000000
--- a/crates/asap_types/src/lib.rs
+++ /dev/null
@@ -1,43 +0,0 @@
-pub mod accumulator_spec;
-pub mod accuracy;
-pub mod aggregation_config;
-pub mod aggregation_type;
-pub mod derived_input;
-pub mod enums;
-pub mod erp_observation;
-pub mod executable_plan;
-pub mod grouping_projection;
-pub mod key_by_label_names;
-pub mod monitor_spec;
-pub mod plan_publication;
-pub mod policy_fingerprint;
-pub mod policy_registry;
-pub mod producer_plan;
-pub mod query_requirements;
-pub mod routing_index;
-pub mod sds;
-pub mod semantic_fragment;
-pub mod storage_backend;
-pub mod summary_catalog;
-pub mod summary_semantics;
-pub mod table_population;
-pub mod traits;
-pub mod utils;
-
-pub use accumulator_spec::{AccumulatorSpec, AccumulatorSpecError, SampleUpdateRule};
-pub use accuracy::{AccuracyKind, AccuracyProfile};
-pub use aggregation_config::*;
-pub use aggregation_type::AggregationType;
-pub use enums::*;
-pub use grouping_projection::{GroupingProjection, PopulationKeyEncoding};
-pub use key_by_label_names::KeyByLabelNames;
-pub use monitor_spec::{MonitorFunctional, MonitorSpec};
-pub use policy_fingerprint::PolicyFingerprint;
-pub use policy_registry::PolicyRegistry;
-pub use query_requirements::*;
-pub use routing_index::RoutingIndex;
-pub use storage_backend::*;
-
-pub mod precompute_plan;
-
-pub mod query_plan;
diff --git a/crates/asap_types/src/monitor_spec.rs b/crates/asap_types/src/monitor_spec.rs
deleted file mode 100644
index 6aad5ad06..000000000
--- a/crates/asap_types/src/monitor_spec.rs
+++ /dev/null
@@ -1,84 +0,0 @@
-use serde::{Deserialize, Serialize};
-
-/// Continuous-monitoring readout shared by the control and data planes.
-#[derive(Debug, Clone, Copy, PartialEq, Eq, Serialize, Deserialize, Default)]
-#[serde(rename_all = "snake_case")]
-pub enum MonitorFunctional {
-    #[default]
-    Sum,
-    CmsPoint,
-    LinearBuckets,
-    F2,
-}
-
-impl MonitorFunctional {
-    pub const fn as_str(self) -> &'static str {
-        match self {
-            Self::Sum => "sum",
-            Self::CmsPoint => "cms_point",
-            Self::LinearBuckets => "linear_buckets",
-            Self::F2 => "f2",
-        }
-    }
-
-    pub fn from_name(value: &str) -> Self {
-        match value.trim().to_ascii_lowercase().as_str() {
-            "cms_point" | "cms" => Self::CmsPoint,
-            "linear_buckets" | "linear" => Self::LinearBuckets,
-            "f2" | "l2" => Self::F2,
-            _ => Self::Sum,
-        }
-    }
-}
-
-/// One continuous-monitoring (CDM) threshold spec. The data-plane monitor
-/// coordinator owns the AUTHORITATIVE `tau`/`epsilon`/`window_ms` (the edge
-/// copy is advisory), keyed by the same content-addressed `agg_id` the edge and
-/// coordinator share. `key` is the CMS point-frequency key for point monitors
-/// (empty for Sum / whole-stream). See
-/// `ASAPCollector/docs/continuous-monitoring-tumbling-cost-analysis.md`.
-///
-/// Stays here (unlike `data_plane::storage_engines::types::InstalledPrecomputePlan`,
-/// which holds a `Vec<MonitorSpec>` field) because `control_plane` genuinely
-/// needs it: `emit/monitor.rs` builds the `InstalledPrecomputePlan.monitors[]` JSON
-/// entry by hand and has a regression test asserting that JSON deserializes
-/// into this exact type. `control_plane` cannot depend on `data_plane` (the
-/// dependency runs the other way), so this type has to live somewhere both
-/// sides can reach — same reasoning as `PrecomputeMaterialization`/`PolicyFingerprint`.
-#[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
-pub struct MonitorSpec {
-    pub agg_id: u64,
-    /// Additive readout the edge reports: "sum" (default), "cms_point", "f2".
-    /// Pass-through metadata so the edge can auto-learn its reporting mode from
-    /// the pushed config; the coordinator allocation is value-driven and does not
-    /// branch on it (p_i ∝ √(value/rate) is the F2 allocation when value=‖f‖²).
-    #[serde(default)]
-    pub functional: String,
-    /// CMS point-frequency key x; empty (default) for Sum / whole-stream / F2.
-    #[serde(default)]
-    pub key: String,
-    /// Threshold τ (authoritative here, not at the edge).
-    pub tau: f64,
-    /// Relative tolerance ε; the alert fires when the estimate reaches (1−ε)τ.
-    #[serde(default = "default_monitor_epsilon")]
-    pub epsilon: f64,
-    /// Tumbling epoch length in ms; MUST match the edge window for this agg_id.
-    pub window_ms: u64,
-    /// Count-Sketch depth (rows) for whole-sketch `functional="f2"` monitors.
-    /// 0 (default) for scalar monitors; MUST match the edge's Count-Sketch for
-    /// this agg when F2 (both sides square/merge the same cell matrix).
-    #[serde(default)]
-    pub d: usize,
-    /// Count-Sketch width (buckets/row) for F2 monitors; 0 for scalar.
-    #[serde(default)]
-    pub w: usize,
-    /// F2 monitoring variant: "distributed" (default, ship every window) or
-    /// "geometric" (Sharfman–Schuster–Keren safe-zone, ship on local violation).
-    /// Ignored by scalar monitors.
-    #[serde(default)]
-    pub mode: String,
-}
-
-fn default_monitor_epsilon() -> f64 {
-    0.05
-}
diff --git a/crates/asap_types/src/plan_publication.rs b/crates/asap_types/src/plan_publication.rs
deleted file mode 100644
index d678a23d5..000000000
--- a/crates/asap_types/src/plan_publication.rs
+++ /dev/null
@@ -1,211 +0,0 @@
-//! Canonical publication document for one catalog generation.
-use crate::precompute_plan::PrecomputePlan;
-use crate::producer_plan::{CollectorPlan, TransmissionPlan};
-use crate::query_plan::QueryPlan;
-use crate::summary_catalog::SummaryCatalog;
-use serde::{Deserialize, Serialize};
-
-#[derive(Debug, Clone, Serialize, Deserialize)]
-#[serde(deny_unknown_fields)]
-pub struct PhysicalPlanPublication {
-    pub summary_catalog: SummaryCatalog,
-    pub precompute_plan: PrecomputePlan,
-    pub collector_plans: Vec<CollectorPlan>,
-    pub transmission_plan: TransmissionPlan,
-    pub query_plan: QueryPlan,
-}
-
-/// Complete typed envelope accepted by the data-plane install endpoint.
-///
-/// Runtime-only routing and adaptation evidence decorate the shared
-/// publication without changing its catalog generation.
-#[derive(Debug, Clone, Serialize, Deserialize)]
-#[serde(deny_unknown_fields)]
-pub struct PhysicalPlanInstallRequest {
-    pub summary_catalog: SummaryCatalog,
-    #[serde(default)]
-    pub collector_plans: Vec<CollectorPlan>,
-    pub precompute_plan: PrecomputePlan,
-    pub transmission_plan: TransmissionPlan,
-    pub query_plan: QueryPlan,
-    pub storage_routing: Option<serde_json::Value>,
-    #[serde(default)]
-    pub adaptation_evidence: Vec<crate::producer_plan::RuntimeAdaptationEvidence>,
-}
-
-/// A projected writer must refer to the query entry installed in the same
-/// generation.
-pub fn validate_maintenance_query_bindings(
-    precompute: &PrecomputePlan,
-    query: &QueryPlan,
-) -> Result<(), String> {
-    for (query_id, installed) in &precompute.executable_dags {
-        installed.validate()?;
-        let mut entries = query
-            .entries
-            .values()
-            .filter(|entry| &entry.query_id == query_id);
-        let entry = entries
-            .next()
-            .ok_or("maintenance projection has no query entry")?;
-        if entries.next().is_some() {
-            return Err("maintenance projection has ambiguous query entries".into());
-        }
-        if entry.root != installed.binding.query_plan_sink {
-            return Err("maintenance projection and query entry have different roots".into());
-        }
-        let selected = query
-            .selected_dags
-            .get(query_id)
-            .ok_or("maintenance projection has no selected semantic provenance")?;
-        if selected.schema_version != crate::executable_plan::OWNED_POST_ASAP_DAG_SCHEMA_VERSION
-            || selected.query_id != *query_id
-        {
-            return Err("selected semantic provenance has invalid identity/version".into());
-        }
-        selected.decode()?;
-        if installed
-            .document
-            .nodes
-            .iter()
-            .any(|node| !selected.nodes.contains(node))
-            || installed
-                .document
-                .edges
-                .iter()
-                .any(|edge| !selected.edges.contains(edge))
-        {
-            return Err("maintenance projection differs from its selected DAG".into());
-        }
-    }
-    Ok(())
-}
-
-/// Every query read must target the installed writer's exact stored output and
-/// physical window contract. The catalog describes semantics; these choices
-/// belong to the executable plans.
-pub fn validate_stored_output_references(
-    precompute: &PrecomputePlan,
-    query: &QueryPlan,
-) -> Result<(), String> {
-    let writers = precompute
-        .schemas
-        .iter()
-        .map(|schema| (schema.materialization, schema))
-        .collect::<std::collections::BTreeMap<_, _>>();
-    let configs = precompute
-        .materializations
-        .iter()
-        .map(|config| (config.policy_fingerprint().into(), config))
-        .collect::<std::collections::BTreeMap<crate::sds::StoredOutputId, _>>();
-    for entry in query.entries.values() {
-        for binding in entry.materialization_bindings() {
-            let writer = writers.get(&binding.materialization).ok_or_else(|| {
-                format!(
-                    "query binding for definition {} has no precompute stored-summary writer",
-                    binding.materialization.as_u64()
-                )
-            })?;
-            if binding.stored_output_reference != writer.stored_output_reference {
-                return Err(
-                    "query read and precompute writer have different stored outputs".into(),
-                );
-            }
-            let config = configs.get(&binding.materialization).ok_or_else(|| {
-                format!(
-                    "query binding for definition {} has no precompute configuration",
-                    binding.materialization.as_u64()
-                )
-            })?;
-            let full_slide = matches!(
-                config.window_layout,
-                crate::WindowMaterializationLayout::FullWindow
-            )
-            .then_some(config.slide_interval.saturating_mul(1_000));
-            if binding.full_window_slide_ms != full_slide {
-                return Err("query full-window cadence differs from precompute definition".into());
-            }
-            if config.stored_window_ms() != binding.window_ms {
-                return Err("query pane differs from precompute stored window".into());
-            }
-            if config.pane_origin_ms != binding.pane_origin_ms {
-                return Err("query pane origin differs from precompute definition".into());
-            }
-        }
-    }
-    Ok(())
-}
-
-impl PhysicalPlanPublication {
-    /// Validate every plan against the shared catalog snapshot.
-    pub fn validate(&self) -> Result<(), String> {
-        let catalog = &self.summary_catalog;
-        self.precompute_plan
-            .validate_against_catalog(catalog)
-            .map_err(|e| e.to_string())?;
-        self.transmission_plan
-            .validate(&self.precompute_plan)
-            .map_err(|e| e.to_string())?;
-        self.transmission_plan
-            .validate_against_catalog(catalog)
-            .map_err(|e| e.to_string())?;
-        self.query_plan
-            .validate_against_catalog(catalog)
-            .map_err(|e| e.to_string())?;
-        validate_maintenance_query_bindings(&self.precompute_plan, &self.query_plan)?;
-        validate_stored_output_references(&self.precompute_plan, &self.query_plan)?;
-        let mut collectors = std::collections::BTreeSet::new();
-        for collector in &self.collector_plans {
-            if collector.envelope != self.precompute_plan.envelope
-                || !collectors.insert(&collector.collector_id)
-            {
-                return Err("collector envelope mismatch or duplicate collector".into());
-            }
-            collector
-                .validate_against_catalog(catalog)
-                .map_err(|e| e.to_string())?;
-            for rule in &collector.transmission_rules {
-                if !self.transmission_plan.rules.contains(rule) {
-                    return Err(
-                        "collector transmission rule absent from published transmission plan"
-                            .into(),
-                    );
-                }
-            }
-        }
-        for producer in &self.precompute_plan.producers {
-            let collector = self
-                .collector_plans
-                .iter()
-                .find(|c| c.collector_id == producer.collector_id)
-                .ok_or("precompute producer has no published CollectorPlan")?;
-            if !collector
-                .materializations
-                .iter()
-                .any(|m| m.materialization == producer.materialization)
-            {
-                return Err(
-                    "collector does not produce referenced precompute materialization".into(),
-                );
-            }
-        }
-        Ok(())
-    }
-
-    pub fn install_request(
-        &self,
-        storage_routing: Option<serde_json::Value>,
-        adaptation_evidence: Vec<crate::producer_plan::RuntimeAdaptationEvidence>,
-    ) -> Result<PhysicalPlanInstallRequest, String> {
-        self.validate()?;
-        Ok(PhysicalPlanInstallRequest {
-            summary_catalog: self.summary_catalog.clone(),
-            collector_plans: self.collector_plans.clone(),
-            precompute_plan: self.precompute_plan.clone(),
-            transmission_plan: self.transmission_plan.clone(),
-            query_plan: self.query_plan.clone(),
-            storage_routing,
-            adaptation_evidence,
-        })
-    }
-}
diff --git a/crates/asap_types/src/policy_fingerprint.rs b/crates/asap_types/src/policy_fingerprint.rs
deleted file mode 100644
index 42fa2e475..000000000
--- a/crates/asap_types/src/policy_fingerprint.rs
+++ /dev/null
@@ -1,504 +0,0 @@
-//! Legacy routing wrapper for a deployed stored output.
-//!
-//! An explicit `PrecomputeMaterialization::stored_output_id` takes precedence.
-//! Otherwise the compiler allocates a deterministic default from the existing
-//! policy fields (including pane layout and cadence). This identifier is not
-//! semantic identity: `SummaryDefinitionId` hashes the versioned semantic
-//! definition, and several deployed outputs may share that definition.
-//! Catalog installation checks that an output is never assigned conflicting
-//! computation or format contracts.
-
-use serde::{Deserialize, Serialize};
-use std::collections::BTreeMap;
-use xxhash_rust::xxh64::xxh64;
-
-use crate::aggregation_config::PrecomputeMaterialization;
-
-/// Routing handle for one deployed stored output. See the module contract.
-#[derive(
-    Debug, Clone, Copy, Default, PartialEq, Eq, Hash, PartialOrd, Ord, Serialize, Deserialize,
-)]
-#[serde(transparent)]
-pub struct PolicyFingerprint(pub u64);
-
-impl PolicyFingerprint {
-    /// Unset sentinel returned by `Default`. Sinks cannot resolve an unset policy;
-    /// construct valid fingerprints with [`Self::from_config`].
-    pub const UNSET: PolicyFingerprint = PolicyFingerprint(0);
-
-    /// True when this fingerprint is the [`Self::UNSET`] sentinel.
-    pub fn is_unset(self) -> bool {
-        self.0 == 0
-    }
-}
-
-impl PolicyFingerprint {
-    /// Compute the fingerprint of an [`PrecomputeMaterialization`].
-    ///
-    /// Hash inputs are concatenated with `\0` byte separators and
-    /// canonicalized so that map/iteration order can't affect the
-    /// outcome. Parameter values are rendered via `serde_json::to_string`
-    /// for nested-shape determinism (matches the existing
-    /// `parameters_canonical` form used in `AggKind::ExactAgg`).
-    pub fn from_config(cfg: &PrecomputeMaterialization) -> Self {
-        if let Some(output) = cfg.stored_output_id {
-            return output.fingerprint();
-        }
-        let mut buf: Vec<u8> = Vec::with_capacity(512);
-
-        if !cfg.population_key_encoding.is_legacy() {
-            // UTF-8 raw metrics cannot alias this nonlegacy domain prefix.
-            buf.extend_from_slice(b"\xffpopulation-key-canonical-labels-v1\0");
-        }
-        // 1. metric name
-        if cfg.derived_input.is_some() {
-            // Raw policies start with UTF-8 metric bytes; 0xff is impossible
-            // there, so a metric cannot impersonate this source domain.
-            buf.extend_from_slice(b"\xffderived-input-v1:");
-            buf.extend_from_slice(
-                &serde_json::to_vec(&cfg.source_identity()).expect("typed source identity"),
-            );
-        } else {
-            buf.extend_from_slice(cfg.metric.as_bytes());
-        }
-        buf.push(0);
-
-        // 2. aggregation_type (Serialize impl is the stable form)
-        buf.extend_from_slice(
-            serde_json::to_string(&cfg.aggregation_type)
-                .unwrap_or_default()
-                .as_bytes(),
-        );
-        buf.push(0);
-
-        // 3. aggregation_sub_type
-        buf.extend_from_slice(cfg.aggregation_sub_type.as_bytes());
-        buf.push(0);
-
-        // 4. parameters — canonicalized (sorted keys, JSON-rendered values)
-        let sorted: BTreeMap<&String, &serde_json::Value> = cfg.parameters.iter().collect();
-        for (k, v) in sorted {
-            buf.extend_from_slice(k.as_bytes());
-            buf.push(b'=');
-            buf.extend_from_slice(serde_json::to_string(v).unwrap_or_default().as_bytes());
-            buf.push(b';');
-        }
-        buf.push(0);
-
-        if let Some(partitioning) = cfg.partitioning {
-            buf.extend_from_slice(format!("partition:{partitioning:?}\0").as_bytes());
-        }
-
-        // 5. grouping_labels (already sorted at construction per
-        //    KeyByLabelNames invariant; encode as `,`-joined list)
-        for l in &cfg.grouping_labels.names() {
-            buf.extend_from_slice(l.as_bytes());
-            buf.push(b',');
-        }
-        buf.push(0);
-
-        if cfg.table_name.is_some() && !cfg.grouping_labels.is_empty() {
-            buf.extend_from_slice(
-                crate::grouping_projection::TABLE_GROUP_OBSERVATION_SEMANTICS.as_bytes(),
-            );
-            buf.push(0);
-        }
-        if !cfg.grouping_labels.is_legacy_labels() {
-            buf.extend_from_slice(b"typed-grouping:");
-            buf.extend_from_slice(
-                serde_json::to_string(&cfg.grouping_labels)
-                    .expect("group projection serializes")
-                    .as_bytes(),
-            );
-            buf.push(0);
-        }
-
-        // 6. aggregated_labels
-        for l in &cfg.aggregated_labels.labels {
-            buf.extend_from_slice(l.as_bytes());
-            buf.push(b',');
-        }
-        buf.push(0);
-
-        // 7. rollup_labels
-        for l in &cfg.rollup_labels.labels {
-            buf.extend_from_slice(l.as_bytes());
-            buf.push(b',');
-        }
-        buf.push(0);
-
-        // 8. window_size + slide_interval + window_type (cadence)
-        buf.extend_from_slice(&cfg.window_size.to_le_bytes());
-        buf.push(0);
-        buf.extend_from_slice(&cfg.slide_interval.to_le_bytes());
-        buf.push(0);
-        buf.extend_from_slice(
-            serde_json::to_string(&cfg.window_type)
-                .unwrap_or_default()
-                .as_bytes(),
-        );
-        buf.push(0);
-
-        // Physical representation is part of state identity. A full overlapping
-        // window and a mergeable pane layout may share semantic descriptors but
-        // never share payload instances or lifecycle accounting.
-        buf.extend_from_slice(
-            serde_json::to_string(&cfg.window_layout)
-                .unwrap_or_default()
-                .as_bytes(),
-        );
-        buf.push(0);
-
-        // 9. pane origin. Presence is explicit so a legacy definition with
-        // unknown phase cannot alias an epoch-aligned definition.
-        match cfg.pane_origin_ms {
-            Some(origin) => {
-                buf.push(1);
-                buf.extend_from_slice(&origin.to_le_bytes());
-            }
-            None => buf.push(0),
-        }
-        buf.push(0);
-
-        // 10. spatial_filter_normalized — canonicalized predicate
-        buf.extend_from_slice(cfg.spatial_filter_normalized.as_bytes());
-        if let Some(table) = &cfg.table_name {
-            buf.extend_from_slice(b"\0sql-source-v1\0");
-            buf.extend_from_slice(table.as_bytes());
-            buf.push(0);
-            if let Some(column) = cfg.effective_value_projection().column() {
-                buf.extend_from_slice(column.as_bytes());
-            }
-            if matches!(
-                cfg.effective_value_projection(),
-                crate::sds::ValueProjectionIdentity::Constant { .. }
-            ) {
-                buf.extend_from_slice(b"\0constant-projection-v1\0");
-                buf.extend_from_slice(
-                    serde_json::to_string(cfg.effective_value_projection())
-                        .expect("finite validated projection serializes")
-                        .as_bytes(),
-                );
-            }
-        }
-        if let Some(population) = &cfg.table_population {
-            let canonical = population.canonical();
-            if !canonical.is_empty() {
-                buf.push(0);
-                buf.extend_from_slice(canonical.as_bytes());
-            }
-        }
-        if let Some(column) = &cfg.table_timestamp_column {
-            buf.extend_from_slice(b"\0timestamp-ms\0");
-            buf.extend_from_slice(column.as_bytes());
-        }
-
-        Self(xxh64(&buf, 0))
-    }
-
-    /// The raw u64. Use sparingly — prefer comparing `PolicyFingerprint`
-    /// values directly.
-    pub fn as_u64(self) -> u64 {
-        self.0
-    }
-}
-
-impl std::fmt::Display for PolicyFingerprint {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        // Hex form so logs distinguish a fingerprint from a decimal
-        // counter id at a glance.
-        write!(f, "policy_fp:{:016x}", self.0)
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use crate::enums::WindowKind;
-    use crate::AggregationType;
-    use crate::KeyByLabelNames;
-    use std::collections::HashMap;
-
-    fn cfg(
-        metric: &str,
-        agg_type: AggregationType,
-        params: HashMap<String, serde_json::Value>,
-        group_by: Vec<&str>,
-        window_size: u64,
-        spatial_filter: &str,
-    ) -> PrecomputeMaterialization {
-        PrecomputeMaterialization::new(
-            agg_type,
-            String::new(),
-            params,
-            KeyByLabelNames::new(group_by.into_iter().map(|s| s.to_string()).collect()),
-            KeyByLabelNames::empty(),
-            KeyByLabelNames::empty(),
-            String::new(),
-            window_size,
-            window_size,
-            WindowKind::Tumbling,
-            spatial_filter.to_string(),
-            metric.to_string(),
-            None,
-            None,
-            None,
-        )
-    }
-
-    #[test]
-    fn population_encoding_preserves_legacy_wire_and_separates_identity() {
-        use crate::grouping_projection::PopulationKeyEncoding;
-        let legacy = cfg(
-            "m",
-            AggregationType::Sum,
-            HashMap::new(),
-            vec!["host"],
-            60,
-            "",
-        );
-        let wire = serde_json::to_value(&legacy).unwrap();
-        assert!(wire.get("population_key_encoding").is_none());
-        let decoded: PrecomputeMaterialization = serde_json::from_value(wire).unwrap();
-        assert!(decoded.population_key_encoding.is_legacy());
-        assert_eq!(legacy.policy_fingerprint(), decoded.policy_fingerprint());
-        let mut canonical = legacy.clone();
-        canonical.population_key_encoding = PopulationKeyEncoding::CanonicalLabelsV1;
-        assert_ne!(legacy.policy_fingerprint(), canonical.policy_fingerprint());
-        let wire = serde_json::to_value(&canonical).unwrap();
-        assert_eq!(wire["population_key_encoding"], "canonical_labels_v1");
-        let decoded: PrecomputeMaterialization = serde_json::from_value(wire).unwrap();
-        assert_eq!(decoded.policy_fingerprint(), canonical.policy_fingerprint());
-    }
-
-    #[test]
-    fn same_config_yields_same_fingerprint() {
-        let a = cfg(
-            "http_lat",
-            AggregationType::Sum,
-            HashMap::new(),
-            vec!["zone"],
-            60,
-            "",
-        );
-        let b = cfg(
-            "http_lat",
-            AggregationType::Sum,
-            HashMap::new(),
-            vec!["zone"],
-            60,
-            "",
-        );
-        assert_eq!(
-            PolicyFingerprint::from_config(&a),
-            PolicyFingerprint::from_config(&b)
-        );
-    }
-
-    #[test]
-    fn physical_window_layout_is_part_of_state_identity() {
-        let panes = cfg(
-            "http_lat",
-            AggregationType::Sum,
-            HashMap::new(),
-            vec!["zone"],
-            60,
-            "",
-        );
-        let mut full = panes.clone();
-        full.window_layout = crate::WindowMaterializationLayout::FullWindow;
-        assert_ne!(
-            PolicyFingerprint::from_config(&panes),
-            PolicyFingerprint::from_config(&full)
-        );
-    }
-
-    #[test]
-    fn different_metric_yields_different_fingerprint() {
-        let a = cfg(
-            "http_lat",
-            AggregationType::Sum,
-            HashMap::new(),
-            vec![],
-            60,
-            "",
-        );
-        let b = cfg(
-            "cpu_pct",
-            AggregationType::Sum,
-            HashMap::new(),
-            vec![],
-            60,
-            "",
-        );
-        assert_ne!(
-            PolicyFingerprint::from_config(&a),
-            PolicyFingerprint::from_config(&b)
-        );
-    }
-
-    #[test]
-    fn different_window_yields_different_fingerprint() {
-        let a = cfg(
-            "http_lat",
-            AggregationType::Sum,
-            HashMap::new(),
-            vec![],
-            60,
-            "",
-        );
-        let b = cfg(
-            "http_lat",
-            AggregationType::Sum,
-            HashMap::new(),
-            vec![],
-            300,
-            "",
-        );
-        assert_ne!(
-            PolicyFingerprint::from_config(&a),
-            PolicyFingerprint::from_config(&b)
-        );
-    }
-
-    #[test]
-    fn different_spatial_filter_yields_different_fingerprint() {
-        let a = cfg(
-            "http_lat",
-            AggregationType::Sum,
-            HashMap::new(),
-            vec![],
-            60,
-            "",
-        );
-        let b = cfg(
-            "http_lat",
-            AggregationType::Sum,
-            HashMap::new(),
-            vec![],
-            60,
-            r#"status="200""#,
-        );
-        assert_ne!(
-            PolicyFingerprint::from_config(&a),
-            PolicyFingerprint::from_config(&b)
-        );
-    }
-
-    #[test]
-    fn different_group_by_yields_different_fingerprint() {
-        let a = cfg(
-            "http_lat",
-            AggregationType::Sum,
-            HashMap::new(),
-            vec!["zone"],
-            60,
-            "",
-        );
-        let b = cfg(
-            "http_lat",
-            AggregationType::Sum,
-            HashMap::new(),
-            vec!["zone", "service"],
-            60,
-            "",
-        );
-        assert_ne!(
-            PolicyFingerprint::from_config(&a),
-            PolicyFingerprint::from_config(&b)
-        );
-    }
-
-    /// Pre-PR-5 the `aggregation_id` field on `PrecomputeMaterialization` was
-    /// excluded from the fingerprint hash. PR 5 deletes the field
-    /// entirely — identity *is* the fingerprint — so this is now
-    /// vacuously true. Kept as a doc-comment anchor; no runtime test
-    /// is needed.
-    #[test]
-    fn policy_fp_u64_accessor_equals_fingerprint_u64() {
-        let a = cfg(
-            "http_lat",
-            AggregationType::Sum,
-            HashMap::new(),
-            vec![],
-            60,
-            "",
-        );
-        assert_eq!(
-            a.policy_fp_u64(),
-            PolicyFingerprint::from_config(&a).as_u64(),
-        );
-    }
-
-    #[test]
-    fn num_aggregates_to_retain_does_not_affect_fingerprint() {
-        let mut a = cfg(
-            "http_lat",
-            AggregationType::Sum,
-            HashMap::new(),
-            vec![],
-            60,
-            "",
-        );
-        let mut b = a.clone();
-        a.num_aggregates_to_retain = Some(100);
-        b.num_aggregates_to_retain = Some(500);
-        assert_eq!(
-            PolicyFingerprint::from_config(&a),
-            PolicyFingerprint::from_config(&b),
-            "retention is a separate concern from policy identity"
-        );
-    }
-
-    #[test]
-    fn parameter_map_order_does_not_affect_fingerprint() {
-        // HashMap iteration order is non-deterministic; the fingerprint
-        // must be order-independent.
-        let mut p1 = HashMap::new();
-        p1.insert("a".into(), serde_json::json!(1));
-        p1.insert("b".into(), serde_json::json!(2));
-        let mut p2 = HashMap::new();
-        p2.insert("b".into(), serde_json::json!(2));
-        p2.insert("a".into(), serde_json::json!(1));
-        let a = cfg("http_lat", AggregationType::Sum, p1, vec![], 60, "");
-        let b = cfg("http_lat", AggregationType::Sum, p2, vec![], 60, "");
-        assert_eq!(
-            PolicyFingerprint::from_config(&a),
-            PolicyFingerprint::from_config(&b)
-        );
-    }
-
-    #[test]
-    fn spatial_filter_canonicalization_drives_fingerprint() {
-        // Two filters that differ only in matcher ordering produce the
-        // SAME normalized form, hence the SAME fingerprint. The
-        // canonicalization step in `PrecomputeMaterialization::new` (via
-        // `normalize_spatial_filter`) sorts matchers by key.
-        let a = cfg(
-            "http_lat",
-            AggregationType::Sum,
-            HashMap::new(),
-            vec![],
-            60,
-            r#"status="200",zone="us""#,
-        );
-        let b = cfg(
-            "http_lat",
-            AggregationType::Sum,
-            HashMap::new(),
-            vec![],
-            60,
-            r#"zone="us",status="200""#,
-        );
-        assert_eq!(
-            PolicyFingerprint::from_config(&a),
-            PolicyFingerprint::from_config(&b)
-        );
-    }
-
-    #[test]
-    fn display_format_is_hex_with_prefix() {
-        let fp = PolicyFingerprint(0xdeadbeef);
-        assert_eq!(format!("{}", fp), "policy_fp:00000000deadbeef");
-    }
-}
diff --git a/crates/asap_types/src/policy_registry.rs b/crates/asap_types/src/policy_registry.rs
deleted file mode 100644
index 90138b139..000000000
--- a/crates/asap_types/src/policy_registry.rs
+++ /dev/null
@@ -1,169 +0,0 @@
-//! Content-addressed policy registry.
-//!
-//! Derived view over a collection of `PrecomputeMaterialization`s that maps
-//! [`PolicyFingerprint`] → [`PrecomputeMaterialization`]. This is the
-//! merged-sid-identity-chain replacement for the controller-allocated
-//! `aggregation_id`-keyed `HashMap` that `data_plane`'s `InstalledPrecomputePlan`
-//! carries (see `data_plane::storage_engines::types::installed_precompute_plan`'s
-//! module doc for why that type lives there, not here).
-//!
-//! ## Dual-keyed transition
-//!
-//! PR 3 (where this lives): the registry exists alongside the
-//! `aggregation_id`-keyed map. Callers can opt into either lookup.
-//! Construction is `O(N)` over the source configs; computation is
-//! pure (no I/O, no mutation of the source).
-//!
-//! Subsequent PRs migrate one set of callers at a time off
-//! `aggregation_id` → `PolicyFingerprint`, until the final PR can
-//! delete the legacy index.
-//!
-//! ## Identity invariants
-//!
-//! Two `PrecomputeMaterialization`s that produce the same `PolicyFingerprint`
-//! ARE the same policy. The registry treats this as a *deduplication*
-//! invariant — if two distinct entries in the source `materializations_by_output`
-//! map produce the same fingerprint, the later one wins (last-write
-//! semantics). In practice the source should never contain duplicates;
-//! if it does, that's a control-plane bug worth surfacing in telemetry
-//! (see [`PolicyRegistry::from_configs_with_collisions`]).
-
-use std::collections::HashMap;
-
-use crate::aggregation_config::PrecomputeMaterialization;
-use crate::policy_fingerprint::PolicyFingerprint;
-
-/// Content-addressed lookup table for active aggregation policies.
-#[derive(Debug, Clone, Default)]
-pub struct PolicyRegistry {
-    policies: HashMap<PolicyFingerprint, PrecomputeMaterialization>,
-}
-
-impl PolicyRegistry {
-    /// Construct from a list of configs. Duplicates (same fingerprint)
-    /// collapse to the last entry; use
-    /// [`Self::from_configs_with_collisions`] when you want to detect
-    /// them.
-    pub fn from_configs<I>(configs: I) -> Self
-    where
-        I: IntoIterator<Item = PrecomputeMaterialization>,
-    {
-        let mut policies = HashMap::new();
-        for cfg in configs {
-            policies.insert(PolicyFingerprint::from_config(&cfg), cfg);
-        }
-        Self { policies }
-    }
-
-    #[cfg(test)]
-    /// Construct + report the count of duplicate fingerprints (entries
-    /// where the source contained two configs producing the same
-    /// fingerprint and the later one displaced the earlier). Zero in
-    /// the well-formed case; non-zero is a control-plane bug worth
-    /// surfacing.
-    pub fn from_configs_with_collisions<I>(configs: I) -> (Self, usize)
-    where
-        I: IntoIterator<Item = PrecomputeMaterialization>,
-    {
-        let mut policies = HashMap::new();
-        let mut collisions = 0usize;
-        for cfg in configs {
-            let fp = PolicyFingerprint::from_config(&cfg);
-            if policies.insert(fp, cfg).is_some() {
-                collisions += 1;
-            }
-        }
-        (Self { policies }, collisions)
-    }
-
-    /// Look up the config for a fingerprint.
-    pub fn get(&self, fp: PolicyFingerprint) -> Option<&PrecomputeMaterialization> {
-        self.policies.get(&fp)
-    }
-
-    /// Iterate fingerprint → config pairs.
-    pub fn iter(&self) -> impl Iterator<Item = (&PolicyFingerprint, &PrecomputeMaterialization)> {
-        self.policies.iter()
-    }
-
-    /// Live policy count.
-    pub fn len(&self) -> usize {
-        self.policies.len()
-    }
-
-    pub fn is_empty(&self) -> bool {
-        self.policies.is_empty()
-    }
-
-    /// All fingerprints currently registered. Useful for diffing two
-    /// registries during a hot-reload swap.
-    pub fn fingerprints(&self) -> impl Iterator<Item = PolicyFingerprint> + '_ {
-        self.policies.keys().copied()
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use crate::enums::WindowKind;
-    use crate::AggregationType;
-    use crate::KeyByLabelNames;
-    use std::collections::HashMap as StdHashMap;
-
-    fn cfg(_id: u64, metric: &str) -> PrecomputeMaterialization {
-        // `_id` is unused after PR 5 — identity is derived from
-        // content. Kept as a parameter so existing call sites in the
-        // tests below don't churn.
-        PrecomputeMaterialization::new(
-            AggregationType::Sum,
-            String::new(),
-            StdHashMap::new(),
-            KeyByLabelNames::empty(),
-            KeyByLabelNames::empty(),
-            KeyByLabelNames::empty(),
-            String::new(),
-            60,
-            60,
-            WindowKind::Tumbling,
-            String::new(),
-            metric.to_string(),
-            None,
-            None,
-            None,
-        )
-    }
-
-    #[test]
-    fn from_configs_round_trips_lookup() {
-        let a = cfg(1, "http_lat");
-        let b = cfg(2, "cpu_pct");
-        let fp_a = PolicyFingerprint::from_config(&a);
-        let fp_b = PolicyFingerprint::from_config(&b);
-        let reg = PolicyRegistry::from_configs(vec![a.clone(), b.clone()]);
-        assert_eq!(reg.len(), 2);
-        assert_eq!(reg.get(fp_a).unwrap().metric, "http_lat");
-        assert_eq!(reg.get(fp_b).unwrap().metric, "cpu_pct");
-    }
-
-    #[test]
-    fn identical_configs_collapse_to_one_entry() {
-        // PR 5: identity IS the content. Two configs that are
-        // byte-for-byte identical on the policy-relevant fields
-        // collapse to ONE entry — there's no way to distinguish them
-        // anymore.
-        let a = cfg(1, "http_lat");
-        let b = cfg(99, "http_lat");
-        let (reg, collisions) = PolicyRegistry::from_configs_with_collisions(vec![a, b]);
-        assert_eq!(reg.len(), 1);
-        assert_eq!(collisions, 1);
-    }
-
-    #[test]
-    fn distinct_policies_keep_distinct_entries() {
-        let a = cfg(1, "http_lat");
-        let b = cfg(1, "cpu_pct"); // different metric → distinct policies
-        let (reg, collisions) = PolicyRegistry::from_configs_with_collisions(vec![a, b]);
-        assert_eq!(reg.len(), 2);
-        assert_eq!(collisions, 0);
-    }
-}
diff --git a/crates/asap_types/src/precompute_plan.rs b/crates/asap_types/src/precompute_plan.rs
deleted file mode 100644
index 05227b679..000000000
--- a/crates/asap_types/src/precompute_plan.rs
+++ /dev/null
@@ -1,1161 +0,0 @@
-//! Shared precompute installation contract and catalog consistency checks.
-//! Compilation chooses these values; runtime consumers validate the same DTO.
-
-mod catalog;
-
-use planner_types::post_asap::{SketchAlgorithm, SketchParams, SummaryFamilyType};
-use planner_types::pre_asap::Source;
-use serde::{Deserialize, Serialize};
-use std::collections::{BTreeMap, BTreeSet, HashMap};
-use thiserror::Error;
-
-/// Check the initial executable maintenance population reductions against the
-/// installed configuration. Indexed reductions need authoritative column mapping
-/// and are not admitted by this bounded capability check.
-pub fn validate_maintenance_reduction(
-    config: &crate::PrecomputeMaterialization,
-    node: &planner_types::post_asap::ExecutableDagNode,
-) -> Result<(), String> {
-    use crate::sds::PopulationPartitioning;
-    use planner_types::{post_asap::ExecutableOperatorPayload, pre_asap::Reduction};
-    match &node.payload {
-        ExecutableOperatorPayload::SummaryAgg {
-            reduction: Reduction::PerEntity,
-            ..
-        } if config.partitioning == Some(PopulationPartitioning::PerEntity) => Ok(()),
-        ExecutableOperatorPayload::SummaryAgg {
-            reduction: Reduction::Reduce(keys),
-            ..
-        } if keys.is_empty()
-            && config.partitioning == Some(PopulationPartitioning::Grouped)
-            && config.grouping_labels.is_empty() =>
-        {
-            Ok(())
-        }
-        _ => Err(
-            "maintenance reduction does not match supported configured population grouping".into(),
-        ),
-    }
-}
-
-/// Validate the physical windows consumed by one derived input program.
-/// This returns the existing source definitions, not a second serialized
-/// contract. It does not prove completion or authorize runtime execution.
-/// Full-window sliding is lossless here; pane merging requires a separate
-/// explicit operator and is deliberately not inferred from window sizes.
-pub fn validated_source_window_cohort<'a>(
-    target: &crate::PrecomputeMaterialization,
-    sources: &[&'a crate::PrecomputeMaterialization],
-) -> Result<Vec<&'a crate::PrecomputeMaterialization>, PrecomputePlanError> {
-    let invalid = || {
-        PrecomputePlanError::CatalogContract(
-            "derived inputs require matching explicit full stored windows".into(),
-        )
-    };
-    let full_ms = target.window_size.checked_mul(1000).ok_or_else(invalid)?;
-    if sources.is_empty()
-        || full_ms == 0
-        || target.slide_interval == 0
-        || target.slide_interval > target.window_size
-        || (target.slide_interval < target.window_size && target.pane_origin_ms.is_none())
-        || target.stored_window_ms() != full_ms
-        || (target.slide_interval < target.window_size
-            && !matches!(
-                target.window_layout,
-                crate::WindowMaterializationLayout::FullWindow
-            ))
-    {
-        return Err(invalid());
-    }
-    let mut identities = BTreeSet::new();
-    for source in sources {
-        if source.derived_input.is_some()
-            || !identities.insert(source.policy_fingerprint())
-            || source.window_size != target.window_size
-            || source.slide_interval != target.slide_interval
-            || source.pane_origin_ms != target.pane_origin_ms
-            || source.stored_window_ms() != full_ms
-            || (source.slide_interval < source.window_size
-                && !matches!(
-                    source.window_layout,
-                    crate::WindowMaterializationLayout::FullWindow
-                ))
-        {
-            return Err(invalid());
-        }
-    }
-    Ok(sources.to_vec())
-}
-
-pub const BACKEND_COMPAT: &str = "asap-query-backend.v1";
-
-#[derive(Debug, Clone, Serialize, Deserialize, PartialEq, Eq)]
-pub struct PlanEnvelope {
-    pub plan_id: u64,
-    pub plan_version: u64,
-    pub generated_at_unix_ms: u64,
-    pub activation_unix_ms: u64,
-    pub expiry_unix_ms: Option<u64>,
-    pub backend_compat: String,
-    pub planner_revision: String,
-    pub capability_snapshot_id: String,
-}
-
-/// DAG-format precompute installation. Planner node payloads and dependency
-/// edges define execution; materializations attach storage/window placement.
-/// Raw source-to-SummaryAgg paths lower to streaming kernels. Derived paths
-/// execute through the maintenance DAG scheduler at stored-state frontiers.
-#[derive(Debug, Clone, Serialize, Deserialize)]
-pub struct PrecomputePlan {
-    #[serde(default, skip_serializing_if = "Option::is_none")]
-    pub summary_catalog: Option<crate::sds::CatalogGeneration>,
-    pub envelope: PlanEnvelope,
-    pub ingest: IngestContract,
-    pub schemas: Vec<StateSchemaContract>,
-    pub producers: Vec<ProducerContract>,
-    pub materializations: Vec<crate::PrecomputeMaterialization>,
-    /// Maintenance projections ending at stored outputs.
-    #[serde(default, skip_serializing_if = "BTreeMap::is_empty")]
-    pub executable_dags: BTreeMap<String, crate::executable_plan::InstalledPostAsapDag>,
-}
-
-#[derive(Debug, Clone, Serialize, Deserialize, PartialEq, Eq)]
-#[serde(rename_all = "snake_case")]
-pub enum IngestProtocol {
-    ModifiedOtlpMetricsV1,
-    PrometheusRemoteWriteV1,
-}
-
-#[derive(Debug, Clone, Serialize, Deserialize, PartialEq, Eq)]
-#[serde(rename_all = "snake_case")]
-pub enum TimestampUnit {
-    UnixNanoseconds,
-    UnixMilliseconds,
-}
-
-/// Backend ingress semantics installed with the precompute projection. This
-/// replaces implicit knowledge formerly hidden in the streaming-config path.
-#[derive(Debug, Clone, Serialize, Deserialize, PartialEq, Eq)]
-#[serde(deny_unknown_fields)]
-pub struct IngestContract {
-    #[serde(default, skip_serializing_if = "Option::is_none")]
-    pub dataset_identity: Option<planner_types::post_asap::LogicalDatasetIdentity>,
-    pub protocol: IngestProtocol,
-    pub endpoint_path: String,
-    pub timestamp_unit: TimestampUnit,
-    pub require_plan_identity: bool,
-    pub require_stored_output_identity: bool,
-    pub require_registered_producer: bool,
-}
-
-#[derive(Debug, Clone, Serialize, Deserialize, PartialEq, Eq, PartialOrd, Ord)]
-#[serde(rename_all = "snake_case")]
-pub enum StateEncoding {
-    SketchlibProtobufV1,
-    SketchCoreMsgpackV1,
-    ExactAccumulatorV1,
-    /// Persisted backend state with explicit Planner family and population layout.
-    PlannerExactAccumulatorV1,
-    ExactCounterAccumulatorV2,
-}
-
-/// Serializable physical state identity derived from Planner's canonical
-/// summary family. This is a wire DTO, not a second planning algebra.
-#[derive(Debug, Clone, Serialize, Deserialize, PartialEq)]
-#[serde(tag = "family", rename_all = "snake_case", deny_unknown_fields)]
-pub enum StateFamilyContract {
-    Exact {
-        kind: ExactStateKind,
-    },
-    Sketch {
-        algorithm: SketchAlgorithm,
-        parameters: SketchParams,
-    },
-}
-
-#[derive(Debug, Clone, Copy, Serialize, Deserialize, PartialEq, Eq)]
-#[serde(rename_all = "snake_case")]
-pub enum ExactStateKind {
-    Sum,
-    Count,
-    /// Exact minimum. Distinct state from [`ExactStateKind::Max`] -- a
-    /// stored minimum cannot answer a maximum query, so the two must
-    /// never share a content address.
-    Min,
-    /// Exact maximum. Planner still spells this `ExactKind::Max` for
-    /// historical reasons; it is a maximum accumulator.
-    Max,
-    Increase,
-    Rate,
-    IRate,
-}
-
-impl TryFrom<&SummaryFamilyType> for StateFamilyContract {
-    type Error = ();
-
-    fn try_from(family: &SummaryFamilyType) -> Result<Self, Self::Error> {
-        use planner_types::post_asap::ExactKind;
-        Ok(match family {
-            SummaryFamilyType::ExactAggregate(kind, _) => Self::Exact {
-                kind: match kind {
-                    ExactKind::Sum => ExactStateKind::Sum,
-                    ExactKind::Count => ExactStateKind::Count,
-                    ExactKind::Max => ExactStateKind::Max,
-                    ExactKind::Min => ExactStateKind::Min,
-                    ExactKind::Increase => ExactStateKind::Increase,
-                    ExactKind::Rate => ExactStateKind::Rate,
-                    ExactKind::IRate => ExactStateKind::IRate,
-                },
-            },
-            SummaryFamilyType::Sketch(kind, _) => Self::Sketch {
-                algorithm: kind.algorithm().clone(),
-                parameters: kind.params().clone(),
-            },
-            _ => return Err(()),
-        })
-    }
-}
-
-/// Decoder/schema contract for one content-addressed materialization.
-#[derive(Debug, Clone, Serialize, Deserialize, PartialEq)]
-#[serde(deny_unknown_fields)]
-pub struct StateSchemaContract {
-    pub stored_output_reference: crate::sds::StoredOutputReference,
-    pub schema_id: String,
-    pub schema_version: u32,
-    pub materialization: crate::sds::StoredOutputId,
-    pub family: StateFamilyContract,
-    pub source: Source,
-    pub value_projection: crate::sds::ValueProjectionIdentity,
-    pub group_by: crate::GroupingProjection,
-    pub window: StateWindowContract,
-    pub encodings: Vec<StateEncoding>,
-}
-
-#[derive(Debug, Clone, Serialize, Deserialize, PartialEq, Eq)]
-#[serde(deny_unknown_fields)]
-pub struct StateWindowContract {
-    pub kind: crate::WindowKind,
-    pub size_ms: u64,
-    pub slide_ms: Option<u64>,
-    #[serde(default, skip_serializing_if = "Option::is_none")]
-    pub pane_origin_ms: Option<i64>,
-}
-
-/// A collector authorized to produce state for one materialization. Runtime
-/// producer epochs and frame sequences belong to TransmissionPlan.
-#[derive(Debug, Clone, Serialize, Deserialize, PartialEq, Eq, PartialOrd, Ord)]
-#[serde(deny_unknown_fields)]
-pub struct ProducerContract {
-    pub producer_id: String,
-    pub collector_id: String,
-    pub materialization: crate::sds::StoredOutputId,
-    pub schema_id: String,
-    /// Authoritative partitions for completion barriers. An explicitly empty
-    /// roster cannot authorize completion claims.
-    pub partition_ids: BTreeSet<String>,
-}
-
-#[derive(Debug, Error, PartialEq, Eq)]
-pub enum PrecomputePlanError {
-    #[error("invalid precompute catalog contract: {0}")]
-    CatalogContract(String),
-    #[error("PrecomputePlan envelope does not match its SummaryCatalog identity/lifecycle")]
-    PlanIdentityMismatch,
-    #[error("unsupported precompute ingest protocol/endpoint/identity contract")]
-    UnsupportedIngestEndpoint,
-    #[error("duplicate materialization {0}")]
-    DuplicateMaterialization(u64),
-    #[error("schema set does not exactly match the materialization set")]
-    SchemaSetMismatch,
-    #[error("schema {schema_id} has invalid version or no encoding")]
-    InvalidSchema { schema_id: String },
-    #[error("materialization {0} uses a summary family unsupported by the runtime schema")]
-    UnsupportedFamily(u64),
-    #[error("materialization {materialization} has an invalid window layout: {reason}")]
-    InvalidWindowLayout {
-        materialization: u64,
-        reason: String,
-    },
-    #[error("producer {producer_id} references an unknown materialization or schema")]
-    InvalidProducer { producer_id: String },
-    #[error("materialization {0} has no registered producer")]
-    MissingProducer(u64),
-    #[error("duplicate producer binding {0}")]
-    DuplicateProducer(String),
-}
-
-impl PrecomputePlan {
-    pub fn build(
-        envelope: PlanEnvelope,
-        materializations: Vec<crate::PrecomputeMaterialization>,
-        producer_ids: &[String],
-    ) -> Result<Self, PrecomputePlanError> {
-        Self::build_complete(
-            envelope,
-            materializations,
-            producer_ids,
-            false,
-            BTreeMap::new(),
-        )
-    }
-
-    fn build_complete(
-        envelope: PlanEnvelope,
-        materializations: Vec<crate::PrecomputeMaterialization>,
-        producer_ids: &[String],
-        backend_local: bool,
-        executable_dags: BTreeMap<String, crate::executable_plan::InstalledPostAsapDag>,
-    ) -> Result<Self, PrecomputePlanError> {
-        let schemas = materializations
-            .iter()
-            .map(|materialization| {
-                let fingerprint = materialization.policy_fingerprint();
-                let accumulator = materialization
-                    .accumulator_spec()
-                    .map_err(|_| PrecomputePlanError::UnsupportedFamily(fingerprint.0))?;
-                let family = StateFamilyContract::try_from(&accumulator.family)
-                    .map_err(|_| PrecomputePlanError::UnsupportedFamily(fingerprint.0))?;
-                let source = materialization.table_name.as_ref().map_or_else(
-                    || Source::TimeSeries {
-                        metric: materialization.metric.clone(),
-                    },
-                    |table_ref| Source::Table {
-                        table_ref: table_ref.clone(),
-                    },
-                );
-                let value_projection = materialization.effective_value_projection().clone();
-                Ok(StateSchemaContract {
-                    stored_output_reference: crate::sds::StoredOutputReference::for_output(
-                        fingerprint.into(),
-                    ),
-                    schema_id: state_schema_id(fingerprint),
-                    schema_version: 1,
-                    materialization: fingerprint.into(),
-                    family,
-                    source,
-                    value_projection,
-                    group_by: materialization.grouping_labels.clone(),
-                    window: StateWindowContract {
-                        kind: materialization.window_type,
-                        size_ms: materialization.window_size.saturating_mul(1_000),
-                        slide_ms: match materialization.window_type {
-                            crate::WindowKind::Tumbling => None,
-                            crate::WindowKind::Sliding => {
-                                Some(materialization.slide_interval.saturating_mul(1_000))
-                            }
-                            crate::WindowKind::Session => None,
-                        },
-                        pane_origin_ms: materialization.pane_origin_ms,
-                    },
-                    encodings: state_encodings(&accumulator.family),
-                })
-            })
-            .collect::<Result<Vec<_>, PrecomputePlanError>>()?;
-        let producers = producer_ids
-            .iter()
-            .flat_map(|producer_id| {
-                schemas.iter().map(move |schema| ProducerContract {
-                    producer_id: producer_id.clone(),
-                    collector_id: producer_id.clone(),
-                    materialization: schema.materialization,
-                    schema_id: schema.schema_id.clone(),
-                    partition_ids: BTreeSet::new(),
-                })
-            })
-            .collect();
-        let dataset_identity = materializations
-            .iter()
-            .filter_map(|m| m.semantic_fragment.as_ref()?.dataset_identity.clone())
-            .next();
-        let plan = Self {
-            summary_catalog: None,
-            envelope,
-            ingest: if backend_local {
-                IngestContract {
-                    dataset_identity: dataset_identity.clone(),
-                    protocol: IngestProtocol::PrometheusRemoteWriteV1,
-                    endpoint_path: "/api/v1/write".into(),
-                    timestamp_unit: TimestampUnit::UnixMilliseconds,
-                    require_plan_identity: false,
-                    require_stored_output_identity: false,
-                    require_registered_producer: false,
-                }
-            } else {
-                IngestContract {
-                    dataset_identity: dataset_identity.clone(),
-                    protocol: IngestProtocol::ModifiedOtlpMetricsV1,
-                    endpoint_path: "/v1/metrics".into(),
-                    timestamp_unit: TimestampUnit::UnixNanoseconds,
-                    require_plan_identity: true,
-                    require_stored_output_identity: true,
-                    require_registered_producer: true,
-                }
-            },
-            schemas,
-            producers,
-            materializations,
-            executable_dags,
-        };
-        plan.validate()?;
-        Ok(plan)
-    }
-
-    /// Build the backend-local projection used when raw Prometheus samples
-    /// are precomputed inside ASAPQuery rather than by ASAPCollector.
-    pub fn build_backend_local(
-        envelope: PlanEnvelope,
-        materializations: Vec<crate::PrecomputeMaterialization>,
-    ) -> Result<Self, PrecomputePlanError> {
-        Self::build_backend_local_with_dags(envelope, materializations, BTreeMap::new())
-    }
-
-    /// Construct the complete backend-local contract before validation. Derived
-    /// definitions are never validated without their actual executable bindings.
-    pub fn build_backend_local_with_dags(
-        envelope: PlanEnvelope,
-        materializations: Vec<crate::PrecomputeMaterialization>,
-        executable_dags: BTreeMap<String, crate::executable_plan::InstalledPostAsapDag>,
-    ) -> Result<Self, PrecomputePlanError> {
-        Self::build_complete(envelope, materializations, &[], true, executable_dags)
-    }
-
-    pub fn runtime_materializations(
-        &self,
-    ) -> Result<
-        HashMap<crate::sds::StoredOutputId, crate::PrecomputeMaterialization>,
-        PrecomputePlanError,
-    > {
-        self.validate()?;
-        Ok(self
-            .materializations
-            .iter()
-            .cloned()
-            .map(|materialization| {
-                (
-                    crate::sds::StoredOutputId(materialization.policy_fp_u64()),
-                    materialization,
-                )
-            })
-            .collect())
-    }
-
-    /// Validate a barrier's installed scope, not authentication, durability or
-    /// monotonic progress. The runtime must enforce those before accepting it.
-    pub fn validate_watermark_scope(
-        &self,
-        materialization: crate::sds::StoredOutputId,
-        barrier: &crate::sds::SummaryWatermarkBarrier,
-    ) -> Result<(), PrecomputePlanError> {
-        self.validate()?;
-        barrier
-            .validate()
-            .map_err(|error| PrecomputePlanError::CatalogContract(error.to_string()))?;
-        if self.summary_catalog.as_ref() != Some(&barrier.catalog_generation)
-            || self.envelope.plan_id != barrier.catalog_generation.plan_id
-            || self.envelope.plan_version != barrier.catalog_generation.plan_version
-        {
-            return Err(PrecomputePlanError::CatalogContract(
-                "watermark catalog generation does not match installed plan".into(),
-            ));
-        }
-        if !self.producers.iter().any(|producer| {
-            producer.materialization == materialization
-                && producer.producer_id == barrier.source.producer_id
-                && producer
-                    .partition_ids
-                    .contains(&barrier.source.partition_id)
-        }) {
-            return Err(PrecomputePlanError::CatalogContract(
-                "watermark source is outside the authoritative partition roster".into(),
-            ));
-        }
-        Ok(())
-    }
-
-    pub fn validate(&self) -> Result<(), PrecomputePlanError> {
-        if let Some(dataset) = &self.ingest.dataset_identity {
-            dataset
-                .validate()
-                .map_err(PrecomputePlanError::CatalogContract)?;
-        }
-        for materialization in &self.materializations {
-            if let Some(fragment) = &materialization.semantic_fragment {
-                fragment
-                    .validate()
-                    .map_err(PrecomputePlanError::CatalogContract)?;
-                if fragment.dataset_identity != self.ingest.dataset_identity {
-                    return Err(PrecomputePlanError::CatalogContract(
-                        "semantic dataset differs from installed input binding".into(),
-                    ));
-                }
-            }
-        }
-        let valid_ingest = match self.ingest.protocol {
-            IngestProtocol::ModifiedOtlpMetricsV1 => {
-                self.ingest.endpoint_path == "/v1/metrics"
-                    && self.ingest.timestamp_unit == TimestampUnit::UnixNanoseconds
-                    && self.ingest.require_plan_identity
-                    && self.ingest.require_stored_output_identity
-                    && self.ingest.require_registered_producer
-            }
-            IngestProtocol::PrometheusRemoteWriteV1 => {
-                self.ingest.endpoint_path == "/api/v1/write"
-                    && self.ingest.timestamp_unit == TimestampUnit::UnixMilliseconds
-                    && !self.ingest.require_plan_identity
-                    && !self.ingest.require_stored_output_identity
-                    && !self.ingest.require_registered_producer
-            }
-        };
-        if !valid_ingest {
-            return Err(PrecomputePlanError::UnsupportedIngestEndpoint);
-        }
-        let canonical_cohort_members: BTreeSet<_> = self
-            .materializations
-            .iter()
-            .filter(|config| !config.population_key_encoding.is_legacy())
-            .filter_map(|config| config.derived_input.as_ref().map(|input| (config, input)))
-            .flat_map(|(config, input)| {
-                std::iter::once(config.policy_fingerprint().into())
-                    .chain(input.inputs.iter().copied())
-            })
-            .collect();
-        for config in &self.materializations {
-            if !config.population_key_encoding.is_legacy()
-                && (self.ingest.protocol != IngestProtocol::PrometheusRemoteWriteV1
-                    || !canonical_cohort_members.contains(&config.policy_fingerprint().into()))
-            {
-                return Err(PrecomputePlanError::CatalogContract(
-                    "population key encoding is not supported by the installed runtime".into(),
-                ));
-            }
-            let Some(derived) = &config.derived_input else {
-                continue;
-            };
-            let invalid = || {
-                PrecomputePlanError::CatalogContract(
-                    "derived summary input requires an installed aligned immutable maintenance DAG"
-                        .into(),
-                )
-            };
-            if self.ingest.protocol != IngestProtocol::PrometheusRemoteWriteV1
-                || derived.inputs.is_empty()
-            {
-                return Err(invalid());
-            }
-            let sources = derived
-                .inputs
-                .iter()
-                .map(|id| {
-                    self.materializations
-                        .iter()
-                        .find(|candidate| candidate.policy_fingerprint() == id.fingerprint())
-                        .ok_or_else(invalid)
-                })
-                .collect::<Result<Vec<_>, _>>()?;
-            if !config.population_key_encoding.is_legacy() {
-                if config.partitioning != Some(crate::sds::PopulationPartitioning::Grouped)
-                    || !config.grouping_labels.is_empty()
-                    || sources.iter().any(|source| {
-                        source.population_key_encoding != config.population_key_encoding
-                    })
-                {
-                    return Err(invalid());
-                }
-            } else if sources
-                .iter()
-                .any(|source| !source.population_key_encoding.is_legacy())
-            {
-                return Err(invalid());
-            }
-            validated_source_window_cohort(config, &sources)?;
-            if sources
-                .iter()
-                .any(|source| !matches!(source.aggregation_type, crate::AggregationType::Sum))
-            {
-                return Err(invalid());
-            }
-            if config.window_size != config.slide_interval {
-                return Err(invalid());
-            }
-            let mut matched = false;
-            for installed in self.executable_dags.values() {
-                let dag = installed
-                    .document
-                    .decode()
-                    .map_err(PrecomputePlanError::CatalogContract)?;
-                for sink in &installed.binding.precompute_sinks {
-                    if !matches!(installed.binding.node(*sink),
-                        Some(crate::executable_plan::BackendNodeBinding::Materialization { stored_output })
-                        if stored_output.fingerprint() == config.policy_fingerprint())
-                    {
-                        continue;
-                    }
-                    let target_node = dag
-                        .nodes
-                        .iter()
-                        .find(|node| node.id == *sink)
-                        .ok_or_else(invalid)?;
-                    validate_maintenance_reduction(config, target_node)
-                        .map_err(PrecomputePlanError::CatalogContract)?;
-                    let inputs: Vec<_> = dag
-                        .edges
-                        .iter()
-                        .filter(|edge| edge.consumer == *sink)
-                        .collect();
-                    let [edge] = inputs.as_slice() else {
-                        return Err(invalid());
-                    };
-                    let frontiers = installed
-                        .binding
-                        .nodes
-                        .iter()
-                        .filter_map(|(node, binding)| match binding {
-                            crate::executable_plan::BackendNodeBinding::Materialization {
-                                stored_output,
-                            } if derived.inputs.contains(stored_output) => {
-                                Some((*node, *stored_output))
-                            }
-                            _ => None,
-                        })
-                        .collect();
-                    let actual = crate::derived_input::DerivedInputIdentity::from_dag(
-                        &installed.document,
-                        edge.producer,
-                        &frontiers,
-                    )
-                    .map_err(PrecomputePlanError::CatalogContract)?;
-                    if &actual != derived {
-                        return Err(invalid());
-                    }
-                    let mut pending = vec![edge.producer];
-                    let mut visited = BTreeSet::new();
-                    while let Some(id) = pending.pop() {
-                        if !visited.insert(id) {
-                            continue;
-                        }
-                        let node = dag
-                            .nodes
-                            .iter()
-                            .find(|node| node.id == id)
-                            .ok_or_else(invalid)?;
-                        let children: Vec<_> = dag
-                            .edges
-                            .iter()
-                            .filter(|edge| edge.consumer == id)
-                            .collect();
-                        use planner_types::post_asap::{
-                            ExecutableOperatorPayload as Payload, ValueOperation,
-                        };
-                        if node.output_state
-                            != planner_types::post_asap::ExecutionDataState::INGESTION_ROWS
-                        {
-                            return Err(invalid());
-                        }
-                        match &node.payload {
-                            Payload::Value {
-                                operation: ValueOperation::FinalizeExactAccumulator,
-                            } if children.len() == 1
-                                && frontiers.contains_key(&children[0].producer) => {}
-                            Payload::Binary { operator }
-                                if children.len() == 2
-                                    && children
-                                        .iter()
-                                        .filter(|edge| {
-                                            edge.role == planner_types::post_asap::EdgeRole::Left
-                                        })
-                                        .count()
-                                        == 1
-                                    && children
-                                        .iter()
-                                        .filter(|edge| {
-                                            edge.role == planner_types::post_asap::EdgeRole::Right
-                                        })
-                                        .count()
-                                        == 1
-                                    && operator.vector_match.is_none()
-                                    && matches!(
-                                        operator.kind,
-                                        planner_types::pre_asap::BinaryOpKind::Arithmetic(_)
-                                    ) =>
-                            {
-                                pending.extend(children.iter().map(|edge| edge.producer));
-                            }
-                            _ => return Err(invalid()),
-                        }
-                    }
-                    matched = true;
-                }
-            }
-            if !matched {
-                return Err(invalid());
-            }
-        }
-        for (query_id, installed) in &self.executable_dags {
-            if query_id != &installed.document.query_id {
-                return Err(PrecomputePlanError::CatalogContract(
-                    "post-ASAP DAG map key differs from document query ID".into(),
-                ));
-            }
-            installed
-                .validate()
-                .map_err(PrecomputePlanError::CatalogContract)?;
-            let dag = installed
-                .document
-                .decode()
-                .map_err(PrecomputePlanError::CatalogContract)?;
-            for node in &dag.nodes {
-                let Some(crate::executable_plan::BackendNodeBinding::Materialization {
-                    stored_output,
-                }) = installed.binding.node(node.id)
-                else {
-                    continue;
-                };
-                let Some(config) = self
-                    .materializations
-                    .iter()
-                    .find(|config| config.policy_fingerprint() == stored_output.fingerprint())
-                else {
-                    return Err(PrecomputePlanError::CatalogContract(
-                        "DAG materialization has no runtime configuration".into(),
-                    ));
-                };
-                if self.ingest.protocol == IngestProtocol::PrometheusRemoteWriteV1
-                    && matches!(
-                        config.aggregation_type,
-                        crate::AggregationType::HLL | crate::AggregationType::UnivMon
-                    )
-                {
-                    if let planner_types::post_asap::ExecutableOperatorPayload::SummaryAgg {
-                        input,
-                        ..
-                    } = &node.payload
-                    {
-                        let supported = match config.aggregation_type {
-                            crate::AggregationType::HLL => {
-                                crate::accumulator_spec::is_scalar_sample_value(input)
-                                    || crate::accumulator_spec::is_unit_sample_frequency(input)
-                            }
-                            crate::AggregationType::UnivMon => {
-                                crate::accumulator_spec::is_unit_sample_frequency(input)
-                            }
-                            _ => unreachable!(),
-                        };
-                        if !supported {
-                            return Err(PrecomputePlanError::CatalogContract(
-                                "raw materialization input does not match its accumulator update semantics".into(),
-                            ));
-                        }
-                    }
-                }
-                if let Some(partitioning) = config.partitioning {
-                    if let planner_types::post_asap::ExecutableOperatorPayload::SummaryAgg {
-                        reduction,
-                        ..
-                    } = &node.payload
-                    {
-                        let expected = match reduction {
-                            planner_types::pre_asap::Reduction::PerEntity => {
-                                crate::sds::PopulationPartitioning::PerEntity
-                            }
-                            planner_types::pre_asap::Reduction::Reduce(_) => {
-                                crate::sds::PopulationPartitioning::Grouped
-                            }
-                        };
-                        if partitioning != expected {
-                            return Err(PrecomputePlanError::CatalogContract(
-                                "runtime population partition disagrees with Planner reduction"
-                                    .into(),
-                            ));
-                        }
-                    }
-                }
-            }
-        }
-        let mut materializations = BTreeSet::new();
-        for materialization in &self.materializations {
-            if materialization.table_name.is_none()
-                && !materialization.grouping_labels.is_legacy_labels()
-            {
-                return Err(PrecomputePlanError::CatalogContract(
-                    "time-series grouping requires non-null string labels".into(),
-                ));
-            }
-
-            materialization
-                .grouping_labels
-                .validate()
-                .map_err(PrecomputePlanError::CatalogContract)?;
-            materialization
-                .window_layout
-                .validate(materialization.window_size, materialization.slide_interval)
-                .map_err(|reason| PrecomputePlanError::InvalidWindowLayout {
-                    materialization: materialization.policy_fp_u64(),
-                    reason,
-                })?;
-            let expected_kind = if materialization.slide_interval == materialization.window_size {
-                crate::WindowKind::Tumbling
-            } else {
-                crate::WindowKind::Sliding
-            };
-            if materialization.window_type != expected_kind {
-                return Err(PrecomputePlanError::InvalidWindowLayout {
-                    materialization: materialization.policy_fp_u64(),
-                    reason: "window kind disagrees with size and slide".into(),
-                });
-            }
-            if !materializations.insert(materialization.policy_fingerprint().into()) {
-                return Err(PrecomputePlanError::DuplicateMaterialization(
-                    materialization.policy_fp_u64(),
-                ));
-            }
-        }
-        let mut schema_ids = BTreeSet::new();
-        let mut stored_outputs = BTreeSet::new();
-        for schema in &self.schemas {
-            if schema.schema_id.trim().is_empty()
-                || !schema_ids.insert(schema.schema_id.as_str())
-                || !stored_outputs.insert(schema.stored_output_reference.stored_output_id)
-                || schema.schema_version == 0
-                || schema.encodings.is_empty()
-                || schema.stored_output_reference.stored_output_id != schema.materialization
-            {
-                return Err(PrecomputePlanError::InvalidSchema {
-                    schema_id: schema.schema_id.clone(),
-                });
-            }
-        }
-        let schemas: BTreeSet<_> = self
-            .schemas
-            .iter()
-            .map(|schema| schema.materialization)
-            .collect();
-        if schemas != materializations || schemas.len() != self.schemas.len() {
-            return Err(PrecomputePlanError::SchemaSetMismatch);
-        }
-        let schema_by_materialization: BTreeMap<_, _> = self
-            .schemas
-            .iter()
-            .map(|schema| (schema.materialization, schema.schema_id.as_str()))
-            .collect();
-        for schema in &self.schemas {
-            let materialization = self
-                .materializations
-                .iter()
-                .find(|candidate| {
-                    candidate.policy_fingerprint() == schema.materialization.fingerprint()
-                })
-                .ok_or(PrecomputePlanError::SchemaSetMismatch)?;
-            let accumulator = materialization.accumulator_spec().map_err(|_| {
-                PrecomputePlanError::UnsupportedFamily(schema.materialization.as_u64())
-            })?;
-            let family = StateFamilyContract::try_from(&accumulator.family).map_err(|_| {
-                PrecomputePlanError::UnsupportedFamily(schema.materialization.as_u64())
-            })?;
-            let source = materialization.table_name.as_ref().map_or_else(
-                || Source::TimeSeries {
-                    metric: materialization.metric.clone(),
-                },
-                |table_ref| Source::Table {
-                    table_ref: table_ref.clone(),
-                },
-            );
-            let value_projection = materialization.effective_value_projection().clone();
-            if schema.schema_id != state_schema_id(schema.materialization.fingerprint())
-                || schema.family != family
-                || schema.source != source
-                || schema.value_projection != value_projection
-                || schema.group_by != materialization.grouping_labels
-                || schema.window.kind != materialization.window_type
-                || schema.window.size_ms != materialization.window_size.saturating_mul(1_000)
-                || schema.window.slide_ms
-                    != match materialization.window_type {
-                        crate::WindowKind::Tumbling => None,
-                        crate::WindowKind::Sliding => {
-                            Some(materialization.slide_interval.saturating_mul(1_000))
-                        }
-                        crate::WindowKind::Session => None,
-                    }
-                || schema.window.pane_origin_ms != materialization.pane_origin_ms
-                || schema.encodings != state_encodings(&accumulator.family)
-            {
-                return Err(PrecomputePlanError::InvalidSchema {
-                    schema_id: schema.schema_id.clone(),
-                });
-            }
-        }
-        let mut producers = BTreeSet::new();
-        let mut produced = BTreeSet::new();
-        for producer in &self.producers {
-            if producer.producer_id.trim().is_empty()
-                || producer.collector_id.trim().is_empty()
-                || producer.partition_ids.iter().any(|id| id.trim().is_empty())
-                || !materializations.contains(&producer.materialization)
-                || schema_by_materialization
-                    .get(&producer.materialization)
-                    .copied()
-                    != Some(producer.schema_id.as_str())
-            {
-                return Err(PrecomputePlanError::InvalidProducer {
-                    producer_id: producer.producer_id.clone(),
-                });
-            }
-            let key = (
-                producer.producer_id.as_str(),
-                producer.materialization,
-                producer.schema_id.as_str(),
-            );
-            if !producers.insert(key) {
-                return Err(PrecomputePlanError::DuplicateProducer(
-                    producer.producer_id.clone(),
-                ));
-            }
-            produced.insert(producer.materialization);
-        }
-        if self.ingest.require_registered_producer {
-            if let Some(missing) = materializations.difference(&produced).next() {
-                return Err(PrecomputePlanError::MissingProducer(missing.as_u64()));
-            }
-        }
-        Ok(())
-    }
-}
-
-pub(crate) fn state_schema_id(fingerprint: crate::PolicyFingerprint) -> String {
-    format!("{}:summary-state:v1:{}", BACKEND_COMPAT, fingerprint.0)
-}
-
-pub(crate) fn state_encodings(family: &SummaryFamilyType) -> Vec<StateEncoding> {
-    match family {
-        SummaryFamilyType::ExactAggregate(
-            planner_types::post_asap::ExactKind::Increase
-            | planner_types::post_asap::ExactKind::Rate,
-            _,
-        ) => vec![
-            StateEncoding::ExactCounterAccumulatorV2,
-            StateEncoding::PlannerExactAccumulatorV1,
-        ],
-        SummaryFamilyType::ExactAggregate(..) => vec![
-            StateEncoding::ExactAccumulatorV1,
-            StateEncoding::PlannerExactAccumulatorV1,
-        ],
-        SummaryFamilyType::Sketch(kind, _)
-            if matches!(
-                kind.algorithm(),
-                SketchAlgorithm::CmsWithHeap
-                    | SketchAlgorithm::CountSketchWithHeap
-                    | SketchAlgorithm::UnivMon
-            ) =>
-        {
-            vec![StateEncoding::SketchCoreMsgpackV1]
-        }
-        SummaryFamilyType::Sketch(..) => vec![
-            StateEncoding::SketchlibProtobufV1,
-            StateEncoding::SketchCoreMsgpackV1,
-        ],
-        _ => Vec::new(),
-    }
-}
-
-#[cfg(test)]
-mod source_window_cohort_tests {
-    use super::*;
-    fn full_window() -> crate::PrecomputeMaterialization {
-        serde_json::from_value(serde_json::json!({
-            "aggregation_type":"Sum", "aggregation_sub_type":"", "parameters":{},
-            "grouping_labels":{"labels":[]}, "aggregated_labels":{"labels":[]},
-            "rollup_labels":{"labels":[]}, "original_yaml":"",
-            "window_size":60, "slide_interval":10, "window_type":"sliding",
-            "window_layout":{"kind":"full_window"}, "pane_origin_ms":0,
-            "spatial_filter":"", "spatial_filter_normalized":"", "metric":"m",
-            "num_aggregates_to_retain":null, "table_name":null, "value_projection":null
-        }))
-        .unwrap()
-    }
-    #[test]
-    fn producer_roster_roundtrip_and_watermark_scope() {
-        let envelope = PlanEnvelope {
-            plan_id: 1,
-            plan_version: 2,
-            generated_at_unix_ms: 0,
-            activation_unix_ms: 0,
-            expiry_unix_ms: None,
-            backend_compat: "test".into(),
-            planner_revision: "test".into(),
-            capability_snapshot_id: "test".into(),
-        };
-        let mut config = full_window();
-        config.slide_interval = config.window_size;
-        config.window_type = crate::WindowKind::Tumbling;
-        let mut plan = PrecomputePlan::build_backend_local(envelope, vec![config]).unwrap();
-        let generation = crate::sds::CatalogGeneration {
-            schema_version: 1,
-            plan_id: 1,
-            plan_version: 2,
-            snapshot_sha256: "snapshot".into(),
-        };
-        plan.summary_catalog = Some(generation.clone());
-        let materialization = plan.schemas[0].materialization;
-        let legacy = serde_json::json!({
-            "producer_id":"p", "collector_id":"c",
-            "materialization":materialization, "schema_id":plan.schemas[0].schema_id,
-        });
-        assert!(serde_json::from_value::<ProducerContract>(legacy.clone()).is_err());
-        let mut current = legacy;
-        current["partition_ids"] = serde_json::json!([]);
-        let producer: ProducerContract = serde_json::from_value(current).unwrap();
-        assert!(producer.partition_ids.is_empty());
-        plan.producers.push(producer);
-        let barrier = crate::sds::SummaryWatermarkBarrier {
-            catalog_generation: generation,
-            source: crate::sds::SummarySourcePartition {
-                producer_id: "p".into(),
-                partition_id: "a".into(),
-                producer_epoch: 1,
-            },
-            sequence: 1,
-            watermark_ms: 100,
-        };
-        assert!(plan
-            .validate_watermark_scope(materialization, &barrier)
-            .is_err());
-        plan.producers[0].partition_ids = BTreeSet::from(["b".into(), "a".into()]);
-        let wire = serde_json::to_value(&plan).unwrap();
-        assert_eq!(
-            wire["producers"][0]["partition_ids"],
-            serde_json::json!(["a", "b"])
-        );
-        let restored: PrecomputePlan = serde_json::from_value(wire).unwrap();
-        assert!(restored
-            .validate_watermark_scope(materialization, &barrier)
-            .is_ok());
-        for case in 0..6 {
-            let mut wrong = barrier.clone();
-            match case {
-                0 => wrong.source.producer_id = "unknown".into(),
-                1 => wrong.source.partition_id = "unknown".into(),
-                2 => wrong.catalog_generation.plan_version += 1,
-                3 => wrong.source.producer_epoch = 0,
-                4 => wrong.sequence = 0,
-                _ => wrong.catalog_generation.snapshot_sha256 = "other".into(),
-            }
-            assert!(restored
-                .validate_watermark_scope(materialization, &wrong)
-                .is_err());
-        }
-        let other_materialization = crate::sds::StoredOutputId::from(crate::PolicyFingerprint(
-            materialization.as_u64().wrapping_add(1),
-        ));
-        assert!(restored
-            .validate_watermark_scope(other_materialization, &barrier)
-            .is_err());
-        let mut wrong_envelope = restored.clone();
-        wrong_envelope.envelope.plan_version += 1;
-        assert!(wrong_envelope
-            .validate_watermark_scope(materialization, &barrier)
-            .is_err());
-        plan.producers[0].partition_ids.insert(" ".into());
-        assert!(plan.validate().is_err());
-    }
-
-    #[test]
-    fn maintenance_reduction_requires_matching_explicit_population_contract() {
-        use planner_types::post_asap::*;
-        use planner_types::pre_asap::Reduction;
-        let mut config = full_window();
-        config.partitioning = Some(crate::sds::PopulationPartitioning::Grouped);
-        let mut node = ExecutableDagNode {
-            id: PostAsapNodeId(1),
-            payload: ExecutableOperatorPayload::SummaryAgg {
-                family: SummaryFamilyType::ExactAggregate(ExactKind::Sum, ExactParams::Sum),
-                input: SummaryUpdate {
-                    item: None,
-                    weight: SummaryInputExpr::Constant(1.0),
-                    weight_domain: Default::default(),
-                },
-                reduction: Reduction::by(vec![]),
-                grouping: Default::default(),
-            },
-            output_state: ExecutionDataState::INGESTION_SUMMARY,
-            output_schema: SummarySchema {
-                fields: vec![],
-                time_index: None,
-            },
-            guarantee: None,
-        };
-        assert!(validate_maintenance_reduction(&config, &node).is_ok());
-        config.partitioning = Some(crate::sds::PopulationPartitioning::PerEntity);
-        assert!(validate_maintenance_reduction(&config, &node).is_err());
-        if let ExecutableOperatorPayload::SummaryAgg { reduction, .. } = &mut node.payload {
-            *reduction = Reduction::PerEntity;
-        }
-        assert!(validate_maintenance_reduction(&config, &node).is_ok());
-        config.partitioning = Some(crate::sds::PopulationPartitioning::Grouped);
-        if let ExecutableOperatorPayload::SummaryAgg { reduction, .. } = &mut node.payload {
-            *reduction = Reduction::by(vec![0]);
-        }
-        assert!(validate_maintenance_reduction(&config, &node).is_err());
-        config.partitioning = None;
-        assert!(validate_maintenance_reduction(&config, &node).is_err());
-        node.payload = ExecutableOperatorPayload::SummaryMerge;
-        assert!(validate_maintenance_reduction(&config, &node).is_err());
-    }
-
-    #[test]
-    fn canonical_population_encoding_is_not_yet_installable() {
-        let mut config = full_window();
-        config.slide_interval = config.window_size;
-        config.population_key_encoding =
-            crate::grouping_projection::PopulationKeyEncoding::CanonicalLabelsV1;
-        let envelope = PlanEnvelope {
-            plan_id: 1,
-            plan_version: 1,
-            generated_at_unix_ms: 0,
-            activation_unix_ms: 0,
-            expiry_unix_ms: None,
-            backend_compat: "test".into(),
-            planner_revision: "test".into(),
-            capability_snapshot_id: "test".into(),
-        };
-        let error = PrecomputePlan::build_backend_local(envelope, vec![config]).unwrap_err();
-        assert!(
-            error.to_string().contains("population key encoding"),
-            "{error}"
-        );
-    }
-
-    #[test]
-    fn full_sliding_cohort_preserves_explicit_windows_and_identity() {
-        let target = full_window();
-        let source = full_window();
-        let mut missing_origin = source.clone();
-        missing_origin.pane_origin_ms = None;
-        assert!(validated_source_window_cohort(&missing_origin, &[&missing_origin]).is_err());
-        missing_origin.slide_interval = missing_origin.window_size;
-        assert!(validated_source_window_cohort(&missing_origin, &[&missing_origin]).is_ok());
-        let result = validated_source_window_cohort(&target, &[&source]).unwrap();
-        assert!(std::ptr::eq(result[0], &source));
-        let mut other = source.clone();
-        other.metric = "other".into();
-        assert_eq!(
-            validated_source_window_cohort(&target, &[&source, &other])
-                .unwrap()
-                .len(),
-            2
-        );
-        assert!(validated_source_window_cohort(&target, &[&source, &source]).is_err());
-        for mutation in 0..3 {
-            let mut changed = source.clone();
-            match mutation {
-                0 => changed.pane_origin_ms = Some(1),
-                1 => changed.slide_interval = 20,
-                _ => {
-                    changed.window_layout =
-                        crate::WindowMaterializationLayout::Pane { pane_secs: 10 }
-                }
-            }
-            assert_ne!(source.policy_fingerprint(), changed.policy_fingerprint());
-            assert!(validated_source_window_cohort(&target, &[&changed]).is_err());
-        }
-    }
-}
diff --git a/crates/asap_types/src/precompute_plan/catalog.rs b/crates/asap_types/src/precompute_plan/catalog.rs
deleted file mode 100644
index bad95e7e5..000000000
--- a/crates/asap_types/src/precompute_plan/catalog.rs
+++ /dev/null
@@ -1,232 +0,0 @@
-//! Catalog consistency checks for the precompute execution plan.
-use super::*;
-use crate::sds::{StoredOutputId, SummaryDescriptor};
-use crate::summary_catalog::SummaryCatalog;
-use planner_types::pre_asap::Source;
-use std::collections::BTreeSet;
-fn invalid(reason: impl Into<String>) -> PrecomputePlanError {
-    PrecomputePlanError::CatalogContract(reason.into())
-}
-
-impl PrecomputePlan {
-    /// Bind references after retention decisions are finalized. The plan keeps
-    /// only the immutable snapshot reference; descriptors are installed once.
-    pub fn bind_catalog(&mut self, catalog: &SummaryCatalog) -> Result<(), PrecomputePlanError> {
-        for config in &self.materializations {
-            let id = StoredOutputId::from(config.policy_fingerprint());
-            catalog.outputs.get(&id).ok_or_else(|| {
-                invalid(format!("missing catalog materialization {}", id.as_u64()))
-            })?;
-        }
-        for schema in &mut self.schemas {
-            schema.stored_output_reference = catalog
-                .output_reference(schema.materialization)
-                .map_err(|e| invalid(e.to_string()))?;
-        }
-        self.summary_catalog = Some(
-            catalog
-                .reference()
-                .map_err(|error| invalid(error.to_string()))?,
-        );
-        self.validate_against_catalog(catalog)
-    }
-    /// Strict validation resolves this plan's reference against the one catalog
-    /// snapshot carried by the enclosing physical-plan installation.
-    pub fn validate_against_catalog(
-        &self,
-        catalog: &SummaryCatalog,
-    ) -> Result<(), PrecomputePlanError> {
-        self.validate()?;
-        self.validate_catalog_contents(catalog)
-    }
-    fn validate_catalog_contents(
-        &self,
-        catalog: &SummaryCatalog,
-    ) -> Result<(), PrecomputePlanError> {
-        catalog.validate().map_err(|e| invalid(e.to_string()))?;
-        let expected = SummaryCatalog::from_materializations(
-            catalog.plan_id,
-            catalog.plan_version,
-            &self.materializations,
-        )
-        .map_err(|e| invalid(e.to_string()))?;
-        if catalog.outputs != expected.outputs || catalog.definitions != expected.definitions {
-            return Err(invalid(
-                "stored output semantics differ from installed writer computation",
-            ));
-        }
-        for config in &self.materializations {
-            if config.derived_input.is_some() && config.semantic_fragment.is_none() {
-                return Err(invalid(
-                    "derived stored output requires its complete Planner semantic closure",
-                ));
-            }
-            if let Some(expected) = &config.semantic_fragment {
-                let mut found = false;
-                for installed in self.executable_dags.values() {
-                    let dag = installed.document.decode().map_err(invalid)?;
-                    for (id, binding) in &installed.binding.nodes {
-                        if matches!(binding, crate::executable_plan::BackendNodeBinding::Materialization { stored_output }
-                            if stored_output.fingerprint() == config.policy_fingerprint())
-                        {
-                            found = true;
-                            let actual = match &self.ingest.dataset_identity {
-                                Some(dataset) => crate::semantic_fragment::SemanticFragment::from_stored_output_in_dataset(&dag, *id, dataset.clone()),
-                                None => crate::semantic_fragment::SemanticFragment::from_stored_output(&dag, *id),
-                            }.map_err(invalid)?;
-                            if &actual != expected {
-                                return Err(invalid(
-                                    "semantic definition differs from Planner-selected producer",
-                                ));
-                            }
-                        }
-                    }
-                }
-                if !found {
-                    return Err(invalid(
-                        "semantic definition has no Planner-selected producer",
-                    ));
-                }
-            }
-        }
-        let expected_reference = catalog
-            .reference()
-            .map_err(|error| invalid(error.to_string()))?;
-        if self.summary_catalog.as_ref() != Some(&expected_reference)
-            || catalog.plan_id != self.envelope.plan_id
-            || catalog.plan_version != self.envelope.plan_version
-        {
-            return Err(PrecomputePlanError::PlanIdentityMismatch);
-        }
-        let ids: BTreeSet<_> = self
-            .materializations
-            .iter()
-            .map(|m| StoredOutputId::from(m.policy_fingerprint()))
-            .collect();
-        if ids != catalog.outputs.keys().copied().collect() {
-            return Err(invalid("catalog/reference/materialization sets differ"));
-        }
-        for config in &self.materializations {
-            let id = StoredOutputId::from(config.policy_fingerprint());
-            let binding = &catalog.outputs[&id];
-            let expected =
-                SummaryDescriptor::from_config(config).map_err(|e| invalid(e.to_string()))?;
-            if binding.summary_descriptor_id != expected.id {
-                return Err(invalid(
-                    "summary operator/update contract differs from catalog",
-                ));
-            }
-            let data = &catalog.data_descriptors[&binding.data_descriptor_id];
-            let expected_source = config.source_identity();
-            if config.table_name.is_some()
-                && !config.grouping_labels.is_empty()
-                && data.observation_semantics
-                    != crate::grouping_projection::TABLE_GROUP_OBSERVATION_SEMANTICS
-            {
-                return Err(invalid(
-                    "table grouping codec differs from installed contract",
-                ));
-            }
-            if config.table_name.is_some() {
-                config
-                    .grouping_labels
-                    .validate_table_group_codec()
-                    .map_err(invalid)?;
-            }
-            let expected_projection = config.effective_value_projection();
-            if data.population_key_encoding != config.population_key_encoding
-                || data.partitioning != config.partitioning
-                || data.timestamp_column != config.table_timestamp_column
-                || data.source != expected_source
-                || &data.value_projection != expected_projection
-                || data.population_filter_canonical
-                    != config.population_filter_canonical().map_err(invalid)?
-                || data.group_by_keys != config.grouping_labels
-            {
-                return Err(invalid("source/population/grouping differs from catalog"));
-            }
-            if config.spatial_filter_normalized
-                != crate::utils::normalize_spatial_filter(&config.spatial_filter)
-            {
-                return Err(invalid("normalized population predicate drift"));
-            }
-            let schema = self
-                .schemas
-                .iter()
-                .find(|s| s.materialization == id)
-                .ok_or(PrecomputePlanError::SchemaSetMismatch)?;
-            let family = config
-                .accumulator_spec()
-                .map_err(|e| invalid(e.to_string()))?
-                .family;
-            let expected_family = StateFamilyContract::try_from(&family)
-                .map_err(|_| PrecomputePlanError::UnsupportedFamily(id.as_u64()))?;
-            let source = if let Some(table) = &config.table_name {
-                Source::Table {
-                    table_ref: table.clone(),
-                }
-            } else {
-                Source::TimeSeries {
-                    metric: config.metric.clone(),
-                }
-            };
-            let projection = config.effective_value_projection();
-            let size = config
-                .window_size
-                .checked_mul(1000)
-                .filter(|v| *v > 0)
-                .ok_or_else(|| invalid("invalid window size"))?;
-            let slide = config
-                .slide_interval
-                .checked_mul(1000)
-                .filter(|v| *v > 0)
-                .ok_or_else(|| invalid("invalid slide interval"))?;
-            let expected_slide = match config.window_type {
-                crate::WindowKind::Tumbling => None,
-                crate::WindowKind::Sliding => Some(slide),
-                crate::WindowKind::Session => {
-                    return Err(invalid("session lifecycle is not supported"))
-                }
-            };
-            if schema.stored_output_reference
-                != catalog
-                    .output_reference(id)
-                    .map_err(|e| invalid(e.to_string()))?
-                || schema.schema_id != state_schema_id(id.fingerprint())
-                || schema.family != expected_family
-                || schema.source != source
-                || &schema.value_projection != projection
-                || schema.group_by != config.grouping_labels
-                || schema.window.kind != config.window_type
-                || schema.window.size_ms != size
-                || schema.window.slide_ms != expected_slide
-                || schema.window.pane_origin_ms != config.pane_origin_ms
-            {
-                return Err(PrecomputePlanError::InvalidSchema {
-                    schema_id: schema.schema_id.clone(),
-                });
-            }
-            if schema.encodings != state_encodings(&family) {
-                return Err(invalid("encoding does not match state family"));
-            }
-            if config.num_aggregates_to_retain == Some(0) {
-                return Err(invalid("materialization lifecycle/retention mismatch"));
-            }
-        }
-        if self.ingest.protocol == IngestProtocol::PrometheusRemoteWriteV1
-            && !self.producers.is_empty()
-        {
-            return Err(invalid(
-                "backend-local plan cannot declare collector placement",
-            ));
-        }
-        if self.producers.iter().any(|p| {
-            p.producer_id.trim().is_empty()
-                || p.collector_id.trim().is_empty()
-                || p.producer_id != p.collector_id
-        }) {
-            return Err(invalid("invalid collector placement identity"));
-        }
-        Ok(())
-    }
-}
diff --git a/crates/asap_types/src/producer_plan.rs b/crates/asap_types/src/producer_plan.rs
deleted file mode 100644
index 846c4df83..000000000
--- a/crates/asap_types/src/producer_plan.rs
+++ /dev/null
@@ -1,855 +0,0 @@
-//! Installed collector and transmission contracts shared across producers and consumers.
-//! Deployment choices and accuracy-budget allocation remain in the control plane.
-use crate::precompute_plan::{PlanEnvelope, PrecomputePlan, StateEncoding, StateFamilyContract};
-use planner_types::post_asap::{SketchAlgorithm, SummaryWindowFramework};
-use serde::{Deserialize, Serialize};
-use serde_json::Value;
-use std::collections::BTreeSet;
-use thiserror::Error;
-
-#[derive(Debug, Clone, Serialize, Deserialize, PartialEq)]
-#[serde(deny_unknown_fields)]
-pub struct CollectorMaterialization {
-    pub query_id: String,
-    pub materialization: crate::sds::StoredOutputId,
-    pub metric: String,
-    pub algorithm: String,
-    pub parameters: Value,
-    pub group_by: Vec<String>,
-    pub window_secs: u64,
-    pub abstract_window_framework: SummaryWindowFramework,
-    #[serde(rename = "window_implementation_id")]
-    pub window_realization_id: String,
-    pub slide_secs: u64,
-    #[serde(default, skip_serializing_if = "Option::is_none")]
-    pub pane_origin_ms: Option<i64>,
-    pub window_layout: crate::WindowMaterializationLayout,
-    pub evidence_source: Option<String>,
-    pub lifecycle: CollectorLifecycle,
-}
-
-#[derive(Debug, Clone, Serialize, Deserialize, PartialEq, Eq)]
-#[serde(deny_unknown_fields)]
-pub struct CollectorLifecycle {
-    pub kind: String,
-    pub maintenance_mode: String,
-    pub evaluation_schedule: String,
-    pub output_representation: String,
-}
-
-#[derive(Debug, Clone, Serialize, Deserialize, PartialEq)]
-#[serde(deny_unknown_fields)]
-pub struct CollectorPlan {
-    /// Set when binding the plan; required for catalog-authorized installation.
-    #[serde(default, skip_serializing_if = "Option::is_none")]
-    pub summary_catalog: Option<crate::sds::CatalogGeneration>,
-    pub collector_id: String,
-    pub envelope: PlanEnvelope,
-    pub materializations: Vec<CollectorMaterialization>,
-    pub transmission_rules: Vec<TransmissionRule>,
-}
-
-#[derive(Debug, Clone, Copy, Serialize, Deserialize, PartialEq, Eq, PartialOrd, Ord)]
-#[serde(rename_all = "snake_case")]
-pub enum TransmissionMode {
-    Full,
-    Delta,
-}
-
-#[derive(Debug, Clone, Copy, Serialize, Deserialize, PartialEq, Eq)]
-#[serde(rename_all = "snake_case")]
-pub enum SequenceScope {
-    MaterializationSeriesProducerEpoch,
-}
-
-#[derive(Debug, Clone, Serialize, Deserialize, PartialEq, Eq)]
-#[serde(deny_unknown_fields)]
-pub struct FrameIdentityContract {
-    pub identity_version: u32,
-    pub sequence_scope: SequenceScope,
-    pub require_checkpoint_for_full: bool,
-    pub require_base_checkpoint_for_delta: bool,
-}
-
-#[derive(Debug, Clone, Serialize, Deserialize, PartialEq)]
-#[serde(deny_unknown_fields)]
-pub struct TransmissionRule {
-    pub materialization: crate::sds::StoredOutputId,
-    pub producer_id: String,
-    pub schema_id: String,
-    pub mode: TransmissionMode,
-    pub encoding: StateEncoding,
-    pub emit_every_ms: u64,
-    pub full_checkpoint_every_ms: Option<u64>,
-    pub destination_ref: String,
-    /// Plan-owned runtime knobs. These values are part of the immutable plan
-    /// generation; live feedback may only change them by publishing a
-    /// successor generation accepted by [`TransmissionPlan::authorize_successor`].
-    #[serde(default)]
-    pub runtime_policy: RuntimeRulePolicy,
-}
-
-/// How the collector admits updates before sketch maintenance.
-#[derive(Debug, Clone, Serialize, Deserialize, PartialEq, Default)]
-#[serde(tag = "mode", rename_all = "snake_case", deny_unknown_fields)]
-pub enum SamplingPolicy {
-    #[default]
-    Disabled,
-    Fixed {
-        /// Probability in `(0, 1]`; `1` is valid but should normally be
-        /// represented by `Disabled`.
-        probability: f64,
-        estimator: SamplingEstimator,
-    },
-}
-
-#[derive(Debug, Clone, Copy, Serialize, Deserialize, PartialEq, Eq)]
-#[serde(rename_all = "snake_case")]
-pub enum SamplingEstimator {
-    /// Hash-threshold element sampling, used by cardinality summaries.
-    HashThreshold,
-    /// Geometric admission/Nitro-style update sampling, used by frequency
-    /// summaries. The sketch readout carries the corresponding correction.
-    GeometricAdmission,
-}
-
-/// Norm-adaptive Group-of-Sketches delta gating. GOS is meaningful only for
-/// CountSketch families and only when the transmission rule is in delta mode.
-#[derive(Debug, Clone, Serialize, Deserialize, PartialEq)]
-#[serde(deny_unknown_fields)]
-pub struct GosPolicy {
-    pub epsilon_staleness: f64,
-    pub sites: u32,
-    pub threshold_mode: GosThresholdMode,
-}
-
-#[derive(Debug, Clone, Copy, Serialize, Deserialize, PartialEq, Eq)]
-#[serde(rename_all = "snake_case")]
-pub enum GosThresholdMode {
-    Isotropic,
-    Anisotropic,
-}
-
-/// Sparse-delta semantics within a delta transmission rule. An absolute
-/// threshold of zero sends every changed cell. When `gos` is present it
-/// replaces the fixed threshold with the GOS norm-adaptive threshold.
-#[derive(Debug, Clone, Serialize, Deserialize, PartialEq)]
-#[serde(deny_unknown_fields)]
-pub struct DeltaPolicy {
-    pub absolute_threshold: f64,
-    pub gos: Option<GosPolicy>,
-}
-
-/// Inclusive bounds for one floating-point adaptation knob.
-#[derive(Debug, Clone, Serialize, Deserialize, PartialEq)]
-#[serde(deny_unknown_fields)]
-pub struct AdaptiveF64Bounds {
-    pub min: f64,
-    pub max: f64,
-    pub max_step: f64,
-}
-
-/// Inclusive bounds for one integer adaptation knob.
-#[derive(Debug, Clone, Serialize, Deserialize, PartialEq, Eq)]
-#[serde(deny_unknown_fields)]
-pub struct AdaptiveU64Bounds {
-    pub min: u64,
-    pub max: u64,
-    pub max_step: u64,
-}
-
-/// Guardrails for telemetry-driven runtime adaptation. This is an
-/// authorization contract, not an instruction to mutate the active plan.
-/// Every accepted change becomes a staged successor CompiledPhysicalPlan.
-#[derive(Debug, Clone, Serialize, Deserialize, PartialEq, Default)]
-#[serde(deny_unknown_fields)]
-pub struct RuntimeAdaptationPolicy {
-    pub enabled: bool,
-    pub not_before_unix_ms: u64,
-    pub max_evidence_age_ms: u64,
-    pub min_evidence_samples: u64,
-    pub sample_probability: Option<AdaptiveF64Bounds>,
-    pub emit_every_ms: Option<AdaptiveU64Bounds>,
-    pub delta_threshold: Option<AdaptiveF64Bounds>,
-    pub gos_epsilon_staleness: Option<AdaptiveF64Bounds>,
-}
-
-#[derive(Debug, Clone, Serialize, Deserialize, PartialEq, Default)]
-#[serde(deny_unknown_fields)]
-pub struct RuntimeRulePolicy {
-    #[serde(default)]
-    pub sampling: SamplingPolicy,
-    pub delta: Option<DeltaPolicy>,
-    #[serde(default)]
-    pub adaptation: RuntimeAdaptationPolicy,
-}
-
-/// Identity and sufficiency information for evidence authorizing one rule's
-/// successor knobs. Raw measurements remain in the runtime-samples store; the
-/// authorization boundary needs only their exact provenance and sample count.
-#[derive(Debug, Clone, Serialize, Deserialize, PartialEq, Eq)]
-#[serde(deny_unknown_fields)]
-pub struct RuntimeAdaptationEvidence {
-    pub plan_id: u64,
-    pub plan_version: u64,
-    pub materialization: crate::sds::StoredOutputId,
-    pub producer_id: String,
-    pub schema_id: String,
-    pub producer_version: String,
-    pub observed_at_unix_ms: u64,
-    pub sample_count: u64,
-}
-
-#[derive(Debug, Clone, Serialize, Deserialize, PartialEq)]
-#[serde(deny_unknown_fields)]
-pub struct TransmissionPlan {
-    /// Set when binding the plan; required for catalog-authorized installation.
-    #[serde(default, skip_serializing_if = "Option::is_none")]
-    pub summary_catalog: Option<crate::sds::CatalogGeneration>,
-    pub envelope: PlanEnvelope,
-    pub frame_identity: FrameIdentityContract,
-    pub rules: Vec<TransmissionRule>,
-}
-
-#[derive(Debug, Clone, Serialize, Deserialize, PartialEq, Eq)]
-#[serde(rename_all = "snake_case")]
-pub enum SummaryFrameKind {
-    Full,
-    Delta,
-}
-
-/// Identity attached to every summary record. Window bounds come from the
-/// data point; the remaining fields are carried as reserved `asap.frame.*`
-/// attributes until the modified-OTLP schema gains a dedicated message.
-#[derive(Debug, Clone, Serialize, Deserialize, PartialEq, Eq)]
-#[serde(deny_unknown_fields)]
-pub struct SummaryFrameIdentity {
-    pub identity_version: u32,
-    pub plan_id: u64,
-    pub plan_version: u64,
-    pub backend_compat: String,
-    pub materialization: crate::sds::StoredOutputId,
-    /// Canonical producer-side identity for one concrete retained-label group.
-    pub series_identity: String,
-    pub schema_id: String,
-    pub producer_id: String,
-    pub producer_epoch: String,
-    pub window_start_unix_nano: u64,
-    pub window_end_unix_nano: u64,
-    pub sequence: u64,
-    pub kind: SummaryFrameKind,
-    pub encoding: StateEncoding,
-    pub checkpoint_id: Option<String>,
-    pub base_checkpoint_id: Option<String>,
-}
-
-#[derive(Debug, Error, PartialEq, Eq)]
-pub enum TransmissionPlanError {
-    #[error("summary catalog mismatch: {0}")]
-    Catalog(String),
-    #[error("TransmissionPlan envelope differs from PrecomputePlan")]
-    EnvelopeMismatch,
-    #[error("transmission rules do not exactly match precompute producer bindings")]
-    ProducerSetMismatch,
-    #[error("invalid transmission rule for producer {0}")]
-    InvalidRule(String),
-    #[error("frame identity is invalid: {0}")]
-    InvalidFrame(String),
-    #[error("frame has no matching transmission rule")]
-    UnknownFrame,
-    #[error("runtime policy for producer {producer_id} is invalid: {reason}")]
-    InvalidRuntimePolicy { producer_id: String, reason: String },
-    #[error("runtime adaptation successor is invalid: {0}")]
-    InvalidSuccessor(String),
-    #[error("runtime adaptation evidence for producer {0} is missing or invalid")]
-    InvalidAdaptationEvidence(String),
-    #[error("runtime adaptation for producer {producer_id} exceeds guardrails: {knob}")]
-    AdaptationOutOfBounds {
-        producer_id: String,
-        knob: &'static str,
-    },
-}
-
-fn validate_catalog_projection(
-    reference: Option<&crate::sds::CatalogGeneration>,
-    envelope: &PlanEnvelope,
-    materializations: impl IntoIterator<Item = crate::sds::StoredOutputId>,
-    catalog: &crate::summary_catalog::SummaryCatalog,
-) -> Result<(), TransmissionPlanError> {
-    let expected = catalog
-        .reference()
-        .map_err(|error| TransmissionPlanError::Catalog(error.to_string()))?;
-    if reference != Some(&expected)
-        || envelope.plan_id != catalog.plan_id
-        || envelope.plan_version != catalog.plan_version
-    {
-        return Err(TransmissionPlanError::Catalog(
-            "missing or different snapshot reference".into(),
-        ));
-    }
-    for id in materializations {
-        if !catalog.outputs.contains_key(&id) {
-            return Err(TransmissionPlanError::Catalog(format!(
-                "unknown materialization {}",
-                id.as_u64()
-            )));
-        }
-    }
-    Ok(())
-}
-
-impl CollectorPlan {
-    pub fn validate_against_catalog(
-        &self,
-        catalog: &crate::summary_catalog::SummaryCatalog,
-    ) -> Result<(), TransmissionPlanError> {
-        validate_catalog_projection(
-            self.summary_catalog.as_ref(),
-            &self.envelope,
-            self.materializations
-                .iter()
-                .map(|m| m.materialization)
-                .chain(self.transmission_rules.iter().map(|r| r.materialization)),
-            catalog,
-        )
-    }
-}
-
-impl TransmissionPlan {
-    pub fn validate_against_catalog(
-        &self,
-        catalog: &crate::summary_catalog::SummaryCatalog,
-    ) -> Result<(), TransmissionPlanError> {
-        validate_catalog_projection(
-            self.summary_catalog.as_ref(),
-            &self.envelope,
-            self.rules.iter().map(|r| r.materialization),
-            catalog,
-        )
-    }
-
-    pub fn validate(&self, precompute: &PrecomputePlan) -> Result<(), TransmissionPlanError> {
-        if self.summary_catalog != precompute.summary_catalog {
-            return Err(TransmissionPlanError::Catalog(
-                "transmission and precompute plans reference different catalog snapshots".into(),
-            ));
-        }
-        if self.envelope != precompute.envelope {
-            return Err(TransmissionPlanError::EnvelopeMismatch);
-        }
-        let expected: BTreeSet<_> = precompute
-            .producers
-            .iter()
-            .map(|producer| {
-                (
-                    producer.materialization,
-                    producer.producer_id.as_str(),
-                    producer.schema_id.as_str(),
-                )
-            })
-            .collect();
-        let actual: BTreeSet<_> = self
-            .rules
-            .iter()
-            .map(|rule| {
-                (
-                    rule.materialization,
-                    rule.producer_id.as_str(),
-                    rule.schema_id.as_str(),
-                )
-            })
-            .collect();
-        if expected != actual || actual.len() != self.rules.len() {
-            return Err(TransmissionPlanError::ProducerSetMismatch);
-        }
-        for rule in &self.rules {
-            let valid_checkpoint_cadence = match (rule.mode, rule.full_checkpoint_every_ms) {
-                (TransmissionMode::Full, None) => true,
-                (TransmissionMode::Delta, Some(full_every)) => {
-                    rule.emit_every_ms > 0
-                        && full_every >= rule.emit_every_ms
-                        && full_every % rule.emit_every_ms == 0
-                }
-                _ => false,
-            };
-            if rule.emit_every_ms == 0
-                || rule.destination_ref.is_empty()
-                || !valid_checkpoint_cadence
-            {
-                return Err(TransmissionPlanError::InvalidRule(rule.producer_id.clone()));
-            }
-            let schema = precompute
-                .schemas
-                .iter()
-                .find(|schema| schema.materialization == rule.materialization)
-                .expect("producer set validation guarantees a matching schema");
-            if !schema.encodings.contains(&rule.encoding) {
-                return Err(TransmissionPlanError::InvalidRule(rule.producer_id.clone()));
-            }
-            validate_runtime_rule_policy(rule, &schema.family)?;
-        }
-        Ok(())
-    }
-
-    /// Authorize a telemetry-driven successor without mutating this active
-    /// plan. Semantic identity, codecs, destination, transmission mode and
-    /// checkpoint cadence remain fixed. Only explicitly bounded runtime knobs
-    /// may move, and each changed rule needs fresh evidence attributed to the
-    /// exact active generation.
-    pub fn authorize_successor(
-        &self,
-        successor: &TransmissionPlan,
-        evidence: &[RuntimeAdaptationEvidence],
-        now_unix_ms: u64,
-    ) -> Result<(), TransmissionPlanError> {
-        if successor.envelope.plan_id != self.envelope.plan_id
-            || successor.envelope.plan_version != self.envelope.plan_version.saturating_add(1)
-            || successor.envelope.backend_compat != self.envelope.backend_compat
-            || successor.envelope.planner_revision != self.envelope.planner_revision
-            || successor.envelope.capability_snapshot_id != self.envelope.capability_snapshot_id
-            || successor.envelope.generated_at_unix_ms < self.envelope.generated_at_unix_ms
-            || successor.envelope.activation_unix_ms < successor.envelope.generated_at_unix_ms
-            || successor.rules.len() != self.rules.len()
-            || successor.frame_identity != self.frame_identity
-        {
-            return Err(TransmissionPlanError::InvalidSuccessor(
-                "successor must be the next version of the same semantic/capability generation"
-                    .into(),
-            ));
-        }
-
-        for current in &self.rules {
-            let Some(next) = successor.rules.iter().find(|candidate| {
-                candidate.materialization == current.materialization
-                    && candidate.producer_id == current.producer_id
-                    && candidate.schema_id == current.schema_id
-            }) else {
-                return Err(TransmissionPlanError::InvalidSuccessor(format!(
-                    "missing rule for producer {}",
-                    current.producer_id
-                )));
-            };
-            if current.mode != next.mode
-                || current.encoding != next.encoding
-                || current.full_checkpoint_every_ms != next.full_checkpoint_every_ms
-                || current.destination_ref != next.destination_ref
-                || current.runtime_policy.adaptation != next.runtime_policy.adaptation
-                || sampling_estimator(&current.runtime_policy.sampling)
-                    != sampling_estimator(&next.runtime_policy.sampling)
-                || delta_shape(&current.runtime_policy.delta)
-                    != delta_shape(&next.runtime_policy.delta)
-            {
-                return Err(TransmissionPlanError::InvalidSuccessor(format!(
-                    "rule identity/codec/mode/guardrails drifted for producer {}",
-                    current.producer_id
-                )));
-            }
-            if current.emit_every_ms == next.emit_every_ms
-                && current.runtime_policy.sampling == next.runtime_policy.sampling
-                && current.runtime_policy.delta == next.runtime_policy.delta
-            {
-                continue;
-            }
-            let policy = &current.runtime_policy.adaptation;
-            if !policy.enabled || now_unix_ms < policy.not_before_unix_ms {
-                return Err(TransmissionPlanError::AdaptationOutOfBounds {
-                    producer_id: current.producer_id.clone(),
-                    knob: "adaptation_disabled_or_in_cooldown",
-                });
-            }
-            let has_evidence = evidence.iter().any(|item| {
-                item.plan_id == self.envelope.plan_id
-                    && item.plan_version == self.envelope.plan_version
-                    && item.materialization == current.materialization
-                    && item.producer_id == current.producer_id
-                    && item.schema_id == current.schema_id
-                    && !item.producer_version.trim().is_empty()
-                    && item.sample_count >= policy.min_evidence_samples
-                    && item.observed_at_unix_ms <= now_unix_ms
-                    && now_unix_ms.saturating_sub(item.observed_at_unix_ms)
-                        <= policy.max_evidence_age_ms
-            });
-            if !has_evidence {
-                return Err(TransmissionPlanError::InvalidAdaptationEvidence(
-                    current.producer_id.clone(),
-                ));
-            }
-            authorize_f64_change(
-                sampling_probability(&current.runtime_policy.sampling),
-                sampling_probability(&next.runtime_policy.sampling),
-                policy.sample_probability.as_ref(),
-                &current.producer_id,
-                "sample_probability",
-            )?;
-            authorize_u64_change(
-                current.emit_every_ms,
-                next.emit_every_ms,
-                policy.emit_every_ms.as_ref(),
-                &current.producer_id,
-                "emit_every_ms",
-            )?;
-            authorize_f64_change(
-                delta_threshold(&current.runtime_policy.delta),
-                delta_threshold(&next.runtime_policy.delta),
-                policy.delta_threshold.as_ref(),
-                &current.producer_id,
-                "delta_threshold",
-            )?;
-            authorize_f64_change(
-                gos_epsilon(&current.runtime_policy.delta),
-                gos_epsilon(&next.runtime_policy.delta),
-                policy.gos_epsilon_staleness.as_ref(),
-                &current.producer_id,
-                "gos_epsilon_staleness",
-            )?;
-        }
-        Ok(())
-    }
-
-    pub fn validate_frame(
-        &self,
-        frame: &SummaryFrameIdentity,
-    ) -> Result<(), TransmissionPlanError> {
-        if frame.identity_version != self.frame_identity.identity_version
-            || frame.plan_id != self.envelope.plan_id
-            || frame.plan_version != self.envelope.plan_version
-            || frame.backend_compat != self.envelope.backend_compat
-            || frame.series_identity.is_empty()
-            || frame.producer_epoch.is_empty()
-            || frame.sequence == 0
-            || frame.window_start_unix_nano >= frame.window_end_unix_nano
-            || (frame.kind == SummaryFrameKind::Full
-                && self.frame_identity.require_checkpoint_for_full
-                && frame.checkpoint_id.is_none())
-            || (frame.kind == SummaryFrameKind::Delta
-                && self.frame_identity.require_base_checkpoint_for_delta
-                && frame.base_checkpoint_id.is_none())
-        {
-            return Err(TransmissionPlanError::InvalidFrame(
-                "identity/lifecycle/window/checkpoint fields do not satisfy the active contract"
-                    .into(),
-            ));
-        }
-        if self.rules.iter().any(|rule| {
-            rule.materialization == frame.materialization
-                && rule.producer_id == frame.producer_id
-                && rule.schema_id == frame.schema_id
-                // A delta rule necessarily emits periodic full checkpoints;
-                // a full-only rule must never emit deltas.
-                && (frame.kind == SummaryFrameKind::Full
-                    || rule.mode == TransmissionMode::Delta)
-                && rule.encoding == frame.encoding
-        }) {
-            Ok(())
-        } else {
-            Err(TransmissionPlanError::UnknownFrame)
-        }
-    }
-}
-
-fn validate_runtime_rule_policy(
-    rule: &TransmissionRule,
-    family: &StateFamilyContract,
-) -> Result<(), TransmissionPlanError> {
-    let invalid = |reason: &str| TransmissionPlanError::InvalidRuntimePolicy {
-        producer_id: rule.producer_id.clone(),
-        reason: reason.into(),
-    };
-    if let SamplingPolicy::Fixed {
-        probability,
-        estimator,
-    } = &rule.runtime_policy.sampling
-    {
-        if !probability.is_finite() || !(0.0..=1.0).contains(probability) || *probability == 0.0 {
-            return Err(invalid("sample probability must be finite and in (0, 1]"));
-        }
-        let supported = matches!(
-            (family, *estimator),
-            (
-                StateFamilyContract::Sketch {
-                    algorithm: SketchAlgorithm::Hll,
-                    ..
-                },
-                SamplingEstimator::HashThreshold,
-            ) | (
-                StateFamilyContract::Sketch {
-                    algorithm: SketchAlgorithm::Cms | SketchAlgorithm::CmsWithHeap,
-                    ..
-                },
-                SamplingEstimator::GeometricAdmission,
-            )
-        );
-        if !supported {
-            return Err(invalid(
-                "sampling estimator is not implemented for the materialization family",
-            ));
-        }
-    }
-
-    if (rule.mode == TransmissionMode::Delta) != rule.runtime_policy.delta.is_some() {
-        return Err(invalid(
-            "delta policy must be present exactly when transmission mode is delta",
-        ));
-    }
-    if let Some(delta) = &rule.runtime_policy.delta {
-        if !delta.absolute_threshold.is_finite() || delta.absolute_threshold < 0.0 {
-            return Err(invalid("delta threshold must be finite and non-negative"));
-        }
-        if !matches!(
-            family,
-            StateFamilyContract::Sketch {
-                algorithm: SketchAlgorithm::DDSketch
-                    | SketchAlgorithm::Hll
-                    | SketchAlgorithm::Cms
-                    | SketchAlgorithm::CmsWithHeap
-                    | SketchAlgorithm::CountSketch
-                    | SketchAlgorithm::CountSketchWithHeap,
-                ..
-            }
-        ) {
-            return Err(invalid(
-                "delta transmission is not implemented for the materialization family",
-            ));
-        }
-        if let Some(gos) = &delta.gos {
-            if !matches!(
-                family,
-                StateFamilyContract::Sketch {
-                    algorithm: SketchAlgorithm::CountSketch | SketchAlgorithm::CountSketchWithHeap,
-                    ..
-                }
-            ) || !gos.epsilon_staleness.is_finite()
-                || !(0.0..=1.0).contains(&gos.epsilon_staleness)
-                || gos.epsilon_staleness == 0.0
-                || gos.sites == 0
-            {
-                return Err(invalid(
-                    "GOS requires a CountSketch family, epsilon in (0, 1], and at least one site",
-                ));
-            }
-        }
-    }
-
-    let adaptation = &rule.runtime_policy.adaptation;
-    if adaptation.enabled
-        && (adaptation.max_evidence_age_ms == 0 || adaptation.min_evidence_samples == 0)
-    {
-        return Err(invalid(
-            "enabled adaptation requires non-zero evidence age and sample-count requirements",
-        ));
-    }
-    validate_f64_bounds(adaptation.sample_probability.as_ref(), 0.0, 1.0).map_err(&invalid)?;
-    validate_f64_bounds(adaptation.delta_threshold.as_ref(), 0.0, f64::MAX).map_err(&invalid)?;
-    validate_f64_bounds(adaptation.gos_epsilon_staleness.as_ref(), 0.0, 1.0).map_err(&invalid)?;
-    if let Some(bounds) = &adaptation.emit_every_ms {
-        if bounds.min == 0
-            || bounds.min > bounds.max
-            || bounds.max_step == 0
-            || !(bounds.min..=bounds.max).contains(&rule.emit_every_ms)
-        {
-            return Err(invalid("emit interval guardrails are invalid"));
-        }
-    }
-    if let Some(bounds) = &adaptation.sample_probability {
-        let current = sampling_probability(&rule.runtime_policy.sampling);
-        if current < bounds.min || current > bounds.max {
-            return Err(invalid(
-                "current sampling probability is outside guardrails",
-            ));
-        }
-    }
-    if let Some(bounds) = &adaptation.delta_threshold {
-        let Some(current) = rule
-            .runtime_policy
-            .delta
-            .as_ref()
-            .map(|policy| policy.absolute_threshold)
-        else {
-            return Err(invalid("delta guardrails require an active delta policy"));
-        };
-        if current < bounds.min || current > bounds.max {
-            return Err(invalid("current delta threshold is outside guardrails"));
-        }
-    }
-    if let Some(bounds) = &adaptation.gos_epsilon_staleness {
-        let Some(current) = rule
-            .runtime_policy
-            .delta
-            .as_ref()
-            .and_then(|policy| policy.gos.as_ref())
-            .map(|gos| gos.epsilon_staleness)
-        else {
-            return Err(invalid("GOS guardrails require an active GOS policy"));
-        };
-        if current < bounds.min || current > bounds.max {
-            return Err(invalid("current GOS epsilon is outside guardrails"));
-        }
-    }
-    Ok(())
-}
-
-fn validate_f64_bounds(
-    bounds: Option<&AdaptiveF64Bounds>,
-    domain_min: f64,
-    domain_max: f64,
-) -> Result<(), &'static str> {
-    let Some(bounds) = bounds else {
-        return Ok(());
-    };
-    if !bounds.min.is_finite()
-        || !bounds.max.is_finite()
-        || !bounds.max_step.is_finite()
-        || bounds.min < domain_min
-        || bounds.max > domain_max
-        || bounds.min > bounds.max
-        || bounds.max_step <= 0.0
-    {
-        Err("floating-point adaptation guardrails are invalid")
-    } else {
-        Ok(())
-    }
-}
-
-fn sampling_probability(policy: &SamplingPolicy) -> f64 {
-    match policy {
-        SamplingPolicy::Disabled => 1.0,
-        SamplingPolicy::Fixed { probability, .. } => *probability,
-    }
-}
-
-fn sampling_estimator(policy: &SamplingPolicy) -> Option<SamplingEstimator> {
-    match policy {
-        SamplingPolicy::Disabled => None,
-        SamplingPolicy::Fixed { estimator, .. } => Some(*estimator),
-    }
-}
-
-fn delta_threshold(policy: &Option<DeltaPolicy>) -> f64 {
-    policy
-        .as_ref()
-        .map(|policy| policy.absolute_threshold)
-        .unwrap_or(0.0)
-}
-
-fn gos_epsilon(policy: &Option<DeltaPolicy>) -> f64 {
-    policy
-        .as_ref()
-        .and_then(|policy| policy.gos.as_ref())
-        .map(|gos| gos.epsilon_staleness)
-        .unwrap_or(0.0)
-}
-
-fn delta_shape(policy: &Option<DeltaPolicy>) -> Option<(Option<(u32, GosThresholdMode)>,)> {
-    policy.as_ref().map(|policy| {
-        (policy
-            .gos
-            .as_ref()
-            .map(|gos| (gos.sites, gos.threshold_mode)),)
-    })
-}
-
-fn authorize_f64_change(
-    current: f64,
-    next: f64,
-    bounds: Option<&AdaptiveF64Bounds>,
-    producer_id: &str,
-    knob: &'static str,
-) -> Result<(), TransmissionPlanError> {
-    if current == next {
-        return Ok(());
-    }
-    let allowed = bounds.is_some_and(|bounds| {
-        next.is_finite()
-            && (bounds.min..=bounds.max).contains(&next)
-            && (next - current).abs() <= bounds.max_step
-    });
-    if allowed {
-        Ok(())
-    } else {
-        Err(TransmissionPlanError::AdaptationOutOfBounds {
-            producer_id: producer_id.into(),
-            knob,
-        })
-    }
-}
-
-fn authorize_u64_change(
-    current: u64,
-    next: u64,
-    bounds: Option<&AdaptiveU64Bounds>,
-    producer_id: &str,
-    knob: &'static str,
-) -> Result<(), TransmissionPlanError> {
-    if current == next {
-        return Ok(());
-    }
-    let allowed = bounds.is_some_and(|bounds| {
-        (bounds.min..=bounds.max).contains(&next) && current.abs_diff(next) <= bounds.max_step
-    });
-    if allowed {
-        Ok(())
-    } else {
-        Err(TransmissionPlanError::AdaptationOutOfBounds {
-            producer_id: producer_id.into(),
-            knob,
-        })
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use planner_types::post_asap::SketchParams;
-
-    #[test]
-    fn runtime_policy_is_family_and_mode_checked() {
-        let mut rule = TransmissionRule {
-            materialization: crate::PolicyFingerprint(1).into(),
-            producer_id: "test".into(),
-            schema_id: "test".into(),
-            mode: TransmissionMode::Full,
-            encoding: StateEncoding::SketchlibProtobufV1,
-            emit_every_ms: 60_000,
-            full_checkpoint_every_ms: None,
-            destination_ref: "backend".into(),
-            runtime_policy: Default::default(),
-        };
-        rule.runtime_policy.sampling = SamplingPolicy::Fixed {
-            probability: 0.5,
-            estimator: SamplingEstimator::HashThreshold,
-        };
-        let hll = StateFamilyContract::Sketch {
-            algorithm: SketchAlgorithm::Hll,
-            parameters: SketchParams::Hll { precision: 14 },
-        };
-        let count_sketch = StateFamilyContract::Sketch {
-            algorithm: SketchAlgorithm::CountSketch,
-            parameters: SketchParams::CountSketch {
-                width: 128,
-                depth: 4,
-            },
-        };
-        validate_runtime_rule_policy(&rule, &hll).expect("HLL supports hash-threshold sampling");
-        assert!(matches!(
-            validate_runtime_rule_policy(&rule, &count_sketch),
-            Err(TransmissionPlanError::InvalidRuntimePolicy { .. })
-        ));
-
-        rule.runtime_policy.sampling = SamplingPolicy::Disabled;
-        rule.mode = TransmissionMode::Delta;
-        rule.full_checkpoint_every_ms = Some(300_000);
-        rule.runtime_policy.delta = Some(DeltaPolicy {
-            absolute_threshold: 0.0,
-            gos: Some(GosPolicy {
-                epsilon_staleness: 0.02,
-                sites: 2,
-                threshold_mode: GosThresholdMode::Isotropic,
-            }),
-        });
-        validate_runtime_rule_policy(&rule, &count_sketch).expect("CountSketch supports delta GOS");
-        assert!(matches!(
-            validate_runtime_rule_policy(&rule, &hll),
-            Err(TransmissionPlanError::InvalidRuntimePolicy { .. })
-        ));
-    }
-}
diff --git a/crates/asap_types/src/query_plan.rs b/crates/asap_types/src/query_plan.rs
deleted file mode 100644
index 8cea4e1a5..000000000
--- a/crates/asap_types/src/query_plan.rs
+++ /dev/null
@@ -1,991 +0,0 @@
-//! Shared installed QueryPlan contract and activation validation.
-//!
-//! ASAPPlanner owns semantic post-ASAP IR. Physical compilation binds every
-//! maintained-summary leaf to one materialization and lowers edges to stable
-//! node IDs. Serving executes this graph without reconstructing Planner IR or
-//! searching for compatible materializations.
-
-pub mod current_series;
-pub mod query_time;
-
-use std::collections::{BTreeMap, BTreeSet};
-
-use planner_types::post_asap::SketchQuery;
-use serde::{Deserialize, Serialize};
-use thiserror::Error;
-
-pub use crate::QueryLanguage;
-use crate::{sds::StoredOutputId, PolicyFingerprint};
-
-#[derive(Debug, Clone, Serialize, Deserialize, PartialEq)]
-#[serde(deny_unknown_fields)]
-pub struct QueryPlan {
-    pub plan_id: u64,
-    pub plan_version: u64,
-    #[serde(default, skip_serializing_if = "Option::is_none")]
-    pub clickhouse_context: Option<ClickHousePlanningContext>,
-    /// Selected semantic roots retained for provenance; serving executes
-    /// `entries` and never reconstructs a plan from these documents.
-    #[serde(default, skip_serializing_if = "BTreeMap::is_empty")]
-    pub selected_dags: BTreeMap<String, crate::executable_plan::OwnedPostAsapDag>,
-    pub entries: BTreeMap<String, QueryPlanEntry>,
-}
-
-#[derive(Debug, Clone, Serialize, Deserialize, PartialEq)]
-#[serde(deny_unknown_fields)]
-pub struct ClickHousePlanningContext {
-    pub tables: std::collections::HashMap<String, planner_types::pre_asap::Schema>,
-    pub accuracy: planner_types::types::AccuracyTarget,
-    /// A time template can have several concrete plans with different pane
-    /// origins or materializations. Keep their physical bindings independent.
-    #[serde(default, skip_serializing_if = "BTreeMap::is_empty")]
-    pub window_templates: BTreeMap<String, Vec<String>>,
-}
-
-#[derive(Debug, Clone, Copy, Serialize, Deserialize, PartialEq, Eq)]
-#[serde(deny_unknown_fields)]
-pub struct FixedEvaluationRange {
-    pub start_ms: u64,
-    pub end_ms: u64,
-    pub cumulative: bool,
-}
-
-impl QueryPlan {
-    pub fn empty() -> Self {
-        Self {
-            plan_id: 0,
-            plan_version: 0,
-            clickhouse_context: None,
-            selected_dags: BTreeMap::new(),
-            entries: BTreeMap::new(),
-        }
-    }
-
-    pub fn lookup(&self, promql: &str) -> Result<&QueryPlanEntry, QueryPlanError> {
-        // Installed entries already carry validated canonical identities. The
-        // common exact spelling requires no serving-time parser invocation.
-        if let Some(entry) = self.entries.get(promql).filter(|entry| {
-            entry.language == QueryLanguage::PromQl && entry.canonical_query == promql
-        }) {
-            return Ok(entry);
-        }
-        let identity = canonical_promql(promql)?;
-        self.lookup_canonical(QueryLanguage::PromQl, &identity)
-    }
-
-    pub fn lookup_canonical(
-        &self,
-        language: QueryLanguage,
-        identity: &str,
-    ) -> Result<&QueryPlanEntry, QueryPlanError> {
-        let key = Self::catalog_key(language, identity);
-        self.entries
-            .get(&key)
-            .filter(|entry| entry.language == language)
-            .ok_or_else(|| QueryPlanError::QueryNotPlanned(identity.into()))
-    }
-
-    pub fn catalog_key(language: QueryLanguage, identity: &str) -> String {
-        match language {
-            QueryLanguage::PromQl => identity.to_owned(),
-            QueryLanguage::MetricsQl => format!("metricsql:{identity}"),
-            QueryLanguage::ClickHouseSql => format!("clickhouse:{identity}"),
-        }
-    }
-
-    pub fn lookup_clickhouse(
-        &self,
-        canonical_sql: &str,
-    ) -> Result<&QueryPlanEntry, QueryPlanError> {
-        self.lookup_canonical(QueryLanguage::ClickHouseSql, canonical_sql)
-    }
-
-    pub fn bind_catalog(
-        &mut self,
-        catalog: &crate::summary_catalog::SummaryCatalog,
-    ) -> Result<(), QueryPlanError> {
-        catalog
-            .validate()
-            .map_err(|e| QueryPlanError::Invalid(e.to_string()))?;
-        for entry in self.entries.values_mut() {
-            for node in entry.nodes.values_mut() {
-                if let QueryPlanNode::ReadMaterialization { binding } = node {
-                    binding.stored_output_reference = catalog
-                        .output_reference(binding.materialization)
-                        .map_err(|e| QueryPlanError::Invalid(e.to_string()))?;
-                }
-            }
-        }
-        self.validate_against_catalog(catalog)
-    }
-
-    /// Validate semantic bindings against the authoritative snapshot before use.
-    pub fn validate_against_catalog(
-        &self,
-        catalog: &crate::summary_catalog::SummaryCatalog,
-    ) -> Result<(), QueryPlanError> {
-        catalog
-            .validate()
-            .map_err(|error| QueryPlanError::Invalid(error.to_string()))?;
-        if self.plan_id != catalog.plan_id || self.plan_version != catalog.plan_version {
-            return Err(QueryPlanError::Invalid(
-                "QueryPlan and SummaryCatalog have different plan identity/version".into(),
-            ));
-        }
-        let available = catalog.outputs.keys().copied().map(Into::into).collect();
-        self.validate(&available)?;
-        for entry in self.entries.values() {
-            for binding in entry.materialization_bindings() {
-                let identity = catalog
-                    .outputs
-                    .get(&binding.materialization)
-                    .ok_or_else(|| {
-                        QueryPlanError::Invalid(
-                            "query binding references absent catalog materialization".into(),
-                        )
-                    })?;
-                if binding.stored_output_reference.definition_id != identity.definition_id {
-                    return Err(QueryPlanError::Invalid(
-                        "read definition differs from installed output".into(),
-                    ));
-                }
-                let _data = &catalog.data_descriptors[&identity.data_descriptor_id];
-                if binding.window_ms == 0 {
-                    return Err(QueryPlanError::Invalid(
-                        "zero physical pane duration".into(),
-                    ));
-                }
-                if binding.full_window_slide_ms == Some(0) {
-                    return Err(QueryPlanError::Invalid(
-                        "query full-window cadence must be nonzero".into(),
-                    ));
-                }
-            }
-            for node in entry.nodes.values() {
-                let QueryPlanNode::ExactReadout { input, readout } = node else {
-                    continue;
-                };
-                if !matches!(readout, ExactReadout::Increase | ExactReadout::Rate) {
-                    continue;
-                }
-                let Some(QueryPlanNode::ReadMaterialization { binding }) = entry.nodes.get(input)
-                else {
-                    return Err(QueryPlanError::Invalid(
-                        "counter readout must directly consume one catalog materialization".into(),
-                    ));
-                };
-                let identity = &catalog.outputs[&binding.materialization];
-                let descriptor = &catalog.summary_descriptors[&identity.summary_descriptor_id];
-                if !matches!(
-                    descriptor.fidelity,
-                    crate::sds::FidelityGuarantee::ExactCounter {
-                        full_pane_coverage_required: true,
-                        ..
-                    }
-                ) {
-                    return Err(QueryPlanError::Invalid(
-                        "rate/increase binding does not reference an exact counter SDS".into(),
-                    ));
-                }
-            }
-        }
-        Ok(())
-    }
-
-    pub fn validate(&self, available: &BTreeSet<PolicyFingerprint>) -> Result<(), QueryPlanError> {
-        if self.plan_id != 0 && self.plan_version == 0 {
-            return Err(QueryPlanError::Invalid(
-                "non-bootstrap QueryPlan has zero plan_version".into(),
-            ));
-        }
-        for (query_id, selected) in &self.selected_dags {
-            if query_id != &selected.query_id {
-                return Err(QueryPlanError::Invalid(format!(
-                    "selected DAG map key `{query_id}` differs from document query ID `{}`",
-                    selected.query_id
-                )));
-            }
-            if selected.schema_version != crate::executable_plan::OWNED_POST_ASAP_DAG_SCHEMA_VERSION
-            {
-                return Err(QueryPlanError::Invalid(format!(
-                    "selected DAG `{query_id}` has unsupported schema version {}",
-                    selected.schema_version
-                )));
-            }
-            selected.decode().map_err(|error| {
-                QueryPlanError::Invalid(format!("selected DAG `{query_id}` is invalid: {error}"))
-            })?;
-            let matching_entries = self
-                .entries
-                .values()
-                .filter(|entry| entry.query_id == *query_id)
-                .count();
-            if matching_entries != 1 {
-                return Err(QueryPlanError::Invalid(format!(
-                    "selected DAG `{query_id}` must correspond to exactly one query entry; found {matching_entries}"
-                )));
-            }
-        }
-        if let Some(context) = &self.clickhouse_context {
-            for (template, identities) in &context.window_templates {
-                if !template.starts_with("moving-window-v1:") || identities.is_empty() {
-                    return Err(QueryPlanError::Invalid(
-                        "invalid SQL window template index".into(),
-                    ));
-                }
-                let mut seen = BTreeSet::new();
-                for identity in identities {
-                    let entry = self.lookup_clickhouse(identity)?;
-                    if !seen.insert(identity)
-                        || entry
-                            .nodes
-                            .values()
-                            .any(|node| matches!(node, QueryPlanNode::ExternalExact { .. }))
-                    {
-                        return Err(QueryPlanError::Invalid(
-                            "SQL window template has duplicate or external bindings".into(),
-                        ));
-                    }
-                }
-            }
-        }
-        for (identity, entry) in &self.entries {
-            let expected = Self::catalog_key(entry.language, &entry.canonical_query);
-            if identity != &expected {
-                return Err(QueryPlanError::Invalid(format!(
-                    "query map key `{identity}` differs from entry identity `{}`",
-                    entry.canonical_query
-                )));
-            }
-            match entry.language {
-                QueryLanguage::PromQl | QueryLanguage::MetricsQl
-                    if entry.fixed_evaluation.is_some() =>
-                {
-                    return Err(QueryPlanError::Invalid(
-                        "PromQL query entry carries a ClickHouse fixed evaluation range".into(),
-                    ));
-                }
-                QueryLanguage::ClickHouseSql => {
-                    if self.clickhouse_context.is_none() {
-                        return Err(QueryPlanError::Invalid(
-                            "ClickHouse query entry has no planning context".into(),
-                        ));
-                    }
-                    let Some(range) = entry.fixed_evaluation else {
-                        return Err(QueryPlanError::Invalid(
-                            "ClickHouse query entry has no fixed evaluation range".into(),
-                        ));
-                    };
-                    if range.end_ms <= range.start_ms {
-                        return Err(QueryPlanError::Invalid(
-                            "ClickHouse query entry has an empty evaluation range".into(),
-                        ));
-                    }
-                }
-                QueryLanguage::PromQl | QueryLanguage::MetricsQl => {}
-            }
-            entry.validate(available)?;
-        }
-        Ok(())
-    }
-}
-
-pub use crate::executable_plan::QueryNodeId;
-
-#[derive(Debug, Clone, Serialize, Deserialize, PartialEq)]
-#[serde(deny_unknown_fields)]
-pub struct QueryPlanEntry {
-    #[serde(default)]
-    pub language: QueryLanguage,
-    pub query_id: String,
-    pub canonical_query: String,
-    #[serde(default, skip_serializing_if = "Option::is_none")]
-    pub fixed_evaluation: Option<FixedEvaluationRange>,
-    pub root: QueryNodeId,
-    pub nodes: BTreeMap<QueryNodeId, QueryPlanNode>,
-    pub instant: InstantExecution,
-    pub fallback: FallbackPolicy,
-}
-
-fn topological_order(
-    root: QueryNodeId,
-    nodes: &BTreeMap<QueryNodeId, QueryPlanNode>,
-) -> Result<Vec<QueryNodeId>, QueryPlanError> {
-    fn visit(
-        id: QueryNodeId,
-        nodes: &BTreeMap<QueryNodeId, QueryPlanNode>,
-        visiting: &mut BTreeSet<QueryNodeId>,
-        visited: &mut BTreeSet<QueryNodeId>,
-        out: &mut Vec<QueryNodeId>,
-    ) -> Result<(), QueryPlanError> {
-        if visited.contains(&id) {
-            return Ok(());
-        }
-        if !visiting.insert(id) {
-            return Err(QueryPlanError::Invalid(format!(
-                "cycle detected at query node {}",
-                id.0
-            )));
-        }
-        let node = nodes
-            .get(&id)
-            .ok_or_else(|| QueryPlanError::Invalid(format!("missing query node {}", id.0)))?;
-        for input in node.inputs() {
-            visit(*input, nodes, visiting, visited, out)?;
-        }
-        visiting.remove(&id);
-        visited.insert(id);
-        out.push(id);
-        Ok(())
-    }
-    let mut out = Vec::with_capacity(nodes.len());
-    visit(
-        root,
-        nodes,
-        &mut BTreeSet::new(),
-        &mut BTreeSet::new(),
-        &mut out,
-    )?;
-    Ok(out)
-}
-
-#[derive(Debug, Clone, Copy, Serialize, Deserialize, PartialEq, Eq)]
-#[serde(deny_unknown_fields)]
-pub struct InstantExecution {
-    pub lookback_ms: u64,
-    pub full_history: bool,
-    pub cumulative_readout: bool,
-}
-
-impl QueryPlanEntry {
-    /// Materializations this executable DAG reads, in stable node order.
-    /// Serving uses this set for readiness accounting; it never performs a
-    /// catalog candidate search to reconstruct dependencies.
-    pub fn materialization_bindings(&self) -> Vec<&MaterializationBinding> {
-        self.nodes
-            .values()
-            .filter_map(|node| match node {
-                QueryPlanNode::ReadMaterialization { binding } => Some(binding),
-                _ => None,
-            })
-            .collect()
-    }
-
-    pub fn topological_order(&self) -> Result<Vec<QueryNodeId>, QueryPlanError> {
-        topological_order(self.root, &self.nodes)
-    }
-
-    pub fn topological_order_from(
-        &self,
-        root: QueryNodeId,
-    ) -> Result<Vec<QueryNodeId>, QueryPlanError> {
-        topological_order(root, &self.nodes)
-    }
-
-    /// The current external adapters provide evaluation time, not a snapshot
-    /// token compatible with local SDS or current-series revisions.
-    pub fn validate_snapshot_sources(&self) -> Result<(), QueryPlanError> {
-        use query_time::QueryTimeOperator;
-        let mut local = false;
-        let mut external = false;
-        for id in self.topological_order()? {
-            match &self.nodes[&id] {
-                QueryPlanNode::ReadMaterialization { .. }
-                | QueryPlanNode::Logical {
-                    operator: QueryTimeOperator::CurrentSeries { .. },
-                    ..
-                } => local = true,
-                QueryPlanNode::ExternalExact { .. }
-                | QueryPlanNode::Logical {
-                    operator:
-                        QueryTimeOperator::ExactSubquery { .. }
-                        | QueryTimeOperator::CandidateExactSubquery { .. },
-                    ..
-                } => external = true,
-                _ => {}
-            }
-        }
-        if local && external {
-            return Err(QueryPlanError::UnsupportedNode(
-                "local state and external exact input have no common snapshot proof".into(),
-            ));
-        }
-        Ok(())
-    }
-
-    /// Validate references, bindings, reachability, and cycles before activation.
-    pub fn validate(&self, available: &BTreeSet<PolicyFingerprint>) -> Result<(), QueryPlanError> {
-        self.validate_snapshot_sources()?;
-        if !self.nodes.contains_key(&self.root) {
-            return Err(QueryPlanError::Invalid(format!(
-                "query `{}` has missing root {}",
-                self.query_id, self.root.0
-            )));
-        }
-        for (id, node) in &self.nodes {
-            validate_native_relation(*id, node)?;
-            if let QueryPlanNode::PhysicalFragment {
-                inputs,
-                dag,
-                row_input,
-                pruning,
-            } = node
-            {
-                let compiled =
-                    asap_physical_operators::physical_planner::CompiledPhysicalDag::decode(dag)
-                        .map_err(|e| QueryPlanError::Invalid(e.to_string()))?;
-                for (_, contract) in compiled.input_contracts() {
-                    let mut samples = 0;
-                    for (index, field) in contract.schema.fields.iter().enumerate() {
-                        use planner_types::{post_asap::SummaryFamilyType, pre_asap::DataType};
-                        match &field.dtype {
-                            SummaryFamilyType::Plain(DataType::Float64 | DataType::Int64) => {
-                                samples += 1
-                            }
-                            SummaryFamilyType::Plain(DataType::Utf8) => {}
-                            SummaryFamilyType::Plain(DataType::Timestamp)
-                                if contract.schema.time_index == Some(index) => {}
-                            _ => {
-                                return Err(QueryPlanError::Invalid(format!(
-                                    "PromQL input binding cannot supply field {}",
-                                    field.name
-                                )))
-                            }
-                        }
-                    }
-                    if samples > 1 {
-                        return Err(QueryPlanError::Invalid(
-                            "PromQL vector input has only one numeric sample per row".into(),
-                        ));
-                    }
-                }
-                let source = compiled.input_contracts().nth(*row_input).map(|(id, _)| id);
-                if compiled.roots().len() != 1
-                    || source.is_none()
-                    || compiled.row_source(compiled.roots()[0]) != source
-                {
-                    return Err(QueryPlanError::Invalid(
-                        "physical vector output must preserve its bound input rows".into(),
-                    ));
-                }
-                if let Some(pruning) = pruning {
-                    if matches!(&pruning.completeness, CandidateCompleteness::Certified { guarantee }
-                        if guarantee.metric != planner_types::post_asap::ErrorMetric::TopKMembership || guarantee.bound.evaluate().is_none() || guarantee.failure_probability.evaluate().is_none())
-                    {
-                        return Err(QueryPlanError::Invalid(
-                            "invalid physical pruning certificate".into(),
-                        ));
-                    }
-                    let contracts = compiled.input_contracts().collect::<Vec<_>>();
-                    let left = contracts
-                        .get(*row_input)
-                        .ok_or_else(|| QueryPlanError::Invalid("invalid row input".into()))?
-                        .1;
-                    let right = contracts
-                        .get(pruning.candidate_input)
-                        .ok_or_else(|| QueryPlanError::Invalid("invalid candidate input".into()))?
-                        .1;
-                    asap_physical_operators::operators::Operator::semi_join(
-                        left.schema.clone(),
-                        right.schema.clone(),
-                        pruning.keys.clone(),
-                    )
-                    .map_err(|e| QueryPlanError::Invalid(e.to_string()))?;
-                }
-                if compiled.input_contracts().count() != inputs.len()
-                    || compiled.roots().len() != 1
-                    || *row_input >= inputs.len()
-                {
-                    return Err(QueryPlanError::Invalid(
-                        "physical input/root binding mismatch".into(),
-                    ));
-                }
-            }
-
-            if let QueryPlanNode::Logical { operator, inputs } = node {
-                operator.validate(inputs.len())?;
-            }
-            if matches!(node, QueryPlanNode::Scalar { value } if !value.is_finite()) {
-                return Err(QueryPlanError::Invalid("non-finite scalar constant".into()));
-            }
-            if let QueryPlanNode::ExternalExact { request, inputs } = node {
-                if request.expression.trim().is_empty() {
-                    return Err(QueryPlanError::Invalid(
-                        "external exact expression must not be empty".into(),
-                    ));
-                }
-                if request.input_contracts.len() != inputs.len() {
-                    return Err(QueryPlanError::Invalid(
-                        "external exact input contracts must match DAG inputs".into(),
-                    ));
-                }
-                if request.input_contracts.iter().any(|contract| {
-                    matches!(contract, ExternalExactInput::CandidateMembership { item_label } if item_label.is_empty())
-                }) {
-                    return Err(QueryPlanError::Invalid(
-                        "external exact candidate item label must not be empty".into(),
-                    ));
-                }
-            }
-            if let QueryPlanNode::RelationalJoin {
-                pruning: Some(completeness),
-                join_kind,
-                ..
-            } = node
-            {
-                if *join_kind != planner_types::pre_asap::JoinKind::Semi {
-                    return Err(QueryPlanError::Invalid(
-                        "pruning evidence requires a semi-join".into(),
-                    ));
-                }
-                if matches!(
-                    completeness,
-                    CandidateCompleteness::Certified { guarantee }
-                        if guarantee.metric
-                            != planner_types::post_asap::ErrorMetric::TopKMembership
-                            || guarantee.bound.evaluate().is_none()
-                            || guarantee.failure_probability.evaluate().is_none()
-                ) {
-                    return Err(QueryPlanError::Invalid(
-                        "invalid semi-join pruning certificate".into(),
-                    ));
-                }
-            }
-            for input in node.inputs() {
-                if !self.nodes.contains_key(input) {
-                    return Err(QueryPlanError::Invalid(format!(
-                        "query `{}` node {} references missing input {}",
-                        self.query_id, id.0, input.0
-                    )));
-                }
-            }
-            if let QueryPlanNode::ReadMaterialization { binding } = node {
-                if binding.stored_output_reference.stored_output_id != binding.materialization {
-                    return Err(QueryPlanError::Invalid(
-                        "read binding has invalid stored output or definition".into(),
-                    ));
-                }
-                if binding.readout_lookback_ms == Some(0) {
-                    return Err(QueryPlanError::Invalid(
-                        "zero semantic readout lookback".into(),
-                    ));
-                }
-                if !available.contains(&binding.materialization.fingerprint()) {
-                    return Err(QueryPlanError::Invalid(format!(
-                        "query `{}` node {} references absent materialization {}",
-                        self.query_id,
-                        id.0,
-                        binding.materialization.as_u64()
-                    )));
-                }
-            }
-        }
-        let order = self.topological_order()?;
-        if order.len() != self.nodes.len() {
-            return Err(QueryPlanError::Invalid(format!(
-                "query `{}` contains unreachable nodes",
-                self.query_id
-            )));
-        }
-        Ok(())
-    }
-}
-
-#[derive(Debug, Clone, Copy, Serialize, Deserialize, PartialEq, Eq)]
-#[serde(rename_all = "snake_case")]
-pub enum FallbackPolicy {
-    ExactBackend,
-    Reject,
-}
-
-#[derive(Debug, Clone, Serialize, Deserialize, PartialEq)]
-#[serde(deny_unknown_fields)]
-pub struct MaterializationBinding {
-    pub stored_output_reference: crate::sds::StoredOutputReference,
-    /// Complete-window storage advances independently of its stored extent.
-    /// None denotes disjoint pane storage.
-    #[serde(default, skip_serializing_if = "Option::is_none")]
-    pub full_window_slide_ms: Option<u64>,
-    pub materialization: StoredOutputId,
-    /// Query operator grouping applied while folding those SIDs.
-    pub output_grouping: PhysicalGrouping,
-    /// Labels whose values form an item identity inside a keyed sketch.
-    #[serde(default, skip_serializing_if = "Vec::is_empty")]
-    pub item_labels: Vec<String>,
-    pub window_ms: u64,
-    /// Unix millisecond timestamp on the materialized pane-boundary grid.
-    /// Legacy plans deserialize this as unknown and fall back at read time.
-    #[serde(default, skip_serializing_if = "Option::is_none")]
-    pub pane_origin_ms: Option<i64>,
-    /// Semantic query lookback, independent of the physical pane duration.
-    #[serde(default, skip_serializing_if = "Option::is_none")]
-    pub readout_lookback_ms: Option<u64>,
-}
-
-impl MaterializationBinding {
-    /// Both range boundaries must identify complete stored state. Full windows
-    /// use a start grid; their end grid is displaced by the window width.
-    pub fn covers_range(&self, start_ms: u64, end_ms: u64) -> bool {
-        let Some(origin) = self.pane_origin_ms else {
-            return false;
-        };
-        if self.window_ms == 0 || end_ms <= start_ms {
-            return false;
-        }
-        let start = i128::from(start_ms) - i128::from(origin);
-        match self.full_window_slide_ms {
-            Some(slide) => {
-                slide != 0
-                    && end_ms - start_ms == self.window_ms
-                    && start.rem_euclid(i128::from(slide)) == 0
-            }
-            None => {
-                start.rem_euclid(i128::from(self.window_ms)) == 0
-                    && (i128::from(end_ms) - i128::from(origin))
-                        .rem_euclid(i128::from(self.window_ms))
-                        == 0
-            }
-        }
-    }
-}
-
-#[derive(Debug, Clone, Serialize, Deserialize, PartialEq, Eq)]
-#[serde(tag = "mode", content = "keys", rename_all = "snake_case")]
-pub enum PhysicalGrouping {
-    PerEntity,
-    Reduce(Vec<String>),
-}
-
-/// Result shape promised by an external exact engine. The backend uses this
-/// contract to type-check downstream DAG nodes without depending on an
-/// engine-specific response envelope.
-#[derive(Debug, Clone, Serialize, Deserialize, PartialEq, Eq)]
-#[serde(tag = "kind", rename_all = "snake_case", deny_unknown_fields)]
-pub enum ExternalExactOutput {
-    Scalar,
-    InstantVector,
-    RangeVector,
-    Relation { schema: serde_json::Value },
-}
-
-/// How an ordinary DAG input constrains an external exact evaluation.
-#[derive(Debug, Clone, Serialize, Deserialize, PartialEq, Eq)]
-#[serde(tag = "kind", rename_all = "snake_case", deny_unknown_fields)]
-pub enum ExternalExactInput {
-    CandidateMembership { item_label: String },
-}
-
-/// Language-neutral request contract for an exact subtree. Evaluation time is
-/// inherited from the containing QueryPlanEntry, avoiding a second time-range
-/// envelope that could drift from the installed query plan.
-#[derive(Debug, Clone, Serialize, Deserialize, PartialEq, Eq)]
-#[serde(deny_unknown_fields)]
-pub struct ExternalExactRequest {
-    pub language: QueryLanguage,
-    pub expression: String,
-    pub output: ExternalExactOutput,
-    /// Engine parameters forwarded without embedding transport details in the DAG.
-    #[serde(default, skip_serializing_if = "BTreeMap::is_empty")]
-    pub parameters: BTreeMap<String, String>,
-    /// Optional parameter names populated from the query entry's evaluation range.
-    #[serde(default, skip_serializing_if = "Option::is_none")]
-    pub start_parameter: Option<String>,
-    #[serde(default, skip_serializing_if = "Option::is_none")]
-    pub end_parameter: Option<String>,
-    #[serde(default, skip_serializing_if = "Vec::is_empty")]
-    pub input_contracts: Vec<ExternalExactInput>,
-}
-
-/// Required candidate rows must have authoritative values at the bound source.
-#[derive(Debug, Clone, Serialize, Deserialize, PartialEq)]
-#[serde(deny_unknown_fields)]
-pub struct PruningInputContract {
-    pub candidate_input: usize,
-    pub keys: Vec<(usize, usize)>,
-    pub completeness: CandidateCompleteness,
-}
-
-#[derive(Debug, Clone, Serialize, Deserialize, PartialEq)]
-#[serde(tag = "op", rename_all = "snake_case", deny_unknown_fields)]
-pub enum QueryPlanNode {
-    /// Planner-compiled computation. Input order follows the physical input contracts.
-    PhysicalFragment {
-        inputs: Vec<QueryNodeId>,
-        dag: Vec<u8>,
-        row_input: usize,
-        pruning: Option<PruningInputContract>,
-    },
-
-    RelationalJoin {
-        inputs: [QueryNodeId; 2],
-        join_kind: planner_types::pre_asap::JoinKind,
-        pruning: Option<CandidateCompleteness>,
-        pred: serde_json::Value,
-        left_schema: planner_types::post_asap::SummarySchema,
-        right_schema: planner_types::post_asap::SummarySchema,
-        output_schema: planner_types::post_asap::SummarySchema,
-    },
-    Relational {
-        input: QueryNodeId,
-        /// Serialized planner-owned operation. Keeping the wire form here makes
-        /// the published catalog Send + Sync even though the planner AST uses Rc.
-        operation: serde_json::Value,
-        input_schema: planner_types::post_asap::SummarySchema,
-        output_schema: planner_types::post_asap::SummarySchema,
-    },
-    Logical {
-        operator: query_time::QueryTimeOperator,
-        inputs: Vec<QueryNodeId>,
-    },
-    Scalar {
-        value: f64,
-    },
-    Binary {
-        inputs: [QueryNodeId; 2],
-        operator: planner_types::pre_asap::ArithmeticOpKind,
-    },
-    ReduceSum {
-        input: QueryNodeId,
-        grouping: PhysicalGrouping,
-    },
-    ReadMaterialization {
-        binding: MaterializationBinding,
-    },
-    SummaryEstimate {
-        input: QueryNodeId,
-        query: QueryReadout,
-    },
-    ExactReadout {
-        input: QueryNodeId,
-        readout: ExactReadout,
-    },
-    SummaryMerge {
-        inputs: Vec<QueryNodeId>,
-    },
-    /// An exact subtree evaluated outside ASAP. Its results enter the query DAG
-    /// like any other node output and may depend on summary-produced inputs.
-    ExternalExact {
-        request: ExternalExactRequest,
-        inputs: Vec<QueryNodeId>,
-    },
-    ExactFallback {
-        reason: String,
-    },
-}
-
-impl QueryPlanNode {
-    pub fn inputs(&self) -> &[QueryNodeId] {
-        match self {
-            Self::Scalar { .. } | Self::ReadMaterialization { .. } | Self::ExactFallback { .. } => {
-                &[]
-            }
-            Self::Binary { inputs, .. } | Self::RelationalJoin { inputs, .. } => inputs,
-            Self::ReduceSum { input, .. }
-            | Self::Relational { input, .. }
-            | Self::SummaryEstimate { input, .. }
-            | Self::ExactReadout { input, .. } => std::slice::from_ref(input),
-            Self::PhysicalFragment { inputs, .. }
-            | Self::SummaryMerge { inputs }
-            | Self::Logical { inputs, .. }
-            | Self::ExternalExact { inputs, .. } => inputs,
-        }
-    }
-}
-
-pub use planner_types::post_asap::CandidateCompleteness;
-
-#[derive(Debug, Clone, Copy, Serialize, Deserialize, PartialEq, Eq)]
-#[serde(rename_all = "snake_case")]
-pub enum ExactReadout {
-    Sum,
-    Count,
-    Increase,
-    Rate,
-    Min,
-    Max,
-}
-
-impl ExactReadout {
-    /// Planner family required by this installed DAG readout node.
-    pub fn planner_family(self) -> planner_types::post_asap::SummaryFamilyType {
-        use planner_types::post_asap::{ExactKind, ExactParams, SummaryFamilyType};
-        let (kind, params) = match self {
-            Self::Sum => (ExactKind::Sum, ExactParams::Sum),
-            Self::Count => (ExactKind::Count, ExactParams::Count),
-            Self::Increase => (ExactKind::Increase, ExactParams::Increase),
-            Self::Rate => (ExactKind::Rate, ExactParams::Rate),
-            Self::Min => (ExactKind::Min, ExactParams::Min),
-            Self::Max => (ExactKind::Max, ExactParams::Max),
-        };
-        SummaryFamilyType::ExactAggregate(kind, params)
-    }
-}
-
-#[derive(Debug, Clone, Serialize, Deserialize, PartialEq)]
-#[serde(tag = "kind", rename_all = "snake_case", deny_unknown_fields)]
-pub enum QueryReadout {
-    FrequencyL2,
-    FrequencyEntropy,
-    Quantile {
-        q: f64,
-    },
-    PointCount {
-        key: planner_types::pre_asap::ColumnRef,
-        value: Option<String>,
-    },
-    Cardinality,
-    TopK {
-        k: usize,
-    },
-}
-
-impl From<SketchQuery> for QueryReadout {
-    fn from(query: SketchQuery) -> Self {
-        match query {
-            SketchQuery::FrequencyL2 => Self::FrequencyL2,
-            SketchQuery::FrequencyEntropy => Self::FrequencyEntropy,
-            SketchQuery::Quantile { q } => Self::Quantile { q },
-            SketchQuery::PointCount { key, value } => Self::PointCount { key, value },
-            SketchQuery::Cardinality => Self::Cardinality,
-            SketchQuery::TopK { k } => Self::TopK { k },
-        }
-    }
-}
-
-impl From<QueryReadout> for SketchQuery {
-    fn from(query: QueryReadout) -> Self {
-        match query {
-            QueryReadout::FrequencyL2 => Self::FrequencyL2,
-            QueryReadout::FrequencyEntropy => Self::FrequencyEntropy,
-            QueryReadout::Quantile { q } => Self::Quantile { q },
-            QueryReadout::PointCount { key, value } => Self::PointCount { key, value },
-            QueryReadout::Cardinality => Self::Cardinality,
-            QueryReadout::TopK { k } => Self::TopK { k },
-        }
-    }
-}
-
-#[derive(Debug, Error)]
-pub enum QueryPlanError {
-    #[error("invalid PromQL query identity: {0}")]
-    InvalidPromql(String),
-    #[error("query is absent from the active QueryPlan: {0}")]
-    QueryNotPlanned(String),
-    #[error("post-ASAP DAG cannot be represented by the query executor: {0}")]
-    UnsupportedNode(String),
-    #[error("invalid QueryPlan: {0}")]
-    Invalid(String),
-}
-
-pub fn canonical_promql(query: &str) -> Result<String, QueryPlanError> {
-    promql_parser::parser::parse(query.trim())
-        .map(|expr| expr.to_string())
-        .map_err(|error| QueryPlanError::InvalidPromql(error.to_string()))
-}
-
-#[cfg(test)]
-mod contract_tests {
-    // Installed plans cross producer/query threads without Planner Rc state.
-    #[test]
-    fn installed_query_contract_is_send_sync() {
-        fn assert_send_sync<T: Send + Sync>() {}
-        assert_send_sync::<super::QueryPlan>();
-        assert_send_sync::<super::QueryPlanEntry>();
-    }
-}
-
-/// Bind portable relation semantics before an installed plan can access its sources.
-fn validate_native_relation(id: QueryNodeId, node: &QueryPlanNode) -> Result<(), QueryPlanError> {
-    use planner_types::post_asap::{
-        ExecutableDagNode, ExecutableOperatorPayload as Payload, ExecutionDataState, PostAsapNodeId,
-    };
-    use std::sync::Arc;
-    let invalid = |error: String| QueryPlanError::Invalid(format!("query node {}: {error}", id.0));
-    let (payload, inputs, output) = match node {
-        QueryPlanNode::Relational {
-            operation,
-            input_schema,
-            output_schema,
-            ..
-        } => (
-            Payload::Value {
-                operation: serde_json::from_value(operation.clone())
-                    .map_err(|e| invalid(e.to_string()))?,
-            },
-            vec![Arc::new(input_schema.clone())],
-            output_schema,
-        ),
-        QueryPlanNode::RelationalJoin {
-            join_kind,
-            pred,
-            left_schema,
-            right_schema,
-            output_schema,
-            pruning,
-            ..
-        } => (
-            Payload::RelationalJoin {
-                join_kind: join_kind.clone(),
-                pred: serde_json::from_value(pred.clone()).map_err(|e| invalid(e.to_string()))?,
-                pruning: serde_json::from_value(
-                    serde_json::to_value(pruning).map_err(|e| invalid(e.to_string()))?,
-                )
-                .map_err(|e| invalid(e.to_string()))?,
-            },
-            vec![
-                Arc::new(left_schema.clone()),
-                Arc::new(right_schema.clone()),
-            ],
-            output_schema,
-        ),
-        _ => return Ok(()),
-    };
-    let node = ExecutableDagNode {
-        id: PostAsapNodeId(0),
-        payload,
-        output_state: ExecutionDataState::QUERY_ROWS,
-        output_schema: output.clone(),
-        guarantee: None,
-    };
-    asap_physical_operators::physical_planner::compile_node(&node, &inputs)
-        .map_err(|e| invalid(e.to_string()))?;
-    Ok(())
-}
-
-#[cfg(test)]
-mod native_binding_tests {
-    use super::*;
-    use planner_types::{
-        post_asap::{SummaryFamilyType, SummaryField, SummarySchema, ValueOperation},
-        pre_asap::{DataType, Predicate, QueryExpr},
-    };
-
-    // Unsupported expressions fail installation without evaluating any source.
-    #[test]
-    fn rejects_unimplemented_relation_predicate_before_execution() {
-        let schema = SummarySchema {
-            fields: vec![SummaryField {
-                name: "value".into(),
-                dtype: SummaryFamilyType::Plain(DataType::Float64),
-                nullable: false,
-            }],
-            time_index: None,
-        };
-        let node = QueryPlanNode::Relational {
-            input: QueryNodeId(0),
-            operation: serde_json::to_value(ValueOperation::Filter {
-                pred: Predicate(
-                    QueryExpr::FunctionCall {
-                        name: "unimplemented_predicate".into(),
-                        args: vec![],
-                    }
-                    .into(),
-                ),
-            })
-            .unwrap(),
-            input_schema: schema.clone(),
-            output_schema: schema,
-        };
-        assert!(validate_native_relation(QueryNodeId(1), &node).is_err());
-    }
-}
diff --git a/crates/asap_types/src/query_plan/current_series.rs b/crates/asap_types/src/query_plan/current_series.rs
deleted file mode 100644
index b109756b6..000000000
--- a/crates/asap_types/src/query_plan/current_series.rs
+++ /dev/null
@@ -1,88 +0,0 @@
-//! Maintained current-value populations, shared independently of q and k.
-use super::{
-    query_time::{Grouping, LabelMatcher},
-    QueryPlanError,
-};
-use serde::{Deserialize, Serialize};
-
-#[derive(Debug, Clone, Serialize, Deserialize, PartialEq)]
-#[serde(deny_unknown_fields)]
-pub struct SeriesPopulation {
-    pub metric: String,
-    pub matchers: Vec<LabelMatcher>,
-    pub grouping: Grouping,
-    pub lookback_ms: u64,
-    pub max_input_lag_ms: u64,
-    /// Admitted historical distance behind ingestion; zero retains current state only.
-    #[serde(default)]
-    pub history_retention_ms: u64,
-    pub max_series: usize,
-    pub max_bytes: u64,
-    pub max_k: u64,
-    pub quantiles: bool,
-}
-impl SeriesPopulation {
-    pub fn key(&self) -> String {
-        serde_json::to_string(self).expect("serializable current-series population")
-    }
-    pub fn validate(&self) -> Result<(), QueryPlanError> {
-        if self.metric.is_empty()
-            || self.lookback_ms == 0
-            || self.lookback_ms > i64::MAX as u64
-            || self.max_input_lag_ms == 0
-            || self.max_input_lag_ms > self.lookback_ms
-            || self.history_retention_ms > i64::MAX as u64
-            || self.max_series == 0
-            || self.max_series > 100_000
-            || self.max_bytes == 0
-            || self.max_bytes > 1_073_741_824
-            || self.max_k > self.max_series as u64
-        {
-            return Err(QueryPlanError::Invalid(
-                "invalid current-series population bounds".into(),
-            ));
-        }
-        Ok(())
-    }
-}
-
-#[derive(Debug, Clone, Serialize, Deserialize, PartialEq)]
-#[serde(tag = "kind", rename_all = "snake_case", deny_unknown_fields)]
-pub enum SeriesReadout {
-    Quantile { q: f64 },
-    TopK { k: u64 },
-    Sum,
-    Count,
-    Average,
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    // Planner-declared horizons are valid independently of the old five-minute default.
-    #[test]
-    fn accepts_declared_horizon_with_bounded_lag() {
-        let mut population = SeriesPopulation {
-            metric: "a".into(),
-            matchers: vec![],
-            grouping: Grouping {
-                labels: vec![],
-                without: false,
-            },
-            lookback_ms: 1_000,
-            max_input_lag_ms: 1_000,
-            history_retention_ms: 0,
-            max_series: 100,
-            max_bytes: 1_000_000,
-            max_k: 3,
-            quantiles: true,
-        };
-        population.validate().unwrap();
-        population.lookback_ms = 0;
-        assert!(population.validate().is_err());
-        population.lookback_ms = u64::MAX;
-        assert!(population.validate().is_err());
-        population.lookback_ms = 999;
-        assert!(population.validate().is_err());
-    }
-}
diff --git a/crates/asap_types/src/query_plan/query_time.rs b/crates/asap_types/src/query_plan/query_time.rs
deleted file mode 100644
index a5b3fa9ef..000000000
--- a/crates/asap_types/src/query_plan/query_time.rs
+++ /dev/null
@@ -1,188 +0,0 @@
-//! Typed installed query-time operators; no Planner selection or AST lowering.
-use super::QueryPlanError;
-use promql_parser::parser::{self, Expr};
-use serde::{Deserialize, Serialize};
-fn invalid(message: impl Into<String>) -> QueryPlanError {
-    QueryPlanError::Invalid(message.into())
-}
-
-#[derive(Debug, Clone, Serialize, Deserialize, PartialEq)]
-#[serde(tag = "kind", rename_all = "snake_case", deny_unknown_fields)]
-pub enum QueryTimeOperator {
-    /// Readout over a bounded current-value population maintained at ingest.
-    CurrentSeries {
-        population: super::current_series::SeriesPopulation,
-        readout: super::current_series::SeriesReadout,
-    },
-    /// A maximal exact scalar/vector subtree evaluated by Prometheus.
-    ExactSubquery {
-        query: String,
-    },
-    /// Prometheus exact subtree whose selectors are restricted at runtime by
-    /// the candidate vector produced by its single input.
-    CandidateExactSubquery {
-        query: String,
-        item_label: String,
-    },
-    Scan {
-        metric: Option<String>,
-        matchers: Vec<LabelMatcher>,
-        range_ms: Option<u64>,
-        offset_ms: i64,
-    },
-    UnaryNegate,
-    VectorToScalar,
-    Aggregate {
-        operation: Aggregation,
-        grouping: Grouping,
-    },
-    /// Select an ordered slice independently within each group.
-    Limit {
-        n: u64,
-        offset: u64,
-        grouping: Grouping,
-    },
-    Binary {
-        operation: BinaryOperation,
-        return_bool: bool,
-    },
-    Temporal {
-        operation: TemporalOperation,
-    },
-    Sort {
-        descending: bool,
-        grouping: Grouping,
-    },
-    HistogramQuantile,
-    Subquery {
-        range_ms: u64,
-        step_ms: u64,
-        offset_ms: i64,
-    },
-}
-
-#[derive(Debug, Clone, Serialize, Deserialize, PartialEq, Eq)]
-#[serde(deny_unknown_fields)]
-pub struct Grouping {
-    pub labels: Vec<String>,
-    pub without: bool,
-}
-#[derive(Debug, Clone, Serialize, Deserialize, PartialEq, Eq)]
-#[serde(deny_unknown_fields)]
-pub struct LabelMatcher {
-    pub name: String,
-    pub value: String,
-    pub operation: LabelMatch,
-}
-#[derive(Debug, Clone, Copy, Serialize, Deserialize, PartialEq, Eq)]
-#[serde(rename_all = "snake_case")]
-pub enum LabelMatch {
-    Equal,
-    NotEqual,
-    Regex,
-    NotRegex,
-}
-#[derive(Debug, Clone, Copy, Serialize, Deserialize, PartialEq, Eq)]
-#[serde(rename_all = "snake_case")]
-pub enum Aggregation {
-    Sum,
-    Max,
-    Min,
-    Avg,
-    Count,
-}
-#[derive(Debug, Clone, Copy, Serialize, Deserialize, PartialEq, Eq)]
-#[serde(rename_all = "snake_case")]
-pub enum BinaryOperation {
-    Add,
-    Sub,
-    Mul,
-    Div,
-    /// Division with the Planner relative-value certificate domain checks.
-    CheckedDiv,
-    /// Division for conditional exact rewrites: finite inputs and finite output.
-    FiniteDiv,
-    Mod,
-    Pow,
-    Equal,
-    NotEqual,
-    Less,
-    LessEqual,
-    Greater,
-    GreaterEqual,
-}
-#[derive(Debug, Clone, Copy, Serialize, Deserialize, PartialEq, Eq)]
-#[serde(rename_all = "snake_case")]
-pub enum TemporalOperation {
-    Rate,
-    Increase,
-    Avg,
-    Max,
-    Min,
-    Sum,
-    Count,
-}
-
-impl QueryTimeOperator {
-    pub fn validate(&self, inputs: usize) -> Result<(), QueryPlanError> {
-        if let Self::CurrentSeries {
-            population,
-            readout,
-        } = self
-        {
-            population.validate()?;
-            match readout {
-                super::current_series::SeriesReadout::Quantile { q }
-                    if !q.is_finite() || !population.quantiles =>
-                {
-                    return Err(invalid(
-                        "quantile readout requires finite q and a quantile population",
-                    ))
-                }
-                super::current_series::SeriesReadout::TopK { k } if *k > population.max_k => {
-                    return Err(invalid("TopK readout exceeds shared population capacity"))
-                }
-                _ => {}
-            }
-        }
-        let expected = match self {
-            Self::Scan { .. } | Self::ExactSubquery { .. } | Self::CurrentSeries { .. } => 0,
-            Self::CandidateExactSubquery { .. } => 1,
-            Self::Binary { .. } | Self::HistogramQuantile => 2,
-            _ => 1,
-        };
-        if inputs != expected {
-            return Err(invalid("logical operator input arity mismatch"));
-        }
-        if matches!(
-            self,
-            Self::Scan {
-                range_ms: Some(0),
-                ..
-            }
-        ) {
-            return Err(invalid("zero range"));
-        }
-        if let Self::ExactSubquery { query } | Self::CandidateExactSubquery { query, .. } = self {
-            let parsed = parser::parse(query).map_err(|e| invalid(e.to_string()))?;
-            if matches!(parsed, Expr::MatrixSelector(_) | Expr::Subquery(_)) {
-                return Err(invalid(
-                    "exact subtree boundary must return scalar or instant vector",
-                ));
-            }
-        }
-        if let Self::Subquery {
-            range_ms, step_ms, ..
-        } = self
-        {
-            if *range_ms == 0 || *step_ms == 0 || range_ms / step_ms > 100_000 {
-                return Err(invalid("invalid or excessive subquery grid"));
-            }
-        }
-        Ok(())
-    }
-}
-
-// Compatibility imports; new callers use the domain names above.
-#[deprecated(note = "Use QueryTimeOperator")]
-pub use QueryTimeOperator as LogicalOperator;
diff --git a/crates/asap_types/src/query_requirements.rs b/crates/asap_types/src/query_requirements.rs
deleted file mode 100644
index f7a4b264e..000000000
--- a/crates/asap_types/src/query_requirements.rs
+++ /dev/null
@@ -1,21 +0,0 @@
-use crate::KeyByLabelNames;
-use crate::Statistic;
-
-/// What a query needs in order to be answered by a stored aggregation.
-#[derive(Debug, Clone)]
-pub struct QueryRequirements {
-    /// Metric name (PromQL) or "table_name.value_column" (SQL).
-    pub metric: String,
-    /// One or more statistics needed.
-    /// For avg this is [Sum, Count]; for everything else it is a single element.
-    /// All statistics must be satisfied by aggregations sharing the same
-    /// window_size and grouping_labels.
-    pub statistics: Vec<Statistic>,
-    /// The span of historical data the query reads, in milliseconds.
-    /// None for spatial-only queries (no time range).
-    pub data_range_ms: Option<u64>,
-    /// GROUP BY labels expected in the query result.
-    pub grouping_labels: KeyByLabelNames,
-    /// Normalized label filter (produced by normalize_spatial_filter).
-    pub spatial_filter_normalized: String,
-}
diff --git a/crates/asap_types/src/routing_index.rs b/crates/asap_types/src/routing_index.rs
deleted file mode 100644
index ec20b7ef2..000000000
--- a/crates/asap_types/src/routing_index.rs
+++ /dev/null
@@ -1,270 +0,0 @@
-//! `RoutingIndex` — a metric-bucketed structural index over a
-//! [`PolicyRegistry`]. It is sourced from the content-addressed view over a
-//! `InstalledPrecomputePlan`'s `PrecomputeMaterialization`s, so it represents planned policy
-//! rather than a reconstruction from ingest side effects.
-//!
-//! **Tier 1** (exact `PolicyFingerprint` → config) is [`PolicyRegistry::get`]
-//! itself — already O(1), nothing to add here.
-//!
-//! **Tier 2** (structural match: "every policy registered for this metric")
-//! is what this type adds. Before this existed,
-//! `control_plane::asap_tier_analysis::find_matching_policies` scanned
-//! *every* policy in the registry for every candidate, checking each one's
-//! metric name first — i.e. it paid for every OTHER metric's policies on
-//! every lookup. `RoutingIndex` buckets by metric once, at construction
-//! time, so a lookup only ever touches the policies that could possibly
-//! match.
-//!
-//! ## Lifecycle
-//!
-//! Built fresh from a `PolicyRegistry` snapshot — construction is `O(N)`
-//! over the registry, same order as `PolicyRegistry::from_configs` itself.
-//! Callers that build one per query (mirroring today's
-//! `streaming_snap.policy_registry()` call) still get the Tier-2 win for
-//! any query with more than one candidate sharing the same snapshot
-//! (composed PromQL shapes routinely do). Building it once per
-//! `InstalledPrecomputePlan` hot-reload swap instead of once per query — the same
-//! "cheap, but call at swap time not per query, if it shows up in
-//! profiles" note `InstalledPrecomputePlan::policy_registry`'s own doc comment
-//! already flags — is a further, larger change (it means threading a
-//! cached derived value through `InstalledPrecomputePlanHandle`'s swap path)
-//! and is not done by this type on its own.
-
-use std::collections::{BTreeSet, HashMap};
-
-use crate::aggregation_config::PrecomputeMaterialization;
-use crate::policy_fingerprint::PolicyFingerprint;
-use crate::policy_registry::PolicyRegistry;
-
-/// See module docs.
-#[derive(Debug, Clone, Default)]
-pub struct RoutingIndex {
-    registry: PolicyRegistry,
-    by_metric: HashMap<String, Vec<PolicyFingerprint>>,
-}
-
-impl RoutingIndex {
-    /// Build from a `PolicyRegistry` snapshot. Takes ownership rather than
-    /// borrowing — callers that still need their own `PolicyRegistry`
-    /// handle after this should `.clone()` it first (cheap-ish, but real;
-    /// most callers don't need the raw registry once they have the index,
-    /// since [`Self::get`] delegates straight through).
-    pub fn build(registry: PolicyRegistry) -> Self {
-        let mut by_metric: HashMap<String, Vec<PolicyFingerprint>> = HashMap::new();
-        for (fp, cfg) in registry.iter() {
-            by_metric.entry(cfg.metric.clone()).or_default().push(*fp);
-        }
-        Self {
-            registry,
-            by_metric,
-        }
-    }
-
-    /// Tier 1 — exact fingerprint lookup. Delegates to the underlying
-    /// registry; see [`PolicyRegistry::get`].
-    pub fn get(&self, fp: PolicyFingerprint) -> Option<&PrecomputeMaterialization> {
-        self.registry.get(fp)
-    }
-
-    /// Tier 2 — every policy fingerprint registered for `metric`, in
-    /// registration order. Empty slice (not an `Option`/error) when
-    /// nothing is registered for this metric — callers already treat "no
-    /// candidates" as a normal, expected outcome (capability miss →
-    /// archive fallback), not a failure to report.
-    pub fn candidates_for_metric(&self, metric: &str) -> &[PolicyFingerprint] {
-        self.by_metric.get(metric).map(Vec::as_slice).unwrap_or(&[])
-    }
-
-    /// Live policy count (same as the underlying registry's).
-    pub fn len(&self) -> usize {
-        self.registry.len()
-    }
-
-    pub fn is_empty(&self) -> bool {
-        self.registry.is_empty()
-    }
-
-    /// All fingerprints currently registered. Delegates to the underlying
-    /// registry — see [`PolicyRegistry::fingerprints`].
-    pub fn fingerprints(&self) -> impl Iterator<Item = PolicyFingerprint> + '_ {
-        self.registry.fingerprints()
-    }
-
-    /// Resolve an ingest-side sketch shape to exactly one configured policy.
-    /// Ambiguous or absent matches fail closed.
-    pub fn find_policy_by_content(
-        &self,
-        metric: &str,
-        group_by_keys: &BTreeSet<String>,
-        agg_type: crate::AggregationType,
-        expected_params: &HashMap<String, serde_json::Value>,
-    ) -> Option<PolicyFingerprint> {
-        let mut hit = None;
-        for fp in self.candidates_for_metric(metric) {
-            let cfg = self.get(*fp)?;
-            let policy_keys: BTreeSet<_> = cfg.grouping_labels.iter().cloned().collect();
-            if cfg.aggregation_type != agg_type
-                || &policy_keys != group_by_keys
-                || !cfg.spatial_filter_normalized.is_empty()
-                || !expected_params.iter().all(|(key, value)| {
-                    cfg.parameters.get(key).or_else(|| match key.as_str() {
-                        // The typed physical-plan compiler names this field
-                        // after SummaryParams, while legacy collector YAML
-                        // uses the equivalent runtime-facing name.
-                        "relative_accuracy" => cfg.parameters.get("alpha"),
-                        "alpha" => cfg.parameters.get("relative_accuracy"),
-                        _ => None,
-                    }) == Some(value)
-                })
-            {
-                continue;
-            }
-            if hit.is_some() {
-                return None;
-            }
-            hit = Some(*fp);
-        }
-        hit
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use crate::enums::WindowKind;
-    use crate::AggregationType;
-    use crate::KeyByLabelNames;
-    use std::collections::HashMap as StdHashMap;
-
-    fn cfg(metric: &str) -> PrecomputeMaterialization {
-        PrecomputeMaterialization::new(
-            AggregationType::Sum,
-            String::new(),
-            StdHashMap::new(),
-            KeyByLabelNames::empty(),
-            KeyByLabelNames::empty(),
-            KeyByLabelNames::empty(),
-            String::new(),
-            60,
-            60,
-            WindowKind::Tumbling,
-            String::new(),
-            metric.to_string(),
-            None,
-            None,
-            None,
-        )
-    }
-
-    #[test]
-    fn buckets_by_metric() {
-        let a1 = cfg("http_lat");
-        let a2 = cfg("cpu_pct");
-        let fp_a1 = PolicyFingerprint::from_config(&a1);
-        let fp_a2 = PolicyFingerprint::from_config(&a2);
-        let idx = RoutingIndex::build(PolicyRegistry::from_configs(vec![a1, a2]));
-
-        assert_eq!(idx.candidates_for_metric("http_lat"), &[fp_a1]);
-        assert_eq!(idx.candidates_for_metric("cpu_pct"), &[fp_a2]);
-    }
-
-    #[test]
-    fn multiple_policies_for_the_same_metric_all_bucket_together() {
-        // Same metric, distinct group-by shapes -> distinct fingerprints,
-        // same bucket.
-        let a = PrecomputeMaterialization::new(
-            AggregationType::Sum,
-            String::new(),
-            StdHashMap::new(),
-            KeyByLabelNames::new(vec!["zone".to_string()]),
-            KeyByLabelNames::empty(),
-            KeyByLabelNames::empty(),
-            String::new(),
-            60,
-            60,
-            WindowKind::Tumbling,
-            String::new(),
-            "http_lat".to_string(),
-            None,
-            None,
-            None,
-        );
-        let b = cfg("http_lat");
-        assert_ne!(
-            PolicyFingerprint::from_config(&a),
-            PolicyFingerprint::from_config(&b)
-        );
-        let idx = RoutingIndex::build(PolicyRegistry::from_configs(vec![a, b]));
-        assert_eq!(idx.candidates_for_metric("http_lat").len(), 2);
-    }
-
-    #[test]
-    fn unknown_metric_returns_empty_slice_not_missing() {
-        let idx = RoutingIndex::build(PolicyRegistry::from_configs(vec![cfg("http_lat")]));
-        assert!(idx.candidates_for_metric("no_such_metric").is_empty());
-    }
-
-    #[test]
-    fn get_delegates_to_underlying_registry() {
-        let a = cfg("http_lat");
-        let fp = PolicyFingerprint::from_config(&a);
-        let idx = RoutingIndex::build(PolicyRegistry::from_configs(vec![a]));
-        assert_eq!(
-            idx.get(fp).map(|c| c.metric.clone()),
-            Some("http_lat".to_string())
-        );
-        assert!(idx
-            .get(PolicyFingerprint::from_config(&cfg("nope")))
-            .is_none());
-    }
-
-    #[test]
-    fn len_and_is_empty_match_registry() {
-        let idx = RoutingIndex::build(PolicyRegistry::from_configs(
-            Vec::<PrecomputeMaterialization>::new(),
-        ));
-        assert!(idx.is_empty());
-        assert_eq!(idx.len(), 0);
-
-        let idx = RoutingIndex::build(PolicyRegistry::from_configs(vec![cfg("m")]));
-        assert!(!idx.is_empty());
-        assert_eq!(idx.len(), 1);
-    }
-
-    #[test]
-    fn ddsketch_alpha_and_relative_accuracy_are_wire_compatible() {
-        let mut parameters = StdHashMap::new();
-        parameters.insert("alpha".to_string(), serde_json::json!(0.01));
-        let config = PrecomputeMaterialization::new(
-            AggregationType::DDSketch,
-            String::new(),
-            parameters,
-            KeyByLabelNames::new(vec!["service".to_string()]),
-            KeyByLabelNames::empty(),
-            KeyByLabelNames::empty(),
-            String::new(),
-            5,
-            5,
-            WindowKind::Tumbling,
-            String::new(),
-            "latency".to_string(),
-            None,
-            None,
-            None,
-        );
-        let fingerprint = PolicyFingerprint::from_config(&config);
-        let index = RoutingIndex::build(PolicyRegistry::from_configs(vec![config]));
-        let expected =
-            StdHashMap::from([("relative_accuracy".to_string(), serde_json::json!(0.01))]);
-
-        assert_eq!(
-            index.find_policy_by_content(
-                "latency",
-                &BTreeSet::from(["service".to_string()]),
-                AggregationType::DDSketch,
-                &expected,
-            ),
-            Some(fingerprint)
-        );
-    }
-}
diff --git a/crates/asap_types/src/sds.rs b/crates/asap_types/src/sds.rs
deleted file mode 100644
index a6870ea20..000000000
--- a/crates/asap_types/src/sds.rs
+++ /dev/null
@@ -1,1876 +0,0 @@
-//! Shared contracts for summary definitions, stored-summary metadata, and plan
-//! output bindings. Payload bytes remain storage-engine owned and logically
-//! belong to the stored summary identified by this metadata.
-pub const TIMESTAMPED_OBSERVATION_SEMANTICS: &str = "asap.timestamped-observations.v2";
-
-use crate::{AggregationType, PrecomputeMaterialization};
-use planner_types::post_asap::{SketchAlgorithm, SketchParams, SummaryFamilyType};
-use serde::{Deserialize, Serialize};
-use serde_json::{json, Value};
-use std::collections::BTreeMap;
-
-#[derive(Debug, Clone, PartialEq, Eq)]
-pub struct SdsError(pub String);
-impl std::fmt::Display for SdsError {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        f.write_str(&self.0)
-    }
-}
-impl std::error::Error for SdsError {}
-
-macro_rules! descriptor_id {
-    ($name:ident) => {
-        #[derive(Debug, Clone, PartialEq, Eq, Hash, PartialOrd, Ord, Serialize, Deserialize)]
-        #[serde(transparent)]
-        pub struct $name(String);
-        impl $name {
-            pub fn canonical(&self) -> &str {
-                &self.0
-            }
-        }
-    };
-}
-/// Identity of one deployed producer output. Runtime routing uses this identity,
-/// never the semantic definition hash.
-#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash, PartialOrd, Ord, Serialize, Deserialize)]
-#[serde(transparent)]
-pub struct StoredOutputId(pub u64);
-impl StoredOutputId {
-    pub fn fingerprint(self) -> crate::PolicyFingerprint {
-        crate::PolicyFingerprint(self.0)
-    }
-    pub fn as_u64(self) -> u64 {
-        self.0
-    }
-}
-impl From<u64> for StoredOutputId {
-    fn from(value: u64) -> Self {
-        Self(value)
-    }
-}
-impl From<crate::PolicyFingerprint> for StoredOutputId {
-    fn from(value: crate::PolicyFingerprint) -> Self {
-        Self(value.0)
-    }
-}
-impl From<StoredOutputId> for crate::PolicyFingerprint {
-    fn from(value: StoredOutputId) -> Self {
-        Self(value.0)
-    }
-}
-
-descriptor_id!(SummaryDefinitionId);
-impl SummaryDefinitionId {
-    pub(crate) fn from_semantics(bytes: &[u8]) -> Self {
-        use sha2::{Digest, Sha256};
-        Self(format!("sds-v1:{:x}", Sha256::digest(bytes)))
-    }
-    pub fn validate(&self) -> Result<(), SdsError> {
-        let hash = self.0.strip_prefix("sds-v1:").unwrap_or("");
-        if hash.len() == 64
-            && hash
-                .bytes()
-                .all(|b| b.is_ascii_digit() || (b'a'..=b'f').contains(&b))
-        {
-            Ok(())
-        } else {
-            Err(SdsError("invalid semantic definition ID".into()))
-        }
-    }
-}
-
-/// The installed writer/reader binding joins deployment identity and semantics.
-#[derive(Debug, Clone, PartialEq, Eq, Hash, PartialOrd, Ord, Serialize, Deserialize)]
-#[serde(deny_unknown_fields)]
-pub struct StoredOutputReference {
-    pub stored_output_id: StoredOutputId,
-    pub definition_id: SummaryDefinitionId,
-}
-impl StoredOutputReference {
-    /// Internal compilation placeholder. Catalog binding must replace its empty
-    /// semantic identity before installation; it cannot authorize a read/write.
-    pub fn for_output(stored_output_id: StoredOutputId) -> Self {
-        Self {
-            stored_output_id,
-            definition_id: SummaryDefinitionId(String::new()),
-        }
-    }
-    pub fn validate(&self) -> Result<(), SdsError> {
-        if self.stored_output_id.0 == 0 {
-            return Err(SdsError("stored output identity must be set".into()));
-        }
-        self.definition_id.validate()
-    }
-}
-
-/// Canonical address of one stored DAG output for one population and window.
-#[derive(Debug, Clone, PartialEq, Eq, Hash, PartialOrd, Ord, Serialize, Deserialize)]
-#[serde(deny_unknown_fields)]
-pub struct StoredSummaryKey {
-    pub plan_id: u64,
-    pub plan_version: u64,
-    pub stored_output_id: StoredOutputId,
-    pub population: BTreeMap<String, String>,
-    pub window: HalfOpenTimeRange,
-}
-
-impl StoredSummaryKey {
-    pub fn validate(&self) -> Result<(), SdsError> {
-        if self.stored_output_id.0 == 0 {
-            return Err(SdsError("stored output identity must be set".into()));
-        }
-        if self.window.start_ms >= self.window.end_ms {
-            return Err(SdsError("stored summary requires a nonempty window".into()));
-        }
-        Ok(())
-    }
-
-    pub fn storage_key(&self) -> Result<String, SdsError> {
-        self.validate()?;
-        serde_json::to_string(self).map_err(|e| SdsError(e.to_string()))
-    }
-}
-
-descriptor_id!(SummaryDescriptorId);
-descriptor_id!(DataDescriptorId);
-
-descriptor_id!(SummaryInstanceId);
-
-impl SummaryInstanceId {
-    pub fn new(value: impl Into<String>) -> Result<Self, SdsError> {
-        let value = value.into();
-        if value.trim().is_empty() {
-            return Err(SdsError("summary instance ID must not be empty".into()));
-        }
-        Ok(Self(value))
-    }
-
-    pub fn validate(&self) -> Result<(), SdsError> {
-        if self.0.trim().is_empty() {
-            Err(SdsError("summary instance ID must not be empty".into()))
-        } else {
-            Ok(())
-        }
-    }
-}
-
-/// Immutable identity of the desired catalog generation used to create state.
-#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
-#[serde(deny_unknown_fields)]
-pub struct CatalogGeneration {
-    pub schema_version: u32,
-    pub plan_id: u64,
-    pub plan_version: u64,
-    pub snapshot_sha256: String,
-}
-
-#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash, PartialOrd, Ord, Serialize, Deserialize)]
-#[serde(deny_unknown_fields)]
-pub struct HalfOpenTimeRange {
-    pub start_ms: i64,
-    pub end_ms: i64,
-}
-
-/// One ordered producer partition. Completion and watermark claims are scoped
-/// to this identity; a maximum timestamp observed by an unrelated worker is
-/// never a source-completeness signal.
-#[derive(Debug, Clone, PartialEq, Eq, Hash, PartialOrd, Ord, Serialize, Deserialize)]
-#[serde(deny_unknown_fields)]
-pub struct SummarySourcePartition {
-    pub producer_id: String,
-    pub partition_id: String,
-    /// Changes whenever a producer restarts or loses its sequence state.
-    pub producer_epoch: u64,
-}
-
-/// A closed materialization bucket, including named group values so a
-/// downstream maintenance DAG can project or shuffle groups without parsing a
-/// routing key.
-#[derive(Debug, Clone, PartialEq, Eq, Hash, PartialOrd, Ord, Serialize, Deserialize)]
-#[serde(deny_unknown_fields)]
-pub struct SummaryInstanceCoordinates {
-    pub stored_output_id: StoredOutputId,
-    pub time_range: HalfOpenTimeRange,
-    pub group_values: BTreeMap<String, String>,
-}
-
-impl SummaryInstanceCoordinates {
-    pub fn instance_id(&self) -> Result<SummaryInstanceId, SdsError> {
-        let bytes =
-            serde_json::to_vec(&self.group_values).map_err(|error| SdsError(error.to_string()))?;
-        SummaryInstanceId::new(format!(
-            "summary-instance:v1:{}:{}:{}:{}",
-            self.stored_output_id.as_u64(),
-            self.time_range.start_ms,
-            self.time_range.end_ms,
-            xxhash_rust::xxh64::xxh64(&bytes, 0)
-        ))
-    }
-}
-
-#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
-#[serde(deny_unknown_fields)]
-pub struct SummaryWindowCompletion {
-    pub catalog_generation: CatalogGeneration,
-    pub source: SummarySourcePartition,
-    /// Concrete SDS instance identity allocated by the storage engine.
-    pub instance_id: SummaryInstanceId,
-    pub coordinates: SummaryInstanceCoordinates,
-    /// Collision-free opaque producer lineage. Retries repeat these bytes.
-    pub input_lineage: Vec<u8>,
-}
-
-impl HalfOpenTimeRange {
-    pub fn validate(self) -> Result<(), SdsError> {
-        if self.start_ms >= self.end_ms {
-            Err(SdsError(
-                "time range must be non-empty and half-open".into(),
-            ))
-        } else {
-            Ok(())
-        }
-    }
-}
-
-impl SummarySourcePartition {
-    pub fn validate(&self) -> Result<(), SdsError> {
-        if self.producer_id.trim().is_empty() || self.partition_id.trim().is_empty() {
-            return Err(SdsError(
-                "source producer and partition must be non-empty".into(),
-            ));
-        }
-        if self.producer_epoch == 0 {
-            return Err(SdsError("source producer epoch must be positive".into()));
-        }
-        Ok(())
-    }
-}
-
-impl SummaryWindowCompletion {
-    pub fn validate(&self) -> Result<(), SdsError> {
-        self.source.validate()?;
-        self.instance_id.validate()?;
-        self.coordinates.time_range.validate()?;
-        if self.input_lineage.is_empty() {
-            return Err(SdsError(
-                "summary completion lineage must not be empty".into(),
-            ));
-        }
-        validate_catalog_generation(&self.catalog_generation)
-    }
-}
-
-#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
-#[serde(deny_unknown_fields)]
-pub struct SummaryWatermarkBarrier {
-    pub catalog_generation: CatalogGeneration,
-    pub source: SummarySourcePartition,
-    /// Monotonic sequence within the producer partition.
-    pub sequence: u64,
-    /// Every event in this partition at or before this event-time watermark
-    /// was published before the barrier.
-    pub watermark_ms: i64,
-}
-
-impl SummaryWatermarkBarrier {
-    pub fn validate(&self) -> Result<(), SdsError> {
-        self.source.validate()?;
-        if self.sequence == 0 {
-            return Err(SdsError("watermark sequence must be positive".into()));
-        }
-        validate_catalog_generation(&self.catalog_generation)
-    }
-}
-
-fn validate_catalog_generation(generation: &CatalogGeneration) -> Result<(), SdsError> {
-    if generation.schema_version == 0 || generation.snapshot_sha256.trim().is_empty() {
-        Err(SdsError("catalog generation identity is invalid".into()))
-    } else {
-        Ok(())
-    }
-}
-
-#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
-#[serde(rename_all = "snake_case")]
-pub enum InstanceCompleteness {
-    Complete,
-    Partial,
-    Unknown,
-}
-
-#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
-#[serde(rename_all = "snake_case")]
-pub enum SummaryInstanceStatus {
-    Building,
-    Ready,
-    Retiring,
-    Failed,
-    MissingPayload,
-}
-
-/// Logical producer and physical state location. Placement changes do not
-/// change descriptor or materialization identity.
-#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
-#[serde(deny_unknown_fields)]
-pub struct SummaryPlacement {
-    pub producer_id: String,
-    pub storage_node_id: String,
-}
-
-/// Opaque storage-engine locator. `key` identifies payload stored elsewhere;
-/// encoded summary state must never be placed in this metadata contract.
-#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
-#[serde(deny_unknown_fields)]
-pub struct SummaryStateReference {
-    pub store: String,
-    pub key: String,
-    pub state_schema_version: u32,
-    pub generation: u64,
-    pub sequence: u64,
-    pub checksum: Option<String>,
-}
-
-#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
-#[serde(deny_unknown_fields)]
-pub struct EphemeralLease {
-    pub lease_id: String,
-    pub owner_id: String,
-    pub issued_at_ms: i64,
-    pub expires_at_ms: i64,
-}
-
-#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
-#[serde(rename_all = "snake_case")]
-pub enum InstanceLifecycle {
-    Persistent,
-    Ephemeral { lease: EphemeralLease },
-}
-
-/// Observed metadata for one concrete SDS instance. Payload remains in the
-/// storage engine and is reached only through `state_reference`.
-#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
-#[serde(deny_unknown_fields)]
-pub struct SummaryInstance {
-    pub instance_id: SummaryInstanceId,
-    pub stored_output_id: StoredOutputId,
-    pub summary_definition_id: SummaryDefinitionId,
-    pub summary_descriptor_id: SummaryDescriptorId,
-    pub data_descriptor_id: DataDescriptorId,
-    pub time_range: HalfOpenTimeRange,
-    pub group_values: BTreeMap<String, String>,
-    pub catalog_generation: CatalogGeneration,
-    pub placement: SummaryPlacement,
-    pub state_reference: SummaryStateReference,
-    pub status: SummaryInstanceStatus,
-    pub completeness: InstanceCompleteness,
-    pub lifecycle: InstanceLifecycle,
-    pub observed_at_ms: i64,
-}
-
-impl SummaryInstance {
-    pub fn validate(&self) -> Result<(), SdsError> {
-        self.summary_definition_id.validate()?;
-        if self.time_range.start_ms >= self.time_range.end_ms {
-            return Err(SdsError(
-                "summary instance time range must be non-empty".into(),
-            ));
-        }
-        if self.catalog_generation.schema_version == 0
-            || self.catalog_generation.snapshot_sha256.is_empty()
-        {
-            return Err(SdsError(
-                "summary instance has invalid catalog generation".into(),
-            ));
-        }
-        if self.placement.producer_id.is_empty() || self.placement.storage_node_id.is_empty() {
-            return Err(SdsError(
-                "summary instance placement must be resolved".into(),
-            ));
-        }
-        if self.state_reference.store.is_empty()
-            || self.state_reference.key.is_empty()
-            || self.state_reference.state_schema_version == 0
-            || self.state_reference.generation != self.catalog_generation.plan_version
-        {
-            return Err(SdsError(
-                "summary instance has invalid state reference".into(),
-            ));
-        }
-        if let InstanceLifecycle::Ephemeral { lease } = &self.lifecycle {
-            if lease.lease_id.is_empty()
-                || lease.owner_id.is_empty()
-                || lease.issued_at_ms >= lease.expires_at_ms
-            {
-                return Err(SdsError(
-                    "summary instance has invalid ephemeral lease".into(),
-                ));
-            }
-        }
-        Ok(())
-    }
-}
-
-/// Data-plane report of what is actually stored. This is observed state and is
-/// deliberately separate from the control-plane desired SummaryCatalog.
-#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
-#[serde(deny_unknown_fields)]
-pub struct ObservedSummaryInventory {
-    pub schema_version: u32,
-    pub reporter_id: String,
-    pub inventory_version: u64,
-    pub observed_at_ms: i64,
-    pub instances: BTreeMap<SummaryInstanceId, SummaryInstance>,
-}
-
-impl ObservedSummaryInventory {
-    pub fn validate(&self) -> Result<(), SdsError> {
-        if self.schema_version != 1 {
-            return Err(SdsError("unsupported observed inventory schema".into()));
-        }
-        if self.reporter_id.is_empty() {
-            return Err(SdsError("inventory reporter ID must not be empty".into()));
-        }
-        for (id, instance) in &self.instances {
-            instance.validate()?;
-            if id != &instance.instance_id {
-                return Err(SdsError("inventory key differs from instance ID".into()));
-            }
-            if instance.observed_at_ms > self.observed_at_ms {
-                return Err(SdsError(
-                    "instance observation is newer than inventory".into(),
-                ));
-            }
-        }
-        Ok(())
-    }
-
-    pub fn validate_against_catalog(
-        &self,
-        catalog: &crate::summary_catalog::SummaryCatalog,
-    ) -> Result<(), SdsError> {
-        self.validate()?;
-        let generation = catalog
-            .reference()
-            .map_err(|error| SdsError(error.to_string()))?;
-        for instance in self.instances.values() {
-            if instance.catalog_generation != generation {
-                return Err(SdsError(
-                    "summary instance belongs to another plan generation".into(),
-                ));
-            }
-            let definition = catalog
-                .outputs
-                .get(&instance.stored_output_id)
-                .ok_or_else(|| SdsError("summary instance has no catalog definition".into()))?;
-            if instance.summary_definition_id != definition.definition_id
-                || instance.summary_descriptor_id != definition.summary_descriptor_id
-                || instance.data_descriptor_id != definition.data_descriptor_id
-                || instance.state_reference.state_schema_version
-                    != catalog.summary_descriptors[&definition.summary_descriptor_id]
-                        .state_schema_version
-            {
-                return Err(SdsError(
-                    "summary instance differs from its catalog definition".into(),
-                ));
-            }
-        }
-        Ok(())
-    }
-}
-
-#[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
-#[serde(tag = "kind", rename_all = "snake_case", deny_unknown_fields)]
-pub enum SummaryOperator {
-    /// Compatibility evidence from a legacy backend record, not a complete
-    /// configured contract. Its ID can never satisfy a Configured descriptor.
-    LegacyPartial { operator_canonical: String },
-    Sketch {
-        algorithm: SketchAlgorithm,
-        parameters: BTreeMap<String, Value>,
-    },
-    ExactAgg {
-        agg_type: AggregationType,
-        parameters_canonical: String,
-    },
-    /// Complete planner materialization configuration, including heap/Hydra
-    /// dimensions and readout/update subtype. Never equal to a legacy projection.
-    Configured {
-        /// Planner-selected semantic family; grouping and pane layout live in
-        /// the data descriptor and summary definition, respectively.
-        family: planner_types::post_asap::SummaryFamilyType,
-        aggregation_type: AggregationType,
-        aggregation_sub_type: String,
-        parameters: BTreeMap<String, Value>,
-    },
-}
-
-#[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
-#[serde(tag = "kind", rename_all = "snake_case", deny_unknown_fields)]
-pub enum FidelityGuarantee {
-    /// Total unit-frequency count is exact. Distinct, L2 and entropy require
-    /// readout-specific evidence; dimensions alone certify no error bound.
-    UnivMonFrequency {
-        heap_size: u32,
-        sketch_rows: u32,
-        sketch_cols: u32,
-        layers: u8,
-    },
-    Exact,
-    /// Exact PromQL counter readout from fixed-size pane summaries. Each pane
-    /// stores only `(first value/time, last value/time, reset-corrected delta,
-    /// sample count)`. A query is eligible only when the selected panes fully
-    /// cover its range; partial boundary panes must fall back to Prometheus.
-    ExactCounter {
-        model: String,
-        full_pane_coverage_required: bool,
-    },
-    KllRankError {
-        k: u32,
-        model: String,
-    },
-    DdSketchRelativeError {
-        alpha: f64,
-    },
-    HllCardinalityError {
-        precision: u32,
-        model: String,
-    },
-    CmsFrequencyError {
-        width: u32,
-        depth: u32,
-        model: String,
-    },
-    CountSketchFrequencyError {
-        width: u32,
-        depth: u32,
-        model: String,
-    },
-    Unknown {
-        reason: String,
-    },
-}
-impl FidelityGuarantee {
-    /// Model IDs name parameterized error families/scopes, not certified numeric
-    /// epsilon/confidence values. Heap membership and Hydra cross-cell readouts
-    /// need separate models; point-frequency/per-cell rank does not attest them.
-    pub fn from_config(config: &PrecomputeMaterialization) -> Self {
-        if config.aggregation_type == AggregationType::HLL {
-            let precision = config
-                .parameters
-                .get("precision")
-                .or_else(|| config.parameters.get("p"))
-                .and_then(Value::as_u64)
-                .and_then(|v| u32::try_from(v).ok())
-                .unwrap_or(14);
-            return Self::HllCardinalityError {
-                precision,
-                model: "asap.hll.relative-cardinality.v1".into(),
-            };
-        }
-        match config.accumulator_spec().map(|s| s.family) {
-            Ok(SummaryFamilyType::ExactAggregate(
-                planner_types::post_asap::ExactKind::Increase
-                | planner_types::post_asap::ExactKind::Rate
-                | planner_types::post_asap::ExactKind::IRate,
-                _,
-            )) => Self::ExactCounter {
-                model: "prometheus.extrapolated-rate.v1".into(),
-                full_pane_coverage_required: true,
-            },
-            Ok(SummaryFamilyType::ExactAggregate(..)) => Self::Exact,
-            Ok(SummaryFamilyType::Sketch(kind, _)) => match kind.params() {
-                SketchParams::UnivMon {
-                    heap_size,
-                    sketch_rows,
-                    sketch_cols,
-                    layers,
-                } => Self::UnivMonFrequency {
-                    heap_size: *heap_size,
-                    sketch_rows: *sketch_rows,
-                    sketch_cols: *sketch_cols,
-                    layers: *layers,
-                },
-                SketchParams::Kll { k } => Self::KllRankError {
-                    k: *k,
-                    model: if config.aggregation_type == AggregationType::HydraKLL {
-                        "asap.hydra-kll.per-cell-rank.v1"
-                    } else {
-                        "asap.kll.normalized-rank.v1"
-                    }
-                    .into(),
-                },
-                SketchParams::DDSketch { alpha } => Self::DdSketchRelativeError { alpha: *alpha },
-                SketchParams::Hll { precision } => Self::HllCardinalityError {
-                    precision: (*precision).into(),
-                    model: "asap.hll.relative-cardinality.v1".into(),
-                },
-                SketchParams::Cms { width, depth }
-                | SketchParams::CmsWithHeap { width, depth, .. } => Self::CmsFrequencyError {
-                    width: *width,
-                    depth: *depth,
-                    model: "asap.cms.point-frequency.v1".into(),
-                },
-                SketchParams::CountSketch { width, depth }
-                | SketchParams::CountSketchWithHeap { width, depth, .. } => {
-                    Self::CountSketchFrequencyError {
-                        width: *width,
-                        depth: *depth,
-                        model: "asap.count-sketch.point-frequency.v1".into(),
-                    }
-                }
-                _ => Self::Unknown {
-                    reason: "No shared parameterized error model for this sketch family".into(),
-                },
-            },
-            _ => Self::Unknown {
-                reason: "Physical accumulator family is unavailable".into(),
-            },
-        }
-    }
-    fn validate(&self) -> Result<(), SdsError> {
-        let valid = match self {
-            Self::UnivMonFrequency {
-                heap_size,
-                sketch_rows,
-                sketch_cols,
-                layers,
-            } => {
-                *heap_size > 0
-                    && *sketch_cols > 0
-                    && (1..=20).contains(sketch_rows)
-                    && (1..=64).contains(layers)
-            }
-            Self::Exact => true,
-            Self::ExactCounter {
-                model,
-                full_pane_coverage_required,
-            } => !model.is_empty() && *full_pane_coverage_required,
-            Self::KllRankError { k, model } => *k > 0 && !model.is_empty(),
-            Self::DdSketchRelativeError { alpha } => {
-                alpha.is_finite() && *alpha > 0.0 && *alpha < 1.0
-            }
-            Self::HllCardinalityError { precision, model } => {
-                *precision > 0 && *precision < 64 && !model.is_empty()
-            }
-            Self::CmsFrequencyError {
-                width,
-                depth,
-                model,
-            }
-            | Self::CountSketchFrequencyError {
-                width,
-                depth,
-                model,
-            } => *width > 0 && *depth > 0 && !model.is_empty(),
-            Self::Unknown { reason } => !reason.is_empty(),
-        };
-        if valid {
-            Ok(())
-        } else {
-            Err(SdsError("invalid parameterized fidelity contract".into()))
-        }
-    }
-}
-
-#[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
-#[serde(deny_unknown_fields)]
-pub struct SummaryDescriptor {
-    pub id: SummaryDescriptorId,
-    pub operator: SummaryOperator,
-    pub fidelity: FidelityGuarantee,
-    pub state_schema_version: u32,
-}
-
-/// Sort every JSON object, including nested configuration values. Arrays retain
-/// order; opaque canonical strings are used verbatim, not reparsed as PromQL.
-fn canonical(value: &Value) -> String {
-    match value {
-        Value::Object(map) => {
-            let sorted: BTreeMap<_, _> = map.iter().collect();
-            format!(
-                "{{{}}}",
-                sorted
-                    .into_iter()
-                    .map(|(k, v)| format!("{}:{}", serde_json::to_string(k).unwrap(), canonical(v)))
-                    .collect::<Vec<_>>()
-                    .join(",")
-            )
-        }
-        Value::Array(values) => format!(
-            "[{}]",
-            values.iter().map(canonical).collect::<Vec<_>>().join(",")
-        ),
-        _ => value.to_string(),
-    }
-}
-impl SummaryDescriptor {
-    pub fn new(
-        operator: SummaryOperator,
-        fidelity: FidelityGuarantee,
-        state_schema_version: u32,
-    ) -> Result<Self, SdsError> {
-        if state_schema_version == 0 {
-            return Err(SdsError("state schema version must be positive".into()));
-        }
-        fidelity.validate()?;
-        if let SummaryOperator::Configured {
-            family,
-            aggregation_type,
-            ..
-        } = &operator
-        {
-            if let Some(expected) = aggregation_type.planner_exact_family() {
-                if family != &expected {
-                    return Err(SdsError(
-                        "configured storage type disagrees with Planner family".into(),
-                    ));
-                }
-            } else {
-                use AggregationType as A;
-                let expected = match aggregation_type {
-                    A::DatasketchesKLL | A::HydraKLL => Some(SketchAlgorithm::Kll),
-                    A::CountMinSketch => Some(SketchAlgorithm::Cms),
-                    A::CountMinSketchWithHeap => Some(SketchAlgorithm::CmsWithHeap),
-                    A::CountSketch => Some(SketchAlgorithm::CountSketch),
-                    A::CountSketchWithHeap => Some(SketchAlgorithm::CountSketchWithHeap),
-                    A::DDSketch => Some(SketchAlgorithm::DDSketch),
-                    A::HLL => Some(SketchAlgorithm::Hll),
-                    A::UnivMon => Some(SketchAlgorithm::UnivMon),
-                    _ => None,
-                };
-                if let Some(expected) = expected {
-                    if !matches!(family, planner_types::post_asap::SummaryFamilyType::Sketch(kind, _) if kind.algorithm() == &expected)
-                    {
-                        return Err(SdsError(
-                            "configured sketch storage disagrees with Planner family".into(),
-                        ));
-                    }
-                }
-            }
-        }
-        if !fidelity.is_compatible_with(&operator) {
-            return Err(SdsError(
-                "summary operator and fidelity guarantee are incompatible".into(),
-            ));
-        }
-        let content = json!({"operator":operator,"fidelity":fidelity,"state_schema_version":state_schema_version});
-        let id = SummaryDescriptorId(format!("summary:v3:{}", canonical(&content)));
-        Ok(Self {
-            id,
-            operator,
-            fidelity,
-            state_schema_version,
-        })
-    }
-    pub fn id(&self) -> &SummaryDescriptorId {
-        &self.id
-    }
-    pub fn validate(&self) -> Result<(), SdsError> {
-        let rebuilt = Self::new(
-            self.operator.clone(),
-            self.fidelity.clone(),
-            self.state_schema_version,
-        )?;
-        if self.id != rebuilt.id {
-            return Err(SdsError("summary descriptor ID/content mismatch".into()));
-        }
-        Ok(())
-    }
-
-    /// Preserve every configured state/update parameter. Omitted defaults remain
-    /// distinct from explicit defaults (conservative identity, never false sharing).
-    /// Legacy AggKind projections intentionally have different operator variants:
-    /// they cannot attest heap, Hydra, or aggregation-subtype semantics they lost.
-    pub fn from_config(config: &PrecomputeMaterialization) -> Result<Self, SdsError> {
-        let fidelity = FidelityGuarantee::from_config(config);
-        let state_schema_version = if matches!(fidelity, FidelityGuarantee::ExactCounter { .. }) {
-            2
-        } else {
-            1
-        };
-        Self::new(
-            SummaryOperator::Configured {
-                family: config
-                    .accumulator_spec()
-                    .map_err(|error| SdsError(error.to_string()))?
-                    .family,
-                aggregation_type: config.aggregation_type,
-                aggregation_sub_type: config.aggregation_sub_type.clone(),
-                parameters: config
-                    .parameters
-                    .iter()
-                    .map(|(k, v)| (k.clone(), v.clone()))
-                    .collect(),
-            },
-            fidelity,
-            state_schema_version,
-        )
-    }
-}
-
-impl FidelityGuarantee {
-    /// Reject a descriptor that advertises an error model belonging to a
-    /// different state family. This is part of the shared wire contract, so a
-    /// consumer must not need to trust the process that produced the catalog.
-    pub fn is_compatible_with(&self, operator: &SummaryOperator) -> bool {
-        use AggregationType as A;
-        use FidelityGuarantee::*;
-        use SketchAlgorithm as S;
-
-        let configured = |aggregation_type| {
-            matches!(
-                (aggregation_type, self),
-                (A::UnivMon, UnivMonFrequency { .. })
-                    | (A::Sum | A::Count | A::Min | A::Max, Exact)
-                    | (A::Increase | A::Rate, ExactCounter { .. })
-                    | (A::DatasketchesKLL | A::HydraKLL, KllRankError { .. })
-                    | (A::DDSketch, DdSketchRelativeError { .. })
-                    | (A::HLL, HllCardinalityError { .. })
-                    | (
-                        A::CountMinSketch | A::CountMinSketchWithHeap,
-                        CmsFrequencyError { .. }
-                    )
-                    | (
-                        A::CountSketch | A::CountSketchWithHeap,
-                        CountSketchFrequencyError { .. }
-                    )
-                    | (
-                        A::SingleSubpopulation | A::MultipleSubpopulation,
-                        Unknown { .. }
-                    )
-            )
-        };
-
-        match operator {
-            SummaryOperator::LegacyPartial { .. } => matches!(self, Unknown { .. }),
-            SummaryOperator::ExactAgg { agg_type, .. } => configured(*agg_type),
-            SummaryOperator::Configured {
-                aggregation_type,
-                parameters,
-                ..
-            } => configured(*aggregation_type) && self.matches_parameters(parameters),
-            SummaryOperator::Sketch {
-                algorithm,
-                parameters,
-            } => {
-                matches!(
-                    (algorithm, self),
-                    (S::UnivMon, UnivMonFrequency { .. })
-                        | (S::Kll, KllRankError { .. })
-                        | (S::DDSketch, DdSketchRelativeError { .. })
-                        | (S::Hll, HllCardinalityError { .. })
-                        | (S::Cms | S::CmsWithHeap, CmsFrequencyError { .. })
-                        | (
-                            S::CountSketch | S::CountSketchWithHeap,
-                            CountSketchFrequencyError { .. }
-                        )
-                        | (S::Kmv | S::Theta, Unknown { .. })
-                ) && self.matches_parameters(parameters)
-            }
-        }
-    }
-
-    fn matches_parameters(&self, parameters: &BTreeMap<String, Value>) -> bool {
-        let u32_parameter = |names: &[&str], expected: u32| {
-            names
-                .iter()
-                .filter_map(|name| parameters.get(*name))
-                .all(|value| value.as_u64() == Some(u64::from(expected)))
-        };
-        match self {
-            Self::UnivMonFrequency {
-                heap_size,
-                sketch_rows,
-                sketch_cols,
-                layers,
-            } => {
-                u32_parameter(&["heap_size"], *heap_size)
-                    && u32_parameter(&["sketch_rows"], *sketch_rows)
-                    && u32_parameter(&["sketch_cols"], *sketch_cols)
-                    && u32_parameter(&["layers"], u32::from(*layers))
-            }
-            Self::KllRankError { k, .. } => u32_parameter(&["k", "K"], *k),
-            Self::HllCardinalityError { precision, .. } => {
-                u32_parameter(&["precision", "p"], *precision)
-            }
-            Self::CmsFrequencyError { width, depth, .. }
-            | Self::CountSketchFrequencyError { width, depth, .. } => {
-                u32_parameter(&["w", "width"], *width) && u32_parameter(&["d", "depth"], *depth)
-            }
-            Self::DdSketchRelativeError { alpha } => ["alpha", "relative_accuracy"]
-                .iter()
-                .filter_map(|name| parameters.get(*name))
-                .all(|value| value.as_f64() == Some(*alpha)),
-            _ => true,
-        }
-    }
-}
-
-#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
-#[serde(deny_unknown_fields)]
-#[serde(rename_all = "snake_case")]
-pub enum DataSourceIdentity {
-    TimeSeries {
-        metric: String,
-    },
-    Table {
-        table_ref: String,
-    },
-    Derived {
-        input: crate::derived_input::DerivedInputIdentity,
-    },
-}
-
-#[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
-#[serde(deny_unknown_fields)]
-#[serde(rename_all = "snake_case")]
-pub enum ValueProjectionIdentity {
-    SampleValue,
-    Column {
-        name: String,
-    },
-    Constant {
-        value: planner_types::pre_asap::ScalarValue,
-    },
-}
-
-impl ValueProjectionIdentity {
-    pub fn column(&self) -> Option<&str> {
-        match self {
-            Self::Column { name } => Some(name),
-            _ => None,
-        }
-    }
-
-    pub fn validate(&self) -> Result<(), String> {
-        use planner_types::pre_asap::ScalarValue;
-        match self {
-            Self::Column { name } => crate::table_population::validate_column_name(name),
-            Self::Constant {
-                value: ScalarValue::Int64(_),
-            }
-            | Self::SampleValue => Ok(()),
-            Self::Constant {
-                value: ScalarValue::Float64(value),
-            } if value.is_finite() => Ok(()),
-            Self::Constant { .. } => {
-                Err("summary value projection requires a finite numeric literal".into())
-            }
-        }
-    }
-}
-
-/// Whether a materialization preserves source entities or pools a population.
-/// Grouped label names remain in `DataDescriptor::group_by_keys`.
-#[derive(Debug, Clone, Copy, PartialEq, Eq, Serialize, Deserialize)]
-#[serde(rename_all = "snake_case")]
-pub enum PopulationPartitioning {
-    PerEntity,
-    Grouped,
-}
-
-#[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
-#[serde(deny_unknown_fields)]
-pub struct DataDescriptor {
-    pub id: DataDescriptorId,
-    pub source: DataSourceIdentity,
-    pub value_projection: ValueProjectionIdentity,
-    /// Table column containing Unix milliseconds. Absent for time-series sources.
-    #[serde(default, skip_serializing_if = "Option::is_none")]
-    pub timestamp_column: Option<String>,
-    pub population_filter_canonical: String,
-    pub group_by_keys: crate::GroupingProjection,
-    #[serde(
-        default,
-        skip_serializing_if = "crate::grouping_projection::PopulationKeyEncoding::is_legacy"
-    )]
-    pub population_key_encoding: crate::grouping_projection::PopulationKeyEncoding,
-    #[serde(default, skip_serializing_if = "Option::is_none")]
-    pub partitioning: Option<PopulationPartitioning>,
-    /// Versioned contract for timestamp interpretation and
-    /// missing/duplicate/invalid observation handling.
-    pub observation_semantics: String,
-}
-impl DataDescriptor {
-    pub fn time_series_metric(&self) -> Option<&str> {
-        match &self.source {
-            DataSourceIdentity::TimeSeries { metric } => Some(metric),
-            DataSourceIdentity::Table { .. } | DataSourceIdentity::Derived { .. } => None,
-        }
-    }
-
-    pub fn new(
-        metric: impl Into<String>,
-        filter: impl Into<String>,
-        group_by: impl IntoIterator<Item = String>,
-    ) -> Self {
-        Self::new_with_semantics(
-            metric,
-            filter,
-            group_by,
-            "asap.timestamped-metric-samples.v1",
-        )
-    }
-
-    pub fn new_with_semantics(
-        metric: impl Into<String>,
-        filter: impl Into<String>,
-        group_by: impl IntoIterator<Item = String>,
-        observation_semantics: impl Into<String>,
-    ) -> Self {
-        let source = DataSourceIdentity::TimeSeries {
-            metric: metric.into(),
-        };
-        Self::new_typed(
-            source,
-            ValueProjectionIdentity::SampleValue,
-            filter,
-            group_by,
-            observation_semantics,
-        )
-    }
-
-    pub fn new_typed(
-        source: DataSourceIdentity,
-        value_projection: ValueProjectionIdentity,
-        filter: impl Into<String>,
-        group_by: impl IntoIterator<Item = String>,
-        observation_semantics: impl Into<String>,
-    ) -> Self {
-        let population_filter_canonical = filter.into();
-        let group_by_keys = group_by.into_iter().collect();
-        let observation_semantics = observation_semantics.into();
-        let id = data_descriptor_id(
-            &source,
-            &value_projection,
-            &population_filter_canonical,
-            &group_by_keys,
-            &observation_semantics,
-            None,
-            None,
-            Default::default(),
-        );
-        Self {
-            id,
-            source,
-            value_projection,
-            timestamp_column: None,
-            population_filter_canonical,
-            group_by_keys,
-            partitioning: None,
-            population_key_encoding: Default::default(),
-            observation_semantics,
-        }
-    }
-    pub fn with_grouping_projection(mut self, grouping: crate::GroupingProjection) -> Self {
-        self.group_by_keys = grouping;
-        self.id = data_descriptor_id(
-            &self.source,
-            &self.value_projection,
-            &self.population_filter_canonical,
-            &self.group_by_keys,
-            &self.observation_semantics,
-            self.partitioning,
-            self.timestamp_column.as_deref(),
-            self.population_key_encoding,
-        );
-        self
-    }
-    pub fn with_partitioning(mut self, partitioning: Option<PopulationPartitioning>) -> Self {
-        self.partitioning = partitioning;
-        self.id = data_descriptor_id(
-            &self.source,
-            &self.value_projection,
-            &self.population_filter_canonical,
-            &self.group_by_keys,
-            &self.observation_semantics,
-            partitioning,
-            self.timestamp_column.as_deref(),
-            self.population_key_encoding,
-        );
-        self
-    }
-    pub fn with_population_key_encoding(
-        mut self,
-        encoding: crate::grouping_projection::PopulationKeyEncoding,
-    ) -> Self {
-        self.population_key_encoding = encoding;
-        let partitioning = self.partitioning;
-        self.with_partitioning(partitioning)
-    }
-    pub fn with_timestamp_column(mut self, column: Option<String>) -> Self {
-        self.timestamp_column = column;
-        let partitioning = self.partitioning;
-        self.with_partitioning(partitioning)
-    }
-    pub fn id(&self) -> &DataDescriptorId {
-        &self.id
-    }
-    pub fn validate(&self) -> Result<(), SdsError> {
-        if let DataSourceIdentity::Derived { input } = &self.source {
-            input.validate().map_err(SdsError)?;
-        }
-        self.value_projection.validate().map_err(SdsError)?;
-        self.group_by_keys.validate().map_err(SdsError)?;
-        if matches!(self.source, DataSourceIdentity::TimeSeries { .. })
-            && !self.group_by_keys.is_legacy_labels()
-        {
-            return Err(SdsError(
-                "time-series grouping requires non-null string labels".into(),
-            ));
-        }
-
-        if matches!(self.source, DataSourceIdentity::Table { .. }) {
-            for column in self.group_by_keys.columns() {
-                crate::table_population::validate_column_name(&column.name).map_err(SdsError)?;
-            }
-        }
-        if let Some(column) = &self.timestamp_column {
-            if !matches!(self.source, DataSourceIdentity::Table { .. }) || column.is_empty() {
-                return Err(SdsError(
-                    "table timestamp projection requires a table and a column".into(),
-                ));
-            }
-            crate::table_population::validate_column_name(column).map_err(SdsError)?;
-        }
-        if self.id
-            != data_descriptor_id(
-                &self.source,
-                &self.value_projection,
-                &self.population_filter_canonical,
-                &self.group_by_keys,
-                &self.observation_semantics,
-                self.partitioning,
-                self.timestamp_column.as_deref(),
-                self.population_key_encoding,
-            )
-        {
-            return Err(SdsError("data descriptor ID/content mismatch".into()));
-        }
-        Ok(())
-    }
-}
-#[allow(clippy::too_many_arguments)]
-fn data_descriptor_id(
-    source: &DataSourceIdentity,
-    value_projection: &ValueProjectionIdentity,
-    filter: &str,
-    group_by: &crate::GroupingProjection,
-    observation_semantics: &str,
-    partitioning: Option<PopulationPartitioning>,
-    timestamp_column: Option<&str>,
-    population_key_encoding: crate::grouping_projection::PopulationKeyEncoding,
-) -> DataDescriptorId {
-    // Length framing keeps distinct typed sources, projections, predicates,
-    // and grouping keys collision-free in the content identity.
-    let source = canonical(&serde_json::to_value(source).expect("data source serializes"));
-    let projection =
-        canonical(&serde_json::to_value(value_projection).expect("value projection serializes"));
-    let mut key = format!(
-        "data:v2|{}:{source}|{}:{projection}|{}:{filter}",
-        source.len(),
-        projection.len(),
-        filter.len()
-    );
-    if let Some(partitioning) = partitioning {
-        key.push_str(&format!("|partition:{partitioning:?}"));
-    }
-    if let Some(column) = timestamp_column {
-        key.push_str(&format!("|timestamp-ms:{}:{column}", column.len()));
-    }
-    for name in group_by.names() {
-        key.push_str(&format!("|{}:{name}", name.len()));
-    }
-    if !group_by.is_legacy_labels() {
-        let typed =
-            canonical(&serde_json::to_value(group_by).expect("group projection serializes"));
-        key.push_str(&format!("|group-types:{}:{typed}", typed.len()));
-    }
-    key.push_str(&format!(
-        "|{}:{observation_semantics}",
-        observation_semantics.len()
-    ));
-    if !population_key_encoding.is_legacy() {
-        key = format!("data:population-key:canonical-labels-v1|{key}");
-    }
-    DataDescriptorId(key)
-}
-
-#[cfg(test)]
-mod partition_identity_tests {
-    use super::*;
-    #[test]
-    fn entity_and_global_population_have_distinct_identity() {
-        let legacy = DataDescriptor::new_typed(
-            DataSourceIdentity::TimeSeries { metric: "m".into() },
-            ValueProjectionIdentity::SampleValue,
-            "",
-            Vec::<String>::new(),
-            "v1",
-        );
-        let entity = legacy
-            .clone()
-            .with_partitioning(Some(PopulationPartitioning::PerEntity));
-        let grouped = legacy
-            .clone()
-            .with_partitioning(Some(PopulationPartitioning::Grouped));
-        assert_ne!(entity.id, grouped.id);
-        assert_ne!(entity.id, legacy.id);
-        assert_eq!(legacy.clone().with_partitioning(None).id, legacy.id);
-        entity.validate().unwrap();
-        grouped.validate().unwrap();
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use std::collections::BTreeSet;
-
-    #[test]
-    fn population_encoding_is_part_of_data_identity_with_legacy_default() {
-        use crate::grouping_projection::PopulationKeyEncoding;
-        let legacy = DataDescriptor::new("m", "", ["host".to_string()]);
-        let wire = serde_json::to_value(&legacy).unwrap();
-        assert!(wire.get("population_key_encoding").is_none());
-        let decoded: DataDescriptor = serde_json::from_value(wire).unwrap();
-        assert_eq!(legacy.id(), decoded.id());
-        let canonical = legacy
-            .clone()
-            .with_population_key_encoding(PopulationKeyEncoding::CanonicalLabelsV1);
-        assert_ne!(legacy.id(), canonical.id());
-        canonical.validate().unwrap();
-        let reverted =
-            canonical.with_population_key_encoding(PopulationKeyEncoding::LegacyDelimited);
-        assert_eq!(legacy.id(), reverted.id());
-    }
-
-    fn completion(epoch: u64) -> SummaryWindowCompletion {
-        SummaryWindowCompletion {
-            catalog_generation: CatalogGeneration {
-                schema_version: 1,
-                plan_id: 4,
-                plan_version: 2,
-                snapshot_sha256: "snapshot".into(),
-            },
-            source: SummarySourcePartition {
-                producer_id: "producer-a".into(),
-                partition_id: "partition-0".into(),
-                producer_epoch: epoch,
-            },
-            instance_id: SummaryInstanceId::new("instance-1").unwrap(),
-            coordinates: SummaryInstanceCoordinates {
-                stored_output_id: StoredOutputId::from(crate::PolicyFingerprint(7)),
-                time_range: HalfOpenTimeRange {
-                    start_ms: 1_000,
-                    end_ms: 2_000,
-                },
-                group_values: BTreeMap::from([("job".into(), "api".into())]),
-            },
-            input_lineage: vec![1, 2, 3],
-        }
-    }
-
-    #[test]
-    fn completion_contract_validates_identity_epoch_range_and_lineage() {
-        completion(1).validate().unwrap();
-
-        let mut invalid = completion(1);
-        invalid.coordinates.time_range.end_ms = invalid.coordinates.time_range.start_ms;
-        assert!(invalid.validate().is_err());
-        invalid = completion(1);
-        invalid.source.producer_id.clear();
-        assert!(invalid.validate().is_err());
-        invalid = completion(0);
-        assert!(invalid.validate().is_err());
-        invalid = completion(1);
-        invalid.input_lineage.clear();
-        assert!(invalid.validate().is_err());
-
-        let mut wire = serde_json::to_value(completion(1)).unwrap();
-        wire.as_object_mut()
-            .unwrap()
-            .insert("future_field".into(), json!(true));
-        assert!(serde_json::from_value::<SummaryWindowCompletion>(wire).is_err());
-    }
-
-    #[test]
-    fn producer_epoch_separates_restart_incarnations() {
-        let first = completion(1).source;
-        let second = completion(2).source;
-        assert_ne!(first, second);
-        assert_eq!(BTreeSet::from([first, second]).len(), 2);
-    }
-
-    #[test]
-    fn watermark_contract_rejects_zero_sequence_and_unknown_fields() {
-        let completion = completion(3);
-        let mut barrier = SummaryWatermarkBarrier {
-            catalog_generation: completion.catalog_generation,
-            source: completion.source,
-            sequence: 1,
-            watermark_ms: 2_000,
-        };
-        barrier.validate().unwrap();
-        barrier.sequence = 0;
-        assert!(barrier.validate().is_err());
-
-        let mut wire = serde_json::to_value(&barrier).unwrap();
-        wire.as_object_mut()
-            .unwrap()
-            .insert("ignored".into(), json!(1));
-        assert!(serde_json::from_value::<SummaryWatermarkBarrier>(wire).is_err());
-    }
-
-    fn observed_instance(lifecycle: InstanceLifecycle) -> SummaryInstance {
-        SummaryInstance {
-            instance_id: SummaryInstanceId::new("instance-1").unwrap(),
-            stored_output_id: StoredOutputId(7),
-            summary_definition_id: SummaryDefinitionId::from_semantics(b"fixture"),
-            summary_descriptor_id: descriptor(
-                200,
-                FidelityGuarantee::KllRankError {
-                    k: 200,
-                    model: "rank.v1".into(),
-                },
-                1,
-            )
-            .id,
-            data_descriptor_id: DataDescriptor::new("cpu", "", []).id,
-            time_range: HalfOpenTimeRange {
-                start_ms: 0,
-                end_ms: 10,
-            },
-            group_values: BTreeMap::new(),
-            catalog_generation: CatalogGeneration {
-                schema_version: 1,
-                plan_id: 1,
-                plan_version: 2,
-                snapshot_sha256: "abc".into(),
-            },
-            placement: SummaryPlacement {
-                producer_id: "producer".into(),
-                storage_node_id: "store".into(),
-            },
-            state_reference: SummaryStateReference {
-                store: "summary-store".into(),
-                key: "state/1".into(),
-                state_schema_version: 1,
-                generation: 2,
-                sequence: 3,
-                checksum: None,
-            },
-            status: SummaryInstanceStatus::Ready,
-            completeness: InstanceCompleteness::Complete,
-            lifecycle,
-            observed_at_ms: 10,
-        }
-    }
-
-    #[test]
-    fn instance_inventory_has_metadata_reference_without_payload() {
-        let instance = observed_instance(InstanceLifecycle::Persistent);
-        instance.validate().unwrap();
-        let encoded = serde_json::to_value(&instance).unwrap();
-        assert!(encoded.get("state_reference").is_some());
-        assert!(encoded.get("state").is_none());
-        assert!(encoded.get("payload").is_none());
-        let inventory = ObservedSummaryInventory {
-            schema_version: 1,
-            reporter_id: "store".into(),
-            inventory_version: 4,
-            observed_at_ms: 10,
-            instances: BTreeMap::from([(instance.instance_id.clone(), instance)]),
-        };
-        inventory.validate().unwrap();
-    }
-
-    // Every component of the persisted output address participates in identity.
-    #[test]
-    fn stored_summary_key_binds_plan_output_population_and_window() {
-        let key = StoredSummaryKey {
-            plan_id: 1,
-            plan_version: 2,
-            stored_output_id: StoredOutputId(101),
-            population: BTreeMap::from([("service".into(), "api".into())]),
-            window: HalfOpenTimeRange {
-                start_ms: 0,
-                end_ms: 1000,
-            },
-        };
-        let mut variants = vec![key.clone(); 5];
-        variants[0].plan_id += 1;
-        variants[1].plan_version += 1;
-        variants[2].stored_output_id.0 += 1;
-        variants[3].population.insert("service".into(), "db".into());
-        variants[4].window.end_ms += 1;
-        let canonical = key.storage_key().unwrap();
-        for other in variants {
-            assert_ne!(canonical, other.storage_key().unwrap());
-        }
-        assert_eq!(
-            serde_json::from_str::<StoredSummaryKey>(&canonical).unwrap(),
-            key
-        );
-    }
-
-    // A DAG output has its own identity even when its definition is shared.
-    #[test]
-    fn stored_output_identity_is_independent_of_definition() {
-        let definition_id = SummaryDefinitionId::from_semantics(b"fixture");
-        for stored_output_id in [StoredOutputId(101), StoredOutputId(102)] {
-            StoredOutputReference {
-                stored_output_id,
-                definition_id: definition_id.clone(),
-            }
-            .validate()
-            .unwrap();
-        }
-    }
-
-    #[test]
-    fn stored_output_and_payload_version_must_match_instance_definition() {
-        let mut instance = observed_instance(InstanceLifecycle::Persistent);
-        instance.stored_output_id = StoredOutputId(8);
-        assert!(instance.validate().is_ok());
-        instance.stored_output_id = StoredOutputId(7);
-        instance.state_reference.generation = 3;
-        assert!(instance.validate().is_err());
-        let mut reference = StoredOutputReference::for_output(instance.stored_output_id);
-        reference.stored_output_id = StoredOutputId(8);
-        assert!(reference.validate().is_err());
-    }
-
-    // Old aliases and numeric semantic IDs must not authorize the new format.
-    #[test]
-    fn stored_output_reference_rejects_legacy_identity() {
-        assert!(serde_json::from_value::<StoredOutputReference>(json!({
-            "state_slot_id": 7, "definition_id": 7
-        }))
-        .is_err());
-        let reference = StoredOutputReference {
-            stored_output_id: StoredOutputId(8),
-            definition_id: SummaryDefinitionId::from_semantics(b"fixture"),
-        };
-        reference.validate().unwrap();
-        assert_eq!(
-            serde_json::from_value::<StoredOutputReference>(
-                serde_json::to_value(&reference).unwrap()
-            )
-            .unwrap(),
-            reference
-        );
-    }
-
-    #[test]
-    fn new_generation_rejects_cross_version_payload_adoption() {
-        let mut instance = observed_instance(InstanceLifecycle::Persistent);
-        let mut wire = serde_json::to_value(&instance).unwrap();
-        wire["reused_from_generation"] =
-            serde_json::to_value(&instance.catalog_generation).unwrap();
-        assert!(serde_json::from_value::<SummaryInstance>(wire).is_err());
-        instance.state_reference.generation -= 1;
-        assert!(instance.validate().is_err());
-    }
-
-    #[test]
-    fn invalid_range_and_lease_are_rejected() {
-        let mut instance = observed_instance(InstanceLifecycle::Ephemeral {
-            lease: EphemeralLease {
-                lease_id: "lease".into(),
-                owner_id: "fast-path".into(),
-                issued_at_ms: 10,
-                expires_at_ms: 20,
-            },
-        });
-        instance.validate().unwrap();
-        instance.time_range.end_ms = instance.time_range.start_ms;
-        assert!(instance.validate().is_err());
-        instance.time_range.end_ms = 10;
-        if let InstanceLifecycle::Ephemeral { lease } = &mut instance.lifecycle {
-            lease.expires_at_ms = lease.issued_at_ms;
-        }
-        assert!(instance.validate().is_err());
-    }
-    fn descriptor(k: u32, fidelity: FidelityGuarantee, version: u32) -> SummaryDescriptor {
-        SummaryDescriptor::new(
-            SummaryOperator::Sketch {
-                algorithm: SketchAlgorithm::Kll,
-                parameters: BTreeMap::from([("k".into(), json!(k))]),
-            },
-            fidelity,
-            version,
-        )
-        .unwrap()
-    }
-    #[test]
-    fn identity_includes_configuration_fidelity_and_state_schema() {
-        let base = descriptor(
-            200,
-            FidelityGuarantee::KllRankError {
-                k: 200,
-                model: "rank.v1".into(),
-            },
-            1,
-        );
-        assert_ne!(
-            base.id,
-            descriptor(
-                201,
-                FidelityGuarantee::KllRankError {
-                    k: 201,
-                    model: "rank.v1".into()
-                },
-                1
-            )
-            .id
-        );
-        assert!(SummaryDescriptor::new(
-            SummaryOperator::Sketch {
-                algorithm: SketchAlgorithm::Kll,
-                parameters: BTreeMap::from([("k".into(), json!(200))]),
-            },
-            FidelityGuarantee::Exact,
-            1,
-        )
-        .is_err());
-        assert_ne!(
-            base.id,
-            descriptor(
-                200,
-                FidelityGuarantee::KllRankError {
-                    k: 200,
-                    model: "rank.v1".into()
-                },
-                2
-            )
-            .id
-        );
-    }
-    #[test]
-    fn group_order_and_duplicates_do_not_change_identity() {
-        let a = DataDescriptor::new("cpu", "{job=\"a\"}", ["z".into(), "a".into(), "a".into()]);
-        let b = DataDescriptor::new("cpu", "{job=\"a\"}", ["a".into(), "z".into()]);
-        assert_eq!(a, b);
-        assert_ne!(
-            a.id,
-            DataDescriptor::new("cpu", "{job=\"b\"}", ["a".into(), "z".into()]).id
-        );
-    }
-    #[test]
-    fn length_framing_distinguishes_delimiters_and_unicode() {
-        assert_ne!(
-            DataDescriptor::new("a|b", "c", []).id,
-            DataDescriptor::new("a", "b|c", []).id
-        );
-        assert_ne!(
-            DataDescriptor::new("π", "", ["x|y".into()]).id,
-            DataDescriptor::new("π", "", ["x".into(), "y".into()]).id
-        );
-    }
-    #[test]
-    fn observation_semantics_is_part_of_data_identity() {
-        assert_ne!(
-            DataDescriptor::new_with_semantics("cpu", "", [], "samples.v1").id,
-            DataDescriptor::new_with_semantics("cpu", "", [], "samples.v2").id
-        );
-    }
-
-    #[test]
-    fn source_and_value_projection_are_part_of_data_identity() {
-        let metric = DataDescriptor::new("events", "", []);
-        let table_value = DataDescriptor::new_typed(
-            DataSourceIdentity::Table {
-                table_ref: "events".into(),
-            },
-            ValueProjectionIdentity::Column {
-                name: "value".into(),
-            },
-            "",
-            [],
-            "asap.timestamped-observations.v2",
-        );
-        let table_cost = DataDescriptor::new_typed(
-            DataSourceIdentity::Table {
-                table_ref: "events".into(),
-            },
-            ValueProjectionIdentity::Column {
-                name: "cost".into(),
-            },
-            "",
-            [],
-            "asap.timestamped-observations.v2",
-        );
-        assert_ne!(metric.id, table_value.id);
-        assert_ne!(table_value.id, table_cost.id);
-        assert_eq!(metric.time_series_metric(), Some("events"));
-        assert_eq!(table_value.time_series_metric(), None);
-    }
-
-    #[test]
-    fn catalog_generation_rejects_legacy_digest_name() {
-        assert!(serde_json::from_value::<CatalogGeneration>(json!({
-            "schema_version": 1,
-            "plan_id": 2,
-            "plan_version": 3,
-            "snapshot_digest": "abc"
-        }))
-        .is_err());
-    }
-    #[test]
-    fn wire_roundtrip_and_tampered_id_validation() {
-        let original = descriptor(
-            200,
-            FidelityGuarantee::KllRankError {
-                k: 200,
-                model: "rank.v1".into(),
-            },
-            1,
-        );
-        let mut decoded: SummaryDescriptor =
-            serde_json::from_str(&serde_json::to_string(&original).unwrap()).unwrap();
-        decoded.validate().unwrap();
-        assert_eq!(decoded, original);
-        decoded.state_schema_version = 2;
-        assert!(decoded.validate().is_err());
-        let mut data = DataDescriptor::new("cpu", "", []);
-        data.source = DataSourceIdentity::TimeSeries {
-            metric: "other".into(),
-        };
-        assert!(data.validate().is_err());
-    }
-    #[test]
-    fn invalid_fidelity_is_rejected() {
-        assert!(SummaryDescriptor::new(
-            SummaryOperator::ExactAgg {
-                agg_type: AggregationType::Sum,
-                parameters_canonical: String::new()
-            },
-            FidelityGuarantee::DdSketchRelativeError { alpha: f64::NAN },
-            1
-        )
-        .is_err());
-        assert!(SummaryDescriptor::new(
-            SummaryOperator::Configured {
-                family: AggregationType::Sum.planner_exact_family().unwrap(),
-                aggregation_type: AggregationType::Sum,
-                aggregation_sub_type: String::new(),
-                parameters: BTreeMap::new(),
-            },
-            FidelityGuarantee::KllRankError {
-                k: 200,
-                model: "rank.v1".into(),
-            },
-            1,
-        )
-        .is_err());
-        assert!(SummaryDescriptor::new(
-            SummaryOperator::Sketch {
-                algorithm: SketchAlgorithm::Kll,
-                parameters: BTreeMap::from([("k".into(), json!(100))]),
-            },
-            FidelityGuarantee::KllRankError {
-                k: 200,
-                model: "rank.v1".into(),
-            },
-            1,
-        )
-        .is_err());
-    }
-
-    #[test]
-    fn configured_descriptor_rejects_family_storage_disagreement() {
-        assert!(SummaryDescriptor::new(
-            SummaryOperator::Configured {
-                family: AggregationType::Rate.planner_exact_family().unwrap(),
-                aggregation_type: AggregationType::Increase,
-                aggregation_sub_type: String::new(),
-                parameters: BTreeMap::new(),
-            },
-            FidelityGuarantee::ExactCounter {
-                model: "prometheus.extrapolated-rate.v1".into(),
-                full_pane_coverage_required: true,
-            },
-            2,
-        )
-        .is_err());
-    }
-    #[test]
-    fn configured_identity_preserves_heap_hydra_and_subtype_and_excludes_population() {
-        let yaml:serde_yaml::Value=serde_yaml::from_str("aggregationType: DDSketch\naggregationSubType: ''\nmetric: m\nlabels:\n  grouping: []\n  rollup: []\n  aggregated: []\nparameters:\n  relative_accuracy: 0.01\nwindowSize: 30\nwindowType: tumbling\nspatialFilter: ''\n").unwrap();
-        let mut config =
-            PrecomputeMaterialization::from_yaml_data(&yaml, None, crate::QueryLanguage::PromQl)
-                .unwrap();
-        assert!(matches!(
-            SummaryDescriptor::from_config(&config).unwrap().fidelity,
-            FidelityGuarantee::DdSketchRelativeError { .. }
-        ));
-        for (kind, key) in [
-            (AggregationType::CountMinSketchWithHeap, "heap_size"),
-            (AggregationType::HydraKLL, "row"),
-            (AggregationType::HydraKLL, "col"),
-            (AggregationType::HydraKLL, "k"),
-        ] {
-            config.aggregation_type = kind;
-            config.parameters.insert(key.into(), json!(10));
-            let before = SummaryDescriptor::from_config(&config).unwrap();
-            config.parameters.insert(key.into(), json!(11));
-            let after = SummaryDescriptor::from_config(&config).unwrap();
-            assert_ne!(before.id, after.id, "{key}");
-            config.metric = "other".into();
-            config.spatial_filter_normalized = "job=a".into();
-            assert_eq!(
-                after.id,
-                SummaryDescriptor::from_config(&config).unwrap().id
-            );
-        }
-        let before = SummaryDescriptor::from_config(&config).unwrap();
-        config.aggregation_sub_type = "max".into();
-        assert_ne!(
-            before.id,
-            SummaryDescriptor::from_config(&config).unwrap().id
-        );
-    }
-    #[test]
-    fn increase_config_declares_prometheus_counter_fidelity() {
-        let yaml: serde_yaml::Value = serde_yaml::from_str(
-            "aggregationType: Increase\naggregationSubType: ''\nmetric: requests_total\nlabels:\n  grouping: []\n  rollup: []\n  aggregated: []\nparameters: {}\nwindowSize: 60\nwindowType: tumbling\nspatialFilter: ''\n",
-        )
-        .unwrap();
-        let config =
-            PrecomputeMaterialization::from_yaml_data(&yaml, None, crate::QueryLanguage::PromQl)
-                .unwrap();
-        assert!(matches!(
-            SummaryDescriptor::from_config(&config).unwrap().fidelity,
-            FidelityGuarantee::ExactCounter {
-                ref model,
-                full_pane_coverage_required: true
-            } if model == "prometheus.extrapolated-rate.v1"
-        ));
-    }
-    #[test]
-    fn canonical_nested_parameters_and_model_versions_are_identity() {
-        let a = SummaryOperator::Configured {
-            family: AggregationType::Sum.planner_exact_family().unwrap(),
-            aggregation_type: AggregationType::Sum,
-            aggregation_sub_type: String::new(),
-            parameters: BTreeMap::from([("nested".into(), json!({"z":1,"a":2}))]),
-        };
-        let b = SummaryOperator::Configured {
-            family: AggregationType::Sum.planner_exact_family().unwrap(),
-            aggregation_type: AggregationType::Sum,
-            aggregation_sub_type: String::new(),
-            parameters: BTreeMap::from([("nested".into(), json!({"a":2,"z":1}))]),
-        };
-        assert_eq!(
-            SummaryDescriptor::new(a.clone(), FidelityGuarantee::Exact, 1)
-                .unwrap()
-                .id,
-            SummaryDescriptor::new(b, FidelityGuarantee::Exact, 1)
-                .unwrap()
-                .id
-        );
-        let kll = SummaryOperator::Sketch {
-            algorithm: SketchAlgorithm::Kll,
-            parameters: BTreeMap::from([("k".into(), json!(200))]),
-        };
-        let first = SummaryDescriptor::new(
-            kll.clone(),
-            FidelityGuarantee::KllRankError {
-                k: 200,
-                model: "rank.v1".into(),
-            },
-            1,
-        )
-        .unwrap();
-        let second = SummaryDescriptor::new(
-            kll,
-            FidelityGuarantee::KllRankError {
-                k: 200,
-                model: "rank.v2".into(),
-            },
-            1,
-        )
-        .unwrap();
-        assert_ne!(first.id, second.id);
-    }
-    #[test]
-    fn stored_output_id_preserves_legacy_wire_identity() {
-        let fingerprint = crate::PolicyFingerprint(42);
-        let id = StoredOutputId::from(fingerprint);
-        assert_eq!(id.fingerprint(), fingerprint);
-        assert_eq!(id.as_u64(), 42);
-        assert_eq!(crate::PolicyFingerprint::from(id), fingerprint);
-        assert_eq!(
-            serde_json::to_value(id).unwrap(),
-            serde_json::to_value(fingerprint).unwrap()
-        );
-        assert_eq!(serde_json::from_str::<StoredOutputId>("42").unwrap(), id);
-    }
-    /// Every supplied alias must agree with the declared fidelity, including runtime w/d keys.
-    #[test]
-    fn fidelity_rejects_conflicting_parameter_aliases() {
-        use serde_json::json;
-        let cases = [
-            (
-                FidelityGuarantee::CmsFrequencyError {
-                    width: 128,
-                    depth: 5,
-                    model: "cms".into(),
-                },
-                json!({"w":128,"d":5,"width":128,"depth":5}),
-                "w",
-                json!(256),
-            ),
-            (
-                FidelityGuarantee::CountSketchFrequencyError {
-                    width: 128,
-                    depth: 5,
-                    model: "cs".into(),
-                },
-                json!({"w":128,"d":5,"width":128,"depth":5}),
-                "d",
-                json!(4),
-            ),
-            (
-                FidelityGuarantee::KllRankError {
-                    k: 200,
-                    model: "kll".into(),
-                },
-                json!({"k":200,"K":200}),
-                "K",
-                json!(100),
-            ),
-            (
-                FidelityGuarantee::HllCardinalityError {
-                    precision: 12,
-                    model: "hll".into(),
-                },
-                json!({"precision":12,"p":12}),
-                "p",
-                json!(10),
-            ),
-            (
-                FidelityGuarantee::DdSketchRelativeError { alpha: 0.01 },
-                json!({"alpha":0.01,"relative_accuracy":0.01}),
-                "relative_accuracy",
-                json!(0.1),
-            ),
-        ];
-        for (fidelity, values, alias, conflict) in cases {
-            let mut parameters: BTreeMap<String, Value> = serde_json::from_value(values).unwrap();
-            assert!(fidelity.matches_parameters(&parameters));
-            parameters.insert(alias.into(), conflict);
-            assert!(!fidelity.matches_parameters(&parameters));
-        }
-        let cms = FidelityGuarantee::CmsFrequencyError {
-            width: 128,
-            depth: 5,
-            model: "cms".into(),
-        };
-        assert!(!cms.matches_parameters(&BTreeMap::from([
-            ("w".into(), json!(256)),
-            ("d".into(), json!(5))
-        ])));
-    }
-}
diff --git a/crates/asap_types/src/semantic_fragment.rs b/crates/asap_types/src/semantic_fragment.rs
deleted file mode 100644
index 390354bd9..000000000
--- a/crates/asap_types/src/semantic_fragment.rs
+++ /dev/null
@@ -1,2 +0,0 @@
-//! Planner owns the versioned semantic description and its normalization.
-pub use planner_types::post_asap::SummarySemanticFragment as SemanticFragment;
diff --git a/crates/asap_types/src/storage_backend.rs b/crates/asap_types/src/storage_backend.rs
deleted file mode 100644
index 68b98488b..000000000
--- a/crates/asap_types/src/storage_backend.rs
+++ /dev/null
@@ -1,33 +0,0 @@
-use serde::{Deserialize, Serialize};
-
-pub const ENGINE_ID_ASAP_QUERY: &str = "asap_query";
-pub const CANONICAL_QUERY_ENGINE_IDS: &[&str] = &[ENGINE_ID_ASAP_QUERY];
-
-/// Backend-owned physical storage target shared by both runtime planes.
-#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash, Serialize, Deserialize, Default)]
-#[serde(rename_all = "snake_case")]
-pub enum StorageBackend {
-    #[default]
-    SketchStore,
-    DoubleWrite,
-    PrometheusRemote,
-}
-
-impl StorageBackend {
-    pub const fn data_source_id(self) -> &'static str {
-        match self {
-            Self::SketchStore => ENGINE_ID_ASAP_QUERY,
-            Self::DoubleWrite => "double_write",
-            Self::PrometheusRemote => "prometheus_remote",
-        }
-    }
-}
-
-pub fn parse_storage_backend_engine_id(value: &str) -> Option<StorageBackend> {
-    match value {
-        ENGINE_ID_ASAP_QUERY => Some(StorageBackend::SketchStore),
-        "double_write" => Some(StorageBackend::DoubleWrite),
-        "prometheus_remote" => Some(StorageBackend::PrometheusRemote),
-        _ => None,
-    }
-}
diff --git a/crates/asap_types/src/summary_catalog.rs b/crates/asap_types/src/summary_catalog.rs
deleted file mode 100644
index ec924e704..000000000
--- a/crates/asap_types/src/summary_catalog.rs
+++ /dev/null
@@ -1,638 +0,0 @@
-//! Authoritative descriptor snapshot for a compiled physical plan.
-//!
-//! The catalog owns semantic definitions; executable plans own writer and
-//! reader bindings, while runtime inventory owns placement and pane state.
-
-use std::collections::BTreeMap;
-
-use crate::sds::{
-    CatalogGeneration, DataDescriptor, DataDescriptorId, DataSourceIdentity, StoredOutputId,
-    SummaryDescriptor, SummaryDescriptorId,
-};
-use crate::PolicyFingerprint;
-use serde::{Deserialize, Serialize};
-
-pub const SUMMARY_CATALOG_SCHEMA_VERSION: u32 = 6;
-
-/// Canonical definition binds operator and population descriptors. Writer
-/// layout and concrete state belong to installed plans and runtime instances.
-#[derive(Debug, Clone, Serialize, Deserialize, PartialEq, Eq)]
-#[serde(deny_unknown_fields)]
-pub struct StoredOutputDefinition {
-    pub definition_id: crate::sds::SummaryDefinitionId,
-    pub summary_descriptor_id: SummaryDescriptorId,
-    pub data_descriptor_id: DataDescriptorId,
-}
-
-#[derive(Debug, Clone, Serialize, Deserialize, PartialEq)]
-#[serde(deny_unknown_fields)]
-pub struct SummaryCatalog {
-    pub schema_version: u32,
-    pub plan_id: u64,
-    pub plan_version: u64,
-    pub summary_descriptors: BTreeMap<SummaryDescriptorId, SummaryDescriptor>,
-    pub data_descriptors: BTreeMap<DataDescriptorId, DataDescriptor>,
-    pub outputs: BTreeMap<StoredOutputId, StoredOutputDefinition>,
-    pub definitions:
-        BTreeMap<crate::sds::SummaryDefinitionId, crate::summary_semantics::SummaryDefinition>,
-}
-
-#[derive(Debug, thiserror::Error)]
-pub enum SummaryCatalogError {
-    #[error("unsupported summary catalog schema version {0}")]
-    SchemaVersion(u32),
-    #[error("invalid summary catalog descriptor: {0}")]
-    Descriptor(String),
-    #[error("definition {0} has conflicting descriptor bindings")]
-    ConflictingDefinition(u64),
-    #[error("definition {0} references a missing descriptor")]
-    MissingDescriptor(u64),
-    #[error("catalog reference does not identify the supplied snapshot")]
-    ReferenceMismatch,
-}
-
-impl CatalogGeneration {
-    #[cfg(test)]
-    /// Validate an untrusted wire reference against the installed immutable
-    /// snapshot and its enclosing plan generation.
-    pub fn validate_snapshot(
-        &self,
-        catalog: &SummaryCatalog,
-        plan_id: u64,
-        plan_version: u64,
-    ) -> Result<(), SummaryCatalogError> {
-        let expected = catalog.reference()?;
-        if self != &expected || (plan_id, plan_version) != (catalog.plan_id, catalog.plan_version) {
-            return Err(SummaryCatalogError::ReferenceMismatch);
-        }
-        Ok(())
-    }
-}
-
-impl SummaryCatalog {
-    pub fn output_reference(
-        &self,
-        id: StoredOutputId,
-    ) -> Result<crate::sds::StoredOutputReference, SummaryCatalogError> {
-        let output = self
-            .outputs
-            .get(&id)
-            .ok_or(SummaryCatalogError::MissingDescriptor(id.as_u64()))?;
-        Ok(crate::sds::StoredOutputReference {
-            stored_output_id: id,
-            definition_id: output.definition_id.clone(),
-        })
-    }
-
-    pub fn reference(&self) -> Result<CatalogGeneration, SummaryCatalogError> {
-        use sha2::{Digest, Sha256};
-        self.validate()?;
-        // BTreeMap tables and typed descriptor fields serialize deterministically.
-        let bytes = serde_json::to_vec(self)
-            .map_err(|error| SummaryCatalogError::Descriptor(error.to_string()))?;
-        Ok(CatalogGeneration {
-            schema_version: self.schema_version,
-            plan_id: self.plan_id,
-            plan_version: self.plan_version,
-            snapshot_sha256: format!("{:x}", Sha256::digest(bytes)),
-        })
-    }
-
-    pub fn from_materializations(
-        plan_id: u64,
-        plan_version: u64,
-        materializations: &[crate::PrecomputeMaterialization],
-    ) -> Result<Self, SummaryCatalogError> {
-        let entries = materializations
-            .iter()
-            .map(|config| {
-                let summary = SummaryDescriptor::from_config(config)
-                    .map_err(|error| SummaryCatalogError::Descriptor(error.to_string()))?;
-                let source = config.source_identity();
-                let value_projection = config.effective_value_projection().clone();
-                let data = DataDescriptor::new_typed(
-                    source,
-                    value_projection,
-                    config
-                        .population_filter_canonical()
-                        .map_err(SummaryCatalogError::Descriptor)?,
-                    config.grouping_labels.names(),
-                    if config.table_name.is_some() && !config.grouping_labels.is_empty() {
-                        crate::grouping_projection::TABLE_GROUP_OBSERVATION_SEMANTICS
-                    } else {
-                        crate::sds::TIMESTAMPED_OBSERVATION_SEMANTICS
-                    },
-                )
-                .with_grouping_projection(config.grouping_labels.clone())
-                .with_partitioning(config.partitioning)
-                .with_population_key_encoding(config.population_key_encoding)
-                .with_timestamp_column(config.table_timestamp_column.clone());
-                Ok((config.policy_fingerprint(), summary, data))
-            })
-            .collect::<Result<Vec<_>, SummaryCatalogError>>()?;
-        let mut catalog = Self::build(plan_id, plan_version, entries)?;
-        let mut semantic_bindings = BTreeMap::new();
-        for config in materializations {
-            let output = catalog
-                .outputs
-                .get_mut(&StoredOutputId::from(config.policy_fingerprint()))
-                .unwrap();
-            let definition = crate::summary_semantics::SummaryDefinition::from_descriptors(
-                &catalog.summary_descriptors[&output.summary_descriptor_id],
-                &catalog.data_descriptors[&output.data_descriptor_id],
-            )?
-            .with_config(config);
-            let id = definition.id()?;
-            if semantic_bindings
-                .insert(config.policy_fingerprint(), id.clone())
-                .is_some_and(|old| old != id)
-            {
-                return Err(SummaryCatalogError::ConflictingDefinition(
-                    config.policy_fingerprint().0,
-                ));
-            }
-            output.definition_id = id.clone();
-            catalog.definitions.insert(id, definition);
-        }
-        let used: std::collections::BTreeSet<_> = catalog
-            .outputs
-            .values()
-            .map(|o| o.definition_id.clone())
-            .collect();
-        catalog.definitions.retain(|id, _| used.contains(id));
-        catalog.validate()?;
-        Ok(catalog)
-    }
-
-    pub fn build(
-        plan_id: u64,
-        plan_version: u64,
-        entries: impl IntoIterator<Item = (PolicyFingerprint, SummaryDescriptor, DataDescriptor)>,
-    ) -> Result<Self, SummaryCatalogError> {
-        let mut catalog = Self {
-            schema_version: SUMMARY_CATALOG_SCHEMA_VERSION,
-            plan_id,
-            plan_version,
-            summary_descriptors: BTreeMap::new(),
-            data_descriptors: BTreeMap::new(),
-            outputs: BTreeMap::new(),
-            definitions: BTreeMap::new(),
-        };
-        for (fingerprint, summary, data) in entries {
-            let definition = StoredOutputId::from(fingerprint);
-            summary
-                .validate()
-                .map_err(|error| SummaryCatalogError::Descriptor(error.to_string()))?;
-            data.validate()
-                .map_err(|error| SummaryCatalogError::Descriptor(error.to_string()))?;
-            let semantics =
-                crate::summary_semantics::SummaryDefinition::from_descriptors(&summary, &data)?;
-            let semantic_id = semantics.id()?;
-            catalog.definitions.insert(semantic_id.clone(), semantics);
-            let binding = StoredOutputDefinition {
-                definition_id: semantic_id,
-                summary_descriptor_id: summary.id().clone(),
-                data_descriptor_id: data.id().clone(),
-            };
-            if catalog
-                .outputs
-                .get(&definition)
-                .is_some_and(|old| old != &binding)
-            {
-                return Err(SummaryCatalogError::ConflictingDefinition(
-                    definition.as_u64(),
-                ));
-            }
-            catalog
-                .summary_descriptors
-                .insert(binding.summary_descriptor_id.clone(), summary);
-            catalog
-                .data_descriptors
-                .insert(binding.data_descriptor_id.clone(), data);
-            catalog.outputs.insert(definition, binding);
-        }
-        catalog.validate()?;
-        Ok(catalog)
-    }
-
-    pub fn validate(&self) -> Result<(), SummaryCatalogError> {
-        if self.schema_version != SUMMARY_CATALOG_SCHEMA_VERSION {
-            return Err(SummaryCatalogError::SchemaVersion(self.schema_version));
-        }
-        for (id, definition) in &self.definitions {
-            if &definition.id()? != id {
-                return Err(SummaryCatalogError::Descriptor(
-                    "semantic definition content hash mismatch".into(),
-                ));
-            }
-        }
-        for (key, descriptor) in &self.summary_descriptors {
-            descriptor
-                .validate()
-                .map_err(|error| SummaryCatalogError::Descriptor(error.to_string()))?;
-            if key != descriptor.id() {
-                return Err(SummaryCatalogError::Descriptor(
-                    "summary table key differs from content identity".into(),
-                ));
-            }
-        }
-        for (key, descriptor) in &self.data_descriptors {
-            descriptor
-                .validate()
-                .map_err(|error| SummaryCatalogError::Descriptor(error.to_string()))?;
-            if key != descriptor.id() {
-                return Err(SummaryCatalogError::Descriptor(
-                    "data table key differs from content identity".into(),
-                ));
-            }
-        }
-        for (id, binding) in &self.outputs {
-            if !self.definitions.contains_key(&binding.definition_id) {
-                return Err(SummaryCatalogError::Descriptor(
-                    "output references absent semantic definition".into(),
-                ));
-            }
-            if !self
-                .summary_descriptors
-                .contains_key(&binding.summary_descriptor_id)
-                || !self
-                    .data_descriptors
-                    .contains_key(&binding.data_descriptor_id)
-            {
-                return Err(SummaryCatalogError::MissingDescriptor(id.as_u64()));
-            }
-        }
-        for output in self.outputs.values() {
-            let expected = crate::summary_semantics::SummaryDefinition::from_descriptors(
-                &self.summary_descriptors[&output.summary_descriptor_id],
-                &self.data_descriptors[&output.data_descriptor_id],
-            )?;
-            if let (
-                crate::summary_semantics::SummarySemantics::Configured {
-                    computation: actual,
-                    ..
-                },
-                crate::summary_semantics::SummarySemantics::Configured {
-                    computation: expected,
-                    ..
-                },
-            ) = (
-                &self.definitions[&output.definition_id].semantics,
-                &expected.semantics,
-            ) {
-                if actual != expected {
-                    return Err(SummaryCatalogError::Descriptor(
-                        "output descriptors disagree with semantic definition".into(),
-                    ));
-                }
-            }
-        }
-        if !self
-            .data_descriptors
-            .values()
-            .any(|data| matches!(data.source, DataSourceIdentity::Derived { .. }))
-        {
-            return Ok(());
-        }
-        // Dependencies must refer to this snapshot and form an acyclic graph.
-        let mut pending = std::collections::BTreeMap::new();
-        let mut consumers: std::collections::BTreeMap<_, Vec<_>> =
-            std::collections::BTreeMap::new();
-        for (id, binding) in &self.outputs {
-            let dependencies = match &self.data_descriptors[&binding.data_descriptor_id].source {
-                DataSourceIdentity::Derived { input } => input.inputs.clone(),
-                _ => Default::default(),
-            };
-            for source in &dependencies {
-                if !self.outputs.contains_key(source) {
-                    return Err(SummaryCatalogError::Descriptor(
-                        "derived input references missing summary".into(),
-                    ));
-                }
-                consumers.entry(*source).or_default().push(*id);
-            }
-            pending.insert(*id, dependencies.len());
-        }
-        let mut ready: Vec<_> = pending
-            .iter()
-            .filter_map(|(id, count)| (*count == 0).then_some(*id))
-            .collect();
-        let mut visited = 0;
-        while let Some(id) = ready.pop() {
-            visited += 1;
-            for consumer in consumers.get(&id).into_iter().flatten() {
-                let count = pending
-                    .get_mut(consumer)
-                    .expect("catalog dependency target");
-                *count -= 1;
-                if *count == 0 {
-                    ready.push(*consumer);
-                }
-            }
-        }
-        if visited != pending.len() {
-            return Err(SummaryCatalogError::Descriptor(
-                "derived summary dependencies have a cycle".into(),
-            ));
-        }
-        Ok(())
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use crate::sds::ValueProjectionIdentity;
-    use crate::{AggregationType, KeyByLabelNames, PrecomputeMaterialization, WindowKind};
-
-    fn config(metric: &str, filter: &str, window: u64) -> PrecomputeMaterialization {
-        PrecomputeMaterialization::new(
-            AggregationType::Sum,
-            String::new(),
-            Default::default(),
-            KeyByLabelNames::new(vec!["job".into()]),
-            KeyByLabelNames::empty(),
-            KeyByLabelNames::empty(),
-            String::new(),
-            window,
-            window,
-            WindowKind::Tumbling,
-            filter.into(),
-            metric.into(),
-            None,
-            None,
-            None,
-        )
-    }
-
-    // Content changes invalidate references even when plan/version are reused.
-    #[test]
-    fn table_populations_have_distinct_materialization_and_data_identities() {
-        use crate::table_population::{TableColumnPredicate, TablePopulation};
-        use planner_types::pre_asap::{CompareOpKind, ScalarValue};
-        let mut requests = config("raw_samples.value", "", 60);
-        requests.table_name = Some("raw_samples".into());
-        requests.value_projection = Some(ValueProjectionIdentity::Column {
-            name: "value".into(),
-        });
-        requests.table_population = Some(TablePopulation {
-            predicates: vec![TableColumnPredicate {
-                column: "metric".into(),
-                operator: CompareOpKind::Eq,
-                value: ScalarValue::Utf8("requests".into()),
-            }],
-        });
-        let mut errors = requests.clone();
-        errors.table_population.as_mut().unwrap().predicates[0].value =
-            ScalarValue::Utf8("errors".into());
-        assert_ne!(requests.policy_fingerprint(), errors.policy_fingerprint());
-        let mut other_table = requests.clone();
-        other_table.table_name = Some("other_samples".into());
-        assert_ne!(
-            requests.policy_fingerprint(),
-            other_table.policy_fingerprint()
-        );
-        let mut other_value = requests.clone();
-        other_value.value_projection = Some(ValueProjectionIdentity::Column {
-            name: "other_value".into(),
-        });
-        assert_ne!(
-            requests.policy_fingerprint(),
-            other_value.policy_fingerprint()
-        );
-        let mut other_time = requests.clone();
-        other_time.table_timestamp_column = Some("event_time_ms".into());
-        assert_ne!(
-            requests.policy_fingerprint(),
-            other_time.policy_fingerprint()
-        );
-        let mut invalid_labels = requests.clone();
-        invalid_labels.table_population = None;
-        invalid_labels.spatial_filter = "job=\"requests\"".into();
-        assert!(SummaryCatalog::from_materializations(1, 1, &[invalid_labels]).is_err());
-        let mut invalid_time = requests.clone();
-        invalid_time.table_timestamp_column = Some("time; DROP TABLE samples".into());
-        assert!(SummaryCatalog::from_materializations(1, 1, &[invalid_time]).is_err());
-        let catalog =
-            SummaryCatalog::from_materializations(1, 1, &[requests, errors, other_time]).unwrap();
-        assert_eq!(catalog.data_descriptors.len(), 3);
-        assert_eq!(catalog.outputs.len(), 3);
-    }
-
-    #[test]
-    fn snapshot_reference_is_deterministic_and_content_sensitive() {
-        let a = config("requests", "", 60);
-        let b = config("errors", "", 60);
-        let left = SummaryCatalog::from_materializations(1, 2, &[a.clone(), b.clone()]).unwrap();
-        let reordered = SummaryCatalog::from_materializations(1, 2, &[b, a.clone()]).unwrap();
-        assert_eq!(left.reference().unwrap(), reordered.reference().unwrap());
-        let changed = SummaryCatalog::from_materializations(1, 2, &[a]).unwrap();
-        assert_ne!(left.reference().unwrap(), changed.reference().unwrap());
-        left.reference()
-            .unwrap()
-            .validate_snapshot(&left, 1, 2)
-            .unwrap();
-        assert!(left
-            .reference()
-            .unwrap()
-            .validate_snapshot(&left, 1, 3)
-            .is_err());
-    }
-
-    // Panes share definitions but retain distinct physical materialization IDs.
-    #[test]
-    fn shares_descriptors_across_windows_and_deduplicates_materializations() {
-        let one = config("requests", "", 60);
-        let two = config("requests", "", 120);
-        let catalog =
-            SummaryCatalog::from_materializations(7, 2, &[one.clone(), two, one]).unwrap();
-        assert_eq!(catalog.summary_descriptors.len(), 1);
-        assert_eq!(catalog.data_descriptors.len(), 1);
-        assert_eq!(catalog.outputs.len(), 2);
-        assert_eq!((catalog.plan_id, catalog.plan_version), (7, 2));
-    }
-
-    // Stored pane duration identifies a deployment output, not the summary meaning.
-    #[test]
-    fn semantic_definition_is_shared_across_deployed_pane_outputs() {
-        let catalog = SummaryCatalog::from_materializations(
-            1,
-            1,
-            &[config("requests", "", 60), config("requests", "", 120)],
-        )
-        .unwrap();
-        assert_eq!(catalog.definitions.len(), 1);
-        assert_eq!(catalog.outputs.len(), 2);
-    }
-
-    // A hot and rebuild output share meaning but remain independently bound.
-    #[test]
-    fn hot_and_rebuild_have_one_definition_and_two_bound_outputs() {
-        let mut hot = config("latency", "", 60);
-        hot.stored_output_id = Some(StoredOutputId(41));
-        let mut rebuild = hot.clone();
-        rebuild.stored_output_id = Some(StoredOutputId(42));
-        let catalog = SummaryCatalog::from_materializations(7, 42, &[hot, rebuild]).unwrap();
-        assert_eq!(catalog.definitions.len(), 1);
-        let hot = catalog.output_reference(StoredOutputId(41)).unwrap();
-        let rebuild = catalog.output_reference(StoredOutputId(42)).unwrap();
-        assert_eq!(hot.definition_id, rebuild.definition_id);
-        assert_ne!(hot, rebuild);
-        let mut forged = catalog.clone();
-        let crate::summary_semantics::SummarySemantics::Configured { computation, .. } =
-            &mut forged.definitions.values_mut().next().unwrap().semantics
-        else {
-            panic!("fixture")
-        };
-        computation.predicate = "service=other".into();
-        assert!(forged.validate().is_err());
-        let mut unknown = catalog.clone();
-        unknown
-            .definitions
-            .values_mut()
-            .next()
-            .unwrap()
-            .semantic_format_version += 1;
-        assert!(unknown.validate().is_err());
-    }
-
-    // Source/population changes never alias, while the operator can be reused.
-    #[test]
-    fn separates_population_and_operator_identity() {
-        let catalog = SummaryCatalog::from_materializations(
-            1,
-            1,
-            &[
-                config("requests", "", 60),
-                config("errors", "", 60),
-                config("requests", "job=user", 60),
-            ],
-        )
-        .unwrap();
-        assert_eq!(catalog.summary_descriptors.len(), 1);
-        assert_eq!(catalog.data_descriptors.len(), 3);
-    }
-
-    // Operator changes share population metadata without sharing state identity.
-    #[test]
-    fn changing_operator_parameters_creates_a_new_summary_descriptor() {
-        let mut a = config("requests", "", 60);
-        a.aggregation_type = AggregationType::DatasketchesKLL;
-        a.parameters.insert("K".into(), serde_json::json!(100));
-        let mut b = a.clone();
-        b.parameters.insert("K".into(), serde_json::json!(200));
-        let catalog = SummaryCatalog::from_materializations(1, 1, &[a, b]).unwrap();
-        assert_eq!(catalog.summary_descriptors.len(), 2);
-        assert_eq!(catalog.data_descriptors.len(), 1);
-        assert_eq!(catalog.outputs.len(), 2);
-    }
-
-    // Construction order cannot affect the published snapshot bytes.
-    #[test]
-    fn snapshot_is_deterministic_and_round_trips() {
-        let a = config("requests", "", 60);
-        let b = config("errors", "", 60);
-        let forward = SummaryCatalog::from_materializations(7, 2, &[a.clone(), b.clone()]).unwrap();
-        let backward = SummaryCatalog::from_materializations(7, 2, &[b, a]).unwrap();
-        let bytes = serde_json::to_vec(&forward).unwrap();
-        assert_eq!(bytes, serde_json::to_vec(&backward).unwrap());
-        let decoded: SummaryCatalog = serde_json::from_slice(&bytes).unwrap();
-        decoded.validate().unwrap();
-        assert_eq!(decoded, forward);
-    }
-
-    #[test]
-    fn catalog_definitions_do_not_store_writer_layout() {
-        let mut materialization = config("requests", "", 60);
-        materialization.pane_origin_ms = Some(7_000);
-        let id = StoredOutputId::from(materialization.policy_fingerprint());
-        let catalog = SummaryCatalog::from_materializations(7, 2, &[materialization]).unwrap();
-        assert!(catalog.outputs.contains_key(&id));
-        assert!(
-            !serde_json::to_value(&catalog).unwrap()["outputs"][id.as_u64().to_string()]
-                .as_object()
-                .unwrap()
-                .contains_key("pane_origin_ms")
-        );
-
-        let mut invalid = serde_json::to_value(&catalog).unwrap();
-        invalid["outputs"][id.as_u64().to_string()]["pane_origin_ms"] = serde_json::json!(7_000);
-        assert!(serde_json::from_value::<SummaryCatalog>(invalid).is_err());
-    }
-
-    // The same materialization cannot silently rebind to another population.
-    #[test]
-    fn conflicting_materialization_is_rejected() {
-        let first = config("requests", "", 60);
-        let second = config("errors", "", 60);
-        let catalog =
-            SummaryCatalog::from_materializations(1, 1, &[first.clone(), second]).unwrap();
-        let summary = catalog.summary_descriptors.values().next().unwrap().clone();
-        let data = catalog
-            .data_descriptors
-            .values()
-            .cloned()
-            .collect::<Vec<_>>();
-        let error = SummaryCatalog::build(
-            1,
-            1,
-            [
-                (first.policy_fingerprint(), summary.clone(), data[0].clone()),
-                (first.policy_fingerprint(), summary, data[1].clone()),
-            ],
-        )
-        .unwrap_err();
-        assert!(matches!(
-            error,
-            SummaryCatalogError::ConflictingDefinition(_)
-        ));
-    }
-
-    // Imported catalogs must resolve every foreign key and content identity.
-    #[test]
-    fn rejects_dangling_refs_tampered_keys_and_unknown_schema() {
-        let catalog =
-            SummaryCatalog::from_materializations(1, 1, &[config("requests", "", 60)]).unwrap();
-        let mut broken = catalog.clone();
-        broken.data_descriptors.clear();
-        assert!(matches!(
-            broken.validate(),
-            Err(SummaryCatalogError::MissingDescriptor(_))
-        ));
-        let mut broken = catalog.clone();
-        let (_, descriptor) = broken.summary_descriptors.pop_first().unwrap();
-        broken.summary_descriptors.insert(
-            serde_json::from_value(serde_json::json!("forged")).unwrap(),
-            descriptor,
-        );
-        assert!(matches!(
-            broken.validate(),
-            Err(SummaryCatalogError::Descriptor(_))
-        ));
-        let mut broken = catalog.clone();
-        broken
-            .summary_descriptors
-            .values_mut()
-            .next()
-            .unwrap()
-            .state_schema_version += 1;
-        assert!(matches!(
-            broken.validate(),
-            Err(SummaryCatalogError::Descriptor(_))
-        ));
-        let mut broken = catalog;
-        broken.schema_version = SUMMARY_CATALOG_SCHEMA_VERSION + 1;
-        assert!(matches!(
-            broken.validate(),
-            Err(SummaryCatalogError::SchemaVersion(_))
-        ));
-    }
-
-    // Native exact-only plans have a valid empty catalog, not dummy state.
-    #[test]
-    fn empty_catalog_is_valid() {
-        let catalog = SummaryCatalog::from_materializations(1, 1, &[]).unwrap();
-        assert!(catalog.outputs.is_empty());
-        catalog.validate().unwrap();
-    }
-}
diff --git a/crates/asap_types/src/summary_semantics.rs b/crates/asap_types/src/summary_semantics.rs
deleted file mode 100644
index 757a7e15b..000000000
--- a/crates/asap_types/src/summary_semantics.rs
+++ /dev/null
@@ -1,129 +0,0 @@
-//! Versioned, content-addressed meaning of a stored result. Runtime routing,
-//! pane placement, codecs, retention and plan generations are deliberately absent.
-use crate::sds::{
-    DataDescriptor, DataSourceIdentity, SummaryDescriptor, SummaryOperator, ValueProjectionIdentity,
-};
-use crate::summary_catalog::SummaryCatalogError;
-use serde::{Deserialize, Serialize};
-
-#[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
-#[serde(deny_unknown_fields)]
-pub struct SummaryDefinition {
-    pub semantic_format_version: u32,
-    pub semantics: SummarySemantics,
-}
-
-#[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
-#[serde(tag = "kind", rename_all = "snake_case", deny_unknown_fields)]
-pub enum SummarySemantics {
-    Planner {
-        fragment: crate::semantic_fragment::SemanticFragment,
-    },
-    /// Restricted raw-input adapter for explicit native summary configurations.
-    /// General expressions must use the Planner fragment variant.
-    Configured {
-        computation: Box<SummaryComputation>,
-        value_source_column: Option<planner_types::pre_asap::Column>,
-        aggregated_labels: crate::KeyByLabelNames,
-        rollup_labels: crate::KeyByLabelNames,
-    },
-}
-
-/// Typed semantic contract of the supported summary input. This is not a
-/// deployment plan: it contains neither physical nodes nor storage references.
-#[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
-#[serde(deny_unknown_fields)]
-pub struct SummaryComputation {
-    pub operator: SummaryOperator,
-    pub source: DataSourceIdentity,
-    pub value: ValueProjectionIdentity,
-    pub predicate: String,
-    pub grouping: crate::GroupingProjection,
-    pub timestamp_column: Option<String>,
-    pub observation_semantics: String,
-}
-
-impl SummaryDefinition {
-    pub fn from_descriptors(
-        summary: &SummaryDescriptor,
-        data: &DataDescriptor,
-    ) -> Result<Self, SummaryCatalogError> {
-        summary
-            .validate()
-            .map_err(|e| SummaryCatalogError::Descriptor(e.to_string()))?;
-        data.validate()
-            .map_err(|e| SummaryCatalogError::Descriptor(e.to_string()))?;
-        Ok(Self {
-            semantic_format_version: 1,
-            semantics: SummarySemantics::Configured {
-                value_source_column: None,
-                aggregated_labels: crate::KeyByLabelNames::empty(),
-                rollup_labels: crate::KeyByLabelNames::empty(),
-                computation: Box::new(SummaryComputation {
-                    operator: summary.operator.clone(),
-                    source: data.source.clone(),
-                    value: data.value_projection.clone(),
-                    predicate: data.population_filter_canonical.clone(),
-                    grouping: data.group_by_keys.clone(),
-                    timestamp_column: data.timestamp_column.clone(),
-                    observation_semantics: data.observation_semantics.clone(),
-                }),
-            },
-        })
-    }
-
-    pub fn with_config(mut self, config: &crate::PrecomputeMaterialization) -> Self {
-        let fragment = config.semantic_fragment.as_ref();
-        if let Some(fragment) = fragment {
-            self.semantics = SummarySemantics::Planner {
-                fragment: fragment.clone(),
-            };
-        } else if let SummarySemantics::Configured {
-            value_source_column,
-            aggregated_labels,
-            rollup_labels,
-            ..
-        } = &mut self.semantics
-        {
-            *value_source_column = config.value_source_column.clone();
-            *aggregated_labels = config.aggregated_labels.clone();
-            *rollup_labels = config.rollup_labels.clone();
-        }
-        self
-    }
-
-    pub fn id(&self) -> Result<crate::sds::SummaryDefinitionId, SummaryCatalogError> {
-        if self.semantic_format_version != 1 {
-            return Err(SummaryCatalogError::Descriptor(
-                "unsupported semantic format version".into(),
-            ));
-        }
-        if let SummarySemantics::Planner { fragment } = &self.semantics {
-            fragment
-                .validate()
-                .map_err(SummaryCatalogError::Descriptor)?;
-        }
-        // Object keys are recursively sorted, independent of serde_json features.
-        fn canonical(value: serde_json::Value) -> serde_json::Value {
-            match value {
-                serde_json::Value::Object(values) => serde_json::Value::Object(
-                    values
-                        .into_iter()
-                        .map(|(k, v)| (k, canonical(v)))
-                        .collect::<std::collections::BTreeMap<_, _>>()
-                        .into_iter()
-                        .collect(),
-                ),
-                serde_json::Value::Array(values) => {
-                    serde_json::Value::Array(values.into_iter().map(canonical).collect())
-                }
-                value => value,
-            }
-        }
-        let value = serde_json::to_value(self)
-            .map_err(|e| SummaryCatalogError::Descriptor(e.to_string()))?;
-        let bytes = serde_json::to_vec(&canonical(value))
-            .map_err(|e| SummaryCatalogError::Descriptor(e.to_string()))?;
-        Ok(crate::sds::SummaryDefinitionId::from_semantics(&bytes))
-    }
-}
diff --git a/crates/asap_types/src/table_population.rs b/crates/asap_types/src/table_population.rs
deleted file mode 100644
index 4bb371387..000000000
--- a/crates/asap_types/src/table_population.rs
+++ /dev/null
@@ -1,133 +0,0 @@
-//! Typed table predicates shared by catalog identity and source readers.
-
-use planner_types::pre_asap::{CompareOpKind, ScalarValue};
-use serde::{Deserialize, Serialize};
-
-/// A conjunction of column/literal comparisons. Column names are schema names,
-/// not SQL fragments; readers must bind literal values as parameters.
-#[derive(Debug, Clone, Default, PartialEq, Serialize, Deserialize)]
-pub struct TablePopulation {
-    pub predicates: Vec<TableColumnPredicate>,
-}
-
-#[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
-pub struct TableColumnPredicate {
-    pub column: String,
-    pub operator: CompareOpKind,
-    pub value: ScalarValue,
-}
-
-impl TablePopulation {
-    pub fn validate(&self) -> Result<(), String> {
-        for predicate in &self.predicates {
-            validate_column_name(&predicate.column)?;
-            if !matches!(
-                predicate.operator,
-                CompareOpKind::Eq
-                    | CompareOpKind::Ne
-                    | CompareOpKind::Lt
-                    | CompareOpKind::Le
-                    | CompareOpKind::Gt
-                    | CompareOpKind::Ge
-            ) {
-                return Err("table population comparison is unsupported".into());
-            }
-            if matches!(
-                predicate.value,
-                ScalarValue::Null | ScalarValue::Interval { .. }
-            ) || matches!(predicate.value, ScalarValue::Float64(value) if !value.is_finite())
-            {
-                return Err("table population requires a finite non-null literal".into());
-            }
-        }
-        Ok(())
-    }
-
-    /// Reordered or repeated conjuncts identify the same population.
-    pub fn canonical(&self) -> String {
-        if self.predicates.is_empty() {
-            return String::new();
-        }
-        let mut predicates: Vec<_> = self
-            .predicates
-            .iter()
-            .map(|predicate| serde_json::to_string(predicate).expect("predicate serialization"))
-            .collect();
-        predicates.sort();
-        predicates.dedup();
-        format!("sql.and.v1:[{}]", predicates.join(","))
-    }
-}
-
-pub(crate) fn validate_column_name(column: &str) -> Result<(), String> {
-    if column.is_empty()
-        || !column.as_bytes()[0].is_ascii_alphabetic() && !column.starts_with('_')
-        || !column
-            .bytes()
-            .all(|byte| byte.is_ascii_alphanumeric() || byte == b'_')
-    {
-        return Err("table column is not an unqualified identifier".into());
-    }
-    Ok(())
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    fn metric(value: &str) -> TableColumnPredicate {
-        TableColumnPredicate {
-            column: "metric".into(),
-            operator: CompareOpKind::Eq,
-            value: ScalarValue::Utf8(value.into()),
-        }
-    }
-
-    #[test]
-    fn population_identity_distinguishes_values_and_ignores_conjunct_order() {
-        let a = metric("requests");
-        let b = TableColumnPredicate {
-            column: "status".into(),
-            operator: CompareOpKind::Ge,
-            value: ScalarValue::Int64(500),
-        };
-        assert_eq!(
-            TablePopulation {
-                predicates: vec![a.clone(), b.clone(), a.clone()]
-            }
-            .canonical(),
-            TablePopulation {
-                predicates: vec![b, a.clone()]
-            }
-            .canonical()
-        );
-        assert_ne!(
-            TablePopulation {
-                predicates: vec![a]
-            }
-            .canonical(),
-            TablePopulation {
-                predicates: vec![metric("errors")]
-            }
-            .canonical()
-        );
-    }
-
-    #[test]
-    fn rejects_sql_fragments_and_nonfinite_literals() {
-        let mut predicate = metric("requests");
-        predicate.column = "metric OR 1=1".into();
-        assert!(TablePopulation {
-            predicates: vec![predicate]
-        }
-        .validate()
-        .is_err());
-        let mut predicate = metric("requests");
-        predicate.value = ScalarValue::Float64(f64::NAN);
-        assert!(TablePopulation {
-            predicates: vec![predicate]
-        }
-        .validate()
-        .is_err());
-    }
-}
diff --git a/crates/asap_types/src/traits.rs b/crates/asap_types/src/traits.rs
deleted file mode 100644
index 51afd904f..000000000
--- a/crates/asap_types/src/traits.rs
+++ /dev/null
@@ -1 +0,0 @@
-pub use asap_physical_operators::SerializableToSink;
diff --git a/crates/asap_types/src/utils.rs b/crates/asap_types/src/utils.rs
deleted file mode 100644
index 025a5e78c..000000000
--- a/crates/asap_types/src/utils.rs
+++ /dev/null
@@ -1,56 +0,0 @@
-/// Normalize spatial filter for PromQL queries
-pub fn normalize_spatial_filter(filter: &str) -> String {
-    if filter.is_empty() {
-        return String::new();
-    }
-
-    let trimmed = filter.trim().strip_prefix('{').unwrap_or(filter.trim());
-    let trimmed = trimmed.strip_suffix('}').unwrap_or(trimmed);
-    let trimmed = trimmed.trim();
-
-    let mut parts = Vec::new();
-    let mut start = 0;
-    let mut quoted = false;
-    let mut escaped = false;
-    for (index, ch) in trimmed.char_indices() {
-        if escaped {
-            escaped = false;
-        } else if ch == '\\' && quoted {
-            escaped = true;
-        } else if ch == '"' {
-            quoted = !quoted;
-        } else if ch == ',' && !quoted {
-            parts.push(trimmed[start..index].trim());
-            start = index + 1;
-        }
-    }
-    parts.push(trimmed[start..].trim());
-    parts.sort();
-
-    format!("{{{}}}", parts.join(","))
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    #[test]
-    fn test_normalize_spatial_filter() {
-        assert_eq!(normalize_spatial_filter("").as_str(), "");
-
-        let result = normalize_spatial_filter("instance=\"localhost:9090\"");
-        assert_eq!(result, "{instance=\"localhost:9090\"}");
-
-        let result = normalize_spatial_filter("{instance=\"localhost:9090\"}");
-        assert_eq!(result, "{instance=\"localhost:9090\"}");
-
-        let result = normalize_spatial_filter("{job=\"prometheus\",instance=\"localhost:9090\"}");
-        assert_eq!(result, "{instance=\"localhost:9090\",job=\"prometheus\"}");
-
-        let result = normalize_spatial_filter("job=\"prometheus\",instance=\"localhost:9090\"");
-        assert_eq!(result, "{instance=\"localhost:9090\",job=\"prometheus\"}");
-
-        let result = normalize_spatial_filter(r#"{status=~"5(00,01)",job="api"}"#);
-        assert_eq!(result, r#"{job="api",status=~"5(00,01)"}"#);
-    }
-}
diff --git a/data_plane/.cargo/config.toml b/data_plane/.cargo/config.toml
deleted file mode 100644
index c91c3f38b..000000000
--- a/data_plane/.cargo/config.toml
+++ /dev/null
@@ -1,2 +0,0 @@
-[net]
-git-fetch-with-cli = true
diff --git a/data_plane/.gitignore b/data_plane/.gitignore
deleted file mode 100644
index eb5a316cb..000000000
--- a/data_plane/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-target
diff --git a/data_plane/Cargo.toml b/data_plane/Cargo.toml
index 223275418..d11d14796 100644
--- a/data_plane/Cargo.toml
+++ b/data_plane/Cargo.toml
@@ -4,103 +4,21 @@ version.workspace = true
 edition.workspace = true
 
 [dependencies]
-# Internal crates (workspace)
-asap_types.workspace = true
-asap-physical-operators.workspace = true
-asap_sketch_codec.workspace = true
-# Phase 9: the control plane is now an in-process library inside the
-# backend binary. Wiring up the in-process OpAMP server + capability-map
-# exposure is a follow-up after Phase 4 (centralized series_id
-# resolver). For now this dep just makes the control_plane crate
-# compile in the workspace and importable from main.rs.
-control_plane = { path = "../control_plane" }
-sha2 = "0.10"
-
-# Use the same Planner IR as the control plane at compilation boundaries.
-planner-types.workspace = true
-asap-frontend-promql.workspace = true
-
-# Shared external (workspace)
+control_plane.workspace = true
 serde.workspace = true
 serde_json.workspace = true
-serde_yaml.workspace = true
 thiserror.workspace = true
 anyhow.workspace = true
 tracing.workspace = true
 tracing-subscriber.workspace = true
 clap.workspace = true
-chrono.workspace = true
-chrono-tz = "0.10"
-promql-parser.workspace = true
 tokio.workspace = true
-arc-swap.workspace = true
-
-# Crate-specific (keep version pinned here)
-form_urlencoded = "1.2"
-axum = "0.7"
-bincode = "1.3"
-dashmap = "5.5"
-flate2 = "1.0"
-async-trait = "0.1"
-xxhash-rust = { version = "0.8", features = ["xxh32", "xxh64"] }
-base64 = "0.21"
-hex = "0.4"
-arrow = "53.4.1"
-futures = "0.3"
+axum.workspace = true
+reqwest.workspace = true
 prost = "0.13"
 snap = "1.1"
-# Vendored modified opentelemetry-proto with first-class sketch metric
-# variants from DataCollector (DDSketch / KLLSketch / CountSketch /
-# CountMinSketch / HLLSketch). See docs/pipeline-query-catalog.md §5.4 in the
-# DataCollector repo for the rationale.
-asap_otel_proto.workspace = true
-# `gzip` feature: enables CompressionEncoding::Gzip so the OTLP gRPC
-# ingest server can `.accept_compressed()` gzip bodies from the
-# `asap-gzip` arm's agent. control_plane already pulls tonic with this
-# feature for its RuntimeSamples gRPC.
-tonic = { version = "0.12", features = ["gzip"] }
-tokio-stream = { version = "0.1", features = ["net"] }
-regex = "1"
-prometheus = "0.13"
-lazy_static = "1.4"
-reqwest.workspace = true
-tracing-appender = "0.2"
-asap_sketchlib = { git = "https://github.com/ProjectASAP/asap_sketchlib", rev = "5f03ccbd798ed5fec62bdd839bcb331123cab369" }
-# Generic MessagePack codec for decoding the heap-bearing CountSketch
-# DELTA-HEAP wire frame (`MSGPACK_DELTA`) directly in the backend, WITHOUT
-# adding a delta API to the public `asap_sketchlib`: the frame is decoded
-# into local serde structs here, the sparse matrix delta is applied onto the
-# stored matrix, and the heap is replaced — all via `asap_sketchlib`'s
-# existing PUBLIC `from_legacy_matrix`/`sketch_matrix`/`topk_heap_items` API.
-# Already in the lock as a transitive dep of `asap_sketchlib`.
-rmp-serde = "1.3"
-# Persistence layer (SketchStore parts / manifest / Tier-2 cache)
-moka = { version = "0.12", features = ["sync"] }
-memmap2 = "0.9"
-crc32fast = "1.4"
-fs2 = "0.4"
-# NOTE: the `asap-gorilla` path-dep + the `s3` (rust-s3) / `lru`
-# crates were dropped when the superseded GORILLA1 read side
-# (`gorilla_object_store`: GorillaS3Store + decode_block + the
-# in-process GorillaQueryEngine) was deleted. The archive tier is
-# served by the ThanosQueryEngine (Path A2) over HTTP, which needs
-# none of them.
 
 [dev-dependencies]
-asap-aware-mapping.workspace = true
-tempfile = "3.20.0"
-criterion = { version = "0.5", features = ["html_reports"] }
+planner-types.workspace = true
 tower = { version = "0.5", features = ["util"] }
 http-body-util = "0.1"
-
-[[bench]]
-name = "sketch_db"
-harness = false
-
-[features]
-#default = ["lock_profiling", "extra_debugging"]
-default = []
-# Enable lock profiling instrumentation
-lock_profiling = []
-# Enable extra debugging output
-extra_debugging = ["asap-physical-operators/extra_debugging"]
diff --git a/data_plane/Dockerfile b/data_plane/Dockerfile
deleted file mode 100644
index 004c7947a..000000000
--- a/data_plane/Dockerfile
+++ /dev/null
@@ -1,41 +0,0 @@
-# Builds the data_plane (backend) binary → asap/data-plane:dev.
-#
-# Repo-ownership (2026-05): each ASAPQuery-backend crate owns its own image
-# Dockerfile here — companion: control_plane/Dockerfile
-# Dockerfile. ASAPCollector only orchestrates + references images by name; the
-# old cross-repo combined builder (ASAPCollector deploy/docker/Dockerfile.backend)
-# is retired.
-#
-# Build from the backend checkout; Cargo fetches public Git dependencies
-# at the revisions recorded in Cargo.lock.
-#
-#   docker build -f data_plane/Dockerfile -t asap/data-plane:dev .
-FROM rust:1.90-bookworm AS build
-WORKDIR /src
-
-# protoc for the backend's prost-build usages; git for any git-dep fetches.
-RUN apt-get update && \
-    apt-get install -y --no-install-recommends \
-        protobuf-compiler git ca-certificates && \
-    rm -rf /var/lib/apt/lists/*
-
-COPY . ASAPQuery-backend
-
-RUN cd ASAPQuery-backend && cargo build --locked --release --bin data_plane
-
-# Runtime image: binary + CA certs.
-FROM debian:bookworm-slim
-RUN apt-get update && \
-    apt-get install -y --no-install-recommends ca-certificates && \
-    rm -rf /var/lib/apt/lists/*
-# Default --output-dir for the rolling log file.
-RUN mkdir -p /var/log/asap
-COPY --from=build /src/ASAPQuery-backend/target/release/data_plane \
-    /usr/local/bin/data_plane
-
-ENV RUST_LOG=info \
-    ASAP_BACKEND_PORT=9090 \
-    ASAP_BACKEND_METRICS_PORT=9465
-# query 9091, OTLP ingest 4317/4318, backend 9090, metrics 9465.
-EXPOSE 9090 9091 9465 4317 4318
-ENTRYPOINT ["/usr/local/bin/data_plane"]
diff --git a/data_plane/LICENSE b/data_plane/LICENSE
deleted file mode 100644
index 404d65798..000000000
--- a/data_plane/LICENSE
+++ /dev/null
@@ -1,21 +0,0 @@
-MIT License
-
-Copyright (c) 2025 SketchDB
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
diff --git a/data_plane/benches/sketch_db.rs b/data_plane/benches/sketch_db.rs
deleted file mode 100644
index de4a448cf..000000000
--- a/data_plane/benches/sketch_db.rs
+++ /dev/null
@@ -1,515 +0,0 @@
-//! Criterion benchmarks for `SketchStore` — the ASAP-tier sketch DB.
-//!
-//! Run with: `cargo bench -p data_plane --bench sketch_db`
-//!
-//! Covers:
-//!   * `append_sample`            — sketch insert
-//!   * `append_precompute`        — precompute insert
-//!   * `query_range`              — per-sid range query
-//!   * `query_precomputes_by_agg` — cross-sid precompute scan
-//!
-//! Varied dimensions: sid cardinality, windows-per-sid (depth),
-//! query-window width, and sketch kind (DDSketch / KLL / HLL).
-//!
-//! NOTE: the insert benches use `iter_batched_ref`, not `iter_batched`.
-//! `iter_batched` (criterion-0.5.1 `src/bencher.rs:264-272`) consumes its
-//! input by value, so the per-iteration `Drop` of the setup `SketchStore`
-//! runs inside the timed region. The `SketchStore` Drop scales linearly
-//! with `num_sids` (each `SummarySeriesMetadata` owns a `String`,
-//! `BTreeSet`, `SketchConfig`, `Option<AccuracyBound>` — roughly ~100 ns
-//! to drop apiece). At 10k sids that's ~1 ms of pure drop work per
-//! "append" — i.e. ~1000× the actual `append_sample` cost. See
-//! `examples/sketch_db_diag.rs` for the breakdown.
-
-use std::collections::{BTreeMap, BTreeSet};
-
-use criterion::{black_box, criterion_group, criterion_main, BenchmarkId, Criterion, Throughput};
-
-use asap_sketchlib::proto::sketchlib::{
-    sketch_envelope, DdSketchState, HllVariant as ProtoVariant, HyperLogLogState, KllState,
-    SketchEnvelope,
-};
-use asap_sketchlib::DdSketch;
-use asap_sketchlib::{HllSketch, HllVariant};
-use prost::Message;
-
-use asap_physical_operators::summary_kernels::SumAccumulator;
-use data_plane::storage_engines::sketch_db::data::{
-    AccuracyBound, AggKind, AggregationType, Capability, SketchAlgorithm, SketchConfig,
-    SketchEncoding,
-};
-use data_plane::storage_engines::sketch_db::index::{SketchStore, SummarySeriesMetadata};
-use data_plane::storage_engines::SketchSampleState;
-
-// ── Payload builders ────────────────────────────────────────────────────────
-
-fn encode_ddsketch(values: &[f64], alpha: f64) -> Vec<u8> {
-    let mut sk = DdSketch::new(alpha);
-    for v in values {
-        sk.update(*v);
-    }
-    let state = DdSketchState {
-        alpha: sk.alpha,
-        store_counts: sk.store_counts.clone(),
-        store_offset: sk.store_offset,
-        ..Default::default()
-    };
-    SketchEnvelope {
-        sketch_state: Some(sketch_envelope::SketchState::Ddsketch(state)),
-        ..Default::default()
-    }
-    .encode_to_vec()
-}
-
-fn encode_kll(k: u32, items: &[f64]) -> Vec<u8> {
-    let state = KllState {
-        k,
-        items: items.to_vec(),
-        levels: vec![],
-        num_levels: 0,
-        ..Default::default()
-    };
-    SketchEnvelope {
-        sketch_state: Some(sketch_envelope::SketchState::Kll(state)),
-        ..Default::default()
-    }
-    .encode_to_vec()
-}
-
-fn encode_hll(distinct_items: usize, precision: u32) -> Vec<u8> {
-    let mut sk = HllSketch::new(HllVariant::Regular, precision);
-    for i in 0..distinct_items {
-        sk.update(format!("user-{i}").as_bytes());
-    }
-    let state = HyperLogLogState {
-        variant: ProtoVariant::Regular as i32,
-        precision: sk.precision,
-        registers: sk.registers.clone(),
-        hip_kxq0: sk.hip_kxq0,
-        hip_kxq1: sk.hip_kxq1,
-        hip_est: sk.hip_est,
-        registers_sparse: None,
-    };
-    SketchEnvelope {
-        sketch_state: Some(sketch_envelope::SketchState::Hll(state)),
-        ..Default::default()
-    }
-    .encode_to_vec()
-}
-
-fn sample(bytes: Vec<u8>) -> SketchSampleState {
-    SketchSampleState {
-        bytes,
-        encoding: SketchEncoding::ProtoFull,
-    }
-}
-
-// ── Metadata builders ───────────────────────────────────────────────────────
-
-fn sketch_meta(
-    sid: u64,
-    algorithm: SketchAlgorithm,
-    config: SketchConfig,
-) -> SummarySeriesMetadata {
-    SummarySeriesMetadata {
-        storage_handle: sid,
-        metric_name: "bench_metric".into(),
-        group_by_keys: BTreeSet::new(),
-        capability: Some(match algorithm {
-            SketchAlgorithm::Hll => Capability::CardinalityApprox,
-            _ => Capability::QuantileApprox(Some(algorithm.clone())),
-        }),
-        accuracy: Some(AccuracyBound::from_config(&config)),
-        agg_kind: AggKind::Sketch {
-            algorithm,
-            config,
-            spatial_filter_canonical: String::new(),
-        },
-        first_seen_unix_ms: 0,
-        retired_at_ms: None,
-        expires_at_ms: None,
-        policy_fp: asap_types::PolicyFingerprint::UNSET,
-    }
-}
-
-fn precompute_meta(sid: u64, metric: &str, agg_type: AggregationType) -> SummarySeriesMetadata {
-    SummarySeriesMetadata {
-        storage_handle: sid,
-        metric_name: metric.to_string(),
-        group_by_keys: BTreeSet::new(),
-        capability: None,
-        accuracy: None,
-        agg_kind: AggKind::ExactAgg {
-            agg_type,
-            parameters_canonical: String::new(),
-            spatial_filter_canonical: String::new(),
-        },
-        first_seen_unix_ms: 0,
-        retired_at_ms: None,
-        expires_at_ms: None,
-        policy_fp: asap_types::PolicyFingerprint::UNSET,
-    }
-}
-
-#[derive(Clone)]
-struct KindCase {
-    name: &'static str,
-    algorithm: SketchAlgorithm,
-    build: fn() -> (SketchConfig, Vec<u8>),
-}
-
-fn dd_small() -> (SketchConfig, Vec<u8>) {
-    let cfg = SketchConfig::DDSketch {
-        relative_accuracy: 0.01,
-    };
-    let bytes = encode_ddsketch(&(1..=64).map(|i| i as f64).collect::<Vec<_>>(), 0.01);
-    (cfg, bytes)
-}
-
-fn kll_small() -> (SketchConfig, Vec<u8>) {
-    let cfg = SketchConfig::Kll { k: 200 };
-    let items: Vec<f64> = (1..=64).map(|i| i as f64).collect();
-    (cfg, encode_kll(200, &items))
-}
-
-fn hll_small() -> (SketchConfig, Vec<u8>) {
-    let cfg = SketchConfig::Hll { precision: 10 };
-    let bytes = encode_hll(256, 10);
-    (cfg, bytes)
-}
-
-const KINDS: &[KindCase] = &[
-    KindCase {
-        name: "DDSketch",
-        algorithm: SketchAlgorithm::DDSketch,
-        build: dd_small,
-    },
-    KindCase {
-        name: "KLL",
-        algorithm: SketchAlgorithm::Kll,
-        build: kll_small,
-    },
-    KindCase {
-        name: "HLL",
-        algorithm: SketchAlgorithm::Hll,
-        build: hll_small,
-    },
-];
-
-// ── append_sample ───────────────────────────────────────────────────────────
-//
-// Pre-populates the store with `num_sids` registered metadata entries once
-// per setup call; the timed routine performs ONE `append_sample`. Using
-// `iter_batched_ref` so the setup store is dropped OUTSIDE the timed region
-// (the original `iter_batched` formulation timed that drop, which scales
-// linearly with `num_sids` and was masking the real per-op cost — see the
-// module doc-comment).
-
-fn bench_append_sample(c: &mut Criterion) {
-    let mut g = c.benchmark_group("append_sample");
-    g.sample_size(20);
-
-    for kind in KINDS {
-        let (cfg, payload_bytes) = (kind.build)();
-        for num_sids in [1usize, 100, 10_000] {
-            g.throughput(Throughput::Elements(1));
-            g.bench_function(
-                BenchmarkId::new(kind.name, format!("sids={num_sids}")),
-                |b| {
-                    b.iter_batched_ref(
-                        || {
-                            let store = SketchStore::new();
-                            for sid in 0..num_sids as u64 {
-                                store.register(sketch_meta(
-                                    sid + 1,
-                                    kind.algorithm.clone(),
-                                    cfg.clone(),
-                                ));
-                            }
-                            (store, 0u64)
-                        },
-                        |(store, counter)| {
-                            let c = *counter;
-                            *counter = c.wrapping_add(1);
-                            let sid = (c % num_sids as u64) + 1;
-                            let win = (1_000 + c * 10, 1_000 + c * 10 + 10);
-                            store.append_sample(
-                                sid,
-                                BTreeMap::new(),
-                                win,
-                                sample(payload_bytes.clone()),
-                            );
-                            black_box(&*store);
-                        },
-                        criterion::BatchSize::SmallInput,
-                    );
-                },
-            );
-        }
-    }
-    g.finish();
-}
-
-// ── append_precompute ───────────────────────────────────────────────────────
-
-fn bench_append_precompute(c: &mut Criterion) {
-    let mut g = c.benchmark_group("append_precompute");
-    g.sample_size(20);
-
-    for num_sids in [1usize, 100, 10_000] {
-        g.throughput(Throughput::Elements(1));
-        g.bench_function(BenchmarkId::new("Sum", format!("sids={num_sids}")), |b| {
-            b.iter_batched_ref(
-                || {
-                    let store = SketchStore::new();
-                    for sid in 0..num_sids as u64 {
-                        store.register(precompute_meta(
-                            sid + 1,
-                            "bench_metric",
-                            AggregationType::Sum,
-                        ));
-                    }
-                    (store, 0u64)
-                },
-                |(store, counter)| {
-                    let c = *counter;
-                    *counter = c.wrapping_add(1);
-                    let sid = (c % num_sids as u64) + 1;
-                    let win = (1_000 + c * 10, 1_000 + c * 10 + 10);
-                    store.append_precompute(
-                        sid,
-                        BTreeMap::new(),
-                        win,
-                        Box::new(SumAccumulator::with_sum(c as f64)),
-                    );
-                    black_box(&*store);
-                },
-                criterion::BatchSize::SmallInput,
-            );
-        });
-    }
-    g.finish();
-}
-
-// ── query_range ─────────────────────────────────────────────────────────────
-
-fn build_populated_store(depth: u64, kind: &KindCase, sid: u64) -> SketchStore {
-    let store = SketchStore::new();
-    let (cfg, payload_bytes) = (kind.build)();
-    store.register(sketch_meta(sid, kind.algorithm.clone(), cfg));
-    for i in 0..depth {
-        let win = (1_000 + i * 10, 1_000 + i * 10 + 10);
-        store.append_sample(sid, BTreeMap::new(), win, sample(payload_bytes.clone()));
-    }
-    store
-}
-
-fn bench_query_range(c: &mut Criterion) {
-    let mut g = c.benchmark_group("query_range");
-    g.sample_size(20);
-
-    let sid = 1u64;
-    for kind in KINDS {
-        for depth in [10u64, 100, 1_000] {
-            let store = build_populated_store(depth, kind, sid);
-            let full_end = 1_000 + depth * 10 + 10;
-            let cases = [
-                ("w=1", (1_000u64, 1_010u64)),
-                ("w=half", (1_000u64, 1_000 + (depth / 2) * 10)),
-                ("w=full", (1_000u64, full_end)),
-            ];
-            for (width_label, (start, end)) in cases {
-                g.throughput(Throughput::Elements(1));
-                g.bench_function(
-                    BenchmarkId::new(kind.name, format!("depth={depth}/{width_label}")),
-                    |b| {
-                        b.iter(|| {
-                            let r =
-                                store.query_range(black_box(sid), black_box(start), black_box(end));
-                            black_box(r);
-                        });
-                    },
-                );
-            }
-        }
-    }
-    g.finish();
-}
-
-// ── query_precomputes_by_agg ───────────────────────────────────────────────
-
-fn build_precompute_store(num_sids: usize, windows_per_sid: u64, metric: &str) -> SketchStore {
-    let store = SketchStore::new();
-    for s in 0..num_sids as u64 {
-        let sid = s + 1;
-        store.register(precompute_meta(sid, metric, AggregationType::Sum));
-        for i in 0..windows_per_sid {
-            let win = (1_000 + i * 10, 1_000 + i * 10 + 10);
-            store.append_precompute(
-                sid,
-                BTreeMap::new(),
-                win,
-                Box::new(SumAccumulator::with_sum((sid + i) as f64)),
-            );
-        }
-    }
-    store
-}
-
-fn bench_query_precomputes_by_agg(c: &mut Criterion) {
-    let mut g = c.benchmark_group("query_precomputes_by_agg");
-    g.sample_size(15);
-
-    let metric = "bench_metric";
-    let cases: &[(usize, u64)] = &[(1, 100), (100, 10), (100, 100), (10_000, 10)];
-    for (num_sids, depth) in cases {
-        let store = build_precompute_store(*num_sids, *depth, metric);
-        let full_end = 1_000 + depth * 10 + 10;
-        let widths = [
-            ("w=1", (1_000u64, 1_010u64)),
-            ("w=full", (1_000u64, full_end)),
-        ];
-        for (width_label, (start, end)) in widths {
-            g.throughput(Throughput::Elements(*num_sids as u64));
-            g.bench_function(
-                BenchmarkId::new(format!("sids={num_sids}/depth={depth}"), width_label),
-                |b| {
-                    b.iter(|| {
-                        let r = store.query_precomputes_by_agg(
-                            black_box(metric),
-                            AggregationType::Sum,
-                            black_box(start),
-                            black_box(end),
-                        );
-                        black_box(r);
-                    });
-                },
-            );
-        }
-    }
-    g.finish();
-}
-
-/// Build a `InstalledPrecomputePlan` whose single agg-config's content
-/// signature matches every sid registered by `build_precompute_store`
-/// (metric / `Sum` / no grouping / empty params+filter). With this
-/// config the reconciler retires nothing — the steady-state ingest
-/// case, where the per-batch reconcile is pure scan overhead.
-fn matching_streaming_config(
-    metric: &str,
-) -> data_plane::storage_engines::types::InstalledPrecomputePlan {
-    use asap_types::aggregation_config::PrecomputeMaterialization;
-    use asap_types::enums::WindowKind;
-    use asap_types::AggregationType as AT;
-    use asap_types::KeyByLabelNames;
-    use std::collections::HashMap;
-
-    let cfg = PrecomputeMaterialization::new(
-        AT::Sum,
-        String::new(),
-        HashMap::new(),
-        KeyByLabelNames::empty(),
-        KeyByLabelNames::empty(),
-        KeyByLabelNames::empty(),
-        String::new(),
-        60,
-        60,
-        WindowKind::Tumbling,
-        String::new(),
-        metric.to_string(),
-        None,
-        None,
-        None,
-    );
-    let runtime = data_plane::storage_engines::types::InstalledPrecomputePlan::default();
-    let plan = control_plane::physical::compiler::PrecomputePlan::build(
-        runtime.plan().envelope.clone(),
-        vec![cfg],
-        &[],
-    )
-    .unwrap();
-    data_plane::storage_engines::types::InstalledPrecomputePlan::from_precompute_plan(plan).unwrap()
-}
-
-/// `reconcile_from_streaming_config` ran on EVERY ingest batch and, in
-/// the pre-optimization code, deep-cloned every `SummarySeriesMetadata`
-/// in the catalog (`snapshot_instances()`) — the dominant ingest-path
-/// CPU cost in live `perf` profiling (BTreeMap/String clone + malloc
-/// churn). This bench measures one un-gated reconcile against a
-/// populated store at a few catalog sizes, so the before/after clone
-/// elimination is directly visible.
-fn bench_reconcile_per_batch(c: &mut Criterion) {
-    use std::time::Duration;
-
-    let mut g = c.benchmark_group("reconcile_per_batch");
-    g.sample_size(50);
-
-    let metric = "bench_metric";
-    for num_sids in [100usize, 1_000, 10_000] {
-        let store = build_precompute_store(num_sids, 1, metric);
-        let config = matching_streaming_config(metric);
-        g.throughput(Throughput::Elements(num_sids as u64));
-        g.bench_function(BenchmarkId::new("full_scan", num_sids), |b| {
-            b.iter(|| {
-                let summary =
-                    data_plane::storage_engines::sketch_db::lifecycle::reconcile_from_streaming_config(
-                        black_box(&store),
-                        black_box(&config),
-                        Duration::from_secs(60),
-                    );
-                black_box(summary);
-            });
-        });
-    }
-    g.finish();
-}
-
-fn bench_group_key_projection(c: &mut Criterion) {
-    use data_plane::precompute_engine::group_key::intern_pairs;
-
-    let cardinality = 100_000usize;
-    let labels = (0..cardinality)
-        .map(|index| (format!("region;{index}"), format!("service={index}")))
-        .collect::<Vec<_>>();
-    let mut group = c.benchmark_group("group_key_projection");
-    group.throughput(Throughput::Elements(cardinality as u64));
-    group.bench_function("cold_high_cardinality", |b| {
-        b.iter(|| {
-            for (region, service) in &labels {
-                black_box(intern_pairs([
-                    ("region", region.as_str()),
-                    ("service", service.as_str()),
-                ]));
-            }
-        });
-    });
-    // Warm the bounded interner, then measure shared-DAG reuse.
-    for (region, service) in &labels {
-        black_box(intern_pairs([
-            ("region", region.as_str()),
-            ("service", service.as_str()),
-        ]));
-    }
-    group.bench_function("warm_shared_projection", |b| {
-        b.iter(|| {
-            for (region, service) in &labels {
-                black_box(intern_pairs([
-                    ("region", region.as_str()),
-                    ("service", service.as_str()),
-                ]));
-            }
-        });
-    });
-    group.finish();
-}
-
-criterion_group!(
-    benches,
-    bench_append_sample,
-    bench_append_precompute,
-    bench_query_range,
-    bench_query_precomputes_by_agg,
-    bench_reconcile_per_batch,
-    bench_group_key_projection,
-);
-criterion_main!(benches);
diff --git a/data_plane/docker-compose.yml.j2 b/data_plane/docker-compose.yml.j2
deleted file mode 100644
index cacf95efe..000000000
--- a/data_plane/docker-compose.yml.j2
+++ /dev/null
@@ -1,43 +0,0 @@
-# QueryEngine Rust Docker Compose Template
-# This template is rendered with Jinja2 to generate the final docker-compose.yml
-
-version: '3.8'
-
-services:
-  queryengine-rust:
-    image: sketchdb-queryengine-rust:latest
-    container_name: {{ container_name }}
-    environment:
-      - RUST_LOG={{ log_level }}
-      - RUST_BACKTRACE=1
-    ports:
-      - "{{ http_port }}:8088"
-    network_mode: "host"
-    volumes:
-      # Mount output directory for experiment results
-      - "{{ experiment_output_dir }}:/app/outputs"
-      # Mount control plane output directory for configuration files (read-only)
-      - "{{ control_plane_remote_output_dir }}:/app/control_plane_output:ro"
-    command: [
-      "--kafka-topic", "{{ kafka_topic }}",
-      "--kafka-broker", "{{ kafka_host }}:9092",
-      "--input-format", "{{ input_format }}",
-      "--config", "/app/control_plane_output/inference_config.yaml",
-      "--streaming-config", "/app/control_plane_output/streaming_config.yaml",
-      "--prometheus-server", "http://{{ prometheus_host }}:{{ prometheus_port }}",
-      "--prometheus-scrape-interval", "{{ prometheus_scrape_interval }}",
-      "--delete-existing-db",
-      "--log-level", "{{ log_level }}",
-      "--output-dir", "/app/outputs",
-      "--streaming-engine", "{{ streaming_engine }}",
-      "--query-language", "{{ query_language }}",
-      "--lock-strategy", "{{ lock_strategy }}"{% if compress_json %},
-      "--decompress-json"{% endif %}{% if profile_query_engine %},
-      "--do-profiling"{% endif %}{% if forward_unsupported_queries %},
-      "--forward-unsupported-queries"{% endif %}{% if dump_precomputes %},
-      "--dump-precomputes"{% endif %}
-    ]
-    extra_hosts:
-      - "kafka:{{ kafka_host }}"
-      - "prometheus:{{ prometheus_host }}"
-    restart: no
diff --git a/data_plane/examples/audit_clickhouse_fallback.rs b/data_plane/examples/audit_clickhouse_fallback.rs
deleted file mode 100644
index 02e2f085e..000000000
--- a/data_plane/examples/audit_clickhouse_fallback.rs
+++ /dev/null
@@ -1,200 +0,0 @@
-use axum::{
-    body::Bytes,
-    http::{HeaderMap, Method},
-};
-use control_plane::{
-    physical::compiler::{PlanEnvelope, PrecomputePlan, BACKEND_COMPAT, PLANNER_REVISION},
-    query_plan::{ClickHousePlanningContext, QueryPlan},
-};
-use data_plane::{
-    drivers::query::servers::http::{validate_and_build_runtime_plan, PhysicalPlanInstallRequest},
-    query_engines::asap_clickhouse_query_engine::{
-        accelerator::CatalogClickHouseAccelerator, ClickHouseAccelerationOutcome,
-        ClickHouseAccelerator, ClickHouseHttpFallback, ClickHouseHttpServer,
-    },
-    storage_engines::{
-        sketch_db::index::SketchStore,
-        types::{ActivePhysicalPlanHandle, BackendStorageRouting},
-    },
-};
-use planner_types::{
-    pre_asap::{Column, DataType, Schema},
-    types::AccuracyTarget,
-};
-use serde::Deserialize;
-use serde_json::json;
-use std::{
-    collections::{BTreeMap, HashMap},
-    fs,
-    path::PathBuf,
-    sync::Arc,
-};
-
-#[derive(Deserialize)]
-struct Corpus {
-    queries: Vec<Row>,
-}
-
-#[derive(Deserialize)]
-struct Row {
-    id: String,
-    clickhouse_sql: Option<String>,
-}
-
-#[tokio::main]
-async fn main() {
-    let path = std::env::args_os()
-        .nth(1)
-        .map(PathBuf::from)
-        .expect("usage: audit_clickhouse_fallback CORPUS.json");
-    let corpus: Corpus = serde_json::from_slice(&fs::read(path).unwrap()).unwrap();
-    let schema = Schema::with_time_index(
-        vec![
-            Column::new("metric", DataType::Utf8, false),
-            Column::new("labels", DataType::Utf8, false),
-            Column::new("ts_ms", DataType::Timestamp, false),
-            Column::new("value", DataType::Float64, false),
-        ],
-        2,
-        vec![],
-    );
-    let envelope = PlanEnvelope {
-        plan_id: 27,
-        plan_version: 1,
-        generated_at_unix_ms: 1_788_891_296_000,
-        activation_unix_ms: 1_788_891_296_000,
-        expiry_unix_ms: None,
-        backend_compat: BACKEND_COMPAT.into(),
-        planner_revision: PLANNER_REVISION.into(),
-        capability_snapshot_id: "sql27-main-eval".into(),
-    };
-    let catalog =
-        asap_types::summary_catalog::SummaryCatalog::from_materializations(27, 1, &[]).unwrap();
-    let reference = catalog.reference().unwrap();
-    let mut precompute_plan =
-        PrecomputePlan::build_backend_local(envelope.clone(), vec![]).unwrap();
-    precompute_plan.bind_catalog(&catalog).unwrap();
-    let mut transmission_plan = control_plane::physical::compiler::build_transmission_plan(
-        envelope,
-        &precompute_plan,
-        &BTreeMap::new(),
-    )
-    .unwrap();
-    transmission_plan.summary_catalog = Some(reference);
-    let query_plan = QueryPlan {
-        plan_id: 27,
-        plan_version: 1,
-        clickhouse_context: Some(ClickHousePlanningContext {
-            window_templates: Default::default(),
-            tables: HashMap::from([("raw_samples".into(), schema)]),
-            accuracy: AccuracyTarget::Epsilon(0.01),
-        }),
-        selected_dags: Default::default(),
-        entries: BTreeMap::new(),
-    };
-    let active = validate_and_build_runtime_plan(
-        PhysicalPlanInstallRequest {
-            summary_catalog: catalog,
-            collector_plans: vec![],
-            precompute_plan,
-            transmission_plan,
-            query_plan,
-            storage_routing: None,
-            adaptation_evidence: vec![],
-        },
-        Arc::new(BackendStorageRouting::empty()),
-    )
-    .unwrap();
-    let exact_url =
-        std::env::var("CLICKHOUSE_URL").unwrap_or_else(|_| "http://127.0.0.1:18123".into());
-    let exact = Arc::new(ClickHouseHttpFallback::new(
-        exact_url.clone(),
-        std::env::var("CLICKHOUSE_DATABASE").unwrap_or_else(|_| "default".into()),
-    ));
-    let accelerator = Arc::new(CatalogClickHouseAccelerator::with_active_physical_plan(
-        Arc::new(SketchStore::new()),
-        ActivePhysicalPlanHandle::new(active),
-    ));
-    let listener = tokio::net::TcpListener::bind("127.0.0.1:0").await.unwrap();
-    let address = listener.local_addr().unwrap();
-    let app = ClickHouseHttpServer::router_with_accelerator(exact, accelerator.clone());
-    let server = tokio::spawn(async move { axum::serve(listener, app).await });
-    let client = reqwest::Client::new();
-    let mut rows = Vec::new();
-    for row in corpus.queries {
-        let sql = row
-            .clickhouse_sql
-            .unwrap_or_default()
-            .replace("{eval_ms}", "1788891296000");
-        let request = data_plane::query_engines::asap_clickhouse_query_engine::request::ClickHouseQueryRequest {
-            method: Method::GET,
-            sql,
-            body: Bytes::new(),
-            parameters: BTreeMap::new(),
-            headers: HeaderMap::new(),
-        };
-        let acceleration = accelerator.execute(&request).await;
-        let mut outbound = client
-            .post(format!("http://{address}/"))
-            .body(request.sql.clone());
-        if let Ok(user) = std::env::var("CLICKHOUSE_USER") {
-            outbound = outbound.header("x-clickhouse-user", user);
-        }
-        if let Ok(password) = std::env::var("CLICKHOUSE_PASSWORD") {
-            outbound = outbound.header("x-clickhouse-key", password);
-        }
-        let response = outbound.send().await.unwrap();
-        let status = response.status().as_u16();
-        let headers = response.headers().clone();
-        let body = response.text().await.unwrap();
-        let mut direct = client.post(&exact_url).body(request.sql.clone());
-        if let Ok(user) = std::env::var("CLICKHOUSE_USER") {
-            direct = direct.header("x-clickhouse-user", user);
-        }
-        if let Ok(password) = std::env::var("CLICKHOUSE_PASSWORD") {
-            direct = direct.header("x-clickhouse-key", password);
-        }
-        let direct = direct.send().await.unwrap();
-        let direct_status = direct.status().as_u16();
-        let direct_body = direct.text().await.unwrap();
-        let matches_direct_exact = status == direct_status && body == direct_body;
-        rows.push(match acceleration {
-            ClickHouseAccelerationOutcome::Fallback(reason) => json!({
-                "id": row.id,
-                "fallback_requested": true,
-                "acceleration_reason": format!("{reason:?}"),
-                "exact_executed": status != 502,
-                "exact_success": (200..300).contains(&status) && matches_direct_exact,
-                "exact_status": status,
-                "direct_exact_status": direct_status,
-                "matches_direct_exact": matches_direct_exact,
-                "clickhouse_summary": headers.get("x-clickhouse-summary").and_then(|v| v.to_str().ok()),
-                "clickhouse_exception_code": headers.get("x-clickhouse-exception-code").and_then(|v| v.to_str().ok()),
-                "result": body,
-            }),
-            ClickHouseAccelerationOutcome::Failed(error) => json!({
-                "id": row.id,
-                "fallback_requested": false,
-                "exact_executed": false,
-                "exact_success": false,
-                "execution_error": error.to_string(),
-                "result": body,
-            }),
-            ClickHouseAccelerationOutcome::Accelerated(_) => json!({
-                "id": row.id,
-                "fallback_requested": false,
-                "exact_executed": false,
-                "exact_success": false,
-                "exact_status": null,
-                "direct_exact_status": direct_status,
-                "matches_direct_exact": false,
-                "result": body,
-            }),
-        });
-    }
-    println!(
-        "{}",
-        serde_json::to_string_pretty(&json!({"queries": rows})).unwrap()
-    );
-    server.abort();
-}
diff --git a/data_plane/examples/autosketch_comparison.rs b/data_plane/examples/autosketch_comparison.rs
deleted file mode 100644
index 598e89e4d..000000000
--- a/data_plane/examples/autosketch_comparison.rs
+++ /dev/null
@@ -1,823 +0,0 @@
-//! Memory-constrained frequency-sketch selection; not a whole-system benchmark.
-use asap_aware_mapping::erp::{
-    AccuracyMode, ErpArtifact, ErpRecord, ErpResourceProfile, ErpSelectionRequest,
-    ERP_SCHEMA_VERSION,
-};
-use asap_sketchlib::{Bloom, CountMinSketch, CountSketch, DataInput, DefaultXxHasher, RegularPath};
-use clap::{Parser, ValueEnum};
-use serde::Serialize;
-use std::{
-    collections::{BTreeMap, BTreeSet, VecDeque},
-    time::Instant,
-};
-
-type MembershipBloom = Bloom<RegularPath, DefaultXxHasher>;
-
-#[derive(Parser, Debug, Serialize)]
-struct Args {
-    /// New JSON artifact path; existing files are never overwritten.
-    #[arg(long)]
-    output: std::path::PathBuf,
-    #[arg(long, default_value_t = 10000)]
-    events: usize,
-    /// Optional `pane_index<TAB>dense_key_index` trace. The first half is
-    /// calibration and the second half is held out from configuration search.
-    #[arg(long)]
-    input_tsv: Option<std::path::PathBuf>,
-    #[arg(long, default_value_t = 1000)]
-    cardinality: usize,
-    #[arg(long, default_value_t = 10)]
-    runs: u64,
-    #[arg(long, default_value_t = 42)]
-    seed: u64,
-    #[arg(long, default_value_t = 0.01)]
-    epsilon: f64,
-    /// Query semantics determine which sketch families are legal.
-    #[arg(long, value_enum, default_value = "frequency")]
-    query: Query,
-    /// Zero is uniform; positive values generate a truncated Zipf distribution.
-    #[arg(long, default_value_t = 0.0)]
-    zipf: f64,
-    /// Required provenance, obtained with git rev-parse HEAD.
-    #[arg(long)]
-    backend_revision: String,
-    /// Hard cap on resident f64 counter payload per selected sketch (not RSS).
-    #[arg(long, default_value_t = 32768)]
-    memory_budget_bytes: usize,
-    #[arg(
-        long,
-        value_enum,
-        value_delimiter = ',',
-        default_value = "cms,count-sketch,bloom"
-    )]
-    sketches: Vec<Family>,
-}
-
-#[derive(Clone, Copy, Debug, PartialEq, Eq, PartialOrd, Ord, Serialize, ValueEnum)]
-#[serde(rename_all = "snake_case")]
-enum Family {
-    Cms,
-    CountSketch,
-    Bloom,
-}
-impl Family {
-    fn name(self) -> &'static str {
-        match self {
-            Self::Cms => "cms",
-            Self::CountSketch => "count_sketch",
-            Self::Bloom => "bloom",
-        }
-    }
-
-    fn supports(self, query: Query) -> bool {
-        matches!(
-            (self, query),
-            (Self::Cms | Self::CountSketch, Query::Frequency) | (Self::Bloom, Query::Membership)
-        )
-    }
-}
-
-#[derive(Clone, Copy, Debug, PartialEq, Eq, Serialize, ValueEnum)]
-#[serde(rename_all = "snake_case")]
-enum Query {
-    Frequency,
-    Membership,
-}
-impl Query {
-    fn error_metric(self) -> &'static str {
-        match self {
-            Self::Frequency => "max_normalized_additive_error",
-            Self::Membership => "false_positive_rate",
-        }
-    }
-}
-
-#[derive(Clone, Copy, Debug, PartialEq, Eq, PartialOrd, Ord, Serialize)]
-struct Config {
-    family: Family,
-    width: usize,
-    depth: usize,
-}
-impl Config {
-    fn bytes(self) -> usize {
-        match self.family {
-            Family::Cms | Family::CountSketch => {
-                self.width * self.depth * std::mem::size_of::<f64>()
-            }
-            Family::Bloom => {
-                MembershipBloom::with_dimensions(self.depth, self.width).size_in_bytes()
-            }
-        }
-    }
-    fn id(self) -> String {
-        format!("{}-{:05}-{:02}", self.family.name(), self.width, self.depth)
-    }
-    fn legal(self) -> bool {
-        // CMS selects Packed64/128/Rows automatically; portable CountSketch
-        // hardcodes Packed64 and needs room for every column/sign bit.
-        self.family == Family::Cms || self.depth * (self.width.ilog2() as usize + 1) <= 64
-    }
-}
-
-fn grid() -> Vec<Config> {
-    (0..7)
-        .flat_map(|i| {
-            (1..=8).map(move |depth| Config {
-                family: Family::Cms,
-                width: 64 << i,
-                depth,
-            })
-        })
-        .collect()
-}
-
-fn candidate_grid(families: &[Family], query: Query, budget: usize) -> Vec<Config> {
-    families
-        .iter()
-        .flat_map(|&family| grid().into_iter().map(move |c| Config { family, ..c }))
-        .filter(|c| c.family.supports(query) && c.legal() && c.bytes() <= budget)
-        .collect::<BTreeSet<_>>()
-        .into_iter()
-        .collect()
-}
-
-// Small deterministic PRNG for workload sampling and LHS permutations. CMS
-// itself uses the library's fixed hash implementation, not this seed.
-struct Rng(u64);
-impl Rng {
-    fn next(&mut self) -> u64 {
-        self.0 = self.0.wrapping_add(0x9e3779b97f4a7c15);
-        let mut x = self.0;
-        x = (x ^ (x >> 30)).wrapping_mul(0xbf58476d1ce4e5b9);
-        x = (x ^ (x >> 27)).wrapping_mul(0x94d049bb133111eb);
-        x ^ (x >> 31)
-    }
-    fn shuffle<T>(&mut self, values: &mut [T]) {
-        for i in (1..values.len()).rev() {
-            values.swap(i, self.next() as usize % (i + 1));
-        }
-    }
-}
-
-fn stream(events: usize, cardinality: usize, zipf: f64, seed: u64) -> Vec<usize> {
-    let mut cumulative = Vec::with_capacity(cardinality);
-    let mut sum = 0.0;
-    for i in 1..=cardinality {
-        sum += (i as f64).powf(-zipf);
-        cumulative.push(sum);
-    }
-    let mut rng = Rng(seed);
-    (0..events)
-        .map(|_| {
-            let u = (rng.next() >> 11) as f64 / ((1_u64 << 53) as f64) * sum;
-            cumulative.partition_point(|v| *v <= u).min(cardinality - 1)
-        })
-        .collect()
-}
-
-fn trace_split(path: &std::path::Path) -> Result<(Vec<usize>, Vec<usize>, usize), String> {
-    let contents = std::fs::read_to_string(path).map_err(|error| error.to_string())?;
-    let mut values = Vec::new();
-    let mut max_key = 0;
-    for (line, row) in contents.lines().enumerate() {
-        let (_, key) = row
-            .split_once('\t')
-            .ok_or_else(|| format!("invalid trace TSV at line {}", line + 1))?;
-        let key: usize = key
-            .parse()
-            .map_err(|error| format!("line {}: {error}", line + 1))?;
-        max_key = max_key.max(key);
-        values.push(key);
-    }
-    if values.len() < 2 {
-        return Err("trace needs at least two events".into());
-    }
-    let held_out = values.split_off(values.len() / 2);
-    Ok((values, held_out, max_key + 1))
-}
-
-#[derive(Debug, Serialize)]
-struct Measurement {
-    config: Config,
-    error: f64,
-    payload_bytes: usize,
-    update_wall_seconds: f64,
-    query_wall_seconds: f64,
-}
-
-fn measure(config: Config, query: Query, data: &[usize], keys: &[String]) -> Measurement {
-    assert!(!data.is_empty());
-    let mut exact = vec![0_u64; keys.len()];
-    for &key in data {
-        exact[key] += 1;
-    }
-    assert!(config.legal());
-    let mut cms =
-        (config.family == Family::Cms).then(|| CountMinSketch::new(config.depth, config.width));
-    let mut cs = (config.family == Family::CountSketch)
-        .then(|| CountSketch::new(config.depth, config.width));
-    let mut bloom: Option<MembershipBloom> = (config.family == Family::Bloom)
-        .then(|| Bloom::with_dimensions(config.depth, config.width));
-    let started = Instant::now();
-    for &key in data {
-        match (&mut cms, &mut cs, &mut bloom) {
-            (Some(sketch), _, _) => sketch.update(&keys[key], 1.0),
-            (_, Some(sketch), _) => sketch.update(&keys[key], 1.0),
-            (_, _, Some(sketch)) => sketch.insert(&DataInput::U64(key as u64)),
-            _ => unreachable!(),
-        }
-    }
-    let update_wall_seconds = started.elapsed().as_secs_f64();
-    let started = Instant::now();
-    let error = match query {
-        Query::Frequency => keys
-            .iter()
-            .zip(exact)
-            .map(|(key, truth)| {
-                let estimate = match (&cms, &cs) {
-                    (Some(sketch), _) => sketch.estimate(key),
-                    (_, Some(sketch)) => sketch.estimate(key),
-                    _ => unreachable!(),
-                };
-                assert!(estimate.is_finite());
-                (estimate - truth as f64).abs() / data.len() as f64
-            })
-            .fold(0.0_f64, f64::max),
-        Query::Membership => {
-            let sketch = bloom.as_ref().expect("membership requires Bloom");
-            assert!(data
-                .iter()
-                .all(|key| sketch.contains(&DataInput::U64(*key as u64))));
-            let false_positives = (keys.len()..keys.len() * 2)
-                .filter(|key| sketch.contains(&DataInput::U64(*key as u64)))
-                .count();
-            false_positives as f64 / keys.len() as f64
-        }
-    };
-    let query_wall_seconds = started.elapsed().as_secs_f64();
-    Measurement {
-        config,
-        error,
-        payload_bytes: config.bytes(),
-        update_wall_seconds,
-        query_wall_seconds,
-    }
-}
-
-fn lhs(seed: u64) -> Vec<Config> {
-    let mut rng = Rng(seed);
-    let mut widths: Vec<_> = (0..7).collect();
-    let mut depths: Vec<_> = (1..=8).collect();
-    rng.shuffle(&mut widths);
-    rng.shuffle(&mut depths);
-    widths
-        .into_iter()
-        .zip(depths)
-        .map(|(w, depth)| Config {
-            family: Family::Cms,
-            width: 64 << w,
-            depth,
-        })
-        .collect()
-}
-
-#[derive(Debug, Serialize)]
-struct Search {
-    selected: Option<Config>,
-    visited: Vec<Config>,
-    selection_wall_seconds: f64,
-}
-
-// Discrete software adaptation of Algorithm 4: depth +/-1, width x2 or /2.
-// Each LHS path stops after crossing feasibility; duplicate evaluations are
-// cached. Pruned feasible nodes may still lead to cheaper neighbors.
-#[cfg(test)]
-fn search(seed: u64, epsilon: f64, evaluate: impl FnMut(Config) -> f64) -> Search {
-    search_candidates(
-        seed,
-        epsilon,
-        &candidate_grid(&[Family::Cms], Query::Frequency, usize::MAX),
-        evaluate,
-    )
-}
-
-fn search_candidates(
-    seed: u64,
-    epsilon: f64,
-    candidates: &[Config],
-    mut evaluate: impl FnMut(Config) -> f64,
-) -> Search {
-    let started = Instant::now();
-    let families: BTreeSet<_> = candidates.iter().map(|c| c.family).collect();
-    let mut pending = VecDeque::new();
-    for family in families {
-        for point in lhs(seed) {
-            let c = Config { family, ..point };
-            if candidates.contains(&c) {
-                pending.push_back((c, None));
-            }
-        }
-        // A tight budget can exclude every LHS point. Keep a legal seed for
-        // every family rather than silently removing it from sketch selection.
-        if let Some(&minimum) = candidates
-            .iter()
-            .filter(|c| c.family == family)
-            .min_by_key(|c| (c.bytes(), **c))
-        {
-            pending.push_back((minimum, None));
-        }
-    }
-    let mut expanded = BTreeSet::new();
-    let mut cache = BTreeMap::new();
-    let mut visited = Vec::new();
-    let mut best: Option<Config> = None;
-    while let Some((c, initial_feasible)) = pending.pop_front() {
-        if !expanded.insert((c, initial_feasible)) {
-            continue;
-        }
-        let error = *cache.entry(c).or_insert_with(|| {
-            visited.push(c);
-            evaluate(c)
-        });
-        let feasible = error.is_finite() && error <= epsilon;
-        if feasible && best.is_none_or(|b| (c.bytes(), c) < (b.bytes(), b)) {
-            best = Some(c);
-        }
-        let direction = initial_feasible.unwrap_or(feasible);
-        if direction != feasible {
-            continue;
-        }
-        if !feasible && best.is_some_and(|b| c.bytes() >= b.bytes()) {
-            continue;
-        }
-        let neighbors = if feasible {
-            [
-                c.width
-                    .checked_div(2)
-                    .filter(|w| *w >= 64)
-                    .map(|width| Config { width, ..c }),
-                c.depth
-                    .checked_sub(1)
-                    .filter(|d| *d >= 1)
-                    .map(|depth| Config { depth, ..c }),
-            ]
-        } else {
-            [
-                (c.width < 4096).then_some(Config {
-                    width: c.width * 2,
-                    ..c
-                }),
-                (c.depth < 8).then_some(Config {
-                    depth: c.depth + 1,
-                    ..c
-                }),
-            ]
-        };
-        for next in neighbors.into_iter().flatten() {
-            if candidates.contains(&next) {
-                pending.push_back((next, Some(direction)));
-            }
-        }
-    }
-    Search {
-        selected: best,
-        visited,
-        selection_wall_seconds: started.elapsed().as_secs_f64(),
-    }
-}
-
-fn oracle(rows: &[Measurement], epsilon: f64) -> Option<Config> {
-    rows.iter()
-        .filter(|m| m.error <= epsilon)
-        .map(|m| m.config)
-        .min_by_key(|c| (c.bytes(), *c))
-}
-
-fn artifact(
-    rows: &[Measurement],
-    distribution: serde_json::Value,
-    revision: &str,
-    query: Query,
-) -> ErpArtifact {
-    ErpArtifact {
-        schema_version: ERP_SCHEMA_VERSION,
-        producer_version: revision.into(),
-        records: rows
-            .iter()
-            .map(|m| ErpRecord {
-                id: m.config.id(),
-                sketch: m.config.family.name().into(),
-                implementation: "asap_sketchlib-portable".into(),
-                parameters: serde_json::json!({"width":m.config.width,"depth":m.config.depth}),
-                distribution: distribution.clone(),
-                trials: 1,
-                error_metrics: BTreeMap::from([(query.error_metric().into(), m.error)]),
-                // Memory-only experiment. Timings are wall measurements, not CPU
-                // profiles: deliberately do not mislabel them as ERP CPU evidence.
-                resources: ErpResourceProfile {
-                    memory_bytes: m.payload_bytes as f64,
-                    update_cpu_seconds: 0.0,
-                    query_cpu_seconds: 0.0,
-                    merge_cpu_seconds: 0.0,
-                },
-            })
-            .collect(),
-    }
-}
-
-fn erp_select(
-    profile: &ErpArtifact,
-    distribution: serde_json::Value,
-    epsilon: f64,
-    query: Query,
-) -> Option<Config> {
-    let request = ErpSelectionRequest {
-        distribution,
-        implementation: Some("asap_sketchlib-portable".into()),
-        allowed_sketches: match query {
-            Query::Frequency => vec!["cms".into(), "count_sketch".into()],
-            Query::Membership => vec!["bloom".into()],
-        },
-        error_metric: query.error_metric().into(),
-        max_error: epsilon,
-        min_trials: 1,
-        expected_updates: 0.0,
-        expected_queries: 0.0,
-        expected_merges: 0.0,
-        retention_seconds: 1.0,
-        cpu_weight: 0.0,
-        byte_second_weight: 1.0,
-        mode: AccuracyMode::Empirical,
-    };
-    match profile.select(&request) {
-        Ok(point) => Some(Config {
-            family: match point.record.sketch.as_str() {
-                "cms" => Family::Cms,
-                "count_sketch" => Family::CountSketch,
-                "bloom" => Family::Bloom,
-                _ => panic!("unknown family"),
-            },
-            width: point.record.parameters["width"].as_u64().unwrap() as usize,
-            depth: point.record.parameters["depth"].as_u64().unwrap() as usize,
-        }),
-        Err(asap_aware_mapping::erp::ErpError::NoApplicableConfiguration) => None,
-        Err(error) => panic!("invalid experiment profile: {error}"),
-    }
-}
-
-fn main() -> Result<(), Box<dyn std::error::Error>> {
-    let mut args = Args::parse();
-    let trace = args.input_tsv.as_deref().map(trace_split).transpose()?;
-    if let Some((calibration, _, cardinality)) = &trace {
-        args.events = calibration.len();
-        args.cardinality = *cardinality;
-    }
-    if args.events == 0
-        || args.cardinality == 0
-        || args.runs == 0
-        || !args.epsilon.is_finite()
-        || args.epsilon < 0.0
-        || !args.zipf.is_finite()
-        || args.zipf < 0.0
-        || args.backend_revision.trim().is_empty()
-    {
-        return Err("invalid experiment arguments".into());
-    }
-    // Fail before benchmarking if the destination already exists.
-    let output = std::fs::OpenOptions::new()
-        .write(true)
-        .create_new(true)
-        .open(&args.output)?;
-    let keys: Vec<_> = (0..args.cardinality).map(|i| format!("key-{i}")).collect();
-    let mut runs = Vec::new();
-    for run in 0..args.runs {
-        let calibration_seed = args.seed.wrapping_add(run.wrapping_mul(2));
-        let test_seed = calibration_seed.wrapping_add(1);
-        let calibration = trace.as_ref().map_or_else(
-            || stream(args.events, args.cardinality, args.zipf, calibration_seed),
-            |(calibration, _, _)| calibration.clone(),
-        );
-        let distribution = args.input_tsv.as_ref().map_or_else(
-            || serde_json::json!({"generator":"splitmix64-truncated-zipf-v1",
-                "events":args.events,"cardinality":args.cardinality,"zipf":args.zipf,"seed":calibration_seed}),
-            |path| serde_json::json!({"external":{"dataset":path.file_name().and_then(|name| name.to_str()).unwrap_or("trace.tsv"),
-                "split":"first_half_calibration"}}),
-        );
-        let start = Instant::now();
-        let mut candidates = candidate_grid(&args.sketches, args.query, args.memory_budget_bytes);
-        Rng(calibration_seed).shuffle(&mut candidates);
-        let rows: Vec<_> = candidates
-            .iter()
-            .copied()
-            .map(|c| measure(c, args.query, &calibration, &keys))
-            .collect();
-        let calibration_wall_seconds = start.elapsed().as_secs_f64();
-        let profile = artifact(
-            &rows,
-            distribution.clone(),
-            &args.backend_revision,
-            args.query,
-        );
-        let adapted = search_candidates(calibration_seed, args.epsilon, &candidates, |c| {
-            rows.iter().find(|m| m.config == c).unwrap().error
-        });
-        let start = Instant::now();
-        let erp = erp_select(&profile, distribution, args.epsilon, args.query);
-        let erp_selection_wall_seconds = start.elapsed().as_secs_f64();
-        let start = Instant::now();
-        let exhaustive = oracle(&rows, args.epsilon);
-        let oracle_selection_wall_seconds = start.elapsed().as_secs_f64();
-        assert_eq!(
-            erp, exhaustive,
-            "same-table ERP must match the finite-grid oracle"
-        );
-        // Test data is generated only after all configuration decisions are made.
-        let held_out = trace.as_ref().map_or_else(
-            || stream(args.events, args.cardinality, args.zipf, test_seed),
-            |(_, held_out, _)| held_out.clone(),
-        );
-        let mut outcomes = Vec::new();
-        for (name, selected) in [
-            ("autosketch_adapted", adapted.selected),
-            ("asapplanner_erp_selector", erp),
-            ("grid_oracle", exhaustive),
-        ] {
-            let measured = selected.map(|c| measure(c, args.query, &held_out, &keys));
-            let pass = measured.as_ref().map(|m| m.error <= args.epsilon);
-            outcomes.push(serde_json::json!({"method":name,"selected":selected,
-                "status":if selected.is_some(){"calibration_feasible"}else{"no_feasible_configuration"},
-                "held_out_pass":pass,"held_out":measured}));
-        }
-        runs.push(serde_json::json!({"run":run,"calibration_seed":calibration_seed,"test_seed":test_seed,
-            "calibration_wall_seconds":calibration_wall_seconds,"calibration_grid":rows,
-            "erp_artifact":profile,"search":adapted,"erp_selection_wall_seconds":erp_selection_wall_seconds,
-            "oracle_selection_wall_seconds":oracle_selection_wall_seconds,"outcomes":outcomes}));
-        eprintln!(
-            "run {run}: ERP={erp:?}, adapted={:?}, oracle={exhaustive:?}",
-            adapted.selected
-        );
-    }
-    serde_json::to_writer_pretty(
-        output,
-        &serde_json::json!({"schema_version":1,"args":args,
-        "debug_assertions":cfg!(debug_assertions),
-        "scope":"memory-constrained query-compatible sketch family and parameter selection; not full ASAPPlanner or system evaluation",
-        "memory_metric":"sketch payload bytes (f64 counters or packed Bloom bits); excludes allocator and object overhead",
-        "hash_seeds":"library fixed hash; only data/search seeds vary",
-        "timing_metric":"wall seconds, not CPU seconds; calibration cost reported separately",
-        "cargo_lock":include_str!("../../Cargo.lock"),"runs":runs}),
-    )?;
-    Ok(())
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    #[test]
-    fn trace_calibration_and_held_out_halves_do_not_overlap() {
-        let path =
-            std::env::temp_dir().join(format!("autosketch-trace-split-{}.tsv", std::process::id()));
-        std::fs::write(&path, "0\t0\n0\t1\n1\t2\n1\t3\n").unwrap();
-        let (calibration, held_out, cardinality) = trace_split(&path).unwrap();
-        std::fs::remove_file(path).unwrap();
-        assert_eq!(calibration, vec![0, 1]);
-        assert_eq!(held_out, vec![2, 3]);
-        assert_eq!(cardinality, 4);
-    }
-    #[test]
-    fn hard_budget_prunes_before_benchmark_and_empty_budget_fails_closed() {
-        for budget in [0, 511, 512, 2048] {
-            let candidates = candidate_grid(
-                &[Family::Cms, Family::CountSketch],
-                Query::Frequency,
-                budget,
-            );
-            let result = search_candidates(42, 0.01, &candidates, |c| {
-                assert!(c.bytes() <= budget);
-                assert!(c.legal());
-                0.0
-            });
-            assert_eq!(result.selected.is_none(), budget < 512);
-            assert_eq!(candidates.is_empty(), budget < 512);
-            let rows: Vec<_> = candidates
-                .into_iter()
-                .map(|config| Measurement {
-                    config,
-                    error: 0.0,
-                    payload_bytes: config.bytes(),
-                    update_wall_seconds: 0.0,
-                    query_wall_seconds: 0.0,
-                })
-                .collect();
-            let context = serde_json::json!({"test":"budget"});
-            let selected = erp_select(
-                &artifact(&rows, context.clone(), "test", Query::Frequency),
-                context,
-                0.01,
-                Query::Frequency,
-            );
-            assert_eq!(selected, oracle(&rows, 0.01));
-            assert_eq!(selected.is_none(), budget < 512);
-            assert!(selected.is_none_or(|c| c.bytes() <= budget));
-        }
-    }
-    #[test]
-    fn sketch_selection_can_choose_either_family() {
-        let candidates =
-            candidate_grid(&[Family::Cms, Family::CountSketch], Query::Frequency, 2048);
-        for preferred in [Family::Cms, Family::CountSketch] {
-            let rows: Vec<_> = candidates
-                .iter()
-                .map(|&config| Measurement {
-                    config,
-                    error: if config.family == preferred { 0.0 } else { 1.0 },
-                    payload_bytes: config.bytes(),
-                    update_wall_seconds: 0.0,
-                    query_wall_seconds: 0.0,
-                })
-                .collect();
-            let result = search_candidates(42, 0.01, &candidates, |c| {
-                rows.iter().find(|r| r.config == c).unwrap().error
-            });
-            let context = serde_json::json!({"test":"family"});
-            let selected = erp_select(
-                &artifact(&rows, context.clone(), "test", Query::Frequency),
-                context,
-                0.01,
-                Query::Frequency,
-            );
-            assert_eq!(result.selected.unwrap().family, preferred);
-            assert_eq!(selected.unwrap().family, preferred);
-            assert_eq!(selected, oracle(&rows, 0.01));
-        }
-    }
-    #[test]
-    fn query_semantics_filter_incompatible_families() {
-        let all = [Family::Cms, Family::CountSketch, Family::Bloom];
-        let frequency = candidate_grid(&all, Query::Frequency, usize::MAX);
-        let membership = candidate_grid(&all, Query::Membership, usize::MAX);
-        assert!(frequency.iter().all(|c| c.family != Family::Bloom));
-        assert!(membership.iter().all(|c| c.family == Family::Bloom));
-        assert!(!membership.is_empty());
-    }
-    #[test]
-    fn bloom_uses_sketchlib_packed_memory_and_has_no_false_negatives() {
-        let config = Config {
-            family: Family::Bloom,
-            width: 1024,
-            depth: 4,
-        };
-        let keys: Vec<_> = (0..100).map(|i| format!("key-{i}")).collect();
-        let data: Vec<_> = (0..100).collect();
-        let measured = measure(config, Query::Membership, &data, &keys);
-        let library_bytes =
-            MembershipBloom::with_dimensions(config.depth, config.width).size_in_bytes();
-        assert_eq!(measured.payload_bytes, library_bytes);
-        assert!((0.0..=1.0).contains(&measured.error));
-    }
-    #[test]
-    fn bloom_autosketch_erp_and_oracle_share_budget_and_fpp_target() {
-        let candidates = candidate_grid(&[Family::Bloom], Query::Membership, 1024);
-        let keys: Vec<_> = (0..200).map(|i| format!("key-{i}")).collect();
-        let data: Vec<_> = (0..200).collect();
-        let rows: Vec<_> = candidates
-            .iter()
-            .copied()
-            .map(|c| measure(c, Query::Membership, &data, &keys))
-            .collect();
-        let adapted = search_candidates(42, 0.05, &candidates, |c| {
-            rows.iter().find(|m| m.config == c).unwrap().error
-        });
-        let context = serde_json::json!({"test":"bloom"});
-        let profile = artifact(&rows, context.clone(), "test", Query::Membership);
-        let erp = erp_select(&profile, context, 0.05, Query::Membership);
-        assert_eq!(erp, oracle(&rows, 0.05));
-        assert!(adapted
-            .selected
-            .is_none_or(|c| { c.family == Family::Bloom && c.bytes() <= 1024 }));
-    }
-    #[test]
-    fn count_sketch_hash_limit_and_single_key_oracle() {
-        let candidates = candidate_grid(&[Family::CountSketch], Query::Frequency, usize::MAX);
-        assert!(candidates
-            .iter()
-            .all(|c| c.depth * (c.width.ilog2() as usize + 1) <= 64));
-        assert!(!candidates.contains(&Config {
-            family: Family::CountSketch,
-            width: 4096,
-            depth: 8
-        }));
-        for config in candidates {
-            assert_eq!(
-                measure(config, Query::Frequency, &[0; 100], &["only".into()]).error,
-                0.0
-            );
-        }
-    }
-    #[test]
-    fn lhs_has_unique_coordinates_and_is_reproducible() {
-        let sample = lhs(42);
-        assert_eq!(sample, lhs(42));
-        assert_eq!(
-            sample
-                .iter()
-                .map(|c| c.width)
-                .collect::<BTreeSet<_>>()
-                .len(),
-            7
-        );
-        assert_eq!(
-            sample
-                .iter()
-                .map(|c| c.depth)
-                .collect::<BTreeSet<_>>()
-                .len(),
-            7
-        );
-        assert!(sample.iter().all(|c| grid().contains(c)));
-    }
-    #[test]
-    fn search_deduplicates_and_stays_in_grid() {
-        let mut seen = BTreeSet::new();
-        let result = search(42, 0.01, |c| {
-            assert!(seen.insert(c));
-            assert!(grid().contains(&c));
-            1.0 / c.width as f64
-        });
-        assert!(result.selected.is_some());
-        assert!(result.visited.len() <= 56);
-    }
-    #[test]
-    fn all_feasible_reaches_smallest_state() {
-        assert_eq!(
-            search(42, 0.01, |_| 0.0).selected,
-            Some(Config {
-                family: Family::Cms,
-                width: 64,
-                depth: 1
-            })
-        );
-    }
-    #[test]
-    fn no_feasible_is_not_best_effort_success() {
-        assert_eq!(search(42, 0.01, |_| 1.0).selected, None);
-        assert_eq!(search(42, 0.01, |_| f64::NAN).selected, None);
-    }
-    #[test]
-    fn deterministic_streams_and_held_out_separation() {
-        assert_eq!(stream(100, 20, 1.2, 42), stream(100, 20, 1.2, 42));
-        assert_ne!(stream(100, 20, 1.2, 42), stream(100, 20, 1.2, 43));
-    }
-    #[test]
-    fn actual_cms_single_key_has_zero_error() {
-        let m = measure(
-            Config {
-                family: Family::Cms,
-                width: 64,
-                depth: 1,
-            },
-            Query::Frequency,
-            &[0; 100],
-            &["only".into()],
-        );
-        assert_eq!(m.error, 0.0);
-        assert_eq!(m.payload_bytes, 512);
-    }
-    #[test]
-    fn real_erp_matches_oracle_and_fails_closed_on_context_miss() {
-        let rows: Vec<_> = grid()
-            .into_iter()
-            .map(|config| Measurement {
-                config,
-                error: 1.0 / config.width as f64,
-                payload_bytes: config.bytes(),
-                update_wall_seconds: 0.0,
-                query_wall_seconds: 0.0,
-            })
-            .collect();
-        let distribution = serde_json::json!({"seed":42});
-        let profile = artifact(
-            &rows,
-            distribution.clone(),
-            "test-revision",
-            Query::Frequency,
-        );
-        assert_eq!(
-            erp_select(&profile, distribution.clone(), 0.01, Query::Frequency),
-            oracle(&rows, 0.01)
-        );
-        assert_eq!(
-            erp_select(
-                &profile,
-                serde_json::json!({"seed":43}),
-                0.01,
-                Query::Frequency,
-            ),
-            None
-        );
-        assert_eq!(
-            erp_select(&profile, distribution, 0.0, Query::Frequency),
-            None
-        );
-    }
-}
diff --git a/data_plane/examples/promql/streaming_config.yaml b/data_plane/examples/promql/streaming_config.yaml
deleted file mode 100644
index 03001c95b..000000000
--- a/data_plane/examples/promql/streaming_config.yaml
+++ /dev/null
@@ -1,20 +0,0 @@
-aggregations:
-- aggregationId: 1
-  aggregationType: DatasketchesKLL
-  aggregationSubType: ''
-  labels:
-    grouping: [label_0]
-    rollup: [instance, job, label_1]
-    aggregated: []
-  metric: fake_metric
-  parameters:
-    K: 20
-  windowSize: 1
-  windowType: tumbling
-  spatialFilter: ''
-metrics:
-  fake_metric:
-  - instance
-  - job
-  - label_0
-  - label_1
diff --git a/data_plane/examples/repeated_window_comparison.rs b/data_plane/examples/repeated_window_comparison.rs
deleted file mode 100644
index 5dca532bb..000000000
--- a/data_plane/examples/repeated_window_comparison.rs
+++ /dev/null
@@ -1,402 +0,0 @@
-//! Repeated-window execution comparison using the real ASAP CMS implementation.
-use asap_aware_mapping::replacement::default_size_params;
-use asap_sketchlib::CountMinSketch;
-use clap::Parser;
-use planner_types::{
-    post_asap::{SketchAlgorithm, SketchParams},
-    pre_asap::AggIntent,
-    types::AccuracyTarget,
-};
-use serde::Serialize;
-use std::{collections::VecDeque, hint::black_box, time::Instant};
-
-#[derive(Clone, Debug, Parser, Serialize)]
-struct Args {
-    #[arg(long)]
-    output: std::path::PathBuf,
-    #[arg(long)]
-    backend_revision: String,
-    /// Optional `pane_index<TAB>dense_key_index` replay file.
-    #[arg(long)]
-    input_tsv: Option<std::path::PathBuf>,
-    #[arg(long, default_value_t = 120)]
-    panes: usize,
-    #[arg(long, default_value_t = 2000)]
-    events_per_pane: usize,
-    #[arg(long, default_value_t = 1000)]
-    cardinality: usize,
-    /// Zero is uniform; positive values use a truncated Zipf distribution.
-    #[arg(long, default_value_t = 0.0)]
-    zipf: f64,
-    #[arg(long, default_value_t = 256)]
-    width: usize,
-    #[arg(long, default_value_t = 4)]
-    depth: usize,
-    /// Accuracy target passed to ASAPPlanner's analytical sizing baseline.
-    #[arg(long, default_value_t = 0.01)]
-    epsilon: f64,
-    #[arg(long, default_value_t = 0.01)]
-    delta: f64,
-    /// Common candidate-space payload limit per sketch.
-    #[arg(long, default_value_t = 32768)]
-    memory_budget_bytes: usize,
-    #[arg(long, default_value_t = 5)]
-    trials: usize,
-    /// Repeat all four end-of-stream queries to model recurring executions.
-    #[arg(long, default_value_t = 10)]
-    query_repetitions: usize,
-    #[arg(long, default_value_t = 42)]
-    seed: u64,
-    #[arg(long, value_delimiter = ',', default_value = "1,5,15,60")]
-    window_panes: Vec<usize>,
-    #[arg(long, default_value_t = 60)]
-    pane_seconds: usize,
-}
-
-struct Rng(u64);
-impl Rng {
-    fn next(&mut self) -> u64 {
-        self.0 = self.0.wrapping_add(0x9e3779b97f4a7c15);
-        let mut x = self.0;
-        x = (x ^ (x >> 30)).wrapping_mul(0xbf58476d1ce4e5b9);
-        x = (x ^ (x >> 27)).wrapping_mul(0x94d049bb133111eb);
-        x ^ (x >> 31)
-    }
-}
-
-fn workload(args: &Args, trial: usize) -> Vec<Vec<usize>> {
-    let mut rng = Rng(args.seed.wrapping_add(trial as u64));
-    let mut cumulative = Vec::with_capacity(args.cardinality);
-    let mut total = 0.0;
-    for rank in 1..=args.cardinality {
-        total += (rank as f64).powf(-args.zipf);
-        cumulative.push(total);
-    }
-    (0..args.panes)
-        .map(|_| {
-            (0..args.events_per_pane)
-                .map(|_| {
-                    let sample = (rng.next() >> 11) as f64 / ((1_u64 << 53) as f64) * total;
-                    cumulative
-                        .partition_point(|value| *value <= sample)
-                        .min(args.cardinality - 1)
-                })
-                .collect()
-        })
-        .collect()
-}
-
-#[allow(clippy::type_complexity)]
-fn replay(path: &std::path::Path) -> Result<(Vec<Vec<usize>>, usize), Box<dyn std::error::Error>> {
-    let contents = std::fs::read_to_string(path)?;
-    let mut rows = Vec::new();
-    let mut max_pane = 0;
-    let mut max_key = 0;
-    for (line_number, line) in contents.lines().enumerate() {
-        let (pane, key) = line
-            .split_once('\t')
-            .ok_or_else(|| format!("invalid TSV at line {}", line_number + 1))?;
-        let pane: usize = pane.parse()?;
-        let key: usize = key.parse()?;
-        max_pane = max_pane.max(pane);
-        max_key = max_key.max(key);
-        rows.push((pane, key));
-    }
-    if rows.is_empty() {
-        return Err("empty replay input".into());
-    }
-    let mut panes = vec![Vec::new(); max_pane + 1];
-    for (pane, key) in rows {
-        panes[pane].push(key);
-    }
-    Ok((panes, max_key + 1))
-}
-
-#[derive(Debug, Serialize)]
-struct ResultRow {
-    method: &'static str,
-    update_wall_seconds: f64,
-    query_wall_seconds: f64,
-    maintenance_updates: usize,
-    retained_sketches: usize,
-    logical_payload_bytes: usize,
-    max_normalized_additive_error: f64,
-}
-
-fn truth(data: &[Vec<usize>], window: usize, cardinality: usize) -> Vec<u64> {
-    let mut counts = vec![0; cardinality];
-    for pane in data.iter().rev().take(window) {
-        for &key in pane {
-            counts[key] += 1;
-        }
-    }
-    counts
-}
-
-fn evaluate(
-    method: &'static str,
-    states: &[VecDeque<CountMinSketch>],
-    data: &[Vec<usize>],
-    args: &Args,
-    update_wall_seconds: f64,
-    maintenance_updates: usize,
-) -> ResultRow {
-    let started = Instant::now();
-    let mut max_error = 0.0_f64;
-    for _ in 0..args.query_repetitions {
-        for (query, &window) in args.window_panes.iter().enumerate() {
-            let exact = truth(data, window, args.cardinality);
-            let denominator = exact.iter().sum::<u64>().max(1) as f64;
-            for (key, exact) in exact.into_iter().enumerate() {
-                let name = format!("key-{key}");
-                let estimate: f64 = states[query].iter().map(|s| s.estimate(&name)).sum();
-                max_error = max_error.max((estimate - exact as f64).abs() / denominator);
-                black_box(estimate);
-            }
-        }
-    }
-    let retained_sketches = states.iter().map(VecDeque::len).sum();
-    ResultRow {
-        method,
-        update_wall_seconds,
-        query_wall_seconds: started.elapsed().as_secs_f64(),
-        maintenance_updates,
-        retained_sketches,
-        logical_payload_bytes: retained_sketches * args.width * args.depth * 8,
-        max_normalized_additive_error: max_error,
-    }
-}
-
-fn per_query(method: &'static str, data: &[Vec<usize>], args: &Args) -> ResultRow {
-    let mut states: Vec<VecDeque<CountMinSketch>> =
-        args.window_panes.iter().map(|_| VecDeque::new()).collect();
-    let started = Instant::now();
-    for pane in data {
-        for (query, &retention) in args.window_panes.iter().enumerate() {
-            let mut sketch = CountMinSketch::new(args.depth, args.width);
-            for &key in pane {
-                sketch.update(&format!("key-{key}"), 1.0);
-            }
-            states[query].push_back(sketch);
-            if states[query].len() > retention {
-                states[query].pop_front();
-            }
-        }
-    }
-    evaluate(
-        method,
-        &states,
-        data,
-        args,
-        started.elapsed().as_secs_f64(),
-        data.iter().map(Vec::len).sum::<usize>() * args.window_panes.len(),
-    )
-}
-
-fn shared(method: &'static str, data: &[Vec<usize>], args: &Args) -> ResultRow {
-    let mut panes = VecDeque::new();
-    let started = Instant::now();
-    for pane in data {
-        let mut sketch = CountMinSketch::new(args.depth, args.width);
-        for &key in pane {
-            sketch.update(&format!("key-{key}"), 1.0);
-        }
-        panes.push_back(sketch);
-        if panes.len() > *args.window_panes.last().unwrap() {
-            panes.pop_front();
-        }
-    }
-    let update = started.elapsed().as_secs_f64();
-    let states: Vec<VecDeque<CountMinSketch>> = args
-        .window_panes
-        .iter()
-        .map(|&window| panes.iter().rev().take(window).rev().cloned().collect())
-        .collect();
-    // Report physical shared storage, not the temporary query views above.
-    let mut row = evaluate(
-        method,
-        &states,
-        data,
-        args,
-        update,
-        data.iter().map(Vec::len).sum(),
-    );
-    row.retained_sketches = panes.len();
-    row.logical_payload_bytes = panes.len() * args.width * args.depth * 8;
-    row
-}
-
-fn analytical_args(args: &Args) -> Result<Args, Box<dyn std::error::Error>> {
-    let intent = AggIntent::Count {
-        accuracy: AccuracyTarget::EpsilonDelta {
-            epsilon: args.epsilon,
-            delta: args.delta,
-        },
-    };
-    let SketchParams::Cms { width, depth } =
-        default_size_params(SketchAlgorithm::Cms, &intent, args.epsilon, args.delta)
-    else {
-        unreachable!("CMS analytical sizing must return CMS parameters")
-    };
-    // The comparison uses the same power-of-two width/depth grid as the
-    // AutoSketch adaptation. Round theory upward so its guarantee is not weakened.
-    let mut analytical = args.clone();
-    analytical.width = usize::try_from(width)?.max(64).next_power_of_two();
-    analytical.depth = usize::try_from(depth)?;
-    if analytical.width * analytical.depth * 8 > args.memory_budget_bytes {
-        return Err("ASAPPlanner analytical CMS exceeds the common memory budget".into());
-    }
-    Ok(analytical)
-}
-
-fn exact(data: &[Vec<usize>], args: &Args) -> ResultRow {
-    let started = Instant::now();
-    let retained: Vec<_> = data
-        .iter()
-        .rev()
-        .take(*args.window_panes.last().unwrap())
-        .rev()
-        .flatten()
-        .copied()
-        .collect();
-    let update = started.elapsed().as_secs_f64();
-    let started = Instant::now();
-    for _ in 0..args.query_repetitions {
-        for &window in &args.window_panes {
-            black_box(truth(data, window, args.cardinality));
-        }
-    }
-    ResultRow {
-        method: "exact_raw",
-        update_wall_seconds: update,
-        query_wall_seconds: started.elapsed().as_secs_f64(),
-        maintenance_updates: data.iter().map(Vec::len).sum(),
-        retained_sketches: 0,
-        logical_payload_bytes: retained.len() * std::mem::size_of::<usize>(),
-        max_normalized_additive_error: 0.0,
-    }
-}
-
-fn main() -> Result<(), Box<dyn std::error::Error>> {
-    let mut args = Args::parse();
-    let replayed = match &args.input_tsv {
-        Some(path) => {
-            let (data, cardinality) = replay(path)?;
-            args.panes = data.len();
-            args.cardinality = cardinality;
-            Some(data)
-        }
-        None => None,
-    };
-    if args.window_panes.is_empty()
-        || args.window_panes.contains(&0)
-        || !args.window_panes.windows(2).all(|pair| pair[0] < pair[1])
-        || args.panes < *args.window_panes.last().unwrap()
-        || (args.input_tsv.is_none() && (args.events_per_pane == 0 || args.cardinality == 0))
-        || args.width == 0
-        || args.depth == 0
-        || !args.zipf.is_finite()
-        || args.zipf < 0.0
-        || !args.epsilon.is_finite()
-        || args.epsilon <= 0.0
-        || !args.delta.is_finite()
-        || args.delta <= 0.0
-        || args.delta >= 1.0
-        || args.width * args.depth * 8 > args.memory_budget_bytes
-        || args.trials == 0
-        || args.query_repetitions == 0
-        || args.backend_revision.trim().is_empty()
-    {
-        return Err("invalid arguments (panes must cover increasing non-zero windows)".into());
-    }
-    let output = std::fs::OpenOptions::new()
-        .write(true)
-        .create_new(true)
-        .open(&args.output)?;
-    let mut trials = Vec::new();
-    for trial in 0..args.trials {
-        let data = match &replayed {
-            Some(data) => data.clone(),
-            None => workload(&args, trial),
-        };
-        if data.len() < *args.window_panes.last().unwrap() {
-            return Err("replay does not cover the largest window".into());
-        }
-        let analytical = analytical_args(&args)?;
-        let rows = vec![
-            per_query("autosketch_per_query", &data, &args),
-            per_query("asap_no_sharing", &data, &args),
-            shared("asapplanner_erp", &data, &args),
-            shared("asapplanner_analytical", &data, &analytical),
-            exact(&data, &args),
-        ];
-        eprintln!("trial {trial} complete");
-        trials.push(serde_json::json!({"trial":trial,"methods":rows}));
-    }
-    serde_json::to_writer_pretty(
-        output,
-        &serde_json::json!({
-            "schema_version":1,"windows_minutes":args.window_panes.iter().map(|window| window * args.pane_seconds / 60).collect::<Vec<_>>(),
-            "pane_seconds":args.pane_seconds,"args":args,
-            "timing_metric":"wall seconds; methods execute sequentially and are not CPU profiles",
-            "memory_metric":"logical retained payload; CMS counters or raw usize keys; excludes allocator overhead",
-            "adaptation":"AutoSketch is deployed independently per recurring query; width/depth are selected by the companion Rust AutoSketch/ERP calibration runner; ASAP-NoSharing isolates sharing; ASAPPlanner-ERP shares panes; ASAPPlanner-Analytical calls Planner default_size_params and rounds upward to the common candidate grid",
-            "trials":trials
-        }),
-    )?;
-    Ok(())
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    fn args() -> Args {
-        Args {
-            output: "unused".into(),
-            backend_revision: "test".into(),
-            input_tsv: None,
-            panes: 60,
-            events_per_pane: 10,
-            cardinality: 20,
-            zipf: 0.0,
-            width: 64,
-            depth: 2,
-            epsilon: 0.01,
-            delta: 0.01,
-            memory_budget_bytes: 32768,
-            trials: 1,
-            query_repetitions: 2,
-            seed: 42,
-            window_panes: vec![1, 5, 15, 60],
-            pane_seconds: 60,
-        }
-    }
-    #[test]
-    fn sharing_reduces_updates_and_storage_without_changing_answers() {
-        let args = args();
-        let data = workload(&args, 0);
-        let per = per_query("autosketch_per_query", &data, &args);
-        let full = shared("asapplanner_erp", &data, &args);
-        assert_eq!(per.maintenance_updates, full.maintenance_updates * 4);
-        assert_eq!(per.retained_sketches, 81);
-        assert_eq!(full.retained_sketches, 60);
-        assert_eq!(
-            per.max_normalized_additive_error,
-            full.max_normalized_additive_error
-        );
-    }
-
-    #[test]
-    fn replay_preserves_empty_panes_and_derives_cardinality() {
-        let path = std::env::temp_dir().join(format!(
-            "asap-replay-{}-{}.tsv",
-            std::process::id(),
-            std::thread::current().name().unwrap_or("test")
-        ));
-        std::fs::write(&path, "0\t2\n2\t0\n2\t1\n").unwrap();
-        let (panes, cardinality) = replay(&path).unwrap();
-        std::fs::remove_file(path).unwrap();
-        assert_eq!(panes, vec![vec![2], vec![], vec![0, 1]]);
-        assert_eq!(cardinality, 3);
-    }
-}
diff --git a/data_plane/examples/sketch_db_diag.rs b/data_plane/examples/sketch_db_diag.rs
deleted file mode 100644
index 739842f49..000000000
--- a/data_plane/examples/sketch_db_diag.rs
+++ /dev/null
@@ -1,159 +0,0 @@
-//! Diagnostic for the 10k-sids slowdown observed in `benches/sketch_db.rs`.
-//!
-//! The original bench used `Bencher::iter_batched(setup, routine, SmallInput)`.
-//! Criterion's `iter_batched` consumes the input by value and the input's
-//! `Drop` runs *inside* the timed region (see criterion-0.5.1
-//! `src/bencher.rs:264-272`). Our `setup` builds a `SketchStore` with N
-//! `SummarySeriesMetadata` entries registered; dropping that store at N=10_000
-//! pays for 10k Drops of `metric_name: String`, `BTreeSet`, `SketchConfig`,
-//! `AccuracyBound`, etc. That drop, not `append_sample`, is what makes the
-//! 10k case look ~90× slower than the 100-sid case.
-//!
-//! This diagnostic separates three quantities:
-//!   (A) rebuild-per-iter (matches the original bench): build + 1 append + drop
-//!   (B) isolated append:                                pre-built store, K appends
-//!   (C) isolated drop:                                  build, time drop only
-//!
-//! Run: `cargo run --release --example sketch_db_diag`
-
-use std::collections::{BTreeMap, BTreeSet};
-use std::time::Instant;
-
-use asap_sketchlib::proto::sketchlib::{sketch_envelope, DdSketchState, SketchEnvelope};
-use asap_sketchlib::DdSketch;
-use prost::Message;
-
-use data_plane::storage_engines::sketch_db::data::{
-    AccuracyBound, AggKind, Capability, SketchAlgorithm, SketchConfig, SketchEncoding,
-    SketchSampleState,
-};
-use data_plane::storage_engines::sketch_db::index::{SketchStore, SummarySeriesMetadata};
-
-fn ddsketch_payload() -> Vec<u8> {
-    let mut sk = DdSketch::new(0.01);
-    for v in 1..=64 {
-        sk.update(v as f64);
-    }
-    let state = DdSketchState {
-        alpha: sk.alpha,
-        store_counts: sk.store_counts.clone(),
-        store_offset: sk.store_offset,
-        ..Default::default()
-    };
-    SketchEnvelope {
-        sketch_state: Some(sketch_envelope::SketchState::Ddsketch(state)),
-        ..Default::default()
-    }
-    .encode_to_vec()
-}
-
-fn dd_meta(sid: u64) -> SummarySeriesMetadata {
-    let cfg = SketchConfig::DDSketch {
-        relative_accuracy: 0.01,
-    };
-    SummarySeriesMetadata {
-        storage_handle: sid,
-        metric_name: "bench_metric".into(),
-        group_by_keys: BTreeSet::new(),
-        capability: Some(Capability::QuantileApprox(Some(SketchAlgorithm::DDSketch))),
-        accuracy: Some(AccuracyBound::from_config(&cfg)),
-        agg_kind: AggKind::Sketch {
-            algorithm: SketchAlgorithm::DDSketch,
-            config: cfg,
-            spatial_filter_canonical: String::new(),
-        },
-        first_seen_unix_ms: 0,
-        retired_at_ms: None,
-        expires_at_ms: None,
-        policy_fp: asap_types::PolicyFingerprint::UNSET,
-    }
-}
-
-fn build_store(num_sids: u64) -> SketchStore {
-    let store = SketchStore::new();
-    for sid in 1..=num_sids {
-        store.register(dd_meta(sid));
-    }
-    store
-}
-
-fn sample(bytes: Vec<u8>) -> SketchSampleState {
-    SketchSampleState {
-        bytes,
-        encoding: SketchEncoding::ProtoFull,
-    }
-}
-
-fn bench_a_rebuild_per_iter(num_sids: u64, iters: u64, payload: &[u8]) -> f64 {
-    // (A) reproduces what `iter_batched` actually measured: build store, one
-    // append, then drop the store — all timed.
-    let t0 = Instant::now();
-    for i in 0..iters {
-        let store = build_store(num_sids);
-        let win = (1_000 + i * 10, 1_000 + i * 10 + 10);
-        store.append_sample(1, BTreeMap::new(), win, sample(payload.to_vec()));
-        // drop happens at end of loop body — inside the timed region.
-    }
-    t0.elapsed().as_nanos() as f64 / iters as f64
-}
-
-fn bench_b_isolated_append(num_sids: u64, iters: u64, payload: &[u8]) -> f64 {
-    // (B) pre-build the store ONCE; loop pure `append_sample` calls.
-    // The store accumulates depth over the run, but DashMap entry + intern
-    // + columnar push is O(1) amortized.
-    let store = build_store(num_sids);
-    let t0 = Instant::now();
-    for i in 0..iters {
-        let sid = (i % num_sids) + 1;
-        let win = (1_000 + i * 10, 1_000 + i * 10 + 10);
-        store.append_sample(sid, BTreeMap::new(), win, sample(payload.to_vec()));
-    }
-    let avg = t0.elapsed().as_nanos() as f64 / iters as f64;
-    drop(store);
-    avg
-}
-
-fn bench_c_isolated_drop(num_sids: u64, iters: u64) -> f64 {
-    // (C) drop-only cost. Build outside, drop inside, time the drop.
-    let mut stores: Vec<SketchStore> = (0..iters).map(|_| build_store(num_sids)).collect();
-    let t0 = Instant::now();
-    while let Some(s) = stores.pop() {
-        drop(s);
-    }
-    t0.elapsed().as_nanos() as f64 / iters as f64
-}
-
-fn main() {
-    let payload = ddsketch_payload();
-    println!("payload bytes: {}", payload.len());
-    println!();
-    println!(
-        "{:>10} | {:>14} | {:>14} | {:>14} | {:>14}",
-        "num_sids", "(A) rebuild+1", "(B) append", "(C) drop", "A - B - C"
-    );
-    println!("{}", "-".repeat(80));
-
-    for (num_sids, iters_a, iters_b, iters_c) in [
-        (1u64, 50_000u64, 200_000u64, 50_000u64),
-        (100, 5_000, 200_000, 5_000),
-        (10_000, 500, 200_000, 500),
-    ] {
-        let a = bench_a_rebuild_per_iter(num_sids, iters_a, &payload);
-        let b = bench_b_isolated_append(num_sids, iters_b, &payload);
-        let c = bench_c_isolated_drop(num_sids, iters_c);
-        let residual = a - b - c;
-        println!(
-            "{:>10} | {:>12.0} ns | {:>12.0} ns | {:>12.0} ns | {:>12.0} ns",
-            num_sids, a, b, c, residual
-        );
-    }
-
-    println!();
-    println!("Legend:");
-    println!(
-        "  (A) per-iter store rebuild + 1 append + drop  (≈ what the criterion bench reported)"
-    );
-    println!("  (B) pure append_sample on a pre-built store    (the actual per-op cost)");
-    println!("  (C) drop of a freshly-built store              (the accounting term we missed)");
-    println!("  A - B - C should be ≈ build_store cost (register() x num_sids).");
-}
diff --git a/data_plane/examples/univmon_erp_artifact.rs b/data_plane/examples/univmon_erp_artifact.rs
deleted file mode 100644
index c20687a1b..000000000
--- a/data_plane/examples/univmon_erp_artifact.rs
+++ /dev/null
@@ -1,204 +0,0 @@
-//! Measure readout-specific ERP evidence from finite JSONL evaluation data.
-//! This offline tool retains samples; the production backend does not.
-use asap_physical_operators::summary_kernels::hll_sketch::HllSketchAccumulator;
-use asap_physical_operators::summary_kernels::univmon::UnivMonAccumulator;
-use data_plane::storage_engines::types::{AggregateCore, SerializableToSink};
-use serde_json::{json, Value};
-use std::collections::{BTreeMap, HashMap};
-use std::io::{BufRead, BufReader};
-
-fn main() -> Result<(), Box<dyn std::error::Error>> {
-    let path = std::env::args()
-        .nth(1)
-        .ok_or("usage: univmon_erp_artifact samples.jsonl")?;
-    let mut series = BTreeMap::<String, Vec<(u64, f64)>>::new();
-    for line in BufReader::new(std::fs::File::open(&path)?).lines() {
-        let row: Value = serde_json::from_str(&line?)?;
-        let key = serde_json::to_string(&row["labels"])?;
-        series.entry(key).or_default().push((
-            row["ts_ms"].as_u64().ok_or("timestamp")?,
-            row["value"].as_f64().ok_or("value")?,
-        ));
-    }
-    if series
-        .values()
-        .any(|samples| samples.windows(2).any(|pair| pair[0].0 >= pair[1].0))
-    {
-        return Err("each series must have strictly increasing timestamps".into());
-    }
-    let first = series.values().next().ok_or("empty dataset")?;
-    let start = first.first().ok_or("empty series")?.0;
-    let end = first.last().ok_or("empty series")?.0;
-    let populations: Vec<_> = series
-        .iter()
-        .take(10)
-        .map(|(key, samples)| {
-            (
-                key,
-                samples
-                    .iter()
-                    .filter(|(ts, _)| *ts > start && *ts <= end)
-                    .map(|(_, v)| *v + 1_000_000_000_000.0)
-                    .collect::<Vec<_>>(),
-            )
-        })
-        .collect();
-    if populations.len() < 2 {
-        return Err("need at least two independent populations".into());
-    }
-    // Calibration hashes a disjoint numeric key namespace. The shift preserves
-    // frequencies/cardinality for this integer-valued finite fixture; reject
-    // inputs for which floating-point rounding could silently merge values.
-    if series.values().flatten().any(|(_, value)| {
-        !value.is_finite() || value.fract() != 0.0 || !(0.0..1_000_000_000_000.0).contains(value)
-    }) {
-        return Err(
-            "calibration namespace requires finite nonnegative integer values below 1e12".into(),
-        );
-    }
-    let mut records = Vec::new();
-    let mut observed_shape = None;
-    for (heap, cols, layers) in [(64, 512, 8), (512, 2048, 8), (4096, 8192, 16)] {
-        let mut max_errors = [0.0f64; 3];
-        let mut bytes = 0;
-        let mut observed = None;
-        for (_, raw) in &populations {
-            let mut counts = HashMap::<u64, usize>::new();
-            for v in raw {
-                *counts
-                    .entry(if *v == 0.0 { 0 } else { v.to_bits() })
-                    .or_default() += 1;
-            }
-            let truths = [
-                counts.len() as f64,
-                counts
-                    .values()
-                    .map(|c| (*c as f64).powi(2))
-                    .sum::<f64>()
-                    .sqrt(),
-                counts
-                    .values()
-                    .map(|c| {
-                        let p = *c as f64 / raw.len() as f64;
-                        -p * p.log2()
-                    })
-                    .sum(),
-            ];
-            let mut observer = control_plane::physical::erp::ErpShapeObserver::new(raw.len())?;
-            for (i, v) in raw.iter().enumerate() {
-                observer.observe(&v.to_string(), i / 1000)?;
-            }
-            let next = observer.snapshot().ok_or("invalid observation")?;
-            if observed.as_ref().is_some_and(
-                |prior: &control_plane::physical::erp::ErpObservedShape| {
-                    prior.observation != next.observation
-                },
-            ) {
-                return Err(
-                    "training populations have different shapes; calibrate separate shape strata"
-                        .into(),
-                );
-            }
-            observed = Some(next);
-            let mut left =
-                UnivMonAccumulator::new(heap, 5, cols, layers).map_err(|e| e.to_string())?;
-            let mut right = left.clone();
-            for (i, v) in raw.iter().enumerate() {
-                if i % 2 == 0 { &mut left } else { &mut right }
-                    .insert_sample(*v)
-                    .map_err(|e| e.to_string())?;
-            }
-            left.merge_in_place(&right).map_err(|e| e.to_string())?;
-            bytes = bytes.max(left.serialize_to_bytes().len());
-            for (i, stat) in [
-                asap_types::Statistic::Cardinality,
-                asap_types::Statistic::FrequencyL2,
-                asap_types::Statistic::FrequencyEntropy,
-            ]
-            .into_iter()
-            .enumerate()
-            {
-                let answer = left
-                    .query_statistic(stat, &None, &Default::default())
-                    .map_err(|e| e.to_string())?;
-                if !answer.is_finite() {
-                    return Err("nonfinite estimate".into());
-                }
-                max_errors[i] = max_errors[i]
-                    .max((answer - truths[i]).abs() / if i == 2 { 1.0 } else { truths[i] });
-            }
-        }
-        let observed = observed.unwrap();
-        observed_shape = Some(observed.observation.clone());
-        let fit = observed
-            .observation
-            .fits
-            .iter()
-            .min_by(|a, b| a.goodness_of_fit.total_cmp(&b.goodness_of_fit))
-            .ok_or("no shape")?;
-        records.push(json!({"id":format!("univmon-h{heap}-c{cols}-l{layers}"),"sketch":"univmon","implementation":"asap-sketchlib-univmon-standard-v1",
-            "parameters":{"heap_size":heap,"sketch_rows":5,"sketch_cols":cols,"layers":layers},"trials":populations.len(),
-            "distribution":{"erp_shape":{"family":fit.family,"parameters":fit.parameters,"cardinality":observed.observation.cardinality,"benchmark_events":observed.observation.observed_events}},
-            "error_metrics":{"max_cardinality_relative_error":max_errors[0],"max_frequency_l2_relative_error":max_errors[1],"max_frequency_entropy_absolute_bits_error":max_errors[2]},
-            "resources":{"memory_bytes":bytes,"update_cpu_seconds":0.0,"merge_cpu_seconds":0.0,"query_cpu_seconds":0.0}}));
-        eprintln!("measured heap={heap} cols={cols} layers={layers}: {max_errors:?}");
-    }
-    // Predeclared precision grid; validation uses disjoint source populations.
-    let observation = observed_shape.as_ref().ok_or("no observation")?;
-    let fit = observation
-        .fits
-        .iter()
-        .min_by(|a, b| a.goodness_of_fit.total_cmp(&b.goodness_of_fit))
-        .ok_or("no fit")?;
-    for precision in [10, 12, 14] {
-        let mut max_error = 0.0f64;
-        let mut bytes = 0;
-        for (_, raw) in &populations {
-            let mut left =
-                HllSketchAccumulator::new(asap_sketchlib::HllVariant::Regular, precision);
-            let mut right = left.clone();
-            let mut distinct = std::collections::HashSet::new();
-            for (i, value) in raw.iter().enumerate() {
-                let bits = if *value == 0.0 { 0 } else { value.to_bits() };
-                distinct.insert(bits);
-                if i % 2 == 0 { &mut left } else { &mut right }
-                    .inner
-                    .update(&bits.to_le_bytes());
-            }
-            let merged = left.merge_with(&right).map_err(|e| e.to_string())?;
-            let merged = merged
-                .as_any()
-                .downcast_ref::<HllSketchAccumulator>()
-                .ok_or("HLL merge type")?;
-            let estimate = merged
-                .query_statistic(
-                    asap_types::Statistic::Cardinality,
-                    &None,
-                    &Default::default(),
-                )
-                .map_err(|e| e.to_string())?;
-            max_error =
-                max_error.max((estimate - distinct.len() as f64).abs() / distinct.len() as f64);
-            bytes = bytes.max(merged.serialize_to_bytes().len());
-        }
-        records.push(json!({"id":format!("hll-p{precision}"),"sketch":"hll","implementation":"asap-sketchlib-hll-regular-v1",
-            "parameters":{"precision":precision},"trials":populations.len(),
-            "distribution":{"erp_shape":{"family":fit.family,"parameters":fit.parameters,"cardinality":observation.cardinality,"benchmark_events":observation.observed_events}},
-            "error_metrics":{"max_cardinality_relative_error":max_error},
-            "resources":{"memory_bytes":bytes,"update_cpu_seconds":0.0,"merge_cpu_seconds":0.0,"query_cpu_seconds":0.0}}));
-        eprintln!("measured HLL precision={precision}: max relative cardinality error={max_error}");
-    }
-    if let Some(path) = std::env::args().nth(2) {
-        std::fs::write(
-            path,
-            serde_json::to_vec_pretty(&observed_shape.ok_or("no observation")?)?,
-        )?;
-    }
-    println!(
-        "{}",
-        serde_json::to_string_pretty(
-            &json!({"schema_version":1,"producer_version":"backend-standard-unit-frequency-merged-two-pane-data-calibration-cpu-excluded","records":records})
-        )?
-    );
-    Ok(())
-}
diff --git a/data_plane/query-engine-rust-cli-compose.yml.j2 b/data_plane/query-engine-rust-cli-compose.yml.j2
deleted file mode 100644
index 32fe8f962..000000000
--- a/data_plane/query-engine-rust-cli-compose.yml.j2
+++ /dev/null
@@ -1,50 +0,0 @@
-# QueryEngine Rust Docker Compose Template
-# This template is rendered with Jinja2 to generate the final docker-compose.yml
-
-services:
-  queryengine-rust:
-    image: sketchdb-queryengine-rust:latest # Need to change image name to 'asap' prefix
-    container_name: asap-queryengine-rust
-    hostname: queryengine-rust
-    networks:
-      - asap-network
-    ports:
-      - "{{ http_port | default('8088') }}:8088"
-    environment:
-      - RUST_LOG={{ log_level | default('info') }}
-      - RUST_BACKTRACE=1
-    volumes:
-      - "{{ experiment_output_dir }}:/app/outputs"
-      - "{{ control_plane_remote_output_dir }}:/app/control_plane_output:ro"
-    command: [
-      "--kafka-topic", "{{ kafka_topic }}",
-      "--kafka-broker", "kafka:9092", # Uses kafka container service name instead of IP
-      "--input-format", "{{ input_format }}",
-      "--config", "/app/control_plane_output/inference_config.yaml",
-      "--streaming-config", "/app/control_plane_output/streaming_config.yaml",
-      "--prometheus-server", "http://prometheus:9090",
-      "--prometheus-scrape-interval", "{{ prometheus_scrape_interval }}",
-      "--delete-existing-db",
-      "--log-level", "{{ log_level }}",
-      "--output-dir", "/app/outputs",
-      "--streaming-engine", "{{ streaming_engine }}",
-      "--query-language", "{{ query_language }}",
-      "--lock-strategy", "{{ lock_strategy }}"{% if compress_json %},
-      "--decompress-json"{% endif %}{% if profile_query_engine %},
-      "--do-profiling"{% endif %}{% if forward_unsupported_queries %},
-      "--forward-unsupported-queries"{% endif %}{% if dump_precomputes %},
-      "--dump-precomputes"{% endif %}
-    ]
-    depends_on:
-      kafka:
-        condition: service_healthy
-      kafka-init:
-        condition: service_completed_successfully # Wait for Kafka topics to be created
-      prometheus:
-        condition: service_healthy
-      control_plane:
-        condition: service_completed_successfully # Wait for control plane to generate configs
-      arroyosketch:
-        condition: service_completed_successfully # Wait for pipeline configuration
-    restart: no
-    # Add healthcheck
diff --git a/data_plane/rustfmt.toml b/data_plane/rustfmt.toml
deleted file mode 100644
index 88c5c0f00..000000000
--- a/data_plane/rustfmt.toml
+++ /dev/null
@@ -1,4 +0,0 @@
-# Optional: customize rustfmt behavior
-max_width = 100
-hard_tabs = false
-tab_spaces = 4
diff --git a/data_plane/src/bin/monitor_coordinator_harness.rs b/data_plane/src/bin/monitor_coordinator_harness.rs
deleted file mode 100644
index 3f993ed2a..000000000
--- a/data_plane/src/bin/monitor_coordinator_harness.rs
+++ /dev/null
@@ -1,84 +0,0 @@
-//! Minimal CDM monitor-coordinator harness for the cross-language e2e
-//! (deploy/mvp-multinode/scripts/monitor_e2e.sh in ASAPCollector). Runs the
-//! tonic MonitorService with a single monitor and prints a line to stdout once
-//! the coordinator has computed a REAL coordinated-sampling grant for the
-//! connecting edge (i.e. the edge's periodic rate report reached the
-//! coordinator and a non-trivial sample_p came back), then exits 0 — so a
-//! driver script can assert the Go edge ⇄ Rust coordinator wire path
-//! end-to-end without standing up the full data-plane.
-//!
-//! Global-threshold alerting is retired (see `data_plane::monitor` module
-//! docs) — this harness no longer waits for or reports an alert.
-//!
-//! Usage: monitor_coordinator_harness <port> <agg_id> <tau> <window_ms> [timeout_secs] [key]
-//!
-//! `tau` is accepted for CLI/back-compat but unused. `key` is the monitor's
-//! group key (the edge's canonical `k=v;k2=v2` label encoding). Scalar (Sum)
-//! monitors register under their series-group key, so the harness config must
-//! carry the same key or registrations are rejected as unconfigured. Empty
-//! (default) = ungrouped.
-
-use data_plane::update_sampling::{MonitorConfig, MonitorCoordinator, MonitorServiceImpl};
-
-/// The edge_id the Go e2edriver connects as (asap-precompute-go/monitor/
-/// grpcclient/cmd/e2edriver/main.go: `monitor.NewEngine("e2e-edge", ...)`).
-const E2E_EDGE_ID: &str = "e2e-edge";
-
-#[tokio::main]
-async fn main() -> Result<(), Box<dyn std::error::Error>> {
-    let mut args = std::env::args().skip(1);
-    let port: u16 = args.next().and_then(|s| s.parse().ok()).unwrap_or(4319);
-    let agg_id: u64 = args.next().and_then(|s| s.parse().ok()).unwrap_or(1);
-    let tau: f64 = args.next().and_then(|s| s.parse().ok()).unwrap_or(100.0);
-    let window_ms: u64 = args
-        .next()
-        .and_then(|s| s.parse().ok())
-        .unwrap_or(3_600_000);
-    let timeout_secs: u64 = args.next().and_then(|s| s.parse().ok()).unwrap_or(30);
-    let key: Vec<u8> = args.next().map(|s| s.into_bytes()).unwrap_or_default();
-
-    let cfg = MonitorConfig {
-        agg_id,
-        key: key.clone(),
-        tau,
-        epsilon: 0.05,
-        window_ms,
-        ..Default::default()
-    };
-    let coord = MonitorCoordinator::new(vec![cfg]);
-    let svc = MonitorServiceImpl::new(coord.clone()).into_server();
-    let addr = format!("0.0.0.0:{port}").parse()?;
-    eprintln!("harness: serving MonitorService on {addr} (agg_id={agg_id}, window_ms={window_ms})");
-    println!("HARNESS_READY {port}");
-
-    // Poll for a real coordinated-sampling grant reaching this edge — the
-    // proof that the edge's periodic rate report made the live gRPC round
-    // trip and the coordinator answered with a computed sample_p.
-    let poll = {
-        let coord = coord.clone();
-        let key = key.clone();
-        async move {
-            loop {
-                if let Some(p) = coord.granted_sample_p(agg_id, &key, E2E_EDGE_ID).await {
-                    println!("MONITOR_GRANT edge={E2E_EDGE_ID} agg_id={agg_id} sample_p={p}");
-                    return;
-                }
-                tokio::time::sleep(std::time::Duration::from_millis(100)).await;
-            }
-        }
-    };
-
-    tokio::select! {
-        r = tonic::transport::Server::builder().add_service(svc).serve(addr) => {
-            r?;
-        }
-        _ = poll => {
-            eprintln!("harness: coordinated-sampling grant observed — exiting");
-        }
-        _ = tokio::time::sleep(std::time::Duration::from_secs(timeout_secs)) => {
-            eprintln!("harness: timeout after {timeout_secs}s with no grant");
-            std::process::exit(2);
-        }
-    }
-    Ok(())
-}
diff --git a/data_plane/src/drivers/ingest/mod.rs b/data_plane/src/drivers/ingest/mod.rs
deleted file mode 100644
index 89d1915d0..000000000
--- a/data_plane/src/drivers/ingest/mod.rs
+++ /dev/null
@@ -1,11 +0,0 @@
-pub mod otel;
-pub mod prometheus_remote_write;
-pub mod series_resolver;
-
-pub use otel::{OtlpReceiver, OtlpReceiverConfig};
-pub use prometheus_remote_write::{
-    PrometheusRemoteWriteConfig, PrometheusRemoteWriteReceiver, RemoteWriteStats,
-};
-pub use series_resolver::{
-    canonical_attrs_fingerprint, population_attrs_fingerprint, SeriesIdResolver,
-};
diff --git a/data_plane/src/drivers/ingest/otel.rs b/data_plane/src/drivers/ingest/otel.rs
deleted file mode 100644
index 81925b1a7..000000000
--- a/data_plane/src/drivers/ingest/otel.rs
+++ /dev/null
@@ -1,4766 +0,0 @@
-//! OTLP ingest driver.
-//!
-//! Accepts OTLP metrics via gRPC (4317) and HTTP (4318, POST /v1/metrics).
-//! Parses `ExportMetricsServiceRequest`, and — when wired to a precompute
-//! engine via [`OtlpReceiver::with_ingest_state`] — routes both raw metric
-//! points and pre-built sketches through the precompute engine's worker
-//! pool. The precompute engine then performs window-aligned aggregation
-//! per `InstalledPrecomputePlan` and writes results to `SketchStore`.
-//!
-//! Architectural flow:
-//! ```text
-//!   DataCollector OTel collector
-//!     → OTLP gRPC/HTTP (this receiver)
-//!     → precompute engine ingest router
-//!     → workers (per (agg_id, group_key) panes)
-//!     → StoreOutputSink → SketchStore
-//!     → query engine
-//! ```
-//!
-//! Labels from the OTLP wire format are preserved all the way into
-//! `KeyByLabelValues` via the standard `series_key` → grouping-label
-//! extraction used by the Prometheus/VictoriaMetrics ingest paths.
-
-use std::collections::HashMap;
-use std::io::Read;
-
-use crate::precompute_engine::series_router::WorkerMessage;
-use crate::precompute_engine::IngestState;
-use crate::query_engines::routing::FreshnessProbeCache;
-use crate::storage_engines::types::AggregateCore;
-use asap_otel_proto::tonic::collector::metrics::v1::{
-    metrics_service_server::MetricsService, ExportMetricsServiceRequest,
-    ExportMetricsServiceResponse,
-};
-use asap_otel_proto::tonic::common::v1::any_value::Value as AnyValueVariant;
-use asap_otel_proto::tonic::metrics::v1::number_data_point::Value as NumberValue;
-use asap_physical_operators::summary_kernels::sketch_envelope::SketchEnvelopeAccumulator;
-use asap_sketchlib::proto::sketchlib::{sketch_envelope, SketchEnvelope};
-use asap_sketchlib::MessagePackCodec;
-use axum::{body::Bytes, extract::State, routing::post, Json, Router};
-use flate2::read::GzDecoder;
-use planner_types::post_asap::SketchAlgorithm;
-use prost::Message;
-use std::sync::Arc;
-use std::time::Instant;
-use tonic::{Request, Response, Status};
-use tracing::{debug, error, info, warn};
-
-/// Configuration for the OTLP receiver.
-#[derive(Debug, Clone)]
-pub struct OtlpReceiverConfig {
-    pub grpc_port: u16,
-    pub http_port: u16,
-}
-
-/// Shared state accessible by both gRPC and HTTP handlers.
-#[derive(Clone)]
-struct OtlpSharedState {
-    /// Handle into the precompute engine's worker pool. When `Some`,
-    /// OTLP metrics and sketches are routed through the engine; when
-    /// `None` the receiver accepts data but only logs it (no storage).
-    ingest_state: Option<Arc<IngestState>>,
-    /// Freshness-probe last-value cache (issue #46 ⑥). When `Some`,
-    /// every received `http_freshness_probe_*` data point updates the
-    /// cache so the HTTP query handler can answer
-    /// `last_over_time(<probe>[<range>])` from RAM with sub-second
-    /// freshness — bypassing the 60–90 s cold-tier flush gap that
-    /// would otherwise leave a 10 s lookback window empty.
-    probe_cache: Option<Arc<FreshnessProbeCache>>,
-}
-
-/// OTLP receiver that accepts metrics via gRPC and HTTP.
-pub struct OtlpReceiver {
-    config: OtlpReceiverConfig,
-    ingest_state: Option<Arc<IngestState>>,
-    probe_cache: Option<Arc<FreshnessProbeCache>>,
-}
-
-impl OtlpReceiver {
-    /// Construct a receiver without a backend. Metrics are parsed and
-    /// logged but not stored — useful for diagnosing the OTLP pipe.
-    pub fn new(config: OtlpReceiverConfig) -> Self {
-        Self {
-            config,
-            ingest_state: None,
-            probe_cache: None,
-        }
-    }
-
-    /// Construct a receiver wired to a precompute engine's ingest state.
-    /// Incoming metrics and sketches are routed through the engine's
-    /// worker pool, where they are merged into per-`(agg_id, group_key)`
-    /// panes and eventually emitted to the store.
-    pub fn with_ingest_state(config: OtlpReceiverConfig, ingest_state: Arc<IngestState>) -> Self {
-        Self {
-            config,
-            ingest_state: Some(ingest_state),
-            probe_cache: None,
-        }
-    }
-
-    /// Attach a [`FreshnessProbeCache`] so the receiver captures the
-    /// latest sample for every `http_freshness_probe_*` metric it
-    /// sees. Builder-style; chains with [`Self::with_ingest_state`]
-    /// at the binary's wiring site. Without this call, probe-shaped
-    /// metrics still reach the precompute engine and the cold-tier
-    /// TSDB write path — only the in-memory query short-circuit is
-    /// disabled.
-    pub fn with_probe_cache(mut self, cache: Arc<FreshnessProbeCache>) -> Self {
-        debug!(
-            "OTLP receiver attached freshness-probe cache for issue #46 \
-             criterion ⑥ short-circuit"
-        );
-        self.probe_cache = Some(cache);
-        self
-    }
-
-    pub async fn run(&self) -> Result<(), Box<dyn std::error::Error + Send + Sync>> {
-        let grpc_addr = std::net::SocketAddr::from(([0, 0, 0, 0], self.config.grpc_port));
-        let http_addr = std::net::SocketAddr::from(([0, 0, 0, 0], self.config.http_port));
-
-        let shared = Arc::new(OtlpSharedState {
-            ingest_state: self.ingest_state.clone(),
-            probe_cache: self.probe_cache.clone(),
-        });
-
-        let grpc_svc = MetricsServiceImpl {
-            shared: shared.clone(),
-        };
-        // Bump tonic's default 4 MiB receive cap. A single agent
-        // window emits ~1000 series, each carrying a typed
-        // DDSketch / KLLSketch / ... state — the full-state
-        // payloads run 17+ MiB at the cardinalities the e2e
-        // harness uses. With the default cap, the gateway's
-        // OTLP exporter retries forever with
-        // `decoded message length too large`. Match the
-        // gateway/agent receiver caps (`max_recv_msg_size_mib: 64`
-        // in their YAMLs) so all three tiers agree.
-        let grpc_svc =
-            asap_otel_proto::tonic::collector::metrics::v1::metrics_service_server::MetricsServiceServer::new(
-                grpc_svc,
-            )
-            .max_decoding_message_size(64 * 1024 * 1024)
-            // Accept gzip-compressed request bodies so the `asap-gzip`
-            // arm's agent (`otlp/backend: compression: gzip`) can
-            // shrink the per-window sketch/aggregate payload on the
-            // wire. This is the matched-codec partner of the OTLP→VM
-            // `b1` baseline (also gzip): comparing b1 vs asap-gzip
-            // isolates the aggregation gain at a fixed codec.
-            // tonic negotiates per-RPC via the grpc-encoding header, so
-            // uncompressed agents (the plain `asap` arm,
-            // `compression: none`, matched against the `b0` baseline)
-            // are unaffected — this only enables the server to decode
-            // gzip when an agent chooses to send it. The control_plane
-            // RuntimeSamples server already does the same
-            // (control_plane/src/runtime_samples.rs).
-            .accept_compressed(tonic::codec::CompressionEncoding::Gzip);
-
-        let app = Router::new()
-            .route("/v1/metrics", post(handle_otlp_http))
-            .with_state(shared);
-
-        let grpc_listener = tokio::net::TcpListener::bind(grpc_addr).await?;
-        let http_listener = tokio::net::TcpListener::bind(http_addr).await?;
-
-        info!("OTLP gRPC listening on {}", grpc_addr);
-        info!("OTLP HTTP listening on {} (POST /v1/metrics)", http_addr);
-
-        tokio::select! {
-            r = tonic::transport::Server::builder()
-                .add_service(grpc_svc)
-                .serve_with_incoming(tokio_stream::wrappers::TcpListenerStream::new(grpc_listener)) => {
-                    if let Err(e) = r {
-                        error!("OTLP gRPC server error: {}", e);
-                    }
-                }
-            r = axum::serve(http_listener, app) => {
-                if let Err(e) = r {
-                    error!("OTLP HTTP server error: {}", e);
-                }
-            }
-        }
-
-        Ok(())
-    }
-}
-
-struct MetricsServiceImpl {
-    shared: Arc<OtlpSharedState>,
-}
-
-#[tonic::async_trait]
-impl MetricsService for MetricsServiceImpl {
-    async fn export(
-        &self,
-        request: Request<ExportMetricsServiceRequest>,
-    ) -> Result<Response<ExportMetricsServiceResponse>, Status> {
-        debug!("OTLP received request via gRPC");
-        let req = request.into_inner();
-        // PERF-1 — parse the OTLP request ONCE here and hand the parsed
-        // points/sketches to the raw-path consumers
-        // (process_otlp_request / capture_freshness / route_otlp_to_precompute)
-        // instead of each re-walking the protobuf. The first-class
-        // sketch path (`route_modified_otlp_sketches_to_precompute`)
-        // still walks the raw request because it reads the sketch
-        // DataPoint variants this parse intentionally skips.
-        let (points, sketch_payloads) = otlp_to_metric_points_and_sketches(&req);
-        process_otlp_request(&req, &points, &sketch_payloads, "gRPC");
-        if let Some(cache) = &self.shared.probe_cache {
-            capture_freshness_probe_samples(&points, cache);
-        }
-        let mut outcome = IngestOutcome::default();
-        if let Some(state) = &self.shared.ingest_state {
-            route_otlp_to_precompute(&points, &sketch_payloads, state).await;
-            outcome = route_modified_otlp_sketches_to_precompute(&req, state)
-                .await
-                .map_err(Status::invalid_argument)?;
-        }
-        debug!("OTLP sending response via gRPC");
-        Ok(Response::new(ExportMetricsServiceResponse {
-            // A successful RPC is the transport ACK: every summary frame
-            // passed the active-plan gate and was applied. Contract failures
-            // return a non-OK gRPC status before any frame is written.
-            partial_success: None,
-            // Sid bindings the sender should cache. Each entry maps an
-            // `attributes_fingerprint` to the canonical sid the backend's
-            // `SeriesIdResolver` minted (or returned from its cache). The
-            // sender's local dictionary keys on `fingerprint`, so it can
-            // refresh stale entries and pick up brand-new ones from this
-            // field without a separate `ResolveSeriesIDs` round-trip.
-            series_assignments: outcome.series_assignments,
-            // backend signals senders to evict cached sids here
-            // when this Export carried a sid the resolver does not
-            // recognize (sid-cache divergence — e.g. after a backend
-            // restart without persistence, or when the sender's sid
-            // disagrees with the resolved sid for the same attrs).
-            unknown_series_ids: outcome.unknown_series_ids,
-        }))
-    }
-
-    async fn resolve_series_i_ds(
-        &self,
-        request: Request<asap_otel_proto::tonic::collector::metrics::v1::ResolveSeriesIDsRequest>,
-    ) -> Result<
-        Response<asap_otel_proto::tonic::collector::metrics::v1::ResolveSeriesIDsResponse>,
-        Status,
-    > {
-        use asap_otel_proto::tonic::collector::metrics::v1::ResolveSeriesIDsResponse;
-
-        // Pre-resolve handshake is structurally redundant with the
-        // canonical Export path under Interpretation B (sid identity is
-        // `(metric, attrs_fingerprint, agg_kind_canonical)` and
-        // `agg_kind` isn't carried in `SeriesQuery`). On the first
-        // Export with attrs, the backend resolves the correct sid and
-        // echoes it back via `ExportMetricsServiceResponse.series_assignments`
-        // — that's the canonical channel, and it also handles every
-        // cache-divergence failure mode (proto comment at
-        // `ExportMetricsServiceResponse.unknown_series_ids:100-104`).
-        //
-        // The RPC is kept as a stable surface so older patched
-        // exporters that still call it don't see `Unimplemented`. The
-        // returned `assignments` vec is empty; the agent's local cache
-        // stays cold and the first real Export populates it.
-        //
-        // Follow-up: drop the RPC entirely (proto change), OR extend
-        // `SeriesQuery` to carry `agg_kind_canonical` so this can
-        // perform a real pre-resolve. Today's stub is the no-harm path.
-        let req = request.into_inner();
-        if !req.queries.is_empty() {
-            warn!(
-                queries = req.queries.len(),
-                "ResolveSeriesIDs RPC called with non-empty batch; \
-                 returning empty assignments — sid identity now \
-                 includes agg_kind which this RPC doesn't carry. \
-                 Agent will mint on first Export with attrs.",
-            );
-        }
-        Ok(Response::new(ResolveSeriesIDsResponse {
-            assignments: Vec::new(),
-        }))
-    }
-}
-
-async fn handle_otlp_http(
-    headers: axum::http::HeaderMap,
-    State(shared): State<Arc<OtlpSharedState>>,
-    body: Bytes,
-) -> Result<Json<serde_json::Value>, (axum::http::StatusCode, String)> {
-    debug!("OTLP received request via HTTP, body_bytes={}", body.len());
-    let body = if let Some(enc) = headers.get(axum::http::header::CONTENT_ENCODING) {
-        let enc = enc.to_str().unwrap_or("").trim().to_ascii_lowercase();
-        if enc == "gzip" {
-            let mut decoder = GzDecoder::new(body.as_ref());
-            let mut out = Vec::new();
-            decoder.read_to_end(&mut out).map_err(|e| {
-                (
-                    axum::http::StatusCode::BAD_REQUEST,
-                    format!("Gzip decode error: {}", e),
-                )
-            })?;
-            Bytes::from(out)
-        } else {
-            body
-        }
-    } else {
-        body
-    };
-
-    let req = ExportMetricsServiceRequest::decode(body.as_ref()).map_err(|e| {
-        (
-            axum::http::StatusCode::BAD_REQUEST,
-            format!("Protobuf decode error: {}", e),
-        )
-    })?;
-    // PERF-1 — parse once, share the result across the raw-path
-    // consumers (see the gRPC `export` path for the rationale).
-    let (points, sketch_payloads) = otlp_to_metric_points_and_sketches(&req);
-    process_otlp_request(&req, &points, &sketch_payloads, "HTTP");
-    if let Some(cache) = &shared.probe_cache {
-        capture_freshness_probe_samples(&points, cache);
-    }
-    let mut outcome = IngestOutcome::default();
-    if let Some(state) = &shared.ingest_state {
-        route_otlp_to_precompute(&points, &sketch_payloads, state).await;
-        outcome = route_modified_otlp_sketches_to_precompute(&req, state)
-            .await
-            .map_err(|error| (axum::http::StatusCode::UNPROCESSABLE_ENTITY, error))?;
-    }
-    debug!("OTLP sending response via HTTP");
-    // HTTP OTLP exporters don't generally read `series_assignments`
-    // back the way the gRPC path does (the OTLP/HTTP spec keeps the
-    // response shape minimal), so we surface assignments only as a
-    // count for observability. Senders that need the bindings should
-    // use the gRPC transport. Eviction signals stay first-class — they
-    // are the universal recovery primitive (see proto comment on
-    // `ExportMetricsServiceResponse.unknown_series_ids`).
-    Ok(Json(serde_json::json!({
-        "rejected": 0,
-        "unknown_series_ids": outcome.unknown_series_ids,
-        "series_assignments_count": outcome.series_assignments.len(),
-    })))
-}
-
-/// A parsed metric data point: name, labels, timestamp (nanos), and numeric value.
-#[derive(Debug)]
-pub struct MetricPoint {
-    pub name: String,
-    pub labels: HashMap<String, String>,
-    pub timestamp_nanos: u64,
-    pub value: f64,
-}
-
-/// A parsed sketch payload extracted from OTLP attributes. Carries the
-/// metric name, attribute name (identifies the sketch kind on the wire),
-/// labels (preserved from the OTLP DataPoint attributes + resource/scope),
-/// wire timestamp, and the opaque `SketchEnvelope` protobuf bytes.
-#[derive(Debug)]
-pub struct SketchPoint {
-    pub name: String,
-    pub attr_name: String,
-    pub labels: HashMap<String, String>,
-    pub timestamp_nanos: u64,
-    pub payload: Vec<u8>,
-}
-
-type OtlpParseResult = (Vec<MetricPoint>, Vec<SketchPoint>);
-
-/// Render OTLP `(name, labels)` into the canonical PromQL-style series
-/// key `metric{k1="v1",k2="v2"}` used everywhere in the data plane.
-///
-/// Values are wrapped in double quotes and embedded `"`, `\`, `\n` are
-/// escaped per the PromQL lexer rules. This matches:
-///
-///   * `parse_labels_from_series_key` in `precompute_engine/worker.rs`
-///     (the inverse — expects `key="value"`)
-///   * `render_series_key` in `storage_engines/sketch_db/backfill/
-///     prometheus_reader.rs` (the other producer of this shape)
-///   * `RawSample.labels`' documented shape (`metric{k="v",...}`)
-///   * `sample_matches` in the backfill raw reader (strips `"` when
-///     parsing)
-///
-/// Pre-fix this helper emitted **unquoted** values (`k=v`), which the
-/// parser silently rejected → `IngestState::extract_group_key_for`
-/// returned `""` for every OTLP wire-format input, and the keyed
-/// dispatch path inside `apply_sample` saw empty aggregated keys for
-/// every OTLP sample. The bug was discovered while implementing PR
-/// #284 (B7.6 ingest sid rekey); that PR side-stepped it by reading
-/// `point.labels` directly, but emit-time `KeyByLabelValues`
-/// content elsewhere depended on the roundtrip working — hence this
-/// fix. See the regression test
-/// `format_series_key_roundtrips_through_parse_labels` in
-/// `precompute_engine/worker.rs`.
-fn format_series_key(name: &str, labels: &HashMap<String, String>) -> String {
-    let mut pairs: Vec<_> = labels.iter().collect();
-    pairs.sort_by_key(|(k, _)| *k);
-    let labels_str = pairs
-        .iter()
-        .map(|(k, v)| format!("{}=\"{}\"", k, escape_label_value(v)))
-        .collect::<Vec<_>>()
-        .join(",");
-    format!("{}{{{}}}", name, labels_str)
-}
-
-/// Escape a label value for the PromQL series-key format. Mirrors
-/// `storage_engines::sketch_db::backfill::prometheus_reader::
-/// escape_label_value` — both producers must stay in lockstep so the
-/// parser in `precompute_engine::worker::parse_labels_from_series_key`
-/// sees a consistent shape regardless of which ingest path emitted
-/// the series key.
-fn escape_label_value(v: &str) -> String {
-    let mut out = String::with_capacity(v.len());
-    for c in v.chars() {
-        match c {
-            '\\' => out.push_str("\\\\"),
-            '"' => out.push_str("\\\""),
-            '\n' => out.push_str("\\n"),
-            other => out.push(other),
-        }
-    }
-    out
-}
-
-fn get_sketch_payload_from_attrs(
-    attrs: &[asap_otel_proto::tonic::common::v1::KeyValue],
-) -> Option<(String, Vec<u8>)> {
-    for kv in attrs {
-        match kv.key.as_str() {
-            "kll.sketch_payload" | "cms.sketch_payload" | "countsketch.sketch_payload" => {
-                if let Some(value) = &kv.value {
-                    if let Some(AnyValueVariant::BytesValue(bytes)) = &value.value {
-                        return Some((kv.key.clone(), bytes.clone()));
-                    }
-                }
-            }
-            _ => {}
-        }
-    }
-    None
-}
-
-fn log_sketch_envelope_type(attr_name: &str, payload: &[u8], metric_name: &str) {
-    match SketchEnvelope::decode(payload) {
-        Ok(env) => {
-            let sketch_type = match env.sketch_state {
-                Some(sketch_envelope::SketchState::Kll(_)) => "KLL",
-                Some(sketch_envelope::SketchState::CountMin(_)) => "CountMin",
-                Some(sketch_envelope::SketchState::CountSketch(_)) => "CountSketch",
-                Some(_) => "Other",
-                None => "Unknown",
-            };
-            debug!(
-                "OTLP Sketches: metric='{}' attr='{}' payload_bytes={} sketch_type={}",
-                metric_name,
-                attr_name,
-                payload.len(),
-                sketch_type
-            );
-        }
-        Err(e) => {
-            debug!(
-                "OTLP Sketches: metric='{}' attr='{}' payload_bytes={} decode_error='{}'",
-                metric_name,
-                attr_name,
-                payload.len(),
-                e
-            );
-        }
-    }
-}
-
-/// Capture every `http_freshness_probe_*` data point in the request
-/// into the [`FreshnessProbeCache`]. Walks the parsed `MetricPoint`s
-/// and only stores those whose metric name matches the probe prefix
-/// — the cache itself enforces the prefix check via
-/// [`FreshnessProbeCache::record`], so non-probe points are
-/// short-circuited cheaply.
-///
-/// Issue #46 ⑥ — without this hook, the cold-tier flush latency
-/// (gorillas3 → 60 s TSDB block → Thanos sync) leaves the
-/// `last_over_time(probe[10s])` query empty for the entire MVP demo
-/// run. The cache lets the HTTP query handler answer the same query
-/// from RAM with sub-second freshness.
-fn capture_freshness_probe_samples(points: &[MetricPoint], cache: &FreshnessProbeCache) {
-    let mut updated = 0usize;
-    for point in points {
-        // The cache filters by metric-name prefix internally; calling
-        // `record` for every point is fine — non-probes are cheap
-        // string-prefix rejections and do not touch the lock.
-        let ts_ms = (point.timestamp_nanos / 1_000_000) as i64;
-        if cache.record(&point.name, ts_ms, point.value) {
-            updated += 1;
-        }
-    }
-    if updated > 0 {
-        debug!(
-            updated_probes = updated,
-            cache_size = cache.len(),
-            "freshness-probe cache updated"
-        );
-    }
-}
-
-fn process_otlp_request(
-    request: &ExportMetricsServiceRequest,
-    points: &[MetricPoint],
-    sketch_payloads: &[SketchPoint],
-    transport: &str,
-) {
-    let resource_count = request.resource_metrics.len();
-    let total_points = otlp_to_record_count(request);
-    if resource_count > 0 || total_points > 0 {
-        debug!(
-            "OTLP ingest: received {} resource metrics, {} total data points (transport={})",
-            resource_count, total_points, transport
-        );
-    }
-
-    for sketch in sketch_payloads {
-        log_sketch_envelope_type(&sketch.attr_name, &sketch.payload, &sketch.name);
-    }
-    if !sketch_payloads.is_empty() {
-        debug!(
-            "OTLP Sketch Payload Flow: received {} sketch payload(s), decoded successfully",
-            sketch_payloads.len()
-        );
-    }
-
-    let mut by_series: HashMap<String, usize> = HashMap::new();
-    for point in points {
-        let key = format_series_key(&point.name, &point.labels);
-        *by_series.entry(key).or_insert(0) += 1;
-    }
-    if !by_series.is_empty() {
-        debug!(
-            "OTLP Raw Metrics Flow: received {} raw metric series",
-            by_series.len()
-        );
-        for (series, count) in by_series {
-            debug!("OTLP Raw Metrics Flow: series {} count={}", series, count);
-        }
-    }
-    if let Some(first) = points.first() {
-        debug!(
-            "OTLP parse example: {} {:?} @{}ns = {}",
-            first.name, first.labels, first.timestamp_nanos, first.value
-        );
-    }
-}
-
-/// Route parsed OTLP data through the precompute engine's worker pool.
-///
-/// Both raw metric points and pre-built sketch payloads are dispatched via
-/// `WorkerMessage::GroupSamples` / `WorkerMessage::AccumulatorInput`, with
-/// `(agg_id, group_key)` derived from the wire labels using the same logic
-/// as the Prometheus/VictoriaMetrics paths. This preserves full label
-/// semantics and lets the precompute engine perform config-driven window
-/// aggregation over both streams.
-///
-/// Metrics whose name does not match any aggregation in the streaming
-/// config are dropped with a debug log — the precompute engine only
-/// maintains state for configured metrics.
-///
-/// Log a per-driver `HashMap<agg_id, count>` of §6.3 write-barrier
-/// drops. Post-schema-retirement the agg_id-keyed
-/// `IngestState::record_barrier_drop` counter is gone — the
-/// sid-level barrier inside `SketchStore::ingest_precompute_for_agg_config`
-/// silently rejects retired-sid writes without crossing this
-/// observer. The function is kept (callers still hand it an empty
-/// map) so the call shape doesn't churn; if the map is non-empty
-/// it emits a single debug log for forensic visibility.
-fn flush_barrier_drops(_state: &IngestState, drops: &HashMap<u64, u64>, driver_tag: &'static str) {
-    if drops.is_empty() {
-        return;
-    }
-    let total: u64 = drops.values().sum();
-    debug!(
-        driver = driver_tag,
-        total_dropped = total,
-        by_agg_id = ?drops,
-        "§6.3 write barrier dropped OTLP samples (agg is retired/expired)"
-    );
-}
-
-/// Resolve the bucket sid (and `policy_fp`) for a single data point
-/// against a single matching `PrecomputeMaterialization`.
-///
-/// B7.6 — sid is the bucket identity in the precompute engine; this
-/// helper folds `(config, grouping-label-values)` into a single u64 via
-/// `SeriesIdResolver`. Same `(metric, grouping-label-values, agg_kind)`
-/// always returns the same sid, so distinct data points that share the
-/// same group bucket land in the same `GroupSamples` /
-/// `AccumulatorInput` message — the GROUP-BY semantics the legacy
-/// `(agg_id, group_key)` tuple expressed.
-///
-/// The "attrs" passed to the resolver are the GROUPING-LABEL projection
-/// of the wire labels (NOT the full label set) — otherwise every
-/// distinct `(rack, node, pod)` tuple under a `grouping_labels=[zone]`
-/// policy would mint its own sid and never roll up.
-///
-/// Configured ingest shares the policy-aware physical identity used by the
-/// live storage sink and backfill. Unbound modified-OTLP sketches retain
-/// their separate wire-level identity protocol.
-fn resolve_bucket_sid_for_agg_config(
-    ingest_state: &Arc<IngestState>,
-    config: &asap_types::aggregation_config::PrecomputeMaterialization,
-    point_labels: &HashMap<String, String>,
-    captured_generation: Option<&asap_types::sds::CatalogGeneration>,
-) -> Result<(u64, asap_types::PolicyFingerprint), String> {
-    if !config.population_key_encoding.is_legacy() {
-        return Err("canonical population requires typed OTLP label propagation".into());
-    }
-    let grouping_pairs: Vec<(&str, &str)> = config
-        .grouping_labels
-        .iter()
-        .map(|name| {
-            let v = point_labels.get(name).map(|s| s.as_str()).unwrap_or("");
-            (name.as_str(), v)
-        })
-        .collect();
-    let fp = crate::drivers::ingest::population_attrs_fingerprint(
-        config.population_key_encoding,
-        &grouping_pairs,
-    )?;
-    let sid = ingest_state.summary_store.resolve_output_storage_handle(
-        &ingest_state.series_resolver,
-        config.policy_fingerprint().into(),
-        &fp,
-        captured_generation,
-    )?;
-    let policy_fp = asap_types::PolicyFingerprint(config.policy_fp_u64());
-    Ok((sid, policy_fp))
-}
-
-async fn route_otlp_to_precompute(
-    points: &[MetricPoint],
-    sketch_payloads: &[SketchPoint],
-    ingest_state: &Arc<IngestState>,
-) {
-    let ingest_received_at = Instant::now();
-
-    // Snapshot the latest agg_configs from the hot-reload handle so
-    // new aggregations are visible without restart.
-    let active_physical_plan_snapshot = ingest_state.active_physical_plan_snapshot();
-    let catalog_generation = active_physical_plan_snapshot
-        .as_ref()
-        .and_then(|plan| plan.precompute_plan.summary_catalog.clone())
-        .map(Arc::new);
-    let snap = active_physical_plan_snapshot
-        .as_ref()
-        .map(|plan| plan.installed_precompute_plan.clone())
-        .unwrap_or_else(|| ingest_state.config_snapshot());
-    let agg_configs = snap.materializations();
-    // Reconcile sid lifecycle using the current streaming-config snapshot.
-    // The store enforces the write barrier for retired and expired instances.
-    // A config-Arc identity check skips catalog scans while the config is unchanged.
-    let _ = crate::storage_engines::sketch_db::lifecycle::reconcile_if_config_changed(
-        ingest_state.summary_store.as_ref(),
-        &snap,
-        crate::storage_engines::sketch_db::DEFAULT_RETIREMENT_RETENTION,
-    );
-
-    // B7.6 — bucket by `sid` instead of `(agg_id, group_key)`. The
-    // grouping label values fold into the sid via the
-    // `(metric, attrs_fp, agg_kind_canonical)` identity contract on
-    // `SeriesIdResolver`: same (config, grouping-label-values) → same
-    // sid → same bucket. We still carry `policy_fp` and `group_key`
-    // alongside the sid in the WorkerMessage so the worker can resolve
-    // the source config and render emit-time labels without consulting
-    // the sid → attrs reverse mapping.
-    type BucketTuple = (
-        u64,
-        asap_types::PolicyFingerprint,
-        Arc<crate::precompute_engine::group_key::GroupKey>,
-    ); // (sid, policy_fp, group_key)
-    type SampleTuple = (String, i64, f64);
-    let mut by_bucket: HashMap<u64, (BucketTuple, Vec<SampleTuple>)> = HashMap::new();
-    let mut raw_matched = 0usize;
-    let mut raw_unmatched = 0usize;
-    // The store enforces the sid-level write barrier. This empty map preserves
-    // the barrier-log interface without duplicating that check.
-    let raw_barrier_drops: HashMap<u64, u64> = HashMap::new();
-
-    for point in points {
-        let series_key = format_series_key(&point.name, &point.labels);
-        let ts_ms = (point.timestamp_nanos / 1_000_000) as i64;
-        let mut matched = false;
-        for config in agg_configs.values() {
-            if config.metric != point.name
-                && config.spatial_filter_normalized != point.name
-                && config.spatial_filter != point.name
-            {
-                continue;
-            }
-            let group_key = IngestState::extract_group_key_for(&series_key, config);
-            let (sid, policy_fp) = match resolve_bucket_sid_for_agg_config(
-                ingest_state,
-                config,
-                &point.labels,
-                catalog_generation.as_deref(),
-            ) {
-                Ok(binding) => binding,
-                Err(error) => {
-                    warn!(%error, "configured ingest series reactivation rejected");
-                    continue;
-                }
-            };
-            by_bucket
-                .entry(sid)
-                .or_insert_with(|| ((sid, policy_fp, group_key.clone()), Vec::new()))
-                .1
-                .push((series_key.clone(), ts_ms, point.value));
-            matched = true;
-        }
-        if matched {
-            raw_matched += 1;
-        } else {
-            raw_unmatched += 1;
-        }
-    }
-    flush_barrier_drops(ingest_state, &raw_barrier_drops, "otlp-raw");
-
-    let raw_messages: Vec<WorkerMessage> = by_bucket
-        .into_iter()
-        .map(
-            |(_sid, ((sid, policy_fp, group_key), samples))| WorkerMessage::GroupSamples {
-                sid,
-                policy_fp,
-                group_key,
-                samples,
-                ingest_received_at,
-            },
-        )
-        .collect();
-
-    if !raw_messages.is_empty() {
-        if let Err(e) = ingest_state
-            .router
-            .route_group_batch(raw_messages, ingest_received_at, catalog_generation.clone())
-            .await
-        {
-            warn!("OTLP raw-sample routing error: {}", e);
-        }
-    }
-
-    // Build AccumulatorInput messages for pre-built sketches.
-    // Each sketch payload carries a metric name that must match an
-    // aggregation config; labels come from the point's attributes. The
-    // payload is decoded enough to identify the sketch type for logging;
-    // the accumulator the worker receives is a conservative placeholder
-    // until per-variant `SketchEnvelope → concrete accumulator` decoders
-    // are wired up (see TODO below).
-    let mut sketch_messages: Vec<WorkerMessage> = Vec::new();
-    let mut sketch_matched = 0usize;
-    let mut sketch_unmatched = 0usize;
-    // See `raw_barrier_drops` above — schema-keyed barrier dropped;
-    // sid-level barrier in `SketchStore` enforces §6.3 going
-    // forward.
-    let sketch_barrier_drops: HashMap<u64, u64> = HashMap::new();
-    for point in sketch_payloads {
-        let series_key = format_series_key(&point.name, &point.labels);
-        let ts_ms = (point.timestamp_nanos / 1_000_000) as i64;
-        let sketch_type = identify_sketch_type(&point.payload);
-        let mut matched = false;
-        for config in agg_configs.values() {
-            if config.metric != point.name
-                && config.spatial_filter_normalized != point.name
-                && config.spatial_filter != point.name
-            {
-                continue;
-            }
-            let group_key = IngestState::extract_group_key_for(&series_key, config);
-            // Wrap the raw SketchEnvelope bytes in a SketchEnvelopeAccumulator
-            // so the precompute engine receives the opaque sketch as-is. This
-            // preserves all sketch state end-to-end; per-variant decoding
-            // (e.g. CountMin → CountMinSketchAccumulator) can layer on top
-            // later without changing the routing contract.
-            let accumulator: Box<dyn AggregateCore> =
-                match SketchEnvelopeAccumulator::from_proto_bytes(point.payload.clone()) {
-                    Ok(acc) => Box::new(acc),
-                    Err(e) => {
-                        warn!(
-                            "OTLP sketch decode failed for metric='{}' attr='{}': {}",
-                            point.name, point.attr_name, e
-                        );
-                        continue;
-                    }
-                };
-            // B7.6 — same sid-resolution scheme as the raw path: bucket
-            // identity is (metric, grouping-label-values, agg_kind).
-            // The opaque SketchEnvelope path predates per-variant
-            // sketch-kind plumbing here; treat the bucket as ExactAgg
-            // so the resolver key matches what
-            // `reconcile_from_streaming_config` derives from the same
-            // config (otherwise the bucket would be reachable but never
-            // reconciled).
-            let (sid, policy_fp) = match resolve_bucket_sid_for_agg_config(
-                ingest_state,
-                config,
-                &point.labels,
-                catalog_generation.as_deref(),
-            ) {
-                Ok(binding) => binding,
-                Err(error) => {
-                    warn!(%error, "configured ingest series reactivation rejected");
-                    continue;
-                }
-            };
-            sketch_messages.push(WorkerMessage::AccumulatorInput {
-                sid,
-                policy_fp,
-                group_key,
-                timestamp_ms: ts_ms,
-                accumulator,
-                ingest_received_at,
-            });
-            matched = true;
-        }
-        if matched {
-            sketch_matched += 1;
-            debug!(
-                "OTLP sketch routed to precompute engine: metric='{}' attr='{}' type={} bytes={}",
-                point.name,
-                point.attr_name,
-                sketch_type,
-                point.payload.len()
-            );
-        } else {
-            sketch_unmatched += 1;
-        }
-    }
-    flush_barrier_drops(ingest_state, &sketch_barrier_drops, "otlp-sketch-envelope");
-
-    if !sketch_messages.is_empty() {
-        if let Err(e) = ingest_state
-            .router
-            .route_group_batch(
-                sketch_messages,
-                ingest_received_at,
-                catalog_generation.clone(),
-            )
-            .await
-        {
-            warn!("OTLP sketch routing error: {}", e);
-        }
-    }
-
-    if raw_unmatched > 0 || sketch_unmatched > 0 {
-        debug!(
-            "OTLP ingest: {} raw samples + {} sketches dropped (no matching aggregation config); \
-             {} raw + {} sketches routed to precompute engine",
-            raw_unmatched, sketch_unmatched, raw_matched, sketch_matched
-        );
-    }
-}
-
-/// Walk the modified-OTLP first-class sketch metric variants
-/// (`DDSketch` / `KLLSketch` / `CountSketch` / `CountMinSketch` /
-/// `HLLSketch` on `Metric.data` tags 13–17) and dispatch each
-/// `*SketchDataPoint` through the precompute engine via
-/// `WorkerMessage::AccumulatorInput`.
-///
-/// Per-variant decoding of the typed `sketch` bytes is delegated to
-/// `decode_modified_otlp_sketch_bytes`, which in turn calls into the
-/// matching concrete accumulator's `from_sketchlib_proto_bytes`
-/// constructor when one exists. Variants without a concrete decoder
-/// today (KLL / DDSketch / CountSketch / HLL) fall through to the
-/// §5.2 fallback path so the user still gets a correct answer; PR C
-/// (task #8) will close those decoder gaps.
-/// Per-Export outcome of the modified-OTLP sketch ingest path. Carries
-/// both halves of the Phase-4/B round trip:
-///
-/// - `unknown_series_ids` → sids the receiver could not satisfy this
-///   Export (sender's cache is stale; sender must evict + re-emit with
-///   attrs).
-/// - `series_assignments` → newly-minted or cache-resolved sid bindings
-///   the receiver wants the sender to cache. Sent back in
-///   `ExportMetricsServiceResponse.series_assignments` so the sender
-///   omits attrs on subsequent emits keyed by these sids.
-///
-/// Empty `series_assignments` is the no-op case (every DP arrived with
-/// the right sid already, or every DP was rejected to `unknown_series_ids`).
-#[derive(Debug, Default)]
-pub(crate) struct IngestOutcome {
-    pub unknown_series_ids: Vec<u64>,
-    pub series_assignments: Vec<asap_otel_proto::tonic::collector::metrics::v1::SeriesAssignment>,
-}
-
-async fn route_modified_otlp_sketches_to_precompute(
-    request: &ExportMetricsServiceRequest,
-    ingest_state: &Arc<IngestState>,
-) -> Result<IngestOutcome, String> {
-    use asap_otel_proto::tonic::metrics::v1::metric::Data;
-
-    let ingest_received_at = Instant::now();
-    // Load the generation exactly once. Deriving both the runtime config and
-    // transmission contract from this Arc prevents an activation between two
-    // independent ArcSwap loads from producing a torn ingest view.
-    let active_physical_plan_snapshot = ingest_state.active_physical_plan_snapshot();
-    let snap = active_physical_plan_snapshot
-        .as_ref()
-        .map(|plan| plan.installed_precompute_plan.clone())
-        .unwrap_or_else(|| ingest_state.config_snapshot());
-    let catalog_generation = active_physical_plan_snapshot
-        .as_ref()
-        .and_then(|plan| plan.precompute_plan.summary_catalog.clone())
-        .map(Arc::new);
-    let active_physical_plan = active_physical_plan_snapshot.filter(|plan| plan.plan_id() != 0);
-    let lineage_batch_guard = active_physical_plan
-        .as_ref()
-        .map(|_| ingest_state.observability.frame_lineage.lock_batch());
-    if let Some(active) = active_physical_plan.as_ref() {
-        // Validate the complete request before mutating the SID registry,
-        // sketch store, snapshot cache, or worker queues. This makes the
-        // OTLP request the atomic full-frame publication unit: 2xx/OK means
-        // the batch was accepted, while a contract error applies none of it.
-        preflight_summary_frames(request, ingest_state, active)?;
-    }
-    let agg_configs = snap.materializations();
-    // Reconcile sid lifecycle only when the configuration snapshot changes.
-    let _ = crate::storage_engines::sketch_db::lifecycle::reconcile_if_config_changed(
-        ingest_state.summary_store.as_ref(),
-        &snap,
-        crate::storage_engines::sketch_db::DEFAULT_RETIREMENT_RETENTION,
-    );
-    let mut messages: Vec<WorkerMessage> = Vec::new();
-    let mut routed = 0usize;
-    let mut decoded_failed = 0usize;
-    let mut unconfigured = 0usize;
-    // CQ-2 — the legacy routing-side WorkerMessage push (the DEPRECATED
-    // dual-write that clones the accumulator into the worker under a
-    // bucket-sid, in tandem with the Phase-5 SketchStore append above) is
-    // gated OFF by default. The SketchStore `append_sample` path is the
-    // live write; the worker push only matters until the ASAP-tier query
-    // reducer is validated end-to-end, so re-enable it with
-    // `ASAP_LEGACY_DUAL_WRITE=1` rather than paying the clone + double
-    // store on the default path. Read once per Export (cheap), not per DP.
-    let legacy_dual_write = std::env::var("ASAP_LEGACY_DUAL_WRITE")
-        .map(|v| {
-            let v = v.trim();
-            v == "1" || v.eq_ignore_ascii_case("true") || v.eq_ignore_ascii_case("on")
-        })
-        .unwrap_or(false);
-    // Schema-keyed barrier dropped (see `raw_barrier_drops` above);
-    // sid-level barrier in `SketchStore` carries §6.3 going forward.
-    let barrier_drops: HashMap<u64, u64> = HashMap::new();
-    // sids the receiver did not recognize this Export. Returned
-    // to the caller so the gRPC / HTTP handler can stamp them into
-    // `ExportMetricsServiceResponse.unknown_series_ids`. Senders evict
-    // these sids and re-emit with attributes; backend re-resolves and
-    // returns fresh `series_assignments`.
-    let mut unknown_sids: Vec<u64> = Vec::new();
-    // Sid bindings the receiver wants the sender to cache. Populated
-    // every time an attrs-bearing DP is resolved by the
-    // `SeriesIdResolver` (either fresh mint or cache hit). Returned
-    // alongside `unknown_sids` so the gRPC / HTTP handler can stamp
-    // them into `ExportMetricsServiceResponse.series_assignments`.
-    let mut new_assignments: Vec<asap_otel_proto::tonic::collector::metrics::v1::SeriesAssignment> =
-        Vec::new();
-
-    for resource_metrics in &request.resource_metrics {
-        let resource_attrs = resource_metrics
-            .resource
-            .as_ref()
-            .map(|r| attributes_to_map(&r.attributes))
-            .unwrap_or_default();
-
-        for scope_metrics in &resource_metrics.scope_metrics {
-            let scope_attrs = scope_metrics
-                .scope
-                .as_ref()
-                .map(|s| attributes_to_map(&s.attributes))
-                .unwrap_or_default();
-
-            for metric in &scope_metrics.metrics {
-                if metric.name.is_empty() {
-                    continue;
-                }
-
-                let base_labels: HashMap<String, String> = scope_attrs
-                    .iter()
-                    .chain(resource_attrs.iter())
-                    .map(|(k, v)| (k.clone(), v.clone()))
-                    .collect();
-
-                // Each branch yields an iterator-like slice of (kind, attrs,
-                // time_unix_nano, sketch_bytes, encoding_i32) tuples. We
-                // then route each tuple through the same dispatcher.
-                let dps: Vec<ModifiedOtlpSketchDp> = match &metric.data {
-                    Some(Data::Ddsketch(d)) => {
-                        let cfg =
-                            crate::storage_engines::sketch_db::index::SketchConfig::DDSketch {
-                                relative_accuracy: d.relative_accuracy,
-                            };
-                        d.data_points
-                            .iter()
-                            .map(|dp| ModifiedOtlpSketchDp {
-                                algorithm: SketchAlgorithm::DDSketch,
-                                attrs: merge_point_attributes(&base_labels, &dp.attributes),
-                                time_unix_nano: dp.time_unix_nano,
-                                sketch: dp.sketch.clone(),
-                                encoding: dp.encoding,
-                                series_id: dp.series_id,
-                                start_time_unix_nano: dp.start_time_unix_nano,
-                                container_config: cfg.clone(),
-                            })
-                            .collect()
-                    }
-                    Some(Data::Kllsketch(k)) => {
-                        let cfg =
-                            crate::storage_engines::sketch_db::index::SketchConfig::Kll { k: k.k };
-                        k.data_points
-                            .iter()
-                            .map(|dp| ModifiedOtlpSketchDp {
-                                algorithm: SketchAlgorithm::Kll,
-                                attrs: merge_point_attributes(&base_labels, &dp.attributes),
-                                time_unix_nano: dp.time_unix_nano,
-                                sketch: dp.sketch.clone(),
-                                encoding: dp.encoding,
-                                series_id: dp.series_id,
-                                start_time_unix_nano: dp.start_time_unix_nano,
-                                container_config: cfg.clone(),
-                            })
-                            .collect()
-                    }
-                    Some(Data::Countsketch(c)) => {
-                        let cfg =
-                            crate::storage_engines::sketch_db::index::SketchConfig::CountSketch {
-                                rows: c.rows,
-                                cols: c.cols,
-                            };
-                        c.data_points
-                            .iter()
-                            .map(|dp| ModifiedOtlpSketchDp {
-                                algorithm: SketchAlgorithm::CountSketch,
-                                attrs: merge_point_attributes(&base_labels, &dp.attributes),
-                                time_unix_nano: dp.time_unix_nano,
-                                sketch: dp.sketch.clone(),
-                                encoding: dp.encoding,
-                                series_id: dp.series_id,
-                                start_time_unix_nano: dp.start_time_unix_nano,
-                                container_config: cfg.clone(),
-                            })
-                            .collect()
-                    }
-                    Some(Data::Countminsketch(c)) => {
-                        let cfg =
-                            crate::storage_engines::sketch_db::index::SketchConfig::CountMin {
-                                rows: c.rows,
-                                cols: c.cols,
-                            };
-                        c.data_points
-                            .iter()
-                            .map(|dp| ModifiedOtlpSketchDp {
-                                algorithm: SketchAlgorithm::Cms,
-                                attrs: merge_point_attributes(&base_labels, &dp.attributes),
-                                time_unix_nano: dp.time_unix_nano,
-                                sketch: dp.sketch.clone(),
-                                encoding: dp.encoding,
-                                series_id: dp.series_id,
-                                start_time_unix_nano: dp.start_time_unix_nano,
-                                container_config: cfg.clone(),
-                            })
-                            .collect()
-                    }
-                    Some(Data::Hllsketch(h)) => {
-                        let cfg = crate::storage_engines::sketch_db::index::SketchConfig::Hll {
-                            precision: h.precision,
-                        };
-                        h.data_points
-                            .iter()
-                            .map(|dp| ModifiedOtlpSketchDp {
-                                algorithm: SketchAlgorithm::Hll,
-                                attrs: merge_point_attributes(&base_labels, &dp.attributes),
-                                time_unix_nano: dp.time_unix_nano,
-                                sketch: dp.sketch.clone(),
-                                encoding: dp.encoding,
-                                series_id: dp.series_id,
-                                start_time_unix_nano: dp.start_time_unix_nano,
-                                container_config: cfg.clone(),
-                            })
-                            .collect()
-                    }
-                    _ => continue,
-                };
-
-                // Canonicalize the metric name once per metric: strip the
-                // agent-side sketch-family suffix (`_kll`, `_hll`, …) so
-                // the whole ingest pipeline — sid resolution, series-key
-                // snapshot cache, `SummarySeriesMetadata.metric_name`,
-                // `derive_sketch_policy_fp`, and the legacy precompute
-                // router match below — keys on the RAW metric name that
-                // the controller's streaming-config and the query
-                // analyzer speak. Without this the warm-tier sketch
-                // queries can never resolve (see
-                // `canonical_sketch_metric_name` for the full rationale).
-                // All datapoints in one OTLP metric share the same family
-                // (the `metric.data` variant), so the first dp's `kind`
-                // determines the suffix for the whole metric.
-                let canonical_name: String = match dps.first() {
-                    Some(first) => {
-                        canonical_sketch_metric_name(&metric.name, first.algorithm.clone())
-                            .to_string()
-                    }
-                    None => metric.name.clone(),
-                };
-
-                for mut dp in dps {
-                    let frame_identity = if let Some(active) = active_physical_plan.as_ref() {
-                        match take_summary_frame_identity(
-                            &mut dp.attrs,
-                            dp.start_time_unix_nano,
-                            dp.time_unix_nano,
-                        )
-                        .and_then(|frame| {
-                            if state_encoding_for_wire(dp.encoding) != Some(frame.encoding.clone())
-                            {
-                                return Err("wire encoding differs from frame identity".into());
-                            }
-                            active
-                                .transmission_plan
-                                .validate_frame(&frame)
-                                .map_err(|error| error.to_string())?;
-                            Ok(frame)
-                        }) {
-                            Ok(frame) => Some(frame),
-                            Err(error) => unreachable!(
-                                "summary frame changed after successful request preflight: {error}"
-                            ),
-                        }
-                    } else {
-                        None
-                    };
-                    let series_key = bound_sketch_series_key(
-                        &canonical_name,
-                        &dp.attrs,
-                        frame_identity.as_ref(),
-                    );
-                    let ts_ms = (dp.time_unix_nano / 1_000_000) as i64;
-
-                    // Sid resolution — registry-allocated, NOT content-
-                    // addressed. The `SeriesIdResolver` is the single
-                    // authoritative mint for sids in the pipeline: same
-                    // `(metric_name, attrs_fingerprint)` always returns
-                    // the same sid for the lifetime of the resolver's
-                    // cache. Uniqueness is by construction
-                    // (`AtomicU64::fetch_add`); two different identities
-                    // CANNOT share a sid. The content-addressed
-                    // `compute_sketch_sid` path was retired here because
-                    // u64 xxhash gives only probabilistic uniqueness,
-                    // and "unique sid per series" is a contract this
-                    // wire shape needs (the agent omits attrs on
-                    // subsequent emits; the receiver must be able to
-                    // disambiguate `sid → (metric, attrs)`).
-                    //
-                    // Determinism trade-off: sids are NOT stable across
-                    // independent backends, and (without persistence)
-                    // not across backend restarts either. PR-2 of this
-                    // chain wires a WAL-backed `SeriesResolverPersistence`
-                    // trait so the mapping survives restart; without it,
-                    // restart-recovery still works via the
-                    // `unknown_series_ids` eviction primitive (agents
-                    // observe their cached sid is unknown, evict, re-emit
-                    // with attrs, get a fresh assignment).
-                    //
-                    // Four wire cases:
-                    //   (sid=0, attrs)        → resolve (mint or cache
-                    //                           hit); always emit a
-                    //                           `SeriesAssignment` so the
-                    //                           sender caches the binding
-                    //   (sid!=0, attrs)       → resolve; if the resolver's
-                    //                           sid disagrees with the
-                    //                           sender's, push sender's
-                    //                           sid to `unknown_sids`
-                    //                           (sender's cache was stale,
-                    //                           e.g. after a backend
-                    //                           restart without
-                    //                           persistence); always emit a
-                    //                           fresh assignment
-                    //   (sid!=0, no attrs)    → can't resolve without
-                    //                           attrs; accept the sid iff
-                    //                           the SketchStore has it
-                    //                           registered. Unknown → push
-                    //                           to `unknown_sids` and drop
-                    //                           this DP (sender will
-                    //                           re-emit with attrs next
-                    //                           pass)
-                    //   (sid=0, no attrs)     → invalid wire shape, drop
-                    let attrs_pairs: Vec<(&str, &str)> = dp
-                        .attrs
-                        .iter()
-                        .map(|(k, v)| (k.as_str(), v.as_str()))
-                        .collect();
-                    // `canonical_attrs_fingerprint(&[])` is `""` — a valid,
-                    // stable key. The empty-attrs case is therefore NOT a
-                    // reason to skip the resolver (P1-5): a globally-
-                    // aggregated sketch (no resource/scope/DP attrs at all)
-                    // resolves to the stable `(metric, "", agg_kind)` sid
-                    // just like any other series.
-                    let fp = crate::drivers::ingest::canonical_attrs_fingerprint(&attrs_pairs);
-                    // Store-lookup-ONLY path is reserved for the bandwidth-
-                    // saving case: the sender already holds a cached sid and
-                    // deliberately omits attrs on this emit. We cannot
-                    // re-derive its identity (no attrs to fingerprint AND a
-                    // non-zero sid the sender expects us to honor), so we
-                    // accept the sid iff the SketchStore has it registered.
-                    //
-                    // Every OTHER case — including (sid=0, empty attrs),
-                    // i.e. global aggregation — goes through the resolver,
-                    // because `fp=""` is a perfectly good mint/lookup key.
-                    let resolved_sid: Option<u64> = if dp.series_id != 0 && attrs_pairs.is_empty() {
-                        let sid = dp.series_id;
-                        if ingest_state.summary_store.is_current_storage_handle(sid) {
-                            Some(sid)
-                        } else {
-                            unknown_sids.push(sid);
-                            None
-                        }
-                    } else {
-                        // Build the canonical AggKind string for this DP so
-                        // the resolver's cache key is `(metric, fp, agg_kind)`.
-                        // Two DPs over the same (metric, attrs) but different
-                        // sketch algorithms/configs (e.g. DDSketch vs Kll, or two
-                        // DDSketches at different relative_accuracy) get
-                        // SEPARATE sids — matching the identity model the
-                        // retired `compute_sketch_sid` hashed over. For the
-                        // empty-attrs global-aggregation case `fp` is `""`,
-                        // so the resolver mints a single stable sid for
-                        // `(metric, "", agg_kind)`.
-                        //
-                        // P1-4 — sid identity uses the BASE (heap-less)
-                        // family so a heap-bearing frame and a heap-LESS
-                        // frame for the same series share ONE sid. The heap
-                        // is an additive enrichment on the same sketch
-                        // substrate, not a different series; the capability
-                        // UPGRADE below promotes that shared sid's metadata
-                        // when a heap arrives. Without this collapse the two
-                        // frames would mint distinct sids and the upgrade
-                        // could never fire (the analyzer would also see two
-                        // candidates for one logical series).
-                        let definition = frame_identity
-                            .as_ref()
-                            .map(|frame| frame.materialization)
-                            .unwrap_or_else(|| asap_types::PolicyFingerprint(0).into());
-                        let resolved = ingest_state.summary_store.resolve_output_storage_handle(
-                            &ingest_state.series_resolver,
-                            definition,
-                            &fp,
-                            catalog_generation.as_deref(),
-                        );
-                        // Codec-only unit fixtures have no installed plan. Production
-                        // accepts stored summaries only through an installed output.
-                        #[cfg(test)]
-                        let resolved = if catalog_generation.is_none()
-                            && definition.fingerprint().is_unset()
-                        {
-                            let kind = crate::storage_engines::sketch_db::data::AggKind::Sketch {
-                                algorithm: base_sketch_algorithm(sketch_algorithm_for(&dp)),
-                                config: dp.container_config.clone(),
-                                spatial_filter_canonical: String::new(),
-                            };
-                            Ok(ingest_state.series_resolver.resolve(
-                                &canonical_name,
-                                &fp,
-                                &kind.canonical_string(),
-                            ))
-                        } else {
-                            resolved
-                        };
-                        let assigned = match resolved {
-                            Ok(sid) => sid,
-                            Err(error) => {
-                                if dp.series_id != 0 {
-                                    unknown_sids.push(dp.series_id);
-                                }
-                                warn!(%error, "modified OTLP series reactivation rejected");
-                                continue;
-                            }
-                        };
-                        if dp.series_id != 0 && dp.series_id != assigned {
-                            // Sender's cached sid disagrees with the
-                            // resolver's binding — sender's cache is
-                            // stale, signal eviction.
-                            unknown_sids.push(dp.series_id);
-                        }
-                        // Always echo the canonical binding back in
-                        // `series_assignments` so the sender caches it
-                        // (or refreshes a stale entry). The dictionary
-                        // bookkeeping fields beyond
-                        // `(attributes_fingerprint, series_id)` are
-                        // optional today — the patched OTel-Go exporter
-                        // keys its local cache on the fingerprint, not on
-                        // the dictionary metadata. The empty-attrs global
-                        // series echoes an assignment with an empty
-                        // `attributes_fingerprint`, which the exporter
-                        // caches like any other binding.
-                        new_assignments.push(
-                            asap_otel_proto::tonic::collector::metrics::v1::SeriesAssignment {
-                                attributes_fingerprint: fp.as_bytes().to_vec(),
-                                series_id: assigned,
-                                metric_name: metric.name.clone(),
-                                ..Default::default()
-                            },
-                        );
-                        Some(assigned)
-                    };
-                    let Some(sid) = resolved_sid else {
-                        continue;
-                    };
-
-                    if let Some(frame) = frame_identity.as_ref() {
-                        let observed_policy = ingest_state
-                            .summary_store
-                            .instance(sid)
-                            .map(|metadata| metadata.policy_fp)
-                            .unwrap_or_else(|| {
-                                derive_sketch_policy_fp(
-                                    ingest_state,
-                                    &canonical_name,
-                                    sketch_algorithm_for(&dp),
-                                    &dp.container_config,
-                                    &dp.attrs.keys().cloned().collect(),
-                                    Some(frame.materialization),
-                                )
-                            });
-                        if observed_policy != frame.materialization.fingerprint() {
-                            unreachable!(
-                                "materialization changed after successful request preflight"
-                            );
-                        }
-                    }
-
-                    // register a `SummarySeriesMetadata` on
-                    // first sight of `sid` and append this DP's sketch
-                    // state to the per-sid columnar storage. The instance
-                    // is keyed by sid, so subsequent DPs on the same sid
-                    // skip the register step. `group_by_keys` is
-                    // `dp.attrs.keys()` — after the agent's `AggregateBy`
-                    // rollup, `attributes` is the group-by VALUES vector,
-                    // and its key set IS the group-by KEY set.
-                    {
-                        use crate::storage_engines::sketch_db::index::{
-                            AccuracyBound, Capability, SketchAlgorithm, SummarySeriesMetadata,
-                        };
-                        use std::collections::BTreeSet;
-
-                        if ingest_state.summary_store.instance(sid).is_none() {
-                            let algorithm = sketch_algorithm_for(&dp);
-                            let cap = match algorithm {
-                                SketchAlgorithm::DDSketch | SketchAlgorithm::Kll => {
-                                    Capability::QuantileApprox(Some(algorithm.clone()))
-                                }
-                                SketchAlgorithm::Hll | SketchAlgorithm::UnivMon => {
-                                    Capability::CardinalityApprox
-                                }
-                                // Heap-LESS frequency sketches answer bare
-                                // frequency point queries (no top-k); index
-                                // them as FrequencyEstimate so a `topk(...)`
-                                // query routes to archive (or to a different
-                                // sid that carries a heap-bearing variant).
-                                SketchAlgorithm::CountSketch | SketchAlgorithm::Cms => {
-                                    Capability::FrequencyEstimate(Some(algorithm.clone()))
-                                }
-                                // Heap-BEARING frequency sketches answer
-                                // both point-frequency AND top-k. We register
-                                // them under FrequencyTopk (top-k is the
-                                // strongest claim); the analyzer-side
-                                // `is_satisfied_by` for FrequencyEstimate
-                                // explicitly accepts heap-bearing variants,
-                                // so bare-frequency queries still route here.
-                                SketchAlgorithm::CmsWithHeap
-                                | SketchAlgorithm::CountSketchWithHeap => {
-                                    Capability::FrequencyTopk(Some(algorithm.clone()))
-                                }
-                                SketchAlgorithm::Kmv | SketchAlgorithm::Theta => {
-                                    Capability::CardinalityApprox
-                                }
-                            };
-                            let group_by_keys: BTreeSet<String> =
-                                dp.attrs.keys().cloned().collect();
-                            let cfg = dp.container_config.clone();
-                            // Derive the policy fingerprint by content-
-                            // matching the OTLP DP's shape against the
-                            // streaming-config registry. Sketches arrive
-                            // with `(kind, config)` embedded but no policy
-                            // reference; we find the policy whose contents
-                            // produce the same shape. Lookup returns
-                            // `Some(fp)` on a unique match, `None`
-                            // when zero policies match (sketch ingested
-                            // before the streaming-config caught up) or
-                            // when multiple policies match the same shape
-                            // (would have been a sid-collision bug —
-                            // surfaces as an UNSET registration so the
-                            // legacy `instances_matching` walk still
-                            // covers it).
-                            let policy_fp = derive_sketch_policy_fp(
-                                ingest_state,
-                                &canonical_name,
-                                algorithm.clone(),
-                                &cfg,
-                                &group_by_keys,
-                                frame_identity.as_ref().map(|frame| frame.materialization),
-                            );
-                            // Per-item dimension (item_label) the controller threaded
-                            // into the matched policy's parameters — recorded on the sid
-                            // below so the query engine can answer per-item estimate(key)
-                            // (the CMS/CountSketch FrequencyEstimate gate consults it).
-                            let item_label_for_sid: Option<String> = {
-                                snap.get_aggregation_config(policy_fp.into())
-                                    .or_else(|| {
-                                        snap.materializations()
-                                            .values()
-                                            .find(|c| c.metric == canonical_name)
-                                    })
-                                    .and_then(|c| c.parameters.get("item_label"))
-                                    .and_then(|v| v.as_str())
-                                    .filter(|s| !s.is_empty())
-                                    .map(|s| s.to_string())
-                            };
-                            ingest_state.summary_store.register(SummarySeriesMetadata {
-                                storage_handle: sid,
-                                metric_name: canonical_name.clone(),
-                                group_by_keys,
-                                capability: Some(cap),
-                                agg_kind:
-                                    crate::storage_engines::sketch_db::index::AggKind::Sketch {
-                                        algorithm,
-                                        config: cfg.clone(),
-                                        spatial_filter_canonical: String::new(),
-                                    },
-                                accuracy: Some(AccuracyBound::from_config(&cfg)),
-                                first_seen_unix_ms: ts_ms,
-                                retired_at_ms: None,
-                                expires_at_ms: None,
-                                policy_fp,
-                            });
-                            if let Some(label) = &item_label_for_sid {
-                                ingest_state.summary_store.set_item_label(sid, label);
-                            }
-                        } else if let Some(existing) = ingest_state.summary_store.instance(sid) {
-                            // P1-4 (a) — one-way capability UPGRADE. The sid
-                            // was first registered from a non-heap frame
-                            // (PROTO, a delta, or a heap-LESS MSGPACK), so it
-                            // carries `FrequencyEstimate(CountMin|CountSketch)`
-                            // and can never answer `topk(...)`. If a later
-                            // heap-bearing frame arrives for the SAME sid,
-                            // promote it to `FrequencyTopk(*WithHeap)` and
-                            // upgrade its kind handle so the analyzer routes
-                            // top-k queries here. Never downgrades: we only
-                            // act when the current cap is heap-LESS frequency
-                            // and the incoming frame actually carries a heap.
-                            let incoming_algorithm = sketch_algorithm_for(&dp);
-                            let upgrade_to = match (&existing.capability, incoming_algorithm) {
-                                (
-                                    Some(Capability::FrequencyEstimate(Some(SketchAlgorithm::Cms))),
-                                    SketchAlgorithm::CmsWithHeap,
-                                ) => Some(SketchAlgorithm::CmsWithHeap),
-                                (
-                                    Some(Capability::FrequencyEstimate(Some(
-                                        SketchAlgorithm::CountSketch,
-                                    ))),
-                                    SketchAlgorithm::CountSketchWithHeap,
-                                ) => Some(SketchAlgorithm::CountSketchWithHeap),
-                                _ => None,
-                            };
-                            if let Some(new_algorithm) = upgrade_to {
-                                let mut upgraded = (*existing).clone();
-                                upgraded.capability =
-                                    Some(Capability::FrequencyTopk(Some(new_algorithm.clone())));
-                                upgraded.agg_kind =
-                                    crate::storage_engines::sketch_db::index::AggKind::Sketch {
-                                        algorithm: new_algorithm.clone(),
-                                        config: dp.container_config.clone(),
-                                        spatial_filter_canonical: String::new(),
-                                    };
-                                // `register` overwrites the sid-keyed entry
-                                // in place (same sid → same policy/metric
-                                // index slots), so this is an atomic swap to
-                                // the stronger capability.
-                                ingest_state.summary_store.register(upgraded);
-                                debug!(
-                                    "OTLP sketch sid {} upgraded {:?} -> FrequencyTopk({:?}) \
-                                     on heap-bearing frame (metric={}, encoding={})",
-                                    sid,
-                                    SketchAlgorithm::Cms,
-                                    new_algorithm,
-                                    metric.name,
-                                    dp.encoding
-                                );
-                            }
-                        }
-                    }
-
-                    // Encoding dispatch: full frames (PROTO /
-                    // MSGPACK) decode standalone and refresh the
-                    // per-series snapshot cache; delta frames
-                    // (PROTO_DELTA) look up the cached base and
-                    // apply the diff in place. The cache key is the
-                    // series_key — agent-side windowing guarantees
-                    // one in-flight delta per (metric, labels) so
-                    // the next full snapshot replaces the current
-                    // cache entry cleanly.
-                    //
-                    // Per-window base rotation
-                    // (`docs/delta-baseline-contract.md` §3): the edge
-                    // tumbling window resets per-series sketch state
-                    // every window, so each window's delta is that
-                    // window's marginal against an empty base. The
-                    // backend therefore must NOT accumulate forever
-                    // (`state(N) = state(N-1) ⊕ delta(N)`), which would
-                    // over-count across windows. Instead we detect a
-                    // window boundary per series — a change in the data
-                    // point's window start (`start_time_unix_nano`)
-                    // versus the `window_start` stored with the cached
-                    // base — and reset the cached base to empty before
-                    // applying the new window's delta. Within a window
-                    // deltas still accumulate; at a new window the base
-                    // starts fresh, so the reconstructed `state(N)` is
-                    // window N only. Sketch-agnostic: the reset is the
-                    // additive families' (DDSketch / CMS / CountSketch /
-                    // HLL) `AggregateCore::reset_to_empty`; KLL never
-                    // deltas. Full frames keep REPLACE semantics and set
-                    // the stored `window_start`.
-                    let accumulator: Box<dyn AggregateCore> = if dp.encoding == ENCODING_PROTO_DELTA
-                        || dp.encoding == ENCODING_MSGPACK_DELTA
-                    {
-                        let (mut merged, base_window_start) = match ingest_state
-                            .sketch_snapshots
-                            .get(&series_key)
-                            .map(|e| (e.core.clone_boxed_core(), e.window_start))
-                        {
-                            Some(pair) => pair,
-                            None => {
-                                // P1-1/P1-2 — no cached base. Under the
-                                // per-window-reset contract each delta
-                                // reconstructs onto an EMPTY base, so for the
-                                // ADDITIVE families (CMS / CountSketch / HLL)
-                                // we bootstrap an empty accumulator of the
-                                // frame's (kind, config) and apply the delta
-                                // onto it — mirroring the warm-read tier so
-                                // the worker tier agrees and recovers after a
-                                // backend restart (which drops this in-memory
-                                // cache). DDSketch / KLL can't reconstruct
-                                // from a bare delta, so they keep the
-                                // unchanged "drop until the next full frame"
-                                // behavior.
-                                match empty_accumulator_for_delta_bootstrap(
-                                    dp.algorithm.clone(),
-                                    &dp.container_config,
-                                    dp.encoding,
-                                ) {
-                                    Some(empty) => {
-                                        debug!(
-                                            "OTLP delta-sketch with no base \
-                                             bootstrapped onto an empty \
-                                             accumulator (metric={}, \
-                                             series_key={}, kind={:?}, \
-                                             encoding={})",
-                                            metric.name, series_key, dp.algorithm, dp.encoding
-                                        );
-                                        // Treat the freshly-minted empty base
-                                        // as belonging to THIS delta's window
-                                        // so the window-boundary reset below
-                                        // is a no-op (the base is already
-                                        // empty for this window).
-                                        (empty, dp.start_time_unix_nano)
-                                    }
-                                    None => {
-                                        // DD/KLL — unchanged drop. Count as a
-                                        // distinct "no base" drop reason.
-                                        ingest_state
-                                            .observability
-                                            .dropped_no_base
-                                            .fetch_add(1, std::sync::atomic::Ordering::Relaxed);
-                                        decoded_failed += 1;
-                                        debug!(
-                                            "OTLP delta-sketch arrived before any base \
-                                             snapshot and is not bootstrappable \
-                                             (metric={}, series_key={}, kind={:?}); \
-                                             dropping — agent must resend the next full \
-                                             frame",
-                                            metric.name, series_key, dp.algorithm
-                                        );
-                                        continue;
-                                    }
-                                }
-                            }
-                        };
-                        // Window boundary: the incoming delta opens a new
-                        // window for this series. Rotate the base to empty
-                        // so the new window starts fresh (state == this
-                        // window only), keeping the sketch's shape/config
-                        // intact for the additive apply below.
-                        if dp.start_time_unix_nano != base_window_start {
-                            debug!(
-                                "OTLP delta-sketch window boundary (metric={}, \
-                                 series_key={}, prev_window_start={}, \
-                                 new_window_start={}); rotating per-series base",
-                                metric.name, series_key, base_window_start, dp.start_time_unix_nano
-                            );
-                            merged.reset_to_empty();
-                        }
-                        if let Err(e) = apply_modified_otlp_delta_bytes(
-                            dp.algorithm.clone(),
-                            dp.encoding,
-                            &mut merged,
-                            &dp.sketch,
-                        ) {
-                            ingest_state
-                                .observability
-                                .dropped_decode_fail
-                                .fetch_add(1, std::sync::atomic::Ordering::Relaxed);
-                            decoded_failed += 1;
-                            debug!(
-                                "OTLP delta-sketch apply failed \
-                                 (metric={}, kind={:?}, encoding={}, \
-                                 bytes={}): {} — falling through to §5.2 \
-                                 fallback",
-                                metric.name,
-                                dp.algorithm,
-                                dp.encoding,
-                                dp.sketch.len(),
-                                e
-                            );
-                            continue;
-                        }
-                        merged
-                    } else {
-                        match decode_modified_otlp_sketch_bytes(
-                            dp.algorithm.clone(),
-                            dp.encoding,
-                            &dp.sketch,
-                        ) {
-                            Ok(acc) => acc,
-                            Err(e) => {
-                                ingest_state
-                                    .observability
-                                    .dropped_decode_fail
-                                    .fetch_add(1, std::sync::atomic::Ordering::Relaxed);
-                                decoded_failed += 1;
-                                let msg = e.to_string();
-                                // Defensive dim-validation rejections
-                                // (malformed / degenerate CMS / CountSketch
-                                // dims — see `validate_sketch_dims`) signal a
-                                // misbehaving producer, so surface them at
-                                // WARN; ordinary decode fallbacks stay at
-                                // DEBUG to avoid log spam.
-                                if msg.contains("rejecting") {
-                                    warn!(
-                                        "OTLP modified-proto sketch dropped on dim \
-                                         validation (metric={}, kind={:?}, \
-                                         encoding={}, bytes={}): {}",
-                                        metric.name,
-                                        dp.algorithm,
-                                        dp.encoding,
-                                        dp.sketch.len(),
-                                        msg
-                                    );
-                                } else {
-                                    debug!(
-                                        "OTLP modified-proto sketch decode failed \
-                                         (metric={}, kind={:?}, encoding={}, \
-                                         bytes={}): {} — falling through to §5.2 \
-                                         fallback",
-                                        metric.name,
-                                        dp.algorithm,
-                                        dp.encoding,
-                                        dp.sketch.len(),
-                                        msg
-                                    );
-                                }
-                                continue;
-                            }
-                        }
-                    };
-
-                    // Stateful lineage is committed only after the payload
-                    // has decoded successfully. Everything after this gate
-                    // (snapshot replacement and SketchStore insertion) is
-                    // synchronous/infallible, so an HTTP/gRPC success cannot
-                    // acknowledge a sequence whose payload was never applied.
-                    if let Some(frame) = frame_identity.as_ref() {
-                        match ingest_state.observability.frame_lineage.observe(frame) {
-                            Ok(
-                                crate::precompute_engine::frame_lineage::FrameLineageDecision::Apply,
-                            ) => {
-                                if frame.kind
-                                    == asap_types::producer_plan::SummaryFrameKind::Full
-                                {
-                                    ingest_state
-                                        .summary_store
-                                        .clear_summary_lineage_incomplete(sid, frame);
-                                }
-                            }
-                            Ok(
-                                crate::precompute_engine::frame_lineage::FrameLineageDecision::Duplicate,
-                            ) => {
-                                debug!(
-                                    plan_id = frame.plan_id,
-                                    plan_version = frame.plan_version,
-                                    materialization = frame.materialization.as_u64(),
-                                    producer = %frame.producer_id,
-                                    producer_epoch = %frame.producer_epoch,
-                                    sequence = frame.sequence,
-                                    "ignored duplicate summary frame"
-                                );
-                                continue;
-                            }
-                            Err(error) => {
-                                ingest_state
-                                    .summary_store
-                                    .mark_summary_lineage_incomplete(sid, frame);
-                                warn!(
-                                    plan_id = frame.plan_id,
-                                    plan_version = frame.plan_version,
-                                        materialization = frame.materialization.as_u64(),
-                                    producer = %frame.producer_id,
-                                    producer_epoch = %frame.producer_epoch,
-                                    sequence = frame.sequence,
-                                    %error,
-                                    "rejected summary frame lineage"
-                                );
-                                return Err(error.to_string());
-                            }
-                        }
-                    }
-
-                    use crate::storage_engines::sketch_db::index::{
-                        SketchEncoding, SketchSampleState,
-                    };
-                    use std::collections::BTreeMap;
-                    let label_values: BTreeMap<String, String> = dp
-                        .attrs
-                        .iter()
-                        .map(|(key, value)| (key.clone(), value.clone()))
-                        .collect();
-                    let window: crate::storage_engines::sketch_db::index::epoch_columnar::TimestampRange = (
-                        dp.start_time_unix_nano / 1_000_000,
-                        dp.time_unix_nano / 1_000_000,
-                    );
-                    let encoding =
-                        encoding_to_handle(dp.encoding).unwrap_or(SketchEncoding::ProtoFull);
-                    if !ingest_state.summary_store.append_sample(
-                        sid,
-                        label_values,
-                        window,
-                        SketchSampleState {
-                            bytes: dp.sketch.clone(),
-                            encoding,
-                        },
-                    ) {
-                        return Err("summary window is immutable after completion".into());
-                    }
-
-                    ingest_state.sketch_snapshots.insert(
-                        series_key.clone(),
-                        crate::precompute_engine::ingest_handler::SnapshotCacheEntry {
-                            core: accumulator.clone_boxed_core(),
-                            window_start: dp.start_time_unix_nano,
-                        },
-                    );
-                    ingest_state.note_window_and_sweep(dp.start_time_unix_nano);
-
-                    // Collect the configs whose metric matches this DP.
-                    // Detection is independent of the legacy dual-write
-                    // (it only drives the routed/unconfigured accounting),
-                    // so we walk it whether or not the worker push fires.
-                    let matching_configs: Vec<
-                        &asap_types::aggregation_config::PrecomputeMaterialization,
-                    > = agg_configs
-                        .values()
-                        .filter(|config| {
-                            config.metric == canonical_name
-                                || config.spatial_filter_normalized == canonical_name
-                                || config.spatial_filter == canonical_name
-                        })
-                        .collect();
-                    let matched_any = !matching_configs.is_empty();
-
-                    // CQ-2 — only pay the worker push (and the per-config
-                    // sid resolution + accumulator clone) when the legacy
-                    // dual-write is explicitly enabled. The SketchStore
-                    // `append_sample` above is the live write either way.
-                    if legacy_dual_write {
-                        // B7.6 — bucket key is the per-config bucket sid
-                        // (folds in `(metric, grouping-label-values,
-                        // ExactAgg-of-config)`), NOT the per-DP `sid`
-                        // resolved above. The per-DP `sid` keys the
-                        // `SketchStore::register/append_sample` lane
-                        // (which uses `AggKind::Sketch` to distinguish
-                        // sketch shapes); the worker's group_states are
-                        // keyed per-aggregation-policy bucket, which
-                        // matches what `reconcile_from_streaming_config`
-                        // derives from the same config (so retirement /
-                        // orphan eviction stays consistent).
-                        //
-                        // DEPRECATED routing-side write — kept behind the
-                        // `ASAP_LEGACY_DUAL_WRITE` gate until the ASAP-tier
-                        // query reducer is validated end-to-end.
-                        let n = matching_configs.len();
-                        // PERF-2 — carry the owned accumulator so the LAST
-                        // matching config can MOVE it into its message
-                        // instead of cloning. `Some` until consumed; the
-                        // common single-match case pays zero clones.
-                        let mut owned_acc: Option<Box<dyn AggregateCore>> = Some(accumulator);
-                        for (i, config) in matching_configs.iter().enumerate() {
-                            // PERF-4 — group key straight from `dp.attrs`
-                            // (no format_series_key → parse round-trip).
-                            let group_key =
-                                IngestState::extract_group_key_from_labels(&dp.attrs, config);
-                            // PERF-3 — `dp.attrs` is already a
-                            // `HashMap<String, String>`; pass it directly
-                            // instead of rebuilding `attrs_map` per config.
-                            let (bucket_sid, policy_fp) = match resolve_bucket_sid_for_agg_config(
-                                ingest_state,
-                                config,
-                                &dp.attrs,
-                                catalog_generation.as_deref(),
-                            ) {
-                                Ok(binding) => binding,
-                                Err(error) => {
-                                    warn!(%error, "configured ingest series reactivation rejected");
-                                    continue;
-                                }
-                            };
-                            let acc_for_msg = if i + 1 == n {
-                                // Last (or only) match — move the owned
-                                // accumulator out, no clone.
-                                owned_acc.take().expect("owned_acc present on last match")
-                            } else {
-                                // 2nd..Nth match — clone from the still-owned
-                                // accumulator (cloning a sketch is a msgpack
-                                // round-trip, so we only pay it when a DP
-                                // genuinely fans out to multiple policies).
-                                owned_acc
-                                    .as_ref()
-                                    .expect("owned_acc present before last match")
-                                    .clone_boxed_core()
-                            };
-                            messages.push(WorkerMessage::AccumulatorInput {
-                                sid: bucket_sid,
-                                policy_fp,
-                                group_key,
-                                timestamp_ms: ts_ms,
-                                accumulator: acc_for_msg,
-                                ingest_received_at,
-                            });
-                        }
-                    }
-
-                    if matched_any {
-                        routed += 1;
-                    } else {
-                        // CQ-6 — a decoded sketch that matched no
-                        // PrecomputeMaterialization in the running streaming config.
-                        ingest_state
-                            .observability
-                            .dropped_unconfigured
-                            .fetch_add(1, std::sync::atomic::Ordering::Relaxed);
-                        unconfigured += 1;
-                    }
-                }
-            }
-        }
-    }
-
-    flush_barrier_drops(ingest_state, &barrier_drops, "otlp-modified-proto");
-
-    // No lineage-protected store mutation occurs after this point. Do not
-    // carry a synchronous mutex guard across the async worker-queue flush.
-    drop(lineage_batch_guard);
-
-    if !messages.is_empty() {
-        if let Err(e) = ingest_state
-            .router
-            .route_group_batch(messages, ingest_received_at, catalog_generation.clone())
-            .await
-        {
-            warn!("OTLP modified-proto sketch routing error: {}", e);
-        }
-    }
-
-    if routed + decoded_failed + unconfigured > 0 {
-        debug!(
-            "OTLP modified-proto sketch ingest: {} routed, {} decode-failed (fallback), {} unconfigured",
-            routed, decoded_failed, unconfigured
-        );
-    }
-
-    Ok(IngestOutcome {
-        unknown_series_ids: unknown_sids,
-        series_assignments: new_assignments,
-    })
-}
-
-/// Map `SketchAlgorithm` to the corresponding wire-format
-/// `AggregationType`. Inverse direction is in
-/// `sketch_algorithm_for` above. Used by
-/// [`derive_sketch_policy_fp`] to find the policy whose
-/// `PrecomputeMaterialization.aggregation_type` matches a freshly-ingested
-/// sketch.
-///
-/// `Any` is a control-plane analysis-time wildcard — it doesn't
-/// appear on the ingest path. Returns `None` so the policy lookup
-/// fails the (rare) defensive path explicitly.
-fn aggregation_type_for_sketch_algorithm(
-    handle: crate::storage_engines::sketch_db::index::SketchAlgorithm,
-) -> Option<asap_types::AggregationType> {
-    use crate::storage_engines::sketch_db::index::SketchAlgorithm;
-    use asap_types::AggregationType;
-    match handle {
-        SketchAlgorithm::DDSketch => Some(AggregationType::DDSketch),
-        SketchAlgorithm::Kll => Some(AggregationType::DatasketchesKLL),
-        SketchAlgorithm::Hll => Some(AggregationType::HLL),
-        SketchAlgorithm::UnivMon => Some(AggregationType::UnivMon),
-        SketchAlgorithm::CountSketch => Some(AggregationType::CountSketch),
-        SketchAlgorithm::CountSketchWithHeap => Some(AggregationType::CountSketchWithHeap),
-        SketchAlgorithm::Cms => Some(AggregationType::CountMinSketch),
-        SketchAlgorithm::CmsWithHeap => Some(AggregationType::CountMinSketchWithHeap),
-        SketchAlgorithm::Kmv | SketchAlgorithm::Theta => None,
-    }
-}
-
-/// Render a `SketchConfig` into the param map the streaming-config
-/// stores. The control plane authors these as
-/// `parameters: {<name>: <value>}` JSON; the data plane has the
-/// parameters typed in `SketchConfig`. This function converts.
-///
-/// Keys MUST match what the control plane emits (see
-/// `crates/asap_types/src/aggregation_config.rs::from_yaml_data` for
-/// the canonical names). Drift here surfaces as policy lookups that
-/// silently miss.
-fn sketch_config_to_params(
-    cfg: &crate::storage_engines::sketch_db::data::SketchConfig,
-) -> std::collections::HashMap<String, serde_json::Value> {
-    use crate::storage_engines::sketch_db::data::SketchConfig;
-    let mut params = std::collections::HashMap::new();
-    match cfg {
-        SketchConfig::UnivMon {
-            heap_size,
-            sketch_rows,
-            sketch_cols,
-            layers,
-        } => {
-            params.insert("heap_size".into(), serde_json::json!(heap_size));
-            params.insert("sketch_rows".into(), serde_json::json!(sketch_rows));
-            params.insert("sketch_cols".into(), serde_json::json!(sketch_cols));
-            params.insert("layers".into(), serde_json::json!(layers));
-        }
-        SketchConfig::DDSketch { relative_accuracy } => {
-            params.insert(
-                "relative_accuracy".to_string(),
-                serde_json::json!(*relative_accuracy),
-            );
-        }
-        SketchConfig::Kll { k } => {
-            params.insert("k".to_string(), serde_json::json!(*k));
-        }
-        SketchConfig::Hll { precision } => {
-            params.insert("precision".to_string(), serde_json::json!(*precision));
-        }
-        SketchConfig::CountSketch { rows, cols } | SketchConfig::CountMin { rows, cols } => {
-            // Canonical key mapping (matches the controller's
-            // `sketch_params_to_json` in
-            // `control_plane::emit::stage_config`): `w` is the
-            // matrix width (=cols), `d` is the depth (=rows). The
-            // controller writes `{w, d}` into the streaming-config
-            // `parameters`, so the policy_fp content match has to
-            // probe the same keys.
-            params.insert("w".to_string(), serde_json::json!(*cols));
-            params.insert("d".to_string(), serde_json::json!(*rows));
-        }
-    }
-    params
-}
-
-// Snapshot and delta bases are scoped to the producer, never only its semantics.
-fn bound_sketch_series_key(
-    name: &str,
-    labels: &HashMap<String, String>,
-    frame: Option<&asap_types::producer_plan::SummaryFrameIdentity>,
-) -> String {
-    let key = format_series_key(name, labels);
-    match frame {
-        Some(frame) => format!(
-            "{}:{}:{}:{key}",
-            frame.plan_id,
-            frame.plan_version,
-            frame.materialization.as_u64()
-        ),
-        None => key,
-    }
-}
-
-/// Resolve the framed deployed output, then verify its content contract.
-/// Unframed input uses legacy content matching and must have exactly one match.
-/// An absent or ambiguous match returns UNSET and cannot authorize bound writes.
-fn derive_sketch_policy_fp(
-    ingest_state: &IngestState,
-    metric: &str,
-    kind: crate::storage_engines::sketch_db::index::SketchAlgorithm,
-    cfg: &crate::storage_engines::sketch_db::data::SketchConfig,
-    group_by_keys: &std::collections::BTreeSet<String>,
-    bound_output: Option<asap_types::sds::StoredOutputId>,
-) -> asap_types::PolicyFingerprint {
-    let Some(agg_type) = aggregation_type_for_sketch_algorithm(kind) else {
-        return asap_types::PolicyFingerprint::UNSET;
-    };
-    let params = sketch_config_to_params(cfg);
-    let snap = ingest_state.config_snapshot();
-    let registry = snap.policy_registry();
-    let registry = if let Some(output) = bound_output {
-        asap_types::PolicyRegistry::from_configs(registry.get(output.fingerprint()).cloned())
-    } else {
-        registry
-    };
-    let index = asap_types::RoutingIndex::build(registry);
-    index
-        .find_policy_by_content(metric, group_by_keys, agg_type, &params)
-        .unwrap_or(asap_types::PolicyFingerprint::UNSET)
-}
-
-/// Phase 5 helper — map a `ModifiedOtlpSketchDp` to the matching
-/// `SketchAlgorithm` so registration and capability classification
-/// share one source of truth.
-///
-/// CMS-with-heap detection: the OTLP `CountMinSketch` wire struct
-/// itself doesn't carry a top-k heap field (see metrics.proto
-/// `CountMinSketch`/`CountMinSketchDataPoint`). The heap is embedded
-/// inside the msgpack-encoded `CountMinSketchWithHeapSerialized`
-/// payload (an outer `{sketch, topk_heap, heap_size}` wrapper). When
-/// the encoding is MSGPACK and the bytes round-trip via
-/// `CountMinSketchWithHeap::deserialize_msgpack`, we classify the sid
-/// as `CmsWithHeap` so the ASAP-tier reducer can later read the heap
-/// directly for `topk` / `topk_over_time` queries.
-/// Strip the agent-side sketch-family name suffix from an OTLP sketch
-/// metric name, returning the *raw* metric name the controller's
-/// streaming-config policies and user PromQL are keyed on.
-///
-/// ## Why this exists
-///
-/// The ASAPCollector edge pipeline's fused `asapedgeprocessor`
-/// (`processor/asapedgeprocessor/sketch.go`) sets
-/// `MetricSuffix: "_" + family` on every sketch it emits, so a KLL
-/// sketch over `request_size_bytes` arrives on the wire named
-/// `request_size_bytes_kll`, an HLL over `unique_users_per_min` arrives
-/// as `unique_users_per_min_hll`, and so on.
-///
-/// Both the controller (which plans + pushes streaming-config policies
-/// keyed on the *bare* metric `request_size_bytes`) and the query
-/// analyzer (`control_plane::asap_tier_analysis`, which lifts the bare
-/// metric name out of the PromQL selector) speak the bare name. With
-/// the suffix left on, `SummarySeriesMetadata.metric_name` is the
-/// suffixed form, so `SketchIndex::instances_matching(bare, …)` and
-/// `find_matching_policies` / `find_policy_by_content` (all of which
-/// compare `metric_name` for equality) never match — every warm sketch
-/// query (`quantile_over_time`, `count`/HLL, `topk`) capability-misses
-/// and the user sees `data_source: asap_query, "No result"`.
-///
-/// Per `docs/design_docs/series-identity.md`, the summary *family*
-/// is a wire-level attribute (carried here in `agg_kind` /
-/// [`SketchAlgorithm`]), NOT a name suffix; storage + query must be
-/// keyed on the raw SDK metric name. This helper applies that
-/// canonicalization at the ingest seam so the backend resolves
-/// correctly regardless of whether the deployed agent still suffixes.
-///
-/// The strip is gated on the suffix matching the datapoint's *actual*
-/// sketch kind, so a metric a user legitimately named `foo_hll` that
-/// arrives as a KLL sketch is left untouched, and the operation is a
-/// no-op (and therefore safe / idempotent) once agents stop suffixing.
-fn canonical_sketch_metric_name<'a>(name: &'a str, algorithm: SketchAlgorithm) -> &'a str {
-    let suffix: &str = match algorithm {
-        SketchAlgorithm::DDSketch => "_ddsketch",
-        SketchAlgorithm::Kll => "_kll",
-        SketchAlgorithm::Hll => "_hll",
-        SketchAlgorithm::CountSketch => "_countsketch",
-        SketchAlgorithm::Cms => "_countminsketch",
-        // These algorithms do not currently have modified-OTLP
-        // containers in this receiver, so there is no suffix to strip.
-        _ => return name,
-    };
-    // Only strip when there's a non-empty base left over (so a metric
-    // literally named `_kll` is never collapsed to the empty string).
-    match name.strip_suffix(suffix) {
-        Some(base) if !base.is_empty() => base,
-        _ => name,
-    }
-}
-
-/// P1-4 — does this frequency-sketch DataPoint carry a non-empty top-k
-/// heap? Detects the heap on BOTH heap-bearing wire encodings:
-///
-///   * `ENCODING_MSGPACK` — full heap-bearing frame
-///     (`{sketch, topk_heap, heap_size}`); decoded with
-///     `CountMinSketchWithHeap::from_msgpack`.
-///   * `ENCODING_MSGPACK_DELTA` — DELTA-HEAP frame (sparse matrix delta +
-///     the FULL top-k heap); decoded via the heap accumulator's
-///     `from_msgpack_heap_delta_bytes` (the same generic `rmp_serde`
-///     reader the apply path uses). This lets a sid whose FIRST frame is
-///     a delta still be detected as heap-bearing and registered/upgraded
-///     to a top-k capability — part (b) of P1-4.
-///
-/// PROTO / PROTO_DELTA frequency frames don't carry a heap on the wire,
-/// so they always read as heap-LESS here.
-fn dp_carries_heap(dp: &ModifiedOtlpSketchDp) -> bool {
-    match dp.encoding {
-        ENCODING_MSGPACK => {
-            use asap_sketchlib::CountMinSketchWithHeap;
-            CountMinSketchWithHeap::from_msgpack(&dp.sketch)
-                .map(|cms| !cms.topk_heap_items().is_empty())
-                .unwrap_or(false)
-        }
-        ENCODING_MSGPACK_DELTA => {
-            use asap_physical_operators::summary_kernels::CountMinSketchWithHeapAccumulator;
-            CountMinSketchWithHeapAccumulator::from_msgpack_heap_delta_bytes(&dp.sketch)
-                .map(|acc| !acc.inner.topk_heap_items().is_empty())
-                .unwrap_or(false)
-        }
-        _ => false,
-    }
-}
-
-/// P1-4 — collapse a heap-BEARING frequency handle to its heap-LESS base
-/// family. Used for SID IDENTITY so a heap-bearing frame and a heap-less
-/// frame for the same `(metric, attrs, config)` resolve to ONE sid (the
-/// heap is enrichment on the same substrate, not a different series). The
-/// CAPABILITY still tracks the heap via the metadata upgrade path. All
-/// other handles pass through unchanged.
-fn base_sketch_algorithm(
-    kind: crate::storage_engines::sketch_db::index::SketchAlgorithm,
-) -> crate::storage_engines::sketch_db::index::SketchAlgorithm {
-    use crate::storage_engines::sketch_db::index::SketchAlgorithm;
-    match kind {
-        SketchAlgorithm::CmsWithHeap => SketchAlgorithm::Cms,
-        SketchAlgorithm::CountSketchWithHeap => SketchAlgorithm::CountSketch,
-        other => other,
-    }
-}
-
-fn sketch_algorithm_for(
-    dp: &ModifiedOtlpSketchDp,
-) -> crate::storage_engines::sketch_db::index::SketchAlgorithm {
-    use crate::storage_engines::sketch_db::index::SketchAlgorithm;
-    match dp.algorithm.clone() {
-        SketchAlgorithm::DDSketch => SketchAlgorithm::DDSketch,
-        SketchAlgorithm::Kll => SketchAlgorithm::Kll,
-        SketchAlgorithm::Hll => SketchAlgorithm::Hll,
-        SketchAlgorithm::CountSketch => {
-            // Mirror the CountMin branch: CountSketch-with-heap
-            // payloads share the same outer msgpack envelope
-            // (`CountMinSketchWithHeapSerialized` — see the comment
-            // in `sketch_reducer.rs` at the dispatch site, which
-            // notes both heap-bearing variants reuse this wire
-            // shape since the heap is the distinguishing payload).
-            // Auto-promote to `CountSketchWithHeap` when the bytes
-            // decode AND the heap is non-empty; otherwise stay with
-            // vanilla `CountSketch`.
-            if dp_carries_heap(dp) {
-                return SketchAlgorithm::CountSketchWithHeap;
-            }
-            SketchAlgorithm::CountSketch
-        }
-        SketchAlgorithm::Cms => {
-            // Try a no-cost peek: msgpack-encoded CMS-with-heap payloads
-            // round-trip through asap_sketchlib's
-            // `CountMinSketchWithHeap::deserialize_msgpack`. If the
-            // sketch bytes decode against that wrapper *and* the
-            // resulting heap is non-empty, treat the sid as
-            // CmsWithHeap so ASAP-tier `topk` can read the heap.
-            // Otherwise stay with vanilla `CountMin`.
-            if dp_carries_heap(dp) {
-                return SketchAlgorithm::CmsWithHeap;
-            }
-            SketchAlgorithm::Cms
-        }
-        other => other,
-    }
-}
-
-/// Phase 5 helper — translate the wire-format `encoding` integer to the
-/// SketchStore's `SketchEncoding` enum. Returns `None` for the unset
-/// (0) encoding so callers can default to `ProtoFull` (the dominant
-/// case for full-state frames).
-fn encoding_to_handle(
-    encoding: i32,
-) -> Option<crate::storage_engines::sketch_db::index::SketchEncoding> {
-    use crate::storage_engines::sketch_db::index::SketchEncoding;
-    match encoding {
-        ENCODING_PROTO => Some(SketchEncoding::ProtoFull),
-        ENCODING_PROTO_DELTA => Some(SketchEncoding::ProtoDelta),
-        ENCODING_MSGPACK => Some(SketchEncoding::MsgpackFull),
-        ENCODING_MSGPACK_DELTA => Some(SketchEncoding::MsgpackDelta),
-        _ => None,
-    }
-}
-
-/// A single modified-OTLP sketch data point flattened across the five
-/// per-variant data-point types so the routing loop can treat them
-/// uniformly.
-struct ModifiedOtlpSketchDp {
-    algorithm: SketchAlgorithm,
-    attrs: HashMap<String, String>,
-    time_unix_nano: u64,
-    sketch: Vec<u8>,
-    encoding: i32,
-    /// sender-supplied series_id, 0 when unset / first emit.
-    /// Backend's resolver mints a fresh sid when this is 0 with attrs
-    /// populated; pushes the sid into `unknown_series_ids` when this is
-    /// non-zero with empty attrs and the resolver doesn't recognize it.
-    series_id: u64,
-    /// DataPoint-level start of the sketch window. Combined
-    /// with `time_unix_nano` to form the `(start_ms, end_ms)` window
-    /// the SketchStore's columnar storage keys on.
-    start_time_unix_nano: u64,
-    /// sketch-instance configuration lifted off the parent
-    /// container. Drives `SummarySeriesMetadata.sketch_config` and the
-    /// derived `AccuracyBound`.
-    container_config: crate::storage_engines::sketch_db::index::SketchConfig,
-}
-
-/// Validate every first-class summary frame in an OTLP request before the
-/// ingest loop performs any externally visible mutation. The transport
-/// response is therefore the acknowledgement boundary; there is no second
-/// application-level ACK protocol.
-fn preflight_summary_frames(
-    request: &ExportMetricsServiceRequest,
-    ingest_state: &IngestState,
-    active: &crate::storage_engines::types::RuntimePhysicalPlan,
-) -> Result<(), String> {
-    use asap_otel_proto::tonic::metrics::v1::metric::Data;
-
-    fn validate_one(
-        metric_name: &str,
-        mut dp: ModifiedOtlpSketchDp,
-        ingest_state: &IngestState,
-        active: &crate::storage_engines::types::RuntimePhysicalPlan,
-    ) -> Result<asap_types::producer_plan::SummaryFrameIdentity, String> {
-        let canonical_name = canonical_sketch_metric_name(metric_name, dp.algorithm.clone());
-        let frame =
-            take_summary_frame_identity(&mut dp.attrs, dp.start_time_unix_nano, dp.time_unix_nano)?;
-        if state_encoding_for_wire(dp.encoding) != Some(frame.encoding.clone()) {
-            return Err(format!(
-                "summary frame for {metric_name} declares an encoding different from its payload"
-            ));
-        }
-        active
-            .transmission_plan
-            .validate_frame(&frame)
-            .map_err(|error| error.to_string())?;
-
-        if active
-            .precompute_plan
-            .materializations
-            .iter()
-            .any(|config| {
-                config.policy_fingerprint() == frame.materialization.fingerprint()
-                    && !config.population_key_encoding.is_legacy()
-            })
-        {
-            return Err(
-                "canonical population is not supported by modified-OTLP summary routing".into(),
-            );
-        }
-
-        let schema = active
-            .precompute_plan
-            .schemas
-            .iter()
-            .find(|schema| schema.materialization == frame.materialization)
-            .ok_or_else(|| format!("summary frame for {metric_name} has no active schema"))?;
-        if dp.attrs.is_empty() && !schema.group_by.is_empty() {
-            return Err(format!(
-                "summary frame for {metric_name} omits labels required by its grouped schema"
-            ));
-        }
-        let observed_series = if dp.attrs.is_empty() {
-            "<global>".to_string()
-        } else {
-            let pairs: Vec<(&str, &str)> = dp
-                .attrs
-                .iter()
-                .map(|(key, value)| (key.as_str(), value.as_str()))
-                .collect();
-            crate::drivers::ingest::canonical_attrs_fingerprint(&pairs)
-        };
-        if observed_series != frame.series_identity {
-            return Err(format!(
-                "summary frame for {metric_name} declares a series identity different from its labels"
-            ));
-        }
-
-        // A malformed full snapshot must not be discovered after an earlier
-        // frame in the request has already reached SketchStore.
-        if frame.kind == asap_types::producer_plan::SummaryFrameKind::Full {
-            decode_modified_otlp_sketch_bytes(dp.algorithm.clone(), dp.encoding, &dp.sketch)
-                .map_err(|error| format!("invalid full frame for {metric_name}: {error}"))?;
-        } else {
-            let series_key = bound_sketch_series_key(canonical_name, &dp.attrs, Some(&frame));
-            let (mut base, base_window_start) = ingest_state
-                .sketch_snapshots
-                .get(&series_key)
-                .map(|entry| (entry.core.clone_boxed_core(), entry.window_start))
-                .or_else(|| {
-                    empty_accumulator_for_delta_bootstrap(
-                        dp.algorithm.clone(),
-                        &dp.container_config,
-                        dp.encoding,
-                    )
-                    .map(|base| (base, dp.start_time_unix_nano))
-                })
-                .ok_or_else(|| {
-                    format!("delta frame for {metric_name} has no reconstructable base")
-                })?;
-            if base_window_start != dp.start_time_unix_nano {
-                base.reset_to_empty();
-            }
-            apply_modified_otlp_delta_bytes(
-                dp.algorithm.clone(),
-                dp.encoding,
-                &mut base,
-                &dp.sketch,
-            )
-            .map_err(|error| format!("invalid delta frame for {metric_name}: {error}"))?;
-        }
-
-        // Attribute-elided retries can recover the policy from their known
-        // SID. Attribute-bearing frames derive it from the active physical
-        // schema. Either route must agree with the declared materialization.
-        let observed = if dp.series_id != 0 && dp.attrs.is_empty() {
-            ingest_state
-                .summary_store
-                .instance(dp.series_id)
-                .map(|metadata| metadata.policy_fp)
-                .ok_or_else(|| {
-                    format!(
-                        "summary frame for {metric_name} references unknown sid {} without labels",
-                        dp.series_id
-                    )
-                })?
-        } else {
-            derive_sketch_policy_fp(
-                ingest_state,
-                canonical_name,
-                sketch_algorithm_for(&dp),
-                &dp.container_config,
-                &dp.attrs.keys().cloned().collect(),
-                Some(frame.materialization),
-            )
-        };
-        if observed != frame.materialization.fingerprint() {
-            return Err(format!(
-                "summary frame for {metric_name} declares materialization {} but active schema resolves {}",
-                frame.materialization.as_u64(), observed.0
-            ));
-        }
-        Ok(frame)
-    }
-
-    let mut frames = Vec::new();
-    for resource_metrics in &request.resource_metrics {
-        let resource_attrs = resource_metrics
-            .resource
-            .as_ref()
-            .map(|resource| attributes_to_map(&resource.attributes))
-            .unwrap_or_default();
-        for scope_metrics in &resource_metrics.scope_metrics {
-            let scope_attrs = scope_metrics
-                .scope
-                .as_ref()
-                .map(|scope| attributes_to_map(&scope.attributes))
-                .unwrap_or_default();
-            for metric in &scope_metrics.metrics {
-                let base_labels: HashMap<String, String> = scope_attrs
-                    .iter()
-                    .chain(resource_attrs.iter())
-                    .map(|(key, value)| (key.clone(), value.clone()))
-                    .collect();
-                macro_rules! validate_points {
-                    ($points:expr, $algorithm:expr, $config:expr) => {{
-                        let config = $config;
-                        for point in &$points {
-                            frames.push(validate_one(
-                                &metric.name,
-                                ModifiedOtlpSketchDp {
-                                    algorithm: $algorithm,
-                                    attrs: merge_point_attributes(&base_labels, &point.attributes),
-                                    time_unix_nano: point.time_unix_nano,
-                                    sketch: point.sketch.clone(),
-                                    encoding: point.encoding,
-                                    series_id: point.series_id,
-                                    start_time_unix_nano: point.start_time_unix_nano,
-                                    container_config: config.clone(),
-                                },
-                                ingest_state,
-                                active,
-                            )?);
-                        }
-                    }};
-                }
-                match &metric.data {
-                    Some(Data::Ddsketch(data)) => validate_points!(
-                        data.data_points,
-                        SketchAlgorithm::DDSketch,
-                        crate::storage_engines::sketch_db::index::SketchConfig::DDSketch {
-                            relative_accuracy: data.relative_accuracy,
-                        }
-                    ),
-                    Some(Data::Kllsketch(data)) => validate_points!(
-                        data.data_points,
-                        SketchAlgorithm::Kll,
-                        crate::storage_engines::sketch_db::index::SketchConfig::Kll { k: data.k }
-                    ),
-                    Some(Data::Countsketch(data)) => validate_points!(
-                        data.data_points,
-                        SketchAlgorithm::CountSketch,
-                        crate::storage_engines::sketch_db::index::SketchConfig::CountSketch {
-                            rows: data.rows,
-                            cols: data.cols,
-                        }
-                    ),
-                    Some(Data::Countminsketch(data)) => validate_points!(
-                        data.data_points,
-                        SketchAlgorithm::Cms,
-                        crate::storage_engines::sketch_db::index::SketchConfig::CountMin {
-                            rows: data.rows,
-                            cols: data.cols,
-                        }
-                    ),
-                    Some(Data::Hllsketch(data)) => validate_points!(
-                        data.data_points,
-                        SketchAlgorithm::Hll,
-                        crate::storage_engines::sketch_db::index::SketchConfig::Hll {
-                            precision: data.precision,
-                        }
-                    ),
-                    _ => {}
-                }
-            }
-        }
-    }
-    ingest_state
-        .observability
-        .frame_lineage
-        .validate_batch(frames.iter())
-        .map_err(|error| error.to_string())?;
-    Ok(())
-}
-
-fn take_summary_frame_identity(
-    attrs: &mut HashMap<String, String>,
-    window_start_unix_nano: u64,
-    window_end_unix_nano: u64,
-) -> Result<asap_types::producer_plan::SummaryFrameIdentity, String> {
-    use asap_types::producer_plan::{SummaryFrameIdentity, SummaryFrameKind};
-    use control_plane::physical::compiler::StateEncoding;
-
-    fn required(attrs: &mut HashMap<String, String>, key: &str) -> Result<String, String> {
-        attrs
-            .remove(key)
-            .filter(|value| !value.is_empty())
-            .ok_or_else(|| format!("missing {key}"))
-    }
-    fn number(attrs: &mut HashMap<String, String>, key: &str) -> Result<u64, String> {
-        required(attrs, key)?
-            .parse()
-            .map_err(|_| format!("invalid {key}"))
-    }
-
-    let identity_version = u32::try_from(number(attrs, "asap.frame.identity_version")?)
-        .map_err(|_| "invalid asap.frame.identity_version".to_string())?;
-    let plan_id = number(attrs, "asap.frame.plan_id")?;
-    let plan_version = number(attrs, "asap.frame.plan_version")?;
-    let backend_compat = required(attrs, "asap.frame.backend_compat")?;
-    let materialization =
-        asap_types::PolicyFingerprint(number(attrs, "asap.frame.materialization")?);
-    let series_identity = required(attrs, "asap.frame.series_identity")?;
-    let schema_id = required(attrs, "asap.frame.schema_id")?;
-    let producer_id = required(attrs, "asap.frame.producer_id")?;
-    let producer_epoch = required(attrs, "asap.frame.producer_epoch")?;
-    let sequence = number(attrs, "asap.frame.sequence")?;
-    let kind = match required(attrs, "asap.frame.kind")?.as_str() {
-        "full" => SummaryFrameKind::Full,
-        "delta" => SummaryFrameKind::Delta,
-        _ => return Err("invalid asap.frame.kind".into()),
-    };
-    let encoding = match required(attrs, "asap.frame.encoding")?.as_str() {
-        "sketchlib_protobuf_v1" => StateEncoding::SketchlibProtobufV1,
-        "sketch_core_msgpack_v1" => StateEncoding::SketchCoreMsgpackV1,
-        "exact_accumulator_v1" => StateEncoding::ExactAccumulatorV1,
-        _ => return Err("invalid asap.frame.encoding".into()),
-    };
-    let checkpoint_id = attrs
-        .remove("asap.frame.checkpoint_id")
-        .filter(|value| !value.is_empty());
-    let base_checkpoint_id = attrs
-        .remove("asap.frame.base_checkpoint_id")
-        .filter(|value| !value.is_empty());
-
-    Ok(SummaryFrameIdentity {
-        identity_version,
-        plan_id,
-        plan_version,
-        backend_compat,
-        materialization: materialization.into(),
-        series_identity,
-        schema_id,
-        producer_id,
-        producer_epoch,
-        window_start_unix_nano,
-        window_end_unix_nano,
-        sequence,
-        kind,
-        encoding,
-        checkpoint_id,
-        base_checkpoint_id,
-    })
-}
-
-fn state_encoding_for_wire(encoding: i32) -> Option<asap_types::precompute_plan::StateEncoding> {
-    use asap_types::precompute_plan::StateEncoding;
-    match encoding {
-        ENCODING_PROTO | ENCODING_PROTO_DELTA => Some(StateEncoding::SketchlibProtobufV1),
-        ENCODING_MSGPACK | ENCODING_MSGPACK_DELTA => Some(StateEncoding::SketchCoreMsgpackV1),
-        _ => None,
-    }
-}
-
-/// Decode the typed `sketch` bytes from a modified-OTLP
-/// `*SketchDataPoint` into a concrete `AggregateCore`.
-///
-/// Dispatches on the `(SketchAlgorithm, encoding)` pair. For each
-/// `(algorithm, _ENCODING_PROTO)` pair we call the matching accumulator's
-/// `from_sketchlib_proto_bytes` constructor. Variants without a
-/// constructor today return `Err`; the caller falls through to §5.2
-/// fallback so the user still gets a correct answer. Per-variant
-/// decoders are tracked in PR C (task #8) and PR I (task #14, for
-/// `_ENCODING_MSGPACK` parity).
-fn decode_modified_otlp_sketch_bytes(
-    algorithm: SketchAlgorithm,
-    encoding: i32,
-    bytes: &[u8],
-) -> Result<Box<dyn AggregateCore>, Box<dyn std::error::Error>> {
-    use asap_physical_operators::summary_kernels::{
-        CountMinSketchAccumulator, CountSketchAccumulator, DDSketchAccumulator,
-        DatasketchesKLLAccumulator, HllSketchAccumulator,
-    };
-
-    // The encoding value is the raw i32 from the per-sketch encoding
-    // enum. All five sketch variants share the same wire tag layout:
-    //
-    //   1  — ENCODING_PROTO          (full sketchlib proto state)
-    //   2  — ENCODING_PROTO_DELTA    (sparse diff vs caller's base
-    //                                 snapshot — apply via
-    //                                 `apply_modified_otlp_delta_bytes`;
-    //                                 not standalone-decodable)
-    //   3  — ENCODING_MSGPACK        (full sketch-core msgpack state)
-    //   4  — ENCODING_MSGPACK_DELTA  (MSGPACK diff; not yet wired)
-
-    match encoding {
-        ENCODING_PROTO => match algorithm {
-            // The neutral codec accepts both full envelopes and supported bare
-            // states. Query accumulators retain their family-specific readouts.
-            SketchAlgorithm::DDSketch => {
-                let (inner, sample_p) = asap_sketch_codec::reconstruct_ddsketch(bytes)?;
-                let sample_p = if sample_p.is_finite() && sample_p > 0.0 && sample_p < 1.0 {
-                    sample_p
-                } else {
-                    1.0
-                };
-                Ok(Box::new(DDSketchAccumulator { inner, sample_p }))
-            }
-            SketchAlgorithm::Kll => Ok(Box::new(
-                DatasketchesKLLAccumulator::from_sketchlib_proto_bytes(bytes)?,
-            )),
-            SketchAlgorithm::Cms => Ok(Box::new(
-                CountMinSketchAccumulator::from_sketchlib_proto_bytes(bytes)?,
-            )),
-            SketchAlgorithm::CountSketch => Ok(Box::new(
-                CountSketchAccumulator::from_sketchlib_proto_bytes(bytes)?,
-            )),
-            SketchAlgorithm::Hll => Ok(Box::new(HllSketchAccumulator::from_sketchlib_proto_bytes(
-                bytes,
-            )?)),
-            other => {
-                Err(format!("modified-OTLP PROTO decoding is not implemented for {other:?}").into())
-            }
-        },
-        ENCODING_MSGPACK => match algorithm {
-            SketchAlgorithm::Cms => Ok(Box::new(CountMinSketchAccumulator::from_msgpack_bytes(
-                bytes,
-            )?)),
-            SketchAlgorithm::CountSketch => {
-                // Heap-bearing CountSketch full frame: the bytes are the
-                // `{sketch,topk_heap,heap_size}` envelope (a DIFFERENT inner
-                // field order than the plain CountSketch msgpack), so
-                // `CountSketch::from_msgpack` can't parse it. Try the heap
-                // decode FIRST when the heap is non-empty (the same promotion
-                // gate `sketch_algorithm_for` uses); cache THAT heap
-                // accumulator as the per-series base so a later MSGPACK_DELTA
-                // frame applies its matrix delta + heap onto a heap
-                // accumulator. Fall back to the plain CountSketch decode for
-                // heap-less msgpack frames (byte-parity path, PR I).
-                //
-                // Uses the real `CountSketchWithHeap` (median-of-signed-rows),
-                // NOT `CountMinSketchWithHeap` — the two share the same wire
-                // envelope shape (structural peek only), but decoding a real
-                // CountSketch's matrix through the CMS wrapper would silently
-                // apply CMS's min-of-rows math to CountSketch data forever
-                // after (the same conflation bug fixed on the write side in
-                // `accumulator_factory.rs`).
-                use asap_sketchlib::CountSketchWithHeap;
-                if let Ok(heap) = CountSketchWithHeap::from_msgpack(bytes) {
-                    if !heap.topk_heap_items().is_empty() {
-                        use asap_physical_operators::summary_kernels::CountSketchWithHeapAccumulator;
-                        return Ok(Box::new(
-                            CountSketchWithHeapAccumulator::from_msgpack_with_heap_bytes(bytes)?,
-                        ));
-                    }
-                }
-                Ok(Box::new(CountSketchAccumulator::from_msgpack_bytes(bytes)?))
-            }
-            SketchAlgorithm::Kll => Ok(Box::new(DatasketchesKLLAccumulator::from_msgpack_bytes(
-                bytes,
-            )?)),
-            SketchAlgorithm::DDSketch => {
-                Ok(Box::new(DDSketchAccumulator::from_msgpack_bytes(bytes)?))
-            }
-            SketchAlgorithm::Hll => Ok(Box::new(HllSketchAccumulator::from_msgpack_bytes(bytes)?)),
-            other => Err(format!(
-                "modified-OTLP MSGPACK decoding is not implemented for {other:?}"
-            )
-            .into()),
-        },
-        ENCODING_PROTO_DELTA => Err(format!(
-            "sketch encoding PROTO_DELTA (2) is not standalone-decodable — \
-             it carries only a diff against the caller's base snapshot. \
-             Caller must route these through \
-             `apply_modified_otlp_delta_bytes` with a cached accumulator; \
-             this decoder is for full-state frames only."
-        )
-        .into()),
-        ENCODING_MSGPACK_DELTA => Err(format!(
-            "sketch encoding MSGPACK_DELTA (4) deferred — PR G wires \
-             PROTO_DELTA only; msgpack delta is a follow-up."
-        )
-        .into()),
-        _ => Err(format!(
-            "unknown modified-OTLP sketch encoding {encoding} \
-             (expected 1 / 2 / 3 / 4)"
-        )
-        .into()),
-    }
-}
-
-/// P1-1/P1-2 — construct an EMPTY accumulator matching a sketch
-/// DataPoint's `(kind, container_config)`, for bootstrapping a delta
-/// frame that arrives with no cached base.
-///
-/// Under the per-window-reset contract (`docs/delta-baseline-contract.md`
-/// §3) each window's delta encodes that window's own state against an
-/// EMPTY base. So a leading delta (no prior full frame — e.g. the very
-/// first frame for a sid, or the first frame after a backend restart
-/// dropped the in-memory snapshot cache) is reconstructable for the
-/// ADDITIVE families by `empty(dims) + apply(delta)`. This mirrors the
-/// warm-read tier's standalone delta reconstruction so the worker tier
-/// agrees with it and recovers after restart, instead of dropping the
-/// delta.
-///
-/// Returns `None` for families that CANNOT reconstruct from a bare delta
-/// (DDSketch and KLL): DDSketch deltas are bucket-index diffs whose
-/// absolute store layout depends on the base's offset, and KLL never
-/// deltas. Those keep the unchanged "drop until the next full frame"
-/// behavior.
-fn empty_accumulator_for_delta_bootstrap(
-    algorithm: SketchAlgorithm,
-    config: &crate::storage_engines::sketch_db::index::SketchConfig,
-    encoding: i32,
-) -> Option<Box<dyn AggregateCore>> {
-    use crate::storage_engines::sketch_db::index::SketchConfig;
-    use asap_physical_operators::summary_kernels::{
-        CountMinSketchAccumulator, CountSketchAccumulator, CountSketchWithHeapAccumulator,
-        HllSketchAccumulator,
-    };
-
-    match (algorithm, config) {
-        (SketchAlgorithm::Hll, SketchConfig::Hll { precision }) => {
-            use asap_sketchlib::HllVariant;
-            // Regular is the default agent variant; HLL's additive delta
-            // merge tolerates an empty same-precision base.
-            Some(Box::new(HllSketchAccumulator::new(
-                HllVariant::Regular,
-                *precision,
-            )))
-        }
-        (SketchAlgorithm::Cms, SketchConfig::CountMin { rows, cols }) => Some(Box::new(
-            CountMinSketchAccumulator::new(*rows as usize, *cols as usize),
-        )),
-        (SketchAlgorithm::CountSketch, SketchConfig::CountSketch { rows, cols }) => {
-            // A heap-bearing DELTA-HEAP frame must reconstruct onto a heap
-            // accumulator (the apply path downcasts to
-            // `CountSketchWithHeapAccumulator`); a plain matrix delta
-            // reconstructs onto a vanilla CountSketch. Pick the base shape
-            // from the encoding so the subsequent
-            // `apply_modified_otlp_delta_bytes` downcast succeeds.
-            if encoding == ENCODING_MSGPACK_DELTA {
-                // heap_size 0 is fine — the DELTA-HEAP apply REPLACES the
-                // heap wholesale from the frame's full heap.
-                Some(Box::new(CountSketchWithHeapAccumulator::new(
-                    *rows as usize,
-                    *cols as usize,
-                    0,
-                )))
-            } else {
-                Some(Box::new(CountSketchAccumulator::new(
-                    *rows as usize,
-                    *cols as usize,
-                )))
-            }
-        }
-        // DDSketch / KLL (and any config/kind mismatch) — not
-        // reconstructable from a bare delta. Caller keeps the unchanged
-        // drop behavior.
-        _ => None,
-    }
-}
-
-// Shared constants — exposed at module scope so both the full-state
-// decoder and the delta applier match on the same values.
-const ENCODING_PROTO: i32 = 1;
-const ENCODING_PROTO_DELTA: i32 = 2;
-const ENCODING_MSGPACK: i32 = 3;
-const ENCODING_MSGPACK_DELTA: i32 = 4;
-
-/// Apply a modified-OTLP `*SketchDataPoint.sketch` delta frame onto an
-/// existing accumulator.
-///
-/// Paper §6.2 B3 / B4 sketch delta-transmission: the agent sends a
-/// sparse diff against its last-flushed snapshot. The backend keeps a
-/// per-series accumulator around, and on arrival of a delta frame
-/// dispatches here to merge the diff in place.
-///
-/// The caller owns the per-series snapshot cache — this dispatcher is
-/// stateless. Today wires `PROTO_DELTA` for DDSketch + HLL (the two
-/// delta-capable sketches in `sketchlib-go`); `MSGPACK_DELTA` and the
-/// KLL/CountSketch/CountMinSketch deltas are deferred to follow-ups
-/// as their delta codecs land.
-pub(crate) fn apply_modified_otlp_delta_bytes(
-    algorithm: SketchAlgorithm,
-    encoding: i32,
-    existing: &mut Box<dyn AggregateCore>,
-    bytes: &[u8],
-) -> Result<(), Box<dyn std::error::Error>> {
-    use asap_physical_operators::summary_kernels::{
-        CountMinSketchAccumulator, CountSketchAccumulator, CountSketchWithHeapAccumulator,
-        DDSketchAccumulator, HllSketchAccumulator,
-    };
-
-    match (encoding, algorithm) {
-        (ENCODING_PROTO_DELTA, SketchAlgorithm::DDSketch) => {
-            let dd = existing
-                .as_any_mut()
-                .downcast_mut::<DDSketchAccumulator>()
-                .ok_or(
-                    "apply_modified_otlp_delta_bytes: existing accumulator is \
-                     not a DDSketchAccumulator",
-                )?;
-            dd.apply_proto_delta_bytes(bytes)
-        }
-        (ENCODING_PROTO_DELTA, SketchAlgorithm::Hll) => {
-            let hll = existing
-                .as_any_mut()
-                .downcast_mut::<HllSketchAccumulator>()
-                .ok_or(
-                    "apply_modified_otlp_delta_bytes: existing accumulator is \
-                     not an HllSketchAccumulator",
-                )?;
-            hll.apply_proto_delta_bytes(bytes)
-        }
-        (ENCODING_PROTO_DELTA, SketchAlgorithm::CountSketch) => {
-            let cs = existing
-                .as_any_mut()
-                .downcast_mut::<CountSketchAccumulator>()
-                .ok_or(
-                    "apply_modified_otlp_delta_bytes: existing accumulator is \
-                     not a CountSketchAccumulator",
-                )?;
-            cs.apply_proto_delta_bytes(bytes)
-        }
-        (ENCODING_PROTO_DELTA, SketchAlgorithm::Cms) => {
-            let cms = existing
-                .as_any_mut()
-                .downcast_mut::<CountMinSketchAccumulator>()
-                .ok_or(
-                    "apply_modified_otlp_delta_bytes: existing accumulator is \
-                     not a CountMinSketchAccumulator",
-                )?;
-            cms.apply_proto_delta_bytes(bytes)
-        }
-        (ENCODING_PROTO_DELTA, other) => Err(format!(
-            "PROTO_DELTA for sketch kind {other:?} is not yet supported; \
-             DDSketch / HLL / CountSketch / CountMin are wired"
-        )
-        .into()),
-        (ENCODING_MSGPACK_DELTA, SketchAlgorithm::CountSketch) => {
-            // DELTA-HEAP frame for the heap-bearing CountSketch: a sparse
-            // signed matrix delta + the full top-k heap. The cached base is
-            // a heap accumulator (window-1 full frame decoded via
-            // `from_msgpack_with_heap_bytes`); under the per-window-reset
-            // model the ingest caller has already reset it to empty at a
-            // window boundary, so applying the delta reconstructs the
-            // window's own matrix and replaces the heap. Decoded generically
-            // in `apply_msgpack_heap_delta_bytes` (rmp_serde, no
-            // `asap_sketchlib` delta API). Real `CountSketchWithHeapAccumulator`
-            // (median-of-signed-rows), not the CMS-family wrapper.
-            let heap = existing
-                .as_any_mut()
-                .downcast_mut::<CountSketchWithHeapAccumulator>()
-                .ok_or(
-                    "apply_modified_otlp_delta_bytes: existing accumulator is \
-                     not a CountSketchWithHeapAccumulator (heap-bearing \
-                     CountSketch delta requires a heap base — the window-1 \
-                     full frame must have promoted the sid)",
-                )?;
-            heap.apply_msgpack_heap_delta_bytes(bytes)
-        }
-        (ENCODING_MSGPACK_DELTA, other) => Err(format!(
-            "MSGPACK_DELTA for sketch kind {other:?} is not yet wired; only \
-             the heap-bearing CountSketch DELTA-HEAP frame is supported"
-        )
-        .into()),
-        (ENCODING_PROTO, _) | (ENCODING_MSGPACK, _) => Err(format!(
-            "encoding {encoding} is a full-state frame — route through \
-             `decode_modified_otlp_sketch_bytes` and replace the cached \
-             accumulator, not through the delta applier"
-        )
-        .into()),
-        (other, _) => Err(format!("unknown modified-OTLP sketch encoding {other}").into()),
-    }
-}
-
-/// Identify the concrete sketch type inside a `SketchEnvelope` payload,
-/// returning a human-readable name for logging. Returns `"Unknown"` if the
-/// payload does not decode or the `sketch_state` variant is unset.
-fn identify_sketch_type(payload: &[u8]) -> &'static str {
-    match SketchEnvelope::decode(payload) {
-        Ok(env) => match env.sketch_state {
-            Some(sketch_envelope::SketchState::Kll(_)) => "KLL",
-            Some(sketch_envelope::SketchState::CountMin(_)) => "CountMin",
-            Some(sketch_envelope::SketchState::CountSketch(_)) => "CountSketch",
-            Some(_) => "Other",
-            None => "Unknown",
-        },
-        Err(_) => "Unknown",
-    }
-}
-
-/// Count total data points by traversing resource_metrics -> scope_metrics -> metrics.
-/// Reuses the same conversion traversal as asap-otel-ingest (Gauge, Sum, Histogram, etc.).
-fn otlp_to_record_count(request: &ExportMetricsServiceRequest) -> usize {
-    let mut count = 0;
-    for resource_metrics in &request.resource_metrics {
-        for scope_metrics in &resource_metrics.scope_metrics {
-            for metric in &scope_metrics.metrics {
-                if metric.name.is_empty() {
-                    continue;
-                }
-
-                use asap_otel_proto::tonic::metrics::v1::metric::Data;
-                match &metric.data {
-                    Some(Data::Gauge(g)) => count += g.data_points.len(),
-                    Some(Data::Sum(s)) => count += s.data_points.len(),
-                    Some(Data::Histogram(hist)) => {
-                        for dp in &hist.data_points {
-                            if dp.sum.is_some() {
-                                count += 1;
-                            }
-                            count += 1; // _count
-                            count += dp.bucket_counts.len(); // _bucket per le
-                        }
-                    }
-                    Some(Data::ExponentialHistogram(eh)) => {
-                        for dp in &eh.data_points {
-                            if dp.sum.is_some() {
-                                count += 1;
-                            }
-                            count += 1; // _count
-                            count += 1; // _scale
-                        }
-                    }
-                    Some(Data::Summary(summary)) => {
-                        for dp in &summary.data_points {
-                            count += 1; // _sum
-                            count += 1; // _count
-                            count += dp.quantile_values.len();
-                        }
-                    }
-                    Some(Data::Ddsketch(d)) => count += d.data_points.len(),
-                    Some(Data::Kllsketch(k)) => count += k.data_points.len(),
-                    Some(Data::Countsketch(c)) => count += c.data_points.len(),
-                    Some(Data::Countminsketch(c)) => count += c.data_points.len(),
-                    Some(Data::Hllsketch(h)) => count += h.data_points.len(),
-                    Some(Data::SumAgg(sa)) => count += sa.data_points.len(),
-                    None => {}
-                }
-            }
-        }
-    }
-    count
-}
-
-/// Parse OTLP request and convert to metric data points (name, labels, timestamp, value).
-/// Data points with sketch payloads in attributes are excluded from points and returned
-/// separately for Sketch Payload Flow processing.
-fn otlp_to_metric_points_and_sketches(request: &ExportMetricsServiceRequest) -> OtlpParseResult {
-    let mut points = Vec::new();
-    let mut sketch_payloads = Vec::new();
-    for resource_metrics in &request.resource_metrics {
-        let resource_attrs = resource_metrics
-            .resource
-            .as_ref()
-            .map(|r| attributes_to_map(&r.attributes))
-            .unwrap_or_default();
-
-        for scope_metrics in &resource_metrics.scope_metrics {
-            let scope_attrs = scope_metrics
-                .scope
-                .as_ref()
-                .map(|s| attributes_to_map(&s.attributes))
-                .unwrap_or_default();
-
-            for metric in &scope_metrics.metrics {
-                if metric.name.is_empty() {
-                    continue;
-                }
-
-                let base_labels: HashMap<String, String> = scope_attrs
-                    .iter()
-                    .chain(resource_attrs.iter())
-                    .map(|(k, v)| (k.clone(), v.clone()))
-                    .collect();
-
-                use asap_otel_proto::tonic::metrics::v1::metric::Data;
-                match &metric.data {
-                    Some(Data::Gauge(g)) => {
-                        for dp in &g.data_points {
-                            if let Some((attr_name, payload)) =
-                                get_sketch_payload_from_attrs(&dp.attributes)
-                            {
-                                sketch_payloads.push(SketchPoint {
-                                    name: metric.name.clone(),
-                                    attr_name,
-                                    labels: merge_point_attributes(&base_labels, &dp.attributes),
-                                    timestamp_nanos: dp.time_unix_nano,
-                                    payload,
-                                });
-                                continue;
-                            }
-                            let labels = merge_point_attributes(&base_labels, &dp.attributes);
-                            let value = number_value_to_f64(&dp.value);
-                            points.push(MetricPoint {
-                                name: metric.name.clone(),
-                                labels,
-                                timestamp_nanos: dp.time_unix_nano,
-                                value,
-                            });
-                        }
-                    }
-                    Some(Data::Sum(s)) => {
-                        for dp in &s.data_points {
-                            if let Some((attr_name, payload)) =
-                                get_sketch_payload_from_attrs(&dp.attributes)
-                            {
-                                sketch_payloads.push(SketchPoint {
-                                    name: metric.name.clone(),
-                                    attr_name,
-                                    labels: merge_point_attributes(&base_labels, &dp.attributes),
-                                    timestamp_nanos: dp.time_unix_nano,
-                                    payload,
-                                });
-                                continue;
-                            }
-                            let labels = merge_point_attributes(&base_labels, &dp.attributes);
-                            let value = number_value_to_f64(&dp.value);
-                            points.push(MetricPoint {
-                                name: metric.name.clone(),
-                                labels,
-                                timestamp_nanos: dp.time_unix_nano,
-                                value,
-                            });
-                        }
-                    }
-                    Some(Data::SumAgg(sa)) => {
-                        // First-class Sum AggregationType: each data point carries
-                        // a SumState envelope ({sum,count}) in `sketch`. Decode it
-                        // and feed the sum as a MetricPoint into the SAME
-                        // ExactAgg(Sum) path as a plain delta Sum — the backend sums
-                        // the per-window/per-shard partials for the same sid.
-                        for dp in &sa.data_points {
-                            let value = match asap_physical_operators::summary_kernels::sum::SumAccumulator::from_sum_bytes(&dp.sketch) {
-                                Ok(acc) => acc.sum,
-                                Err(e) => {
-                                    debug!("asap_edge: SumAgg data point decode failed (skipping): {e}");
-                                    continue;
-                                }
-                            };
-                            let labels = merge_point_attributes(&base_labels, &dp.attributes);
-                            points.push(MetricPoint {
-                                name: metric.name.clone(),
-                                labels,
-                                timestamp_nanos: dp.time_unix_nano,
-                                value,
-                            });
-                        }
-                    }
-                    Some(Data::Histogram(hist)) => {
-                        for dp in &hist.data_points {
-                            if let Some((attr_name, payload)) =
-                                get_sketch_payload_from_attrs(&dp.attributes)
-                            {
-                                sketch_payloads.push(SketchPoint {
-                                    name: metric.name.clone(),
-                                    attr_name,
-                                    labels: merge_point_attributes(&base_labels, &dp.attributes),
-                                    timestamp_nanos: dp.time_unix_nano,
-                                    payload,
-                                });
-                                continue;
-                            }
-                            let labels = merge_point_attributes(&base_labels, &dp.attributes);
-                            if let Some(sum) = dp.sum {
-                                points.push(MetricPoint {
-                                    name: format!("{}_sum", metric.name),
-                                    labels: labels.clone(),
-                                    timestamp_nanos: dp.time_unix_nano,
-                                    value: sum,
-                                });
-                            }
-                            points.push(MetricPoint {
-                                name: format!("{}_count", metric.name),
-                                labels: labels.clone(),
-                                timestamp_nanos: dp.time_unix_nano,
-                                value: dp.count as f64,
-                            });
-                        }
-                    }
-                    Some(Data::ExponentialHistogram(eh)) => {
-                        for dp in &eh.data_points {
-                            if let Some((attr_name, payload)) =
-                                get_sketch_payload_from_attrs(&dp.attributes)
-                            {
-                                sketch_payloads.push(SketchPoint {
-                                    name: metric.name.clone(),
-                                    attr_name,
-                                    labels: merge_point_attributes(&base_labels, &dp.attributes),
-                                    timestamp_nanos: dp.time_unix_nano,
-                                    payload,
-                                });
-                                continue;
-                            }
-                            let labels = merge_point_attributes(&base_labels, &dp.attributes);
-                            if let Some(sum) = dp.sum {
-                                points.push(MetricPoint {
-                                    name: format!("{}_sum", metric.name),
-                                    labels: labels.clone(),
-                                    timestamp_nanos: dp.time_unix_nano,
-                                    value: sum,
-                                });
-                            }
-                            points.push(MetricPoint {
-                                name: format!("{}_count", metric.name),
-                                labels: labels.clone(),
-                                timestamp_nanos: dp.time_unix_nano,
-                                value: dp.count as f64,
-                            });
-                        }
-                    }
-                    Some(Data::Summary(sm)) => {
-                        for dp in &sm.data_points {
-                            if let Some((attr_name, payload)) =
-                                get_sketch_payload_from_attrs(&dp.attributes)
-                            {
-                                sketch_payloads.push(SketchPoint {
-                                    name: metric.name.clone(),
-                                    attr_name,
-                                    labels: merge_point_attributes(&base_labels, &dp.attributes),
-                                    timestamp_nanos: dp.time_unix_nano,
-                                    payload,
-                                });
-                                continue;
-                            }
-                            let labels = merge_point_attributes(&base_labels, &dp.attributes);
-                            points.push(MetricPoint {
-                                name: format!("{}_sum", metric.name),
-                                labels: labels.clone(),
-                                timestamp_nanos: dp.time_unix_nano,
-                                value: dp.sum,
-                            });
-                            points.push(MetricPoint {
-                                name: format!("{}_count", metric.name),
-                                labels: labels.clone(),
-                                timestamp_nanos: dp.time_unix_nano,
-                                value: dp.count as f64,
-                            });
-                        }
-                    }
-                    // Modified-OTLP first-class sketch metric variants
-                    // (Ddsketch / Kllsketch / Countsketch / Countminsketch /
-                    // Hllsketch) and `None` are not handled here: this
-                    // function only parses raw scalar metric points and
-                    // attribute-embedded `SketchEnvelope` payloads. The
-                    // first-class sketch DataPoints are decoded + routed by
-                    // `route_modified_otlp_sketches_to_precompute`, so we
-                    // intentionally ignore them in this parse pass.
-                    _ => {}
-                }
-            }
-        }
-    }
-    (points, sketch_payloads)
-}
-
-fn merge_point_attributes(
-    base: &HashMap<String, String>,
-    attrs: &[asap_otel_proto::tonic::common::v1::KeyValue],
-) -> HashMap<String, String> {
-    let mut m = base.clone();
-    for (k, v) in attributes_to_map(attrs) {
-        m.insert(k, v);
-    }
-    m
-}
-
-fn number_value_to_f64(v: &Option<NumberValue>) -> f64 {
-    match v {
-        Some(NumberValue::AsDouble(x)) => *x,
-        Some(NumberValue::AsInt(x)) => *x as f64,
-        None => 0.0,
-    }
-}
-
-fn any_value_to_string(v: &asap_otel_proto::tonic::common::v1::AnyValue) -> String {
-    use asap_otel_proto::tonic::common::v1::any_value::Value as AnyValueVariant;
-    match &v.value {
-        Some(AnyValueVariant::StringValue(s)) => s.clone(),
-        Some(AnyValueVariant::IntValue(i)) => i.to_string(),
-        Some(AnyValueVariant::DoubleValue(d)) => d.to_string(),
-        Some(AnyValueVariant::BoolValue(b)) => b.to_string(),
-        Some(AnyValueVariant::BytesValue(bytes)) => format!("{:?}", bytes),
-        _ => String::new(),
-    }
-}
-
-fn attributes_to_map(
-    attrs: &[asap_otel_proto::tonic::common::v1::KeyValue],
-) -> HashMap<String, String> {
-    let mut m = HashMap::new();
-    for kv in attrs {
-        let key = kv.key.clone();
-        let value = kv
-            .value
-            .as_ref()
-            .map(any_value_to_string)
-            .unwrap_or_default();
-        if !key.is_empty() {
-            m.insert(key, value);
-        }
-    }
-    m
-}
-
-#[cfg(test)]
-mod canonical_metric_name_tests {
-    //! Coverage for `canonical_sketch_metric_name` — the ingest-seam
-    //! strip of the agent's `_<family>` suffix (ASAPCollector
-    //! `asapedgeprocessor` sets `MetricSuffix: "_" + family`). Without
-    //! it, warm-tier sketch queries against the raw metric name
-    //! capability-miss because `SummarySeriesMetadata.metric_name` and
-    //! the controller's streaming-config policy `metric` never line up.
-    use super::*;
-
-    #[test]
-    fn strips_matching_family_suffix() {
-        assert_eq!(
-            canonical_sketch_metric_name("request_size_bytes_kll", SketchAlgorithm::Kll),
-            "request_size_bytes"
-        );
-        assert_eq!(
-            canonical_sketch_metric_name(
-                "http_requests_total_latency_ms_kll",
-                SketchAlgorithm::Kll
-            ),
-            "http_requests_total_latency_ms"
-        );
-        assert_eq!(
-            canonical_sketch_metric_name("unique_users_per_min_hll", SketchAlgorithm::Hll),
-            "unique_users_per_min"
-        );
-        assert_eq!(
-            canonical_sketch_metric_name(
-                "top_endpoint_qps_countsketch",
-                SketchAlgorithm::CountSketch
-            ),
-            "top_endpoint_qps"
-        );
-        assert_eq!(
-            canonical_sketch_metric_name(
-                "endpoint_request_freq_countminsketch",
-                SketchAlgorithm::Cms
-            ),
-            "endpoint_request_freq"
-        );
-        assert_eq!(
-            canonical_sketch_metric_name("latency_ddsketch", SketchAlgorithm::DDSketch),
-            "latency"
-        );
-    }
-
-    #[test]
-    fn leaves_bare_name_untouched_idempotent() {
-        // Once agents stop suffixing (series-identity
-        // Phase 1), the strip must be a no-op.
-        assert_eq!(
-            canonical_sketch_metric_name("request_size_bytes", SketchAlgorithm::Kll),
-            "request_size_bytes"
-        );
-        assert_eq!(
-            canonical_sketch_metric_name("unique_users_per_min", SketchAlgorithm::Hll),
-            "unique_users_per_min"
-        );
-    }
-
-    #[test]
-    fn does_not_strip_suffix_of_a_different_family() {
-        // A metric whose name happens to end in `_hll` but arrives as a
-        // KLL sketch keeps its name — the strip is gated on the dp's
-        // actual sketch kind, so we never collapse a legitimately-named
-        // metric onto a different one.
-        assert_eq!(
-            canonical_sketch_metric_name("my_metric_hll", SketchAlgorithm::Kll),
-            "my_metric_hll"
-        );
-    }
-
-    #[test]
-    fn never_collapses_to_empty_string() {
-        // A metric literally named `_kll` (base would be empty) is left
-        // intact rather than emptied.
-        assert_eq!(
-            canonical_sketch_metric_name("_kll", SketchAlgorithm::Kll),
-            "_kll"
-        );
-    }
-}
-
-#[cfg(test)]
-mod series_key_roundtrip_tests {
-    //! Regression coverage for the `format_series_key` ↔
-    //! `parse_labels_from_series_key` roundtrip bug discovered while
-    //! shipping PR #284 (B7.6 ingest sid rekey). The formatter
-    //! emitted unquoted `k=v` pairs but the parser required
-    //! `k="v"`, which silently produced empty group keys for every
-    //! OTLP wire-format input. These tests pin the canonical
-    //! PromQL-style quoted format the data plane now uses
-    //! throughout (see also `render_series_key` in
-    //! `storage_engines/sketch_db/backfill/prometheus_reader.rs`).
-    use super::*;
-    use crate::precompute_engine::worker::{decode_label_value, parse_labels_from_series_key};
-
-    fn roundtrip(name: &str, input: &[(&str, &str)]) {
-        let labels: HashMap<String, String> = input
-            .iter()
-            .map(|(k, v)| (k.to_string(), v.to_string()))
-            .collect();
-        let key = format_series_key(name, &labels);
-        let parsed = parse_labels_from_series_key(&key);
-        for (k, v) in input {
-            let got = parsed
-                .get(*k)
-                .map(|raw| decode_label_value(raw).into_owned())
-                .unwrap_or_else(|| panic!("label '{}' missing after roundtrip; key={}", k, key));
-            assert_eq!(
-                got, *v,
-                "label '{}' value mismatch after roundtrip; key={}",
-                k, key
-            );
-        }
-        assert_eq!(
-            parsed.len(),
-            input.len(),
-            "label count mismatch after roundtrip; key={} parsed={:?}",
-            key,
-            parsed
-        );
-    }
-
-    #[test]
-    fn format_series_key_emits_promql_quoted_form() {
-        // The canonical shape every downstream parser
-        // (`parse_labels_from_series_key`, `sample_matches`) expects.
-        let mut labels = HashMap::new();
-        labels.insert("svc".to_string(), "auth".to_string());
-        labels.insert("env".to_string(), "prod".to_string());
-        let key = format_series_key("latency", &labels);
-        // Keys are sorted lexicographically so the formatted output
-        // is deterministic regardless of HashMap iteration order.
-        assert_eq!(key, r#"latency{env="prod",svc="auth"}"#);
-    }
-
-    #[test]
-    fn roundtrip_simple_alphanumeric() {
-        roundtrip("metric", &[("svc", "auth"), ("env", "prod")]);
-    }
-
-    #[test]
-    fn roundtrip_value_with_comma() {
-        // Comma is the pair delimiter — quoting must keep it inside
-        // the value. Pre-fix the unquoted format would split mid-value.
-        roundtrip("metric", &[("tag", "a,b,c"), ("svc", "auth")]);
-    }
-
-    #[test]
-    fn roundtrip_value_with_equals() {
-        // Equals is the key/value delimiter — quoting must protect it.
-        roundtrip("metric", &[("expr", "x=y"), ("svc", "auth")]);
-    }
-
-    #[test]
-    fn roundtrip_value_with_embedded_quote() {
-        // `"` must be escaped as `\"` on emit and decoded back on
-        // read. The parser's closing-quote scan must walk past the
-        // escape; `decode_label_value` un-escapes the slice.
-        roundtrip("metric", &[("msg", r#"hello "world""#), ("svc", "auth")]);
-    }
-
-    #[test]
-    fn roundtrip_value_with_backslash() {
-        roundtrip("metric", &[("path", r"C:\Users\app"), ("svc", "auth")]);
-    }
-
-    #[test]
-    fn roundtrip_value_with_newline() {
-        // `\n` round-trips through the `\n` escape; verifies the
-        // decoder handles all three escape body variants.
-        roundtrip("metric", &[("multi", "line1\nline2"), ("svc", "auth")]);
-    }
-
-    #[test]
-    fn roundtrip_value_with_all_metacharacters() {
-        // One stress case combining every escape body and every
-        // pair-delimiter character in a single value.
-        roundtrip("metric", &[("payload", "a,b=c\"d\\e\nf"), ("svc", "auth")]);
-    }
-
-    #[test]
-    fn empty_labels_yield_bare_braces() {
-        let labels: HashMap<String, String> = HashMap::new();
-        let key = format_series_key("metric", &labels);
-        assert_eq!(key, "metric{}");
-        let parsed = parse_labels_from_series_key(&key);
-        assert!(parsed.is_empty());
-    }
-}
-
-#[cfg(test)]
-mod policy_fp_lookup_tests {
-    use super::*;
-    use crate::storage_engines::sketch_db::data::SketchConfig;
-    use crate::storage_engines::sketch_db::index::SketchAlgorithm;
-    use asap_types::AggregationType;
-
-    #[test]
-    fn handle_to_agg_type_round_trips_canonical_kinds() {
-        // Locks in the data-plane → control-plane name mapping.
-        // Drift surfaces as policy lookups that silently miss because
-        // the handle resolves to an `AggregationType` no policy uses.
-        assert_eq!(
-            aggregation_type_for_sketch_algorithm(SketchAlgorithm::DDSketch),
-            Some(AggregationType::DDSketch)
-        );
-        assert_eq!(
-            aggregation_type_for_sketch_algorithm(SketchAlgorithm::Kll),
-            Some(AggregationType::DatasketchesKLL)
-        );
-        assert_eq!(
-            aggregation_type_for_sketch_algorithm(SketchAlgorithm::Hll),
-            Some(AggregationType::HLL)
-        );
-        assert_eq!(
-            aggregation_type_for_sketch_algorithm(SketchAlgorithm::Cms),
-            Some(AggregationType::CountMinSketch)
-        );
-        assert_eq!(
-            aggregation_type_for_sketch_algorithm(SketchAlgorithm::CmsWithHeap),
-            Some(AggregationType::CountMinSketchWithHeap)
-        );
-        assert_eq!(
-            aggregation_type_for_sketch_algorithm(SketchAlgorithm::CountSketch),
-            Some(AggregationType::CountSketch)
-        );
-        // `Any` is a control-plane wildcard, not a real DP shape.
-        assert_eq!(
-            aggregation_type_for_sketch_algorithm(SketchAlgorithm::Kmv),
-            None
-        );
-    }
-
-    #[test]
-    fn sketch_config_to_params_uses_canonical_keys() {
-        // The param-name vocabulary must match what the control plane
-        // writes in streaming-config YAML (see
-        // `asap_types::aggregation_config::PrecomputeMaterialization::from_yaml_data`).
-        // Drift surfaces as `find_policy_by_content` missing matches.
-        let dd = sketch_config_to_params(&SketchConfig::DDSketch {
-            relative_accuracy: 0.01,
-        });
-        assert_eq!(dd.get("relative_accuracy"), Some(&serde_json::json!(0.01)));
-
-        let kll = sketch_config_to_params(&SketchConfig::Kll { k: 200 });
-        assert_eq!(kll.get("k"), Some(&serde_json::json!(200)));
-
-        let hll = sketch_config_to_params(&SketchConfig::Hll { precision: 14 });
-        assert_eq!(hll.get("precision"), Some(&serde_json::json!(14)));
-
-        let cs = sketch_config_to_params(&SketchConfig::CountSketch { rows: 4, cols: 256 });
-        // Canonical keys: w (=cols, width) and d (=rows, depth) —
-        // matches `control_plane::emit::stage_config::sketch_params_to_json`.
-        assert_eq!(cs.get("w"), Some(&serde_json::json!(256)));
-        assert_eq!(cs.get("d"), Some(&serde_json::json!(4)));
-
-        let cm = sketch_config_to_params(&SketchConfig::CountMin { rows: 4, cols: 256 });
-        assert_eq!(cm.get("w"), Some(&serde_json::json!(256)));
-        assert_eq!(cm.get("d"), Some(&serde_json::json!(4)));
-    }
-}
-
-#[cfg(test)]
-mod dispatcher_tests {
-    use super::*;
-    use crate::storage_engines::types::AggregateCore;
-    use asap_physical_operators::summary_kernels::{DDSketchAccumulator, HllSketchAccumulator};
-    use asap_sketchlib::DdSketch;
-    use asap_sketchlib::HllVariant;
-
-    #[test]
-    fn apply_modified_otlp_delta_bytes_ddsketch_round_trip() {
-        use asap_otel_proto::sketchlib::v1::{DdSketchBucketDelta, DdSketchDelta as PbDelta};
-        use prost::Message;
-
-        // Base sketch represents the last full snapshot the agent sent.
-        let mut acc: Box<dyn AggregateCore> = Box::new(DDSketchAccumulator {
-            inner: DdSketch::from_raw(0.01, vec![1, 2, 3], 0),
-            sample_p: 1.0,
-        });
-
-        // The wire delta now carries only bucket deltas (tags 2-7
-        // reserved post ProjectASAP/sketchlib-go#243 / asap_sketchlib#57).
-        let bytes = PbDelta {
-            buckets: vec![
-                DdSketchBucketDelta {
-                    index: 0,
-                    d_count: 10,
-                },
-                DdSketchBucketDelta {
-                    index: 2,
-                    d_count: 20,
-                },
-            ],
-        }
-        .encode_to_vec();
-
-        apply_modified_otlp_delta_bytes(
-            SketchAlgorithm::DDSketch,
-            ENCODING_PROTO_DELTA,
-            &mut acc,
-            &bytes,
-        )
-        .expect("apply ok");
-
-        let dd = acc.as_any().downcast_ref::<DDSketchAccumulator>().unwrap();
-        assert_eq!(dd.inner.store_counts, vec![11, 2, 23]);
-        // `count` recomputed from the merged buckets: 11 + 2 + 23 = 36.
-        assert_eq!(dd.inner.total_count(), 36);
-    }
-
-    #[test]
-    fn apply_modified_otlp_delta_bytes_hll_round_trip() {
-        use asap_otel_proto::sketchlib::v1::HllDelta as PbDelta;
-        use prost::Message;
-
-        let mut acc: Box<dyn AggregateCore> =
-            Box::new(HllSketchAccumulator::new(HllVariant::Regular, 2));
-        acc.as_any_mut()
-            .downcast_mut::<HllSketchAccumulator>()
-            .unwrap()
-            .inner
-            .registers = vec![1, 5, 3, 7];
-
-        // Packed (index_delta, value) blob for updates {0:4, 2:6}.
-        let bytes = PbDelta {
-            packed_updates: vec![0, 4, 2, 6],
-        }
-        .encode_to_vec();
-
-        apply_modified_otlp_delta_bytes(
-            SketchAlgorithm::Hll,
-            ENCODING_PROTO_DELTA,
-            &mut acc,
-            &bytes,
-        )
-        .expect("apply ok");
-
-        let hll = acc.as_any().downcast_ref::<HllSketchAccumulator>().unwrap();
-        assert_eq!(hll.inner.registers, vec![4, 5, 6, 7]);
-    }
-
-    #[test]
-    fn apply_rejects_wrong_accumulator_type() {
-        let mut acc: Box<dyn AggregateCore> =
-            Box::new(HllSketchAccumulator::new(HllVariant::Regular, 2));
-        let err = apply_modified_otlp_delta_bytes(
-            SketchAlgorithm::DDSketch,
-            ENCODING_PROTO_DELTA,
-            &mut acc,
-            &[0u8; 4],
-        )
-        .expect_err("expected type-mismatch error")
-        .to_string();
-        assert!(err.contains("not a DDSketchAccumulator"));
-    }
-
-    #[test]
-    fn apply_rejects_full_state_encoding() {
-        let mut acc: Box<dyn AggregateCore> = Box::new(DDSketchAccumulator::new(0.01));
-        let err = apply_modified_otlp_delta_bytes(
-            SketchAlgorithm::DDSketch,
-            ENCODING_PROTO,
-            &mut acc,
-            &[],
-        )
-        .expect_err("expected full-state-rejection error")
-        .to_string();
-        assert!(err.contains("full-state frame"));
-    }
-
-    #[test]
-    fn decode_rejects_delta_encoding_with_helpful_message() {
-        let err = match decode_modified_otlp_sketch_bytes(
-            SketchAlgorithm::DDSketch,
-            ENCODING_PROTO_DELTA,
-            &[],
-        ) {
-            Ok(_) => panic!("expected PROTO_DELTA to be rejected by full-state decoder"),
-            Err(e) => e.to_string(),
-        };
-        assert!(err.contains("apply_modified_otlp_delta_bytes"));
-    }
-}
-
-/// sid-resolution gate tests. Construct an OTLP DDSketch
-/// Export with one DataPoint per scenario, run it through
-/// `route_modified_otlp_sketches_to_precompute`, and assert on the
-/// returned `unknown_series_ids` plus the SeriesIdResolver / SketchStore
-/// state on the shared IngestState.
-#[cfg(test)]
-mod sid_resolution_tests {
-    use super::*;
-    use crate::drivers::ingest::series_resolver::SeriesIdResolver;
-    use crate::precompute_engine::series_router::SeriesRouter;
-    use crate::storage_engines::sketch_db::index::SketchStore;
-    use crate::storage_engines::types::{InstalledPrecomputePlan, InstalledPrecomputePlanHandle};
-    use asap_otel_proto::tonic::collector::metrics::v1::ExportMetricsServiceRequest;
-    use asap_otel_proto::tonic::common::v1::{any_value::Value as AnyVal, AnyValue, KeyValue};
-    use asap_otel_proto::tonic::metrics::v1::{
-        metric::Data, DdSketch as PbDDSketch, DdSketchDataPoint, Metric as PbMetric,
-        ResourceMetrics, ScopeMetrics,
-    };
-    use std::sync::Arc;
-    use tokio::sync::mpsc;
-
-    async fn make_state() -> (Arc<IngestState>, tokio::task::JoinHandle<()>) {
-        let (tx, mut rx) = mpsc::channel(1024);
-        let router = SeriesRouter::new(vec![tx]);
-        let streaming = InstalledPrecomputePlan::new(std::collections::HashMap::new());
-        let hot_reload = InstalledPrecomputePlanHandle::new(streaming.clone());
-        let state = Arc::new(IngestState {
-            router,
-            samples_ingested: std::sync::atomic::AtomicU64::new(0),
-            samples_blocked_by_schema_barrier: std::sync::atomic::AtomicU64::new(0),
-            hot_reload_config: hot_reload,
-            pass_raw_samples: false,
-            sketch_snapshots: dashmap::DashMap::new(),
-            series_resolver: Arc::new(SeriesIdResolver::new()),
-            summary_store: Arc::new(SketchStore::new()),
-            observability: crate::precompute_engine::ingest_handler::IngestObservability::default(),
-        });
-        let drain = tokio::spawn(async move { while rx.recv().await.is_some() {} });
-        (state, drain)
-    }
-
-    fn kv(k: &str, v: &str) -> KeyValue {
-        KeyValue {
-            key: k.to_string(),
-            value: Some(AnyValue {
-                value: Some(AnyVal::StringValue(v.to_string())),
-            }),
-        }
-    }
-
-    fn build_request(metric_name: &str, dp: DdSketchDataPoint) -> ExportMetricsServiceRequest {
-        ExportMetricsServiceRequest {
-            resource_metrics: vec![ResourceMetrics {
-                resource: None,
-                scope_metrics: vec![ScopeMetrics {
-                    scope: None,
-                    metrics: vec![PbMetric {
-                        name: metric_name.to_string(),
-                        description: String::new(),
-                        unit: String::new(),
-                        metadata: Vec::new(),
-                        data: Some(Data::Ddsketch(PbDDSketch {
-                            data_points: vec![dp],
-                            aggregation_temporality: 0,
-                            relative_accuracy: 0.01,
-                        })),
-                    }],
-                    schema_url: String::new(),
-                }],
-                schema_url: String::new(),
-            }],
-        }
-    }
-
-    #[tokio::test]
-    async fn fresh_sid_minted_when_sender_supplies_zero_with_attrs() {
-        let (state, drain) = make_state().await;
-        let dp = DdSketchDataPoint {
-            attributes: vec![kv("zone", "z0")],
-            start_time_unix_nano: 1_000_000,
-            time_unix_nano: 11_000_000,
-            sketch: vec![1, 2, 3],
-            encoding: 1,
-            exemplars: Vec::new(),
-            flags: 0,
-            series_id: 0,
-        };
-        let req = build_request("http_latency_ms", dp);
-
-        let outcome = route_modified_otlp_sketches_to_precompute(&req, &state)
-            .await
-            .expect("ingest succeeds");
-        assert!(
-            outcome.unknown_series_ids.is_empty(),
-            "no unknown sids on a fresh-attrs DP"
-        );
-        // Option B — sid is resolver-allocated; every attrs-bearing DP
-        // gets a SeriesAssignment echoed back so the sender caches it.
-        assert_eq!(
-            outcome.series_assignments.len(),
-            1,
-            "one series_assignment returned for one fresh DP"
-        );
-        let assigned = &outcome.series_assignments[0];
-        assert_eq!(assigned.metric_name, "http_latency_ms");
-        assert_ne!(
-            assigned.series_id, 0,
-            "resolver mints a non-zero sid (zero is reserved on the wire)"
-        );
-        assert_eq!(
-            state.summary_store.instance_count(),
-            1,
-            "SketchStore registered one instance under the resolver-minted sid"
-        );
-        assert!(state.summary_store.instance(assigned.series_id).is_some());
-
-        drop(state);
-        let _ = drain.await;
-    }
-
-    #[tokio::test]
-    async fn unknown_sid_with_empty_attrs_is_returned_in_response() {
-        let (state, drain) = make_state().await;
-        // sid != 0, no attrs — SketchStore doesn't know it; should land
-        // in unknown_sids and the DP must be dropped (no instance
-        // registered). The resolver can't be consulted without attrs.
-        let dp = DdSketchDataPoint {
-            attributes: Vec::new(),
-            start_time_unix_nano: 0,
-            time_unix_nano: 5_000_000,
-            sketch: vec![9],
-            encoding: 1,
-            exemplars: Vec::new(),
-            flags: 0,
-            series_id: 7777,
-        };
-        let req = build_request("http_latency_ms", dp);
-
-        let outcome = route_modified_otlp_sketches_to_precompute(&req, &state)
-            .await
-            .expect("ingest succeeds");
-        assert_eq!(outcome.unknown_series_ids, vec![7777]);
-        assert!(
-            outcome.series_assignments.is_empty(),
-            "no assignment when attrs are missing"
-        );
-        assert_eq!(state.summary_store.instance_count(), 0);
-
-        drop(state);
-        let _ = drain.await;
-    }
-
-    #[tokio::test]
-    async fn sid_attrs_disagreement_signals_stale_sid_but_uses_resolved_value() {
-        let (state, drain) = make_state().await;
-        // First, register the sid by sending sid=0 with attrs. The
-        // resolver mints a fresh u64 (sequential, NOT content-addressed).
-        let dp_seed = DdSketchDataPoint {
-            attributes: vec![kv("zone", "z0")],
-            start_time_unix_nano: 1_000_000,
-            time_unix_nano: 11_000_000,
-            sketch: vec![1],
-            encoding: 1,
-            exemplars: Vec::new(),
-            flags: 0,
-            series_id: 0,
-        };
-        let seed_outcome = route_modified_otlp_sketches_to_precompute(
-            &build_request("http_latency_ms", dp_seed),
-            &state,
-        )
-        .await
-        .expect("seed ingest succeeds");
-        let assigned_sid = seed_outcome.series_assignments[0].series_id;
-        assert!(
-            state.summary_store.instance(assigned_sid).is_some(),
-            "seed registers the resolver-minted sid"
-        );
-
-        // Now arrive with the same attrs but a STALE sid (sender's
-        // local cache was wrong, e.g. survived a backend restart without
-        // persistence).
-        let stale = assigned_sid.wrapping_add(123);
-        let dp_disagree = DdSketchDataPoint {
-            attributes: vec![kv("zone", "z0")],
-            start_time_unix_nano: 1_000_000,
-            time_unix_nano: 12_000_000,
-            sketch: vec![2],
-            encoding: 1,
-            exemplars: Vec::new(),
-            flags: 0,
-            series_id: stale,
-        };
-        let outcome = route_modified_otlp_sketches_to_precompute(
-            &build_request("http_latency_ms", dp_disagree),
-            &state,
-        )
-        .await
-        .expect("ingest succeeds");
-        assert_eq!(
-            outcome.unknown_series_ids,
-            vec![stale],
-            "stale sid should be signalled for eviction"
-        );
-        assert_eq!(
-            outcome.series_assignments.len(),
-            1,
-            "fresh assignment echoed so sender can refresh its cache"
-        );
-        assert_eq!(
-            outcome.series_assignments[0].series_id, assigned_sid,
-            "resolver returns the canonical sid for this (metric, attrs) — same as seed"
-        );
-        // The assigned sid stays registered — the second DP routed to
-        // it via the resolver's cache hit.
-        assert!(state.summary_store.instance(assigned_sid).is_some());
-
-        drop(state);
-        let _ = drain.await;
-    }
-
-    /// Per-window base rotation (`docs/delta-baseline-contract.md` §3):
-    /// the backend must NOT accumulate deltas across windows. For one
-    /// series, a full frame opens window 1, a delta in window 1 (same
-    /// `start_time_unix_nano`) accumulates onto it, then a delta in
-    /// window 2 (a NEW `start_time_unix_nano`) must reset the cached base
-    /// to empty first — so the reconstructed state is window 2's delta
-    /// only, NOT window1 + window2.
-    ///
-    /// Uses DDSketch (an additive family) so accumulation vs. reset is
-    /// directly observable on the bucket counts.
-    #[tokio::test]
-    async fn delta_apply_rotates_per_series_base_at_window_boundary() {
-        use asap_otel_proto::sketchlib::v1::{DdSketchBucketDelta, DdSketchDelta as PbDelta};
-        use asap_physical_operators::summary_kernels::DDSketchAccumulator;
-        use asap_sketchlib::proto::sketchlib::{sketch_envelope, DdSketchState, SketchEnvelope};
-        use prost::Message;
-
-        let (state, drain) = make_state().await;
-
-        const WIN1_START: u64 = 1_000_000;
-        const WIN2_START: u64 = 2_000_000;
-
-        // Build a DDSketch DataPoint with explicit encoding / window-start
-        // / payload so we can stage a full frame then per-window deltas.
-        let make_dp = |start: u64, ts: u64, encoding: i32, sketch: Vec<u8>| DdSketchDataPoint {
-            attributes: vec![kv("zone", "z0")],
-            start_time_unix_nano: start,
-            time_unix_nano: ts,
-            sketch,
-            encoding,
-            exemplars: Vec::new(),
-            flags: 0,
-            series_id: 0,
-        };
-
-        // The cache key (series_key) is derived from the canonical metric
-        // name + attrs; recompute it the same way the ingest loop does so
-        // we can read the reconstructed base back out.
-        let mut attrs = HashMap::new();
-        attrs.insert("zone".to_string(), "z0".to_string());
-        let series_key = format_series_key(
-            canonical_sketch_metric_name("http_latency_ms", SketchAlgorithm::DDSketch),
-            &attrs,
-        );
-
-        // ── Window 1: full frame. Base buckets [10, 0, 5]. ──
-        let full_w1 = SketchEnvelope {
-            sketch_state: Some(sketch_envelope::SketchState::Ddsketch(DdSketchState {
-                alpha: 0.01,
-                store_counts: vec![10, 0, 5],
-                store_offset: 0,
-                ..Default::default()
-            })),
-            ..Default::default()
-        }
-        .encode_to_vec();
-        route_modified_otlp_sketches_to_precompute(
-            &build_request(
-                "http_latency_ms",
-                make_dp(WIN1_START, 11_000_000, 1, full_w1),
-            ),
-            &state,
-        )
-        .await
-        .expect("first ingest succeeds");
-
-        // ── Window 1: delta (SAME window_start). Adds +3 to bucket 0,
-        // +7 to bucket 1. Within the window this accumulates onto the
-        // full frame → [13, 7, 5]. ──
-        let delta_w1 = PbDelta {
-            buckets: vec![
-                DdSketchBucketDelta {
-                    index: 0,
-                    d_count: 3,
-                },
-                DdSketchBucketDelta {
-                    index: 1,
-                    d_count: 7,
-                },
-            ],
-        }
-        .encode_to_vec();
-        route_modified_otlp_sketches_to_precompute(
-            &build_request(
-                "http_latency_ms",
-                make_dp(WIN1_START, 12_000_000, 2, delta_w1),
-            ),
-            &state,
-        )
-        .await
-        .expect("second ingest succeeds");
-
-        {
-            let entry = state
-                .sketch_snapshots
-                .get(&series_key)
-                .expect("base cached after full + delta in window 1");
-            let dd = entry
-                .core
-                .as_any()
-                .downcast_ref::<DDSketchAccumulator>()
-                .expect("DDSketch base");
-            assert_eq!(
-                dd.inner.store_counts,
-                vec![13, 7, 5],
-                "within window 1 the delta accumulates onto the full frame"
-            );
-            assert_eq!(
-                entry.window_start, WIN1_START,
-                "cached window_start tracks window 1"
-            );
-        }
-
-        // ── Window 2: delta with a NEW window_start. Adds +20 to bucket
-        // 2. With per-window base rotation the base is reset to empty
-        // BEFORE this delta is applied, so the reconstructed state is
-        // window 2 ONLY: count 20 — NOT window1 + window2 (count 45).
-        let delta_w2 = PbDelta {
-            buckets: vec![DdSketchBucketDelta {
-                index: 2,
-                d_count: 20,
-            }],
-        }
-        .encode_to_vec();
-        route_modified_otlp_sketches_to_precompute(
-            &build_request(
-                "http_latency_ms",
-                make_dp(WIN2_START, 21_000_000, 2, delta_w2),
-            ),
-            &state,
-        )
-        .await
-        .expect("ingest succeeds");
-
-        {
-            let entry = state
-                .sketch_snapshots
-                .get(&series_key)
-                .expect("base still cached after window 2 delta");
-            let dd = entry
-                .core
-                .as_any()
-                .downcast_ref::<DDSketchAccumulator>()
-                .expect("DDSketch base");
-            // The base was rotated to empty before the window-2 delta, so
-            // it holds window 2 ONLY: total count 20 (the +20 on bucket 2),
-            // NOT window1 + window2 (which would be 13 + 7 + 5 + 20 = 45).
-            // Asserting on `total_count` keeps the check independent of the
-            // empty-sketch's store offset/layout (a fresh sketch re-bases
-            // its store offset around the first touched bucket).
-            assert_eq!(
-                dd.inner.total_count(),
-                20,
-                "new window_start rotates the base to empty: state == window 2 only \
-                 (count 20), NOT the all-time accumulation (45)"
-            );
-            // Only bucket 2 carries mass; the window-1 buckets (0 and 1)
-            // were dropped by the rotation.
-            let bucket_count = |abs_idx: i32| -> u64 {
-                let i = abs_idx - dd.inner.store_offset;
-                if i >= 0 && (i as usize) < dd.inner.store_counts.len() {
-                    dd.inner.store_counts[i as usize]
-                } else {
-                    0
-                }
-            };
-            assert_eq!(bucket_count(2), 20, "window 2's +20 lands on bucket 2");
-            assert_eq!(
-                bucket_count(0),
-                0,
-                "window 1's bucket 0 mass was rotated away"
-            );
-            assert_eq!(
-                bucket_count(1),
-                0,
-                "window 1's bucket 1 mass was rotated away"
-            );
-            assert_eq!(
-                entry.window_start, WIN2_START,
-                "cached window_start advanced to window 2"
-            );
-        }
-
-        drop(state);
-        let _ = drain.await;
-    }
-
-    #[tokio::test]
-    async fn second_emit_with_cached_sid_and_no_attrs_hits_same_instance() {
-        // Round-trip: emit DP with attrs → cache the assignment →
-        // re-emit with (sid, no attrs). Second emit must NOT push
-        // anything to unknown_sids and MUST land in the same SketchStore
-        // instance. This is the bandwidth-saving path the registry
-        // approach is built for.
-        let (state, drain) = make_state().await;
-
-        let dp_first = DdSketchDataPoint {
-            attributes: vec![kv("zone", "z0")],
-            start_time_unix_nano: 1_000_000,
-            time_unix_nano: 11_000_000,
-            sketch: vec![1],
-            encoding: 1,
-            exemplars: Vec::new(),
-            flags: 0,
-            series_id: 0,
-        };
-        let first = route_modified_otlp_sketches_to_precompute(
-            &build_request("http_latency_ms", dp_first),
-            &state,
-        )
-        .await
-        .expect("first ingest succeeds");
-        let cached_sid = first.series_assignments[0].series_id;
-
-        let dp_second = DdSketchDataPoint {
-            attributes: Vec::new(), // sender omits attrs now that it has the sid
-            start_time_unix_nano: 1_000_000,
-            time_unix_nano: 12_000_000,
-            sketch: vec![2],
-            encoding: 1,
-            exemplars: Vec::new(),
-            flags: 0,
-            series_id: cached_sid,
-        };
-        let second = route_modified_otlp_sketches_to_precompute(
-            &build_request("http_latency_ms", dp_second),
-            &state,
-        )
-        .await
-        .expect("second ingest succeeds");
-        assert!(
-            second.unknown_series_ids.is_empty(),
-            "cached sid + no attrs hits the same SketchStore instance"
-        );
-        assert!(
-            second.series_assignments.is_empty(),
-            "no fresh assignment when sender already had a valid binding"
-        );
-        // Both DPs landed against the same sid — no proliferation.
-        assert_eq!(state.summary_store.instance_count(), 1);
-
-        drop(state);
-        let _ = drain.await;
-    }
-
-    // ── P1-1/P1-2: leading delta (no prior full) for additive families ──
-
-    /// Build an export request carrying one `CountMinSketch` DataPoint.
-    fn build_cms_request(
-        metric: &str,
-        rows: i32,
-        cols: i32,
-        encoding: i32,
-        sketch: Vec<u8>,
-        start_ns: u64,
-        ts_ns: u64,
-    ) -> ExportMetricsServiceRequest {
-        use asap_otel_proto::tonic::metrics::v1::{
-            CountMinSketch as PbCms, CountMinSketchDataPoint as PbCmsDp,
-        };
-        let dp = PbCmsDp {
-            attributes: vec![kv("svc", "auth")],
-            start_time_unix_nano: start_ns,
-            time_unix_nano: ts_ns,
-            sketch,
-            encoding,
-            flags: 0,
-            series_id: 0,
-        };
-        ExportMetricsServiceRequest {
-            resource_metrics: vec![ResourceMetrics {
-                resource: None,
-                scope_metrics: vec![ScopeMetrics {
-                    scope: None,
-                    metrics: vec![PbMetric {
-                        name: metric.to_string(),
-                        description: String::new(),
-                        unit: String::new(),
-                        metadata: Vec::new(),
-                        data: Some(Data::Countminsketch(PbCms {
-                            data_points: vec![dp],
-                            aggregation_temporality: 0,
-                            rows,
-                            cols,
-                        })),
-                    }],
-                    schema_url: String::new(),
-                }],
-                schema_url: String::new(),
-            }],
-        }
-    }
-
-    /// Build an export request carrying one `HllSketch` DataPoint.
-    fn build_hll_request(
-        metric: &str,
-        precision: u32,
-        encoding: i32,
-        sketch: Vec<u8>,
-        start_ns: u64,
-        ts_ns: u64,
-    ) -> ExportMetricsServiceRequest {
-        use asap_otel_proto::tonic::metrics::v1::{
-            HllSketch as PbHll, HllSketchDataPoint as PbHllDp,
-        };
-        let dp = PbHllDp {
-            attributes: vec![kv("svc", "auth")],
-            start_time_unix_nano: start_ns,
-            time_unix_nano: ts_ns,
-            sketch,
-            encoding,
-            flags: 0,
-            series_id: 0,
-        };
-        ExportMetricsServiceRequest {
-            resource_metrics: vec![ResourceMetrics {
-                resource: None,
-                scope_metrics: vec![ScopeMetrics {
-                    scope: None,
-                    metrics: vec![PbMetric {
-                        name: metric.to_string(),
-                        description: String::new(),
-                        unit: String::new(),
-                        metadata: Vec::new(),
-                        data: Some(Data::Hllsketch(PbHll {
-                            data_points: vec![dp],
-                            aggregation_temporality: 0,
-                            precision,
-                        })),
-                    }],
-                    schema_url: String::new(),
-                }],
-                schema_url: String::new(),
-            }],
-        }
-    }
-
-    /// P1-1/P1-2 — a CMS PROTO_DELTA frame that is the FIRST frame for its
-    /// series (no prior full snapshot) must NOT be dropped: the ingest
-    /// path bootstraps an empty CMS of the frame's (rows, cols) and
-    /// applies the delta onto it, recovering the window's state. This is
-    /// what makes the worker tier agree with the warm-read tier and
-    /// recover after a backend restart.
-    #[tokio::test]
-    async fn leading_cms_delta_bootstraps_onto_empty_base() {
-        use asap_otel_proto::sketchlib::v1::CountMinDelta as PbDelta;
-        use asap_physical_operators::summary_kernels::CountMinSketchAccumulator;
-        use prost::Message;
-
-        let (state, drain) = make_state().await;
-
-        const ROWS: i32 = 4;
-        const COLS: i32 = 8;
-        const WIN_START: u64 = 1_000_000;
-
-        // Sparse delta: +5 at (0,1), +9 at (2,3). All cells within 4x8.
-        let delta = PbDelta {
-            rows: ROWS as u32,
-            cols: COLS as u32,
-            cell_rows: vec![0u32, 2u32],
-            cell_cols: vec![1u32, 3u32],
-            d_counts: vec![5i64, 9i64],
-            l1: vec![5.0, 0.0, 9.0, 0.0],
-            l2: vec![25.0, 0.0, 81.0, 0.0],
-        }
-        .encode_to_vec();
-
-        let req = build_cms_request(
-            "frequency_metric",
-            ROWS,
-            COLS,
-            ENCODING_PROTO_DELTA,
-            delta,
-            WIN_START,
-            11_000_000,
-        );
-        // No prior full frame for this series — pre-fix this DP was
-        // dropped (decoded_failed). Post-fix it bootstraps + applies.
-        route_modified_otlp_sketches_to_precompute(&req, &state)
-            .await
-            .expect("ingest succeeds");
-
-        // The per-series base is now cached, holding the window's
-        // reconstructed matrix.
-        let mut attrs = HashMap::new();
-        attrs.insert("svc".to_string(), "auth".to_string());
-        let series_key = format_series_key(
-            canonical_sketch_metric_name("frequency_metric", SketchAlgorithm::Cms),
-            &attrs,
-        );
-        {
-            let entry = state
-                .sketch_snapshots
-                .get(&series_key)
-                .expect("leading CMS delta bootstrapped + cached a base");
-            let cms = entry
-                .core
-                .as_any()
-                .downcast_ref::<CountMinSketchAccumulator>()
-                .expect("base is a CountMinSketchAccumulator");
-            let matrix = cms.inner.sketch();
-            assert_eq!(
-                matrix[0][1], 5.0,
-                "delta cell (0,1) applied onto empty base"
-            );
-            assert_eq!(
-                matrix[2][3], 9.0,
-                "delta cell (2,3) applied onto empty base"
-            );
-            assert_eq!(matrix[0][0], 0.0, "untouched cell stays empty");
-        }
-        // The DD/KLL "no base" drop counter must NOT have ticked — CMS is
-        // bootstrappable.
-        assert_eq!(
-            state
-                .observability
-                .dropped_no_base
-                .load(std::sync::atomic::Ordering::Relaxed),
-            0,
-            "CMS leading delta is bootstrapped, not dropped as no-base"
-        );
-
-        drop(state);
-        let _ = drain.await;
-    }
-
-    /// P1-1/P1-2 — same as above but for HLL: a leading PROTO_DELTA frame
-    /// bootstraps onto an empty HLL of the frame's precision and applies
-    /// the register-max updates.
-    #[tokio::test]
-    async fn leading_hll_delta_bootstraps_onto_empty_base() {
-        use asap_otel_proto::sketchlib::v1::HllDelta as PbDelta;
-        use asap_physical_operators::summary_kernels::HllSketchAccumulator;
-        use prost::Message;
-
-        let (state, drain) = make_state().await;
-
-        const PRECISION: u32 = 2; // 2^2 = 4 registers
-        const WIN_START: u64 = 1_000_000;
-
-        // Packed (index, value) updates: set register 0 -> 4, register 2 -> 6.
-        let delta = PbDelta {
-            packed_updates: vec![0, 4, 2, 6],
-        }
-        .encode_to_vec();
-
-        let req = build_hll_request(
-            "cardinality_metric",
-            PRECISION,
-            ENCODING_PROTO_DELTA,
-            delta,
-            WIN_START,
-            11_000_000,
-        );
-        route_modified_otlp_sketches_to_precompute(&req, &state)
-            .await
-            .expect("ingest succeeds");
-
-        let mut attrs = HashMap::new();
-        attrs.insert("svc".to_string(), "auth".to_string());
-        let series_key = format_series_key(
-            canonical_sketch_metric_name("cardinality_metric", SketchAlgorithm::Hll),
-            &attrs,
-        );
-        {
-            let entry = state
-                .sketch_snapshots
-                .get(&series_key)
-                .expect("leading HLL delta bootstrapped + cached a base");
-            let hll = entry
-                .core
-                .as_any()
-                .downcast_ref::<HllSketchAccumulator>()
-                .expect("base is an HllSketchAccumulator");
-            // Empty base registers are all 0; the delta sets max(0,4)=4 and
-            // max(0,6)=6 on registers 0 and 2.
-            assert_eq!(hll.inner.registers[0], 4, "register 0 set to 4");
-            assert_eq!(hll.inner.registers[2], 6, "register 2 set to 6");
-        }
-        assert_eq!(
-            state
-                .observability
-                .dropped_no_base
-                .load(std::sync::atomic::Ordering::Relaxed),
-            0,
-            "HLL leading delta is bootstrapped, not dropped as no-base"
-        );
-
-        drop(state);
-        let _ = drain.await;
-    }
-
-    /// P1-1/P1-2 — DDSketch is NOT bootstrappable from a bare delta, so a
-    /// leading DDSketch delta is still dropped and counted under
-    /// `dropped_no_base`. Confirms the fix is scoped to the additive
-    /// families and leaves DD/KLL behavior unchanged.
-    #[tokio::test]
-    async fn leading_ddsketch_delta_still_dropped_as_no_base() {
-        use asap_otel_proto::sketchlib::v1::{DdSketchBucketDelta, DdSketchDelta as PbDelta};
-        use prost::Message;
-
-        let (state, drain) = make_state().await;
-        let delta = PbDelta {
-            buckets: vec![DdSketchBucketDelta {
-                index: 0,
-                d_count: 10,
-            }],
-        }
-        .encode_to_vec();
-        let dp = DdSketchDataPoint {
-            attributes: vec![kv("zone", "z0")],
-            start_time_unix_nano: 1_000_000,
-            time_unix_nano: 11_000_000,
-            sketch: delta,
-            encoding: ENCODING_PROTO_DELTA,
-            exemplars: Vec::new(),
-            flags: 0,
-            series_id: 0,
-        };
-        route_modified_otlp_sketches_to_precompute(&build_request("dd_latency_ms", dp), &state)
-            .await
-            .expect("ingest succeeds");
-
-        let mut attrs = HashMap::new();
-        attrs.insert("zone".to_string(), "z0".to_string());
-        let series_key = format_series_key(
-            canonical_sketch_metric_name("dd_latency_ms", SketchAlgorithm::DDSketch),
-            &attrs,
-        );
-        assert!(
-            state.sketch_snapshots.get(&series_key).is_none(),
-            "DDSketch leading delta is dropped (no bootstrap), so nothing cached"
-        );
-        assert_eq!(
-            state
-                .observability
-                .dropped_no_base
-                .load(std::sync::atomic::Ordering::Relaxed),
-            1,
-            "DDSketch leading delta counted as a no-base drop"
-        );
-
-        drop(state);
-        let _ = drain.await;
-    }
-
-    // ── P1-4: heap capability upgrade ──
-
-    /// P1-4 (a) — a CMS sid first registered from a heap-LESS frame
-    /// (`FrequencyEstimate(CountMin)`) must UPGRADE to
-    /// `FrequencyTopk(CmsWithHeap)` when a later heap-bearing MSGPACK
-    /// frame arrives for the same sid. One-way; never downgrades.
-    #[tokio::test]
-    async fn heap_bearing_frame_upgrades_cms_sid_capability() {
-        use crate::storage_engines::sketch_db::index::{Capability, SketchAlgorithm};
-        use asap_sketchlib::{CountMinSketchWithHeap, MessagePackCodec};
-
-        let (state, drain) = make_state().await;
-
-        const ROWS: i32 = 4;
-        const COLS: i32 = 8;
-
-        // ── Frame 1: heap-LESS plain CMS msgpack. Registers the sid as
-        // FrequencyEstimate(CountMin). ──
-        let plain = asap_sketchlib::CountMinSketch::new(ROWS as usize, COLS as usize);
-        let plain_bytes = plain.to_msgpack().expect("serialize plain CMS msgpack");
-        let req1 = build_cms_request(
-            "topk_metric",
-            ROWS,
-            COLS,
-            ENCODING_MSGPACK,
-            plain_bytes,
-            1_000_000,
-            11_000_000,
-        );
-        let out1 = route_modified_otlp_sketches_to_precompute(&req1, &state)
-            .await
-            .expect("ingest succeeds");
-        let sid = out1.series_assignments[0].series_id;
-        let meta1 = state.summary_store.instance(sid).expect("sid registered");
-        assert_eq!(
-            meta1.capability,
-            Some(Capability::FrequencyEstimate(Some(SketchAlgorithm::Cms))),
-            "heap-less first frame registers FrequencyEstimate(CountMin)"
-        );
-
-        // ── Frame 2: heap-BEARING CMS-with-heap msgpack for the SAME
-        // (metric, attrs) → same sid. Must upgrade the capability. ──
-        let mut heap = CountMinSketchWithHeap::new(ROWS as usize, COLS as usize, 4);
-        heap.update("hot_key", 100.0);
-        heap.update("hot_key", 50.0);
-        assert!(
-            !heap.topk_heap_items().is_empty(),
-            "heap frame carries a non-empty top-k heap"
-        );
-        let heap_bytes = heap.to_msgpack().expect("serialize CMS-with-heap msgpack");
-        let req2 = build_cms_request(
-            "topk_metric",
-            ROWS,
-            COLS,
-            ENCODING_MSGPACK,
-            heap_bytes,
-            1_000_000,
-            12_000_000,
-        );
-        route_modified_otlp_sketches_to_precompute(&req2, &state)
-            .await
-            .expect("ingest succeeds");
-
-        let meta2 = state
-            .summary_store
-            .instance(sid)
-            .expect("sid still registered");
-        assert_eq!(
-            meta2.capability,
-            Some(Capability::FrequencyTopk(Some(
-                SketchAlgorithm::CmsWithHeap
-            ))),
-            "heap-bearing frame upgrades the sid to FrequencyTopk(CmsWithHeap)"
-        );
-        // Still one instance — the upgrade is an in-place overwrite, not a
-        // new sid.
-        assert_eq!(state.summary_store.instance_count(), 1);
-
-        // ── Frame 3: a later heap-LESS frame must NOT downgrade. ──
-        let plain2 = asap_sketchlib::CountMinSketch::new(ROWS as usize, COLS as usize);
-        let plain2_bytes = plain2.to_msgpack().expect("serialize plain CMS msgpack");
-        let req3 = build_cms_request(
-            "topk_metric",
-            ROWS,
-            COLS,
-            ENCODING_MSGPACK,
-            plain2_bytes,
-            1_000_000,
-            13_000_000,
-        );
-        route_modified_otlp_sketches_to_precompute(&req3, &state)
-            .await
-            .expect("ingest succeeds");
-        let meta3 = state
-            .summary_store
-            .instance(sid)
-            .expect("sid still registered");
-        assert_eq!(
-            meta3.capability,
-            Some(Capability::FrequencyTopk(Some(
-                SketchAlgorithm::CmsWithHeap
-            ))),
-            "a later heap-less frame never downgrades the capability"
-        );
-
-        drop(state);
-        let _ = drain.await;
-    }
-
-    // ── P1-5: empty-attrs (global-aggregation) series can mint a sid ──
-
-    /// P1-5 — a sketch DataPoint with NO attributes (global aggregation,
-    /// no resource/scope/DP attrs) must still resolve to a sid via the
-    /// resolver (fingerprint `""`) and register a SketchStore instance,
-    /// instead of being dropped by the store-lookup-only branch.
-    #[tokio::test]
-    async fn attr_less_sketch_dp_mints_a_sid() {
-        let (state, drain) = make_state().await;
-
-        let dp = DdSketchDataPoint {
-            attributes: Vec::new(), // global aggregation — no attrs at all
-            start_time_unix_nano: 1_000_000,
-            time_unix_nano: 11_000_000,
-            sketch: vec![1, 2, 3],
-            encoding: ENCODING_PROTO,
-            exemplars: Vec::new(),
-            flags: 0,
-            series_id: 0, // first emit, no cached sid
-        };
-        let out = route_modified_otlp_sketches_to_precompute(
-            &build_request("global_latency_ms", dp),
-            &state,
-        )
-        .await
-        .expect("ingest succeeds");
-
-        // Pre-fix: dropped (sid=0 + no attrs → None). Post-fix: resolver
-        // mints a stable sid for (metric, "", agg_kind) and echoes an
-        // assignment with an empty fingerprint.
-        assert_eq!(
-            out.series_assignments.len(),
-            1,
-            "attr-less DP resolves and echoes one assignment"
-        );
-        let assigned = &out.series_assignments[0];
-        assert_ne!(assigned.series_id, 0, "resolver mints a non-zero sid");
-        assert!(
-            assigned.attributes_fingerprint.is_empty(),
-            "global series carries the empty fingerprint"
-        );
-        assert!(
-            out.unknown_series_ids.is_empty(),
-            "no unknown sids — the DP was ingestable, not dropped"
-        );
-        assert_eq!(
-            state.summary_store.instance_count(),
-            1,
-            "SketchStore registered the global-aggregation instance"
-        );
-        assert!(state.summary_store.instance(assigned.series_id).is_some());
-
-        drop(state);
-        let _ = drain.await;
-    }
-}
-
-// ── B7.6 regression: ingest bucketing is keyed by sid, not (agg_id, group_key) ──
-#[cfg(test)]
-mod sid_bucketing_tests {
-    //! Pin the B7.6 contract: ingest dispatches to the precompute engine
-    //! with `(sid, policy_fp, group_key)` on every `GroupSamples` /
-    //! `AccumulatorInput`, and distinct group_key values mint distinct
-    //! sids that round-trip through `SeriesIdResolver::lookup`. Tests
-    //! the actual `route_otlp_to_precompute` path end-to-end so a
-    //! refactor that drops the per-DP sid-resolve call (or routes by
-    //! agg_id) breaks here.
-    use super::*;
-    use crate::drivers::ingest::series_resolver::SeriesIdResolver;
-    use crate::precompute_engine::series_router::{SeriesRouter, WorkerMessage};
-    use crate::storage_engines::sketch_db::index::SketchStore;
-    use crate::storage_engines::types::{InstalledPrecomputePlan, InstalledPrecomputePlanHandle};
-    use asap_otel_proto::tonic::collector::metrics::v1::ExportMetricsServiceRequest;
-    use asap_otel_proto::tonic::common::v1::{any_value::Value as AnyVal, AnyValue, KeyValue};
-    use asap_otel_proto::tonic::metrics::v1::{
-        metric::Data, number_data_point::Value as NumberValue, Gauge as PbGauge,
-        Metric as PbMetric, NumberDataPoint, ResourceMetrics, ScopeMetrics,
-    };
-    use asap_types::aggregation_config::PrecomputeMaterialization;
-    use asap_types::enums::WindowKind;
-    use asap_types::AggregationType;
-    use asap_types::KeyByLabelNames;
-    use std::collections::HashMap;
-    use std::sync::Arc;
-    use tokio::sync::mpsc;
-
-    fn kv(k: &str, v: &str) -> KeyValue {
-        KeyValue {
-            key: k.to_string(),
-            value: Some(AnyValue {
-                value: Some(AnyVal::StringValue(v.to_string())),
-            }),
-        }
-    }
-
-    fn sum_agg_config(metric: &str, grouping: &[&str]) -> PrecomputeMaterialization {
-        PrecomputeMaterialization::new(
-            AggregationType::SingleSubpopulation,
-            "Sum".to_string(),
-            HashMap::new(),
-            KeyByLabelNames::new(grouping.iter().map(|s| s.to_string()).collect()),
-            KeyByLabelNames::empty(),
-            KeyByLabelNames::empty(),
-            String::new(),
-            10,
-            10,
-            WindowKind::Tumbling,
-            String::new(),
-            metric.to_string(),
-            None,
-            None,
-            None,
-        )
-    }
-
-    /// Build a Gauge request with one DataPoint per (zone, value) entry.
-    /// Distinct `zone` values are the two grouping-label buckets the
-    /// test inspects.
-    fn build_gauge_request(metric: &str, points: &[(&str, f64)]) -> ExportMetricsServiceRequest {
-        let data_points = points
-            .iter()
-            .map(|(zone, val)| NumberDataPoint {
-                attributes: vec![kv("zone", zone)],
-                start_time_unix_nano: 1_000_000,
-                time_unix_nano: 11_000_000,
-                value: Some(NumberValue::AsDouble(*val)),
-                exemplars: Vec::new(),
-                flags: 0,
-                series_id: 0,
-            })
-            .collect();
-        ExportMetricsServiceRequest {
-            resource_metrics: vec![ResourceMetrics {
-                resource: None,
-                scope_metrics: vec![ScopeMetrics {
-                    scope: None,
-                    metrics: vec![PbMetric {
-                        name: metric.to_string(),
-                        description: String::new(),
-                        unit: String::new(),
-                        metadata: Vec::new(),
-                        data: Some(Data::Gauge(PbGauge { data_points })),
-                    }],
-                    schema_url: String::new(),
-                }],
-                schema_url: String::new(),
-            }],
-        }
-    }
-
-    /// Two distinct `zone` values under one policy → two distinct
-    /// `GroupSamples` messages, each keyed by the sid the resolver
-    /// minted for the corresponding `(metric, zone-only-attrs,
-    /// ExactAgg-of-config)` tuple.
-    ///
-    /// Pre-B7.6 this path dispatched `WorkerMessage::GroupSamples {
-    /// agg_id, group_key, ... }` and the worker bucketed by
-    /// `(agg_id, group_key)`. The contract this test pins is:
-    ///   - exactly two `WorkerMessage::GroupSamples` are emitted
-    ///   - their sids are non-zero and distinct
-    ///   - each sid equals what `SeriesIdResolver::lookup` records for
-    ///     `(metric, "zone=<zv>;", ExactAgg-canonical)` — i.e. the
-    ///     bucket identity is folded into sid via the resolver
-    ///   - policy_fp = config.policy_fp_u64() on every message
-    ///   - samples in each bucket are exactly the DPs whose `zone`
-    ///     attribute matches that bucket (the GROUP-BY semantic)
-    ///
-    /// Note: the `group_key` field on the message comes from
-    /// `IngestState::extract_group_key_for(series_key, config)`. Pre-
-    /// PR-after-#284 a quoting mismatch between `format_series_key`
-    /// (unquoted) and `parse_labels_from_series_key` (quoted) caused
-    /// this to return the empty string for OTLP wire inputs; the
-    /// follow-up PR fixed the formatter to emit the canonical
-    /// PromQL `k="v"` form and added a roundtrip regression in
-    /// `series_key_roundtrip_tests`. Bucketing was always correct
-    /// here because B7.6 routes by sid (read directly from
-    /// `point.labels`, not the joined series_key) — the
-    /// group_key value is informational only for this test.
-    #[tokio::test]
-    async fn raw_otlp_buckets_by_sid_with_distinct_group_keys() {
-        // Channel large enough to capture all routed messages without
-        // blocking the dispatch loop.
-        let (tx, mut rx) = mpsc::channel::<WorkerMessage>(64);
-        let router = SeriesRouter::new(vec![tx]);
-
-        let metric = "cpu_seconds";
-        let cfg = sum_agg_config(metric, &["zone"]);
-        let policy_fp = asap_types::PolicyFingerprint(cfg.policy_fp_u64());
-        let mut configs = HashMap::new();
-        configs.insert(cfg.policy_fp_u64(), cfg.clone());
-        let streaming = InstalledPrecomputePlan::from_raw_ids(configs);
-        let hot_reload = InstalledPrecomputePlanHandle::new(streaming);
-
-        let resolver = Arc::new(SeriesIdResolver::new());
-        let state = Arc::new(IngestState {
-            router,
-            samples_ingested: std::sync::atomic::AtomicU64::new(0),
-            samples_blocked_by_schema_barrier: std::sync::atomic::AtomicU64::new(0),
-            hot_reload_config: hot_reload,
-            pass_raw_samples: false,
-            sketch_snapshots: dashmap::DashMap::new(),
-            series_resolver: resolver.clone(),
-            summary_store: Arc::new(SketchStore::new()),
-            observability: crate::precompute_engine::ingest_handler::IngestObservability::default(),
-        });
-
-        // Two zones × two DPs each. The two zones must produce two
-        // separate buckets; the two DPs within a zone must accumulate
-        // into the same bucket.
-        let req = build_gauge_request(
-            metric,
-            &[("z0", 1.0), ("z0", 2.0), ("z1", 10.0), ("z1", 20.0)],
-        );
-
-        // PERF-1 — parse once and pass the slices, matching the receiver
-        // path's new shape.
-        let (points, sketch_payloads) = otlp_to_metric_points_and_sketches(&req);
-        route_otlp_to_precompute(&points, &sketch_payloads, &state).await;
-
-        // Drain the messages the dispatcher emitted (one per bucket).
-        let mut messages: Vec<WorkerMessage> = Vec::new();
-        while let Ok(msg) = rx.try_recv() {
-            messages.push(msg);
-        }
-
-        // Filter to GroupSamples — the only variant raw OTLP emits.
-        let groups: Vec<(
-            u64,
-            asap_types::PolicyFingerprint,
-            Arc<crate::precompute_engine::group_key::GroupKey>,
-            Vec<(String, i64, f64)>,
-        )> = messages
-            .into_iter()
-            .filter_map(|m| match m {
-                WorkerMessage::GroupSamples {
-                    sid,
-                    policy_fp,
-                    group_key,
-                    samples,
-                    ..
-                } => Some((sid, policy_fp, group_key, samples)),
-                _ => None,
-            })
-            .collect();
-
-        assert_eq!(
-            groups.len(),
-            2,
-            "exactly two buckets (one per zone) — observed {} messages",
-            groups.len()
-        );
-
-        // Both buckets carry the same policy_fp (one source config).
-        for (_, pf, _, _) in &groups {
-            assert_eq!(
-                *pf, policy_fp,
-                "policy_fp must equal config.policy_fp_u64()"
-            );
-        }
-
-        // sids must be non-zero (zero is reserved on the wire) and distinct.
-        let mut sids: Vec<u64> = groups.iter().map(|(s, _, _, _)| *s).collect();
-        sids.sort();
-        sids.dedup();
-        assert_eq!(sids.len(), 2, "two distinct sids — one per group_key");
-        assert!(sids.iter().all(|&s| s != 0), "sid 0 is reserved");
-
-        // Each sid must match what the resolver records for its bucket
-        // identity: (metric, "zone=<zv>;", ExactAgg-canonical). Use
-        // the bucket's sample values to identify which zone it
-        // represents (sample-value-based identification is robust
-        // regardless of group_key shape — the test pin is on sid
-        // assignment, not on group_key content), then verify the
-        // sid matches the resolver mint for THAT zone.
-        let agg_kind_canonical =
-            crate::storage_engines::sketch_db::data::materialization_kind_for_config(&cfg);
-        for (sid, _, _, samples) in &groups {
-            let mut vals: Vec<f64> = samples.iter().map(|(_, _, v)| *v).collect();
-            vals.sort_by(|a, b| a.partial_cmp(b).unwrap());
-            let zone_for_bucket: &str = match vals.as_slice() {
-                [1.0, 2.0] => "z0",
-                [10.0, 20.0] => "z1",
-                other => panic!("unexpected bucket sample values: {other:?}"),
-            };
-            let fp =
-                crate::drivers::ingest::canonical_attrs_fingerprint(&[("zone", zone_for_bucket)]);
-            let resolved = state
-                .summary_store
-                .resolve_output_storage_handle(&resolver, policy_fp.into(), &fp, None)
-                .ok();
-            assert_eq!(
-                resolved,
-                Some(*sid),
-                "sid for zone={zone_for_bucket} (inferred from sample values) must equal \
-                 resolver mint for (metric={metric}, fp={fp}, agg_kind={agg_kind_canonical})",
-            );
-        }
-    }
-
-    #[test]
-    fn summary_frame_identity_is_parsed_and_removed_from_series_labels() {
-        let mut attrs = HashMap::from([
-            ("service".into(), "api".into()),
-            ("asap.frame.identity_version".into(), "1".into()),
-            ("asap.frame.plan_id".into(), "42".into()),
-            ("asap.frame.plan_version".into(), "3".into()),
-            (
-                "asap.frame.backend_compat".into(),
-                "asap-query-backend.v1".into(),
-            ),
-            ("asap.frame.materialization".into(), "99".into()),
-            (
-                "asap.frame.series_identity".into(),
-                "service=checkout,zone=a".into(),
-            ),
-            ("asap.frame.schema_id".into(), "schema-99".into()),
-            ("asap.frame.producer_id".into(), "edge-a".into()),
-            ("asap.frame.producer_epoch".into(), "boot-7".into()),
-            ("asap.frame.sequence".into(), "8".into()),
-            ("asap.frame.kind".into(), "full".into()),
-            ("asap.frame.encoding".into(), "sketchlib_protobuf_v1".into()),
-            ("asap.frame.checkpoint_id".into(), "cp-8".into()),
-        ]);
-        let frame = take_summary_frame_identity(&mut attrs, 100, 200).expect("valid identity");
-        assert_eq!(frame.plan_id, 42);
-        assert_eq!(frame.plan_version, 3);
-        assert_eq!(
-            frame.materialization,
-            asap_types::PolicyFingerprint(99).into()
-        );
-        assert_eq!(attrs, HashMap::from([("service".into(), "api".into())]));
-    }
-}
diff --git a/data_plane/src/drivers/ingest/prometheus_remote_write.rs b/data_plane/src/drivers/ingest/prometheus_remote_write.rs
deleted file mode 100644
index 6f2c2ba2a..000000000
--- a/data_plane/src/drivers/ingest/prometheus_remote_write.rs
+++ /dev/null
@@ -1,1983 +0,0 @@
-//! Prometheus Remote Write v1 adapter for the backend-local precompute path.
-//!
-//! This module deliberately stops at wire validation, canonical series
-//! identity, retry deduplication, and config-driven routing. Aggregation-family
-//! selection remains owned by the installed precompute plan.
-
-use crate::precompute_engine::ingest_handler::IngestState;
-use crate::precompute_engine::series_router::{TryRouteError, WorkerMessage};
-use prost::Message;
-use std::collections::{BTreeMap, HashMap};
-use std::sync::atomic::{AtomicU64, Ordering};
-use std::sync::{Arc, Mutex};
-use std::time::{Duration, Instant};
-
-pub const STALE_NAN_BITS: u64 = 0x7ff0_0000_0000_0002;
-
-#[derive(Clone, PartialEq, Message)]
-pub struct WriteRequest {
-    #[prost(message, repeated, tag = "1")]
-    pub timeseries: Vec<TimeSeries>,
-}
-
-#[derive(Clone, PartialEq, Message)]
-pub struct TimeSeries {
-    #[prost(message, repeated, tag = "1")]
-    pub labels: Vec<Label>,
-    #[prost(message, repeated, tag = "2")]
-    pub samples: Vec<Sample>,
-    #[prost(message, repeated, tag = "3")]
-    pub exemplars: Vec<OpaqueMessage>,
-    #[prost(message, repeated, tag = "4")]
-    pub histograms: Vec<OpaqueMessage>,
-}
-
-/// Presence-only decoder for unsupported non-scalar v1 payloads. Prost skips
-/// the nested fields while preserving whether such a payload was supplied.
-#[derive(Clone, PartialEq, Message)]
-pub struct OpaqueMessage {}
-
-#[derive(Clone, PartialEq, Message)]
-pub struct Label {
-    #[prost(string, tag = "1")]
-    pub name: String,
-    #[prost(string, tag = "2")]
-    pub value: String,
-}
-
-#[derive(Clone, PartialEq, Message)]
-pub struct Sample {
-    #[prost(double, tag = "1")]
-    pub value: f64,
-    #[prost(int64, tag = "2")]
-    pub timestamp: i64,
-}
-
-#[derive(Debug, Clone)]
-pub struct PrometheusRemoteWriteConfig {
-    pub max_compressed_bytes: usize,
-    pub max_decompressed_bytes: usize,
-    pub max_timeseries: usize,
-    pub max_samples: usize,
-    pub dedup_horizon: Duration,
-    pub max_dedup_entries: usize,
-    pub revisions: Option<(
-        std::path::PathBuf,
-        crate::precompute_engine::revisions::RevisionPolicy,
-    )>,
-}
-
-impl Default for PrometheusRemoteWriteConfig {
-    fn default() -> Self {
-        Self {
-            max_compressed_bytes: 32 * 1024 * 1024,
-            max_decompressed_bytes: 128 * 1024 * 1024,
-            max_timeseries: 100_000,
-            max_samples: 1_000_000,
-            dedup_horizon: Duration::from_secs(10 * 60),
-            max_dedup_entries: 2_000_000,
-            revisions: None,
-        }
-    }
-}
-
-#[derive(Debug, Default)]
-pub struct RemoteWriteStats {
-    pub requests: AtomicU64,
-    pub samples: AtomicU64,
-    pub stale_markers: AtomicU64,
-    pub duplicates: AtomicU64,
-    pub rejected_requests: AtomicU64,
-    pub bytes: AtomicU64,
-}
-
-#[derive(Clone)]
-pub struct PrometheusRemoteWriteReceiver {
-    inner: Arc<ReceiverInner>,
-}
-
-struct ReceiverInner {
-    config: PrometheusRemoteWriteConfig,
-    ingest: Arc<IngestState>,
-    dedup: Mutex<DedupState>,
-    stats: Arc<RemoteWriteStats>,
-}
-
-#[derive(Default)]
-struct DedupState {
-    input_closed: bool,
-    values: HashMap<(u64, u64, Arc<str>, i64), DedupValue>,
-    expiry_by_event_time: BTreeMap<i64, Vec<(u64, u64, Arc<str>)>>,
-    max_event_timestamp_ms: Option<i64>,
-}
-
-#[derive(Clone, Copy, PartialEq, Eq)]
-enum DedupValue {
-    Number(u64),
-    Stale,
-}
-
-#[derive(Debug, thiserror::Error)]
-pub enum RemoteWriteError {
-    #[error("finite input has been closed by the drain barrier")]
-    InputClosed,
-    #[error("compressed request exceeds {0} bytes")]
-    CompressedTooLarge(usize),
-    #[error("decompressed request exceeds {0} bytes")]
-    DecompressedTooLarge(usize),
-    #[error("snappy decompression failed: {0}")]
-    Snappy(String),
-    #[error("protobuf decoding failed: {0}")]
-    Protobuf(String),
-    #[error("request has {actual} time series; limit is {limit}")]
-    TooManySeries { actual: usize, limit: usize },
-    #[error("request has more than {0} samples")]
-    TooManySamples(usize),
-    #[error("invalid series: {0}")]
-    InvalidSeries(String),
-    #[error("invalid sample for {series} at {timestamp}: {reason}")]
-    InvalidSample {
-        series: String,
-        timestamp: i64,
-        reason: String,
-    },
-    #[error("conflicting sample for {series} at timestamp {timestamp}")]
-    Conflict { series: String, timestamp: i64 },
-    #[error("deduplication capacity ({0}) is exhausted")]
-    DedupCapacity(usize),
-    #[error("Remote Write requires an active PrometheusRemoteWriteV1 PhysicalPlan")]
-    InactivePhysicalPlan,
-    #[error("series identity admission failed: {0}")]
-    SeriesIdentity(String),
-    #[error("continuous revision execution failed: {0}")]
-    Revision(#[source] crate::precompute_engine::revisions::RevisionError),
-    #[error(transparent)]
-    Backpressure(#[from] TryRouteError),
-}
-
-#[derive(Debug, Clone, PartialEq)]
-pub struct CanonicalSample {
-    pub metric: Arc<str>,
-    pub labels: Arc<HashMap<String, String>>,
-    pub series_key: Arc<str>,
-    population_key: Arc<str>,
-    all_attrs_fingerprint: Arc<str>,
-    pub timestamp_ms: i64,
-    pub value: Option<f64>,
-}
-
-impl PrometheusRemoteWriteReceiver {
-    pub fn new(config: PrometheusRemoteWriteConfig, ingest: Arc<IngestState>) -> Self {
-        if let Some((directory, policy)) = &config.revisions {
-            *ingest
-                .summary_store
-                .revisions
-                .write()
-                .expect("revision installation poisoned") = Some(Arc::new(
-                crate::precompute_engine::revisions::RevisionRuntime::new(
-                    directory.clone(),
-                    policy.clone(),
-                    ingest.hot_reload_config.clone(),
-                ),
-            ));
-        }
-        Self {
-            inner: Arc::new(ReceiverInner {
-                config,
-                ingest,
-                dedup: Mutex::new(DedupState::default()),
-                stats: Arc::new(RemoteWriteStats::default()),
-            }),
-        }
-    }
-
-    pub fn config(&self) -> &PrometheusRemoteWriteConfig {
-        &self.inner.config
-    }
-
-    pub fn stats(&self) -> Arc<RemoteWriteStats> {
-        self.inner.stats.clone()
-    }
-
-    pub(crate) fn install_erp_observation_generation(
-        &self,
-        generation: asap_types::sds::CatalogGeneration,
-    ) {
-        if let Some(observer) = self.inner.ingest.router.erp_observer() {
-            observer.install_generation(generation);
-        }
-    }
-
-    /// Permanently seal this finite source before queuing worker barriers.
-    pub async fn drain(&self) -> Result<(), String> {
-        if self.inner.config.revisions.is_some() {
-            return Err(
-                "continuous input uses revisable snapshots; it cannot be sealed by a finite drain"
-                    .into(),
-            );
-        }
-        {
-            let mut state = self.inner.dedup.lock().map_err(|e| e.to_string())?;
-            state.input_closed = true;
-            // No write or retry is admissible after the finite-input barrier,
-            // so retry identities have no remaining correctness role during
-            // the query phase. Release them before waiting for materialization.
-            state.values.clear();
-            state.values.shrink_to_fit();
-            state.expiry_by_event_time.clear();
-            state.max_event_timestamp_ms = None;
-        }
-        let generation = self
-            .inner
-            .ingest
-            .active_physical_plan_snapshot()
-            .and_then(|plan| plan.precompute_plan.summary_catalog.clone())
-            .ok_or("finite completion requires a catalog generation")?;
-        self.inner.ingest.router.drain().await?;
-        let flush_deadline = tokio::time::Instant::now() + std::time::Duration::from_secs(30);
-        loop {
-            if self
-                .inner
-                .ingest
-                .summary_store
-                .seal_finite_summary_input(&generation)?
-            {
-                break;
-            }
-            if tokio::time::Instant::now() >= flush_deadline {
-                return Err(
-                    "finite completion is waiting for durable summary payloads; retry drain".into(),
-                );
-            }
-            tokio::time::sleep(std::time::Duration::from_millis(20)).await;
-        }
-        let plan = self
-            .inner
-            .ingest
-            .active_physical_plan_snapshot()
-            .ok_or("finite maintenance requires an installed physical plan")?;
-        if plan.precompute_plan.summary_catalog.as_ref() != Some(&generation) {
-            return Err("finite maintenance generation changed during drain".into());
-        }
-        self.inner.ingest.router.complete_dag(plan).await?;
-        if let Some(observer) = self.inner.ingest.router.erp_observer() {
-            let now_ms = std::time::SystemTime::now()
-                .duration_since(std::time::UNIX_EPOCH)
-                .map_err(|error| error.to_string())?
-                .as_millis() as u64;
-            observer.publish_finite(&generation, now_ms).await?;
-        }
-        trim_process_allocator();
-        Ok(())
-    }
-
-    /// Decode, validate, deduplicate, and enqueue one whole v1 request.
-    /// All validation and all queue reservations complete before any message
-    /// becomes visible to a worker.
-    pub fn accept(&self, body: &[u8]) -> Result<(), RemoteWriteError> {
-        self.inner.stats.requests.fetch_add(1, Ordering::Relaxed);
-        self.inner
-            .stats
-            .bytes
-            .fetch_add(body.len() as u64, Ordering::Relaxed);
-        let result = self.accept_inner(body);
-        if result.is_err() {
-            self.inner
-                .stats
-                .rejected_requests
-                .fetch_add(1, Ordering::Relaxed);
-        }
-        result
-    }
-
-    fn accept_inner(&self, body: &[u8]) -> Result<(), RemoteWriteError> {
-        let config = &self.inner.config;
-        if body.len() > config.max_compressed_bytes {
-            return Err(RemoteWriteError::CompressedTooLarge(
-                config.max_compressed_bytes,
-            ));
-        }
-        let decoded_len = snap::raw::decompress_len(body)
-            .map_err(|error| RemoteWriteError::Snappy(error.to_string()))?;
-        if decoded_len > config.max_decompressed_bytes {
-            return Err(RemoteWriteError::DecompressedTooLarge(
-                config.max_decompressed_bytes,
-            ));
-        }
-        let decoded = snap::raw::Decoder::new()
-            .decompress_vec(body)
-            .map_err(|error| RemoteWriteError::Snappy(error.to_string()))?;
-        let request = WriteRequest::decode(decoded.as_slice())
-            .map_err(|error| RemoteWriteError::Protobuf(error.to_string()))?;
-        let samples = canonicalize_request(&request, config)?;
-        let physical_plan = self
-            .inner
-            .ingest
-            .active_physical_plan_snapshot()
-            .ok_or(RemoteWriteError::InactivePhysicalPlan)?;
-        if physical_plan.precompute_plan.envelope.plan_id == 0
-            || !matches!(
-                physical_plan.precompute_plan.ingest.protocol,
-                asap_types::precompute_plan::IngestProtocol::PrometheusRemoteWriteV1
-            )
-            || physical_plan.precompute_plan.ingest.endpoint_path != "/api/v1/write"
-        {
-            return Err(RemoteWriteError::InactivePhysicalPlan);
-        }
-        let plan_identity = (
-            physical_plan.precompute_plan.envelope.plan_id,
-            physical_plan.precompute_plan.envelope.plan_version,
-        );
-
-        let mut dedup = self
-            .inner
-            .dedup
-            .lock()
-            .expect("remote write dedup poisoned");
-        if dedup.input_closed {
-            return Err(RemoteWriteError::InputClosed);
-        }
-        if let Some(runtime) = self
-            .inner
-            .ingest
-            .summary_store
-            .revisions
-            .read()
-            .map_err(|_| RemoteWriteError::Revision("revision installation poisoned".into()))?
-            .clone()
-        {
-            let now_ms = std::time::SystemTime::now()
-                .duration_since(std::time::UNIX_EPOCH)
-                .map_err(|e| RemoteWriteError::Revision(e.into()))?
-                .as_millis() as u64;
-            self.accept_revision(&runtime, samples, now_ms)
-                .map_err(RemoteWriteError::Revision)?;
-            return Ok(());
-        }
-        let batch_max_timestamp_ms = samples.iter().map(|sample| sample.timestamp_ms).max();
-        let max_event_timestamp_ms = match (dedup.max_event_timestamp_ms, batch_max_timestamp_ms) {
-            (Some(current), Some(batch)) => Some(current.max(batch)),
-            (current, batch) => current.or(batch),
-        };
-        let horizon_ms = i64::try_from(config.dedup_horizon.as_millis()).unwrap_or(i64::MAX);
-        let retention_cutoff_ms = max_event_timestamp_ms
-            .map(|timestamp| timestamp.saturating_sub(horizon_ms))
-            .unwrap_or(i64::MIN);
-
-        // Validate conflicts both against committed history and inside this
-        // request before reserving any worker capacity.
-        let mut batch_values: HashMap<(u64, u64, Arc<str>, i64), DedupValue> = HashMap::new();
-        let mut new_samples = Vec::with_capacity(samples.len());
-        let mut duplicates = 0u64;
-        for sample in samples {
-            let key = (
-                plan_identity.0,
-                plan_identity.1,
-                sample.series_key.clone(),
-                sample.timestamp_ms,
-            );
-            let value = sample
-                .value
-                .map(|v| DedupValue::Number(v.to_bits()))
-                .unwrap_or(DedupValue::Stale);
-            let prior = batch_values.get(&key).or_else(|| {
-                (sample.timestamp_ms >= retention_cutoff_ms)
-                    .then(|| dedup.values.get(&key))
-                    .flatten()
-            });
-            match prior {
-                Some(previous) if *previous == value => {
-                    duplicates += 1;
-                }
-                Some(_) => {
-                    return Err(RemoteWriteError::Conflict {
-                        series: sample.series_key.to_string(),
-                        timestamp: sample.timestamp_ms,
-                    });
-                }
-                None => {
-                    batch_values.insert(key, value);
-                    new_samples.push(sample);
-                }
-            }
-        }
-        let retained_existing = dedup
-            .values
-            .keys()
-            .filter(|key| key.3 >= retention_cutoff_ms)
-            .count();
-        let retained_batch = batch_values
-            .keys()
-            .filter(|key| key.3 >= retention_cutoff_ms)
-            .count();
-        if retained_existing.saturating_add(retained_batch) > config.max_dedup_entries {
-            return Err(RemoteWriteError::DedupCapacity(config.max_dedup_entries));
-        }
-
-        let messages = route_messages(&new_samples, &self.inner.ingest, &physical_plan)?;
-        let generation = Arc::new(
-            physical_plan
-                .precompute_plan
-                .summary_catalog
-                .clone()
-                .ok_or(RemoteWriteError::InactivePhysicalPlan)?,
-        );
-        let snapshot = self.inner.ingest.hot_reload_config.snapshot();
-        let mut coordinates = std::collections::BTreeSet::new();
-        for message in &messages {
-            let WorkerMessage::GroupSamples {
-                policy_fp,
-                group_key,
-                samples,
-                ..
-            } = message
-            else {
-                continue;
-            };
-            let config = snapshot
-                .get_aggregation_config((*policy_fp).into())
-                .ok_or(RemoteWriteError::InactivePhysicalPlan)?;
-            let manager = crate::precompute_engine::window_manager::WindowManager::with_layout(
-                config.window_size,
-                config.slide_interval,
-                config.pane_origin_ms,
-                &config.window_layout,
-            );
-            let mut labels = group_key.as_population_labels();
-            if labels.is_empty() {
-                labels = config
-                    .grouping_labels
-                    .iter()
-                    .cloned()
-                    .zip(group_key.values().labels)
-                    .collect();
-            }
-            let right_closed = config
-                .parameters
-                .get("promql_right_closed")
-                .and_then(serde_json::Value::as_bool)
-                .unwrap_or(false);
-            let affected = crate::precompute_engine::maintenance_runtime::affected_materializations(
-                &physical_plan.precompute_plan,
-                (*policy_fp).into(),
-            );
-            let mut starts = std::collections::BTreeSet::new();
-            for (_, timestamp, _) in samples {
-                let timestamp = if right_closed {
-                    timestamp.saturating_sub(1)
-                } else {
-                    *timestamp
-                };
-                starts.extend(manager.stored_bucket_starts(timestamp));
-            }
-            for start in starts {
-                let (start_ms, end_ms) = manager.stored_bucket_bounds(start);
-                for stored_output_id in &affected {
-                    coordinates.insert(asap_types::sds::SummaryInstanceCoordinates {
-                        stored_output_id: *stored_output_id,
-                        time_range: asap_types::sds::HalfOpenTimeRange { start_ms, end_ms },
-                        group_values: labels.clone(),
-                    });
-                }
-            }
-        }
-        self.inner
-            .ingest
-            .router
-            .try_route_group_batch_with_admission(messages, || {
-                if coordinates.is_empty() {
-                    return Ok(None);
-                }
-                let revision = self
-                    .inner
-                    .ingest
-                    .summary_store
-                    .admit_summary_updates(&generation, coordinates)?;
-                Ok(Some(Arc::new(
-                    crate::storage_engines::types::SummaryInputRevision {
-                        generation,
-                        revision,
-                        first_revision: revision,
-                    },
-                )))
-            })?;
-
-        self.inner
-            .ingest
-            .summary_store
-            .current_series
-            .lock()
-            .expect("current-series state poisoned")
-            .ingest(&physical_plan.query_plan, &new_samples);
-
-        // Commit dedup mutation only after the entire routed batch was
-        // reserved successfully. A rejected/backpressured request must not
-        // advance event time or erase retry history.
-        dedup.max_event_timestamp_ms = max_event_timestamp_ms;
-        dedup.evict_event_times_before(retention_cutoff_ms);
-        for ((plan_id, plan_version, series, timestamp), value) in batch_values {
-            if timestamp < retention_cutoff_ms {
-                continue;
-            }
-            dedup
-                .values
-                .insert((plan_id, plan_version, series.clone(), timestamp), value);
-            dedup
-                .expiry_by_event_time
-                .entry(timestamp)
-                .or_default()
-                .push((plan_id, plan_version, series));
-        }
-        let stale_count = new_samples
-            .iter()
-            .filter(|sample| sample.value.is_none())
-            .count() as u64;
-        let accepted_numeric_samples = (new_samples.len() as u64).saturating_sub(stale_count);
-        self.inner
-            .stats
-            .samples
-            .fetch_add(accepted_numeric_samples, Ordering::Relaxed);
-        crate::precompute_engine::metrics::record_accepted_samples(accepted_numeric_samples);
-        self.inner
-            .stats
-            .stale_markers
-            .fetch_add(stale_count, Ordering::Relaxed);
-        self.inner
-            .stats
-            .duplicates
-            .fetch_add(duplicates, Ordering::Relaxed);
-        self.inner
-            .ingest
-            .samples_ingested
-            .fetch_add(new_samples.len() as u64, Ordering::Relaxed);
-        Ok(())
-    }
-}
-
-#[cfg(all(target_os = "linux", target_env = "gnu"))]
-fn trim_process_allocator() {
-    unsafe extern "C" {
-        fn malloc_trim(pad: usize) -> i32;
-    }
-    // The input barrier has drained all worker-owned batches and permanently
-    // rejects future writes, so pages released by the dedup map and ingest
-    // buffers are no longer reachable by application code.
-    unsafe {
-        malloc_trim(0);
-    }
-}
-
-#[cfg(not(all(target_os = "linux", target_env = "gnu")))]
-fn trim_process_allocator() {}
-
-impl DedupState {
-    fn evict_event_times_before(&mut self, cutoff_ms: i64) {
-        let expired_timestamps = self
-            .expiry_by_event_time
-            .range(..cutoff_ms)
-            .map(|(timestamp, _)| *timestamp)
-            .collect::<Vec<_>>();
-        for timestamp in expired_timestamps {
-            if let Some(entries) = self.expiry_by_event_time.remove(&timestamp) {
-                for (plan_id, plan_version, series) in entries {
-                    self.values
-                        .remove(&(plan_id, plan_version, series, timestamp));
-                }
-            }
-        }
-    }
-}
-
-pub(crate) fn canonicalize_request(
-    request: &WriteRequest,
-    config: &PrometheusRemoteWriteConfig,
-) -> Result<Vec<CanonicalSample>, RemoteWriteError> {
-    if request.timeseries.len() > config.max_timeseries {
-        return Err(RemoteWriteError::TooManySeries {
-            actual: request.timeseries.len(),
-            limit: config.max_timeseries,
-        });
-    }
-    let mut out = Vec::new();
-    for timeseries in &request.timeseries {
-        if !timeseries.exemplars.is_empty() || !timeseries.histograms.is_empty() {
-            return Err(RemoteWriteError::InvalidSeries(
-                "exemplars and native histograms are outside compatibility level 1".into(),
-            ));
-        }
-        if out.len().saturating_add(timeseries.samples.len()) > config.max_samples {
-            return Err(RemoteWriteError::TooManySamples(config.max_samples));
-        }
-        let (metric, labels, series_key) = canonicalize_labels(&timeseries.labels)?;
-        let metric: Arc<str> = metric.into();
-        let labels = Arc::new(labels);
-        let series_key: Arc<str> = series_key.into();
-        let mut sorted_attrs = labels
-            .iter()
-            .map(|(name, value)| (name.as_str(), value.as_str()))
-            .collect::<Vec<_>>();
-        sorted_attrs.sort_unstable();
-        let all_attrs_fingerprint: Arc<str> =
-            super::canonical_attrs_fingerprint(&sorted_attrs).into();
-        let population_labels = sorted_attrs
-            .iter()
-            .map(|(name, value)| ((*name).to_string(), (*value).to_string()))
-            .collect::<BTreeMap<_, _>>();
-        let population_key: Arc<str> = format!(
-            "__asap_population__{}",
-            serde_json::to_string(&population_labels).expect("label map serialization")
-        )
-        .into();
-        for sample in &timeseries.samples {
-            let value = if sample.value.to_bits() == STALE_NAN_BITS {
-                None
-            } else if !sample.value.is_finite() {
-                return Err(RemoteWriteError::InvalidSample {
-                    series: series_key.to_string(),
-                    timestamp: sample.timestamp,
-                    reason: "only finite values or the Prometheus stale marker are accepted".into(),
-                });
-            } else {
-                Some(sample.value)
-            };
-            out.push(CanonicalSample {
-                metric: metric.clone(),
-                labels: labels.clone(),
-                series_key: series_key.clone(),
-                population_key: population_key.clone(),
-                all_attrs_fingerprint: all_attrs_fingerprint.clone(),
-                timestamp_ms: sample.timestamp,
-                value,
-            });
-        }
-    }
-    Ok(out)
-}
-
-fn canonicalize_labels(
-    labels: &[Label],
-) -> Result<(String, HashMap<String, String>, String), RemoteWriteError> {
-    let mut metric = None;
-    let mut attrs = HashMap::new();
-    for label in labels {
-        if !valid_label_name(&label.name) {
-            return Err(RemoteWriteError::InvalidSeries(format!(
-                "invalid label name {:?}",
-                label.name
-            )));
-        }
-        if label.name == "__name__" {
-            if metric.replace(label.value.clone()).is_some() {
-                return Err(RemoteWriteError::InvalidSeries(
-                    "duplicate __name__ label".into(),
-                ));
-            }
-        } else if attrs
-            .insert(label.name.clone(), label.value.clone())
-            .is_some()
-        {
-            return Err(RemoteWriteError::InvalidSeries(format!(
-                "duplicate label {:?}",
-                label.name
-            )));
-        }
-    }
-    let metric =
-        metric.ok_or_else(|| RemoteWriteError::InvalidSeries("missing __name__".into()))?;
-    if !valid_metric_name(&metric) {
-        return Err(RemoteWriteError::InvalidSeries(format!(
-            "invalid metric name {metric:?}"
-        )));
-    }
-    let mut sorted: Vec<_> = attrs.iter().collect();
-    sorted.sort_by(|a, b| a.0.cmp(b.0));
-    let series_key = if sorted.is_empty() {
-        metric.clone()
-    } else {
-        let rendered = sorted
-            .into_iter()
-            .map(|(name, value)| format!("{name}=\"{}\"", escape_label_value(value)))
-            .collect::<Vec<_>>()
-            .join(",");
-        format!("{metric}{{{rendered}}}")
-    };
-    Ok((metric, attrs, series_key))
-}
-
-fn route_messages(
-    samples: &[CanonicalSample],
-    ingest: &Arc<IngestState>,
-    physical_plan: &crate::storage_engines::types::RuntimePhysicalPlan,
-) -> Result<Vec<WorkerMessage>, RemoteWriteError> {
-    type Bucket = (
-        u64,
-        asap_types::PolicyFingerprint,
-        Arc<crate::precompute_engine::group_key::GroupKey>,
-    );
-    type RoutedSample = (String, i64, f64);
-    let snapshot = physical_plan.installed_precompute_plan.clone();
-    let _ = crate::storage_engines::sketch_db::lifecycle::reconcile_if_config_changed(
-        ingest.summary_store.as_ref(),
-        &snapshot,
-        crate::storage_engines::sketch_db::DEFAULT_RETIREMENT_RETENTION,
-    );
-    let configs = snapshot
-        .materializations()
-        .values()
-        .filter(|config| config.derived_input.is_none())
-        .filter_map(|config| {
-            compile_spatial_filter(&config.spatial_filter_normalized)
-                .ok()
-                .map(|filter| (config, filter))
-        })
-        .collect::<Vec<_>>();
-    let mut buckets: HashMap<u64, (Bucket, Vec<RoutedSample>)> = HashMap::new();
-    for sample in samples {
-        let Some(value) = sample.value else {
-            // Staleness is a lifecycle signal, never an accumulator input.
-            continue;
-        };
-        for (config, filter) in &configs {
-            if config.metric.as_str() != sample.metric.as_ref() || !filter.matches(&sample.labels) {
-                continue;
-            }
-            let group_key = if config.population_key_encoding.is_legacy() {
-                IngestState::extract_group_key_for(&sample.series_key, config)
-            } else {
-                IngestState::extract_group_key_from_labels(&sample.labels, config)
-            };
-            // Reset-aware counters and temporal min/max must keep one
-            // accumulator per source series. Their emitted label values still
-            // follow the physical grouping, so query-time Reduce nodes can
-            // combine those independent SDS instances safely.
-            let series_scoped = config.partitioning
-                == Some(asap_types::sds::PopulationPartitioning::PerEntity)
-                || (config.partitioning.is_none()
-                    && matches!(
-                        config.aggregation_type,
-                        asap_types::AggregationType::Increase
-                            | asap_types::AggregationType::Rate
-                            | asap_types::AggregationType::Min
-                            | asap_types::AggregationType::Max
-                    ));
-            let grouping_pairs: Vec<(&str, &str)> = if series_scoped {
-                Vec::new()
-            } else {
-                config
-                    .grouping_labels
-                    .iter()
-                    .map(|name| {
-                        (
-                            name.as_str(),
-                            sample.labels.get(name).map(String::as_str).unwrap_or(""),
-                        )
-                    })
-                    .collect()
-            };
-            let group_key = if series_scoped {
-                let mut names = sample.labels.keys().map(String::as_str).collect::<Vec<_>>();
-                names.sort_unstable();
-                crate::precompute_engine::group_key::intern_pairs(names.into_iter().map(|name| {
-                    (
-                        name,
-                        sample.labels.get(name).map(String::as_str).unwrap_or(""),
-                    )
-                }))
-            } else {
-                group_key
-            };
-            let computed_attrs_fp;
-            let attrs_fp = if series_scoped && config.population_key_encoding.is_legacy() {
-                sample.all_attrs_fingerprint.as_ref()
-            } else {
-                let pairs = if series_scoped {
-                    sample
-                        .labels
-                        .iter()
-                        .map(|(name, value)| (name.as_str(), value.as_str()))
-                        .collect::<Vec<_>>()
-                } else {
-                    grouping_pairs
-                };
-                computed_attrs_fp =
-                    super::population_attrs_fingerprint(config.population_key_encoding, &pairs)
-                        .map_err(RemoteWriteError::SeriesIdentity)?;
-                &computed_attrs_fp
-            };
-            let policy_fp = asap_types::PolicyFingerprint(config.policy_fp_u64());
-            let sid = ingest
-                .summary_store
-                .resolve_output_storage_handle(
-                    &ingest.series_resolver,
-                    policy_fp.into(),
-                    attrs_fp,
-                    physical_plan.precompute_plan.summary_catalog.as_ref(),
-                )
-                .map_err(RemoteWriteError::SeriesIdentity)?;
-            buckets
-                .entry(sid)
-                .or_insert_with(|| ((sid, policy_fp, group_key), Vec::new()))
-                .1
-                .push((sample.series_key.to_string(), sample.timestamp_ms, value));
-        }
-    }
-    let received_at = Instant::now();
-    Ok(buckets
-        .into_values()
-        .map(
-            |((sid, policy_fp, group_key), samples)| WorkerMessage::GroupSamples {
-                sid,
-                policy_fp,
-                group_key,
-                samples,
-                ingest_received_at: received_at,
-            },
-        )
-        .collect())
-}
-
-#[derive(Debug)]
-enum CompiledLabelMatcher {
-    Equal(String, String),
-    NotEqual(String, String),
-    Regex(String, regex::Regex),
-    NotRegex(String, regex::Regex),
-}
-
-#[derive(Debug, Default)]
-struct CompiledSpatialFilter(Vec<CompiledLabelMatcher>);
-
-impl CompiledSpatialFilter {
-    fn matches(&self, labels: &HashMap<String, String>) -> bool {
-        self.0.iter().all(|matcher| {
-            let (name, expected, negate) = match matcher {
-                CompiledLabelMatcher::Equal(name, value) => {
-                    return labels.get(name).map(String::as_str).unwrap_or("") == value
-                }
-                CompiledLabelMatcher::NotEqual(name, value) => {
-                    return labels.get(name).map(String::as_str).unwrap_or("") != value
-                }
-                CompiledLabelMatcher::Regex(name, regex) => (name, regex, false),
-                CompiledLabelMatcher::NotRegex(name, regex) => (name, regex, true),
-            };
-            let matched = expected.is_match(labels.get(name).map(String::as_str).unwrap_or(""));
-            matched != negate
-        })
-    }
-}
-
-fn compile_spatial_filter(filter: &str) -> Result<CompiledSpatialFilter, String> {
-    let body = filter.trim().trim_start_matches('{').trim_end_matches('}');
-    if body.trim().is_empty() {
-        return Ok(CompiledSpatialFilter::default());
-    }
-    let mut parts = Vec::new();
-    let mut start = 0;
-    let mut quoted = false;
-    let mut escaped = false;
-    for (index, ch) in body.char_indices() {
-        if escaped {
-            escaped = false;
-        } else if ch == '\\' && quoted {
-            escaped = true;
-        } else if ch == '"' {
-            quoted = !quoted;
-        } else if ch == ',' && !quoted {
-            parts.push(body[start..index].trim());
-            start = index + 1;
-        }
-    }
-    if quoted {
-        return Err("unterminated spatial-filter string".into());
-    }
-    parts.push(body[start..].trim());
-    let mut compiled = Vec::with_capacity(parts.len());
-    for part in parts {
-        let (name, operator, raw_value) = ["!~", "=~", "!=", "="]
-            .into_iter()
-            .find_map(|operator| {
-                part.find(operator).map(|at| {
-                    (
-                        part[..at].trim(),
-                        operator,
-                        part[at + operator.len()..].trim(),
-                    )
-                })
-            })
-            .ok_or_else(|| format!("invalid spatial matcher {part:?}"))?;
-        if name.is_empty() {
-            return Err("spatial matcher has an empty label name".into());
-        }
-        let value: String = serde_json::from_str(raw_value)
-            .map_err(|error| format!("invalid spatial matcher value: {error}"))?;
-        compiled.push(match operator {
-            "=" => CompiledLabelMatcher::Equal(name.into(), value),
-            "!=" => CompiledLabelMatcher::NotEqual(name.into(), value),
-            "=~" | "!~" => {
-                let regex = regex::Regex::new(&format!("^(?:{value})$"))
-                    .map_err(|error| format!("invalid spatial matcher regex: {error}"))?;
-                if operator == "=~" {
-                    CompiledLabelMatcher::Regex(name.into(), regex)
-                } else {
-                    CompiledLabelMatcher::NotRegex(name.into(), regex)
-                }
-            }
-            _ => unreachable!(),
-        });
-    }
-    Ok(CompiledSpatialFilter(compiled))
-}
-
-fn valid_label_name(name: &str) -> bool {
-    let mut chars = name.chars();
-    matches!(chars.next(), Some('_' | 'a'..='z' | 'A'..='Z'))
-        && chars.all(|ch| matches!(ch, '_' | 'a'..='z' | 'A'..='Z' | '0'..='9'))
-}
-
-fn valid_metric_name(name: &str) -> bool {
-    let mut chars = name.chars();
-    matches!(chars.next(), Some('_' | ':' | 'a'..='z' | 'A'..='Z'))
-        && chars.all(|ch| matches!(ch, '_' | ':' | 'a'..='z' | 'A'..='Z' | '0'..='9'))
-}
-
-fn escape_label_value(value: &str) -> String {
-    let mut out = String::with_capacity(value.len());
-    for ch in value.chars() {
-        match ch {
-            '\\' => out.push_str("\\\\"),
-            '"' => out.push_str("\\\""),
-            '\n' => out.push_str("\\n"),
-            other => out.push(other),
-        }
-    }
-    out
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use crate::precompute_engine::ingest_handler::IngestObservability;
-    use crate::precompute_engine::series_router::SeriesRouter;
-    use crate::storage_engines::types::{
-        ActivePhysicalPlanHandle, BackendStorageRouting, InstalledPrecomputePlan,
-        InstalledPrecomputePlanHandle, RuntimePhysicalPlan,
-    };
-    use tokio::sync::mpsc;
-
-    fn compressed(request: WriteRequest) -> Vec<u8> {
-        snap::raw::Encoder::new()
-            .compress_vec(&request.encode_to_vec())
-            .unwrap()
-    }
-
-    fn physical_config(streaming: InstalledPrecomputePlan) -> InstalledPrecomputePlanHandle {
-        use asap_types::producer_plan::{FrameIdentityContract, SequenceScope, TransmissionPlan};
-        use control_plane::physical::compiler::{
-            IngestContract, IngestProtocol, PlanEnvelope, PrecomputePlan, TimestampUnit,
-            PLANNER_REVISION,
-        };
-        let envelope = PlanEnvelope {
-            plan_id: 7,
-            plan_version: 3,
-            generated_at_unix_ms: 1,
-            activation_unix_ms: 1,
-            expiry_unix_ms: None,
-            backend_compat: asap_types::precompute_plan::BACKEND_COMPAT.into(),
-            planner_revision: PLANNER_REVISION.into(),
-            capability_snapshot_id: "test".into(),
-        };
-        let configs = streaming
-            .materializations_by_output
-            .values()
-            .cloned()
-            .collect::<Vec<_>>();
-        let catalog = Arc::new(
-            asap_types::summary_catalog::SummaryCatalog::from_materializations(7, 3, &configs)
-                .unwrap(),
-        );
-        let reference = catalog.reference().unwrap();
-        let generation = asap_types::sds::CatalogGeneration {
-            schema_version: reference.schema_version,
-            plan_id: reference.plan_id,
-            plan_version: reference.plan_version,
-            snapshot_sha256: reference.snapshot_sha256,
-        };
-        let active = RuntimePhysicalPlan {
-            readout_programs: Default::default(),
-            envelope: envelope.clone(),
-            summary_catalog: Some(catalog),
-            precompute_plan: PrecomputePlan {
-                summary_catalog: Some(generation),
-                envelope: envelope.clone(),
-                ingest: IngestContract {
-                    dataset_identity: None,
-                    protocol: IngestProtocol::PrometheusRemoteWriteV1,
-                    endpoint_path: "/api/v1/write".into(),
-                    timestamp_unit: TimestampUnit::UnixMilliseconds,
-                    require_plan_identity: false,
-                    require_stored_output_identity: false,
-                    require_registered_producer: false,
-                },
-                schemas: Vec::new(),
-                producers: Vec::new(),
-                executable_dags: Default::default(),
-                materializations: streaming
-                    .materializations_by_output
-                    .values()
-                    .cloned()
-                    .collect(),
-            },
-            transmission_plan: TransmissionPlan {
-                summary_catalog: None,
-                envelope,
-                frame_identity: FrameIdentityContract {
-                    identity_version: 1,
-                    sequence_scope: SequenceScope::MaterializationSeriesProducerEpoch,
-                    require_checkpoint_for_full: true,
-                    require_base_checkpoint_for_delta: true,
-                },
-                rules: Vec::new(),
-            },
-            installed_precompute_plan: Arc::new(streaming),
-            query_plan: Arc::new(asap_types::query_plan::QueryPlan::empty()),
-            storage_routing: Arc::new(BackendStorageRouting::empty()),
-        };
-        InstalledPrecomputePlanHandle::from_active_physical_plan(ActivePhysicalPlanHandle::new(
-            active,
-        ))
-    }
-
-    fn receiver(config: PrometheusRemoteWriteConfig) -> PrometheusRemoteWriteReceiver {
-        let (sender, _receiver) = mpsc::channel(8);
-        let ingest = Arc::new(IngestState {
-            router: SeriesRouter::new(vec![sender]),
-            samples_ingested: AtomicU64::new(0),
-            samples_blocked_by_schema_barrier: AtomicU64::new(0),
-            hot_reload_config: physical_config(InstalledPrecomputePlan::default()),
-            pass_raw_samples: false,
-            sketch_snapshots: dashmap::DashMap::new(),
-            series_resolver: Arc::new(super::super::SeriesIdResolver::new()),
-            summary_store: Arc::new(crate::storage_engines::sketch_db::index::SketchStore::new()),
-            observability: IngestObservability::default(),
-        });
-        PrometheusRemoteWriteReceiver::new(config, ingest)
-    }
-
-    fn configured_receiver() -> (PrometheusRemoteWriteReceiver, mpsc::Receiver<WorkerMessage>) {
-        use asap_types::enums::WindowKind;
-        use asap_types::{AggregationType, KeyByLabelNames, PrecomputeMaterialization};
-        let aggregation = PrecomputeMaterialization {
-            stored_output_id: None,
-            semantic_fragment: None,
-            population_key_encoding: Default::default(),
-            aggregation_type: AggregationType::Sum,
-            aggregation_sub_type: String::new(),
-            parameters: HashMap::new(),
-            grouping_labels: KeyByLabelNames::new(vec!["job".into()]).into(),
-            aggregated_labels: KeyByLabelNames::empty(),
-            rollup_labels: KeyByLabelNames::empty(),
-            original_yaml: String::new(),
-            window_size: 60,
-            slide_interval: 60,
-            window_type: WindowKind::Tumbling,
-            window_layout: asap_types::WindowMaterializationLayout::Pane { pane_secs: 60 },
-            pane_origin_ms: None,
-            spatial_filter: String::new(),
-            spatial_filter_normalized: String::new(),
-            metric: "requests_total".into(),
-            num_aggregates_to_retain: None,
-            table_name: None,
-            value_projection: None,
-            table_population: None,
-            derived_input: None,
-            table_timestamp_column: None,
-            partitioning: None,
-            value_source_column: None,
-        };
-        let policy_fp = aggregation.policy_fp_u64();
-        let streaming =
-            InstalledPrecomputePlan::from_raw_ids(HashMap::from([(policy_fp, aggregation)]));
-        let (sender, receiver) = mpsc::channel(8);
-        let ingest = Arc::new(IngestState {
-            router: SeriesRouter::new(vec![sender]),
-            samples_ingested: AtomicU64::new(0),
-            samples_blocked_by_schema_barrier: AtomicU64::new(0),
-            hot_reload_config: physical_config(streaming),
-            pass_raw_samples: false,
-            sketch_snapshots: dashmap::DashMap::new(),
-            series_resolver: Arc::new(super::super::SeriesIdResolver::new()),
-            summary_store: Arc::new(crate::storage_engines::sketch_db::index::SketchStore::new()),
-            observability: IngestObservability::default(),
-        });
-        ingest
-            .summary_store
-            .install_summary_catalog(
-                ingest
-                    .active_physical_plan_snapshot()
-                    .unwrap()
-                    .summary_catalog
-                    .as_ref()
-                    .unwrap()
-                    .clone(),
-            )
-            .unwrap();
-        (
-            PrometheusRemoteWriteReceiver::new(PrometheusRemoteWriteConfig::default(), ingest),
-            receiver,
-        )
-    }
-
-    #[test]
-    fn canonical_routing_preserves_group_labels_without_series_text_roundtrip() {
-        let (base, _worker) = configured_receiver();
-        let snapshot = base.inner.ingest.active_physical_plan_snapshot().unwrap();
-        let mut config = snapshot.precompute_plan.materializations[0].clone();
-        config.population_key_encoding = asap_types::PopulationKeyEncoding::CanonicalLabelsV1;
-        config.partitioning = Some(asap_types::sds::PopulationPartitioning::Grouped);
-        let hot = physical_config(InstalledPrecomputePlan::from_raw_ids(HashMap::from([(
-            config.policy_fp_u64(),
-            config.clone(),
-        )])));
-        let physical = hot.active_physical_plan_snapshot().unwrap();
-        // A direct routing fixture; public installation remains intentionally gated.
-        let (sender, _worker) = mpsc::channel(8);
-        let ingest = Arc::new(IngestState {
-            router: SeriesRouter::new(vec![sender]),
-            samples_ingested: AtomicU64::new(0),
-            samples_blocked_by_schema_barrier: AtomicU64::new(0),
-            hot_reload_config: hot,
-            pass_raw_samples: false,
-            sketch_snapshots: dashmap::DashMap::new(),
-            series_resolver: Arc::new(super::super::SeriesIdResolver::new()),
-            summary_store: Arc::new(crate::storage_engines::sketch_db::index::SketchStore::new()),
-            observability: IngestObservability::default(),
-        });
-        ingest
-            .summary_store
-            .install_summary_catalog(physical.summary_catalog.as_ref().unwrap().clone())
-            .unwrap();
-        let value = "a;z=\"x,y\\q";
-        let request = WriteRequest {
-            timeseries: vec![TimeSeries {
-                labels: vec![
-                    Label {
-                        name: "__name__".into(),
-                        value: config.metric.clone(),
-                    },
-                    Label {
-                        name: "job".into(),
-                        value: value.into(),
-                    },
-                ],
-                samples: vec![Sample {
-                    value: 1.0,
-                    timestamp: 1000,
-                }],
-                exemplars: vec![],
-                histograms: vec![],
-            }],
-        };
-        let samples =
-            canonicalize_request(&request, &PrometheusRemoteWriteConfig::default()).unwrap();
-        let messages = route_messages(&samples, &ingest, &physical).unwrap();
-        assert_eq!(messages.len(), 1);
-        let WorkerMessage::GroupSamples { group_key, .. } = &messages[0] else {
-            panic!("expected group samples")
-        };
-        assert_eq!(
-            group_key.as_population_labels(),
-            std::collections::BTreeMap::from([("job".into(), value.into())])
-        );
-    }
-
-    #[test]
-    fn global_topk_cms_routes_once_while_counters_remain_per_series() {
-        use asap_types::enums::WindowKind;
-        use asap_types::{AggregationType, KeyByLabelNames, PrecomputeMaterialization};
-
-        let config = |aggregation_type, grouping: Vec<String>, aggregated: Vec<String>| {
-            PrecomputeMaterialization {
-                stored_output_id: None,
-                semantic_fragment: None,
-                population_key_encoding: Default::default(),
-                aggregation_type,
-                aggregation_sub_type: String::new(),
-                parameters: match aggregation_type {
-                    AggregationType::CountMinSketchWithHeap => HashMap::from([
-                        ("w".into(), serde_json::json!(128)),
-                        ("d".into(), serde_json::json!(5)),
-                        ("heap_size".into(), serde_json::json!(2)),
-                    ]),
-                    AggregationType::DatasketchesKLL => {
-                        HashMap::from([("k".into(), serde_json::json!(200))])
-                    }
-                    _ => HashMap::new(),
-                },
-                grouping_labels: KeyByLabelNames::new(grouping).into(),
-                aggregated_labels: KeyByLabelNames::new(aggregated),
-                rollup_labels: KeyByLabelNames::empty(),
-                original_yaml: String::new(),
-                window_size: 60,
-                slide_interval: 60,
-                window_type: WindowKind::Tumbling,
-                window_layout: asap_types::WindowMaterializationLayout::Pane { pane_secs: 60 },
-                pane_origin_ms: Some(0),
-                spatial_filter: String::new(),
-                spatial_filter_normalized: String::new(),
-                metric: "cpu_seconds_total".into(),
-                num_aggregates_to_retain: Some(80),
-                table_name: None,
-                value_projection: None,
-                table_population: None,
-                derived_input: None,
-                table_timestamp_column: None,
-                partitioning: None,
-                value_source_column: None,
-            }
-        };
-        let cms = config(
-            AggregationType::CountMinSketchWithHeap,
-            vec![],
-            vec!["job".into()],
-        );
-        let counter = config(AggregationType::Increase, vec!["job".into()], vec![]);
-        let mut kll = config(AggregationType::DatasketchesKLL, vec![], vec![]);
-        kll.partitioning = Some(asap_types::sds::PopulationPartitioning::PerEntity);
-        let kll_fp = kll.policy_fingerprint();
-        let mut pooled_kll = kll.clone();
-        pooled_kll.partitioning = Some(asap_types::sds::PopulationPartitioning::Grouped);
-        let pooled_kll_fp = pooled_kll.policy_fingerprint();
-        assert_ne!(kll_fp, pooled_kll_fp);
-        let cms_fp = cms.policy_fingerprint();
-        let counter_fp = counter.policy_fingerprint();
-        let streaming = InstalledPrecomputePlan::from_raw_ids(HashMap::from([
-            (cms_fp.0, cms),
-            (counter_fp.0, counter),
-            (kll_fp.0, kll),
-            (pooled_kll_fp.0, pooled_kll),
-        ]));
-        let hot_reload = physical_config(streaming);
-        let physical_plan = hot_reload.active_physical_plan_snapshot().unwrap();
-        let (sender, _worker) = mpsc::channel(8);
-        let ingest = Arc::new(IngestState {
-            router: SeriesRouter::new(vec![sender]),
-            samples_ingested: AtomicU64::new(0),
-            samples_blocked_by_schema_barrier: AtomicU64::new(0),
-            hot_reload_config: hot_reload,
-            pass_raw_samples: false,
-            sketch_snapshots: dashmap::DashMap::new(),
-            series_resolver: Arc::new(super::super::SeriesIdResolver::new()),
-            summary_store: Arc::new(crate::storage_engines::sketch_db::index::SketchStore::new()),
-            observability: IngestObservability::default(),
-        });
-        ingest
-            .summary_store
-            .install_summary_catalog(physical_plan.summary_catalog.as_ref().unwrap().clone())
-            .unwrap();
-        let request = WriteRequest {
-            timeseries: ["api", "order", "payment", "user", "webapp"]
-                .into_iter()
-                .flat_map(|job| {
-                    ["a", "b"].into_iter().map(move |instance| TimeSeries {
-                        labels: vec![
-                            Label {
-                                name: "__name__".into(),
-                                value: "cpu_seconds_total".into(),
-                            },
-                            Label {
-                                name: "job".into(),
-                                value: job.into(),
-                            },
-                            Label {
-                                name: "instance".into(),
-                                value: instance.into(),
-                            },
-                        ],
-                        samples: vec![Sample {
-                            value: 1.0,
-                            timestamp: 1_000,
-                        }],
-                        exemplars: Vec::new(),
-                        histograms: Vec::new(),
-                    })
-                })
-                .collect(),
-        };
-        let samples = canonicalize_request(&request, &PrometheusRemoteWriteConfig::default())
-            .expect("canonical samples");
-        let messages = route_messages(&samples, &ingest, &physical_plan).unwrap();
-        let mut cms_buckets = 0;
-        let mut counter_buckets = 0;
-        let mut cms_samples = 0;
-        let mut kll_buckets = 0;
-        let mut pooled_kll_buckets = 0;
-        for message in messages {
-            let WorkerMessage::GroupSamples {
-                policy_fp, samples, ..
-            } = message
-            else {
-                panic!("route emits only group samples")
-            };
-            if policy_fp == cms_fp {
-                cms_buckets += 1;
-                cms_samples += samples.len();
-            } else if policy_fp == counter_fp {
-                counter_buckets += 1;
-            } else if policy_fp == kll_fp {
-                kll_buckets += 1;
-            } else if policy_fp == pooled_kll_fp {
-                pooled_kll_buckets += 1;
-            }
-        }
-        assert_eq!(kll_buckets, 10, "PerEntity KLL keeps every source series");
-        assert_eq!(
-            pooled_kll_buckets, 1,
-            "Grouped empty keys intentionally pool"
-        );
-        assert_eq!(cms_buckets, 1, "Reduce([]) has one global CMS SID");
-        assert_eq!(cms_samples, 10, "global CMS receives every source series");
-        assert_eq!(
-            counter_buckets, 10,
-            "reset-aware counters remain series scoped"
-        );
-    }
-
-    fn one_sample(value: f64) -> Vec<u8> {
-        compressed(WriteRequest {
-            timeseries: vec![TimeSeries {
-                labels: vec![
-                    Label {
-                        name: "__name__".into(),
-                        value: "requests_total".into(),
-                    },
-                    Label {
-                        name: "job".into(),
-                        value: "api".into(),
-                    },
-                ],
-                samples: vec![Sample {
-                    value,
-                    timestamp: 100,
-                }],
-                exemplars: Vec::new(),
-                histograms: Vec::new(),
-            }],
-        })
-    }
-
-    #[test]
-    fn spatial_filter_matches_prometheus_label_semantics() {
-        let labels = HashMap::from([
-            ("job".to_string(), "order-service".to_string()),
-            ("status".to_string(), "503".to_string()),
-        ]);
-        assert!(
-            compile_spatial_filter(r#"{job="order-service",status=~"5.."}"#)
-                .unwrap()
-                .matches(&labels)
-        );
-        assert!(!compile_spatial_filter(r#"{job!="order-service"}"#)
-            .unwrap()
-            .matches(&labels));
-        assert!(compile_spatial_filter(r#"{missing!="present"}"#)
-            .unwrap()
-            .matches(&labels));
-        assert!(!compile_spatial_filter(r#"{status!~"5.."}"#)
-            .unwrap()
-            .matches(&labels));
-    }
-
-    // Closing finite input prevents writes racing behind the completion barrier.
-    #[tokio::test]
-    async fn finite_input_drain_seals_receiver_and_propagates_worker_failure() {
-        let (receiver, mut worker) = configured_receiver();
-        receiver.accept(&one_sample(1.0)).unwrap();
-        let handle = receiver.clone();
-        let drain = tokio::spawn(async move { handle.drain().await });
-        assert!(matches!(
-            worker.recv().await.unwrap(),
-            WorkerMessage::BoundInput { .. }
-        ));
-        let WorkerMessage::Drain(reply) = worker.recv().await.unwrap() else {
-            panic!("expected barrier")
-        };
-        assert!(matches!(
-            receiver.accept(&one_sample(1.0)),
-            Err(RemoteWriteError::InputClosed)
-        ));
-        reply.send(Err("sink write failed".into())).unwrap();
-        assert_eq!(drain.await.unwrap().unwrap_err(), "sink write failed");
-    }
-
-    #[test]
-    fn rejects_writes_without_an_active_physical_plan() {
-        let (sender, _worker) = mpsc::channel(1);
-        let ingest = Arc::new(IngestState {
-            router: SeriesRouter::new(vec![sender]),
-            samples_ingested: AtomicU64::new(0),
-            samples_blocked_by_schema_barrier: AtomicU64::new(0),
-            hot_reload_config: InstalledPrecomputePlanHandle::new(
-                InstalledPrecomputePlan::default(),
-            ),
-            pass_raw_samples: false,
-            sketch_snapshots: dashmap::DashMap::new(),
-            series_resolver: Arc::new(super::super::SeriesIdResolver::new()),
-            summary_store: Arc::new(crate::storage_engines::sketch_db::index::SketchStore::new()),
-            observability: IngestObservability::default(),
-        });
-        let receiver = PrometheusRemoteWriteReceiver::new(Default::default(), ingest);
-        assert!(matches!(
-            receiver.accept(&one_sample(1.0)),
-            Err(RemoteWriteError::InactivePhysicalPlan)
-        ));
-    }
-
-    #[test]
-    fn canonicalizes_labels_and_recognizes_staleness() {
-        let request = WriteRequest {
-            timeseries: vec![TimeSeries {
-                labels: vec![
-                    Label {
-                        name: "zone".into(),
-                        value: "a\n\"b".into(),
-                    },
-                    Label {
-                        name: "__name__".into(),
-                        value: "http_requests_total".into(),
-                    },
-                    Label {
-                        name: "job".into(),
-                        value: "api".into(),
-                    },
-                ],
-                samples: vec![
-                    Sample {
-                        value: 3.0,
-                        timestamp: 100,
-                    },
-                    Sample {
-                        value: f64::from_bits(STALE_NAN_BITS),
-                        timestamp: 200,
-                    },
-                ],
-                exemplars: Vec::new(),
-                histograms: Vec::new(),
-            }],
-        };
-        let decoded = snap::raw::Decoder::new()
-            .decompress_vec(&compressed(request))
-            .unwrap();
-        let request = WriteRequest::decode(decoded.as_slice()).unwrap();
-        let samples =
-            canonicalize_request(&request, &PrometheusRemoteWriteConfig::default()).unwrap();
-        assert_eq!(
-            samples[0].series_key.as_ref(),
-            "http_requests_total{job=\"api\",zone=\"a\\n\\\"b\"}"
-        );
-        assert_eq!(samples[0].value, Some(3.0));
-        assert_eq!(samples[1].value, None);
-        assert!(Arc::ptr_eq(&samples[0].metric, &samples[1].metric));
-        assert!(Arc::ptr_eq(&samples[0].labels, &samples[1].labels));
-        assert!(Arc::ptr_eq(&samples[0].series_key, &samples[1].series_key));
-    }
-
-    #[test]
-    fn rejects_non_stale_nan_and_conflicting_labels() {
-        let config = PrometheusRemoteWriteConfig::default();
-        let invalid_nan = WriteRequest {
-            timeseries: vec![TimeSeries {
-                labels: vec![Label {
-                    name: "__name__".into(),
-                    value: "m".into(),
-                }],
-                samples: vec![Sample {
-                    value: f64::NAN,
-                    timestamp: 1,
-                }],
-                exemplars: Vec::new(),
-                histograms: Vec::new(),
-            }],
-        };
-        assert!(matches!(
-            canonicalize_request(&invalid_nan, &config),
-            Err(RemoteWriteError::InvalidSample { .. })
-        ));
-        assert!(canonicalize_labels(&[
-            Label {
-                name: "__name__".into(),
-                value: "m".into()
-            },
-            Label {
-                name: "job".into(),
-                value: "a".into()
-            },
-            Label {
-                name: "job".into(),
-                value: "b".into()
-            },
-        ])
-        .is_err());
-    }
-
-    #[test]
-    fn resource_limits_apply_before_allocation() {
-        let bytes = compressed(WriteRequest {
-            timeseries: Vec::new(),
-        });
-        let mut config = PrometheusRemoteWriteConfig::default();
-        config.max_compressed_bytes = bytes.len() - 1;
-        assert!(matches!(
-            receiver(config).accept(&bytes),
-            Err(RemoteWriteError::CompressedTooLarge(_))
-        ));
-    }
-
-    #[test]
-    fn replay_is_a_noop_and_conflict_is_rejected() {
-        let receiver = receiver(PrometheusRemoteWriteConfig::default());
-        receiver.accept(&one_sample(4.0)).unwrap();
-        receiver.accept(&one_sample(4.0)).unwrap();
-        assert_eq!(receiver.stats().samples.load(Ordering::Relaxed), 1);
-        assert_eq!(receiver.stats().duplicates.load(Ordering::Relaxed), 1);
-        assert!(matches!(
-            receiver.accept(&one_sample(5.0)),
-            Err(RemoteWriteError::Conflict { .. })
-        ));
-        assert_eq!(receiver.stats().samples.load(Ordering::Relaxed), 1);
-        assert_eq!(
-            receiver.stats().rejected_requests.load(Ordering::Relaxed),
-            1
-        );
-    }
-
-    #[test]
-    fn dedup_history_is_evicted_by_event_time_during_fast_replay() {
-        let mut state = DedupState::default();
-        for timestamp in [0, 60_000, 600_000, 660_000] {
-            let series: Arc<str> = format!("series-{timestamp}").into();
-            state
-                .values
-                .insert((7, 3, series.clone(), timestamp), DedupValue::Number(1));
-            state
-                .expiry_by_event_time
-                .entry(timestamp)
-                .or_default()
-                .push((7, 3, series));
-        }
-        state.evict_event_times_before(600_000);
-        assert_eq!(state.values.len(), 2);
-        assert!(state.values.keys().all(|key| key.3 >= 600_000));
-    }
-
-    #[test]
-    fn stale_marker_is_deduplicated_but_never_counted_as_numeric() {
-        let receiver = receiver(PrometheusRemoteWriteConfig::default());
-        let stale = one_sample(f64::from_bits(STALE_NAN_BITS));
-        receiver.accept(&stale).unwrap();
-        receiver.accept(&stale).unwrap();
-        assert_eq!(receiver.stats().samples.load(Ordering::Relaxed), 0);
-        assert_eq!(receiver.stats().stale_markers.load(Ordering::Relaxed), 1);
-        assert_eq!(receiver.stats().duplicates.load(Ordering::Relaxed), 1);
-    }
-
-    #[tokio::test]
-    async fn queued_population_blocks_partial_warm_read_until_both_workers_publish() {
-        use crate::precompute_engine::{
-            config::LateDataPolicy,
-            output_sink::SketchStoreSink,
-            worker::{Worker, WorkerRuntimeConfig},
-        };
-        use crate::query_engines::asap_query_engine::summary_executor::{
-            QueryExecutionContext, SummaryExecutorError,
-        };
-        use std::sync::atomic::{AtomicI64, AtomicUsize};
-        let (receiver, mut queued) = configured_receiver();
-        let request = WriteRequest {
-            timeseries: ["a", "b"]
-                .into_iter()
-                .map(|job| TimeSeries {
-                    labels: vec![
-                        Label {
-                            name: "__name__".into(),
-                            value: "requests_total".into(),
-                        },
-                        Label {
-                            name: "job".into(),
-                            value: job.into(),
-                        },
-                    ],
-                    samples: vec![Sample {
-                        timestamp: 100,
-                        value: 4.0,
-                    }],
-                    exemplars: vec![],
-                    histograms: vec![],
-                })
-                .collect(),
-        };
-        receiver.accept(&compressed(request)).unwrap();
-        let first = queued.recv().await.unwrap();
-        let second = queued.recv().await.unwrap();
-        let ingest = &receiver.inner.ingest;
-        let sink = Arc::new(SketchStoreSink::new(
-            ingest.summary_store.clone(),
-            ingest.hot_reload_config.clone(),
-            ingest.series_resolver.clone(),
-        ));
-        let start_worker = |id| {
-            let (tx, rx) = mpsc::channel(4);
-            let worker = Worker::new(
-                id,
-                rx,
-                sink.clone(),
-                ingest.hot_reload_config.clone(),
-                WorkerRuntimeConfig {
-                    max_buffer_per_series: 100,
-                    allowed_lateness_ms: 0,
-                    pass_raw_samples: false,
-                    raw_mode_aggregation_id: 0,
-                    late_data_policy: LateDataPolicy::Drop,
-                    wall_clock_idle_grace_period_ms: i64::MAX,
-                    wall_clock_max_open_grace_period_ms: i64::MAX,
-                },
-                Arc::new(AtomicUsize::new(0)),
-                Arc::new(AtomicI64::new(i64::MIN)),
-            );
-            (tx, tokio::spawn(worker.run()))
-        };
-        let (fast, fast_task) = start_worker(0);
-        let (slow, slow_task) = start_worker(1);
-        fast.send(first).await.unwrap();
-        let (done, result) = tokio::sync::oneshot::channel();
-        fast.send(WorkerMessage::Drain(done)).await.unwrap();
-        result.await.unwrap().unwrap();
-        let policy = *ingest
-            .hot_reload_config
-            .snapshot()
-            .materializations_by_output
-            .keys()
-            .next()
-            .unwrap();
-        let binding = asap_types::query_plan::MaterializationBinding {
-            full_window_slide_ms: None,
-            materialization: policy,
-            stored_output_reference: ingest
-                .summary_store
-                .summary_catalog_snapshot()
-                .unwrap()
-                .output_reference(policy)
-                .unwrap(),
-            output_grouping: asap_types::query_plan::PhysicalGrouping::Reduce(vec!["job".into()]),
-            item_labels: vec![],
-            window_ms: 60_000,
-            pane_origin_ms: Some(0),
-            readout_lookback_ms: None,
-        };
-        let context = QueryExecutionContext {
-            index: &ingest.summary_store,
-            t0_ms: 0,
-            t1_ms: 60_000,
-            is_cumulative: true,
-            allowed_materializations: None,
-        };
-        assert!(matches!(
-            context.read_bound_materialization(&binding),
-            Err(SummaryExecutorError::Unsupported(
-                "materialization population has unpublished input"
-            ))
-        ));
-        slow.send(second).await.unwrap();
-        let (done, result) = tokio::sync::oneshot::channel();
-        slow.send(WorkerMessage::Drain(done)).await.unwrap();
-        result.await.unwrap().unwrap();
-        assert_eq!(
-            context.read_bound_materialization(&binding).unwrap().len(),
-            2
-        );
-        fast.send(WorkerMessage::Shutdown).await.unwrap();
-        slow.send(WorkerMessage::Shutdown).await.unwrap();
-        fast_task.await.unwrap();
-        slow_task.await.unwrap();
-    }
-
-    #[tokio::test]
-    async fn valid_request_routes_canonical_sample_to_installed_plan() {
-        let (receiver, mut worker) = configured_receiver();
-        receiver.accept(&one_sample(4.0)).unwrap();
-        let message = worker.recv().await.expect("routed worker message");
-        let WorkerMessage::BoundInput {
-            input, revision, ..
-        } = message
-        else {
-            panic!("missing admission receipt")
-        };
-        assert!(revision.as_ref().unwrap().revision > 0);
-        let message = *input;
-        let revision = revision.expect("remote-write input carries admission receipt");
-        let WorkerMessage::GroupSamples {
-            group_key, samples, ..
-        } = message
-        else {
-            panic!("expected GroupSamples");
-        };
-        assert_eq!(group_key.values().labels, vec!["api"]);
-        assert_eq!(
-            samples,
-            vec![("requests_total{job=\"api\"}".into(), 100, 4.0)]
-        );
-    }
-}
-
-impl PrometheusRemoteWriteReceiver {
-    fn accept_revision(
-        &self,
-        runtime: &crate::precompute_engine::revisions::RevisionRuntime,
-        samples: Vec<CanonicalSample>,
-        now_ms: u64,
-    ) -> Result<u64, crate::precompute_engine::revisions::RevisionError> {
-        use crate::precompute_engine::revisions::{encode_state, InputSample, RevisionRecord};
-        use crate::precompute_engine::{raw_dag::RawDagProgram, window_manager::WindowManager};
-        use asap_types::sds::StoredOutputId;
-        let (plan, store) = runtime.installed()?;
-        let generation = plan
-            .precompute_plan
-            .summary_catalog
-            .as_ref()
-            .ok_or("revision catalog missing")?;
-        let max_window = plan
-            .precompute_plan
-            .materializations
-            .iter()
-            .map(|c| c.window_size.saturating_mul(1000))
-            .max()
-            .unwrap_or(0);
-        let query_history = plan
-            .query_plan
-            .entries
-            .values()
-            .map(|entry| entry.instant.lookback_ms)
-            .max()
-            .unwrap_or(0);
-        let planned_retention = plan
-            .precompute_plan
-            .materializations
-            .iter()
-            .filter_map(|c| {
-                c.num_aggregates_to_retain
-                    .map(|n| n.saturating_mul(c.slide_interval).saturating_mul(1000))
-            })
-            .max()
-            .unwrap_or(0);
-        let current_series_history = plan
-            .query_plan
-            .entries
-            .values()
-            .flat_map(|entry| entry.nodes.values())
-            .filter_map(|node| match node {
-                asap_types::query_plan::QueryPlanNode::Logical {
-                    operator:
-                        asap_types::query_plan::query_time::QueryTimeOperator::CurrentSeries {
-                            population,
-                            ..
-                        },
-                    ..
-                } => Some(population.lookback_ms),
-                _ => None,
-            })
-            .max()
-            .unwrap_or(0);
-        let required_history = runtime
-            .policy
-            .correction_horizon_ms
-            .max(query_history)
-            .max(current_series_history)
-            .max(planned_retention);
-        let retain = max_window
-            .checked_add(required_history)
-            .and_then(|v| v.checked_add(runtime.policy.max_query_staleness_ms))
-            .ok_or("revision retention overflow")?;
-        let inputs: Vec<_> = samples
-            .into_iter()
-            .map(|s| InputSample {
-                metric: s.metric.to_string(),
-                labels: s
-                    .labels
-                    .iter()
-                    .map(|(k, v)| (k.clone(), v.clone()))
-                    .collect(),
-                series: s.series_key.to_string(),
-                timestamp_ms: s.timestamp_ms,
-                first_revision: 0,
-                value: s.value,
-            })
-            .collect();
-        let outputs = plan
-            .precompute_plan
-            .materializations
-            .iter()
-            .map(|c| StoredOutputId(c.policy_fp_u64()))
-            .collect();
-        store.apply(generation, inputs, now_ms, retain, &outputs, |samples, horizon| {
-            // Event-time maxima and flush timers cannot admit an expired correction.
-            // Use the backend admission clock, and reject the entire request first.
-            if samples.iter().any(|s| s.timestamp_ms < 0 || s.timestamp_ms as u64 > now_ms || (s.timestamp_ms as u64) < now_ms.saturating_sub(horizon)) {
-                return Err(crate::precompute_engine::revisions::AdmissionRejected("Remote Write request exceeds the correction horizon or contains future input").into());
-            }
-            for config in plan.precompute_plan.materializations.iter().filter(|c| c.derived_input.is_none()) {
-                let filter = compile_spatial_filter(&config.spatial_filter_normalized)?;
-                let program = RawDagProgram::from_plan(&plan.precompute_plan, config)?;
-                let updater = program.updater()?;
-                for sample in samples {
-                    let labels = sample.labels.iter().map(|(k,v)|(k.clone(),v.clone())).collect();
-                    if sample.metric == config.metric && filter.matches(&labels) {
-                        if let Some(value) = sample.value {
-                            program.validate_sample(updater.as_ref(), value).map_err(|_| crate::precompute_engine::revisions::AdmissionRejected("sample is outside the bound summary kernel's input domain"))?;
-                        }
-                    }
-                }
-            }
-            Ok(())
-        }, |inputs, revision, captured_at_ms, admitted, publish| {
-            if admitted {
-                let new = inputs.iter().filter(|s| s.first_revision == revision);
-                let numeric = new.clone().filter(|s|s.value.is_some()).count() as u64;
-                let stale = new.filter(|s|s.value.is_none()).count() as u64;
-                self.inner.stats.samples.fetch_add(numeric, Ordering::Relaxed);
-                self.inner.stats.stale_markers.fetch_add(stale, Ordering::Relaxed);
-                self.inner.ingest.samples_ingested.fetch_add(numeric, Ordering::Relaxed);
-                crate::precompute_engine::metrics::record_accepted_samples(numeric);
-            }
-            let canonical = revision_samples(inputs)?;
-            let committed = store.committed_outputs(revision)?;
-            let routed = route_messages(&canonical, &self.inner.ingest, &plan)?;
-            let mut frozen = Vec::new();
-            let mut records: BTreeMap<StoredOutputId, Vec<RevisionRecord>> = plan.precompute_plan.materializations.iter().filter(|c| c.derived_input.is_none()).map(|c|(StoredOutputId(c.policy_fp_u64()), Vec::new())).collect();
-            for message in routed {
-                let WorkerMessage::GroupSamples { sid, policy_fp, group_key, mut samples, .. } = message else { return Err("revision routing returned non-sample input".into()); };
-                let config = plan.precompute_plan.materializations.iter().find(|c| c.policy_fingerprint() == policy_fp).ok_or("revision raw configuration missing")?;
-                if committed.contains_key(&policy_fp.0) { continue; }
-                let program = RawDagProgram::from_plan(&plan.precompute_plan, config)?;
-                let manager = WindowManager::with_layout(config.window_size, config.slide_interval, config.pane_origin_ms, &config.window_layout);
-                let mut windows: BTreeMap<(u64,u64), Box<dyn asap_physical_operators::summary_kernels::factory::AccumulatorUpdater>> = BTreeMap::new();
-                samples.sort_by(|a,b| (&a.0,a.1).cmp(&(&b.0,b.1)));
-                for (series,time,value) in samples {
-                    for start in manager.stored_bucket_starts(time) {
-                        let (start,end) = manager.stored_bucket_bounds(start);
-                        if start < 0 || end < 0 || end as u64 > captured_at_ms || (start as u64) < captured_at_ms.saturating_sub(retain.saturating_sub(max_window)) { continue; }
-                        let key = (start as u64,end as u64);
-                        if let std::collections::btree_map::Entry::Vacant(entry) = windows.entry(key) { entry.insert(program.updater()?); }
-                        program.apply(windows.get_mut(&key).unwrap().as_mut(), &series, value, time)?;
-                        let bytes = windows.values().map(|u|u.memory_usage_bytes()).sum::<usize>();
-                        if bytes > runtime.policy.max_checkpoint_bytes { return Err(Box::new(asap_physical_operators::Error::MemoryLimit)); }
-                    }
-                }
-                let reference = plan.installed_precompute_plan.stored_output_reference(policy_fp.into()).ok_or("revision raw binding missing")?;
-                let group = group_key.as_population_labels();
-                let states: BTreeMap<_, Arc<dyn crate::storage_engines::types::AggregateCore>> = windows.into_iter().map(|(w,updater)|(w,Arc::from(updater.into_accumulator()))).collect();
-                for ((start,end),state) in &states {
-                    records.get_mut(&policy_fp.into()).unwrap().push(RevisionRecord { reference: reference.clone(), group: group.clone(), start_ms:*start, end_ms:*end, payload:encode_state(Arc::clone(state),program.family.clone())? });
-                }
-                frozen.push(crate::storage_engines::sketch_db::index::FrozenExactWindows { stored_output_reference: reference, storage_handle: sid, definition:policy_fp.into(), generation: Arc::new(generation.clone()), group, windows:states, singleton_population_complete:true });
-                if frozen.iter().flat_map(|f| f.windows.values()).map(|s|s.approx_memory_bytes()).sum::<usize>() > runtime.policy.max_checkpoint_bytes { return Err(Box::new(asap_physical_operators::Error::MemoryLimit)); }
-            }
-            // Recovery must consume the exact committed raw bytes, not another
-            // randomized sketch realization from replaying identical input.
-            for (output, result) in records {
-                if let Some(previous) = committed.get(&output.0) {
-                    let config = plan.precompute_plan.materializations.iter().find(|c| c.policy_fp_u64() == output.0).ok_or("committed raw output missing")?;
-                    let mut groups: BTreeMap<BTreeMap<String,String>, BTreeMap<(u64,u64),Arc<dyn crate::storage_engines::types::AggregateCore>>> = BTreeMap::new();
-                    for record in previous { groups.entry(record.group.clone()).or_default().insert((record.start_ms,record.end_ms),crate::precompute_engine::revisions::decode_state(record,config)?); }
-                    for (group,windows) in groups {
-                        frozen.push(crate::storage_engines::sketch_db::index::FrozenExactWindows {
-                            stored_output_reference: plan.installed_precompute_plan.stored_output_reference(output).ok_or("committed raw binding missing")?, storage_handle: output.0, definition: output, generation:Arc::new(generation.clone()), group, windows, singleton_population_complete:true,
-                        });
-                    }
-                } else { publish(output,result)?; }
-            }
-            crate::precompute_engine::maintenance_runtime::execute_revision_outputs(&plan, &frozen, revision, runtime.policy.max_checkpoint_bytes, publish)
-        })
-    }
-}
-
-impl PrometheusRemoteWriteReceiver {
-    /// Validate and restore the active generation before opening request serving.
-    pub fn recover_revisions(&self) -> Result<(), RemoteWriteError> {
-        if let Some(runtime) = self
-            .inner
-            .ingest
-            .summary_store
-            .revisions
-            .read()
-            .map_err(|_| RemoteWriteError::Revision("revision installation poisoned".into()))?
-            .clone()
-        {
-            if self.inner.ingest.active_physical_plan_snapshot().is_some() {
-                runtime.installed().map_err(RemoteWriteError::Revision)?;
-            }
-        }
-        Ok(())
-    }
-
-    /// Capture newly closed windows even when no later event arrives. This is
-    /// a revisable snapshot of locally accepted input, not an event-time watermark.
-    pub fn refresh_revisions(&self) -> Result<(), RemoteWriteError> {
-        let _admission = self
-            .inner
-            .dedup
-            .lock()
-            .map_err(|_| RemoteWriteError::Revision("revision admission poisoned".into()))?;
-        let runtime = self
-            .inner
-            .ingest
-            .summary_store
-            .revisions
-            .read()
-            .map_err(|_| RemoteWriteError::Revision("revision installation poisoned".into()))?
-            .clone();
-        if let Some(runtime) = runtime {
-            if self.inner.ingest.active_physical_plan_snapshot().is_none() {
-                return Ok(());
-            }
-            let now = std::time::SystemTime::now()
-                .duration_since(std::time::UNIX_EPOCH)
-                .map_err(|e| RemoteWriteError::Revision(e.into()))?
-                .as_millis() as u64;
-            self.accept_revision(&runtime, Vec::new(), now)
-                .map_err(RemoteWriteError::Revision)?;
-        }
-        Ok(())
-    }
-}
-
-pub(crate) fn revision_samples(
-    inputs: &[crate::precompute_engine::revisions::InputSample],
-) -> Result<Vec<CanonicalSample>, crate::precompute_engine::revisions::RevisionError> {
-    let canonical: Vec<_> = inputs
-        .iter()
-        .map(|s| {
-            let attrs: Vec<_> = s
-                .labels
-                .iter()
-                .map(|(k, v)| (k.as_str(), v.as_str()))
-                .collect();
-            Ok(CanonicalSample {
-                metric: Arc::from(s.metric.as_str()),
-                labels: Arc::new(
-                    s.labels
-                        .iter()
-                        .map(|(k, v)| (k.clone(), v.clone()))
-                        .collect(),
-                ),
-                series_key: Arc::from(s.series.as_str()),
-                population_key: Arc::from(format!(
-                    "__asap_population__{}",
-                    serde_json::to_string(&s.labels)?
-                )),
-                all_attrs_fingerprint: Arc::from(super::canonical_attrs_fingerprint(&attrs)),
-                timestamp_ms: s.timestamp_ms,
-                value: s.value,
-            })
-        })
-        .collect::<Result<_, crate::precompute_engine::revisions::RevisionError>>()?;
-    Ok(canonical)
-}
diff --git a/data_plane/src/drivers/ingest/series_resolver.rs b/data_plane/src/drivers/ingest/series_resolver.rs
deleted file mode 100644
index 61942fb27..000000000
--- a/data_plane/src/drivers/ingest/series_resolver.rs
+++ /dev/null
@@ -1,1292 +0,0 @@
-//! Centralized series_id resolver — Phase 4 of the controller-into-backend
-//! refactor (2026-05).
-//!
-//! The asap-query-backend host is the SOLE minter of `series_id`s in the
-//! pipeline. Agents and gateway are transparent forwarders for sids whose
-//! input identity matches the output identity; for rollup-output identities
-//! at the gateway, the gateway itself calls back to this resolver (same
-//! flow as agents — it just happens to be a hop closer).
-//!
-//! The resolver is content-addressable and idempotent: same `(metric_name,
-//! attribute_set)` input always produces the same `series_id` for the
-//! lifetime of the cache. This is the invariant that makes
-//! attribute-fallback recovery work — a recovered agent re-emits with full
-//! attributes, the resolver returns the same sid that was assigned before
-//! the agent's crash, and sketch state under that sid stays coherent.
-//!
-//! Cache key: a deterministic fingerprint of `(metric_name, sorted
-//! [attr_key, attr_value] pairs)`. Both sender and resolver MUST compute
-//! the fingerprint the same way; the fingerprint algorithm here mirrors
-//! the patched OTel-Go exporter's `attributesFingerprint` in
-//! `opentelemetry-go-patch/exporters/otlp/otlpmetric/otlpmetricgrpc/
-//! internal/series/dictionary.go`.
-//!
-//! See design doc §5.4 ("Idempotency invariant on `ResolveSeriesIDs`")
-//! in `docs/design_docs/series-identity.md`.
-
-use dashmap::DashMap;
-use std::collections::BTreeMap;
-use std::fs::{File, OpenOptions};
-use std::io::{Read, Seek, SeekFrom, Write};
-use std::path::PathBuf;
-use std::sync::atomic::{AtomicU64, Ordering};
-use std::sync::{Arc, Mutex};
-use tracing::{info, warn};
-
-/// Canonical sid identity: `(metric_name, attrs_fingerprint, agg_kind_canonical)`.
-///
-/// Sort attribute keys and join `key=value;` pairs exactly as the patched
-/// OTel-Go exporter does. The aggregation kind separates different summaries
-/// over the same metric and attributes.
-type CacheKey = (String, String, String);
-
-/// Idempotent compute-or-mint resolver. Atomic per-key — concurrent
-/// `resolve()` calls for the same `(metric, attrs)` from different agents
-/// or different DataPoints in the same Export request always observe the
-/// same sid, no spurious mints.
-pub struct SeriesIdResolver {
-    cache: DashMap<CacheKey, u64>,
-    next_sid: AtomicU64,
-    /// Durability hook. `NoopPersistence` is the default — fast, no I/O,
-    /// loses every binding on restart (recovery path is the existing
-    /// `unknown_series_ids` eviction signal). `FilePersistence` writes a
-    /// WAL record per fresh mint and replays on construction, so the
-    /// agent's cached sids stay valid across backend restarts.
-    persistence: Arc<dyn SeriesResolverPersistence>,
-}
-
-impl SeriesIdResolver {
-    /// Build an in-memory-only resolver. Equivalent to
-    /// `with_persistence(NoopPersistence)`. Suitable for tests, for the
-    /// `--persistence-enabled=false` deployment mode, and for any path
-    /// where the caller doesn't need restart-survival semantics.
-    pub fn new() -> Self {
-        Self::with_persistence(Arc::new(NoopPersistence))
-    }
-
-    /// Build a resolver with an injected persistence backend. Used by
-    /// tests that want to verify the trait contract against a mock, and
-    /// by [`Self::open`] under the hood.
-    pub fn with_persistence(persistence: Arc<dyn SeriesResolverPersistence>) -> Self {
-        Self {
-            cache: DashMap::new(),
-            // sid=0 is reserved for "unresolved/uncached"; start minting at 1.
-            next_sid: AtomicU64::new(1),
-            persistence,
-        }
-    }
-
-    /// Open a file-backed resolver at `path`, replay every durable
-    /// binding into the in-memory cache, resume `next_sid` at
-    /// `max(replayed_sid) + 1`, and return the warm resolver. The
-    /// production constructor under `--persistence-enabled`.
-    ///
-    /// If the file does not exist, it is created with a fresh header
-    /// and the resolver starts cold (no bindings, `next_sid = 1`).
-    ///
-    /// If a torn record is detected at EOF during replay (e.g. backend
-    /// crashed mid-append), the file is truncated to the last durable
-    /// record's offset. Replay returns the durable prefix.
-    pub fn open(path: PathBuf) -> std::io::Result<Self> {
-        let persistence = Arc::new(FilePersistence::open(path)?);
-        let records = persistence.replay()?;
-        info!(replayed = records.len(), "series-resolver WAL replayed",);
-        let cache: DashMap<CacheKey, u64> = DashMap::new();
-        let mut max_sid: u64 = 0;
-        for r in records {
-            cache.insert((r.metric, r.attrs_fingerprint, r.agg_kind_canonical), r.sid);
-            if r.sid > max_sid {
-                max_sid = r.sid;
-            }
-        }
-        // sid=0 is reserved; if the log was empty, max_sid is 0 and we
-        // start minting at 1 (the same as a cold start).
-        Ok(Self {
-            cache,
-            next_sid: AtomicU64::new(max_sid.saturating_add(1).max(1)),
-            persistence,
-        })
-    }
-
-    /// Resolve `(metric, attrs, agg_kind)` to a series_id. Returns the
-    /// existing sid if this 3-tuple was already registered; otherwise
-    /// mints a fresh sid, durably persists the binding (when a non-noop
-    /// backend is wired), caches it, and returns the new value.
-    ///
-    /// `agg_kind_canonical` is the stable string form of
-    /// [`sketch_db::data::AggKind`] (call its `canonical_string()`
-    /// method at the call site). It's a string here so the resolver
-    /// doesn't take a dep on storage_engines.
-    ///
-    /// Idempotent: repeated calls with the same input ALWAYS return the
-    /// same sid for the lifetime of the cache. With `FilePersistence`,
-    /// "lifetime of the cache" extends across backend restarts (the WAL
-    /// is replayed on [`Self::open`]). With `NoopPersistence`, the
-    /// cache resets per process; agents observe their cached sids as
-    /// stale via `unknown_series_ids` and re-resolve with attrs.
-    ///
-    /// Persistence failures are logged at WARN and do NOT propagate —
-    /// the returned identity is ephemeral and is not cached. Catalog-bound
-    /// callers use `try_resolve` and receive the persistence failure instead.
-    pub fn resolve(
-        &self,
-        metric_name: &str,
-        attrs_fingerprint: &str,
-        agg_kind_canonical: &str,
-    ) -> u64 {
-        match self.try_resolve(metric_name, attrs_fingerprint, agg_kind_canonical) {
-            Ok(sid) => sid,
-            Err(error) => {
-                // Compatibility callers still receive an ephemeral ID, but it
-                // must never enter the shared cache used by strict producers.
-                let sid = self.next_sid.fetch_add(1, Ordering::Relaxed);
-                warn!(%error, sid, "resolver persistence failed; returning uncached ephemeral identity");
-                sid
-            }
-        }
-    }
-
-    /// Persist a new binding before exposing it to catalog-bound producers.
-    pub fn try_resolve(&self, metric: &str, attrs: &str, kind: &str) -> std::io::Result<u64> {
-        use dashmap::mapref::entry::Entry;
-        let key = (metric.to_owned(), attrs.to_owned(), kind.to_owned());
-        match self.cache.entry(key) {
-            Entry::Occupied(entry) => Ok(*entry.get()),
-            Entry::Vacant(entry) => {
-                let sid = self
-                    .next_sid
-                    .fetch_update(Ordering::Relaxed, Ordering::Relaxed, |value| {
-                        value.checked_add(1)
-                    })
-                    .map_err(|_| std::io::Error::other("series ID exhausted"))?;
-                self.persistence.append(sid, metric, attrs, kind)?;
-                entry.insert(sid);
-                Ok(sid)
-            }
-        }
-    }
-
-    /// Resolve a logical series and ask the storage lifecycle owner whether
-    /// an explicit catalog activation requires a fresh physical lifetime.
-    pub fn resolve_with_reactivation(
-        &self,
-        metric: &str,
-        attrs: &str,
-        kind: &str,
-        authorize: impl FnOnce(u64) -> Result<Option<Arc<asap_types::sds::CatalogGeneration>>, String>,
-    ) -> Result<u64, String> {
-        let sid = self
-            .try_resolve(metric, attrs, kind)
-            .map_err(|error| error.to_string())?;
-        match authorize(sid)? {
-            None => Ok(sid),
-            Some(generation) => self
-                .rotate_for_catalog_activation(metric, attrs, kind, sid, &generation)
-                .map_err(|error| error.to_string()),
-        }
-    }
-
-    /// Advance a tombstoned physical series after the storage engine has
-    /// authorized reactivation in a different installed catalog generation.
-    /// The logical cache key remains unchanged. Persistence failure leaves
-    /// the old binding intact. Concurrent activation requires fresh authorization.
-    pub fn rotate_for_catalog_activation(
-        &self,
-        metric_name: &str,
-        attrs_fingerprint: &str,
-        agg_kind_canonical: &str,
-        previous_sid: u64,
-        generation: &asap_types::sds::CatalogGeneration,
-    ) -> std::io::Result<u64> {
-        let key = (
-            metric_name.to_owned(),
-            attrs_fingerprint.to_owned(),
-            agg_kind_canonical.to_owned(),
-        );
-        let mut binding = self.cache.get_mut(&key).ok_or_else(|| {
-            std::io::Error::new(
-                std::io::ErrorKind::NotFound,
-                "catalog activation requires an existing resolver binding",
-            )
-        })?;
-        if *binding != previous_sid {
-            return Err(std::io::Error::new(
-                std::io::ErrorKind::WouldBlock,
-                "physical series changed after catalog authorization; retry routing",
-            ));
-        }
-        let replacement = self
-            .next_sid
-            .fetch_update(Ordering::Relaxed, Ordering::Relaxed, |sid| {
-                sid.checked_add(1)
-            })
-            .map_err(|_| std::io::Error::other("physical series ID space exhausted"))?;
-        self.persistence.append_catalog_activation(
-            replacement,
-            metric_name,
-            attrs_fingerprint,
-            agg_kind_canonical,
-            generation,
-        )?;
-        *binding = replacement;
-        Ok(replacement)
-    }
-
-    /// Look up an existing sid without minting. Returns `None` if the
-    /// `(metric, attrs, agg_kind)` tuple is not in the cache.
-    pub fn lookup(
-        &self,
-        metric_name: &str,
-        attrs_fingerprint: &str,
-        agg_kind_canonical: &str,
-    ) -> Option<u64> {
-        let key = (
-            metric_name.to_string(),
-            attrs_fingerprint.to_string(),
-            agg_kind_canonical.to_string(),
-        );
-        self.cache.get(&key).map(|v| *v)
-    }
-
-    /// Number of registered identities. Used for telemetry / debugging.
-    pub fn len(&self) -> usize {
-        self.cache.len()
-    }
-}
-
-impl Default for SeriesIdResolver {
-    fn default() -> Self {
-        Self::new()
-    }
-}
-
-// ── Persistence ──────────────────────────────────────────────────────────────
-//
-// The resolver's `(metric, fp, agg_kind) → sid` cache is in-memory only
-// by default. Under `--persistence-enabled`, a `FilePersistence` backend
-// writes a WAL record per fresh mint; the resolver replays it on startup
-// so the agent's cached sids stay valid across backend restarts.
-//
-// WAL v4: header b"ASAPSRP\x04", followed by u32-length-prefixed JSON
-// records. CatalogGeneration records are normalized by snapshot digest;
-// Binding records carry a reference only for explicitly authorized rotations.
-// Opening a v3 WAL atomically migrates its durable prefix without changing
-// physical IDs. v1/v2 remain unsupported because they used different identity
-// semantics. Older binaries reject the v4 header rather than truncating it.
-//
-// Every append is fsynced before publication. Failed appends roll back to the
-// previous offset; replay truncates incomplete trailing frames and rejects
-// malformed or oversized complete frames. The append-only WAL has no garbage
-// collection yet; lifetime rotations add bindings for the same logical key.
-
-/// One durable binding row read back from the WAL.
-#[derive(Debug, Clone, PartialEq, Eq)]
-pub struct ResolverRecord {
-    pub sid: u64,
-    pub metric: String,
-    pub attrs_fingerprint: String,
-    pub agg_kind_canonical: String,
-    pub catalog_generation: Option<Arc<asap_types::sds::CatalogGeneration>>,
-}
-
-/// Durability hook for [`SeriesIdResolver`]. Implementations decide
-/// whether mints survive process restart. `NoopPersistence` is fine for
-/// tests and stateless deployments; `FilePersistence` is the production
-/// answer under `--persistence-enabled`.
-pub trait SeriesResolverPersistence: Send + Sync {
-    /// Durably record a fresh `(sid, metric, fp, agg_kind)` binding.
-    /// MUST be flushed to stable storage before returning `Ok` — the
-    /// resolver only returns the sid to its caller after this returns.
-    /// On error, the binding is in-memory-only; the caller logs and
-    /// continues.
-    fn append(
-        &self,
-        sid: u64,
-        metric: &str,
-        attrs_fingerprint: &str,
-        agg_kind_canonical: &str,
-    ) -> std::io::Result<()>;
-
-    /// Persist a replacement physical lifetime with its catalog provenance.
-    /// Backends must explicitly implement this stronger contract; silently
-    /// downgrading to a legacy binding append would lose authorization.
-    fn append_catalog_activation(
-        &self,
-        _sid: u64,
-        _metric: &str,
-        _attrs_fingerprint: &str,
-        _agg_kind_canonical: &str,
-        _generation: &asap_types::sds::CatalogGeneration,
-    ) -> std::io::Result<()> {
-        Err(std::io::Error::new(
-            std::io::ErrorKind::Unsupported,
-            "resolver persistence does not support catalog activation",
-        ))
-    }
-
-    /// Read every durable binding in append order. Called once at
-    /// resolver construction time.
-    fn replay(&self) -> std::io::Result<Vec<ResolverRecord>>;
-}
-
-/// In-memory-only impl. Every `append` is a no-op; `replay` returns
-/// empty. Resolver bindings reset on process restart; agents recover via
-/// the `unknown_series_ids` eviction primitive.
-pub struct NoopPersistence;
-
-impl SeriesResolverPersistence for NoopPersistence {
-    fn append(
-        &self,
-        _sid: u64,
-        _metric: &str,
-        _fp: &str,
-        _agg_kind_canonical: &str,
-    ) -> std::io::Result<()> {
-        Ok(())
-    }
-
-    fn append_catalog_activation(
-        &self,
-        _sid: u64,
-        _metric: &str,
-        _attrs_fingerprint: &str,
-        _agg_kind_canonical: &str,
-        _generation: &asap_types::sds::CatalogGeneration,
-    ) -> std::io::Result<()> {
-        Ok(())
-    }
-
-    fn replay(&self) -> std::io::Result<Vec<ResolverRecord>> {
-        Ok(Vec::new())
-    }
-}
-
-/// File-backed WAL. Single-writer; the `Mutex<File>` serializes appends
-/// to keep the on-disk order deterministic and so `fsync` ordering
-/// matches mint order. Reads only happen at construction.
-#[derive(Debug)]
-pub struct FilePersistence {
-    file: Mutex<File>,
-    generations: Mutex<BTreeMap<String, Arc<asap_types::sds::CatalogGeneration>>>,
-}
-
-const WAL_MAGIC: &[u8; 8] = b"ASAPSRP\x04";
-const LEGACY_WAL_MAGIC: &[u8; 8] = b"ASAPSRP\x03";
-const MAX_WAL_RECORD_BYTES: usize = 4 * 1024 * 1024;
-
-#[derive(serde::Serialize, serde::Deserialize)]
-#[serde(tag = "kind", rename_all = "snake_case")]
-enum WalRecord {
-    CatalogGeneration {
-        generation: Arc<asap_types::sds::CatalogGeneration>,
-    },
-    Binding {
-        sid: u64,
-        metric: String,
-        attrs_fingerprint: String,
-        agg_kind_canonical: String,
-        #[serde(default)]
-        generation_sha256: Option<String>,
-    },
-}
-
-fn write_wal_record(file: &mut File, record: &WalRecord) -> std::io::Result<()> {
-    let bytes = serde_json::to_vec(record).map_err(std::io::Error::other)?;
-    if bytes.len() > MAX_WAL_RECORD_BYTES {
-        return Err(std::io::Error::new(
-            std::io::ErrorKind::InvalidInput,
-            "resolver WAL record exceeds size limit",
-        ));
-    }
-    file.write_all(&(bytes.len() as u32).to_le_bytes())?;
-    file.write_all(&bytes)
-}
-/// Reject any single field whose length-prefix exceeds these caps. A
-/// corrupted file might claim huge field lengths; without these bounds
-/// the replay loop could allocate gigabytes of zeros before discovering
-/// the lengths don't match the actual content. The caps are far above
-/// any realistic input — metric names are tens of bytes, fingerprints
-/// are hundreds, agg_kind canonical strings are tens.
-const MAX_METRIC_LEN: usize = 16 * 1024;
-const MAX_FP_LEN: usize = 64 * 1024;
-const MAX_AGG_KIND_LEN: usize = 4 * 1024;
-
-impl FilePersistence {
-    pub fn open(path: PathBuf) -> std::io::Result<Self> {
-        if let Some(parent) = path.parent() {
-            std::fs::create_dir_all(parent)?;
-        }
-        let mut file = OpenOptions::new()
-            .read(true)
-            .write(true)
-            .create(true)
-            .open(&path)?;
-        if file.metadata()?.len() == 0 {
-            file.write_all(WAL_MAGIC)?;
-            file.sync_all()?;
-        } else {
-            let mut header = [0; 8];
-            file.read_exact(&mut header)?;
-            if &header == LEGACY_WAL_MAGIC {
-                let temporary = path.with_extension("v4.tmp");
-                let mut migrated = File::create(&temporary)?;
-                migrated.write_all(WAL_MAGIC)?;
-                loop {
-                    match read_one_record(&mut file) {
-                        ReadOne::Ok(record, offset) => {
-                            debug_assert!(offset >= 8);
-                            write_wal_record(
-                                &mut migrated,
-                                &WalRecord::Binding {
-                                    sid: record.sid,
-                                    metric: record.metric,
-                                    attrs_fingerprint: record.attrs_fingerprint,
-                                    agg_kind_canonical: record.agg_kind_canonical,
-                                    generation_sha256: None,
-                                },
-                            )?;
-                        }
-                        ReadOne::Eof | ReadOne::Torn => break,
-                        ReadOne::Io(error) => return Err(error),
-                        ReadOne::Corrupt => {
-                            return Err(std::io::Error::new(
-                                std::io::ErrorKind::InvalidData,
-                                "corrupt legacy resolver record",
-                            ))
-                        }
-                    }
-                }
-                migrated.sync_all()?;
-                std::fs::rename(&temporary, &path)?;
-                if let Some(parent) = path.parent() {
-                    File::open(parent)?.sync_all()?;
-                }
-                file = OpenOptions::new().read(true).write(true).open(&path)?;
-            } else if &header != WAL_MAGIC {
-                return Err(std::io::Error::new(
-                    std::io::ErrorKind::InvalidData,
-                    "resolver WAL header mismatch",
-                ));
-            }
-        }
-        file.seek(SeekFrom::End(0))?;
-        Ok(Self {
-            file: Mutex::new(file),
-            generations: Mutex::new(BTreeMap::new()),
-        })
-    }
-
-    fn append_binding(
-        &self,
-        sid: u64,
-        metric: &str,
-        attrs_fingerprint: &str,
-        agg_kind_canonical: &str,
-        generation: Option<&asap_types::sds::CatalogGeneration>,
-    ) -> std::io::Result<()> {
-        if sid == 0
-            || metric.len() > MAX_METRIC_LEN
-            || attrs_fingerprint.len() > MAX_FP_LEN
-            || agg_kind_canonical.len() > MAX_AGG_KIND_LEN
-        {
-            return Err(std::io::Error::new(
-                std::io::ErrorKind::InvalidInput,
-                "invalid resolver binding",
-            ));
-        }
-        let mut file = self.file.lock().unwrap();
-        let mut generations = self.generations.lock().unwrap();
-        let offset = file.stream_position()?;
-        let result = (|| {
-            if let Some(generation) = generation {
-                if let Some(existing) = generations.get(&generation.snapshot_sha256) {
-                    if existing.as_ref() != generation {
-                        return Err(std::io::Error::new(
-                            std::io::ErrorKind::InvalidInput,
-                            "conflicting catalog generation digest",
-                        ));
-                    }
-                } else {
-                    write_wal_record(
-                        &mut file,
-                        &WalRecord::CatalogGeneration {
-                            generation: Arc::new(generation.clone()),
-                        },
-                    )?;
-                }
-            }
-            write_wal_record(
-                &mut file,
-                &WalRecord::Binding {
-                    sid,
-                    metric: metric.into(),
-                    attrs_fingerprint: attrs_fingerprint.into(),
-                    agg_kind_canonical: agg_kind_canonical.into(),
-                    generation_sha256: generation.map(|value| value.snapshot_sha256.clone()),
-                },
-            )?;
-            file.sync_all()
-        })();
-        if result.is_err() {
-            // Do not append behind an incomplete record after a failed write.
-            file.set_len(offset)?;
-            file.seek(SeekFrom::Start(offset))?;
-            file.sync_all()?;
-            return result;
-        }
-        if let Some(generation) = generation {
-            generations
-                .entry(generation.snapshot_sha256.clone())
-                .or_insert_with(|| Arc::new(generation.clone()));
-        }
-        Ok(())
-    }
-}
-
-impl SeriesResolverPersistence for FilePersistence {
-    fn append(
-        &self,
-        sid: u64,
-        metric: &str,
-        attrs_fingerprint: &str,
-        agg_kind_canonical: &str,
-    ) -> std::io::Result<()> {
-        self.append_binding(sid, metric, attrs_fingerprint, agg_kind_canonical, None)
-    }
-
-    fn append_catalog_activation(
-        &self,
-        sid: u64,
-        metric: &str,
-        attrs_fingerprint: &str,
-        agg_kind_canonical: &str,
-        generation: &asap_types::sds::CatalogGeneration,
-    ) -> std::io::Result<()> {
-        self.append_binding(
-            sid,
-            metric,
-            attrs_fingerprint,
-            agg_kind_canonical,
-            Some(generation),
-        )
-    }
-
-    fn replay(&self) -> std::io::Result<Vec<ResolverRecord>> {
-        let mut file = self.file.lock().unwrap();
-        file.seek(SeekFrom::Start(0))?;
-        let mut header = [0; 8];
-        file.read_exact(&mut header)?;
-        if &header != WAL_MAGIC {
-            return Err(std::io::Error::new(
-                std::io::ErrorKind::InvalidData,
-                "resolver WAL header mismatch",
-            ));
-        }
-        let mut generations = BTreeMap::new();
-        let mut records = Vec::new();
-        let mut physical_keys = BTreeMap::new();
-        let mut logical_sids = BTreeMap::new();
-        let mut safe_offset = 8;
-        loop {
-            let mut length = [0; 4];
-            match file.read_exact(&mut length) {
-                Ok(()) => {}
-                Err(error) if error.kind() == std::io::ErrorKind::UnexpectedEof => {
-                    file.set_len(safe_offset)?;
-                    break;
-                }
-                Err(error) => return Err(error),
-            }
-            let length = u32::from_le_bytes(length) as usize;
-            if length > MAX_WAL_RECORD_BYTES {
-                return Err(std::io::Error::new(
-                    std::io::ErrorKind::InvalidData,
-                    "resolver WAL record exceeds size limit",
-                ));
-            }
-            let mut bytes = vec![0; length];
-            if let Err(error) = file.read_exact(&mut bytes) {
-                if error.kind() == std::io::ErrorKind::UnexpectedEof {
-                    file.set_len(safe_offset)?;
-                    break;
-                }
-                return Err(error);
-            }
-            let record: WalRecord = serde_json::from_slice(&bytes)
-                .map_err(|error| std::io::Error::new(std::io::ErrorKind::InvalidData, error))?;
-            match record {
-                WalRecord::CatalogGeneration { generation } => {
-                    let key = generation.snapshot_sha256.clone();
-                    if generations
-                        .get(&key)
-                        .is_some_and(|existing| existing != &generation)
-                    {
-                        return Err(std::io::Error::new(
-                            std::io::ErrorKind::InvalidData,
-                            "conflicting catalog generation digest",
-                        ));
-                    }
-                    generations.insert(key, generation);
-                }
-                WalRecord::Binding {
-                    sid,
-                    metric,
-                    attrs_fingerprint,
-                    agg_kind_canonical,
-                    generation_sha256,
-                } => {
-                    if sid == 0
-                        || metric.len() > MAX_METRIC_LEN
-                        || attrs_fingerprint.len() > MAX_FP_LEN
-                        || agg_kind_canonical.len() > MAX_AGG_KIND_LEN
-                    {
-                        return Err(std::io::Error::new(
-                            std::io::ErrorKind::InvalidData,
-                            "invalid resolver binding",
-                        ));
-                    }
-                    let key = (
-                        metric.clone(),
-                        attrs_fingerprint.clone(),
-                        agg_kind_canonical.clone(),
-                    );
-                    if physical_keys.get(&sid).is_some_and(|existing| {
-                        existing != &(key.clone(), generation_sha256.clone())
-                    }) || logical_sids.get(&key).is_some_and(|previous| {
-                        *previous != sid && (generation_sha256.is_none() || sid < *previous)
-                    }) {
-                        return Err(std::io::Error::new(
-                            std::io::ErrorKind::InvalidData,
-                            "conflicting resolver binding",
-                        ));
-                    }
-                    physical_keys.insert(sid, (key.clone(), generation_sha256.clone()));
-                    logical_sids.insert(key, sid);
-                    let catalog_generation = generation_sha256
-                        .map(|key| {
-                            generations.get(&key).cloned().ok_or_else(|| {
-                                std::io::Error::new(
-                                    std::io::ErrorKind::InvalidData,
-                                    "missing catalog generation reference",
-                                )
-                            })
-                        })
-                        .transpose()?;
-                    records.push(ResolverRecord {
-                        sid,
-                        metric,
-                        attrs_fingerprint,
-                        agg_kind_canonical,
-                        catalog_generation,
-                    });
-                }
-            }
-            safe_offset = file.stream_position()?;
-        }
-        file.seek(SeekFrom::End(0))?;
-        *self.generations.lock().unwrap() = generations;
-        Ok(records)
-    }
-}
-
-/// Outcome of attempting to read a single WAL record. `Torn` means a
-/// short read was detected mid-record; malformed complete fields are corruption.
-/// Only an incomplete tail may be discarded;
-/// the caller truncates the file to the last `Ok` offset.
-enum ReadOne {
-    Ok(ResolverRecord, u64),
-    Eof,
-    Torn,
-    Corrupt,
-    Io(std::io::Error),
-}
-
-fn read_one_record(f: &mut File) -> ReadOne {
-    let mut sid_buf = [0u8; 8];
-    match f.read_exact(&mut sid_buf) {
-        Ok(()) => {}
-        Err(e) if e.kind() == std::io::ErrorKind::UnexpectedEof => return ReadOne::Eof,
-        Err(error) => return ReadOne::Io(error),
-    }
-    let sid = u64::from_le_bytes(sid_buf);
-    if sid == 0 {
-        return ReadOne::Corrupt;
-    }
-
-    let mut len_buf = [0u8; 4];
-    if let Err(error) = f.read_exact(&mut len_buf) {
-        return if error.kind() == std::io::ErrorKind::UnexpectedEof {
-            ReadOne::Torn
-        } else {
-            ReadOne::Io(error)
-        };
-    }
-    let metric_len = u32::from_le_bytes(len_buf) as usize;
-    if metric_len > MAX_METRIC_LEN {
-        return ReadOne::Corrupt;
-    }
-    let mut metric_bytes = vec![0u8; metric_len];
-    if let Err(error) = f.read_exact(&mut metric_bytes) {
-        return if error.kind() == std::io::ErrorKind::UnexpectedEof {
-            ReadOne::Torn
-        } else {
-            ReadOne::Io(error)
-        };
-    }
-
-    if let Err(error) = f.read_exact(&mut len_buf) {
-        return if error.kind() == std::io::ErrorKind::UnexpectedEof {
-            ReadOne::Torn
-        } else {
-            ReadOne::Io(error)
-        };
-    }
-    let fp_len = u32::from_le_bytes(len_buf) as usize;
-    if fp_len > MAX_FP_LEN {
-        return ReadOne::Corrupt;
-    }
-    let mut fp_bytes = vec![0u8; fp_len];
-    if let Err(error) = f.read_exact(&mut fp_bytes) {
-        return if error.kind() == std::io::ErrorKind::UnexpectedEof {
-            ReadOne::Torn
-        } else {
-            ReadOne::Io(error)
-        };
-    }
-
-    if let Err(error) = f.read_exact(&mut len_buf) {
-        return if error.kind() == std::io::ErrorKind::UnexpectedEof {
-            ReadOne::Torn
-        } else {
-            ReadOne::Io(error)
-        };
-    }
-    let agg_kind_len = u32::from_le_bytes(len_buf) as usize;
-    if agg_kind_len > MAX_AGG_KIND_LEN {
-        return ReadOne::Corrupt;
-    }
-    let mut agg_kind_bytes = vec![0u8; agg_kind_len];
-    if let Err(error) = f.read_exact(&mut agg_kind_bytes) {
-        return if error.kind() == std::io::ErrorKind::UnexpectedEof {
-            ReadOne::Torn
-        } else {
-            ReadOne::Io(error)
-        };
-    }
-
-    let metric = match String::from_utf8(metric_bytes) {
-        Ok(s) => s,
-        Err(_) => return ReadOne::Corrupt,
-    };
-    let attrs_fingerprint = match String::from_utf8(fp_bytes) {
-        Ok(s) => s,
-        Err(_) => return ReadOne::Corrupt,
-    };
-    let agg_kind_canonical = match String::from_utf8(agg_kind_bytes) {
-        Ok(s) => s,
-        Err(_) => return ReadOne::Corrupt,
-    };
-    let new_offset = match f.stream_position() {
-        Ok(p) => p,
-        Err(error) => return ReadOne::Io(error),
-    };
-    ReadOne::Ok(
-        ResolverRecord {
-            sid,
-            metric,
-            attrs_fingerprint,
-            agg_kind_canonical,
-            catalog_generation: None,
-        },
-        new_offset,
-    )
-}
-
-/// Compute the canonical attributes fingerprint matching the patched
-/// OTel-Go exporter's `attributesFingerprint`. Both sides MUST produce
-/// the same string for the same attribute set — sender uses it to look
-/// up its local cache; receiver uses it as the resolver's cache key.
-///
-/// Format: `key1=value1;key2=value2;...` where keys are sorted
-/// lexicographically. Mirrors
-/// `opentelemetry-go-patch/exporters/otlp/otlpmetric/otlpmetricgrpc/
-/// internal/series/dictionary.go::attributesFingerprint`.
-/// Select the population key protocol explicitly carried by the policy identity.
-/// Legacy bytes remain unchanged; canonical keys reject ambiguous duplicate names.
-pub fn population_attrs_fingerprint(
-    encoding: asap_types::PopulationKeyEncoding,
-    attrs: &[(&str, &str)],
-) -> Result<String, String> {
-    match encoding {
-        asap_types::PopulationKeyEncoding::LegacyDelimited => {
-            Ok(canonical_attrs_fingerprint(attrs))
-        }
-        asap_types::PopulationKeyEncoding::CanonicalLabelsV1 => {
-            let mut labels = std::collections::BTreeMap::new();
-            for (name, value) in attrs {
-                if labels
-                    .insert((*name).to_string(), (*value).to_string())
-                    .is_some()
-                {
-                    return Err("duplicate population label name".into());
-                }
-            }
-            asap_types::grouping_projection::encode_label_population_key(&labels)
-        }
-    }
-}
-
-pub fn canonical_attrs_fingerprint(attrs: &[(&str, &str)]) -> String {
-    let mut sorted: Vec<(&str, &str)> = attrs.to_vec();
-    sorted.sort_by(|a, b| a.0.cmp(b.0));
-    let mut buf = String::new();
-    for (k, v) in sorted {
-        buf.push_str(k);
-        buf.push('=');
-        buf.push_str(v);
-        buf.push(';');
-    }
-    buf
-}
-
-#[cfg(test)]
-mod persistence_tests {
-    use super::*;
-    use tempfile::TempDir;
-
-    fn wal_path(dir: &TempDir) -> PathBuf {
-        dir.path().join("series_resolver.wal")
-    }
-
-    fn generation() -> asap_types::sds::CatalogGeneration {
-        asap_types::sds::CatalogGeneration {
-            schema_version: 1,
-            plan_id: 7,
-            plan_version: 2,
-            snapshot_sha256: "new-catalog".into(),
-        }
-    }
-
-    #[test]
-    fn catalog_rotation_is_once_and_survives_restart_with_provenance() {
-        let dir = TempDir::new().unwrap();
-        let path = wal_path(&dir);
-        let resolver = Arc::new(SeriesIdResolver::open(path.clone()).unwrap());
-        let previous = resolver.resolve("m", "group=a", TEST_AGG);
-        let threads: Vec<_> = (0..8)
-            .map(|_| {
-                let resolver = Arc::clone(&resolver);
-                std::thread::spawn(move || {
-                    resolver.rotate_for_catalog_activation(
-                        "m",
-                        "group=a",
-                        TEST_AGG,
-                        previous,
-                        &generation(),
-                    )
-                })
-            })
-            .collect();
-        let ids: Vec<_> = threads
-            .into_iter()
-            .map(|thread| thread.join().unwrap())
-            .collect();
-        let successful: Vec<_> = ids
-            .iter()
-            .filter_map(|result| result.as_ref().ok())
-            .copied()
-            .collect();
-        assert_eq!(successful.len(), 1);
-        assert_ne!(successful[0], previous);
-        assert!(ids
-            .iter()
-            .filter_map(|result| result.as_ref().err())
-            .all(|error| error.kind() == std::io::ErrorKind::WouldBlock));
-        drop(resolver);
-        let reopened = SeriesIdResolver::open(path.clone()).unwrap();
-        assert_eq!(reopened.resolve("m", "group=a", TEST_AGG), successful[0]);
-        let records = FilePersistence::open(path).unwrap().replay().unwrap();
-        assert_eq!(records.len(), 2);
-        assert_eq!(
-            records[1].catalog_generation.as_deref(),
-            Some(&generation())
-        );
-    }
-
-    #[test]
-    fn failed_catalog_rotation_keeps_old_resolver_mapping() {
-        struct RejectRotation;
-        impl SeriesResolverPersistence for RejectRotation {
-            fn append(&self, _: u64, _: &str, _: &str, _: &str) -> std::io::Result<()> {
-                Ok(())
-            }
-            fn replay(&self) -> std::io::Result<Vec<ResolverRecord>> {
-                Ok(vec![])
-            }
-        }
-        let resolver = SeriesIdResolver::with_persistence(Arc::new(RejectRotation));
-        let previous = resolver.resolve("m", "group=a", TEST_AGG);
-        assert!(resolver
-            .rotate_for_catalog_activation("m", "group=a", TEST_AGG, previous, &generation())
-            .is_err());
-        assert_eq!(resolver.resolve("m", "group=a", TEST_AGG), previous);
-    }
-
-    #[test]
-    fn legacy_v3_bindings_migrate_without_changing_physical_ids() {
-        let dir = TempDir::new().unwrap();
-        let path = wal_path(&dir);
-        let mut file = File::create(&path).unwrap();
-        file.write_all(LEGACY_WAL_MAGIC).unwrap();
-        file.write_all(&9u64.to_le_bytes()).unwrap();
-        for field in ["m", "group=a", TEST_AGG] {
-            file.write_all(&(field.len() as u32).to_le_bytes()).unwrap();
-            file.write_all(field.as_bytes()).unwrap();
-        }
-        file.sync_all().unwrap();
-        drop(file);
-        let resolver = SeriesIdResolver::open(path.clone()).unwrap();
-        assert_eq!(resolver.resolve("m", "group=a", TEST_AGG), 9);
-        assert_eq!(resolver.resolve("m", "group=b", TEST_AGG), 10);
-        assert_eq!(&std::fs::read(path).unwrap()[..8], WAL_MAGIC);
-    }
-
-    #[cfg(unix)]
-    #[test]
-    fn legacy_io_failure_is_not_an_incomplete_tail() {
-        let dir = TempDir::new().unwrap();
-        let mut unreadable_stream = File::open(dir.path()).unwrap();
-        assert!(matches!(
-            read_one_record(&mut unreadable_stream),
-            ReadOne::Io(_)
-        ));
-    }
-
-    #[test]
-    fn corrupt_legacy_record_preserves_original_file() {
-        let dir = TempDir::new().unwrap();
-        let path = wal_path(&dir);
-        let mut bytes = LEGACY_WAL_MAGIC.to_vec();
-        bytes.extend_from_slice(&1u64.to_le_bytes());
-        bytes.extend_from_slice(&((MAX_METRIC_LEN + 1) as u32).to_le_bytes());
-        std::fs::write(&path, &bytes).unwrap();
-        assert!(FilePersistence::open(path.clone()).is_err());
-        assert_eq!(std::fs::read(path).unwrap(), bytes);
-    }
-
-    #[test]
-    fn replay_rejects_invalid_or_conflicting_physical_bindings() {
-        for second in [0, 1] {
-            let dir = TempDir::new().unwrap();
-            let path = wal_path(&dir);
-            let persistence = FilePersistence::open(path.clone()).unwrap();
-            persistence.append(1, "first", "", TEST_AGG).unwrap();
-            let mut file = OpenOptions::new().append(true).open(&path).unwrap();
-            write_wal_record(
-                &mut file,
-                &WalRecord::Binding {
-                    sid: second,
-                    metric: "other".into(),
-                    attrs_fingerprint: "".into(),
-                    agg_kind_canonical: TEST_AGG.into(),
-                    generation_sha256: None,
-                },
-            )
-            .unwrap();
-            assert!(persistence.replay().is_err());
-        }
-    }
-
-    #[test]
-    fn empty_log_replays_empty() {
-        let dir = TempDir::new().unwrap();
-        let p = FilePersistence::open(wal_path(&dir)).unwrap();
-        let records = p.replay().unwrap();
-        assert!(records.is_empty());
-    }
-
-    const TEST_AGG: &str = "sketch:DDSketch:D:0.01";
-
-    #[test]
-    fn append_then_replay_round_trips() {
-        let dir = TempDir::new().unwrap();
-        let p = FilePersistence::open(wal_path(&dir)).unwrap();
-        p.append(1, "metric_a", "zone=z0;", TEST_AGG).unwrap();
-        p.append(2, "metric_a", "zone=z1;", TEST_AGG).unwrap();
-        p.append(3, "metric_b", "zone=z0;", "precompute:Sum:")
-            .unwrap();
-
-        // Reopen to confirm durability across handle close.
-        drop(p);
-        let p2 = FilePersistence::open(wal_path(&dir)).unwrap();
-        let records = p2.replay().unwrap();
-        assert_eq!(records.len(), 3);
-        assert_eq!(records[0].sid, 1);
-        assert_eq!(records[0].metric, "metric_a");
-        assert_eq!(records[0].attrs_fingerprint, "zone=z0;");
-        assert_eq!(records[0].agg_kind_canonical, TEST_AGG);
-        assert_eq!(records[1].sid, 2);
-        assert_eq!(records[2].metric, "metric_b");
-        assert_eq!(records[2].agg_kind_canonical, "precompute:Sum:");
-    }
-
-    #[test]
-    fn header_mismatch_errors_on_open() {
-        let dir = TempDir::new().unwrap();
-        let path = wal_path(&dir);
-        // Write a non-WAL file at the path.
-        std::fs::write(&path, b"NOTAWAL!extra bytes").unwrap();
-        let err = FilePersistence::open(path).unwrap_err();
-        assert_eq!(err.kind(), std::io::ErrorKind::InvalidData);
-    }
-
-    #[test]
-    fn torn_record_truncated_on_replay() {
-        let dir = TempDir::new().unwrap();
-        let path = wal_path(&dir);
-        // Write two clean frames, then a length prefix with no payload.
-        {
-            let p = FilePersistence::open(path.clone()).unwrap();
-            p.append(1, "m", "k=v;", TEST_AGG).unwrap();
-            p.append(2, "m", "k=w;", TEST_AGG).unwrap();
-        }
-        // The third frame claims 999 bytes but has no payload.
-        {
-            use std::io::Write;
-            let mut f = OpenOptions::new().append(true).open(&path).unwrap();
-            f.write_all(&999u32.to_le_bytes()).unwrap();
-            f.sync_all().unwrap();
-        }
-        let pre_size = std::fs::metadata(&path).unwrap().len();
-        let p = FilePersistence::open(path.clone()).unwrap();
-        let records = p.replay().unwrap();
-        assert_eq!(records.len(), 2, "only the two clean records survive");
-        let post_size = std::fs::metadata(&path).unwrap().len();
-        assert!(
-            post_size < pre_size,
-            "torn tail truncated: pre={pre_size} post={post_size}"
-        );
-        // After truncation, subsequent appends pick up from the
-        // truncated EOF — no gap, no rewrite of historical records.
-        p.append(3, "m", "k=x;", TEST_AGG).unwrap();
-        drop(p);
-        let p2 = FilePersistence::open(path).unwrap();
-        let records2 = p2.replay().unwrap();
-        assert_eq!(records2.len(), 3);
-        assert_eq!(records2[2].sid, 3);
-    }
-
-    #[test]
-    fn oversized_frame_fails_without_allocating_or_discarding_history() {
-        // An oversized frame is corruption, not a torn tail. Reject it
-        // before allocation and leave the durable file unchanged.
-        let dir = TempDir::new().unwrap();
-        let path = wal_path(&dir);
-        {
-            let p = FilePersistence::open(path.clone()).unwrap();
-            p.append(1, "m", "k=v;", TEST_AGG).unwrap();
-        }
-        {
-            use std::io::Write;
-            let mut f = OpenOptions::new().append(true).open(&path).unwrap();
-            f.write_all(&((MAX_WAL_RECORD_BYTES as u32) + 1).to_le_bytes())
-                .unwrap();
-            f.sync_all().unwrap();
-        }
-        let before = std::fs::metadata(&path).unwrap().len();
-        let p = FilePersistence::open(path.clone()).unwrap();
-        assert_eq!(
-            p.replay().unwrap_err().kind(),
-            std::io::ErrorKind::InvalidData
-        );
-        assert_eq!(std::fs::metadata(path).unwrap().len(), before);
-    }
-
-    #[test]
-    fn resolver_open_replays_existing_log() {
-        let dir = TempDir::new().unwrap();
-        let path = wal_path(&dir);
-        // First process: mint three bindings.
-        {
-            let r = SeriesIdResolver::open(path.clone()).unwrap();
-            let s1 = r.resolve("m", "k=v0;", TEST_AGG);
-            let s2 = r.resolve("m", "k=v1;", TEST_AGG);
-            let s3 = r.resolve("m", "k=v2;", TEST_AGG);
-            assert_eq!(s1, 1);
-            assert_eq!(s2, 2);
-            assert_eq!(s3, 3);
-        }
-        // Second process: reopen, same inputs return the same sids;
-        // a fresh input mints sid=4 (max replayed + 1).
-        {
-            let r = SeriesIdResolver::open(path).unwrap();
-            assert_eq!(r.resolve("m", "k=v0;", TEST_AGG), 1);
-            assert_eq!(r.resolve("m", "k=v1;", TEST_AGG), 2);
-            assert_eq!(r.resolve("m", "k=v2;", TEST_AGG), 3);
-            let fresh = r.resolve("m", "k=v3;", TEST_AGG);
-            assert_eq!(fresh, 4, "next_sid resumes at max(replayed)+1");
-        }
-    }
-
-    #[test]
-    fn resolver_open_distinguishes_agg_kinds_on_replay() {
-        // Same (metric, attrs) but two agg_kinds — both replay to the
-        // resolver as distinct keys, and re-resolving each returns its
-        // original sid.
-        let dir = TempDir::new().unwrap();
-        let path = wal_path(&dir);
-        {
-            let r = SeriesIdResolver::open(path.clone()).unwrap();
-            let s_dd = r.resolve("m", "k=v0;", "sketch:DDSketch:D:0.01");
-            let s_sum = r.resolve("m", "k=v0;", "precompute:Sum:");
-            assert_ne!(s_dd, s_sum);
-        }
-        {
-            let r = SeriesIdResolver::open(path).unwrap();
-            assert_eq!(r.resolve("m", "k=v0;", "sketch:DDSketch:D:0.01"), 1);
-            assert_eq!(r.resolve("m", "k=v0;", "precompute:Sum:"), 2);
-        }
-    }
-
-    #[test]
-    fn resolver_with_noop_persistence_does_not_persist() {
-        // Sanity check: NoopPersistence is the back-compat path; resolver
-        // bindings reset across construction.
-        let r1 = SeriesIdResolver::new();
-        let s1 = r1.resolve("m", "k=v;", TEST_AGG);
-        drop(r1);
-        let r2 = SeriesIdResolver::new();
-        let s2 = r2.resolve("m", "k=v;", TEST_AGG);
-        // Both resolvers start fresh, so both mint sid=1.
-        assert_eq!(s1, 1);
-        assert_eq!(s2, 1);
-    }
-
-    #[test]
-    fn append_failure_logs_but_does_not_panic() {
-        // A custom persistence impl that always returns an error.
-        // The resolver should log + return the sid anyway (in-memory-
-        // only); subsequent resolves for the same key hit the cache
-        // and don't re-attempt append.
-        struct FailingPersistence;
-        impl SeriesResolverPersistence for FailingPersistence {
-            fn append(&self, _: u64, _: &str, _: &str, _: &str) -> std::io::Result<()> {
-                Err(std::io::Error::other("simulated I/O failure"))
-            }
-            fn replay(&self) -> std::io::Result<Vec<ResolverRecord>> {
-                Ok(Vec::new())
-            }
-        }
-        let r = SeriesIdResolver::with_persistence(Arc::new(FailingPersistence));
-        assert!(r
-            .resolve_with_reactivation("strict", "k=v;", TEST_AGG, |_| Ok(None))
-            .is_err());
-        assert!(!r
-            .cache
-            .contains_key(&("strict".into(), "k=v;".into(), TEST_AGG.into())));
-        let sid = r.resolve("m", "k=v;", TEST_AGG);
-        assert!(sid > 0, "legacy resolver returns an uncached ephemeral sid");
-        assert!(r.try_resolve("m", "k=v;", TEST_AGG).is_err());
-        assert_eq!(r.lookup("m", "k=v;", TEST_AGG), None);
-        let sid2 = r.resolve("m", "k=v;", TEST_AGG);
-        assert_ne!(sid, sid2);
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    /// Stand-in canonical `AggKind` string. Tests don't care about the
-    /// specific encoding — the resolver only uses the value for key
-    /// equality. Production callers compute this via
-    /// `AggKind::canonical_string()`.
-    const TEST_AGG: &str = "sketch:DDSketch:D:0.01";
-
-    #[test]
-    fn versioned_population_routing_separates_delimiter_collisions() {
-        use asap_types::PopulationKeyEncoding::{CanonicalLabelsV1, LegacyDelimited};
-        let a = [("a", "b;c=d")];
-        let b = [("a", "b"), ("c", "d")];
-        assert_eq!(
-            population_attrs_fingerprint(LegacyDelimited, &a).unwrap(),
-            "a=b;c=d;"
-        );
-        assert_eq!(
-            population_attrs_fingerprint(LegacyDelimited, &a),
-            population_attrs_fingerprint(LegacyDelimited, &b)
-        );
-        let ka = population_attrs_fingerprint(CanonicalLabelsV1, &a).unwrap();
-        let kb = population_attrs_fingerprint(CanonicalLabelsV1, &b).unwrap();
-        assert_ne!(ka, kb);
-        assert_eq!(
-            kb,
-            population_attrs_fingerprint(CanonicalLabelsV1, &[("c", "d"), ("a", "b")]).unwrap()
-        );
-        let resolver = SeriesIdResolver::new();
-        assert_ne!(
-            resolver.resolve("m", &ka, TEST_AGG),
-            resolver.resolve("m", &kb, TEST_AGG)
-        );
-        assert!(
-            population_attrs_fingerprint(CanonicalLabelsV1, &[("a", "1"), ("a", "2")]).is_err()
-        );
-    }
-
-    #[test]
-    fn idempotent_same_input_same_sid() {
-        let r = SeriesIdResolver::new();
-        let sid1 = r.resolve("http_requests_total", "zone=z0;", TEST_AGG);
-        let sid2 = r.resolve("http_requests_total", "zone=z0;", TEST_AGG);
-        assert_eq!(sid1, sid2, "same input must produce same sid");
-    }
-
-    #[test]
-    fn distinct_inputs_distinct_sids() {
-        let r = SeriesIdResolver::new();
-        let s_z0 = r.resolve("metric_a", "zone=z0;", TEST_AGG);
-        let s_z1 = r.resolve("metric_a", "zone=z1;", TEST_AGG);
-        assert_ne!(s_z0, s_z1);
-    }
-
-    #[test]
-    fn distinct_metrics_same_attrs_distinct_sids() {
-        let r = SeriesIdResolver::new();
-        let s_a = r.resolve("metric_a", "zone=z0;", TEST_AGG);
-        let s_b = r.resolve("metric_b", "zone=z0;", TEST_AGG);
-        assert_ne!(s_a, s_b);
-    }
-
-    #[test]
-    fn distinct_agg_kinds_same_series_distinct_sids() {
-        // Two aggregations over the same (metric, attrs) tuple — e.g.
-        // a DDSketch and a Sum on `http_latency_ms{zone=z0}` — get
-        // SEPARATE sids. This is the core property of Interpretation B:
-        // sid identity is `(metric, attrs, agg_kind)`.
-        let r = SeriesIdResolver::new();
-        let s_dd = r.resolve("http_latency_ms", "zone=z0;", "sketch:DDSketch:D:0.01");
-        let s_sum = r.resolve("http_latency_ms", "zone=z0;", "precompute:Sum:");
-        assert_ne!(
-            s_dd, s_sum,
-            "different agg_kinds over the same series must mint distinct sids",
-        );
-    }
-
-    #[test]
-    fn fingerprint_sorts_keys() {
-        let f1 = canonical_attrs_fingerprint(&[("zone", "z0"), ("rack", "r00")]);
-        let f2 = canonical_attrs_fingerprint(&[("rack", "r00"), ("zone", "z0")]);
-        assert_eq!(f1, f2, "fingerprint must be order-independent");
-        assert_eq!(f1, "rack=r00;zone=z0;");
-    }
-
-    #[test]
-    fn lookup_returns_existing_without_mint() {
-        let r = SeriesIdResolver::new();
-        let sid = r.resolve("m", "k=v;", TEST_AGG);
-        assert_eq!(r.lookup("m", "k=v;", TEST_AGG), Some(sid));
-        assert_eq!(r.lookup("m", "k=v2;", TEST_AGG), None);
-        // Same (metric, attrs) but different agg_kind is a miss.
-        assert_eq!(r.lookup("m", "k=v;", "precompute:Sum:"), None);
-    }
-}
diff --git a/data_plane/src/drivers/mod.rs b/data_plane/src/drivers/mod.rs
deleted file mode 100644
index 68b23bddd..000000000
--- a/data_plane/src/drivers/mod.rs
+++ /dev/null
@@ -1,6 +0,0 @@
-pub mod ingest;
-pub mod query;
-
-// Re-export commonly used types for convenience
-pub use ingest::{OtlpReceiver, OtlpReceiverConfig};
-pub use query::{AdapterConfig, HttpServer, HttpServerConfig};
diff --git a/data_plane/src/drivers/query/adapters/config.rs b/data_plane/src/drivers/query/adapters/config.rs
deleted file mode 100644
index 36cff467c..000000000
--- a/data_plane/src/drivers/query/adapters/config.rs
+++ /dev/null
@@ -1,135 +0,0 @@
-use crate::drivers::query::fallback::FallbackClient;
-use crate::query_engines::QueryForwardingPolicy;
-use crate::storage_engines::types::enums::{QueryLanguage, QueryProtocol};
-use std::sync::Arc;
-
-/// Configuration for a specific protocol adapter
-#[derive(Clone)]
-pub struct AdapterConfig {
-    /// The query protocol to use
-    pub protocol: QueryProtocol,
-
-    /// The query language to use
-    pub language: QueryLanguage,
-
-    /// Optional fallback client for unsupported queries
-    pub fallback: Option<Arc<dyn FallbackClient>>,
-
-    /// Whether this adapter may issue query requests to its fallback backend.
-    pub query_forwarding_policy: QueryForwardingPolicy,
-
-    /// A fallback was configured but removed by the forwarding policy.
-    pub fallback_blocked_by_policy: bool,
-}
-
-impl std::fmt::Debug for AdapterConfig {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        f.debug_struct("AdapterConfig")
-            .field("protocol", &self.protocol)
-            .field("language", &self.language)
-            .field(
-                "fallback",
-                &self.fallback.as_ref().map(|_| "Some(FallbackClient)"),
-            )
-            .field("query_forwarding_policy", &self.query_forwarding_policy)
-            .field(
-                "fallback_blocked_by_policy",
-                &self.fallback_blocked_by_policy,
-            )
-            .finish()
-    }
-}
-
-impl AdapterConfig {
-    /// Generic constructor for adapter configuration
-    pub fn new(
-        protocol: QueryProtocol,
-        language: QueryLanguage,
-        fallback: Option<Arc<dyn FallbackClient>>,
-    ) -> Self {
-        Self {
-            protocol,
-            language,
-            fallback,
-            query_forwarding_policy: QueryForwardingPolicy::Enabled,
-            fallback_blocked_by_policy: false,
-        }
-    }
-
-    pub fn with_query_forwarding_policy(mut self, policy: QueryForwardingPolicy) -> Self {
-        self.query_forwarding_policy = policy;
-        if !policy.allows_external_queries() {
-            self.fallback_blocked_by_policy |= self.fallback.is_some();
-            self.fallback = None;
-        } else {
-            self.fallback_blocked_by_policy = false;
-        }
-        self
-    }
-
-    /// Create a configuration for Prometheus HTTP with PromQL
-    /// Convenience constructor for backward compatibility
-    pub fn prometheus_promql(fallback_url: String, forward_unsupported: bool) -> Self {
-        use crate::drivers::query::fallback::PrometheusHttpFallback;
-
-        let fallback = if forward_unsupported {
-            Some(Arc::new(PrometheusHttpFallback::new(fallback_url)) as Arc<dyn FallbackClient>)
-        } else {
-            None
-        };
-
-        Self::new(
-            QueryProtocol::PrometheusHttp,
-            QueryLanguage::PromQl,
-            fallback,
-        )
-    }
-
-    /// Configuration used by the independent VictoriaMetrics listener. The
-    /// wire protocol is Prometheus-compatible; MetricsQL binding is handled at
-    /// the query-language boundary.
-    pub fn victoriametrics_metricsql(fallback_url: String) -> Self {
-        use crate::drivers::query::fallback::VictoriaMetricsHttpFallback;
-        Self::new(
-            QueryProtocol::PrometheusHttp,
-            QueryLanguage::MetricsQl,
-            Some(Arc::new(VictoriaMetricsHttpFallback::new(fallback_url))),
-        )
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    #[test]
-    fn listener_factories_preserve_their_query_language() {
-        assert_eq!(
-            AdapterConfig::prometheus_promql(String::new(), false).language,
-            QueryLanguage::PromQl
-        );
-        assert_eq!(
-            AdapterConfig::victoriametrics_metricsql(String::new()).language,
-            QueryLanguage::MetricsQl
-        );
-    }
-
-    #[test]
-    fn disabled_query_forwarding_removes_the_fallback_client() {
-        let config = AdapterConfig::prometheus_promql("http://prom:9090".into(), true)
-            .with_query_forwarding_policy(QueryForwardingPolicy::Disabled);
-        assert!(config.fallback.is_none());
-        assert!(config.fallback_blocked_by_policy);
-        assert_eq!(
-            config.query_forwarding_policy,
-            QueryForwardingPolicy::Disabled
-        );
-    }
-
-    #[test]
-    fn disabling_without_a_fallback_does_not_claim_a_blocked_request() {
-        let config = AdapterConfig::prometheus_promql("http://prom:9090".into(), false)
-            .with_query_forwarding_policy(QueryForwardingPolicy::Disabled);
-        assert!(!config.fallback_blocked_by_policy);
-    }
-}
diff --git a/data_plane/src/drivers/query/adapters/mod.rs b/data_plane/src/drivers/query/adapters/mod.rs
deleted file mode 100644
index 7061c2825..000000000
--- a/data_plane/src/drivers/query/adapters/mod.rs
+++ /dev/null
@@ -1,13 +0,0 @@
-pub mod config;
-pub mod prometheus_http;
-pub mod traits;
-pub mod victoriametrics_http;
-
-// Re-export main types
-pub use config::AdapterConfig;
-pub use prometheus_http::{PrometheusHttpAdapter, PrometheusResponse};
-pub use traits::{
-    AdapterError, HttpProtocolAdapter, ParsedQueryRequest, ParsedRangeQueryRequest,
-    QueryExecutionResult,
-};
-pub use victoriametrics_http::VictoriaMetricsHttpAdapter;
diff --git a/data_plane/src/drivers/query/adapters/prometheus_http.rs b/data_plane/src/drivers/query/adapters/prometheus_http.rs
deleted file mode 100644
index 1ede26e6b..000000000
--- a/data_plane/src/drivers/query/adapters/prometheus_http.rs
+++ /dev/null
@@ -1,650 +0,0 @@
-use super::config::AdapterConfig;
-use super::traits::*;
-use crate::query_engines::QueryResult;
-use crate::utils::http::{convert_query_result_to_prometheus, convert_range_result_to_prometheus};
-use asap_types::KeyByLabelNames;
-use async_trait::async_trait;
-use axum::{
-    extract::{Form, Query},
-    http::StatusCode,
-    response::{IntoResponse, Json, Response},
-};
-use serde::{Deserialize, Serialize};
-use serde_json::{json, Value};
-use std::collections::HashMap;
-use std::sync::Arc;
-use tracing::{debug, error};
-
-/// Prometheus-compatible response structure, with two ASAP
-/// extensions:
-///
-/// * `infos` — Prometheus 3.0-style informational annotations
-///   (Grafana 11+ renders these inline). Mirrors a one-liner
-///   summary of `accuracy` so older / non-JSON-aware UIs still
-///   see the ε/δ bound.
-/// * `accuracy` — structured [`AccuracyEnvelope`] carrying ε, δ,
-///   kind, and optional `per_segment` for schema-timeline-
-///   crossing queries. Standard Prometheus clients ignore
-///   unknown top-level fields, so this is a zero-risk extension.
-#[derive(Debug, Serialize, Deserialize)]
-pub struct PrometheusResponse {
-    pub status: String,
-    pub data: Option<Value>,
-    #[serde(rename = "errorType", skip_serializing_if = "Option::is_none")]
-    pub error_type: Option<String>,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub error: Option<String>,
-    /// Non-error advisories — maps to Prometheus's top-level
-    /// `warnings: []` field. The schema-timeline dispatcher uses
-    /// this to surface partial results when a query spans a
-    /// reconfigure boundary with a non-combinable statistic or a
-    /// Purged segment.
-    #[serde(default, skip_serializing_if = "Vec::is_empty")]
-    pub warnings: Vec<String>,
-    /// Prometheus 3.0 `infos: []`. Grafana 11+ renders each
-    /// string inline. Used to mirror a human-readable
-    /// `accuracy: ε=..., δ=..., kind=...` line when the
-    /// structured `accuracy` field is present.
-    #[serde(default, skip_serializing_if = "Vec::is_empty")]
-    pub infos: Vec<String>,
-    /// ASAP extension: theoretical accuracy envelope for the
-    /// answer (see docs/design_docs/summary-storage.md). Unknown to
-    /// standard Prometheus clients (they ignore unknown fields),
-    /// consumed by Grafana panels / paper artifacts that want
-    /// the machine-readable (ε, δ) bound.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub accuracy: Option<crate::storage_engines::sketch_db::AccuracyEnvelope>,
-}
-
-impl PrometheusResponse {
-    pub fn success(data: Value) -> Self {
-        Self {
-            status: "success".to_string(),
-            data: Some(data),
-            error_type: None,
-            error: None,
-            warnings: Vec::new(),
-            infos: Vec::new(),
-            accuracy: None,
-        }
-    }
-
-    /// `success` + a non-empty `warnings` list attached. Used by the
-    /// query adapters when the engine returned a `CombinedResult::Partial`.
-    pub fn success_with_warnings(data: Value, warnings: Vec<String>) -> Self {
-        Self {
-            status: "success".to_string(),
-            data: Some(data),
-            error_type: None,
-            error: None,
-            warnings,
-            infos: Vec::new(),
-            accuracy: None,
-        }
-    }
-
-    /// Attach an accuracy envelope: sets the structured `accuracy`
-    /// field and mirrors a human-readable one-liner to `infos`.
-    /// Chainable so both warning + accuracy paths can decorate
-    /// the same `success(...)` construction.
-    pub fn with_accuracy(
-        mut self,
-        envelope: crate::storage_engines::sketch_db::AccuracyEnvelope,
-    ) -> Self {
-        self.infos.push(envelope.summary());
-        self.accuracy = Some(envelope);
-        self
-    }
-
-    /// Attach the actual `[start_ms, end_ms)` precompute window
-    /// the engine consulted to answer this query. Surfaced as a
-    /// `precompute_window: ...` line in the response's `infos`
-    /// array so the caller can see which pane produced the
-    /// answer — important for window queries where the request
-    /// range and the answered range may differ (the engine picks
-    /// the latest closest pane that overlaps the request).
-    pub fn with_precompute_window(mut self, window: (u64, u64)) -> Self {
-        self.infos.push(format!(
-            "precompute_window: [{}, {}) ms (width {} ms)",
-            window.0,
-            window.1,
-            window.1.saturating_sub(window.0),
-        ));
-        self
-    }
-
-    pub fn error(error_type: &str, error: &str) -> Self {
-        Self {
-            status: "error".to_string(),
-            data: None,
-            error_type: Some(error_type.to_string()),
-            error: Some(error.to_string()),
-            warnings: Vec::new(),
-            infos: Vec::new(),
-            accuracy: None,
-        }
-    }
-}
-
-/// Prometheus HTTP protocol adapter
-pub struct PrometheusHttpAdapter {
-    config: AdapterConfig,
-}
-
-impl PrometheusHttpAdapter {
-    pub fn new(config: AdapterConfig) -> Self {
-        Self { config }
-    }
-
-    /// Helper to parse query parameters (used by both GET and POST)
-    fn parse_params(
-        &self,
-        params: &HashMap<String, String>,
-    ) -> Result<ParsedQueryRequest, AdapterError> {
-        let query = params
-            .get("query")
-            .ok_or_else(|| AdapterError::MissingParameter("query".to_string()))?
-            .clone();
-
-        let time = if let Some(time_str) = params.get("time") {
-            time_str.parse::<f64>().map_err(|e| {
-                AdapterError::InvalidParameter(format!("Invalid time parameter: {}", e))
-            })?
-        } else {
-            // Use current time as default
-            std::time::SystemTime::now()
-                .duration_since(std::time::UNIX_EPOCH)
-                .unwrap()
-                .as_secs_f64()
-        };
-
-        Ok(ParsedQueryRequest {
-            query,
-            time,
-            timeout: params.get("timeout").cloned(),
-        })
-    }
-
-    /// Helper to parse range query parameters
-    fn parse_range_params(
-        &self,
-        params: &HashMap<String, String>,
-    ) -> Result<ParsedRangeQueryRequest, AdapterError> {
-        let query = params
-            .get("query")
-            .ok_or_else(|| AdapterError::MissingParameter("query".to_string()))?
-            .clone();
-
-        let start = params
-            .get("start")
-            .ok_or_else(|| AdapterError::MissingParameter("start".to_string()))?
-            .parse::<f64>()
-            .map_err(|e| AdapterError::InvalidParameter(format!("Invalid start: {}", e)))?;
-
-        let end = params
-            .get("end")
-            .ok_or_else(|| AdapterError::MissingParameter("end".to_string()))?
-            .parse::<f64>()
-            .map_err(|e| AdapterError::InvalidParameter(format!("Invalid end: {}", e)))?;
-
-        let step = params
-            .get("step")
-            .ok_or_else(|| AdapterError::MissingParameter("step".to_string()))?
-            .parse::<f64>()
-            .map_err(|e| AdapterError::InvalidParameter(format!("Invalid step: {}", e)))?;
-
-        // Basic validation
-        if start >= end {
-            return Err(AdapterError::InvalidParameter(
-                "start must be before end".to_string(),
-            ));
-        }
-        if step <= 0.0 {
-            return Err(AdapterError::InvalidParameter(
-                "step must be positive".to_string(),
-            ));
-        }
-
-        Ok(ParsedRangeQueryRequest {
-            query,
-            start,
-            end,
-            step,
-            timeout: params.get("timeout").cloned(),
-        })
-    }
-}
-
-#[async_trait]
-impl HttpProtocolAdapter for PrometheusHttpAdapter {
-    async fn parse_get_request(
-        &self,
-        Query(params): Query<HashMap<String, String>>,
-    ) -> Result<ParsedQueryRequest, AdapterError> {
-        debug!(
-            "Prometheus adapter: parsing GET request with params: {:?}",
-            params
-        );
-        self.parse_params(&params)
-    }
-
-    async fn parse_post_request(
-        &self,
-        Form(params): Form<HashMap<String, String>>,
-    ) -> Result<ParsedQueryRequest, AdapterError> {
-        debug!(
-            "Prometheus adapter: parsing POST request with params: {:?}",
-            params
-        );
-        self.parse_params(&params)
-    }
-
-    fn get_query_endpoint(&self) -> &'static str {
-        "/api/v1/query"
-    }
-
-    async fn parse_range_get_request(
-        &self,
-        Query(params): Query<HashMap<String, String>>,
-    ) -> Result<ParsedRangeQueryRequest, AdapterError> {
-        debug!(
-            "Prometheus adapter: parsing range GET request with params: {:?}",
-            params
-        );
-        self.parse_range_params(&params)
-    }
-
-    async fn parse_range_post_request(
-        &self,
-        Form(params): Form<HashMap<String, String>>,
-    ) -> Result<ParsedRangeQueryRequest, AdapterError> {
-        debug!(
-            "Prometheus adapter: parsing range POST request with params: {:?}",
-            params
-        );
-        self.parse_range_params(&params)
-    }
-
-    fn get_range_query_endpoint(&self) -> &'static str {
-        "/api/v1/query_range"
-    }
-
-    async fn format_success_response(
-        &self,
-        result: &QueryExecutionResult,
-    ) -> Result<Response, StatusCode> {
-        debug!("Prometheus adapter: formatting success response");
-
-        let prometheus_data =
-            convert_query_result_to_prometheus(&result.query_result, &result.query_output_labels)
-                .map_err(|e| {
-                error!("Failed to convert query result: {}", e);
-                StatusCode::INTERNAL_SERVER_ERROR
-            })?;
-
-        // Thread through any schema-timeline dispatcher warnings
-        // so they land on the top-level `warnings` field, matching
-        // Prometheus's native API.
-        let warnings = result.query_result.warnings().to_vec();
-        let accuracy = result.query_result.accuracy().cloned();
-        let window_used = result.query_result.window_used();
-        let mut response = if warnings.is_empty() {
-            PrometheusResponse::success(prometheus_data)
-        } else {
-            PrometheusResponse::success_with_warnings(prometheus_data, warnings)
-        };
-        if let Some(envelope) = accuracy {
-            response = response.with_accuracy(envelope);
-        }
-        if let Some(window) = window_used {
-            response = response.with_precompute_window(window);
-        }
-        Ok(Json(serde_json::to_value(response).unwrap()).into_response())
-    }
-
-    async fn format_range_success_response(
-        &self,
-        result: &QueryResult,
-        labels: &KeyByLabelNames,
-    ) -> Result<Response, StatusCode> {
-        debug!("Prometheus adapter: formatting range success response");
-
-        let prometheus_data = convert_range_result_to_prometheus(result, labels).map_err(|e| {
-            error!("Failed to convert range result: {}", e);
-            StatusCode::INTERNAL_SERVER_ERROR
-        })?;
-        let warnings = result.warnings().to_vec();
-        let accuracy = result.accuracy().cloned();
-        let window_used = result.window_used();
-        let mut response = if warnings.is_empty() {
-            PrometheusResponse::success(prometheus_data)
-        } else {
-            PrometheusResponse::success_with_warnings(prometheus_data, warnings)
-        };
-        if let Some(envelope) = accuracy {
-            response = response.with_accuracy(envelope);
-        }
-        if let Some(window) = window_used {
-            response = response.with_precompute_window(window);
-        }
-        Ok(Json(serde_json::to_value(response).unwrap()).into_response())
-    }
-
-    async fn format_error_response(&self, error: &AdapterError) -> Result<Response, StatusCode> {
-        debug!("Prometheus adapter: formatting error response: {:?}", error);
-
-        let (error_type, error_msg) = match error {
-            AdapterError::MissingParameter(p) => ("bad_data", format!("Missing parameter: {}", p)),
-            AdapterError::InvalidParameter(p) => ("bad_data", format!("Invalid parameter: {}", p)),
-            AdapterError::ParseError(e) => ("bad_data", format!("Parse error: {}", e)),
-            AdapterError::NetworkError(e) => ("internal", format!("Network error: {}", e)),
-            AdapterError::ProtocolError(e) => ("internal", format!("Protocol error: {}", e)),
-        };
-
-        let response = PrometheusResponse::error(error_type, &error_msg);
-        Ok(Json(serde_json::to_value(response).unwrap()).into_response())
-    }
-
-    async fn format_unsupported_query_response(&self) -> Result<Response, StatusCode> {
-        debug!("Prometheus adapter: formatting unsupported query response");
-
-        let response = PrometheusResponse::error("bad_data", "No result for query");
-        Ok(Json(serde_json::to_value(response).unwrap()).into_response())
-    }
-
-    fn query_language(&self) -> asap_types::QueryLanguage {
-        asap_types::QueryLanguage::PromQl
-    }
-
-    fn adapter_name(&self) -> &'static str {
-        "PrometheusHTTP"
-    }
-
-    fn get_runtime_info_path(&self) -> &'static str {
-        "/api/v1/status/runtimeinfo"
-    }
-
-    async fn handle_runtime_info(
-        &self,
-        summary_store: Arc<crate::storage_engines::sketch_db::index::SketchStore>,
-    ) -> Result<Json<Value>, StatusCode> {
-        debug!("Handling runtime info request in Prometheus adapter");
-
-        // Read first-seen timestamps from per-sid metadata for runtime diagnostics.
-        let earliest_timestamps = summary_store.earliest_timestamps_per_series_id();
-
-        // Get runtime info from fallback if available
-        let mut runtime_data = if let Some(fallback) = &self.config.fallback {
-            debug!("Fetching runtime info from fallback");
-            match fallback.get_runtime_info().await {
-                Ok(data) => data,
-                Err(e) => {
-                    error!("Failed to get runtime info from fallback: {:?}", e);
-                    json!({})
-                }
-            }
-        } else {
-            json!({})
-        };
-
-        // Merge local data with fallback data
-        if let Some(data_obj) = runtime_data.as_object_mut() {
-            data_obj.insert(
-                "earliest_timestamp_per_sid".to_string(),
-                serde_json::to_value(earliest_timestamps).unwrap_or(json!({})),
-            );
-        } else {
-            runtime_data = json!({
-                "earliest_timestamp_per_sid": earliest_timestamps
-            });
-        }
-
-        debug!("Successfully merged runtime info with local data");
-
-        // Wrap in Prometheus response format
-        let response = PrometheusResponse::success(runtime_data);
-        Ok(Json(serde_json::to_value(response).unwrap()))
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use crate::storage_engines::types::enums::{QueryLanguage, QueryProtocol};
-
-    fn create_test_adapter() -> PrometheusHttpAdapter {
-        let config = AdapterConfig::new(QueryProtocol::PrometheusHttp, QueryLanguage::PromQl, None);
-        PrometheusHttpAdapter::new(config)
-    }
-
-    // Tests for parse_range_params
-
-    #[test]
-    fn test_parse_range_params_valid() {
-        let adapter = create_test_adapter();
-        let mut params = HashMap::new();
-        params.insert("query".to_string(), "sum(metric)".to_string());
-        params.insert("start".to_string(), "1700000000".to_string());
-        params.insert("end".to_string(), "1700001000".to_string());
-        params.insert("step".to_string(), "60".to_string());
-
-        let result = adapter.parse_range_params(&params);
-
-        assert!(result.is_ok());
-        let parsed = result.unwrap();
-        assert_eq!(parsed.query, "sum(metric)");
-        assert_eq!(parsed.start, 1700000000.0);
-        assert_eq!(parsed.end, 1700001000.0);
-        assert_eq!(parsed.step, 60.0);
-    }
-
-    #[test]
-    fn test_parse_range_params_missing_query() {
-        let adapter = create_test_adapter();
-        let mut params = HashMap::new();
-        params.insert("start".to_string(), "1700000000".to_string());
-        params.insert("end".to_string(), "1700001000".to_string());
-        params.insert("step".to_string(), "60".to_string());
-
-        let result = adapter.parse_range_params(&params);
-
-        assert!(result.is_err());
-        match result.unwrap_err() {
-            AdapterError::MissingParameter(p) => assert_eq!(p, "query"),
-            _ => panic!("Expected MissingParameter error"),
-        }
-    }
-
-    #[test]
-    fn test_parse_range_params_missing_start() {
-        let adapter = create_test_adapter();
-        let mut params = HashMap::new();
-        params.insert("query".to_string(), "sum(metric)".to_string());
-        params.insert("end".to_string(), "1700001000".to_string());
-        params.insert("step".to_string(), "60".to_string());
-
-        let result = adapter.parse_range_params(&params);
-
-        assert!(result.is_err());
-        match result.unwrap_err() {
-            AdapterError::MissingParameter(p) => assert_eq!(p, "start"),
-            _ => panic!("Expected MissingParameter error"),
-        }
-    }
-
-    #[test]
-    fn test_parse_range_params_missing_end() {
-        let adapter = create_test_adapter();
-        let mut params = HashMap::new();
-        params.insert("query".to_string(), "sum(metric)".to_string());
-        params.insert("start".to_string(), "1700000000".to_string());
-        params.insert("step".to_string(), "60".to_string());
-
-        let result = adapter.parse_range_params(&params);
-
-        assert!(result.is_err());
-        match result.unwrap_err() {
-            AdapterError::MissingParameter(p) => assert_eq!(p, "end"),
-            _ => panic!("Expected MissingParameter error"),
-        }
-    }
-
-    #[test]
-    fn test_parse_range_params_missing_step() {
-        let adapter = create_test_adapter();
-        let mut params = HashMap::new();
-        params.insert("query".to_string(), "sum(metric)".to_string());
-        params.insert("start".to_string(), "1700000000".to_string());
-        params.insert("end".to_string(), "1700001000".to_string());
-
-        let result = adapter.parse_range_params(&params);
-
-        assert!(result.is_err());
-        match result.unwrap_err() {
-            AdapterError::MissingParameter(p) => assert_eq!(p, "step"),
-            _ => panic!("Expected MissingParameter error"),
-        }
-    }
-
-    #[test]
-    fn test_parse_range_params_invalid_start() {
-        let adapter = create_test_adapter();
-        let mut params = HashMap::new();
-        params.insert("query".to_string(), "sum(metric)".to_string());
-        params.insert("start".to_string(), "not_a_number".to_string());
-        params.insert("end".to_string(), "1700001000".to_string());
-        params.insert("step".to_string(), "60".to_string());
-
-        let result = adapter.parse_range_params(&params);
-
-        assert!(result.is_err());
-        match result.unwrap_err() {
-            AdapterError::InvalidParameter(msg) => assert!(msg.contains("start")),
-            _ => panic!("Expected InvalidParameter error"),
-        }
-    }
-
-    #[test]
-    fn test_parse_range_params_start_after_end() {
-        let adapter = create_test_adapter();
-        let mut params = HashMap::new();
-        params.insert("query".to_string(), "sum(metric)".to_string());
-        params.insert("start".to_string(), "1700001000".to_string());
-        params.insert("end".to_string(), "1700000000".to_string()); // end before start
-        params.insert("step".to_string(), "60".to_string());
-
-        let result = adapter.parse_range_params(&params);
-
-        assert!(result.is_err());
-        match result.unwrap_err() {
-            AdapterError::InvalidParameter(msg) => {
-                assert!(msg.contains("start must be before end"))
-            }
-            _ => panic!("Expected InvalidParameter error"),
-        }
-    }
-
-    #[test]
-    fn test_parse_range_params_zero_step() {
-        let adapter = create_test_adapter();
-        let mut params = HashMap::new();
-        params.insert("query".to_string(), "sum(metric)".to_string());
-        params.insert("start".to_string(), "1700000000".to_string());
-        params.insert("end".to_string(), "1700001000".to_string());
-        params.insert("step".to_string(), "0".to_string());
-
-        let result = adapter.parse_range_params(&params);
-
-        assert!(result.is_err());
-        match result.unwrap_err() {
-            AdapterError::InvalidParameter(msg) => assert!(msg.contains("step must be positive")),
-            _ => panic!("Expected InvalidParameter error"),
-        }
-    }
-
-    #[test]
-    fn test_parse_range_params_negative_step() {
-        let adapter = create_test_adapter();
-        let mut params = HashMap::new();
-        params.insert("query".to_string(), "sum(metric)".to_string());
-        params.insert("start".to_string(), "1700000000".to_string());
-        params.insert("end".to_string(), "1700001000".to_string());
-        params.insert("step".to_string(), "-60".to_string());
-
-        let result = adapter.parse_range_params(&params);
-
-        assert!(result.is_err());
-        match result.unwrap_err() {
-            AdapterError::InvalidParameter(msg) => assert!(msg.contains("step must be positive")),
-            _ => panic!("Expected InvalidParameter error"),
-        }
-    }
-
-    #[test]
-    fn test_get_range_query_endpoint() {
-        let adapter = create_test_adapter();
-        assert_eq!(adapter.get_range_query_endpoint(), "/api/v1/query_range");
-    }
-
-    #[tokio::test]
-    async fn test_parse_range_get_request() {
-        let adapter = create_test_adapter();
-        let mut params = HashMap::new();
-        params.insert("query".to_string(), "sum(metric)".to_string());
-        params.insert("start".to_string(), "1700000000".to_string());
-        params.insert("end".to_string(), "1700001000".to_string());
-        params.insert("step".to_string(), "60".to_string());
-
-        let result = adapter.parse_range_get_request(Query(params)).await;
-
-        assert!(result.is_ok());
-        let parsed = result.unwrap();
-        assert_eq!(parsed.query, "sum(metric)");
-    }
-
-    #[tokio::test]
-    async fn test_parse_range_post_request() {
-        let adapter = create_test_adapter();
-        let mut params = HashMap::new();
-        params.insert("query".to_string(), "sum(metric)".to_string());
-        params.insert("start".to_string(), "1700000000".to_string());
-        params.insert("end".to_string(), "1700001000".to_string());
-        params.insert("step".to_string(), "60".to_string());
-
-        let result = adapter.parse_range_post_request(Form(params)).await;
-
-        assert!(result.is_ok());
-        let parsed = result.unwrap();
-        assert_eq!(parsed.query, "sum(metric)");
-    }
-
-    #[test]
-    fn success_response_without_warnings_omits_field() {
-        let r = PrometheusResponse::success(json!({"resultType": "vector", "result": []}));
-        let s = serde_json::to_string(&r).unwrap();
-        assert!(s.contains("\"status\":\"success\""));
-        assert!(
-            !s.contains("\"warnings\""),
-            "empty warnings must be skip-serialised for wire compatibility"
-        );
-    }
-
-    #[test]
-    fn success_response_with_warnings_serialises_the_top_level_field() {
-        // Contract: a Partial result coming out of the §7
-        // schema-timeline dispatcher lands on Prometheus's native
-        // `warnings: []` field at the top of the response,
-        // matching upstream behaviour for warning-carrying queries.
-        let r = PrometheusResponse::success_with_warnings(
-            json!({"resultType": "vector", "result": []}),
-            vec![
-                "partial result: query spans 2 schemas".to_string(),
-                "1 group(s) dropped".to_string(),
-            ],
-        );
-        let s = serde_json::to_string(&r).unwrap();
-        assert!(s.contains("\"warnings\":["));
-        assert!(s.contains("partial result: query spans 2 schemas"));
-        assert!(s.contains("1 group(s) dropped"));
-    }
-}
diff --git a/data_plane/src/drivers/query/adapters/traits.rs b/data_plane/src/drivers/query/adapters/traits.rs
deleted file mode 100644
index 90f2d6aa8..000000000
--- a/data_plane/src/drivers/query/adapters/traits.rs
+++ /dev/null
@@ -1,165 +0,0 @@
-use asap_types::KeyByLabelNames;
-use async_trait::async_trait;
-use axum::{
-    body::Bytes,
-    extract::{Form, Query},
-    http::StatusCode,
-    response::{Json, Response},
-};
-use serde_json::Value;
-use std::collections::HashMap;
-
-use crate::query_engines::QueryResult;
-
-/// Parsed query request data ready for engine processing
-#[derive(Debug, Clone)]
-pub struct ParsedQueryRequest {
-    pub query: String,
-    pub time: f64,
-    /// Prometheus timeout syntax, preserved verbatim for exact fallback.
-    pub timeout: Option<String>,
-}
-
-/// Parsed range query request with validated parameters
-#[derive(Debug, Clone)]
-pub struct ParsedRangeQueryRequest {
-    pub query: String,
-    pub start: f64, // epoch seconds
-    pub end: f64,   // epoch seconds
-    pub step: f64,  // seconds, must be multiple of tumbling window
-    /// Prometheus timeout syntax, preserved verbatim for exact fallback.
-    pub timeout: Option<String>,
-}
-
-/// Result of query execution (before formatting for protocol)
-#[derive(Debug, Clone)]
-pub struct QueryExecutionResult {
-    pub query_output_labels: KeyByLabelNames,
-    pub query_result: QueryResult,
-}
-
-/// Error types for adapters
-#[derive(Debug)]
-pub enum AdapterError {
-    MissingParameter(String),
-    InvalidParameter(String),
-    ParseError(String),
-    NetworkError(String),
-    ProtocolError(String),
-}
-
-impl std::fmt::Display for AdapterError {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        match self {
-            AdapterError::MissingParameter(p) => write!(f, "Missing parameter: {}", p),
-            AdapterError::InvalidParameter(p) => write!(f, "Invalid parameter: {}", p),
-            AdapterError::ParseError(e) => write!(f, "Parse error: {}", e),
-            AdapterError::NetworkError(e) => write!(f, "Network error: {}", e),
-            AdapterError::ProtocolError(e) => write!(f, "Protocol error: {}", e),
-        }
-    }
-}
-
-impl std::error::Error for AdapterError {}
-
-/// HTTP query parsing, response formatting, and listener identity.
-/// Fallback transport is handled separately by `FallbackClient`.
-#[async_trait]
-pub trait HttpProtocolAdapter: Send + Sync {
-    /// Parse a GET request with query parameters
-    async fn parse_get_request(
-        &self,
-        query_params: Query<HashMap<String, String>>,
-    ) -> Result<ParsedQueryRequest, AdapterError>;
-
-    /// Parse a POST request with form data
-    async fn parse_post_request(
-        &self,
-        form_params: Form<HashMap<String, String>>,
-    ) -> Result<ParsedQueryRequest, AdapterError>;
-
-    /// Parse a POST request with a JSON body.
-    /// Default implementation returns an error - adapters that support JSON
-    /// POST requests should override this method.
-    async fn parse_json_post_request(
-        &self,
-        _body: Bytes,
-    ) -> Result<ParsedQueryRequest, AdapterError> {
-        Err(AdapterError::ProtocolError(
-            "JSON POST requests not supported by this adapter".to_string(),
-        ))
-    }
-
-    /// Get the HTTP path this adapter handles (e.g., "/api/v1/query")
-    fn get_query_endpoint(&self) -> &'static str;
-
-    /// Parse a GET request for range queries
-    async fn parse_range_get_request(
-        &self,
-        query_params: Query<HashMap<String, String>>,
-    ) -> Result<ParsedRangeQueryRequest, AdapterError>;
-
-    /// Parse a POST request for range queries
-    async fn parse_range_post_request(
-        &self,
-        form_params: Form<HashMap<String, String>>,
-    ) -> Result<ParsedRangeQueryRequest, AdapterError>;
-
-    /// Get the HTTP path for range queries (e.g., "/api/v1/query_range")
-    fn get_range_query_endpoint(&self) -> &'static str;
-
-    /// Format a successful query result into protocol response
-    async fn format_success_response(
-        &self,
-        result: &QueryExecutionResult,
-    ) -> Result<Response, StatusCode>;
-
-    /// Format a successful range query result into protocol response
-    async fn format_range_success_response(
-        &self,
-        result: &QueryResult,
-        labels: &KeyByLabelNames,
-    ) -> Result<Response, StatusCode>;
-
-    /// Format an error into protocol response
-    async fn format_error_response(&self, error: &AdapterError) -> Result<Response, StatusCode>;
-
-    /// Format an error when query returns None (unsupported query)
-    async fn format_unsupported_query_response(&self) -> Result<Response, StatusCode>;
-
-    /// Query language accepted at this listener boundary.
-    fn query_language(&self) -> asap_types::QueryLanguage;
-
-    /// Get a descriptive name for this adapter (for logging/debugging)
-    fn adapter_name(&self) -> &'static str;
-
-    /// Language-owned canonical identity for an independently published plan
-    /// catalog. Protocols without a sidecar catalog return `None`.
-    fn canonical_plan_identity(&self, _query: &str) -> Result<Option<String>, AdapterError> {
-        Ok(None)
-    }
-
-    /// Get the path for the runtime info endpoint
-    ///
-    /// Example: "/api/v1/status/runtimeinfo" for Prometheus
-    fn get_runtime_info_path(&self) -> &'static str;
-
-    /// Handle runtime info request
-    ///
-    /// The adapter can query the SketchStore for internal metrics and
-    /// optionally forward to fallback backend for additional info.
-    async fn handle_runtime_info(
-        &self,
-        summary_store: std::sync::Arc<crate::storage_engines::sketch_db::index::SketchStore>,
-    ) -> Result<Json<Value>, StatusCode>;
-
-    async fn handle_runtime_info_with_headers(
-        &self,
-        summary_store: std::sync::Arc<crate::storage_engines::sketch_db::index::SketchStore>,
-        headers: HashMap<String, String>,
-    ) -> Result<Json<Value>, StatusCode> {
-        // Adapters may override this to forward request headers.
-        let _ = headers;
-        self.handle_runtime_info(summary_store).await
-    }
-}
diff --git a/data_plane/src/drivers/query/adapters/victoriametrics_http.rs b/data_plane/src/drivers/query/adapters/victoriametrics_http.rs
deleted file mode 100644
index c2c1e756b..000000000
--- a/data_plane/src/drivers/query/adapters/victoriametrics_http.rs
+++ /dev/null
@@ -1,175 +0,0 @@
-use super::{
-    AdapterConfig, AdapterError, HttpProtocolAdapter, ParsedQueryRequest, ParsedRangeQueryRequest,
-    PrometheusHttpAdapter, QueryExecutionResult,
-};
-use asap_types::KeyByLabelNames;
-use async_trait::async_trait;
-use axum::{
-    body::Bytes,
-    extract::{Form, Query},
-    http::StatusCode,
-    response::{Json, Response},
-};
-use serde_json::Value;
-use std::{collections::HashMap, sync::Arc};
-
-/// VictoriaMetrics HTTP adapter. VictoriaMetrics intentionally uses the
-/// Prometheus-compatible wire envelope. Canonical identities use the shared
-/// parser; execution resolves the installed MetricsQL QueryPlan or falls back
-/// to VictoriaMetrics.
-pub struct VictoriaMetricsHttpAdapter {
-    wire: PrometheusHttpAdapter,
-}
-
-impl VictoriaMetricsHttpAdapter {
-    pub fn new(config: AdapterConfig) -> Self {
-        Self {
-            wire: PrometheusHttpAdapter::new(config),
-        }
-    }
-}
-
-#[async_trait]
-impl HttpProtocolAdapter for VictoriaMetricsHttpAdapter {
-    async fn parse_get_request(
-        &self,
-        params: Query<HashMap<String, String>>,
-    ) -> Result<ParsedQueryRequest, AdapterError> {
-        self.wire.parse_get_request(params).await
-    }
-    async fn parse_post_request(
-        &self,
-        params: Form<HashMap<String, String>>,
-    ) -> Result<ParsedQueryRequest, AdapterError> {
-        self.wire.parse_post_request(params).await
-    }
-    async fn parse_json_post_request(
-        &self,
-        body: Bytes,
-    ) -> Result<ParsedQueryRequest, AdapterError> {
-        self.wire.parse_json_post_request(body).await
-    }
-    fn get_query_endpoint(&self) -> &'static str {
-        "/api/v1/query"
-    }
-    async fn parse_range_get_request(
-        &self,
-        params: Query<HashMap<String, String>>,
-    ) -> Result<ParsedRangeQueryRequest, AdapterError> {
-        self.wire.parse_range_get_request(params).await
-    }
-    async fn parse_range_post_request(
-        &self,
-        params: Form<HashMap<String, String>>,
-    ) -> Result<ParsedRangeQueryRequest, AdapterError> {
-        self.wire.parse_range_post_request(params).await
-    }
-    fn get_range_query_endpoint(&self) -> &'static str {
-        "/api/v1/query_range"
-    }
-
-    async fn format_success_response(
-        &self,
-        result: &QueryExecutionResult,
-    ) -> Result<Response, StatusCode> {
-        self.wire.format_success_response(result).await
-    }
-    async fn format_range_success_response(
-        &self,
-        result: &crate::query_engines::QueryResult,
-        labels: &KeyByLabelNames,
-    ) -> Result<Response, StatusCode> {
-        self.wire
-            .format_range_success_response(result, labels)
-            .await
-    }
-    async fn format_error_response(&self, error: &AdapterError) -> Result<Response, StatusCode> {
-        self.wire.format_error_response(error).await
-    }
-    async fn format_unsupported_query_response(&self) -> Result<Response, StatusCode> {
-        self.wire.format_unsupported_query_response().await
-    }
-
-    fn query_language(&self) -> asap_types::QueryLanguage {
-        asap_types::QueryLanguage::MetricsQl
-    }
-
-    fn adapter_name(&self) -> &'static str {
-        "VictoriaMetrics HTTP / MetricsQL"
-    }
-    fn canonical_plan_identity(&self, query: &str) -> Result<Option<String>, AdapterError> {
-        asap_types::query_plan::canonical_promql(query)
-            .map(Some)
-            .map_err(|error| AdapterError::ParseError(format!("promql-compatible subset: {error}")))
-    }
-    fn get_runtime_info_path(&self) -> &'static str {
-        "/api/v1/status/runtimeinfo"
-    }
-    async fn handle_runtime_info(
-        &self,
-        index: Arc<crate::storage_engines::sketch_db::index::SketchStore>,
-    ) -> Result<Json<Value>, StatusCode> {
-        self.wire.handle_runtime_info(index).await
-    }
-    async fn handle_runtime_info_with_headers(
-        &self,
-        index: Arc<crate::storage_engines::sketch_db::index::SketchStore>,
-        headers: HashMap<String, String>,
-    ) -> Result<Json<Value>, StatusCode> {
-        self.wire
-            .handle_runtime_info_with_headers(index, headers)
-            .await
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use crate::storage_engines::types::enums::{QueryLanguage, QueryProtocol};
-
-    fn adapter() -> VictoriaMetricsHttpAdapter {
-        VictoriaMetricsHttpAdapter::new(AdapterConfig::new(
-            QueryProtocol::PrometheusHttp,
-            QueryLanguage::MetricsQl,
-            None,
-        ))
-    }
-
-    #[tokio::test]
-    async fn preserves_metricsql_expression_for_binding_or_fallback() {
-        let mut params = HashMap::new();
-        params.insert(
-            "query".into(),
-            "rate(requests[5m]) keep_metric_names".into(),
-        );
-        params.insert("time".into(), "1700000000".into());
-        let parsed = adapter().parse_get_request(Query(params)).await.unwrap();
-        assert_eq!(parsed.query, "rate(requests[5m]) keep_metric_names");
-    }
-
-    #[test]
-    fn exposes_victoriametrics_query_endpoints() {
-        assert_eq!(adapter().query_language(), QueryLanguage::MetricsQl);
-        assert_eq!(adapter().get_query_endpoint(), "/api/v1/query");
-        assert_eq!(adapter().get_range_query_endpoint(), "/api/v1/query_range");
-    }
-
-    #[test]
-    fn identity_tracks_the_shared_parser_boundary() {
-        for query in [
-            "mad_over_time(cpu_usage[5m])",
-            "distinct_over_time(cpu_usage[5m])",
-            "entropy_over_time(cpu_usage[5m])",
-        ] {
-            assert!(adapter().canonical_plan_identity(query).unwrap().is_some());
-        }
-        for query in [
-            "default_rollup(cpu_usage[5m])",
-            "topk_over_time(3, cpu_usage[5m])",
-            "rate(requests[5m]) keep_metric_names",
-            "sum(foo, bar)",
-        ] {
-            assert!(adapter().canonical_plan_identity(query).is_err());
-        }
-    }
-}
diff --git a/data_plane/src/drivers/query/fallback/mod.rs b/data_plane/src/drivers/query/fallback/mod.rs
deleted file mode 100644
index 84d974719..000000000
--- a/data_plane/src/drivers/query/fallback/mod.rs
+++ /dev/null
@@ -1,140 +0,0 @@
-use async_trait::async_trait;
-use axum::{
-    body::Bytes,
-    http::{HeaderMap, StatusCode},
-    response::{IntoResponse, Json, Response},
-};
-use serde_json::Value;
-use std::collections::HashMap;
-
-use crate::drivers::query::adapters::{ParsedQueryRequest, ParsedRangeQueryRequest};
-
-/// Response format from fallback backend
-#[derive(Debug, Clone)]
-pub enum FallbackResponse {
-    /// JSON response (used by Prometheus, etc.)
-    Json(Value),
-    /// Plain text response.
-    Text(String),
-    /// Exact upstream HTTP response for protocols whose status and response
-    /// metadata are part of the compatibility contract.
-    Forwarded {
-        status: StatusCode,
-        headers: HeaderMap,
-        body: Bytes,
-    },
-}
-
-impl IntoResponse for FallbackResponse {
-    fn into_response(self) -> Response {
-        let mut response = match self {
-            FallbackResponse::Json(value) => Json(value).into_response(),
-            FallbackResponse::Text(text) => {
-                // Return plain text with appropriate content type
-                (
-                    [(
-                        axum::http::header::CONTENT_TYPE,
-                        "text/tab-separated-values",
-                    )],
-                    text,
-                )
-                    .into_response()
-            }
-            FallbackResponse::Forwarded {
-                status,
-                headers,
-                body,
-            } => {
-                let mut response = (status, body).into_response();
-                *response.headers_mut() = headers;
-                response
-            }
-        };
-        response.headers_mut().insert(
-            "x-asap-execution",
-            axum::http::HeaderValue::from_static("exact_fallback"),
-        );
-        response
-    }
-}
-
-#[cfg(test)]
-mod execution_attribution_tests {
-    use super::*;
-
-    // An HTTP fallback must be distinguishable from warm execution, even if
-    // its upstream response carries misleading or absent source annotations.
-    #[test]
-    fn forwarded_response_has_backend_owned_execution_marker() {
-        let response = FallbackResponse::Json(serde_json::json!({
-            "status": "success", "infos": ["data_source: asap_query"]
-        }))
-        .into_response();
-        assert_eq!(response.headers()["x-asap-execution"], "exact_fallback");
-    }
-}
-
-/// Client for forwarding unsupported queries to a fallback backend
-#[async_trait]
-pub trait FallbackClient: Send + Sync {
-    /// Execute a query against the fallback backend
-    ///
-    /// # Arguments
-    /// * `request` - The parsed query request (query string, time, etc.)
-    ///
-    /// # Returns
-    /// Protocol-specific response from the fallback backend (JSON or Text)
-    async fn execute_query(
-        &self,
-        request: &ParsedQueryRequest,
-    ) -> Result<FallbackResponse, StatusCode>;
-
-    async fn execute_query_with_headers(
-        &self,
-        request: &ParsedQueryRequest,
-        _headers: HashMap<String, String>,
-    ) -> Result<FallbackResponse, StatusCode> {
-        // Default implementation delegates to execute_query
-        self.execute_query(request).await
-    }
-
-    /// Execute a Prometheus range query against the fallback backend.
-    async fn execute_range_query(
-        &self,
-        _request: &ParsedRangeQueryRequest,
-    ) -> Result<FallbackResponse, StatusCode> {
-        Err(StatusCode::NOT_IMPLEMENTED)
-    }
-
-    async fn execute_range_query_with_headers(
-        &self,
-        request: &ParsedRangeQueryRequest,
-        _headers: HashMap<String, String>,
-    ) -> Result<FallbackResponse, StatusCode> {
-        self.execute_range_query(request).await
-    }
-
-    /// Get runtime info from the fallback backend (optional)
-    ///
-    /// # Returns
-    /// Runtime info as JSON, or empty object if not supported
-    async fn get_runtime_info(&self) -> Result<Value, StatusCode> {
-        // Default implementation: return empty object
-        Ok(serde_json::json!({}))
-    }
-
-    async fn get_runtime_info_with_headers(
-        &self,
-        headers: HashMap<String, String>,
-    ) -> Result<Value, StatusCode> {
-        // Default implementation delegates to get_runtime_info
-        let _ = headers;
-        self.get_runtime_info().await
-    }
-}
-
-mod prometheus;
-mod victoriametrics;
-
-pub use prometheus::PrometheusHttpFallback;
-pub use victoriametrics::VictoriaMetricsHttpFallback;
diff --git a/data_plane/src/drivers/query/fallback/prometheus.rs b/data_plane/src/drivers/query/fallback/prometheus.rs
deleted file mode 100644
index f32e5e8d9..000000000
--- a/data_plane/src/drivers/query/fallback/prometheus.rs
+++ /dev/null
@@ -1,318 +0,0 @@
-use super::{FallbackClient, FallbackResponse};
-use crate::drivers::query::adapters::{ParsedQueryRequest, ParsedRangeQueryRequest};
-use async_trait::async_trait;
-use axum::http::StatusCode;
-use reqwest::Client;
-use serde_json::Value;
-use tracing::{debug, error};
-
-/// Fallback client for Prometheus HTTP API
-pub struct PrometheusHttpFallback {
-    client: Client,
-    base_url: String,
-}
-
-impl PrometheusHttpFallback {
-    pub fn new(base_url: String) -> Self {
-        Self {
-            client: Client::new(),
-            base_url,
-        }
-    }
-
-    fn apply_headers(
-        mut request: reqwest::RequestBuilder,
-        headers: std::collections::HashMap<String, String>,
-    ) -> reqwest::RequestBuilder {
-        for (name, value) in headers {
-            request = request.header(name, value);
-        }
-        request
-    }
-}
-
-#[async_trait]
-impl FallbackClient for PrometheusHttpFallback {
-    async fn execute_query(
-        &self,
-        request: &ParsedQueryRequest,
-    ) -> Result<FallbackResponse, StatusCode> {
-        debug!("=== FORWARDING TO PROMETHEUS ===");
-        debug!(
-            "Forwarding query: '{}', time: {}",
-            request.query, request.time
-        );
-
-        // Build the full URL for the Prometheus endpoint
-        let full_url = format!("{}/api/v1/query", self.base_url.trim_end_matches('/'));
-
-        debug!("Full forwarding URL: {}", full_url);
-
-        // Prepare query parameters for forwarding
-        let mut query_params = vec![
-            ("query", request.query.clone()),
-            ("time", request.time.to_string()),
-        ];
-        if let Some(timeout) = &request.timeout {
-            query_params.push(("timeout", timeout.clone()));
-        }
-
-        debug!("Final query parameters for forwarding: {:?}", query_params);
-
-        // Forward the request to Prometheus
-        debug!("Sending request to Prometheus...");
-        match self
-            .client
-            .get(&full_url)
-            .query(&query_params)
-            .timeout(std::time::Duration::from_secs(30))
-            .send()
-            .await
-        {
-            Ok(response) => {
-                let status = response.status();
-                debug!("Received response from Prometheus, status: {}", status);
-                match response.json::<Value>().await {
-                    Ok(prometheus_response) => {
-                        debug!(
-                            "Successfully parsed Prometheus response: {:?}",
-                            prometheus_response
-                        );
-                        debug!("=== PROMETHEUS FORWARD SUCCESS ===");
-                        Ok(FallbackResponse::Json(prometheus_response))
-                    }
-                    Err(parse_err) => {
-                        error!("Failed to parse Prometheus response: {}", parse_err);
-                        debug!("=== PROMETHEUS FORWARD PARSE ERROR ===");
-
-                        use crate::drivers::query::adapters::PrometheusResponse;
-                        let error = PrometheusResponse::error(
-                            "internal",
-                            "Failed to parse Prometheus response",
-                        );
-                        Ok(FallbackResponse::Json(serde_json::to_value(error).unwrap()))
-                    }
-                }
-            }
-            Err(req_err) => {
-                error!("Failed to forward query to Prometheus: {}", req_err);
-                debug!("=== PROMETHEUS FORWARD REQUEST ERROR ===");
-
-                use crate::drivers::query::adapters::PrometheusResponse;
-                let error = PrometheusResponse::error(
-                    "internal",
-                    &format!("Failed to forward query to Prometheus: {}", req_err),
-                );
-                Ok(FallbackResponse::Json(serde_json::to_value(error).unwrap()))
-            }
-        }
-    }
-
-    async fn execute_query_with_headers(
-        &self,
-        request: &ParsedQueryRequest,
-        headers: std::collections::HashMap<String, String>,
-    ) -> Result<FallbackResponse, StatusCode> {
-        let full_url = format!("{}/api/v1/query", self.base_url.trim_end_matches('/'));
-        let mut query_params = vec![
-            ("query", request.query.clone()),
-            ("time", request.time.to_string()),
-        ];
-        if let Some(timeout) = &request.timeout {
-            query_params.push(("timeout", timeout.clone()));
-        }
-        let request = Self::apply_headers(self.client.get(full_url).query(&query_params), headers);
-        let response = match request
-            .timeout(std::time::Duration::from_secs(30))
-            .send()
-            .await
-        {
-            Ok(response) => response,
-            Err(error) => {
-                use crate::drivers::query::adapters::PrometheusResponse;
-                return Ok(FallbackResponse::Json(
-                    serde_json::to_value(PrometheusResponse::error(
-                        "internal",
-                        &format!("Failed to forward query to Prometheus: {error}"),
-                    ))
-                    .expect("Prometheus error response serializes"),
-                ));
-            }
-        };
-        let status = response.status();
-        let payload = match response.json::<Value>().await {
-            Ok(payload) => payload,
-            Err(_) => {
-                use crate::drivers::query::adapters::PrometheusResponse;
-                serde_json::to_value(PrometheusResponse::error(
-                    "internal",
-                    "Failed to parse Prometheus response",
-                ))
-                .expect("Prometheus error response serializes")
-            }
-        };
-        if !status.is_success() {
-            debug!(status = %status, "Prometheus instant fallback returned an error response");
-        }
-        Ok(FallbackResponse::Json(payload))
-    }
-
-    async fn execute_range_query(
-        &self,
-        request: &ParsedRangeQueryRequest,
-    ) -> Result<FallbackResponse, StatusCode> {
-        self.execute_range_query_with_headers(request, std::collections::HashMap::new())
-            .await
-    }
-
-    async fn execute_range_query_with_headers(
-        &self,
-        request: &ParsedRangeQueryRequest,
-        headers: std::collections::HashMap<String, String>,
-    ) -> Result<FallbackResponse, StatusCode> {
-        let full_url = format!("{}/api/v1/query_range", self.base_url.trim_end_matches('/'));
-        let mut query_params = vec![
-            ("query", request.query.clone()),
-            ("start", request.start.to_string()),
-            ("end", request.end.to_string()),
-            ("step", request.step.to_string()),
-        ];
-        if let Some(timeout) = &request.timeout {
-            query_params.push(("timeout", timeout.clone()));
-        }
-        let request = Self::apply_headers(self.client.get(full_url).query(&query_params), headers);
-        let response = request
-            .timeout(std::time::Duration::from_secs(30))
-            .send()
-            .await
-            .map_err(|_| StatusCode::BAD_GATEWAY)?;
-        let status = response.status();
-        let payload = response
-            .json::<Value>()
-            .await
-            .map_err(|_| StatusCode::BAD_GATEWAY)?;
-        if !status.is_success() {
-            debug!(status = %status, "Prometheus range fallback returned an error response");
-        }
-        Ok(FallbackResponse::Json(payload))
-    }
-
-    async fn get_runtime_info(&self) -> Result<Value, StatusCode> {
-        debug!("Fetching runtime info from Prometheus fallback");
-
-        // Build the runtime info URL
-        let url = format!(
-            "{}/api/v1/status/runtimeinfo",
-            self.base_url.trim_end_matches('/')
-        );
-
-        debug!("Runtime info URL: {}", url);
-
-        // Send request to Prometheus
-        match self
-            .client
-            .get(&url)
-            .timeout(std::time::Duration::from_secs(30))
-            .send()
-            .await
-        {
-            Ok(response) => {
-                match response.text().await {
-                    Ok(text) => {
-                        debug!("Prometheus runtime info response: {}", text);
-
-                        // Check for VictoriaMetrics unsupported path error
-                        if text.contains("unsupported path requested") {
-                            debug!("VictoriaMetrics detected - returning empty runtime info");
-                            return Ok(serde_json::json!({}));
-                        }
-
-                        // Try to parse as JSON
-                        match serde_json::from_str::<Value>(&text) {
-                            Ok(json) => {
-                                // Extract the data field if it exists (Prometheus format)
-                                if let Some(data) = json.get("data") {
-                                    Ok(data.clone())
-                                } else {
-                                    Ok(json)
-                                }
-                            }
-                            Err(e) => {
-                                error!("Failed to parse runtime info response: {}", e);
-                                Ok(serde_json::json!({}))
-                            }
-                        }
-                    }
-                    Err(e) => {
-                        error!("Failed to read runtime info response: {}", e);
-                        Ok(serde_json::json!({}))
-                    }
-                }
-            }
-            Err(e) => {
-                error!("Failed to fetch runtime info from Prometheus: {}", e);
-                Ok(serde_json::json!({}))
-            }
-        }
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use axum::{extract::Query, http::HeaderMap, routing::get, Json, Router};
-    use std::{collections::HashMap, sync::Arc};
-    use tokio::{net::TcpListener, sync::Mutex};
-
-    #[tokio::test]
-    async fn range_fallback_preserves_parameters_and_request_context() {
-        let captured = Arc::new(Mutex::new(None));
-        let handler_capture = Arc::clone(&captured);
-        let app = Router::new().route(
-            "/api/v1/query_range",
-            get(
-                move |Query(params): Query<HashMap<String, String>>, headers: HeaderMap| {
-                    let captured = Arc::clone(&handler_capture);
-                    async move {
-                        *captured.lock().await = Some((params, headers));
-                        Json(serde_json::json!({
-                            "status": "success",
-                            "data": {"resultType": "matrix", "result": []}
-                        }))
-                    }
-                },
-            ),
-        );
-        let listener = TcpListener::bind("127.0.0.1:0").await.unwrap();
-        let address = listener.local_addr().unwrap();
-        tokio::spawn(async move { axum::serve(listener, app).await.unwrap() });
-
-        let fallback = PrometheusHttpFallback::new(format!("http://{address}"));
-        let request = ParsedRangeQueryRequest {
-            query: "rate(requests_total[1m])".into(),
-            start: 100.25,
-            end: 200.75,
-            step: 15.5,
-            timeout: Some("7s".into()),
-        };
-        fallback
-            .execute_range_query_with_headers(
-                &request,
-                HashMap::from([
-                    ("authorization".into(), "Bearer secret".into()),
-                    ("x-scope-orgid".into(), "tenant-a".into()),
-                ]),
-            )
-            .await
-            .unwrap();
-
-        let (params, headers) = captured.lock().await.take().unwrap();
-        assert_eq!(params.get("query"), Some(&request.query));
-        assert_eq!(params.get("start").map(String::as_str), Some("100.25"));
-        assert_eq!(params.get("end").map(String::as_str), Some("200.75"));
-        assert_eq!(params.get("step").map(String::as_str), Some("15.5"));
-        assert_eq!(params.get("timeout").map(String::as_str), Some("7s"));
-        assert_eq!(headers["authorization"], "Bearer secret");
-        assert_eq!(headers["x-scope-orgid"], "tenant-a");
-    }
-}
diff --git a/data_plane/src/drivers/query/fallback/victoriametrics.rs b/data_plane/src/drivers/query/fallback/victoriametrics.rs
deleted file mode 100644
index 6f0f55de7..000000000
--- a/data_plane/src/drivers/query/fallback/victoriametrics.rs
+++ /dev/null
@@ -1,238 +0,0 @@
-use super::{FallbackClient, FallbackResponse};
-use crate::drivers::query::adapters::{ParsedQueryRequest, ParsedRangeQueryRequest};
-use async_trait::async_trait;
-use axum::http::StatusCode;
-use std::collections::HashMap;
-
-/// Exact MetricsQL backend. VictoriaMetrics' query API is wire-compatible with
-/// Prometheus, so transport is shared while this type keeps backend selection
-/// independent from the Prometheus listener.
-pub struct VictoriaMetricsHttpFallback {
-    client: reqwest::Client,
-    base_url: String,
-}
-
-impl VictoriaMetricsHttpFallback {
-    pub fn new(base_url: String) -> Self {
-        Self {
-            client: reqwest::Client::new(),
-            base_url,
-        }
-    }
-
-    fn endpoint(&self, tenant: Option<&str>, range: bool) -> String {
-        let suffix = if range { "query_range" } else { "query" };
-        match tenant {
-            Some(tenant) => format!(
-                "{}/select/{tenant}/prometheus/api/v1/{suffix}",
-                self.base_url.trim_end_matches('/')
-            ),
-            None => format!("{}/api/v1/{suffix}", self.base_url.trim_end_matches('/')),
-        }
-    }
-
-    async fn send(
-        &self,
-        endpoint: String,
-        params: Vec<(&str, String)>,
-        mut headers: HashMap<String, String>,
-    ) -> Result<FallbackResponse, StatusCode> {
-        headers.remove("x-asap-tenant");
-        let mut request = self.client.get(endpoint).query(&params);
-        for (name, value) in headers {
-            request = request.header(name, value);
-        }
-        let response = request
-            .timeout(std::time::Duration::from_secs(30))
-            .send()
-            .await
-            .map_err(|_| StatusCode::BAD_GATEWAY)?;
-        let status = StatusCode::from_u16(response.status().as_u16())
-            .map_err(|_| StatusCode::BAD_GATEWAY)?;
-        let mut response_headers = axum::http::HeaderMap::new();
-        for name in ["content-type", "cache-control", "warning", "retry-after"] {
-            if let Some(value) = response.headers().get(name) {
-                if let Ok(value) = axum::http::HeaderValue::from_bytes(value.as_bytes()) {
-                    response_headers.insert(
-                        axum::http::HeaderName::from_bytes(name.as_bytes()).unwrap(),
-                        value,
-                    );
-                }
-            }
-        }
-        let body = response
-            .bytes()
-            .await
-            .map_err(|_| StatusCode::BAD_GATEWAY)?;
-        Ok(FallbackResponse::Forwarded {
-            status,
-            headers: response_headers,
-            body,
-        })
-    }
-}
-
-#[async_trait]
-impl FallbackClient for VictoriaMetricsHttpFallback {
-    async fn execute_query(
-        &self,
-        request: &ParsedQueryRequest,
-    ) -> Result<FallbackResponse, StatusCode> {
-        self.execute_query_with_headers(request, HashMap::new())
-            .await
-    }
-    async fn execute_query_with_headers(
-        &self,
-        request: &ParsedQueryRequest,
-        headers: HashMap<String, String>,
-    ) -> Result<FallbackResponse, StatusCode> {
-        let tenant = headers.get("x-asap-tenant").cloned();
-        let mut params = vec![
-            ("query", request.query.clone()),
-            ("time", request.time.to_string()),
-        ];
-        if let Some(timeout) = &request.timeout {
-            params.push(("timeout", timeout.clone()));
-        }
-        self.send(self.endpoint(tenant.as_deref(), false), params, headers)
-            .await
-    }
-    async fn execute_range_query(
-        &self,
-        request: &ParsedRangeQueryRequest,
-    ) -> Result<FallbackResponse, StatusCode> {
-        self.execute_range_query_with_headers(request, HashMap::new())
-            .await
-    }
-    async fn execute_range_query_with_headers(
-        &self,
-        request: &ParsedRangeQueryRequest,
-        headers: HashMap<String, String>,
-    ) -> Result<FallbackResponse, StatusCode> {
-        let tenant = headers.get("x-asap-tenant").cloned();
-        let mut params = vec![
-            ("query", request.query.clone()),
-            ("start", request.start.to_string()),
-            ("end", request.end.to_string()),
-            ("step", request.step.to_string()),
-        ];
-        if let Some(timeout) = &request.timeout {
-            params.push(("timeout", timeout.clone()));
-        }
-        self.send(self.endpoint(tenant.as_deref(), true), params, headers)
-            .await
-    }
-    async fn get_runtime_info(&self) -> Result<serde_json::Value, StatusCode> {
-        Ok(serde_json::json!({}))
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use axum::{extract::Query, response::IntoResponse, routing::get, Json, Router};
-
-    #[tokio::test]
-    async fn exact_fallback_preserves_metricsql_expression() {
-        let app = Router::new().route(
-            "/api/v1/query",
-            get(|Query(params): Query<HashMap<String, String>>| async move {
-                Json(serde_json::json!({
-                    "status": "success",
-                    "data": {"received": params["query"]}
-                }))
-            }),
-        );
-        let listener = tokio::net::TcpListener::bind("127.0.0.1:0").await.unwrap();
-        let address = listener.local_addr().unwrap();
-        tokio::spawn(async move { axum::serve(listener, app).await.unwrap() });
-
-        let client = VictoriaMetricsHttpFallback::new(format!("http://{address}"));
-        let response = client
-            .execute_query(&ParsedQueryRequest {
-                query: "rate(requests[5m]) keep_metric_names".into(),
-                time: 1_700_000_000.0,
-                timeout: Some("5s".into()),
-            })
-            .await
-            .unwrap();
-        let FallbackResponse::Forwarded { status, body, .. } = response else {
-            panic!("VictoriaMetrics fallback must forward the upstream response")
-        };
-        assert_eq!(status, StatusCode::OK);
-        let payload: serde_json::Value = serde_json::from_slice(&body).unwrap();
-        assert_eq!(
-            payload["data"]["received"],
-            "rate(requests[5m]) keep_metric_names"
-        );
-    }
-
-    #[tokio::test]
-    async fn cluster_fallback_uses_tenant_prefixed_path() {
-        let app = Router::new().route(
-            "/select/42/prometheus/api/v1/query_range",
-            get(|Query(params): Query<HashMap<String, String>>| async move {
-                Json(serde_json::json!({
-                    "status": "success",
-                    "data": {"received": params["query"]}
-                }))
-            }),
-        );
-        let listener = tokio::net::TcpListener::bind("127.0.0.1:0").await.unwrap();
-        let address = listener.local_addr().unwrap();
-        tokio::spawn(async move { axum::serve(listener, app).await.unwrap() });
-
-        let client = VictoriaMetricsHttpFallback::new(format!("http://{address}"));
-        let response = client
-            .execute_range_query_with_headers(
-                &ParsedRangeQueryRequest {
-                    query: "sum(rate(requests[5m]))".into(),
-                    start: 1.0,
-                    end: 2.0,
-                    step: 1.0,
-                    timeout: None,
-                },
-                HashMap::from([("x-asap-tenant".into(), "42".into())]),
-            )
-            .await
-            .unwrap();
-        let FallbackResponse::Forwarded { status, body, .. } = response else {
-            panic!("VictoriaMetrics cluster fallback must forward the upstream response")
-        };
-        assert_eq!(status, StatusCode::OK);
-        let payload: serde_json::Value = serde_json::from_slice(&body).unwrap();
-        assert_eq!(payload["data"]["received"], "sum(rate(requests[5m]))");
-    }
-
-    #[tokio::test]
-    async fn cluster_fallback_preserves_upstream_status_and_protocol_headers() {
-        let app = Router::new().route(
-            "/select/42/prometheus/api/v1/query",
-            get(|| async {
-                (
-                    StatusCode::UNPROCESSABLE_ENTITY,
-                    [("content-type", "application/json"), ("retry-after", "7")],
-                    r#"{"status":"error","error":"bad MetricsQL"}"#,
-                )
-            }),
-        );
-        let listener = tokio::net::TcpListener::bind("127.0.0.1:0").await.unwrap();
-        let address = listener.local_addr().unwrap();
-        tokio::spawn(async move { axum::serve(listener, app).await.unwrap() });
-        let response = VictoriaMetricsHttpFallback::new(format!("http://{address}"))
-            .execute_query_with_headers(
-                &ParsedQueryRequest {
-                    query: "invalid".into(),
-                    time: 1.0,
-                    timeout: None,
-                },
-                HashMap::from([("x-asap-tenant".into(), "42".into())]),
-            )
-            .await
-            .unwrap()
-            .into_response();
-        assert_eq!(response.status(), StatusCode::UNPROCESSABLE_ENTITY);
-        assert_eq!(response.headers()["retry-after"], "7");
-        assert_eq!(response.headers()["x-asap-execution"], "exact_fallback");
-    }
-}
diff --git a/data_plane/src/drivers/query/mod.rs b/data_plane/src/drivers/query/mod.rs
deleted file mode 100644
index 04f96ea91..000000000
--- a/data_plane/src/drivers/query/mod.rs
+++ /dev/null
@@ -1,8 +0,0 @@
-pub mod adapters;
-pub mod fallback;
-pub mod servers;
-
-// Re-export commonly used types for convenience
-pub use adapters::{AdapterConfig, HttpProtocolAdapter};
-pub use fallback::FallbackClient;
-pub use servers::{HttpServer, HttpServerConfig};
diff --git a/data_plane/src/drivers/query/servers/http.rs b/data_plane/src/drivers/query/servers/http.rs
deleted file mode 100644
index c48391baa..000000000
--- a/data_plane/src/drivers/query/servers/http.rs
+++ /dev/null
@@ -1,6701 +0,0 @@
-use crate::drivers::query::adapters::{ParsedQueryRequest, ParsedRangeQueryRequest};
-use axum::{
-    body::Bytes,
-    extract::{DefaultBodyLimit, Form, Path, Query, State},
-    http::{HeaderMap, StatusCode},
-    response::{IntoResponse, Json, Response},
-    routing::{get, post},
-    Router,
-};
-use serde_json::Value;
-use std::collections::HashMap;
-use std::sync::Arc;
-use std::time::{Duration, Instant};
-use tokio::net::TcpListener;
-use tracing::{debug, info, warn};
-
-use crate::drivers::query::adapters::{AdapterConfig, HttpProtocolAdapter, PrometheusHttpAdapter};
-use crate::drivers::query::servers::metrics as srv_metrics;
-use crate::query_engines::routing::{
-    AccuracyTarget, EngineRouter, EngineRouterError, FreshnessProbeCache, QueryEngine,
-};
-use crate::query_engines::ASAPQueryEngine;
-use crate::storage_engines::types::StorageBackend;
-use asap_types::Statistic;
-
-/// Per-query engine override header (Phase-6 accuracy reducer).
-///
-/// When the client sets `X-ASAP-Engine: <data_source_id>` (or the
-/// equivalent `?engine=<data_source_id>` query param), the HTTP layer
-/// bypasses the per-metric `BackendStorageRouting` lookup and dispatches
-/// the PromQL string straight to the named engine. Used by the
-/// `accuracy_reduce.py` reducer to select a registered query engine.
-///
-/// Recognised values match `StorageBackend::data_source_id()` —
-/// `asap_query`, `double_write`, `prometheus_remote`. An unknown
-/// value returns 400.
-pub const ENGINE_OVERRIDE_HEADER: &str = "X-ASAP-Engine";
-pub const ENGINE_OVERRIDE_QUERY_PARAM: &str = "engine";
-/// Per-request accuracy contract. `exact` forwards to the configured exact
-/// backend; `approximate` (the default) tries ASAP execution first.
-pub const ACCURACY_HEADER: &str = "X-ASAP-Accuracy";
-
-fn extract_accuracy(headers: &HeaderMap) -> Result<AccuracyTarget, String> {
-    let Some(value) = headers.get(ACCURACY_HEADER) else {
-        return Ok(AccuracyTarget::Epsilon(0.01));
-    };
-    let value = value
-        .to_str()
-        .map_err(|_| format!("{ACCURACY_HEADER} must be valid UTF-8"))?
-        .trim();
-    if value.eq_ignore_ascii_case("exact") {
-        Ok(AccuracyTarget::Exact)
-    } else if value.eq_ignore_ascii_case("approximate") {
-        Ok(AccuracyTarget::Epsilon(0.01))
-    } else {
-        Err(format!(
-            "invalid {ACCURACY_HEADER} value {value:?}; expected `exact` or `approximate`"
-        ))
-    }
-}
-
-fn invalid_accuracy_response(error: String) -> Response {
-    (
-        StatusCode::BAD_REQUEST,
-        Json(serde_json::json!({
-            "status": "error",
-            "errorType": "bad_data",
-            "error": error,
-        })),
-    )
-        .into_response()
-}
-
-/// Per-request tenant header (per-tenant `BackendStorageRouting`,
-/// follow-up to PR #333).
-///
-/// Multi-tenant deployments scope the per-metric routing table per
-/// tenant. The HTTP query handler reads this header on every
-/// request, snapshots that tenant's table off
-/// `HotReloadBackendStorageRouting`, and falls back to the
-/// `default` tenant's table when the header is missing or the
-/// requested tenant has no entry. Sketch state is still global —
-/// only routing is tenant-scoped.
-///
-/// **MVP scope:** the header is unauthenticated. Anyone can pick any
-/// tenant by setting it. Tenant-aware AUTH is deferred to a follow-up
-/// before any multi-tenant deploy is considered production-ready.
-pub const TENANT_HEADER: &str = "X-ASAP-Tenant";
-
-/// Extract the tenant id from the per-request `X-ASAP-Tenant`
-/// header, or fall back to [`crate::query_engines::routing::DEFAULT_TENANT`] when
-/// the header is missing / empty / not valid UTF-8. Used by the
-/// instant-query and range-query handlers to scope per-tenant
-/// routing-table lookup.
-fn extract_tenant(headers: &axum::http::HeaderMap) -> String {
-    headers
-        .get(TENANT_HEADER)
-        .and_then(|v| v.to_str().ok())
-        .map(|s| s.trim().to_string())
-        .filter(|s| !s.is_empty())
-        .unwrap_or_else(|| crate::query_engines::routing::DEFAULT_TENANT.to_string())
-}
-
-/// Copy only request context that is safe and meaningful for the configured
-/// Prometheus fallback. Hop-by-hop and client-controlled transport headers are
-/// intentionally excluded.
-fn extract_fallback_headers(headers: &HeaderMap) -> HashMap<String, String> {
-    const FORWARDED: [&str; 3] = ["authorization", "x-scope-orgid", "x-asap-tenant"];
-    FORWARDED
-        .into_iter()
-        .filter_map(|name| {
-            headers
-                .get(name)
-                .and_then(|value| value.to_str().ok())
-                .map(|value| (name.to_string(), value.to_string()))
-        })
-        .collect()
-}
-
-#[derive(Debug, Clone)]
-pub struct HttpServerConfig {
-    pub port: u16,
-    pub handle_http_requests: bool,
-    pub adapter_config: AdapterConfig,
-}
-
-#[derive(Clone)]
-pub struct HttpServer {
-    config: HttpServerConfig,
-    adapter_override: Option<Arc<dyn HttpProtocolAdapter>>,
-    query_engine: Arc<ASAPQueryEngine>,
-    /// Phase-5/6 capability router. Built from `query_engine` at
-    /// construction time (`ASAPQueryEngine` registered as the ASAP-tier
-    /// `QueryEngine`) and extended via [`Self::with_query_engine`] —
-    /// e.g. to plug in a `GorillaQueryEngine` for the cold archive
-    /// tier. Instant-query dispatch consults this for metrics whose
-    /// `InstalledPrecomputePlan::storage_backend()` is anything other than
-    /// `SketchStore`; ASAP-tier queries still take the direct
-    /// `ASAPQueryEngine::handle_query` path so they keep the
-    /// `KeyByLabelNames` Prometheus needs to populate the `metric`
-    /// map. See `docs/design-gorilla-s3-cold-engine.md` §8.
-    query_router: Arc<EngineRouter>,
-    /// Sketch storage for runtime diagnostics.
-    summary_store: Arc<crate::storage_engines::sketch_db::index::SketchStore>,
-    /// Hot-reloadable `InstalledPrecomputePlan` source. `None` when hot-reload
-    /// is not wired up by the caller (unit tests, legacy binaries).
-    hot_reload_config: Option<crate::storage_engines::types::InstalledPrecomputePlanHandle>,
-    /// Per-metric storage-backend routing table consulted by the HTTP
-    /// instant-query handler at request time. When `Some(..)` and the
-    /// query parses, the handler extracts the metric name from the
-    /// PromQL AST, consults this table, and dispatches through
-    /// `EngineRouter` for any per-metric override. When `None` the
-    /// handler falls back to the pre-Phase-5 behaviour of consulting
-    /// the streaming-config's single `storage_backend()` axis (which
-    /// itself defaults to `SketchStore`). Wired by the binary via
-    /// [`Self::with_backend_storage_routing`]; production deploys
-    /// bootstrap from `deploy/configs/backend-storage-routing.yaml`
-    /// (legacy form) or the control plane's first
-    /// `POST /api/v1/storage_routing` push.
-    ///
-    /// `HotReloadBackendStorageRouting` is an atomic routing snapshot
-    /// — an `ArcSwap`-backed wrapper that supports atomic at-runtime
-    /// swap from the `POST /api/v1/storage_routing` endpoint. The
-    /// existing read path snapshots the wrapper once per request
-    /// (`handle.snapshot().lookup_with_shape(...)`); swap is observed
-    /// by the next request without restart.
-    backend_storage_routing: Option<crate::query_engines::routing::HotReloadBackendStorageRouting>,
-    /// Backfill registry shared with the worker and HTTP job endpoints.
-    backfill: Option<Arc<crate::storage_engines::sketch_db::BackfillRegistry>>,
-    /// SketchStore data-retention horizon in millis, mirroring
-    /// `--persistence-delete-older-than-secs` at the CLI. Used by the
-    /// `POST /api/v1/db/backfill` handler to gate job creation via
-    /// `BackfillRegistry::create_checked` (§10.5 Method B). `None`
-    /// disables the retention precheck — the handler still enforces
-    /// the §10.5 time-disjoint invariant.
-    data_retention_ms: Option<u64>,
-    /// Freshness-probe last-value cache (issue #46 ⑥). When `Some`,
-    /// the query handler intercepts
-    /// `last_over_time(<probe>[<range>])` for probe-shaped metric
-    /// names and answers from RAM. The same cache is fed by the OTLP
-    /// receiver — see `OtlpReceiver::with_probe_cache`. `None`
-    /// disables the short-circuit; the dispatch falls through to the
-    /// normal routing-table path, which observes the warm tier's
-    /// 60–90 s flush gap.
-    probe_cache: Option<Arc<FreshnessProbeCache>>,
-    /// Serializes multi-document physical-plan publication so two control
-    /// plane generations cannot interleave their plan projections and catalog.
-    physical_plan_lock: Arc<tokio::sync::Mutex<()>>,
-    active_physical_plan: Option<crate::storage_engines::types::ActivePhysicalPlanHandle>,
-    physical_plan_lifecycle: Option<crate::storage_engines::types::PhysicalPlanLifecycle>,
-    remote_write: Option<crate::drivers::ingest::PrometheusRemoteWriteReceiver>,
-}
-
-#[derive(Clone)]
-struct AppState {
-    config: HttpServerConfig,
-    query_engine: Arc<ASAPQueryEngine>,
-    /// See [`HttpServer::query_router`].
-    query_router: Arc<EngineRouter>,
-    /// Attach sketch storage for HTTP runtime diagnostics.
-    summary_store: Arc<crate::storage_engines::sketch_db::index::SketchStore>,
-    adapter: Arc<dyn HttpProtocolAdapter>,
-    fallback: Option<Arc<dyn crate::drivers::query::fallback::FallbackClient>>,
-    hot_reload_config: Option<crate::storage_engines::types::InstalledPrecomputePlanHandle>,
-    /// See [`HttpServer::backend_storage_routing`].
-    backend_storage_routing: Option<crate::query_engines::routing::HotReloadBackendStorageRouting>,
-    /// Backfill registry (sketch DB §10). See `HttpServer::backfill`.
-    backfill: Option<Arc<crate::storage_engines::sketch_db::BackfillRegistry>>,
-    /// See `HttpServer::data_retention_ms`.
-    data_retention_ms: Option<u64>,
-    /// See [`HttpServer::probe_cache`].
-    probe_cache: Option<Arc<FreshnessProbeCache>>,
-    physical_plan_lock: Arc<tokio::sync::Mutex<()>>,
-    active_physical_plan: Option<crate::storage_engines::types::ActivePhysicalPlanHandle>,
-    physical_plan_lifecycle: Option<crate::storage_engines::types::PhysicalPlanLifecycle>,
-    remote_write: Option<crate::drivers::ingest::PrometheusRemoteWriteReceiver>,
-}
-
-impl HttpServer {
-    pub fn new(
-        config: HttpServerConfig,
-        query_engine: Arc<ASAPQueryEngine>,
-        summary_store: Arc<crate::storage_engines::sketch_db::index::SketchStore>,
-    ) -> Self {
-        // Bootstrap the capability router with `ASAPQueryEngine`
-        // registered under its canonical query-engine id.
-        let mut router = EngineRouter::new();
-        router.register(query_engine.clone() as Arc<dyn QueryEngine>);
-        let query_router = Arc::new(router);
-        Self {
-            config,
-            adapter_override: None,
-            query_engine,
-            query_router,
-            summary_store,
-            hot_reload_config: None,
-            backend_storage_routing: None,
-            backfill: None,
-            data_retention_ms: None,
-            probe_cache: None,
-            physical_plan_lock: Arc::new(tokio::sync::Mutex::new(())),
-            active_physical_plan: None,
-            physical_plan_lifecycle: None,
-            remote_write: None,
-        }
-    }
-
-    /// Use a language-specific protocol adapter without extending the shared
-    /// protocol enum. This keeps VictoriaMetrics transport policy at its own
-    /// listener boundary.
-    pub fn with_protocol_adapter(mut self, adapter: Arc<dyn HttpProtocolAdapter>) -> Self {
-        self.adapter_override = Some(adapter);
-        self
-    }
-
-    /// Clone the fully configured query service onto another query listener.
-    pub fn with_query_listener(mut self, port: u16, adapter_config: AdapterConfig) -> Self {
-        self.config.port = port;
-        self.config.adapter_config = adapter_config;
-        self.remote_write = None;
-        self
-    }
-
-    /// Enable Prometheus Remote Write v1 on the same public HTTP listener.
-    pub fn with_remote_write(
-        mut self,
-        receiver: crate::drivers::ingest::PrometheusRemoteWriteReceiver,
-    ) -> Self {
-        self.remote_write = Some(receiver);
-        self
-    }
-
-    #[cfg(test)]
-    /// Plug an additional [`QueryEngine`] into the capability router.
-    /// Used by the binary to register `GorillaQueryEngine` (cold
-    /// archive) alongside the `ASAPQueryEngine` registered by `new`.
-    /// Engines are keyed by their `data_source_id`; calling this with
-    /// an engine whose id collides with an already-registered one
-    /// replaces the previous registration (matches `EngineRouter`'s
-    /// hot-swap contract).
-    pub fn with_query_engine(mut self, engine: Arc<dyn QueryEngine>) -> Self {
-        // The router stored here is the canonical one — callers always
-        // hold an `Arc<EngineRouter>`, so we rebuild from a fresh
-        // `EngineRouter::clone()` (cheap; the `engines` map clones the
-        // inner `Arc`s, not the engines themselves).
-        let mut router: EngineRouter = (*self.query_router).clone();
-        router.register(engine);
-        self.query_router = Arc::new(router);
-        self
-    }
-
-    /// Attach the precompute projection used by installed-plan consumers.
-    /// Computation changes are published through the complete physical plan.
-    pub fn with_hot_reload_config(
-        mut self,
-        handle: crate::storage_engines::types::InstalledPrecomputePlanHandle,
-    ) -> Self {
-        self.hot_reload_config = Some(handle);
-        self
-    }
-
-    pub fn with_active_physical_plan(
-        mut self,
-        handle: crate::storage_engines::types::ActivePhysicalPlanHandle,
-    ) -> Self {
-        self.physical_plan_lifecycle = Some(
-            crate::storage_engines::types::PhysicalPlanLifecycle::new(handle.clone()),
-        );
-        self.active_physical_plan = Some(handle);
-        self
-    }
-
-    /// Attach a per-metric storage-backend routing table. The table is
-    /// wrapped in a hot-reload handle internally so the
-    /// `POST /api/v1/storage_routing` endpoint can swap it
-    /// atomically without restart.
-    ///
-    /// Bootstrap typically comes from
-    /// `BackendStorageRouting::from_yaml_file(...)` for legacy / dev
-    /// deploys, or from `BackendStorageRouting::empty()` when the
-    /// control plane will push the first table — the control plane's first
-    /// `POST /api/v1/storage_routing` then fills in all the entries.
-    ///
-    /// When the wrapper is attached, every instant query consults the
-    /// snapshot (after extracting the metric name from the PromQL AST)
-    /// and dispatches through `EngineRouter` for any per-metric
-    /// override. Without the wrapper the handler falls back to the
-    /// pre-Phase-5 single-axis behaviour driven by
-    /// `InstalledPrecomputePlan::storage_backend()`.
-    pub fn with_backend_storage_routing(
-        mut self,
-        routing: Arc<crate::storage_engines::types::BackendStorageRouting>,
-    ) -> Self {
-        self.backend_storage_routing =
-            Some(crate::query_engines::routing::HotReloadBackendStorageRouting::from_arc(routing));
-        self
-    }
-
-    /// Attach a pre-built hot-reload routing handle.
-    /// Used by callers that want to share the same handle with other
-    /// subsystems (e.g. the query-router for diagnostics) — the
-    /// `with_backend_storage_routing` builder is the simpler entry
-    /// point that wraps an `Arc<BackendStorageRouting>` for callers
-    /// that don't.
-    pub fn with_hot_reload_backend_storage_routing(
-        mut self,
-        handle: crate::query_engines::routing::HotReloadBackendStorageRouting,
-    ) -> Self {
-        self.backend_storage_routing = Some(handle);
-        self
-    }
-
-    /// Attach a `BackfillRegistry` so the `/api/v1/db/backfill`
-    /// HTTP endpoints can create and inspect jobs. Jobs
-    /// remain `Queued` unless a backfill worker is enabled.
-    pub fn with_backfill_registry(
-        mut self,
-        registry: Arc<crate::storage_engines::sketch_db::BackfillRegistry>,
-    ) -> Self {
-        self.backfill = Some(registry);
-        self
-    }
-
-    /// Declare the SketchStore data-retention horizon (the value of
-    /// `--persistence-delete-older-than-secs` * 1000). When set, the
-    /// `POST /api/v1/db/backfill` handler runs `create_checked` with
-    /// this bound, so jobs that would write windows older than the
-    /// retention horizon are rejected up-front instead of being
-    /// silently evicted right after write (§10.5 Method B).
-    pub fn with_data_retention_ms(mut self, data_retention_ms: u64) -> Self {
-        self.data_retention_ms = Some(data_retention_ms);
-        self
-    }
-
-    /// Attach a [`FreshnessProbeCache`] so the HTTP query handler
-    /// answers `last_over_time(<probe>[<range>])` from RAM. The same
-    /// `Arc` should be handed to the OTLP receiver via
-    /// `OtlpReceiver::with_probe_cache` so writes and reads see the
-    /// same cache state. Without this call, probe queries fall
-    /// through to the cold archive — fine for queries with a
-    /// generous lookback (≥1m) but produces an empty result for the
-    /// MVP demo's 10 s window. See issue #46 ⑥ for the failure
-    /// mode.
-    pub fn with_probe_cache(mut self, cache: Arc<FreshnessProbeCache>) -> Self {
-        self.probe_cache = Some(cache);
-        self
-    }
-
-    pub async fn run(self) -> Result<(), Box<dyn std::error::Error + Send + Sync>> {
-        srv_metrics::register_all();
-
-        let adapter = self.adapter_override.clone().unwrap_or_else(|| {
-            Arc::new(PrometheusHttpAdapter::new(
-                self.config.adapter_config.clone(),
-            ))
-        });
-
-        let query_endpoint = adapter.get_query_endpoint();
-        let runtime_info_path = adapter.get_runtime_info_path();
-        info!(
-            "Adapter '{}' configured for endpoint: {}",
-            adapter.adapter_name(),
-            query_endpoint
-        );
-        info!("Runtime info endpoint: {}", runtime_info_path);
-
-        let request_body_limit = self
-            .remote_write
-            .as_ref()
-            .map(|receiver| receiver.config().max_compressed_bytes)
-            .unwrap_or(2 * 1024 * 1024);
-        let app_state = AppState {
-            config: self.config.clone(),
-            query_engine: self.query_engine,
-            query_router: self.query_router,
-            summary_store: self.summary_store,
-            adapter: adapter.clone(),
-            fallback: self.config.adapter_config.fallback.clone(),
-            hot_reload_config: self.hot_reload_config.clone(),
-            backend_storage_routing: self.backend_storage_routing.clone(),
-            backfill: self.backfill.clone(),
-            data_retention_ms: self.data_retention_ms,
-            probe_cache: self.probe_cache.clone(),
-            physical_plan_lock: self.physical_plan_lock.clone(),
-            active_physical_plan: self.active_physical_plan.clone(),
-            physical_plan_lifecycle: self.physical_plan_lifecycle.clone(),
-            remote_write: self.remote_write.clone(),
-        };
-
-        let range_query_endpoint = adapter.get_range_query_endpoint();
-
-        let app = Router::new()
-            .route(query_endpoint, get(handle_instant_query))
-            .route(query_endpoint, post(handle_instant_query_post))
-            .route(range_query_endpoint, get(handle_range_query))
-            .route(range_query_endpoint, post(handle_range_query_post))
-            .route(runtime_info_path, get(handle_runtime_info))
-            .route(runtime_info_path, post(handle_runtime_info))
-            .route("/metrics", get(handle_metrics))
-            .route("/api/v1/health", get(handle_health))
-            .route(
-                "/api/v1/write",
-                post(handle_prometheus_remote_write)
-                    .layer(DefaultBodyLimit::max(request_body_limit)),
-            )
-            .route("/api/v1/store/metrics", get(handle_store_metrics))
-            .route("/api/v1/precompute/drain", post(handle_precompute_drain))
-            .route("/api/v1/physical-plan", post(handle_post_physical_plan))
-            .route(
-                "/api/v1/physical-plan/discard",
-                post(handle_discard_physical_plan),
-            )
-            .route(
-                "/api/v1/physical-plan/activate",
-                post(handle_activate_physical_plan),
-            )
-            .route(
-                "/api/v1/physical-plan/status",
-                get(handle_physical_plan_status),
-            )
-            .route("/api/v1/summary-inventory", get(handle_summary_inventory))
-            // control-plane-pushed `BackendStorageRouting`
-            // table. POST replaces the current table atomically; GET
-            // returns a JSON snapshot for operator diagnostics.
-            .route(
-                "/api/v1/storage_routing",
-                get(handle_get_storage_routing).post(handle_post_storage_routing),
-            )
-            .route("/api/v1/db/schemas", get(handle_get_schemas))
-            .route(
-                "/api/v1/db/schemas/:sid/retire",
-                post(handle_post_schema_retire),
-            )
-            .route(
-                "/api/v1/db/schemas/:sid/expire",
-                post(handle_post_schema_expire),
-            )
-            .route("/api/v1/db/timeline", get(handle_get_timeline))
-            .route("/api/v1/db/backfill", post(handle_post_backfill_job))
-            .route("/api/v1/db/backfill/jobs", get(handle_get_backfill_jobs))
-            .route(
-                "/api/v1/db/backfill/jobs/:job_id",
-                get(handle_get_backfill_job).delete(handle_delete_backfill_job),
-            );
-        let app = if adapter.query_language() == asap_types::QueryLanguage::MetricsQl {
-            app.route(
-                "/select/:tenant/prometheus/api/v1/query",
-                get(handle_vm_cluster_instant).post(handle_vm_cluster_instant_post),
-            )
-            .route(
-                "/select/:tenant/prometheus/api/v1/query_range",
-                get(handle_vm_cluster_range).post(handle_vm_cluster_range_post),
-            )
-        } else {
-            app
-        };
-        let app = app.with_state(app_state);
-
-        let listener = TcpListener::bind(format!("0.0.0.0:{}", self.config.port)).await?;
-        info!("HTTP server listening on port {}", self.config.port);
-
-        axum::serve(listener, app).await?;
-        Ok(())
-    }
-
-    /// Start server for testing on a random available port. Returns the
-    /// actual port number used.
-    ///
-    /// Intentionally not gated behind `#[cfg(test)]` — integration tests
-    /// under `data_plane/tests/` are compiled separately from the lib's
-    /// own unit tests and need this entry point. The name + doc-comment
-    /// make the testing intent explicit; production callers should use
-    /// the regular `start()` method.
-    pub async fn start_test_server(&self) -> Result<u16, Box<dyn std::error::Error + Send + Sync>> {
-        let adapter = self.adapter_override.clone().unwrap_or_else(|| {
-            Arc::new(PrometheusHttpAdapter::new(
-                self.config.adapter_config.clone(),
-            ))
-        });
-
-        let query_endpoint = adapter.get_query_endpoint();
-        let runtime_info_path = adapter.get_runtime_info_path();
-
-        let request_body_limit = self
-            .remote_write
-            .as_ref()
-            .map(|receiver| receiver.config().max_compressed_bytes)
-            .unwrap_or(2 * 1024 * 1024);
-        let app_state = AppState {
-            config: self.config.clone(),
-            query_engine: self.query_engine.clone(),
-            query_router: self.query_router.clone(),
-            summary_store: self.summary_store.clone(),
-            adapter: adapter.clone(),
-            fallback: self.config.adapter_config.fallback.clone(),
-            hot_reload_config: self.hot_reload_config.clone(),
-            backend_storage_routing: self.backend_storage_routing.clone(),
-            backfill: self.backfill.clone(),
-            data_retention_ms: self.data_retention_ms,
-            probe_cache: self.probe_cache.clone(),
-            physical_plan_lock: self.physical_plan_lock.clone(),
-            active_physical_plan: self.active_physical_plan.clone(),
-            physical_plan_lifecycle: self.physical_plan_lifecycle.clone(),
-            remote_write: self.remote_write.clone(),
-        };
-
-        let range_query_endpoint = adapter.get_range_query_endpoint();
-
-        let app = Router::new()
-            .route("/api/v1/precompute/drain", post(handle_precompute_drain))
-            .route(query_endpoint, get(handle_instant_query))
-            .route(query_endpoint, post(handle_instant_query_post))
-            .route(range_query_endpoint, get(handle_range_query))
-            .route(range_query_endpoint, post(handle_range_query_post))
-            .route(runtime_info_path, get(handle_runtime_info))
-            .route("/metrics", get(handle_metrics))
-            .route("/api/v1/health", get(handle_health))
-            .route(
-                "/api/v1/write",
-                post(handle_prometheus_remote_write)
-                    .layer(DefaultBodyLimit::max(request_body_limit)),
-            )
-            .route("/api/v1/physical-plan", post(handle_post_physical_plan))
-            .route(
-                "/api/v1/physical-plan/discard",
-                post(handle_discard_physical_plan),
-            )
-            .route(
-                "/api/v1/physical-plan/activate",
-                post(handle_activate_physical_plan),
-            )
-            .route(
-                "/api/v1/physical-plan/status",
-                get(handle_physical_plan_status),
-            )
-            .route("/api/v1/summary-inventory", get(handle_summary_inventory))
-            // control-plane-pushed `BackendStorageRouting`
-            // table. POST replaces the current table atomically; GET
-            // returns a JSON snapshot for operator diagnostics.
-            .route(
-                "/api/v1/storage_routing",
-                get(handle_get_storage_routing).post(handle_post_storage_routing),
-            )
-            .route("/api/v1/db/schemas", get(handle_get_schemas))
-            .route(
-                "/api/v1/db/schemas/:sid/retire",
-                post(handle_post_schema_retire),
-            )
-            .route(
-                "/api/v1/db/schemas/:sid/expire",
-                post(handle_post_schema_expire),
-            )
-            .route("/api/v1/db/timeline", get(handle_get_timeline))
-            .route("/api/v1/db/backfill", post(handle_post_backfill_job))
-            .route("/api/v1/db/backfill/jobs", get(handle_get_backfill_jobs))
-            .route(
-                "/api/v1/db/backfill/jobs/:job_id",
-                get(handle_get_backfill_job).delete(handle_delete_backfill_job),
-            );
-        let app = if adapter.query_language() == asap_types::QueryLanguage::MetricsQl {
-            app.route(
-                "/select/:tenant/prometheus/api/v1/query",
-                get(handle_vm_cluster_instant).post(handle_vm_cluster_instant_post),
-            )
-            .route(
-                "/select/:tenant/prometheus/api/v1/query_range",
-                get(handle_vm_cluster_range).post(handle_vm_cluster_range_post),
-            )
-        } else {
-            app
-        };
-        let app = app.with_state(app_state);
-
-        let listener = TcpListener::bind("127.0.0.1:0").await?;
-        let actual_port = listener.local_addr()?.port();
-
-        tokio::spawn(async move {
-            axum::serve(listener, app).await.unwrap();
-        });
-
-        // Give the server time to start
-        tokio::time::sleep(tokio::time::Duration::from_millis(100)).await;
-
-        Ok(actual_port)
-    }
-}
-
-/// Core query execution logic shared between GET and POST handlers.
-///
-/// `engine_override` (Phase-6 Fix 1): when `Some(data_source_id)` the
-/// per-metric `BackendStorageRouting` lookup is bypassed and the query
-/// is dispatched straight to the named engine. Set by the
-/// `X-ASAP-Engine` request header (POST) or the `?engine=` query
-/// parameter (GET / POST), both consumed at the handler boundary
-/// before the request reaches this function. Used by the accuracy
-/// reducer to query the same PromQL against warm sketch and Gorilla
-/// archive for cross-tier rel-err computation.
-async fn process_query_request(
-    state: &AppState,
-    parsed_request: &ParsedQueryRequest,
-    start_time: Instant,
-    headers: HashMap<String, String>,
-    engine_override: Option<String>,
-    accuracy: AccuracyTarget,
-    tenant: &str,
-) -> Response {
-    // Check if handling is enabled
-    if !state.config.handle_http_requests {
-        debug!("HTTP request handling is disabled");
-        if let Some(fallback) = &state.fallback {
-            debug!("Forwarding to fallback due to disabled handling");
-            return match fallback
-                .execute_query_with_headers(parsed_request, headers)
-                .await
-            {
-                Ok(response) => response.into_response(),
-                Err(status) => status.into_response(),
-            };
-        } else {
-            debug!("Returning error - both handling and forwarding disabled");
-            use crate::drivers::query::adapters::AdapterError;
-            return match state
-                .adapter
-                .format_error_response(&AdapterError::ProtocolError(
-                    "Query handling is disabled".to_string(),
-                ))
-                .await
-            {
-                Ok(json) => json.into_response(),
-                Err(status) => status.into_response(),
-            };
-        }
-    }
-
-    // Phase-6 Fix 1: per-query engine override.
-    //
-    // If the caller explicitly named an engine (via `X-ASAP-Engine`
-    // header or `?engine=` query param) bypass `BackendStorageRouting`
-    // and dispatch directly — the accuracy reducer uses this to pin one
-    // engine per replay row.
-    if let Some(override_id) = engine_override.as_deref() {
-        return process_via_named_engine(state, parsed_request, start_time, override_id).await;
-    }
-
-    let language_identity = state.adapter.canonical_plan_identity(&parsed_request.query);
-    if state.adapter.query_language() == asap_types::QueryLanguage::MetricsQl
-        && language_identity.is_err()
-    {
-        if let Some(fallback) = &state.fallback {
-            return match fallback
-                .execute_query_with_headers(parsed_request, headers)
-                .await
-            {
-                Ok(response) => response.into_response(),
-                Err(status) => status.into_response(),
-            };
-        }
-    }
-    if let Ok(Some(identity)) = language_identity {
-        let evaluation_ms = if parsed_request.time > 0.0 {
-            (parsed_request.time * 1_000.0) as u64
-        } else {
-            unix_time_ms()
-        };
-        if let Ok(query_result) = state
-            .query_engine
-            .execute_metricsql_at(&identity, evaluation_ms)
-            .await
-        {
-            let result = crate::drivers::query::adapters::QueryExecutionResult {
-                query_output_labels: asap_types::KeyByLabelNames::default(),
-                query_result,
-            };
-            return match state.adapter.format_success_response(&result).await {
-                Ok(response) => {
-                    annotate_data_source(response, StorageBackend::SketchStore.data_source_id())
-                        .await
-                }
-                Err(status) => status.into_response(),
-            };
-        }
-        if let Some(fallback) = &state.fallback {
-            return match fallback
-                .execute_query_with_headers(parsed_request, headers)
-                .await
-            {
-                Ok(response) => response.into_response(),
-                Err(status) => status.into_response(),
-            };
-        }
-    }
-
-    // Issue #46 ⑥ — freshness-probe short-circuit.
-    //
-    // The MVP demo's freshness criterion polls
-    // `last_over_time(http_freshness_probe_warm[10s])` at 10 Hz. The
-    // probe metric flows through the agent's
-    // `[gorillas3 → ddsketch → batch] → backend OTLP` pipeline; the
-    // cold tier's `gorillas3 → 60 s TSDB block → Thanos sync` path
-    // adds 60–90 s of flush latency, so a 10 s lookback against the
-    // cold archive returns an empty vector for the entire run
-    // (replay client logged `attempted=600 got=0`). The OTLP receiver
-    // captures the latest sample for every probe metric in
-    // [`AppState::probe_cache`]; here we intercept the matching query
-    // shape before it falls through to the routing table and answer
-    // from RAM with sub-second freshness. When the cache has no entry
-    // inside the lookback window the intercept returns `None` and
-    // dispatch falls through to the normal path — preserving the
-    // long-window queries (≥1m) that the cold archive still answers
-    // correctly.
-    if let Some(response) = try_answer_freshness_probe(state, parsed_request, start_time).await {
-        return response;
-    }
-
-    // Step 2: Pick a dispatch path based on the metric's pinned
-    // storage backend (Phase-5 capability routing).
-    //
-    // Routing precedence:
-    //   (a) Per-metric `BackendStorageRouting` table (loaded from
-    //       `backend-storage-routing.yaml` at startup). The PromQL
-    //       query is parsed; the metric name is extracted from the
-    //       AST and looked up in the table. This is the production
-    //       path the issue-46 MVP relies on so non-default metrics
-    //       actually route through the `EngineRouter`.
-    //   (b) Single-axis `InstalledPrecomputePlan::storage_backend()` from the
-    //       hot-reload config (the pre-Phase-5 fallback). Pre-control-plane
-    //       deploys ride this path; it always lands on `SketchStore`
-    //       unless the YAML was hand-patched.
-    //   (c) Default — `SketchStore`. Keeps the direct
-    //       `ASAPQueryEngine::handle_query` path so the response carries
-    //       the `KeyByLabelNames` the Prometheus adapter needs to
-    //       populate the `metric` map.
-    //
-    // For non-`SketchStore` axes the dispatch goes through the
-    // `EngineRouter`. Phase-6 (Gorilla MVP) returns a scalar with
-    // empty labels, so dropping `KeyByLabelNames` is acceptable; the
-    // response carries `accuracy` + `data_source` via the
-    // wire-extension annotations.
-    let metric_storage = resolve_metric_storage(state, &parsed_request.query, tenant);
-    debug!(
-        "Dispatch axis: metric_storage={:?} tenant={} (from backend-storage-routing: {}, hot-reload: {})",
-        metric_storage,
-        tenant,
-        state.backend_storage_routing.is_some(),
-        state.hot_reload_config.is_some(),
-    );
-
-    // `X-ASAP-Accuracy: exact` means "do not answer from the ε/δ-bounded
-    // sketches". Since #746 removed the archive tier there is no exact
-    // engine left in-process, so an exact request goes straight to the
-    // Prometheus fallback (or the adapter's unsupported-query response
-    // when no fallback is configured).
-    if matches!(accuracy, AccuracyTarget::Exact) {
-        debug!("Exact accuracy requested — bypassing the sketch tier");
-        return forward_instant_to_fallback(state, parsed_request, headers).await;
-    }
-
-    if matches!(metric_storage, StorageBackend::SketchStore) {
-        process_via_simple_engine(state, parsed_request, start_time, headers).await
-    } else {
-        process_via_router(state, parsed_request, start_time, metric_storage, headers).await
-    }
-}
-
-/// Range sibling of [`forward_instant_to_fallback`].
-async fn forward_range_to_fallback(
-    state: &AppState,
-    parsed_request: &ParsedRangeQueryRequest,
-    headers: HashMap<String, String>,
-) -> Response {
-    if let Some(fallback) = &state.fallback {
-        return match fallback
-            .execute_range_query_with_headers(parsed_request, headers)
-            .await
-        {
-            Ok(response) => response.into_response(),
-            Err(status) => status.into_response(),
-        };
-    }
-    match state.adapter.format_unsupported_query_response().await {
-        Ok(json) => json.into_response(),
-        Err(status) => status.into_response(),
-    }
-}
-
-/// Forward an instant query to the Prometheus fallback, or render the
-/// adapter's unsupported-query response when no fallback is configured.
-///
-/// The single exit for "the ASAP tier cannot serve this" since #746: an
-/// exact-accuracy request, or a router that ran out of compatible
-/// engines.
-async fn forward_instant_to_fallback(
-    state: &AppState,
-    parsed_request: &ParsedQueryRequest,
-    headers: HashMap<String, String>,
-) -> Response {
-    if let Some(fallback) = &state.fallback {
-        return match fallback
-            .execute_query_with_headers(parsed_request, headers)
-            .await
-        {
-            Ok(response) => response.into_response(),
-            Err(status) => status.into_response(),
-        };
-    }
-    match state.adapter.format_unsupported_query_response().await {
-        Ok(json) => json.into_response(),
-        Err(status) => status.into_response(),
-    }
-}
-
-/// Resolve the [`StorageBackend`] that should handle this query.
-///
-/// Routing precedence (see `process_query_request` for context):
-/// 1. Per-metric `BackendStorageRouting` table — parse the PromQL,
-///    pull the metric name out of the AST, look it up in the table.
-///    This is the path issue #46's MVP demo relies on.
-/// 2. Streaming-config single-axis fallback — preserves pre-Phase-5
-///    behaviour for deploys that haven't loaded a routing table.
-/// 3. Default `SketchStore`.
-///
-/// Parsing failures fall through to (2)/(3) so a malformed PromQL
-/// doesn't surface as a routing 5xx (the engines themselves will
-/// reject it with a clearer error).
-///
-/// v7: when the routing table has multi-target rows for the metric,
-/// the parsed AST is also classified via
-/// [`crate::storage_engines::types::classify_query_shape`] and the lookup picks
-/// the target whose `applies_to_query_shape` matches. v6.1
-/// single-target metrics keep their original semantics — every shape
-/// resolves to the one configured backend.
-fn resolve_metric_storage(state: &AppState, query: &str, tenant: &str) -> StorageBackend {
-    // A non-bootstrap atomic CompiledPhysicalPlan owns routing. Every request first
-    // enters the ASAP engine, where QueryPlan lookup either executes its
-    // compiler-bound DAG or returns an explicit fallback reason. Consulting
-    // the legacy shape/SID candidate heuristics here would bypass QueryPlan
-    // (and can also discard the request's explicit evaluation timestamp).
-    if state.active_physical_plan.as_ref().is_some_and(|active| {
-        let snapshot = active.active_snapshot();
-        snapshot.query_plan.plan_id != 0 && !snapshot.query_plan.entries.is_empty()
-    }) {
-        debug!(
-            tenant,
-            query, "resolve_metric_storage: active QueryPlan owns warm/fallback routing"
-        );
-        return StorageBackend::SketchStore;
-    }
-
-    if let Some(routing_handle) = state.backend_storage_routing.as_ref() {
-        // snapshot the hot-reload handle once per request,
-        // scoped to this request's tenant. The snapshot resolves to
-        // the named tenant's table when present, else the
-        // `default` tenant's table. Concurrent per-tenant swaps from
-        // `POST /api/v1/storage_routing` produce a fresh `Arc`; this
-        // snapshot remains valid for the rest of the dispatch (no
-        // torn read).
-        let routing = routing_handle.snapshot_for_tenant(tenant);
-        match promql_parser::parser::parse(query) {
-            Ok(expr) => {
-                if let Some(metric_name) = first_metric_name(&expr) {
-                    let shape = crate::storage_engines::types::classify_query_shape(&expr);
-                    let mut backend = routing.lookup_with_shape(&metric_name, shape);
-
-                    // ── ExactAgg(Sum) override for rate / topk shapes ──
-                    // The control plane's `build_routing_entry` puts
-                    // `RatePostHoc` and `Topk` (when no CountSketch is
-                    // planned) on the archive's claim list — based on
-                    // the assumption that warm-tier sketches can't
-                    // serve them natively. For metrics backed by
-                    // ExactAgg(Sum) sids the warm tier CAN serve
-                    // `rate(metric[r])`, `sum by (gbk) (rate(...))`,
-                    // and `topk(K, sum by (gbk) (rate(...)))` via the
-                    // engine's `evaluate_exact_agg_rate` reducer +
-                    // `try_topk_over_rate_fallback` engine path. When
-                    // we see those shapes routed to a non-SketchStore
-                    // backend but ExactAgg(Sum) sids exist for the
-                    // metric, override to SketchStore so the asap
-                    // engine answers natively.
-                    if !matches!(backend, StorageBackend::SketchStore)
-                        && matches!(
-                            shape,
-                            crate::storage_engines::types::QueryOperatorShape::RatePostHoc
-                                | crate::storage_engines::types::QueryOperatorShape::Topk
-                        )
-                        && metric_has_exact_agg_sum_sid(&state.summary_store, &metric_name)
-                    {
-                        debug!(
-                            "resolve_metric_storage: overriding {:?} → SketchStore \
-                             for metric={} shape={:?} (ExactAgg(Sum) sid present, \
-                             warm tier serves rate/topk via exact-agg reducer)",
-                            backend, metric_name, shape,
-                        );
-                        backend = StorageBackend::SketchStore;
-                    }
-
-                    debug!(
-                        "resolve_metric_storage: routing-table hit for tenant={} metric={} shape={:?} → {:?}",
-                        tenant, metric_name, shape, backend,
-                    );
-                    return backend;
-                }
-                debug!(
-                    "resolve_metric_storage: PromQL parsed but no metric name found in AST; falling back to installed storage axis",
-                );
-            }
-            Err(e) => {
-                debug!(
-                    "resolve_metric_storage: PromQL parse failed ({}); falling back to installed storage axis",
-                    e,
-                );
-            }
-        }
-    }
-
-    state
-        .hot_reload_config
-        .as_ref()
-        .map(|h| h.snapshot().storage_backend())
-        .unwrap_or_default()
-}
-
-/// True when the sketch index carries at least one ExactAgg(Sum-family)
-/// sid for `metric_name`. Used by [`resolve_metric_storage`] to override
-/// the routing-table decision for `rate(...)` / `topk(...)` shapes when
-/// the warm tier can answer them via the engine's
-/// `evaluate_exact_agg_rate` reducer.
-///
-/// Subset-match-on-group-by-keys isn't needed here — we only care
-/// whether the metric has ANY ExactAgg(Sum) sid; the engine's
-/// `try_topk_over_rate_fallback` + per-candidate dispatch handle the
-/// per-(group_by_keys) match downstream.
-fn metric_has_exact_agg_sum_sid(
-    idx: &crate::storage_engines::sketch_db::index::SketchStore,
-    metric_name: &str,
-) -> bool {
-    use crate::storage_engines::sketch_db::data::AggregationType;
-    use crate::storage_engines::sketch_db::index::Capability;
-    let sids = idx.instances_matching(metric_name, &std::collections::BTreeSet::new());
-    for sid in sids {
-        if let Some(meta) = idx.instance(sid) {
-            if let Some(cap) = meta.capability.as_ref() {
-                if matches!(
-                    cap,
-                    Capability::ExactAgg(
-                        AggregationType::Sum
-                            | AggregationType::Count
-                            | AggregationType::Increase
-                            | AggregationType::Rate
-                    )
-                ) {
-                    return true;
-                }
-            }
-        }
-    }
-    false
-}
-
-/// Walk a PromQL AST and return the first metric name we encounter.
-/// Used by the routing-table lookup to pick a key. PromQL queries that
-/// reference multiple metrics (e.g. `a / on(x) b`) are not currently
-/// supported by the routing table — the first-encountered metric wins.
-/// In practice the issue-46 demo replay queries each touch exactly one
-/// metric, so this heuristic is correct for the MVP.
-fn first_metric_name(expr: &promql_parser::parser::Expr) -> Option<String> {
-    use promql_parser::parser::Expr;
-    match expr {
-        Expr::VectorSelector(vs) => vs.name.clone(),
-        Expr::MatrixSelector(ms) => ms.vs.name.clone(),
-        Expr::Call(call) => call.args.args.iter().find_map(|a| first_metric_name(a)),
-        Expr::Aggregate(agg) => first_metric_name(&agg.expr),
-        Expr::Binary(bin) => first_metric_name(&bin.lhs).or_else(|| first_metric_name(&bin.rhs)),
-        Expr::Subquery(sq) => first_metric_name(&sq.expr),
-        Expr::Paren(p) => first_metric_name(&p.expr),
-        Expr::Unary(u) => first_metric_name(&u.expr),
-        _ => None,
-    }
-}
-
-/// Issue #46 ⑥ short-circuit — answer
-/// `last_over_time(<probe>[<range>])` from the freshness probe cache.
-///
-/// Recognises queries of shape `last_over_time(<metric>[<range>])`
-/// (also wrapped in `Paren` / `Unary`) where `<metric>` matches the
-/// `http_freshness_probe_*` family. Returns `Some(response)` only when
-/// the cache is configured AND has an entry whose `ts_ms` falls inside
-/// the lookback window `[now − range, now]`. Every other shape and
-/// every cache miss returns `None` — the caller falls through to the
-/// normal routing-table dispatch unchanged.
-///
-/// Response shape mirrors `process_via_router`'s success path: a
-/// Prometheus instant vector with one element (empty labels, scalar
-/// value), a `data_source: asap_query` info-line so the wire format
-/// is consistent with the ASAP-tier path the routing table comment
-/// describes as the right home for the `_warm` probe.
-async fn try_answer_freshness_probe(
-    state: &AppState,
-    parsed_request: &ParsedQueryRequest,
-    start_time: Instant,
-) -> Option<Response> {
-    use crate::drivers::query::adapters::QueryExecutionResult;
-    use crate::query_engines::query_result::{InstantVectorElement, QueryResult};
-    use asap_types::KeyByLabelNames;
-
-    let cache = state.probe_cache.as_ref()?;
-    let (metric, range_ms) = parse_last_over_time_probe(&parsed_request.query)?;
-    if !crate::query_engines::routing::is_freshness_probe(&metric) {
-        return None;
-    }
-
-    // `parsed_request.time` is unix seconds (instant query). Convert
-    // to ms to match the cache's storage scale. A `time` of `0.0` (the
-    // adapter's default for "no time given") falls back to wall clock,
-    // matching Prometheus's instant-query semantics.
-    let now_ms = if parsed_request.time > 0.0 {
-        (parsed_request.time * 1_000.0) as i64
-    } else {
-        crate::query_engines::routing::freshness_probe_now_ms()
-    };
-    let sample = cache.lookup(&metric, now_ms, range_ms)?;
-
-    debug!(
-        metric = %metric,
-        sample_ts_ms = sample.ts_ms,
-        sample_value = sample.value,
-        now_ms,
-        range_ms,
-        "freshness-probe cache hit; answering last_over_time from RAM"
-    );
-
-    let element = InstantVectorElement::new(
-        crate::storage_engines::types::KeyByLabelValues::new(),
-        sample.value,
-    );
-    // The instant-vector timestamp is unix milliseconds — match the
-    // adapter's expectations downstream (the Prometheus adapter
-    // divides by 1000 to render the wire `value: [<unix_seconds>, ...]`).
-    let query_result = QueryResult::vector(vec![element], now_ms as u64);
-    let execution_result = QueryExecutionResult {
-        query_output_labels: KeyByLabelNames::default(),
-        query_result,
-    };
-
-    let total_duration = start_time.elapsed();
-    debug!(
-        "freshness-probe response built in {:.2}ms",
-        total_duration.as_secs_f64() * 1000.0,
-    );
-
-    Some(
-        match state
-            .adapter
-            .format_success_response(&execution_result)
-            .await
-        {
-            Ok(response) => {
-                annotate_data_source(response, StorageBackend::SketchStore.data_source_id()).await
-            }
-            Err(status) => status.into_response(),
-        },
-    )
-}
-
-/// Pull `(metric_name, range_ms)` out of a parsed
-/// `last_over_time(<metric>[<range>])` PromQL expression. Returns
-/// `None` for any other shape — that's the caller's signal to fall
-/// through to the normal dispatch path. Tolerates leading `Paren` /
-/// `Unary` wrappers so reasonable spellings parse the same way the
-/// gorilla engine's `plan_from_ast` does.
-fn parse_last_over_time_probe(query: &str) -> Option<(String, i64)> {
-    use promql_parser::parser::{parse, Expr};
-    // Every accepted probe contains this function token. Avoid constructing
-    // the PromQL grammar for unrelated installed queries on each HTTP request.
-    if !query.contains("last_over_time") {
-        return None;
-    }
-    let expr = parse(query).ok()?;
-    fn unwrap<'a>(expr: &'a Expr) -> &'a Expr {
-        match expr {
-            Expr::Paren(p) => unwrap(&p.expr),
-            Expr::Unary(u) => unwrap(&u.expr),
-            other => other,
-        }
-    }
-    let inner = unwrap(&expr);
-    let call = match inner {
-        Expr::Call(c) => c,
-        _ => return None,
-    };
-    if !call.func.name.eq_ignore_ascii_case("last_over_time") {
-        return None;
-    }
-    if call.args.args.len() != 1 {
-        return None;
-    }
-    let arg = unwrap(&call.args.args[0]);
-    let ms = match arg {
-        Expr::MatrixSelector(ms) => ms,
-        _ => return None,
-    };
-    let metric = ms.vs.name.clone()?;
-    let range_ms = ms.range.as_millis() as i64;
-    Some((metric, range_ms))
-}
-
-/// Execute through the query-engine trait and add `data_source: asap_query`
-/// to the HTTP response. Trait results use the same label adaptation as
-/// router dispatch.
-async fn process_via_simple_engine(
-    state: &AppState,
-    parsed_request: &ParsedQueryRequest,
-    start_time: Instant,
-    headers: HashMap<String, String>,
-) -> Response {
-    let query_start_time = Instant::now();
-    debug!(
-        "About to call query_engine.execute with query='{}' and time={}",
-        parsed_request.query, parsed_request.time
-    );
-    use crate::drivers::query::adapters::QueryExecutionResult;
-    use crate::query_engines::routing::query_engine_routing::QueryEngine;
-    let evaluation_ms = if parsed_request.time > 0.0 {
-        (parsed_request.time * 1_000.0) as u64
-    } else {
-        unix_time_ms()
-    };
-    match state
-        .query_engine
-        .execute_at(&parsed_request.query, evaluation_ms)
-        .await
-    {
-        Ok(query_result) => {
-            let query_duration = query_start_time.elapsed();
-            debug!(
-                "Modern execute() succeeded for query='{}' in {:.2}ms",
-                parsed_request.query,
-                query_duration.as_secs_f64() * 1000.0
-            );
-            let execution_result = QueryExecutionResult {
-                query_output_labels: asap_types::KeyByLabelNames::default(),
-                query_result,
-            };
-            let total_duration = start_time.elapsed();
-            debug!(
-                "Total request processing took: {:.2}ms",
-                total_duration.as_secs_f64() * 1000.0
-            );
-            match state
-                .adapter
-                .format_success_response(&execution_result)
-                .await
-            {
-                Ok(response) => {
-                    annotate_data_source(response, StorageBackend::SketchStore.data_source_id())
-                        .await
-                }
-                Err(status) => status.into_response(),
-            }
-        }
-        Err(error) => {
-            debug!(
-                "Modern execute() returned {error} for query='{}', falling through to fallback / unsupported",
-                parsed_request.query,
-            );
-            let total_duration = start_time.elapsed();
-            debug!(
-                "Request capability-missed after: {:.2}ms",
-                total_duration.as_secs_f64() * 1000.0
-            );
-
-            // Step 4: Handle unsupported query using fallback client
-            if let Some(fallback) = &state.fallback {
-                debug!("Query not supported locally, forwarding to fallback");
-                // Fallback client handles the HTTP call and returns formatted response
-                match fallback
-                    .execute_query_with_headers(parsed_request, headers)
-                    .await
-                {
-                    Ok(response) => response.into_response(),
-                    Err(status) => status.into_response(),
-                }
-            } else {
-                record_disabled_forwarding(state, "prometheus", "instant");
-                debug!("Query not supported and forwarding disabled, returning error");
-                // Adapter formats the unsupported query error for its protocol.
-                // We still annotate `data_source: asap_query` so callers
-                // see which tier the request was dispatched against —
-                // the routing decision happened, the metric just had no
-                // compatible aggregation. Mirrors the
-                // ASAPQueryEngine-as-router-engine path where a
-                // `EngineError::CapabilityMiss` response is still tagged.
-                match state.adapter.format_unsupported_query_response().await {
-                    Ok(response) => {
-                        annotate_data_source(response, StorageBackend::SketchStore.data_source_id())
-                            .await
-                    }
-                    Err(status) => status.into_response(),
-                }
-            }
-        }
-    }
-}
-
-/// Dispatch directly to the engine registered under `data_source_id`,
-/// bypassing the `BackendStorageRouting` lookup. Set by the per-query
-/// `X-ASAP-Engine` header (or `?engine=` query param). Used by the
-/// accuracy reducer to query the same PromQL against the warm sketch
-/// and the Gorilla archive on MinIO so it can compute apples-to-apples
-/// relative error per replay row.
-///
-/// HTTP semantics:
-/// * Unknown `data_source_id` → 400 with the list of registered ids.
-/// * Engine returns `EngineError::Backend` → 500.
-/// * Engine returns `EngineError::CapabilityMiss` → 404.
-/// * Engine returns `Ok` → 2xx with `data_source: <id>` info-line.
-async fn process_via_named_engine(
-    state: &AppState,
-    parsed_request: &ParsedQueryRequest,
-    start_time: Instant,
-    data_source_id: &str,
-) -> Response {
-    use crate::drivers::query::adapters::QueryExecutionResult;
-    use crate::query_engines::EngineError;
-
-    let query_start_time = Instant::now();
-    debug!(
-        "Dispatching via named engine override: query='{}' data_source_id={}",
-        parsed_request.query, data_source_id,
-    );
-
-    let Some(engine) = state.query_router.engine_by_id(data_source_id) else {
-        let registered: Vec<&'static str> = state.query_router.registered_ids().collect();
-        warn!(
-            requested = data_source_id,
-            registered = ?registered,
-            "named engine override: requested engine not registered",
-        );
-        return (
-            StatusCode::BAD_REQUEST,
-            Json(serde_json::json!({
-            "status": "error",
-            "errorType": "bad_data",
-            "error": format!(
-                "no engine registered under data_source_id={data_source_id:?}; \
-                 registered={registered:?}"
-            )})),
-        )
-            .into_response();
-    };
-
-    let engine = engine.clone();
-    let result = engine.execute(&parsed_request.query).await;
-
-    let total_duration = start_time.elapsed();
-    debug!(
-        "Named engine dispatch took: {:.2}ms (total req {:.2}ms)",
-        query_start_time.elapsed().as_secs_f64() * 1000.0,
-        total_duration.as_secs_f64() * 1000.0,
-    );
-
-    match result {
-        Ok(query_result) => {
-            // Trait dispatch loses `KeyByLabelNames`, identical to
-            // `process_via_router`. Default to empty so the
-            // Prometheus adapter renders `metric: {}` for every
-            // returned series.
-            let query_output_labels = asap_types::KeyByLabelNames::default();
-            let execution_result = QueryExecutionResult {
-                query_output_labels,
-                query_result,
-            };
-            // Resolve the `data_source` annotation from the engine's
-            // own capabilities so the wire response stays in sync
-            // even if the request used a typo'd casing of the id.
-            let canonical_id = engine.capabilities().data_source_id;
-            match state
-                .adapter
-                .format_success_response(&execution_result)
-                .await
-            {
-                Ok(response) => annotate_data_source(response, canonical_id).await,
-                Err(status) => status.into_response(),
-            }
-        }
-        Err(EngineError::CapabilityMiss { .. }) => {
-            warn!(
-                data_source_id = data_source_id,
-                "named engine: capability miss",
-            );
-            (
-                StatusCode::NOT_FOUND,
-                Json(serde_json::json!({
-                "status": "error",
-                "errorType": "bad_data",
-                "error": format!(
-                    "engine {data_source_id:?} could not serve this query (capability miss)"
-                )})),
-            )
-                .into_response()
-        }
-        Err(error @ EngineError::Physical(_)) => (
-            StatusCode::INTERNAL_SERVER_ERROR,
-            Json(serde_json::json!({"status": "error", "errorType": "execution", "error": error.to_string()})),
-        ).into_response(),
-        Err(EngineError::Backend { .. }) => {
-            warn!(
-                data_source_id = data_source_id,
-                "named engine: backend failure",
-            );
-            (
-                StatusCode::INTERNAL_SERVER_ERROR,
-                Json(serde_json::json!({
-                    "status": "error",
-                    "errorType": "internal",
-                    "error": format!("engine {data_source_id:?} backend failed")})),
-            )
-                .into_response()
-        }
-    }
-}
-
-/// Dispatch through the [`EngineRouter`] — used for any metric whose
-/// pinned `StorageBackend` is something other than `SketchStore`.
-///
-/// The router's `execute` API is `(&str, Statistic, AccuracyTarget,
-/// StorageBackend) -> QueryResult`. Three of those four axes are
-/// pinned by the request:
-///
-/// * `query` — straight from the parsed request.
-/// * `metric_storage` — looked up from the hot-reload `InstalledPrecomputePlan`
-///   by the caller.
-///
-/// `Statistic` remains a shape-derived follow-up. `AccuracyTarget` is
-/// supplied by the caller through [`ACCURACY_HEADER`] and defaults to
-/// approximate when the header is absent.
-///
-/// Map `EngineRouterError` variants to HTTP statuses:
-/// * `NoEngineRegistered` → 503 (configuration bug — restart with the
-///   right engine plugged in).
-/// * `AllFailed { last: CapabilityMiss }` → 404 (no engine in the
-///   failover sequence could serve this query shape).
-/// * `AllFailed { last: Backend }` → 500 (engines were all eligible
-///   but their backends transiently failed).
-async fn process_via_router(
-    state: &AppState,
-    parsed_request: &ParsedQueryRequest,
-    start_time: Instant,
-    metric_storage: StorageBackend,
-    headers: HashMap<String, String>,
-) -> Response {
-    use crate::drivers::query::adapters::QueryExecutionResult;
-    use crate::query_engines::EngineError;
-
-    let query_start_time = Instant::now();
-    debug!(
-        "Dispatching via EngineRouter: query='{}' metric_storage={:?}",
-        parsed_request.query, metric_storage,
-    );
-
-    // Statistic is not currently used by the routing policy. Accuracy is
-    // the validated request contract threaded in by the HTTP handler.
-    let stat = Statistic::Sum;
-    let router_result = state
-        .query_router
-        .execute_routed(&parsed_request.query, stat, metric_storage)
-        .await;
-
-    match router_result {
-        Ok((query_result, data_source_id)) => {
-            let query_duration = query_start_time.elapsed();
-            debug!(
-                "EngineRouter dispatch took: {:.2}ms; result: {:?}",
-                query_duration.as_secs_f64() * 1000.0,
-                query_result
-            );
-
-            // The Phase-4 Gorilla MVP returns a scalar with empty
-            // labels; trait dispatch loses the `KeyByLabelNames` shape
-            // ASAPQueryEngine carries. Default to an empty `KeyByLabelNames`
-            // — the Prometheus adapter renders an empty `metric: {}`,
-            // which is a valid Prometheus shape (every label is just
-            // unset) and matches `wrap_result`'s Phase-4 contract.
-            let query_output_labels = asap_types::KeyByLabelNames::default();
-            let execution_result = QueryExecutionResult {
-                query_output_labels,
-                query_result,
-            };
-
-            let total_duration = start_time.elapsed();
-            debug!(
-                "Total request processing took: {:.2}ms",
-                total_duration.as_secs_f64() * 1000.0
-            );
-            debug!("=== RETURNING ROUTER SUCCESS RESPONSE ===");
-
-            match state
-                .adapter
-                .format_success_response(&execution_result)
-                .await
-            {
-                Ok(response) => annotate_data_source(response, data_source_id).await,
-                Err(status) => status.into_response(),
-            }
-        }
-        // No engine for the metric's tier is a deploy misconfig, not a
-        // query the ASAP tier cannot serve — keep it fail-loud.
-        Err(EngineRouterError::NoEngineRegistered { tried, registered }) => {
-            warn!(
-                tried = ?tried,
-                registered = ?registered,
-                "EngineRouter: no engine registered for any compatible backend",
-            );
-            (
-                StatusCode::SERVICE_UNAVAILABLE,
-                Json(serde_json::json!({
-                    "status": "error",
-                    "errorType": "internal",
-                    "error": format!(
-                        "no engine registered for any compatible backend; tried {tried:?}, registered={registered:?}"
-                    )})),
-            )
-                .into_response()
-        }
-        // A CapabilityMiss means the ASAP tier cannot serve this query;
-        // forward it rather than answering "no result" (#746 — the archive
-        // failover that used to absorb these is gone). A Backend error is a
-        // real upstream failure, so it stays a 5xx.
-        Err(EngineRouterError::AllFailed { last }) => {
-            warn!(error = %last, "EngineRouter: all compatible engines failed");
-            match &last {
-                EngineError::CapabilityMiss { .. } => {
-                    forward_instant_to_fallback(state, parsed_request, headers).await
-                }
-                EngineError::Physical(_) => (
-                    StatusCode::INTERNAL_SERVER_ERROR,
-                    Json(serde_json::json!({"status": "error", "errorType": "execution", "error": last.to_string()})),
-                ).into_response(),
-                EngineError::Backend { .. } => (
-                    StatusCode::INTERNAL_SERVER_ERROR,
-                    Json(serde_json::json!({
-                        "status": "error",
-                        "errorType": "internal",
-                        "error": last.to_string()})),
-                )
-                    .into_response(),
-            }
-        }
-    }
-}
-
-fn extract_logical_provenance(
-    value: &mut serde_json::Value,
-) -> Option<Result<(u64, u64, u64, u64, u64, u64, u64), ()>> {
-    let warnings = value.get_mut("warnings")?.as_array_mut()?;
-    let mut route = None;
-    let mut stats = None;
-    let mut found = false;
-    let mut malformed = false;
-    warnings.retain(|warning| {
-        let Some(text) = warning.as_str() else {
-            return true;
-        };
-        if let Some(mode) = text.strip_prefix("asap_execution:") {
-            found = true;
-            if route.replace(mode.to_owned()).is_some() {
-                malformed = true;
-            }
-            return false;
-        }
-        if let Some(text) = text.strip_prefix("asap_logical_stats:") {
-            found = true;
-            let values = text.split(',').collect::<Vec<_>>();
-            let parse = |index: usize, prefix: &str| {
-                values
-                    .get(index)
-                    .and_then(|v| v.strip_prefix(prefix))
-                    .and_then(|v| v.parse::<u64>().ok())
-            };
-            let parsed = if matches!(values.len(), 3 | 5 | 6 | 7) {
-                parse(0, "raw=")
-                    .zip(parse(1, "summary="))
-                    .zip(parse(2, "memo_hits="))
-                    .zip(if values.len() >= 5 {
-                        parse(3, "remote=")
-                    } else {
-                        Some(0)
-                    })
-                    .zip(if matches!(values.len(), 5 | 7) {
-                        parse(4, "index_reads=")
-                    } else {
-                        Some(0)
-                    })
-                    .and_then(|((((raw, summary), memo), remote), indexes)| {
-                        let rpcs = if values.len() == 6 {
-                            parse(4, "remote_rpcs=")?
-                        } else if values.len() == 7 {
-                            parse(5, "remote_rpcs=")?
-                        } else {
-                            remote
-                        };
-                        let branches = if values.len() == 6 {
-                            parse(5, "remote_branches=")?
-                        } else if values.len() == 7 {
-                            parse(6, "remote_branches=")?
-                        } else {
-                            remote
-                        };
-                        Some((raw, summary, memo, remote, indexes, rpcs, branches))
-                    })
-            } else {
-                None
-            };
-            if stats.is_some() || parsed.is_none() {
-                malformed = true;
-            }
-            stats = parsed;
-            return false;
-        }
-        true
-    });
-    if !found {
-        return None;
-    }
-    let Some((raw, summary, memo, remote, indexes, rpcs, branches)) = stats else {
-        return Some(Err(()));
-    };
-    let expected = if raw > 0 {
-        // Retain the field only to reject provenance from obsolete local-raw
-        // executors. Installed plans cannot execute such a branch.
-        "invalid"
-    } else if remote > 0 && summary > 0 {
-        "hybrid"
-    } else if remote > 0 {
-        "exact_dag"
-    } else if summary > 0 {
-        "asap"
-    } else {
-        "invalid"
-    };
-    if malformed || route.as_deref().is_some_and(|mode| mode != expected) {
-        Some(Err(()))
-    } else {
-        Some(Ok((raw, summary, memo, remote, indexes, rpcs, branches)))
-    }
-}
-
-/// Append a `data_source: <id>` info-line to the response JSON's
-/// `infos` array (Prometheus 3.0-style, mirrors the wire-format
-/// extension the `GorillaQueryEngine` documents in §6 of
-/// `docs/design-gorilla-s3-cold-engine.md`). Best-effort: when the
-/// adapter's response isn't a JSON object (or doesn't have an
-/// `infos` array shape), this is a no-op and the response passes
-/// through unchanged.
-async fn annotate_data_source(response: Response, data_source_id: &'static str) -> Response {
-    use axum::body::to_bytes;
-
-    let (mut parts, body) = response.into_parts();
-    // Adapter responses are bounded JSON objects; cap at 16 MiB to
-    // bracket pathological cases without blowing memory.
-    let bytes = match to_bytes(body, 16 * 1024 * 1024).await {
-        Ok(b) => b,
-        Err(e) => {
-            warn!("annotate_data_source: failed to read response body: {e}");
-            return Response::from_parts(parts, axum::body::Body::empty());
-        }
-    };
-    let mut value: serde_json::Value = match serde_json::from_slice(&bytes) {
-        Ok(v) => v,
-        Err(_) => {
-            // Not a JSON body — pass through. Reconstruct the body
-            // from the buffered bytes so the caller still sees the
-            // original payload.
-            return Response::from_parts(parts, axum::body::Body::from(bytes));
-        }
-    };
-    if data_source_id == "asap_query"
-        && (!parts.status.is_success()
-            || value.get("status").and_then(serde_json::Value::as_str) != Some("success")
-            || value.get("data").is_none_or(serde_json::Value::is_null))
-    {
-        // Dispatch to the local engine is not a successful warm execution.
-        return Response::from_parts(parts, axum::body::Body::from(bytes));
-    }
-    if data_source_id == "asap_query" {
-        if let Some(provenance) = extract_logical_provenance(&mut value) {
-            let (route, detail) = match provenance {
-                Ok((raw, summary, memo, remote, _legacy_indexes, rpcs, branches)) => {
-                    for (name, count) in [
-                        ("x-asap-raw-scan-evaluations", raw),
-                        ("x-asap-summary-readout-evaluations", summary),
-                        ("x-asap-memo-hits", memo),
-                        ("x-asap-exact-subquery-evaluations", remote),
-                        ("x-asap-exact-subquery-rpcs", rpcs),
-                        ("x-asap-exact-branch-evaluations", branches),
-                    ] {
-                        parts.headers.insert(
-                            name,
-                            axum::http::HeaderValue::from_str(&count.to_string()).unwrap(),
-                        );
-                    }
-                    if raw > 0 {
-                        ("failed", "invalid_provenance")
-                    } else if remote > 0 && summary > 0 {
-                        ("hybrid", "hybrid")
-                    } else if remote > 0 || summary == 0 {
-                        (
-                            "exact_fallback",
-                            if remote > 0 {
-                                "external_exact"
-                            } else {
-                                "invalid_provenance"
-                            },
-                        )
-                    } else {
-                        ("warm", "asap")
-                    }
-                }
-                Err(()) => ("failed", "invalid_provenance"),
-            };
-            parts.headers.insert(
-                "x-asap-execution",
-                axum::http::HeaderValue::from_static(route),
-            );
-            parts.headers.insert(
-                "x-asap-execution-detail",
-                axum::http::HeaderValue::from_static(detail),
-            );
-            if let Some(map) = value.as_object_mut() {
-                if let Some(infos) = map
-                    .entry("infos")
-                    .or_insert_with(|| serde_json::json!([]))
-                    .as_array_mut()
-                {
-                    infos.push(serde_json::json!(format!("execution: {detail}")));
-                }
-            }
-        }
-    }
-    // The body changed; an adapter's original Content-Length is no longer valid.
-    parts.headers.remove(axum::http::header::CONTENT_LENGTH);
-    if let serde_json::Value::Object(map) = &mut value {
-        let infos_entry = map
-            .entry("infos".to_string())
-            .or_insert_with(|| serde_json::Value::Array(Vec::new()));
-        if let serde_json::Value::Array(arr) = infos_entry {
-            arr.push(serde_json::Value::String(format!(
-                "data_source: {data_source_id}"
-            )));
-        }
-    }
-    let serialized = match serde_json::to_vec(&value) {
-        Ok(v) => v,
-        Err(e) => {
-            warn!("annotate_data_source: failed to re-serialize: {e}");
-            return Response::from_parts(parts, axum::body::Body::from(bytes));
-        }
-    };
-    Response::from_parts(parts, axum::body::Body::from(serialized))
-}
-
-fn vm_tenant_headers(tenant: String, mut headers: HeaderMap) -> Result<HeaderMap, Response> {
-    let value = axum::http::HeaderValue::from_str(&tenant)
-        .map_err(|_| (StatusCode::BAD_REQUEST, "invalid VictoriaMetrics tenant").into_response())?;
-    headers.insert(TENANT_HEADER, value);
-    Ok(headers)
-}
-
-async fn handle_vm_cluster_instant(
-    Path(tenant): Path<String>,
-    query: Query<HashMap<String, String>>,
-    headers: HeaderMap,
-    state: State<AppState>,
-) -> Response {
-    let Ok(headers) = vm_tenant_headers(tenant, headers) else {
-        return (StatusCode::BAD_REQUEST, "invalid VictoriaMetrics tenant").into_response();
-    };
-    handle_instant_query(query, headers, state).await
-}
-
-async fn handle_vm_cluster_instant_post(
-    Path(tenant): Path<String>,
-    state: State<AppState>,
-    headers: HeaderMap,
-    body: Bytes,
-) -> Response {
-    let Ok(headers) = vm_tenant_headers(tenant, headers) else {
-        return (StatusCode::BAD_REQUEST, "invalid VictoriaMetrics tenant").into_response();
-    };
-    handle_instant_query_post(state, headers, body).await
-}
-
-async fn handle_vm_cluster_range(
-    Path(tenant): Path<String>,
-    query: Query<HashMap<String, String>>,
-    headers: HeaderMap,
-    state: State<AppState>,
-) -> Response {
-    let Ok(headers) = vm_tenant_headers(tenant, headers) else {
-        return (StatusCode::BAD_REQUEST, "invalid VictoriaMetrics tenant").into_response();
-    };
-    handle_range_query(query, headers, state).await
-}
-
-async fn handle_vm_cluster_range_post(
-    Path(tenant): Path<String>,
-    state: State<AppState>,
-    headers: HeaderMap,
-    body: Bytes,
-) -> Response {
-    let Ok(headers) = vm_tenant_headers(tenant, headers) else {
-        return (StatusCode::BAD_REQUEST, "invalid VictoriaMetrics tenant").into_response();
-    };
-    handle_range_query_post(state, headers, body).await
-}
-
-async fn handle_instant_query(
-    query_params: Query<HashMap<String, String>>,
-    headers: axum::http::HeaderMap,
-    State(state): State<AppState>,
-) -> Response {
-    let _timer = srv_metrics::start_query_timer(srv_metrics::QUERY_TYPE_INSTANT);
-    let start_time = Instant::now();
-    debug!("=== INCOMING GET REQUEST ===");
-    debug!("Raw query params: {:?}", query_params.0);
-
-    // Phase-6 Fix 1: per-query engine override. Header takes
-    // precedence over query param; either flips the dispatcher to
-    // `process_via_named_engine`. Recorded before `parse_get_request`
-    // strips the param out (it doesn't, but reading the source of
-    // truth keeps this robust to adapter changes).
-    let engine_override = extract_engine_override(&headers, &query_params.0);
-    let accuracy = match extract_accuracy(&headers) {
-        Ok(accuracy) => accuracy,
-        Err(error) => return invalid_accuracy_response(error),
-    };
-    // Per-tenant `BackendStorageRouting`: read the tenant id from the
-    // `X-ASAP-Tenant` header (default `"default"`). Captured before
-    // `parse_get_request` consumes `query_params`.
-    let tenant = extract_tenant(&headers);
-    let forwarding_headers = extract_fallback_headers(&headers);
-
-    let parsed_request = match state.adapter.parse_get_request(query_params).await {
-        Ok(req) => {
-            debug!(
-                "Successfully parsed - query: '{}', time: {}",
-                req.query, req.time
-            );
-            req
-        }
-        Err(parse_error) => {
-            debug!("Failed to parse request: {:?}", parse_error);
-            srv_metrics::record_query_outcome(
-                srv_metrics::QUERY_TYPE_INSTANT,
-                srv_metrics::QUERY_STATUS_ERROR,
-            );
-            return match state.adapter.format_error_response(&parse_error).await {
-                Ok(json) => json.into_response(),
-                Err(status) => status.into_response(),
-            };
-        }
-    };
-
-    let response = process_query_request(
-        &state,
-        &parsed_request,
-        start_time,
-        forwarding_headers,
-        engine_override,
-        accuracy,
-        &tenant,
-    )
-    .await;
-    srv_metrics::record_query_outcome(
-        srv_metrics::QUERY_TYPE_INSTANT,
-        query_status_label(&response),
-    );
-    response
-}
-
-/// Extract the per-query engine override (Phase-6 Fix 1).
-///
-/// Precedence: the `X-ASAP-Engine` header wins over the `?engine=`
-/// query parameter when both are present. Returns `None` (default
-/// dispatch via `BackendStorageRouting`) when neither is set.
-fn extract_engine_override(
-    headers: &axum::http::HeaderMap,
-    query_params: &HashMap<String, String>,
-) -> Option<String> {
-    if let Some(v) = headers.get(ENGINE_OVERRIDE_HEADER) {
-        if let Ok(s) = v.to_str() {
-            let trimmed = s.trim();
-            if !trimmed.is_empty() {
-                return Some(trimmed.to_string());
-            }
-        }
-    }
-    query_params
-        .get(ENGINE_OVERRIDE_QUERY_PARAM)
-        .map(|s| s.trim().to_string())
-        .filter(|s| !s.is_empty())
-}
-
-async fn handle_instant_query_post(
-    State(state): State<AppState>,
-    headers: axum::http::HeaderMap,
-    body: Bytes,
-) -> Response {
-    let _timer = srv_metrics::start_query_timer(srv_metrics::QUERY_TYPE_INSTANT);
-    let start_time = Instant::now();
-    debug!("=== INCOMING POST REQUEST ===");
-
-    let forwarding_headers = extract_fallback_headers(&headers);
-    let accuracy = match extract_accuracy(&headers) {
-        Ok(accuracy) => accuracy,
-        Err(error) => return invalid_accuracy_response(error),
-    };
-
-    // Check content type to determine how to parse the body
-    let content_type = headers
-        .get(axum::http::header::CONTENT_TYPE)
-        .and_then(|v| v.to_str().ok())
-        .unwrap_or("");
-
-    debug!("Content-Type: {}", content_type);
-
-    // Phase-6 Fix 1: per-query engine override read from the header
-    // before parsing the body. We don't yet know the form-decoded
-    // params, so query-param fallback (rare for POST) is wired in
-    // below after the form parse.
-    let mut engine_override: Option<String> = headers
-        .get(ENGINE_OVERRIDE_HEADER)
-        .and_then(|v| v.to_str().ok())
-        .map(|s| s.trim().to_string())
-        .filter(|s| !s.is_empty());
-
-    // Per-tenant `BackendStorageRouting` (POST path): read the
-    // tenant id from the `X-ASAP-Tenant` header (default
-    // `"default"`).
-    let tenant = extract_tenant(&headers);
-
-    let parsed_request = if content_type.contains("application/json") {
-        // Handle JSON POST
-        debug!("Parsing as JSON POST request");
-        match state.adapter.parse_json_post_request(body).await {
-            Ok(req) => {
-                debug!(
-                    "Successfully parsed JSON POST - query: '{}', time: {}",
-                    req.query, req.time
-                );
-                req
-            }
-            Err(parse_error) => {
-                debug!("Failed to parse JSON POST request: {:?}", parse_error);
-                srv_metrics::record_query_outcome(
-                    srv_metrics::QUERY_TYPE_INSTANT,
-                    srv_metrics::QUERY_STATUS_ERROR,
-                );
-                return match state.adapter.format_error_response(&parse_error).await {
-                    Ok(json) => json.into_response(),
-                    Err(status) => status.into_response(),
-                };
-            }
-        }
-    } else {
-        // Handle form-encoded POST
-        debug!("Parsing as form-encoded POST request");
-
-        // Parse the body as form data
-        let body_str = match String::from_utf8(body.to_vec()) {
-            Ok(s) => s,
-            Err(e) => {
-                debug!("Failed to parse body as UTF-8: {}", e);
-                use crate::drivers::query::adapters::AdapterError;
-                srv_metrics::record_query_outcome(
-                    srv_metrics::QUERY_TYPE_INSTANT,
-                    srv_metrics::QUERY_STATUS_ERROR,
-                );
-                return match state
-                    .adapter
-                    .format_error_response(&AdapterError::ParseError(format!(
-                        "Invalid UTF-8 in request body: {}",
-                        e
-                    )))
-                    .await
-                {
-                    Ok(json) => json.into_response(),
-                    Err(status) => status.into_response(),
-                };
-            }
-        };
-
-        // Parse form parameters
-        let params: HashMap<String, String> = form_urlencoded::parse(body_str.as_bytes())
-            .into_owned()
-            .collect();
-        debug!("Form params extracted: {:?}", params);
-
-        // Phase-6 Fix 1: form-body fallback for the engine override
-        // (header still wins). Lets a curl POST send `engine=archive`
-        // alongside `query=` and `time=`.
-        if engine_override.is_none() {
-            engine_override = params
-                .get(ENGINE_OVERRIDE_QUERY_PARAM)
-                .map(|s| s.trim().to_string())
-                .filter(|s| !s.is_empty());
-        }
-
-        // Use adapter to parse POST request (handles form-encoded parameters)
-        match state.adapter.parse_post_request(Form(params)).await {
-            Ok(req) => {
-                debug!(
-                    "Successfully parsed POST - query: '{}', time: {}",
-                    req.query, req.time
-                );
-                req
-            }
-            Err(parse_error) => {
-                debug!("Failed to parse POST request: {:?}", parse_error);
-                srv_metrics::record_query_outcome(
-                    srv_metrics::QUERY_TYPE_INSTANT,
-                    srv_metrics::QUERY_STATUS_ERROR,
-                );
-                return match state.adapter.format_error_response(&parse_error).await {
-                    Ok(json) => json.into_response(),
-                    Err(status) => status.into_response(),
-                };
-            }
-        }
-    };
-
-    let result = process_query_request(
-        &state,
-        &parsed_request,
-        start_time,
-        forwarding_headers,
-        engine_override,
-        accuracy,
-        &tenant,
-    )
-    .await;
-
-    let total_duration = start_time.elapsed();
-    debug!(
-        "Total POST request processing took: {:.2}ms",
-        total_duration.as_secs_f64() * 1000.0
-    );
-
-    srv_metrics::record_query_outcome(srv_metrics::QUERY_TYPE_INSTANT, query_status_label(&result));
-    result
-}
-
-async fn handle_runtime_info(
-    State(state): State<AppState>,
-    headers: axum::http::HeaderMap,
-) -> Result<Json<Value>, StatusCode> {
-    debug!("Delegating runtime info request to adapter");
-
-    // Extract headers we want to forward
-    let mut forwarding_headers = HashMap::new();
-    if let Some(auth) = headers.get(axum::http::header::AUTHORIZATION) {
-        if let Ok(auth_str) = auth.to_str() {
-            debug!("Found Authorization header for runtime info: {}", auth_str);
-            forwarding_headers.insert("Authorization".to_string(), auth_str.to_string());
-        }
-    } else {
-        debug!("No Authorization header found in runtime info request");
-    }
-
-    // Delegate to adapter for protocol-specific handling
-    state
-        .adapter
-        .handle_runtime_info_with_headers(state.summary_store.clone(), forwarding_headers)
-        .await
-}
-
-// Map a finished Response to an `asap_query_requests_total` status
-// label. We distinguish 5xx (internal) errors from 4xx (client / parse)
-// errors — both count as `error`, and 2xx / 3xx count as `ok`. A more
-// granular split into `unsupported` / `fallback` would require the
-// handlers to thread the outcome back out; the Response status is the
-// tractable signal we have today.
-fn query_status_label(response: &Response) -> &'static str {
-    if response.status().is_success() || response.status().is_redirection() {
-        srv_metrics::QUERY_STATUS_OK
-    } else {
-        srv_metrics::QUERY_STATUS_ERROR
-    }
-}
-
-fn record_disabled_forwarding(state: &AppState, backend: &str, path: &str) {
-    if state.config.adapter_config.fallback_blocked_by_policy
-        && !state
-            .config
-            .adapter_config
-            .query_forwarding_policy
-            .allows_external_queries()
-    {
-        debug!(
-            backend,
-            path, "query forwarding disabled; external query blocked"
-        );
-        srv_metrics::record_query_forwarding_blocked(backend, path);
-    }
-}
-
-// ============================================================
-// Metrics Handler
-// ============================================================
-
-async fn handle_metrics(State(state): State<AppState>) -> impl IntoResponse {
-    let encoder = prometheus::TextEncoder::new();
-    let metric_families = prometheus::gather();
-    let mut buffer = Vec::new();
-    prometheus::Encoder::encode(&encoder, &metric_families, &mut buffer)
-        .unwrap_or_else(|e| tracing::error!("Failed to encode metrics: {}", e));
-    let (populations, builds) = state
-        .summary_store
-        .current_series
-        .lock()
-        .expect("current-series state poisoned")
-        .stats();
-    buffer.extend_from_slice(format!(
-        "# TYPE asap_current_series_populations gauge\nasap_current_series_populations {populations}\n# TYPE asap_current_series_cache_builds_total counter\nasap_current_series_cache_builds_total {builds}\n"
-    ).as_bytes());
-    if let Some(receiver) = state.remote_write.as_ref() {
-        use std::sync::atomic::Ordering;
-        let stats = receiver.stats();
-        let extra = format!(
-            "# TYPE asap_remote_write_requests_total counter\n\
-             asap_remote_write_requests_total {}\n\
-             # TYPE asap_remote_write_samples_total counter\n\
-             asap_remote_write_samples_total {}\n\
-             # TYPE asap_remote_write_stale_markers_total counter\n\
-             asap_remote_write_stale_markers_total {}\n\
-             # TYPE asap_remote_write_duplicates_total counter\n\
-             asap_remote_write_duplicates_total {}\n\
-             # TYPE asap_remote_write_rejected_requests_total counter\n\
-             asap_remote_write_rejected_requests_total {}\n\
-             # TYPE asap_remote_write_bytes_total counter\n\
-             asap_remote_write_bytes_total {}\n",
-            stats.requests.load(Ordering::Relaxed),
-            stats.samples.load(Ordering::Relaxed),
-            stats.stale_markers.load(Ordering::Relaxed),
-            stats.duplicates.load(Ordering::Relaxed),
-            stats.rejected_requests.load(Ordering::Relaxed),
-            stats.bytes.load(Ordering::Relaxed),
-        );
-        buffer.extend_from_slice(extra.as_bytes());
-    }
-    (
-        [(
-            axum::http::header::CONTENT_TYPE,
-            "text/plain; version=0.0.4",
-        )],
-        buffer,
-    )
-}
-
-// ============================================================
-// Range Query Handlers
-// ============================================================
-
-/// Core range query execution logic shared between GET and POST handlers
-async fn process_range_query_request(
-    state: &AppState,
-    parsed_request: &ParsedRangeQueryRequest,
-    start_time: Instant,
-    forwarding_headers: HashMap<String, String>,
-    accuracy: AccuracyTarget,
-    tenant: &str,
-) -> Response {
-    // Check if handling is enabled
-    if !state.config.handle_http_requests {
-        debug!("HTTP request handling is disabled for range query");
-        // For now, return error - fallback for range queries can be added later
-        use crate::drivers::query::adapters::AdapterError;
-        return match state
-            .adapter
-            .format_error_response(&AdapterError::ProtocolError(
-                "Range query handling is disabled".to_string(),
-            ))
-            .await
-        {
-            Ok(json) => json.into_response(),
-            Err(status) => status.into_response(),
-        };
-    }
-
-    // Execute range query with engine
-    let query_start_time = Instant::now();
-    debug!(
-        "Executing range query: '{}' from {} to {} step {}",
-        parsed_request.query, parsed_request.start, parsed_request.end, parsed_request.step
-    );
-
-    // ASAP-first centralization refactor — the range path is now a
-    // thin transport layer. Engine selection lives in
-    // `EngineRouter::execute_range`, which walks the shared
-    // `compatible_storage_backends` policy table. Since #746 that table
-    // has one ASAP-managed answer (the sketch tier); a CapabilityMiss
-    // forwards to the Prometheus fallback rather than to another tier.
-    let start_ms = (parsed_request.start * 1000.0) as u64;
-    let end_ms = (parsed_request.end * 1000.0) as u64;
-    let step_ms = (parsed_request.step * 1000.0) as u64;
-
-    let language_identity = state.adapter.canonical_plan_identity(&parsed_request.query);
-    if state.adapter.query_language() == asap_types::QueryLanguage::MetricsQl
-        && language_identity.is_err()
-    {
-        if let Some(fallback) = &state.fallback {
-            return match fallback
-                .execute_range_query_with_headers(parsed_request, forwarding_headers)
-                .await
-            {
-                Ok(response) => response.into_response(),
-                Err(status) => status.into_response(),
-            };
-        }
-    }
-    if let Ok(Some(identity)) = language_identity {
-        if let Ok(result) = state
-            .query_engine
-            .execute_metricsql_range(&identity, start_ms, end_ms, step_ms)
-            .await
-        {
-            return match state
-                .adapter
-                .format_range_success_response(&result, &asap_types::KeyByLabelNames::default())
-                .await
-            {
-                Ok(response) => {
-                    annotate_data_source(response, StorageBackend::SketchStore.data_source_id())
-                        .await
-                }
-                Err(status) => status.into_response(),
-            };
-        }
-        if let Some(fallback) = &state.fallback {
-            return match fallback
-                .execute_range_query_with_headers(parsed_request, forwarding_headers)
-                .await
-            {
-                Ok(response) => response.into_response(),
-                Err(status) => status.into_response(),
-            };
-        }
-    }
-
-    // `X-ASAP-Accuracy: exact` means "do not answer from the ε/δ-bounded
-    // sketches" — with no archive tier left (#746) that is the Prometheus
-    // fallback's job.
-    if matches!(accuracy, AccuracyTarget::Exact) {
-        debug!("Exact accuracy requested on range query — bypassing the sketch tier");
-        return forward_range_to_fallback(state, parsed_request, forwarding_headers).await;
-    }
-
-    let metric_storage = resolve_metric_storage(state, &parsed_request.query, tenant);
-
-    // Statistic is not currently used by the routing policy.
-    let stat = Statistic::Sum;
-    debug!(
-        "Dispatching range query via EngineRouter: query='{}' metric_storage={:?} stat={:?}",
-        parsed_request.query, metric_storage, stat,
-    );
-
-    let router_result = state
-        .query_router
-        .execute_range_routed(
-            &parsed_request.query,
-            stat,
-            metric_storage,
-            start_ms,
-            end_ms,
-            step_ms,
-        )
-        .await;
-
-    match router_result {
-        Ok((query_result, data_source_id)) => {
-            let query_duration = query_start_time.elapsed();
-            debug!(
-                "EngineRouter range dispatch took: {:.2}ms",
-                query_duration.as_secs_f64() * 1000.0
-            );
-            let total_duration = start_time.elapsed();
-            debug!(
-                "Total range query processing took: {:.2}ms",
-                total_duration.as_secs_f64() * 1000.0
-            );
-            match state
-                .adapter
-                .format_range_success_response(
-                    &query_result,
-                    &asap_types::KeyByLabelNames::default(),
-                )
-                .await
-            {
-                Ok(response) => {
-                    annotate_data_source(response.into_response(), data_source_id).await
-                }
-                Err(status) => status.into_response(),
-            }
-        }
-        Err(EngineRouterError::NoEngineRegistered { tried, registered }) => {
-            warn!(
-                tried = ?tried,
-                registered = ?registered,
-                "EngineRouter (range): no engine registered for any compatible backend",
-            );
-            (
-                StatusCode::SERVICE_UNAVAILABLE,
-                Json(serde_json::json!({
-                    "status": "error",
-                    "errorType": "internal",
-                    "error": format!(
-                        "no engine registered for any compatible backend; tried {tried:?}, registered={registered:?}"
-                    )})),
-            )
-                .into_response()
-        }
-        Err(EngineRouterError::AllFailed { last }) => {
-            use crate::query_engines::EngineError;
-            warn!(error = %last, "EngineRouter (range): all compatible engines failed");
-            // A terminal CapabilityMiss means no tier could serve the
-            // range query — surface the adapter's "unsupported query"
-            // response (the wire shape browsers / dashboards expect),
-            // matching the pre-refactor fall-through. A Backend error
-            // is a real upstream failure → 5xx.
-            match &last {
-                EngineError::CapabilityMiss { .. } => {
-                    debug!(
-                        "Range query CapabilityMiss across all tiers for query='{}', \
-                         falling through to unsupported",
-                        parsed_request.query
-                    );
-                    if let Some(fallback) = &state.fallback {
-                        match fallback
-                            .execute_range_query_with_headers(parsed_request, forwarding_headers)
-                            .await
-                        {
-                            Ok(response) => response.into_response(),
-                            Err(status) => status.into_response(),
-                        }
-                    } else {
-                        record_disabled_forwarding(state, "prometheus", "range");
-                        match state.adapter.format_unsupported_query_response().await {
-                            Ok(json) => json.into_response(),
-                            Err(status) => status.into_response(),
-                        }
-                    }
-                }
-                EngineError::Physical(_) => (
-                    StatusCode::INTERNAL_SERVER_ERROR,
-                    Json(serde_json::json!({"status": "error", "errorType": "execution", "error": last.to_string()})),
-                ).into_response(),
-                EngineError::Backend { .. } => (
-                    StatusCode::INTERNAL_SERVER_ERROR,
-                    Json(serde_json::json!({
-                        "status": "error",
-                        "errorType": "internal",
-                        "error": last.to_string()})),
-                )
-                    .into_response(),
-            }
-        }
-    }
-}
-
-async fn handle_range_query(
-    query_params: Query<HashMap<String, String>>,
-    headers: HeaderMap,
-    State(state): State<AppState>,
-) -> Response {
-    let _timer = srv_metrics::start_query_timer(srv_metrics::QUERY_TYPE_RANGE);
-    let start_time = Instant::now();
-    debug!("=== INCOMING RANGE QUERY GET REQUEST ===");
-    debug!("Raw query params: {:?}", query_params.0);
-
-    let accuracy = match extract_accuracy(&headers) {
-        Ok(accuracy) => accuracy,
-        Err(error) => return invalid_accuracy_response(error),
-    };
-    let parsed_request = match state.adapter.parse_range_get_request(query_params).await {
-        Ok(req) => {
-            debug!(
-                "Successfully parsed range query - query: '{}', start: {}, end: {}, step: {}",
-                req.query, req.start, req.end, req.step
-            );
-            req
-        }
-        Err(parse_error) => {
-            debug!("Failed to parse range query request: {:?}", parse_error);
-            srv_metrics::record_query_outcome(
-                srv_metrics::QUERY_TYPE_RANGE,
-                srv_metrics::QUERY_STATUS_ERROR,
-            );
-            return match state.adapter.format_error_response(&parse_error).await {
-                Ok(json) => json.into_response(),
-                Err(status) => status.into_response(),
-            };
-        }
-    };
-    let tenant = extract_tenant(&headers);
-
-    let response = process_range_query_request(
-        &state,
-        &parsed_request,
-        start_time,
-        extract_fallback_headers(&headers),
-        accuracy,
-        &tenant,
-    )
-    .await;
-    srv_metrics::record_query_outcome(srv_metrics::QUERY_TYPE_RANGE, query_status_label(&response));
-    response
-}
-
-async fn handle_range_query_post(
-    State(state): State<AppState>,
-    headers: HeaderMap,
-    body: Bytes,
-) -> Response {
-    let _timer = srv_metrics::start_query_timer(srv_metrics::QUERY_TYPE_RANGE);
-    let start_time = Instant::now();
-    debug!("=== INCOMING RANGE QUERY POST REQUEST ===");
-    let accuracy = match extract_accuracy(&headers) {
-        Ok(accuracy) => accuracy,
-        Err(error) => return invalid_accuracy_response(error),
-    };
-
-    // Parse the body as form data
-    let body_str = match String::from_utf8(body.to_vec()) {
-        Ok(s) => s,
-        Err(e) => {
-            debug!("Failed to parse body as UTF-8: {}", e);
-            use crate::drivers::query::adapters::AdapterError;
-            srv_metrics::record_query_outcome(
-                srv_metrics::QUERY_TYPE_RANGE,
-                srv_metrics::QUERY_STATUS_ERROR,
-            );
-            return match state
-                .adapter
-                .format_error_response(&AdapterError::ParseError(format!(
-                    "Invalid UTF-8 in request body: {}",
-                    e
-                )))
-                .await
-            {
-                Ok(json) => json.into_response(),
-                Err(status) => status.into_response(),
-            };
-        }
-    };
-
-    // Parse form parameters
-    let params: HashMap<String, String> = form_urlencoded::parse(body_str.as_bytes())
-        .into_owned()
-        .collect();
-    debug!("Form params extracted: {:?}", params);
-
-    let parsed_request = match state.adapter.parse_range_post_request(Form(params)).await {
-        Ok(req) => {
-            debug!(
-                "Successfully parsed range POST - query: '{}', start: {}, end: {}, step: {}",
-                req.query, req.start, req.end, req.step
-            );
-            req
-        }
-        Err(parse_error) => {
-            debug!("Failed to parse range POST request: {:?}", parse_error);
-            srv_metrics::record_query_outcome(
-                srv_metrics::QUERY_TYPE_RANGE,
-                srv_metrics::QUERY_STATUS_ERROR,
-            );
-            return match state.adapter.format_error_response(&parse_error).await {
-                Ok(json) => json.into_response(),
-                Err(status) => status.into_response(),
-            };
-        }
-    };
-    let tenant = extract_tenant(&headers);
-
-    let response = process_range_query_request(
-        &state,
-        &parsed_request,
-        start_time,
-        extract_fallback_headers(&headers),
-        accuracy,
-        &tenant,
-    )
-    .await;
-    srv_metrics::record_query_outcome(srv_metrics::QUERY_TYPE_RANGE, query_status_label(&response));
-    response
-}
-
-#[cfg(test)]
-mod tests {
-    #[tokio::test]
-    async fn no_result_error_is_not_annotated_as_warm() {
-        use axum::response::IntoResponse;
-        for (status, body) in [
-            (
-                StatusCode::OK,
-                serde_json::json!({"status":"error","data":null,
-                "errorType":"bad_data","error":"No result for query"}),
-            ),
-            (
-                StatusCode::INTERNAL_SERVER_ERROR,
-                serde_json::json!({"status":"success","data":{"result":[]}}),
-            ),
-            (StatusCode::OK, serde_json::json!({"status":"success"})),
-            (
-                StatusCode::OK,
-                serde_json::json!({"status":"success","data":null}),
-            ),
-        ] {
-            let response = super::annotate_data_source(
-                (status, axum::Json(body.clone())).into_response(),
-                "asap_query",
-            )
-            .await;
-            assert!(!response.headers().contains_key("x-asap-execution"));
-            let bytes = axum::body::to_bytes(response.into_body(), 4096)
-                .await
-                .unwrap();
-            let actual: serde_json::Value = serde_json::from_slice(&bytes).unwrap();
-            assert!(actual.get("infos").is_none());
-            assert_eq!(actual, body);
-        }
-    }
-    use super::*;
-    use crate::drivers::ingest::prometheus_remote_write::{
-        Label, PrometheusRemoteWriteConfig, PrometheusRemoteWriteReceiver, Sample, TimeSeries,
-        WriteRequest,
-    };
-    use crate::precompute_engine::ingest_handler::{IngestObservability, IngestState};
-    use crate::precompute_engine::series_router::SeriesRouter;
-    use crate::query_engines::ASAPQueryEngine;
-    use crate::storage_engines::types::{InstalledPrecomputePlan, InstalledPrecomputePlanHandle};
-    use prost::Message;
-    use reqwest::Client;
-    use std::sync::atomic::AtomicU64;
-    use std::sync::Arc;
-    use tokio::sync::mpsc;
-
-    async fn setup_test_server() -> u16 {
-        setup_test_server_with_hot_reload(None).await
-    }
-
-    async fn setup_remote_write_test_server() -> (u16, PrometheusRemoteWriteReceiver) {
-        use asap_types::producer_plan::{FrameIdentityContract, SequenceScope, TransmissionPlan};
-        use control_plane::physical::compiler::{
-            IngestContract, IngestProtocol, PlanEnvelope, PrecomputePlan, TimestampUnit,
-            PLANNER_REVISION,
-        };
-        let installed_precompute_plan = Arc::new(InstalledPrecomputePlan::default());
-        let envelope = PlanEnvelope {
-            plan_id: 7,
-            plan_version: 1,
-            generated_at_unix_ms: 0,
-            activation_unix_ms: 1,
-            expiry_unix_ms: None,
-            backend_compat: asap_types::precompute_plan::BACKEND_COMPAT.into(),
-            planner_revision: PLANNER_REVISION.into(),
-            capability_snapshot_id: "test".into(),
-        };
-        let catalog = Arc::new(
-            asap_types::summary_catalog::SummaryCatalog::from_materializations(7, 1, &[]).unwrap(),
-        );
-        let generation = catalog.reference().unwrap();
-        let summary_store = Arc::new(crate::storage_engines::sketch_db::index::SketchStore::new());
-        summary_store
-            .install_summary_catalog(Arc::clone(&catalog))
-            .unwrap();
-        let active = crate::storage_engines::types::ActivePhysicalPlanHandle::new(
-            crate::storage_engines::types::RuntimePhysicalPlan {
-                readout_programs: Default::default(),
-                envelope: envelope.clone(),
-                summary_catalog: Some(Arc::clone(&catalog)),
-                precompute_plan: PrecomputePlan {
-                    summary_catalog: Some(generation.clone()),
-                    envelope: envelope.clone(),
-                    ingest: IngestContract {
-                        dataset_identity: None,
-                        protocol: IngestProtocol::PrometheusRemoteWriteV1,
-                        endpoint_path: "/api/v1/write".into(),
-                        timestamp_unit: TimestampUnit::UnixMilliseconds,
-                        require_plan_identity: false,
-                        require_stored_output_identity: false,
-                        require_registered_producer: false,
-                    },
-                    schemas: Vec::new(),
-                    producers: Vec::new(),
-                    executable_dags: Default::default(),
-                    materializations: Vec::new(),
-                },
-                transmission_plan: TransmissionPlan {
-                    summary_catalog: Some(generation),
-                    envelope,
-                    frame_identity: FrameIdentityContract {
-                        identity_version: 1,
-                        sequence_scope: SequenceScope::MaterializationSeriesProducerEpoch,
-                        require_checkpoint_for_full: true,
-                        require_base_checkpoint_for_delta: true,
-                    },
-                    rules: Vec::new(),
-                },
-                installed_precompute_plan: installed_precompute_plan.clone(),
-                query_plan: Arc::new(asap_types::query_plan::QueryPlan {
-                    plan_id: 7,
-                    plan_version: 1,
-                    clickhouse_context: None,
-                    selected_dags: Default::default(),
-                    entries: Default::default(),
-                }),
-                storage_routing: Arc::new(
-                    crate::storage_engines::types::BackendStorageRouting::empty(),
-                ),
-            },
-        );
-        let hot_reload = InstalledPrecomputePlanHandle::from_active_physical_plan(active.clone());
-        let (sender, _worker) = mpsc::channel(8);
-        let ingest = Arc::new(IngestState {
-            router: SeriesRouter::new(vec![sender]),
-            samples_ingested: AtomicU64::new(0),
-            samples_blocked_by_schema_barrier: AtomicU64::new(0),
-            hot_reload_config: hot_reload,
-            pass_raw_samples: false,
-            sketch_snapshots: dashmap::DashMap::new(),
-            series_resolver: Arc::new(crate::drivers::ingest::SeriesIdResolver::new()),
-            summary_store: Arc::clone(&summary_store),
-            observability: IngestObservability::default(),
-        });
-        let receiver =
-            PrometheusRemoteWriteReceiver::new(PrometheusRemoteWriteConfig::default(), ingest);
-        let adapter_config = AdapterConfig::prometheus_promql("http://127.0.0.1:9".into(), false);
-        let server = HttpServer::new(
-            HttpServerConfig {
-                port: 0,
-                handle_http_requests: true,
-                adapter_config,
-            },
-            Arc::new(ASAPQueryEngine::new(15_000)),
-            summary_store,
-        )
-        .with_active_physical_plan(active)
-        .with_remote_write(receiver.clone());
-        (server.start_test_server().await.unwrap(), receiver)
-    }
-
-    #[tokio::test]
-    async fn remote_write_http_contract_accepts_v1_and_rejects_wrong_encoding() {
-        let (port, receiver) = setup_remote_write_test_server().await;
-        let request = WriteRequest {
-            timeseries: vec![TimeSeries {
-                labels: vec![Label {
-                    name: "__name__".into(),
-                    value: "up".into(),
-                }],
-                samples: vec![Sample {
-                    value: 1.0,
-                    timestamp: 123,
-                }],
-                exemplars: Vec::new(),
-                histograms: Vec::new(),
-            }],
-        };
-        let body = snap::raw::Encoder::new()
-            .compress_vec(&request.encode_to_vec())
-            .unwrap();
-        let client = Client::new();
-        let accepted = client
-            .post(format!("http://127.0.0.1:{port}/api/v1/write"))
-            .header("content-encoding", "snappy")
-            .header("content-type", "application/x-protobuf")
-            .header("x-prometheus-remote-write-version", "0.1.0")
-            .body(body.clone())
-            .send()
-            .await
-            .unwrap();
-        assert_eq!(accepted.status().as_u16(), StatusCode::NO_CONTENT.as_u16());
-        let ready = client
-            .get(format!("http://127.0.0.1:{port}/api/v1/health"))
-            .send()
-            .await
-            .unwrap();
-        assert_eq!(ready.status().as_u16(), StatusCode::OK.as_u16());
-        assert_eq!(
-            receiver
-                .stats()
-                .samples
-                .load(std::sync::atomic::Ordering::Relaxed),
-            1
-        );
-
-        let rejected = client
-            .post(format!("http://127.0.0.1:{port}/api/v1/write"))
-            .header("content-encoding", "gzip")
-            .header("content-type", "application/x-protobuf")
-            .body(body)
-            .send()
-            .await
-            .unwrap();
-        assert_eq!(
-            rejected.status().as_u16(),
-            StatusCode::UNSUPPORTED_MEDIA_TYPE.as_u16()
-        );
-    }
-
-    async fn setup_test_server_with_hot_reload(
-        hot_reload: Option<InstalledPrecomputePlanHandle>,
-    ) -> u16 {
-        let adapter_config = AdapterConfig::prometheus_promql(
-            "http://127.0.0.1:9999".to_string(), // Unused for this test
-            false,                               // forward_unsupported_queries
-        );
-
-        let config = HttpServerConfig {
-            port: 0,
-            handle_http_requests: true,
-            adapter_config,
-        };
-
-        let installed_precompute_plan = Arc::new(InstalledPrecomputePlan::default());
-        let query_engine = Arc::new(ASAPQueryEngine::new(15000));
-
-        let mut server = HttpServer::new(
-            config,
-            query_engine,
-            Arc::new(crate::storage_engines::sketch_db::index::SketchStore::new()),
-        );
-        if let Some(handle) = hot_reload {
-            server = server.with_hot_reload_config(handle);
-        }
-        server
-            .start_test_server()
-            .await
-            .expect("Failed to start test server")
-    }
-
-    async fn setup_victoriametrics_test_server(fallback_url: String) -> u16 {
-        use crate::drivers::query::adapters::VictoriaMetricsHttpAdapter;
-        let adapter_config = AdapterConfig::victoriametrics_metricsql(fallback_url);
-        let server = HttpServer::new(
-            HttpServerConfig {
-                port: 0,
-                handle_http_requests: true,
-                adapter_config: adapter_config.clone(),
-            },
-            Arc::new(ASAPQueryEngine::new(15_000)),
-            Arc::new(crate::storage_engines::sketch_db::index::SketchStore::new()),
-        )
-        .with_protocol_adapter(Arc::new(VictoriaMetricsHttpAdapter::new(adapter_config)));
-        server.start_test_server().await.unwrap()
-    }
-
-    #[tokio::test]
-    async fn victoriametrics_cluster_routes_are_registered() {
-        let port = setup_victoriametrics_test_server("http://127.0.0.1:9999".into()).await;
-        let response = Client::new()
-            .get(format!(
-                "http://127.0.0.1:{port}/select/42/prometheus/api/v1/query"
-            ))
-            .query(&[("query", "default_rollup(cpu[5m])"), ("time", "1")])
-            .send()
-            .await
-            .unwrap();
-        assert_ne!(response.status(), reqwest::StatusCode::NOT_FOUND);
-    }
-
-    #[tokio::test]
-    async fn promql_exact_request_forwards_to_prometheus() {
-        let upstream = Router::new().route(
-            "/api/v1/query",
-            get(|Query(params): Query<HashMap<String, String>>| async move {
-                Json(serde_json::json!({
-                    "status": "success",
-                    "data": {"received": params["query"]}
-                }))
-            }),
-        );
-        let listener = TcpListener::bind("127.0.0.1:0").await.unwrap();
-        let address = listener.local_addr().unwrap();
-        tokio::spawn(async move { axum::serve(listener, upstream).await.unwrap() });
-        let config = AdapterConfig::prometheus_promql(format!("http://{address}"), true);
-        let server = HttpServer::new(
-            HttpServerConfig {
-                port: 0,
-                handle_http_requests: true,
-                adapter_config: config,
-            },
-            Arc::new(ASAPQueryEngine::new(15_000)),
-            Arc::new(crate::storage_engines::sketch_db::index::SketchStore::new()),
-        );
-        let port = server.start_test_server().await.unwrap();
-        let response = Client::new()
-            .get(format!("http://127.0.0.1:{port}/api/v1/query"))
-            .header(ACCURACY_HEADER, "exact")
-            .query(&[("query", "sum_over_time(foo[5m])"), ("time", "1")])
-            .send()
-            .await
-            .unwrap();
-        assert_eq!(response.status(), reqwest::StatusCode::OK);
-        let payload: serde_json::Value = response.json().await.unwrap();
-        assert_eq!(payload["data"]["received"], "sum_over_time(foo[5m])");
-    }
-
-    #[tokio::test]
-    async fn metricsql_exact_request_forwards_to_victoriametrics() {
-        let upstream = Router::new().route(
-            "/api/v1/query",
-            get(|Query(params): Query<HashMap<String, String>>| async move {
-                Json(serde_json::json!({
-                    "status": "success",
-                    "data": {"received": params["query"]}
-                }))
-            }),
-        );
-        let listener = TcpListener::bind("127.0.0.1:0").await.unwrap();
-        let address = listener.local_addr().unwrap();
-        tokio::spawn(async move { axum::serve(listener, upstream).await.unwrap() });
-        let port = setup_victoriametrics_test_server(format!("http://{address}")).await;
-        let response = Client::new()
-            .get(format!("http://127.0.0.1:{port}/api/v1/query"))
-            .header(ACCURACY_HEADER, "exact")
-            .query(&[
-                ("query", "rate(requests[5m]) keep_metric_names"),
-                ("time", "1"),
-            ])
-            .send()
-            .await
-            .unwrap();
-        assert_eq!(response.status(), reqwest::StatusCode::OK);
-        let payload: serde_json::Value = response.json().await.unwrap();
-        assert_eq!(
-            payload["data"]["received"],
-            "rate(requests[5m]) keep_metric_names"
-        );
-    }
-
-    #[tokio::test]
-    async fn test_get_endpoint_plus_symbol_decoding() {
-        // Enable debug logging for this test
-        // let _ = tracing_subscriber::fmt()
-        //     .with_env_filter("debug")
-        //     .try_init();
-
-        let server_port = setup_test_server().await;
-        let client = Client::new();
-
-        // Test query with + symbols that should become spaces
-        let test_query = "quantile by (instance, job) (0.95, fake_metric_total)";
-
-        println!("Sending query: {test_query}");
-
-        let response = client
-            .get(format!("http://127.0.0.1:{server_port}/api/v1/query"))
-            .query(&[("query", test_query)])
-            .send()
-            .await
-            .expect("Failed to send request");
-
-        let status = response.status();
-        let response_json: serde_json::Value = response.json().await.expect("Failed to parse JSON");
-
-        println!("Response status: {status}");
-        println!("Response JSON: {response_json}");
-
-        // The debug logs should show what query was actually parsed
-        assert!(status.is_success() || status == reqwest::StatusCode::OK);
-    }
-
-    #[tokio::test]
-    async fn test_post_endpoint_form_decoding() {
-        // let _ = tracing_subscriber::fmt()
-        //     .with_env_filter("debug")
-        //     .try_init();
-
-        let server_port = setup_test_server().await;
-        let client = Client::new();
-
-        // Test the same query via POST with form encoding
-        let test_query = "quantile+by+(instance,+job)+(0.95,+fake_metric_total)";
-
-        println!("Sending POST with form data: {test_query}");
-
-        let response = client
-            .post(format!("http://127.0.0.1:{server_port}/api/v1/query"))
-            .header("content-type", "application/x-www-form-urlencoded")
-            .body(format!("query={test_query}&time=1758161478.205"))
-            .send()
-            .await
-            .expect("Failed to send request");
-
-        let status = response.status();
-        let response_json: serde_json::Value = response.json().await.expect("Failed to parse JSON");
-
-        println!("Response status: {status}");
-        println!("Response JSON: {response_json}");
-
-        assert!(status.is_success() || status == reqwest::StatusCode::OK);
-    }
-
-    // ── InstalledPrecomputePlan hot-reload (PR E) ────────────────────────────────
-
-    /// A retired partial-configuration route cannot mutate the active plan.
-    #[tokio::test]
-    async fn flat_streaming_config_is_rejected_without_mutating_active_state() {
-        let handle = InstalledPrecomputePlanHandle::new(InstalledPrecomputePlan::default());
-        let port = setup_test_server_with_hot_reload(Some(handle.clone())).await;
-        let before = handle.snapshot();
-        let response = Client::new()
-            .post(format!("http://127.0.0.1:{port}/api/v1/streaming-config"))
-            .body("aggregations: [{aggregationType: Sum, metric: m}]")
-            .send()
-            .await
-            .unwrap();
-        assert_eq!(response.status(), reqwest::StatusCode::NOT_FOUND);
-        assert!(Arc::ptr_eq(&before, &handle.snapshot()));
-    }
-
-    #[tokio::test]
-    async fn test_streaming_config_route_is_absent_without_legacy_handle() {
-        // A server without a legacy hot-reload handle does not expose this route.
-        let server_port = setup_test_server().await;
-        let client = Client::new();
-
-        let get_resp = client
-            .get(format!(
-                "http://127.0.0.1:{server_port}/api/v1/streaming-config"
-            ))
-            .send()
-            .await
-            .unwrap();
-        assert_eq!(get_resp.status(), reqwest::StatusCode::NOT_FOUND);
-
-        let post_resp = client
-            .post(format!(
-                "http://127.0.0.1:{server_port}/api/v1/streaming-config"
-            ))
-            .body("anything")
-            .send()
-            .await
-            .unwrap();
-        assert_eq!(post_resp.status(), reqwest::StatusCode::NOT_FOUND);
-    }
-
-    #[tokio::test]
-    async fn test_streaming_config_hot_reload_rejects_bad_yaml() {
-        let hot_reload = InstalledPrecomputePlanHandle::new(InstalledPrecomputePlan::default());
-        let server_port = setup_test_server_with_hot_reload(Some(hot_reload)).await;
-        let client = Client::new();
-
-        let resp = client
-            .post(format!(
-                "http://127.0.0.1:{server_port}/api/v1/streaming-config"
-            ))
-            .body("not: : : valid: yaml: :")
-            .send()
-            .await
-            .unwrap();
-        assert_eq!(resp.status(), reqwest::StatusCode::NOT_FOUND);
-    }
-
-    /// Set up a test server wired with a hot-reload handle and a
-    /// shared `SketchStore` (the sid catalog the new sid-level
-    /// reconcile reads + writes). Returns `(port, sketch_index)` so
-    /// tests can pre-register sids or inspect the catalog after a
-    /// streaming-config swap. Schema retirement final cut: the
-    /// legacy `SchemaRegistry` is gone, so there is no longer a
-    /// `schemas` parameter — every reconcile decision is sid-level.
-    async fn setup_test_server_with_hot_reload_and_sketch_index(
-        hot_reload: InstalledPrecomputePlanHandle,
-        summary_store: Arc<crate::storage_engines::sketch_db::index::SketchStore>,
-    ) -> u16 {
-        let adapter_config =
-            AdapterConfig::prometheus_promql("http://127.0.0.1:9999".to_string(), false);
-        let config = HttpServerConfig {
-            port: 0,
-            handle_http_requests: true,
-            adapter_config,
-        };
-        let installed_precompute_plan = Arc::new(InstalledPrecomputePlan::default());
-        let query_engine = Arc::new(ASAPQueryEngine::new(15000));
-        let server =
-            HttpServer::new(config, query_engine, summary_store).with_hot_reload_config(hot_reload);
-        server
-            .start_test_server()
-            .await
-            .expect("Failed to start test server")
-    }
-
-    /// Helper that mints a Precompute-`Sum` sid registered as Active
-    /// against the supplied `(metric, group_by)` signature. Tests
-    /// pre-populate the sid catalog so the streaming-config swap
-    /// handler has something concrete to reconcile.
-    fn register_precompute_sid(
-        store: &crate::storage_engines::sketch_db::index::SketchStore,
-        sid: u64,
-        metric: &str,
-        group_by: &[&str],
-    ) {
-        use crate::storage_engines::sketch_db::data::AggKind;
-        use crate::storage_engines::sketch_db::index::SummarySeriesMetadata;
-        use std::collections::BTreeSet;
-        let group_by_keys: BTreeSet<String> = group_by.iter().map(|s| s.to_string()).collect();
-        store.register(SummarySeriesMetadata {
-            storage_handle: sid,
-            metric_name: metric.to_string(),
-            group_by_keys,
-            capability: None,
-            agg_kind: AggKind::ExactAgg {
-                agg_type: asap_types::AggregationType::Sum,
-                parameters_canonical: String::new(),
-                spatial_filter_canonical: String::new(),
-            },
-            accuracy: None,
-            first_seen_unix_ms: 0,
-            retired_at_ms: None,
-            expires_at_ms: None,
-            policy_fp: asap_types::PolicyFingerprint::UNSET,
-        });
-    }
-
-    #[tokio::test]
-    async fn test_get_schemas_returns_active_and_retired_sids_with_status_filter() {
-        // Schema retirement final cut: `/api/v1/db/schemas` now
-        // surfaces sid-catalog entries. Pre-register two sids, then
-        // POST a streaming config that orphans one — the swap
-        // handler force-retires it.
-        use crate::storage_engines::sketch_db::index::SketchStore;
-
-        let hot_reload = InstalledPrecomputePlanHandle::new(InstalledPrecomputePlan::default());
-        let summary_store = Arc::new(SketchStore::new());
-        register_precompute_sid(&summary_store, 1, "m1", &[]);
-        register_precompute_sid(&summary_store, 2, "m2", &[]);
-        let server_port = setup_test_server_with_hot_reload_and_sketch_index(
-            hot_reload.clone(),
-            summary_store.clone(),
-        )
-        .await;
-        let client = Client::new();
-
-        assert!(summary_store
-            .force_retire(
-                2,
-                crate::storage_engines::sketch_db::DEFAULT_RETIREMENT_RETENTION
-            )
-            .is_some());
-
-        // GET /api/v1/db/schemas (no filter = all).
-        let resp = client
-            .get(format!("http://127.0.0.1:{server_port}/api/v1/db/schemas"))
-            .send()
-            .await
-            .unwrap();
-        assert!(resp.status().is_success());
-        let body: serde_json::Value = resp.json().await.unwrap();
-        assert_eq!(body["status"], "success");
-        assert_eq!(body["count"], 2);
-        let entries = body["schemas"].as_array().unwrap();
-        // Sorted by sid — first is active, second is retired.
-        assert_eq!(entries[0]["storage_handle"], 1);
-        assert_eq!(entries[0]["status"], "active");
-        assert_eq!(entries[0]["metric_name"], "m1");
-        assert!(entries[0]["retired_at_ms"].is_null());
-        assert_eq!(entries[1]["storage_handle"], 2);
-        assert_eq!(entries[1]["status"], "retired");
-        assert!(entries[1]["retired_at_ms"].is_u64());
-
-        // Filter: active only.
-        let resp = client
-            .get(format!(
-                "http://127.0.0.1:{server_port}/api/v1/db/schemas?status=active"
-            ))
-            .send()
-            .await
-            .unwrap();
-        let body: serde_json::Value = resp.json().await.unwrap();
-        assert_eq!(body["count"], 1);
-        assert_eq!(body["schemas"][0]["storage_handle"], 1);
-
-        // Filter: retired only.
-        let resp = client
-            .get(format!(
-                "http://127.0.0.1:{server_port}/api/v1/db/schemas?status=retired"
-            ))
-            .send()
-            .await
-            .unwrap();
-        let body: serde_json::Value = resp.json().await.unwrap();
-        assert_eq!(body["count"], 1);
-        assert_eq!(body["schemas"][0]["storage_handle"], 2);
-
-        // Bogus filter → 400.
-        let resp = client
-            .get(format!(
-                "http://127.0.0.1:{server_port}/api/v1/db/schemas?status=junk"
-            ))
-            .send()
-            .await
-            .unwrap();
-        assert_eq!(resp.status(), reqwest::StatusCode::BAD_REQUEST);
-    }
-
-    #[tokio::test]
-    async fn test_get_schemas_with_empty_catalog_returns_empty_array() {
-        // Schema retirement final cut: the sid catalog is always
-        // attached (every `HttpServer` carries one). With no
-        // registered sids the endpoint reports an empty array, not
-        // a 503.
-        let hot_reload = InstalledPrecomputePlanHandle::new(InstalledPrecomputePlan::default());
-        let server_port = setup_test_server_with_hot_reload(Some(hot_reload)).await;
-        let client = Client::new();
-
-        let resp = client
-            .get(format!("http://127.0.0.1:{server_port}/api/v1/db/schemas"))
-            .send()
-            .await
-            .unwrap();
-        assert!(resp.status().is_success());
-        let body: serde_json::Value = resp.json().await.unwrap();
-        assert_eq!(body["status"], "success");
-        assert_eq!(body["count"], 0);
-        assert_eq!(body["schemas"].as_array().unwrap().len(), 0);
-    }
-
-    #[tokio::test]
-    async fn test_post_schema_retire_and_expire_endpoints_drive_sid_catalog() {
-        // Coverage for `POST /api/v1/db/schemas/:sid/retire` and
-        // `POST /api/v1/db/schemas/:sid/expire` after the schema
-        // retirement final cut: both routes take `:sid` and drive
-        // the sid catalog directly via `SketchStore::force_retire`
-        // and `SketchStore::force_expire`. Unknown sid → 404.
-        use crate::storage_engines::sketch_db::index::SketchStore;
-        use crate::storage_engines::sketch_db::AggStatus;
-
-        let hot_reload = InstalledPrecomputePlanHandle::new(InstalledPrecomputePlan::default());
-        let summary_store = Arc::new(SketchStore::new());
-        register_precompute_sid(&summary_store, 11, "cpu", &["host"]);
-        register_precompute_sid(&summary_store, 22, "mem", &["host"]);
-        let server_port = setup_test_server_with_hot_reload_and_sketch_index(
-            hot_reload.clone(),
-            summary_store.clone(),
-        )
-        .await;
-        let client = Client::new();
-
-        // Retire sid 11.
-        let resp = client
-            .post(format!(
-                "http://127.0.0.1:{server_port}/api/v1/db/schemas/11/retire"
-            ))
-            .send()
-            .await
-            .unwrap();
-        assert!(resp.status().is_success());
-        let body: serde_json::Value = resp.json().await.unwrap();
-        assert_eq!(body["status"], "success");
-        assert_eq!(body["schema"]["storage_handle"], 11);
-        assert_eq!(body["schema"]["status"], "retired");
-        assert_eq!(
-            summary_store.instance(11).unwrap().status(),
-            AggStatus::Retired
-        );
-
-        // Expire sid 22.
-        let resp = client
-            .post(format!(
-                "http://127.0.0.1:{server_port}/api/v1/db/schemas/22/expire"
-            ))
-            .send()
-            .await
-            .unwrap();
-        assert!(resp.status().is_success());
-        let body: serde_json::Value = resp.json().await.unwrap();
-        assert_eq!(body["status"], "success");
-        assert_eq!(body["schema"]["storage_handle"], 22);
-        assert_eq!(body["schema"]["status"], "expired");
-        assert_eq!(
-            summary_store.instance(22).unwrap().status(),
-            AggStatus::Expired
-        );
-
-        // Unknown sid → 404 for both routes.
-        for path in [
-            "/api/v1/db/schemas/9999/retire",
-            "/api/v1/db/schemas/9999/expire",
-        ] {
-            let resp = client
-                .post(format!("http://127.0.0.1:{server_port}{path}"))
-                .send()
-                .await
-                .unwrap();
-            assert_eq!(resp.status(), reqwest::StatusCode::NOT_FOUND, "{path}");
-        }
-    }
-
-    #[tokio::test]
-    async fn test_get_timeline_missing_param_returns_400() {
-        use crate::storage_engines::sketch_db::index::SketchStore;
-
-        let hot_reload = InstalledPrecomputePlanHandle::new(InstalledPrecomputePlan::default());
-        let summary_store = Arc::new(SketchStore::new());
-        let server_port = setup_test_server_with_hot_reload_and_sketch_index(
-            hot_reload.clone(),
-            summary_store.clone(),
-        )
-        .await;
-        let client = Client::new();
-
-        // No metric param → 400.
-        let resp = client
-            .get(format!(
-                "http://127.0.0.1:{server_port}/api/v1/db/timeline?start_ms=0&end_ms=100"
-            ))
-            .send()
-            .await
-            .unwrap();
-        assert_eq!(resp.status(), reqwest::StatusCode::BAD_REQUEST);
-
-        // Missing start_ms.
-        let resp = client
-            .get(format!(
-                "http://127.0.0.1:{server_port}/api/v1/db/timeline?metric=m&end_ms=100"
-            ))
-            .send()
-            .await
-            .unwrap();
-        assert_eq!(resp.status(), reqwest::StatusCode::BAD_REQUEST);
-
-        // Non-numeric start_ms.
-        let resp = client
-            .get(format!(
-                "http://127.0.0.1:{server_port}/api/v1/db/timeline?metric=m&start_ms=abc&end_ms=100"
-            ))
-            .send()
-            .await
-            .unwrap();
-        assert_eq!(resp.status(), reqwest::StatusCode::BAD_REQUEST);
-    }
-
-    #[tokio::test]
-    async fn test_get_timeline_with_no_sids_returns_empty_200() {
-        // Schema retirement #2 — the `/api/v1/db/timeline` endpoint now
-        // reads from the sid catalog (always attached) instead of the
-        // optional `SchemaRegistry`. Empty catalog → empty segments,
-        // not a 503.
-        let hot_reload = InstalledPrecomputePlanHandle::new(InstalledPrecomputePlan::default());
-        let server_port = setup_test_server_with_hot_reload(Some(hot_reload)).await;
-        let client = Client::new();
-        let resp = client
-            .get(format!(
-                "http://127.0.0.1:{server_port}/api/v1/db/timeline?metric=m&start_ms=0&end_ms=100"
-            ))
-            .send()
-            .await
-            .unwrap();
-        assert!(resp.status().is_success());
-        let body: serde_json::Value = resp.json().await.unwrap();
-        assert_eq!(body["count"], 0);
-        assert_eq!(body["segments"].as_array().unwrap().len(), 0);
-    }
-
-    // ─── backfill HTTP endpoint tests ─────────────────────────────
-
-    /// Build a server with a backfill registry and active sid fixtures. Test
-    /// markers generate per-metric configs; the returned fingerprints let callers
-    /// target those configs through HTTP.
-    async fn setup_test_server_with_backfill_and_sids(
-        registry: Arc<crate::storage_engines::sketch_db::BackfillRegistry>,
-        active_agg_ids: &[u64],
-    ) -> u16 {
-        setup_test_server_with_backfill_and_sids_returning_fps(registry, active_agg_ids)
-            .await
-            .0
-    }
-
-    /// Same as `setup_test_server_with_backfill_and_sids` but also
-    /// returns the marker→fingerprint mapping so tests can compute
-    /// the fingerprint u64 they need to POST.
-    async fn setup_test_server_with_backfill_and_sids_returning_fps(
-        registry: Arc<crate::storage_engines::sketch_db::BackfillRegistry>,
-        active_agg_ids: &[u64],
-    ) -> (u16, std::collections::HashMap<u64, u64>) {
-        use asap_types::aggregation_config::PrecomputeMaterialization;
-        use asap_types::enums::WindowKind;
-        use asap_types::AggregationType;
-        use asap_types::KeyByLabelNames;
-        use std::collections::HashMap;
-
-        let adapter_config =
-            AdapterConfig::prometheus_promql("http://127.0.0.1:9999".to_string(), false);
-        let config = HttpServerConfig {
-            port: 0,
-            handle_http_requests: true,
-            adapter_config,
-        };
-        // Build a InstalledPrecomputePlan with one Sum agg per `active_agg_ids`
-        // so the backfill handler's agg-config lookup (post-schema-
-        // retirement) can find them. The matching sid in the catalog
-        // is registered via the canonical ingest path so its content
-        // hash matches what `create_checked` would compute.
-        let mut agg_map = HashMap::new();
-        let mut marker_to_fp = std::collections::HashMap::new();
-        for marker in active_agg_ids {
-            let metric = format!("metric_{marker}");
-            let cfg = PrecomputeMaterialization {
-                stored_output_id: None,
-                semantic_fragment: None,
-                population_key_encoding: Default::default(),
-                aggregation_type: AggregationType::Sum,
-                aggregation_sub_type: String::new(),
-                parameters: HashMap::new(),
-                grouping_labels: KeyByLabelNames::empty().into(),
-                aggregated_labels: KeyByLabelNames::empty(),
-                rollup_labels: KeyByLabelNames::empty(),
-                original_yaml: String::new(),
-                window_size: 1,
-                slide_interval: 1,
-                window_type: WindowKind::Tumbling,
-                window_layout: asap_types::WindowMaterializationLayout::Pane { pane_secs: 1 },
-                pane_origin_ms: None,
-                spatial_filter: String::new(),
-                spatial_filter_normalized: String::new(),
-                metric: metric.clone(),
-                num_aggregates_to_retain: None,
-                table_name: None,
-                value_projection: None,
-                table_population: None,
-                derived_input: None,
-                table_timestamp_column: None,
-                partitioning: None,
-                value_source_column: None,
-            };
-            // PR 5: streaming-config is keyed on the policy
-            // fingerprint. Build a marker→fingerprint map so the test
-            // POSTs the right id on the wire.
-            let fp = cfg.policy_fp_u64();
-            marker_to_fp.insert(*marker, fp);
-            agg_map.insert(fp, cfg);
-        }
-        let installed_precompute_plan = Arc::new(InstalledPrecomputePlan::from_raw_ids(agg_map));
-        let hot_reload = InstalledPrecomputePlanHandle::from_arc(installed_precompute_plan.clone());
-        let query_engine = Arc::new(ASAPQueryEngine::new(15000));
-        let summary_store = Arc::new(crate::storage_engines::sketch_db::index::SketchStore::new());
-        for marker in active_agg_ids {
-            let fp = marker_to_fp[marker];
-            register_precompute_sid(&summary_store, fp, &format!("metric_{marker}"), &[]);
-        }
-        let server = HttpServer::new(config, query_engine, summary_store)
-            .with_backfill_registry(registry)
-            .with_hot_reload_config(hot_reload);
-        let port = server
-            .start_test_server()
-            .await
-            .expect("Failed to start test server");
-        (port, marker_to_fp)
-    }
-
-    #[tokio::test]
-    async fn test_backfill_full_lifecycle_through_http() {
-        let registry = Arc::new(crate::storage_engines::sketch_db::BackfillRegistry::new());
-        let (server_port, marker_to_fp) =
-            setup_test_server_with_backfill_and_sids_returning_fps(registry.clone(), &[42]).await;
-        let client = Client::new();
-        // PR 5: the streaming-config key is the policy fingerprint;
-        // POST the fingerprint, not the test marker.
-        let fp_42 = marker_to_fp[&42];
-
-        // POST creates a Queued job.
-        let req = serde_json::json!({
-            "agg_id": fp_42,
-            "start_ms": 100,
-            "end_ms": 500,
-            "source": { "Prometheus": { "url": "http://prom.local" } },
-            "windows_total": 4});
-        let resp = client
-            .post(format!("http://127.0.0.1:{server_port}/api/v1/db/backfill"))
-            .json(&req)
-            .send()
-            .await
-            .unwrap();
-        assert_eq!(resp.status(), reqwest::StatusCode::CREATED);
-        let body: serde_json::Value = resp.json().await.unwrap();
-        let job_id = body["job_id"].as_u64().expect("job_id in response");
-        assert_eq!(body["status"], "success");
-
-        // GET /jobs/:id returns the queued job.
-        let resp = client
-            .get(format!(
-                "http://127.0.0.1:{server_port}/api/v1/db/backfill/jobs/{job_id}"
-            ))
-            .send()
-            .await
-            .unwrap();
-        assert!(resp.status().is_success());
-        let body: serde_json::Value = resp.json().await.unwrap();
-        assert_eq!(body["job"]["status"], "queued");
-        assert_eq!(body["job"]["agg_id"].as_u64().unwrap(), fp_42);
-        assert_eq!(body["job"]["start_ms"], 100);
-        assert_eq!(body["job"]["windows_total"], 4);
-        assert_eq!(body["job"]["progress"], 0.0);
-
-        // GET /jobs (no filter) lists all.
-        let resp = client
-            .get(format!(
-                "http://127.0.0.1:{server_port}/api/v1/db/backfill/jobs"
-            ))
-            .send()
-            .await
-            .unwrap();
-        let body: serde_json::Value = resp.json().await.unwrap();
-        assert_eq!(body["count"], 1);
-
-        // Filter by status=queued → 1.
-        let resp = client
-            .get(format!(
-                "http://127.0.0.1:{server_port}/api/v1/db/backfill/jobs?status=queued"
-            ))
-            .send()
-            .await
-            .unwrap();
-        let body: serde_json::Value = resp.json().await.unwrap();
-        assert_eq!(body["count"], 1);
-
-        // Filter by status=running → 0.
-        let resp = client
-            .get(format!(
-                "http://127.0.0.1:{server_port}/api/v1/db/backfill/jobs?status=running"
-            ))
-            .send()
-            .await
-            .unwrap();
-        let body: serde_json::Value = resp.json().await.unwrap();
-        assert_eq!(body["count"], 0);
-
-        // DELETE cancels the job.
-        let resp = client
-            .delete(format!(
-                "http://127.0.0.1:{server_port}/api/v1/db/backfill/jobs/{job_id}"
-            ))
-            .send()
-            .await
-            .unwrap();
-        assert!(resp.status().is_success());
-        assert_eq!(
-            registry.get(job_id).unwrap().status,
-            crate::storage_engines::sketch_db::BackfillStatus::Cancelled
-        );
-
-        // Second DELETE on already-cancelled job → 409 Conflict.
-        let resp = client
-            .delete(format!(
-                "http://127.0.0.1:{server_port}/api/v1/db/backfill/jobs/{job_id}"
-            ))
-            .send()
-            .await
-            .unwrap();
-        assert_eq!(resp.status(), reqwest::StatusCode::CONFLICT);
-    }
-
-    #[tokio::test]
-    async fn test_backfill_post_rejects_inverted_range() {
-        let registry = Arc::new(crate::storage_engines::sketch_db::BackfillRegistry::new());
-        let server_port = setup_test_server_with_backfill_and_sids(registry, &[1]).await;
-        let client = Client::new();
-
-        let req = serde_json::json!({
-            "agg_id": 1,
-            "start_ms": 500,
-            "end_ms": 100,
-            "source": { "Prometheus": { "url": "http://prom.local" } },
-            "windows_total": 1});
-        let resp = client
-            .post(format!("http://127.0.0.1:{server_port}/api/v1/db/backfill"))
-            .json(&req)
-            .send()
-            .await
-            .unwrap();
-        assert_eq!(resp.status(), reqwest::StatusCode::BAD_REQUEST);
-    }
-
-    #[tokio::test]
-    async fn test_backfill_get_unknown_job_returns_404() {
-        let registry = Arc::new(crate::storage_engines::sketch_db::BackfillRegistry::new());
-        let server_port = setup_test_server_with_backfill_and_sids(registry, &[]).await;
-        let client = Client::new();
-        let resp = client
-            .get(format!(
-                "http://127.0.0.1:{server_port}/api/v1/db/backfill/jobs/9999"
-            ))
-            .send()
-            .await
-            .unwrap();
-        assert_eq!(resp.status(), reqwest::StatusCode::NOT_FOUND);
-    }
-
-    #[tokio::test]
-    async fn test_backfill_endpoints_503_without_registry() {
-        // Build a server with NO backfill registry attached — every
-        // backfill endpoint should 503.
-        let hot_reload = InstalledPrecomputePlanHandle::new(InstalledPrecomputePlan::default());
-        let server_port = setup_test_server_with_hot_reload(Some(hot_reload)).await;
-        let client = Client::new();
-
-        for (method, path) in [
-            ("GET", "/api/v1/db/backfill/jobs"),
-            ("GET", "/api/v1/db/backfill/jobs/1"),
-        ] {
-            let resp = client
-                .request(
-                    reqwest::Method::from_bytes(method.as_bytes()).unwrap(),
-                    format!("http://127.0.0.1:{server_port}{path}"),
-                )
-                .send()
-                .await
-                .unwrap();
-            assert_eq!(
-                resp.status(),
-                reqwest::StatusCode::SERVICE_UNAVAILABLE,
-                "{method} {path}"
-            );
-        }
-
-        // POST also.
-        let req = serde_json::json!({
-            "agg_id": 1,
-            "start_ms": 0,
-            "end_ms": 10,
-            "source": { "Prometheus": { "url": "x" } },
-            "windows_total": 1});
-        let resp = client
-            .post(format!("http://127.0.0.1:{server_port}/api/v1/db/backfill"))
-            .json(&req)
-            .send()
-            .await
-            .unwrap();
-        assert_eq!(resp.status(), reqwest::StatusCode::SERVICE_UNAVAILABLE);
-    }
-
-    #[tokio::test]
-    async fn test_backfill_list_bogus_status_returns_400() {
-        let registry = Arc::new(crate::storage_engines::sketch_db::BackfillRegistry::new());
-        let server_port = setup_test_server_with_backfill_and_sids(registry, &[]).await;
-        let client = Client::new();
-        let resp = client
-            .get(format!(
-                "http://127.0.0.1:{server_port}/api/v1/db/backfill/jobs?status=junk"
-            ))
-            .send()
-            .await
-            .unwrap();
-        assert_eq!(resp.status(), reqwest::StatusCode::BAD_REQUEST);
-    }
-
-    // §10.5: create_checked invariants surfacing through HTTP.
-
-    #[tokio::test]
-    async fn test_backfill_post_unknown_agg_returns_404() {
-        let registry = Arc::new(crate::storage_engines::sketch_db::BackfillRegistry::new());
-        // Empty schema registry — agg_id 42 is unknown.
-        let server_port = setup_test_server_with_backfill_and_sids(registry, &[]).await;
-        let client = Client::new();
-        let req = serde_json::json!({
-            "agg_id": 42,
-            "start_ms": 100,
-            "end_ms": 500,
-            "source": { "Prometheus": { "url": "http://prom.local" } },
-            "windows_total": 1});
-        let resp = client
-            .post(format!("http://127.0.0.1:{server_port}/api/v1/db/backfill"))
-            .json(&req)
-            .send()
-            .await
-            .unwrap();
-        assert_eq!(resp.status(), reqwest::StatusCode::NOT_FOUND);
-        let body: serde_json::Value = resp.json().await.unwrap();
-        assert_eq!(body["status"], "error");
-        assert!(body["error"]
-            .as_str()
-            .unwrap()
-            .contains("unknown agg_id 42"));
-    }
-
-    #[tokio::test]
-    async fn test_backfill_post_overlap_with_live_ingest_returns_409() {
-        let registry = Arc::new(crate::storage_engines::sketch_db::BackfillRegistry::new());
-        // Schema registered at `now` — any `end_ms` > created_at_ms
-        // overlaps live ingest.
-        let (server_port, marker_to_fp) =
-            setup_test_server_with_backfill_and_sids_returning_fps(registry, &[7]).await;
-        let client = Client::new();
-        let future_ms = std::time::SystemTime::now()
-            .duration_since(std::time::UNIX_EPOCH)
-            .unwrap()
-            .as_millis() as u64
-            + 3_600_000;
-        let req = serde_json::json!({
-            "agg_id": marker_to_fp[&7],
-            "start_ms": 0,
-            "end_ms": future_ms,
-            "source": { "Prometheus": { "url": "http://prom.local" } },
-            "windows_total": 1});
-        let resp = client
-            .post(format!("http://127.0.0.1:{server_port}/api/v1/db/backfill"))
-            .json(&req)
-            .send()
-            .await
-            .unwrap();
-        assert_eq!(resp.status(), reqwest::StatusCode::CONFLICT);
-    }
-
-    // HTTP routing tests verify configured engine dispatch and the response
-    // `data_source` annotation.
-
-    use crate::query_engines::routing::{EngineCapabilities, QueryEngine};
-    use crate::query_engines::{EngineError, QueryResult};
-    use async_trait::async_trait;
-    use std::sync::atomic::{AtomicUsize, Ordering};
-
-    /// In-test stub `QueryEngine`. Records call counts and returns a
-    /// canned `QueryResult` keyed to the configured `data_source_id`
-    /// so HTTP-level assertions can pin which engine answered.
-    struct MockQueryEngine {
-        caps: EngineCapabilities,
-        calls: Arc<AtomicUsize>,
-        outcome: MockOutcome,
-    }
-
-    #[derive(Clone)]
-    enum MockOutcome {
-        Physical(asap_physical_operators::Error),
-        /// Empty instant vector — the Prometheus adapter still
-        /// produces `status=success` with `data.result=[]`.
-        OkEmpty,
-        /// Force the engine to fail with `EngineError::Backend` so
-        /// the router falls through to the next compatible backend.
-        Backend,
-    }
-
-    impl MockQueryEngine {
-        fn new(backend: StorageBackend, outcome: MockOutcome) -> (Arc<Self>, Arc<AtomicUsize>) {
-            let calls = Arc::new(AtomicUsize::new(0));
-            let engine = Arc::new(Self {
-                caps: EngineCapabilities {
-                    data_source_id: backend.data_source_id(),
-                    storage_backend: backend,
-                    supports_streams_above_bytes: 1024 * 1024,
-                },
-                calls: calls.clone(),
-                outcome,
-            });
-            (engine, calls)
-        }
-    }
-
-    #[async_trait]
-    impl QueryEngine for MockQueryEngine {
-        async fn execute(&self, _query: &str) -> Result<QueryResult, EngineError> {
-            self.calls.fetch_add(1, Ordering::SeqCst);
-            match &self.outcome {
-                MockOutcome::Physical(error) => Err(EngineError::Physical(error.clone())),
-                MockOutcome::OkEmpty => Ok(QueryResult::vector(Vec::new(), 0)),
-                MockOutcome::Backend => Err(EngineError::backend(
-                    self.caps.data_source_id,
-                    "simulated backend failure",
-                )),
-            }
-        }
-        fn capabilities(&self) -> EngineCapabilities {
-            self.caps
-        }
-
-        async fn execute_range(
-            &self,
-            _query: &str,
-            _start_ms: u64,
-            _end_ms: u64,
-            _step_ms: u64,
-        ) -> Result<QueryResult, EngineError> {
-            self.calls.fetch_add(1, Ordering::SeqCst);
-            match &self.outcome {
-                MockOutcome::Physical(error) => Err(EngineError::Physical(error.clone())),
-                MockOutcome::OkEmpty => Ok(QueryResult::matrix(Vec::new())),
-                MockOutcome::Backend => Err(EngineError::backend(
-                    self.caps.data_source_id,
-                    "simulated backend failure",
-                )),
-            }
-        }
-    }
-
-    /// Build an `HttpServer` whose router holds the supplied set of
-    /// `QueryEngine`s. The hot-reload `InstalledPrecomputePlan` is pinned at
-    /// `metric_storage_backend` so query dispatch follows the
-    /// requested capability axis. Returns the bound port + the
-    /// `InstalledPrecomputePlanHandle` handle so tests can swap the
-    /// `storage_backend` mid-flight if they need to.
-    async fn setup_test_server_with_router(
-        metric_storage_backend: StorageBackend,
-        extra_engines: Vec<Arc<dyn QueryEngine>>,
-    ) -> u16 {
-        setup_test_server_with_router_and_fallback(metric_storage_backend, extra_engines, false)
-            .await
-    }
-
-    async fn setup_test_server_with_router_and_fallback(
-        metric_storage_backend: StorageBackend,
-        extra_engines: Vec<Arc<dyn QueryEngine>>,
-        forward_unsupported: bool,
-    ) -> u16 {
-        let adapter_config = AdapterConfig::prometheus_promql(
-            "http://127.0.0.1:9999".to_string(),
-            forward_unsupported,
-        );
-        let config = HttpServerConfig {
-            port: 0,
-            handle_http_requests: true,
-            adapter_config,
-        };
-        // Pin `storage_backend` on the streaming config so the http
-        // dispatcher reads it back through the hot-reload handle.
-        let streaming_cfg = InstalledPrecomputePlan::with_storage_backend(
-            Default::default(),
-            metric_storage_backend,
-        );
-        let streaming_arc = Arc::new(streaming_cfg);
-        let hot_reload = InstalledPrecomputePlanHandle::from_arc(streaming_arc.clone());
-        let query_engine = Arc::new(ASAPQueryEngine::new(15000));
-        let mut server = HttpServer::new(
-            config,
-            query_engine,
-            Arc::new(crate::storage_engines::sketch_db::index::SketchStore::new()),
-        )
-        .with_hot_reload_config(hot_reload);
-        for engine in extra_engines {
-            server = server.with_query_engine(engine);
-        }
-        server
-            .start_test_server()
-            .await
-            .expect("Failed to start test server")
-    }
-
-    /// Build an `HttpServer` wired with a per-metric
-    /// `BackendStorageRouting` table — the **production path** the
-    /// issue-46 MVP relies on. The streaming-config single axis stays
-    /// at `SketchStore` (the realistic deploy state); the routing
-    /// table is what flips per-metric dispatch over to the
-    /// `EngineRouter`. This proves the production code path
-    /// (`process_query_request → resolve_metric_storage → routing
-    /// table lookup`), as opposed to the
-    /// `setup_test_server_with_router` helper above which mocks the
-    /// resolution by pinning `streaming_cfg.storage_backend` directly.
-    async fn setup_test_server_with_routing_table(
-        routing: crate::storage_engines::types::BackendStorageRouting,
-        extra_engines: Vec<Arc<dyn QueryEngine>>,
-    ) -> u16 {
-        let adapter_config =
-            AdapterConfig::prometheus_promql("http://127.0.0.1:9999".to_string(), false);
-        let config = HttpServerConfig {
-            port: 0,
-            handle_http_requests: true,
-            adapter_config,
-        };
-        // Streaming-config stays on the default `SketchStore` axis
-        // — exactly what the production deploy looks like (the YAML
-        // loader doesn't parse `storage_backend`). All routing
-        // decisions must come from the per-metric routing table.
-        let streaming_cfg = InstalledPrecomputePlan::default();
-        let streaming_arc = Arc::new(streaming_cfg);
-        let hot_reload = InstalledPrecomputePlanHandle::from_arc(streaming_arc.clone());
-        let query_engine = Arc::new(ASAPQueryEngine::new(15000));
-        let mut server = HttpServer::new(
-            config,
-            query_engine,
-            Arc::new(crate::storage_engines::sketch_db::index::SketchStore::new()),
-        )
-        .with_hot_reload_config(hot_reload)
-        .with_backend_storage_routing(Arc::new(routing));
-        for engine in extra_engines {
-            server = server.with_query_engine(engine);
-        }
-        server
-            .start_test_server()
-            .await
-            .expect("Failed to start test server")
-    }
-
-    /// Build a server whose `EngineRouter` has zero registered
-    /// engines. We can't reach this through the public API
-    /// (`HttpServer::new` always registers `ASAPQueryEngine`), so the
-    /// helper drops in a router by hand via the same builder
-    /// surface — but registers nothing, then asks the router-path
-    /// dispatch to route an archive metric. Used by the
-    /// `503 NoEngineRegistered` test.
-    async fn setup_test_server_with_empty_router(metric_storage_backend: StorageBackend) -> u16 {
-        // `HttpServer::new` always registers ASAPQueryEngine for the
-        // ASAP tier. To force `NoEngineRegistered` we point the
-        // metric at a backend whose data_source_id doesn't match
-        // any registered engine — since `HttpServer::new` only
-        // registers ASAPQueryEngine (asap_query), routing a
-        // `GorillaObjectStore`-only metric trips the empty path
-        // (compatible_storage_backends = [GorillaObjectStore], no
-        // engine registered for that id).
-        setup_test_server_with_router(metric_storage_backend, Vec::new()).await
-    }
-
-    /// Asserts the `data_source: <expected>` info-line lands on the
-    /// Prometheus response body's `infos` array. Pulled out so each
-    /// dispatch-axis test reads the same way.
-    fn assert_data_source(body: &serde_json::Value, expected: &str) {
-        let infos = body
-            .get("infos")
-            .and_then(|v| v.as_array())
-            .unwrap_or_else(|| panic!("expected `infos` array in response body, got {body}",));
-        let want = format!("data_source: {expected}");
-        assert!(
-            infos.iter().any(|v| v.as_str() == Some(&want)),
-            "expected `{want}` in infos, got {infos:?}",
-        );
-    }
-
-    #[test]
-    fn accuracy_header_parses_explicit_contract_and_rejects_typos() {
-        let mut headers = HeaderMap::new();
-        assert!(matches!(
-            extract_accuracy(&headers),
-            Ok(AccuracyTarget::Epsilon(_))
-        ));
-        headers.insert(ACCURACY_HEADER, "exact".parse().unwrap());
-        assert!(matches!(
-            extract_accuracy(&headers),
-            Ok(AccuracyTarget::Exact)
-        ));
-        headers.insert(ACCURACY_HEADER, "approximate".parse().unwrap());
-        assert!(matches!(
-            extract_accuracy(&headers),
-            Ok(AccuracyTarget::Epsilon(_))
-        ));
-        headers.insert(ACCURACY_HEADER, "best-effort".parse().unwrap());
-        assert!(extract_accuracy(&headers).is_err());
-    }
-
-    /// #746: `exact` means "not from the sketches". With no archive tier
-    /// left the request is forwarded to the Prometheus fallback, so no
-    /// in-process engine runs. The test fallback points at a dead port, so
-    /// the body is the forwarder's error — what matters is that the sketch
-    /// tier was never consulted.
-    #[tokio::test]
-    async fn exact_accuracy_header_bypasses_the_sketch_tier() {
-        let (sketch, sketch_calls) =
-            MockQueryEngine::new(StorageBackend::SketchStore, MockOutcome::OkEmpty);
-        let server_port = setup_test_server_with_router(
-            StorageBackend::SketchStore,
-            vec![sketch as Arc<dyn QueryEngine>],
-        )
-        .await;
-        let response = Client::new()
-            .get(format!("http://127.0.0.1:{server_port}/api/v1/query"))
-            .header(ACCURACY_HEADER, "exact")
-            .query(&[("query", "sum_over_time(foo[5m])"), ("time", "1700000000")])
-            .send()
-            .await
-            .unwrap();
-        let body: serde_json::Value = response.json().await.unwrap();
-        assert_eq!(
-            sketch_calls.load(Ordering::SeqCst),
-            0,
-            "an exact request must never be answered from the sketch tier; got {body}",
-        );
-        assert_eq!(
-            body["status"], "error",
-            "the test fallback is unreachable, so the forward must surface an error; got {body}",
-        );
-    }
-
-    #[tokio::test]
-    async fn exact_accuracy_header_bypasses_the_sketch_tier_for_range_queries() {
-        let (sketch, sketch_calls) =
-            MockQueryEngine::new(StorageBackend::SketchStore, MockOutcome::OkEmpty);
-        let server_port = setup_test_server_with_router(
-            StorageBackend::SketchStore,
-            vec![sketch as Arc<dyn QueryEngine>],
-        )
-        .await;
-        let response = Client::new()
-            .get(format!("http://127.0.0.1:{server_port}/api/v1/query_range"))
-            .header(ACCURACY_HEADER, "exact")
-            .query(&[
-                ("query", "sum_over_time(foo[5m])"),
-                ("start", "1699999940"),
-                ("end", "1700000000"),
-                ("step", "10"),
-            ])
-            .send()
-            .await
-            .unwrap();
-        let body: serde_json::Value = response.json().await.unwrap();
-        assert_eq!(
-            sketch_calls.load(Ordering::SeqCst),
-            0,
-            "an exact range request must never be answered from the sketch tier; got {body}",
-        );
-        assert_eq!(
-            body["status"], "error",
-            "the test fallback is unreachable, so the forward must surface an error; got {body}",
-        );
-    }
-
-    #[tokio::test]
-    async fn invalid_accuracy_header_returns_bad_request() {
-        let server_port =
-            setup_test_server_with_router(StorageBackend::SketchStore, Vec::new()).await;
-        let response = Client::new()
-            .get(format!("http://127.0.0.1:{server_port}/api/v1/query"))
-            .header(ACCURACY_HEADER, "best-effort")
-            .query(&[("query", "sum_over_time(foo[5m])")])
-            .send()
-            .await
-            .unwrap();
-        assert_eq!(response.status(), reqwest::StatusCode::BAD_REQUEST);
-    }
-
-    #[tokio::test]
-    async fn http_routes_asap_tier_metric_to_simple_engine() {
-        // Default (no hot-reload) → `SketchStore`. The handler
-        // takes the direct `ASAPQueryEngine::handle_query` path; the
-        // empty local engine reports no result without a warm annotation.
-        let server_port =
-            setup_test_server_with_router(StorageBackend::SketchStore, Vec::new()).await;
-        let client = Client::new();
-        let resp = client
-            .get(format!("http://127.0.0.1:{server_port}/api/v1/query"))
-            .query(&[("query", "sum_over_time(foo[5m])"), ("time", "1700000000")])
-            .send()
-            .await
-            .expect("Failed to send request");
-        assert!(
-            resp.status().is_success(),
-            "ASAP-tier dispatch must return 2xx; got {}",
-            resp.status()
-        );
-        let body: serde_json::Value = resp.json().await.unwrap();
-        // Empty local fixtures exercise routing, not successful execution.
-        assert_eq!(
-            body,
-            serde_json::json!({"status":"error", "data":null,
-            "errorType":"bad_data", "error":"No result for query"})
-        );
-    }
-
-    #[tokio::test]
-    async fn http_routes_archive_spelled_metric_to_the_sketch_tier() {
-        // #746: `GorillaObjectStore` survives as a stored-plan spelling but
-        // has no engine of its own. A metric pinned to it dispatches through
-        // the router to the sketch tier, so the response carries
-        // `data_source: asap_query`.
-        let (gorilla, gorilla_calls) =
-            MockQueryEngine::new(StorageBackend::SketchStore, MockOutcome::OkEmpty);
-        let server_port = setup_test_server_with_router(
-            StorageBackend::DoubleWrite,
-            vec![gorilla as Arc<dyn QueryEngine>],
-        )
-        .await;
-        let client = Client::new();
-        let resp = client
-            .get(format!("http://127.0.0.1:{server_port}/api/v1/query"))
-            .query(&[
-                ("query", "sum_over_time(audit_events[1h])"),
-                ("time", "1700000000"),
-            ])
-            .send()
-            .await
-            .expect("Failed to send request");
-        assert!(
-            resp.status().is_success(),
-            "router dispatch must return 2xx; got {}",
-            resp.status()
-        );
-        let body: serde_json::Value = resp.json().await.unwrap();
-        assert_data_source(&body, "asap_query");
-        assert_eq!(
-            gorilla_calls.load(Ordering::SeqCst),
-            1,
-            "the sketch-tier mock engine should have been hit exactly once",
-        );
-    }
-
-    #[tokio::test]
-    async fn http_query_with_no_storage_config_defaults_to_asap_tier() {
-        // `InstalledPrecomputePlan::default()` has `storage_backend =
-        // SketchStore` (per the `#[serde(default)]` on the
-        // field — see `installed_precompute_plan.rs`). A server set up
-        // without a hot-reload handle still infers ASAP-tier and
-        // takes the ASAPQueryEngine direct path. Back-compat for
-        // pre-Phase-5 deploys whose YAML doesn't include the new
-        // `storage_backend` key.
-        let server_port = setup_test_server().await; // No hot-reload handle attached.
-        let client = Client::new();
-        let resp = client
-            .get(format!("http://127.0.0.1:{server_port}/api/v1/query"))
-            .query(&[("query", "sum_over_time(foo[5m])"), ("time", "1700000000")])
-            .send()
-            .await
-            .expect("Failed to send request");
-        assert!(
-            resp.status().is_success(),
-            "default-config dispatch must return 2xx; got {}",
-            resp.status()
-        );
-        let body: serde_json::Value = resp.json().await.unwrap();
-        // Empty local fixtures exercise routing, not successful execution.
-        assert_eq!(
-            body,
-            serde_json::json!({"status":"error", "data":null,
-            "errorType":"bad_data", "error":"No result for query"})
-        );
-    }
-
-    #[tokio::test]
-    async fn http_returns_503_when_no_engines_registered() {
-        // PrometheusRemote has one eligible backend. Without its engine registered,
-        // the router must return `NoEngineRegistered`, surfaced as HTTP 503.
-        let server_port =
-            setup_test_server_with_empty_router(StorageBackend::PrometheusRemote).await;
-        let client = Client::new();
-        let resp = client
-            .get(format!("http://127.0.0.1:{server_port}/api/v1/query"))
-            .query(&[("query", "sum_over_time(foo[5m])"), ("time", "1700000000")])
-            .send()
-            .await
-            .expect("Failed to send request");
-        assert_eq!(
-            resp.status(),
-            reqwest::StatusCode::SERVICE_UNAVAILABLE,
-            "no-engine routing must surface as 503",
-        );
-        let body: serde_json::Value = resp.json().await.unwrap();
-        assert_eq!(body["status"], "error");
-        let err = body["error"].as_str().unwrap_or_default();
-        assert!(
-            err.contains("no engine registered"),
-            "503 body must explain the routing failure; got {err}",
-        );
-    }
-
-    #[tokio::test]
-    async fn range_returns_503_when_engine_missing_even_with_fallback() {
-        let server_port = setup_test_server_with_router_and_fallback(
-            StorageBackend::PrometheusRemote,
-            Vec::new(),
-            true,
-        )
-        .await;
-        let response = Client::new()
-            .get(format!("http://127.0.0.1:{server_port}/api/v1/query_range"))
-            .query(&[
-                ("query", "sum_over_time(foo[5m])"),
-                ("start", "1699999940"),
-                ("end", "1700000000"),
-                ("step", "10"),
-            ])
-            .send()
-            .await
-            .unwrap();
-        assert_eq!(response.status(), reqwest::StatusCode::SERVICE_UNAVAILABLE);
-        let body: serde_json::Value = response.json().await.unwrap();
-        assert!(body["error"]
-            .as_str()
-            .unwrap_or_default()
-            .contains("no engine registered"));
-    }
-
-    #[tokio::test]
-    async fn http_passes_through_accuracy_envelope() {
-        // The Phase-5 `QueryResult` carries an `accuracy:
-        // AccuracyEnvelope` field; the HTTP adapter mirrors it onto
-        // the response's `infos` array (`accuracy: ε=..., δ=...,
-        // kind=exact`) so Grafana 11+ surfaces it inline. We verify
-        // the router-path dispatch preserves that mirroring rather
-        // than stripping the envelope on its way through.
-        struct ExactStub;
-        #[async_trait]
-        impl QueryEngine for ExactStub {
-            async fn execute(&self, _query: &str) -> Result<QueryResult, EngineError> {
-                use crate::storage_engines::sketch_db::accuracy::{
-                    AccuracyEnvelope, AccuracyProfile,
-                };
-                Ok(QueryResult::vector(Vec::new(), 0)
-                    .with_accuracy(AccuracyEnvelope::single(AccuracyProfile::exact())))
-            }
-            fn capabilities(&self) -> EngineCapabilities {
-                EngineCapabilities {
-                    data_source_id: StorageBackend::SketchStore.data_source_id(),
-                    storage_backend: StorageBackend::SketchStore,
-                    supports_streams_above_bytes: 1024 * 1024,
-                }
-            }
-        }
-        let server_port = setup_test_server_with_router(
-            StorageBackend::DoubleWrite,
-            vec![Arc::new(ExactStub) as Arc<dyn QueryEngine>],
-        )
-        .await;
-        let client = Client::new();
-        let resp = client
-            .get(format!("http://127.0.0.1:{server_port}/api/v1/query"))
-            .query(&[("query", "sum_over_time(foo[1h])"), ("time", "1700000000")])
-            .send()
-            .await
-            .unwrap();
-        assert!(resp.status().is_success());
-        let body: serde_json::Value = resp.json().await.unwrap();
-        // Both the `data_source` info-line AND the
-        // `accuracy: ε=..., δ=..., kind=exact` summary must land on
-        // the response — proving the router-path dispatch preserves
-        // the engine's wire annotations.
-        assert_data_source(&body, "asap_query");
-        let infos = body["infos"].as_array().expect("infos array");
-        assert!(
-            infos
-                .iter()
-                .any(|v| v.as_str().unwrap_or("").contains("kind=exact")),
-            "exact-accuracy summary must be present in infos; got {infos:?}",
-        );
-        // The structured `accuracy` field also round-trips.
-        let accuracy = body
-            .get("accuracy")
-            .expect("accuracy field must round-trip on router path");
-        assert_eq!(accuracy["epsilon"], 0.0);
-        assert_eq!(accuracy["delta"], 0.0);
-    }
-
-    // Execution failure must survive the router and HTTP boundary without failover.
-    #[tokio::test]
-    async fn physical_resource_errors_never_forward_instant_or_range_queries() {
-        for cause in [
-            asap_physical_operators::Error::MemoryLimit,
-            asap_physical_operators::Error::Cancelled,
-        ] {
-            let error = asap_physical_operators::Error::AtNode {
-                node: 7,
-                operation: "sort".into(),
-                source: Box::new(cause.clone()),
-            };
-            let (warm, warm_calls) =
-                MockQueryEngine::new(StorageBackend::SketchStore, MockOutcome::Physical(error));
-            let (other, other_calls) =
-                MockQueryEngine::new(StorageBackend::DoubleWrite, MockOutcome::OkEmpty);
-            let port =
-                setup_test_server_with_router(StorageBackend::DoubleWrite, vec![warm, other]).await;
-            for endpoint in ["query", "query_range"] {
-                let response = Client::new()
-                    .get(format!("http://127.0.0.1:{port}/api/v1/{endpoint}"))
-                    .query(&[
-                        ("query", "sum_over_time(foo[5m])"),
-                        ("time", "1700000000"),
-                        ("start", "1700000000"),
-                        ("end", "1700000060"),
-                        ("step", "15"),
-                    ])
-                    .send()
-                    .await
-                    .unwrap();
-                assert_eq!(
-                    response.status(),
-                    reqwest::StatusCode::INTERNAL_SERVER_ERROR
-                );
-                let body: serde_json::Value = response.json().await.unwrap();
-                assert_eq!(body["status"], "error");
-                assert_eq!(body["errorType"], "execution");
-                assert!(
-                    body["error"].as_str().unwrap().contains(&cause.to_string()),
-                    "{body}"
-                );
-            }
-            assert_eq!(warm_calls.load(Ordering::SeqCst), 2);
-            assert_eq!(other_calls.load(Ordering::SeqCst), 0);
-        }
-    }
-
-    #[tokio::test]
-    async fn http_router_serves_double_write_via_warm_head() {
-        // Step-1 of the JSONL deprecation deleted the
-        // `ColdJsonlFallback` last-resort slot; the surviving
-        // failover surface is ASAP-tier sketch ↔ Gorilla-S3 archive.
-        // The HTTP handler dispatches with default
-        // `(Statistic::Sum, AccuracyTarget::Epsilon(_))`, so for a
-        // `DoubleWrite` metric the compatibility list is
-        // `[SketchStore, GorillaObjectStore]` and the ASAP-tier
-        // mock answers first. The archive must NOT be hit (no
-        // failover needed when the head succeeds).
-        let (warm_ok, warm_calls) =
-            MockQueryEngine::new(StorageBackend::SketchStore, MockOutcome::OkEmpty);
-        let (archive, archive_calls) =
-            MockQueryEngine::new(StorageBackend::DoubleWrite, MockOutcome::Backend);
-        let server_port = setup_test_server_with_router(
-            StorageBackend::DoubleWrite,
-            vec![
-                warm_ok as Arc<dyn QueryEngine>,
-                archive as Arc<dyn QueryEngine>,
-            ],
-        )
-        .await;
-        let client = Client::new();
-        let resp = client
-            .get(format!("http://127.0.0.1:{server_port}/api/v1/query"))
-            .query(&[("query", "sum_over_time(foo[5m])"), ("time", "1700000000")])
-            .send()
-            .await
-            .unwrap();
-        assert!(
-            resp.status().is_success(),
-            "double-write must answer 2xx; got {}",
-            resp.status()
-        );
-        assert_eq!(warm_calls.load(Ordering::SeqCst), 1);
-        assert_eq!(
-            archive_calls.load(Ordering::SeqCst),
-            0,
-            "archive must not run when the ASAP-tier head answers cleanly",
-        );
-    }
-
-    // ── Issue #46 production-path coverage: BackendStorageRouting ─────────────
-    //
-    // The tests above (e.g. `http_routes_archive_metric_to_gorilla_engine`)
-    // mock the routing decision by pinning `streaming_cfg.storage_backend
-    // = GorillaObjectStore` directly. That proves the dispatch BRANCH is
-    // wired, but not the production code path — in real deploys the
-    // installed precompute view uses the default storage backend.
-    // The tests below exercise per-metric routing end-to-end:
-    // a per-metric `BackendStorageRouting` table is loaded at startup
-    // (mirroring `--backend-storage-routing` on `precompute_engine`),
-    // and the handler must consult the table on every request.
-
-    #[tokio::test]
-    async fn http_production_path_routes_archive_metric_via_routing_table() {
-        // Production path: streaming-config single axis stays on
-        // `SketchStore` (the YAML loader's default), but the
-        // per-metric routing table flips `http_requests_total` to
-        // a non-default axis. The handler must extract the metric name
-        // from the PromQL AST, look it up, and dispatch through the
-        // EngineRouter. Since #746 that archive spelling resolves to the
-        // sketch tier, so the response carries `data_source: asap_query`.
-        let mut metrics = std::collections::HashMap::new();
-        metrics.insert(
-            "http_requests_total".to_string(),
-            StorageBackend::DoubleWrite,
-        );
-        let routing = crate::storage_engines::types::BackendStorageRouting::new_from_single_targets(
-            StorageBackend::SketchStore,
-            metrics,
-        );
-        let (gorilla, gorilla_calls) =
-            MockQueryEngine::new(StorageBackend::SketchStore, MockOutcome::OkEmpty);
-        let server_port =
-            setup_test_server_with_routing_table(routing, vec![gorilla as Arc<dyn QueryEngine>])
-                .await;
-        let client = Client::new();
-        let resp = client
-            .get(format!("http://127.0.0.1:{server_port}/api/v1/query"))
-            .query(&[
-                ("query", "count(http_requests_total)"),
-                ("time", "1700000000"),
-            ])
-            .send()
-            .await
-            .expect("Failed to send request");
-        assert!(
-            resp.status().is_success(),
-            "production-path archive dispatch must return 2xx; got {}",
-            resp.status(),
-        );
-        let body: serde_json::Value = resp.json().await.unwrap();
-        assert_data_source(&body, "asap_query");
-        assert_eq!(
-            gorilla_calls.load(Ordering::SeqCst),
-            1,
-            "the sketch-tier engine must be hit exactly once on the production path",
-        );
-    }
-
-    #[tokio::test]
-    async fn http_production_path_unlisted_metric_falls_back_to_asap_tier() {
-        // The same routing table only overrides `http_requests_total`;
-        // a query against a different metric must take the ASAP-tier
-        // direct-dispatch path (no `EngineRouter` round-trip).
-        let mut metrics = std::collections::HashMap::new();
-        metrics.insert(
-            "http_requests_total".to_string(),
-            StorageBackend::DoubleWrite,
-        );
-        let routing = crate::storage_engines::types::BackendStorageRouting::new_from_single_targets(
-            StorageBackend::SketchStore,
-            metrics,
-        );
-        let server_port = setup_test_server_with_routing_table(routing, Vec::new()).await;
-        let client = Client::new();
-        let resp = client
-            .get(format!("http://127.0.0.1:{server_port}/api/v1/query"))
-            .query(&[
-                ("query", "sum_over_time(some_other_metric[5m])"),
-                ("time", "1700000000"),
-            ])
-            .send()
-            .await
-            .expect("Failed to send request");
-        assert!(
-            resp.status().is_success(),
-            "ASAP-tier fallback must return 2xx; got {}",
-            resp.status(),
-        );
-        let body: serde_json::Value = resp.json().await.unwrap();
-        // Empty local fixtures exercise routing, not successful execution.
-        assert_eq!(
-            body,
-            serde_json::json!({"status":"error", "data":null,
-            "errorType":"bad_data", "error":"No result for query"})
-        );
-    }
-
-    #[tokio::test]
-    async fn http_production_path_default_axis_routes_all_metrics() {
-        // Routing table with no per-metric overrides but a non-default
-        // top-level non-sketch `default` — every metric must route
-        // through the router, which lands them on the sketch tier since
-        // #746 removed the archive engine.
-        let routing = crate::storage_engines::types::BackendStorageRouting::new_from_single_targets(
-            StorageBackend::DoubleWrite,
-            std::collections::HashMap::new(),
-        );
-        let (gorilla, gorilla_calls) =
-            MockQueryEngine::new(StorageBackend::SketchStore, MockOutcome::OkEmpty);
-        let server_port =
-            setup_test_server_with_routing_table(routing, vec![gorilla as Arc<dyn QueryEngine>])
-                .await;
-        let client = Client::new();
-        let resp = client
-            .get(format!("http://127.0.0.1:{server_port}/api/v1/query"))
-            .query(&[
-                ("query", "count(any_metric_at_all)"),
-                ("time", "1700000000"),
-            ])
-            .send()
-            .await
-            .expect("Failed to send request");
-        assert!(resp.status().is_success());
-        let body: serde_json::Value = resp.json().await.unwrap();
-        assert_data_source(&body, "asap_query");
-        assert_eq!(gorilla_calls.load(Ordering::SeqCst), 1);
-    }
-
-    // ── v7 dual-routing production-path coverage ──────────────────────────────
-    //
-    // v7 lets one metric fan out to multiple `(backend,
-    // applies_to_query_shape)` targets. The two tests below mirror
-    // `http_production_path_routes_archive_metric_via_routing_table`
-    // — same setup, but the routing table has TWO targets for
-    // `http_requests_total`: a default ASAP-tier slot and a
-    // cold-archive slot scoped to `[count, topk, rate_post_hoc]`.
-    // A `count(...)` query must land on the archive; a
-    // `quantile_over_time(...)` query must land on the ASAP tier.
-
-    #[tokio::test]
-    async fn http_v7_dual_routing_count_lands_on_archive() {
-        use crate::storage_engines::types::{
-            BackendStorageRouting, QueryOperatorShape, RoutingTarget,
-        };
-        let mut metrics = std::collections::HashMap::new();
-        metrics.insert(
-            "http_requests_total".to_string(),
-            vec![
-                RoutingTarget::always(StorageBackend::SketchStore),
-                RoutingTarget::for_shapes(
-                    StorageBackend::DoubleWrite,
-                    vec![
-                        QueryOperatorShape::Count,
-                        QueryOperatorShape::Topk,
-                        QueryOperatorShape::RatePostHoc,
-                    ],
-                ),
-            ],
-        );
-        let routing = BackendStorageRouting::new(StorageBackend::SketchStore, metrics);
-
-        let (gorilla, gorilla_calls) =
-            MockQueryEngine::new(StorageBackend::SketchStore, MockOutcome::OkEmpty);
-        let server_port =
-            setup_test_server_with_routing_table(routing, vec![gorilla as Arc<dyn QueryEngine>])
-                .await;
-
-        let client = Client::new();
-        let resp = client
-            .get(format!("http://127.0.0.1:{server_port}/api/v1/query"))
-            .query(&[
-                ("query", "count(http_requests_total{service=\"payments\"})"),
-                ("time", "1700000000"),
-            ])
-            .send()
-            .await
-            .expect("Failed to send request");
-        assert!(
-            resp.status().is_success(),
-            "v7 dual-routing: count must dispatch and return 2xx; got {}",
-            resp.status()
-        );
-        let body: serde_json::Value = resp.json().await.unwrap();
-        assert_data_source(&body, "asap_query");
-        assert_eq!(
-            gorilla_calls.load(Ordering::SeqCst),
-            1,
-            "v7 dual-routing: the archive-claimed shape still dispatches \
-             through the router, now onto the sketch tier",
-        );
-    }
-
-    #[tokio::test]
-    async fn http_v7_dual_routing_quantile_stays_on_asap_tier() {
-        use crate::storage_engines::types::{
-            BackendStorageRouting, QueryOperatorShape, RoutingTarget,
-        };
-        let mut metrics = std::collections::HashMap::new();
-        metrics.insert(
-            "http_requests_total".to_string(),
-            vec![
-                RoutingTarget::always(StorageBackend::SketchStore),
-                RoutingTarget::for_shapes(
-                    StorageBackend::DoubleWrite,
-                    vec![
-                        QueryOperatorShape::Count,
-                        QueryOperatorShape::Topk,
-                        QueryOperatorShape::RatePostHoc,
-                    ],
-                ),
-            ],
-        );
-        let routing = BackendStorageRouting::new(StorageBackend::SketchStore, metrics);
-
-        // Register a Gorilla mock so a misroute would surface as a
-        // failed assertion rather than a silent fall-through. The
-        // mock starts with 0 calls; a quantile must NOT touch it.
-        let (gorilla, gorilla_calls) =
-            MockQueryEngine::new(StorageBackend::SketchStore, MockOutcome::OkEmpty);
-        let server_port =
-            setup_test_server_with_routing_table(routing, vec![gorilla as Arc<dyn QueryEngine>])
-                .await;
-
-        let client = Client::new();
-        let resp = client
-            .get(format!("http://127.0.0.1:{server_port}/api/v1/query"))
-            .query(&[
-                ("query", "quantile_over_time(0.99, http_requests_total[1m])"),
-                ("time", "1700000000"),
-            ])
-            .send()
-            .await
-            .expect("Failed to send request");
-        // Warm tier path returns 2xx with `data_source: asap_query`
-        // (the ASAPQueryEngine returns None for this unconfigured
-        // metric, but the handler still annotates the wire response
-        // with the ASAP-tier source).
-        assert!(
-            resp.status().is_success(),
-            "v7 dual-routing: quantile must dispatch and return 2xx; got {}",
-            resp.status()
-        );
-        let body: serde_json::Value = resp.json().await.unwrap();
-        // Empty local fixtures exercise routing, not successful execution.
-        assert_eq!(
-            body,
-            serde_json::json!({"status":"error", "data":null,
-            "errorType":"bad_data", "error":"No result for query"})
-        );
-        assert_eq!(
-            gorilla_calls.load(Ordering::SeqCst),
-            0,
-            "v7 dual-routing: quantile must NOT hit the archive engine",
-        );
-    }
-
-    // ── Phase-6 Fix 1: per-query engine override ─────────────────────────
-    //
-    // The accuracy reducer asks the same PromQL against both the warm
-    // sketch and the Gorilla archive on MinIO so it can compute
-    // apples-to-apples relative error. This requires a way to bypass
-    // the per-metric `BackendStorageRouting` lookup and dispatch
-    // straight to a named engine. Two surfaces are exposed:
-    //
-    // * `X-ASAP-Engine: <data_source_id>` request header (preferred)
-    // * `?engine=<data_source_id>` query / form param (fallback)
-    //
-    // Both flip the dispatcher to `process_via_named_engine`.
-
-    /// Header override flips a `quantile_over_time` query — which the
-    /// v7 dual-routing table sends to the warm sketch — over to the
-    /// Gorilla archive engine. Proves the override bypasses the
-    /// shape-classifier and dispatches to the explicitly named engine.
-    #[tokio::test]
-    async fn http_engine_override_header_routes_to_named_engine() {
-        use crate::storage_engines::types::{
-            BackendStorageRouting, QueryOperatorShape, RoutingTarget,
-        };
-
-        let (gorilla, gorilla_calls) =
-            MockQueryEngine::new(StorageBackend::DoubleWrite, MockOutcome::OkEmpty);
-
-        // Dual-routing for `metric_warm`: quantiles → warm, count →
-        // archive. Without the header the test query routes to warm.
-        let mut metrics = std::collections::HashMap::new();
-        metrics.insert(
-            "metric_warm".to_string(),
-            vec![
-                RoutingTarget::for_shapes(
-                    StorageBackend::SketchStore,
-                    vec![QueryOperatorShape::Quantile],
-                ),
-                RoutingTarget::for_shapes(
-                    StorageBackend::DoubleWrite,
-                    vec![QueryOperatorShape::Count],
-                ),
-            ],
-        );
-        let routing = BackendStorageRouting::new(StorageBackend::SketchStore, metrics);
-        let server_port =
-            setup_test_server_with_routing_table(routing, vec![gorilla as Arc<dyn QueryEngine>])
-                .await;
-
-        let client = Client::new();
-        // Ask a quantile query (default routing → warm) but override
-        // to archive via the header.
-        let resp = client
-            .get(format!("http://127.0.0.1:{server_port}/api/v1/query"))
-            .header(ENGINE_OVERRIDE_HEADER, "double_write")
-            .query(&[
-                ("query", "quantile_over_time(0.5, metric_warm[1m])"),
-                ("time", "1700000000"),
-            ])
-            .send()
-            .await
-            .expect("Failed to send request");
-        assert!(
-            resp.status().is_success(),
-            "header-override dispatch must return 2xx; got {}",
-            resp.status()
-        );
-        let body: serde_json::Value = resp.json().await.unwrap();
-        assert_data_source(&body, "double_write");
-        assert_eq!(
-            gorilla_calls.load(Ordering::SeqCst),
-            1,
-            "header override must dispatch to the named engine exactly once",
-        );
-    }
-
-    /// Without the override header the same query takes the default
-    /// routing-table path. Proves the override is opt-in and
-    /// backwards-compatible.
-    #[tokio::test]
-    async fn http_engine_override_missing_uses_default_routing() {
-        use crate::storage_engines::types::{
-            BackendStorageRouting, QueryOperatorShape, RoutingTarget,
-        };
-
-        let (gorilla, gorilla_calls) =
-            MockQueryEngine::new(StorageBackend::DoubleWrite, MockOutcome::OkEmpty);
-
-        let mut metrics = std::collections::HashMap::new();
-        metrics.insert(
-            "metric_warm".to_string(),
-            vec![
-                RoutingTarget::for_shapes(
-                    StorageBackend::SketchStore,
-                    vec![QueryOperatorShape::Quantile],
-                ),
-                RoutingTarget::for_shapes(
-                    StorageBackend::DoubleWrite,
-                    vec![QueryOperatorShape::Count],
-                ),
-            ],
-        );
-        let routing = BackendStorageRouting::new(StorageBackend::SketchStore, metrics);
-        let server_port =
-            setup_test_server_with_routing_table(routing, vec![gorilla as Arc<dyn QueryEngine>])
-                .await;
-
-        let client = Client::new();
-        // No override → quantile shape routes to ASAP tier.
-        let resp = client
-            .get(format!("http://127.0.0.1:{server_port}/api/v1/query"))
-            .query(&[
-                ("query", "quantile_over_time(0.5, metric_warm[1m])"),
-                ("time", "1700000000"),
-            ])
-            .send()
-            .await
-            .expect("Failed to send request");
-        assert!(resp.status().is_success(), "default routing must still 2xx");
-        let body: serde_json::Value = resp.json().await.unwrap();
-        // Empty local fixtures exercise routing, not successful execution.
-        assert_eq!(
-            body,
-            serde_json::json!({"status":"error", "data":null,
-            "errorType":"bad_data", "error":"No result for query"})
-        );
-        assert_eq!(
-            gorilla_calls.load(Ordering::SeqCst),
-            0,
-            "no override → archive engine must NOT be hit",
-        );
-    }
-
-    /// Query-param fallback: `?engine=double_write` overrides the
-    /// routing table when the header is absent.
-    #[tokio::test]
-    async fn http_engine_override_query_param_routes_to_named_engine() {
-        let (gorilla, gorilla_calls) =
-            MockQueryEngine::new(StorageBackend::DoubleWrite, MockOutcome::OkEmpty);
-
-        let server_port = setup_test_server_with_router(
-            StorageBackend::SketchStore,
-            vec![gorilla as Arc<dyn QueryEngine>],
-        )
-        .await;
-
-        let client = Client::new();
-        let resp = client
-            .get(format!("http://127.0.0.1:{server_port}/api/v1/query"))
-            .query(&[
-                ("query", "sum_over_time(foo[5m])"),
-                ("time", "1700000000"),
-                (ENGINE_OVERRIDE_QUERY_PARAM, "double_write"),
-            ])
-            .send()
-            .await
-            .expect("Failed to send request");
-        assert!(resp.status().is_success(), "query-param override must 2xx");
-        let body: serde_json::Value = resp.json().await.unwrap();
-        assert_data_source(&body, "double_write");
-        assert_eq!(
-            gorilla_calls.load(Ordering::SeqCst),
-            1,
-            "query-param override must hit the archive engine exactly once",
-        );
-    }
-
-    /// Unknown engine id returns 400 with a useful error body listing
-    /// the registered engines. Lets `accuracy_reduce.py` distinguish
-    /// "engine not deployed" (config bug) from "archive miss" (the
-    /// chunk hasn't landed yet — still 200 with an empty result).
-    #[tokio::test]
-    async fn http_engine_override_unknown_id_returns_400() {
-        let server_port =
-            setup_test_server_with_router(StorageBackend::SketchStore, Vec::new()).await;
-
-        let client = Client::new();
-        let resp = client
-            .get(format!("http://127.0.0.1:{server_port}/api/v1/query"))
-            .header(ENGINE_OVERRIDE_HEADER, "does_not_exist")
-            .query(&[("query", "sum_over_time(foo[5m])"), ("time", "1700000000")])
-            .send()
-            .await
-            .expect("Failed to send request");
-        assert_eq!(resp.status(), reqwest::StatusCode::BAD_REQUEST);
-        let body: serde_json::Value = resp.json().await.unwrap();
-        let err = body.get("error").and_then(|v| v.as_str()).unwrap_or("");
-        assert!(
-            err.contains("does_not_exist"),
-            "error must name the bad id; got {err}",
-        );
-        assert!(
-            err.contains("asap_query"),
-            "error must list registered engines; got {err}",
-        );
-    }
-
-    /// POST + form-encoded body works the same way: header still
-    /// wins, body's `engine=` is the fallback.
-    #[tokio::test]
-    async fn http_engine_override_post_header_routes_to_named_engine() {
-        let (gorilla, gorilla_calls) =
-            MockQueryEngine::new(StorageBackend::DoubleWrite, MockOutcome::OkEmpty);
-        let server_port = setup_test_server_with_router(
-            StorageBackend::SketchStore,
-            vec![gorilla as Arc<dyn QueryEngine>],
-        )
-        .await;
-
-        let client = Client::new();
-        let form_body = "query=sum_over_time(foo%5B5m%5D)&time=1700000000";
-        let resp = client
-            .post(format!("http://127.0.0.1:{server_port}/api/v1/query"))
-            .header(ENGINE_OVERRIDE_HEADER, "double_write")
-            .header("Content-Type", "application/x-www-form-urlencoded")
-            .body(form_body)
-            .send()
-            .await
-            .expect("Failed to send request");
-        assert!(
-            resp.status().is_success(),
-            "POST header-override must 2xx; got {}",
-            resp.status()
-        );
-        let body: serde_json::Value = resp.json().await.unwrap();
-        assert_data_source(&body, "double_write");
-        assert_eq!(gorilla_calls.load(Ordering::SeqCst), 1);
-    }
-
-    // ── BackendStorageRouting hot-reload HTTP integration ────
-
-    /// Standard test wiring for the `/api/v1/storage_routing` endpoint:
-    /// install an empty hot-reload routing handle, hold the handle so
-    /// the test can introspect the swap result.
-    async fn setup_test_server_for_storage_routing() -> (
-        u16,
-        crate::query_engines::routing::HotReloadBackendStorageRouting,
-    ) {
-        use crate::query_engines::routing::HotReloadBackendStorageRouting;
-        use crate::storage_engines::types::{
-            InstalledPrecomputePlan, InstalledPrecomputePlanHandle,
-        };
-
-        let adapter_config =
-            AdapterConfig::prometheus_promql("http://127.0.0.1:9999".to_string(), false);
-        let config = HttpServerConfig {
-            port: 0,
-            handle_http_requests: true,
-            adapter_config,
-        };
-        let streaming_cfg = InstalledPrecomputePlan::default();
-        let streaming_arc = Arc::new(streaming_cfg);
-        let hot_reload = InstalledPrecomputePlanHandle::from_arc(streaming_arc.clone());
-        let query_engine = Arc::new(ASAPQueryEngine::new(15000));
-        let routing_handle = HotReloadBackendStorageRouting::empty();
-        let server = HttpServer::new(
-            config,
-            query_engine,
-            Arc::new(crate::storage_engines::sketch_db::index::SketchStore::new()),
-        )
-        .with_hot_reload_config(hot_reload)
-        .with_hot_reload_backend_storage_routing(routing_handle.clone());
-        let port = server.start_test_server().await.expect("start ok");
-        (port, routing_handle)
-    }
-
-    fn fixture_routing_json() -> serde_json::Value {
-        serde_json::json!({
-            "default_engine": "asap_query",
-            "metrics": [
-                {
-                    "name": "http_requests_total",
-                    "targets": [
-                        { "engine": "asap_query" },
-                        {
-                            "engine": "double_write",
-                            "applies_to_query_shape": [
-                                "histogram_quantile", "delta", "absent",
-                                "rate_post_hoc", "count"
-                            ]
-                        }
-                    ]
-                }
-            ]
-        })
-    }
-
-    #[tokio::test]
-    async fn storage_routing_post_swaps_table_atomically() {
-        let (port, handle) = setup_test_server_for_storage_routing().await;
-        // Initial table is empty.
-        assert_eq!(handle.snapshot().len(), 0);
-
-        let client = Client::new();
-        let resp = client
-            .post(format!("http://127.0.0.1:{port}/api/v1/storage_routing"))
-            .header("Content-Type", "application/json")
-            .body(fixture_routing_json().to_string())
-            .send()
-            .await
-            .expect("send ok");
-
-        assert!(
-            resp.status().is_success(),
-            "swap must 2xx; got {}",
-            resp.status()
-        );
-        let body: serde_json::Value = resp.json().await.unwrap();
-        assert_eq!(body["status"], "success");
-        assert_eq!(body["metrics_count"], 1);
-        let returned_hash = body["table_hash"].as_str().unwrap().to_string();
-        assert!(!returned_hash.is_empty(), "hash must be non-empty");
-
-        // Snapshot now reflects the new table — and the hash matches
-        // what the response advertised.
-        let snap = handle.snapshot();
-        assert_eq!(snap.len(), 1);
-        let live_hash = crate::query_engines::routing::routing_table_hash(snap.as_ref());
-        assert_eq!(live_hash, returned_hash, "live hash must match advertised");
-    }
-
-    #[tokio::test]
-    async fn storage_routing_post_rejects_invalid_json() {
-        let (port, handle) = setup_test_server_for_storage_routing().await;
-        let client = Client::new();
-
-        // Garbage body — not even valid JSON.
-        let resp = client
-            .post(format!("http://127.0.0.1:{port}/api/v1/storage_routing"))
-            .header("Content-Type", "application/json")
-            .body("not json {{")
-            .send()
-            .await
-            .expect("send ok");
-        assert_eq!(resp.status().as_u16(), 400, "garbage body must 400");
-
-        // Valid JSON but invalid schema (unknown engine).
-        let bad = serde_json::json!({
-            "default_engine": "asap_query",
-            "metrics": [{
-                "name": "x",
-                "targets": [{ "engine": "not_a_real_engine" }]
-            }]
-        });
-        let resp = client
-            .post(format!("http://127.0.0.1:{port}/api/v1/storage_routing"))
-            .header("Content-Type", "application/json")
-            .body(bad.to_string())
-            .send()
-            .await
-            .expect("send ok");
-        assert_eq!(
-            resp.status().as_u16(),
-            400,
-            "schema-invalid body must 400; got {}",
-            resp.status(),
-        );
-
-        // Confirm the table was NOT swapped (still empty).
-        assert_eq!(handle.snapshot().len(), 0);
-    }
-
-    #[tokio::test]
-    async fn storage_routing_get_returns_current_snapshot() {
-        let (port, handle) = setup_test_server_for_storage_routing().await;
-        // Pre-load the table.
-        let new = crate::storage_engines::types::BackendStorageRouting::from_json_payload(
-            &fixture_routing_json(),
-        )
-        .expect("parse");
-        handle.swap(new);
-
-        let client = Client::new();
-        let resp = client
-            .get(format!("http://127.0.0.1:{port}/api/v1/storage_routing"))
-            .send()
-            .await
-            .expect("send ok");
-        assert!(resp.status().is_success());
-        let body: serde_json::Value = resp.json().await.unwrap();
-        assert_eq!(body["status"], "success");
-        assert_eq!(body["default_engine"], "asap_query");
-        assert_eq!(body["metrics_count"], 1);
-        let snap_hash = body["table_hash"].as_str().unwrap();
-        let live_hash =
-            crate::query_engines::routing::routing_table_hash(handle.snapshot().as_ref());
-        assert_eq!(snap_hash, live_hash);
-    }
-
-    /// Per-tenant push: a body with `tenant: tenant-a` lands in the
-    /// `tenant-a` slot; the `default` tenant table is unaffected.
-    /// Subsequent GETs with `X-ASAP-Tenant: tenant-a` see the new
-    /// table; GETs with no header (default tenant) see an empty
-    /// table.
-    #[tokio::test]
-    async fn storage_routing_post_per_tenant_isolates_tenants() {
-        let (port, handle) = setup_test_server_for_storage_routing().await;
-        let client = Client::new();
-
-        // Push tenant-a's table.
-        let mut tenant_a_body = fixture_routing_json();
-        tenant_a_body["tenant"] = serde_json::json!("tenant-a");
-        let resp = client
-            .post(format!("http://127.0.0.1:{port}/api/v1/storage_routing"))
-            .header("Content-Type", "application/json")
-            .body(tenant_a_body.to_string())
-            .send()
-            .await
-            .expect("send ok");
-        assert!(resp.status().is_success());
-        let body: serde_json::Value = resp.json().await.unwrap();
-        assert_eq!(body["tenant"], "tenant-a");
-        assert_eq!(body["metrics_count"], 1);
-
-        // Default tenant table is unchanged (still empty).
-        let snap_default =
-            handle.snapshot_for_tenant(crate::query_engines::routing::DEFAULT_TENANT);
-        assert_eq!(snap_default.len(), 0);
-        // Tenant-a table has the new entry.
-        let snap_a = handle.snapshot_for_tenant("tenant-a");
-        assert_eq!(snap_a.len(), 1);
-    }
-
-    /// Per-tenant push via `X-ASAP-Tenant` header (when the body
-    /// leaves `tenant` implicit). The header acts as a fallback
-    /// signal when the control plane emits a tenant-agnostic body.
-    #[tokio::test]
-    async fn storage_routing_post_per_tenant_via_header_when_body_implicit() {
-        let (port, handle) = setup_test_server_for_storage_routing().await;
-        let client = Client::new();
-
-        // Body has no `tenant` field — control plane emit shape today.
-        let resp = client
-            .post(format!("http://127.0.0.1:{port}/api/v1/storage_routing"))
-            .header("Content-Type", "application/json")
-            .header("X-ASAP-Tenant", "tenant-b")
-            .body(fixture_routing_json().to_string())
-            .send()
-            .await
-            .expect("send ok");
-        assert!(resp.status().is_success());
-        let body: serde_json::Value = resp.json().await.unwrap();
-        // The header steered the swap to tenant-b.
-        assert_eq!(body["tenant"], "tenant-b");
-        let snap_b = handle.snapshot_for_tenant("tenant-b");
-        assert_eq!(snap_b.len(), 1);
-        // Default tenant is still empty.
-        let snap_default =
-            handle.snapshot_for_tenant(crate::query_engines::routing::DEFAULT_TENANT);
-        assert_eq!(snap_default.len(), 0);
-    }
-
-    /// Per-tenant push when neither the body's `tenant` field nor
-    /// the `X-ASAP-Tenant` header are set: the swap lands in the
-    /// `default` tenant slot — preserves the legacy single-tenant
-    /// contract for existing control planes that haven't been updated
-    /// yet.
-    #[tokio::test]
-    async fn storage_routing_post_no_tenant_falls_back_to_default() {
-        let (port, handle) = setup_test_server_for_storage_routing().await;
-        let client = Client::new();
-        let resp = client
-            .post(format!("http://127.0.0.1:{port}/api/v1/storage_routing"))
-            .header("Content-Type", "application/json")
-            .body(fixture_routing_json().to_string())
-            .send()
-            .await
-            .expect("send ok");
-        assert!(resp.status().is_success());
-        let body: serde_json::Value = resp.json().await.unwrap();
-        assert_eq!(
-            body["tenant"],
-            crate::query_engines::routing::DEFAULT_TENANT
-        );
-        let snap_default =
-            handle.snapshot_for_tenant(crate::query_engines::routing::DEFAULT_TENANT);
-        assert_eq!(snap_default.len(), 1);
-    }
-
-    /// GET reports the tenant scope inferred from the request's
-    /// `X-ASAP-Tenant` header. Operators can issue
-    /// `curl -H 'X-ASAP-Tenant: tenant-a' /api/v1/storage_routing`
-    /// to inspect that one tenant's table; the `tenants` field
-    /// always lists every registered tenant for fleet-level
-    /// diagnostics.
-    #[tokio::test]
-    async fn storage_routing_get_per_tenant_lists_all_tenants() {
-        let (port, _handle) = setup_test_server_for_storage_routing().await;
-        let client = Client::new();
-        // Push two tenants.
-        for tenant in ["tenant-a", "tenant-b"] {
-            let mut body = fixture_routing_json();
-            body["tenant"] = serde_json::json!(tenant);
-            let _ = client
-                .post(format!("http://127.0.0.1:{port}/api/v1/storage_routing"))
-                .header("Content-Type", "application/json")
-                .body(body.to_string())
-                .send()
-                .await
-                .unwrap();
-        }
-        // GET tenant-a's view.
-        let resp = client
-            .get(format!("http://127.0.0.1:{port}/api/v1/storage_routing"))
-            .header("X-ASAP-Tenant", "tenant-a")
-            .send()
-            .await
-            .expect("send ok");
-        let body: serde_json::Value = resp.json().await.unwrap();
-        assert_eq!(body["tenant"], "tenant-a");
-        assert_eq!(body["metrics_count"], 1);
-        let tenants = body["tenants"].as_array().expect("tenants array");
-        let names: Vec<String> = tenants
-            .iter()
-            .filter_map(|v| v.as_str().map(|s| s.to_string()))
-            .collect();
-        assert!(names.contains(&"tenant-a".to_string()));
-        assert!(names.contains(&"tenant-b".to_string()));
-    }
-
-    #[tokio::test]
-    async fn storage_routing_swap_observed_by_subsequent_query_dispatch() {
-        // End-to-end production-path test: POST a routing table, then
-        // issue a `count(http_requests_total)` query. The handler must
-        // see the freshly-swapped table and route the query through
-        // the EngineRouter. We can't easily assert the response engine
-        // without setting up a Gorilla mock, but we can verify the
-        // swap landed by GETting the hash — that's the contract the
-        // control plane relies on.
-        let (port, handle) = setup_test_server_for_storage_routing().await;
-        let client = Client::new();
-
-        let resp = client
-            .post(format!("http://127.0.0.1:{port}/api/v1/storage_routing"))
-            .header("Content-Type", "application/json")
-            .body(fixture_routing_json().to_string())
-            .send()
-            .await
-            .expect("send ok");
-        assert!(resp.status().is_success());
-
-        // `lookup_with_shape` must reflect the swapped contents on
-        // the very next read.
-        let snap = handle.snapshot();
-        assert_eq!(
-            snap.lookup_with_shape(
-                "http_requests_total",
-                crate::storage_engines::types::QueryOperatorShape::Count,
-            ),
-            StorageBackend::DoubleWrite,
-        );
-        assert_eq!(
-            snap.lookup_with_shape(
-                "http_requests_total",
-                crate::storage_engines::types::QueryOperatorShape::Quantile,
-            ),
-            StorageBackend::SketchStore,
-        );
-    }
-
-    /// Build an `HttpServer` whose router holds the supplied engines.
-    async fn setup_test_server_with_named_router(
-        metric_storage_backend: StorageBackend,
-        engines: Vec<Arc<dyn QueryEngine>>,
-    ) -> u16 {
-        let adapter_config =
-            AdapterConfig::prometheus_promql("http://127.0.0.1:9999".to_string(), false);
-        let config = HttpServerConfig {
-            port: 0,
-            handle_http_requests: true,
-            adapter_config,
-        };
-        let streaming_cfg = InstalledPrecomputePlan::with_storage_backend(
-            Default::default(),
-            metric_storage_backend,
-        );
-        let streaming_arc = Arc::new(streaming_cfg);
-        let hot_reload = InstalledPrecomputePlanHandle::from_arc(streaming_arc.clone());
-        let query_engine = Arc::new(ASAPQueryEngine::new(15000));
-        let mut server = HttpServer::new(
-            config,
-            query_engine,
-            Arc::new(crate::storage_engines::sketch_db::index::SketchStore::new()),
-        )
-        .with_hot_reload_config(hot_reload);
-        for engine in engines {
-            server = server.with_query_engine(engine);
-        }
-        server
-            .start_test_server()
-            .await
-            .expect("Failed to start test server")
-    }
-
-    // ── Issue #46 ⑥ — freshness-probe last-value cache ────────────
-    //
-    // The MVP demo's freshness criterion polls
-    // `last_over_time(http_freshness_probe_warm[10s])` against the
-    // backend's HTTP query endpoint at 10 Hz. The cold-tier flush
-    // gap (gorillas3 → 60 s TSDB block → Thanos sync) leaves a 10 s
-    // lookback window empty, so the OTLP receiver captures the
-    // latest probe sample in a `FreshnessProbeCache` and the HTTP
-    // handler answers the matching query shape from RAM. These
-    // tests pin the contract: a recorded sample inside the lookback
-    // window comes back as a single-element instant vector with the
-    // counter value the producer encoded, and a stale sample falls
-    // through (returns no result) without crashing the handler.
-
-    /// Spin up an `HttpServer` wired to a fresh `FreshnessProbeCache`
-    /// and return both. The cache is shared with the server so the
-    /// test can pre-populate it with a synthetic sample before
-    /// hitting `/api/v1/query`. The router holds no cold-archive
-    /// engine; the freshness probe short-circuit must answer
-    /// without ever consulting the cold tier.
-    async fn setup_test_server_with_probe_cache(
-    ) -> (u16, Arc<crate::query_engines::routing::FreshnessProbeCache>) {
-        let adapter_config =
-            AdapterConfig::prometheus_promql("http://127.0.0.1:9999".to_string(), false);
-        let config = HttpServerConfig {
-            port: 0,
-            handle_http_requests: true,
-            adapter_config,
-        };
-        let streaming_arc = Arc::new(InstalledPrecomputePlan::default());
-        let query_engine = Arc::new(ASAPQueryEngine::new(15000));
-        let cache = Arc::new(crate::query_engines::routing::FreshnessProbeCache::new());
-        let server = HttpServer::new(
-            config,
-            query_engine,
-            Arc::new(crate::storage_engines::sketch_db::index::SketchStore::new()),
-        )
-        .with_probe_cache(cache.clone());
-        let port = server
-            .start_test_server()
-            .await
-            .expect("Failed to start test server");
-        (port, cache)
-    }
-
-    #[tokio::test]
-    async fn freshness_probe_last_over_time_answers_from_cache() {
-        let (port, cache) = setup_test_server_with_probe_cache().await;
-
-        // Synthetic sample: probe encodes its emission unix_ms as the
-        // counter value (matches `deploy/fake-exporter/probes.go`).
-        // Record the sample at "now" so the 10 s lookback hits.
-        let now_ms = crate::query_engines::routing::freshness_probe_now_ms();
-        let probe_value_ms = now_ms - 50; // sample emitted 50 ms ago
-        cache.record(
-            "http_freshness_probe_warm",
-            probe_value_ms,
-            probe_value_ms as f64,
-        );
-
-        let client = Client::new();
-        let resp = client
-            .get(format!("http://127.0.0.1:{port}/api/v1/query"))
-            .query(&[("query", "last_over_time(http_freshness_probe_warm[10s])")])
-            .send()
-            .await
-            .expect("Failed to send request");
-        assert!(
-            resp.status().is_success(),
-            "freshness-probe short-circuit must return 2xx; got {}",
-            resp.status(),
-        );
-        let body: serde_json::Value = resp.json().await.expect("Failed to parse JSON");
-        assert_eq!(body["status"], "success", "expected status=success: {body}");
-        let result = &body["data"]["result"];
-        assert!(
-            result.is_array() && !result.as_array().unwrap().is_empty(),
-            "expected non-empty result vector; got {body}",
-        );
-        // The element's value (string-encoded float, Prometheus-wire
-        // format) should be the cumulative counter the producer
-        // encoded — i.e. the unix_ms of the last emission.
-        let value_str = result[0]["value"][1]
-            .as_str()
-            .expect("instant-vector value must be a string");
-        let parsed: i64 = value_str.parse().expect("value must parse as integer");
-        assert_eq!(
-            parsed, probe_value_ms,
-            "last_over_time must return the cumulative counter value (= unix_ms of emission)",
-        );
-    }
-
-    #[tokio::test]
-    async fn freshness_probe_last_over_time_falls_through_on_stale_sample() {
-        let (port, cache) = setup_test_server_with_probe_cache().await;
-
-        // Sample is older than the lookback window — the cache lookup
-        // returns None and the handler falls through to the normal
-        // routing path. The default routing landed on
-        // `SketchStore`, which the test's empty `ASAPQueryEngine`
-        // can't answer, so the response is a structured error or an
-        // empty-result success — anything but a crash. The test
-        // pins the no-crash contract; the exact error surface is
-        // covered by the routing-table tests.
-        let now_ms = crate::query_engines::routing::freshness_probe_now_ms();
-        let stale_ts = now_ms - 60_000; // 60 s old, outside [now-10s, now]
-        cache.record("http_freshness_probe_warm", stale_ts, stale_ts as f64);
-
-        let client = Client::new();
-        let resp = client
-            .get(format!("http://127.0.0.1:{port}/api/v1/query"))
-            .query(&[("query", "last_over_time(http_freshness_probe_warm[10s])")])
-            .send()
-            .await
-            .expect("Failed to send request");
-        // The response either succeeds with an empty vector (cache
-        // miss → fall through → ASAPQueryEngine no-data) or returns a
-        // 4xx/5xx with a structured error. Either is fine as long as
-        // the handler did not panic.
-        let body: serde_json::Value = resp.json().await.expect("Failed to parse JSON");
-        assert!(
-            body.get("status").is_some(),
-            "response must carry a status field; got {body}",
-        );
-    }
-
-    #[test]
-    fn parse_last_over_time_probe_recognises_canonical_shape() {
-        // Canonical shape — `last_over_time(metric[range])`. Returns
-        // `(metric_name, range_ms)`.
-        let parsed =
-            super::parse_last_over_time_probe("last_over_time(http_freshness_probe_warm[10s])")
-                .expect("canonical last_over_time must parse");
-        assert_eq!(parsed.0, "http_freshness_probe_warm");
-        assert_eq!(parsed.1, 10_000);
-
-        // Different range — millis are extracted from the matrix
-        // selector, not hard-coded.
-        let parsed =
-            super::parse_last_over_time_probe("last_over_time(http_freshness_probe_archive[5m])")
-                .expect("5m range must parse");
-        assert_eq!(parsed.1, 5 * 60_000);
-    }
-
-    #[test]
-    fn parse_last_over_time_probe_rejects_other_shapes() {
-        // Bare vector selector — not a function call.
-        assert_eq!(
-            super::parse_last_over_time_probe("http_freshness_probe_warm"),
-            None,
-        );
-        // Different function name.
-        assert_eq!(
-            super::parse_last_over_time_probe("rate(http_freshness_probe_warm[10s])"),
-            None,
-        );
-        // Wrong arg count for last_over_time (which takes one matrix
-        // selector).
-        assert_eq!(super::parse_last_over_time_probe("last_over_time()"), None,);
-        // Aggregation around the call — outermost shape isn't a
-        // bare `last_over_time` call.
-        assert_eq!(
-            super::parse_last_over_time_probe(
-                "topk(1, last_over_time(http_freshness_probe_warm[10s]))"
-            ),
-            None,
-        );
-        // Garbage PromQL.
-        assert_eq!(super::parse_last_over_time_probe("not promql"), None);
-    }
-
-    #[tokio::test]
-    async fn freshness_probe_short_circuit_ignores_non_probe_metrics() {
-        let (port, cache) = setup_test_server_with_probe_cache().await;
-        let now_ms = crate::query_engines::routing::freshness_probe_now_ms();
-        cache.record("http_freshness_probe_warm", now_ms, now_ms as f64);
-
-        // Different metric — must NOT be served from the cache (the
-        // short-circuit checks the metric name prefix). The handler
-        // should fall through to normal routing; whatever happens
-        // there is the test of those paths, not of the short-circuit.
-        let client = Client::new();
-        let resp = client
-            .get(format!("http://127.0.0.1:{port}/api/v1/query"))
-            .query(&[("query", "last_over_time(http_requests_total[10s])")])
-            .send()
-            .await
-            .expect("Failed to send request");
-        let body: serde_json::Value = resp.json().await.expect("Failed to parse JSON");
-        // The cache hit would have produced a non-empty result with
-        // value `now_ms`. Fall-through paths return either an empty
-        // vector or an error — neither carries our probe value, so
-        // we negative-assert: the body must NOT contain the probe
-        // value as a stringified counter.
-        let body_str = body.to_string();
-        assert!(
-            !body_str.contains(&now_ms.to_string()),
-            "non-probe metric must NOT be answered from the freshness cache; \
-             saw probe value {now_ms} leaked into response: {body}",
-        );
-    }
-}
-
-/// Health check endpoint for DataCollector controller to verify backend is alive.
-async fn handle_prometheus_remote_write(
-    State(state): State<AppState>,
-    headers: HeaderMap,
-    body: Bytes,
-) -> Response {
-    let Some(receiver) = state.remote_write.as_ref() else {
-        return (StatusCode::NOT_FOUND, "Remote Write is disabled").into_response();
-    };
-    let content_encoding = headers
-        .get(axum::http::header::CONTENT_ENCODING)
-        .and_then(|value| value.to_str().ok());
-    if !content_encoding.is_some_and(|value| value.eq_ignore_ascii_case("snappy")) {
-        return (
-            StatusCode::UNSUPPORTED_MEDIA_TYPE,
-            "Content-Encoding must be snappy",
-        )
-            .into_response();
-    }
-    if let Some(content_type) = headers
-        .get(axum::http::header::CONTENT_TYPE)
-        .and_then(|value| value.to_str().ok())
-    {
-        if !content_type
-            .split(';')
-            .next()
-            .is_some_and(|value| value.trim().eq_ignore_ascii_case("application/x-protobuf"))
-        {
-            return (
-                StatusCode::UNSUPPORTED_MEDIA_TYPE,
-                "Content-Type must be application/x-protobuf",
-            )
-                .into_response();
-        }
-    }
-    if let Some(version) = headers
-        .get("x-prometheus-remote-write-version")
-        .and_then(|value| value.to_str().ok())
-    {
-        if version != "0.1.0" {
-            return (
-                StatusCode::BAD_REQUEST,
-                "only Prometheus Remote Write v1 (0.1.0) is supported",
-            )
-                .into_response();
-        }
-    }
-
-    let receiver = receiver.clone();
-    let accepted = match tokio::task::spawn_blocking(move || receiver.accept(&body)).await {
-        Ok(result) => result,
-        Err(error) => {
-            return (StatusCode::INTERNAL_SERVER_ERROR, error.to_string()).into_response()
-        }
-    };
-    match accepted {
-        Ok(()) => StatusCode::NO_CONTENT.into_response(),
-        Err(crate::drivers::ingest::prometheus_remote_write::RemoteWriteError::InputClosed) =>
-            (StatusCode::CONFLICT, "finite input is closed").into_response(),
-        Err(
-            crate::drivers::ingest::prometheus_remote_write::RemoteWriteError::CompressedTooLarge(
-                _,
-            )
-            | crate::drivers::ingest::prometheus_remote_write::RemoteWriteError::DecompressedTooLarge(
-                _,
-            )
-            | crate::drivers::ingest::prometheus_remote_write::RemoteWriteError::TooManySeries {
-                ..
-            }
-            | crate::drivers::ingest::prometheus_remote_write::RemoteWriteError::TooManySamples(
-                _,
-            ),
-        ) => (StatusCode::PAYLOAD_TOO_LARGE, "Remote Write request exceeds configured limits")
-            .into_response(),
-        Err(
-            error @ (crate::drivers::ingest::prometheus_remote_write::RemoteWriteError::Backpressure(
-                _,
-            )
-            | crate::drivers::ingest::prometheus_remote_write::RemoteWriteError::DedupCapacity(_)
-            | crate::drivers::ingest::prometheus_remote_write::RemoteWriteError::InactivePhysicalPlan),
-        ) => (StatusCode::SERVICE_UNAVAILABLE, error.to_string()).into_response(),
-        Err(crate::drivers::ingest::prometheus_remote_write::RemoteWriteError::Revision(error)) => {
-            let status = if error.is::<crate::precompute_engine::revisions::AdmissionRejected>() { StatusCode::BAD_REQUEST } else { StatusCode::INTERNAL_SERVER_ERROR };
-            (status, error.to_string()).into_response()
-        },
-        Err(error) => (StatusCode::BAD_REQUEST, error.to_string()).into_response(),
-    }
-}
-
-async fn handle_health(State(state): State<AppState>) -> axum::response::Response {
-    use axum::response::IntoResponse;
-
-    if state.remote_write.is_some() {
-        let Some(active) = state
-            .active_physical_plan
-            .as_ref()
-            .map(|handle| handle.active_snapshot())
-        else {
-            return (StatusCode::SERVICE_UNAVAILABLE, "no active PhysicalPlan").into_response();
-        };
-        let now = unix_time_ms();
-        let lifecycle_ready = active.plan_id() != 0
-            && active.activation_unix_ms() <= now
-            && active.expiry_unix_ms().is_none_or(|expiry| now < expiry);
-        let ingest_ready = matches!(
-            active.precompute_plan.ingest.protocol,
-            asap_types::precompute_plan::IngestProtocol::PrometheusRemoteWriteV1
-        ) && active.precompute_plan.ingest.endpoint_path == "/api/v1/write";
-        if !lifecycle_ready || !ingest_ready {
-            return (
-                StatusCode::SERVICE_UNAVAILABLE,
-                "active PhysicalPlan is not ready for Remote Write",
-            )
-                .into_response();
-        }
-    }
-    (StatusCode::OK, "ok").into_response()
-}
-
-/// Explicit end-of-input; this seals Remote Write for the lifetime of the process.
-async fn handle_precompute_drain(State(state): State<AppState>) -> Response {
-    let Some(receiver) = state.remote_write.as_ref() else {
-        return (StatusCode::NOT_FOUND, "Remote Write is disabled").into_response();
-    };
-    match receiver.drain().await {
-        Ok(()) => (
-            StatusCode::OK,
-            axum::Json(serde_json::json!({
-                "status": "success", "input_closed": true, "complete": true
-            })),
-        )
-            .into_response(),
-        Err(error) => (
-            StatusCode::INTERNAL_SERVER_ERROR,
-            axum::Json(serde_json::json!({
-                "status": "error", "input_closed": true, "complete": false, "error": error
-            })),
-        )
-            .into_response(),
-    }
-}
-
-/// Return list of metrics currently in the store.
-async fn handle_store_metrics(State(state): State<AppState>) -> axum::response::Response {
-    use axum::http::StatusCode;
-    use axum::response::IntoResponse;
-
-    // Per-sid first-seen timestamps are available without I/O.
-    let timestamps = state.summary_store.earliest_timestamps_per_series_id();
-    let body = serde_json::json!({
-        "status": "success",
-        "sid_count": timestamps.len(),
-        "approx_resident_bytes": state.summary_store.approx_resident_bytes(),
-        "earliest_timestamps_per_series_id": timestamps});
-    (StatusCode::OK, axum::Json(body)).into_response()
-}
-
-pub use asap_types::plan_publication::PhysicalPlanInstallRequest;
-
-/// Decode and cross-validate every backend view before it can become visible.
-/// Used by both startup artifact loading and the staged HTTP install path.
-pub fn validate_and_build_runtime_plan(
-    request: PhysicalPlanInstallRequest,
-    default_routing: Arc<crate::storage_engines::types::BackendStorageRouting>,
-) -> Result<crate::storage_engines::types::RuntimePhysicalPlan, String> {
-    use std::collections::BTreeSet;
-    request
-        .precompute_plan
-        .validate_against_catalog(&request.summary_catalog)
-        .map_err(|error| format!("PrecomputePlan catalog validation error: {error}"))?;
-    request
-        .transmission_plan
-        .validate_against_catalog(&request.summary_catalog)
-        .map_err(|error| format!("TransmissionPlan catalog validation error: {error}"))?;
-    request
-        .query_plan
-        .validate_against_catalog(&request.summary_catalog)
-        .map_err(|error| format!("QueryPlan catalog validation error: {error}"))?;
-    for collector in &request.collector_plans {
-        collector
-            .validate_against_catalog(&request.summary_catalog)
-            .map_err(|error| format!("CollectorPlan catalog validation error: {error}"))?;
-    }
-    asap_types::plan_publication::validate_stored_output_references(
-        &request.precompute_plan,
-        &request.query_plan,
-    )?;
-    let _runtime_materializations = request
-        .precompute_plan
-        .runtime_materializations()
-        .map_err(|error| format!("PrecomputePlan validation error: {error}"))?;
-    request
-        .transmission_plan
-        .validate(&request.precompute_plan)
-        .map_err(|error| format!("TransmissionPlan validation error: {error}"))?;
-    let envelope = &request.precompute_plan.envelope;
-    if request.query_plan.plan_id != envelope.plan_id
-        || request.query_plan.plan_version != envelope.plan_version
-        || request.transmission_plan.envelope != *envelope
-    {
-        return Err("physical subplans have different plan identity/version".into());
-    }
-    let installed_precompute_plan =
-        crate::storage_engines::types::InstalledPrecomputePlan::from_precompute_plan(
-            request.precompute_plan.clone(),
-        )
-        .map_err(|error| format!("DAG execution installation failed: {error}"))?;
-    let typed_fps: BTreeSet<_> = installed_precompute_plan
-        .materializations_by_output
-        .keys()
-        .copied()
-        .map(asap_types::sds::StoredOutputId::fingerprint)
-        .collect();
-    request
-        .query_plan
-        .validate(&typed_fps)
-        .map_err(|error| format!("QueryPlan validation error: {error}"))?;
-    asap_types::plan_publication::validate_maintenance_query_bindings(
-        &request.precompute_plan,
-        &request.query_plan,
-    )?;
-    let storage_routing = match request.storage_routing.as_ref() {
-        Some(value) => Arc::new(
-            crate::storage_engines::types::BackendStorageRouting::from_json_payload(value)
-                .map_err(|error| format!("BackendStorageRouting build error: {error:#}"))?,
-        ),
-        None => default_routing,
-    };
-    Ok(crate::storage_engines::types::RuntimePhysicalPlan {
-        readout_programs: Default::default(),
-        envelope: envelope.clone(),
-        summary_catalog: Some(Arc::new(request.summary_catalog)),
-        precompute_plan: request.precompute_plan,
-        transmission_plan: request.transmission_plan,
-        installed_precompute_plan: Arc::new(installed_precompute_plan),
-        query_plan: Arc::new(request.query_plan),
-        storage_routing,
-    })
-}
-
-/// Validate and stage all backend views. Staging never changes query routing;
-/// a separate activation request performs the single snapshot swap.
-async fn handle_post_physical_plan(
-    State(state): State<AppState>,
-    axum::Json(request): axum::Json<PhysicalPlanInstallRequest>,
-) -> axum::response::Response {
-    use axum::http::StatusCode;
-    use axum::response::IntoResponse;
-
-    let Some(active_handle) = state.active_physical_plan.as_ref() else {
-        return (
-            StatusCode::SERVICE_UNAVAILABLE,
-            axum::Json(serde_json::json!({
-                "status": "error", "error": "physical-plan hot-reload handles are not attached"
-            })),
-        )
-            .into_response();
-    };
-    let Some(lifecycle) = state.physical_plan_lifecycle.as_ref() else {
-        return (
-            StatusCode::SERVICE_UNAVAILABLE,
-            axum::Json(serde_json::json!({
-                "status": "error", "error": "physical-plan lifecycle is not attached"
-            })),
-        )
-            .into_response();
-    };
-    let current = active_handle.active_snapshot();
-    if current.transmission_plan.envelope.plan_id != 0 {
-        if let Err(error) = current.transmission_plan.authorize_successor(
-            &request.transmission_plan,
-            &request.adaptation_evidence,
-            unix_time_ms(),
-        ) {
-            return (
-                StatusCode::UNPROCESSABLE_ENTITY,
-                axum::Json(serde_json::json!({
-                    "status": "error",
-                    "error": format!("runtime adaptation authorization error: {error}")
-                })),
-            )
-                .into_response();
-        }
-    }
-    let _guard = state.physical_plan_lock.lock().await;
-    let active = match validate_and_build_runtime_plan(request, current.storage_routing.clone()) {
-        Ok(active) => active,
-        Err(error) => {
-            return (
-                StatusCode::UNPROCESSABLE_ENTITY,
-                axum::Json(serde_json::json!({"status": "error", "error": error})),
-            )
-                .into_response();
-        }
-    };
-    if state.remote_write.is_some()
-        && (active.plan_id() == 0
-            || !matches!(
-                active.precompute_plan.ingest.protocol,
-                asap_types::precompute_plan::IngestProtocol::PrometheusRemoteWriteV1
-            )
-            || active.precompute_plan.ingest.endpoint_path != "/api/v1/write")
-    {
-        return (
-            StatusCode::UNPROCESSABLE_ENTITY,
-            axum::Json(serde_json::json!({
-                "status": "error",
-                "error": "Remote Write listener requires a non-bootstrap prometheus_remote_write_v1 plan at /api/v1/write"
-            })),
-        )
-            .into_response();
-    }
-    let plan_id = active.plan_id();
-    let materialization_count = active.precompute_plan.materializations.len();
-    let metricsql_query_count = active
-        .query_plan
-        .entries
-        .values()
-        .filter(|entry| entry.language == asap_types::query_plan::QueryLanguage::MetricsQl)
-        .count();
-    let clickhouse_plan_count = active
-        .query_plan
-        .entries
-        .values()
-        .filter(|entry| entry.language == asap_types::query_plan::QueryLanguage::ClickHouseSql)
-        .count();
-    let plan_version = active.plan_version();
-    let now = unix_time_ms();
-    if let Err(error) = lifecycle.stage(active, now) {
-        return (
-            StatusCode::CONFLICT,
-            axum::Json(serde_json::json!({"status": "error", "error": error.to_string()})),
-        )
-            .into_response();
-    }
-    (
-        StatusCode::ACCEPTED,
-        axum::Json(serde_json::json!({
-            "status": "staged", "plan_id": plan_id, "plan_version": plan_version,
-            "materialization_count": materialization_count,
-            "metricsql_query_count": metricsql_query_count,
-            "clickhouse_plan_count": clickhouse_plan_count
-        })),
-    )
-        .into_response()
-}
-
-#[derive(serde::Deserialize)]
-#[serde(deny_unknown_fields)]
-struct ActivatePhysicalPlanRequest {
-    plan_id: u64,
-    plan_version: u64,
-}
-
-async fn handle_activate_physical_plan(
-    State(state): State<AppState>,
-    axum::Json(request): axum::Json<ActivatePhysicalPlanRequest>,
-) -> axum::response::Response {
-    use axum::response::IntoResponse;
-    let (Some(lifecycle), Some(active_handle)) = (
-        state.physical_plan_lifecycle.as_ref(),
-        state.active_physical_plan.as_ref(),
-    ) else {
-        return (
-            StatusCode::SERVICE_UNAVAILABLE,
-            axum::Json(serde_json::json!({
-                "status": "error", "error": "physical-plan lifecycle is not attached"
-            })),
-        )
-            .into_response();
-    };
-    let _guard = state.physical_plan_lock.lock().await;
-    let store = Arc::clone(&state.summary_store);
-    let remote_write = state.remote_write.clone();
-    let old = match lifecycle.activate_with_prepare(
-        request.plan_id,
-        request.plan_version,
-        unix_time_ms(),
-        move |plan| match plan.summary_catalog.as_ref() {
-            Some(catalog) => {
-                store
-                    .install_precompute_plan(Arc::clone(catalog), &plan.precompute_plan)
-                    .map_err(|error| format!("SummaryCatalog install error: {error}"))?;
-                if let Some(receiver) = &remote_write {
-                    receiver.install_erp_observation_generation(
-                        catalog.reference().map_err(|error| error.to_string())?,
-                    );
-                }
-                Ok(())
-            }
-            None => Err("authoritative SummaryCatalog is unavailable".to_string()),
-        },
-    ) {
-        Ok(old) => old,
-        Err(error) => {
-            return (
-                StatusCode::CONFLICT,
-                axum::Json(serde_json::json!({
-                    "status": "error", "error": error.to_string()
-                })),
-            )
-                .into_response()
-        }
-    };
-    let activated = active_handle.active_snapshot();
-    let clickhouse_plan_count = activated
-        .query_plan
-        .entries
-        .values()
-        .filter(|entry| entry.language == asap_types::query_plan::QueryLanguage::ClickHouseSql)
-        .count();
-    if old.plan_id() != 0 {
-        let draining_id = old.plan_id();
-        let draining_version = old.plan_version();
-        let lifecycle = lifecycle.clone();
-        tokio::spawn(async move {
-            loop {
-                if Arc::strong_count(&old) == 1 {
-                    lifecycle.mark_drained_plan_retired(draining_id, draining_version);
-                    break;
-                }
-                tokio::time::sleep(Duration::from_millis(10)).await;
-            }
-        });
-    }
-    let snap = activated.installed_precompute_plan.clone();
-    let retired = crate::storage_engines::sketch_db::lifecycle::reconcile_from_streaming_config(
-        state.summary_store.as_ref(),
-        snap.as_ref(),
-        crate::storage_engines::sketch_db::DEFAULT_RETIREMENT_RETENTION,
-    );
-    (
-        StatusCode::OK,
-        axum::Json(serde_json::json!({
-            "status": "active", "plan_id": request.plan_id, "plan_version": request.plan_version,
-            "sids_retired": retired.retired,
-            "clickhouse_plan_count": clickhouse_plan_count
-        })),
-    )
-        .into_response()
-}
-
-async fn handle_summary_inventory(State(state): State<AppState>) -> axum::response::Response {
-    use axum::response::IntoResponse;
-    let Some(active) = state
-        .active_physical_plan
-        .as_ref()
-        .map(|handle| handle.active_snapshot())
-    else {
-        return (
-            StatusCode::SERVICE_UNAVAILABLE,
-            axum::Json(
-                serde_json::json!({"status":"error","error":"physical plan is unavailable"}),
-            ),
-        )
-            .into_response();
-    };
-    if active.summary_catalog.is_none() {
-        return (
-            StatusCode::SERVICE_UNAVAILABLE,
-            axum::Json(serde_json::json!({"status":"error","error":"authoritative SummaryCatalog is unavailable"})),
-        )
-            .into_response();
-    }
-    let producers = active
-        .precompute_plan
-        .producers
-        .iter()
-        .map(|producer| {
-            let definition = asap_types::sds::StoredOutputId::from(producer.materialization);
-            active
-                .precompute_plan
-                .schemas
-                .iter()
-                .find(|schema| schema.materialization == definition)
-                .map(|schema| {
-                    (
-                        definition,
-                        (
-                            schema.stored_output_reference.stored_output_id,
-                            producer.producer_id.clone(),
-                        ),
-                    )
-                })
-        })
-        .collect::<Option<std::collections::BTreeMap<_, _>>>();
-    let Some(producers) = producers else {
-        return (
-            StatusCode::INTERNAL_SERVER_ERROR,
-            axum::Json(serde_json::json!({"status":"error","error":"precompute producer has no stored-output binding"})),
-        )
-            .into_response();
-    };
-    let reporter = std::env::var("HOSTNAME").unwrap_or_else(|_| "asapquery-backend".into());
-    match state.summary_store.observed_summary_inventory(
-        &reporter,
-        &reporter,
-        &producers,
-        active.plan_version(),
-        unix_time_ms() as i64,
-    ) {
-        Ok(inventory) => axum::Json(inventory).into_response(),
-        Err(error) => (
-            StatusCode::INTERNAL_SERVER_ERROR,
-            axum::Json(serde_json::json!({"status":"error","error":error})),
-        )
-            .into_response(),
-    }
-}
-
-async fn handle_discard_physical_plan(
-    State(state): State<AppState>,
-    axum::Json(request): axum::Json<ActivatePhysicalPlanRequest>,
-) -> axum::response::Response {
-    use axum::response::IntoResponse;
-    let Some(lifecycle) = state.physical_plan_lifecycle.as_ref() else {
-        return (
-            StatusCode::SERVICE_UNAVAILABLE,
-            "physical-plan lifecycle is not attached",
-        )
-            .into_response();
-    };
-    match lifecycle.discard_staged(request.plan_id, request.plan_version) {
-        Ok(()) => StatusCode::NO_CONTENT.into_response(),
-        Err(error) => (StatusCode::CONFLICT, error.to_string()).into_response(),
-    }
-}
-
-async fn handle_physical_plan_status(State(state): State<AppState>) -> axum::response::Response {
-    use axum::response::IntoResponse;
-    let Some(lifecycle) = state.physical_plan_lifecycle.as_ref() else {
-        return (
-            StatusCode::SERVICE_UNAVAILABLE,
-            axum::Json(serde_json::json!({
-                "status": "error", "error": "physical-plan lifecycle is not attached"
-            })),
-        )
-            .into_response();
-    };
-    let precompute_plan = state
-        .active_physical_plan
-        .as_ref()
-        .map(|active| active.active_snapshot().precompute_plan.clone());
-    let materializations = state
-        .active_physical_plan
-        .as_ref()
-        .map(|active| active.materialization_statuses())
-        .unwrap_or_default();
-    (
-        StatusCode::OK,
-        axum::Json(serde_json::json!({
-            "status": "success",
-            "plans": lifecycle.statuses(),
-            "precompute_plan": precompute_plan,
-            "materializations": materializations
-        })),
-    )
-        .into_response()
-}
-
-fn unix_time_ms() -> u64 {
-    std::time::SystemTime::now()
-        .duration_since(std::time::UNIX_EPOCH)
-        .unwrap_or_default()
-        .as_millis() as u64
-}
-
-// ── BackendStorageRouting hot-reload endpoints ────────────
-
-/// `GET /api/v1/storage_routing` — return a JSON snapshot of the
-/// currently-active per-metric `BackendStorageRouting` table.
-///
-/// Useful for operators to confirm a control plane push landed with the
-/// expected entries. Returns 503 when the backend wasn't built with a
-/// routing-table handle.
-async fn handle_get_storage_routing(
-    State(state): State<AppState>,
-    headers: axum::http::HeaderMap,
-) -> axum::response::Response {
-    use axum::http::StatusCode;
-    use axum::response::IntoResponse;
-
-    let Some(handle) = state.backend_storage_routing.as_ref() else {
-        let body = serde_json::json!({
-            "status": "error",
-            "error": "routing handle not attached; backend was built without HttpServer::with_backend_storage_routing"});
-        return (StatusCode::SERVICE_UNAVAILABLE, axum::Json(body)).into_response();
-    };
-    // Per-tenant scope: the GET reports the tenant inferred from the
-    // request's `X-ASAP-Tenant` header (default `"default"`). The
-    // `tenants` field lists every tenant id currently registered so
-    // operators can spot-check the multi-tenant map without a
-    // separate endpoint.
-    let tenant = extract_tenant(&headers);
-    let snap = handle.snapshot_for_tenant(&tenant);
-    let body = serde_json::json!({
-        "status": "success",
-        "tenant": tenant,
-        "default_engine": snap.default_backend().data_source_id(),
-        "metrics_count": snap.len(),
-        "table_hash": crate::query_engines::routing::routing_table_hash(snap.as_ref()),
-        "tenants": handle.tenant_ids()});
-    (StatusCode::OK, axum::Json(body)).into_response()
-}
-
-/// `POST /api/v1/storage_routing` — replace the per-metric routing
-/// table from a control-plane-emitted JSON document.
-///
-/// Body shape — see
-/// `control_plane/src/emit/stage_config.rs::emit_backend_storage_routing`
-/// (or `BackendStorageRouting::from_json_payload` in this crate for
-/// the matching parser). On 2xx the response body carries the new
-/// table's hash and entry count so the control plane can verify the
-/// installed bytes match what it pushed.
-///
-/// Errors:
-/// * 400 — body is not valid UTF-8, not valid JSON, or the JSON
-///   fails the schema check (unknown engine / empty targets / etc.).
-/// * 503 — backend wasn't built with a routing-table handle.
-///
-/// The swap is atomic: in-flight queries either see the entire old
-/// table or the entire new table; never a half-applied state.
-async fn handle_post_storage_routing(
-    State(state): State<AppState>,
-    headers: axum::http::HeaderMap,
-    body: axum::body::Bytes,
-) -> axum::response::Response {
-    use axum::http::StatusCode;
-    use axum::response::IntoResponse;
-
-    let Some(handle) = state.backend_storage_routing.as_ref() else {
-        let body = serde_json::json!({
-            "status": "error",
-            "error": "routing handle not attached; backend was built without HttpServer::with_backend_storage_routing"});
-        return (StatusCode::SERVICE_UNAVAILABLE, axum::Json(body)).into_response();
-    };
-
-    let json_text = match std::str::from_utf8(&body) {
-        Ok(s) => s,
-        Err(e) => {
-            let body = serde_json::json!({
-                "status": "error",
-                "error": format!("request body is not valid UTF-8: {e}")});
-            return (StatusCode::BAD_REQUEST, axum::Json(body)).into_response();
-        }
-    };
-    let json_value: serde_json::Value = match serde_json::from_str(json_text) {
-        Ok(v) => v,
-        Err(e) => {
-            let body = serde_json::json!({
-                "status": "error",
-                "error": format!("JSON parse error: {e}")});
-            return (StatusCode::BAD_REQUEST, axum::Json(body)).into_response();
-        }
-    };
-    let new_table = match crate::storage_engines::types::BackendStorageRouting::from_json_payload(
-        &json_value,
-    ) {
-        Ok(t) => t,
-        Err(e) => {
-            let body = serde_json::json!({
-                "status": "error",
-                "error": format!("BackendStorageRouting build error: {e:#}")});
-            return (StatusCode::BAD_REQUEST, axum::Json(body)).into_response();
-        }
-    };
-
-    // Per-tenant push: the new table's tenant id is the source of
-    // truth (the body's `tenant` field, defaulting to `default`).
-    // The `X-ASAP-Tenant` header is honoured as a fallback when the
-    // body left the tenant field implicit — it's the control plane's
-    // primary signal for "which tenant am I pushing for".
-    let tenant_from_body = new_table.tenant().to_string();
-    let tenant = if tenant_from_body == crate::query_engines::routing::DEFAULT_TENANT {
-        // Body left it implicit; honour the header.
-        extract_tenant(&headers)
-    } else {
-        tenant_from_body
-    };
-
-    let entries = new_table.len();
-    let hash = crate::query_engines::routing::routing_table_hash(&new_table);
-    let _old = handle.swap_tenant(&tenant, new_table);
-    info!(
-        tenant = %tenant,
-        entries,
-        table_hash = %hash,
-        "storage-routing JSON hot-reload swap completed (per-tenant)",
-    );
-
-    let body = serde_json::json!({
-        "status": "success",
-        "tenant": tenant,
-        "metrics_count": entries,
-        "table_hash": hash});
-    (StatusCode::OK, axum::Json(body)).into_response()
-}
-
-/// Expose sid metadata at `/api/v1/db/schemas` for API compatibility.
-/// Filter with `status=active|retired|expired|all` (default `all`).
-async fn handle_get_schemas(
-    State(state): State<AppState>,
-    axum::extract::Query(params): axum::extract::Query<std::collections::HashMap<String, String>>,
-) -> axum::response::Response {
-    use crate::storage_engines::sketch_db::AggStatus;
-    use axum::http::StatusCode;
-    use axum::response::IntoResponse;
-
-    let filter = params.get("status").map(String::as_str).unwrap_or("all");
-    let allowed: &[AggStatus] = match filter {
-        "active" => &[AggStatus::Active],
-        "retired" => &[AggStatus::Retired],
-        "expired" => &[AggStatus::Expired],
-        "all" => &[AggStatus::Active, AggStatus::Retired, AggStatus::Expired],
-        other => {
-            let body = serde_json::json!({
-            "status": "error",
-            "error": format!(
-                "unknown status filter '{other}'; expected one of active|retired|expired|all",
-            )});
-            return (StatusCode::BAD_REQUEST, axum::Json(body)).into_response();
-        }
-    };
-
-    let mut entries: Vec<serde_json::Value> = state
-        .summary_store
-        .snapshot_instances()
-        .iter()
-        .filter(|m| allowed.contains(&m.status()))
-        .map(|metadata| {
-            let descriptors = state
-                .summary_store
-                .descriptors_for_series_id(metadata.storage_handle);
-            stored_output_instance_to_json(
-                metadata,
-                descriptors.as_ref(),
-                state
-                    .summary_store
-                    .stored_output_for_handle(metadata.storage_handle),
-            )
-        })
-        .collect();
-    entries.sort_by_key(|v| {
-        v.get("storage_handle")
-            .and_then(|x| x.as_u64())
-            .unwrap_or(0)
-    });
-
-    let body = serde_json::json!({
-        "status": "success",
-        "count": entries.len(),
-        "schemas": entries});
-    (StatusCode::OK, axum::Json(body)).into_response()
-}
-
-fn status_str(s: crate::storage_engines::sketch_db::AggStatus) -> &'static str {
-    use crate::storage_engines::sketch_db::AggStatus;
-    match s {
-        AggStatus::Active => "active",
-        AggStatus::Retired => "retired",
-        AggStatus::Expired => "expired",
-    }
-}
-
-/// Encode sid metadata, including identity, lifecycle timestamps, and status.
-fn stored_output_instance_to_json(
-    m: &crate::storage_engines::sketch_db::index::SummarySeriesMetadata,
-    descriptors: Option<&(
-        std::sync::Arc<crate::storage_engines::sketch_db::SummaryDescriptor>,
-        std::sync::Arc<crate::storage_engines::sketch_db::DataDescriptor>,
-    )>,
-    output: Option<asap_types::sds::StoredOutputReference>,
-) -> serde_json::Value {
-    let summary_descriptor_id = descriptors.map(|(summary, _)| summary.id.canonical());
-    let data_descriptor_id = descriptors.map(|(_, data)| data.id.canonical());
-    serde_json::json!({
-        "storage_handle": m.storage_handle,
-        "stored_output_reference": output,
-        "metric_name": m.metric_name,
-        "status": status_str(m.status()),
-        "first_seen_unix_ms": m.first_seen_unix_ms,
-        "retired_at_ms": m.retired_at_ms,
-        "expires_at_ms": m.expires_at_ms,
-        "group_by_keys": m.group_by_keys.iter().collect::<Vec<_>>(),
-        "agg_kind": format!("{:?}", m.agg_kind),
-        "summary_descriptor_id": summary_descriptor_id,
-        "data_descriptor_id": data_descriptor_id})
-}
-
-/// `POST /api/v1/db/schemas/:sid/retire` — manually transition an
-/// Active sid to Retired (kicking off the retirement retention
-/// clock). Idempotent: already-Retired or Expired sids return 200
-/// with their current state unchanged. Returns 404 if the sid is
-/// unknown.
-async fn handle_post_schema_retire(
-    State(state): State<AppState>,
-    axum::extract::Path(sid): axum::extract::Path<u64>,
-) -> axum::response::Response {
-    use axum::response::IntoResponse;
-    match state.summary_store.force_retire(
-        sid,
-        crate::storage_engines::sketch_db::DEFAULT_RETIREMENT_RETENTION,
-    ) {
-        Some(meta) => {
-            let descriptors = state.summary_store.descriptors_for_series_id(sid);
-            let body = serde_json::json!({
-                "status": "success",
-                "schema": stored_output_instance_to_json(&meta, descriptors.as_ref(), state.summary_store.stored_output_for_handle(meta.storage_handle))});
-            (StatusCode::OK, axum::Json(body)).into_response()
-        }
-        None => {
-            let body = serde_json::json!({
-                "status": "error",
-                "error": format!("sid {sid} not found")});
-            (StatusCode::NOT_FOUND, axum::Json(body)).into_response()
-        }
-    }
-}
-
-/// `POST /api/v1/db/schemas/:sid/expire` — manually transition a sid
-/// to Expired immediately. The next `SchemaEvictionService` tick
-/// drops the sid's data + removes the sid. Idempotent; 404 if the
-/// sid is unknown.
-async fn handle_post_schema_expire(
-    State(state): State<AppState>,
-    axum::extract::Path(sid): axum::extract::Path<u64>,
-) -> axum::response::Response {
-    use axum::response::IntoResponse;
-    match state.summary_store.force_expire(sid) {
-        Some(meta) => {
-            let descriptors = state.summary_store.descriptors_for_series_id(sid);
-            let body = serde_json::json!({
-                "status": "success",
-                "schema": stored_output_instance_to_json(&meta, descriptors.as_ref(), state.summary_store.stored_output_for_handle(meta.storage_handle))});
-            (StatusCode::OK, axum::Json(body)).into_response()
-        }
-        None => {
-            let body = serde_json::json!({
-                "status": "error",
-                "error": format!("sid {sid} not found")});
-            (StatusCode::NOT_FOUND, axum::Json(body)).into_response()
-        }
-    }
-}
-
-fn coverage_str(c: crate::storage_engines::sketch_db::TimelineCoverage) -> &'static str {
-    use crate::storage_engines::sketch_db::TimelineCoverage;
-    match c {
-        TimelineCoverage::Sketch => "sketch",
-        TimelineCoverage::Purged => "purged",
-    }
-}
-
-/// §7 / §15.3 of the sketch DB design: expose the schema timeline
-/// for a given metric over an `[start_ms, end_ms]` window. Useful
-/// for debugging "which agg served this slice of history?" questions
-/// without attaching a debugger, and for external tools that want
-/// to reproduce the engine's per-segment dispatch.
-///
-/// Required query params:
-///   `metric`    — metric name (string).
-///   `start_ms`  — inclusive lower bound (u64 millis).
-///   `end_ms`    — inclusive upper bound (u64 millis).
-async fn handle_get_timeline(
-    State(state): State<AppState>,
-    axum::extract::Query(params): axum::extract::Query<std::collections::HashMap<String, String>>,
-) -> axum::response::Response {
-    use axum::http::StatusCode;
-    use axum::response::IntoResponse;
-
-    let Some(metric) = params.get("metric") else {
-        let body = serde_json::json!({
-            "status": "error",
-            "error": "missing required query parameter 'metric'"});
-        return (StatusCode::BAD_REQUEST, axum::Json(body)).into_response();
-    };
-
-    let parse_u64 = |key: &str| -> Result<u64, Box<axum::response::Response>> {
-        match params.get(key) {
-            Some(s) => s.parse::<u64>().map_err(|e| {
-                let body = serde_json::json!({
-                    "status": "error",
-                    "error": format!("query parameter '{key}' is not a valid u64: {e}")});
-                Box::new((StatusCode::BAD_REQUEST, axum::Json(body)).into_response())
-            }),
-            None => {
-                let body = serde_json::json!({
-                    "status": "error",
-                    "error": format!("missing required query parameter '{key}'")});
-                Err(Box::new(
-                    (StatusCode::BAD_REQUEST, axum::Json(body)).into_response(),
-                ))
-            }
-        }
-    };
-    let start_ms = match parse_u64("start_ms") {
-        Ok(v) => v,
-        Err(resp) => return *resp,
-    };
-    let end_ms = match parse_u64("end_ms") {
-        Ok(v) => v,
-        Err(resp) => return *resp,
-    };
-
-    // Schema retirement #2 — read the timeline from the sid catalog
-    // directly. The `agg_id` field on each segment now carries a
-    // content-derived signature id (xxh64 of metric + agg_kind +
-    // group_by_keys), stable across restarts.
-    let segments = crate::storage_engines::sketch_db::query::timeline::timeline_for_metric(
-        &state.summary_store,
-        metric,
-        start_ms,
-        end_ms,
-    );
-    let entries: Vec<serde_json::Value> = segments
-        .iter()
-        .map(|s| {
-            serde_json::json!({
-                "agg_id": s.agg_id,
-                "start_ms": s.start_ms,
-                "end_ms": s.end_ms,
-                "status": status_str(s.status),
-                "coverage": coverage_str(s.coverage)})
-        })
-        .collect();
-
-    let body = serde_json::json!({
-        "status": "success",
-        "metric": metric,
-        "start_ms": start_ms,
-        "end_ms": end_ms,
-        "count": entries.len(),
-        "segments": entries});
-    (StatusCode::OK, axum::Json(body)).into_response()
-}
-
-// ─── §10 / §15 backfill API ──────────────────────────────────────────────────
-
-/// Request body for `POST /api/v1/db/backfill`.
-#[derive(serde::Deserialize)]
-struct CreateBackfillJobRequest {
-    agg_id: u64,
-    start_ms: u64,
-    end_ms: u64,
-    source: crate::storage_engines::sketch_db::BackfillSource,
-    windows_total: u64,
-}
-
-fn backfill_status_str(s: &crate::storage_engines::sketch_db::BackfillStatus) -> &'static str {
-    use crate::storage_engines::sketch_db::BackfillStatus;
-    match s {
-        BackfillStatus::Queued => "queued",
-        BackfillStatus::Running => "running",
-        BackfillStatus::Complete => "complete",
-        BackfillStatus::Failed => "failed",
-        BackfillStatus::Cancelled => "cancelled",
-    }
-}
-
-fn backfill_job_to_json(job: &crate::storage_engines::sketch_db::BackfillJob) -> serde_json::Value {
-    serde_json::json!({
-        "job_id": job.job_id,
-        "agg_id": job.agg_id,
-        "start_ms": job.time_range.0,
-        "end_ms": job.time_range.1,
-        "source": job.source,
-        "status": backfill_status_str(&job.status),
-        "progress": job.progress(),
-        "windows_done": job.windows_done,
-        "windows_total": job.windows_total,
-        "created_at_ms": job.created_at_ms,
-        "started_at_ms": job.started_at_ms,
-        "completed_at_ms": job.completed_at_ms,
-        "error_message": job.error_message})
-}
-
-fn service_unavailable_no_backfill() -> axum::response::Response {
-    use axum::response::IntoResponse;
-    let body = serde_json::json!({
-        "status": "error",
-        "error": "backfill registry not attached; backend was built without HttpServer::with_backfill_registry"});
-    (StatusCode::SERVICE_UNAVAILABLE, axum::Json(body)).into_response()
-}
-
-/// `POST /api/v1/db/backfill` — create a queued backfill job.
-///
-/// Validates the request against the §10.5 invariants via
-/// `BackfillRegistry::create_checked`:
-/// * `agg_id` must be known to the schema registry → 404 on miss.
-/// * `end_ms` must not extend past the agg's `created_at_ms` (no
-///   race against live ingest) → 409 on overlap.
-/// * `start_ms` must be within the SketchStore data-retention
-///   window when one is configured (Method B) → 409 on stale range.
-///
-/// 400 on malformed body / inverted range; 503 when no registry or
-/// schema registry is attached.
-async fn handle_post_backfill_job(
-    State(state): State<AppState>,
-    body: axum::body::Bytes,
-) -> axum::response::Response {
-    use crate::storage_engines::sketch_db::CreateError;
-    use axum::response::IntoResponse;
-
-    let Some(registry) = state.backfill else {
-        return service_unavailable_no_backfill();
-    };
-
-    let req: CreateBackfillJobRequest = match serde_json::from_slice(&body) {
-        Ok(v) => v,
-        Err(e) => {
-            let body = serde_json::json!({
-                "status": "error",
-                "error": format!("invalid request body: {e}")});
-            return (StatusCode::BAD_REQUEST, axum::Json(body)).into_response();
-        }
-    };
-    if req.start_ms >= req.end_ms {
-        let body = serde_json::json!({
-        "status": "error",
-        "error": format!(
-            "start_ms {} must be < end_ms {}",
-            req.start_ms, req.end_ms
-        )});
-        return (StatusCode::BAD_REQUEST, axum::Json(body)).into_response();
-    }
-
-    // Resolve the aggregation from the current installed precompute plan, or
-    // return 404 `UnknownAgg`. Its earliest matching sid timestamp bounds the
-    // backfill range; with no ingested sid, use the current time.
-    let Some(handle) = state.hot_reload_config.as_ref() else {
-        let body = serde_json::json!({
-            "status": "error",
-            "error": "hot-reload installed precompute handle not attached; backfill agg lookup requires HttpServer::with_hot_reload_config"});
-        return (StatusCode::SERVICE_UNAVAILABLE, axum::Json(body)).into_response();
-    };
-    let snapshot = handle.snapshot();
-    let agg_cfg = match snapshot.get_aggregation_config(asap_types::sds::StoredOutputId(req.agg_id))
-    {
-        Some(c) => c.clone(),
-        None => {
-            let body = serde_json::json!({
-                "status": "error",
-                "error": format!("unknown agg_id {} (not in installed precompute plan)", req.agg_id)});
-            return (StatusCode::NOT_FOUND, axum::Json(body)).into_response();
-        }
-    };
-    let created_at_ms = {
-        // Earliest live first_seen_unix_ms for this metric, if any
-        // sid in the catalog has actually ingested data. A sid that
-        // was registered without data has `first_seen_unix_ms == 0`,
-        // which we treat as "no live ingest yet" rather than
-        // "ingest started at the unix epoch" — backfill can then
-        // cover up to wall-clock-now.
-        let earliest = state
-            .summary_store
-            .snapshot_instances()
-            .into_iter()
-            .filter(|m| m.metric_name == agg_cfg.metric)
-            .map(|m| m.first_seen_unix_ms.max(0) as u64)
-            .filter(|t| *t > 0)
-            .min();
-        earliest.unwrap_or_else(|| {
-            std::time::SystemTime::now()
-                .duration_since(std::time::UNIX_EPOCH)
-                .map(|d| d.as_millis() as u64)
-                .unwrap_or(0)
-        })
-    };
-    match registry.create_checked(
-        &agg_cfg,
-        created_at_ms,
-        (req.start_ms, req.end_ms),
-        req.source,
-        req.windows_total,
-        state.data_retention_ms,
-    ) {
-        Ok(job_id) => {
-            let body = serde_json::json!({
-                "status": "success",
-                "job_id": job_id});
-            (StatusCode::CREATED, axum::Json(body)).into_response()
-        }
-        Err(e @ CreateError::UnknownAgg { .. }) => {
-            let body = serde_json::json!({
-                "status": "error",
-                "error": e.to_string()});
-            (StatusCode::NOT_FOUND, axum::Json(body)).into_response()
-        }
-        Err(e @ (CreateError::Overlap { .. } | CreateError::OutOfRetention { .. })) => {
-            let body = serde_json::json!({
-                "status": "error",
-                "error": e.to_string()});
-            (StatusCode::CONFLICT, axum::Json(body)).into_response()
-        }
-    }
-}
-
-/// `GET /api/v1/db/backfill/jobs` — list all jobs with optional
-/// `?status=queued|running|complete|failed|cancelled|all` filter.
-async fn handle_get_backfill_jobs(
-    State(state): State<AppState>,
-    axum::extract::Query(params): axum::extract::Query<std::collections::HashMap<String, String>>,
-) -> axum::response::Response {
-    use crate::storage_engines::sketch_db::BackfillStatus;
-    use axum::response::IntoResponse;
-
-    let Some(registry) = state.backfill else {
-        return service_unavailable_no_backfill();
-    };
-
-    let filter = params.get("status").map(String::as_str).unwrap_or("all");
-    let jobs = match filter {
-        "queued" => registry.list_by_status(&BackfillStatus::Queued),
-        "running" => registry.list_by_status(&BackfillStatus::Running),
-        "complete" => registry.list_by_status(&BackfillStatus::Complete),
-        "failed" => registry.list_by_status(&BackfillStatus::Failed),
-        "cancelled" => registry.list_by_status(&BackfillStatus::Cancelled),
-        "all" => registry.list(),
-        other => {
-            let body = serde_json::json!({
-            "status": "error",
-            "error": format!(
-                "unknown status filter '{other}'; expected one of queued|running|complete|failed|cancelled|all",
-            )});
-            return (StatusCode::BAD_REQUEST, axum::Json(body)).into_response();
-        }
-    };
-    let mut entries: Vec<serde_json::Value> = jobs.iter().map(backfill_job_to_json).collect();
-    entries.sort_by_key(|v| v.get("job_id").and_then(|x| x.as_u64()).unwrap_or(0));
-
-    let body = serde_json::json!({
-        "status": "success",
-        "count": entries.len(),
-        "jobs": entries});
-    (StatusCode::OK, axum::Json(body)).into_response()
-}
-
-/// `GET /api/v1/db/backfill/jobs/:job_id` — detail of a single job.
-/// Returns 404 if not found, 503 if no registry.
-async fn handle_get_backfill_job(
-    State(state): State<AppState>,
-    axum::extract::Path(job_id): axum::extract::Path<u64>,
-) -> axum::response::Response {
-    use axum::response::IntoResponse;
-
-    let Some(registry) = state.backfill else {
-        return service_unavailable_no_backfill();
-    };
-    match registry.get(job_id) {
-        Some(job) => {
-            let body = serde_json::json!({
-                "status": "success",
-                "job": backfill_job_to_json(&job)});
-            (StatusCode::OK, axum::Json(body)).into_response()
-        }
-        None => {
-            let body = serde_json::json!({
-                "status": "error",
-                "error": format!("job_id {job_id} not found")});
-            (StatusCode::NOT_FOUND, axum::Json(body)).into_response()
-        }
-    }
-}
-
-/// `DELETE /api/v1/db/backfill/jobs/:job_id` — cancel the job if
-/// non-terminal. Returns 200 on success, 404 if unknown, 409 if
-/// the job is already terminal, 503 if no registry.
-async fn handle_delete_backfill_job(
-    State(state): State<AppState>,
-    axum::extract::Path(job_id): axum::extract::Path<u64>,
-) -> axum::response::Response {
-    use axum::response::IntoResponse;
-
-    let Some(registry) = state.backfill else {
-        return service_unavailable_no_backfill();
-    };
-    let Some(job) = registry.get(job_id) else {
-        let body = serde_json::json!({
-            "status": "error",
-            "error": format!("job_id {job_id} not found")});
-        return (StatusCode::NOT_FOUND, axum::Json(body)).into_response();
-    };
-    if job.status.is_terminal() {
-        let body = serde_json::json!({
-        "status": "error",
-        "error": format!(
-            "job {job_id} already {}, cannot cancel",
-            backfill_status_str(&job.status)
-        )});
-        return (StatusCode::CONFLICT, axum::Json(body)).into_response();
-    }
-    registry.cancel(job_id);
-    let body = serde_json::json!({
-        "status": "success",
-        "job_id": job_id});
-    (StatusCode::OK, axum::Json(body)).into_response()
-}
-
-#[cfg(test)]
-mod logical_provenance_tests {
-    use super::*;
-
-    #[tokio::test]
-    async fn hybrid_execution_has_its_own_route_with_measured_branch_counts() {
-        // A successful mixed graph must never inherit the pure-ASAP route from its engine name.
-        let response = Json(serde_json::json!({"status":"success", "warnings":[
-            "asap_execution:hybrid", "asap_logical_stats:raw=0,summary=1,memo_hits=3,remote=2,remote_rpcs=1,remote_branches=2"
-        ], "data":{"resultType":"vector", "result":[]}}))
-        .into_response();
-        let response = annotate_data_source(response, "asap_query").await;
-        assert_eq!(response.headers()["x-asap-execution"], "hybrid");
-        assert_eq!(response.headers()["x-asap-execution-detail"], "hybrid");
-        assert_eq!(
-            response.headers()["x-asap-summary-readout-evaluations"],
-            "1"
-        );
-        let bytes = axum::body::to_bytes(response.into_body(), 4096)
-            .await
-            .unwrap();
-        let value: serde_json::Value = serde_json::from_slice(&bytes).unwrap();
-        assert!(value["warnings"].as_array().unwrap().is_empty());
-    }
-
-    #[tokio::test]
-    async fn prometheus_exact_branch_is_hybrid_without_backend_scan() {
-        let response = Json(serde_json::json!({"status":"success", "warnings":[
-            "asap_execution:hybrid", "asap_logical_stats:raw=0,summary=1,memo_hits=0,remote=1,remote_rpcs=1,remote_branches=1"
-        ], "data":{"resultType":"vector", "result":[]}})).into_response();
-        let response = annotate_data_source(response, "asap_query").await;
-        assert_eq!(response.headers()["x-asap-execution-detail"], "hybrid");
-        assert_eq!(response.headers()["x-asap-raw-scan-evaluations"], "0");
-        assert_eq!(response.headers()["x-asap-exact-subquery-evaluations"], "1");
-    }
-
-    #[tokio::test]
-    async fn prometheus_only_dag_is_external_exact() {
-        let response = Json(serde_json::json!({"status":"success", "warnings":[
-            "asap_execution:exact_dag", "asap_logical_stats:raw=0,summary=0,memo_hits=0,remote=1,remote_rpcs=1,remote_branches=1"
-        ], "data":{"resultType":"vector", "result":[]}})).into_response();
-        let response = annotate_data_source(response, "asap_query").await;
-        assert_eq!(response.headers()["x-asap-execution"], "exact_fallback");
-        assert_eq!(
-            response.headers()["x-asap-execution-detail"],
-            "external_exact"
-        );
-    }
-
-    #[test]
-    fn partial_result_warning_survives_internal_metadata_extraction() {
-        // Only internal metadata is removed; incomplete-result warnings still invalidate comparison.
-        let mut value = serde_json::json!({"warnings":["partial data", "asap_execution:exact_dag", "asap_logical_stats:raw=0,summary=0,memo_hits=0,remote=1,remote_rpcs=1,remote_branches=1"]});
-        assert_eq!(
-            extract_logical_provenance(&mut value),
-            Some(Ok((0, 0, 0, 1, 0, 1, 1)))
-        );
-        assert_eq!(value["warnings"], serde_json::json!(["partial data"]));
-    }
-
-    #[test]
-    fn contradictory_provenance_is_not_warm() {
-        // Any observed local raw branch invalidates a deployed plan.
-        let mut value = serde_json::json!({"warnings":["asap_execution:asap", "asap_logical_stats:raw=1,summary=1,memo_hits=0"]});
-        assert_eq!(extract_logical_provenance(&mut value), Some(Err(())));
-    }
-}
-
-#[cfg(test)]
-mod catalog_install_tests {
-    use super::{validate_and_build_runtime_plan, PhysicalPlanInstallRequest};
-    use std::sync::Arc;
-
-    fn request() -> PhysicalPlanInstallRequest {
-        let snapshot: control_plane::physical::compiler::BackendLocalPlanningInput =
-            serde_json::from_str(include_str!(
-                "../../../../../docs/examples/asapquery-compatibility-demo-snapshot.json"
-            ))
-            .unwrap();
-        let plan = crate::tests::test_utilities::planning::quoted_snapshot(snapshot, false)
-            .compile_promql()
-            .unwrap();
-        PhysicalPlanInstallRequest {
-            summary_catalog: plan.summary_catalog,
-            collector_plans: plan.collector_plans,
-            precompute_plan: plan.precompute_plan,
-            transmission_plan: plan.transmission_plan,
-            query_plan: plan.query_plan,
-            storage_routing: None,
-            adaptation_evidence: vec![],
-        }
-    }
-    fn install(
-        request: PhysicalPlanInstallRequest,
-    ) -> Result<crate::storage_engines::types::RuntimePhysicalPlan, String> {
-        validate_and_build_runtime_plan(
-            request,
-            Arc::new(crate::storage_engines::types::BackendStorageRouting::empty()),
-        )
-    }
-
-    #[test]
-    fn complete_dag_cannot_be_installed_as_maintenance() {
-        let mut request = request();
-        let query_id = request
-            .precompute_plan
-            .executable_dags
-            .iter()
-            .next()
-            .map(|(id, _)| id.clone())
-            .expect("fixture has a maintained summary");
-        request
-            .precompute_plan
-            .executable_dags
-            .get_mut(&query_id)
-            .unwrap()
-            .document = request.query_plan.selected_dags[&query_id].clone();
-        assert!(install(request)
-            .unwrap_err()
-            .contains("unsupported maintenance DAG"));
-    }
-
-    #[test]
-    fn selected_dag_identity_is_validated_even_without_using_its_projection() {
-        let mut request = request();
-        let query_id = request
-            .query_plan
-            .selected_dags
-            .keys()
-            .next()
-            .cloned()
-            .expect("fixture has selected DAG provenance");
-        request
-            .query_plan
-            .selected_dags
-            .get_mut(&query_id)
-            .unwrap()
-            .query_id = "different-query".into();
-        assert!(install(request)
-            .unwrap_err()
-            .contains("differs from document query ID"));
-    }
-
-    #[test]
-    fn invalid_clickhouse_entry_cannot_change_active_generation() {
-        let active = install(request()).expect("baseline plan installs");
-        let handle = crate::storage_engines::types::ActivePhysicalPlanHandle::new(active);
-        let before = handle.active_snapshot();
-        let mut candidate = request();
-        candidate.query_plan.clickhouse_context =
-            Some(asap_types::query_plan::ClickHousePlanningContext {
-                window_templates: Default::default(),
-                tables: Default::default(),
-                accuracy: planner_types::types::AccuracyTarget::Exact,
-            });
-        let (_, mut entry) = candidate
-            .query_plan
-            .entries
-            .pop_first()
-            .expect("fixture has a query entry");
-        entry.language = asap_types::query_plan::QueryLanguage::ClickHouseSql;
-        entry.fixed_evaluation = Some(asap_types::query_plan::FixedEvaluationRange {
-            start_ms: 0,
-            end_ms: 1_000,
-            cumulative: true,
-        });
-        let canonical = entry.canonical_query.clone();
-        let binding = entry
-            .nodes
-            .values_mut()
-            .find_map(|node| match node {
-                asap_types::query_plan::QueryPlanNode::ReadMaterialization { binding } => {
-                    Some(binding)
-                }
-                _ => None,
-            })
-            .expect("fixture query reads a materialization");
-        binding.pane_origin_ms = Some(999);
-        candidate
-            .query_plan
-            .entries
-            .insert(format!("clickhouse:{canonical}"), entry);
-
-        let error = install(candidate).expect_err("invalid SQL binding must fail staging");
-        assert!(error.contains("pane origin"), "{error}");
-        let after = handle.active_snapshot();
-        assert_eq!(after.plan_id(), before.plan_id());
-        assert_eq!(after.plan_version(), before.plan_version());
-    }
-
-    // Installing transports the exact supplied snapshot, rather than rebuilding it.
-    #[test]
-    fn catalog_install_preserves_authoritative_snapshot() {
-        let request = request();
-        let expected = request.summary_catalog.clone();
-        let encoded = serde_json::to_vec(&request).unwrap();
-        let active = install(serde_json::from_slice(&encoded).unwrap()).unwrap();
-        assert_eq!(active.summary_catalog.as_deref(), Some(&expected));
-        active
-            .query_plan
-            .validate_against_catalog(active.summary_catalog.as_deref().unwrap())
-            .unwrap();
-    }
-
-    // Catalog-aware artifacts cannot silently downgrade to a legacy installation.
-    #[test]
-    fn catalog_install_requires_snapshot_and_matching_references() {
-        let mut encoded = serde_json::to_value(request()).unwrap();
-        encoded.as_object_mut().unwrap().remove("summary_catalog");
-        assert!(serde_json::from_value::<PhysicalPlanInstallRequest>(encoded).is_err());
-        let mut request = request();
-        request.transmission_plan.summary_catalog = None;
-        assert!(install(request)
-            .unwrap_err()
-            .contains("TransmissionPlan catalog"));
-    }
-
-    // A same-version snapshot replacement fails before the active generation changes.
-    #[test]
-    fn catalog_install_rejects_drift_without_replacing_active_snapshot() {
-        let active = crate::storage_engines::types::ActivePhysicalPlanHandle::new(
-            install(request()).unwrap(),
-        );
-        let before = active.active_snapshot();
-        let mut changed = request();
-        changed.summary_catalog.plan_version += 1;
-        assert!(install(changed).is_err());
-        assert!(Arc::ptr_eq(&before, &active.active_snapshot()));
-        let mut changed = request();
-        changed.summary_catalog.summary_descriptors.clear();
-        assert!(install(changed).is_err());
-        assert!(Arc::ptr_eq(&before, &active.active_snapshot()));
-    }
-
-    // Physical pane width cannot be replaced by the semantic lookback at install.
-    #[test]
-    fn catalog_install_rejects_query_pane_drift() {
-        let mut request = request();
-        let binding = request
-            .query_plan
-            .entries
-            .values_mut()
-            .flat_map(|entry| entry.nodes.values_mut())
-            .find_map(|node| match node {
-                asap_types::query_plan::QueryPlanNode::ReadMaterialization { binding } => {
-                    Some(binding)
-                }
-                _ => None,
-            })
-            .expect("demo has maintained summaries");
-        binding.window_ms += 1;
-        let error = install(request).unwrap_err();
-        assert!(
-            error.contains("query") && error.contains("pane") && error.contains("differs"),
-            "{error}"
-        );
-    }
-
-    #[test]
-    fn catalog_install_applies_pane_origin_validation_to_metricsql_entries() {
-        let mut request = request();
-        let key = request.query_plan.entries.keys().next().unwrap().clone();
-        let mut entry = request.query_plan.entries.remove(&key).unwrap();
-        entry.language = asap_types::query_plan::QueryLanguage::MetricsQl;
-        let binding = entry
-            .nodes
-            .values_mut()
-            .find_map(|node| match node {
-                asap_types::query_plan::QueryPlanNode::ReadMaterialization { binding } => {
-                    Some(binding)
-                }
-                _ => None,
-            })
-            .expect("demo has maintained summaries");
-        binding.pane_origin_ms = Some(1);
-        let key =
-            asap_types::query_plan::QueryPlan::catalog_key(entry.language, &entry.canonical_query);
-        request.query_plan.entries.insert(key, entry);
-        let error = install(request).unwrap_err();
-        assert!(error.contains("pane origin"), "{error}");
-    }
-}
-
-#[deprecated(note = "Use validate_and_build_runtime_plan")]
-pub use validate_and_build_runtime_plan as build_active_physical_plan;
diff --git a/data_plane/src/drivers/query/servers/metrics.rs b/data_plane/src/drivers/query/servers/metrics.rs
deleted file mode 100644
index 9af5d7ffe..000000000
--- a/data_plane/src/drivers/query/servers/metrics.rs
+++ /dev/null
@@ -1,95 +0,0 @@
-use lazy_static::lazy_static;
-use prometheus::{
-    register_counter_vec, register_histogram_vec, CounterVec, HistogramTimer, HistogramVec,
-};
-
-// Status labels for query requests. `fallback` means the local engine
-// returned None and the fallback client handled the query; `error` covers
-// parse failures, disabled-handling short-circuits, and fallback failures.
-pub const QUERY_STATUS_OK: &str = "ok";
-pub const QUERY_STATUS_FALLBACK: &str = "fallback";
-pub const QUERY_STATUS_ERROR: &str = "error";
-pub const QUERY_STATUS_UNSUPPORTED: &str = "unsupported";
-
-pub const QUERY_TYPE_INSTANT: &str = "instant";
-pub const QUERY_TYPE_RANGE: &str = "range";
-
-lazy_static! {
-    pub static ref QUERY_REQUESTS_TOTAL: CounterVec = register_counter_vec!(
-        "asap_query_requests_total",
-        "Total query-server requests, labelled by query type and outcome",
-        &["type", "status"]
-    )
-    .unwrap();
-
-    // Buckets span the range the paper expects: sketch hits land
-    // sub-ms (§6.3), cold-fallback hits land 10ms–1s.
-    pub static ref QUERY_DURATION_SECONDS: HistogramVec = register_histogram_vec!(
-        "asap_query_duration_seconds",
-        "End-to-end query request duration",
-        &["type"],
-        vec![
-            0.00005, 0.0001, 0.0005, 0.001, 0.005, 0.01, 0.05, 0.1, 0.5, 1.0, 5.0
-        ]
-    )
-    .unwrap();
-
-    pub static ref QUERY_FORWARDING_BLOCKED_TOTAL: CounterVec = register_counter_vec!(
-        "asap_query_forwarding_blocked_total",
-        "External query attempts blocked by the query-forwarding policy",
-        &["backend", "path"]
-    )
-    .unwrap();
-
-    pub static ref INGEST_SAMPLES_TOTAL: CounterVec = register_counter_vec!(
-        "asap_ingest_samples_total",
-        "Raw samples accepted by the ingest server, labelled by wire protocol",
-        &["protocol"]
-    )
-    .unwrap();
-
-    pub static ref INGEST_BATCH_DURATION_SECONDS: HistogramVec = register_histogram_vec!(
-        "asap_ingest_batch_duration_seconds",
-        "Time to decode + route one ingest batch",
-        &["protocol"],
-        vec![0.001, 0.005, 0.01, 0.025, 0.05, 0.1, 0.25, 0.5, 1.0]
-    )
-    .unwrap();
-
-    pub static ref INGEST_DECODE_ERRORS_TOTAL: CounterVec = register_counter_vec!(
-        "asap_ingest_decode_errors_total",
-        "Ingest batches rejected before routing (decode / parse failures)",
-        &["protocol"]
-    )
-    .unwrap();
-}
-
-// Touching each lazy_static so all metric families show up on the first
-// `/metrics` scrape even if no traffic has hit the server yet. Prometheus
-// treats "metric appeared after scrape N" as a reset, which breaks rate().
-pub fn register_all() {
-    lazy_static::initialize(&QUERY_REQUESTS_TOTAL);
-    lazy_static::initialize(&QUERY_DURATION_SECONDS);
-    lazy_static::initialize(&QUERY_FORWARDING_BLOCKED_TOTAL);
-    lazy_static::initialize(&INGEST_SAMPLES_TOTAL);
-    lazy_static::initialize(&INGEST_BATCH_DURATION_SECONDS);
-    lazy_static::initialize(&INGEST_DECODE_ERRORS_TOTAL);
-}
-
-pub fn start_query_timer(query_type: &str) -> HistogramTimer {
-    QUERY_DURATION_SECONDS
-        .with_label_values(&[query_type])
-        .start_timer()
-}
-
-pub fn record_query_outcome(query_type: &str, status: &str) {
-    QUERY_REQUESTS_TOTAL
-        .with_label_values(&[query_type, status])
-        .inc();
-}
-
-pub fn record_query_forwarding_blocked(backend: &str, path: &str) {
-    QUERY_FORWARDING_BLOCKED_TOTAL
-        .with_label_values(&[backend, path])
-        .inc();
-}
diff --git a/data_plane/src/drivers/query/servers/mod.rs b/data_plane/src/drivers/query/servers/mod.rs
deleted file mode 100644
index a509d2b17..000000000
--- a/data_plane/src/drivers/query/servers/mod.rs
+++ /dev/null
@@ -1,4 +0,0 @@
-pub mod http;
-pub mod metrics;
-
-pub use http::{HttpServer, HttpServerConfig};
diff --git a/data_plane/src/lib.rs b/data_plane/src/lib.rs
index 158d1acb0..fd483635c 100644
--- a/data_plane/src/lib.rs
+++ b/data_plane/src/lib.rs
@@ -1,65 +1,136 @@
-#![allow(
-    dead_code,
-    unused_imports,
-    unused_mut,
-    unused_variables,
-    clippy::bool_assert_comparison,
-    clippy::chunks_exact_to_as_chunks,
-    clippy::cloned_ref_to_slice_refs,
-    clippy::collapsible_if,
-    clippy::doc_lazy_continuation,
-    clippy::field_reassign_with_default,
-    clippy::items_after_test_module,
-    clippy::len_without_is_empty,
-    clippy::manual_checked_ops,
-    clippy::match_result_ok,
-    clippy::needless_lifetimes,
-    clippy::redundant_field_names,
-    clippy::result_large_err,
-    clippy::suspicious_open_options,
-    clippy::too_many_arguments,
-    clippy::type_complexity,
-    clippy::useless_conversion,
-    clippy::useless_format,
-    clippy::while_let_loop
-)]
+//! Backend data plane: receives Prometheus Remote Write samples and serves
+//! the Prometheus query API for an installed plan.
+//!
+//! The installed plan is ASAPPlanner's selected `PhysicalASAPDAG`. Executing
+//! it is not implemented yet: samples are validated and counted, and every
+//! query is forwarded to Prometheus.
 
-pub mod drivers;
-pub mod update_sampling;
+pub mod remote_write;
 
-#[deprecated(note = "Use update_sampling")]
-pub use update_sampling as monitor;
-pub mod precompute_engine;
-pub mod query_engines;
-pub mod storage_engines;
+use std::sync::atomic::{AtomicU64, Ordering};
+use std::sync::Arc;
 
-pub mod utils;
+use axum::body::Bytes;
+use axum::extract::{RawQuery, State};
+use axum::http::{header, HeaderMap, HeaderValue, Method, StatusCode};
+use axum::response::{IntoResponse, Response};
+use axum::routing::{get, post};
+use axum::Router;
 
-// Re-export commonly used types to avoid glob import conflicts
-pub use storage_engines::types::{
-    AggregateCore, KeyByLabelValues, Measurement, MergeableAccumulator,
-    MultipleSubpopulationAggregate, PrecomputeMaterialization, PrecomputedOutput,
-    SerializableToSink, SingleSubpopulationAggregate,
-};
+/// Response header naming what answered a query.
+pub const EXECUTION_HEADER: &str = "x-asap-execution";
 
-pub use asap_physical_operators::summary_kernels::{
-    IncreaseAccumulator, KeyedSumCountAccumulator, MaxAccumulator, MinAccumulator, SumAccumulator,
-};
+pub struct DataPlane {
+    /// The installed plan's queries, in root order. The plan itself is not
+    /// `Send` (its operator payloads hold `Rc`s), so it stays with its loader.
+    pub queries: Vec<String>,
+    /// Base URL of the Prometheus that answers forwarded queries.
+    pub prometheus_url: String,
+    pub limits: remote_write::Limits,
+    /// Samples accepted since startup.
+    pub samples: AtomicU64,
+    client: reqwest::Client,
+}
 
-pub use storage_engines::StoreResult;
+impl DataPlane {
+    pub fn new(queries: Vec<String>, prometheus_url: String) -> Self {
+        Self {
+            queries,
+            prometheus_url: prometheus_url.trim_end_matches('/').to_string(),
+            limits: remote_write::Limits::default(),
+            samples: AtomicU64::new(0),
+            client: reqwest::Client::new(),
+        }
+    }
+}
 
-pub use query_engines::{ASAPQueryEngine, InstantVector, QueryResult};
+pub fn router(state: Arc<DataPlane>) -> Router {
+    Router::new()
+        .route("/api/v1/write", post(write))
+        .route("/api/v1/query", get(query).post(query))
+        .route("/api/v1/query_range", get(query_range).post(query_range))
+        .route("/-/ready", get(|| async { StatusCode::OK }))
+        .with_state(state)
+}
 
-pub use drivers::ingest::{
-    PrometheusRemoteWriteConfig, PrometheusRemoteWriteReceiver, RemoteWriteStats,
-};
-pub use drivers::{HttpServer, HttpServerConfig, OtlpReceiver, OtlpReceiverConfig};
+async fn write(State(state): State<Arc<DataPlane>>, body: Bytes) -> Response {
+    match remote_write::decode(&body, &state.limits) {
+        Ok(request) => {
+            let samples: usize = request.timeseries.iter().map(|s| s.samples.len()).sum();
+            state.samples.fetch_add(samples as u64, Ordering::Relaxed);
+            StatusCode::NO_CONTENT.into_response()
+        }
+        Err(error) => (StatusCode::BAD_REQUEST, error.to_string()).into_response(),
+    }
+}
 
-pub use precompute_engine::config::{LateDataPolicy, PrecomputeEngineConfig};
-pub use precompute_engine::output_sink::SketchStoreSink;
-pub use precompute_engine::PrecomputeEngine;
+async fn query(
+    state: State<Arc<DataPlane>>,
+    method: Method,
+    query: RawQuery,
+    headers: HeaderMap,
+    body: Bytes,
+) -> Response {
+    forward(state, "query", method, query, headers, body).await
+}
 
-pub type Result<T> = std::result::Result<T, Box<dyn std::error::Error + Send + Sync>>;
+async fn query_range(
+    state: State<Arc<DataPlane>>,
+    method: Method,
+    query: RawQuery,
+    headers: HeaderMap,
+    body: Bytes,
+) -> Response {
+    forward(state, "query_range", method, query, headers, body).await
+}
 
-#[cfg(test)]
-pub mod tests;
+/// Sends the request to Prometheus unchanged and returns its response.
+async fn forward(
+    State(state): State<Arc<DataPlane>>,
+    endpoint: &str,
+    method: Method,
+    RawQuery(query): RawQuery,
+    headers: HeaderMap,
+    body: Bytes,
+) -> Response {
+    let mut url = format!("{}/api/v1/{endpoint}", state.prometheus_url);
+    if let Some(query) = query {
+        url = format!("{url}?{query}");
+    }
+    let mut request = state.client.request(method, url).body(body);
+    if let Some(content_type) = headers.get(header::CONTENT_TYPE) {
+        request = request.header(header::CONTENT_TYPE, content_type);
+    }
+    let upstream = match request.send().await {
+        Ok(upstream) => upstream,
+        Err(error) => {
+            return (
+                StatusCode::BAD_GATEWAY,
+                format!("forwarding to Prometheus: {error}"),
+            )
+                .into_response()
+        }
+    };
+    let status = upstream.status();
+    let content_type = upstream.headers().get(header::CONTENT_TYPE).cloned();
+    let body = match upstream.bytes().await {
+        Ok(body) => body,
+        Err(error) => {
+            return (
+                StatusCode::BAD_GATEWAY,
+                format!("reading Prometheus response: {error}"),
+            )
+                .into_response()
+        }
+    };
+    let mut response = (status, body).into_response();
+    if let Some(content_type) = content_type {
+        response
+            .headers_mut()
+            .insert(header::CONTENT_TYPE, content_type);
+    }
+    response
+        .headers_mut()
+        .insert(EXECUTION_HEADER, HeaderValue::from_static("forwarded"));
+    response
+}
diff --git a/data_plane/src/main.rs b/data_plane/src/main.rs
index d5b9e5d7a..e82015a49 100644
--- a/data_plane/src/main.rs
+++ b/data_plane/src/main.rs
@@ -1,1569 +1,38 @@
-use clap::{Parser, ValueEnum};
-use std::fs;
+use std::path::PathBuf;
 use std::sync::Arc;
-use thiserror::Error;
-use tokio::signal;
-use tracing::{error, info, warn};
 
-use data_plane::drivers::AdapterConfig;
-use data_plane::precompute_engine::config::LateDataPolicy;
-use data_plane::precompute_engine::PrecomputeWorkerDiagnostics;
-use data_plane::storage_engines::types::enums::{CleanupPolicy, LockStrategy};
-use data_plane::{
-    ASAPQueryEngine, HttpServer, HttpServerConfig, OtlpReceiver, OtlpReceiverConfig,
-    PrecomputeEngine, PrecomputeEngineConfig, PrometheusRemoteWriteConfig,
-    PrometheusRemoteWriteReceiver, Result, SketchStoreSink,
-};
+use clap::Parser;
+use control_plane::InstalledPlan;
+use data_plane::{router, DataPlane};
 
-#[derive(Clone, Copy, Debug, Default, PartialEq, Eq, ValueEnum)]
-enum RuntimeProfile {
-    #[default]
-    Distributed,
-    Asapquery,
-}
-
-fn unix_time_ms() -> u64 {
-    std::time::SystemTime::now()
-        .duration_since(std::time::UNIX_EPOCH)
-        .map(|duration| duration.as_millis() as u64)
-        .unwrap_or(0)
-}
-
-#[derive(Parser, Debug)]
-#[command(author, version, about, long_about = None)]
+/// Serve Remote Write ingestion and the Prometheus query API for a plan.
+#[derive(Parser)]
 struct Args {
-    /// Publish bounded materialization-input ERP observations after a verified finite-source drain.
-    #[arg(long)]
-    erp_runtime_samples_endpoint: Option<String>,
-    /// Runtime component profile. `asapquery` enables backend ingest-time
-    /// materialization and rejects Collector/OTLP-only components.
-    #[arg(long, value_enum, default_value = "distributed")]
-    profile: RuntimeProfile,
-
-    /// Monitor coordinator settings, separate from executable computation plans.
-    #[arg(long)]
-    monitor_specs: Option<std::path::PathBuf>,
-
-    /// JSON physical-plan artifact. Required by the backend-local profile;
-    /// all runtime/query views are validated and installed as one snapshot.
-    #[arg(long)]
-    physical_plan: Option<std::path::PathBuf>,
-
-    /// Versioned canonical QueryWorkload + DataWorkload and backend-local
-    /// implementation evidence. The ASAPQuery profile invokes the pinned
-    /// Planner and DeploymentPlanCompiler at startup when this is supplied.
-    #[arg(long)]
-    planning_snapshot: Option<std::path::PathBuf>,
-
-    /// Cleanup policy for SketchStore retention.
-    /// `circular_buffer`: keep the N most recent windows per agg
-    /// (N comes from each aggregation's `numAggregatesToRetain`).
-    /// `no_cleanup`: never evict.
-    #[arg(long, value_enum, default_value = "circular_buffer")]
-    cleanup_policy: CleanupPolicy,
-
-    /// Prometheus scrape interval (seconds). Default 30 matches
-    /// the e2e harness's 30s window. ASAPQueryEngine uses this as the
-    /// instant-query lookback window — for tumbling-window
-    /// aggregations it must be ≥ the window size in
-    /// the installed precompute plan.
-    #[arg(long, default_value = "30")]
-    prometheus_scrape_interval: u64,
-
-    /// HTTP server port for the PromQL-compatible query surface.
-    /// `--query-port` is accepted as an alias for compatibility with
-    /// the legacy `precompute_engine` binary's flag (whose default
-    /// was 8080). Compose stacks pass `--query-port=9091`.
-    #[arg(long, alias = "query-port", default_value = "8088")]
-    http_port: u16,
-
-    /// Independent VictoriaMetrics-compatible MetricsQL query listener.
+    /// Plan written by the control plane.
     #[arg(long)]
-    victoriametrics_http_port: Option<u16>,
-
-    /// VictoriaMetrics base URL used for exact MetricsQL fallback.
-    #[arg(long, default_value = "http://localhost:8428")]
-    victoriametrics_url: String,
-
-    /// Optional independent ClickHouse-compatible HTTP listener.
-    #[arg(long, env = "ASAP_CLICKHOUSE_HTTP_PORT")]
-    clickhouse_http_port: Option<u16>,
-
-    /// Exact ClickHouse HTTP endpoint used by the SQL listener.
-    #[arg(
-        long,
-        env = "ASAP_CLICKHOUSE_URL",
-        default_value = "http://localhost:8123"
-    )]
-    clickhouse_url: String,
-
-    /// Default database supplied when a ClickHouse request omits one.
-    #[arg(long, env = "ASAP_CLICKHOUSE_DATABASE", default_value = "default")]
-    clickhouse_database: String,
-
-    /// Enable the configured ClickHouse connection for typed table backfill jobs.
-    #[arg(long, env = "ASAP_CLICKHOUSE_BACKFILL_TABLE")]
-    clickhouse_backfill_table: Option<String>,
-    #[arg(
-        long,
-        env = "ASAP_CLICKHOUSE_BACKFILL_DATABASE",
-        default_value = "default"
-    )]
-    clickhouse_backfill_database: String,
-    #[arg(
-        long,
-        env = "ASAP_CLICKHOUSE_BACKFILL_METRIC_COLUMN",
-        default_value = "metric"
-    )]
-    clickhouse_backfill_metric_column: String,
-    #[arg(
-        long,
-        env = "ASAP_CLICKHOUSE_BACKFILL_LABELS_COLUMN",
-        default_value = "labels"
-    )]
-    clickhouse_backfill_labels_column: String,
-    #[arg(
-        long,
-        env = "ASAP_CLICKHOUSE_BACKFILL_TIMESTAMP_COLUMN",
-        default_value = "timestamp_ms"
-    )]
-    clickhouse_backfill_timestamp_column: String,
-    #[arg(
-        long,
-        env = "ASAP_CLICKHOUSE_BACKFILL_VALUE_COLUMN",
-        default_value = "value"
-    )]
-    clickhouse_backfill_value_column: String,
-    #[arg(long, env = "ASAP_CLICKHOUSE_USER")]
-    clickhouse_user: Option<String>,
-    #[arg(long, env = "ASAP_CLICKHOUSE_PASSWORD")]
-    clickhouse_password: Option<String>,
-
-    /// Deprecated/no-op: the backend's only HTTP listener is the
-    /// PromQL query surface (`--http-port` / `--query-port`). The
-    /// old PRW ingest port was deleted in PR #100; this flag is
-    /// accepted for compose backwards compatibility (some overlays
-    /// still pass `--ingest-port=9090`) and silently ignored.
-    #[arg(long, hide = true)]
-    ingest_port: Option<u16>,
-
-    /// Prometheus server URL
+    plan: PathBuf,
+    /// Prometheus base URL that answers forwarded queries.
     #[arg(long, default_value = "http://localhost:9090")]
-    prometheus_server: String,
-
-    /// Forward unsupported queries to Prometheus
-    #[arg(long)]
-    forward_unsupported_queries: bool,
-
-    /// Disable all external query forwarding for isolated tests.
-    #[arg(long)]
-    disable_query_forwarding: bool,
-
-    /// Database path (currently unused, kept for compatibility)
-    #[arg(long, default_value = "sketchdb.db")]
-    db_path: String,
-
-    /// Delete existing database (currently unused, kept for compatibility)
-    #[arg(long)]
-    delete_existing_db: bool,
-
-    /// Output directory for logs
-    #[arg(long, default_value = "/var/log/asap")]
-    output_dir: String,
-
-    /// Log level
-    #[arg(long, default_value = "INFO")]
-    log_level: String,
-
-    /// Enable profiling (currently unused, kept for compatibility)
-    #[arg(long)]
-    do_profiling: bool,
-
-    /// Lock strategy for SketchStore: "global" for single mutex,
-    /// "per-key" for fine-grained locking. Default `per-key`.
-    #[arg(long, value_enum, default_value = "per-key")]
-    lock_strategy: LockStrategy,
-
-    /// Path to promsketch configuration YAML file (optional; uses defaults if omitted)
-    #[arg(long)]
-    promsketch_config: Option<String>,
-
-    /// Enable OTLP metrics ingest (gRPC + HTTP)
-    #[arg(long)]
-    enable_otel_ingest: bool,
-
-    /// Enable Prometheus Remote Write v1 at POST /api/v1/write. Automatically
-    /// enabled by `--profile asapquery`.
-    #[arg(long)]
-    enable_remote_write: bool,
-
-    /// Maximum compressed Remote Write request size.
-    #[arg(long, default_value = "33554432")]
-    remote_write_max_compressed_bytes: usize,
-
-    /// Maximum Snappy-decompressed Remote Write request size.
-    #[arg(long, default_value = "134217728")]
-    remote_write_max_decompressed_bytes: usize,
-
-    /// Maximum series in one Remote Write request.
-    #[arg(long, default_value = "100000")]
-    remote_write_max_timeseries: usize,
-
-    /// Maximum samples in one Remote Write request.
-    #[arg(long, default_value = "1000000")]
-    remote_write_max_samples: usize,
-
-    /// Bounded Remote Write idempotency horizon.
-    #[arg(long, default_value = "600000")]
-    remote_write_dedup_horizon_ms: u64,
-
-    /// Expected maximum interval over which Prometheus can retry a request.
-    #[arg(long, default_value = "60000")]
-    remote_write_expected_retry_interval_ms: u64,
-
-    /// Maximum retained (series,timestamp) idempotency keys.
-    #[arg(long, default_value = "2000000")]
-    remote_write_max_dedup_entries: usize,
-
-    /// Enable bounded, revisable local Remote Write snapshots in this directory.
-    #[arg(long)]
-    remote_write_revision_dir: Option<std::path::PathBuf>,
-    #[arg(long, default_value = "600000")]
-    remote_write_correction_horizon_ms: u64,
-    #[arg(long, default_value = "60000")]
-    remote_write_revision_freshness_ms: u64,
-    #[arg(long, default_value = "67108864")]
-    remote_write_revision_max_bytes: usize,
-
-    /// OTLP gRPC listen port
-    #[arg(long, default_value = "4317")]
-    otel_grpc_port: u16,
-
-    /// OTLP HTTP listen port
-    #[arg(long, default_value = "4318")]
-    otel_http_port: u16,
-
-    /// Enable the continuous-monitoring (CDM) coordinator gRPC server. Serves
-    /// the specs from `--monitor-specs`; no-op if that list is
-    /// empty.
-    #[arg(long)]
-    enable_monitor_coordinator: bool,
-
-    /// CDM monitor coordinator gRPC listen port (edge MonitorService stream).
-    #[arg(long, default_value = "4319")]
-    monitor_grpc_port: u16,
-
-    /// Number of precompute engine worker threads
-    #[arg(long, default_value = "4")]
-    precompute_num_workers: usize,
-
-    /// Maximum allowed lateness for out-of-order samples
-    /// (milliseconds). `--allowed-lateness-ms` is accepted as an
-    /// alias for compatibility with the legacy `precompute_engine`
-    /// binary's flag spelling.
-    #[arg(long, alias = "allowed-lateness-ms", default_value = "5000")]
-    precompute_allowed_lateness_ms: i64,
-
-    /// Maximum buffered samples per series before eviction
-    #[arg(long, default_value = "10000")]
-    precompute_max_buffer_per_series: usize,
-
-    /// Interval at which the flush timer fires (milliseconds)
-    #[arg(long, default_value = "1000")]
-    precompute_flush_interval_ms: u64,
-
-    /// Capacity of the channel between router and each worker
-    #[arg(long, default_value = "10000")]
-    precompute_channel_buffer_size: usize,
-
-    /// Compatibility option for schema persistence. Sid lifecycle persistence is
-    /// managed by the sketch store.
-    #[arg(long)]
-    schema_persist_path: Option<std::path::PathBuf>,
-
-    /// Optional path where the backfill job registry persists across
-    /// restarts (sketch DB Phase 5g). When set, every job state
-    /// transition rewrites this file atomically, so operators see
-    /// recent backfill history even after a backend restart.
-    /// Memory-only by default.
-    #[arg(long)]
-    backfill_persist_path: Option<std::path::PathBuf>,
-
-    /// Spawn the Phase 5e backfill drain loop. When off (default),
-    /// queued backfill jobs stay `Queued` forever — shadow-mode
-    /// for control plane REFRESH dispatch validation. When on, a
-    /// background task picks up queued jobs and runs them through
-    /// `BackfillWindowProcessor` (real sketch rebuild + store
-    /// writes). Requires `--streaming-engine=precompute` so the
-    /// schema registry is available; otherwise a warning is logged
-    /// and the service stays down.
-    #[arg(long)]
-    enable_backfill_worker: bool,
-
-    /// Spawn the Phase 5 schema eviction service. Periodically
-    /// scans the schema registry for `Expired` schemas, cancels
-    /// any in-flight backfill jobs targeting them, and drops the
-    /// agg_id's data from the store. Requires the schema registry
-    /// (same precompute-engine dependency as --enable-backfill-worker).
-    #[arg(long)]
-    enable_schema_eviction: bool,
-
-    /// Poll interval for the schema eviction service, in seconds.
-    /// Default 300s (5 minutes) — eviction is not latency-sensitive.
-    #[arg(long, default_value = "300")]
-    schema_eviction_poll_secs: u64,
-
-    /// When true, the eviction service logs what it would drop but
-    /// doesn't actually call `drop_agg_id` / `remove_schema`. Use
-    /// to validate a new retention value before letting it delete
-    /// anything.
-    #[arg(long)]
-    schema_eviction_dry_run: bool,
-
-    /// Idle-sid eviction (memory reclaim). Drop the in-memory state of any
-    /// sketch sid with no writes for this many seconds AND whose state is
-    /// fully flushed to disk, keeping its queryable metadata — the series
-    /// stays answerable from the durable tier and rehydrates on the next
-    /// write. Bounds resident registry memory when series churn / go stale
-    /// (without it, stale sketch sids are pinned in RAM until config-driven
-    /// retirement). 0 disables. Effective horizon is
-    /// max(this, --persistence-hot-window-secs), since eviction waits for
-    /// the sid's windows to seal+flush first.
-    #[arg(long, env = "ASAP_IDLE_SID_EVICT_SECS", default_value = "0")]
-    idle_sid_evict_secs: u64,
-
-    // ---- SketchStore persistence ----
-    //
-    // When --persistence-enabled is set, the store is constructed via
-    // SketchStore::with_persistence_per_key with the other
-    // --persistence-* flags as the config. Forces LockStrategy::PerKey
-    // regardless of --lock-strategy; the Global variant is
-    // intentionally left in-memory-only.
-    /// Enable the disk-backed persistence layer for SketchStore
-    #[arg(long)]
-    persistence_enabled: bool,
-
-    /// Root directory for persistence (manifest + parts/). Required
-    /// when --persistence-enabled.
-    #[arg(long)]
-    persistence_dir: Option<String>,
-
-    /// Primary memory budget for in-memory sealed epochs, in MiB.
-    /// When exceeded, the background flusher evicts oldest-first.
-    #[arg(long, default_value = "2048")]
-    persistence_memory_limit_mb: usize,
-
-    /// Hot-window length in seconds. Any sealed epoch whose end_ts is
-    /// older than (now - this) is flushed on the next flusher tick,
-    /// regardless of memory pressure. 0 disables time-based flushing.
-    #[arg(long, default_value = "3600")]
-    persistence_hot_window_secs: u64,
-
-    /// Cold-tier TTL in seconds. Parts whose max_ts is older than
-    /// (now - this) are removed from disk on the next flusher tick.
-    /// 0 disables disk retention.
-    #[arg(long, default_value = "604800")]
-    persistence_delete_older_than_secs: u64,
-
-    /// Cadence of the background flusher loop, in milliseconds.
-    #[arg(long, default_value = "1000")]
-    persistence_flush_interval_ms: u64,
-
-    /// Tier-2 part-cache byte budget, in MiB. 0 disables the cache.
-    /// Defaults to `min(10% * memory_limit_mb, 512)`.
-    #[arg(long)]
-    persistence_part_cache_mb: Option<u64>,
-
-    /// Seal cadence in DISTINCT WINDOWS. The per-sid hot epoch is sealed
-    /// into the (pending-flush) sealed ring once it accumulates this
-    /// many distinct windows, giving the flusher sealed epochs to make
-    /// durable. ~30s panes ⇒ 20 windows ≈ 10 min per part. 0 disables
-    /// cadence sealing (no durable tier even with --persistence-enabled).
-    #[arg(long, default_value = "20")]
-    persistence_seal_window_count: usize,
-
-    /// Path to the per-metric backend storage routing YAML
-    /// (`{metric_name: storage_backend}` map). Loaded at startup and
-    /// consulted by the HTTP query handler on every PromQL request to
-    /// pick the right engine (`ASAPQueryEngine` for ASAP-tier
-    /// sketches). Without
-    /// this flag the handler falls back to the installed storage view
-    /// single axis (always `SketchStore`) and the EngineRouter is
-    /// effectively bypassed — the issue-46 v2 demo's criterion ⑤
-    /// failure mode. Mirrors the `precompute_engine` binary's flag
-    /// of the same name.
-    #[arg(long, env = "ASAP_BACKEND_STORAGE_ROUTING")]
-    backend_storage_routing: Option<std::path::PathBuf>,
-}
-
-#[derive(Debug, Error)]
-enum QueryForwardingConfigError {
-    #[error("--disable-query-forwarding conflicts with --forward-unsupported-queries")]
-    ConflictingFlags,
-    #[error("--profile asapquery requires query forwarding and cannot be combined with --disable-query-forwarding")]
-    AsapqueryRequiresForwarding,
-    #[error("--disable-query-forwarding cannot be combined with --victoriametrics-http-port")]
-    VictoriaMetricsListenerConfigured,
-    #[error("--disable-query-forwarding cannot be combined with --clickhouse-http-port")]
-    ClickHouseListenerConfigured,
-}
-
-fn validate_query_forwarding_configuration(
-    args: &Args,
-) -> std::result::Result<(), QueryForwardingConfigError> {
-    if args.disable_query_forwarding {
-        if args.forward_unsupported_queries {
-            return Err(QueryForwardingConfigError::ConflictingFlags);
-        }
-        if args.profile == RuntimeProfile::Asapquery {
-            return Err(QueryForwardingConfigError::AsapqueryRequiresForwarding);
-        }
-        if args.victoriametrics_http_port.is_some() {
-            return Err(QueryForwardingConfigError::VictoriaMetricsListenerConfigured);
-        }
-        if args.clickhouse_http_port.is_some() {
-            return Err(QueryForwardingConfigError::ClickHouseListenerConfigured);
-        }
-    }
-    Ok(())
-}
-
-fn validate_profile(args: &Args) -> Result<()> {
-    validate_query_forwarding_configuration(args)?;
-    if args.remote_write_revision_dir.is_some() {
-        if !args.enable_remote_write && args.profile != RuntimeProfile::Asapquery {
-            return Err("--remote-write-revision-dir requires Remote Write ingestion".into());
-        }
-        if args.remote_write_correction_horizon_ms == 0
-            || args.remote_write_revision_freshness_ms == 0
-            || args.remote_write_revision_max_bytes == 0
-        {
-            return Err("continuous revision horizons and byte budget must be positive".into());
-        }
-    }
-    if args.profile != RuntimeProfile::Asapquery {
-        if args.physical_plan.is_none() {
-            return Err("the distributed profile requires --physical-plan".into());
-        }
-        if args.planning_snapshot.is_some() {
-            return Err("--planning-snapshot is available only with --profile asapquery".into());
-        }
-        return Ok(());
-    }
-    if args.physical_plan.is_some() == args.planning_snapshot.is_some() {
-        return Err(
-            "--profile asapquery requires exactly one of --planning-snapshot or --physical-plan"
-                .into(),
-        );
-    }
-    let mut excluded = Vec::new();
-    if args.enable_otel_ingest {
-        excluded.push("--enable-otel-ingest");
-    }
-    if args.enable_monitor_coordinator {
-        excluded.push("--enable-monitor-coordinator");
-    }
-    if args.enable_backfill_worker {
-        excluded.push("--enable-backfill-worker");
-    }
-    if args.enable_schema_eviction {
-        excluded.push("--enable-schema-eviction");
-    }
-    if args.persistence_enabled {
-        excluded.push("--persistence-enabled");
-    }
-    if args.backend_storage_routing.is_some() {
-        excluded.push("--backend-storage-routing");
-    }
-    if !excluded.is_empty() {
-        return Err(format!(
-            "--profile asapquery excludes distributed/durable components: {}",
-            excluded.join(", ")
-        )
-        .into());
-    }
-    if !args.forward_unsupported_queries {
-        return Err(
-            "--profile asapquery requires --forward-unsupported-queries for exact fallback".into(),
-        );
-    }
-    let required_horizon = (args.precompute_allowed_lateness_ms.max(0) as u64)
-        .saturating_add(args.remote_write_expected_retry_interval_ms);
-    if args.remote_write_dedup_horizon_ms < required_horizon {
-        return Err(format!(
-            "--remote-write-dedup-horizon-ms must cover allowed lateness plus the expected retry interval (at least {required_horizon}ms)"
-        )
-        .into());
-    }
-    if args.remote_write_max_compressed_bytes == 0
-        || args.remote_write_max_decompressed_bytes == 0
-        || args.remote_write_max_timeseries == 0
-        || args.remote_write_max_samples == 0
-        || args.remote_write_max_dedup_entries == 0
-    {
-        return Err("Remote Write resource limits must all be greater than zero".into());
-    }
-    if args.remote_write_max_decompressed_bytes < args.remote_write_max_compressed_bytes {
-        return Err(
-            "--remote-write-max-decompressed-bytes must be at least the compressed limit".into(),
-        );
-    }
-    Ok(())
-}
-
-async fn verify_prometheus_fallback(base_url: &str) -> Result<()> {
-    let url = format!("{}/-/healthy", base_url.trim_end_matches('/'));
-    let response = reqwest::Client::new()
-        .get(&url)
-        .timeout(std::time::Duration::from_secs(5))
-        .send()
-        .await
-        .map_err(|error| format!("Prometheus fallback health check {url} failed: {error}"))?;
-    if !response.status().is_success() {
-        return Err(format!(
-            "Prometheus fallback health check {url} returned {}",
-            response.status()
-        )
-        .into());
-    }
-    Ok(())
+    prometheus_url: String,
+    #[arg(long, default_value = "0.0.0.0:8088")]
+    listen: String,
 }
 
 #[tokio::main]
-async fn main() -> Result<()> {
+async fn main() -> anyhow::Result<()> {
+    tracing_subscriber::fmt()
+        .with_env_filter(tracing_subscriber::EnvFilter::from_default_env())
+        .init();
     let args = Args::parse();
-
-    validate_profile(&args)?;
-
-    // Create output directory
-    fs::create_dir_all(&args.output_dir)?;
-
-    // Initialize logging similar to Python's create_loggers function
-    // Keep the guard alive for the entire lifetime of the application
-    let _log_guard = setup_logging(&args.output_dir, &args.log_level)?;
-
-    info!("Starting Query Engine Rust");
-    info!("Output directory: {}", args.output_dir);
-
-    if args.profile == RuntimeProfile::Asapquery {
-        verify_prometheus_fallback(&args.prometheus_server).await?;
-        info!("ASAPQuery compatibility profile: Prometheus fallback is healthy");
-    }
-
-    if let Some(ingest_port) = args.ingest_port {
-        warn!(
-            "--ingest-port={ingest_port} is deprecated and ignored: Remote Write and PromQL \
-             share --http-port. Drop the flag from your compose `command:` block."
-        );
-    }
-
-    let startup_artifact = if let Some(path) = args.planning_snapshot.as_ref() {
-        let bytes = fs::read(path)?;
-        let mut snapshot: control_plane::physical::compiler::BackendLocalPlanningInput =
-            serde_json::from_slice(&bytes).map_err(|error| {
-                format!(
-                    "failed to decode planning snapshot {}: {error}",
-                    path.display()
-                )
-            })?;
-        let runtime_memory_budget = u64::try_from(args.persistence_memory_limit_mb)
-            .unwrap_or(u64::MAX)
-            .saturating_mul(1024 * 1024);
-        snapshot
-            .physical_inputs
-            .retained_summary_memory_budget_bytes = snapshot
-            .physical_inputs
-            .retained_summary_memory_budget_bytes
-            .min(runtime_memory_budget);
-        let plan = snapshot
-            .compile_promql()
-            .map_err(|error| format!("startup planning failed for {}: {error}", path.display()))?;
-        if let Some(comparison) = &plan.cost_comparison {
-            info!(
-                "Startup workload cost decision: {}",
-                serde_json::to_string(comparison)?
-            );
-        }
-        Some(
-            data_plane::drivers::query::servers::http::PhysicalPlanInstallRequest {
-                summary_catalog: plan.summary_catalog,
-                collector_plans: plan.collector_plans,
-                precompute_plan: plan.precompute_plan,
-                transmission_plan: plan.transmission_plan,
-                query_plan: plan.query_plan,
-                storage_routing: None,
-                adaptation_evidence: Vec::new(),
-            },
-        )
-    } else if let Some(path) = args.physical_plan.as_ref() {
-        let bytes = fs::read(path)?;
-        Some(serde_json::from_slice(&bytes).map_err(|error| {
-            format!(
-                "failed to decode physical plan artifact {}: {error}",
-                path.display()
-            )
-        })?)
-    } else {
-        None
-    };
-    let startup_physical_plan = if let Some(artifact) = startup_artifact {
-        let active = data_plane::drivers::query::servers::http::validate_and_build_runtime_plan(
-            artifact,
-            Arc::new(data_plane::storage_engines::types::BackendStorageRouting::empty()),
-        )
-        .map_err(|error| format!("invalid startup PhysicalPlan: {error}"))?;
-        if args.profile == RuntimeProfile::Asapquery
-            && (active.plan_id() == 0
-                || !matches!(
-                    active.precompute_plan.ingest.protocol,
-                    asap_types::precompute_plan::IngestProtocol::PrometheusRemoteWriteV1
-                )
-                || active.precompute_plan.ingest.endpoint_path != "/api/v1/write")
-        {
-            return Err("the asapquery profile requires a non-bootstrap physical plan declaring prometheus_remote_write_v1 at /api/v1/write".into());
-        }
-        let now = unix_time_ms();
-        if active.activation_unix_ms() > now {
-            return Err(format!(
-                "physical plan activation {} is later than startup time {now}",
-                active.activation_unix_ms()
-            )
-            .into());
-        }
-        if active.expiry_unix_ms().is_some_and(|expiry| expiry <= now) {
-            return Err("physical plan artifact is expired".into());
-        }
-        Some(active)
-    } else {
-        None
-    };
-    let startup_physical_plan = startup_physical_plan.ok_or("startup requires a physical plan")?;
-    let installed_precompute_plan = startup_physical_plan.installed_precompute_plan.clone();
-    info!(
-        "Installed precompute DAG with {} stored outputs",
-        installed_precompute_plan.materializations().len()
-    );
-
-    // Share a hot-reload handle with HTTP configuration endpoints and consumers.
-
-    let cleanup_policy = args.cleanup_policy;
-    info!("Using cleanup policy: {:?}", cleanup_policy);
-    let _ = (cleanup_policy, args.lock_strategy); // Both still parsed for backwards-compat CLI; no runtime effect.
-
-    // Phase 4 + 5 wire-in (refactor 2026-05): allocate the shared
-    // SeriesIdResolver + SketchStore once. The OTLP receive path
-    // (sid resolution + unknown_series_ids stamping; SketchStore
-    // .append_sample on every modified-OTLP sketch DP) AND the
-    // ASAPQueryEngine query path (SketchStore.classify / query_range
-    // for ASAP-tier reads) hold clones of these Arcs. Allocated
-    // here before BOTH the ASAPQueryEngine and the precompute engine
-    // are constructed so both can be wired with a single canonical
-    // instance — even when precompute is disabled, the engine still
-    // needs the index for the Phase 6 archive failover trigger.
-    // Under --persistence-enabled, the resolver replays its WAL on
-    // startup so the agent's cached sids stay valid across backend
-    // restarts. Without persistence (tests, stateless deploys), every
-    // restart drops the cache; agents recover via the existing
-    // `unknown_series_ids` eviction primitive — one extra round trip
-    // per identity on the first emit post-restart.
-    let series_resolver = if args.persistence_enabled {
-        use data_plane::drivers::ingest::series_resolver::SeriesIdResolver;
-        let dir = args
-            .persistence_dir
-            .as_ref()
-            .expect("--persistence-enabled requires --persistence-dir");
-        let wal_path = std::path::PathBuf::from(dir).join("series_resolver.wal");
-        info!("opening series-resolver WAL at {:?}", wal_path);
-        Arc::new(SeriesIdResolver::open(wal_path)?)
-    } else {
-        Arc::new(data_plane::drivers::ingest::series_resolver::SeriesIdResolver::new())
-    };
-    let summary_store = Arc::new(data_plane::storage_engines::sketch_db::index::SketchStore::new());
-    if let Some(catalog) = startup_physical_plan.summary_catalog.as_ref() {
-        summary_store
-            .install_precompute_plan(Arc::clone(catalog), &startup_physical_plan.precompute_plan)
-            .map_err(std::io::Error::other)?;
-    }
-
-    // Enable persistence for the shared sketch store so precompute and sketch
-    // state survive restarts.
-    let _sketch_index_persistence = if args.persistence_enabled {
-        use data_plane::storage_engines::sketch_db::index::persistence::SketchStorePersistenceConfig;
-        let disk_path = args
-            .persistence_dir
-            .clone()
-            .expect("--persistence-enabled requires --persistence-dir");
-        let memory_limit_bytes = args.persistence_memory_limit_mb * 1024 * 1024;
-        let hot_window_ms = if args.persistence_hot_window_secs == 0 {
-            None
-        } else {
-            Some(args.persistence_hot_window_secs * 1000)
-        };
-        let delete_older_than_ms = if args.persistence_delete_older_than_secs == 0 {
-            None
-        } else {
-            Some(args.persistence_delete_older_than_secs * 1000)
-        };
-        let part_cache_bytes = args
-            .persistence_part_cache_mb
-            .map(|mb| mb * 1024 * 1024)
-            .unwrap_or_else(|| {
-                let ten_pct = (memory_limit_bytes / 10) as u64;
-                ten_pct.min(512 * 1024 * 1024)
-            });
-        let index_persistence_dir = std::path::PathBuf::from(&disk_path).join("sketch_index");
-        let cfg = SketchStorePersistenceConfig {
-            memory_limit_bytes,
-            memory_low_watermark_bytes: memory_limit_bytes * 8 / 10,
-            hard_cap_bytes: memory_limit_bytes * 125 / 100,
-            hot_window_ms,
-            delete_older_than_ms,
-            flush_interval: std::time::Duration::from_millis(args.persistence_flush_interval_ms),
-            disk_path: index_persistence_dir.clone(),
-            part_cache_bytes,
-            seal_window_count: args.persistence_seal_window_count,
-        };
-        info!(
-            "SketchStore persistence enabled: disk_path={:?}",
-            index_persistence_dir
-        );
-        Some(
-            summary_store
-                .start_persistence(cfg)
-                .expect("SketchStore::start_persistence failed"),
-        )
-    } else {
-        None
-    };
-
-    let initial_active_plan = startup_physical_plan;
-    let active_physical_plan =
-        data_plane::storage_engines::types::ActivePhysicalPlanHandle::new(initial_active_plan);
-    let hot_reload_config =
-        data_plane::storage_engines::types::InstalledPrecomputePlanHandle::from_active_physical_plan(
-            active_physical_plan.clone(),
-        );
-
-    // Query execution reads generation-consistent runtime configuration from
-    // the RuntimePhysicalPlan installed below.
-    // Phase 5 wire-in (refactor 2026-05): hand the ASAP-tier SummaryStore to the
-    // query engine so SeriesLookup classification drives the Phase 6 archive
-    // failover via EngineError::CapabilityMiss when the ASAP tier is empty /
-    // ghost / unknown.
-    let query_forwarding_policy = if args.disable_query_forwarding {
-        data_plane::query_engines::QueryForwardingPolicy::Disabled
-    } else {
-        data_plane::query_engines::QueryForwardingPolicy::Enabled
-    };
-    if !query_forwarding_policy.allows_external_queries() {
-        info!("query forwarding disabled for this process");
-    }
-    let engine = ASAPQueryEngine::new(args.prometheus_scrape_interval)
-        .with_sketch_index(summary_store.clone())
-        .with_active_physical_plan(active_physical_plan.clone())
-        .with_query_forwarding_policy(query_forwarding_policy)
-        .with_exact_subquery_endpoint(args.prometheus_server.clone())
-        .with_metricsql_exact_subquery_endpoint(args.victoriametrics_url.clone());
-
-    // Setup precompute engine. Backend ingest is OTLP-only — the
-    // precompute engine no longer hosts an HTTP listener of its own; the
-    // OTLP receiver below pushes envelopes / raw points into the worker
-    // pool via the `IngestState` handle returned by `engine.ingest_state()`.
-    //
-    // NOTE: precompute is constructed BEFORE the OTLP receiver so the receiver
-    // can obtain an `Arc<IngestState>` handle and push OTLP metrics / sketches
-    // into the same worker pool (and not just write directly to the store).
-    let (precompute_handle, precompute_ingest_state) = {
-        let precompute_config = PrecomputeEngineConfig {
-            num_workers: args.precompute_num_workers,
-            allowed_lateness_ms: args.precompute_allowed_lateness_ms,
-            max_buffer_per_series: args.precompute_max_buffer_per_series,
-            flush_interval_ms: args.precompute_flush_interval_ms,
-            channel_buffer_size: args.precompute_channel_buffer_size,
-            pass_raw_samples: false,
-            raw_mode_aggregation_id: 0,
-            late_data_policy: LateDataPolicy::ForwardToStore,
-            wall_clock_idle_grace_period_ms: 5_000,
-            wall_clock_max_open_grace_period_ms: 5_000,
-            schema_persist_path: args.schema_persist_path.clone(),
-        };
-        // M2.3.6 — sketch-only sink. Precompute writes now go to
-        // `SketchStore` exclusively; the legacy `SketchStore` no
-        // longer receives traffic from either ingest (this sink) or
-        // queries (engine M2.3.5b cut-over). The `store` Arc kept
-        // below is for the eviction service + diagnostic plumbing
-        // until subsequent M2.3.6 sub-PRs delete those too.
-        let output_sink = Arc::new(SketchStoreSink::new(
-            summary_store.clone(),
-            hot_reload_config.clone(),
-            series_resolver.clone(),
-        ));
-        let engine = PrecomputeEngine::new(
-            precompute_config,
-            hot_reload_config.clone(),
-            output_sink,
-            series_resolver.clone(),
-            summary_store.clone(),
-        );
-        if let Some(endpoint) = args.erp_runtime_samples_endpoint.clone() {
-            let generation = engine
-                .ingest_state()
-                .active_physical_plan_snapshot()
-                .and_then(|plan| plan.precompute_plan.summary_catalog.clone())
-                .ok_or_else(|| {
-                    std::io::Error::other("ERP observation requires an installed catalog")
-                })?;
-            engine
-                .ingest_state()
-                .router
-                .enable_erp_observation(endpoint, generation)
-                .map_err(std::io::Error::other)?;
-        }
-        let worker_diagnostics = engine.diagnostics();
-        let ingest_state = engine.ingest_state();
-        info!("Starting precompute engine (ingest adapters share its bounded worker queues)");
-
-        // Log memory diagnostics for the shared sketch store.
-        let diag_index = summary_store.clone();
-        tokio::spawn(async move {
-            spawn_memory_diagnostics(diag_index, Some(worker_diagnostics)).await;
-        });
-
-        let handle = tokio::spawn(async move {
-            if let Err(e) = engine.run().await {
-                error!("Precompute engine error: {}", e);
-            }
-        });
-        (Some(handle), Some(ingest_state))
-    };
-
-    // Sid lifecycle is owned by the shared sketch store.
-    let engine = Arc::new(engine);
-
-    // Idle-sid eviction sweep (memory reclaim) — opt-in via
-    // --idle-sid-evict-secs. Drops the in-memory `SidStoreData` for
-    // write-idle, fully-flushed sketch sids while keeping their queryable
-    // metadata, bounding resident registry memory under series churn.
-    if args.idle_sid_evict_secs > 0 {
-        let evict_index = summary_store.clone();
-        let idle_ms = args.idle_sid_evict_secs.saturating_mul(1000);
-        // Sweep a few times per idle horizon, clamped to a sane cadence.
-        let sweep = std::time::Duration::from_secs(args.idle_sid_evict_secs.clamp(10, 60));
-        info!(
-            "Idle-sid eviction enabled: idle threshold {}s, sweep every {}s",
-            args.idle_sid_evict_secs,
-            sweep.as_secs()
-        );
-        tokio::spawn(async move {
-            let mut interval = tokio::time::interval(sweep);
-            loop {
-                interval.tick().await;
-                let n = evict_index.evict_idle_series(idle_ms);
-                if n > 0 {
-                    info!(
-                        "[IDLE_EVICT] evicted {} idle sid(s) from memory \
-                         (still queryable from disk; rehydrate on next write)",
-                        n
-                    );
-                }
-            }
-        });
-    }
-
-    // Setup OTLP receiver (after precompute engine so it can share the ingest state)
-    // Issue #46 ⑥ — freshness-probe last-value cache. Shared between
-    // the OTLP receiver (write path) and the HTTP query handler (read
-    // path) so `last_over_time(http_freshness_probe_*[<range>])` can
-    // be answered from RAM instead of falling through to the cold
-    // archive (which has a 60–90 s flush gap that would leave the
-    // 10 s lookback window empty). Allocated unconditionally — non-
-    // probe traffic doesn't touch the cache, so the cost is one
-    // `RwLock<HashMap>` of three entries for the whole demo run.
-    let probe_cache = Arc::new(data_plane::query_engines::routing::FreshnessProbeCache::new());
-
-    let otel_handle = if args.enable_otel_ingest {
-        let otel_config = OtlpReceiverConfig {
-            grpc_port: args.otel_grpc_port,
-            http_port: args.otel_http_port,
-        };
-        let receiver = match precompute_ingest_state.clone() {
-            Some(ingest_state) => {
-                info!(
-                    "Starting OTLP receiver wired to precompute engine \
-                     (gRPC port {}, HTTP port {})",
-                    args.otel_grpc_port, args.otel_http_port
-                );
-                OtlpReceiver::with_ingest_state(otel_config, ingest_state)
-                    .with_probe_cache(probe_cache.clone())
-            }
-            None => {
-                info!(
-                    "Starting OTLP receiver in log-only mode \
-                     (precompute engine not enabled; gRPC port {}, HTTP port {})",
-                    args.otel_grpc_port, args.otel_http_port
-                );
-                OtlpReceiver::new(otel_config).with_probe_cache(probe_cache.clone())
-            }
-        };
-        Some(tokio::spawn(async move {
-            if let Err(e) = receiver.run().await {
-                error!("OTLP receiver error: {}", e);
-            }
-        }))
-    } else {
-        None
-    };
-
-    // Coordinated-sampling monitor coordinator: bidi MonitorService gRPC that
-    // answers each edge's periodic rate report with its whole-sketch ε-floor
-    // sample_p grant. Global-threshold alerting is retired (see
-    // data_plane::monitor module docs) — this coordinator never fires one.
-    let monitor_handle = if args.enable_monitor_coordinator {
-        use data_plane::update_sampling::{
-            Functional, MonitorConfig, MonitorCoordinator, MonitorServiceImpl,
-        };
-        let monitor_specs: Vec<asap_types::MonitorSpec> = match &args.monitor_specs {
-            Some(path) => serde_yaml::from_slice(&fs::read(path)?)?,
-            None => Vec::new(),
-        };
-        let specs = monitor_specs
-            .into_iter()
-            .map(|m| MonitorConfig {
-                agg_id: m.agg_id,
-                key: m.key.into_bytes(),
-                tau: m.tau,
-                epsilon: m.epsilon,
-                window_ms: m.window_ms,
-                functional: Functional::from_name(&m.functional),
-            })
-            .collect();
-        let coord = MonitorCoordinator::new(specs);
-
-        let svc = MonitorServiceImpl::new(coord).into_server();
-        let port = args.monitor_grpc_port;
-        info!("Starting CDM monitor coordinator gRPC on 0.0.0.0:{port}");
-        Some(tokio::spawn(async move {
-            let addr = match format!("0.0.0.0:{port}").parse() {
-                Ok(a) => a,
-                Err(e) => {
-                    error!("invalid monitor coordinator addr: {e}");
-                    return;
-                }
-            };
-            if let Err(e) = tonic::transport::Server::builder()
-                .add_service(svc)
-                .serve(addr)
-                .await
-            {
-                error!("monitor coordinator server error: {e}");
-            }
-        }))
-    } else {
-        None
-    };
-
-    // Step-1 of the JSONL deprecation deleted the local-FS cold
-    // store + the §5.2 `ColdFallback` adapter; the surviving
-    // fallback chain is just Prometheus (when
-    // `--forward-unsupported-queries` is set).
-    let adapter_config = AdapterConfig::prometheus_promql(
-        args.prometheus_server.clone(),
-        args.forward_unsupported_queries,
-    )
-    .with_query_forwarding_policy(query_forwarding_policy);
-
-    let http_config = HttpServerConfig {
-        port: args.http_port,
-        handle_http_requests: true,
-        adapter_config,
-    };
-
-    // The backend consumes streaming configuration and storage routing pushed
-    // by the control plane through their HTTP endpoints.
-
-    // HTTP endpoints inspect lifecycle metadata in the shared sketch store.
-    let mut server = HttpServer::new(http_config, engine, summary_store.clone())
-        .with_active_physical_plan(active_physical_plan.clone())
-        .with_probe_cache(probe_cache.clone());
-    if args.profile == RuntimeProfile::Distributed {
-        // Legacy partial-document endpoints remain available to distributed
-        // deployments. The compatibility profile deliberately exposes only
-        // the atomic CompiledPhysicalPlan stage/activate lifecycle.
-        server = server.with_hot_reload_config(hot_reload_config.clone());
-    }
-
-    if args.enable_remote_write || args.profile == RuntimeProfile::Asapquery {
-        let receiver = PrometheusRemoteWriteReceiver::new(
-            PrometheusRemoteWriteConfig {
-                max_compressed_bytes: args.remote_write_max_compressed_bytes,
-                max_decompressed_bytes: args.remote_write_max_decompressed_bytes,
-                max_timeseries: args.remote_write_max_timeseries,
-                max_samples: args.remote_write_max_samples,
-                dedup_horizon: std::time::Duration::from_millis(args.remote_write_dedup_horizon_ms),
-                max_dedup_entries: args.remote_write_max_dedup_entries,
-                revisions: args.remote_write_revision_dir.clone().map(|directory| {
-                    (
-                        directory,
-                        data_plane::precompute_engine::revisions::RevisionPolicy {
-                            correction_horizon_ms: args.remote_write_correction_horizon_ms,
-                            max_query_staleness_ms: args.remote_write_revision_freshness_ms,
-                            max_checkpoint_bytes: args.remote_write_revision_max_bytes,
-                        },
-                    )
-                }),
-            },
-            precompute_ingest_state
-                .clone()
-                .expect("precompute ingest state is always constructed"),
-        );
-        info!("Prometheus Remote Write v1 enabled at POST /api/v1/write");
-        if args.remote_write_revision_dir.is_some() {
-            receiver.recover_revisions()?;
-            let continuous = receiver.clone();
-            let capture_interval_ms = (args.remote_write_revision_freshness_ms / 2).clamp(1, 1000);
-            tokio::spawn(async move {
-                let mut tick =
-                    tokio::time::interval(std::time::Duration::from_millis(capture_interval_ms));
-                tick.set_missed_tick_behavior(tokio::time::MissedTickBehavior::Skip);
-                loop {
-                    tick.tick().await;
-                    let receiver = continuous.clone();
-                    match tokio::task::spawn_blocking(move || receiver.refresh_revisions()).await {
-                        Ok(Ok(())) => {}
-                        outcome => {
-                            tracing::error!(?outcome, "continuous revision execution stopped");
-                            break;
-                        }
-                    }
-                }
-            });
-        }
-        server = server.with_remote_write(receiver);
-    }
-
-    // Per-metric storage-backend routing table (issue #46
-    // criterion ⑤). Mirror the `precompute_engine` binary: load it
-    // from `--backend-storage-routing` (or its env-var alias) so the
-    // HTTP handler consults a per-metric `StorageBackend` map on
-    // every PromQL query instead of bypassing the EngineRouter when
-    // the installed storage view single axis defaults to `SketchStore`.
-    //
-    // even when no static YAML is loaded, install an
-    // empty hot-reload handle so the control plane's first
-    // `POST /api/v1/storage_routing` push lands without first-call 503
-    // lossage. Operators can still hand-author the YAML for
-    // dev / standalone — the YAML supplies the bootstrap, control plane
-    // pushes overwrite it.
-    let bootstrap_routing = if let Some(routing_path) = args.backend_storage_routing.as_deref() {
-        match data_plane::storage_engines::types::BackendStorageRouting::from_yaml_file(
-            routing_path,
-        ) {
-            Ok(routing) => {
-                info!(
-                    "Loaded backend-storage-routing from {:?}: default={:?}, entries={}",
-                    routing_path,
-                    routing.default_backend(),
-                    routing.len(),
-                );
-                routing
-            }
-            Err(e) => {
-                warn!(
-                    "Failed to load backend-storage-routing from {:?}: {} — installing an empty routing table; the control plane's first POST /api/v1/storage_routing push will fill it",
-                    routing_path, e,
-                );
-                data_plane::storage_engines::types::BackendStorageRouting::empty()
-            }
-        }
-    } else {
-        info!(
-            "--backend-storage-routing not set — installing an empty routing table; the control plane's first POST /api/v1/storage_routing push will fill it",
-        );
-        data_plane::storage_engines::types::BackendStorageRouting::empty()
-    };
-    if active_physical_plan.active_snapshot().plan_id() == 0 {
-        let current = active_physical_plan.active_snapshot();
-        active_physical_plan.swap(data_plane::storage_engines::types::RuntimePhysicalPlan {
-            readout_programs: Default::default(),
-            envelope: current.envelope.clone(),
-            summary_catalog: current.summary_catalog.clone(),
-            precompute_plan: current.precompute_plan.clone(),
-            transmission_plan: current.transmission_plan.clone(),
-            installed_precompute_plan: current.installed_precompute_plan.clone(),
-            query_plan: current.query_plan.clone(),
-            storage_routing: Arc::new(bootstrap_routing),
-        });
-    }
-    server = server.with_hot_reload_backend_storage_routing(
-        data_plane::query_engines::routing::HotReloadBackendStorageRouting::from_active(
-            active_physical_plan.clone(),
-        ),
+    let plan = InstalledPlan::load(&args.plan)?;
+    tracing::info!(
+        queries = plan.queries.len(),
+        nodes = plan.dag.dag.nodes.len(),
+        "installed plan"
     );
-
-    if args.persistence_delete_older_than_secs > 0 {
-        server = server.with_data_retention_ms(args.persistence_delete_older_than_secs * 1000);
-    }
-    // Share the backfill registry between HTTP endpoints and the worker.
-    // `--backfill-persist-path` enables recovery and atomic persistence of job
-    // transitions; without it, job history is memory-only.
-    let backfill_registry = Arc::new(match args.backfill_persist_path.as_ref() {
-        Some(path) => {
-            data_plane::storage_engines::sketch_db::BackfillRegistry::load_or_new(path.clone())
-        }
-        None => data_plane::storage_engines::sketch_db::BackfillRegistry::new(),
-    });
-    server = server.with_backfill_registry(backfill_registry.clone());
-
-    // Start the backfill worker when enabled. Each source needs a reader factory;
-    // unsupported sources fail the job with a missing-reader error.
-    let backfill_service_handle = if let (true, Some(_ingest_state)) = (
-        args.enable_backfill_worker,
-        precompute_ingest_state.as_ref(),
-    ) {
-        // Backfill uses the installed precompute plan and sketch store.
-        let reader_factory = match args.clickhouse_backfill_table.as_ref() {
-            Some(table) => data_plane::storage_engines::sketch_db::clickhouse_reader_factory(
-                data_plane::storage_engines::sketch_db::ClickHouseReaderConfig {
-                    base_url: args.clickhouse_url.clone(),
-                    database: args.clickhouse_backfill_database.clone(),
-                    table: table.clone(),
-                    metric_column: args.clickhouse_backfill_metric_column.clone(),
-                    labels_column: args.clickhouse_backfill_labels_column.clone(),
-                    timestamp_ms_column: args.clickhouse_backfill_timestamp_column.clone(),
-                    value_column: args.clickhouse_backfill_value_column.clone(),
-                    user: args.clickhouse_user.clone(),
-                    password: args.clickhouse_password.clone(),
-                },
-            ),
-            None => data_plane::storage_engines::sketch_db::default_reader_factory(),
-        };
-        let service = data_plane::storage_engines::sketch_db::BackfillService::new(
-            backfill_registry.clone(),
-            hot_reload_config.clone(),
-            reader_factory,
-            data_plane::storage_engines::sketch_db::BackfillServiceConfig::default(),
-        )
-        // Backfill and live ingest share the same sid resolver and sketch store.
-        .with_sketch_index(summary_store.clone())
-        .with_series_resolver(series_resolver.clone());
-        info!(
-            "Spawning BackfillService drain loop (reader factory: default — Prometheus sources wired, S3/OtherSketch fail fast)"
-        );
-        Some(service.spawn())
-    } else {
-        if args.enable_backfill_worker {
-            warn!(
-                "--enable-backfill-worker was set but precompute engine isn't enabled; backfill service NOT spawned"
-            );
-        }
-        None
-    };
-
-    // schema eviction service. On every poll interval,
-    // scans the schema registry for `Expired` schemas, cancels any
-    // in-flight backfills targeting them, and drops the agg_id's
-    // data from the store. Complements the age-based data retention
-    // in SketchStore — see `SchemaEvictionService` module doc for
-    // the ordering rationale.
-    let schema_eviction_handle = if let (true, Some(_ingest_state)) = (
-        args.enable_schema_eviction,
-        precompute_ingest_state.as_ref(),
-    ) {
-        let data_retention_opt = if args.persistence_delete_older_than_secs == 0 {
-            None
-        } else {
-            Some(std::time::Duration::from_secs(
-                args.persistence_delete_older_than_secs,
-            ))
-        };
-        // Compare data retention against the configured retirement retention.
-        data_plane::storage_engines::sketch_db::warn_if_retention_inverted(
-            data_retention_opt,
-            data_plane::storage_engines::sketch_db::DEFAULT_RETIREMENT_RETENTION,
-        );
-        let svc = data_plane::storage_engines::sketch_db::SchemaEvictionService::new(
-            summary_store.clone(),
-            backfill_registry.clone(),
-            data_plane::storage_engines::sketch_db::SchemaEvictionConfig {
-                poll_interval: std::time::Duration::from_secs(args.schema_eviction_poll_secs),
-                dry_run: args.schema_eviction_dry_run,
-            },
-        );
-        info!(
-            poll_secs = args.schema_eviction_poll_secs,
-            dry_run = args.schema_eviction_dry_run,
-            "Spawning SchemaEvictionService"
-        );
-        Some(svc.spawn())
-    } else {
-        if args.enable_schema_eviction {
-            warn!(
-                "--enable-schema-eviction set but precompute engine isn't enabled; eviction service NOT spawned"
-            );
-        }
-        None
-    };
-
-    info!("Starting HTTP server on port {}", args.http_port);
-
-    let victoria_server = args.victoriametrics_http_port.map(|port| {
-        use data_plane::drivers::query::adapters::VictoriaMetricsHttpAdapter;
-        let config = AdapterConfig::victoriametrics_metricsql(args.victoriametrics_url.clone());
-        info!("Starting VictoriaMetrics MetricsQL listener on port {port}");
-        server
-            .clone()
-            .with_query_listener(port, config.clone())
-            .with_protocol_adapter(Arc::new(VictoriaMetricsHttpAdapter::new(config)))
-    });
-
-    let victoria_task = victoria_server.map(|server| tokio::spawn(server.run()));
-
-    let clickhouse_server_handle = args.clickhouse_http_port.map(|port| {
-        let fallback = Arc::new(
-            data_plane::query_engines::asap_clickhouse_query_engine::ClickHouseHttpFallback::new(
-                args.clickhouse_url.clone(),
-                args.clickhouse_database.clone(),
-            ),
-        );
-        let accelerator = Arc::new(
-            data_plane::query_engines::asap_clickhouse_query_engine::accelerator::CatalogClickHouseAccelerator::with_active_physical_plan_and_exact_backend(
-                summary_store.clone(),
-                active_physical_plan.clone(),
-                fallback.clone(),
-            ),
-        );
-        let clickhouse_server =
-            data_plane::query_engines::asap_clickhouse_query_engine::ClickHouseHttpServer {
-                listen_address: format!("0.0.0.0:{port}"),
-                fallback,
-            };
-        info!("Starting ClickHouse-compatible HTTP proxy on port {port}");
-        tokio::spawn(async move {
-            let result = clickhouse_server.run_with_accelerator(accelerator).await;
-            if let Err(error) = result {
-                error!("ClickHouse HTTP server error: {error}");
-            }
-        })
-    });
-    // Wait for shutdown signal
-    tokio::select! {
-        result = server.run() => {
-            if let Err(e) = result {
-                error!("HTTP server error: {}", e);
-            }
-        }
-        _ = signal::ctrl_c() => {
-            info!("Shutdown signal received");
-        }
-    }
-
-    if let Some(task) = victoria_task {
-        task.abort();
-    }
-
-    // Cleanup - gracefully shutdown background tasks
-    if let Some(handle) = backfill_service_handle {
-        info!("Shutting down backfill service...");
-        handle.shutdown().await;
-    }
-
-    if let Some(handle) = schema_eviction_handle {
-        info!("Shutting down schema eviction service...");
-        handle.shutdown().await;
-    }
-
-    if let Some(handle) = clickhouse_server_handle {
-        handle.abort();
-    }
-
-    if let Some(handle) = otel_handle {
-        info!("Shutting down OTLP receiver...");
-        handle.abort();
-        let _ = handle.await;
-    }
-
-    if let Some(handle) = monitor_handle {
-        info!("Shutting down CDM monitor coordinator...");
-        handle.abort();
-        let _ = handle.await;
-    }
-
-    if let Some(handle) = precompute_handle {
-        info!("Shutting down precompute engine...");
-        handle.abort();
-        let _ = handle.await;
-    }
-
-    info!("Shutdown complete");
+    let state = Arc::new(DataPlane::new(plan.queries, args.prometheus_url));
+    let listener = tokio::net::TcpListener::bind(&args.listen).await?;
+    tracing::info!(address = %listener.local_addr()?, "listening");
+    axum::serve(listener, router(state)).await?;
     Ok(())
 }
-
-/// Best-effort process resident-set size (RSS) in bytes, read from
-/// `/proc/self/statm` (field 2 = resident pages × page size). Returns 0 if
-/// unreadable (non-Linux / sandboxed) so the diagnostic degrades gracefully
-/// rather than failing. This is the ground-truth counterpart to the
-/// store's structural estimates in the memory diagnostic.
-fn process_resident_bytes() -> usize {
-    let Ok(statm) = std::fs::read_to_string("/proc/self/statm") else {
-        return 0;
-    };
-    let Some(resident_pages) = statm.split_whitespace().nth(1) else {
-        return 0;
-    };
-    let pages: usize = resident_pages.parse().unwrap_or(0);
-    // `sysconf(_SC_PAGESIZE)` is 4 KiB on every platform this runs on.
-    pages * 4096
-}
-
-/// Periodic memory diagnostics logger — runs every 30 seconds.
-async fn spawn_memory_diagnostics(
-    summary_store: Arc<data_plane::storage_engines::sketch_db::index::SketchStore>,
-    worker_diagnostics: Option<Arc<PrecomputeWorkerDiagnostics>>,
-) {
-    use data_plane::storage_engines::sketch_db::index::persistence::EpochSource;
-    use std::sync::atomic::Ordering;
-
-    let mut interval = tokio::time::interval(tokio::time::Duration::from_secs(30));
-    loop {
-        interval.tick().await;
-
-        // Per-sid sketch-store diagnostics.
-        let instance_count = summary_store.instance_count();
-        let series_count = summary_store.series_len();
-        // `approx_memory_bytes` is the flusher's EVICTABLE-payload gauge:
-        // it counts only live sketch payloads (current_epoch + sealed), so
-        // it correctly reads ~0 once everything has been flushed to disk.
-        // On its own it badly misrepresents the store's footprint — the
-        // per-sid registry + intern caches stay resident and are not
-        // flushable. Report evictable payload, structural overhead, their
-        // total store estimate, and process RSS ground truth separately.
-        let payload_bytes = summary_store.approx_memory_bytes();
-        let resident_bytes = summary_store.approx_resident_bytes();
-        let structural_bytes = resident_bytes.saturating_sub(payload_bytes);
-        let rss_bytes = process_resident_bytes();
-        info!(
-            "[MEMORY_DIAG] SketchStore: {} instance(s), {} sid(s) with state, \
-             payload={:.2} KB (evictable, flusher gauge), \
-             registry+intern\u{2248}{:.2} MB (structural), total-store\u{2248}{:.2} MB, \
-             process RSS={:.1} MB",
-            instance_count,
-            series_count,
-            payload_bytes as f64 / 1024.0,
-            structural_bytes as f64 / (1024.0 * 1024.0),
-            resident_bytes as f64 / (1024.0 * 1024.0),
-            rss_bytes as f64 / (1024.0 * 1024.0),
-        );
-
-        // 2. Worker diagnostics (precompute engine only)
-        if let Some(ref diag) = worker_diagnostics {
-            let total_groups: usize = diag
-                .worker_group_counts
-                .iter()
-                .map(|c| c.load(Ordering::Relaxed))
-                .sum();
-            info!(
-                "[MEMORY_DIAG] PrecomputeEngine: {} total groups across {} workers",
-                total_groups,
-                diag.worker_group_counts.len(),
-            );
-            for (i, counter) in diag.worker_group_counts.iter().enumerate() {
-                info!(
-                    "[MEMORY_DIAG]   worker_{}: group_states_len={}",
-                    i,
-                    counter.load(Ordering::Relaxed),
-                );
-            }
-        }
-    }
-}
-
-fn setup_logging(
-    output_dir: &str,
-    log_level: &str,
-) -> Result<tracing_appender::non_blocking::WorkerGuard> {
-    use tracing_subscriber::{layer::SubscriberExt, util::SubscriberInitExt, EnvFilter};
-
-    // Create env filter that respects RUST_LOG, with fallback to command line arg
-    let env_filter = EnvFilter::try_from_default_env()
-        .or_else(|_| EnvFilter::try_new(log_level))
-        .unwrap_or_else(|_| EnvFilter::new("info"));
-
-    // Create file appender for logging to file
-    let file_appender = tracing_appender::rolling::never(output_dir, "query_engine.log");
-    let (non_blocking_file, guard) = tracing_appender::non_blocking(file_appender);
-
-    // Create console layer for stdout
-    let console_layer = tracing_subscriber::fmt::layer()
-        .with_file(true)
-        .with_line_number(true)
-        .with_target(true)
-        .with_writer(std::io::stdout);
-
-    // Create file layer for file output
-    let file_layer = tracing_subscriber::fmt::layer()
-        .with_file(true)
-        .with_line_number(true)
-        .with_target(true)
-        .with_ansi(false) // Disable ANSI color codes in log file
-        .with_writer(non_blocking_file);
-
-    tracing_subscriber::registry()
-        .with(env_filter)
-        .with(console_layer)
-        .with(file_layer)
-        .init();
-
-    info!("Logging initialized (respects RUST_LOG environment variable)");
-    info!("Logs will be written to: {}/query_engine.log", output_dir);
-    Ok(guard)
-}
-
-#[cfg(test)]
-mod tests {
-    use super::{validate_profile, Args};
-    use clap::Parser;
-    use data_plane::drivers::AdapterConfig;
-
-    // Every profile must bootstrap from the same validated physical artifact.
-    #[test]
-    fn distributed_accepts_physical_plan_without_streaming_config() {
-        let args = Args::try_parse_from(["data_plane", "--physical-plan", "plan.json"]).unwrap();
-        assert!(validate_profile(&args).is_ok());
-    }
-
-    #[test]
-    fn asapquery_requires_atomic_physical_plan_not_streaming_config() {
-        let valid = Args::try_parse_from([
-            "data_plane",
-            "--profile",
-            "asapquery",
-            "--physical-plan",
-            "plan.json",
-            "--forward-unsupported-queries",
-        ])
-        .unwrap();
-        assert!(validate_profile(&valid).is_ok());
-
-        assert!(
-            Args::try_parse_from(["data_plane", "--streaming-config", "streaming.yaml"]).is_err()
-        );
-
-        let planned = Args::try_parse_from([
-            "data_plane",
-            "--profile",
-            "asapquery",
-            "--planning-snapshot",
-            "workload.json",
-            "--forward-unsupported-queries",
-        ])
-        .unwrap();
-        assert!(validate_profile(&planned).is_ok());
-
-        let ambiguous = Args::try_parse_from([
-            "data_plane",
-            "--profile",
-            "asapquery",
-            "--planning-snapshot",
-            "workload.json",
-            "--physical-plan",
-            "plan.json",
-            "--forward-unsupported-queries",
-        ])
-        .unwrap();
-        assert!(validate_profile(&ambiguous)
-            .unwrap_err()
-            .to_string()
-            .contains("exactly one"));
-    }
-
-    // Step-1 of the JSONL deprecation refactor deleted the
-    // §5.2 `ColdFallback` adapter and the
-    // `from_prom_with_optional_cold` constructor. The surviving
-    // fallback chain is just Prometheus (gated by
-    // `forward_unsupported_queries`).
-
-    #[test]
-    fn no_forward_yields_no_fallback() {
-        let cfg = AdapterConfig::prometheus_promql("http://prom:9090".into(), false);
-        assert!(
-            cfg.fallback.is_none(),
-            "forward_unsupported=false must leave the fallback slot empty",
-        );
-    }
-
-    #[test]
-    fn forward_yields_prom_fallback() {
-        let cfg = AdapterConfig::prometheus_promql("http://prom:9090".into(), true);
-        assert!(
-            cfg.fallback.is_some(),
-            "forward_unsupported=true must install the Prom fallback",
-        );
-    }
-
-    #[test]
-    fn disable_query_forwarding_rejects_conflicting_flags() {
-        let args = Args::try_parse_from([
-            "data_plane",
-            "--physical-plan",
-            "streaming.yaml",
-            "--disable-query-forwarding",
-            "--forward-unsupported-queries",
-        ])
-        .unwrap();
-        assert!(validate_profile(&args)
-            .unwrap_err()
-            .to_string()
-            .contains("conflicts"));
-    }
-
-    #[test]
-    fn disable_query_forwarding_rejects_forwarding_listeners() {
-        let args = Args::try_parse_from([
-            "data_plane",
-            "--physical-plan",
-            "streaming.yaml",
-            "--disable-query-forwarding",
-            "--victoriametrics-http-port",
-            "8429",
-        ])
-        .unwrap();
-        assert!(validate_profile(&args)
-            .unwrap_err()
-            .to_string()
-            .contains("victoriametrics-http-port"));
-    }
-
-    #[test]
-    fn disable_query_forwarding_rejects_clickhouse_listener() {
-        let clickhouse = Args::try_parse_from([
-            "data_plane",
-            "--physical-plan",
-            "streaming.yaml",
-            "--disable-query-forwarding",
-            "--clickhouse-http-port",
-            "8124",
-        ])
-        .unwrap();
-        assert!(validate_profile(&clickhouse)
-            .unwrap_err()
-            .to_string()
-            .contains("clickhouse-http-port"));
-    }
-
-    #[test]
-    fn disable_query_forwarding_rejects_asapquery_profile() {
-        let args = Args::try_parse_from([
-            "data_plane",
-            "--profile",
-            "asapquery",
-            "--physical-plan",
-            "plan.json",
-            "--disable-query-forwarding",
-        ])
-        .unwrap();
-        assert!(validate_profile(&args)
-            .unwrap_err()
-            .to_string()
-            .contains("requires query forwarding"));
-    }
-}
diff --git a/data_plane/src/precompute_engine/config.rs b/data_plane/src/precompute_engine/config.rs
deleted file mode 100644
index df6612be9..000000000
--- a/data_plane/src/precompute_engine/config.rs
+++ /dev/null
@@ -1,118 +0,0 @@
-use serde::{Deserialize, Serialize};
-
-/// Policy for handling late samples that arrive after their window has closed.
-#[derive(Debug, Clone, Copy, PartialEq, Serialize, Deserialize, clap::ValueEnum)]
-pub enum LateDataPolicy {
-    /// Drop late samples that arrive after their window has closed.
-    Drop,
-    /// Forward late samples to the store to be merged with existing window data.
-    ForwardToStore,
-}
-
-/// Configuration for the precompute engine.
-#[derive(Debug, Clone, Serialize, Deserialize)]
-pub struct PrecomputeEngineConfig {
-    /// Number of worker threads for parallel processing.
-    pub num_workers: usize,
-    /// Maximum allowed lateness for out-of-order samples (milliseconds).
-    /// Samples arriving later than this behind the watermark are dropped.
-    pub allowed_lateness_ms: i64,
-    /// Maximum number of buffered samples per series before oldest are evicted.
-    pub max_buffer_per_series: usize,
-    /// Interval at which the flush timer fires to close idle windows (milliseconds).
-    pub flush_interval_ms: u64,
-    /// Capacity of the MPSC channel between router and each worker.
-    pub channel_buffer_size: usize,
-    /// When true, skip all aggregation and pass each raw sample directly to the
-    /// output sink as a `SumAccumulator::with_sum(value)`.
-    pub pass_raw_samples: bool,
-    /// Aggregation ID to stamp on each raw-mode output.
-    pub raw_mode_aggregation_id: u64,
-    /// Policy for handling late samples that arrive after their window has closed.
-    pub late_data_policy: LateDataPolicy,
-    /// Additional idle grace after one window duration. A pane closes when it
-    /// has received no input for `window_size + idle_grace`. The legacy YAML
-    /// name is accepted as a serde alias. Non-positive disables idle closure.
-    #[serde(
-        default = "default_wall_clock_idle_grace_period_ms",
-        alias = "wall_clock_grace_period_ms"
-    )]
-    pub wall_clock_idle_grace_period_ms: i64,
-    /// Additional grace for the absolute wall-clock deadline. A pane closes
-    /// after `window_size + max_open_grace` from its first input even if it is
-    /// still active. Non-positive disables the deadline. The worker applies an
-    /// absolute deadline only with `ForwardToStore`, ensuring later inputs are
-    /// emitted as mergeable corrections. Default: 5000 ms.
-    #[serde(default = "default_wall_clock_max_open_grace_period_ms")]
-    pub wall_clock_max_open_grace_period_ms: i64,
-    /// Compatibility option for schema persistence. Sid lifecycle persistence is
-    /// managed by the sketch store.
-    #[serde(default)]
-    pub schema_persist_path: Option<std::path::PathBuf>,
-}
-
-impl Default for PrecomputeEngineConfig {
-    fn default() -> Self {
-        Self {
-            num_workers: 4,
-            allowed_lateness_ms: 5_000,
-            max_buffer_per_series: 10_000,
-            flush_interval_ms: 1_000,
-            channel_buffer_size: 10_000,
-            pass_raw_samples: false,
-            raw_mode_aggregation_id: 0,
-            late_data_policy: LateDataPolicy::ForwardToStore,
-            wall_clock_idle_grace_period_ms: default_wall_clock_idle_grace_period_ms(),
-            wall_clock_max_open_grace_period_ms: default_wall_clock_max_open_grace_period_ms(),
-            schema_persist_path: None,
-        }
-    }
-}
-
-fn default_wall_clock_idle_grace_period_ms() -> i64 {
-    5_000
-}
-
-fn default_wall_clock_max_open_grace_period_ms() -> i64 {
-    5_000
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    #[test]
-    fn test_default_config() {
-        let config = PrecomputeEngineConfig::default();
-        assert_eq!(config.num_workers, 4);
-        assert_eq!(config.allowed_lateness_ms, 5_000);
-        assert_eq!(config.max_buffer_per_series, 10_000);
-        assert_eq!(config.flush_interval_ms, 1_000);
-        assert_eq!(config.channel_buffer_size, 10_000);
-        assert!(!config.pass_raw_samples);
-        assert_eq!(config.raw_mode_aggregation_id, 0);
-        assert_eq!(config.late_data_policy, LateDataPolicy::ForwardToStore);
-        assert_eq!(config.wall_clock_idle_grace_period_ms, 5_000);
-        assert_eq!(config.wall_clock_max_open_grace_period_ms, 5_000);
-    }
-
-    #[test]
-    fn legacy_wall_clock_grace_deserializes_as_idle_grace() {
-        let config: PrecomputeEngineConfig = serde_yaml::from_str(
-            r#"
-num_workers: 1
-allowed_lateness_ms: 100
-max_buffer_per_series: 10
-flush_interval_ms: 1000
-channel_buffer_size: 10
-pass_raw_samples: false
-raw_mode_aggregation_id: 0
-late_data_policy: Drop
-wall_clock_grace_period_ms: 7000
-"#,
-        )
-        .expect("legacy config should deserialize");
-        assert_eq!(config.wall_clock_idle_grace_period_ms, 7_000);
-        assert_eq!(config.wall_clock_max_open_grace_period_ms, 5_000);
-    }
-}
diff --git a/data_plane/src/precompute_engine/engine.rs b/data_plane/src/precompute_engine/engine.rs
deleted file mode 100644
index b3b1af86f..000000000
--- a/data_plane/src/precompute_engine/engine.rs
+++ /dev/null
@@ -1,187 +0,0 @@
-use crate::precompute_engine::config::PrecomputeEngineConfig;
-use crate::precompute_engine::ingest_handler::IngestState;
-use crate::precompute_engine::output_sink::OutputSink;
-use crate::precompute_engine::series_router::{SeriesRouter, WorkerMessage};
-use crate::precompute_engine::worker::{Worker, WorkerRuntimeConfig};
-use crate::storage_engines::types::InstalledPrecomputePlanHandle;
-use std::sync::atomic::{AtomicI64, AtomicUsize};
-use std::sync::Arc;
-use tokio::sync::mpsc;
-use tracing::{info, warn};
-
-/// Shared diagnostic counters readable from outside the engine.
-pub struct PrecomputeWorkerDiagnostics {
-    pub worker_group_counts: Vec<Arc<AtomicUsize>>,
-    pub worker_watermarks: Vec<Arc<AtomicI64>>,
-}
-
-/// The top-level precompute engine orchestrator.
-///
-/// Creates worker threads and the series router. The ingest state
-/// (router + hot-reload handle) is built eagerly in `new()` so that
-/// ingest sources (currently OTLP) can hold a handle and push data
-/// into the same worker pool. OTLP ingestion and the backend-local Remote Write
-/// profile both use the installed materialization view.
-pub struct PrecomputeEngine {
-    config: PrecomputeEngineConfig,
-    output_sink: Arc<dyn OutputSink>,
-    diagnostics: Arc<PrecomputeWorkerDiagnostics>,
-    ingest_state: Arc<IngestState>,
-    hot_reload_config: InstalledPrecomputePlanHandle,
-    /// Worker receivers, one per worker. Taken by `run()` when spawning workers.
-    receivers: Vec<mpsc::Receiver<WorkerMessage>>,
-}
-
-impl PrecomputeEngine {
-    pub fn new(
-        config: PrecomputeEngineConfig,
-        hot_reload_config: InstalledPrecomputePlanHandle,
-        output_sink: Arc<dyn OutputSink>,
-        series_resolver: Arc<crate::drivers::ingest::series_resolver::SeriesIdResolver>,
-        summary_store: Arc<crate::storage_engines::sketch_db::index::SketchStore>,
-    ) -> Self {
-        let worker_group_counts = (0..config.num_workers)
-            .map(|_| Arc::new(AtomicUsize::new(0)))
-            .collect();
-        let worker_watermarks = (0..config.num_workers)
-            .map(|_| Arc::new(AtomicI64::new(i64::MIN)))
-            .collect();
-        let diagnostics = Arc::new(PrecomputeWorkerDiagnostics {
-            worker_group_counts,
-            worker_watermarks,
-        });
-
-        // Build MPSC channels for each worker up front.
-        let num_workers = config.num_workers;
-        let channel_size = config.channel_buffer_size;
-        let mut senders = Vec::with_capacity(num_workers);
-        let mut receivers = Vec::with_capacity(num_workers);
-        for _ in 0..num_workers {
-            let (tx, rx) = mpsc::channel::<WorkerMessage>(channel_size);
-            senders.push(tx);
-            receivers.push(rx);
-        }
-
-        // Build the router that owns the senders; it will be shared via IngestState.
-        let router = SeriesRouter::new(senders).with_plan(hot_reload_config.clone());
-
-        // Snapshot the hot-reload configuration on each ingest batch so policy
-        // changes are visible immediately. Sid lifecycle reconciliation uses
-        // the same snapshot as ingestion.
-        let ingest_state = Arc::new(IngestState {
-            router,
-            samples_ingested: std::sync::atomic::AtomicU64::new(0),
-            samples_blocked_by_schema_barrier: std::sync::atomic::AtomicU64::new(0),
-            hot_reload_config: hot_reload_config.clone(),
-            pass_raw_samples: config.pass_raw_samples,
-            sketch_snapshots: dashmap::DashMap::new(),
-            series_resolver,
-            summary_store,
-            observability: crate::precompute_engine::ingest_handler::IngestObservability::new(),
-        });
-
-        Self {
-            config,
-            output_sink,
-            diagnostics,
-            ingest_state,
-            hot_reload_config,
-            receivers,
-        }
-    }
-
-    /// Get a handle to worker diagnostics, readable even after `run()` starts.
-    pub fn diagnostics(&self) -> Arc<PrecomputeWorkerDiagnostics> {
-        self.diagnostics.clone()
-    }
-
-    /// Get a clonable handle to the shared ingest state. Other ingest sources
-    /// (OTLP, Kafka, etc.) call this before `run()` to push into the same
-    /// worker pool.
-    pub fn ingest_state(&self) -> Arc<IngestState> {
-        self.ingest_state.clone()
-    }
-
-    /// Start the precompute engine. This spawns worker tasks and the
-    /// periodic flush timer, then blocks until shutdown. Protocol receivers
-    /// submit through the shared `IngestState` returned by `ingest_state()`.
-    pub async fn run(mut self) -> Result<(), Box<dyn std::error::Error + Send + Sync>> {
-        let num_workers = self.config.num_workers;
-        // Take ownership of receivers (they can only be used once).
-        let receivers = std::mem::take(&mut self.receivers);
-
-        // Spawn workers. Each worker holds a clone of the hot-reload
-        // handle and reads config directly from ArcSwap — no
-        // ConfigReload messages needed.
-        let mut worker_handles = Vec::with_capacity(num_workers);
-        for (id, rx) in receivers.into_iter().enumerate() {
-            let output_sink: Arc<dyn crate::precompute_engine::output_sink::OutputSink> = Arc::new(
-                crate::precompute_engine::maintenance_runtime::PrecomputeDagSink::new(
-                    Arc::clone(&self.output_sink),
-                    self.hot_reload_config.clone(),
-                ),
-            );
-
-            let mut worker = Worker::new(
-                id,
-                rx,
-                output_sink.clone(),
-                self.hot_reload_config.clone(),
-                WorkerRuntimeConfig {
-                    max_buffer_per_series: self.config.max_buffer_per_series,
-                    allowed_lateness_ms: self.config.allowed_lateness_ms,
-                    pass_raw_samples: self.config.pass_raw_samples,
-                    raw_mode_aggregation_id: self.config.raw_mode_aggregation_id,
-                    late_data_policy: self.config.late_data_policy,
-                    wall_clock_idle_grace_period_ms: self.config.wall_clock_idle_grace_period_ms,
-                    wall_clock_max_open_grace_period_ms: self
-                        .config
-                        .wall_clock_max_open_grace_period_ms,
-                },
-                self.diagnostics.worker_group_counts[id].clone(),
-                self.diagnostics.worker_watermarks[id].clone(),
-            );
-            worker.set_maintenance_storage(
-                Arc::clone(&self.ingest_state.summary_store),
-                Arc::clone(&self.ingest_state.series_resolver),
-            );
-            worker.set_erp_observer(self.ingest_state.router.erp_observer());
-            let handle = tokio::spawn(async move {
-                worker.run().await;
-            });
-            worker_handles.push(handle);
-        }
-
-        info!("PrecomputeEngine started with {} workers", num_workers);
-
-        let ingest_state = self.ingest_state.clone();
-
-        // Start flush timer — pure flush, no config polling.
-        let flush_state = ingest_state.clone();
-        let flush_interval_ms = self.config.flush_interval_ms;
-        let flush_task = tokio::spawn(async move {
-            let mut interval =
-                tokio::time::interval(tokio::time::Duration::from_millis(flush_interval_ms));
-            loop {
-                interval.tick().await;
-                if let Err(e) = flush_state.router.broadcast_flush().await {
-                    warn!("Flush broadcast error: {}", e);
-                    break;
-                }
-            }
-        });
-
-        // Wait for workers to finish (this only happens on shutdown).
-        let mut worker_error = None;
-        for handle in worker_handles {
-            if let Err(error) = handle.await {
-                worker_error = Some(error);
-            }
-        }
-        flush_task.abort();
-        if let Some(error) = worker_error {
-            return Err(Box::new(error));
-        }
-        Ok(())
-    }
-}
diff --git a/data_plane/src/precompute_engine/erp_observer.rs b/data_plane/src/precompute_engine/erp_observer.rs
deleted file mode 100644
index e97045fe5..000000000
--- a/data_plane/src/precompute_engine/erp_observer.rs
+++ /dev/null
@@ -1,361 +0,0 @@
-//! Bounded observations of actual materialization inputs, published only after
-//! an explicit finite-source completion barrier. No worker timestamp is a seal.
-use asap_types::erp_observation::*;
-use asap_types::sds::*;
-use std::collections::BTreeMap;
-use std::sync::{Arc, Mutex};
-
-const MAX_POPULATIONS: usize = 128;
-const MAX_KEYS: usize = 65_536;
-const MAX_POPULATION_METADATA_BYTES: usize = 1_048_576;
-
-struct Population {
-    coordinates: SummaryInstanceCoordinates,
-    semantics: ErpObservationInputSemantics,
-    source: String,
-    sketch: String,
-    implementation: String,
-    observer: BoundedFrequencyObserver<u64>,
-}
-#[derive(Default)]
-struct Observations {
-    generation: Option<CatalogGeneration>,
-    populations: BTreeMap<SummaryInstanceId, Population>,
-    extent: BTreeMap<StoredOutputId, (i64, i64)>,
-    total_keys: usize,
-    metadata_bytes: usize,
-    invalid: Option<String>,
-}
-
-pub struct RuntimeErpObserver {
-    endpoint: String,
-    observations: Mutex<Observations>,
-}
-impl RuntimeErpObserver {
-    pub fn new(endpoint: String, generation: CatalogGeneration) -> Arc<Self> {
-        Arc::new(Self {
-            endpoint,
-            observations: Mutex::new(Observations {
-                generation: Some(generation),
-                ..Default::default()
-            }),
-        })
-    }
-    /// Only the accepted catalog activation path may reset an observation epoch.
-    pub(crate) fn install_generation(&self, generation: CatalogGeneration) {
-        let mut state = self.observations.lock().unwrap();
-        if state.generation.as_ref() != Some(&generation) {
-            *state = Observations {
-                generation: Some(generation),
-                ..Default::default()
-            };
-        }
-    }
-
-    pub fn observe(
-        &self,
-        generation: &CatalogGeneration,
-        coordinates: SummaryInstanceCoordinates,
-        config: &asap_types::PrecomputeMaterialization,
-        timestamp_ms: i64,
-        value: f64,
-    ) {
-        use asap_types::{AggregationType, SampleUpdateRule};
-        let (semantics, sketch, implementation) = match config.aggregation_type {
-            AggregationType::HLL => (
-                ErpObservationInputSemantics::ScalarSampleValue,
-                "hll",
-                "asap-sketchlib-hll-regular-v1",
-            ),
-            AggregationType::UnivMon => (
-                ErpObservationInputSemantics::UnitSampleFrequency,
-                "univmon",
-                "asap-sketchlib-univmon-standard-v1",
-            ),
-            _ => return,
-        };
-        let mut state = self.observations.lock().unwrap();
-        // Catalog installation establishes identity. Delayed old worker input
-        // cannot reset the current generation or create a partial replacement fit.
-        if state.generation.as_ref() != Some(generation) {
-            return;
-        }
-        if state.invalid.is_some() {
-            return;
-        }
-        if !value.is_finite()
-            || !matches!(
-                config.sample_update_rule(),
-                SampleUpdateRule::Value { scale: 1.0 }
-            )
-        {
-            state.invalid = Some("unsupported non-finite or transformed summary input".into());
-            for population in state.populations.values_mut() {
-                population.observer = BoundedFrequencyObserver::new(1, 64).unwrap();
-            }
-            return;
-        }
-        let extent = state
-            .extent
-            .entry(coordinates.stored_output_id)
-            .or_insert((timestamp_ms, timestamp_ms));
-        extent.0 = extent.0.min(timestamp_ms);
-        extent.1 = extent.1.max(timestamp_ms);
-        let Ok(id) = coordinates.instance_id() else {
-            return;
-        };
-        if !state.populations.contains_key(&id) && state.populations.len() >= MAX_POPULATIONS {
-            state.invalid = Some("ERP population observation budget exceeded".into());
-            for population in state.populations.values_mut() {
-                population.observer = BoundedFrequencyObserver::new(1, 64).unwrap();
-            }
-            return;
-        }
-        if !state.populations.contains_key(&id) {
-            let bytes = coordinates
-                .group_values
-                .iter()
-                .try_fold(0usize, |total, (key, value)| {
-                    total
-                        .checked_add(key.len())
-                        .and_then(|n| n.checked_add(value.len()))
-                });
-            let total = bytes.and_then(|bytes| state.metadata_bytes.checked_add(bytes));
-            if total.is_none_or(|bytes| bytes > MAX_POPULATION_METADATA_BYTES) {
-                state.invalid = Some("ERP population metadata budget exceeded".into());
-                for population in state.populations.values_mut() {
-                    population.observer = BoundedFrequencyObserver::new(1, 64).unwrap();
-                }
-                return;
-            }
-            state.metadata_bytes = total.unwrap();
-        }
-        let population = state.populations.entry(id).or_insert_with(|| Population {
-            source: format!(
-                "summary-definition:{}",
-                coordinates.stored_output_id.as_u64()
-            ),
-            coordinates,
-            semantics,
-            sketch: sketch.into(),
-            implementation: implementation.into(),
-            observer: BoundedFrequencyObserver::new(MAX_KEYS, 64).unwrap(),
-        });
-        let before = population.observer.observed_key_count();
-        // Canonical fixed-width numeric identity; no raw sample or arbitrary label copy.
-        let key = if value == 0.0 { 0 } else { value.to_bits() };
-        let range = population.coordinates.time_range;
-        let duration = range.end_ms.saturating_sub(range.start_ms).max(1);
-        let offset = timestamp_ms
-            .saturating_sub(range.start_ms)
-            .clamp(0, duration);
-        let interval = ((offset as u128 * 64) / duration as u128).min(63) as usize;
-        let result = population.observer.observe(key, interval);
-        let added = population
-            .observer
-            .observed_key_count()
-            .saturating_sub(before);
-        state.total_keys = state.total_keys.saturating_add(added);
-        if result.is_err() || state.total_keys > MAX_KEYS {
-            state.invalid = Some("ERP key observation budget exceeded".into());
-            for population in state.populations.values_mut() {
-                population.observer = BoundedFrequencyObserver::new(1, 64).unwrap();
-            }
-        }
-    }
-
-    pub async fn publish_finite(
-        &self,
-        generation: &CatalogGeneration,
-        now_ms: u64,
-    ) -> Result<(), String> {
-        use control_plane::runtime_samples::feedback::{
-            runtime_samples_client::RuntimeSamplesClient, PushBatch, RuntimeRecord,
-        };
-        let records = {
-            let state = self.observations.lock().unwrap();
-            if state.generation.as_ref() != Some(generation) {
-                return Ok(());
-            }
-            let mut groups: BTreeMap<
-                (StoredOutputId, i64, i64),
-                (
-                    String,
-                    String,
-                    String,
-                    ErpPopulationObservations<EmpiricalFrequencyObservation>,
-                ),
-            > = BTreeMap::new();
-            for (id, population) in &state.populations {
-                let c = &population.coordinates;
-                let Some((first, last)) = state.extent.get(&c.stored_output_id) else {
-                    continue;
-                };
-                if c.time_range.start_ms < *first || c.time_range.end_ms > *last {
-                    continue;
-                }
-                let key = (
-                    c.stored_output_id,
-                    c.time_range.start_ms,
-                    c.time_range.end_ms,
-                );
-                let entry = groups.entry(key).or_insert_with(|| {
-                    (
-                        population.source.clone(),
-                        population.sketch.clone(),
-                        population.implementation.clone(),
-                        ErpPopulationObservations {
-                            schema_version: 1,
-                            catalog_generation: generation.clone(),
-                            stored_output_id: c.stored_output_id,
-                            observed_at_unix_ms: now_ms,
-                            window_start_ms: c.time_range.start_ms,
-                            window_end_ms: c.time_range.end_ms,
-                            input_semantics: population.semantics,
-                            invalid_reason: state.invalid.clone(),
-                            populations: Vec::new(),
-                        },
-                    )
-                });
-                match population.observer.snapshot() {
-                    Some(shape) => entry.3.populations.push(ErpPopulationObservation {
-                        population_id: id.clone(),
-                        shape,
-                    }),
-                    None => entry.3.invalid_reason = Some("ERP population fit unavailable".into()),
-                }
-            }
-            groups
-                .into_values()
-                .map(|(source, sketch, impl_name, mut envelope)| {
-                    if envelope.invalid_reason.is_some() {
-                        envelope.populations.clear();
-                    }
-                    RuntimeRecord {
-                        source,
-                        sketch,
-                        impl_name,
-                        schema_version: 1,
-                        payload_json: serde_json::json!({"erp_population_observations":envelope})
-                            .to_string(),
-                    }
-                })
-                .collect::<Vec<_>>()
-        };
-        if records.is_empty() {
-            return Ok(());
-        }
-        let expected = records.len() as u64;
-        let mut client = RuntimeSamplesClient::connect(self.endpoint.clone())
-            .await
-            .map_err(|e| e.to_string())?;
-        let ack = client
-            .push(PushBatch { records })
-            .await
-            .map_err(|e| e.to_string())?
-            .into_inner();
-        if ack.accepted != expected {
-            return Err("control plane rejected ERP observation records".into());
-        }
-        Ok(())
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    fn fixture() -> (CatalogGeneration, asap_types::PrecomputeMaterialization) {
-        let config = asap_types::PrecomputeMaterialization::new(
-            asap_types::AggregationType::HLL,
-            String::new(),
-            Default::default(),
-            asap_types::KeyByLabelNames::new(vec![]),
-            asap_types::KeyByLabelNames::new(vec![]),
-            asap_types::KeyByLabelNames::new(vec![]),
-            String::new(),
-            60,
-            60,
-            asap_types::enums::WindowKind::Tumbling,
-            String::new(),
-            "m".into(),
-            None,
-            None,
-            None,
-        );
-        (
-            CatalogGeneration {
-                schema_version: 1,
-                plan_id: 1,
-                plan_version: 1,
-                snapshot_sha256: "a".repeat(64),
-            },
-            config,
-        )
-    }
-    fn coordinate(group: usize) -> SummaryInstanceCoordinates {
-        SummaryInstanceCoordinates {
-            stored_output_id: asap_types::PolicyFingerprint(1).into(),
-            time_range: HalfOpenTimeRange {
-                start_ms: 0,
-                end_ms: 60_000,
-            },
-            group_values: BTreeMap::from([("job".into(), group.to_string())]),
-        }
-    }
-    #[test]
-    fn observations_keep_partitions_separate_and_invalidate_on_overflow() {
-        let (generation, config) = fixture();
-        let observer = RuntimeErpObserver::new("http://127.0.0.1:1".into(), generation.clone());
-        observer.observe(&generation, coordinate(0), &config, 1, 1.0);
-        observer.observe(&generation, coordinate(0), &config, 2, 1.0);
-        observer.observe(&generation, coordinate(1), &config, 3, 2.0);
-        {
-            let state = observer.observations.lock().unwrap();
-            assert_eq!(state.populations.len(), 2);
-            assert_eq!(state.total_keys, 2);
-            assert!(state
-                .populations
-                .values()
-                .all(|p| p.observer.observed_key_count() == 1));
-        }
-        for group in 2..=MAX_POPULATIONS {
-            observer.observe(&generation, coordinate(group), &config, 4, 3.0);
-        }
-        let state = observer.observations.lock().unwrap();
-        assert!(state.invalid.is_some());
-        assert!(state
-            .populations
-            .values()
-            .all(|p| p.observer.snapshot().is_none()));
-    }
-    #[test]
-    fn delayed_generation_cannot_reset_current_population_counts() {
-        let (generation, config) = fixture();
-        let observer = RuntimeErpObserver::new("http://127.0.0.1:1".into(), generation.clone());
-        let mut previous = generation.clone();
-        previous.plan_version = 0;
-        observer.install_generation(previous.clone());
-        observer.observe(&previous, coordinate(0), &config, 0, 77.0);
-        observer.install_generation(generation.clone());
-        observer.observe(&generation, coordinate(0), &config, 1, 1.0);
-        let mut stale = generation.clone();
-        stale.plan_version = 0;
-        observer.observe(&stale, coordinate(0), &config, 2, 99.0);
-        observer.observe(&generation, coordinate(0), &config, 3, 2.0);
-        let state = observer.observations.lock().unwrap();
-        assert_eq!(state.total_keys, 2);
-        assert_eq!(state.generation.as_ref(), Some(&generation));
-        assert_eq!(
-            state
-                .populations
-                .values()
-                .next()
-                .unwrap()
-                .observer
-                .snapshot()
-                .unwrap()
-                .sorted_counts,
-            vec![1, 1]
-        );
-    }
-}
diff --git a/data_plane/src/precompute_engine/frame_lineage.rs b/data_plane/src/precompute_engine/frame_lineage.rs
deleted file mode 100644
index da79aad47..000000000
--- a/data_plane/src/precompute_engine/frame_lineage.rs
+++ /dev/null
@@ -1,366 +0,0 @@
-//! Receiver-side ordering and checkpoint validation for summary frames.
-//!
-//! [`TransmissionPlan::validate_frame`] validates a frame's static shape
-//! against the active physical plan. This module owns the stateful half of
-//! the wire contract: deltas are only safe to apply after an observed full
-//! checkpoint, in sequence, within the exact producer/window lineage.
-
-use asap_types::producer_plan::{SummaryFrameIdentity, SummaryFrameKind};
-use dashmap::mapref::entry::Entry;
-use thiserror::Error;
-
-/// The result of accepting a frame into its lineage.
-#[derive(Debug, Clone, Copy, PartialEq, Eq)]
-pub enum FrameLineageDecision {
-    /// This frame advances (or re-establishes) the lineage and may be applied.
-    Apply,
-    /// This exact frame was already accepted. Callers must acknowledge it but
-    /// must not apply or persist it a second time.
-    Duplicate,
-}
-
-/// Stateful frame-contract failures. Every failure is recoverable by the
-/// producer emitting a new full checkpoint for the same scoped lineage.
-#[derive(Debug, Clone, PartialEq, Eq, Error)]
-pub enum FrameLineageError {
-    #[error("full frame is missing its checkpoint id")]
-    MissingCheckpoint,
-    #[error("delta frame is missing its base checkpoint id")]
-    MissingBaseCheckpoint,
-    #[error("delta has no established full checkpoint")]
-    MissingBase,
-    #[error("delta base checkpoint does not match the established checkpoint")]
-    BaseCheckpointMismatch,
-    #[error("frame sequence is stale or conflicts with an accepted frame")]
-    StaleOrConflictingSequence,
-    #[error("delta sequence gap: expected {expected}, received {received}")]
-    SequenceGap { expected: u64, received: u64 },
-    #[error("lineage is incomplete and requires a new full checkpoint")]
-    Incomplete,
-}
-
-/// Exact scope mandated by `SequenceScope::MaterializationSeriesProducerEpoch`.
-/// `producer_id` is included because epochs are only unique within a producer.
-#[derive(Debug, Clone, PartialEq, Eq, Hash)]
-struct FrameLineageKey {
-    plan_id: u64,
-    plan_version: u64,
-    materialization: asap_types::sds::StoredOutputId,
-    series_identity: String,
-    producer_id: String,
-    producer_epoch: String,
-}
-
-impl From<&SummaryFrameIdentity> for FrameLineageKey {
-    fn from(frame: &SummaryFrameIdentity) -> Self {
-        Self {
-            plan_id: frame.plan_id,
-            plan_version: frame.plan_version,
-            materialization: frame.materialization,
-            series_identity: frame.series_identity.clone(),
-            producer_id: frame.producer_id.clone(),
-            producer_epoch: frame.producer_epoch.clone(),
-        }
-    }
-}
-
-#[derive(Debug, Clone)]
-struct FrameLineageState {
-    checkpoint_id: Option<String>,
-    last_frame: SummaryFrameIdentity,
-    incomplete: bool,
-}
-
-/// Concurrency-safe receiver state for frame checkpoint/sequence lineages.
-///
-/// The occupied DashMap entry is held across each transition. Acceptance is
-/// therefore linearizable for one lineage (two concurrent copies of sequence
-/// N+1 cannot both be applied) without serializing unrelated producers.
-#[derive(Debug, Default)]
-pub struct FrameLineageTracker {
-    lineages: dashmap::DashMap<FrameLineageKey, FrameLineageState>,
-    batch_gate: std::sync::Mutex<()>,
-}
-
-impl FrameLineageTracker {
-    /// Serialize validation and application of one OTLP frame batch. The
-    /// caller releases this guard after every frame has reached the store.
-    pub fn lock_batch(&self) -> std::sync::MutexGuard<'_, ()> {
-        self.batch_gate.lock().expect("frame lineage batch lock")
-    }
-
-    /// Dry-run a complete batch against a snapshot of committed lineage.
-    /// This detects duplicates, gaps and checkpoint mismatches before the
-    /// caller applies the first payload in the request.
-    pub fn validate_batch<'a>(
-        &self,
-        frames: impl IntoIterator<Item = &'a SummaryFrameIdentity>,
-    ) -> Result<(), FrameLineageError> {
-        let scratch = FrameLineageTracker::default();
-        for entry in &self.lineages {
-            scratch
-                .lineages
-                .insert(entry.key().clone(), entry.value().clone());
-        }
-        for frame in frames {
-            scratch.observe(frame)?;
-        }
-        Ok(())
-    }
-
-    /// Validate and atomically record one frame.
-    ///
-    /// Full frames establish (or replace) the checkpoint and clear an
-    /// incomplete lineage. Delta frames must reference that checkpoint and
-    /// advance the last accepted sequence by exactly one. An exact replay of
-    /// the last frame is idempotently classified as [`Duplicate`].
-    pub fn observe(
-        &self,
-        frame: &SummaryFrameIdentity,
-    ) -> Result<FrameLineageDecision, FrameLineageError> {
-        match frame.kind {
-            SummaryFrameKind::Full if frame.checkpoint_id.is_none() => {
-                return Err(FrameLineageError::MissingCheckpoint);
-            }
-            SummaryFrameKind::Delta if frame.base_checkpoint_id.is_none() => {
-                return Err(FrameLineageError::MissingBaseCheckpoint);
-            }
-            _ => {}
-        }
-        let key = FrameLineageKey::from(frame);
-        match self.lineages.entry(key) {
-            Entry::Vacant(entry) => match frame.kind {
-                SummaryFrameKind::Full => {
-                    entry.insert(FrameLineageState {
-                        checkpoint_id: frame.checkpoint_id.clone(),
-                        last_frame: frame.clone(),
-                        incomplete: false,
-                    });
-                    Ok(FrameLineageDecision::Apply)
-                }
-                // A rejected frame never advances receiver state. In
-                // particular, a producer may recover this exact sequence by
-                // retransmitting it as a full checkpoint.
-                SummaryFrameKind::Delta => Err(FrameLineageError::MissingBase),
-            },
-            Entry::Occupied(mut entry) => {
-                let state = entry.get_mut();
-                if state.last_frame == *frame {
-                    return Ok(FrameLineageDecision::Duplicate);
-                }
-
-                match frame.kind {
-                    // A full frame is the explicit recovery boundary. It may
-                    // jump over missing delta sequences and resets the base.
-                    SummaryFrameKind::Full => {
-                        if frame.sequence <= state.last_frame.sequence {
-                            return Err(FrameLineageError::StaleOrConflictingSequence);
-                        }
-                        state.checkpoint_id = frame.checkpoint_id.clone();
-                        state.last_frame = frame.clone();
-                        state.incomplete = false;
-                        Ok(FrameLineageDecision::Apply)
-                    }
-                    SummaryFrameKind::Delta => {
-                        if state.incomplete {
-                            return Err(FrameLineageError::Incomplete);
-                        }
-                        if frame.base_checkpoint_id.as_ref() != state.checkpoint_id.as_ref() {
-                            return Err(FrameLineageError::BaseCheckpointMismatch);
-                        }
-                        if frame.sequence <= state.last_frame.sequence {
-                            return Err(FrameLineageError::StaleOrConflictingSequence);
-                        }
-                        let expected = state.last_frame.sequence.saturating_add(1);
-                        if frame.sequence != expected {
-                            state.incomplete = true;
-                            return Err(FrameLineageError::SequenceGap {
-                                expected,
-                                received: frame.sequence,
-                            });
-                        }
-                        state.last_frame = frame.clone();
-                        Ok(FrameLineageDecision::Apply)
-                    }
-                }
-            }
-        }
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use asap_types::precompute_plan::StateEncoding;
-
-    fn frame(sequence: u64, kind: SummaryFrameKind) -> SummaryFrameIdentity {
-        SummaryFrameIdentity {
-            identity_version: 1,
-            plan_id: 7,
-            plan_version: 3,
-            backend_compat: "asap-query-backend.v1".into(),
-            materialization: asap_types::PolicyFingerprint(41).into(),
-            series_identity: "service=checkout,zone=a".into(),
-            schema_id: "schema-41".into(),
-            producer_id: "edge-a".into(),
-            producer_epoch: "boot-9".into(),
-            window_start_unix_nano: 100,
-            window_end_unix_nano: 200,
-            sequence,
-            kind: kind.clone(),
-            encoding: StateEncoding::SketchlibProtobufV1,
-            checkpoint_id: (kind == SummaryFrameKind::Full).then(|| format!("cp-{sequence}")),
-            base_checkpoint_id: (kind == SummaryFrameKind::Delta).then(|| "cp-1".into()),
-        }
-    }
-
-    #[test]
-    fn full_establishes_base_and_contiguous_delta_advances() {
-        let tracker = FrameLineageTracker::default();
-        assert_eq!(
-            tracker.observe(&frame(1, SummaryFrameKind::Full)),
-            Ok(FrameLineageDecision::Apply)
-        );
-        assert_eq!(
-            tracker.observe(&frame(2, SummaryFrameKind::Delta)),
-            Ok(FrameLineageDecision::Apply)
-        );
-    }
-
-    #[test]
-    fn exact_duplicate_is_idempotently_ignored() {
-        let tracker = FrameLineageTracker::default();
-        let full = frame(1, SummaryFrameKind::Full);
-        let delta = frame(2, SummaryFrameKind::Delta);
-        tracker.observe(&full).unwrap();
-        tracker.observe(&delta).unwrap();
-        assert_eq!(tracker.observe(&delta), Ok(FrameLineageDecision::Duplicate));
-    }
-
-    #[test]
-    fn batch_validation_is_atomic_and_does_not_commit() {
-        let tracker = FrameLineageTracker::default();
-        let full = frame(1, SummaryFrameKind::Full);
-        let delta = frame(2, SummaryFrameKind::Delta);
-        tracker
-            .validate_batch([&full, &delta])
-            .expect("contiguous batch is valid");
-
-        assert_eq!(
-            tracker.observe(&delta),
-            Err(FrameLineageError::MissingBase),
-            "dry-run validation must not expose an un-applied checkpoint"
-        );
-
-        let gap = frame(3, SummaryFrameKind::Delta);
-        assert!(matches!(
-            tracker.validate_batch([&full, &gap]),
-            Err(FrameLineageError::SequenceGap {
-                expected: 2,
-                received: 3
-            })
-        ));
-        assert_eq!(
-            tracker.observe(&full),
-            Ok(FrameLineageDecision::Apply),
-            "a rejected batch must leave committed lineage unchanged"
-        );
-    }
-
-    #[test]
-    fn delta_requires_the_established_checkpoint() {
-        let tracker = FrameLineageTracker::default();
-        assert_eq!(
-            tracker.observe(&frame(1, SummaryFrameKind::Delta)),
-            Err(FrameLineageError::MissingBase)
-        );
-        assert_eq!(
-            tracker.observe(&frame(1, SummaryFrameKind::Full)),
-            Ok(FrameLineageDecision::Apply),
-            "a rejected leading delta must not consume its sequence"
-        );
-
-        let tracker = FrameLineageTracker::default();
-        tracker.observe(&frame(1, SummaryFrameKind::Full)).unwrap();
-        let mut wrong_base = frame(2, SummaryFrameKind::Delta);
-        wrong_base.base_checkpoint_id = Some("some-other-checkpoint".into());
-        assert_eq!(
-            tracker.observe(&wrong_base),
-            Err(FrameLineageError::BaseCheckpointMismatch)
-        );
-    }
-
-    #[test]
-    fn checkpoint_identity_is_required_for_both_frame_kinds() {
-        let tracker = FrameLineageTracker::default();
-        let mut full = frame(1, SummaryFrameKind::Full);
-        full.checkpoint_id = None;
-        assert_eq!(
-            tracker.observe(&full),
-            Err(FrameLineageError::MissingCheckpoint)
-        );
-
-        let mut delta = frame(2, SummaryFrameKind::Delta);
-        delta.base_checkpoint_id = None;
-        assert_eq!(
-            tracker.observe(&delta),
-            Err(FrameLineageError::MissingBaseCheckpoint)
-        );
-    }
-
-    #[test]
-    fn gap_marks_lineage_incomplete_until_next_full() {
-        let tracker = FrameLineageTracker::default();
-        tracker.observe(&frame(1, SummaryFrameKind::Full)).unwrap();
-        assert_eq!(
-            tracker.observe(&frame(3, SummaryFrameKind::Delta)),
-            Err(FrameLineageError::SequenceGap {
-                expected: 2,
-                received: 3
-            })
-        );
-        assert_eq!(
-            tracker.observe(&frame(2, SummaryFrameKind::Delta)),
-            Err(FrameLineageError::Incomplete)
-        );
-
-        let recovery = frame(4, SummaryFrameKind::Full);
-        assert_eq!(tracker.observe(&recovery), Ok(FrameLineageDecision::Apply));
-        let mut next = frame(5, SummaryFrameKind::Delta);
-        next.base_checkpoint_id = recovery.checkpoint_id.clone();
-        assert_eq!(tracker.observe(&next), Ok(FrameLineageDecision::Apply));
-    }
-
-    #[test]
-    fn plan_series_and_epoch_are_independent_but_sequence_crosses_windows() {
-        let tracker = FrameLineageTracker::default();
-        let first = frame(1, SummaryFrameKind::Full);
-        tracker.observe(&first).unwrap();
-
-        let mut next_plan = first.clone();
-        next_plan.plan_version += 1;
-        assert_eq!(tracker.observe(&next_plan), Ok(FrameLineageDecision::Apply));
-
-        let mut next_series = first.clone();
-        next_series.series_identity = "service=checkout,zone=b".into();
-        assert_eq!(
-            tracker.observe(&next_series),
-            Ok(FrameLineageDecision::Apply)
-        );
-
-        let mut next_epoch = first.clone();
-        next_epoch.producer_epoch = "boot-10".into();
-        assert_eq!(
-            tracker.observe(&next_epoch),
-            Ok(FrameLineageDecision::Apply)
-        );
-
-        let mut next_window = frame(2, SummaryFrameKind::Delta);
-        next_window.window_start_unix_nano = 200;
-        next_window.window_end_unix_nano = 300;
-        assert_eq!(
-            tracker.observe(&next_window),
-            Ok(FrameLineageDecision::Apply)
-        );
-    }
-}
diff --git a/data_plane/src/precompute_engine/group_key.rs b/data_plane/src/precompute_engine/group_key.rs
deleted file mode 100644
index dd3c56842..000000000
--- a/data_plane/src/precompute_engine/group_key.rs
+++ /dev/null
@@ -1,142 +0,0 @@
-use std::collections::HashMap;
-use std::sync::{Arc, OnceLock};
-
-use moka::sync::Cache;
-
-use crate::storage_engines::types::KeyByLabelValues;
-
-/// Collision-free, positional identity for a physical GROUP BY partition.
-/// Label names are retained so different DAG projections cannot alias merely
-/// because their values happen to be equal.
-#[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct GroupKey {
-    labels: Arc<[(Arc<str>, Arc<str>)]>,
-    canonical: Arc<[u8]>,
-}
-
-impl GroupKey {
-    pub fn project<'a>(
-        names: impl IntoIterator<Item = &'a str>,
-        labels: &HashMap<String, String>,
-    ) -> Self {
-        Self::new(
-            names
-                .into_iter()
-                .map(|name| (name, labels.get(name).map(String::as_str).unwrap_or(""))),
-        )
-    }
-
-    pub fn new<'a>(pairs: impl IntoIterator<Item = (&'a str, &'a str)>) -> Self {
-        let labels: Arc<[(Arc<str>, Arc<str>)]> = pairs
-            .into_iter()
-            .map(|(name, value)| (Arc::from(name), Arc::from(value)))
-            .collect::<Vec<_>>()
-            .into();
-        let mut canonical = Vec::new();
-        canonical.extend_from_slice(b"ASAPGK\x01");
-        canonical.extend_from_slice(&(labels.len() as u32).to_be_bytes());
-        for (name, value) in labels.iter() {
-            put_component(&mut canonical, name.as_bytes());
-            put_component(&mut canonical, value.as_bytes());
-        }
-        Self {
-            labels,
-            canonical: canonical.into(),
-        }
-    }
-
-    pub fn canonical_bytes(&self) -> &[u8] {
-        &self.canonical
-    }
-
-    pub fn values(&self) -> KeyByLabelValues {
-        KeyByLabelValues::new_with_labels(
-            self.labels
-                .iter()
-                .map(|(_, value)| value.to_string())
-                .collect(),
-        )
-    }
-
-    pub fn as_population_labels(&self) -> std::collections::BTreeMap<String, String> {
-        self.labels
-            .iter()
-            .map(|(name, value)| (name.to_string(), value.to_string()))
-            .collect()
-    }
-}
-
-impl std::fmt::Display for GroupKey {
-    fn fmt(&self, output: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        output.write_str("{")?;
-        for (index, (name, value)) in self.labels.iter().enumerate() {
-            if index != 0 {
-                output.write_str(",")?;
-            }
-            write!(output, "{name}={value:?}")?;
-        }
-        output.write_str("}")
-    }
-}
-
-fn put_component(target: &mut Vec<u8>, value: &[u8]) {
-    target.extend_from_slice(&(value.len() as u32).to_be_bytes());
-    target.extend_from_slice(value);
-}
-
-/// Bounded interner shared by ingress adapters. Repeated DAG consumers with
-/// the same projection carry one immutable key allocation into workers.
-pub fn intern(key: GroupKey) -> Arc<GroupKey> {
-    intern_pairs(
-        key.labels
-            .iter()
-            .map(|(name, value)| (name.as_ref(), value.as_ref())),
-    )
-}
-
-/// Project and intern from borrowed labels. The hot path builds only the
-/// compact lookup bytes on a cache hit; label/name strings are allocated once
-/// when a new high-cardinality group first appears.
-pub fn intern_pairs<'a>(pairs: impl IntoIterator<Item = (&'a str, &'a str)>) -> Arc<GroupKey> {
-    let pairs = pairs.into_iter().collect::<Vec<_>>();
-    let mut encoded = Vec::with_capacity(
-        11 + pairs
-            .iter()
-            .map(|(name, value)| name.len() + value.len() + 8)
-            .sum::<usize>(),
-    );
-    encoded.extend_from_slice(b"ASAPGK\x01");
-    encoded.extend_from_slice(&(pairs.len() as u32).to_be_bytes());
-    for (name, value) in &pairs {
-        put_component(&mut encoded, name.as_bytes());
-        put_component(&mut encoded, value.as_bytes());
-    }
-    static INTERNER: OnceLock<Cache<Vec<u8>, Arc<GroupKey>>> = OnceLock::new();
-    let interner = INTERNER.get_or_init(|| Cache::builder().max_capacity(131_072).build());
-    interner.get_with(encoded, || Arc::new(GroupKey::new(pairs)))
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    #[test]
-    fn delimiters_names_order_and_missing_values_cannot_alias() {
-        let a = GroupKey::new([("x", "a;b"), ("y", "c")]);
-        let b = GroupKey::new([("x", "a"), ("y", "b;c")]);
-        let reordered = GroupKey::new([("y", "c"), ("x", "a;b")]);
-        let other_names = GroupKey::new([("p", "a;b"), ("q", "c")]);
-        let missing = GroupKey::new([("x", ""), ("y", "c")]);
-        for other in [&b, &reordered, &other_names, &missing] {
-            assert_ne!(a.canonical_bytes(), other.canonical_bytes());
-        }
-        assert_eq!(a.values().labels, vec!["a;b", "c"]);
-    }
-
-    #[test]
-    fn interner_reuses_equal_projection() {
-        let left = intern(GroupKey::new([("region", "us-east"), ("job", "api")]));
-        let right = intern(GroupKey::new([("region", "us-east"), ("job", "api")]));
-        assert!(Arc::ptr_eq(&left, &right));
-    }
-}
diff --git a/data_plane/src/precompute_engine/ingest_handler.rs b/data_plane/src/precompute_engine/ingest_handler.rs
deleted file mode 100644
index 400797a7a..000000000
--- a/data_plane/src/precompute_engine/ingest_handler.rs
+++ /dev/null
@@ -1,538 +0,0 @@
-use crate::precompute_engine::series_router::SeriesRouter;
-use crate::precompute_engine::worker::parse_labels_from_series_key;
-use crate::storage_engines::types::InstalledPrecomputePlanHandle;
-use asap_types::aggregation_config::PrecomputeMaterialization;
-use std::sync::atomic::{AtomicU64, Ordering};
-use std::sync::Arc;
-
-/// CQ-6 — per-reason atomic counters for silently-dropped ingest
-/// samples, plus the §RES-1 sketch-snapshot eviction configuration.
-///
-/// Grouped into a single `Default`-constructible sub-struct so the
-/// counters/config can be added to [`IngestState`] without changing the
-/// (explicit, field-by-field) struct-literal call sites that construct
-/// it — they only need a single `observability: IngestObservability::new()`
-/// (or `..Default` style) line.
-///
-/// Counters are `AtomicU64` (relaxed ordering — these are monotonic
-/// observability counters, not synchronization primitives), incremented
-/// at the corresponding drop sites in the OTLP ingest path
-/// (`route_modified_otlp_sketches_to_precompute`) and the output-sink
-/// policy-miss path. Surfaced wherever `IngestState` stats reach
-/// `/metrics`.
-#[derive(Debug)]
-pub struct IngestObservability {
-    /// Delta frame arrived but the additive family could not be
-    /// reconstructed from a bare delta (DD/KLL with no cached base).
-    pub dropped_no_base: AtomicU64,
-    /// A full / delta frame failed to decode (or a delta failed to
-    /// apply) and was dropped.
-    pub dropped_decode_fail: AtomicU64,
-    /// A decoded sketch matched no `PrecomputeMaterialization` in the running
-    /// streaming config (legacy routing-side bucketing miss).
-    pub dropped_unconfigured: AtomicU64,
-    /// The output sink could not resolve a `policy_fp` to an
-    /// `PrecomputeMaterialization` (registry miss) and skipped the write.
-    pub dropped_policy_miss: AtomicU64,
-    /// RES-1 — max number of distinct tumbling windows a per-series
-    /// snapshot base may lag behind the newest observed `window_start`
-    /// before it is swept out of `sketch_snapshots`. Stored as a
-    /// nanosecond span (windows are keyed by `start_time_unix_nano`),
-    /// so "N windows" is expressed as `N * window_span_nanos`. A value
-    /// of 0 disables age-based eviction.
-    pub snapshot_max_window_lag_nanos: AtomicU64,
-    /// RES-1 — the newest `window_start` (nanos) observed across all
-    /// series, used as the eviction sweep's reference point. Advanced
-    /// monotonically on each cached base insert.
-    pub snapshot_newest_window_start: AtomicU64,
-    /// Stateful checkpoint and sequence validation for physical-plan summary
-    /// frames. Kept with the ingest-wide shared state so concurrent OTLP
-    /// requests observe one linearizable lineage per producer/window.
-    pub frame_lineage: super::frame_lineage::FrameLineageTracker,
-}
-
-impl IngestObservability {
-    /// Default eviction lag: keep ~4 windows of per-series base behind
-    /// the newest observed window. Picked to tolerate a couple of late /
-    /// out-of-order windows while still bounding memory for churning
-    /// high-cardinality series. The span is in nanoseconds; the default
-    /// assumes a 60s tumbling window (4 * 60s = 240s), and is
-    /// overridable via the `ASAP_SNAPSHOT_MAX_WINDOW_LAG_SECS` env var.
-    pub const DEFAULT_MAX_WINDOW_LAG_NANOS: u64 = 4 * 60 * 1_000_000_000;
-
-    pub fn new() -> Self {
-        let lag = std::env::var("ASAP_SNAPSHOT_MAX_WINDOW_LAG_SECS")
-            .ok()
-            .and_then(|s| s.parse::<u64>().ok())
-            .map(|secs| secs.saturating_mul(1_000_000_000))
-            .unwrap_or(Self::DEFAULT_MAX_WINDOW_LAG_NANOS);
-        Self {
-            dropped_no_base: AtomicU64::new(0),
-            dropped_decode_fail: AtomicU64::new(0),
-            dropped_unconfigured: AtomicU64::new(0),
-            dropped_policy_miss: AtomicU64::new(0),
-            snapshot_max_window_lag_nanos: AtomicU64::new(lag),
-            snapshot_newest_window_start: AtomicU64::new(0),
-            frame_lineage: super::frame_lineage::FrameLineageTracker::default(),
-        }
-    }
-}
-
-impl Default for IngestObservability {
-    fn default() -> Self {
-        Self::new()
-    }
-}
-
-/// One per-series entry in the delta-reconstitution snapshot cache.
-///
-/// Carries the reconstructed accumulator base **plus** the start of the
-/// tumbling window that base belongs to. The ingest path uses
-/// `window_start` to drive per-window base rotation: when a delta frame
-/// arrives whose data-point window start differs from the cached
-/// `window_start`, the cached `core` is reset to empty before the new
-/// window's delta is applied, so the reconstructed state reflects that
-/// window only rather than an all-time accumulation across windows (see
-/// `docs/delta-baseline-contract.md` §3).
-pub struct SnapshotCacheEntry {
-    /// Reconstructed per-series accumulator base.
-    pub core: Box<dyn crate::storage_engines::types::AggregateCore>,
-    /// `start_time_unix_nano` of the window this base was built for.
-    /// Full frames set it from their own data point; delta frames
-    /// compare against it to detect a window boundary.
-    pub window_start: u64,
-}
-
-/// Shared state for the ingest path.
-///
-/// Holds the worker router plus the aggregation configs needed for group-key
-/// extraction. A single instance is shared by every ingest source (currently
-/// the OTLP receiver) so they all push into the same worker pool.
-pub struct IngestState {
-    pub router: SeriesRouter,
-    pub samples_ingested: std::sync::atomic::AtomicU64,
-    /// §6.3 observability counter — per-sample-per-agg-config drops
-    /// caused by a non-Active schema for a matching agg. Incremented
-    /// exactly when the barrier fires, so a non-zero reading proves
-    /// the barrier is wired. One sample can contribute more than one
-    /// drop when multiple agg configs match the metric and one (or
-    /// more) of them is retired/expired.
-    pub samples_blocked_by_schema_barrier: std::sync::atomic::AtomicU64,
-    /// Hot-reloadable streaming config. On each ingest batch, the
-    /// router snapshots the latest config to derive agg_configs.
-    /// This replaces the old frozen `Vec<Arc<PrecomputeMaterialization>>`.
-    pub hot_reload_config: InstalledPrecomputePlanHandle,
-    /// When true, skip group-key extraction and pass raw samples through.
-    pub pass_raw_samples: bool,
-    /// Per-series reconstructed sketch bases, keyed by series identity. Full frames
-    /// replace the base; delta frames update it. Window boundaries reset the base.
-    /// DashMap allows independent series to update concurrently.
-    ///
-    /// [`IngestState::note_window_and_sweep`] bounds growth by evicting bases whose
-    /// window start falls behind the newest observed window by the configured lag.
-    pub sketch_snapshots: dashmap::DashMap<String, SnapshotCacheEntry>,
-    /// centralized series_id resolver. Shared across the OTLP
-    /// receive path (sid resolution + `unknown_series_ids` population) and
-    /// the `ResolveSeriesIDs` RPC (eager batch resolution from the agent's
-    /// exporter). Holding it on `IngestState` lets every ingest source
-    /// reach the same idempotent compute-or-mint cache.
-    pub series_resolver: Arc<crate::drivers::ingest::series_resolver::SeriesIdResolver>,
-    /// two-level sketch ASAP tier (instance metadata +
-    /// per-sid columnar state). Populated by the OTLP ingest path on
-    /// every modified-OTLP first-class sketch DataPoint; queried by
-    /// the `ASAPQueryEngine` query path (ASAP-tier hit / ghost / unknown
-    /// classification drives the Phase 6 archive failover).
-    pub summary_store: Arc<crate::storage_engines::sketch_db::index::SketchStore>,
-    /// CQ-6 / RES-1 — per-reason silent-drop counters plus the
-    /// `sketch_snapshots` eviction configuration. Grouped into one
-    /// `Default`-constructible field so the counters can live on
-    /// `IngestState` without churning every struct-literal call site.
-    pub observability: IngestObservability,
-}
-
-impl IngestState {
-    /// Snapshot the current streaming config from the hot-reload
-    /// handle. Called at the start of each ingest batch so new
-    /// configs from a `POST /api/v1/streaming-config` swap are
-    /// visible immediately without restart.
-    ///
-    /// Returns the shared `Arc<InstalledPrecomputePlan>` — no cloning of
-    /// individual PrecomputeMaterialization objects, just an atomic refcount
-    /// increment (~5ns).
-    pub fn config_snapshot(&self) -> Arc<crate::storage_engines::types::InstalledPrecomputePlan> {
-        self.hot_reload_config.snapshot()
-    }
-
-    pub fn active_physical_plan_snapshot(
-        &self,
-    ) -> Option<Arc<crate::storage_engines::types::RuntimePhysicalPlan>> {
-        self.hot_reload_config.active_physical_plan_snapshot()
-    }
-
-    #[deprecated(note = "use active_physical_plan_snapshot")]
-    pub fn physical_plan_snapshot(
-        &self,
-    ) -> Option<Arc<crate::storage_engines::types::RuntimePhysicalPlan>> {
-        self.active_physical_plan_snapshot()
-    }
-
-    /// RES-1 — record that a per-series snapshot base for `window_start`
-    /// was just (re)inserted, then opportunistically sweep stale entries.
-    ///
-    /// Advances the observed `snapshot_newest_window_start` monotonically
-    /// and, when age-based eviction is enabled
-    /// (`snapshot_max_window_lag_nanos != 0`), removes every
-    /// `sketch_snapshots` entry whose `window_start` lags more than the
-    /// configured span behind the newest observed window. This bounds
-    /// memory for churning / high-cardinality series whose keys would
-    /// otherwise accumulate forever (the cache previously had no
-    /// eviction at all).
-    ///
-    /// "Opportunistic" — the sweep runs inline on insert. The DashMap
-    /// `retain` walk is O(n) in the live key count, but it only fires
-    /// when the newest window actually advances (so steady-state inserts
-    /// within one window pay nothing), keeping amortized cost low. A
-    /// future refactor can move this to a periodic background sweep if
-    /// the inline walk shows up in profiles.
-    ///
-    /// Returns the number of entries evicted (0 when eviction is
-    /// disabled or nothing was stale) — used by tests.
-    pub fn note_window_and_sweep(&self, window_start: u64) -> usize {
-        // Monotonically advance the newest-observed window.
-        let mut newest = self
-            .observability
-            .snapshot_newest_window_start
-            .load(Ordering::Relaxed);
-        loop {
-            if window_start <= newest {
-                break;
-            }
-            match self
-                .observability
-                .snapshot_newest_window_start
-                .compare_exchange_weak(newest, window_start, Ordering::Relaxed, Ordering::Relaxed)
-            {
-                Ok(_) => {
-                    newest = window_start;
-                    break;
-                }
-                Err(observed) => newest = observed,
-            }
-        }
-
-        let lag = self
-            .observability
-            .snapshot_max_window_lag_nanos
-            .load(Ordering::Relaxed);
-        if lag == 0 {
-            return 0;
-        }
-        // Evict entries strictly older than (newest - lag). Saturating
-        // sub so an early small `newest` never underflows into a huge
-        // cutoff that would evict everything.
-        let cutoff = newest.saturating_sub(lag);
-        if cutoff == 0 {
-            return 0;
-        }
-        let before = self.sketch_snapshots.len();
-        self.sketch_snapshots
-            .retain(|_key, entry| entry.window_start >= cutoff);
-        before.saturating_sub(self.sketch_snapshots.len())
-    }
-}
-
-impl IngestState {
-    /// Extract the group key for a series key against a given aggregation
-    /// config. Re-exports the module-private helper so that out-of-module
-    /// ingest sources (e.g. OTLP) can reuse it.
-    pub fn extract_group_key_for(
-        series_key: &str,
-        config: &PrecomputeMaterialization,
-    ) -> Arc<crate::precompute_engine::group_key::GroupKey> {
-        extract_group_key(series_key, config)
-    }
-
-    /// PERF-4 — extract the group key directly from a parsed label map,
-    /// avoiding the `format_series_key` → `parse_labels_from_series_key`
-    /// round-trip when the caller already holds the labels (e.g. the OTLP
-    /// modified-sketch path, which carries `dp.attrs` as a
-    /// `HashMap<String, String>`). Produces the identical
-    /// grouping-label-value join (`;`-separated, "" for absent labels) as
-    /// [`Self::extract_group_key_for`] does after the round-trip.
-    pub fn extract_group_key_from_labels(
-        labels: &std::collections::HashMap<String, String>,
-        config: &PrecomputeMaterialization,
-    ) -> Arc<crate::precompute_engine::group_key::GroupKey> {
-        crate::precompute_engine::group_key::intern_pairs(config.grouping_labels.iter().map(
-            |name| {
-                (
-                    name.as_str(),
-                    labels.get(name).map(String::as_str).unwrap_or(""),
-                )
-            },
-        ))
-    }
-}
-
-/// Extract the group key (grouping label values joined by semicolons)
-/// for a given series key and aggregation config.
-fn extract_group_key(
-    series_key: &str,
-    config: &PrecomputeMaterialization,
-) -> Arc<crate::precompute_engine::group_key::GroupKey> {
-    let labels = parse_labels_from_series_key(series_key);
-    crate::precompute_engine::group_key::intern_pairs(config.grouping_labels.iter().map(|name| {
-        (
-            name.as_str(),
-            labels.get(name.as_str()).copied().unwrap_or(""),
-        )
-    }))
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use crate::precompute_engine::series_router::SeriesRouter;
-    use crate::storage_engines::types::InstalledPrecomputePlan;
-    use asap_types::aggregation_config::PrecomputeMaterialization;
-    use asap_types::enums::WindowKind;
-    use asap_types::AggregationType;
-    use asap_types::KeyByLabelNames;
-    use std::sync::Arc;
-    use tokio::sync::mpsc;
-
-    fn make_config(_agg_id: u64, metric: &str) -> PrecomputeMaterialization {
-        // `_agg_id` is unused after PR 5 — identity is content-addressed
-        // via `PolicyFingerprint::from_config`. Kept as a parameter to
-        // avoid churning the call sites below.
-        PrecomputeMaterialization::new(
-            AggregationType::CountMinSketch,
-            String::new(),
-            std::collections::HashMap::new(),
-            KeyByLabelNames::empty(),
-            KeyByLabelNames::empty(),
-            KeyByLabelNames::empty(),
-            String::new(),
-            60,
-            60,
-            WindowKind::Tumbling,
-            String::new(),
-            metric.to_string(),
-            None,
-            None,
-            None,
-        )
-    }
-
-    /// Set up an `IngestState` with one Active agg for `metric` and a
-    /// draining worker channel. The drain task keeps the router
-    /// channel empty so `route_group_batch` never blocks on capacity.
-    async fn setup_state(
-        agg_id: u64,
-        metric: &str,
-    ) -> (Arc<IngestState>, tokio::task::JoinHandle<()>) {
-        let (tx, mut rx) = mpsc::channel(1024);
-        let router = SeriesRouter::new(vec![tx]);
-
-        let mut map = std::collections::HashMap::new();
-        map.insert(agg_id, make_config(agg_id, metric));
-        let streaming = InstalledPrecomputePlan::from_raw_ids(map);
-        let hot_reload =
-            crate::storage_engines::types::InstalledPrecomputePlanHandle::new(streaming.clone());
-
-        let state = Arc::new(IngestState {
-            router,
-            samples_ingested: std::sync::atomic::AtomicU64::new(0),
-            samples_blocked_by_schema_barrier: std::sync::atomic::AtomicU64::new(0),
-            hot_reload_config: hot_reload,
-            pass_raw_samples: false,
-            sketch_snapshots: dashmap::DashMap::new(),
-            series_resolver: Arc::new(
-                crate::drivers::ingest::series_resolver::SeriesIdResolver::new(),
-            ),
-            summary_store: Arc::new(crate::storage_engines::sketch_db::index::SketchStore::new()),
-            observability: IngestObservability::default(),
-        });
-
-        let drain = tokio::spawn(async move { while rx.recv().await.is_some() {} });
-        (state, drain)
-    }
-
-    /// Base frame → delta frame → second delta frame path against
-    /// the per-series sketch snapshot cache. Exercises what the OTLP
-    /// ingest loop does for a DDSketch stream: store on full, apply
-    /// + refresh on delta, verify the cumulative state matches a
-    /// hand-merged sequence of full sketches.
-    #[tokio::test]
-    async fn delta_path_reconstitutes_cumulative_state() {
-        use crate::drivers::ingest::otel::apply_modified_otlp_delta_bytes;
-        use asap_otel_proto::sketchlib::v1::{DdSketchBucketDelta, DdSketchDelta as PbDelta};
-        use asap_physical_operators::summary_kernels::DDSketchAccumulator;
-        use asap_sketchlib::DdSketch;
-        use planner_types::post_asap::SketchAlgorithm;
-        use prost::Message;
-
-        const ENCODING_PROTO_DELTA: i32 = 2;
-
-        let (state, drain) = setup_state(42, "latency_ms").await;
-
-        // Seed the cache with a base DDSketch as if the agent's
-        // first PROTO-encoded frame had landed. Use a distinct key
-        // so we're not racing any earlier tests.
-        let series_key = "__name__=latency_ms,inst=a";
-        let base = DDSketchAccumulator {
-            inner: DdSketch::from_raw(0.01, vec![1, 2, 3], 0),
-            sample_p: 1.0,
-        };
-        state.sketch_snapshots.insert(
-            series_key.to_string(),
-            SnapshotCacheEntry {
-                core: Box::new(base.clone()),
-                window_start: 0,
-            },
-        );
-
-        // First delta adds to bucket 0 and bucket 2. The wire delta now
-        // carries only bucket deltas (the count/sum/min/max scalar fields
-        // were dropped, ProjectASAP/sketchlib-go#243 / asap_sketchlib#57).
-        let d1 = PbDelta {
-            buckets: vec![
-                DdSketchBucketDelta {
-                    index: 0,
-                    d_count: 10,
-                },
-                DdSketchBucketDelta {
-                    index: 2,
-                    d_count: 20,
-                },
-            ],
-        }
-        .encode_to_vec();
-        let mut acc1 = state
-            .sketch_snapshots
-            .get(series_key)
-            .unwrap()
-            .core
-            .clone_boxed_core();
-        apply_modified_otlp_delta_bytes(
-            SketchAlgorithm::DDSketch,
-            ENCODING_PROTO_DELTA,
-            &mut acc1,
-            &d1,
-        )
-        .expect("apply first delta");
-        state.sketch_snapshots.insert(
-            series_key.to_string(),
-            SnapshotCacheEntry {
-                core: acc1.clone_boxed_core(),
-                window_start: 0,
-            },
-        );
-
-        // Second delta — picks up on top of the first, proving the
-        // cache refresh is transitive.
-        let d2 = PbDelta {
-            buckets: vec![DdSketchBucketDelta {
-                index: 1,
-                d_count: 5,
-            }],
-        }
-        .encode_to_vec();
-        let mut acc2 = state
-            .sketch_snapshots
-            .get(series_key)
-            .unwrap()
-            .core
-            .clone_boxed_core();
-        apply_modified_otlp_delta_bytes(
-            SketchAlgorithm::DDSketch,
-            ENCODING_PROTO_DELTA,
-            &mut acc2,
-            &d2,
-        )
-        .expect("apply second delta");
-
-        let final_dd = acc2.as_any().downcast_ref::<DDSketchAccumulator>().unwrap();
-        // Base [1,2,3] + d1 [+10 on 0, +20 on 2] = [11,2,23];
-        // + d2 [+5 on 1] = [11,7,23].
-        assert_eq!(final_dd.inner.store_counts, vec![11, 7, 23]);
-        // `count` recomputed from the merged buckets: 11 + 7 + 23 = 41.
-        // (sum/min/max were dropped from the wire format,
-        // ProjectASAP/sketchlib-go#243 / asap_sketchlib#57.)
-        assert_eq!(final_dd.inner.total_count(), 41);
-
-        drop(state);
-        let _ = drain.await;
-    }
-
-    /// RES-1 — `note_window_and_sweep` evicts per-series snapshot bases
-    /// whose `window_start` lags more than the configured span behind the
-    /// newest observed window, bounding `sketch_snapshots` for churning
-    /// high-cardinality series. A fresh entry in the current window must
-    /// survive; a stale entry from far in the past must be swept.
-    #[tokio::test]
-    async fn stale_snapshot_entry_is_evicted_by_sweep() {
-        use asap_physical_operators::summary_kernels::SumAccumulator;
-
-        let (state, drain) = setup_state(7, "evict_metric").await;
-
-        // Pin a deterministic lag of 100ns so the test doesn't depend on
-        // the env default (240s). Entries older than (newest - 100) go.
-        state
-            .observability
-            .snapshot_max_window_lag_nanos
-            .store(100, std::sync::atomic::Ordering::Relaxed);
-
-        // A stale entry from window_start=10 and a fresh entry from
-        // window_start=1000. Cores are arbitrary — the sweep only reads
-        // `window_start`.
-        state.sketch_snapshots.insert(
-            "stale".to_string(),
-            SnapshotCacheEntry {
-                core: Box::new(SumAccumulator::with_sum(1.0)),
-                window_start: 10,
-            },
-        );
-        state.sketch_snapshots.insert(
-            "fresh".to_string(),
-            SnapshotCacheEntry {
-                core: Box::new(SumAccumulator::with_sum(2.0)),
-                window_start: 1000,
-            },
-        );
-        assert_eq!(state.sketch_snapshots.len(), 2);
-
-        // Insert/observe the newest window (1000). cutoff = 1000 - 100 =
-        // 900; the stale entry (10 < 900) is evicted, fresh (1000) stays.
-        let evicted = state.note_window_and_sweep(1000);
-        assert_eq!(evicted, 1, "exactly the stale entry is swept");
-        assert!(
-            state.sketch_snapshots.get("stale").is_none(),
-            "stale entry evicted"
-        );
-        assert!(
-            state.sketch_snapshots.get("fresh").is_some(),
-            "fresh entry within the lag window survives"
-        );
-
-        // A lag of 0 disables eviction — nothing is swept even when an
-        // ancient entry is present.
-        state
-            .observability
-            .snapshot_max_window_lag_nanos
-            .store(0, std::sync::atomic::Ordering::Relaxed);
-        state.sketch_snapshots.insert(
-            "ancient".to_string(),
-            SnapshotCacheEntry {
-                core: Box::new(SumAccumulator::with_sum(3.0)),
-                window_start: 1,
-            },
-        );
-        let evicted2 = state.note_window_and_sweep(5000);
-        assert_eq!(evicted2, 0, "lag=0 disables age-based eviction");
-        assert!(state.sketch_snapshots.get("ancient").is_some());
-
-        drop(state);
-        let _ = drain.await;
-    }
-}
diff --git a/data_plane/src/precompute_engine/maintenance_runtime.rs b/data_plane/src/precompute_engine/maintenance_runtime.rs
deleted file mode 100644
index 3ce4596de..000000000
--- a/data_plane/src/precompute_engine/maintenance_runtime.rs
+++ /dev/null
@@ -1,4627 +0,0 @@
-//! Production adapter from installed post-ASAP maintenance DAGs to summary state.
-
-use super::output_sink::OutputSink;
-use super::subdag_scheduler::{
-    execute_precompute_sink, execute_precompute_sinks, IdempotentCommitSink,
-    MaterializationCommitKey, PrecomputeOperatorRegistry, ScheduleError,
-};
-use crate::storage_engines::types::{
-    AggregateCore, InstalledPrecomputePlanHandle, PrecomputedOutput,
-};
-use asap_physical_operators::dag::RunContext;
-use asap_types::executable_plan::{BackendExecutableBinding, BackendNodeBinding};
-use planner_types::post_asap::{ExecutableDagNode, ExecutableOperatorPayload, PostAsapNodeId};
-use sha2::{Digest, Sha256};
-use std::collections::{BTreeMap, BTreeSet};
-use std::sync::{Arc, Mutex};
-
-type MaintenanceError = Box<dyn std::error::Error + Send + Sync>;
-
-type SummaryState = Arc<dyn AggregateCore>;
-type Population = BTreeMap<String, String>;
-type PopulationStates = BTreeMap<Population, Arc<[(i64, SummaryState)]>>;
-type PopulationRows = BTreeMap<Population, Vec<(i64, f64)>>;
-
-fn maintenance_context(
-    start: i64,
-    end: i64,
-    revision: u64,
-) -> Result<RunContext, MaintenanceError> {
-    RunContext::new(
-        asap_physical_operators::dag::Scope::Ingestion {
-            window_start_ms: start,
-            window_end_ms: end,
-            revision,
-        },
-        asap_physical_operators::dag::Limits::default(),
-    )
-    .map_err(Into::into)
-}
-
-#[derive(Clone)]
-enum MaintenanceValue {
-    Summary {
-        state: SummaryState,
-        family: Option<planner_types::post_asap::SummaryFamilyType>,
-    },
-    // A collection is retained until the DAG explicitly reduces it. Evaluating
-    // the whole DAG once per source pane would change nested reductions.
-    SummaryWindows {
-        states: PopulationStates,
-        family: planner_types::post_asap::SummaryFamilyType,
-    },
-    Rows {
-        values: PopulationRows,
-        name: String,
-        timestamped: bool,
-    },
-}
-
-impl MaintenanceValue {
-    fn summary(state: SummaryState) -> Self {
-        Self::Summary {
-            state,
-            family: None,
-        }
-    }
-
-    fn state(&self) -> Result<&SummaryState, MaintenanceError> {
-        match self {
-            Self::Summary { state, .. } => Ok(state),
-            Self::SummaryWindows { states, .. }
-                if states.len() == 1
-                    && states
-                        .values()
-                        .next()
-                        .is_some_and(|windows| windows.len() == 1) =>
-            {
-                Ok(&states.values().next().unwrap()[0].1)
-            }
-            Self::Rows { .. } | Self::SummaryWindows { .. } => {
-                Err("maintenance sink requires an explicit reduction to one summary state".into())
-            }
-        }
-    }
-}
-type PendingOutput = (
-    Option<(MaterializationCommitKey, u64)>,
-    PrecomputedOutput,
-    Box<dyn AggregateCore>,
-);
-
-enum MaintenanceInputs<'a> {
-    Live {
-        definition: asap_types::sds::StoredOutputId,
-        state: SummaryState,
-    },
-    Frozen(&'a [crate::storage_engines::sketch_db::index::FrozenExactWindows]),
-    Complete(&'a crate::storage_engines::sketch_db::index::CompleteRawMaintenanceCohort),
-    Captured(&'a [crate::storage_engines::sketch_db::index::FrozenExactWindows]),
-}
-
-impl MaintenanceInputs<'_> {
-    fn frozen_inputs(
-        &self,
-    ) -> Option<&[crate::storage_engines::sketch_db::index::FrozenExactWindows]> {
-        match self {
-            Self::Live { .. } => None,
-            Self::Frozen(inputs) | Self::Captured(inputs) => Some(inputs),
-            Self::Complete(cohort) => Some(cohort.inputs()),
-        }
-    }
-}
-
-fn frozen_population_value(
-    inputs: &[crate::storage_engines::sketch_db::index::FrozenExactWindows],
-    definition: asap_types::sds::StoredOutputId,
-    family: Option<planner_types::post_asap::SummaryFamilyType>,
-    complete: bool,
-) -> Result<Option<MaintenanceValue>, MaintenanceError> {
-    let mut states = PopulationStates::new();
-    for input in inputs.iter().filter(|input| input.definition == definition) {
-        if !complete && !states.is_empty() {
-            return Err("maintenance frontier requires explicit population routing".into());
-        }
-        let windows = input
-            .windows
-            .iter()
-            .map(|((_, end), state)| (*end as i64, Arc::clone(state)))
-            .collect::<Vec<_>>()
-            .into();
-        if states.insert(input.group.clone(), windows).is_some() {
-            return Err("maintenance frontier repeats a logical population".into());
-        }
-    }
-    if states.is_empty() {
-        return Ok(None);
-    }
-    Ok(Some(MaintenanceValue::SummaryWindows {
-        states,
-        family: family.ok_or("immutable source lacks a summary schema")?,
-    }))
-}
-
-struct OperatorAdapter<'a> {
-    binding: &'a BackendExecutableBinding,
-    inputs: MaintenanceInputs<'a>,
-    configs: &'a [asap_types::aggregation_config::PrecomputeMaterialization],
-}
-
-impl PrecomputeOperatorRegistry<MaintenanceValue> for OperatorAdapter<'_> {
-    type Error = MaintenanceError;
-
-    fn materialized_input(
-        &self,
-        node: &ExecutableDagNode,
-    ) -> Result<Option<MaintenanceValue>, MaintenanceError> {
-        let definition = match self.binding.node(node.id) {
-            Some(BackendNodeBinding::Materialization { stored_output }) => *stored_output,
-            _ => return Ok(None),
-        };
-        let family = node.output_schema.fields.iter().find_map(|field| {
-            (!matches!(
-                field.dtype,
-                planner_types::post_asap::SummaryFamilyType::Plain(_)
-            ))
-            .then(|| field.dtype.clone())
-        });
-        match &self.inputs {
-            MaintenanceInputs::Live {
-                definition: source,
-                state,
-            } if definition == *source => Ok(Some(MaintenanceValue::Summary {
-                state: Arc::clone(state),
-                family,
-            })),
-            MaintenanceInputs::Live { .. } => Ok(None),
-            MaintenanceInputs::Frozen(inputs) => {
-                frozen_population_value(inputs, definition, family, false)
-            }
-            MaintenanceInputs::Captured(inputs) => {
-                frozen_population_value(inputs, definition, family, true)
-            }
-            MaintenanceInputs::Complete(cohort) => {
-                frozen_population_value(cohort.inputs(), definition, family, true)
-            }
-        }
-    }
-
-    fn output_bytes(&self, value: &MaintenanceValue) -> usize {
-        fn labels(group: &Population) -> usize {
-            group.iter().map(|(k, v)| k.len() + v.len()).sum()
-        }
-        match value {
-            MaintenanceValue::Summary { state, .. } => state.approx_memory_bytes(),
-            MaintenanceValue::SummaryWindows { states, .. } => states
-                .iter()
-                .map(|(group, windows)| {
-                    labels(group)
-                        + windows
-                            .iter()
-                            .map(|(_, state)| 8 + state.approx_memory_bytes())
-                            .sum::<usize>()
-                })
-                .sum(),
-            MaintenanceValue::Rows { values, name, .. } => {
-                name.len()
-                    + values
-                        .iter()
-                        .map(|(group, rows)| {
-                            labels(group) + rows.len() * std::mem::size_of::<(i64, f64)>()
-                        })
-                        .sum::<usize>()
-            }
-        }
-    }
-
-    fn execute(
-        &self,
-        node: &ExecutableDagNode,
-        inputs: &[Arc<MaintenanceValue>],
-        context: RunContext,
-    ) -> Result<MaintenanceValue, Self::Error> {
-        if node.output_state.timing != planner_types::post_asap::ExecutionTiming::IngestionTime {
-            return Err("ingestion executor received a query-time node".into());
-        }
-        match &node.payload {
-            ExecutableOperatorPayload::SummaryMerge => merge_inputs(inputs, &context),
-            ExecutableOperatorPayload::Binary { operator } => {
-                if !self.inputs.frozen_inputs().is_some()
-                    || node.output_state
-                        != planner_types::post_asap::ExecutionDataState::INGESTION_ROWS
-                {
-                    return Err("maintenance binary requires immutable completed row inputs".into());
-                }
-                evaluate_aligned_binary(node, operator, inputs, &context)
-            }
-
-            ExecutableOperatorPayload::Value {
-                operation: planner_types::post_asap::ValueOperation::FinalizeExactAccumulator,
-            } => {
-                if !self.inputs.frozen_inputs().is_some() {
-                    return Err(
-                        "maintenance finalization requires immutable completed input windows"
-                            .into(),
-                    );
-                }
-                finalize_exact(node, inputs, &context)
-            }
-            ExecutableOperatorPayload::SummaryAgg {
-                family,
-                input,
-                grouping,
-                ..
-            } => {
-                let [value] = inputs else {
-                    return Err("maintenance SummaryAgg requires exactly one row input".into());
-                };
-                let MaintenanceValue::Rows { values, name, .. } = value.as_ref() else {
-                    return Err("maintenance SummaryAgg requires a typed update evaluator; finalize summary state before applying an update".into());
-                };
-                if !self.inputs.frozen_inputs().is_some() {
-                    return Err(
-                        "maintenance aggregation requires immutable completed input windows".into(),
-                    );
-                }
-                let target = match self.binding.node(node.id) {
-                    Some(BackendNodeBinding::Materialization { stored_output }) => stored_output,
-                    _ => {
-                        return Err(
-                            "maintenance SummaryAgg lacks installed materialization binding".into(),
-                        )
-                    }
-                };
-                let config = self
-                    .configs
-                    .iter()
-                    .find(|config| config.policy_fingerprint() == target.fingerprint())
-                    .ok_or("maintenance SummaryAgg lacks installed accumulator configuration")?;
-                asap_types::precompute_plan::validate_maintenance_reduction(config, node)?;
-                let sources = self
-                    .inputs
-                    .frozen_inputs()
-                    .ok_or("maintenance aggregation requires frozen sources")?;
-                for source in sources {
-                    let source_config = self
-                        .configs
-                        .iter()
-                        .find(|config| {
-                            config.policy_fingerprint() == source.definition.fingerprint()
-                        })
-                        .ok_or("maintenance input lacks installed source configuration")?;
-                    validate_maintenance_grouping(
-                        config,
-                        source_config,
-                        node,
-                        source.singleton_population_complete
-                            || matches!(&self.inputs, MaintenanceInputs::Complete(_)),
-                    )?;
-                }
-                if config.accumulator_spec()?.family != *family {
-                    return Err(
-                        "maintenance SummaryAgg family differs from installed configuration".into(),
-                    );
-                }
-                if input.item.is_some() {
-                    return Err(
-                        "keyed maintenance updates require explicit row identity routing".into(),
-                    );
-                }
-                let _ = grouping;
-                let output_groups = values
-                    .keys()
-                    .map(|group| {
-                        if config.partitioning
-                            == Some(asap_types::sds::PopulationPartitioning::PerEntity)
-                        {
-                            return Ok(group.clone());
-                        }
-                        config
-                            .grouping_labels
-                            .names()
-                            .into_iter()
-                            .map(|key| {
-                                group
-                                    .get(&key)
-                                    .cloned()
-                                    .map(|value| (key.to_string(), value))
-                                    .ok_or_else(|| {
-                                        "maintenance output grouping key is absent".to_string()
-                                    })
-                            })
-                            .collect::<Result<Population, String>>()
-                    })
-                    .collect::<Result<BTreeSet<_>, String>>()?;
-                if output_groups.len() != 1 {
-                    return Err(
-                        "maintenance sink requires one explicitly reduced output population".into(),
-                    );
-                }
-                use asap_physical_operators::dag::{operators::Operator, values::Value};
-                let schema = native_schema(vec![
-                    (
-                        "value",
-                        planner_types::post_asap::SummaryFamilyType::Plain(
-                            planner_types::pre_asap::DataType::Float64,
-                        ),
-                    ),
-                    (
-                        "time",
-                        planner_types::post_asap::SummaryFamilyType::Plain(
-                            planner_types::pre_asap::DataType::Timestamp,
-                        ),
-                    ),
-                ]);
-                let rows = values
-                    .values()
-                    .flatten()
-                    .map(|(time, value)| {
-                        Ok(vec![
-                            Value::Float64(evaluate_weight(&input.weight, *value, name)?),
-                            Value::Timestamp(*time),
-                        ])
-                    })
-                    .collect::<Result<Vec<_>, MaintenanceError>>()?;
-                let builder =
-                    Operator::summary_build(schema.clone(), family.clone(), 0, Some(1), vec![])?;
-                let mut result = native_rows(schema, rows, vec![builder], &context)?;
-                let Some(Value::Summary { state, .. }) = result.pop().and_then(|mut row| row.pop())
-                else {
-                    return Err("native summary builder did not return state".into());
-                };
-                let timestamp = values
-                    .values()
-                    .flatten()
-                    .map(|(timestamp, _)| *timestamp)
-                    .max()
-                    .ok_or("maintenance aggregation has no input rows")?;
-                Ok(MaintenanceValue::SummaryWindows {
-                    states: BTreeMap::from([(
-                        output_groups.into_iter().next().unwrap(),
-                        vec![(timestamp, state)].into(),
-                    )]),
-                    family: family.clone(),
-                })
-            }
-            payload => Err(format!(
-                "maintenance operator {payload:?} has no summary-state implementation"
-            )
-            .into()),
-        }
-    }
-}
-
-// These functions translate deployment values into native batches. Window and
-// catalog checks stay here; the library owns all computation on batch values.
-fn native_schema(
-    fields: Vec<(&str, planner_types::post_asap::SummaryFamilyType)>,
-) -> asap_physical_operators::dag::values::Schema {
-    Arc::new(planner_types::post_asap::SummarySchema {
-        fields: fields
-            .into_iter()
-            .map(|(name, dtype)| planner_types::post_asap::SummaryField {
-                name: name.into(),
-                dtype,
-                nullable: false,
-            })
-            .collect(),
-        time_index: None,
-    })
-}
-fn native_rows(
-    schema: asap_physical_operators::dag::values::Schema,
-    rows: Vec<Vec<asap_physical_operators::dag::values::Value>>,
-    operators: Vec<asap_physical_operators::dag::operators::Operator>,
-    context: &RunContext,
-) -> Result<Vec<Vec<asap_physical_operators::dag::values::Value>>, MaintenanceError> {
-    use asap_physical_operators::dag::{batch_execution::evaluate_batch, values::Batch};
-    let input = Batch::try_new(schema, rows)?;
-    Ok(evaluate_batch(input, operators, context.clone())?
-        .into_iter()
-        .flat_map(|b| b.rows().to_vec())
-        .collect())
-}
-fn native_arithmetic(
-    op: &planner_types::post_asap::BinaryOperator,
-    inputs: Vec<(i64, f64, f64)>,
-    context: &RunContext,
-) -> Result<Vec<(i64, f64)>, MaintenanceError> {
-    use asap_physical_operators::dag::{
-        operators::{Expression, Operator},
-        values::Value,
-    };
-    use planner_types::{post_asap::SummaryFamilyType, pre_asap::DataType};
-    let schema = native_schema(vec![
-        ("time", SummaryFamilyType::Plain(DataType::Timestamp)),
-        ("left", SummaryFamilyType::Plain(DataType::Float64)),
-        ("right", SummaryFamilyType::Plain(DataType::Float64)),
-    ]);
-    let project = Operator::project(
-        schema.clone(),
-        vec![
-            ("time".into(), Expression::Column(0)),
-            (
-                "value".into(),
-                Expression::Binary {
-                    operator: op.clone(),
-                    left: Box::new(Expression::Column(1)),
-                    right: Box::new(Expression::Column(2)),
-                },
-            ),
-        ],
-    )?;
-    let rows = native_rows(
-        schema,
-        inputs
-            .into_iter()
-            .map(|(time, left, right)| {
-                vec![
-                    Value::Timestamp(time),
-                    Value::Float64(left),
-                    Value::Float64(right),
-                ]
-            })
-            .collect(),
-        vec![project],
-        context,
-    )?;
-    rows.into_iter()
-        .map(|row| match row.as_slice() {
-            [Value::Timestamp(time), Value::Float64(value)] if value.is_finite() => {
-                Ok((*time, *value))
-            }
-            _ => Err("maintenance binary produced a non-finite update".into()),
-        })
-        .collect()
-}
-
-fn validate_maintenance_grouping(
-    target: &asap_types::PrecomputeMaterialization,
-    source: &asap_types::PrecomputeMaterialization,
-    node: &ExecutableDagNode,
-    singleton_population_complete: bool,
-) -> Result<(), MaintenanceError> {
-    if target.grouping_labels == source.grouping_labels
-        && target.partitioning == source.partitioning
-    {
-        return Ok(());
-    }
-    if singleton_population_complete
-        && target.grouping_labels.is_empty()
-        && target.partitioning == Some(asap_types::sds::PopulationPartitioning::Grouped)
-        && source.partitioning == Some(asap_types::sds::PopulationPartitioning::PerEntity)
-        && target.stored_window_ms() == source.stored_window_ms()
-        && matches!(&node.payload, ExecutableOperatorPayload::SummaryAgg {
-            reduction: planner_types::pre_asap::Reduction::Reduce(keys), ..
-        } if keys.is_empty())
-    {
-        return Ok(());
-    }
-    Err("maintenance population reduction requires a complete singleton source or synchronized grouping".into())
-}
-
-fn evaluate_weight(
-    expression: &planner_types::post_asap::SummaryInputExpr,
-    value: f64,
-    name: &str,
-) -> Result<f64, MaintenanceError> {
-    use planner_types::{post_asap::SummaryInputExpr, pre_asap::ColumnRef};
-    let weight = match expression {
-        SummaryInputExpr::Constant(value) => *value,
-        SummaryInputExpr::Column(ColumnRef::SampleValue) => value,
-        SummaryInputExpr::Column(ColumnRef::Named(column)) if column == name => value,
-        _ => {
-            return Err("maintenance update does not resolve against the supplied typed row".into())
-        }
-    };
-    if !weight.is_finite() {
-        return Err("maintenance update weight is not finite".into());
-    }
-    Ok(weight)
-}
-
-// Rows carry only a value and its window timestamp. Reject any schema that
-// would require silently dropping another column or manufacturing a timestamp.
-fn maintenance_float64_column(
-    node: &ExecutableDagNode,
-) -> Result<&planner_types::post_asap::SummaryField, MaintenanceError> {
-    use planner_types::post_asap::SummaryFamilyType;
-    let fields = &node.output_schema.fields;
-    let field = match node.output_schema.time_index {
-        None if fields.len() == 1 => &fields[0],
-        Some(time_index) if fields.len() == 2 && time_index < 2 => {
-            let timestamp = &fields[time_index];
-            let value = &fields[1 - time_index];
-            if timestamp.nullable
-                || timestamp.name == value.name
-                || !matches!(
-                    timestamp.dtype,
-                    SummaryFamilyType::Plain(planner_types::pre_asap::DataType::Timestamp)
-                )
-            {
-                return Err("finalization timestamp column differs from its typed schema".into());
-            }
-            value
-        }
-        _ => {
-            return Err(
-                "exact maintenance finalization requires one value and optional declared timestamp"
-                    .into(),
-            )
-        }
-    };
-    if field.nullable
-        || !matches!(
-            field.dtype,
-            SummaryFamilyType::Plain(planner_types::pre_asap::DataType::Float64)
-        )
-    {
-        return Err(
-            "exact maintenance finalization currently requires a Float64 output column".into(),
-        );
-    }
-    Ok(field)
-}
-
-fn evaluate_aligned_binary(
-    node: &ExecutableDagNode,
-    operator: &planner_types::post_asap::BinaryOperator,
-    inputs: &[Arc<MaintenanceValue>],
-    context: &RunContext,
-) -> Result<MaintenanceValue, MaintenanceError> {
-    use planner_types::pre_asap::BinaryOpKind;
-    let BinaryOpKind::Arithmetic(_) = &operator.kind else {
-        return Err("maintenance binary currently requires arithmetic".into());
-    };
-    if operator.vector_match.is_some() {
-        return Err(
-            "maintenance binary requires explicit population routing for vector matching".into(),
-        );
-    }
-    let name = maintenance_float64_column(node)?.name.clone();
-    if node.output_schema.time_index.is_none() {
-        return Err("maintenance binary requires declared window timestamps".into());
-    }
-    let [left, right] = inputs else {
-        return Err("maintenance binary requires two row inputs".into());
-    };
-    let (
-        MaintenanceValue::Rows {
-            values: left,
-            timestamped: true,
-            ..
-        },
-        MaintenanceValue::Rows {
-            values: right,
-            timestamped: true,
-            ..
-        },
-    ) = (left.as_ref(), right.as_ref())
-    else {
-        return Err("maintenance binary requires finalized row inputs".into());
-    };
-    if left.is_empty() || left.keys().ne(right.keys()) {
-        return Err("maintenance binary requires matching nonempty population sets".into());
-    }
-    let mut values = PopulationRows::new();
-    for (group, left) in left {
-        let right = &right[group];
-        if left.is_empty() || left.len() != right.len() {
-            return Err("maintenance binary requires matching nonempty timestamp sets".into());
-        }
-        // Canonical timestamp maps accept arrival-order differences, but never
-        // collapse duplicate updates or pair unrelated source windows by position.
-        let mut left_rows = BTreeMap::new();
-        let mut right_rows = BTreeMap::new();
-        for (rows, index) in [(left, &mut left_rows), (right, &mut right_rows)] {
-            for &(timestamp, value) in rows {
-                if !value.is_finite() || index.insert(timestamp, value).is_some() {
-                    return Err(
-                        "maintenance binary input has duplicate timestamps or non-finite values"
-                            .into(),
-                    );
-                }
-            }
-        }
-        let mut joined = Vec::with_capacity(left.len());
-        for (timestamp, left) in left_rows {
-            let right = right_rows
-                .get(&timestamp)
-                .ok_or("maintenance binary requires matching timestamp sets")?;
-            joined.push((timestamp, left, *right));
-        }
-        let joined = native_arithmetic(operator, joined, context)?;
-        values.insert(group.clone(), joined);
-    }
-    Ok(MaintenanceValue::Rows {
-        values,
-        name,
-        timestamped: true,
-    })
-}
-
-fn finalize_exact(
-    node: &ExecutableDagNode,
-    inputs: &[Arc<MaintenanceValue>],
-    context: &RunContext,
-) -> Result<MaintenanceValue, MaintenanceError> {
-    use planner_types::post_asap::{ExactKind, SummaryFamilyType};
-    let [input] = inputs else {
-        return Err("exact maintenance finalization requires one summary input".into());
-    };
-    let (groups, family) = match input.as_ref() {
-        MaintenanceValue::Summary {
-            state,
-            family: Some(family),
-        } => {
-            if node.output_schema.time_index.is_some() {
-                return Err("timestamped finalization requires source window timestamps".into());
-            }
-            (vec![(Population::new(), vec![(0, state)])], family)
-        }
-        MaintenanceValue::SummaryWindows { states, family } => (
-            states
-                .iter()
-                .map(|(group, windows)| {
-                    (
-                        group.clone(),
-                        windows.iter().map(|(time, state)| (*time, state)).collect(),
-                    )
-                })
-                .collect(),
-            family,
-        ),
-        _ => {
-            return Err("exact maintenance finalization requires a typed exact accumulator".into())
-        }
-    };
-    let SummaryFamilyType::ExactAggregate(kind, _) = family else {
-        return Err("exact maintenance finalization requires a typed exact accumulator".into());
-    };
-    let statistic = match kind {
-        ExactKind::Sum => asap_types::Statistic::Sum,
-        ExactKind::Count => asap_types::Statistic::Count,
-        _ => {
-            return Err(
-                "exact maintenance readout requires explicit operator/time semantics".into(),
-            )
-        }
-    };
-    let field = maintenance_float64_column(node)?;
-    let mut values = PopulationRows::new();
-    for (group, states) in groups {
-        use asap_physical_operators::dag::{operators::Operator, values::Value};
-        let schema = native_schema(vec![("state", family.clone())]);
-        let readout = Operator::readout(schema.clone(), 0, statistic, Default::default())?;
-        let rows = native_rows(
-            schema,
-            states
-                .iter()
-                .map(|(_, state)| {
-                    vec![Value::Summary {
-                        family: family.clone(),
-                        state: Arc::clone(state),
-                    }]
-                })
-                .collect(),
-            vec![readout],
-            context,
-        )?;
-        let rows = states
-            .into_iter()
-            .zip(rows)
-            .map(|((timestamp, _), row)| {
-                let value =
-                    match row.first() {
-                        Some(Value::Float64(value)) => *value,
-                        Some(Value::Int64(value)) if value.unsigned_abs() <= (1u64 << 53) => {
-                            *value as f64
-                        }
-                        _ => return Err(
-                            "exact readout cannot be represented by the installed Float64 schema"
-                                .to_string(),
-                        ),
-                    };
-                if !value.is_finite() {
-                    return Err("exact maintenance finalization produced a non-finite value".into());
-                }
-                Ok((timestamp, value))
-            })
-            .collect::<Result<Vec<_>, String>>()?;
-        values.insert(group, rows);
-    }
-    Ok(MaintenanceValue::Rows {
-        values,
-        name: field.name.clone(),
-        timestamped: node.output_schema.time_index.is_some()
-            && matches!(input.as_ref(), MaintenanceValue::SummaryWindows { .. }),
-    })
-}
-
-fn merge_inputs(
-    inputs: &[Arc<MaintenanceValue>],
-    context: &RunContext,
-) -> Result<MaintenanceValue, MaintenanceError> {
-    let mut grouped = BTreeMap::<Population, (Vec<&SummaryState>, Option<i64>)>::new();
-    let mut expected_groups = None;
-    let mut family = None;
-    for input in inputs {
-        let (groups, input_family) = match input.as_ref() {
-            MaintenanceValue::Summary { state, family } => (
-                vec![(Population::new(), vec![(None, state)])],
-                family.as_ref(),
-            ),
-            MaintenanceValue::SummaryWindows { states, family } => (
-                states
-                    .iter()
-                    .map(|(group, windows)| {
-                        (
-                            group.clone(),
-                            windows
-                                .iter()
-                                .map(|(time, state)| (Some(*time), state))
-                                .collect(),
-                        )
-                    })
-                    .collect(),
-                Some(family),
-            ),
-            MaintenanceValue::Rows { .. } => return Err("summary merge cannot consume rows".into()),
-        };
-        let keys: BTreeSet<_> = groups.iter().map(|(group, _)| group.clone()).collect();
-        if expected_groups
-            .as_ref()
-            .is_some_and(|expected| expected != &keys)
-        {
-            return Err("summary merge cannot collapse different populations".into());
-        }
-        expected_groups = Some(keys);
-        for (group, windows) in groups {
-            let (states, end) = grouped.entry(group).or_default();
-            for (timestamp, state) in windows {
-                states.push(state);
-                *end = (*end).max(timestamp);
-            }
-        }
-        if let Some(input_family) = input_family {
-            if family.as_ref().is_some_and(|family| family != input_family) {
-                return Err("summary merge input families differ".into());
-            }
-            family = Some(input_family.clone());
-        }
-    }
-    if grouped.is_empty() {
-        return Err("summary maintenance node has no input state".into());
-    }
-    let mut result = PopulationStates::new();
-    for (group, (states, timestamp)) in grouped {
-        let Some((first, rest)) = states.split_first() else {
-            return Err("summary maintenance population has no input state".into());
-        };
-        let state_family = family.clone().or_else(|| {
-            first.as_any().downcast_ref::<asap_physical_operators::summary_kernels::exact::ExactAccumulator>().map(|state| state.family().clone())
-        }).or_else(|| first.as_any().is::<asap_physical_operators::summary_kernels::SumAccumulator>().then_some(
-            planner_types::post_asap::SummaryFamilyType::ExactAggregate(planner_types::post_asap::ExactKind::Sum, planner_types::post_asap::ExactParams::Sum)
-        )).ok_or("summary merge requires a registered state family")?;
-        use asap_physical_operators::dag::{operators::Operator, values::Value};
-        let schema = native_schema(vec![("state", state_family.clone())]);
-        let rows = std::iter::once(*first)
-            .chain(rest.iter().copied())
-            .map(|state| {
-                vec![Value::Summary {
-                    family: state_family.clone(),
-                    state: Arc::clone(state),
-                }]
-            })
-            .collect();
-        let merge = Operator::summary_merge(schema.clone(), 0, vec![])?;
-        let mut output = native_rows(schema, rows, vec![merge], context)?;
-        let Some(Value::Summary { state: merged, .. }) = output.pop().and_then(|mut row| row.pop())
-        else {
-            return Err("native summary merge did not return state".into());
-        };
-        let Some(timestamp) = timestamp else {
-            return Ok(MaintenanceValue::Summary {
-                state: merged,
-                family,
-            });
-        };
-        result.insert(group, vec![(timestamp, merged)].into());
-    }
-    Ok(MaintenanceValue::SummaryWindows {
-        states: result,
-        family: family.ok_or("merged immutable state lacks a family")?,
-    })
-}
-
-fn frozen_cohort_lineage(
-    inputs: &[crate::storage_engines::sketch_db::index::FrozenExactWindows],
-    expected: &asap_types::derived_input::DerivedInputIdentity,
-) -> Result<[u8; 32], MaintenanceError> {
-    let generation = &inputs
-        .first()
-        .ok_or("immutable input cohort is empty")?
-        .generation;
-    if inputs
-        .iter()
-        .map(|input| input.definition)
-        .collect::<BTreeSet<_>>()
-        != expected.inputs
-    {
-        return Err("immutable lineage differs from installed input definitions".into());
-    }
-    let mut ordered: Vec<_> = inputs.iter().collect();
-    ordered.sort_by(|left, right| {
-        (&left.stored_output_reference, &left.group)
-            .cmp(&(&right.stored_output_reference, &right.group))
-    });
-    if ordered.windows(2).any(|pair| {
-        (&pair[0].stored_output_reference, &pair[0].group)
-            == (&pair[1].stored_output_reference, &pair[1].group)
-    }) {
-        return Err("immutable lineage repeats a stored-output population".into());
-    }
-    let multiple = ordered.len() > 1;
-    let mut lineage = Sha256::new();
-    lineage.update(b"immutable-stored-output-input-v3");
-    lineage.update((ordered.len() as u64).to_be_bytes());
-    for input in ordered {
-        if &input.generation != generation || input.windows.is_empty() {
-            return Err("immutable lineage has mixed generations or empty windows".into());
-        }
-        if input.stored_output_reference.stored_output_id != input.definition {
-            return Err("immutable input output differs from its definition".into());
-        }
-        let metadata = serde_json::to_vec(&(
-            &input.stored_output_reference,
-            &input.generation,
-            &input.group,
-            expected,
-        ))
-        .map_err(|error| error.to_string())?;
-        if multiple {
-            lineage.update((metadata.len() as u64).to_be_bytes());
-        }
-        lineage.update(metadata);
-        if multiple {
-            lineage.update((input.windows.len() as u64).to_be_bytes());
-        }
-        for ((start, end), state) in &input.windows {
-            lineage.update(start.to_be_bytes());
-            lineage.update(end.to_be_bytes());
-            let bytes = state.serialize_to_bytes();
-            lineage.update((bytes.len() as u64).to_be_bytes());
-            lineage.update(bytes);
-        }
-    }
-    Ok(lineage.finalize().into())
-}
-
-/// Evaluate one installed maintenance sink over an immutable physical source
-/// incarnation. Durable publication is a separate existing-store transaction;
-/// the in-memory scheduler cache here never claims durable exactly-once writes.
-fn prepare_frozen_maintenance_sink(
-    installed: &asap_types::executable_plan::InstalledPostAsapDag,
-    configs: &[asap_types::PrecomputeMaterialization],
-    sink: PostAsapNodeId,
-    inputs: &[crate::storage_engines::sketch_db::index::FrozenExactWindows],
-    output_window: (u64, u64),
-) -> Result<
-    (
-        planner_types::post_asap::ExecutableDag,
-        MaterializationCommitKey,
-    ),
-    MaintenanceError,
-> {
-    installed.validate()?;
-    let target = match installed.binding.node(sink) {
-        Some(BackendNodeBinding::Materialization { stored_output }) => *stored_output,
-        _ => return Err("immutable sink lacks a materialization binding".into()),
-    };
-    let config = configs
-        .iter()
-        .find(|config| config.policy_fingerprint() == target.fingerprint())
-        .ok_or("immutable sink lacks its installed configuration")?;
-    let expected_input = config
-        .derived_input
-        .as_ref()
-        .ok_or("immutable sink is not a derived materialization")?;
-    if expected_input.inputs != inputs.iter().map(|input| input.definition).collect() {
-        return Err("immutable sink requires synchronized input definitions".into());
-    }
-    if output_window.0 >= output_window.1
-        || output_window.1 - output_window.0 != config.stored_window_ms()
-        || inputs.iter().any(|input| {
-            input
-                .windows
-                .keys()
-                .any(|(start, end)| *start < output_window.0 || *end > output_window.1)
-        })
-    {
-        return Err("immutable inputs do not fit the installed output window".into());
-    }
-    let dag = installed.document.decode()?;
-    let producers: Vec<_> = dag
-        .edges
-        .iter()
-        .filter(|edge| edge.consumer == sink)
-        .collect();
-    let [producer] = producers.as_slice() else {
-        return Err("immutable sink requires one input relation".into());
-    };
-    let frontiers = installed
-        .binding
-        .nodes
-        .iter()
-        .filter_map(|(node, binding)| match binding {
-            BackendNodeBinding::Materialization { stored_output }
-                if expected_input.inputs.contains(stored_output) =>
-            {
-                Some((*node, *stored_output))
-            }
-            _ => None,
-        })
-        .collect();
-    let actual_input = asap_types::derived_input::DerivedInputIdentity::from_dag(
-        &installed.document,
-        producer.producer,
-        &frontiers,
-    )?;
-    if &actual_input != expected_input {
-        return Err("immutable sink input program differs from its catalog identity".into());
-    }
-    let digest = frozen_cohort_lineage(inputs, expected_input)?;
-    let generation = &inputs
-        .first()
-        .ok_or("immutable input cohort is empty")?
-        .generation;
-    let key = MaterializationCommitKey {
-        plan_id: generation.plan_id,
-        plan_version: generation.plan_version,
-        stored_output: target,
-        window_start_ms: i64::try_from(output_window.0)
-            .map_err(|_| "output window exceeds timestamp range")?,
-        window_end_ms: i64::try_from(output_window.1)
-            .map_err(|_| "output window exceeds timestamp range")?,
-        input_lineage: digest.to_vec(),
-    };
-    Ok((dag, key))
-}
-
-fn execute_prepared_frozen_sink(
-    installed: &asap_types::executable_plan::InstalledPostAsapDag,
-    configs: &[asap_types::PrecomputeMaterialization],
-    sink: PostAsapNodeId,
-    inputs: MaintenanceInputs<'_>,
-    dag: &planner_types::post_asap::ExecutableDag,
-    key: MaterializationCommitKey,
-) -> Result<(SummaryState, Population), MaintenanceError> {
-    let adapter = OperatorAdapter {
-        binding: &installed.binding,
-        inputs,
-        configs,
-    };
-    let value = execute_precompute_sink(
-        dag,
-        &installed.binding,
-        sink,
-        key.clone(),
-        &adapter,
-        &CommitRegistry::default(),
-        maintenance_context(key.window_start_ms, key.window_end_ms, key.plan_version)?,
-    )
-    .map_err(schedule_error)?;
-    let group = match value.as_ref() {
-        MaintenanceValue::SummaryWindows { states, .. } if states.len() == 1 => {
-            states.keys().next().unwrap().clone()
-        }
-        MaintenanceValue::Summary { .. } => Population::new(),
-        _ => return Err("maintenance sink has multiple or missing output populations".into()),
-    };
-    Ok((Arc::clone(value.state()?), group))
-}
-
-#[cfg(test)]
-fn evaluate_frozen_maintenance_sink(
-    installed: &asap_types::executable_plan::InstalledPostAsapDag,
-    configs: &[asap_types::PrecomputeMaterialization],
-    sink: PostAsapNodeId,
-    input: &crate::storage_engines::sketch_db::index::FrozenExactWindows,
-    output_window: (u64, u64),
-) -> Result<(SummaryState, [u8; 32]), MaintenanceError> {
-    let (dag, key) = prepare_frozen_maintenance_sink(
-        installed,
-        configs,
-        sink,
-        std::slice::from_ref(input),
-        output_window,
-    )?;
-    let digest = key
-        .input_lineage
-        .as_slice()
-        .try_into()
-        .map_err(|_| "invalid input digest")?;
-    let (state, _) = execute_prepared_frozen_sink(
-        installed,
-        configs,
-        sink,
-        MaintenanceInputs::Frozen(std::slice::from_ref(input)),
-        &dag,
-        key,
-    )?;
-    Ok((state, digest))
-}
-
-#[cfg(test)]
-/// Execute an installed, single-population maintenance subDAG from frozen
-/// base panes and publish its complete output through the durable part path.
-/// This initial entry point accepts non-overlapping output windows; sliding
-/// replacement and cross-population shuffles require their own scheduling
-/// proof and are rejected, rather than treating corrections as observations.
-#[allow(clippy::too_many_arguments)]
-pub fn execute_completed_maintenance(
-    store: &crate::storage_engines::sketch_db::index::SketchStore,
-    installed: &asap_types::executable_plan::InstalledPostAsapDag,
-    configs: &[asap_types::PrecomputeMaterialization],
-    sink: planner_types::post_asap::PostAsapNodeId,
-    source_sid: u64,
-    target_sid: u64,
-    window: (u64, u64),
-    group: &BTreeMap<String, String>,
-) -> Result<bool, MaintenanceError> {
-    let target = match installed.binding.node(sink) {
-        Some(BackendNodeBinding::Materialization { stored_output }) => *stored_output,
-        _ => return Err("maintenance sink lacks an installed output identity".into()),
-    };
-    let derived = configs
-        .iter()
-        .find(|config| config.policy_fingerprint() == target.fingerprint())
-        .and_then(|config| config.derived_input.as_ref())
-        .ok_or("maintenance output has no derived input")?;
-    if derived.inputs.len() != 1 {
-        return Err("maintenance execution requires synchronized multi-source scheduling".into());
-    }
-    let generation = store
-        .active_catalog_generation()
-        .ok_or("maintenance requires an authoritative catalog")?;
-    execute_completed_maintenance_cohort(
-        store,
-        &generation,
-        installed,
-        configs,
-        sink,
-        &BTreeMap::from([(*derived.inputs.first().unwrap(), source_sid)]),
-        target_sid,
-        window,
-        group,
-    )
-}
-
-/// Execute one completed population per input definition at matching full
-/// windows. All source populations must share the same explicit label map.
-#[allow(clippy::too_many_arguments)]
-pub(crate) fn execute_completed_maintenance_cohort(
-    store: &crate::storage_engines::sketch_db::index::SketchStore,
-    generation: &Arc<asap_types::sds::CatalogGeneration>,
-    installed: &asap_types::executable_plan::InstalledPostAsapDag,
-    configs: &[asap_types::PrecomputeMaterialization],
-    sink: PostAsapNodeId,
-    source_sids: &BTreeMap<asap_types::sds::StoredOutputId, u64>,
-    target_sid: u64,
-    window: (u64, u64),
-    group: &BTreeMap<String, String>,
-) -> Result<bool, MaintenanceError> {
-    use asap_types::executable_plan::BackendNodeBinding;
-    let target = match installed.binding.node(sink) {
-        Some(BackendNodeBinding::Materialization { stored_output }) => *stored_output,
-        _ => return Err("maintenance sink lacks an installed output identity".into()),
-    };
-    let target_config = configs
-        .iter()
-        .find(|config| config.policy_fingerprint() == target.fingerprint())
-        .ok_or("maintenance output configuration is absent")?;
-    let derived = target_config
-        .derived_input
-        .as_ref()
-        .ok_or("maintenance output has no derived input")?;
-    if derived.inputs != source_sids.keys().copied().collect() {
-        return Err("maintenance source set differs from installed input definitions".into());
-    }
-    let source_configs = source_sids
-        .keys()
-        .map(|source| {
-            configs
-                .iter()
-                .find(|config| config.policy_fingerprint() == source.fingerprint())
-                .ok_or("maintenance source configuration is absent")
-        })
-        .collect::<Result<Vec<_>, _>>()?;
-    if source_configs.len() > 1 {
-        asap_types::precompute_plan::validated_source_window_cohort(target_config, &source_configs)
-            .map_err(|error| error.to_string())?;
-    }
-    let mut requests = Vec::with_capacity(source_sids.len());
-    for source_config in &source_configs {
-        let source = source_config.policy_fingerprint().into();
-        let source_sid = source_sids[&source];
-        let source_width = source_config.stored_window_ms();
-        let target_width = target_config.stored_window_ms();
-        let origin = source_config.pane_origin_ms.unwrap_or(0);
-        if source_width == 0
-            || target_width == 0
-            || window.0 >= window.1
-            || window.1 - window.0 != target_width
-            || target_width % source_width != 0
-            || target_width / source_width > 65_536
-            || source_config
-                .slide_interval
-                .checked_mul(1000)
-                .is_none_or(|slide| slide < source_width)
-            || target_config
-                .slide_interval
-                .checked_mul(1000)
-                .is_none_or(|slide| slide < target_width)
-            || window.1 > i64::MAX as u64
-            || (window.0 as i128 - origin as i128).rem_euclid(source_width as i128) != 0
-            || (window.0 as i128 - target_config.pane_origin_ms.unwrap_or(0) as i128)
-                .rem_euclid(target_width as i128)
-                != 0
-        {
-            return Err("maintenance window requires unsupported overlap, phase, or extent".into());
-        }
-        let expected = (0..target_width / source_width)
-            .map(|index| {
-                let start = window.0 + index * source_width;
-                (start, start + source_width)
-            })
-            .collect();
-        requests.push((source_sid, source, expected, group.clone()));
-    }
-    let cohort = store.read_frozen_exact_cohort(generation, &derived.inputs, &requests)?;
-    if cohort.len() > 1
-        && cohort
-            .iter()
-            .any(|source| !source.singleton_population_complete)
-    {
-        return Err(
-            "multi-source maintenance requires a complete single population per source".into(),
-        );
-    }
-    let (dag, key) = prepare_frozen_maintenance_sink(installed, configs, sink, &cohort, window)?;
-    let digest = key
-        .input_lineage
-        .as_slice()
-        .try_into()
-        .map_err(|_| "invalid input digest")?;
-    let target_node = dag
-        .nodes
-        .iter()
-        .find(|node| node.id == sink)
-        .ok_or("maintenance target node is absent")?;
-    for frozen in &cohort {
-        let source_config = source_configs
-            .iter()
-            .find(|config| config.policy_fingerprint() == frozen.definition.fingerprint())
-            .ok_or("maintenance source configuration is absent")?;
-        validate_maintenance_grouping(
-            target_config,
-            source_config,
-            target_node,
-            frozen.singleton_population_complete,
-        )?;
-    }
-    if store.recover_frozen_maintenance_output(
-        target_sid,
-        target_config,
-        &cohort,
-        digest,
-        window,
-    )? {
-        return Ok(false);
-    }
-    let (state, computed_group) = execute_prepared_frozen_sink(
-        installed,
-        configs,
-        sink,
-        MaintenanceInputs::Frozen(&cohort),
-        &dag,
-        key,
-    )?;
-    let expected_group =
-        if target_config.partitioning == Some(asap_types::sds::PopulationPartitioning::PerEntity) {
-            group.clone()
-        } else {
-            target_config
-                .grouping_labels
-                .names()
-                .into_iter()
-                .map(|key| {
-                    group
-                        .get(&key)
-                        .cloned()
-                        .map(|value| (key, value))
-                        .ok_or("maintenance output grouping key is absent")
-                })
-                .collect::<Result<Population, _>>()?
-        };
-    if computed_group != expected_group {
-        return Err("computed maintenance population differs from its output binding".into());
-    }
-    let mut output = crate::storage_engines::types::PrecomputedOutput::new(
-        window.0,
-        window.1,
-        Some(crate::storage_engines::types::KeyByLabelValues {
-            labels: target_config
-                .grouping_labels
-                .iter()
-                .map(|name| {
-                    group
-                        .get(name)
-                        .cloned()
-                        .ok_or("maintenance population is missing an output grouping key")
-                })
-                .collect::<Result<Vec<_>, _>>()?,
-        }),
-        target.fingerprint(),
-    );
-    output.catalog_generation = Some(Arc::clone(generation));
-    store
-        .publish_frozen_maintenance_output(
-            target_sid,
-            target_config,
-            &output,
-            state.as_ref(),
-            &cohort,
-            digest,
-        )
-        .map_err(Into::into)
-}
-
-/// Schedule a complete common population across all raw input definitions.
-/// Missing windows are unavailable; they are never interpreted as zero values.
-fn execute_finite_source_cohort(
-    store: &crate::storage_engines::sketch_db::index::SketchStore,
-    resolver: &crate::drivers::ingest::series_resolver::SeriesIdResolver,
-    plan: &asap_types::precompute_plan::PrecomputePlan,
-    installed: &asap_types::executable_plan::InstalledPostAsapDag,
-    sink: PostAsapNodeId,
-) -> Result<(), MaintenanceError> {
-    let generation = plan
-        .summary_catalog
-        .as_ref()
-        .ok_or("finite maintenance requires a catalog generation")?;
-    let Some(BackendNodeBinding::Materialization {
-        stored_output: target,
-    }) = installed.binding.node(sink)
-    else {
-        return Err("finite maintenance sink has no installed definition".into());
-    };
-    let config = plan
-        .materializations
-        .iter()
-        .find(|config| config.policy_fingerprint() == target.fingerprint())
-        .ok_or("finite maintenance target configuration is absent")?;
-    let derived = config
-        .derived_input
-        .as_ref()
-        .ok_or("finite maintenance target has no input program")?;
-    let source_configs = derived
-        .inputs
-        .iter()
-        .map(|source| {
-            plan.materializations
-                .iter()
-                .find(|config| config.policy_fingerprint() == source.fingerprint())
-                .ok_or("finite maintenance source configuration is absent")
-        })
-        .collect::<Result<Vec<_>, _>>()?;
-    asap_types::precompute_plan::validated_source_window_cohort(config, &source_configs)
-        .map_err(|error| error.to_string())?;
-    let width = config.stored_window_ms();
-    if config.slide_interval.checked_mul(1000) != Some(width) {
-        return Err("finite source cohorts currently require non-overlapping full windows".into());
-    }
-    let active_generation = store
-        .active_catalog_generation()
-        .ok_or("finite source cohort requires an active catalog")?;
-    if active_generation.as_ref() != generation {
-        return Err("finite source cohort catalog generation changed".into());
-    }
-    let mut source_sids = BTreeMap::new();
-    let mut common_group = None;
-    let mut common_windows: Option<BTreeSet<(u64, u64)>> = None;
-    for source in &derived.inputs {
-        let populations = store.completed_maintenance_coordinates(*source, generation)?;
-        if populations.is_empty() {
-            return Ok(());
-        }
-        if populations.len() != 1 || populations.values().any(|groups| groups.len() != 1) {
-            return Err(
-                "finite source cohort requires one physical population per definition".into(),
-            );
-        }
-        let (sid, groups) = populations.into_iter().next().unwrap();
-        let (group, windows) = groups.into_iter().next().unwrap();
-        if common_group
-            .as_ref()
-            .is_some_and(|expected| expected != &group)
-        {
-            return Err("finite source cohort requires matching explicit populations".into());
-        }
-        if windows
-            .iter()
-            .any(|(start, end)| end.checked_sub(*start) != Some(width))
-        {
-            return Err("finite source cohort contains a non-full source window".into());
-        }
-        common_group = Some(group);
-        source_sids.insert(*source, sid);
-        match &mut common_windows {
-            Some(common) => common.retain(|window| windows.contains(window)),
-            None => common_windows = Some(windows),
-        }
-    }
-    let Some(group) = common_group else {
-        return Ok(());
-    };
-    let output_group: BTreeMap<_, _> = config
-        .grouping_labels
-        .iter()
-        .map(|key| {
-            group
-                .get(key)
-                .cloned()
-                .map(|value| (key.clone(), value))
-                .ok_or("finite maintenance output grouping key is absent")
-        })
-        .collect::<Result<_, _>>()?;
-    let existing = store.completed_maintenance_coordinates(*target, generation)?;
-    for window in common_windows.unwrap_or_default() {
-        if (window.0 as i128 - config.pane_origin_ms.unwrap_or(0) as i128).rem_euclid(width as i128)
-            != 0
-        {
-            continue;
-        }
-        // All definitions and populations are proven before resolving any
-        // target. The publication transaction revalidates every lifetime.
-        let requests = source_sids
-            .iter()
-            .map(|(definition, sid)| (*sid, *definition, BTreeSet::from([window]), group.clone()))
-            .collect::<Vec<_>>();
-        let cohort =
-            store.read_frozen_exact_cohort(&active_generation, &derived.inputs, &requests)?;
-        if cohort
-            .iter()
-            .any(|input| !input.singleton_population_complete)
-        {
-            return Err("finite source cohort has incomplete population proof".into());
-        }
-        let pairs = output_group
-            .iter()
-            .map(|(key, value)| (key.as_str(), value.as_str()))
-            .collect::<Vec<_>>();
-        let attrs = crate::drivers::ingest::population_attrs_fingerprint(
-            config.population_key_encoding,
-            &pairs,
-        )?;
-        let target_sid =
-            store.resolve_output_storage_handle(resolver, *target, &attrs, Some(generation))?;
-        if existing
-            .get(&target_sid)
-            .and_then(|groups| groups.get(&output_group))
-            .is_some_and(|windows| windows.contains(&window))
-        {
-            continue;
-        }
-        execute_completed_maintenance_cohort(
-            store,
-            &active_generation,
-            installed,
-            &plan.materializations,
-            sink,
-            &source_sids,
-            target_sid,
-            window,
-            &group,
-        )?;
-    }
-    Ok(())
-}
-
-/// Evaluate every raw population before one global immutable publication.
-/// Canonical source identities are mandatory; legacy plans retain their
-/// existing singleton path and cannot silently reinterpret old resolver keys.
-fn execute_finite_complete_populations(
-    store: &crate::storage_engines::sketch_db::index::SketchStore,
-    resolver: &crate::drivers::ingest::series_resolver::SeriesIdResolver,
-    plan: &asap_types::precompute_plan::PrecomputePlan,
-    installed: &asap_types::executable_plan::InstalledPostAsapDag,
-    sink: PostAsapNodeId,
-    generation: &Arc<asap_types::sds::CatalogGeneration>,
-) -> Result<(), MaintenanceError> {
-    let target = match installed.binding.node(sink) {
-        Some(BackendNodeBinding::Materialization { stored_output }) => *stored_output,
-        _ => return Err("complete maintenance target is not bound".into()),
-    };
-    let config = plan
-        .materializations
-        .iter()
-        .find(|config| config.policy_fingerprint() == target.fingerprint())
-        .ok_or("complete target config is absent")?;
-    let derived = config
-        .derived_input
-        .as_ref()
-        .ok_or("complete target is not derived")?;
-    let sources = derived
-        .inputs
-        .iter()
-        .map(|definition| {
-            plan.materializations
-                .iter()
-                .find(|source| source.policy_fingerprint() == definition.fingerprint())
-                .ok_or("complete source config is absent")
-        })
-        .collect::<Result<Vec<_>, _>>()?;
-    asap_types::precompute_plan::validated_source_window_cohort(config, &sources)
-        .map_err(|error| error.to_string())?;
-    if std::iter::once(config)
-        .chain(sources.iter().copied())
-        .any(|config| {
-            config.population_key_encoding != asap_types::PopulationKeyEncoding::CanonicalLabelsV1
-                || config.slide_interval.checked_mul(1000) != Some(config.stored_window_ms())
-        })
-    {
-        return Err(
-            "complete population execution requires canonical nonoverlapping full windows".into(),
-        );
-    }
-    let dag = installed.document.decode()?;
-    let target_node = dag
-        .nodes
-        .iter()
-        .find(|node| node.id == sink)
-        .ok_or("complete target node is absent")?;
-    asap_types::precompute_plan::validate_maintenance_reduction(config, target_node)?;
-    if !matches!(&target_node.payload, ExecutableOperatorPayload::SummaryAgg {
-        reduction: planner_types::pre_asap::Reduction::Reduce(keys), ..
-    } if keys.is_empty())
-    {
-        return Err("complete population execution currently requires one global reduction".into());
-    }
-    let mut common_windows: Option<BTreeSet<(u64, u64)>> = None;
-    let mut common_groups: Option<BTreeSet<Population>> = None;
-    for source in &sources {
-        let inventory = store
-            .complete_raw_maintenance_population(source.policy_fingerprint().into(), generation)?;
-        let mut groups = BTreeSet::new();
-        for populations in inventory.values() {
-            for (group, windows) in populations {
-                if !groups.insert(group.clone()) {
-                    return Err(
-                        "complete source repeats a logical population across lifetimes".into(),
-                    );
-                }
-                for (start, end) in windows {
-                    let width = source.stored_window_ms();
-                    if width == 0
-                        || end.checked_sub(*start) != Some(width)
-                        || *end > i64::MAX as u64
-                        || (*start as i128 - source.pane_origin_ms.unwrap_or(0) as i128)
-                            .rem_euclid(width as i128)
-                            != 0
-                    {
-                        return Err(
-                            "complete source window is not an aligned stored full window".into(),
-                        );
-                    }
-                }
-                common_windows = Some(match common_windows {
-                    None => windows.clone(),
-                    Some(previous) => previous.intersection(windows).copied().collect(),
-                });
-            }
-        }
-        if common_groups
-            .as_ref()
-            .is_some_and(|expected| expected != &groups)
-        {
-            return Err("complete arithmetic sources have different population sets".into());
-        }
-        common_groups = Some(groups);
-    }
-    for window in common_windows.unwrap_or_default() {
-        let cohort =
-            store.read_complete_raw_maintenance_cohort(generation, &derived.inputs, window)?;
-        let (dag, key) = prepare_frozen_maintenance_sink(
-            installed,
-            &plan.materializations,
-            sink,
-            cohort.inputs(),
-            window,
-        )?;
-        let digest: [u8; 32] = key
-            .input_lineage
-            .as_slice()
-            .try_into()
-            .map_err(|_| "complete maintenance digest is invalid")?;
-        let output_group = Population::new();
-        let attrs = crate::drivers::ingest::population_attrs_fingerprint(
-            config.population_key_encoding,
-            &[],
-        )?;
-        let target_sid =
-            store.resolve_output_storage_handle(resolver, target, &attrs, Some(generation))?;
-        if store
-            .completed_maintenance_coordinates(target, generation)?
-            .get(&target_sid)
-            .and_then(|groups| groups.get(&output_group))
-            .is_some_and(|windows| windows.contains(&window))
-        {
-            continue;
-        }
-        if store
-            .recover_complete_raw_maintenance_output(target_sid, config, &cohort, digest, window)?
-        {
-            continue;
-        }
-        let (state, computed_group) = execute_prepared_frozen_sink(
-            installed,
-            &plan.materializations,
-            sink,
-            MaintenanceInputs::Complete(&cohort),
-            &dag,
-            key,
-        )?;
-        if computed_group != output_group {
-            return Err("computed complete population differs from the bound global output".into());
-        }
-        let mut output = crate::storage_engines::types::PrecomputedOutput::new(
-            window.0,
-            window.1,
-            Some(crate::storage_engines::types::KeyByLabelValues { labels: Vec::new() }),
-            target.fingerprint(),
-        );
-        output.population_labels = Some(computed_group);
-        output.catalog_generation = Some(Arc::clone(generation));
-        store.publish_complete_raw_maintenance_output(
-            target_sid,
-            config,
-            &output,
-            state.as_ref(),
-            &cohort,
-            digest,
-        )?;
-    }
-    Ok(())
-}
-
-/// Schedule retained, aligned completed windows from the installed DAG after
-/// the finite source barrier. Missing panes remain unavailable to query reads.
-pub(crate) fn execute_finite_maintenance(
-    store: &crate::storage_engines::sketch_db::index::SketchStore,
-    resolver: &crate::drivers::ingest::series_resolver::SeriesIdResolver,
-    plan: &asap_types::precompute_plan::PrecomputePlan,
-) -> Result<(), MaintenanceError> {
-    let generation = plan
-        .summary_catalog
-        .as_ref()
-        .ok_or("finite maintenance requires a catalog generation")?;
-    let active_generation = store
-        .active_catalog_generation()
-        .ok_or("finite maintenance requires an active catalog")?;
-    if active_generation.as_ref() != generation {
-        return Err("finite maintenance catalog generation changed".into());
-    }
-    for installed in plan.executable_dags.values() {
-        for sink in &installed.binding.precompute_sinks {
-            let Some(BackendNodeBinding::Materialization {
-                stored_output: target,
-            }) = installed.binding.node(*sink)
-            else {
-                continue;
-            };
-            let config = plan
-                .materializations
-                .iter()
-                .find(|config| config.policy_fingerprint() == target.fingerprint())
-                .ok_or("maintenance target configuration is absent")?;
-            let Some(derived) = &config.derived_input else {
-                continue;
-            };
-            if config.population_key_encoding
-                == asap_types::PopulationKeyEncoding::CanonicalLabelsV1
-            {
-                execute_finite_complete_populations(
-                    store,
-                    resolver,
-                    plan,
-                    installed,
-                    *sink,
-                    &active_generation,
-                )?;
-                continue;
-            }
-            if derived.inputs.len() > 1 {
-                execute_finite_source_cohort(store, resolver, plan, installed, *sink)?;
-                continue;
-            }
-            if derived.inputs.is_empty() {
-                return Err("finite maintenance requires a source definition".into());
-            }
-            let source = *derived.inputs.first().unwrap();
-            let source_config = plan
-                .materializations
-                .iter()
-                .find(|config| config.policy_fingerprint() == source.fingerprint())
-                .ok_or("maintenance source configuration is absent")?;
-            if source_config.derived_input.is_some() {
-                return Err(
-                    "multi-stage finite maintenance requires topological scheduling".into(),
-                );
-            }
-            let width = config.stored_window_ms();
-            let pane = source_config.stored_window_ms();
-            if width == 0 || pane == 0 || width % pane != 0 || width / pane > 65_536 {
-                return Err("finite maintenance window extent is unsupported".into());
-            }
-            let sources = store.completed_maintenance_coordinates(source, generation)?;
-            if sources.len() > 1 || sources.values().any(|populations| populations.len() != 1) {
-                return Err(
-                    "finite maintenance requires exactly one physical source population".into(),
-                );
-            }
-            let existing = store.completed_maintenance_coordinates(*target, generation)?;
-            for (source_sid, populations) in sources {
-                for (group, windows) in populations {
-                    let output_group: BTreeMap<_, _> = config
-                        .grouping_labels
-                        .iter()
-                        .map(|key| {
-                            group
-                                .get(key)
-                                .cloned()
-                                .map(|value| (key.clone(), value))
-                                .ok_or("maintenance output grouping key is absent")
-                        })
-                        .collect::<Result<_, _>>()?;
-                    let pairs: Vec<_> = output_group
-                        .iter()
-                        .map(|(key, value)| (key.as_str(), value.as_str()))
-                        .collect();
-                    let attrs = crate::drivers::ingest::population_attrs_fingerprint(
-                        config.population_key_encoding,
-                        &pairs,
-                    )?;
-                    let target_sid = store.resolve_output_storage_handle(
-                        resolver,
-                        *target,
-                        &attrs,
-                        Some(generation),
-                    )?;
-                    for (start, _) in &windows {
-                        if (*start as i128 - config.pane_origin_ms.unwrap_or(0) as i128)
-                            .rem_euclid(width as i128)
-                            != 0
-                        {
-                            continue;
-                        }
-                        let Some(end) = start.checked_add(width) else {
-                            continue;
-                        };
-                        if !(0..width / pane).all(|offset| {
-                            let begin = start + offset * pane;
-                            windows.contains(&(begin, begin + pane))
-                        }) {
-                            continue;
-                        }
-                        if existing
-                            .get(&target_sid)
-                            .and_then(|groups| groups.get(&output_group))
-                            .is_some_and(|present| present.contains(&(*start, end)))
-                        {
-                            continue;
-                        }
-                        execute_completed_maintenance_cohort(
-                            store,
-                            &active_generation,
-                            installed,
-                            &plan.materializations,
-                            *sink,
-                            &BTreeMap::from([(source, source_sid)]),
-                            target_sid,
-                            (*start, end),
-                            &group,
-                        )?;
-                    }
-                }
-            }
-        }
-    }
-    Ok(())
-}
-
-struct CommittedState {
-    value: Option<Arc<MaintenanceValue>>,
-    published: bool,
-}
-
-#[derive(Default)]
-struct CommitRegistryState {
-    generation: Option<(u64, u64)>,
-    entries: BTreeMap<MaterializationCommitKey, CommittedState>,
-    frontiers: BTreeMap<asap_types::sds::StoredOutputId, (i64, u64)>,
-    pending_batch: Option<[u8; 32]>,
-    batch_has_published: bool,
-    admitted_keys: BTreeSet<MaterializationCommitKey>,
-}
-
-impl CommitRegistryState {
-    fn validate_key(&self, key: &MaterializationCommitKey) -> Result<(), String> {
-        if self
-            .generation
-            .is_some_and(|generation| generation != (key.plan_id, key.plan_version))
-        {
-            return Err("maintenance retry belongs to an obsolete plan generation".into());
-        }
-        if !self.admitted_keys.contains(key)
-            && self
-                .frontiers
-                .get(&key.stored_output)
-                .is_some_and(|(latest, horizon)| {
-                    key.window_end_ms
-                        <= latest.saturating_sub(i64::try_from(*horizon).unwrap_or(i64::MAX))
-                })
-        {
-            return Err(
-                "maintenance retry is outside the materialization retention horizon".into(),
-            );
-        }
-        Ok(())
-    }
-}
-
-#[derive(Default)]
-struct CommitRegistry(Mutex<CommitRegistryState>);
-
-impl CommitRegistry {
-    fn plan_snapshot(
-        &self,
-        plans: &InstalledPrecomputePlanHandle,
-    ) -> Result<Option<Arc<crate::storage_engines::types::RuntimePhysicalPlan>>, String> {
-        let mut state = self.0.lock().map_err(|_| "commit registry poisoned")?;
-        // Read the authoritative generation while holding the registry lock,
-        // so an old in-flight batch cannot restore an obsolete generation.
-        let plan = plans.active_physical_plan_snapshot();
-        let generation = plan
-            .as_ref()
-            .map(|plan| (plan.plan_id(), plan.plan_version()));
-        if state.generation != generation {
-            state.entries.clear();
-            state.admitted_keys.clear();
-            state.frontiers.clear();
-            state.pending_batch = None;
-            state.batch_has_published = false;
-            state.generation = generation;
-        }
-        Ok(plan)
-    }
-
-    fn begin_batch(&self, digest: [u8; 32]) -> Result<(), String> {
-        let mut state = self.0.lock().map_err(|_| "commit registry poisoned")?;
-        match state.pending_batch {
-            Some(pending) if pending != digest => Err(
-                "maintenance batch retry is pending; retry that batch before submitting new work"
-                    .into(),
-            ),
-            _ => {
-                if state.pending_batch.is_none() {
-                    state.batch_has_published = false;
-                }
-                state.pending_batch = Some(digest);
-                Ok(())
-            }
-        }
-    }
-
-    fn finish_batch(&self, digest: [u8; 32]) -> Result<(), String> {
-        self.complete_batch(digest, &[])
-    }
-
-    fn cancel_unpublished_batch(&self) {
-        if let Ok(mut state) = self.0.lock() {
-            if !state.batch_has_published {
-                state.entries.retain(|_, entry| entry.published);
-                state.pending_batch = None;
-                state.admitted_keys.clear();
-            }
-        }
-    }
-
-    fn complete_batch(
-        &self,
-        digest: [u8; 32],
-        completed: &[(MaterializationCommitKey, u64)],
-    ) -> Result<(), String> {
-        let mut state = self.0.lock().map_err(|_| "commit registry poisoned")?;
-        if state.pending_batch != Some(digest) {
-            return Err("maintenance batch generation changed before completion".into());
-        }
-        for (key, horizon) in completed {
-            if *horizon == 0
-                || state
-                    .generation
-                    .is_some_and(|generation| generation != (key.plan_id, key.plan_version))
-            {
-                return Err("maintenance batch has invalid completion lifecycle".into());
-            }
-            let frontier = state
-                .frontiers
-                .entry(key.stored_output)
-                .or_insert((key.window_end_ms, *horizon));
-            frontier.0 = frontier.0.max(key.window_end_ms);
-            frontier.1 = frontier.1.max(*horizon);
-        }
-        let frontiers = state.frontiers.clone();
-        state.entries.retain(|key, _| {
-            frontiers
-                .get(&key.stored_output)
-                .is_none_or(|(latest, horizon)| {
-                    key.window_end_ms
-                        > latest.saturating_sub(i64::try_from(*horizon).unwrap_or(i64::MAX))
-                })
-        });
-        state.pending_batch = None;
-        state.admitted_keys.clear();
-        state.batch_has_published = false;
-        Ok(())
-    }
-
-    fn pin_admitted(&self, key: &MaterializationCommitKey) -> Result<(), String> {
-        let mut state = self.0.lock().map_err(|_| "commit registry poisoned")?;
-        if state.pending_batch.is_none()
-            || state.generation != Some((key.plan_id, key.plan_version))
-        {
-            return Err("admitted maintenance output has no current batch".into());
-        }
-        state.admitted_keys.insert(key.clone());
-        Ok(())
-    }
-
-    fn is_published(&self, key: &MaterializationCommitKey) -> Result<bool, String> {
-        let state = self.0.lock().map_err(|_| "commit registry poisoned")?;
-        state.validate_key(key)?;
-        Ok(state.entries.get(key).is_some_and(|entry| entry.published))
-    }
-    fn publish(
-        &self,
-        key: &MaterializationCommitKey,
-        emit: impl FnOnce() -> Result<(), Box<dyn std::error::Error + Send + Sync>>,
-    ) -> Result<(), Box<dyn std::error::Error + Send + Sync>> {
-        // Serialize acknowledgement with publication so a concurrent replay
-        // cannot skip an in-flight write that later fails.
-        let mut commits = self.0.lock().map_err(|_| "commit registry poisoned")?;
-        commits.validate_key(key)?;
-        let committed = commits
-            .entries
-            .get_mut(key)
-            .ok_or_else(|| "maintenance result was not committed".to_string())?;
-        if committed.published {
-            Ok(())
-        } else {
-            emit()?;
-            committed.published = true;
-            committed.value = None;
-            commits.batch_has_published = true;
-            Ok(())
-        }
-    }
-}
-
-impl IdempotentCommitSink<MaintenanceValue> for CommitRegistry {
-    type Error = String;
-
-    fn get(
-        &self,
-        key: &MaterializationCommitKey,
-    ) -> Result<Option<Arc<MaintenanceValue>>, Self::Error> {
-        let state = self.0.lock().map_err(|_| "commit registry poisoned")?;
-        state.validate_key(key)?;
-        Ok(state
-            .entries
-            .get(key)
-            .and_then(|committed| committed.value.as_ref().map(Arc::clone)))
-    }
-
-    fn commit_if_absent(
-        &self,
-        key: MaterializationCommitKey,
-        value: Arc<MaintenanceValue>,
-    ) -> Result<Arc<MaintenanceValue>, Self::Error> {
-        let mut commits = self.0.lock().map_err(|_| "commit registry poisoned")?;
-        commits.validate_key(&key)?;
-        let committed = commits
-            .entries
-            .entry(key)
-            .or_insert_with(|| CommittedState {
-                value: Some(Arc::clone(&value)),
-                published: false,
-            });
-        Ok(committed.value.as_ref().map(Arc::clone).unwrap_or(value))
-    }
-}
-
-/// Decorates the ordinary store sink with installed maintenance DAG execution.
-/// With no matching DAG, the source output is forwarded unchanged.
-pub struct PrecomputeDagSink {
-    inner: Arc<dyn OutputSink>,
-    plans: InstalledPrecomputePlanHandle,
-    commits: CommitRegistry,
-    batch_guard: Mutex<()>,
-}
-
-impl PrecomputeDagSink {
-    pub fn new(inner: Arc<dyn OutputSink>, plans: InstalledPrecomputePlanHandle) -> Self {
-        Self {
-            inner,
-            plans,
-            commits: CommitRegistry::default(),
-            batch_guard: Mutex::new(()),
-        }
-    }
-
-    fn execute_one(
-        &self,
-        plan: &crate::storage_engines::types::RuntimePhysicalPlan,
-        output: PrecomputedOutput,
-        state: Box<dyn AggregateCore>,
-    ) -> Result<Vec<PendingOutput>, MaintenanceError> {
-        let source_definition: asap_types::sds::StoredOutputId = output.policy_fp.into();
-        let source: SummaryState = Arc::from(state);
-        let mut derived = Vec::new();
-        let mut matched = false;
-        let mut lineage = Sha256::new();
-        lineage.update(b"asap-maintenance-lineage-v1");
-        let definition_bytes = source_definition.0.to_be_bytes();
-        lineage.update(definition_bytes);
-        if let Some(input) = &output.input_revision {
-            if input.generation.plan_id != plan.plan_id()
-                || input.generation.plan_version != plan.plan_version()
-            {
-                return Err("maintenance input belongs to an obsolete generation".into());
-            }
-            lineage.update(input.first_revision.to_be_bytes());
-            lineage.update(input.revision.to_be_bytes());
-        }
-        let group_bytes = output
-            .key
-            .as_ref()
-            .map(|key| key.serialize_to_bytes())
-            .unwrap_or_default();
-        lineage.update((group_bytes.len() as u64).to_be_bytes());
-        lineage.update(&group_bytes);
-        let state_bytes = source.serialize_to_bytes();
-        lineage.update((state_bytes.len() as u64).to_be_bytes());
-        lineage.update(&state_bytes);
-        let lineage = lineage.finalize().to_vec();
-        drop(state_bytes);
-        for installed in plan.precompute_plan.executable_dags.values() {
-            let dag = installed.document.decode()?;
-            let source_nodes = installed
-                .binding
-                .nodes
-                .iter()
-                .filter_map(|(id, binding)| matches!(binding, BackendNodeBinding::Materialization { stored_output } if *stored_output == source_definition).then_some(*id))
-                .collect::<BTreeSet<_>>();
-            if source_nodes.is_empty() {
-                continue;
-            }
-            let adapter = OperatorAdapter {
-                binding: &installed.binding,
-                inputs: MaintenanceInputs::Live {
-                    definition: source_definition,
-                    state: Arc::clone(&source),
-                },
-                configs: &plan.precompute_plan.materializations,
-            };
-            let mut selected_outputs = Vec::new();
-            let mut horizons = Vec::new();
-            for sink_node in &installed.binding.precompute_sinks {
-                // Derived summaries consume complete immutable windows at the
-                // completion barrier, never additive worker fragments.
-                if matches!(installed.binding.node(*sink_node),
-                    Some(BackendNodeBinding::Materialization { stored_output })
-                        if plan.precompute_plan.materializations.iter().any(|config|
-                            config.policy_fingerprint() == stored_output.fingerprint()
-                                && config.derived_input.is_some()))
-                {
-                    continue;
-                }
-                if !depends_on_any(&dag, *sink_node, &source_nodes) {
-                    continue;
-                }
-                let reachable = dependencies_until(&dag, *sink_node, &source_nodes);
-                let foreign_source = reachable.iter().any(|node| {
-                    let has_input = dag.edges.iter().any(|edge| edge.consumer == *node);
-                    !has_input
-                        && matches!(
-                            installed.binding.node(*node),
-                            Some(BackendNodeBinding::Materialization { stored_output })
-                                if *stored_output != source_definition
-                        )
-                });
-                if foreign_source {
-                    return Err(
-                        "maintenance sink requires synchronized inputs from multiple summary definitions"
-                            .into(),
-                    );
-                }
-                if dag.edges.iter().any(|edge| {
-                    reachable.contains(&edge.consumer)
-                        && !source_nodes.contains(&edge.consumer)
-                        && !matches!(
-                            edge.grouping,
-                            planner_types::post_asap::GroupingEdgeCompatibility::Identical
-                                | planner_types::post_asap::GroupingEdgeCompatibility::NotApplicable
-                        )
-                }) {
-                    return Err(
-                        "maintenance sink requires a cross-group shuffle before summary composition"
-                            .into(),
-                    );
-                }
-                matched = true;
-                let target = match installed.binding.node(*sink_node) {
-                    Some(BackendNodeBinding::Materialization { stored_output }) => *stored_output,
-                    _ => return Err("precompute sink lacks materialization binding".into()),
-                };
-                let key = MaterializationCommitKey {
-                    plan_id: plan.plan_id(),
-                    plan_version: plan.plan_version(),
-                    stored_output: target,
-                    window_start_ms: output.start_timestamp as i64,
-                    window_end_ms: output.end_timestamp as i64,
-                    input_lineage: lineage.clone(),
-                };
-                let config = plan
-                    .precompute_plan
-                    .materializations
-                    .iter()
-                    .find(|config| config.policy_fingerprint() == target.fingerprint())
-                    .ok_or("maintenance sink has no materialization lifecycle")?;
-                // Keep replay receipts for the installed state-retention span,
-                // or one complete window when no longer retention is declared.
-                let horizon_ms = config
-                    .num_aggregates_to_retain
-                    .unwrap_or(1)
-                    .saturating_mul(config.slide_interval)
-                    .max(config.window_size)
-                    .saturating_mul(1_000);
-                // This output was admitted before another worker advanced the
-                // replay floor. The store validates its exact consumed receipt
-                // before publication; it is not an unsolicited expired replay.
-                if output.input_revision.is_some() {
-                    self.commits.pin_admitted(&key)?;
-                }
-                if self.commits.is_published(&key)? {
-                    continue;
-                }
-                selected_outputs.push((*sink_node, key));
-                horizons.push(horizon_ms);
-            }
-            let values = execute_precompute_sinks(
-                &dag,
-                &installed.binding,
-                &selected_outputs,
-                &adapter,
-                &self.commits,
-                maintenance_context(
-                    output.start_timestamp as i64,
-                    output.end_timestamp as i64,
-                    plan.plan_version(),
-                )?,
-            )
-            .map_err(schedule_error)?;
-            for (((_, key), horizon_ms), value) in
-                selected_outputs.into_iter().zip(horizons).zip(values)
-            {
-                let target = key.stored_output;
-                let mut target_output = output.clone();
-                target_output.policy_fp = target.into();
-                target_output.storage_handle = None;
-                derived.push((
-                    Some((key, horizon_ms)),
-                    target_output,
-                    value.state()?.clone_boxed_core(),
-                ));
-            }
-        }
-        if matched {
-            Ok(derived)
-        } else {
-            Ok(vec![(None, output, (*source).clone_boxed_core())])
-        }
-    }
-}
-
-fn schedule_error(error: ScheduleError<MaintenanceError, String>) -> MaintenanceError {
-    match error {
-        ScheduleError::Invalid(e) | ScheduleError::Sink(e) => e.into(),
-        ScheduleError::Operator(e) => e,
-        ScheduleError::Execution(e) => Box::new(e),
-    }
-}
-
-fn depends_on_any(
-    dag: &planner_types::post_asap::ExecutableDag,
-    sink: PostAsapNodeId,
-    sources: &BTreeSet<PostAsapNodeId>,
-) -> bool {
-    !dependencies(dag, sink).is_disjoint(sources)
-}
-
-fn dependencies(
-    dag: &planner_types::post_asap::ExecutableDag,
-    sink: PostAsapNodeId,
-) -> BTreeSet<PostAsapNodeId> {
-    dependencies_until(dag, sink, &BTreeSet::new())
-}
-
-fn dependencies_until(
-    dag: &planner_types::post_asap::ExecutableDag,
-    sink: PostAsapNodeId,
-    frontier: &BTreeSet<PostAsapNodeId>,
-) -> BTreeSet<PostAsapNodeId> {
-    let mut pending = vec![sink];
-    let mut seen = BTreeSet::new();
-    while let Some(node) = pending.pop() {
-        if seen.insert(node) && !frontier.contains(&node) {
-            pending.extend(
-                dag.edges
-                    .iter()
-                    .filter(|edge| edge.consumer == node)
-                    .map(|edge| edge.producer),
-            );
-        }
-    }
-    seen
-}
-
-impl OutputSink for PrecomputeDagSink {
-    fn emit_batch(
-        &self,
-        outputs: Vec<(PrecomputedOutput, Box<dyn AggregateCore>)>,
-    ) -> Result<(), Box<dyn std::error::Error + Send + Sync>> {
-        // One bounded pending batch may be retried. Do not let another worker
-        // advance its frontier while a partially accepted batch is replayable.
-        let _guard = self
-            .batch_guard
-            .lock()
-            .map_err(|_| "maintenance batch lock poisoned")?;
-        let plan = self.commits.plan_snapshot(&self.plans)?;
-        let sinks = plan.as_ref().map_or(0, |plan| {
-            plan.precompute_plan
-                .executable_dags
-                .values()
-                .map(|dag| dag.binding.precompute_sinks.len())
-                .sum::<usize>()
-        });
-        if sinks == 0 {
-            return self.inner.emit_batch(outputs);
-        }
-        const MAX_BATCH_RECEIPTS: usize = 65_536;
-        const MAX_BATCH_SOURCE_BYTES: usize = 64 * 1024 * 1024;
-        if outputs.len().saturating_mul(sinks) > MAX_BATCH_RECEIPTS {
-            return Err(
-                "maintenance batch exceeds bounded receipt budget; split the input batch".into(),
-            );
-        }
-        let mut digest = Sha256::new();
-        digest.update(b"asap-maintenance-batch-v1");
-        let mut source_bytes = 0usize;
-        for (output, state) in &outputs {
-            let bytes = state.serialize_to_bytes();
-            let group = output
-                .key
-                .as_ref()
-                .map(|key| key.serialize_to_bytes())
-                .unwrap_or_default();
-            source_bytes = source_bytes
-                .saturating_add(bytes.len())
-                .saturating_add(group.len());
-            if source_bytes.saturating_mul(sinks) > MAX_BATCH_SOURCE_BYTES {
-                return Err(
-                    "maintenance batch exceeds serialized source budget; split the input batch"
-                        .into(),
-                );
-            }
-            if let Some(input) = &output.input_revision {
-                digest.update(input.first_revision.to_be_bytes());
-                digest.update(input.revision.to_be_bytes());
-            }
-            digest.update(output.policy_fp.0.to_be_bytes());
-            digest.update(output.start_timestamp.to_be_bytes());
-            digest.update(output.end_timestamp.to_be_bytes());
-            digest.update((group.len() as u64).to_be_bytes());
-            digest.update(group);
-            digest.update((bytes.len() as u64).to_be_bytes());
-            digest.update(bytes);
-        }
-        let digest: [u8; 32] = digest.finalize().into();
-        self.commits.begin_batch(digest)?;
-        let mut transformed = Vec::new();
-        for (output, state) in outputs {
-            match self.execute_one(
-                plan.as_ref()
-                    .expect("maintenance DAG requires an active plan"),
-                output,
-                state,
-            ) {
-                Ok(outputs) => transformed.extend(outputs),
-                Err(error) => {
-                    self.commits.cancel_unpublished_batch();
-                    return Err(error.into());
-                }
-            }
-        }
-        if transformed.iter().all(|(key, _, _)| key.is_none()) {
-            self.inner.emit_batch(
-                transformed
-                    .into_iter()
-                    .map(|(_, output, state)| (output, state))
-                    .collect(),
-            )?;
-            self.commits.finish_batch(digest)?;
-            return Ok(());
-        }
-        // The generic sink can partially accept a batch. Acknowledge each
-        // maintained output independently so retries skip only accepted writes.
-        let mut completed = Vec::new();
-        for (key, output, state) in transformed {
-            match key {
-                Some((key, horizon)) => {
-                    self.commits
-                        .publish(&key, || self.inner.emit_batch(vec![(output, state)]))?;
-                    completed.push((key, horizon));
-                }
-                None => self.inner.emit_batch(vec![(output, state)])?,
-            }
-        }
-        // Publication and partial replay use the previous frontier. Advance
-        // only after the complete batch was accepted, so an early pane cannot
-        // lose its receipt merely because a later pane shares its batch.
-        self.commits.complete_batch(digest, &completed)?;
-        Ok(())
-    }
-}
-
-/// Materializations affected by an admitted source update, following installed
-/// semantic dependencies rather than assuming source and output identities match.
-pub(crate) fn affected_materializations(
-    plan: &asap_types::precompute_plan::PrecomputePlan,
-    source: asap_types::sds::StoredOutputId,
-) -> BTreeSet<asap_types::sds::StoredOutputId> {
-    use asap_types::executable_plan::BackendNodeBinding;
-    let mut affected = BTreeSet::from([source]);
-    for installed in plan.executable_dags.values() {
-        let mut reachable = installed.binding.nodes.iter().filter_map(|(node, binding)| {
-            matches!(binding, BackendNodeBinding::Materialization { stored_output } if *stored_output == source).then_some(*node)
-        }).collect::<BTreeSet<_>>();
-        let mut frontier = reachable.iter().copied().collect::<Vec<_>>();
-        while let Some(producer) = frontier.pop() {
-            for edge in &installed.document.edges {
-                let immutable = matches!(installed.binding.node(edge.consumer),
-                    Some(BackendNodeBinding::Materialization { stored_output })
-                        if plan.materializations.iter().any(|config|
-                            config.policy_fingerprint() == stored_output.fingerprint()
-                                && config.derived_input.is_some()));
-                if edge.producer == producer && !immutable && reachable.insert(edge.consumer) {
-                    frontier.push(edge.consumer);
-                }
-            }
-        }
-        for sink in &installed.binding.precompute_sinks {
-            if reachable.contains(sink) {
-                if let Some(BackendNodeBinding::Materialization { stored_output }) =
-                    installed.binding.nodes.get(sink)
-                {
-                    affected.insert(*stored_output);
-                }
-            }
-        }
-    }
-    affected
-}
-
-#[cfg(test)]
-mod tests {
-    fn test_context() -> asap_physical_operators::dag::RunContext {
-        use asap_physical_operators::dag::{Limits, RunContext, Scope};
-        RunContext::new(
-            Scope::Ingestion {
-                window_start_ms: 0,
-                window_end_ms: 10_000,
-                revision: 1,
-            },
-            Limits::default(),
-        )
-        .unwrap()
-    }
-
-    use super::*;
-    use asap_physical_operators::summary_kernels::SumAccumulator;
-    use planner_types::post_asap::{
-        EdgeRole, ExecutableDag, ExecutableDagEdge, GroupingEdgeCompatibility, SummarySchema,
-        WindowEdgeCompatibility,
-    };
-
-    fn definition(value: u64) -> asap_types::sds::StoredOutputId {
-        asap_types::PolicyFingerprint(value).into()
-    }
-
-    fn maintenance_only(
-        mut dag: ExecutableDag,
-        mut binding: BackendExecutableBinding,
-    ) -> (ExecutableDag, BackendExecutableBinding) {
-        let retained = dag
-            .nodes
-            .iter()
-            .filter(|node| {
-                node.output_state.timing == planner_types::post_asap::ExecutionTiming::IngestionTime
-            })
-            .map(|node| node.id)
-            .collect::<BTreeSet<_>>();
-        dag.nodes.retain(|node| retained.contains(&node.id));
-        dag.edges
-            .retain(|edge| retained.contains(&edge.producer) && retained.contains(&edge.consumer));
-        binding.nodes.retain(|id, _| retained.contains(id));
-        dag.root = binding.precompute_sinks[0];
-        (dag, binding)
-    }
-
-    #[test]
-    fn cohort_lineage_is_order_independent_and_binds_every_input() {
-        use crate::storage_engines::sketch_db::index::FrozenExactWindows;
-        let make = |sid, id, value| {
-            let mut state = asap_physical_operators::summary_kernels::SumAccumulator::new();
-            state.update(value);
-            FrozenExactWindows {
-                stored_output_reference: asap_types::sds::StoredOutputReference::for_output(
-                    definition(id),
-                ),
-                storage_handle: sid,
-                definition: definition(id),
-                generation: Arc::new(asap_types::sds::CatalogGeneration {
-                    schema_version: 2,
-                    plan_id: 1,
-                    plan_version: 1,
-                    snapshot_sha256: "0".repeat(64),
-                }),
-                group: BTreeMap::from([("instance".into(), sid.to_string())]),
-                windows: BTreeMap::from([((0, 1000), Arc::new(state) as SummaryState)]),
-                singleton_population_complete: false,
-            }
-        };
-        let expected = asap_types::derived_input::DerivedInputIdentity {
-            inputs: BTreeSet::from([definition(1), definition(2)]),
-            program_sha256: "1".repeat(64),
-        };
-        let baseline =
-            frozen_cohort_lineage(&[make(10, 1, 3.0), make(20, 2, 5.0)], &expected).unwrap();
-        let mut relocated = make(20, 2, 5.0);
-        relocated.storage_handle = 999;
-        assert_eq!(
-            baseline,
-            frozen_cohort_lineage(&[make(10, 1, 3.0), relocated], &expected).unwrap(),
-            "local row relocation must not change stored-output lineage"
-        );
-        assert_eq!(
-            baseline,
-            frozen_cohort_lineage(&[make(20, 2, 5.0), make(10, 1, 3.0)], &expected).unwrap()
-        );
-        assert_ne!(
-            baseline,
-            frozen_cohort_lineage(&[make(10, 1, 3.0), make(20, 2, 6.0)], &expected).unwrap()
-        );
-        assert_ne!(
-            baseline,
-            frozen_cohort_lineage(&[make(10, 1, 3.0), make(21, 2, 5.0)], &expected).unwrap()
-        );
-        let mut changed_output = make(20, 2, 5.0);
-        changed_output.stored_output_reference.stored_output_id.0 += 100;
-        assert!(frozen_cohort_lineage(&[make(10, 1, 3.0), changed_output], &expected).is_err());
-        let mut changed = make(20, 2, 5.0);
-        changed.group.insert("instance".into(), "other".into());
-        assert_ne!(
-            baseline,
-            frozen_cohort_lineage(&[make(10, 1, 3.0), changed], &expected).unwrap()
-        );
-        let mut changed = make(20, 2, 5.0);
-        let state = changed.windows.remove(&(0, 1000)).unwrap();
-        changed.windows.insert((1000, 2000), state);
-        assert_ne!(
-            baseline,
-            frozen_cohort_lineage(&[make(10, 1, 3.0), changed], &expected).unwrap()
-        );
-        let mut changed = make(20, 2, 5.0);
-        Arc::make_mut(&mut changed.generation).plan_version += 1;
-        assert!(frozen_cohort_lineage(&[make(10, 1, 3.0), changed], &expected).is_err());
-        assert!(frozen_cohort_lineage(&[make(10, 1, 3.0)], &expected).is_err());
-        assert!(frozen_cohort_lineage(
-            &[make(10, 1, 3.0), make(10, 1, 3.0), make(20, 2, 5.0)],
-            &expected
-        )
-        .is_err());
-    }
-
-    // Ingestion adapters must execute native operators in the parent's scope.
-    #[test]
-    fn native_merge_uses_the_parent_budget_and_cancellation() {
-        let input = Arc::new(MaintenanceValue::summary(Arc::new(
-            SumAccumulator::with_sum(3.),
-        )));
-        let context = test_context();
-        let output = merge_inputs(&[Arc::clone(&input)], &context).unwrap();
-        assert_eq!(
-            output
-                .state()
-                .unwrap()
-                .query_statistic(asap_types::Statistic::Sum, &None, &Default::default())
-                .unwrap(),
-            3.
-        );
-        assert!(context.peak_bytes() > 0);
-        context.cancel();
-        let error = merge_inputs(&[input], &context).err().unwrap();
-        let error = error
-            .downcast_ref::<asap_physical_operators::dag::Error>()
-            .expect("native cancellation must retain its physical error type");
-        fn cause(
-            error: &asap_physical_operators::dag::Error,
-        ) -> &asap_physical_operators::dag::Error {
-            match error {
-                asap_physical_operators::dag::Error::AtNode { source, .. } => cause(source),
-                error => error,
-            }
-        }
-        assert_eq!(
-            cause(error),
-            &asap_physical_operators::dag::Error::Cancelled
-        );
-    }
-
-    fn node(id: u32) -> ExecutableDagNode {
-        ExecutableDagNode {
-            id: PostAsapNodeId(id),
-            payload: ExecutableOperatorPayload::SummaryMerge,
-            output_state: planner_types::post_asap::ExecutionDataState::INGESTION_SUMMARY,
-            output_schema: SummarySchema {
-                fields: vec![],
-                time_index: None,
-            },
-            guarantee: None,
-        }
-    }
-
-    fn edge(producer: u32, consumer: u32) -> ExecutableDagEdge {
-        ExecutableDagEdge {
-            producer: PostAsapNodeId(producer),
-            consumer: PostAsapNodeId(consumer),
-            role: EdgeRole::Input,
-            intermediate_schema: SummarySchema {
-                fields: vec![],
-                time_index: None,
-            },
-            data_state: planner_types::post_asap::ExecutionDataState::INGESTION_SUMMARY,
-            grouping: GroupingEdgeCompatibility::Identical,
-            window: WindowEdgeCompatibility::NotApplicable,
-        }
-    }
-
-    fn sum(value: f64) -> SummaryState {
-        let mut accumulator = SumAccumulator::new();
-        accumulator.update(value);
-        Arc::new(accumulator)
-    }
-
-    #[test]
-    fn frozen_adapter_resolves_each_materialized_frontier_without_aliasing() {
-        use planner_types::post_asap::{ExactKind, ExactParams, SummaryFamilyType, SummaryField};
-        let make = |id| crate::storage_engines::sketch_db::index::FrozenExactWindows {
-            stored_output_reference: asap_types::sds::StoredOutputReference::for_output(
-                definition(id),
-            ),
-            storage_handle: id,
-            definition: definition(id),
-            generation: Arc::new(asap_types::sds::CatalogGeneration {
-                schema_version: 2,
-                plan_id: 1,
-                plan_version: 1,
-                snapshot_sha256: "0".repeat(64),
-            }),
-            group: BTreeMap::new(),
-            windows: BTreeMap::from([((0, 1000), sum(id as f64))]),
-            singleton_population_complete: false,
-        };
-        let inputs = [make(1), make(2)];
-        let binding = BackendExecutableBinding {
-            nodes: [(1, definition(1)), (2, definition(2)), (3, definition(3))]
-                .into_iter()
-                .map(|(id, stored_output)| {
-                    (
-                        PostAsapNodeId(id),
-                        BackendNodeBinding::Materialization { stored_output },
-                    )
-                })
-                .collect(),
-            query_sink: PostAsapNodeId(3),
-            query_plan_sink: asap_types::query_plan::QueryNodeId(3),
-            precompute_sinks: vec![PostAsapNodeId(3)],
-        };
-        let adapter = OperatorAdapter {
-            binding: &binding,
-            inputs: MaintenanceInputs::Frozen(&inputs),
-            configs: &[],
-        };
-        let source_node = |id| {
-            let mut source = node(id);
-            source.output_schema.fields = vec![SummaryField {
-                name: "state".into(),
-                dtype: SummaryFamilyType::ExactAggregate(ExactKind::Sum, ExactParams::Sum),
-                nullable: false,
-            }];
-            source
-        };
-        let first = adapter
-            .materialized_input(&source_node(1))
-            .unwrap()
-            .unwrap();
-        let second = adapter
-            .materialized_input(&source_node(2))
-            .unwrap()
-            .unwrap();
-        assert!(adapter
-            .materialized_input(&source_node(3))
-            .unwrap()
-            .is_none());
-        let merged = adapter
-            .execute(
-                &node(3),
-                &[Arc::new(first), Arc::new(second)],
-                test_context(),
-            )
-            .unwrap();
-        assert_eq!(
-            merged
-                .state()
-                .unwrap()
-                .query_statistic(
-                    asap_types::Statistic::Sum,
-                    &None,
-                    &std::collections::HashMap::new()
-                )
-                .unwrap(),
-            3.0
-        );
-        let ambiguous = [make(1), make(1)];
-        let adapter = OperatorAdapter {
-            binding: &binding,
-            inputs: MaintenanceInputs::Frozen(&ambiguous),
-            configs: &[],
-        };
-        assert!(adapter.materialized_input(&source_node(1)).is_err());
-    }
-
-    #[test]
-    fn finalized_summary_update_builds_a_different_installed_family() {
-        use planner_types::post_asap::{
-            ExactKind, ExactParams, GroupingStrategy, SummaryFamilyType, SummaryField,
-            SummaryInputExpr, SummaryUpdate,
-        };
-        use planner_types::pre_asap::{DataType, Reduction};
-        let mut snapshot: serde_json::Value = serde_json::from_str(include_str!(
-            "../../../docs/examples/asapquery-planning-snapshot.json"
-        ))
-        .unwrap();
-        snapshot["query_workload"]["repeating_queries"][0]["query"] =
-            "sum(sum_over_time(m[1m]))".into();
-        let snapshot: control_plane::physical::compiler::BackendLocalPlanningInput =
-            serde_json::from_value(snapshot).unwrap();
-        let bundle = crate::tests::test_utilities::planning::quoted_snapshot(snapshot, false)
-            .compile_promql()
-            .unwrap();
-        let mut source_config = bundle.precompute_plan.materializations[0].clone();
-        // This operator fixture supplies global raw populations; its config
-        // must agree with the explicit Reduce([]) below.
-        source_config.partitioning = Some(asap_types::sds::PopulationPartitioning::Grouped);
-        source_config.grouping_labels = std::iter::empty::<String>().collect();
-        source_config.window_size = 2;
-        source_config.slide_interval = 2;
-        source_config.window_type = asap_types::WindowKind::Tumbling;
-        source_config.window_layout =
-            asap_types::aggregation_config::WindowMaterializationLayout::Pane { pane_secs: 1 };
-        let source_definition = source_config.policy_fingerprint().into();
-        let mut target_config = source_config.clone();
-        target_config.window_layout =
-            asap_types::aggregation_config::WindowMaterializationLayout::FullWindow;
-        target_config.aggregation_type = asap_types::AggregationType::DatasketchesKLL;
-        target_config.aggregation_sub_type = "quantile".into();
-        target_config
-            .parameters
-            .insert("k".into(), serde_json::json!(200));
-        let target = target_config.policy_fingerprint().into();
-        let target_family = target_config.accumulator_spec().unwrap().family;
-        let configs = [source_config, target_config];
-        let binding = BackendExecutableBinding {
-            nodes: BTreeMap::from([
-                (
-                    PostAsapNodeId(1),
-                    BackendNodeBinding::Materialization {
-                        stored_output: source_definition,
-                    },
-                ),
-                (PostAsapNodeId(2), BackendNodeBinding::MaintenanceInput),
-                (
-                    PostAsapNodeId(3),
-                    BackendNodeBinding::Materialization {
-                        stored_output: target,
-                    },
-                ),
-            ]),
-            query_sink: PostAsapNodeId(3),
-            query_plan_sink: control_plane::query_plan::QueryNodeId(3),
-            precompute_sinks: vec![PostAsapNodeId(3)],
-        };
-        let frozen_inputs = [
-            crate::storage_engines::sketch_db::index::FrozenExactWindows {
-                stored_output_reference: asap_types::sds::StoredOutputReference::for_output(
-                    source_definition,
-                ),
-                storage_handle: 1,
-                definition: source_definition,
-                generation: Arc::new(asap_types::sds::CatalogGeneration {
-                    schema_version: 2,
-                    plan_id: 1,
-                    plan_version: 1,
-                    snapshot_sha256: "0".repeat(64),
-                }),
-                group: BTreeMap::new(),
-                windows: BTreeMap::from([((0, 1000), sum(7.0))]),
-                singleton_population_complete: false,
-            },
-        ];
-        let adapter = OperatorAdapter {
-            binding: &binding,
-            inputs: MaintenanceInputs::Frozen(&frozen_inputs),
-            configs: &configs,
-        };
-        let mut read = node(2);
-        read.payload = ExecutableOperatorPayload::Value {
-            operation: planner_types::post_asap::ValueOperation::FinalizeExactAccumulator,
-        };
-        read.output_schema.fields = vec![SummaryField {
-            name: "value".into(),
-            dtype: SummaryFamilyType::Plain(DataType::Float64),
-            nullable: false,
-        }];
-        let source = Arc::new(MaintenanceValue::Summary {
-            state: sum(7.0),
-            family: Some(SummaryFamilyType::ExactAggregate(
-                ExactKind::Sum,
-                ExactParams::Sum,
-            )),
-        });
-        let row = adapter.execute(&read, &[source], test_context()).unwrap();
-        let mut aggregate = node(3);
-        aggregate.payload = ExecutableOperatorPayload::SummaryAgg {
-            family: target_family,
-            input: SummaryUpdate {
-                item: None,
-                weight: SummaryInputExpr::Constant(3.0),
-                weight_domain: Default::default(),
-            },
-            reduction: Reduction::by(vec![]),
-            grouping: GroupingStrategy::default(),
-        };
-        let result = adapter
-            .execute(&aggregate, &[Arc::new(row)], test_context())
-            .unwrap();
-        let mut kwargs = std::collections::HashMap::new();
-        kwargs.insert("quantile".into(), "0.5".into());
-        assert_eq!(
-            result
-                .state()
-                .unwrap()
-                .query_statistic(asap_types::Statistic::Quantile, &None, &kwargs)
-                .unwrap(),
-            3.0
-        );
-        // Exercise the same registry through the production topological
-        // scheduler, including the precomputed source frontier and commit.
-        let mut source_node = node(1);
-        source_node.output_schema.fields = vec![SummaryField {
-            name: "state".into(),
-            dtype: SummaryFamilyType::ExactAggregate(ExactKind::Sum, ExactParams::Sum),
-            nullable: false,
-        }];
-        read.output_state = planner_types::post_asap::ExecutionDataState::INGESTION_ROWS;
-        aggregate.output_schema.fields = vec![SummaryField {
-            name: "state".into(),
-            dtype: configs[1].accumulator_spec().unwrap().family,
-            nullable: false,
-        }];
-        let mut query = node(4);
-        query.output_state = planner_types::post_asap::ExecutionDataState::QUERY_ROWS;
-        let mut first_edge = edge(1, 2);
-        first_edge.intermediate_schema = source_node.output_schema.clone();
-        let mut second_edge = edge(2, 3);
-        second_edge.intermediate_schema = read.output_schema.clone();
-        second_edge.data_state = read.output_state;
-        let mut query_edge = edge(3, 4);
-        query_edge.intermediate_schema = aggregate.output_schema.clone();
-        let dag = ExecutableDag {
-            nodes: vec![source_node, read, aggregate, query],
-            edges: vec![first_edge, second_edge, query_edge],
-            root: PostAsapNodeId(4),
-        };
-        let mut scheduled_binding = binding.clone();
-        scheduled_binding.nodes.insert(
-            PostAsapNodeId(1),
-            BackendNodeBinding::Materialization {
-                stored_output: source_definition,
-            },
-        );
-        scheduled_binding
-            .nodes
-            .insert(PostAsapNodeId(2), BackendNodeBinding::MaintenanceInput);
-        scheduled_binding.nodes.insert(
-            PostAsapNodeId(4),
-            BackendNodeBinding::Query {
-                query_node: control_plane::query_plan::QueryNodeId(4),
-            },
-        );
-        scheduled_binding.query_sink = PostAsapNodeId(4);
-        scheduled_binding.query_plan_sink = control_plane::query_plan::QueryNodeId(4);
-        let (dag, scheduled_binding) = maintenance_only(dag, scheduled_binding);
-        let scheduled_adapter = OperatorAdapter {
-            binding: &scheduled_binding,
-            ..adapter
-        };
-        let key = MaterializationCommitKey {
-            plan_id: 1,
-            plan_version: 1,
-            stored_output: target,
-            window_start_ms: 0,
-            window_end_ms: 1000,
-            input_lineage: vec![1],
-        };
-        let committed = execute_precompute_sink(
-            &dag,
-            &scheduled_binding,
-            PostAsapNodeId(3),
-            key,
-            &scheduled_adapter,
-            &CommitRegistry::default(),
-            test_context(),
-        )
-        .unwrap();
-        assert_eq!(
-            committed
-                .state()
-                .unwrap()
-                .query_statistic(asap_types::Statistic::Quantile, &None, &kwargs)
-                .unwrap(),
-            3.0
-        );
-        // The real store provides the completion proof. Execute, persist,
-        // restart, and retry the same installed subDAG without additive append.
-        use crate::storage_engines::sketch_db::index::{
-            persistence::config::SketchStorePersistenceConfig, SketchStore,
-        };
-        use asap_types::executable_plan::{InstalledPostAsapDag, OwnedPostAsapDag};
-        let mut document =
-            OwnedPostAsapDag::from_executable("immutable-chain".into(), &dag).unwrap();
-        let mut durable_configs = configs.to_vec();
-        durable_configs[1].derived_input = Some(
-            asap_types::derived_input::DerivedInputIdentity::from_dag(
-                &document,
-                PostAsapNodeId(2),
-                &BTreeMap::from([(PostAsapNodeId(1), source_definition)]),
-            )
-            .unwrap(),
-        );
-        document.schema_version = asap_types::executable_plan::PRECOMPUTE_DAG_SCHEMA_VERSION;
-        let mut durable_binding = scheduled_binding.clone();
-        durable_binding.nodes.insert(
-            PostAsapNodeId(3),
-            BackendNodeBinding::Materialization {
-                stored_output: durable_configs[1].policy_fingerprint().into(),
-            },
-        );
-        let installed = InstalledPostAsapDag {
-            document,
-            binding: durable_binding,
-        };
-        let catalog = Arc::new(
-            asap_types::summary_catalog::SummaryCatalog::from_materializations(
-                1,
-                1,
-                &durable_configs,
-            )
-            .unwrap(),
-        );
-        let directory = tempfile::tempdir().unwrap();
-        let persistence_config = || {
-            let mut config = SketchStorePersistenceConfig::with_memory_limit(
-                1 << 24,
-                directory.path().to_path_buf(),
-            );
-            config.delete_older_than_ms = None;
-            config.hot_window_ms = None;
-            config.flush_interval = std::time::Duration::from_millis(5);
-            config
-        };
-        let expected = BTreeSet::from([(0, 1000), (1000, 2000)]);
-        let mut store = Arc::new(SketchStore::new());
-        store.install_summary_catalog(Arc::clone(&catalog)).unwrap();
-        let mut persistence = store.start_persistence(persistence_config()).unwrap();
-        let generation = store.active_catalog_generation().unwrap();
-        for ((start, end), value) in [((0, 1000), 2.0), ((1000, 2000), 7.0)] {
-            let coordinate = asap_types::sds::SummaryInstanceCoordinates {
-                stored_output_id: source_definition,
-                time_range: asap_types::sds::HalfOpenTimeRange {
-                    start_ms: start,
-                    end_ms: end,
-                },
-                group_values: BTreeMap::new(),
-            };
-            let revision = store
-                .admit_summary_updates(&generation, BTreeSet::from([coordinate.clone()]))
-                .unwrap();
-            let mut output = PrecomputedOutput::new(
-                start as u64,
-                end as u64,
-                None,
-                durable_configs[0].policy_fingerprint(),
-            );
-            output.catalog_generation = Some(Arc::clone(&generation));
-            store
-                .publish_admitted_summary_update(
-                    &generation,
-                    &coordinate,
-                    revision,
-                    revision,
-                    120_000,
-                    |writer| {
-                        writer.ingest_precompute_with_series_id(
-                            600,
-                            &durable_configs[0],
-                            &output,
-                            sum(value).as_ref(),
-                        )
-                    },
-                )
-                .unwrap();
-        }
-        assert!(store
-            .read_frozen_exact_windows(
-                600,
-                source_definition,
-                &generation,
-                &expected,
-                &BTreeMap::new()
-            )
-            .is_err());
-        let deadline =
-            crate::tests::test_utilities::timing::deadline(std::time::Duration::from_secs(5));
-        while !store.seal_finite_summary_input(&generation).unwrap() {
-            assert!(std::time::Instant::now() < deadline);
-            std::thread::sleep(std::time::Duration::from_millis(5));
-        }
-        let mut rejected_output =
-            PrecomputedOutput::new(2000, 3000, None, durable_configs[0].policy_fingerprint());
-        rejected_output.catalog_generation = Some(Arc::clone(&generation));
-        rejected_output.input_revision = Some(Arc::new(
-            crate::storage_engines::types::precomputed_output::SummaryInputRevision {
-                generation: Arc::clone(&generation),
-                first_revision: 1,
-                revision: 1,
-            },
-        ));
-        assert!(store
-            .ingest_precompute_with_series_id(
-                600,
-                &durable_configs[0],
-                &rejected_output,
-                sum(99.0).as_ref()
-            )
-            .is_none());
-        assert_eq!(
-            store
-                .completed_maintenance_coordinates(source_definition, &generation)
-                .unwrap(),
-            BTreeMap::from([(600, BTreeMap::from([(BTreeMap::new(), expected.clone())]))])
-        );
-        let frozen = store
-            .read_frozen_exact_windows(
-                600,
-                source_definition,
-                &generation,
-                &expected,
-                &BTreeMap::new(),
-            )
-            .unwrap();
-        let (result, digest) = evaluate_frozen_maintenance_sink(
-            &installed,
-            &durable_configs,
-            PostAsapNodeId(3),
-            &frozen,
-            (0, 2000),
-        )
-        .unwrap();
-        let mut output =
-            PrecomputedOutput::new(0, 2000, None, durable_configs[1].policy_fingerprint());
-        output.catalog_generation = Some(Arc::clone(&generation));
-        let log = persistence.manifest.log_path();
-        let backup = log.with_extension("saved");
-        std::fs::rename(&log, &backup).unwrap();
-        std::fs::create_dir(&log).unwrap();
-        assert!(execute_completed_maintenance(
-            &store,
-            &installed,
-            &durable_configs,
-            PostAsapNodeId(3),
-            600,
-            601,
-            (0, 2000),
-            &BTreeMap::new()
-        )
-        .is_err());
-        std::fs::remove_dir(&log).unwrap();
-        std::fs::rename(&backup, &log).unwrap();
-        persistence.shutdown();
-        drop(store);
-        store = Arc::new(SketchStore::new());
-        store.install_summary_catalog(Arc::clone(&catalog)).unwrap();
-        persistence = store.start_persistence(persistence_config()).unwrap();
-        // The already durable pending KLL part is completed before a new
-        // randomized sketch can be built after restart.
-        assert!(!execute_completed_maintenance(
-            &store,
-            &installed,
-            &durable_configs,
-            PostAsapNodeId(3),
-            600,
-            601,
-            (0, 2000),
-            &BTreeMap::new(),
-        )
-        .unwrap());
-        assert!(!execute_completed_maintenance(
-            &store,
-            &installed,
-            &durable_configs,
-            PostAsapNodeId(3),
-            600,
-            601,
-            (0, 2000),
-            &BTreeMap::new()
-        )
-        .unwrap());
-        assert_eq!(
-            result
-                .query_statistic(asap_types::Statistic::Quantile, &None, &kwargs)
-                .unwrap(),
-            3.0
-        );
-        let mut correction =
-            PrecomputedOutput::new(0, 1000, None, durable_configs[0].policy_fingerprint());
-        correction.catalog_generation = Some(Arc::clone(&generation));
-        assert!(store
-            .ingest_precompute_with_series_id(
-                600,
-                &durable_configs[0],
-                &correction,
-                sum(100.0).as_ref()
-            )
-            .is_none());
-        persistence.shutdown();
-        drop(store);
-        let restored = Arc::new(SketchStore::new());
-        restored.install_summary_catalog(catalog).unwrap();
-        let mut persistence = restored.start_persistence(persistence_config()).unwrap();
-        let frozen = restored
-            .read_frozen_exact_windows(
-                600,
-                source_definition,
-                &generation,
-                &expected,
-                &BTreeMap::new(),
-            )
-            .unwrap();
-        let (_result, replay_digest) = evaluate_frozen_maintenance_sink(
-            &installed,
-            &durable_configs,
-            PostAsapNodeId(3),
-            &frozen,
-            (0, 2000),
-        )
-        .unwrap();
-        assert_eq!(digest, replay_digest);
-        assert!(!execute_completed_maintenance(
-            &restored,
-            &installed,
-            &durable_configs,
-            PostAsapNodeId(3),
-            600,
-            601,
-            (0, 2000),
-            &BTreeMap::new()
-        )
-        .unwrap());
-        assert!(restored
-            .ingest_precompute_with_series_id(
-                600,
-                &durable_configs[0],
-                &correction,
-                sum(100.0).as_ref()
-            )
-            .is_none());
-        let target_entries = persistence
-            .manifest
-            .live_parts()
-            .iter()
-            .map(|part| {
-                let path = crate::storage_engines::sketch_db::persistence::part::part_dir_path(
-                    &persistence.parts_root,
-                    part.part_id,
-                );
-                crate::storage_engines::sketch_db::persistence::part::PartReader::open(&path)
-                    .unwrap()
-                    .index_records()
-                    .into_iter()
-                    .filter(|entry| entry.agg_id == 601)
-                    .count()
-            })
-            .sum::<usize>();
-        assert_eq!(target_entries, 1);
-        let next_catalog = Arc::new(
-            asap_types::summary_catalog::SummaryCatalog::from_materializations(
-                1,
-                2,
-                &durable_configs,
-            )
-            .unwrap(),
-        );
-        restored.install_summary_catalog(next_catalog).unwrap();
-        let next_generation = restored.active_catalog_generation().unwrap();
-        assert!(restored
-            .series_ids_for_policy(durable_configs[1].policy_fingerprint())
-            .is_empty());
-        assert!(restored
-            .authorize_series_reactivation(601, durable_configs[1].policy_fingerprint().into())
-            .unwrap()
-            .is_some());
-        let mut new_population =
-            PrecomputedOutput::new(0, 1000, None, durable_configs[0].policy_fingerprint());
-        new_population.catalog_generation = Some(next_generation);
-        assert_eq!(
-            restored.ingest_precompute_with_series_id(
-                602,
-                &durable_configs[0],
-                &new_population,
-                sum(20.0).as_ref()
-            ),
-            Some(602)
-        );
-        assert!(restored
-            .series_ids_for_policy(durable_configs[1].policy_fingerprint())
-            .is_empty());
-        persistence.shutdown();
-        exercise_two_source_completed_sink(&dag, &configs, &scheduled_binding, true, false);
-        exercise_two_source_completed_sink(&dag, &configs, &scheduled_binding, false, false);
-        exercise_two_source_completed_sink(&dag, &configs, &scheduled_binding, true, true);
-        exercise_two_source_completed_sink(&dag, &configs, &scheduled_binding, false, true);
-        assert!(evaluate_weight(
-            &SummaryInputExpr::Column(planner_types::pre_asap::ColumnRef::Named("missing".into())),
-            7.0,
-            "value"
-        )
-        .is_err());
-    }
-
-    fn exercise_two_source_completed_sink(
-        template: &ExecutableDag,
-        configs: &[asap_types::PrecomputeMaterialization],
-        binding: &BackendExecutableBinding,
-        matching_windows: bool,
-        complete_groups: bool,
-    ) {
-        // A bound operator fixture, not a claim that a frontend selected this
-        // composition. Both actual durable sources are required before output.
-        use crate::storage_engines::sketch_db::index::{
-            persistence::config::SketchStorePersistenceConfig, SketchStore,
-        };
-        use asap_types::executable_plan::{InstalledPostAsapDag, OwnedPostAsapDag};
-        let mut first = configs[0].clone();
-        first.window_layout = asap_types::WindowMaterializationLayout::FullWindow;
-        if complete_groups {
-            first.population_key_encoding = asap_types::PopulationKeyEncoding::CanonicalLabelsV1;
-            first.partitioning = Some(asap_types::sds::PopulationPartitioning::PerEntity);
-        }
-        let mut second = first.clone();
-        second.metric = "second_maintenance_source".into();
-        let first_id = first.policy_fingerprint().into();
-        let second_id = second.policy_fingerprint().into();
-        let mut dag = template.clone();
-        let mut second_node = dag
-            .nodes
-            .iter()
-            .find(|node| node.id == PostAsapNodeId(1))
-            .unwrap()
-            .clone();
-        second_node.id = PostAsapNodeId(5);
-        let mut merge = second_node.clone();
-        merge.id = PostAsapNodeId(6);
-        merge.payload = ExecutableOperatorPayload::SummaryMerge;
-        dag.nodes.extend([second_node, merge]);
-        let original = dag
-            .edges
-            .iter()
-            .find(|edge| edge.producer == PostAsapNodeId(1) && edge.consumer == PostAsapNodeId(2))
-            .unwrap()
-            .clone();
-        dag.edges.retain(|edge| {
-            !(edge.producer == PostAsapNodeId(1) && edge.consumer == PostAsapNodeId(2))
-        });
-        for (producer, consumer) in [(1, 6), (5, 6), (6, 2)] {
-            let mut edge = original.clone();
-            edge.producer = PostAsapNodeId(producer);
-            edge.consumer = PostAsapNodeId(consumer);
-            dag.edges.push(edge);
-        }
-        if let ExecutableOperatorPayload::SummaryAgg { input, .. } = &mut dag
-            .nodes
-            .iter_mut()
-            .find(|node| node.id == PostAsapNodeId(3))
-            .unwrap()
-            .payload
-        {
-            input.weight = planner_types::post_asap::SummaryInputExpr::Column(
-                planner_types::pre_asap::ColumnRef::SampleValue,
-            );
-        }
-        let mut document =
-            OwnedPostAsapDag::from_executable("two-source-fixture".into(), &dag).unwrap();
-        let mut target = configs[1].clone();
-        if complete_groups {
-            target.population_key_encoding = asap_types::PopulationKeyEncoding::CanonicalLabelsV1;
-        }
-        target.derived_input = Some(
-            asap_types::derived_input::DerivedInputIdentity::from_dag(
-                &document,
-                PostAsapNodeId(2),
-                &BTreeMap::from([
-                    (PostAsapNodeId(1), first_id),
-                    (PostAsapNodeId(5), second_id),
-                ]),
-            )
-            .unwrap(),
-        );
-        document.schema_version = asap_types::executable_plan::PRECOMPUTE_DAG_SCHEMA_VERSION;
-        let mut binding = binding.clone();
-        for (node, stored_output) in [
-            (1, first_id),
-            (5, second_id),
-            (3, target.policy_fingerprint().into()),
-        ] {
-            binding.nodes.insert(
-                PostAsapNodeId(node),
-                BackendNodeBinding::Materialization { stored_output },
-            );
-        }
-        binding
-            .nodes
-            .insert(PostAsapNodeId(6), BackendNodeBinding::MaintenanceInput);
-        let installed = InstalledPostAsapDag { document, binding };
-        let configs = [first, second, target];
-        let catalog = Arc::new(
-            asap_types::summary_catalog::SummaryCatalog::from_materializations(2, 1, &configs)
-                .unwrap(),
-        );
-        let directory = tempfile::tempdir().unwrap();
-        let persistence_config = || {
-            let mut config =
-                SketchStorePersistenceConfig::with_memory_limit(1 << 24, directory.path().into());
-            config.delete_older_than_ms = None;
-            config.hot_window_ms = None;
-            // Keep the background flush cadence well inside the seal deadline.
-            config.flush_interval = std::time::Duration::from_millis(5);
-            config
-        };
-        let store = Arc::new(SketchStore::new());
-        store.install_summary_catalog(Arc::clone(&catalog)).unwrap();
-        let mut persistence = store.start_persistence(persistence_config()).unwrap();
-        let generation = store.active_catalog_generation().unwrap();
-        let sources = BTreeMap::from([(first_id, 800), (second_id, 801)]);
-        // A bound scheduler fixture; actual frontend selection is tested separately.
-        let mut plan = asap_types::precompute_plan::PrecomputePlan::build_backend_local(
-            asap_types::precompute_plan::PlanEnvelope {
-                plan_id: 2,
-                plan_version: 1,
-                generated_at_unix_ms: 0,
-                activation_unix_ms: 0,
-                expiry_unix_ms: None,
-                backend_compat: asap_types::precompute_plan::BACKEND_COMPAT.into(),
-                planner_revision: "scheduler-fixture".into(),
-                capability_snapshot_id: "scheduler-fixture".into(),
-            },
-            configs[..2]
-                .iter()
-                .cloned()
-                .map(|mut config| {
-                    // This is a bound runtime fixture; actual canonical installation
-                    // is tested with the real compiler/process integration separately.
-                    config.population_key_encoding =
-                        asap_types::PopulationKeyEncoding::LegacyDelimited;
-                    config
-                })
-                .collect(),
-        )
-        .unwrap();
-        plan.materializations = configs.to_vec();
-        plan.summary_catalog = Some(generation.as_ref().clone());
-        plan.executable_dags = BTreeMap::from([("cohort-fixture".into(), installed.clone())]);
-        let resolver_path = directory.path().join("resolver.wal");
-        let resolver =
-            crate::drivers::ingest::series_resolver::SeriesIdResolver::open(resolver_path.clone())
-                .unwrap();
-
-        for (index, value) in [2.0, 7.0].into_iter().enumerate() {
-            let config = &configs[index];
-            let start = if !matching_windows && index == 1 {
-                2000
-            } else {
-                0
-            };
-            for population_index in 0..if complete_groups { 2 } else { 1 } {
-                let population = if complete_groups {
-                    BTreeMap::from([("instance".to_string(), population_index.to_string())])
-                } else {
-                    BTreeMap::new()
-                };
-                let coordinate = asap_types::sds::SummaryInstanceCoordinates {
-                    stored_output_id: config.policy_fingerprint().into(),
-                    time_range: asap_types::sds::HalfOpenTimeRange {
-                        start_ms: start,
-                        end_ms: start + 2000,
-                    },
-                    group_values: population.clone(),
-                };
-                let revision = store
-                    .admit_summary_updates(&generation, BTreeSet::from([coordinate.clone()]))
-                    .unwrap();
-                let mut output = PrecomputedOutput::new(
-                    start as u64,
-                    (start + 2000) as u64,
-                    None,
-                    config.policy_fingerprint(),
-                );
-                output.catalog_generation = Some(Arc::clone(&generation));
-                if complete_groups {
-                    output.population_labels = Some(population);
-                }
-                let sid = 800
-                    + if complete_groups {
-                        index * 2 + population_index
-                    } else {
-                        index
-                    } as u64;
-                store
-                    .publish_admitted_summary_update(
-                        &generation,
-                        &coordinate,
-                        revision,
-                        revision,
-                        4000,
-                        |writer| {
-                            writer.ingest_precompute_with_series_id(
-                                sid,
-                                config,
-                                &output,
-                                sum(value + population_index as f64 * 10.0).as_ref(),
-                            )
-                        },
-                    )
-                    .unwrap();
-            }
-        }
-        assert!(execute_completed_maintenance_cohort(
-            &store,
-            &generation,
-            &installed,
-            &configs,
-            PostAsapNodeId(3),
-            &sources,
-            1,
-            (0, 2000),
-            &BTreeMap::new()
-        )
-        .is_err());
-        assert!(store
-            .series_ids_for_policy(configs[2].policy_fingerprint())
-            .is_empty());
-        let deadline =
-            crate::tests::test_utilities::timing::deadline(std::time::Duration::from_secs(5));
-        while !store.seal_finite_summary_input(&generation).unwrap() {
-            assert!(std::time::Instant::now() < deadline);
-            std::thread::sleep(std::time::Duration::from_millis(5));
-        }
-        let source_parts = persistence.manifest.live_parts().len();
-        execute_finite_maintenance(&store, &resolver, &plan).unwrap();
-        if !matching_windows {
-            // Complete inputs at different windows cannot create any target.
-            assert!(store
-                .series_ids_for_policy(configs[2].policy_fingerprint())
-                .is_empty());
-            assert_eq!(persistence.manifest.live_parts().len(), source_parts);
-            assert!(persistence
-                .flusher
-                .metadata_store()
-                .load_strict()
-                .unwrap()
-                .iter()
-                .all(|record| record.storage_handle != 1));
-            persistence.shutdown();
-            return;
-        }
-        assert_eq!(
-            store.series_ids_for_policy(configs[2].policy_fingerprint()),
-            vec![1]
-        );
-        if complete_groups {
-            let cohort = store
-                .read_complete_raw_maintenance_cohort(
-                    &generation,
-                    &BTreeSet::from([first_id, second_id]),
-                    (0, 2000),
-                )
-                .unwrap();
-            assert_eq!(cohort.inputs().len(), 4);
-            let (dag, key) = prepare_frozen_maintenance_sink(
-                &installed,
-                &configs,
-                PostAsapNodeId(3),
-                cohort.inputs(),
-                (0, 2000),
-            )
-            .unwrap();
-            let (state, group) = execute_prepared_frozen_sink(
-                &installed,
-                &configs,
-                PostAsapNodeId(3),
-                MaintenanceInputs::Complete(&cohort),
-                &dag,
-                key,
-            )
-            .unwrap();
-            assert!(group.is_empty());
-            assert_eq!(
-                state
-                    .query_statistic(
-                        asap_types::Statistic::Quantile,
-                        &None,
-                        &std::collections::HashMap::from([("quantile".into(), "1.0".into())])
-                    )
-                    .unwrap(),
-                29.0
-            );
-            let committed = persistence.manifest.live_parts().len();
-            execute_finite_maintenance(&store, &resolver, &plan).unwrap();
-            assert_eq!(persistence.manifest.live_parts().len(), committed);
-            persistence.shutdown();
-            let restored = Arc::new(SketchStore::new());
-            restored.install_summary_catalog(catalog).unwrap();
-            let mut persistence = restored.start_persistence(persistence_config()).unwrap();
-            let resolver =
-                crate::drivers::ingest::series_resolver::SeriesIdResolver::open(resolver_path)
-                    .unwrap();
-            execute_finite_maintenance(&restored, &resolver, &plan).unwrap();
-            assert_eq!(persistence.manifest.live_parts().len(), committed);
-            persistence.shutdown();
-            return;
-        }
-        let requests = sources
-            .iter()
-            .map(|(definition, sid)| {
-                (
-                    *sid,
-                    *definition,
-                    BTreeSet::from([(0, 2000)]),
-                    BTreeMap::new(),
-                )
-            })
-            .collect::<Vec<_>>();
-        let cohort = store
-            .read_frozen_exact_cohort(
-                &generation,
-                &configs[2].derived_input.as_ref().unwrap().inputs,
-                &requests,
-            )
-            .unwrap();
-        let (dag, key) = prepare_frozen_maintenance_sink(
-            &installed,
-            &configs,
-            PostAsapNodeId(3),
-            &cohort,
-            (0, 2000),
-        )
-        .unwrap();
-        let (result, _) = execute_prepared_frozen_sink(
-            &installed,
-            &configs,
-            PostAsapNodeId(3),
-            MaintenanceInputs::Frozen(&cohort),
-            &dag,
-            key,
-        )
-        .unwrap();
-        assert_eq!(
-            result
-                .query_statistic(
-                    asap_types::Statistic::Quantile,
-                    &None,
-                    &std::collections::HashMap::from([("quantile".into(), "0.5".into())])
-                )
-                .unwrap(),
-            9.0
-        );
-        assert!(!execute_completed_maintenance_cohort(
-            &store,
-            &generation,
-            &installed,
-            &configs,
-            PostAsapNodeId(3),
-            &sources,
-            1,
-            (0, 2000),
-            &BTreeMap::new()
-        )
-        .unwrap());
-        let parts = persistence.manifest.live_parts().len();
-        assert!(!execute_completed_maintenance_cohort(
-            &store,
-            &generation,
-            &installed,
-            &configs,
-            PostAsapNodeId(3),
-            &sources,
-            1,
-            (0, 2000),
-            &BTreeMap::new()
-        )
-        .unwrap());
-        assert_eq!(persistence.manifest.live_parts().len(), parts);
-        persistence.shutdown();
-        drop(store);
-        let restored = Arc::new(SketchStore::new());
-        restored.install_summary_catalog(catalog).unwrap();
-        let mut persistence = restored.start_persistence(persistence_config()).unwrap();
-        drop(resolver);
-        let resolver =
-            crate::drivers::ingest::series_resolver::SeriesIdResolver::open(resolver_path).unwrap();
-        execute_finite_maintenance(&restored, &resolver, &plan).unwrap();
-
-        assert!(!execute_completed_maintenance_cohort(
-            &restored,
-            &generation,
-            &installed,
-            &configs,
-            PostAsapNodeId(3),
-            &sources,
-            1,
-            (0, 2000),
-            &BTreeMap::new()
-        )
-        .unwrap());
-        assert_eq!(persistence.manifest.live_parts().len(), parts);
-        let next_catalog = Arc::new(
-            asap_types::summary_catalog::SummaryCatalog::from_materializations(2, 2, &configs)
-                .unwrap(),
-        );
-        restored.install_summary_catalog(next_catalog).unwrap();
-        assert_ne!(generation, restored.active_catalog_generation().unwrap());
-        // Stale scheduling fails at the captured catalog boundary, before any
-        // new generation's completion state or payload can be substituted.
-        let stale = execute_completed_maintenance_cohort(
-            &restored,
-            &generation,
-            &installed,
-            &configs,
-            PostAsapNodeId(3),
-            &sources,
-            2,
-            (0, 2000),
-            &BTreeMap::new(),
-        )
-        .unwrap_err();
-        assert!(stale.to_string().contains("stale producer"), "{stale}");
-        assert!(execute_finite_maintenance(&restored, &resolver, &plan).is_err());
-        assert_eq!(persistence.manifest.live_parts().len(), parts);
-        assert!(persistence
-            .flusher
-            .metadata_store()
-            .load_strict()
-            .unwrap()
-            .iter()
-            .all(|record| record.storage_handle != 2));
-        persistence.shutdown();
-    }
-
-    #[test]
-    fn maintenance_binary_aligns_windows_and_rejects_incomplete_or_ambiguous_rows() {
-        use planner_types::post_asap::{BinaryOperator, SummaryFamilyType, SummaryField};
-        use planner_types::pre_asap::{ArithmeticOpKind, BinaryOpKind, DataType};
-        let mut operation = node(10);
-        operation.output_schema.fields = vec![
-            SummaryField {
-                name: "ts".into(),
-                dtype: SummaryFamilyType::Plain(DataType::Timestamp),
-                nullable: false,
-            },
-            SummaryField {
-                name: "value".into(),
-                dtype: SummaryFamilyType::Plain(DataType::Float64),
-                nullable: false,
-            },
-        ];
-        operation.output_schema.time_index = Some(0);
-        let mut operator = BinaryOperator {
-            checked_relative_division: false,
-            checked_finite_division: false,
-            kind: BinaryOpKind::Arithmetic(ArithmeticOpKind::Sub),
-            vector_match: None,
-        };
-        let rows = |values: Vec<(i64, f64)>| {
-            Arc::new(MaintenanceValue::Rows {
-                values: BTreeMap::from([(BTreeMap::new(), values)]),
-                name: "value".into(),
-                timestamped: true,
-            })
-        };
-        let left = rows(vec![(2_000, 7.0), (1_000, 5.0)]);
-        let right = rows(vec![(1_000, 2.0), (2_000, 3.0)]);
-        // Arrival order cannot exchange windows, and subtraction retains edge order.
-        let MaintenanceValue::Rows { values, .. } = evaluate_aligned_binary(
-            &operation,
-            &operator,
-            &[left.clone(), right.clone()],
-            &test_context(),
-        )
-        .unwrap() else {
-            panic!("expected rows")
-        };
-        assert_eq!(values[&BTreeMap::new()], vec![(1_000, 3.0), (2_000, 4.0)]);
-        // Equal timestamps in different populations are separate rows, never
-        // added together before the DAG explicitly reduces those populations.
-        let a = BTreeMap::from([("instance".to_string(), "a".to_string())]);
-        let b = BTreeMap::from([("instance".to_string(), "b".to_string())]);
-        let grouped = |values| {
-            Arc::new(MaintenanceValue::Rows {
-                values,
-                name: "value".into(),
-                timestamped: true,
-            })
-        };
-        let grouped_left = grouped(BTreeMap::from([
-            (a.clone(), vec![(1_000, 5.0)]),
-            (b.clone(), vec![(1_000, 9.0)]),
-        ]));
-        let grouped_right = grouped(BTreeMap::from([
-            (a.clone(), vec![(1_000, 2.0)]),
-            (b.clone(), vec![(1_000, 4.0)]),
-        ]));
-        let MaintenanceValue::Rows { values, .. } = evaluate_aligned_binary(
-            &operation,
-            &operator,
-            &[grouped_left.clone(), grouped_right],
-            &test_context(),
-        )
-        .unwrap() else {
-            panic!("expected grouped rows")
-        };
-        assert_eq!(
-            values,
-            BTreeMap::from([(a.clone(), vec![(1_000, 3.0)]), (b, vec![(1_000, 5.0)]),])
-        );
-        assert!(evaluate_aligned_binary(
-            &operation,
-            &operator,
-            &[
-                grouped_left,
-                grouped(BTreeMap::from([(a, vec![(1_000, 2.0)])]))
-            ],
-            &test_context()
-        )
-        .is_err());
-        let binding = BackendExecutableBinding {
-            nodes: BTreeMap::new(),
-            query_sink: PostAsapNodeId(10),
-            query_plan_sink: asap_types::query_plan::QueryNodeId(10),
-            precompute_sinks: vec![],
-        };
-        let frozen = OperatorAdapter {
-            binding: &binding,
-            inputs: MaintenanceInputs::Frozen(&[]),
-            configs: &[],
-        };
-        operation.payload = ExecutableOperatorPayload::Binary {
-            operator: operator.clone(),
-        };
-        operation.output_state = planner_types::post_asap::ExecutionDataState::INGESTION_ROWS;
-        assert!(frozen
-            .execute(&operation, &[left.clone(), right.clone()], test_context())
-            .is_ok());
-        let live = OperatorAdapter {
-            binding: &binding,
-            inputs: MaintenanceInputs::Live {
-                definition: definition(1),
-                state: sum(1.0),
-            },
-            configs: &[],
-        };
-        assert!(live
-            .execute(&operation, &[left.clone(), right.clone()], test_context())
-            .is_err());
-        operation.payload = ExecutableOperatorPayload::Binary {
-            operator: operator.clone(),
-        };
-        operation.output_state = planner_types::post_asap::ExecutionDataState::QUERY_ROWS;
-        assert!(frozen
-            .execute(&operation, &[left.clone(), right.clone()], test_context())
-            .is_err());
-        operation.output_state = planner_types::post_asap::ExecutionDataState::INGESTION_ROWS;
-
-        for invalid in [
-            rows(vec![]),
-            rows(vec![(1_000, 2.0)]),
-            rows(vec![(1_000, 2.0), (3_000, 3.0)]),
-            rows(vec![(1_000, 2.0), (1_000, 3.0)]),
-            rows(vec![(1_000, f64::NAN), (2_000, 3.0)]),
-            Arc::new(MaintenanceValue::Rows {
-                values: BTreeMap::from([(BTreeMap::new(), vec![(1_000, 2.0), (2_000, 3.0)])]),
-                name: "value".into(),
-                timestamped: false,
-            }),
-            Arc::new(MaintenanceValue::summary(sum(2.0))),
-        ] {
-            assert!(evaluate_aligned_binary(
-                &operation,
-                &operator,
-                &[left.clone(), invalid],
-                &test_context()
-            )
-            .is_err());
-        }
-        operator.kind = BinaryOpKind::Arithmetic(ArithmeticOpKind::Div);
-        assert!(evaluate_aligned_binary(
-            &operation,
-            &operator,
-            &[left.clone(), rows(vec![(1_000, 0.0), (2_000, 3.0)])],
-            &test_context()
-        )
-        .is_err());
-        operation.output_schema.fields[1].dtype = SummaryFamilyType::Plain(DataType::Int64);
-        assert!(
-            evaluate_aligned_binary(&operation, &operator, &[left, right], &test_context())
-                .is_err()
-        );
-    }
-
-    #[test]
-    fn finalization_preserves_windows_until_an_explicit_merge() {
-        use planner_types::post_asap::{ExactKind, ExactParams, SummaryFamilyType, SummaryField};
-        let family = SummaryFamilyType::ExactAggregate(ExactKind::Sum, ExactParams::Sum);
-        let inputs = Arc::new(MaintenanceValue::SummaryWindows {
-            states: BTreeMap::from([(
-                BTreeMap::new(),
-                vec![(1_000, sum(2.0)), (2_000, sum(7.0))].into(),
-            )]),
-            family: family.clone(),
-        });
-        let different_group = Arc::new(MaintenanceValue::SummaryWindows {
-            states: BTreeMap::from([(
-                BTreeMap::from([("instance".into(), "other".into())]),
-                vec![(1_000, sum(3.0))].into(),
-            )]),
-            family,
-        });
-        assert!(merge_inputs(&[inputs.clone(), different_group], &test_context()).is_err());
-        let mut read = node(2);
-        read.output_schema.fields = vec![SummaryField {
-            name: "value".into(),
-            dtype: SummaryFamilyType::Plain(planner_types::pre_asap::DataType::Float64),
-            nullable: false,
-        }];
-        let MaintenanceValue::Rows { values, .. } =
-            finalize_exact(&read, &[inputs.clone()], &test_context()).unwrap()
-        else {
-            panic!("expected finalized rows")
-        };
-        assert_eq!(values[&BTreeMap::new()], vec![(1_000, 2.0), (2_000, 7.0)]);
-        // Merge is a semantic DAG operation, not an implicit batch optimization.
-        // Finalizing after it emits exactly one value instead of two updates.
-        let merged = Arc::new(merge_inputs(&[inputs], &test_context()).unwrap());
-        let MaintenanceValue::Rows { values, .. } =
-            finalize_exact(&read, &[merged], &test_context()).unwrap()
-        else {
-            panic!("expected finalized row")
-        };
-        assert_eq!(values[&BTreeMap::new()], vec![(2_000, 9.0)]);
-        read.output_schema.fields[0].dtype =
-            SummaryFamilyType::Plain(planner_types::pre_asap::DataType::Int64);
-        let integer_state = Arc::new(MaintenanceValue::Summary {
-            state: sum(9.0),
-            family: Some(SummaryFamilyType::ExactAggregate(
-                ExactKind::Sum,
-                ExactParams::Sum,
-            )),
-        });
-        assert!(
-            matches!(finalize_exact(&read, &[integer_state], &test_context()), Err(error) if error.to_string().contains("Float64"))
-        );
-    }
-
-    #[test]
-    fn finalization_preserves_declared_timestamp_and_rejects_ambiguous_columns() {
-        use planner_types::post_asap::{ExactKind, ExactParams, SummaryFamilyType, SummaryField};
-        use planner_types::pre_asap::DataType;
-        let input = Arc::new(MaintenanceValue::SummaryWindows {
-            states: BTreeMap::from([(BTreeMap::new(), vec![(60_000, sum(10.0))].into())]),
-            family: SummaryFamilyType::ExactAggregate(ExactKind::Sum, ExactParams::Sum),
-        });
-        let mut read = node(2);
-        read.output_schema.fields = vec![
-            SummaryField {
-                name: "ts".into(),
-                dtype: SummaryFamilyType::Plain(DataType::Timestamp),
-                nullable: false,
-            },
-            SummaryField {
-                name: "value".into(),
-                dtype: SummaryFamilyType::Plain(DataType::Float64),
-                nullable: false,
-            },
-        ];
-        read.output_schema.time_index = Some(0);
-        let MaintenanceValue::Rows { values, name, .. } =
-            finalize_exact(&read, &[Arc::clone(&input)], &test_context()).unwrap()
-        else {
-            panic!("expected typed rows")
-        };
-        assert_eq!(values[&BTreeMap::new()], vec![(60_000, 10.0)]);
-        assert_eq!(name, "value");
-        let mut malformed = Vec::new();
-        let mut copy = read.clone();
-        copy.output_schema.time_index = None;
-        malformed.push(copy);
-        let mut copy = read.clone();
-        copy.output_schema.time_index = Some(2);
-        malformed.push(copy);
-        let mut copy = read.clone();
-        copy.output_schema.time_index = Some(1);
-        malformed.push(copy);
-        let mut copy = read.clone();
-        copy.output_schema
-            .fields
-            .push(copy.output_schema.fields[1].clone());
-        malformed.push(copy);
-        let mut copy = read.clone();
-        copy.output_schema.fields[1].nullable = true;
-        malformed.push(copy);
-        let mut copy = read.clone();
-        copy.output_schema.fields[1].name = "ts".into();
-        malformed.push(copy);
-        for malformed in malformed {
-            assert!(finalize_exact(&malformed, &[Arc::clone(&input)], &test_context()).is_err());
-        }
-        let untimed = Arc::new(MaintenanceValue::Summary {
-            state: sum(10.0),
-            family: Some(SummaryFamilyType::ExactAggregate(
-                ExactKind::Sum,
-                ExactParams::Sum,
-            )),
-        });
-        assert!(finalize_exact(&read, &[untimed], &test_context()).is_err());
-    }
-
-    #[test]
-    fn summary_aggregation_does_not_silently_reuse_input_family() {
-        use planner_types::post_asap::{
-            ExactKind, ExactParams, GroupingStrategy, SummaryFamilyType, SummaryUpdate,
-        };
-        use planner_types::pre_asap::{ColumnRef, Reduction};
-
-        let binding = BackendExecutableBinding {
-            nodes: BTreeMap::new(),
-            query_sink: PostAsapNodeId(2),
-            query_plan_sink: asap_types::query_plan::QueryNodeId(2),
-            precompute_sinks: vec![PostAsapNodeId(1)],
-        };
-        let adapter = OperatorAdapter {
-            binding: &binding,
-            inputs: MaintenanceInputs::Live {
-                definition: definition(1),
-                state: sum(7.0),
-            },
-            configs: &[],
-        };
-        let mut aggregate = node(1);
-        aggregate.payload = ExecutableOperatorPayload::SummaryAgg {
-            family: SummaryFamilyType::ExactAggregate(ExactKind::Count, ExactParams::Count),
-            input: SummaryUpdate::column(ColumnRef::SampleValue),
-            reduction: Reduction::by(vec![]),
-            grouping: GroupingStrategy::default(),
-        };
-        let error = adapter.execute(
-            &aggregate,
-            &[Arc::new(MaintenanceValue::summary(sum(7.0)))],
-            test_context(),
-        );
-        assert!(
-            matches!(error, Err(reason) if reason.to_string().contains("typed update evaluator"))
-        );
-    }
-
-    #[test]
-    fn summary_update_rejects_multiple_output_populations_before_updating() {
-        use planner_types::post_asap::{GroupingStrategy, SummaryUpdate};
-        use planner_types::pre_asap::{ColumnRef, Reduction};
-        let snapshot: control_plane::physical::compiler::BackendLocalPlanningInput =
-            serde_json::from_str(include_str!(
-                "../../../docs/examples/asapquery-planning-snapshot.json"
-            ))
-            .unwrap();
-        let mut config = crate::tests::test_utilities::planning::quoted_snapshot(snapshot, false)
-            .compile_promql()
-            .unwrap()
-            .precompute_plan
-            .materializations[0]
-            .clone();
-        config.aggregation_type = asap_types::AggregationType::Sum;
-        config.aggregation_sub_type = "sum".into();
-        config.grouping_labels = ["instance".to_string()].into_iter().collect();
-        config.partitioning = Some(asap_types::sds::PopulationPartitioning::PerEntity);
-        let family = config.accumulator_spec().unwrap().family;
-        let binding = BackendExecutableBinding {
-            nodes: BTreeMap::from([(
-                PostAsapNodeId(1),
-                BackendNodeBinding::Materialization {
-                    stored_output: config.policy_fingerprint().into(),
-                },
-            )]),
-            query_sink: PostAsapNodeId(1),
-            query_plan_sink: asap_types::query_plan::QueryNodeId(1),
-            precompute_sinks: vec![PostAsapNodeId(1)],
-        };
-        let configs = [config];
-        let adapter = OperatorAdapter {
-            binding: &binding,
-            inputs: MaintenanceInputs::Frozen(&[]),
-            configs: &configs,
-        };
-        let mut aggregate = node(1);
-        aggregate.payload = ExecutableOperatorPayload::SummaryAgg {
-            family,
-            input: SummaryUpdate::column(ColumnRef::SampleValue),
-            reduction: Reduction::PerEntity,
-            grouping: GroupingStrategy::default(),
-        };
-        let rows = MaintenanceValue::Rows {
-            values: ["a", "b"]
-                .into_iter()
-                .map(|name| {
-                    (
-                        BTreeMap::from([("instance".into(), name.into())]),
-                        vec![(1_000, 5.0)],
-                    )
-                })
-                .collect(),
-            name: "value".into(),
-            timestamped: true,
-        };
-        assert!(
-            matches!(adapter.execute(&aggregate, &[Arc::new(rows)], test_context()),
-            Err(error) if error.to_string().contains("one explicitly reduced output population"))
-        );
-    }
-
-    #[test]
-    fn dds_maintenance_rejects_nonpositive_population_before_returning_summary() {
-        use planner_types::post_asap::{GroupingStrategy, SummaryUpdate};
-        use planner_types::pre_asap::{ColumnRef, Reduction};
-        let snapshot: control_plane::physical::compiler::BackendLocalPlanningInput =
-            serde_json::from_str(include_str!(
-                "../../../docs/examples/asapquery-planning-snapshot.json"
-            ))
-            .unwrap();
-        let mut config = crate::tests::test_utilities::planning::quoted_snapshot(snapshot, false)
-            .compile_promql()
-            .unwrap()
-            .precompute_plan
-            .materializations[0]
-            .clone();
-        config.aggregation_type = asap_types::AggregationType::DDSketch;
-        config.parameters.clear();
-        config
-            .parameters
-            .insert("relative_accuracy".into(), "0.01".into());
-        config.aggregation_sub_type.clear();
-        config.grouping_labels = std::iter::empty::<String>().collect();
-        config.partitioning = Some(asap_types::sds::PopulationPartitioning::Grouped);
-        let family = config.accumulator_spec().unwrap().family;
-        let binding = BackendExecutableBinding {
-            nodes: BTreeMap::from([(
-                PostAsapNodeId(1),
-                BackendNodeBinding::Materialization {
-                    stored_output: config.policy_fingerprint().into(),
-                },
-            )]),
-            query_sink: PostAsapNodeId(1),
-            query_plan_sink: asap_types::query_plan::QueryNodeId(1),
-            precompute_sinks: vec![PostAsapNodeId(1)],
-        };
-        let configs = [config];
-        let adapter = OperatorAdapter {
-            binding: &binding,
-            inputs: MaintenanceInputs::Frozen(&[]),
-            configs: &configs,
-        };
-        let mut aggregate = node(1);
-        aggregate.payload = ExecutableOperatorPayload::SummaryAgg {
-            family,
-            input: SummaryUpdate::column(ColumnRef::SampleValue),
-            reduction: Reduction::by(vec![]),
-            grouping: GroupingStrategy::default(),
-        };
-        for rejected in [-20.0, 0.0, f64::MAX] {
-            let rows = MaintenanceValue::Rows {
-                values: [("a", 20.0), ("b", rejected)]
-                    .into_iter()
-                    .map(|(group, value)| {
-                        (
-                            BTreeMap::from([("instance".into(), group.into())]),
-                            vec![(1000, value)],
-                        )
-                    })
-                    .collect(),
-                name: "value".into(),
-                timestamped: true,
-            };
-            assert!(
-                matches!(adapter.execute(&aggregate, &[Arc::new(rows)], test_context()),
-                Err(error) if error.to_string().contains("positive representable domain"))
-            );
-        }
-    }
-
-    #[test]
-    fn admitted_slow_worker_can_publish_behind_another_workers_replay_floor() {
-        let commits = CommitRegistry::default();
-        commits.0.lock().unwrap().generation = Some((7, 1));
-        let key = |end| MaterializationCommitKey {
-            plan_id: 7,
-            plan_version: 1,
-            stored_output: definition(2),
-            window_start_ms: end - 10,
-            window_end_ms: end,
-            input_lineage: vec![0; 32],
-        };
-        let fast = key(1000);
-        commits.begin_batch([1; 32]).unwrap();
-        commits
-            .commit_if_absent(fast.clone(), Arc::new(MaintenanceValue::summary(sum(2.0))))
-            .unwrap();
-        commits.publish(&fast, || Ok(())).unwrap();
-        commits.complete_batch([1; 32], &[(fast, 30)]).unwrap();
-        let slow = key(10);
-        assert!(commits.is_published(&slow).is_err());
-        commits.begin_batch([2; 32]).unwrap();
-        commits.pin_admitted(&slow).unwrap();
-        commits
-            .commit_if_absent(slow.clone(), Arc::new(MaintenanceValue::summary(sum(3.0))))
-            .unwrap();
-        commits.publish(&slow, || Ok(())).unwrap();
-        commits
-            .complete_batch([2; 32], &[(slow.clone(), 30)])
-            .unwrap();
-        assert!(commits.is_published(&slow).is_err());
-        assert!(commits.0.lock().unwrap().admitted_keys.is_empty());
-    }
-
-    // Receipts follow the declared event-time horizon and never retain accepted
-    // summary payloads; expired retries fail instead of becoming duplicate writes.
-    #[test]
-    fn maintenance_receipts_are_bounded_and_expired_retries_fail_closed() {
-        let commits = CommitRegistry::default();
-        let key = |end| MaterializationCommitKey {
-            plan_id: 7,
-            plan_version: 1,
-            stored_output: definition(2),
-            window_start_ms: end - 10,
-            window_end_ms: end,
-            input_lineage: vec![0; 32],
-        };
-        for end in (10..=1_000).step_by(10) {
-            let key = key(end);
-            commits.begin_batch([0; 32]).unwrap();
-            commits
-                .commit_if_absent(key.clone(), Arc::new(MaintenanceValue::summary(sum(2.0))))
-                .unwrap();
-            commits.publish(&key, || Ok(())).unwrap();
-            commits.complete_batch([0; 32], &[(key, 30)]).unwrap();
-            let state = commits.0.lock().unwrap();
-            assert!(state.entries.len() <= 3);
-            assert!(state.entries.values().all(|entry| entry.value.is_none()));
-        }
-        assert!(commits.get(&key(970)).is_err());
-        assert!(commits
-            .publish(&key(970), || panic!(
-                "expired output must not reach storage"
-            ))
-            .is_err());
-        assert!(commits.is_published(&key(980)).unwrap());
-        commits.0.lock().unwrap().generation = Some((7, 2));
-        assert!(commits
-            .commit_if_absent(key(1_000), Arc::new(MaintenanceValue::summary(sum(2.0))))
-            .is_err());
-    }
-
-    // Local node IDs are reused in separate query DAGs. Receipts must be scoped
-    // by materialization identity so neither DAG suppresses the other's output.
-    #[test]
-    fn different_materializations_have_independent_publication_receipts() {
-        let commits = CommitRegistry::default();
-        for target in [2, 3] {
-            let key = MaterializationCommitKey {
-                plan_id: 7,
-                plan_version: 1,
-                stored_output: definition(target),
-                window_start_ms: 0,
-                window_end_ms: 10,
-                input_lineage: vec![0; 32],
-            };
-            assert!(!commits.is_published(&key).unwrap());
-            commits
-                .commit_if_absent(key.clone(), Arc::new(MaintenanceValue::summary(sum(2.0))))
-                .unwrap();
-            commits.publish(&key, || Ok(())).unwrap();
-        }
-        assert_eq!(commits.0.lock().unwrap().entries.len(), 2);
-    }
-
-    // A failed downstream write must be retried, while accepted outputs remain
-    // idempotent when the same maintenance lineage is replayed.
-    #[test]
-    fn downstream_failure_does_not_acknowledge_maintenance_publication() {
-        use crate::storage_engines::types::{
-            ActivePhysicalPlanHandle, InstalledPrecomputePlan, RuntimePhysicalPlan,
-        };
-        use asap_types::executable_plan::{InstalledPostAsapDag, OwnedPostAsapDag};
-        use std::sync::atomic::{AtomicUsize, Ordering};
-
-        #[derive(Default)]
-        struct FailOnceSink {
-            attempts: AtomicUsize,
-            accepted: AtomicUsize,
-            fail_at: usize,
-        }
-        impl OutputSink for FailOnceSink {
-            fn emit_batch(
-                &self,
-                outputs: Vec<(PrecomputedOutput, Box<dyn AggregateCore>)>,
-            ) -> Result<(), Box<dyn std::error::Error + Send + Sync>> {
-                if outputs.is_empty() {
-                    return Ok(());
-                }
-                if self.attempts.fetch_add(1, Ordering::SeqCst) == self.fail_at {
-                    return Err("temporary store failure".into());
-                }
-                self.accepted.fetch_add(outputs.len(), Ordering::SeqCst);
-                Ok(())
-            }
-        }
-
-        let mut snapshot: serde_json::Value = serde_json::from_str(include_str!(
-            "../../../docs/examples/asapquery-planning-snapshot.json"
-        ))
-        .unwrap();
-        snapshot["query_workload"]["repeating_queries"][0]["query"] =
-            "sum(sum_over_time(m[1m]))".into();
-        let snapshot: control_plane::physical::compiler::BackendLocalPlanningInput =
-            serde_json::from_value(snapshot).unwrap();
-        let mut bundle = crate::tests::test_utilities::planning::quoted_snapshot(snapshot, false)
-            .compile_promql()
-            .unwrap();
-        let target_config = &bundle.precompute_plan.materializations[0];
-        let long_step = target_config.window_size.max(
-            target_config.slide_interval * target_config.num_aggregates_to_retain.unwrap_or(1),
-        ) * 1_000;
-        let target_definition = bundle.precompute_plan.materializations[0]
-            .policy_fingerprint()
-            .into();
-        let mut query = node(2);
-        query.output_state = planner_types::post_asap::ExecutionDataState::QUERY_ROWS;
-        let dag = ExecutableDag {
-            nodes: vec![node(0), node(1), query],
-            edges: vec![edge(0, 1), edge(1, 2)],
-            root: PostAsapNodeId(2),
-        };
-        let binding = BackendExecutableBinding {
-            nodes: BTreeMap::from([
-                (
-                    PostAsapNodeId(0),
-                    BackendNodeBinding::Materialization {
-                        stored_output: definition(1),
-                    },
-                ),
-                (
-                    PostAsapNodeId(1),
-                    BackendNodeBinding::Materialization {
-                        stored_output: target_definition,
-                    },
-                ),
-                (
-                    PostAsapNodeId(2),
-                    BackendNodeBinding::Query {
-                        query_node: asap_types::query_plan::QueryNodeId(9),
-                    },
-                ),
-            ]),
-            query_sink: PostAsapNodeId(2),
-            query_plan_sink: asap_types::query_plan::QueryNodeId(9),
-            precompute_sinks: vec![PostAsapNodeId(1)],
-        };
-        let (dag, binding) = maintenance_only(dag, binding);
-        bundle.precompute_plan.executable_dags = BTreeMap::from([(
-            "retry".into(),
-            InstalledPostAsapDag {
-                document: {
-                    let mut document =
-                        OwnedPostAsapDag::from_executable("retry".into(), &dag).unwrap();
-                    document.schema_version =
-                        asap_types::executable_plan::PRECOMPUTE_DAG_SCHEMA_VERSION;
-                    document
-                },
-                binding,
-            },
-        )]);
-        let active = RuntimePhysicalPlan {
-            readout_programs: Default::default(),
-            envelope: bundle.precompute_plan.envelope.clone(),
-            summary_catalog: Some(Arc::new(bundle.summary_catalog)),
-            precompute_plan: bundle.precompute_plan,
-            transmission_plan: bundle.transmission_plan,
-            installed_precompute_plan: Arc::new(InstalledPrecomputePlan::new(Default::default())),
-            query_plan: Arc::new(bundle.query_plan),
-            storage_routing: Arc::new(Default::default()),
-        };
-        // The long batch spans two retention horizons. Its accepted prefix
-        // must remain replayable until the same whole batch completes.
-        for (fail_at, count, step, replay_after_success) in
-            [(0, 2, 10, true), (1, 2, 10, true), (2, 5, long_step, false)]
-        {
-            let downstream = Arc::new(FailOnceSink {
-                fail_at,
-                ..Default::default()
-            });
-            let sink = PrecomputeDagSink::new(
-                downstream.clone(),
-                InstalledPrecomputePlanHandle::from_active_physical_plan(
-                    ActivePhysicalPlanHandle::new(active.clone()),
-                ),
-            );
-            let batch = || {
-                (0..count)
-                    .map(|i| {
-                        (
-                            PrecomputedOutput::new(
-                                i * step,
-                                (i + 1) * step,
-                                None,
-                                asap_types::PolicyFingerprint(1),
-                            ),
-                            sum(2.0).clone_boxed_core(),
-                        )
-                    })
-                    .collect()
-            };
-            if !replay_after_success {
-                let oversized = (0..65_537)
-                    .map(|_| {
-                        (
-                            PrecomputedOutput::new(0, step, None, asap_types::PolicyFingerprint(1)),
-                            sum(2.0).clone_boxed_core(),
-                        )
-                    })
-                    .collect();
-                assert!(sink
-                    .emit_batch(oversized)
-                    .unwrap_err()
-                    .to_string()
-                    .contains("receipt budget"));
-                assert_eq!(downstream.attempts.load(Ordering::SeqCst), 0);
-            }
-            assert!(sink.emit_batch(batch()).is_err());
-            if !replay_after_success {
-                assert!(sink
-                    .emit_batch(vec![(
-                        PrecomputedOutput::new(
-                            999_000,
-                            1_000_000,
-                            None,
-                            asap_types::PolicyFingerprint(1),
-                        ),
-                        sum(3.0).clone_boxed_core()
-                    )])
-                    .unwrap_err()
-                    .to_string()
-                    .contains("retry is pending"));
-            }
-            sink.emit_batch(batch()).unwrap();
-            if replay_after_success {
-                sink.emit_batch(batch()).unwrap();
-            } else {
-                assert!(sink
-                    .emit_batch(batch())
-                    .unwrap_err()
-                    .to_string()
-                    .contains("retention horizon"));
-                assert!(sink.commits.0.lock().unwrap().entries.len() <= 2);
-            }
-            assert_eq!(downstream.accepted.load(Ordering::SeqCst), count as usize);
-            assert_eq!(
-                downstream.attempts.load(Ordering::SeqCst),
-                count as usize + 1
-            );
-        }
-    }
-
-    #[test]
-    fn shared_summary_node_executes_once_and_summary_over_summary_merges() {
-        // source 0 is shared by both branches; root therefore contains two
-        // copies of its value while node 0 itself is evaluated once.
-        let mut query = node(4);
-        query.output_state = planner_types::post_asap::ExecutionDataState::QUERY_ROWS;
-        let dag = ExecutableDag {
-            nodes: (0..4).map(node).chain([query]).collect(),
-            edges: vec![edge(0, 1), edge(0, 2), edge(1, 3), edge(2, 3), edge(3, 4)],
-            root: PostAsapNodeId(4),
-        };
-        let binding = BackendExecutableBinding {
-            nodes: (0..4)
-                .map(|id| {
-                    (
-                        PostAsapNodeId(id),
-                        BackendNodeBinding::Materialization {
-                            stored_output: definition(if id == 0 { 1 } else { id as u64 + 1 }),
-                        },
-                    )
-                })
-                .chain([(
-                    PostAsapNodeId(4),
-                    BackendNodeBinding::Query {
-                        query_node: asap_types::query_plan::QueryNodeId(9),
-                    },
-                )])
-                .collect(),
-            query_sink: PostAsapNodeId(4),
-            query_plan_sink: asap_types::query_plan::QueryNodeId(9),
-            precompute_sinks: vec![PostAsapNodeId(3)],
-        };
-        let (dag, binding) = maintenance_only(dag, binding);
-        let source = sum(2.0);
-        let adapter = OperatorAdapter {
-            binding: &binding,
-            inputs: MaintenanceInputs::Live {
-                definition: definition(1),
-                state: source,
-            },
-            configs: &[],
-        };
-        let commits = CommitRegistry::default();
-        let key = MaterializationCommitKey {
-            plan_id: 7,
-            plan_version: 2,
-            stored_output: definition(4),
-            window_start_ms: 0,
-            window_end_ms: 10,
-            input_lineage: b"batch:1".to_vec(),
-        };
-        let result = execute_precompute_sink(
-            &dag,
-            &binding,
-            PostAsapNodeId(3),
-            key.clone(),
-            &adapter,
-            &commits,
-            test_context(),
-        )
-        .unwrap();
-        assert_eq!(result.state().unwrap().aux_stats().sum, Some(4.0));
-        commits.publish(&key, || Ok(())).unwrap();
-        assert!(
-            commits.get(&key).unwrap().is_none(),
-            "accepted payload must not remain in the retry registry"
-        );
-        assert!(commits.is_published(&key).unwrap());
-        commits
-            .publish(&key, || panic!("accepted lineage must not publish twice"))
-            .unwrap();
-    }
-
-    #[test]
-    fn unsupported_maintenance_operator_propagates_failure_without_commit() {
-        let mut unsupported = node(1);
-        unsupported.payload = ExecutableOperatorPayload::SummarySubtract;
-        let mut query = node(2);
-        query.output_state = planner_types::post_asap::ExecutionDataState::QUERY_ROWS;
-        let dag = ExecutableDag {
-            nodes: vec![node(0), unsupported, query],
-            edges: vec![edge(0, 1), edge(1, 2)],
-            root: PostAsapNodeId(2),
-        };
-        let binding = BackendExecutableBinding {
-            nodes: BTreeMap::from([
-                (
-                    PostAsapNodeId(0),
-                    BackendNodeBinding::Materialization {
-                        stored_output: definition(1),
-                    },
-                ),
-                (
-                    PostAsapNodeId(1),
-                    BackendNodeBinding::Materialization {
-                        stored_output: definition(2),
-                    },
-                ),
-                (
-                    PostAsapNodeId(2),
-                    BackendNodeBinding::Query {
-                        query_node: asap_types::query_plan::QueryNodeId(9),
-                    },
-                ),
-            ]),
-            query_sink: PostAsapNodeId(2),
-            query_plan_sink: asap_types::query_plan::QueryNodeId(9),
-            precompute_sinks: vec![PostAsapNodeId(1)],
-        };
-        let (dag, binding) = maintenance_only(dag, binding);
-        let adapter = OperatorAdapter {
-            binding: &binding,
-            inputs: MaintenanceInputs::Live {
-                definition: definition(1),
-                state: sum(2.0),
-            },
-            configs: &[],
-        };
-        let commits = CommitRegistry::default();
-        let key = MaterializationCommitKey {
-            plan_id: 7,
-            plan_version: 2,
-            stored_output: definition(2),
-            window_start_ms: 0,
-            window_end_ms: 10,
-            input_lineage: b"batch:1".to_vec(),
-        };
-        assert!(matches!(
-            execute_precompute_sink(
-                &dag,
-                &binding,
-                PostAsapNodeId(1),
-                key.clone(),
-                &adapter,
-                &commits,
-                test_context()
-            ),
-            Err(ScheduleError::Operator(_))
-        ));
-        assert!(commits.get(&key).unwrap().is_none());
-    }
-}
-
-/// Captured local input provides fixed population membership for this revision.
-/// All compatible sinks share one native execution cache for each output window.
-pub(crate) fn execute_revision_outputs(
-    plan: &crate::storage_engines::types::RuntimePhysicalPlan,
-    raw: &[crate::storage_engines::sketch_db::index::FrozenExactWindows],
-    revision: u64,
-    limit: usize,
-    publish: &mut crate::precompute_engine::revisions::Publisher<'_>,
-) -> Result<(), MaintenanceError> {
-    use crate::precompute_engine::revisions::{encode_state, RevisionRecord};
-    let generation = plan
-        .precompute_plan
-        .summary_catalog
-        .as_ref()
-        .ok_or("revision generation missing")?;
-    for installed in plan.precompute_plan.executable_dags.values() {
-        let mut windows: BTreeMap<(u64, u64), Vec<(PostAsapNodeId, MaterializationCommitKey)>> =
-            BTreeMap::new();
-        let mut result: BTreeMap<asap_types::sds::StoredOutputId, Vec<RevisionRecord>> =
-            BTreeMap::new();
-        for sink in &installed.binding.precompute_sinks {
-            let Some(BackendNodeBinding::Materialization {
-                stored_output: target,
-            }) = installed.binding.node(*sink)
-            else {
-                continue;
-            };
-            let config = plan
-                .precompute_plan
-                .materializations
-                .iter()
-                .find(|c| c.policy_fingerprint() == target.fingerprint())
-                .ok_or("revision target configuration missing")?;
-            let Some(derived) = &config.derived_input else {
-                continue;
-            };
-            result.entry(*target).or_default();
-            let inputs: Vec<_> = raw
-                .iter()
-                .filter(|r| derived.inputs.contains(&r.definition))
-                .collect();
-            let width = config.stored_window_ms();
-            if width == 0 {
-                return Err("revision output has zero window extent".into());
-            }
-            let possible: BTreeSet<_> = inputs
-                .iter()
-                .flat_map(|i| i.windows.keys())
-                .filter_map(|(start, _)| {
-                    ((*start as i128 - config.pane_origin_ms.unwrap_or(0) as i128)
-                        .rem_euclid(width as i128)
-                        == 0)
-                        .then(|| start.checked_add(width).map(|end| (*start, end)))
-                        .flatten()
-                })
-                .collect();
-            for window in possible {
-                let selected: Vec<_> = inputs
-                    .iter()
-                    .map(
-                        |input| crate::storage_engines::sketch_db::index::FrozenExactWindows {
-                            stored_output_reference: input.stored_output_reference.clone(),
-                            storage_handle: input.storage_handle,
-                            definition: input.definition,
-                            generation: Arc::clone(&input.generation),
-                            group: input.group.clone(),
-                            windows: input
-                                .windows
-                                .iter()
-                                .filter(|((s, e), _)| *s >= window.0 && *e <= window.1)
-                                .map(|(w, s)| (*w, Arc::clone(s)))
-                                .collect(),
-                            singleton_population_complete: true,
-                        },
-                    )
-                    .collect();
-                // Every contributing population must have contiguous pane coverage.
-                if selected.is_empty()
-                    || selected.iter().any(|i| {
-                        let mut cursor = window.0;
-                        for (start, end) in i.windows.keys() {
-                            if *start != cursor {
-                                return true;
-                            }
-                            cursor = *end;
-                        }
-                        cursor != window.1
-                    })
-                {
-                    continue;
-                }
-                let (_, mut key) = prepare_frozen_maintenance_sink(
-                    installed,
-                    &plan.precompute_plan.materializations,
-                    *sink,
-                    &selected,
-                    window,
-                )?;
-                // The captured input revision, rather than a sink-specific digest,
-                // identifies the common evaluation frontier for shared producers.
-                key.input_lineage = revision.to_be_bytes().to_vec();
-                windows.entry(window).or_default().push((*sink, key));
-            }
-        }
-        let dag = installed.document.decode()?;
-        for (window, sinks) in windows {
-            let inputs: Vec<_> = raw
-                .iter()
-                .filter_map(|input| {
-                    let windows: BTreeMap<_, _> = input
-                        .windows
-                        .iter()
-                        .filter(|((s, e), _)| *s >= window.0 && *e <= window.1)
-                        .map(|(w, s)| (*w, Arc::clone(s)))
-                        .collect();
-                    (!windows.is_empty()).then(|| {
-                        crate::storage_engines::sketch_db::index::FrozenExactWindows {
-                            stored_output_reference: input.stored_output_reference.clone(),
-                            storage_handle: input.storage_handle,
-                            definition: input.definition,
-                            generation: Arc::clone(&input.generation),
-                            group: input.group.clone(),
-                            windows,
-                            singleton_population_complete: true,
-                        }
-                    })
-                })
-                .collect();
-            let adapter = OperatorAdapter {
-                binding: &installed.binding,
-                inputs: MaintenanceInputs::Captured(&inputs),
-                configs: &plan.precompute_plan.materializations,
-            };
-            let context = RunContext::new(
-                asap_physical_operators::dag::Scope::Ingestion {
-                    window_start_ms: window.0 as i64,
-                    window_end_ms: window.1 as i64,
-                    revision,
-                },
-                asap_physical_operators::dag::Limits {
-                    max_bytes: limit,
-                    ..Default::default()
-                },
-            )?;
-            let values = execute_precompute_sinks(
-                &dag,
-                &installed.binding,
-                &sinks,
-                &adapter,
-                &CommitRegistry::default(),
-                context,
-            )
-            .map_err(schedule_error)?;
-            for ((_, key), value) in sinks.iter().zip(values) {
-                let group = match value.as_ref() {
-                    MaintenanceValue::SummaryWindows { states, .. } if states.len() == 1 => {
-                        states.keys().next().unwrap().clone()
-                    }
-                    MaintenanceValue::Summary { .. } => BTreeMap::new(),
-                    _ => {
-                        return Err(
-                            "revision sink must explicitly reduce its output population".into()
-                        )
-                    }
-                };
-                let config = plan
-                    .precompute_plan
-                    .materializations
-                    .iter()
-                    .find(|c| c.policy_fingerprint() == key.stored_output.fingerprint())
-                    .ok_or("revision output configuration missing")?;
-                result
-                    .get_mut(&key.stored_output)
-                    .unwrap()
-                    .push(RevisionRecord {
-                        reference: plan
-                            .installed_precompute_plan
-                            .stored_output_reference(key.stored_output)
-                            .ok_or("revision output binding missing")?,
-                        group,
-                        start_ms: window.0,
-                        end_ms: window.1,
-                        payload: encode_state(
-                            Arc::clone(value.state()?),
-                            config.accumulator_spec()?.family,
-                        )?,
-                    });
-            }
-        }
-        for (output, records) in result {
-            publish(output, records)?;
-        }
-    }
-    let _ = generation;
-    Ok(())
-}
diff --git a/data_plane/src/precompute_engine/metrics.rs b/data_plane/src/precompute_engine/metrics.rs
deleted file mode 100644
index 4bf1e844d..000000000
--- a/data_plane/src/precompute_engine/metrics.rs
+++ /dev/null
@@ -1,115 +0,0 @@
-use lazy_static::lazy_static;
-use prometheus::{register_counter_vec, register_int_counter, CounterVec, IntCounter};
-
-lazy_static! {
-    static ref LATE_INPUTS_TOTAL: CounterVec = register_counter_vec!(
-        "asap_precompute_late_inputs_total",
-        "Precompute inputs handled after their event-time window was late or closed",
-        &["action", "input_kind"]
-    )
-    .expect("late-input counter registration must succeed");
-    static ref ACCEPTED_SAMPLES_TOTAL: IntCounter = register_int_counter!(
-        "asap_precompute_accepted_samples_total",
-        "Unique input samples accepted and queued for precompute"
-    )
-    .expect("accepted-sample counter registration must succeed");
-    static ref PROCESSED_UPDATES_TOTAL: IntCounter = register_int_counter!(
-        "asap_precompute_processed_updates_total",
-        "Sample updates dequeued by precompute workers"
-    )
-    .expect("processed-update counter registration must succeed");
-    static ref MATERIALIZED_OUTPUTS_TOTAL: IntCounter = register_int_counter!(
-        "asap_precompute_materialized_outputs_total",
-        "Completed summary outputs successfully installed in SummaryStore"
-    )
-    .expect("materialized-output counter registration must succeed");
-}
-
-#[derive(Debug, Clone, Copy, PartialEq, Eq)]
-pub struct ThroughputTotals {
-    pub accepted_samples: u64,
-    pub processed_updates: u64,
-    pub materialized_outputs: u64,
-}
-
-impl ThroughputTotals {
-    #[cfg(test)]
-    pub fn since(self, previous: Self) -> Self {
-        Self {
-            accepted_samples: self
-                .accepted_samples
-                .saturating_sub(previous.accepted_samples),
-            processed_updates: self
-                .processed_updates
-                .saturating_sub(previous.processed_updates),
-            materialized_outputs: self
-                .materialized_outputs
-                .saturating_sub(previous.materialized_outputs),
-        }
-    }
-}
-
-#[cfg(test)]
-pub fn throughput_totals() -> ThroughputTotals {
-    ThroughputTotals {
-        accepted_samples: ACCEPTED_SAMPLES_TOTAL.get(),
-        processed_updates: PROCESSED_UPDATES_TOTAL.get(),
-        materialized_outputs: MATERIALIZED_OUTPUTS_TOTAL.get(),
-    }
-}
-
-pub fn record_accepted_samples(count: u64) {
-    ACCEPTED_SAMPLES_TOTAL.inc_by(count);
-}
-
-pub fn record_processed_updates(count: u64) {
-    PROCESSED_UPDATES_TOTAL.inc_by(count);
-}
-
-pub fn record_materialized_outputs(count: u64) {
-    MATERIALIZED_OUTPUTS_TOTAL.inc_by(count);
-}
-
-pub fn record_late_input(action: &'static str, input_kind: &'static str) {
-    LATE_INPUTS_TOTAL
-        .with_label_values(&[action, input_kind])
-        .inc();
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    #[test]
-    fn late_input_actions_are_exported() {
-        record_late_input("drop", "raw_sample");
-        let family = prometheus::gather()
-            .into_iter()
-            .find(|family| family.get_name() == "asap_precompute_late_inputs_total")
-            .expect("late-input counter must be registered");
-        assert!(family.get_metric().iter().any(|metric| {
-            metric
-                .get_label()
-                .iter()
-                .any(|label| label.get_name() == "action" && label.get_value() == "drop")
-        }));
-    }
-
-    #[test]
-    fn throughput_observation_is_monotonic_and_non_destructive() {
-        let before = throughput_totals();
-        record_accepted_samples(7);
-        record_processed_updates(5);
-        record_materialized_outputs(2);
-        let after = throughput_totals();
-        assert_eq!(after, throughput_totals());
-        assert_eq!(
-            after.since(before),
-            ThroughputTotals {
-                accepted_samples: 7,
-                processed_updates: 5,
-                materialized_outputs: 2,
-            }
-        );
-    }
-}
diff --git a/data_plane/src/precompute_engine/mod.rs b/data_plane/src/precompute_engine/mod.rs
deleted file mode 100644
index 2a684d470..000000000
--- a/data_plane/src/precompute_engine/mod.rs
+++ /dev/null
@@ -1,21 +0,0 @@
-pub mod config;
-mod engine;
-pub mod erp_observer;
-pub mod frame_lineage;
-pub mod group_key;
-pub mod ingest_handler;
-pub mod maintenance_runtime;
-pub(crate) mod metrics;
-pub mod output_sink;
-pub mod raw_dag;
-pub mod series_router;
-pub mod subdag_scheduler;
-pub mod window_manager;
-pub mod worker;
-
-pub use engine::{PrecomputeEngine, PrecomputeWorkerDiagnostics};
-pub use ingest_handler::IngestState;
-
-pub mod partitioning;
-
-pub mod revisions;
diff --git a/data_plane/src/precompute_engine/output_sink.rs b/data_plane/src/precompute_engine/output_sink.rs
deleted file mode 100644
index eab97b320..000000000
--- a/data_plane/src/precompute_engine/output_sink.rs
+++ /dev/null
@@ -1,699 +0,0 @@
-use crate::drivers::ingest::series_resolver::SeriesIdResolver;
-use crate::precompute_engine::ingest_handler::IngestObservability;
-use crate::storage_engines::sketch_db::index::SketchStore;
-use crate::storage_engines::types::hot_reload_config::InstalledPrecomputePlanHandle;
-use crate::storage_engines::types::{AggregateCore, PrecomputedOutput};
-use std::sync::atomic::{AtomicU64, Ordering};
-use std::sync::{Arc, Mutex};
-use tracing::{debug_span, warn};
-
-/// CQ-6 — process-global fallback for the output-sink policy-miss
-/// counter, used when a `SketchStoreSink` was constructed without an
-/// `IngestObservability` handle wired in (e.g. the legacy
-/// `SketchStoreSink::new` call site that predates the handle). Keeps the
-/// count observable even before the handle is threaded through, so a
-/// /metrics scrape never silently loses policy-miss drops.
-static GLOBAL_DROPPED_POLICY_MISS: AtomicU64 = AtomicU64::new(0);
-
-/// Trait for emitting completed window outputs.
-pub trait OutputSink: Send + Sync {
-    fn emit_batch(
-        &self,
-        outputs: Vec<(PrecomputedOutput, Box<dyn AggregateCore>)>,
-    ) -> Result<(), Box<dyn std::error::Error + Send + Sync>>;
-
-    /// Publish an explicit source-partition event-time barrier after every
-    /// preceding window from that partition has reached this sink.
-    fn advance_summary_watermark(
-        &self,
-        _barrier: &asap_types::sds::SummaryWatermarkBarrier,
-    ) -> Result<(), Box<dyn std::error::Error + Send + Sync>> {
-        Err(Box::new(std::io::Error::new(
-            std::io::ErrorKind::Unsupported,
-            "output sink does not support summary watermark barriers",
-        )))
-    }
-}
-
-fn consume_in_order<T>(items: Vec<T>, mut persist: impl FnMut(&T) -> bool) -> usize {
-    let mut failed = 0;
-    for item in items {
-        if !persist(&item) {
-            failed += 1;
-        }
-    }
-    failed
-}
-
-/// Publish completed windows using their selected output reference and complete
-/// plan/population/window address. Local row handles are checked against this
-/// address and cannot redirect a queued output to another stored summary.
-pub struct SketchStoreSink {
-    summary_store: Arc<SketchStore>,
-    hot_reload: InstalledPrecomputePlanHandle,
-    /// Durable local-handle allocation keyed by the complete output population
-    /// identity. Shared with ingest and backfill so they address the same rows.
-    series_resolver: Arc<SeriesIdResolver>,
-    /// CQ-6 — optional handle to the shared `IngestObservability` so
-    /// policy-miss drops land in the same counter the OTLP ingest path
-    /// surfaces to /metrics. `None` when the sink was constructed via the
-    /// legacy `new()` call site (main.rs) that doesn't thread the handle;
-    /// in that case drops are counted in the process-global fallback
-    /// (`GLOBAL_DROPPED_POLICY_MISS`). Wire it post-construction with
-    /// [`SketchStoreSink::with_observability`].
-    observability: Option<Arc<IngestObservability>>,
-}
-
-impl SketchStoreSink {
-    pub fn new(
-        summary_store: Arc<SketchStore>,
-        hot_reload: InstalledPrecomputePlanHandle,
-        series_resolver: Arc<SeriesIdResolver>,
-    ) -> Self {
-        Self {
-            summary_store,
-            hot_reload,
-            series_resolver,
-            observability: None,
-        }
-    }
-
-    #[cfg(test)]
-    /// CQ-6 — attach a shared `IngestObservability` so this sink's
-    /// policy-miss drops increment the same counter the ingest path
-    /// reports. Builder-style (returns `self`) so the `new()` signature
-    /// stays stable for existing call sites; wire it where the sink and
-    /// `IngestState` are constructed together.
-    pub fn with_observability(mut self, observability: Arc<IngestObservability>) -> Self {
-        self.observability = Some(observability);
-        self
-    }
-
-    /// CQ-6 — increment the policy-miss drop counter (shared handle if
-    /// wired, process-global fallback otherwise).
-    fn record_policy_miss(&self) {
-        match &self.observability {
-            Some(obs) => {
-                obs.dropped_policy_miss.fetch_add(1, Ordering::Relaxed);
-            }
-            None => {
-                GLOBAL_DROPPED_POLICY_MISS.fetch_add(1, Ordering::Relaxed);
-            }
-        }
-    }
-
-    /// Write one PrecomputedOutput; false reports a rejected output to the caller.
-    /// Missing configuration or incompatible state must surface as failure:
-    /// a finite-input completion barrier cannot acknowledge dropped outputs.
-    ///
-    /// PR-6 follow-up: resolves the source `PrecomputeMaterialization` via
-    /// `PolicyRegistry::get(output.policy_fp)`. The legacy
-    /// `aggregation_id` fallback branch (PR 4) is gone — `policy_fp`
-    /// is the only identity handle on `PrecomputedOutput`. Outputs
-    /// emitted with the `PolicyFingerprint::UNSET` sentinel (e.g.
-    /// raw-mode fast-path that has no source config) are skipped
-    /// rather than routed by a parallel id.
-    fn append_to_index(&self, output: &PrecomputedOutput, accumulator: &dyn AggregateCore) -> bool {
-        if output.policy_fp.is_unset() {
-            warn!(
-                "SketchStoreSink: PrecomputedOutput carries PolicyFingerprint::UNSET; \
-                 skipping write (sink requires a content-addressed handle)"
-            );
-            return false;
-        }
-        let cfg = self.hot_reload.snapshot();
-        let registry = cfg.policy_registry();
-        let agg_cfg = match registry.get(output.policy_fp) {
-            Some(c) => c.clone(),
-            None => {
-                // CQ-6 — policy-miss drop: a content-addressed policy_fp
-                // that the running streaming-config registry doesn't know
-                // (config lag / retired policy). Count it so /metrics can
-                // surface the silent skip.
-                self.record_policy_miss();
-                warn!(
-                    policy_fp = %output.policy_fp,
-                    "SketchStoreSink: policy_fp missing from registry; skipping write"
-                );
-                return false;
-            }
-        };
-        let agg_cfg = &agg_cfg;
-        let Some(reference) = cfg.stored_output_reference(output.policy_fp.into()) else {
-            return false;
-        };
-        let Some(start_ms) = i64::try_from(output.start_timestamp).ok() else {
-            return false;
-        };
-        let Some(end_ms) = i64::try_from(output.end_timestamp).ok() else {
-            return false;
-        };
-        let population = output.population_labels.clone().unwrap_or_else(|| {
-            agg_cfg
-                .grouping_labels
-                .iter()
-                .cloned()
-                .zip(output.key.clone().unwrap_or_default().labels)
-                .collect()
-        });
-        let (plan_id, plan_version) = output
-            .catalog_generation
-            .as_deref()
-            .map(|generation| (generation.plan_id, generation.plan_version))
-            .unwrap_or((0, 0));
-        let address = asap_types::sds::StoredSummaryKey {
-            plan_id,
-            plan_version,
-            stored_output_id: reference.stored_output_id,
-            population,
-            window: asap_types::sds::HalfOpenTimeRange { start_ms, end_ms },
-        };
-        let persist =
-            |writer: &crate::storage_engines::sketch_db::index::SummaryPublicationWriter<'_>| {
-                writer
-                    .write_stored_summary(
-                        &address,
-                        &self.series_resolver,
-                        agg_cfg,
-                        output,
-                        accumulator,
-                    )
-                    .inspect(|_| crate::precompute_engine::metrics::record_materialized_outputs(1))
-            };
-        if let Some(revision) = &output.input_revision {
-            let group_values = output.population_labels.clone().unwrap_or_else(|| {
-                agg_cfg
-                    .grouping_labels
-                    .iter()
-                    .cloned()
-                    .zip(output.key.clone().unwrap_or_default().labels)
-                    .collect()
-            });
-            let (Ok(start_ms), Ok(end_ms)) = (
-                i64::try_from(output.start_timestamp),
-                i64::try_from(output.end_timestamp),
-            ) else {
-                return false;
-            };
-            let coordinate = asap_types::sds::SummaryInstanceCoordinates {
-                stored_output_id: output.policy_fp.into(),
-                time_range: asap_types::sds::HalfOpenTimeRange { start_ms, end_ms },
-                group_values,
-            };
-            if let Err(error) = self.summary_store.publish_admitted_summary_update(
-                &revision.generation,
-                &coordinate,
-                revision.first_revision,
-                revision.revision,
-                agg_cfg
-                    .num_aggregates_to_retain
-                    .unwrap_or(1)
-                    .saturating_mul(agg_cfg.slide_interval)
-                    .max(agg_cfg.window_size)
-                    .saturating_mul(1_000),
-                persist,
-            ) {
-                warn!(%error, "summary input revision publication failed");
-                return false;
-            }
-            true
-        } else {
-            self.summary_store
-                .publish_unadmitted_summary_update(persist)
-                .is_some()
-        }
-    }
-}
-
-impl OutputSink for SketchStoreSink {
-    fn emit_batch(
-        &self,
-        outputs: Vec<(PrecomputedOutput, Box<dyn AggregateCore>)>,
-    ) -> Result<(), Box<dyn std::error::Error + Send + Sync>> {
-        if outputs.is_empty() {
-            return Ok(());
-        }
-        let _span = debug_span!("sketch_index_insert", batch_size = outputs.len()).entered();
-        let output_count = outputs.len();
-        let failed = consume_in_order(outputs, |(output, accumulator)| {
-            self.append_to_index(output, accumulator.as_ref())
-        });
-        if failed > 0 {
-            return Err(format!(
-                "SketchStore rejected {failed} of {} completed outputs",
-                output_count
-            )
-            .into());
-        }
-        Ok(())
-    }
-}
-
-/// A capturing sink for testing that stores all emitted outputs.
-pub struct CapturingOutputSink {
-    pub captured: Mutex<Vec<(PrecomputedOutput, Box<dyn AggregateCore>)>>,
-}
-
-impl CapturingOutputSink {
-    pub fn new() -> Self {
-        Self {
-            captured: Mutex::new(Vec::new()),
-        }
-    }
-
-    pub fn drain(&self) -> Vec<(PrecomputedOutput, Box<dyn AggregateCore>)> {
-        self.captured.lock().unwrap().drain(..).collect()
-    }
-
-    pub fn len(&self) -> usize {
-        self.captured.lock().unwrap().len()
-    }
-
-    pub fn is_empty(&self) -> bool {
-        self.captured.lock().unwrap().is_empty()
-    }
-}
-
-impl Default for CapturingOutputSink {
-    fn default() -> Self {
-        Self::new()
-    }
-}
-
-impl OutputSink for CapturingOutputSink {
-    fn emit_batch(
-        &self,
-        outputs: Vec<(PrecomputedOutput, Box<dyn AggregateCore>)>,
-    ) -> Result<(), Box<dyn std::error::Error + Send + Sync>> {
-        self.captured.lock().unwrap().extend(outputs);
-        Ok(())
-    }
-}
-
-/// A no-op sink for testing that just counts emitted batches.
-pub struct NoopOutputSink {
-    pub emit_count: std::sync::atomic::AtomicU64,
-}
-
-impl NoopOutputSink {
-    pub fn new() -> Self {
-        Self {
-            emit_count: std::sync::atomic::AtomicU64::new(0),
-        }
-    }
-}
-
-impl Default for NoopOutputSink {
-    fn default() -> Self {
-        Self::new()
-    }
-}
-
-impl OutputSink for NoopOutputSink {
-    fn emit_batch(
-        &self,
-        outputs: Vec<(PrecomputedOutput, Box<dyn AggregateCore>)>,
-    ) -> Result<(), Box<dyn std::error::Error + Send + Sync>> {
-        self.emit_count
-            .fetch_add(outputs.len() as u64, std::sync::atomic::Ordering::Relaxed);
-        Ok(())
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use crate::storage_engines::sketch_db::index::{AggKind, SeriesLookup};
-    use crate::storage_engines::types::{InstalledPrecomputePlan, KeyByLabelValues};
-    use asap_physical_operators::summary_kernels::{DDSketchAccumulator, SumAccumulator};
-    use asap_types::aggregation_config::PrecomputeMaterialization;
-    use asap_types::enums::WindowKind;
-    use asap_types::AggregationType;
-    use asap_types::KeyByLabelNames;
-    use std::collections::HashMap;
-    use std::sync::atomic::{AtomicUsize, Ordering};
-
-    struct EmitOnlySink;
-
-    impl OutputSink for EmitOnlySink {
-        fn emit_batch(
-            &self,
-            _outputs: Vec<(PrecomputedOutput, Box<dyn AggregateCore>)>,
-        ) -> Result<(), Box<dyn std::error::Error + Send + Sync>> {
-            Ok(())
-        }
-    }
-
-    #[test]
-    fn watermark_support_must_be_explicit() {
-        let completion_source = asap_types::sds::SummarySourcePartition {
-            producer_id: "producer".into(),
-            partition_id: "partition".into(),
-            producer_epoch: 1,
-        };
-        let barrier = asap_types::sds::SummaryWatermarkBarrier {
-            catalog_generation: asap_types::sds::CatalogGeneration {
-                schema_version: 1,
-                plan_id: 1,
-                plan_version: 1,
-                snapshot_sha256: "snapshot".into(),
-            },
-            source: completion_source,
-            sequence: 1,
-            watermark_ms: 10,
-        };
-        let err = EmitOnlySink
-            .advance_summary_watermark(&barrier)
-            .expect_err("sink must reject an unsupported barrier");
-        assert_eq!(
-            err.downcast_ref::<std::io::Error>()
-                .map(std::io::Error::kind),
-            Some(std::io::ErrorKind::Unsupported)
-        );
-    }
-
-    fn sum_agg_config(_id: u64, metric: &str, grouping_keys: &[&str]) -> PrecomputeMaterialization {
-        // `_id` is unused after PR 5 — identity is content-addressed
-        // via `PolicyFingerprint::from_config`. Callers obtain the id
-        // via `config.policy_fp_u64()`.
-        PrecomputeMaterialization {
-            stored_output_id: None,
-            semantic_fragment: None,
-            population_key_encoding: Default::default(),
-            aggregation_type: AggregationType::Sum,
-            aggregation_sub_type: String::new(),
-            parameters: HashMap::new(),
-            grouping_labels: KeyByLabelNames::new(
-                grouping_keys.iter().map(|s| s.to_string()).collect(),
-            )
-            .into(),
-            aggregated_labels: KeyByLabelNames::empty(),
-            rollup_labels: KeyByLabelNames::empty(),
-            original_yaml: String::new(),
-            window_size: 1,
-            slide_interval: 1,
-            window_type: WindowKind::Tumbling,
-            window_layout: asap_types::WindowMaterializationLayout::Pane { pane_secs: 1 },
-            pane_origin_ms: None,
-            spatial_filter: String::new(),
-            spatial_filter_normalized: String::new(),
-            metric: metric.to_string(),
-            num_aggregates_to_retain: None,
-            table_name: None,
-            value_projection: None,
-            table_population: None,
-            derived_input: None,
-            table_timestamp_column: None,
-            partitioning: None,
-            value_source_column: None,
-        }
-    }
-
-    #[test]
-    fn sketch_index_sink_writes_to_index() {
-        let cfg = sum_agg_config(7, "cpu_seconds", &["zone"]);
-        let agg_id = cfg.policy_fp_u64();
-        let mut configs = HashMap::new();
-        configs.insert(agg_id, cfg);
-        let streaming = InstalledPrecomputePlan::from_raw_ids(configs);
-        let hot_reload = InstalledPrecomputePlanHandle::new(streaming.clone());
-
-        let summary_store = Arc::new(SketchStore::new());
-        let sink = SketchStoreSink::new(
-            summary_store.clone(),
-            hot_reload,
-            Arc::new(SeriesIdResolver::new()),
-        );
-
-        let key = KeyByLabelValues::new_with_labels(vec!["z0".to_string()]);
-        let output =
-            PrecomputedOutput::new(1000, 2000, Some(key), asap_types::PolicyFingerprint(agg_id));
-        let acc: Box<dyn AggregateCore> = Box::new(SumAccumulator::with_sum(42.0));
-
-        sink.emit_batch(vec![(output, acc)]).expect("emit ok");
-
-        assert_eq!(
-            summary_store.instance_count(),
-            1,
-            "SketchStore should have one precompute instance"
-        );
-        let instances = summary_store
-            .list_by_status(crate::storage_engines::sketch_db::lifecycle::AggStatus::Active);
-        assert_eq!(instances.len(), 1);
-        let meta = instances[0].clone();
-        let sid = meta.storage_handle;
-        assert_eq!(summary_store.classify(sid), SeriesLookup::Hit);
-        assert!(
-            matches!(
-                meta.agg_kind,
-                AggKind::ExactAgg {
-                    agg_type: AggregationType::Sum,
-                    ..
-                }
-            ),
-            "sid metadata should be ExactAgg(Sum)"
-        );
-        // PR 6 follow-up: ExactAgg-backed sids now carry an
-        // `ExactAgg(agg_type)` capability so the analyzer can match
-        // them. Previously this field was unconditionally `None`.
-        assert_eq!(
-            meta.capability,
-            Some(
-                crate::storage_engines::sketch_db::data::Capability::ExactAgg(AggregationType::Sum)
-            ),
-            "ExactAgg sids carry an ExactAgg capability"
-        );
-    }
-
-    #[test]
-    fn sink_reactivates_catalog_series_without_reusing_retired_payload() {
-        let cfg = sum_agg_config(7, "cpu_seconds", &[]);
-        let fingerprint = cfg.policy_fingerprint();
-        let catalog = asap_types::summary_catalog::SummaryCatalog::from_materializations(
-            1,
-            1,
-            &[cfg.clone()],
-        )
-        .unwrap();
-        let store = Arc::new(SketchStore::new());
-        store
-            .install_summary_catalog(Arc::new(catalog.clone()))
-            .unwrap();
-        let temporary = tempfile::tempdir().unwrap();
-        let resolver =
-            Arc::new(SeriesIdResolver::open(temporary.path().join("resolver.wal")).unwrap());
-        let sink = SketchStoreSink::new(
-            store.clone(),
-            InstalledPrecomputePlanHandle::new(InstalledPrecomputePlan::from_raw_ids(
-                HashMap::from([(fingerprint.0, cfg)]),
-            )),
-            resolver,
-        );
-        let original_generation = Arc::new(catalog.reference().unwrap());
-        let output = || {
-            let mut output = PrecomputedOutput::new(1000, 2000, None, fingerprint);
-            output.catalog_generation = Some(Arc::clone(&original_generation));
-            output
-        };
-        sink.emit_batch(vec![(output(), Box::new(SumAccumulator::with_sum(7.0)))])
-            .unwrap();
-        let old_sid = store.series_ids_for_policy(fingerprint)[0];
-        store.remove_instance(old_sid).unwrap();
-        assert!(sink
-            .emit_batch(vec![(output(), Box::new(SumAccumulator::with_sum(11.0)))])
-            .is_err());
-        let mut stale_output = output();
-        stale_output.storage_handle = Some(old_sid);
-        stale_output.catalog_generation = Some(Arc::new(catalog.reference().unwrap()));
-        let mut next = catalog;
-        next.plan_version += 1;
-        let next_generation = Arc::new(next.reference().unwrap());
-        store.install_summary_catalog(Arc::new(next)).unwrap();
-        assert!(sink
-            .emit_batch(vec![(
-                stale_output.clone(),
-                Box::new(SumAccumulator::with_sum(99.0))
-            )])
-            .is_err());
-        let mut next_output = output();
-        next_output.catalog_generation = Some(next_generation);
-        sink.emit_batch(vec![(
-            next_output,
-            Box::new(SumAccumulator::with_sum(11.0)),
-        )])
-        .unwrap();
-        assert!(sink
-            .emit_batch(vec![(
-                stale_output,
-                Box::new(SumAccumulator::with_sum(99.0))
-            )])
-            .is_err());
-        let new_sid = store.series_ids_for_policy(fingerprint)[0];
-        // A derived/unbound stale output must not reuse an already rotated cache hit.
-        assert!(sink
-            .emit_batch(vec![(output(), Box::new(SumAccumulator::with_sum(101.0)))])
-            .is_err());
-        let mut stale_routed_output = output();
-        stale_routed_output.storage_handle = Some(new_sid);
-        assert!(sink
-            .emit_batch(vec![(
-                stale_routed_output,
-                Box::new(SumAccumulator::with_sum(103.0))
-            )])
-            .is_err());
-        let mut missing_generation = PrecomputedOutput::new(1000, 2000, None, fingerprint);
-        missing_generation.storage_handle = Some(new_sid);
-        assert!(sink
-            .emit_batch(vec![(
-                missing_generation,
-                Box::new(SumAccumulator::with_sum(107.0))
-            )])
-            .is_err());
-        assert_ne!(old_sid, new_sid);
-        assert!(store.query_exact_agg_range(old_sid, 1000, 2000).is_empty());
-        let values = store.query_exact_agg_range(new_sid, 1000, 2000);
-        assert_eq!(
-            values[0].1.values().next().unwrap().aux_stats().sum,
-            Some(11.0)
-        );
-    }
-
-    #[test]
-    fn sketch_policy_is_registered_and_stored_as_sketch_state() {
-        let mut cfg = sum_agg_config(8, "latency", &[]);
-        cfg.aggregation_type = AggregationType::DDSketch;
-        cfg.parameters
-            .insert("alpha".into(), serde_json::json!(0.01));
-        let policy_fp = cfg.policy_fp_u64();
-        let hot_reload = InstalledPrecomputePlanHandle::new(InstalledPrecomputePlan::from_raw_ids(
-            HashMap::from([(policy_fp, cfg)]),
-        ));
-        let summary_store = Arc::new(SketchStore::new());
-        let sink = SketchStoreSink::new(
-            summary_store.clone(),
-            hot_reload,
-            Arc::new(SeriesIdResolver::new()),
-        );
-        let mut accumulator = DDSketchAccumulator::new(0.01);
-        accumulator.inner.update(42.0);
-
-        sink.emit_batch(vec![(
-            PrecomputedOutput::new(1_000, 2_000, None, asap_types::PolicyFingerprint(policy_fp)),
-            Box::new(accumulator),
-        )])
-        .expect("emit sketch");
-
-        let meta = summary_store
-            .list_by_status(crate::storage_engines::sketch_db::lifecycle::AggStatus::Active)
-            .into_iter()
-            .next()
-            .expect("registered sketch SID");
-        assert!(matches!(
-            meta.agg_kind,
-            AggKind::Sketch {
-                algorithm: crate::storage_engines::sketch_db::data::SketchAlgorithm::DDSketch,
-                ..
-            }
-        ));
-        assert_eq!(
-            summary_store
-                .query_range(meta.storage_handle, 1_000, 2_000)
-                .len(),
-            1
-        );
-        assert!(summary_store
-            .query_exact_agg_range(meta.storage_handle, 1_000, 2_000)
-            .is_empty());
-    }
-
-    #[test]
-    fn sketch_index_sink_reports_unknown_policy_as_failure() {
-        // Streaming config does NOT contain agg_id=99 — the sink
-        // reports a recoverable error rather than acknowledging a lost write.
-        let streaming = InstalledPrecomputePlan::new(HashMap::new());
-        let hot_reload = InstalledPrecomputePlanHandle::new(streaming.clone());
-        let summary_store = Arc::new(SketchStore::new());
-        let sink = SketchStoreSink::new(
-            summary_store.clone(),
-            hot_reload,
-            Arc::new(SeriesIdResolver::new()),
-        );
-
-        let output = PrecomputedOutput::new(1000, 2000, None, asap_types::PolicyFingerprint(99));
-        let acc: Box<dyn AggregateCore> = Box::new(SumAccumulator::with_sum(1.0));
-        sink.emit_batch(vec![(output, acc)])
-            .expect_err("unpersisted output must not be acknowledged");
-        assert_eq!(summary_store.instance_count(), 0);
-    }
-
-    /// CQ-6 — a registry-miss (policy_fp not in the running streaming
-    /// config) reports a failed write; with an `IngestObservability`
-    /// handle wired in, the `dropped_policy_miss` counter must tick.
-    #[test]
-    fn sink_increments_policy_miss_counter_on_registry_miss() {
-        let streaming = InstalledPrecomputePlan::new(HashMap::new());
-        let hot_reload = InstalledPrecomputePlanHandle::new(streaming.clone());
-        let summary_store = Arc::new(SketchStore::new());
-        let obs = Arc::new(IngestObservability::new());
-        let sink = SketchStoreSink::new(
-            summary_store.clone(),
-            hot_reload,
-            Arc::new(SeriesIdResolver::new()),
-        )
-        .with_observability(obs.clone());
-
-        // policy_fp=42 is absent from the empty registry → registry miss.
-        let output = PrecomputedOutput::new(1000, 2000, None, asap_types::PolicyFingerprint(42));
-        let acc: Box<dyn AggregateCore> = Box::new(SumAccumulator::with_sum(1.0));
-        sink.emit_batch(vec![(output, acc)])
-            .expect_err("unpersisted output must not be acknowledged");
-
-        assert_eq!(
-            summary_store.instance_count(),
-            0,
-            "no write on registry miss"
-        );
-        assert_eq!(
-            obs.dropped_policy_miss
-                .load(std::sync::atomic::Ordering::Relaxed),
-            1,
-            "policy-miss drop counted on the wired observability handle"
-        );
-
-        // The UNSET sentinel is an expected raw-mode skip, NOT a policy
-        // miss — it must not bump the counter.
-        let unset = PrecomputedOutput::new(1000, 2000, None, asap_types::PolicyFingerprint::UNSET);
-        let acc2: Box<dyn AggregateCore> = Box::new(SumAccumulator::with_sum(1.0));
-        sink.emit_batch(vec![(unset, acc2)])
-            .expect_err("unpersisted output must not be acknowledged");
-        assert_eq!(
-            obs.dropped_policy_miss
-                .load(std::sync::atomic::Ordering::Relaxed),
-            1,
-            "UNSET skip is not a policy miss"
-        );
-    }
-
-    #[test]
-    fn consuming_batch_releases_each_item_after_it_is_persisted() {
-        struct DropProbe(Arc<AtomicUsize>);
-        impl Drop for DropProbe {
-            fn drop(&mut self) {
-                self.0.fetch_sub(1, Ordering::SeqCst);
-            }
-        }
-
-        let live = Arc::new(AtomicUsize::new(3));
-        let probes = (0..3).map(|_| DropProbe(live.clone())).collect::<Vec<_>>();
-        let mut observed = Vec::new();
-        assert_eq!(
-            consume_in_order(probes, |_| {
-                observed.push(live.load(Ordering::SeqCst));
-                true
-            }),
-            0
-        );
-        assert_eq!(observed, vec![3, 2, 1]);
-        assert_eq!(live.load(Ordering::SeqCst), 0);
-    }
-}
diff --git a/data_plane/src/precompute_engine/partitioning.rs b/data_plane/src/precompute_engine/partitioning.rs
deleted file mode 100644
index 09ef174fd..000000000
--- a/data_plane/src/precompute_engine/partitioning.rs
+++ /dev/null
@@ -1,115 +0,0 @@
-//! Data ownership for an entire installed precompute graph.
-use std::collections::{BTreeMap, BTreeSet};
-
-use asap_types::precompute_plan::PrecomputePlan;
-use xxhash_rust::xxh64::xxh64;
-
-/// A conservative locality proof. Raw producer paths are validated separately
-/// at installation. Derived graphs use one owner until their complete reduction
-/// paths can establish a finer partition without a cross-worker exchange.
-#[derive(Debug, Clone, PartialEq, Eq, Default)]
-pub enum DagPartitioning {
-    #[default]
-    SingleWorker,
-    Labels(Vec<String>),
-    Population,
-}
-
-impl DagPartitioning {
-    pub fn from_plan(plan: &PrecomputePlan) -> Self {
-        if plan
-            .materializations
-            .iter()
-            .any(|output| output.derived_input.is_some())
-        {
-            return Self::SingleWorker;
-        }
-        let mut common: Option<BTreeSet<String>> = None;
-        for output in &plan.materializations {
-            let labels = output
-                .grouping_labels
-                .iter()
-                .cloned()
-                .collect::<BTreeSet<_>>();
-            common = Some(match common {
-                None => labels,
-                Some(previous) => previous.intersection(&labels).cloned().collect(),
-            });
-        }
-        match common {
-            Some(labels) if !labels.is_empty() => Self::Labels(labels.into_iter().collect()),
-            _ if !plan.materializations.is_empty()
-                && plan.materializations.iter().all(|output| {
-                    output.partitioning == Some(asap_types::sds::PopulationPartitioning::PerEntity)
-                }) =>
-            {
-                Self::Population
-            }
-            _ => Self::SingleWorker,
-        }
-    }
-
-    pub fn owner(
-        &self,
-        population: &BTreeMap<String, String>,
-        workers: usize,
-    ) -> Result<usize, String> {
-        if workers == 0 {
-            return Err("precompute requires at least one worker".into());
-        }
-        match self {
-            Self::SingleWorker => Ok(0),
-            Self::Population => {
-                let key = super::group_key::GroupKey::new(
-                    population.iter().map(|(k, v)| (k.as_str(), v.as_str())),
-                );
-                Ok(xxh64(key.canonical_bytes(), 0) as usize % workers)
-            }
-            Self::Labels(names) => {
-                let pairs = names
-                    .iter()
-                    .map(|name| {
-                        population
-                            .get(name)
-                            .map(|value| (name.as_str(), value.as_str()))
-                            .ok_or_else(|| {
-                                format!("DAG partition label {name} is absent from population")
-                            })
-                    })
-                    .collect::<Result<Vec<_>, _>>()?;
-                let key = super::group_key::GroupKey::new(pairs);
-                Ok(xxh64(key.canonical_bytes(), 0) as usize % workers)
-            }
-        }
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    // Upstream series state and downstream grouped state have one owner.
-    #[test]
-    fn service_partition_preserves_series_and_reduction_locality() {
-        let rule = DagPartitioning::Labels(vec!["service".into()]);
-        let group = BTreeMap::from([("service".into(), "api".into())]);
-        let expected = rule.owner(&group, 4).unwrap();
-        for instance in ["a", "b", "c"] {
-            let mut series = group.clone();
-            series.insert("instance".into(), instance.into());
-            assert_eq!(rule.owner(&series, 4).unwrap(), expected);
-        }
-        assert!(rule.owner(&BTreeMap::new(), 4).is_err());
-        assert!(rule.owner(&group, 0).is_err());
-        let owners = (0..64)
-            .map(|i| {
-                rule.owner(
-                    &BTreeMap::from([("service".into(), format!("service-{i}"))]),
-                    4,
-                )
-                .unwrap()
-            })
-            .collect::<BTreeSet<_>>();
-        assert_eq!(owners.len(), 4);
-    }
-}
diff --git a/data_plane/src/precompute_engine/precompute_engine_design_doc.md b/data_plane/src/precompute_engine/precompute_engine_design_doc.md
deleted file mode 100644
index 123d8837a..000000000
--- a/data_plane/src/precompute_engine/precompute_engine_design_doc.md
+++ /dev/null
@@ -1,1172 +0,0 @@
-# Precompute Engine Design Document
-
-## 1. Overview
-
-The Precompute Engine is a real-time streaming aggregation system that sits between
-metric producers and ASAP storage and query engine. It accepts raw
-time-series samples via multiple ingestion connectors (Prometheus remote write
-and VictoriaMetrics remote write), buffers them, computes windowed aggregations
-(sketches), and writes the results to a store for fast query-time retrieval.
-
-**Key properties:**
-- Single-machine, multi-threaded architecture (all workers run as async tasks within one process)
-- Watermark-based windowed aggregation (tumbling and sliding windows)
-- Shared-nothing worker design: series are hash-partitioned across threads with no cross-worker coordination
-- Pluggable accumulator types (Sum, Min/Max, Increase, KLL, CMS, HydraKLL)
-- Configurable late-data handling (Drop or ForwardToStore)
-- Optional raw passthrough mode for bypassing aggregation
-
-## 2. Architecture
-
-```
-                 OTLP receiver (gRPC :4317 / HTTP :4318)
-                  raw points + sketch envelopes (modified-OTLP)
-                                  |
-                                  v
-                    IngestState (route_otel_*)
-                     (group by series key)
-                                  |
-                            SeriesRouter (hash)
-                          /        |        \
-                     Worker 0   Worker 1   Worker 2  ...  Worker N-1
-                     (shard 0)  (shard 1)  (shard 2)      (shard N-1)
-                        |           |           |              |
-                        +---------- + --------- + ----------- +
-                                    |
-                             OutputSink.emit_batch()
-                                    |
-                                 Store
-                          (SketchStore / PerKey)
-                                    |
-                             Query Engine
-                          (PromQL / SQL / etc.)
-```
-
-A periodic **flush timer** broadcasts `Flush` messages to all workers so that
-windows that would otherwise remain open (no new samples arriving) are closed
-and emitted.
-
-## 2.1 Watermark Propagation
-
-### How watermarks work
-
-A watermark is a monotonically increasing timestamp assertion: **"no more events
-with timestamp <= W will arrive."** It tells the system when a time window can
-be safely closed and its results emitted.
-
-```
-Time ──────────────────────────────────────────────────────────►
-
-Event Stream (arriving out of order):
-  t=3  t=1  t=5  t=2  t=7  t=4  t=9  t=6  t=11  t=8  t=13
-   ●    ●    ●    ●    ●    ●    ●    ●    ●     ●     ●
-
-Watermark (max_ts - allowed_lateness, where lateness=2):
-  W=1  W=1  W=3  W=3  W=5  W=5  W=7  W=7  W=9   W=9  W=11
-   ─────┘    ─────┘    ─────┘    ─────┘    ─────┘      │
-   (no advance,       (advances)                        │
-    older event)                                        │
-
-Window Lifecycle (window_size=5, slide=5):
-                                                        │
-  ┌─────────────────────┐                               │
-  │  Window [0, 5)      │                               │
-  │  collects: t=3,1,2,4│                               │
-  │                     │── W=5 crosses end ──► EMIT    │
-  └─────────────────────┘                               │
-                                                        │
-        ┌─────────────────────┐                         │
-        │  Window [5, 10)     │                         │
-        │  collects: t=5,7,9,6│                         │
-        │                     │── W=11 crosses end      │
-        └─────────────────────┘           ──► EMIT      │
-                                                        │
-              ┌─────────────────────┐                   │
-              │  Window [10, 15)    │                    │
-              │  collects: t=11,13  │  (still open,     │
-              │  ...waiting...      │   W=11 < 15)      │
-              └─────────────────────┘                   │
-
-
-Late data handling:
-
-  Timeline:    ... t=6  t=10  t=3 ...
-                    ●     ●    ●
-                              │
-               Watermark W=8 ─┘
-               t=3 < W - allowed_lateness(2) = 6?
-               3 < 6 → YES, late → DROP (or ForwardToStore)
-```
-
-### Per-group event-time watermarks
-
-Each group tracks its own maximum observed event timestamp. Its event-time
-watermark is `max_event_time_ms - allowed_lateness_ms`. Periodic flushes never
-modify observed event time.
-
-A timestamp observed for one group does not advance another group. Independent
-sources can progress at different rates, so cross-group propagation can close a
-live window prematurely and turn valid input into late data. The worker-level
-watermark atomic reports the maximum group watermark for diagnostics only; it
-is not fed back into group closure.
-
-Idle and bounded-time closure use a separate wall-clock policy. Distributed
-completion requires an explicit source/window barrier; an unrelated group's
-timestamp is not such a barrier.
-
-## 3. Components
-
-### 3.1 PrecomputeEngine (`mod.rs`)
-
-Top-level orchestrator. On `run()`:
-
-1. Creates one `mpsc::channel<WorkerMessage>` per worker.
-2. Constructs a `SeriesRouter` with the sender halves.
-3. Spawns `Worker` tasks, each owning its receiver.
-4. Spawns a flush timer that calls `router.broadcast_flush()` every
-   `flush_interval_ms`.
-5. Starts the Axum HTTP server with routes for each ingest connector and blocks until shutdown.
-
-```rust
-pub struct PrecomputeEngine {
-    config: PrecomputeEngineConfig,
-    streaming_config: Arc<StreamingConfig>,
-    output_sink: Arc<dyn OutputSink>,
-}
-```
-
-### 3.2 Configuration (`config.rs`)
-
-```rust
-pub struct PrecomputeEngineConfig {
-    pub num_workers: usize,              // default: 4
-    pub allowed_lateness_ms: i64,        // default: 5,000
-    pub max_buffer_per_series: usize,    // default: 10,000
-    pub flush_interval_ms: u64,          // default: 1,000
-    pub channel_buffer_size: usize,      // default: 10,000
-    pub pass_raw_samples: bool,          // default: false
-    pub raw_mode_aggregation_id: u64,    // default: 0
-    pub late_data_policy: LateDataPolicy, // default: ForwardToStore
-    pub wall_clock_idle_grace_period_ms: i64, // default: 5,000
-    pub wall_clock_max_open_grace_period_ms: i64, // default: 5,000
-}
-
-pub enum LateDataPolicy {
-    Drop,            // Silently discard late samples for closed windows
-    ForwardToStore,  // Emit a mini-accumulator for query-time merge
-}
-```
-
-For a window of duration `W`, idle closure fires after `W + idle_grace`
-without a touch. When enabled, the absolute deadline fires after
-`W + max_open_grace` from the first touch even if input remains active. These
-wall-clock decisions advance only the closure watermark; they never modify the
-maximum observed event timestamp.
-
-The absolute deadline is applied only with `ForwardToStore`: input arriving
-after a deadline close is appended as a mergeable correction for the same
-logical window. With explicit `Drop`, the absolute deadline is disabled so a
-timer cannot introduce silent loss. Both actions increment
-`asap_precompute_late_inputs_total{action,input_kind}`.
-
-### 3.3 SeriesRouter (`series_router.rs`)
-
-Deterministic hash-based routing using XXHash64:
-
-```
-worker_idx = xxhash64(series_key) % num_workers
-```
-
-All samples for a given series always land on the same worker, so per-series
-state (buffer, watermark, active windows) needs no synchronization.
-
-**Message types:**
-```rust
-enum WorkerMessage {
-    Samples { series_key: String, samples: Vec<(i64, f64)>, ingest_received_at: Instant },
-    Flush,
-    Shutdown,
-}
-```
-
-`route_batch()` groups messages by target worker and sends them in parallel for
-throughput while preserving per-worker ordering.
-
-#### Load balancing trade-offs and alternatives
-
-The current hash-mod scheme is correct and low-overhead but has four distinct failure modes. Each has a corresponding mitigation strategy.
-
-**Problem 1: hash skew — uneven series count per worker**
-
-With a good hash and N workers the variance in series count is O(√(S/N)), which is negligible at large S. Virtual nodes (each physical worker owns K hash ring slots) reduce variance further at zero runtime cost but are rarely necessary with xxhash64 in practice.
-
-**Problem 2: hot series — a few series dominate sample volume**
-
-The hash does not know about per-series sample rates. If one metric is scraped at 1 s while others are at 60 s, the owning worker handles 60× more samples.
-
-*Mitigation — weight-aware initial placement:* on first sight of a series, assign it to the least-loaded worker (by current sample rate) and record the assignment in a small routing table that replaces the hash lookup. The assignment remains stable (one series = one worker always), so no cross-worker state is needed. The routing table fits in memory for millions of series. Works well when series rates are observable at assignment time (e.g. from Prometheus service discovery).
-
-**Problem 3: GROUP BY fan-in — cross-worker store entries require query-time merge**
-
-Because routing is by full series key, two series that share a `grouping_labels` value but differ in rolled-up labels land on different workers and emit independent accumulators for the same `(agg_id, key, window)` tuple (see §4). The store must append multiple entries and the query engine merges them.
-
-*Mitigation A — route by grouping key:* use `xxhash64(grouping_key)` instead of the full series key. All series rolling up into the same GROUP BY bucket land on one worker, which merges them before emitting. The store gets exactly one entry per `(agg_id, key, window)` and no query-time fan-in is needed. Trade-offs: routing requires knowing the config's `grouping_labels` at ingest time; creates a new hot-key risk when one grouping value covers far more series than others; a series matched by multiple configs with different grouping keys would need to be sent to multiple workers.
-
-*Mitigation B — two-phase aggregation:* keep routing by series key (local aggregation as now) but emit partial accumulators to a second tier of reduce-workers routed by grouping key. Reduce-workers merge partials and write a single entry to the store. Eliminates query-time fan-in without the hot-key risk. Adds one extra hop of latency and requires coordinating two flush cycles.
-
-**Problem 4: static assignment — series stuck on overloaded workers**
-
-Hash-based assignment is fixed for the lifetime of the process. A series that begins emitting at 100× its original rate stays on the same worker forever.
-
-*Mitigation — state migration at window boundaries:* when a series has no open panes (i.e. `active_panes` is empty after a window close), its state can be serialized, sent to a new worker, and the routing table updated atomically. The empty-panes condition occurs naturally at every tumbling window boundary, or periodically for sliding windows after all panes are evicted. Operationally complex but sound — no split-window state is possible if migration is gated on the empty-panes condition.
-
-**Practical signal: channel backpressure**
-
-Before investing in any of the above, add observability to the bounded MPSC channels — if a worker's channel is frequently near capacity, that is the primary signal that routing is imbalanced. Exposing `channel.capacity()` (remaining slots) per worker as a metric is cheap and pinpoints which worker is the bottleneck, providing the data needed to choose between the mitigations above.
-
-
-### 3.4 Worker (`worker.rs`)
-
-Each worker owns an isolated shard of the series space.
-
-```rust
-struct Worker {
-    id: usize,
-    receiver: mpsc::Receiver<WorkerMessage>,
-    output_sink: Arc<dyn OutputSink>,
-    series_map: HashMap<String, SeriesState>,
-    agg_configs: HashMap<u64, AggregationConfig>,
-    max_buffer_per_series: usize,
-    allowed_lateness_ms: i64,
-    pass_raw_samples: bool,
-    raw_mode_aggregation_id: u64,
-    late_data_policy: LateDataPolicy,
-}
-```
-
-**Per-series state:**
-```rust
-struct SeriesState {
-    previous_watermark_ms: i64,                // last-seen watermark
-    aggregations: Vec<AggregationState>,       // one per matching config
-}
-
-struct AggregationState {
-    config: AggregationConfig,
-    window_manager: WindowManager,
-    active_panes: BTreeMap<i64, Box<dyn AccumulatorUpdater>>,
-}
-```
-
-#### Accumulator lifecycle and ownership
-
-Accumulators are not pre-assigned — they are created **lazily** at three nested levels:
-
-**1. At engine startup** (`engine.rs`): every worker receives a full copy of all `AggregationConfig`s. All workers are symmetric; none is pre-assigned to any series or config.
-
-```rust
-let agg_configs = streaming_config.get_all_aggregation_configs().clone();
-for (id, rx) in receivers {
-    Worker::new(id, rx, sink.clone(), agg_configs.clone(), ...)
-}
-```
-
-**2. On first sample for a series** (`get_or_create_series_state`): the worker calls `matching_agg_configs(series_key)` to filter the config map by metric name, then creates one `AggregationState` per match (a `WindowManager` + empty pane map). No accumulators exist yet.
-
-```rust
-let aggregations = matching_agg_configs(series_key).map(|(_, config)| AggregationState {
-    window_manager: WindowManager::new(config.window_size, config.slide_interval),
-    config: config.clone(),
-    active_panes: BTreeMap::new(),   // ← empty; no memory allocated for sketches yet
-}).collect();
-```
-
-**3. On first sample in a pane** (`process_samples`): the accumulator is created the moment a sample falls into a pane that does not yet exist in `active_panes`.
-
-```rust
-let updater = agg_state.active_panes
-    .entry(pane_start)
-    .or_insert_with(|| create_accumulator_updater(&agg_state.config));
-```
-
-**Ownership hierarchy:**
-
-```
-Worker
-└── series_map[series_key]           one entry per series this worker owns
-    └── aggregations[i]              one AggregationState per matching config
-        └── active_panes[pane_start] one AccumulatorUpdater per open pane
-            └── Box<dyn AggregateCore>   the actual sketch / sum / minmax / etc.
-```
-
-Because `xxhash64(series_key) % N` is deterministic, a series always lands on the same worker. Its accumulators live in exactly one worker with no sharing and no locking. Workers that never receive a series never allocate any state for it.
-
-#### Pane-Based Sliding Window Optimization
-
-The worker uses **pane-based incremental computation** to reduce per-sample
-work for sliding windows. The timeline is divided into non-overlapping **panes**
-of size `slide_interval`. Each window is composed of `W = window_size /
-slide_interval` consecutive panes. Consecutive windows share W-1 panes.
-
-```
-Panes:     [0,10)  [10,20)  [20,30)  [30,40)  [40,50)
-Window A:  [───────── 0,30 ─────────)
-Window B:          [───────── 10,40 ─────────)
-Window C:                  [───────── 20,50 ─────────)
-```
-
-**Why panes instead of subtraction?** Only Sum is invertible. MinMax, Increase,
-KLL, CMS, HydraKLL are all non-invertible. Pane+merge works universally because
-all accumulator types implement `AggregateCore::merge_with()`.
-
-**Performance comparison** (N samples per window, W = window_size / slide_interval):
-
-| | Per-window approach | Pane-based |
-|--|---------|------------|
-| Per-sample accumulator updates | N × W | N × 1 |
-| Per-window-close merges | 0 | W - 1 |
-| Per-window-close clones | 0 | W - 2 (shared panes) |
-
-Net win when N >> W (typical: thousands of samples per window, W = 3-5).
-For tumbling windows (W=1), panes degenerate to 1 pane = 1 window with
-zero merges — identical behavior to the non-pane approach.
-
-**Key methods:**
-
-| Method | Description |
-|--------|-------------|
-| `pane_start_for(ts)` | Align timestamp to slide grid (same as `window_start_for`) |
-| `panes_for_window(ws)` | All pane starts composing window `[ws, ws+size)` |
-| `snapshot_accumulator()` | Non-destructive read of a pane's accumulator (for shared panes) |
-
-**Pane eviction:** When window `[S, S+W)` closes, pane `[S, S+slide)` is the
-oldest pane and is not needed by any later window (next window starts at
-`S+slide`). It is destructively consumed via `take_accumulator()` and removed
-from `active_panes`. Remaining panes are read non-destructively via
-`snapshot_accumulator()`.
-
-#### Processing pipeline (`process_samples`)
-
-```
-1. Match series to AggregationConfigs (by metric name / spatial_filter)
-2. Insert samples and update maximum observed event time
-3. Compute event watermark as `max_event_time_ms - allowed_lateness_ms`
-4. For each sample × each aggregation:
-   a. Compute pane_start = pane_start_for(ts)
-   b. If pane was evicted (late data for closed window):
-      → late_data_policy == Drop:           skip
-      → late_data_policy == ForwardToStore:  create mini-accumulator, emit
-   c. Else: get-or-create pane in active_panes, feed value (1 update per sample)
-5. Detect newly closed windows via
-   `closed_windows(previous_closure_watermark, event_watermark)`
-6. For each closed window:
-   a. Get pane starts via panes_for_window(window_start)
-   b. Oldest pane: take_accumulator() + remove from active_panes (destructive)
-   c. Remaining panes: snapshot_accumulator() (non-destructive, shared)
-   d. Merge all pane accumulators via AggregateCore::merge_with()
-   e. Emit merged result as PrecomputedOutput + AggregateCore
-7. Emit batch to OutputSink
-8. Update observed event time and the separate closure watermark
-```
-
-#### Raw mode
-
-When `pass_raw_samples = true`, the entire aggregation pipeline is bypassed.
-Each sample is emitted as a `SumAccumulator::with_sum(value)` with point-window
-bounds `[ts, ts]` and the configured `raw_mode_aggregation_id`.
-### 3.5 WindowManager (`window_manager.rs`)
-
-Handles both tumbling and sliding window semantics.
-
-```rust
-struct WindowManager {
-    window_size_ms: i64,       // e.g. 60_000
-    slide_interval_ms: i64,    // == window_size for tumbling; < window_size for sliding
-}
-```
-
-**Key methods:**
-
-| Method | Description |
-|--------|-------------|
-| `window_start_for(ts)` | Align timestamp down to nearest slide boundary |
-| `window_starts_containing(ts)` | All windows whose `[start, start+size)` includes `ts`. Tumbling → 1 window; sliding → `ceil(size/slide)` windows |
-| `closed_windows(prev_wm, curr_wm)` | Windows that transitioned open→closed as the watermark advanced |
-| `window_bounds(start)` | Returns `(start, start + window_size_ms)` |
-| `pane_start_for(ts)` | Pane start for a timestamp (same slide-aligned grid as `window_start_for`) |
-| `panes_for_window(ws)` | All pane starts composing window `[ws, ws+size)`, in ascending order |
-| `slide_interval_ms()` | Slide interval accessor |
-
-**Window closure rule:** a window `[S, S + size)` closes when `watermark >= S + size`.
-Once closed, a window never reopens.
-
-#### Sliding window mechanics
-
-Tumbling windows are a special case of sliding windows where
-`slide_interval == window_size`. The same code handles both — no separate paths.
-
-**`window_start_for(ts)`** aligns a timestamp to the slide grid:
-```rust
-let n = timestamp_ms.div_euclid(slide_interval_ms);
-n * slide_interval_ms
-```
-
-**`window_starts_containing(ts)`** returns all windows whose `[start, start+size)`
-contains the timestamp, by walking backwards from the aligned start:
-```rust
-let mut start = window_start_for(timestamp_ms);
-while start + window_size_ms > timestamp_ms {
-    starts.push(start);
-    start -= slide_interval_ms;
-}
-```
-
-For tumbling windows this always yields exactly 1 result. For sliding windows,
-each sample belongs to `ceil(window_size / slide_interval)` overlapping windows.
-
-**Example** (30s window, 10s slide):
-```
-t=15s → belongs to windows [0, 30s), [10s, 40s), [-10s, 20s)   (3 windows)
-t=35s → belongs to windows [30s, 60s), [20s, 50s), [10s, 40s)  (3 windows)
-```
-
-**`closed_windows(prev_wm, curr_wm)`** finds windows that transitioned open→closed
-as the watermark advanced. It scans forward from the earliest possibly-open window
-start, collecting those where `start + size <= curr_wm` (now closed) AND
-`start + size > prev_wm` (was still open before).
-
-The worker calls `window_starts_containing(ts)` for each incoming sample and feeds
-the value into the accumulator for every matching window. When
-`closed_windows()` fires, each closed window's accumulator is extracted and
-emitted independently.
-### 3.6 AccumulatorUpdater (`accumulator_factory.rs`)
-
-Trait-based interface for feeding samples into sketch accumulators:
-
-```rust
-trait AccumulatorUpdater: Send {
-    fn update_single(&mut self, value: f64, timestamp_ms: i64);
-    fn update_keyed(&mut self, key: &KeyByLabelValues, value: f64, timestamp_ms: i64);
-    fn take_accumulator(&mut self) -> Box<dyn AggregateCore>;
-    fn snapshot_accumulator(&self) -> Box<dyn AggregateCore>;  // non-destructive clone
-    fn reset(&mut self);
-    fn is_keyed(&self) -> bool;
-    fn memory_usage_bytes(&self) -> usize;
-}
-```
-
-`snapshot_accumulator()` returns a clone of the current state without resetting.
-Used by pane-based sliding windows to read shared panes that are still needed
-by future windows.
-
-The factory function `create_accumulator_updater(config)` dispatches on
-`(aggregation_type, aggregation_sub_type)`:
-
-| Type | Sub-type | Updater |
-|------|----------|---------|
-| SingleSubpopulation | Sum | SumAccumulatorUpdater |
-| SingleSubpopulation | Min/Max | MinMaxAccumulatorUpdater |
-| SingleSubpopulation | Increase | IncreaseAccumulatorUpdater |
-| SingleSubpopulation | KLL | KllAccumulatorUpdater |
-| MultipleSubpopulation | Sum | MultipleSumUpdater |
-| MultipleSubpopulation | Min/Max | MultipleMinMaxUpdater |
-| MultipleSubpopulation | Increase | MultipleIncreaseUpdater |
-| MultipleSubpopulation | CMS | CmsAccumulatorUpdater |
-| MultipleSubpopulation | HydraKLL | HydraKllAccumulatorUpdater |
-
-### 3.7 OutputSink (`output_sink.rs`)
-
-```rust
-trait OutputSink: Send + Sync {
-    fn emit_batch(
-        &self,
-        outputs: Vec<(PrecomputedOutput, Box<dyn AggregateCore>)>,
-    ) -> Result<(), Box<dyn std::error::Error + Send + Sync>>;
-}
-```
-
-**Implementations:**
-- `StoreOutputSink` — calls `store.insert_precomputed_output_batch()`
-- `RawPassthroughSink` — same interface, used for raw mode
-- `NoopOutputSink` — testing helper that counts emitted items via `AtomicU64`
-- `CapturingOutputSink` — testing helper that stores all emitted `(PrecomputedOutput, Box<dyn AggregateCore>)` pairs in a `Mutex<Vec<...>>`, with `drain()` and `len()` for assertions
-
-## 4. Cross-Series (GROUP BY) Aggregation
-
-### Label dimension roles
-
-`AggregationConfig` has three label dimension fields that control the spatial aggregation shape:
-
-| Field | Role |
-|---|---|
-| `grouping_labels` | Labels preserved in `PrecomputedOutput.key`; form the GROUP BY key visible at query time |
-| `aggregated_labels` | Internal sub-keys for MultipleSubpopulation sketches (e.g. CMS, HydraKLL) |
-| `rollup_labels` | Dropped entirely at ingest; not recoverable at query time |
-
-A config with `grouping_labels: [job]` and `rollup_labels: [instance]` means: "aggregate across all instances, keep one output series per job value." Multiple input series (`metric{job=j1,instance=h1}`, `metric{job=j1,instance=h2}`, ...) all contribute to the same logical output key `(job=j1)`.
-
-### Cross-worker fan-in
-
-Because routing is by full series key (`xxhash64(series_key) % N`), two series that share a `grouping_labels` value but differ in rolled-up labels typically land on different workers:
-
-```
-metric{job=j1, instance=h1} → Worker 0 → pane accumulator with key (job=j1)
-metric{job=j1, instance=h2} → Worker 3 → pane accumulator with key (job=j1)
-```
-
-Each worker independently closes its window and emits a separate `PrecomputedOutput` with key `(job=j1)` for the same window `[0, 60s)`. The store **appends** rather than overwrites on the same `(aggregation_id, key, window)` tuple:
-
-```
-store[(agg_id, key=(j1), [0,60s))] → [acc_worker0, acc_worker3]
-```
-
-Query-time `SummaryMergeMultipleExec` merges all entries for the same key and window via `AggregateCore::merge_with()`. No ingest-time cross-worker coordination is needed.
-
-### Eventual consistency
-
-Workers have independent watermarks. For a standard Prometheus scrape (all instances delivered in one HTTP batch via `route_batch()`), all workers receive their samples in the same round-trip and close the window on the same flush cycle. The incompleteness window — time between the first and last worker emitting for the same cross-series window — is typically milliseconds (bounded by Tokio task scheduling jitter).
-
-For staggered multi-source producers arriving at different times, the incompleteness window is bounded by the spread of producer arrival times. In both cases the result is **eventually consistent**: once all contributing workers have emitted, the store holds a complete set of accumulators and queries return the correct merged value.
-
-This deferred-merge design is intentional — it preserves the shared-nothing worker architecture with zero ingest-time cross-worker coordination. The store's append-multiple-per-window design and the query-time merge handle the fan-in correctly for both cross-series aggregation and `ForwardToStore` late data.
-
-### Sliding windows with cross-worker GROUP BY
-
-The pane-sharing optimization is an **intra-worker** implementation detail. From the store and query engine's perspective, each worker always emits a complete, self-consistent accumulator for each closed window — tumbling or sliding makes no difference to the cross-worker fan-in.
-
-**Within a single worker** (e.g. Worker 0, series `{job=j1, instance=h1}`, 30s/10s sliding):
-
-```
-Window [0, 30s)  — panes [0, 10s, 20s]
-  pane 0:   take (evict — no future window needs it)
-  pane 10s: snapshot (shared with [10s, 40s))
-  pane 20s: snapshot (shared with [10s, 40s) and [20s, 50s))
-  → emit: acc_w0, key=(j1), window=[0,30s), sum = v_0 + v_10 + v_20
-
-Window [10s, 40s)  — panes [10s, 20s, 30s]
-  pane 10s: take (evict — snapshot for [0,30s) already completed)
-  pane 20s: snapshot
-  pane 30s: snapshot (or take, depending on future windows)
-  → emit: acc_w0, key=(j1), window=[10s,40s), sum = v_10 + v_20 + v_30
-```
-
-Worker 3 (series `{job=j1, instance=h2}`) performs the same steps independently — its own pane `BTreeMap`, its own snapshots, its own emits.
-
-**What the store sees:**
-
-```
-store[(agg_id, key=(j1), [0,  30s))] → [acc_w0, acc_w3]
-store[(agg_id, key=(j1), [10s,40s))] → [acc_w0, acc_w3]
-store[(agg_id, key=(j1), [20s,50s))] → [acc_w0, acc_w3]
-```
-
-Each entry is a complete accumulator from one worker for one window. Query-time merge combines them identically to the tumbling case.
-
-The pane snapshot/take logic reduces memory and CPU inside each worker (avoiding re-accumulation of shared panes), but what exits the worker is always one standalone `Box<dyn AggregateCore>` per window. Consecutive sliding windows `[0,30s)` and `[10s,40s)` share panes *inside* the worker but have independent store entries — their cross-worker merges at query time are completely unrelated.
-
-### Optional second-tier merge workers for cross-worker accumulator reduction
-
-The current design relies on **query-time merge** for cross-worker fan-in. That
-is sufficient for eventual consistency, but it leaves two important gaps:
-
-1. **Query latency / repeated work** — queries must repeatedly merge
-   per-worker fragments for the same `(aggregation_id, key, window)` tuple.
-2. **No canonical reduced output** — the store holds worker-local fragments
-   rather than a single merged accumulator for each logical output window.
-
-This affects **all mergeable accumulators**, not just sliding-window sketches:
-
-- tumbling-window group-by aggregates spread across workers
-- sliding-window exact outputs
-- keyed sketches such as CMS / HydraKLL
-- late-data mini-accumulators emitted via `ForwardToStore`
-
-Sliding windows are the strongest motivation because exact reads benefit most
-from canonical pre-merged output, but the same second-tier reduction design can
-be used for any accumulator type that implements `AggregateCore::merge_with()`.
-
-To close those gaps without giving up shared-nothing ingest, add an optional
-**second tier of merge workers** between the first-tier workers and the final
-store.
-
-#### Goal
-
-Produce **one canonical accumulator per logical output window**:
-
-```
-(aggregation_id, grouping_key, window_start, window_end) -> merged accumulator
-```
-
-so that:
-
-- the store can hold one merged output per `(aggregation_id, key, window)`
-- query-time merge is reduced or eliminated for merge-tier-enabled aggregations
-- distributed output matches the semantics of a single logical aggregation over
-  the full input stream
-
-For sliding windows, this gives semantic equivalence to a single logical
-`HOP(slide, size)` aggregation over the distributed input stream. For tumbling
-windows and other mergeable accumulators, it gives the same result the query
-engine would otherwise have to reconstruct on read.
-
-#### High-level architecture
-
-```
-Remote write
-  -> SeriesRouter
-  -> First-tier workers (per-series pane accumulation)
-  -> MergeRouter
-  -> Merge workers (per-window fan-in, all keys co-located)
-  -> FinalOutputSink
-  -> Store
-```
-
-The first tier is unchanged: it still owns all per-series pane state and emits
-one standalone accumulator per closed window. The new part is that these emits
-go to the `MergeRouter` instead of directly to the final store.
-
-#### Routing key for the merge tier
-
-All messages — both `PartialWindowAggregate` and `WindowCompletion` — are
-routed by the **window identity alone**, without the grouping key:
-
-```
-merge_key = hash(aggregation_id, window_start_ms, window_end_ms)
-```
-
-This ensures that:
-
-1. All partials for any key within the same window land on the same merge
-   worker, so the merge worker can finalize all keys for a window in one pass.
-2. `WindowCompletion` messages (which carry no key) route to exactly the same
-   merge worker as the partials they complete, through the same MPSC channel.
-   This preserves FIFO ordering: all `PartialWindowAggregate` messages from a
-   first-tier worker for a given window are enqueued before its
-   `WindowCompletion` for that window.
-
-Routing by `(agg_id, key, window)` is explicitly avoided. It would put partials
-for different keys on different merge workers, requiring `WindowCompletion` to be
-broadcast to every merge worker — an O(M) fanout for M merge workers per
-completion. Window-level routing eliminates that broadcast entirely.
-
-#### Messages emitted by first-tier workers
-
-Each first-tier worker emits two message types per closed window per
-aggregation, always in this order within the same MPSC channel to the merge
-worker:
-
-1. Zero or more `PartialWindowAggregate` (one per series that had data in this
-   window), followed immediately by:
-2. Exactly one `WindowCompletion`
-
-```rust
-/// Partial result from one first-tier worker for one closed window.
-/// Zero or more of these arrive before the WindowCompletion for the same
-/// (aggregation_id, window_start_ms, window_end_ms, source_worker_id).
-struct PartialWindowAggregate {
-    aggregation_id: u64,
-    key: Option<KeyByLabelValues>,   // grouping key extracted from the series
-    window_start_ms: u64,
-    window_end_ms: u64,
-    source_worker_id: usize,
-    accumulator: Box<dyn AggregateCore>,
-}
-
-/// Signals that source_worker_id will send no more on-time PartialWindowAggregates
-/// for (aggregation_id, window_start_ms, window_end_ms).
-/// One per (aggregation_id, window, source_worker_id) — no key field.
-struct WindowCompletion {
-    aggregation_id: u64,
-    window_start_ms: u64,
-    window_end_ms: u64,
-    source_worker_id: usize,
-    worker_watermark_ms: i64,   // the worker's watermark at the time of completion
-}
-```
-
-`WindowCompletion` carries no `key` field. It is a window-level signal, not a
-key-level signal. The merge worker infers which keys exist from the partials it
-has received; it finalizes all observed keys once all sources have completed the
-window.
-
-Because both message types are enqueued into the **same MPSC channel** from a
-given first-tier worker to its target merge worker, the merge worker always
-observes partials before the completion for the same
-`(aggregation_id, window, source)` triple. No additional ordering guarantee is
-needed.
-
-#### First-tier worker watermark for WindowCompletion
-
-`WindowCompletion` must be emitted by **every** first-tier worker for every
-window of every aggregation it is configured for — including workers that
-received no data for that aggregation or window.
-
-A worker may have no matching series for an aggregation (its `series_map` has
-no entry for any series matching that config). In that case it will never
-receive samples for that aggregation and its per-series watermarks will never
-advance. Without an explicit mechanism, it would never emit `WindowCompletion`,
-causing the merge worker to deadlock waiting for N completions.
-
-**Fix: per-worker global watermark, advanced by the flush timer.**
-
-Each first-tier worker maintains a `per_agg_watermark: HashMap<u64, i64>` —
-one entry per aggregation config it knows about, initialized to `i64::MIN`.
-
-The watermark for aggregation `agg_id` is updated by two sources:
-
-1. **Data arrival**: when any series matching `agg_id` closes a window, the
-   worker updates `per_agg_watermark[agg_id]` to the maximum watermark seen
-   across all its matching series.
-
-2. **Flush timer**: on each `WorkerMessage::Flush`, for every aggregation config
-   the worker is configured with, the worker advances `per_agg_watermark[agg_id]`
-   to at least `now_ms - allowed_lateness_ms` (wall-clock derived floor). This
-   ensures forward progress even when no data arrives for a given aggregation.
-
-After updating `per_agg_watermark[agg_id]`, the worker calls
-`window_manager.closed_windows(previous_agg_wm, new_agg_wm)` and emits a
-`WindowCompletion` for each newly closed window — even if no partials were
-emitted for that window from this worker.
-
-This guarantees that every merge worker eventually receives exactly N
-`WindowCompletion` messages per `(aggregation_id, window)` — one from each of
-the N first-tier workers — and can finalize without deadlock.
-
-#### Late data and `ForwardToStore`
-
-When `LateDataPolicy::ForwardToStore` is active and a late sample falls into an
-already-closed (and potentially already-merged) window, the first-tier worker
-emits a `PartialWindowAggregate` for that window as it does today.
-
-The merge tier treats these late partials as **store appends**, not as
-corrections to a finalized canonical entry. The canonical merged output written
-at finalization time remains unchanged. The store accumulates the late partial
-alongside it, and query-time `SummaryMergeMultipleExec` merges them on read.
-
-This is consistent with the existing `ForwardToStore` semantics and avoids the
-need to read-modify-write a finalized store entry. The benefit of the merge tier
-(one canonical output per window) applies only to on-time data; late corrections
-fall back to the same append + query-time-merge path as the non-merge-tier
-design.
-
-#### Merge-worker state
-
-Each merge worker maintains two separate tables, separating window-level
-completion tracking from key-level partial accumulation:
-
-```rust
-struct MergeWorkerState {
-    /// Per-window: which first-tier workers have sent WindowCompletion.
-    /// Key: (aggregation_id, window_start_ms, window_end_ms)
-    window_completions: HashMap<(u64, u64, u64), HashSet<usize>>,
-
-    /// Per (aggregation_id, key, window): partial accumulators received so far.
-    /// Key: (aggregation_id, key, window_start_ms, window_end_ms)
-    pending_partials: HashMap<(u64, Option<KeyByLabelValues>, u64, u64), Vec<Box<dyn AggregateCore>>>,
-}
-```
-
-Separating these two maps is necessary because:
-
-- `window_completions` is indexed by window only (no key) — matching
-  `WindowCompletion`'s key-less definition.
-- `pending_partials` is indexed by `(agg_id, key, window)` — matching the
-  per-key partials arriving from first-tier workers.
-
-Applying a single key-less `WindowCompletion` to the per-key `pending_partials`
-map requires only a lookup in `window_completions` followed by iteration over
-all `pending_partials` entries sharing the same `(agg_id, window)` — done once
-at finalization, not per-completion.
-
-#### Merge-tier watermark and pending state eviction
-
-The merge tier tracks a **merge watermark** per aggregation:
-
-```rust
-merge_watermark: HashMap<u64, i64>  // aggregation_id -> min watermark across sources
-```
-
-Each `WindowCompletion` carries `worker_watermark_ms`. The merge worker updates:
-
-```rust
-merge_watermark[agg_id] = min over all sources of their latest watermark_ms
-```
-
-Any pending window with `window_end_ms <= merge_watermark[agg_id]` that has
-also received all N completions is eligible for finalization and eviction. Any
-pending window older than `merge_watermark[agg_id] - eviction_grace_period_ms`
-is force-finalized with whatever partials have arrived, even if not all N
-completions have been received (handles stuck or lagging first-tier workers).
-
-This bounds the size of `window_completions` and `pending_partials` in
-proportion to `eviction_grace_period_ms / slide_interval_ms`, regardless of
-workload.
-
-#### Completion protocol
-
-A merge worker finalizes all keys for a window when:
-
-```text
-window_completions[(agg_id, window_start, window_end)].len() == num_first_tier_workers
-```
-
-Steps:
-1. Check `window_completions` for the window just completed.
-2. If all N sources have completed, collect all `pending_partials` entries
-   matching `(agg_id, *, window_start, window_end)` — iterate over keys
-   observed for that window.
-3. For each observed key, merge its partial accumulators and write one
-   canonical `PrecomputedOutput` to the final store.
-4. Remove the window from both `window_completions` and all matching entries
-   in `pending_partials`.
-
-If a `WindowCompletion` arrives for a window that has no partials in
-`pending_partials` (i.e., no series on any first-tier worker matched this
-aggregation for this window), the merge worker simply records the completion.
-Once all N completions arrive, there is nothing to finalize and the window is
-evicted immediately.
-
-#### Finalization
-
-When a window is complete, the merge worker:
-
-1. Iterates all keys observed for `(agg_id, window)` in `pending_partials`.
-2. For each key, folds its `Vec<Box<dyn AggregateCore>>` with
-   `AggregateCore::merge_with()`.
-3. Writes one canonical `PrecomputedOutput` per key to the final store.
-4. Removes all entries for this window from both state maps.
-
-This produces the canonical shape expected by merge-tier-enabled reads:
-
-```
-store[(agg_id, key=(j1), [0,30s))]  -> [merged_acc]
-store[(agg_id, key=(j1), [10s,40s))] -> [merged_acc]
-```
-
-and for tumbling windows:
-
-```
-store[(agg_id, key=(j1), [0,60s))] -> [merged_acc]
-```
-
-#### Query-path simplification
-
-With the merge tier enabled for an aggregation:
-
-- **Instant sliding queries** become exact reads with no cross-worker merge.
-- **Range sliding queries** iterate exact sliding windows and read one merged
-  accumulator per key/window.
-- **Tumbling queries** read already-merged buckets instead of merging
-  per-worker fragments on demand.
-- **General aggregate queries** over Sum, Min/Max, KLL, CMS, HydraKLL, etc. can
-  all consume canonical outputs if their aggregation id is merge-tier-enabled.
-
-This removes the current ambiguity where the store can return multiple exact
-matches for one logical output window and the query layer must decide whether
-to merge or pick one. Late corrections (via `ForwardToStore`) continue to use
-query-time merge for their incremental updates.
-
-#### Why a separate merge worker is preferable to routing by grouping key
-
-Compared with "route all contributing series for a grouping key to the same
-worker", the merge-tier approach:
-
-- preserves per-series ownership in the first tier
-- avoids hot-spotting first-tier workers on popular grouping keys
-- keeps pane state local to the ingest worker that already owns the series
-- allows the merge tier to scale independently of ingest
-
-Compared with routing the merge tier by `(agg_id, key, window)`, window-level
-routing:
-
-- avoids broadcasting `WindowCompletion` to every merge worker (O(M) fanout)
-- keeps all keys for a window co-located, enabling one-pass finalization
-- uses the same MPSC channel for partials and completions, giving free
-  ordering guarantees between them
-
-The cost is that all keys for a window go to the same merge worker, which
-limits key-level parallelism within a window. In practice, the number of
-distinct keys per window is bounded and this is not a bottleneck.
-
-#### Failure and persistence considerations
-
-This design introduces **merge-tier in-flight state** in addition to the
-existing pane state in first-tier workers. To make the whole system robust, the
-same durability story must cover both tiers:
-
-- first-tier WAL / pane snapshots protect open panes
-- merge-tier WAL / partial-window snapshots protect unfinalized merge state
-
-Without persistence, a merge-worker crash loses pending cross-worker fan-in even
-if the first-tier workers are healthy. The merge-tier watermark and
-force-eviction after `eviction_grace_period_ms` bound the exposure window.
-
-#### Rollout strategy
-
-The cleanest migration path is:
-
-1. Keep the current store-append + query-time-merge model as the default.
-2. Add `per_agg_watermark` tracking and flush-timer-driven `WindowCompletion`
-   emission to first-tier workers (required for correctness before any merge
-   worker is deployed).
-3. Add an optional `MergeWorkerOutputSink` controlled by a per-aggregation flag.
-4. Enable the merge tier first for **sliding-window aggregations** where the
-   benefit is largest.
-5. Expand to tumbling windows and other high-fan-in accumulators once stable.
-
-Step 2 must precede step 3: first-tier workers must emit `WindowCompletion` for
-all aggregations via the flush timer before any merge worker is deployed,
-otherwise merge workers deadlock on their first window.
-
-## 5. Data Model
-
-### PrecomputedOutput
-
-```rust
-pub struct PrecomputedOutput {
-    pub start_timestamp: u64,              // window start (ms)
-    pub end_timestamp: u64,                // window end (ms)
-    pub key: Option<KeyByLabelValues>,     // grouping key (e.g. method="GET")
-    pub aggregation_id: u64,
-}
-```
-
-### KeyByLabelValues
-
-Ordered vector of label values matching the `grouping_labels` in the aggregation
-config. Serialized as semicolon-delimited strings for hashing/storage.
-
-### AggregationConfig
-
-Loaded from `streaming_config.yaml`:
-
-```rust
-pub struct AggregationConfig {
-    pub aggregation_id: u64,
-    pub aggregation_type: String,        // "SingleSubpopulation" | "MultipleSubpopulation"
-    pub aggregation_sub_type: String,    // "Sum" | "Min" | "Max" | "Increase" | "KLL" | ...
-    pub parameters: HashMap<String, Value>,
-    pub grouping_labels: KeyByLabelNames,
-    pub window_size: u64,                // seconds
-    pub slide_interval: u64,             // seconds (0 = tumbling)
-    pub metric: String,
-    pub spatial_filter: String,
-    pub num_aggregates_to_retain: Option<u64>,
-    // ...
-}
-```
-
-## 6. Store Integration
-
-### Write path
-
-`OutputSink.emit_batch()` → `Store.insert_precomputed_output_batch()`
-
-Because the precompute engine runs in the same process as the store, the write
-path involves **zero serialization and zero network hops**. Closed window
-accumulators flow from worker to store entirely as in-memory trait objects:
-
-```
-Worker: updater.take_accumulator()     → Box<dyn AggregateCore>  (in-memory)
-   ↓  (direct function call, no IPC)
-OutputSink: store.insert_precomputed_output_batch(outputs)  (pass-through)
-   ↓  (direct function call, same process)
-SketchStore: HashMap entry insert   → Box<dyn AggregateCore>  (stored as-is)
-```
-
-No serialization, deserialization, compression, or network transfer occurs
-between the worker extracting an accumulator and the store persisting it.
-The only network hops in the system are at the edges: HTTP ingest (in) and
-HTTP query (out). Serialization of accumulators only happens on the read path
-when query results are returned to clients.
-
-This is in contrast to the external Kafka ingest path, where precomputes from
-Arroyo/Flink arrive hex-encoded + gzip-compressed + MessagePack-serialized and
-require multiple deserialization steps.
-
-The `SketchStore` (PerKey variant) uses:
-```
-DashMap<aggregation_id, Arc<RwLock<StoreKeyData>>>
-```
-where:
-```rust
-struct StoreKeyData {
-    time_map: HashMap<(u64, u64), Vec<(Option<KeyByLabelValues>, Box<dyn AggregateCore>)>>,
-    read_counts: HashMap<(u64, u64), u64>,
-}
-```
-
-Multiple entries per `(start_ts, end_ts)` are allowed — they are appended, not
-overwritten. This is what makes `ForwardToStore` late-data policy work: the late
-mini-accumulator is stored alongside the original window accumulator.
-
-### Read path / query-time merge
-
-At query time, `PrecomputedSummaryReadExec` reads sparse buckets from the store.
-`SummaryMergeMultipleExec` groups by label key and merges via
-`accumulator.merge_with()`.
-
-The `NaiveMerger` re-merges all accumulators in the window on each slide.
-The store's existing multi-entry-per-window design means late data is
-automatically combined with original window data at query time.
-
-### Cleanup policies
-
-| Policy | Behavior |
-|--------|----------|
-| CircularBuffer | Keep N most recent windows (4x `num_aggregates_to_retain`) |
-| ReadBased | Remove after `read_count >= threshold` |
-| NoCleanup | Retain forever |
-
-## 7. Late Data Handling
-
-Two checks classify an input as late: its timestamp is behind the event-time
-watermark, or its target window has already closed. `LateDataPolicy` applies to
-both cases and to both raw samples and prebuilt sketches:
-
-- **Drop**: increment `asap_precompute_late_inputs_total{action="drop",...}`,
-  log at debug level, and skip. No ghost accumulator is created.
-
-- **ForwardToStore**: create a fresh `AccumulatorUpdater`, feed the single
-  late sample, wrap as `PrecomputedOutput`, and push into the same `emit_batch`
-  as normal closed-window outputs. The store appends it alongside the original
-  window data, and query-time merge combines them.
-
-## 8. Concurrency Model
-
-The current implementation is **single-machine, multi-threaded**. All components
-(HTTP server, workers, store) run within a single OS process as Tokio async
-tasks on a shared thread pool. There is no distributed coordination, no
-cross-machine communication, and no external dependency beyond the store.
-
-- **Ingest HTTP handlers**: Per-connector Axum async handlers (Prometheus, VictoriaMetrics) with shared format-agnostic routing logic.
-- **SeriesRouter**: Lock-free hash routing. No shared mutable state.
-- **Workers**: Each worker is a single Tokio task that owns its `series_map`
-  exclusively. No locks needed within a worker — thread safety comes from
-  the hash-partitioning guarantee that each series is assigned to exactly one
-  worker.
-- **OutputSink / Store**: Thread-safe (`Arc<dyn OutputSink>`, DashMap-backed store).
-  Workers emit concurrently; the PerKey store uses per-aggregation_id RwLocks
-  to minimize contention.
-- **Flush timer**: Separate Tokio task, communicates via the same MPSC channels.
-
-Scaling beyond a single machine would require partitioning the series space
-across multiple engine instances (e.g. via consistent hashing at the load
-balancer level), each running this same single-process architecture
-independently.
-
-## 9. Performance Characteristics
-
-**Ingest path (per batch):**
-- Sample insert: O(log B) per sample (BTreeMap, B = buffer size)
-- Pane routing: O(A) per sample (A = matching aggregations; each sample
-  touches exactly 1 pane per aggregation, regardless of window overlap)
-- Accumulator update: O(1) for Sum/MinMax, O(log k) for KLL
-- Window close: O(W-1) merges per closed window (W = window_size / slide_interval)
-
-**Memory:**
-- O(S × N) buffered samples (S = max per series, N = active series)
-- O(A × W_open) active pane accumulators (fewer than window accumulators
-  since panes are shared across overlapping windows)
-
-**Throughput (measured, 2x Xeon E5-2630 v3, 32 logical CPUs, 125 GiB RAM):**
-- Raw mode, `NoopOutputSink`, 16 workers: **~8.9M samples/sec** flush throughput; near-linear scaling (19x at 16 workers vs 16x ideal).
-- Windowed aggregation (Sum, W=1-6), 4 workers: **~660K samples/sec** E2E; throughput is nearly identical across W=1 and W=6, confirming the pane-based optimization.
-- Workers process in parallel with no cross-shard coordination.
-
-**Benchmark caveat -- `workers = senders` coupling:** The raw-mode scalability benchmark uses one concurrent HTTP sender per worker. The 1-worker baseline is bottlenecked by a single sender (one CPU for Snappy compression, one in-flight HTTP connection); at 16 workers, 16 senders parallelize compression across cores and pipeline connections. The apparent super-linear speedup (9.37x at 8 workers, 19.13x at 16 workers) reflects sender-side parallelism as much as engine-side scaling. A clean engine-scaling measurement would fix sender count and vary only worker count.
-
-## 10. CLI Usage
-
-### Standalone binary
-
-```bash
-cargo run --bin precompute_engine -- \
-  --streaming-config streaming_config.yaml \
-  --num-workers 4 \
-  --allowed-lateness-ms 5000 \
-  --max-buffer-per-series 10000 \
-  --flush-interval-ms 1000 \
-  --channel-buffer-size 10000 \
-  --query-port 8080 \
-  --lock-strategy per-key \
-  --late-data-policy drop
-```
-
-### Embedded in main binary
-
-The precompute engine is also embedded in the main `query_engine_rust` binary,
-auto-enabled by `--streaming-engine=precompute`. Ingest reaches it via the
-OTLP receiver (which holds the same `IngestState` handle), and it shares the
-store with the Kafka consumer path.
-
-## 11. Testing
-
-- **Unit tests -- `worker.rs` (correctness, via `CapturingOutputSink`):**
-
-  | Test | What it verifies |
-  |---|---|
-  | `test_raw_mode_forwarding` | 3 samples -> 3 emits; `start == end == ts`, `SumAccumulator.sum == value` |
-  | `test_tumbling_window_correctness` | Samples at t=1s/5s/9s; window [0,10s) closes on t=10s; `sum=6` |
-  | `test_sliding_window_pane_sharing` | Sample at t=15s in 30s/10s window -> 2 emits for [0,30s) and [10s,40s), both `sum=42` via shared pane snapshot/take |
-  | `test_groupby_separate_emits_per_series` | Two series (`host=A`, `host=B`) on same worker -> 2 independent `MultipleSumAccumulator` emits (no ingest-time cross-series merge) |
-  | `test_late_data_drop` | Sample behind the event watermark with `Drop` policy -> 0 emits and records the action |
-  | `test_late_data_forward_to_store` | Late sample for evicted pane with `ForwardToStore` -> 1 emit as mini-accumulator with correct window bounds and sum |
-
-- **Unit tests -- other modules**: `window_manager.rs` (tumbling/sliding arithmetic, pane enumeration, closure detection), `accumulator_factory.rs` (updater creation and reset), `series_router.rs` (consistent hash routing), `config.rs` (defaults).
-
-- **E2E coverage**: end-to-end paths now run through the OTLP receiver
-  driving the same `IngestState` (`tests/component_process_e2e.rs`; the runnable multi-node demo
-  lives in ASAPCollector). The legacy in-process remote-write E2E binaries
-  (`bin/test_e2e_precompute.rs`, `bin/e2e_quickstart_resource_test.rs`,
-  `bin/bench_precompute_sketch.rs`) and the equivalent test
-  (`tests/e2e_precompute_equivalence.rs`) were removed when the
-  remote-write ingest path was deleted.
-
-## 12. Known Data Loss Cases and Fault Tolerance TODOs
-
-The engine is currently in-memory and single-process with no persistence of in-flight window state. The following cases result in data loss:
-
-| # | Case | When it occurs | Mitigation status |
-|---|---|---|---|
-| 1 | **Explicit late drop** | `LateDataPolicy::Drop` handles a late or already-closed-window input | Intended and counted; use `ForwardToStore` to retain corrections |
-| 2 | **No matching config** | Metric name does not match a configured policy | Warn and expose the existing policy-miss diagnostics |
-| 3 | **Worker panic** | Tokio task dies with in-memory panes | TODO: worker supervision and durable pane recovery |
-
-On graceful shutdown, `force_close_all` emits all remaining raw and sketch
-panes. These are partial windows when the event-time boundary was not reached.
-
-### TODO: warn on unmatched series
-
-Case 4 is silent and hard to diagnose. The fix is a single warn-level log (rate-limited per series key) in `get_or_create_series_state` when `aggregations.is_empty()`, plus a Prometheus counter `precompute_unmatched_series_total`.
-
-### TODO: worker restart on panic
-
-Currently a panicked worker is never restarted. The engine should catch task failures (via `JoinHandle`) in the main `run()` loop and respawn the worker with a fresh receiver, re-routing future series to surviving workers (or to the replacement) in the meantime. In-flight pane state for the crashed worker is still lost -- full recovery would require the WAL approach below.
-
-### TODO: write-ahead log (WAL) for pane state
-
-Cases 5 and 6 both stem from the same root cause: pane accumulators exist only in memory. A WAL would persist each pane update (series key, aggregation id, pane start, serialized accumulator delta) to disk or an external log (e.g. Kafka) before acknowledging the ingest HTTP request. On restart, the worker replays the WAL to reconstruct open panes before resuming normal processing.
-
-Trade-offs:
-- Serialization cost: accumulators must be serializable (all current types are, via `rmp-serde`)
-- WAL volume: one entry per sample per matching aggregation config -- potentially high; batching per pane per flush interval reduces this significantly
-- Recovery time: proportional to WAL size since last checkpoint
-- Complexity: requires a checkpoint mechanism to bound recovery time and WAL size
-
-A lighter alternative: **periodic pane snapshots** written to disk at each flush interval. On restart, replay only samples received since the last snapshot. This bounds recovery time to `flush_interval_ms` worth of samples at the cost of snapshot I/O every flush cycle.
-
-## 13. File Map
-
-| File | Purpose |
-|------|---------|
-| `precompute_engine/mod.rs` | Orchestrator |
-| `precompute_engine/engine.rs` | `PrecomputeEngine` (workers + flush timer; OTLP-fed via `IngestState`) |
-| `precompute_engine/ingest_handler.rs` | `IngestState`: shared router, schema registry, §6.3 barrier helpers |
-| `precompute_engine/config.rs` | `PrecomputeEngineConfig`, `LateDataPolicy` |
-| `precompute_engine/worker.rs` | Per-shard processing, aggregation, window management |
-| `precompute_engine/series_router.rs` | Hash-based series → worker routing |
-| `precompute_engine/window_manager.rs` | Tumbling/sliding window logic |
-| `precompute_engine/accumulator_factory.rs` | `AccumulatorUpdater` trait + factory |
-| `precompute_engine/output_sink.rs` | `OutputSink` trait + `StoreOutputSink`, `NoopOutputSink`, `CapturingOutputSink` (testing) |
-| `bin/precompute_engine.rs` | Standalone CLI binary |
diff --git a/data_plane/src/precompute_engine/raw_dag.rs b/data_plane/src/precompute_engine/raw_dag.rs
deleted file mode 100644
index fac1323a1..000000000
--- a/data_plane/src/precompute_engine/raw_dag.rs
+++ /dev/null
@@ -1,291 +0,0 @@
-//! Bind raw ingestion to a selected Planner producer and its raw dependency edge.
-use crate::storage_engines::types::KeyByLabelValues;
-use asap_physical_operators::factory::{create_planner_accumulator, AccumulatorUpdater};
-use asap_types::{executable_plan::BackendNodeBinding, PrecomputeMaterialization};
-use planner_types::post_asap::{
-    EdgeRole, ExecutableOperatorPayload, GroupingStrategy, PostAsapNodeId, SummaryFamilyType,
-    SummaryInputExpr, SummaryUpdate,
-};
-use planner_types::pre_asap::{ColumnRef, QueryExpr, Source};
-use std::collections::HashMap;
-
-/// A validated executable projection; semantics come from the installed node.
-/// The retained node ID makes failures attributable to the selected DAG.
-#[derive(Debug, Clone)]
-pub struct RawDagProgram {
-    pub node: PostAsapNodeId,
-    pub family: SummaryFamilyType,
-    pub input: SummaryUpdate,
-    pub grouping: GroupingStrategy,
-    pub reduction: planner_types::pre_asap::Reduction,
-    projected_column: Option<String>,
-}
-
-impl RawDagProgram {
-    pub fn from_plan(
-        plan: &asap_types::precompute_plan::PrecomputePlan,
-        config: &PrecomputeMaterialization,
-    ) -> Result<Self, String> {
-        let mut selected: Option<Self> = None;
-        for installed in plan.executable_dags.values() {
-            installed.validate()?;
-            let dag = installed.document.decode()?;
-            for node in &dag.nodes {
-                if !matches!(installed.binding.node(node.id), Some(BackendNodeBinding::Materialization { stored_output }) if stored_output.fingerprint() == config.policy_fingerprint())
-                {
-                    continue;
-                }
-                let ExecutableOperatorPayload::SummaryAgg {
-                    family,
-                    input,
-                    grouping,
-                    reduction,
-                } = &node.payload
-                else {
-                    return Err(
-                        "raw materialization binding must identify a Planner SummaryAgg".into(),
-                    );
-                };
-                if config.derived_input.is_some() {
-                    return Err("derived producer must execute through maintenance DAG".into());
-                }
-                let incoming: Vec<_> = dag.edges.iter().filter(|e| e.consumer == node.id).collect();
-                let [edge] = incoming.as_slice() else {
-                    return Err("raw SummaryAgg must have exactly one DAG input".into());
-                };
-                if edge.role != EdgeRole::Input {
-                    return Err("raw SummaryAgg input edge has wrong role".into());
-                }
-                let source = dag
-                    .nodes
-                    .iter()
-                    .find(|n| n.id == edge.producer)
-                    .ok_or("missing raw DAG input")?;
-                let ExecutableOperatorPayload::Fallback { expression } = &source.payload else {
-                    return Err("raw producer requires an executable source input; maintenance edges cannot be bypassed".into());
-                };
-                let scan = match expression {
-                    QueryExpr::TimeRange { child, .. } => child.as_ref(),
-                    source => source,
-                };
-                match scan {
-                    QueryExpr::Scan {
-                        source: Source::TimeSeries { metric },
-                        ..
-                    } if metric == &config.metric => {
-                        let (metric, window, filter) =
-                            control_plane::physical::compiler::raw_time_series_input_contract(
-                                expression,
-                                matches!(family, SummaryFamilyType::ExactAggregate(..)),
-                            )?;
-                        if metric != config.metric
-                            || window.is_some_and(|seconds| seconds != config.window_size)
-                            || asap_types::utils::normalize_spatial_filter(&filter)
-                                != config.spatial_filter_normalized
-                        {
-                            return Err(
-                                "raw DAG source filter/window differs from physical binding".into(),
-                            );
-                        }
-                    }
-                    QueryExpr::Scan {
-                        source: Source::Table { table_ref },
-                        ..
-                    } if config.table_name.as_ref() == Some(table_ref) => {
-                        return Err(
-                            "raw table execution requires a validated table scan executor".into(),
-                        );
-                    }
-                    _ => return Err("raw DAG input does not match installed source routing".into()),
-                }
-                if let planner_types::pre_asap::Reduction::Reduce(keys) = reduction {
-                    if keys.is_without() {
-                        return Err(
-                            "raw without reduction requires explicit dynamic population routing"
-                                .into(),
-                        );
-                    }
-                    let names = keys
-                        .keys()
-                        .iter()
-                        .map(|id| {
-                            source
-                                .output_schema
-                                .fields
-                                .get(*id)
-                                .map(|f| f.name.clone())
-                                .ok_or("missing reduction column")
-                        })
-                        .collect::<Result<Vec<_>, _>>()?;
-                    if names != config.grouping_labels.names() {
-                        return Err("DAG reduction differs from physical population binding".into());
-                    }
-                }
-                if let SummaryFamilyType::ExactAggregate(kind, _) = family {
-                    if input.item.is_some() {
-                        return Err(
-                            "raw exact populations must follow Planner reduction, not an item map"
-                                .into(),
-                        );
-                    }
-                    if !matches!(input.weight, SummaryInputExpr::Column(_))
-                        && !(matches!(kind, planner_types::post_asap::ExactKind::Count)
-                            && input.weight == SummaryInputExpr::Constant(1.0))
-                    {
-                        return Err("raw exact update differs from stored source projection".into());
-                    }
-                }
-                if &config.accumulator_spec().map_err(|e| e.to_string())?.family != family {
-                    return Err(
-                        "materialization storage family differs from selected Planner node".into(),
-                    );
-                }
-                // The stored descriptor must name the same update semantics; its
-                // content identity cannot be reused for an unrelated DAG program.
-                let update_matches = match (&input.weight, config.sample_update_rule()) {
-                    (
-                        SummaryInputExpr::Column(_),
-                        asap_types::SampleUpdateRule::Value { scale },
-                    ) => scale == 1.0,
-                    (SummaryInputExpr::Constant(value), asap_types::SampleUpdateRule::Count) => {
-                        *value == 1.0
-                    }
-                    _ => {
-                        asap_types::accumulator_spec::is_unit_sample_frequency(input)
-                            || (matches!(
-                                family,
-                                SummaryFamilyType::ExactAggregate(
-                                    planner_types::post_asap::ExactKind::Count,
-                                    _
-                                )
-                            ) && input.weight == SummaryInputExpr::Constant(1.0))
-                    }
-                };
-                if !update_matches {
-                    return Err("DAG update differs from stored summary identity".into());
-                }
-                let program = Self {
-                    node: node.id,
-                    family: family.clone(),
-                    input: input.clone(),
-                    grouping: grouping.clone(),
-                    reduction: reduction.clone(),
-                    projected_column: config
-                        .effective_value_projection()
-                        .column()
-                        .map(str::to_owned),
-                };
-                program.validate()?;
-                if let Some(old) = &selected {
-                    if old.family != program.family
-                        || old.input != program.input
-                        || old.grouping != program.grouping
-                        || old.reduction != program.reduction
-                    {
-                        return Err(
-                            "one stored definition is bound to incompatible Planner producers"
-                                .into(),
-                        );
-                    }
-                } else {
-                    selected = Some(program);
-                }
-            }
-        }
-        selected.ok_or_else(|| "raw materialization has no selected post-ASAP DAG producer".into())
-    }
-
-    pub fn updater(&self) -> Result<Box<dyn AccumulatorUpdater>, String> {
-        create_planner_accumulator(&self.family, &self.input, &self.grouping)
-    }
-
-    fn validate(&self) -> Result<(), String> {
-        match &self.input.weight {
-            SummaryInputExpr::Column(ColumnRef::SampleValue) | SummaryInputExpr::Constant(_) => {}
-            SummaryInputExpr::Column(
-                ColumnRef::Named(name) | ColumnRef::Qualified { name, .. },
-            ) if self.projected_column.as_ref() == Some(name) => {}
-            _ => return Err("raw DAG weight expression is unsupported".into()),
-        }
-        fn item(expr: &SummaryInputExpr) -> bool {
-            match expr {
-                SummaryInputExpr::Column(ColumnRef::Named(_) | ColumnRef::SampleValue) => true,
-                SummaryInputExpr::Tuple(items) => items.iter().all(item),
-                SummaryInputExpr::EntityIdentity(
-                    planner_types::post_asap::EntityIdentity::PromqlLabelSet { excluding },
-                ) => excluding.is_empty(),
-                _ => false,
-            }
-        }
-        if self.input.item.as_ref().is_some_and(|e| !item(e)) {
-            return Err("raw DAG item expression is unsupported".into());
-        }
-        self.updater().map(|_| ())
-    }
-
-    /// Validate admission with the same weight semantics used during execution,
-    /// without mutating an accumulator or accepting part of a request.
-    pub fn validate_sample(
-        &self,
-        updater: &dyn AccumulatorUpdater,
-        value: f64,
-    ) -> Result<f64, String> {
-        let weight = match &self.input.weight {
-            SummaryInputExpr::Constant(c) => *c,
-            // The worker retains one previous value per series across pane rotation.
-            SummaryInputExpr::Column(_) => value,
-            _ => return Err("unsupported raw weight expression".into()),
-        };
-        let scalar_frequency = asap_types::accumulator_spec::is_unit_sample_frequency(&self.input)
-            && !updater.is_keyed();
-        let weight = if scalar_frequency { value } else { weight };
-        updater.validate_single_input(weight)?;
-        Ok(weight)
-    }
-
-    pub fn apply(
-        &self,
-        updater: &mut dyn AccumulatorUpdater,
-        series: &str,
-        value: f64,
-        timestamp: i64,
-    ) -> Result<(), String> {
-        let weight = self.validate_sample(updater, value)?;
-        if updater.is_keyed() {
-            let labels = super::worker::parse_labels_from_series_key(series);
-            fn eval(
-                expr: &SummaryInputExpr,
-                series: &str,
-                value: f64,
-                labels: &HashMap<&str, &str>,
-            ) -> Result<Vec<String>, String> {
-                Ok(match expr {
-                    SummaryInputExpr::EntityIdentity(_) => vec![series.to_owned()],
-                    SummaryInputExpr::Column(ColumnRef::SampleValue) => vec![value.to_string()],
-                    SummaryInputExpr::Column(ColumnRef::Named(name)) => vec![labels
-                        .get(name.as_str())
-                        .map(|s| super::worker::decode_label_value(s).into_owned())
-                        .ok_or_else(|| format!("missing DAG item column {name}"))?],
-                    SummaryInputExpr::Tuple(items) => items
-                        .iter()
-                        .map(|i| eval(i, series, value, labels))
-                        .collect::<Result<Vec<_>, _>>()?
-                        .into_iter()
-                        .flatten()
-                        .collect(),
-                    _ => return Err("unsupported raw item expression".into()),
-                })
-            }
-            let item = self
-                .input
-                .item
-                .as_ref()
-                .ok_or("keyed DAG kernel requires an explicit item")?;
-            let key = KeyByLabelValues::new_with_labels(eval(item, series, value, &labels)?);
-            updater.update_keyed(&key, weight, timestamp);
-        } else {
-            updater.update_single(weight, timestamp);
-        }
-        Ok(())
-    }
-}
diff --git a/data_plane/src/precompute_engine/revisions.rs b/data_plane/src/precompute_engine/revisions.rs
deleted file mode 100644
index 02a624622..000000000
--- a/data_plane/src/precompute_engine/revisions.rs
+++ /dev/null
@@ -1,1020 +0,0 @@
-//! Bounded local-input snapshots and independently published stored results.
-//! The checkpoint is runtime state for one installed generation, not a new plan.
-use asap_types::sds::{CatalogGeneration, StoredOutputId, StoredOutputReference};
-use fs2::FileExt;
-use serde::{Deserialize, Serialize};
-use std::{
-    collections::{BTreeMap, BTreeSet},
-    fs::{self, File, OpenOptions},
-    io::Write,
-    path::PathBuf,
-    sync::{Arc, Mutex, RwLock},
-};
-
-pub type Publisher<'a> =
-    dyn FnMut(StoredOutputId, Vec<RevisionRecord>) -> Result<(), RevisionError> + 'a;
-
-#[derive(Debug, thiserror::Error)]
-#[error("no compatible input snapshot satisfies query freshness")]
-pub struct SnapshotUnavailable;
-
-#[derive(Debug, thiserror::Error)]
-#[error("revision admission rejected: {0}")]
-pub struct AdmissionRejected(pub &'static str);
-
-pub type RevisionError = Box<dyn std::error::Error + Send + Sync>;
-
-#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
-#[serde(deny_unknown_fields)]
-pub struct RevisionPolicy {
-    pub correction_horizon_ms: u64,
-    pub max_query_staleness_ms: u64,
-    pub max_checkpoint_bytes: usize,
-}
-
-#[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
-#[serde(deny_unknown_fields)]
-pub struct InputSample {
-    pub metric: String,
-    pub labels: BTreeMap<String, String>,
-    pub series: String,
-    pub timestamp_ms: i64,
-    pub first_revision: u64,
-    pub value: Option<f64>,
-}
-
-#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
-#[serde(deny_unknown_fields)]
-pub struct RevisionRecord {
-    pub reference: StoredOutputReference,
-    pub group: BTreeMap<String, String>,
-    pub start_ms: u64,
-    pub end_ms: u64,
-    pub payload: Vec<u8>,
-}
-
-#[derive(Debug, Clone, Serialize, Deserialize)]
-#[serde(deny_unknown_fields)]
-struct Snapshot {
-    revision: u64,
-    captured_at_ms: u64,
-    outputs: BTreeMap<u64, Vec<RevisionRecord>>,
-}
-
-#[derive(Debug, Clone, Serialize, Deserialize)]
-#[serde(deny_unknown_fields)]
-struct Checkpoint {
-    schema_version: u32,
-    generation: CatalogGeneration,
-    policy: RevisionPolicy,
-    inputs: Vec<InputSample>,
-    snapshots: Vec<Snapshot>,
-}
-
-/// Owned records pin the selected snapshot independently of later commits/GC.
-#[derive(Debug, Clone)]
-pub struct PinnedRevision {
-    pub revision: u64,
-    pub captured_at_ms: u64,
-    pub records: Vec<RevisionRecord>,
-    pub inputs: Vec<InputSample>,
-}
-
-pub struct RevisionStore {
-    path: PathBuf,
-    _writer: File,
-    execution: Mutex<()>,
-    state: RwLock<Arc<Checkpoint>>,
-    poisoned: std::sync::atomic::AtomicBool,
-}
-
-impl RevisionStore {
-    pub fn open(
-        path: PathBuf,
-        generation: CatalogGeneration,
-        policy: RevisionPolicy,
-    ) -> Result<Self, RevisionError> {
-        if policy.correction_horizon_ms == 0
-            || policy.max_query_staleness_ms == 0
-            || policy.max_checkpoint_bytes == 0
-        {
-            return Err(
-                "revision policy requires positive bounded horizons and a byte budget".into(),
-            );
-        }
-        fs::create_dir_all(
-            path.parent()
-                .ok_or("revision checkpoint needs a parent directory")?,
-        )?;
-        let writer = OpenOptions::new()
-            .create(true)
-            .truncate(false)
-            .read(true)
-            .write(true)
-            .open(path.with_extension("lock"))?;
-        writer.try_lock_exclusive()?;
-        if fs::metadata(&path)
-            .is_ok_and(|metadata| metadata.len() > policy.max_checkpoint_bytes as u64)
-        {
-            return Err("revision checkpoint exceeds configured byte budget".into());
-        }
-        let document = match fs::read(&path) {
-            Ok(bytes) => {
-                if bytes.len() > policy.max_checkpoint_bytes {
-                    return Err("revision checkpoint exceeds configured byte budget".into());
-                }
-                let document: Checkpoint = serde_json::from_slice(&bytes)?;
-                if document.schema_version != 1
-                    || document.generation != generation
-                    || document.policy != policy
-                {
-                    return Err(
-                        "revision checkpoint differs from installed generation or policy".into(),
-                    );
-                }
-                let mut input_keys = BTreeSet::new();
-                for sample in &document.inputs {
-                    if sample.timestamp_ms < 0
-                        || sample.first_revision == 0
-                        || document
-                            .snapshots
-                            .last()
-                            .is_none_or(|s| sample.first_revision > s.revision)
-                        || sample.value.is_some_and(|v| !v.is_finite())
-                        || !input_keys.insert((&sample.series, sample.timestamp_ms))
-                    {
-                        return Err("revision checkpoint contains invalid or repeated input".into());
-                    }
-                }
-                let mut previous = (0, 0);
-                for snapshot in &document.snapshots {
-                    if snapshot.revision <= previous.0 || snapshot.captured_at_ms < previous.1 {
-                        return Err("revision checkpoint has non-monotonic snapshots".into());
-                    }
-                    for (output, records) in &snapshot.outputs {
-                        validate_records(*output, records)?;
-                    }
-                    previous = (snapshot.revision, snapshot.captured_at_ms);
-                }
-                document
-            }
-            Err(error) if error.kind() == std::io::ErrorKind::NotFound => Checkpoint {
-                schema_version: 1,
-                generation,
-                policy,
-                inputs: Vec::new(),
-                snapshots: Vec::new(),
-            },
-            Err(error) => return Err(error.into()),
-        };
-        Ok(Self {
-            path,
-            _writer: writer,
-            execution: Mutex::new(()),
-            state: RwLock::new(Arc::new(document)),
-            poisoned: false.into(),
-        })
-    }
-
-    fn current(&self) -> Result<Arc<Checkpoint>, RevisionError> {
-        if self.poisoned.load(std::sync::atomic::Ordering::SeqCst) {
-            return Err("revision persistence is uncertain; reopen before continuing".into());
-        }
-        Ok(self
-            .state
-            .read()
-            .map_err(|_| "revision state poisoned")?
-            .clone())
-    }
-
-    fn persist(&self, next: Checkpoint) -> Result<(), RevisionError> {
-        let bytes = serde_json::to_vec(&next)?;
-        if bytes.len() > next.policy.max_checkpoint_bytes {
-            return Err(Box::new(asap_physical_operators::dag::Error::MemoryLimit));
-        }
-        let result = (|| -> std::io::Result<()> {
-            let temporary = self.path.with_extension("tmp");
-            let mut file = File::create(&temporary)?;
-            file.write_all(&bytes)?;
-            file.sync_all()?;
-            fs::rename(temporary, &self.path)?;
-            File::open(self.path.parent().unwrap())?.sync_all()
-        })();
-        if let Err(error) = result {
-            self.poisoned
-                .store(true, std::sync::atomic::Ordering::SeqCst);
-            return Err(error.into());
-        }
-        *self.state.write().map_err(|_| "revision state poisoned")? = Arc::new(next);
-        Ok(())
-    }
-
-    /// Admission and execution are serialized; readers only hold the short state
-    /// lock. Each output commit is durable independently, allowing old snapshots
-    /// to remain readable if a later output fails.
-    #[allow(clippy::too_many_arguments)]
-    pub fn apply(
-        &self,
-        generation: &CatalogGeneration,
-        samples: Vec<InputSample>,
-        now_ms: u64,
-        retain_input_ms: u64,
-        outputs: &BTreeSet<StoredOutputId>,
-        validate: impl FnOnce(&[InputSample], u64) -> Result<(), RevisionError>,
-        execute: impl FnOnce(
-            &[InputSample],
-            u64,
-            u64,
-            bool,
-            &mut Publisher<'_>,
-        ) -> Result<(), RevisionError>,
-    ) -> Result<u64, RevisionError> {
-        let _execution = self
-            .execution
-            .lock()
-            .map_err(|_| "revision execution poisoned")?;
-        let current = self.current()?;
-        if &current.generation != generation {
-            return Err("revision input belongs to a different installed generation".into());
-        }
-        if current
-            .snapshots
-            .last()
-            .is_some_and(|s| now_ms < s.captured_at_ms)
-        {
-            return Err("revision clock regressed".into());
-        }
-        validate(&samples, current.policy.correction_horizon_ms)?;
-        if retain_input_ms < current.policy.correction_horizon_ms {
-            return Err("input retention is shorter than correction horizon".into());
-        }
-        let mut inputs: BTreeMap<_, _> = current
-            .inputs
-            .iter()
-            .cloned()
-            .map(|s| ((s.series.clone(), s.timestamp_ms), s))
-            .collect();
-        let mut changed = false;
-        let next_revision = current.snapshots.last().map_or(Ok(1), |s| {
-            s.revision.checked_add(1).ok_or("input revision exhausted")
-        })?;
-        for mut sample in samples {
-            if sample.value.is_some_and(|v| !v.is_finite()) {
-                return Err("revision input must be finite or an explicit stale marker".into());
-            }
-            let key = (sample.series.clone(), sample.timestamp_ms);
-            sample.first_revision = inputs
-                .get(&key)
-                .map_or(next_revision, |old| old.first_revision);
-            match inputs.get(&key) {
-                Some(old) if old != &sample => {
-                    return Err(AdmissionRejected("conflicting sample in revision input").into())
-                }
-                Some(_) => {}
-                None => {
-                    inputs.insert(key, sample);
-                    changed = true;
-                }
-            }
-        }
-        let pending = current
-            .snapshots
-            .last()
-            .is_some_and(|s| outputs.iter().any(|o| !s.outputs.contains_key(&o.0)));
-        if changed && pending {
-            return Err(
-                "prior input revision is pending; retry its execution before new admission".into(),
-            );
-        }
-        let revision = if changed
-            || current.snapshots.is_empty()
-            || (!pending
-                && current
-                    .snapshots
-                    .last()
-                    .is_some_and(|s| now_ms > s.captured_at_ms))
-        {
-            let revision = current.snapshots.last().map_or(Ok(1), |s| {
-                s.revision.checked_add(1).ok_or("input revision exhausted")
-            })?;
-            let floor = now_ms.saturating_sub(retain_input_ms);
-            let mut next = (*current).clone();
-            next.inputs = inputs
-                .into_values()
-                .filter(|s| s.timestamp_ms >= 0 && s.timestamp_ms as u64 >= floor)
-                .collect();
-            let cutoff = now_ms.saturating_sub(current.policy.max_query_staleness_ms);
-            next.snapshots.retain(|s| s.captured_at_ms >= cutoff);
-            next.snapshots.push(Snapshot {
-                revision,
-                captured_at_ms: now_ms,
-                outputs: BTreeMap::new(),
-            });
-            self.persist(next)?;
-            revision
-        } else if !pending {
-            return Ok(current.snapshots.last().unwrap().revision);
-        } else {
-            current.snapshots.last().unwrap().revision
-        };
-        let snapshot = self.current()?;
-        let mut publish = |output: StoredOutputId, records: Vec<RevisionRecord>| {
-            if !outputs.contains(&output) {
-                return Err("revision publication references an uninstalled output".into());
-            }
-            validate_records(output.0, &records)?;
-            let mut next = (*self.current()?).clone();
-            let frame = next
-                .snapshots
-                .last_mut()
-                .ok_or("input revision disappeared")?;
-            if frame.revision != revision {
-                return Err("input revision changed during execution".into());
-            }
-            // Reuse committed randomized sketches on recovery; do not recompute
-            // their identity from another random realization of the same input.
-            if frame.outputs.contains_key(&output.0) {
-                return Ok(());
-            }
-            frame.outputs.insert(output.0, records);
-            self.persist(next)
-        };
-        execute(
-            &snapshot.inputs,
-            revision,
-            snapshot.snapshots.last().unwrap().captured_at_ms,
-            changed,
-            &mut publish,
-        )?;
-        if outputs.iter().any(|o| {
-            !self
-                .current()
-                .map(|s| s.snapshots.last().unwrap().outputs.contains_key(&o.0))
-                .unwrap_or(false)
-        }) {
-            return Err("revision execution did not publish every selected output".into());
-        }
-        Ok(revision)
-    }
-
-    pub(crate) fn committed_outputs(
-        &self,
-        revision: u64,
-    ) -> Result<BTreeMap<u64, Vec<RevisionRecord>>, RevisionError> {
-        self.current()?
-            .snapshots
-            .iter()
-            .find(|s| s.revision == revision)
-            .map(|s| s.outputs.clone())
-            .ok_or_else(|| "captured revision disappeared".into())
-    }
-
-    #[cfg(test)]
-    pub fn pin(
-        &self,
-        required: &BTreeSet<StoredOutputId>,
-        now_ms: u64,
-    ) -> Result<PinnedRevision, RevisionError> {
-        self.pin_matching(required, now_ms, |_| true)
-    }
-
-    fn pin_matching(
-        &self,
-        required: &BTreeSet<StoredOutputId>,
-        now_ms: u64,
-        eligible: impl Fn(&BTreeMap<u64, Vec<RevisionRecord>>) -> bool,
-    ) -> Result<PinnedRevision, RevisionError> {
-        let state = self.current()?;
-        let snapshot = state
-            .snapshots
-            .iter()
-            .rev()
-            .find(|s| {
-                s.captured_at_ms <= now_ms
-                    && now_ms - s.captured_at_ms <= state.policy.max_query_staleness_ms
-                    && required.iter().all(|o| s.outputs.contains_key(&o.0))
-                    && eligible(&s.outputs)
-            })
-            .ok_or(SnapshotUnavailable)?;
-        Ok(PinnedRevision {
-            revision: snapshot.revision,
-            captured_at_ms: snapshot.captured_at_ms,
-            inputs: state
-                .inputs
-                .iter()
-                .filter(|s| s.first_revision <= snapshot.revision)
-                .cloned()
-                .collect(),
-            records: required
-                .iter()
-                .flat_map(|o| snapshot.outputs[&o.0].clone())
-                .collect(),
-        })
-    }
-}
-
-fn validate_records(output: u64, records: &[RevisionRecord]) -> Result<(), RevisionError> {
-    let mut keys = BTreeSet::new();
-    for record in records {
-        record.reference.validate()?;
-        if record.reference.stored_output_id.0 != output
-            || record.start_ms >= record.end_ms
-            || record.payload.is_empty()
-            || !keys.insert((&record.group, record.start_ms, record.end_ms))
-        {
-            return Err("invalid or duplicate revision output record".into());
-        }
-    }
-    Ok(())
-}
-
-use crate::storage_engines::types::{
-    AggregateCore, InstalledPrecomputePlanHandle, RuntimePhysicalPlan,
-};
-use asap_physical_operators::{
-    stored_state::native,
-    values::{Batch, Schema, Value},
-};
-use planner_types::post_asap::{SummaryFamilyType, SummaryField, SummarySchema};
-
-fn state_schema(family: SummaryFamilyType) -> Schema {
-    Arc::new(SummarySchema {
-        fields: vec![SummaryField {
-            name: "state".into(),
-            dtype: family,
-            nullable: false,
-        }],
-        time_index: None,
-    })
-}
-
-pub(crate) fn encode_state(
-    state: Arc<dyn AggregateCore>,
-    family: SummaryFamilyType,
-) -> Result<Vec<u8>, RevisionError> {
-    Ok(native::encode_batch(&Batch::try_new(
-        state_schema(family.clone()),
-        vec![vec![Value::Summary { family, state }]],
-    )?)?)
-}
-
-pub(crate) fn decode_state(
-    record: &RevisionRecord,
-    config: &asap_types::PrecomputeMaterialization,
-) -> Result<Arc<dyn AggregateCore>, RevisionError> {
-    let family = config.accumulator_spec()?.family;
-    let batch = native::decode_batch(&record.payload, state_schema(family), record.payload.len())?;
-    match batch.rows() {
-        [row] => match row.as_slice() {
-            [Value::Summary { state, .. }] => Ok(Arc::clone(state)),
-            _ => Err("revision record must contain exactly one typed summary".into()),
-        },
-        _ => Err("revision record must contain exactly one row".into()),
-    }
-}
-
-/// A single local owner serializes input revisions for the installed plan.
-/// Opening is lazy so activation/recovery does not depend on receiving new data.
-pub struct RevisionRuntime {
-    directory: PathBuf,
-    pub policy: RevisionPolicy,
-    plans: InstalledPrecomputePlanHandle,
-    current: Mutex<Option<(CatalogGeneration, Arc<RevisionStore>)>>,
-}
-
-impl RevisionRuntime {
-    pub fn new(
-        directory: PathBuf,
-        policy: RevisionPolicy,
-        plans: InstalledPrecomputePlanHandle,
-    ) -> Self {
-        Self {
-            directory,
-            policy,
-            plans,
-            current: Mutex::new(None),
-        }
-    }
-
-    pub(crate) fn installed(
-        &self,
-    ) -> Result<(Arc<RuntimePhysicalPlan>, Arc<RevisionStore>), RevisionError> {
-        let plan = self
-            .plans
-            .active_physical_plan_snapshot()
-            .ok_or("revision execution requires an active physical plan")?;
-        if plan.precompute_plan.ingest.protocol
-            != asap_types::precompute_plan::IngestProtocol::PrometheusRemoteWriteV1
-        {
-            return Err("continuous revisions require the local Remote Write input binding".into());
-        }
-        if plan
-            .query_plan
-            .entries
-            .values()
-            .any(|entry| entry.instant.full_history && !entry.materialization_bindings().is_empty())
-        {
-            return Err("continuous revisions require a bounded query history".into());
-        }
-        let generation = plan
-            .precompute_plan
-            .summary_catalog
-            .as_ref()
-            .ok_or("revision execution requires a catalog generation")?;
-        let mut current = self
-            .current
-            .lock()
-            .map_err(|_| "revision installation poisoned")?;
-        if let Some((previous, store)) = current
-            .as_ref()
-            .filter(|(previous, _)| previous == generation)
-        {
-            let _ = previous;
-            return Ok((Arc::clone(&plan), Arc::clone(store)));
-        }
-        // A selected producer must have a typed recovery codec before any raw
-        // input is durably admitted. Codec failure is a deployment-format error,
-        // never a reason to leave an accepted input revision unrecoverable.
-        for config in plan
-            .precompute_plan
-            .materializations
-            .iter()
-            .filter(|c| c.derived_input.is_none())
-        {
-            let program = super::raw_dag::RawDagProgram::from_plan(&plan.precompute_plan, config)?;
-            let bytes = encode_state(
-                Arc::from(program.updater()?.into_accumulator()),
-                program.family,
-            )?;
-            if bytes.len() > self.policy.max_checkpoint_bytes {
-                return Err(Box::new(asap_physical_operators::Error::MemoryLimit));
-            }
-        }
-        let path = self.directory.join(format!(
-            "{}-{}.json",
-            generation.plan_id, generation.plan_version
-        ));
-        let store = Arc::new(RevisionStore::open(
-            path,
-            generation.clone(),
-            self.policy.clone(),
-        )?);
-        // Validate recovered bindings and payloads before making any result readable.
-        for snapshot in &store.current()?.snapshots {
-            for (output, records) in &snapshot.outputs {
-                let config = plan
-                    .precompute_plan
-                    .materializations
-                    .iter()
-                    .find(|c| c.policy_fp_u64() == *output)
-                    .ok_or("recovered revision has an uninstalled output")?;
-                let reference = plan
-                    .installed_precompute_plan
-                    .stored_output_reference(StoredOutputId(*output))
-                    .ok_or("recovered revision has no installed binding")?;
-                for record in records {
-                    if record.reference != reference {
-                        return Err(
-                            "recovered revision semantic binding differs from installed plan"
-                                .into(),
-                        );
-                    }
-                    decode_state(record, config)?;
-                }
-            }
-        }
-        *current = Some((generation.clone(), Arc::clone(&store)));
-        Ok((plan, store))
-    }
-
-    pub(crate) fn query_view(
-        &self,
-        required: &BTreeSet<StoredOutputId>,
-        now_ms: u64,
-        ranges: &[(StoredOutputId, u64, u64)],
-        expected: &CatalogGeneration,
-    ) -> Result<crate::storage_engines::sketch_db::index::SketchStore, RevisionError> {
-        let (plan, store) = self.installed()?;
-        if plan.precompute_plan.summary_catalog.as_ref() != Some(expected) {
-            return Err("query snapshot generation differs from the selected QueryPlan".into());
-        }
-        let mut pinned = store.pin_matching(required, now_ms, |outputs| {
-            ranges
-                .iter()
-                .all(|(output, start, end)| records_cover(&outputs[&output.0], *start, *end))
-        })?;
-        pinned.records.retain(|r| {
-            ranges.iter().any(|(output, start, end)| {
-                r.reference.stored_output_id == *output && r.start_ms >= *start && r.end_ms <= *end
-            })
-        });
-        crate::storage_engines::sketch_db::index::SketchStore::from_revision(&plan, &pinned)
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    fn generation() -> CatalogGeneration {
-        CatalogGeneration {
-            schema_version: 6,
-            plan_id: 1,
-            plan_version: 1,
-            snapshot_sha256: "a".repeat(64),
-        }
-    }
-    fn policy() -> RevisionPolicy {
-        RevisionPolicy {
-            correction_horizon_ms: 1000,
-            max_query_staleness_ms: 100,
-            max_checkpoint_bytes: 100_000,
-        }
-    }
-    fn sample(time: i64, value: f64) -> InputSample {
-        InputSample {
-            metric: "x".into(),
-            labels: BTreeMap::new(),
-            series: "x".into(),
-            timestamp_ms: time,
-            first_revision: 0,
-            value: Some(value),
-        }
-    }
-    fn record(output: u64, value: u8) -> RevisionRecord {
-        RevisionRecord {
-            reference: StoredOutputReference {
-                stored_output_id: StoredOutputId(output),
-                definition_id: serde_json::from_value(serde_json::json!(format!(
-                    "sds-v1:{}",
-                    "a".repeat(64)
-                )))
-                .unwrap(),
-            },
-            group: BTreeMap::new(),
-            start_ms: 0,
-            end_ms: 100,
-            payload: vec![value],
-        }
-    }
-    fn output_set() -> BTreeSet<StoredOutputId> {
-        BTreeSet::from([StoredOutputId(1), StoredOutputId(2)])
-    }
-
-    /// A durable partial r2 cannot force a two-branch query to mix r1 and r2.
-    #[test]
-    fn partial_revision_restart_and_pinned_read_are_consistent() {
-        let dir = tempfile::tempdir().unwrap();
-        let path = dir.path().join("checkpoint.json");
-        let store = RevisionStore::open(path.clone(), generation(), policy()).unwrap();
-        let outputs = output_set();
-        store
-            .apply(
-                &generation(),
-                vec![sample(10, 2.)],
-                100,
-                1000,
-                &outputs,
-                |_, _| Ok(()),
-                |_, _, _, _, publish| {
-                    publish(StoredOutputId(1), vec![record(1, 2)])?;
-                    publish(StoredOutputId(2), vec![record(2, 2)])
-                },
-            )
-            .unwrap();
-        let old = store.pin(&outputs, 100).unwrap();
-        let failure = store
-            .apply(
-                &generation(),
-                vec![sample(20, 3.)],
-                110,
-                1000,
-                &outputs,
-                |_, _| Ok(()),
-                |_, _, _, _, publish| {
-                    publish(StoredOutputId(1), vec![record(1, 5)])?;
-                    Err(Box::new(asap_physical_operators::Error::Cancelled))
-                },
-            )
-            .unwrap_err();
-        assert!(matches!(
-            failure.downcast_ref(),
-            Some(asap_physical_operators::Error::Cancelled)
-        ));
-        assert_eq!(store.pin(&outputs, 110).unwrap().revision, 1);
-        assert_eq!(
-            store
-                .pin(&BTreeSet::from([StoredOutputId(1)]), 110)
-                .unwrap()
-                .revision,
-            2
-        );
-        drop(store);
-        let store = RevisionStore::open(path.clone(), generation(), policy()).unwrap();
-        assert_eq!(store.pin(&outputs, 110).unwrap().revision, 1);
-        store
-            .apply(
-                &generation(),
-                vec![],
-                120,
-                1000,
-                &outputs,
-                |_, _| Ok(()),
-                |inputs, revision, captured, _, publish| {
-                    assert_eq!((inputs.len(), revision, captured), (2, 2, 110));
-                    // Already committed bytes survive retry, including randomized sketches.
-                    publish(StoredOutputId(1), vec![record(1, 99)])?;
-                    publish(StoredOutputId(2), vec![record(2, 5)])
-                },
-            )
-            .unwrap();
-        let new = store.pin(&outputs, 120).unwrap();
-        assert_eq!(new.revision, 2);
-        assert_eq!(old.inputs.len(), 1);
-        assert_eq!(new.inputs.len(), 2);
-        assert_eq!(
-            new.records.iter().map(|r| r.payload[0]).collect::<Vec<_>>(),
-            vec![5, 5]
-        );
-        assert_eq!(
-            old.records.iter().map(|r| r.payload[0]).collect::<Vec<_>>(),
-            vec![2, 2]
-        );
-        assert!(store.pin(&outputs, 211).is_err());
-        drop(store);
-        let mut next = generation();
-        next.plan_version += 1;
-        assert!(RevisionStore::open(path, next, policy()).is_err());
-    }
-
-    /// Newer published outputs without the requested historical pane must not
-    /// hide an older fresh snapshot that still has complete coverage.
-    #[test]
-    fn coverage_is_part_of_common_snapshot_selection() {
-        let dir = tempfile::tempdir().unwrap();
-        let store = RevisionStore::open(dir.path().join("checkpoint.json"), generation(), policy())
-            .unwrap();
-        let outputs = output_set();
-        for (time, value) in [(100, 2), (110, 3)] {
-            store
-                .apply(
-                    &generation(),
-                    vec![sample(time as i64 - 1, value as f64)],
-                    time,
-                    1000,
-                    &outputs,
-                    |_, _| Ok(()),
-                    |_, _, _, _, publish| {
-                        for output in &outputs {
-                            let mut record = record(output.0, value);
-                            if time == 110 {
-                                record.start_ms = 100;
-                                record.end_ms = 110;
-                            }
-                            publish(*output, vec![record])?;
-                        }
-                        Ok(())
-                    },
-                )
-                .unwrap();
-        }
-        let eligible = |records: &BTreeMap<u64, Vec<RevisionRecord>>| {
-            outputs
-                .iter()
-                .all(|o| records_cover(&records[&o.0], 0, 100))
-        };
-        assert_eq!(
-            store
-                .pin_matching(&outputs, 110, eligible)
-                .unwrap()
-                .revision,
-            1
-        );
-        assert!(store.pin_matching(&outputs, 201, eligible).is_err());
-    }
-
-    /// Local capture must evaluate newly elapsed windows without inventing a
-    /// later source sample or replaying an already admitted input as new data.
-    #[test]
-    fn periodic_capture_reuses_input_without_new_admission() {
-        let dir = tempfile::tempdir().unwrap();
-        let store = RevisionStore::open(dir.path().join("checkpoint.json"), generation(), policy())
-            .unwrap();
-        let outputs = output_set();
-        store
-            .apply(
-                &generation(),
-                vec![sample(5, 2.)],
-                10,
-                1000,
-                &outputs,
-                |_, _| Ok(()),
-                |_, _, _, admitted, publish| {
-                    assert!(admitted);
-                    for output in &outputs {
-                        publish(*output, vec![])?;
-                    }
-                    Ok(())
-                },
-            )
-            .unwrap();
-        store
-            .apply(
-                &generation(),
-                vec![],
-                100,
-                1000,
-                &outputs,
-                |_, _| Ok(()),
-                |inputs, revision, captured, admitted, publish| {
-                    assert_eq!((inputs.len(), revision, captured), (1, 2, 100));
-                    assert!(!admitted);
-                    for output in &outputs {
-                        publish(*output, vec![record(output.0, 2)])?;
-                    }
-                    Ok(())
-                },
-            )
-            .unwrap();
-        assert_eq!(store.pin(&outputs, 100).unwrap().revision, 2);
-    }
-
-    /// Rejection must not persist the valid prefix, a dedup key, or a revision.
-    #[test]
-    fn rejected_whole_batch_and_budget_leave_checkpoint_unchanged() {
-        let dir = tempfile::tempdir().unwrap();
-        let path = dir.path().join("checkpoint.json");
-        let store = RevisionStore::open(path.clone(), generation(), policy()).unwrap();
-        let outputs = output_set();
-        store
-            .apply(
-                &generation(),
-                vec![sample(10, 2.)],
-                100,
-                1000,
-                &outputs,
-                |_, _| Ok(()),
-                |_, _, _, _, publish| {
-                    for o in &outputs {
-                        publish(*o, vec![record(o.0, 2)])?;
-                    }
-                    Ok(())
-                },
-            )
-            .unwrap();
-        let before = fs::read(&path).unwrap();
-        assert!(store
-            .apply(
-                &generation(),
-                vec![sample(20, 3.), sample(10, 99.)],
-                110,
-                1000,
-                &outputs,
-                |_, _| Ok(()),
-                |_, _, _, _, _| panic!("rejected batch executed")
-            )
-            .is_err());
-        assert_eq!(fs::read(&path).unwrap(), before);
-        assert!(store
-            .apply(
-                &generation(),
-                vec![sample(20, 3.)],
-                110,
-                1000,
-                &outputs,
-                |_, _| Err("outside correction horizon".into()),
-                |_, _, _, _, _| panic!("rejected batch executed")
-            )
-            .is_err());
-        assert_eq!(fs::read(&path).unwrap(), before);
-        let mut oversized = sample(20, 3.);
-        oversized.series = "x".repeat(100_000);
-        let error = store
-            .apply(
-                &generation(),
-                vec![oversized],
-                110,
-                1000,
-                &outputs,
-                |_, _| Ok(()),
-                |_, _, _, _, _| panic!("over-budget batch executed"),
-            )
-            .unwrap_err();
-        assert!(matches!(
-            error.downcast_ref(),
-            Some(asap_physical_operators::Error::MemoryLimit)
-        ));
-        assert_eq!(fs::read(&path).unwrap(), before);
-    }
-}
-
-pub(crate) fn pin_query(
-    index: &crate::storage_engines::sketch_db::index::SketchStore,
-    entry: &asap_types::query_plan::QueryPlanEntry,
-    times: &[u64],
-    generation: Option<&CatalogGeneration>,
-) -> Result<
-    Option<crate::storage_engines::sketch_db::index::SketchStore>,
-    crate::query_engines::EngineError,
-> {
-    use crate::query_engines::EngineError;
-    let required: BTreeSet<_> = entry
-        .materialization_bindings()
-        .into_iter()
-        .map(|b| b.stored_output_reference.stored_output_id)
-        .collect();
-    let current_series =
-        entry.nodes.values().any(|node| {
-            matches!(
-                node,
-                asap_types::query_plan::QueryPlanNode::Logical {
-                    operator:
-                        asap_types::query_plan::query_time::QueryTimeOperator::CurrentSeries { .. },
-                    ..
-                }
-            )
-        });
-    if required.is_empty() && !current_series {
-        return Ok(None);
-    }
-    let runtime = index
-        .revisions
-        .read()
-        .map_err(|_| {
-            EngineError::Physical(asap_physical_operators::Error::Invalid(
-                "revision installation poisoned".into(),
-            ))
-        })?
-        .clone();
-    let Some(runtime) = runtime else {
-        return Ok(None);
-    };
-    let now = std::time::SystemTime::now()
-        .duration_since(std::time::UNIX_EPOCH)
-        .map_err(|e| EngineError::Physical(asap_physical_operators::Error::Invalid(e.to_string())))?
-        .as_millis() as u64;
-    let ranges: Vec<_> = entry
-        .materialization_bindings()
-        .into_iter()
-        .flat_map(|binding| {
-            times.iter().map(move |time| {
-                (
-                    binding.materialization,
-                    time.saturating_sub(
-                        binding
-                            .readout_lookback_ms
-                            .unwrap_or(entry.instant.lookback_ms),
-                    ),
-                    *time,
-                )
-            })
-        })
-        .collect();
-    runtime
-        .query_view(
-            &required,
-            now,
-            &ranges,
-            generation.ok_or_else(|| {
-                EngineError::Physical(asap_physical_operators::Error::Invalid(
-                    "query revision requires a catalog generation".into(),
-                ))
-            })?,
-        )
-        .map(Some)
-        .map_err(|error| {
-            if error.is::<SnapshotUnavailable>() {
-                return EngineError::capability_miss("summary_snapshot", error.to_string());
-            }
-            match error.downcast::<asap_physical_operators::Error>() {
-                Ok(native) => EngineError::Physical(*native),
-                Err(error) => EngineError::Physical(asap_physical_operators::Error::Invalid(
-                    error.to_string(),
-                )),
-            }
-        })
-}
-
-fn records_cover(records: &[RevisionRecord], start: u64, end: u64) -> bool {
-    let mut groups = BTreeMap::<&BTreeMap<String, String>, Vec<(u64, u64)>>::new();
-    for record in records {
-        let windows = groups.entry(&record.group).or_default();
-        if record.start_ms >= start && record.end_ms <= end {
-            windows.push((record.start_ms, record.end_ms));
-        }
-    }
-    !groups.is_empty()
-        && groups.values_mut().all(|windows| {
-            windows.sort_unstable();
-            let mut cursor = start;
-            for (lo, hi) in windows {
-                if *hi <= cursor {
-                    continue;
-                }
-                if *lo != cursor {
-                    return false;
-                }
-                cursor = *hi;
-            }
-            cursor == end
-        })
-}
diff --git a/data_plane/src/precompute_engine/series_router.rs b/data_plane/src/precompute_engine/series_router.rs
deleted file mode 100644
index 0334f5fb2..000000000
--- a/data_plane/src/precompute_engine/series_router.rs
+++ /dev/null
@@ -1,484 +0,0 @@
-use crate::precompute_engine::group_key::GroupKey;
-use crate::storage_engines::types::AggregateCore;
-use asap_types::PolicyFingerprint;
-use futures::future::try_join_all;
-use std::collections::HashMap;
-use std::fmt;
-use std::sync::Arc;
-use std::time::Instant;
-use tokio::sync::mpsc;
-use xxhash_rust::xxh64::xxh64;
-
-/// A message sent from the router to a worker.
-/// Data partition ownership is derived from the installed DAG; storage locators
-/// carried by individual inputs do not determine their destination worker.
-pub enum WorkerMessage {
-    /// Immutable producer generation captured before routing. The optional
-    /// receipt proves atomic admission; absent receipts are never fabricated.
-    BoundInput {
-        input: Box<WorkerMessage>,
-        generation: Arc<asap_types::sds::CatalogGeneration>,
-        revision: Option<Arc<crate::storage_engines::types::SummaryInputRevision>>,
-    },
-    /// A batch of samples for the same series, routed by series key.
-    /// Used in `pass_raw_samples` mode where no aggregation is needed.
-    RawSamples {
-        series_key: String,
-        samples: Vec<(i64, f64)>, // (timestamp_ms, value)
-        ingest_received_at: Instant,
-    },
-    /// A batch of samples destined for a specific sid (group bucket).
-    /// All samples share the same `sid` and are fed into a single shared
-    /// accumulator (like Arroyo's GROUP BY). `sid` is the registry-
-    /// allocated identity for `(metric, attrs, agg_kind)`; `policy_fp` is
-    /// the source config's content-addressed fingerprint; `group_key` is
-    /// kept for emit-time label rendering.
-    GroupSamples {
-        /// Registry-allocated bucket identity. Folds in
-        /// `(metric, attrs_fingerprint, agg_kind_canonical)` — see
-        /// `SeriesIdResolver::resolve`. Worker keys `group_states` on this.
-        sid: u64,
-        /// Source `PrecomputeMaterialization` fingerprint. Worker looks up its
-        /// `PrecomputeMaterialization` (window size, sketch kind/config, late
-        /// data policy, etc.) via `snap.get_aggregation_config(policy_fp.into())`.
-        policy_fp: PolicyFingerprint,
-        /// Grouping label values joined by semicolons (e.g. "constant").
-        /// Empty string if the aggregation has no grouping labels. Used
-        /// at emit time to render the output's `KeyByLabelValues`.
-        group_key: Arc<GroupKey>,
-        /// Each entry: (series_key, timestamp_ms, value).
-        /// series_key is needed for keyed (MultipleSubpopulation) accumulators
-        /// to extract the aggregated-label key.
-        samples: Vec<(String, i64, f64)>,
-        ingest_received_at: Instant,
-    },
-    /// A pre-built accumulator destined for a specific sid's pane. The
-    /// worker merges it into that pane's existing accumulator (or
-    /// inserts it if the pane is empty) via `AggregateCore::merge_with`.
-    ///
-    /// Produced by ingest sources that deliver pre-aggregated sketches —
-    /// e.g. the OTLP receiver when DataCollector emits KLL / CountMin /
-    /// CountSketch payloads on a `SketchEnvelope`. Lets the precompute
-    /// engine perform further window-aligned aggregation on sketches the
-    /// same way it does on raw samples.
-    ///
-    /// Same sid / policy_fp / group_key contract as `GroupSamples`.
-    AccumulatorInput {
-        /// Registry-allocated bucket identity; see `GroupSamples::sid`.
-        sid: u64,
-        /// Source `PrecomputeMaterialization` fingerprint; see
-        /// `GroupSamples::policy_fp`.
-        policy_fp: PolicyFingerprint,
-        /// Grouping label values joined by semicolons, matching the
-        /// format produced by `IngestState::extract_group_key_for`.
-        /// Used at emit time to render the output's `KeyByLabelValues`.
-        group_key: Arc<GroupKey>,
-        /// Wall-clock timestamp the sketch refers to (millis since epoch).
-        /// Used to place the sketch into the correct pane.
-        timestamp_ms: i64,
-        /// The incoming accumulator to be merged into the pane.
-        accumulator: Box<dyn AggregateCore>,
-        ingest_received_at: Instant,
-    },
-    /// Signal the worker to flush/check idle windows.
-    Flush,
-    /// Finite-input barrier: acknowledge only after queued input and trailing panes reach the sink.
-    Drain(tokio::sync::oneshot::Sender<Result<(), String>>),
-    /// Execute downstream DAG work after all raw windows have been sealed.
-    CompleteDag {
-        plan: Arc<crate::storage_engines::types::RuntimePhysicalPlan>,
-        reply: tokio::sync::oneshot::Sender<Result<(), String>>,
-    },
-    /// Graceful shutdown.
-    Shutdown,
-}
-
-impl fmt::Debug for WorkerMessage {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        match self {
-            Self::BoundInput {
-                input,
-                generation,
-                revision,
-            } => f
-                .debug_struct("BoundInput")
-                .field("input", input)
-                .field("generation", generation)
-                .field("revision", &revision.as_ref().map(|value| value.revision))
-                .finish(),
-            Self::RawSamples {
-                series_key,
-                samples,
-                ..
-            } => f
-                .debug_struct("RawSamples")
-                .field("series_key", series_key)
-                .field("sample_count", &samples.len())
-                .finish(),
-            Self::GroupSamples {
-                sid,
-                group_key,
-                samples,
-                ..
-            } => f
-                .debug_struct("GroupSamples")
-                .field("sid", sid)
-                .field("group_key", group_key)
-                .field("sample_count", &samples.len())
-                .finish(),
-            Self::AccumulatorInput {
-                sid,
-                group_key,
-                timestamp_ms,
-                accumulator,
-                ..
-            } => f
-                .debug_struct("AccumulatorInput")
-                .field("sid", sid)
-                .field("group_key", group_key)
-                .field("timestamp_ms", timestamp_ms)
-                .field("accumulator_type", &accumulator.type_name())
-                .finish(),
-            Self::Flush => f.write_str("Flush"),
-            Self::Drain(_) => f.write_str("Drain"),
-            Self::CompleteDag { .. } => f.write_str("CompleteDag"),
-            Self::Shutdown => f.write_str("Shutdown"),
-        }
-    }
-}
-
-/// Routes incoming samples to one of N workers based on a consistent hash.
-pub struct SeriesRouter {
-    erp_observer: std::sync::OnceLock<std::sync::Arc<super::erp_observer::RuntimeErpObserver>>,
-    senders: Vec<mpsc::Sender<WorkerMessage>>,
-    num_workers: usize,
-    plan: Option<crate::storage_engines::types::InstalledPrecomputePlanHandle>,
-}
-
-impl SeriesRouter {
-    pub fn new(senders: Vec<mpsc::Sender<WorkerMessage>>) -> Self {
-        let num_workers = senders.len();
-        Self {
-            erp_observer: std::sync::OnceLock::new(),
-            senders,
-            num_workers,
-            plan: None,
-        }
-    }
-
-    pub fn with_plan(
-        mut self,
-        plan: crate::storage_engines::types::InstalledPrecomputePlanHandle,
-    ) -> Self {
-        self.plan = Some(plan);
-        self
-    }
-
-    fn partition_rule(&self) -> super::partitioning::DagPartitioning {
-        self.plan
-            .as_ref()
-            .map(|plan| plan.snapshot().partitioning.clone())
-            .unwrap_or(super::partitioning::DagPartitioning::Population)
-    }
-
-    pub fn enable_erp_observation(
-        &self,
-        endpoint: String,
-        generation: asap_types::sds::CatalogGeneration,
-    ) -> Result<(), String> {
-        self.erp_observer
-            .set(super::erp_observer::RuntimeErpObserver::new(
-                endpoint, generation,
-            ))
-            .map_err(|_| "ERP observer already configured".into())
-    }
-    pub fn erp_observer(&self) -> Option<std::sync::Arc<super::erp_observer::RuntimeErpObserver>> {
-        self.erp_observer.get().cloned()
-    }
-
-    /// Route a pre-grouped batch of group messages to workers concurrently.
-    ///
-    /// Every producer uses the same DAG partition rule. Messages within one
-    /// worker are sent sequentially to preserve admission order.
-    pub async fn route_group_batch(
-        &self,
-        messages: Vec<WorkerMessage>,
-        _ingest_received_at: Instant,
-        generation: Option<Arc<asap_types::sds::CatalogGeneration>>,
-    ) -> Result<(), Box<dyn std::error::Error + Send + Sync>> {
-        let partitioning = self.partition_rule();
-        // Group messages by target worker index
-        let mut per_worker: HashMap<usize, Vec<WorkerMessage>> = HashMap::new();
-        for msg in messages {
-            let worker_idx = match &msg {
-                WorkerMessage::BoundInput { .. } => {
-                    return Err("input must be admitted by the router".into())
-                }
-                WorkerMessage::GroupSamples { group_key, .. }
-                | WorkerMessage::AccumulatorInput { group_key, .. } => {
-                    partitioning.owner(&group_key.as_population_labels(), self.num_workers)?
-                }
-                WorkerMessage::RawSamples { series_key, .. } => self.worker_for(series_key),
-                _ => 0,
-            };
-            let message = match &generation {
-                Some(generation) => WorkerMessage::BoundInput {
-                    input: Box::new(msg),
-                    generation: Arc::clone(generation),
-                    revision: None,
-                },
-                None => msg,
-            };
-            per_worker.entry(worker_idx).or_default().push(message);
-        }
-
-        // Send to each worker concurrently
-        try_join_all(per_worker.into_iter().map(|(worker_idx, messages)| {
-            let sender = &self.senders[worker_idx];
-            async move {
-                for msg in messages {
-                    sender
-                        .send(msg)
-                        .await
-                        .map_err(|e| format!("Failed to send to worker {}: {}", worker_idx, e))?;
-                }
-                Ok::<(), String>(())
-            }
-        }))
-        .await
-        .map_err(|e| -> Box<dyn std::error::Error + Send + Sync> {
-            Box::new(std::io::Error::other(e))
-        })?;
-
-        Ok(())
-    }
-
-    pub fn try_route_group_batch_with_admission(
-        &self,
-        messages: Vec<WorkerMessage>,
-        admit: impl FnOnce() -> Result<
-            Option<Arc<crate::storage_engines::types::SummaryInputRevision>>,
-            String,
-        >,
-    ) -> Result<(), TryRouteError> {
-        let partitioning = self.partition_rule();
-        let mut pending = Vec::with_capacity(messages.len());
-        for message in messages {
-            let worker_idx = match &message {
-                WorkerMessage::GroupSamples { group_key, .. }
-                | WorkerMessage::AccumulatorInput { group_key, .. } => partitioning
-                    .owner(&group_key.as_population_labels(), self.num_workers)
-                    .map_err(TryRouteError::Admission)?,
-                WorkerMessage::RawSamples { series_key, .. } => self.worker_for(series_key),
-                WorkerMessage::BoundInput { .. } => {
-                    return Err(TryRouteError::Admission("input already admitted".into()))
-                }
-                WorkerMessage::Flush
-                | WorkerMessage::Drain(_)
-                | WorkerMessage::Shutdown
-                | WorkerMessage::CompleteDag { .. } => 0,
-            };
-            let permit = self.senders[worker_idx]
-                .clone()
-                .try_reserve_owned()
-                .map_err(|error| match error {
-                    mpsc::error::TrySendError::Full(_) => TryRouteError::Full,
-                    mpsc::error::TrySendError::Closed(_) => TryRouteError::Closed,
-                })?;
-            pending.push((permit, message));
-        }
-        let revision = admit().map_err(TryRouteError::Admission)?;
-        for (permit, message) in pending {
-            permit.send(match &revision {
-                Some(revision) => WorkerMessage::BoundInput {
-                    input: Box::new(message),
-                    generation: Arc::clone(&revision.generation),
-                    revision: Some(Arc::clone(revision)),
-                },
-                None => message,
-            });
-        }
-        Ok(())
-    }
-
-    /// Broadcast a flush signal to all workers.
-    pub async fn broadcast_flush(&self) -> Result<(), Box<dyn std::error::Error + Send + Sync>> {
-        for (i, sender) in self.senders.iter().enumerate() {
-            sender
-                .send(WorkerMessage::Flush)
-                .await
-                .map_err(|e| format!("Failed to send flush to worker {}: {}", i, e))?;
-        }
-        Ok(())
-    }
-
-    /// Caller must stop new input before invoking this finite-source barrier.
-    pub async fn drain(&self) -> Result<(), String> {
-        let mut replies = Vec::new();
-        for sender in &self.senders {
-            let (tx, rx) = tokio::sync::oneshot::channel();
-            sender
-                .send(WorkerMessage::Drain(tx))
-                .await
-                .map_err(|e| e.to_string())?;
-            replies.push(rx);
-        }
-        for reply in replies {
-            reply.await.map_err(|e| e.to_string())??;
-        }
-        Ok(())
-    }
-
-    pub async fn shutdown(&self) -> Result<(), String> {
-        let mut errors = Vec::new();
-        for (worker, sender) in self.senders.iter().enumerate() {
-            if let Err(error) = sender.send(WorkerMessage::Shutdown).await {
-                errors.push(format!("worker {worker}: {error}"));
-            }
-        }
-        if errors.is_empty() {
-            Ok(())
-        } else {
-            Err(errors.join("; "))
-        }
-    }
-
-    pub async fn complete_dag(
-        &self,
-        plan: Arc<crate::storage_engines::types::RuntimePhysicalPlan>,
-    ) -> Result<(), String> {
-        let mut replies = Vec::with_capacity(self.senders.len());
-        for sender in &self.senders {
-            let (reply, receiver) = tokio::sync::oneshot::channel();
-            sender
-                .send(WorkerMessage::CompleteDag {
-                    plan: Arc::clone(&plan),
-                    reply,
-                })
-                .await
-                .map_err(|error| error.to_string())?;
-            replies.push(receiver);
-        }
-        for reply in replies {
-            reply.await.map_err(|error| error.to_string())??;
-        }
-        Ok(())
-    }
-
-    /// Determine which worker handles a given series key (for raw mode).
-    fn worker_for(&self, series_key: &str) -> usize {
-        let hash = xxh64(series_key.as_bytes(), 0);
-        (hash as usize) % self.num_workers
-    }
-}
-
-#[derive(Debug, Clone, PartialEq, Eq, thiserror::Error)]
-pub enum TryRouteError {
-    #[error("summary admission rejected: {0}")]
-    Admission(String),
-    #[error("precompute queue is full")]
-    Full,
-    #[error("precompute worker is unavailable")]
-    Closed,
-}
-
-#[cfg(test)]
-mod tests {
-    // One failed worker must not prevent shutdown of the other workers.
-    #[tokio::test]
-    async fn shutdown_reaches_healthy_workers_after_an_earlier_worker_failed() {
-        let (failed, receiver) = tokio::sync::mpsc::channel(1);
-        drop(receiver);
-        let (healthy, mut receiver) = tokio::sync::mpsc::channel(1);
-        let router = SeriesRouter::new(vec![failed, healthy]);
-        assert!(router.shutdown().await.is_err());
-        assert!(matches!(receiver.try_recv(), Ok(WorkerMessage::Shutdown)));
-    }
-
-    use super::*;
-
-    // Shared DAG consumers must share partition ownership regardless of locator IDs.
-    #[tokio::test]
-    async fn shared_population_is_not_split_by_storage_locator() {
-        let (senders, mut receivers): (Vec<_>, Vec<_>) =
-            (0..4).map(|_| mpsc::channel::<WorkerMessage>(128)).unzip();
-        let router = SeriesRouter::new(senders);
-        let messages = (0..32)
-            .map(|sid| WorkerMessage::GroupSamples {
-                sid,
-                policy_fp: PolicyFingerprint(sid),
-                group_key: Arc::new(GroupKey::new([("service", "api")])),
-                samples: vec![("counter".into(), 1, 1.0)],
-                ingest_received_at: Instant::now(),
-            })
-            .collect();
-        router
-            .route_group_batch(messages, Instant::now(), None)
-            .await
-            .unwrap();
-        let counts = receivers
-            .iter_mut()
-            .map(|rx| {
-                let mut count = 0;
-                while rx.try_recv().is_ok() {
-                    count += 1;
-                }
-                count
-            })
-            .collect::<Vec<_>>();
-        assert_eq!(counts.iter().sum::<usize>(), 32);
-        assert_eq!(
-            counts.iter().filter(|n| **n != 0).count(),
-            1,
-            "one service's complete DAG must stay with one worker: {counts:?}"
-        );
-    }
-
-    #[test]
-    fn test_raw_mode_routing() {
-        let (senders, _receivers): (Vec<_>, Vec<_>) =
-            (0..4).map(|_| mpsc::channel::<WorkerMessage>(10)).unzip();
-
-        let router = SeriesRouter::new(senders);
-
-        // Same key should always go to the same worker
-        let w1 = router.worker_for("cpu{host=\"a\"}");
-        let w2 = router.worker_for("cpu{host=\"a\"}");
-        assert_eq!(w1, w2);
-        assert!(router.worker_for("mem{host=\"a\"}") < 4);
-    }
-
-    #[tokio::test]
-    async fn atomic_route_publishes_nothing_when_batch_exceeds_capacity() {
-        let (sender, mut receiver) = mpsc::channel::<WorkerMessage>(1);
-        let router = SeriesRouter::new(vec![sender]);
-        let messages = vec![
-            WorkerMessage::RawSamples {
-                series_key: "m{job=\"a\"}".into(),
-                samples: vec![(1, 1.0)],
-                ingest_received_at: Instant::now(),
-            },
-            WorkerMessage::RawSamples {
-                series_key: "m{job=\"b\"}".into(),
-                samples: vec![(1, 2.0)],
-                ingest_received_at: Instant::now(),
-            },
-        ];
-        let mut admitted = false;
-        assert_eq!(
-            router.try_route_group_batch_with_admission(messages, || {
-                admitted = true;
-                Ok(None)
-            }),
-            Err(TryRouteError::Full)
-        );
-        assert!(
-            !admitted,
-            "failed queue reservation must not mutate admission"
-        );
-        assert!(matches!(
-            receiver.try_recv(),
-            Err(mpsc::error::TryRecvError::Empty)
-        ));
-    }
-}
diff --git a/data_plane/src/precompute_engine/subdag_scheduler.rs b/data_plane/src/precompute_engine/subdag_scheduler.rs
deleted file mode 100644
index 6f0d6c40a..000000000
--- a/data_plane/src/precompute_engine/subdag_scheduler.rs
+++ /dev/null
@@ -1,780 +0,0 @@
-use asap_physical_operators::dag as execution;
-use asap_types::executable_plan::{BackendExecutableBinding, BackendNodeBinding};
-use futures::StreamExt;
-use planner_types::post_asap::PostAsapNodeId;
-use planner_types::post_asap::{
-    EdgeRole, ExecutableDag, ExecutableDagNode, ExecutableOperatorPayload, ExecutionDataState,
-};
-use std::{cell::RefCell, rc::Rc};
-use std::{
-    collections::{BTreeMap, BTreeSet},
-    sync::Arc,
-};
-
-#[derive(Debug, Clone, PartialEq, Eq, PartialOrd, Ord, Hash)]
-pub struct MaterializationCommitKey {
-    pub plan_id: u64,
-    pub plan_version: u64,
-    pub stored_output: asap_types::sds::StoredOutputId,
-    pub window_start_ms: i64,
-    pub window_end_ms: i64,
-    /// Producer lineage identity, including source and immutable input payload.
-    /// Production uses a domain-separated SHA-256 digest to avoid retaining
-    /// another full copy of every source summary.
-    pub input_lineage: Vec<u8>,
-}
-
-pub trait PrecomputeOperatorRegistry<V> {
-    type Error;
-    /// A materialized input is an execution frontier: its absorbed semantic
-    /// dependencies have already run and must not be evaluated again.
-    fn materialized_input(&self, _node: &ExecutableDagNode) -> Result<Option<V>, Self::Error> {
-        Ok(None)
-    }
-    fn output_bytes(&self, _value: &V) -> usize {
-        std::mem::size_of::<V>().max(1)
-    }
-    fn execute(
-        &self,
-        node: &ExecutableDagNode,
-        inputs: &[Arc<V>],
-        context: execution::RunContext,
-    ) -> Result<V, Self::Error>;
-}
-
-/// Atomic persistence boundary. Implementations must return the already
-/// committed value when the same lineage key is replayed after a retry or
-/// restart, and must never publish two values for one key.
-pub trait IdempotentCommitSink<V> {
-    type Error;
-    fn get(&self, key: &MaterializationCommitKey) -> Result<Option<Arc<V>>, Self::Error>;
-    fn commit_if_absent(
-        &self,
-        key: MaterializationCommitKey,
-        value: Arc<V>,
-    ) -> Result<Arc<V>, Self::Error>;
-}
-
-#[derive(Debug)]
-pub enum ScheduleError<OperatorError, SinkError> {
-    Invalid(String),
-    Operator(OperatorError),
-    Sink(SinkError),
-    Execution(execution::Error),
-}
-
-/// Execute one precompute sink and its transitive dependencies in topological
-/// order. Intermediates use `Arc`, so a shared upstream node is computed once
-/// without copying summary payloads. Only the sink is committed; upstream
-/// materialization sinks are committed by their own lineage-keyed invocation.
-pub fn execute_precompute_sink<V, R, S>(
-    dag: &ExecutableDag,
-    binding: &BackendExecutableBinding,
-    sink_node: PostAsapNodeId,
-    key: MaterializationCommitKey,
-    registry: &R,
-    sink: &S,
-    context: execution::RunContext,
-) -> Result<Arc<V>, ScheduleError<R::Error, S::Error>>
-where
-    R: PrecomputeOperatorRegistry<V>,
-    S: IdempotentCommitSink<V>,
-{
-    let mut outputs =
-        execute_precompute_sinks(dag, binding, &[(sink_node, key)], registry, sink, context)?;
-    Ok(outputs.remove(0))
-}
-
-/// Evaluate all selected stored outputs with one dependency cache. Keys must
-/// describe the same input revision and window; only their output identity may
-/// differ. Validation finishes before executing or committing any output.
-pub fn execute_precompute_sinks<V, R, S>(
-    dag: &ExecutableDag,
-    binding: &BackendExecutableBinding,
-    outputs: &[(PostAsapNodeId, MaterializationCommitKey)],
-    registry: &R,
-    sink: &S,
-    context: execution::RunContext,
-) -> Result<Vec<Arc<V>>, ScheduleError<R::Error, S::Error>>
-where
-    R: PrecomputeOperatorRegistry<V>,
-    S: IdempotentCommitSink<V>,
-{
-    let mut unique = BTreeSet::new();
-    for (node, key) in outputs {
-        if !unique.insert(node.0)
-            || !binding.precompute_sinks.contains(node)
-            || !matches!(binding.node(*node), Some(BackendNodeBinding::Materialization { stored_output }) if *stored_output == key.stored_output)
-        {
-            return Err(ScheduleError::Invalid(
-                "commit key does not match a unique stored output binding".into(),
-            ));
-        }
-        let first = &outputs[0].1;
-        if (
-            key.plan_id,
-            key.plan_version,
-            key.window_start_ms,
-            key.window_end_ms,
-            &key.input_lineage,
-        ) != (
-            first.plan_id,
-            first.plan_version,
-            first.window_start_ms,
-            first.window_end_ms,
-            &first.input_lineage,
-        ) {
-            return Err(ScheduleError::Invalid(
-                "stored outputs require one evaluation window and input revision".into(),
-            ));
-        }
-    }
-    binding
-        .validate_precompute(dag)
-        .map_err(ScheduleError::Invalid)?;
-    let nodes = dag
-        .nodes
-        .iter()
-        .map(|n| (n.id.0, n))
-        .collect::<BTreeMap<_, _>>();
-    let mut incoming = BTreeMap::<u32, Vec<_>>::new();
-    for edge in &dag.edges {
-        incoming.entry(edge.consumer.0).or_default().push(edge);
-    }
-    for node in &dag.nodes {
-        if matches!(node.payload, ExecutableOperatorPayload::Binary { .. }) {
-            incoming.entry(node.id.0).or_default();
-        }
-    }
-    let mut inputs = BTreeMap::<u32, Vec<u32>>::new();
-    for (consumer, edges) in incoming {
-        let ordered = if nodes
-            .get(&consumer)
-            .is_some_and(|node| matches!(node.payload, ExecutableOperatorPayload::Binary { .. }))
-        {
-            // Wire order is not operand order. Preserve noncommutative binary
-            // semantics even when a valid transport reorders its edge list.
-            let left = edges
-                .iter()
-                .filter(|edge| edge.role == EdgeRole::Left)
-                .collect::<Vec<_>>();
-            let right = edges
-                .iter()
-                .filter(|edge| edge.role == EdgeRole::Right)
-                .collect::<Vec<_>>();
-            if edges.len() != 2 || left.len() != 1 || right.len() != 1 {
-                return Err(ScheduleError::Invalid(
-                    "binary maintenance input roles must be exactly Left and Right".into(),
-                ));
-            }
-            vec![left[0].producer.0, right[0].producer.0]
-        } else {
-            edges.iter().map(|edge| edge.producer.0).collect()
-        };
-        inputs.insert(consumer, ordered);
-    }
-    if outputs.is_empty() {
-        return Ok(Vec::new());
-    }
-    let error = Rc::new(RefCell::new(None));
-    let mut sources = BTreeMap::new();
-    for (node, key) in outputs {
-        if let Some(value) = sink.get(key).map_err(ScheduleError::Sink)? {
-            sources.insert(node.0, value);
-        }
-    }
-    let committed = sources.keys().copied().collect::<BTreeSet<_>>();
-    let mut graph = execution::PhysicalDag::default();
-    let mut pending = outputs.iter().map(|(id, _)| id.0).collect::<Vec<_>>();
-    let mut added = BTreeSet::new();
-    while let Some(id) = pending.pop() {
-        if !added.insert(id) {
-            continue;
-        }
-        let node = *nodes
-            .get(&id)
-            .ok_or_else(|| ScheduleError::Invalid(format!("missing node {id}")))?;
-        if node.output_state.timing == planner_types::post_asap::ExecutionTiming::QueryTime {
-            return Err(ScheduleError::Invalid(format!(
-                "query-time node {id} in precompute dependency path"
-            )));
-        }
-        let source = if let Some(value) = sources.remove(&id) {
-            Some(value)
-        } else {
-            registry
-                .materialized_input(node)
-                .map_err(ScheduleError::Operator)?
-                .map(Arc::new)
-        };
-        let children = if source.is_some() {
-            vec![]
-        } else {
-            inputs.get(&id).cloned().unwrap_or_default()
-        };
-        let schemas = children
-            .iter()
-            .map(|child| {
-                nodes
-                    .get(child)
-                    .map(|n| n.output_schema.clone())
-                    .ok_or_else(|| ScheduleError::Invalid(format!("missing node {child}")))
-            })
-            .collect::<Result<Vec<_>, _>>()?;
-        pending.extend(children.iter().copied());
-        graph
-            .add(
-                u64::from(id),
-                children.into_iter().map(u64::from).collect(),
-                IngestionOperator {
-                    node,
-                    registry,
-                    source,
-                    schemas,
-                    error: error.clone(),
-                },
-            )
-            .map_err(ScheduleError::Execution)?;
-    }
-    let roots = outputs
-        .iter()
-        .map(|(id, _)| u64::from(id.0))
-        .collect::<Vec<_>>();
-    let streams = graph
-        .execute(&roots, context)
-        .map_err(ScheduleError::Execution)?;
-    futures::executor::block_on(futures::future::try_join_all(
-        streams
-            .into_iter()
-            .zip(outputs)
-            .map(|(mut stream, (node, key))| {
-                let error = &error;
-                let committed = &committed;
-                async move {
-                    let result = stream.next().await.ok_or_else(|| {
-                        ScheduleError::Invalid("ingestion root produced no value".into())
-                    })?;
-                    let value = match result {
-                        Ok(value) => Arc::clone(value.value()),
-                        Err(failure) => {
-                            return Err(match error.borrow_mut().take() {
-                                Some(error) => ScheduleError::Operator(error),
-                                None => ScheduleError::Execution(failure),
-                            })
-                        }
-                    };
-                    if committed.contains(&node.0) {
-                        Ok(value)
-                    } else {
-                        sink.commit_if_absent(key.clone(), value)
-                            .map_err(ScheduleError::Sink)
-                    }
-                }
-            }),
-    ))
-}
-
-struct IngestionOperator<'a, V, R: PrecomputeOperatorRegistry<V>> {
-    node: &'a ExecutableDagNode,
-    registry: &'a R,
-    source: Option<Arc<V>>,
-    schemas: Vec<planner_types::post_asap::SummarySchema>,
-    error: Rc<RefCell<Option<R::Error>>>,
-}
-impl<V, R: PrecomputeOperatorRegistry<V>>
-    execution::PhysicalOperator<Arc<V>, planner_types::post_asap::SummarySchema>
-    for IngestionOperator<'_, V, R>
-{
-    fn name(&self) -> &str {
-        "InstalledIngestionOperator"
-    }
-    fn input_schemas(&self) -> Vec<planner_types::post_asap::SummarySchema> {
-        self.schemas.clone()
-    }
-    fn output_schema(&self) -> planner_types::post_asap::SummarySchema {
-        self.node.output_schema.clone()
-    }
-    fn output_bytes(&self, value: &Arc<V>) -> usize {
-        self.registry.output_bytes(value)
-    }
-    fn start<'a>(
-        &'a self,
-        inputs: Vec<execution::Input<'a, Arc<V>>>,
-        context: execution::RunContext,
-    ) -> Result<execution::OutputStream<'a, Arc<V>>, execution::Error> {
-        Ok(futures::stream::once(async move {
-            if let Some(source) = &self.source {
-                return Ok(Arc::clone(source));
-            }
-            let inputs =
-                futures::future::try_join_all(inputs.into_iter().map(|mut input| async move {
-                    input.next().await.ok_or_else(|| {
-                        execution::Error::Operator("ingestion input produced no value".into())
-                    })?
-                }))
-                .await?;
-            let values = inputs
-                .iter()
-                .map(|value| Arc::clone(value.value()))
-                .collect::<Vec<_>>();
-            self.registry
-                .execute(self.node, &values, context)
-                .map(Arc::new)
-                .map_err(|e| {
-                    *self.error.borrow_mut() = Some(e);
-                    execution::Error::Operator(format!("ingestion node {} failed", self.node.id.0))
-                })
-        })
-        .boxed_local())
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use planner_types::post_asap::{EdgeRole, ExecutionDataState};
-    use planner_types::post_asap::{
-        ExecutableDagEdge, ExecutableOperatorPayload, GroupingEdgeCompatibility, SummarySchema,
-        WindowEdgeCompatibility,
-    };
-    use std::sync::Mutex;
-
-    fn test_context() -> execution::RunContext {
-        execution::RunContext::new(
-            execution::Scope::Ingestion {
-                window_start_ms: 10,
-                window_end_ms: 20,
-                revision: 1,
-            },
-            execution::Limits::default(),
-        )
-        .unwrap()
-    }
-
-    // Caller cancellation or exhaustion must terminate without committing state.
-    #[test]
-    fn caller_control_terminates_before_publication() {
-        for cancelled in [true, false] {
-            let context = execution::RunContext::new(
-                execution::Scope::Ingestion {
-                    window_start_ms: 10,
-                    window_end_ms: 20,
-                    revision: 1,
-                },
-                execution::Limits {
-                    max_bytes: 1,
-                    ..Default::default()
-                },
-            )
-            .unwrap();
-            if cancelled {
-                context.cancel();
-            }
-            let dag = ExecutableDag {
-                nodes: (0..4).map(node).collect(),
-                edges: vec![edge(0, 1), edge(1, 3)],
-                root: PostAsapNodeId(3),
-            };
-            let (dag, binding) = maintenance_only(dag, binding(), PostAsapNodeId(3));
-            let registry = Registry::default();
-            let sink = Sink::default();
-            let result = execute_precompute_sink(
-                &dag,
-                &binding,
-                PostAsapNodeId(3),
-                key(3),
-                &registry,
-                &sink,
-                context,
-            );
-            fn cause(error: &execution::Error) -> &execution::Error {
-                match error {
-                    execution::Error::AtNode { source, .. } => cause(source),
-                    error => error,
-                }
-            }
-            let Err(ScheduleError::Execution(error)) = result else {
-                panic!("expected a typed execution error, got {result:?}");
-            };
-            assert_eq!(
-                cause(&error),
-                if cancelled {
-                    &execution::Error::Cancelled
-                } else {
-                    &execution::Error::MemoryLimit
-                }
-            );
-            assert!(sink.0.lock().unwrap().is_empty());
-            if cancelled {
-                assert!(registry.0.lock().unwrap().is_empty());
-            }
-        }
-    }
-
-    fn binding() -> BackendExecutableBinding {
-        BackendExecutableBinding {
-            nodes: (0..4)
-                .map(|id| {
-                    (
-                        PostAsapNodeId(id),
-                        BackendNodeBinding::Materialization {
-                            stored_output: asap_types::PolicyFingerprint(u64::from(id) + 1).into(),
-                        },
-                    )
-                })
-                .chain([(
-                    PostAsapNodeId(4),
-                    BackendNodeBinding::Query {
-                        query_node: asap_types::query_plan::QueryNodeId(9),
-                    },
-                )])
-                .collect(),
-            query_sink: PostAsapNodeId(4),
-            query_plan_sink: asap_types::query_plan::QueryNodeId(9),
-            precompute_sinks: vec![PostAsapNodeId(3)],
-        }
-    }
-
-    fn maintenance_only(
-        mut dag: ExecutableDag,
-        mut binding: BackendExecutableBinding,
-        sink: PostAsapNodeId,
-    ) -> (ExecutableDag, BackendExecutableBinding) {
-        let retained = dag
-            .nodes
-            .iter()
-            .filter(|node| {
-                node.output_state.timing == planner_types::post_asap::ExecutionTiming::IngestionTime
-            })
-            .map(|node| node.id)
-            .collect::<std::collections::BTreeSet<_>>();
-        dag.nodes.retain(|node| retained.contains(&node.id));
-        dag.edges
-            .retain(|edge| retained.contains(&edge.producer) && retained.contains(&edge.consumer));
-        binding.nodes.retain(|id, _| retained.contains(id));
-        dag.root = sink;
-        (dag, binding)
-    }
-
-    fn node(id: u32) -> ExecutableDagNode {
-        ExecutableDagNode {
-            id: PostAsapNodeId(id),
-            payload: ExecutableOperatorPayload::SummarySubtract,
-            output_state: ExecutionDataState::INGESTION_SUMMARY,
-            output_schema: SummarySchema {
-                fields: Vec::new(),
-                time_index: None,
-            },
-            guarantee: None,
-        }
-    }
-
-    fn edge(producer: u32, consumer: u32) -> ExecutableDagEdge {
-        ExecutableDagEdge {
-            producer: PostAsapNodeId(producer),
-            consumer: PostAsapNodeId(consumer),
-            role: EdgeRole::Input,
-            intermediate_schema: SummarySchema {
-                fields: Vec::new(),
-                time_index: None,
-            },
-            data_state: ExecutionDataState::INGESTION_SUMMARY,
-            grouping: GroupingEdgeCompatibility::Identical,
-            window: WindowEdgeCompatibility::NotApplicable,
-        }
-    }
-
-    #[derive(Default)]
-    struct Registry(Mutex<BTreeMap<u32, usize>>);
-
-    impl PrecomputeOperatorRegistry<u32> for Registry {
-        type Error = String;
-
-        fn execute(
-            &self,
-            node: &ExecutableDagNode,
-            inputs: &[Arc<u32>],
-            _context: execution::RunContext,
-        ) -> Result<u32, Self::Error> {
-            *self.0.lock().unwrap().entry(node.id.0).or_default() += 1;
-            Ok(node.id.0 + inputs.iter().map(|v| **v).sum::<u32>())
-        }
-    }
-
-    #[derive(Default)]
-    struct Sink(Mutex<BTreeMap<MaterializationCommitKey, Arc<u32>>>);
-
-    impl IdempotentCommitSink<u32> for Sink {
-        type Error = String;
-
-        fn get(&self, key: &MaterializationCommitKey) -> Result<Option<Arc<u32>>, Self::Error> {
-            Ok(self.0.lock().unwrap().get(key).cloned())
-        }
-
-        fn commit_if_absent(
-            &self,
-            key: MaterializationCommitKey,
-            value: Arc<u32>,
-        ) -> Result<Arc<u32>, Self::Error> {
-            Ok(Arc::clone(
-                self.0.lock().unwrap().entry(key).or_insert(value),
-            ))
-        }
-    }
-
-    fn key(node_id: u32) -> MaterializationCommitKey {
-        MaterializationCommitKey {
-            plan_id: 7,
-            plan_version: 1,
-            stored_output: asap_types::PolicyFingerprint(u64::from(node_id) + 1).into(),
-            window_start_ms: 10,
-            window_end_ms: 20,
-            input_lineage: b"checkpoint:3".to_vec(),
-        }
-    }
-
-    // Two stored sinks in one evaluation reuse their shared upstream work.
-    #[test]
-    fn stored_sinks_share_one_evaluation() {
-        let mut query = node(4);
-        query.output_state = ExecutionDataState::QUERY_ROWS;
-        let dag = ExecutableDag {
-            nodes: vec![node(0), node(1), node(2), node(3), query],
-            edges: vec![edge(0, 1), edge(1, 2), edge(1, 3)],
-            root: PostAsapNodeId(4),
-        };
-        let mut bindings = binding();
-        bindings.precompute_sinks = vec![PostAsapNodeId(2), PostAsapNodeId(3)];
-        let (dag, bindings) = maintenance_only(dag, bindings, PostAsapNodeId(3));
-        let registry = Registry::default();
-        let sink = Sink::default();
-        execute_precompute_sinks(
-            &dag,
-            &bindings,
-            &[(PostAsapNodeId(2), key(2)), (PostAsapNodeId(3), key(3))],
-            &registry,
-            &sink,
-            test_context(),
-        )
-        .unwrap();
-        assert_eq!(
-            *registry.0.lock().unwrap(),
-            BTreeMap::from([(0, 1), (1, 1), (2, 1), (3, 1)])
-        );
-    }
-
-    #[test]
-    fn binary_operand_roles_survive_edge_reordering_and_reject_duplicates() {
-        use planner_types::post_asap::BinaryOperator;
-        use planner_types::pre_asap::{ArithmeticOpKind, BinaryOpKind};
-        struct Subtract;
-        impl PrecomputeOperatorRegistry<u32> for Subtract {
-            type Error = String;
-            fn execute(
-                &self,
-                node: &ExecutableDagNode,
-                inputs: &[Arc<u32>],
-                _context: execution::RunContext,
-            ) -> Result<u32, String> {
-                match node.id.0 {
-                    0 => Ok(10),
-                    1 => Ok(3),
-                    3 => Ok(*inputs[0] - *inputs[1]),
-                    _ => Err("unexpected node".into()),
-                }
-            }
-        }
-        let mut binary = node(3);
-        binary.payload = ExecutableOperatorPayload::Binary {
-            operator: BinaryOperator {
-                checked_relative_division: false,
-                checked_finite_division: false,
-                kind: BinaryOpKind::Arithmetic(ArithmeticOpKind::Sub),
-                vector_match: None,
-            },
-        };
-        let mut left = edge(0, 3);
-        left.role = EdgeRole::Left;
-        let mut right = edge(1, 3);
-        right.role = EdgeRole::Right;
-        let mut dag = ExecutableDag {
-            nodes: vec![node(0), node(1), node(2), binary, {
-                let mut query = node(4);
-                query.output_state = ExecutionDataState::QUERY_ROWS;
-                query
-            }],
-            edges: vec![right, left],
-            root: PostAsapNodeId(3),
-        };
-        let execute = |dag: &ExecutableDag| {
-            let (dag, binding) = maintenance_only(dag.clone(), binding(), PostAsapNodeId(3));
-            execute_precompute_sink(
-                &dag,
-                &binding,
-                PostAsapNodeId(3),
-                key(3),
-                &Subtract,
-                &Sink::default(),
-                test_context(),
-            )
-        };
-        assert_eq!(*execute(&dag).unwrap(), 7);
-        dag.edges.reverse();
-        assert_eq!(*execute(&dag).unwrap(), 7);
-        dag.edges[1].role = EdgeRole::Left;
-        assert!(matches!(execute(&dag), Err(ScheduleError::Invalid(_))));
-        dag.edges.pop();
-        assert!(matches!(execute(&dag), Err(ScheduleError::Invalid(_))));
-        dag.edges.clear();
-        assert!(matches!(execute(&dag), Err(ScheduleError::Invalid(_))));
-    }
-
-    #[test]
-    fn shared_dependency_executes_once_and_replay_reads_committed_value() {
-        // 0 is shared by 1 and 2; 3 consumes both branches.
-        let dag = ExecutableDag {
-            nodes: (0..4)
-                .map(node)
-                .chain([{
-                    let mut query = node(4);
-                    query.output_state = ExecutionDataState::QUERY_ROWS;
-                    query
-                }])
-                .collect(),
-            edges: vec![edge(0, 1), edge(0, 2), edge(1, 3), edge(2, 3), edge(3, 4)],
-            root: PostAsapNodeId(4),
-        };
-        let registry = Registry::default();
-        let sink = Sink::default();
-        let (dag, binding) = maintenance_only(dag, binding(), PostAsapNodeId(3));
-        let first = execute_precompute_sink(
-            &dag,
-            &binding,
-            PostAsapNodeId(3),
-            key(3),
-            &registry,
-            &sink,
-            test_context(),
-        )
-        .unwrap();
-        assert_eq!(*first, 6);
-        assert_eq!(registry.0.lock().unwrap().values().sum::<usize>(), 4);
-
-        let replay = execute_precompute_sink(
-            &dag,
-            &binding,
-            PostAsapNodeId(3),
-            key(3),
-            &registry,
-            &sink,
-            test_context(),
-        )
-        .unwrap();
-        assert!(Arc::ptr_eq(&first, &replay));
-        assert_eq!(registry.0.lock().unwrap().values().sum::<usize>(), 4);
-    }
-
-    #[test]
-    fn supplied_materialization_cuts_absorbed_dependencies_and_is_shared() {
-        struct FrontierRegistry(Registry);
-        impl PrecomputeOperatorRegistry<u32> for FrontierRegistry {
-            type Error = String;
-            fn materialized_input(&self, node: &ExecutableDagNode) -> Result<Option<u32>, String> {
-                Ok((node.id == PostAsapNodeId(1)).then_some(10))
-            }
-            fn execute(
-                &self,
-                node: &ExecutableDagNode,
-                inputs: &[Arc<u32>],
-                context: execution::RunContext,
-            ) -> Result<u32, String> {
-                assert_ne!(
-                    node.id,
-                    PostAsapNodeId(0),
-                    "absorbed source subtree must not execute"
-                );
-                self.0.execute(node, inputs, context)
-            }
-        }
-        let mut raw = node(0);
-        raw.output_state = ExecutionDataState::QUERY_ROWS;
-        let mut query = node(4);
-        query.output_state = ExecutionDataState::QUERY_ROWS;
-        let dag = ExecutableDag {
-            nodes: vec![raw, node(1), node(2), node(3), query],
-            edges: vec![edge(0, 1), edge(1, 2), edge(1, 3), edge(2, 3), edge(3, 4)],
-            root: PostAsapNodeId(4),
-        };
-        let mut bindings = binding();
-        bindings
-            .nodes
-            .insert(PostAsapNodeId(0), BackendNodeBinding::QueryInput);
-        let (dag, bindings) = maintenance_only(dag, bindings, PostAsapNodeId(3));
-        let registry = FrontierRegistry(Registry::default());
-        let sink = Sink::default();
-        let result = execute_precompute_sink(
-            &dag,
-            &bindings,
-            PostAsapNodeId(3),
-            key(3),
-            &registry,
-            &sink,
-            test_context(),
-        )
-        .unwrap();
-        assert_eq!(*result, 25);
-        assert_eq!(
-            *registry.0 .0.lock().unwrap(),
-            BTreeMap::from([(2, 1), (3, 1)])
-        );
-    }
-
-    #[test]
-    fn rejects_query_node_in_precompute_path_and_mismatched_lineage_key() {
-        let mut query_child = node(0);
-        query_child.output_state = ExecutionDataState::QUERY_ROWS;
-        let dag = ExecutableDag {
-            nodes: vec![query_child, node(1)],
-            edges: vec![edge(0, 1)],
-            root: PostAsapNodeId(0),
-        };
-        let registry = Registry::default();
-        let sink = Sink::default();
-        let invalid_path_binding = BackendExecutableBinding {
-            nodes: [
-                (
-                    PostAsapNodeId(0),
-                    BackendNodeBinding::Query {
-                        query_node: asap_types::query_plan::QueryNodeId(1),
-                    },
-                ),
-                (
-                    PostAsapNodeId(1),
-                    BackendNodeBinding::Materialization {
-                        stored_output: asap_types::PolicyFingerprint(2).into(),
-                    },
-                ),
-            ]
-            .into_iter()
-            .collect(),
-            query_sink: PostAsapNodeId(0),
-            query_plan_sink: asap_types::query_plan::QueryNodeId(1),
-            precompute_sinks: vec![PostAsapNodeId(1)],
-        };
-        assert!(matches!(
-            execute_precompute_sink(&dag, &invalid_path_binding, PostAsapNodeId(1), key(1), &registry, &sink, test_context()),
-            Err(ScheduleError::Invalid(message)) if message.contains("query-owned node")
-        ));
-        let mut summary_dag = dag.clone();
-        summary_dag.nodes[0].output_state.primitive =
-            planner_types::post_asap::DataPrimitive::SummaryState;
-        assert!(matches!(
-            execute_precompute_sink(&summary_dag, &invalid_path_binding, PostAsapNodeId(1), key(1), &registry, &sink, test_context()),
-            Err(ScheduleError::Invalid(message)) if message.contains("query-owned node")
-        ));
-        assert!(matches!(
-            execute_precompute_sink(&dag, &invalid_path_binding, PostAsapNodeId(1), key(0), &registry, &sink, test_context()),
-            Err(ScheduleError::Invalid(message)) if message.contains("does not match")
-        ));
-    }
-}
diff --git a/data_plane/src/precompute_engine/window_manager.rs b/data_plane/src/precompute_engine/window_manager.rs
deleted file mode 100644
index e1214fd9b..000000000
--- a/data_plane/src/precompute_engine/window_manager.rs
+++ /dev/null
@@ -1,437 +0,0 @@
-/// Manages tumbling and sliding window boundaries and detects which windows
-/// have closed based on watermark advancement.
-///
-/// Tumbling windows are a special case where `slide_interval == window_size`.
-/// The same logic handles both — no separate code paths.
-pub struct WindowManager {
-    /// Window size in milliseconds.
-    window_size_ms: i64,
-    /// Slide interval in milliseconds (== window_size_ms for tumbling windows).
-    slide_interval_ms: i64,
-    /// Width of independently stored non-overlapping panes.
-    pane_interval_ms: i64,
-    /// Planned event-time phase of this materialization definition.
-    origin_ms: Option<i64>,
-    stores_full_windows: bool,
-}
-
-impl WindowManager {
-    /// Create a new WindowManager.
-    ///
-    /// `window_size_secs` and `slide_interval_secs` come from `PrecomputeMaterialization`
-    /// (which stores them in seconds). They are converted to milliseconds internally.
-    pub fn new(window_size_secs: u64, slide_interval_secs: u64) -> Self {
-        Self::with_origin(window_size_secs, slide_interval_secs, None)
-    }
-
-    pub fn with_origin(
-        window_size_secs: u64,
-        slide_interval_secs: u64,
-        origin_ms: Option<i64>,
-    ) -> Self {
-        let window_size_ms = (window_size_secs * 1000) as i64;
-        let slide_interval_ms = if slide_interval_secs == 0 {
-            window_size_ms // tumbling window
-        } else {
-            (slide_interval_secs * 1000) as i64
-        };
-        Self {
-            window_size_ms,
-            slide_interval_ms,
-            pane_interval_ms: slide_interval_ms,
-            origin_ms,
-            stores_full_windows: true,
-        }
-    }
-
-    pub fn with_layout(
-        window_size_secs: u64,
-        slide_interval_secs: u64,
-        origin_ms: Option<i64>,
-        layout: &asap_types::WindowMaterializationLayout,
-    ) -> Self {
-        let mut manager = Self::with_origin(window_size_secs, slide_interval_secs, origin_ms);
-        manager.stores_full_windows =
-            matches!(layout, asap_types::WindowMaterializationLayout::FullWindow);
-        if !manager.stores_full_windows {
-            manager.pane_interval_ms = (layout.base_pane_secs() * 1_000) as i64;
-        }
-        manager
-    }
-
-    /// Resolve the physical buckets updated by an input timestamp.
-    /// Their extent may differ from the semantic window or emission cadence.
-    pub fn stored_bucket_starts(&self, timestamp_ms: i64) -> Vec<i64> {
-        if self.stores_full_windows {
-            self.window_starts_containing(timestamp_ms)
-                .into_iter()
-                .filter(|start| *start >= 0)
-                .collect()
-        } else {
-            vec![self.pane_start_for(timestamp_ms)]
-        }
-    }
-
-    pub fn stored_bucket_bounds(&self, start_ms: i64) -> (i64, i64) {
-        if self.stores_full_windows {
-            self.window_bounds(start_ms)
-        } else {
-            self.pane_bounds(start_ms)
-        }
-    }
-
-    pub fn window_size_ms(&self) -> i64 {
-        self.window_size_ms
-    }
-
-    /// Compute the window start for a given timestamp.
-    /// Windows are aligned to the planned origin. Legacy definitions without
-    /// an origin retain epoch alignment but cannot pass certified reads.
-    pub fn window_start_for(&self, timestamp_ms: i64) -> i64 {
-        // Floor-divide to the nearest slide interval boundary
-        let origin = self.origin_ms.unwrap_or(0);
-        origin + (timestamp_ms - origin).div_euclid(self.slide_interval_ms) * self.slide_interval_ms
-    }
-
-    /// Return window starts whose windows are now closed, given that the
-    /// watermark advanced from `previous_wm` to `current_wm`.
-    ///
-    /// A window `[start, start + window_size_ms)` is closed when
-    /// `current_wm >= start + window_size_ms`.
-    ///
-    /// Returns window starts in ascending order.
-    pub fn closed_windows(&self, previous_wm: i64, current_wm: i64) -> Vec<i64> {
-        if current_wm <= previous_wm || previous_wm == i64::MIN {
-            // No watermark advancement, or first sample ever (nothing to close yet
-            // — the window that contains the first sample is still open).
-            return Vec::new();
-        }
-
-        let mut closed = Vec::new();
-
-        // The earliest window start that *could* have been open at previous_wm.
-        // A window is open if its end (start + window_size_ms) > previous_wm.
-        // So the oldest open window start was: previous_wm - window_size_ms + 1,
-        // aligned down to slide_interval.
-        let earliest_open_start =
-            self.window_start_for((previous_wm - self.window_size_ms + 1).max(0));
-
-        let mut start = earliest_open_start;
-        while start + self.window_size_ms <= current_wm {
-            // This window was NOT closed at previous_wm but IS closed at current_wm
-            if start + self.window_size_ms > previous_wm {
-                closed.push(start);
-            }
-            start += self.slide_interval_ms;
-        }
-
-        closed
-    }
-
-    /// Return non-overlapping pane starts that became immutable as the
-    /// watermark advanced. Persisted summary instances use these pane
-    /// intervals; query-time DAG nodes compose panes into semantic windows.
-    pub fn closed_panes(&self, previous_wm: i64, current_wm: i64) -> Vec<i64> {
-        if current_wm <= previous_wm || previous_wm == i64::MIN {
-            return Vec::new();
-        }
-        let mut panes = Vec::new();
-        let mut start = self.pane_start_for(previous_wm.saturating_sub(self.pane_interval_ms - 1));
-        while start.saturating_add(self.pane_interval_ms) <= current_wm {
-            if start.saturating_add(self.pane_interval_ms) > previous_wm {
-                panes.push(start);
-            }
-            start = start.saturating_add(self.pane_interval_ms);
-        }
-        panes
-    }
-
-    /// Return all window starts whose window `[start, start + window_size_ms)`
-    /// contains the given timestamp. For tumbling windows this returns exactly
-    /// one start; for sliding windows it returns `ceil(window_size / slide)`
-    /// starts.
-    pub fn window_starts_containing(&self, timestamp_ms: i64) -> Vec<i64> {
-        let mut starts = Vec::new();
-        let mut start = self.window_start_for(timestamp_ms);
-        while start + self.window_size_ms > timestamp_ms {
-            starts.push(start);
-            start -= self.slide_interval_ms;
-        }
-        starts
-    }
-
-    /// Return the window `[start, end)` boundaries for a given window start.
-    pub fn window_bounds(&self, window_start: i64) -> (i64, i64) {
-        (window_start, window_start + self.window_size_ms)
-    }
-
-    pub fn pane_bounds(&self, pane_start: i64) -> (i64, i64) {
-        (pane_start, pane_start + self.pane_interval_ms)
-    }
-
-    /// Slide interval accessor.
-    pub fn slide_interval_ms(&self) -> i64 {
-        self.slide_interval_ms
-    }
-
-    /// Pane start for a timestamp. Panes are aligned to the slide_interval grid,
-    /// which is the same grid as `window_start_for`.
-    pub fn pane_start_for(&self, timestamp_ms: i64) -> i64 {
-        let origin = self.origin_ms.unwrap_or(0);
-        origin + (timestamp_ms - origin).div_euclid(self.pane_interval_ms) * self.pane_interval_ms
-    }
-
-    #[cfg(test)]
-    /// All pane starts composing a window, in ascending order.
-    /// A window `[ws, ws + window_size)` is composed of
-    /// `window_size / slide_interval` consecutive panes.
-    pub fn panes_for_window(&self, window_start: i64) -> Vec<i64> {
-        let num_panes = self.window_size_ms / self.pane_interval_ms;
-        (0..num_panes)
-            .map(|i| window_start + i * self.pane_interval_ms)
-            .collect()
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    // Storage timestamps are unsigned: never admit windows the sink cannot publish.
-    #[test]
-    fn full_window_storage_starts_stay_in_the_storage_time_domain() {
-        let manager = WindowManager::with_layout(
-            5,
-            1,
-            Some(0),
-            &asap_types::WindowMaterializationLayout::FullWindow,
-        );
-        assert_eq!(manager.stored_bucket_starts(999), vec![0]);
-    }
-
-    #[test]
-    fn stored_bucket_assignment_distinguishes_full_windows_from_base_panes() {
-        // Admission and execution need the stored extent, not only slide cadence.
-        let full = WindowManager::with_layout(
-            10,
-            5,
-            Some(1_000),
-            &asap_types::WindowMaterializationLayout::FullWindow,
-        );
-        let mut starts = full.stored_bucket_starts(7_000);
-        starts.sort_unstable();
-        assert_eq!(starts, vec![1_000, 6_000]);
-        assert_eq!(full.stored_bucket_bounds(1_000), (1_000, 11_000));
-        let panes = WindowManager::with_layout(
-            10,
-            5,
-            Some(1_000),
-            &asap_types::WindowMaterializationLayout::Pane { pane_secs: 1 },
-        );
-        assert_eq!(panes.stored_bucket_starts(7_000), vec![7_000]);
-        assert_eq!(panes.stored_bucket_bounds(7_000), (7_000, 8_000));
-    }
-
-    #[test]
-    fn test_tumbling_window_start() {
-        // 60-second (60000ms) tumbling windows
-        let wm = WindowManager::new(60, 0);
-
-        assert_eq!(wm.window_start_for(0), 0);
-        assert_eq!(wm.window_start_for(59_999), 0);
-        assert_eq!(wm.window_start_for(60_000), 60_000);
-        assert_eq!(wm.window_start_for(119_999), 60_000);
-        assert_eq!(wm.window_start_for(120_000), 120_000);
-    }
-
-    #[test]
-    fn planned_origin_aligns_repeated_event_time_queries() {
-        let windows = WindowManager::with_origin(5, 5, Some(27_000));
-        assert_eq!(windows.window_start_for(27_000), 27_000);
-        assert_eq!(windows.window_start_for(57_000), 57_000);
-        assert_eq!(windows.window_start_for(21_657_000), 21_657_000);
-    }
-
-    #[test]
-    fn test_no_closed_windows_on_first_sample() {
-        let wm = WindowManager::new(60, 0);
-        let closed = wm.closed_windows(i64::MIN, 30_000);
-        assert!(closed.is_empty());
-    }
-
-    #[test]
-    fn test_tumbling_window_close() {
-        // 60s tumbling windows
-        let wm = WindowManager::new(60, 0);
-
-        // Watermark advances from 30_000 to 70_000
-        // Window [0, 60_000) closes when wm >= 60_000
-        let closed = wm.closed_windows(30_000, 70_000);
-        assert_eq!(closed, vec![0]);
-    }
-
-    #[test]
-    fn test_multiple_window_closes() {
-        // 10s (10000ms) tumbling windows
-        let wm = WindowManager::new(10, 0);
-
-        // Watermark jumps from 5_000 to 35_000 — closes windows 0, 10_000, 20_000
-        let closed = wm.closed_windows(5_000, 35_000);
-        assert_eq!(closed, vec![0, 10_000, 20_000]);
-    }
-
-    #[test]
-    fn sliding_materialization_closes_each_non_overlapping_pane_once() {
-        let wm = WindowManager::new(30, 10);
-        assert_eq!(
-            wm.closed_panes(15_000, 45_000),
-            vec![10_000, 20_000, 30_000]
-        );
-        assert_eq!(wm.pane_bounds(20_000), (20_000, 30_000));
-    }
-
-    #[test]
-    fn physical_pane_width_is_independent_of_query_slide() {
-        let wm = WindowManager::with_layout(
-            60,
-            30,
-            Some(0),
-            &asap_types::WindowMaterializationLayout::Pane { pane_secs: 10 },
-        );
-        assert_eq!(wm.pane_start_for(29_999), 20_000);
-        assert_eq!(wm.pane_bounds(20_000), (20_000, 30_000));
-        assert_eq!(
-            wm.panes_for_window(0),
-            vec![0, 10_000, 20_000, 30_000, 40_000, 50_000]
-        );
-        assert_eq!(wm.closed_panes(15_000, 35_000), vec![10_000, 20_000]);
-    }
-
-    #[test]
-    fn test_no_close_when_watermark_stagnant() {
-        let wm = WindowManager::new(60, 0);
-        let closed = wm.closed_windows(30_000, 30_000);
-        assert!(closed.is_empty());
-    }
-
-    #[test]
-    fn test_window_bounds() {
-        let wm = WindowManager::new(60, 0);
-        assert_eq!(wm.window_bounds(0), (0, 60_000));
-        assert_eq!(wm.window_bounds(60_000), (60_000, 120_000));
-    }
-
-    #[test]
-    fn test_sliding_window() {
-        // 30s window, 10s slide
-        let wm = WindowManager::new(30, 10);
-
-        assert_eq!(wm.window_start_for(0), 0);
-        assert_eq!(wm.window_start_for(9_999), 0);
-        assert_eq!(wm.window_start_for(10_000), 10_000);
-
-        // Watermark advances from 15_000 to 35_000
-        // Window [0, 30_000) closes at wm=30_000 (was open at 15_000)
-        let closed = wm.closed_windows(15_000, 35_000);
-        assert_eq!(closed, vec![0]);
-    }
-
-    #[test]
-    fn test_window_starts_containing_tumbling() {
-        // 60s tumbling windows — each sample belongs to exactly one window
-        let wm = WindowManager::new(60, 0);
-        let mut starts = wm.window_starts_containing(15_000);
-        starts.sort();
-        assert_eq!(starts, vec![0]);
-
-        let mut starts = wm.window_starts_containing(60_000);
-        starts.sort();
-        assert_eq!(starts, vec![60_000]);
-    }
-
-    #[test]
-    fn test_window_starts_containing_sliding() {
-        // 30s window, 10s slide — each sample belongs to 3 windows
-        let wm = WindowManager::new(30, 10);
-
-        // t=15_000 belongs to [0, 30_000), [10_000, 40_000)
-        // and [-10_000, 20_000) which starts negative — still returned
-        let mut starts = wm.window_starts_containing(15_000);
-        starts.sort();
-        assert_eq!(starts, vec![-10_000, 0, 10_000]);
-
-        // t=30_000 belongs to [10_000, 40_000), [20_000, 50_000), [30_000, 60_000)
-        let mut starts = wm.window_starts_containing(30_000);
-        starts.sort();
-        assert_eq!(starts, vec![10_000, 20_000, 30_000]);
-    }
-
-    // --- Pane method tests ---
-
-    #[test]
-    fn test_pane_start_for_equals_window_start_for() {
-        // Pane start and window start use the same slide-aligned grid
-        let wm = WindowManager::new(30, 10);
-        for ts in [0, 5_000, 9_999, 10_000, 15_000, 25_000, 30_000] {
-            assert_eq!(wm.pane_start_for(ts), wm.window_start_for(ts));
-        }
-    }
-
-    #[test]
-    fn test_panes_for_window_sliding() {
-        // 30s window, 10s slide → 3 panes per window
-        let wm = WindowManager::new(30, 10);
-
-        assert_eq!(wm.panes_for_window(0), vec![0, 10_000, 20_000]);
-        assert_eq!(wm.panes_for_window(10_000), vec![10_000, 20_000, 30_000]);
-        assert_eq!(wm.panes_for_window(20_000), vec![20_000, 30_000, 40_000]);
-    }
-
-    #[test]
-    fn test_panes_for_window_tumbling_degeneration() {
-        // 60s tumbling window → 1 pane per window (no merges needed)
-        let wm = WindowManager::new(60, 0);
-
-        assert_eq!(wm.panes_for_window(0), vec![0]);
-        assert_eq!(wm.panes_for_window(60_000), vec![60_000]);
-    }
-
-    #[test]
-    fn test_slide_interval_ms_accessor() {
-        let wm_tumbling = WindowManager::new(60, 0);
-        assert_eq!(wm_tumbling.slide_interval_ms(), 60_000);
-
-        let wm_sliding = WindowManager::new(30, 10);
-        assert_eq!(wm_sliding.slide_interval_ms(), 10_000);
-    }
-
-    #[test]
-    fn test_panes_for_window_count() {
-        // W = window_size / slide_interval
-        let wm = WindowManager::new(30, 10);
-        assert_eq!(wm.panes_for_window(0).len(), 3); // 30/10 = 3
-
-        let wm2 = WindowManager::new(50, 10);
-        assert_eq!(wm2.panes_for_window(0).len(), 5); // 50/10 = 5
-
-        let wm3 = WindowManager::new(60, 0);
-        assert_eq!(wm3.panes_for_window(0).len(), 1); // tumbling = 1
-    }
-
-    #[test]
-    fn test_consecutive_windows_share_panes() {
-        // 30s window, 10s slide — consecutive windows share W-1 = 2 panes
-        let wm = WindowManager::new(30, 10);
-
-        let panes_a = wm.panes_for_window(0); // [0, 10_000, 20_000]
-        let panes_b = wm.panes_for_window(10_000); // [10_000, 20_000, 30_000]
-
-        // Shared panes: 10_000 and 20_000
-        let shared: Vec<i64> = panes_a
-            .iter()
-            .filter(|p| panes_b.contains(p))
-            .copied()
-            .collect();
-        assert_eq!(shared, vec![10_000, 20_000]);
-    }
-}
diff --git a/data_plane/src/precompute_engine/worker.rs b/data_plane/src/precompute_engine/worker.rs
deleted file mode 100644
index 5d71f6645..000000000
--- a/data_plane/src/precompute_engine/worker.rs
+++ /dev/null
@@ -1,4729 +0,0 @@
-use crate::precompute_engine::config::LateDataPolicy;
-use crate::precompute_engine::group_key::GroupKey;
-use crate::precompute_engine::metrics::record_late_input;
-use crate::precompute_engine::output_sink::OutputSink;
-use crate::precompute_engine::series_router::WorkerMessage;
-use crate::precompute_engine::window_manager::WindowManager;
-use crate::storage_engines::types::{
-    AggregateCore, InstalledPrecomputePlanHandle, KeyByLabelValues, PrecomputedOutput,
-};
-#[cfg(test)]
-use crate::tests::accumulator_fixture::create_fixture_accumulator;
-use asap_physical_operators::factory::AccumulatorUpdater;
-use asap_physical_operators::summary_kernels::sum::SumAccumulator;
-use asap_types::aggregation_config::PrecomputeMaterialization;
-use asap_types::PolicyFingerprint;
-use asap_types::SampleUpdateRule;
-use std::collections::{BTreeMap, HashMap};
-// (PolicyFingerprint is used for both `PolicyFingerprint::from_config(...)`
-//  on the emit path and the `policy_fp` field of GroupState below.)
-use std::sync::atomic::{AtomicI64, AtomicUsize, Ordering};
-use std::sync::Arc;
-use tokio::sync::mpsc;
-use tracing::{debug, debug_span, info, warn};
-
-/// Per-bucket aggregation state: window manager + active pane accumulators.
-///
-/// B7.6 (schema-retirement #5): one `GroupState` per `sid`, where `sid` is
-/// the registry-allocated identity for `(metric, attrs, agg_kind)`. The
-/// legacy `(agg_id, group_key)` tuple folds into this single u64 — the
-/// grouping label values participate in `attrs`, and the source policy
-/// participates in `agg_kind`, so distinct buckets always carry distinct
-/// sids. `policy_fp` and `group_key` are held here so the worker can
-/// recover the source config (for window shape / late-data policy) and
-/// the emit-time `KeyByLabelValues` without re-parsing the sid.
-///
-/// All raw series sharing the same sid feed into the same accumulator,
-/// producing one output per (sid, window) — exactly like Arroyo's
-/// `GROUP BY window, key`.
-struct GroupState {
-    program: Option<Arc<super::raw_dag::RawDagProgram>>,
-    series_id: u64,
-    stored_output_reference: Option<asap_types::sds::StoredOutputReference>,
-    catalog_generation: Option<Arc<asap_types::sds::CatalogGeneration>>,
-    input_revisions: BTreeMap<i64, Arc<crate::storage_engines::types::SummaryInputRevision>>,
-    config: Arc<PrecomputeMaterialization>,
-    /// Source policy fingerprint that minted this sid. Held so
-    /// `evict_orphaned_groups` can check liveness against the streaming
-    /// config snapshot (a sid stays alive only while its source policy is
-    /// still configured), and so the worker can re-derive the
-    /// `PolicyFingerprint` on the emit path without a second config
-    /// fingerprint pass.
-    policy_fp: PolicyFingerprint,
-    /// Grouping label values joined by semicolons. Held so the emit path
-    /// can render the output's `KeyByLabelValues` without consulting the
-    /// sid → attrs reverse mapping. Format matches the input messages'
-    /// `group_key` field.
-    group_key: Arc<GroupKey>,
-    window_manager: WindowManager,
-    /// Active panes for raw-sample accumulation, keyed by pane_start_ms.
-    active_panes: BTreeMap<i64, Box<dyn AccumulatorUpdater>>,
-    /// Last cumulative counter sample per source series for heap membership
-    /// materializations. This is bounded O(series) derivative state, not a
-    /// raw-sample history, and deliberately survives pane rotation.
-    counter_previous: HashMap<String, (i64, f64)>,
-    /// Active panes for pre-built accumulator inputs (e.g. OTLP-delivered
-    /// sketches), keyed by pane_start_ms. Each entry is the running merge
-    /// of every accumulator that landed in that pane's time range. Kept
-    /// separate from `active_panes` because sketches come in as opaque
-    /// `Box<dyn AggregateCore>` objects and do not share the updater
-    /// machinery used for incremental sample updates.
-    sketch_panes: BTreeMap<i64, Box<dyn AggregateCore>>,
-    /// Maximum event timestamp actually observed from input for this group.
-    /// Periodic flushes never modify this value.
-    max_event_time_ms: i64,
-    /// Monotonic watermark through which windows have already been closed.
-    /// This is separate from observed event time because wall-clock policies
-    /// may close a window without manufacturing a later input timestamp.
-    closure_watermark_ms: i64,
-    /// First and latest wall-clock input times for each open pane. The former
-    /// enforces an absolute lifetime; the latter supports idle closure.
-    pane_wall_clock: BTreeMap<i64, PaneWallClock>,
-}
-
-#[derive(Clone, Copy)]
-struct PaneWallClock {
-    first_touch_ms: i64,
-    last_touch_ms: i64,
-}
-
-impl GroupState {
-    fn stores_full_windows(&self) -> bool {
-        matches!(
-            self.config.window_layout,
-            asap_types::WindowMaterializationLayout::FullWindow
-        )
-    }
-
-    fn bucket_starts_for(&self, timestamp_ms: i64) -> Vec<i64> {
-        self.window_manager.stored_bucket_starts(timestamp_ms)
-    }
-
-    fn closed_buckets(&self, previous_ms: i64, current_ms: i64) -> Vec<i64> {
-        if self.stores_full_windows() {
-            self.window_manager.closed_windows(previous_ms, current_ms)
-        } else {
-            self.window_manager.closed_panes(previous_ms, current_ms)
-        }
-    }
-
-    fn bucket_bounds(&self, start_ms: i64) -> (i64, i64) {
-        self.window_manager.stored_bucket_bounds(start_ms)
-    }
-
-    fn touch_pane(&mut self, pane_start_ms: i64, now_ms: i64) {
-        self.pane_wall_clock
-            .entry(pane_start_ms)
-            .and_modify(|clock| clock.last_touch_ms = now_ms)
-            .or_insert(PaneWallClock {
-                first_touch_ms: now_ms,
-                last_touch_ms: now_ms,
-            });
-    }
-
-    fn prune_pane_wall_clock(&mut self) {
-        let active = &self.active_panes;
-        let sketch = &self.sketch_panes;
-        self.pane_wall_clock
-            .retain(|ps, _| active.contains_key(ps) || sketch.contains_key(ps));
-        self.input_revisions
-            .retain(|ps, _| active.contains_key(ps) || sketch.contains_key(ps));
-    }
-}
-
-/// Runtime configuration for a Worker, grouping non-structural parameters.
-pub struct WorkerRuntimeConfig {
-    pub max_buffer_per_series: usize,
-    pub allowed_lateness_ms: i64,
-    pub pass_raw_samples: bool,
-    pub raw_mode_aggregation_id: u64,
-    pub late_data_policy: LateDataPolicy,
-    pub wall_clock_idle_grace_period_ms: i64,
-    pub wall_clock_max_open_grace_period_ms: i64,
-}
-
-/// Worker that processes samples for a shard of the sid space.
-///
-/// Unlike the old per-series design, this worker maintains accumulators
-/// keyed by `sid` (B7.6 — was `(agg_id, group_key)`). Multiple raw series
-/// with the same grouping label values share a single accumulator,
-/// producing one merged output per window — matching Arroyo's `GROUP BY`
-/// semantics. The grouping label values participate in the sid via the
-/// `(metric, attrs_fingerprint, agg_kind_canonical)` identity contract on
-/// `SeriesIdResolver`, so one sid uniquely names one bucket.
-pub struct Worker {
-    maintenance_storage: Option<(
-        Arc<crate::storage_engines::sketch_db::index::SketchStore>,
-        Arc<crate::drivers::ingest::series_resolver::SeriesIdResolver>,
-    )>,
-    erp_observer: Option<Arc<super::erp_observer::RuntimeErpObserver>>,
-    current_input_revision: Option<Arc<crate::storage_engines::types::SummaryInputRevision>>,
-    current_catalog_generation: Option<Arc<asap_types::sds::CatalogGeneration>>,
-    id: usize,
-    receiver: mpsc::Receiver<WorkerMessage>,
-    output_sink: Arc<dyn OutputSink>,
-    /// Map from sid to per-bucket state. One entry per active sid this
-    /// worker shard owns.
-    group_states: HashMap<u64, GroupState>,
-    /// Hot-reload handle — workers read config directly from ArcSwap
-    /// instead of holding a local copy. All components see the same
-    /// config at the same time.
-    hot_reload: InstalledPrecomputePlanHandle,
-    /// Allowed lateness in ms.
-    allowed_lateness_ms: i64,
-    /// When true, skip aggregation and pass raw samples through.
-    pass_raw_samples: bool,
-    /// Aggregation ID stamped on each raw-mode output.
-    raw_mode_aggregation_id: u64,
-    /// Policy for handling late samples that arrive after their window has closed.
-    late_data_policy: LateDataPolicy,
-    /// This worker's maximum observed event-time watermark, exposed only for
-    /// diagnostics. It is never propagated into another group's closure state.
-    worker_watermark: Arc<AtomicI64>,
-    /// Externally-readable group count for diagnostics.
-    group_count: Arc<AtomicUsize>,
-    wall_clock_idle_grace_period_ms: i64,
-    wall_clock_max_open_grace_period_ms: i64,
-    /// Injectable clock returning current wall-clock time in milliseconds
-    /// since the unix epoch. Production uses `SystemTime::now`; tests
-    /// override with a deterministic fake. The closure runs under
-    /// `&mut self` only on `flush_all` and pane creation, so a single
-    /// non-`Sync` cell behind a mutex is fine — but we keep the bound
-    /// `Send + Sync` for clarity since `Worker` itself is `Send`.
-    now_ms_fn: Box<dyn Fn() -> i64 + Send + Sync>,
-}
-
-impl Worker {
-    pub fn set_maintenance_storage(
-        &mut self,
-        store: Arc<crate::storage_engines::sketch_db::index::SketchStore>,
-        resolver: Arc<crate::drivers::ingest::series_resolver::SeriesIdResolver>,
-    ) {
-        self.maintenance_storage = Some((store, resolver));
-    }
-
-    fn complete_dag(
-        &self,
-        plan: &crate::storage_engines::types::RuntimePhysicalPlan,
-    ) -> Result<(), String> {
-        if !plan
-            .precompute_plan
-            .materializations
-            .iter()
-            .any(|output| output.derived_input.is_some())
-        {
-            return Ok(());
-        }
-        // The installed locality proof assigns derived graphs to one owner.
-        // Every raw input of this graph was routed to that same worker.
-        if plan.installed_precompute_plan.partitioning
-            != super::partitioning::DagPartitioning::SingleWorker
-        {
-            return Err("derived DAG has no validated local partitioning rule".into());
-        }
-        if self.id != 0 {
-            return Ok(());
-        }
-        let (store, resolver) = self
-            .maintenance_storage
-            .as_ref()
-            .ok_or("worker has no maintenance storage bindings")?;
-        super::maintenance_runtime::execute_finite_maintenance(
-            store,
-            resolver,
-            &plan.precompute_plan,
-        )
-        .map_err(|error| error.to_string())
-    }
-
-    pub fn set_erp_observer(
-        &mut self,
-        observer: Option<Arc<super::erp_observer::RuntimeErpObserver>>,
-    ) {
-        self.erp_observer = observer;
-    }
-    #[allow(clippy::too_many_arguments)]
-    pub fn new(
-        id: usize,
-        receiver: mpsc::Receiver<WorkerMessage>,
-        output_sink: Arc<dyn OutputSink>,
-        hot_reload: InstalledPrecomputePlanHandle,
-        runtime_config: WorkerRuntimeConfig,
-        group_count: Arc<AtomicUsize>,
-        worker_watermark: Arc<AtomicI64>,
-    ) -> Self {
-        let WorkerRuntimeConfig {
-            max_buffer_per_series: _,
-            allowed_lateness_ms,
-            pass_raw_samples,
-            raw_mode_aggregation_id,
-            late_data_policy,
-            wall_clock_idle_grace_period_ms,
-            wall_clock_max_open_grace_period_ms,
-        } = runtime_config;
-        Self {
-            maintenance_storage: None,
-            erp_observer: None,
-            current_input_revision: None,
-            current_catalog_generation: None,
-            id,
-            receiver,
-            output_sink,
-            group_states: HashMap::new(),
-            hot_reload,
-            allowed_lateness_ms,
-            pass_raw_samples,
-            raw_mode_aggregation_id,
-            late_data_policy,
-            worker_watermark,
-            group_count,
-            wall_clock_idle_grace_period_ms,
-            wall_clock_max_open_grace_period_ms,
-            now_ms_fn: Box::new(default_now_ms),
-        }
-    }
-
-    /// Test/diagnostic-only setter for the wall-clock source. Replaces
-    /// the default `SystemTime::now`-backed clock with a deterministic
-    /// fake so unit tests can drive the wall-clock fallback in
-    /// `flush_all` without `std::thread::sleep`. Production code never
-    /// calls this.
-    #[cfg(test)]
-    pub fn set_now_ms_fn(&mut self, f: Box<dyn Fn() -> i64 + Send + Sync>) {
-        self.now_ms_fn = f;
-    }
-
-    /// Run the worker loop. Blocks until shutdown.
-    pub async fn run(mut self) {
-        info!("Worker {} started", self.id);
-
-        let mut processing_error: Option<String> = None;
-        while let Some(msg) = self.receiver.recv().await {
-            // A failed execution cannot publish a later batch or hide failure
-            // behind a successful drain. The engine must be restarted explicitly.
-            if let Some(error) = &processing_error {
-                match msg {
-                    WorkerMessage::Drain(reply) | WorkerMessage::CompleteDag { reply, .. } => {
-                        let _ = reply.send(Err(error.clone()));
-                    }
-                    WorkerMessage::Shutdown => break,
-                    _ => {}
-                }
-                continue;
-            }
-            let msg = match msg {
-                WorkerMessage::BoundInput {
-                    input,
-                    generation,
-                    revision,
-                } => {
-                    if revision
-                        .as_ref()
-                        .is_some_and(|receipt| receipt.generation != generation)
-                    {
-                        processing_error =
-                            Some("input receipt differs from captured generation".into());
-                        self.receiver.close();
-                        continue;
-                    }
-                    self.current_catalog_generation = Some(generation);
-                    self.current_input_revision = revision;
-                    *input
-                }
-                message => {
-                    self.current_input_revision = None;
-                    self.current_catalog_generation = None;
-                    message
-                }
-            };
-            match msg {
-                WorkerMessage::BoundInput { .. } => {
-                    processing_error = Some("nested admission receipt".into());
-                }
-                WorkerMessage::GroupSamples {
-                    sid,
-                    policy_fp,
-                    group_key,
-                    samples,
-                    ingest_received_at,
-                } => {
-                    let sample_count = samples.len();
-                    let _span = debug_span!(
-                        "worker_process_group",
-                        worker_id = self.id,
-                        sid,
-                        policy_fp = %policy_fp,
-                        group = %group_key,
-                        sample_count,
-                    )
-                    .entered();
-                    if let Err(e) = self.process_group_samples(sid, policy_fp, &group_key, samples)
-                    {
-                        processing_error = Some(e.to_string());
-                        warn!(
-                            "Worker {} error processing sid={} (policy_fp={}, group={}): {}",
-                            self.id, sid, policy_fp, group_key, e
-                        );
-                    }
-                    debug!(
-                        e2e_latency_us = ingest_received_at.elapsed().as_micros() as u64,
-                        "e2e: ingest->worker complete"
-                    );
-                }
-                WorkerMessage::RawSamples {
-                    series_key,
-                    samples,
-                    ingest_received_at,
-                } => {
-                    let _span = debug_span!(
-                        "worker_process_raw",
-                        worker_id = self.id,
-                        series = %series_key,
-                        sample_count = samples.len(),
-                    )
-                    .entered();
-                    if let Err(e) = self.process_samples_raw(&series_key, samples) {
-                        processing_error = Some(e.to_string());
-                        warn!("Worker {} raw error for {}: {}", self.id, series_key, e);
-                    }
-                    debug!(
-                        e2e_latency_us = ingest_received_at.elapsed().as_micros() as u64,
-                        "e2e: ingest->worker complete (raw)"
-                    );
-                }
-                WorkerMessage::AccumulatorInput {
-                    sid,
-                    policy_fp,
-                    group_key,
-                    timestamp_ms,
-                    accumulator,
-                    ingest_received_at,
-                } => {
-                    let _span = debug_span!(
-                        "worker_process_accumulator",
-                        worker_id = self.id,
-                        sid,
-                        policy_fp = %policy_fp,
-                        group = %group_key,
-                        timestamp_ms,
-                        accumulator_type = accumulator.type_name(),
-                    )
-                    .entered();
-                    if let Err(e) = self.process_accumulator_input(
-                        sid,
-                        policy_fp,
-                        &group_key,
-                        timestamp_ms,
-                        accumulator,
-                    ) {
-                        processing_error = Some(e.to_string());
-                        warn!(
-                            "Worker {} accumulator input error for sid={} (policy_fp={}, group={}): {}",
-                            self.id, sid, policy_fp, group_key, e
-                        );
-                    }
-                    debug!(
-                        e2e_latency_us = ingest_received_at.elapsed().as_micros() as u64,
-                        "e2e: ingest->worker complete (accumulator)"
-                    );
-                }
-                WorkerMessage::Flush => {
-                    if let Err(e) = self.flush_all() {
-                        processing_error = Some(e.to_string());
-                        warn!("Worker {} flush error: {}", self.id, e);
-                    }
-                    // Evict orphaned GroupStates whose agg_id has been
-                    // removed from the config. Panes that still have
-                    // data are kept until they drain (flush_all already
-                    // closed their windows); empty ones are freed.
-                    self.evict_orphaned_groups();
-                }
-                WorkerMessage::Drain(reply) => {
-                    let result = self.force_close_all().map_err(|e| e.to_string());
-                    if let Err(error) = &result {
-                        processing_error = Some(error.clone());
-                    }
-                    if processing_error.is_some() {
-                        self.receiver.close();
-                    }
-                    let _ = reply.send(processing_error.clone().map_or(Ok(()), Err));
-                }
-                WorkerMessage::CompleteDag { plan, reply } => {
-                    let result = match &processing_error {
-                        Some(error) => Err(error.clone()),
-                        None => self.complete_dag(&plan),
-                    };
-                    if let Err(error) = &result {
-                        processing_error = Some(error.clone());
-                    }
-                    if processing_error.is_some() {
-                        self.receiver.close();
-                    }
-                    let _ = reply.send(result);
-                }
-                WorkerMessage::Shutdown => {
-                    info!("Worker {} shutting down", self.id);
-                    if let Err(e) = self.flush_all() {
-                        warn!("Worker {} final flush error: {}", self.id, e);
-                        self.receiver.close();
-                        break;
-                    }
-                    // Force-close any windows still open after the final flush.
-                    // The wall-clock fallback may not yet be due for a one-shot
-                    // batch, so the trailing window can remain open. No more
-                    // samples will arrive after shutdown; close every pane.
-                    if let Err(e) = self.force_close_all() {
-                        warn!("Worker {} shutdown force-close error: {}", self.id, e);
-                    }
-                    break;
-                }
-            }
-            if processing_error.is_some() {
-                // Reject new queue reservations; otherwise ingestion could
-                // acknowledge data that this failed worker will never execute.
-                self.receiver.close();
-            }
-        }
-
-        info!(
-            "Worker {} stopped, {} active groups",
-            self.id,
-            self.group_states.len()
-        );
-    }
-
-    /// Get or create the GroupState for a sid.
-    ///
-    /// B7.6 — buckets are now keyed by `sid` (a single u64) rather than
-    /// `(agg_id, group_key)`. `policy_fp` is the source config's
-    /// fingerprint, used to fetch the `PrecomputeMaterialization` from the
-    /// hot-reload snapshot the first time we see this sid; `group_key` is
-    /// remembered on the `GroupState` for emit-time label rendering.
-    ///
-    /// Reads config directly from the `InstalledPrecomputePlanHandle`
-    /// ArcSwap handle, so new policies from a config swap are visible
-    /// immediately — no message passing, no delay.
-    /// Returns None if `policy_fp` has no matching config (e.g. arrived
-    /// after the policy was retired).
-    fn get_or_create_group_state(
-        &mut self,
-        sid: u64,
-        policy_fp: PolicyFingerprint,
-        group_key: &Arc<GroupKey>,
-    ) -> Result<Option<&mut GroupState>, String> {
-        if !self.group_states.contains_key(&sid) {
-            let snap = self.hot_reload.snapshot();
-            let Some(cfg) = snap.get_aggregation_config(policy_fp.into()) else {
-                return Ok(None);
-            };
-            let program = snap.raw_programs.get(&policy_fp.as_u64()).cloned();
-            let config = Arc::new(cfg.clone());
-            let gs = GroupState {
-                program,
-                series_id: sid,
-                stored_output_reference: snap.stored_output_reference(policy_fp.into()),
-                catalog_generation: self.current_catalog_generation.clone(),
-                input_revisions: BTreeMap::new(),
-                window_manager: WindowManager::with_layout(
-                    config.window_size,
-                    config.slide_interval,
-                    config.pane_origin_ms,
-                    &config.window_layout,
-                ),
-                config,
-                policy_fp,
-                group_key: Arc::clone(group_key),
-                active_panes: BTreeMap::new(),
-                counter_previous: HashMap::new(),
-                sketch_panes: BTreeMap::new(),
-                max_event_time_ms: i64::MIN,
-                closure_watermark_ms: i64::MIN,
-                pane_wall_clock: BTreeMap::new(),
-            };
-            self.group_states.insert(sid, gs);
-            self.group_count
-                .store(self.group_states.len(), Ordering::Relaxed);
-        }
-        Ok(self.group_states.get_mut(&sid))
-    }
-
-    /// Process a batch of samples for a specific sid bucket.
-    /// All samples in the batch feed into the same shared accumulator.
-    ///
-    /// This is the core of the Arroyo-equivalent GROUP BY logic.
-    /// B7.6 — buckets are keyed by `sid`; `policy_fp` is the source
-    /// `PrecomputeMaterialization` fingerprint used to resolve the bucket's
-    /// config on first sight; `group_key` is held on the resulting
-    /// `GroupState` for emit-time label rendering.
-    pub fn process_group_samples(
-        &mut self,
-        sid: u64,
-        policy_fp: PolicyFingerprint,
-        group_key: &Arc<GroupKey>,
-        samples: Vec<(String, i64, f64)>, // (series_key, timestamp_ms, value)
-    ) -> Result<(), Box<dyn std::error::Error + Send + Sync>> {
-        let input_revision = self.current_input_revision.clone();
-        let worker_id = self.id;
-        let allowed_lateness_ms = self.allowed_lateness_ms;
-        let late_data_policy = self.late_data_policy;
-        let now_ms = (self.now_ms_fn)();
-
-        if self
-            .get_or_create_group_state(sid, policy_fp, group_key)?
-            .is_none()
-        {
-            warn!(
-                "Worker {} skipping samples for unknown policy_fp={} (sid={}, group_key={})",
-                self.id, policy_fp, sid, group_key
-            );
-            return Ok(());
-        }
-        let state = self.group_states.get_mut(&sid).unwrap();
-        #[cfg(not(test))]
-        if state.program.is_none() {
-            return Err("raw precompute requires an installed post-ASAP DAG producer".into());
-        }
-
-        // Keep original timestamps inside accumulators (notably rate/increase),
-        // shifting only pane membership and closure watermark for PromQL (a,b].
-        let right_closed = state
-            .config
-            .parameters
-            .get("promql_right_closed")
-            .and_then(serde_json::Value::as_bool)
-            .unwrap_or(false);
-        let pane_timestamp = |ts: i64| {
-            if right_closed {
-                ts.saturating_sub(1)
-            } else {
-                ts
-            }
-        };
-        // Find the timestamp span in this batch. A first batch may contain
-        // several windows (Prometheus commonly sends catch-up samples after
-        // startup), so its minimum timestamp is also the initial closure
-        // scan boundary.
-        let batch_min_ts = samples
-            .iter()
-            .map(|(_, ts, _)| pane_timestamp(*ts))
-            .min()
-            .unwrap_or(i64::MIN);
-        let batch_max_ts = samples
-            .iter()
-            .map(|(_, ts, _)| pane_timestamp(*ts))
-            .max()
-            .unwrap_or(i64::MIN);
-        let previous_event_time = state.max_event_time_ms;
-        let current_event_time = if batch_max_ts > previous_event_time {
-            batch_max_ts
-        } else {
-            previous_event_time
-        };
-        let event_watermark = watermark_for_event_time(current_event_time, allowed_lateness_ms);
-        let previous_closure_watermark = state.closure_watermark_ms;
-
-        let mut emit_batch: Vec<(PrecomputedOutput, Box<dyn AggregateCore>)> = Vec::new();
-
-        // The selected physical layout owns update fanout. Pane and rollup
-        // layouts update one non-overlapping base pane; FullWindow updates
-        // every overlapping semantic window that contains the sample.
-        for (series_key, ts, val) in &samples {
-            let too_late = previous_event_time != i64::MIN
-                && pane_timestamp(*ts)
-                    < watermark_for_event_time(previous_event_time, allowed_lateness_ms);
-            let value = if legacy_counter_delta(state) {
-                reset_aware_counter_delta(&mut state.counter_previous, series_key, *val, *ts)
-            } else {
-                Some(*val)
-            };
-            for bucket_start in state.bucket_starts_for(pane_timestamp(*ts)) {
-                if let Some(revision) = &input_revision {
-                    state
-                        .input_revisions
-                        .entry(bucket_start)
-                        .and_modify(|existing| {
-                            if existing.revision < revision.revision {
-                                let mut combined = (**revision).clone();
-                                combined.first_revision = existing.first_revision;
-                                *existing = Arc::new(combined);
-                            }
-                        })
-                        .or_insert_with(|| Arc::clone(revision));
-                }
-                let (_, bucket_end) = state.bucket_bounds(bucket_start);
-                let bucket_closed = !state.active_panes.contains_key(&bucket_start)
-                    && previous_closure_watermark >= bucket_end;
-
-                if too_late || bucket_closed {
-                    let window_start = bucket_start;
-                    let window_end = bucket_end;
-                    match late_data_policy {
-                        LateDataPolicy::Drop => {
-                            if let Some(input) = state.input_revisions.get_mut(&bucket_start) {
-                                Arc::make_mut(input).first_revision = 0;
-                            }
-                            record_late_input("drop", "raw_sample");
-                            debug!(
-                                "Worker {} dropping late sample for sid={} (group={}): \
-                             ts={} observed_event_time={} pane=[{}, {})",
-                                worker_id,
-                                sid,
-                                group_key,
-                                ts,
-                                previous_event_time,
-                                bucket_start,
-                                bucket_end
-                            );
-                            continue;
-                        }
-                        LateDataPolicy::ForwardToStore => {
-                            // A late cumulative sample cannot be converted to a
-                            // derivative without its time-adjacent neighbours.
-                            // Never feed the raw counter value into a membership
-                            // heap; the authoritative ExactCounter branch remains
-                            // responsible for the visible result.
-                            if legacy_counter_delta(state) {
-                                if let Some(input) = state.input_revisions.get_mut(&bucket_start) {
-                                    Arc::make_mut(input).first_revision = 0;
-                                }
-                                record_late_input("drop", "counter_delta_membership");
-                                continue;
-                            }
-                            record_late_input("append_correction", "raw_sample");
-                            let mut updater =
-                                installed_updater(state.program.as_deref(), &state.config)?;
-                            apply_installed_sample(
-                                state.program.as_deref(),
-                                &mut *updater,
-                                series_key,
-                                *val,
-                                *ts,
-                                &state.config,
-                            )?;
-                            if let (Some(observer), Some(revision)) =
-                                (&self.erp_observer, &input_revision)
-                            {
-                                observer.observe(
-                                    &revision.generation,
-                                    asap_types::sds::SummaryInstanceCoordinates {
-                                        stored_output_id: policy_fp.into(),
-                                        time_range: asap_types::sds::HalfOpenTimeRange {
-                                            start_ms: bucket_start,
-                                            end_ms: bucket_end,
-                                        },
-                                        group_values: group_key.as_population_labels(),
-                                    },
-                                    &state.config,
-                                    *ts,
-                                    *val,
-                                );
-                            }
-                            let key = build_group_key_label_values(group_key);
-                            let output = precomputed_output_for_group(
-                                window_start as u64,
-                                window_end as u64,
-                                key,
-                                PolicyFingerprint::from_config(&state.config),
-                                group_key,
-                                &state.input_revisions,
-                                state.series_id,
-                                state.catalog_generation.as_ref(),
-                                state.stored_output_reference.clone(),
-                            );
-                            emit_batch.push((output, updater.take_accumulator()));
-                            debug!(
-                                "Forwarding late sample to store for evicted pane [{}, {})",
-                                bucket_start, bucket_end
-                            );
-                            continue;
-                        }
-                    }
-                }
-
-                // Normal path: route sample to its single pane accumulator.
-                // Refresh the pane's wall-clock last-touch time so the fallback
-                // only closes an idle pane, not a long-running bulk ingest whose
-                // records share one event timestamp.
-                state.touch_pane(bucket_start, now_ms);
-                if let std::collections::btree_map::Entry::Vacant(entry) =
-                    state.active_panes.entry(bucket_start)
-                {
-                    entry.insert(installed_updater(state.program.as_deref(), &state.config)?);
-                }
-                let updater = state.active_panes.get_mut(&bucket_start).unwrap();
-                if let Some(value) = value {
-                    apply_installed_sample(
-                        state.program.as_deref(),
-                        &mut **updater,
-                        series_key,
-                        value,
-                        *ts,
-                        &state.config,
-                    )?;
-                    if let (Some(observer), Some(revision)) = (&self.erp_observer, &input_revision)
-                    {
-                        observer.observe(
-                            &revision.generation,
-                            asap_types::sds::SummaryInstanceCoordinates {
-                                stored_output_id: policy_fp.into(),
-                                time_range: asap_types::sds::HalfOpenTimeRange {
-                                    start_ms: bucket_start,
-                                    end_ms: bucket_end,
-                                },
-                                group_values: group_key.as_population_labels(),
-                            },
-                            &state.config,
-                            *ts,
-                            value,
-                        );
-                    }
-                }
-            }
-        }
-
-        // Check for closed windows
-        let closure_scan_start = if previous_closure_watermark == i64::MIN {
-            batch_min_ts
-        } else {
-            previous_closure_watermark
-        };
-        let closed = state.closed_buckets(closure_scan_start, event_watermark);
-
-        for window_start in &closed {
-            let (_, window_end) = state.bucket_bounds(*window_start);
-            let pane_starts = [*window_start];
-
-            if let Some(accumulator) = merge_panes_for_window(&mut state.active_panes, &pane_starts)
-            {
-                let key = build_group_key_label_values(group_key);
-                let output = precomputed_output_for_group(
-                    *window_start as u64,
-                    window_end as u64,
-                    key,
-                    PolicyFingerprint::from_config(&state.config),
-                    group_key,
-                    &state.input_revisions,
-                    state.series_id,
-                    state.catalog_generation.as_ref(),
-                    state.stored_output_reference.clone(),
-                );
-                emit_batch.push((output, accumulator));
-            }
-        }
-
-        state.max_event_time_ms = current_event_time;
-        if event_watermark > state.closure_watermark_ms {
-            state.closure_watermark_ms = event_watermark;
-        }
-        // A skipped admitted sample makes this coordinate incomplete, including
-        // corrections prepared earlier in this same batch.
-        for (output, _) in &mut emit_batch {
-            if state
-                .input_revisions
-                .get(&(output.start_timestamp as i64))
-                .is_some_and(|input| input.first_revision == 0)
-            {
-                if let Some(input) = &mut output.input_revision {
-                    Arc::make_mut(input).first_revision = 0;
-                }
-            }
-        }
-        state.prune_pane_wall_clock();
-
-        // Emit to output sink
-        if !emit_batch.is_empty() {
-            debug!(
-                "Worker {} emitting {} outputs for sid={} (group={})",
-                worker_id,
-                emit_batch.len(),
-                sid,
-                group_key
-            );
-            self.output_sink
-                .emit_batch(coalesce_admitted_outputs(emit_batch)?)?;
-        }
-
-        crate::precompute_engine::metrics::record_processed_updates(samples.len() as u64);
-        Ok(())
-    }
-
-    /// Process a pre-built accumulator (e.g. an OTLP-delivered sketch) for a
-    /// specific sid bucket's pane.
-    ///
-    /// The incoming accumulator is merged into `sketch_panes[pane_start]` via
-    /// `AggregateCore::merge_with`. If the pane is empty the accumulator is
-    /// installed as-is. If the pane's window has already closed, the late
-    /// data policy decides whether to drop it or forward it to the sink as
-    /// a standalone output so no data is silently lost.
-    ///
-    /// Unlike `process_group_samples`, this path does not touch
-    /// `active_panes` — sketches live in their own pane map and get merged
-    /// at window close (see `merge_sketch_panes_for_window`).
-    ///
-    /// `policy_fp` / `group_key` carry the same semantics as on
-    /// `process_group_samples` — policy lookup + emit-time label rendering.
-    pub fn process_accumulator_input(
-        &mut self,
-        sid: u64,
-        policy_fp: PolicyFingerprint,
-        group_key: &Arc<GroupKey>,
-        timestamp_ms: i64,
-        incoming: Box<dyn AggregateCore>,
-    ) -> Result<(), Box<dyn std::error::Error + Send + Sync>> {
-        let worker_id = self.id;
-        let allowed_lateness_ms = self.allowed_lateness_ms;
-        let late_data_policy = self.late_data_policy;
-        let now_ms = (self.now_ms_fn)();
-
-        if self
-            .get_or_create_group_state(sid, policy_fp, group_key)?
-            .is_none()
-        {
-            warn!(
-                "Worker {} skipping accumulator input for unknown policy_fp={} (sid={}, group_key={})",
-                self.id, policy_fp, sid, group_key
-            );
-            return Ok(());
-        }
-        let state = self.group_states.get_mut(&sid).unwrap();
-
-        let previous_event_time = state.max_event_time_ms;
-        let current_event_time = if timestamp_ms > previous_event_time {
-            timestamp_ms
-        } else {
-            previous_event_time
-        };
-        let event_watermark = watermark_for_event_time(current_event_time, allowed_lateness_ms);
-        let previous_closure_watermark = state.closure_watermark_ms;
-
-        let mut emit_batch: Vec<(PrecomputedOutput, Box<dyn AggregateCore>)> = Vec::new();
-
-        // Late-arrival check against the existing watermark.
-        let too_late = previous_event_time != i64::MIN
-            && timestamp_ms < watermark_for_event_time(previous_event_time, allowed_lateness_ms);
-        // A pre-built accumulator is already a materialized interval, not a
-        // point sample. Never duplicate its state across overlapping windows.
-        // Full-window producers stamp the corresponding slide boundary.
-        let bucket_starts = if state.stores_full_windows() {
-            vec![state.window_manager.window_start_for(timestamp_ms)]
-        } else {
-            state.bucket_starts_for(timestamp_ms)
-        };
-        let any_bucket_closed = bucket_starts.iter().any(|start| {
-            let (_, end) = state.bucket_bounds(*start);
-            !state.sketch_panes.contains_key(start) && previous_closure_watermark >= end
-        });
-
-        if too_late || any_bucket_closed {
-            match late_data_policy {
-                LateDataPolicy::Drop => {
-                    record_late_input("drop", "prebuilt_sketch");
-                    debug!(
-                        "Worker {} dropping late accumulator input for sid={} (group={}): ts={} watermark={}",
-                        worker_id, sid, group_key, timestamp_ms, previous_event_time
-                    );
-                }
-                LateDataPolicy::ForwardToStore => {
-                    record_late_input("append_correction", "prebuilt_sketch");
-                    for window_start in bucket_starts {
-                        let (_, window_end) = state.bucket_bounds(window_start);
-                        let key = build_group_key_label_values(group_key);
-                        let output = precomputed_output_for_group(
-                            window_start as u64,
-                            window_end as u64,
-                            key,
-                            PolicyFingerprint::from_config(&state.config),
-                            group_key,
-                            &state.input_revisions,
-                            state.series_id,
-                            state.catalog_generation.as_ref(),
-                            state.stored_output_reference.clone(),
-                        );
-                        emit_batch.push((output, incoming.clone_boxed_core()));
-                    }
-                    self.output_sink.emit_batch(emit_batch)?;
-                }
-            }
-            return Ok(());
-        }
-
-        // Refresh the pane's wall-clock last-touch time so an active sketch
-        // stream with a fixed event timestamp is not force-closed mid-ingest.
-        for bucket_start in bucket_starts {
-            state.touch_pane(bucket_start, now_ms);
-            match state.sketch_panes.remove(&bucket_start) {
-                Some(existing) => {
-                    let merged = existing
-                        .merge_with(incoming.as_ref())
-                        .map_err(|e| format!("merge_with failed for bucket {bucket_start}: {e}"))?;
-                    state.sketch_panes.insert(bucket_start, merged);
-                }
-                None => {
-                    state
-                        .sketch_panes
-                        .insert(bucket_start, incoming.clone_boxed_core());
-                }
-            }
-        }
-
-        // Check for closed windows and emit merged outputs.
-        let closed = state.closed_buckets(previous_closure_watermark, event_watermark);
-        for window_start in &closed {
-            let (_, window_end) = state.bucket_bounds(*window_start);
-            let pane_starts = [*window_start];
-
-            // Emit from the raw-sample pane map (in case both sources are
-            // populated for the same group; rare but supported).
-            if let Some(accumulator) = merge_panes_for_window(&mut state.active_panes, &pane_starts)
-            {
-                let key = build_group_key_label_values(group_key);
-                let output = precomputed_output_for_group(
-                    *window_start as u64,
-                    window_end as u64,
-                    key,
-                    PolicyFingerprint::from_config(&state.config),
-                    group_key,
-                    &state.input_revisions,
-                    state.series_id,
-                    state.catalog_generation.as_ref(),
-                    state.stored_output_reference.clone(),
-                );
-                emit_batch.push((output, accumulator));
-            }
-
-            // Emit from the sketch pane map.
-            if let Some(accumulator) =
-                merge_sketch_panes_for_window(&mut state.sketch_panes, &pane_starts)
-            {
-                let key = build_group_key_label_values(group_key);
-                let output = precomputed_output_for_group(
-                    *window_start as u64,
-                    window_end as u64,
-                    key,
-                    PolicyFingerprint::from_config(&state.config),
-                    group_key,
-                    &state.input_revisions,
-                    state.series_id,
-                    state.catalog_generation.as_ref(),
-                    state.stored_output_reference.clone(),
-                );
-                emit_batch.push((output, accumulator));
-            }
-        }
-
-        state.max_event_time_ms = current_event_time;
-        if event_watermark > state.closure_watermark_ms {
-            state.closure_watermark_ms = event_watermark;
-        }
-        state.prune_pane_wall_clock();
-
-        if !emit_batch.is_empty() {
-            debug!(
-                "Worker {} emitting {} sketch outputs for sid={} (group={})",
-                worker_id,
-                emit_batch.len(),
-                sid,
-                group_key
-            );
-            self.output_sink.emit_batch(emit_batch)?;
-        }
-
-        Ok(())
-    }
-
-    /// Raw fast-path: emit each sample as a standalone `SumAccumulator`.
-    pub fn process_samples_raw(
-        &self,
-        series_key: &str,
-        samples: Vec<(i64, f64)>,
-    ) -> Result<(), Box<dyn std::error::Error + Send + Sync>> {
-        let mut emit_batch: Vec<(PrecomputedOutput, Box<dyn AggregateCore>)> =
-            Vec::with_capacity(samples.len());
-
-        for (ts, val) in samples {
-            // Raw-mode outputs have no source policy. The sink drops
-            // `PolicyFingerprint::UNSET` outputs with a warning.
-            let output =
-                PrecomputedOutput::new(ts as u64, ts as u64, None, PolicyFingerprint::UNSET);
-            let _ = self.raw_mode_aggregation_id;
-            let accumulator = SumAccumulator::with_sum(val);
-            emit_batch.push((output, Box::new(accumulator)));
-        }
-
-        if !emit_batch.is_empty() {
-            debug!(
-                "Worker {} raw-emitting {} samples for {}",
-                self.id,
-                emit_batch.len(),
-                series_key
-            );
-            self.output_sink.emit_batch(emit_batch)?;
-        }
-
-        Ok(())
-    }
-
-    /// Flush all groups with cross-group watermark propagation.
-    ///
-    /// 1. Compute worker watermark = max(all group watermarks)
-    /// 2. Publish it for cross-worker reads
-    /// 3. Compute global watermark = min(all worker watermarks)
-    /// 4. Advance idle groups to the global watermark, closing due windows
-    ///
-    /// Remove GroupStates whose source policy is no longer in the
-    /// current config (i.e. the control plane removed the
-    /// aggregation). Liveness is checked against each bucket's stored
-    /// `policy_fp` — a sid stays alive only while its minting policy is
-    /// still configured. Buckets with non-empty panes are kept until
-    /// flush_all closes their windows; once both pane maps are empty,
-    /// the GroupState shell is freed.
-    fn evict_orphaned_groups(&mut self) {
-        let snap = self.hot_reload.snapshot();
-        let before = self.group_states.len();
-        self.group_states.retain(|&sid, gs| {
-            if snap.contains(gs.policy_fp.into()) {
-                return true; // policy still in config, keep
-            }
-            // Policy retired — keep only if there's residual data
-            // that flush_all hasn't drained yet.
-            let has_data = !gs.active_panes.is_empty() || !gs.sketch_panes.is_empty();
-            if !has_data {
-                debug!(
-                    "evicting orphaned bucket (sid={}, policy_fp={})",
-                    sid, gs.policy_fp
-                );
-            }
-            has_data
-        });
-        let after = self.group_states.len();
-        if before != after {
-            info!(
-                "Worker {} evicted {} orphaned buckets ({} → {})",
-                self.id,
-                before - after,
-                before,
-                after
-            );
-            self.group_count.store(after, Ordering::Relaxed);
-        }
-    }
-
-    fn flush_all(&mut self) -> Result<(), Box<dyn std::error::Error + Send + Sync>> {
-        if self.pass_raw_samples {
-            return Ok(());
-        }
-
-        let now_ms = (self.now_ms_fn)();
-        let idle_grace_ms = self.wall_clock_idle_grace_period_ms;
-        let max_open_grace_ms = self.wall_clock_max_open_grace_period_ms;
-
-        // Publish the largest observed event-time watermark for diagnostics.
-        // It must not be fed back into another group's closure decision: group
-        // timestamps are independent unless an explicit source barrier says
-        // otherwise.
-        let worker_wm = self
-            .group_states
-            .values()
-            .map(|s| watermark_for_event_time(s.max_event_time_ms, self.allowed_lateness_ms))
-            .filter(|&wm| wm != i64::MIN)
-            .max()
-            .unwrap_or(i64::MIN);
-        self.worker_watermark.store(worker_wm, Ordering::Release);
-
-        let mut emit_batch: Vec<(PrecomputedOutput, Box<dyn AggregateCore>)> = Vec::new();
-
-        for (&sid, state) in &mut self.group_states {
-            let _ = sid; // sid is the bucket key; group_key/policy_fp live on `state`
-            if state.max_event_time_ms == i64::MIN {
-                continue; // No samples received yet — no panes to close.
-            }
-            // group_key/policy_fp travelled in on the message and are
-            // stored on `state` so the emit path can reach them without
-            // re-keying the bucket. Clone so the body below can borrow
-            // `state` mutably for pane drains.
-            let group_key = state.group_key.clone();
-
-            // Start from this group's existing closure watermark. A timer tick
-            // alone must not advance event time.
-            let mut effective_wm = state.closure_watermark_ms;
-
-            // Wall-clock policy is independent of observed event time. Idle
-            // closure handles completed finite input; the optional first-touch
-            // deadline bounds freshness even for a continuously touched pane.
-            if idle_grace_ms > 0 || max_open_grace_ms > 0 {
-                let window_size_ms = state.window_manager.window_size_ms();
-                for (&pane_start, &clock) in &state.pane_wall_clock {
-                    let idle_due = idle_grace_ms > 0
-                        && now_ms.saturating_sub(clock.last_touch_ms)
-                            >= window_size_ms.saturating_add(idle_grace_ms);
-                    // An absolute close can be followed by more input for the
-                    // same event-time window. Enable it only when those inputs
-                    // are emitted as mergeable corrections.
-                    let deadline_due = self.late_data_policy == LateDataPolicy::ForwardToStore
-                        && max_open_grace_ms > 0
-                        && now_ms.saturating_sub(clock.first_touch_ms)
-                            >= window_size_ms.saturating_add(max_open_grace_ms);
-                    if idle_due || deadline_due {
-                        let force_to = pane_start.saturating_add(window_size_ms);
-                        if force_to > effective_wm {
-                            effective_wm = force_to;
-                        }
-                    }
-                }
-            }
-
-            let closed = state.closed_buckets(state.closure_watermark_ms, effective_wm);
-
-            for window_start in &closed {
-                let (_, window_end) = state.bucket_bounds(*window_start);
-                let pane_starts = [*window_start];
-
-                if let Some(accumulator) =
-                    merge_panes_for_window(&mut state.active_panes, &pane_starts)
-                {
-                    let key = build_group_key_label_values(&group_key);
-                    let output = precomputed_output_for_group(
-                        *window_start as u64,
-                        window_end as u64,
-                        key,
-                        PolicyFingerprint::from_config(&state.config),
-                        &group_key,
-                        &state.input_revisions,
-                        state.series_id,
-                        state.catalog_generation.as_ref(),
-                        state.stored_output_reference.clone(),
-                    );
-                    emit_batch.push((output, accumulator));
-                }
-
-                if let Some(accumulator) =
-                    merge_sketch_panes_for_window(&mut state.sketch_panes, &pane_starts)
-                {
-                    let key = build_group_key_label_values(&group_key);
-                    let output = precomputed_output_for_group(
-                        *window_start as u64,
-                        window_end as u64,
-                        key,
-                        PolicyFingerprint::from_config(&state.config),
-                        &group_key,
-                        &state.input_revisions,
-                        state.series_id,
-                        state.catalog_generation.as_ref(),
-                        state.stored_output_reference.clone(),
-                    );
-                    emit_batch.push((output, accumulator));
-                }
-            }
-
-            if effective_wm > state.closure_watermark_ms {
-                state.closure_watermark_ms = effective_wm;
-            }
-
-            state.prune_pane_wall_clock();
-        }
-
-        if !emit_batch.is_empty() {
-            debug!(
-                "Worker {} flush emitting {} outputs",
-                self.id,
-                emit_batch.len()
-            );
-            self.output_sink.emit_batch(emit_batch)?;
-        }
-
-        Ok(())
-    }
-
-    /// Force-close every window still open on shutdown.
-    ///
-    /// Unlike `flush_all` — which preserves observed event time and only applies
-    /// configured wall-clock closure — this emits every remaining pane because
-    /// no further samples will arrive once the engine is shutting down. Without
-    /// it, a one-shot batch whose records all fall in a single window (so event-time
-    /// never advances past the window end) would leave that window open forever
-    /// and never write it to the store. Covers both `active_panes` (sample
-    /// aggregation) and `sketch_panes` (OTLP-delivered sketches).
-    ///
-    /// To advance past the open windows we use a *finite* bound derived from
-    /// the largest open pane (`max_pane + window_size_ms`) rather than
-    /// `i64::MAX`: `WindowManager::closed_windows` enumerates window starts up
-    /// to `current_wm` one slide at a time, so passing `i64::MAX` would loop
-    /// ~`i64::MAX / slide` times and overflow. `max_pane + window_size_ms` is
-    /// the smallest watermark that closes the latest open window.
-    ///
-    /// Idempotent: closed panes are drained from both pane maps and their
-    /// wall-clock bookkeeping is pruned, so a second call emits nothing.
-    fn force_close_all(&mut self) -> Result<(), Box<dyn std::error::Error + Send + Sync>> {
-        if self.pass_raw_samples {
-            return Ok(());
-        }
-
-        let mut emit_batch: Vec<(PrecomputedOutput, Box<dyn AggregateCore>)> = Vec::new();
-
-        for (&sid, state) in &mut self.group_states {
-            let _ = sid; // sid is the bucket key; group_key/policy_fp live on `state`
-            if state.max_event_time_ms == i64::MIN {
-                continue; // never received data — nothing to close
-            }
-
-            // The latest window start equals the largest open pane start across
-            // both pane maps; closing `[start, start + size)` needs
-            // `wm >= start + size`.
-            let max_active = state.active_panes.keys().next_back().copied();
-            let max_sketch = state.sketch_panes.keys().next_back().copied();
-            let max_pane = match (max_active, max_sketch) {
-                (Some(a), Some(b)) => a.max(b),
-                (Some(a), None) => a,
-                (None, Some(b)) => b,
-                (None, None) => continue, // no open panes
-            };
-            let (_, force_wm) = state.bucket_bounds(max_pane);
-
-            let group_key = state.group_key.clone();
-            let closed = state.closed_buckets(state.closure_watermark_ms, force_wm);
-
-            for window_start in &closed {
-                let (_, window_end) = state.bucket_bounds(*window_start);
-                let pane_starts = [*window_start];
-
-                if let Some(accumulator) =
-                    merge_panes_for_window(&mut state.active_panes, &pane_starts)
-                {
-                    let key = build_group_key_label_values(&group_key);
-                    let output = precomputed_output_for_group(
-                        *window_start as u64,
-                        window_end as u64,
-                        key,
-                        PolicyFingerprint::from_config(&state.config),
-                        &group_key,
-                        &state.input_revisions,
-                        state.series_id,
-                        state.catalog_generation.as_ref(),
-                        state.stored_output_reference.clone(),
-                    );
-                    emit_batch.push((output, accumulator));
-                }
-
-                if let Some(accumulator) =
-                    merge_sketch_panes_for_window(&mut state.sketch_panes, &pane_starts)
-                {
-                    let key = build_group_key_label_values(&group_key);
-                    let output = precomputed_output_for_group(
-                        *window_start as u64,
-                        window_end as u64,
-                        key,
-                        PolicyFingerprint::from_config(&state.config),
-                        &group_key,
-                        &state.input_revisions,
-                        state.series_id,
-                        state.catalog_generation.as_ref(),
-                        state.stored_output_reference.clone(),
-                    );
-                    emit_batch.push((output, accumulator));
-                }
-            }
-
-            if force_wm > state.closure_watermark_ms {
-                state.closure_watermark_ms = force_wm;
-            }
-            state.prune_pane_wall_clock();
-        }
-
-        if !emit_batch.is_empty() {
-            debug!(
-                "Worker {} shutdown force-close emitting {} outputs",
-                self.id,
-                emit_batch.len()
-            );
-            self.output_sink.emit_batch(emit_batch)?;
-        }
-
-        Ok(())
-    }
-}
-
-/// Build a `KeyByLabelValues` from a semicolon-delimited group key string.
-/// e.g. "constant" → KeyByLabelValues { labels: ["constant"] }
-/// e.g. "us-east;svc-a" → KeyByLabelValues { labels: ["us-east", "svc-a"] }
-/// e.g. "" → KeyByLabelValues { labels: [""] }
-/// Default wall-clock-now source: milliseconds since the unix epoch.
-/// Used by `Worker::new`. Tests override via `set_now_ms_fn`.
-fn default_now_ms() -> i64 {
-    use std::time::{SystemTime, UNIX_EPOCH};
-    SystemTime::now()
-        .duration_since(UNIX_EPOCH)
-        .map(|d| d.as_millis() as i64)
-        // Pre-1970 wall clock (only happens if the host clock is
-        // grossly misconfigured) — fall back to 0 so the fallback
-        // simply doesn't trigger rather than panicking.
-        .unwrap_or(0)
-}
-
-/// Convert observed event time to the watermark that is safe to close through.
-/// A negative configured lateness is treated as zero rather than advancing the
-/// watermark beyond any timestamp actually observed.
-fn watermark_for_event_time(max_event_time_ms: i64, allowed_lateness_ms: i64) -> i64 {
-    if max_event_time_ms == i64::MIN {
-        i64::MIN
-    } else {
-        max_event_time_ms.saturating_sub(allowed_lateness_ms.max(0))
-    }
-}
-
-fn build_group_key_label_values(group_key: &GroupKey) -> KeyByLabelValues {
-    group_key.values()
-}
-
-fn population_labels_from_group_key(group_key: &GroupKey) -> Option<BTreeMap<String, String>> {
-    let labels = group_key.as_population_labels();
-    (!labels.is_empty()).then_some(labels)
-}
-
-/// One admission receipt covers all fragments for a physical coordinate.
-/// Combine late corrections before publishing that receipt once.
-fn coalesce_admitted_outputs(
-    outputs: Vec<(PrecomputedOutput, Box<dyn AggregateCore>)>,
-) -> Result<
-    Vec<(PrecomputedOutput, Box<dyn AggregateCore>)>,
-    Box<dyn std::error::Error + Send + Sync>,
-> {
-    let mut merged: Vec<(PrecomputedOutput, Box<dyn AggregateCore>)> = Vec::new();
-    let mut coordinates = BTreeMap::new();
-    for (output, state) in outputs {
-        let index = output.input_revision.as_ref().and_then(|revision| {
-            let key = (
-                output.policy_fp.0,
-                output.start_timestamp,
-                output.end_timestamp,
-                output
-                    .key
-                    .as_ref()
-                    .map(|key| key.serialize_to_bytes())
-                    .unwrap_or_default(),
-                output.population_labels.clone(),
-                revision.generation.plan_id,
-                revision.generation.plan_version,
-                revision.revision,
-            );
-            match coordinates.entry(key) {
-                std::collections::btree_map::Entry::Occupied(entry) => Some(*entry.get()),
-                std::collections::btree_map::Entry::Vacant(entry) => {
-                    entry.insert(merged.len());
-                    None
-                }
-            }
-        });
-        if let Some(index) = index {
-            merged[index].1 = merged[index].1.merge_with(state.as_ref())?;
-            if output
-                .input_revision
-                .as_ref()
-                .is_some_and(|input| input.first_revision == 0)
-            {
-                if let Some(input) = merged[index].0.input_revision.as_mut() {
-                    Arc::make_mut(input).first_revision = 0;
-                }
-            }
-        } else {
-            merged.push((output, state));
-        }
-    }
-    Ok(merged)
-}
-
-fn precomputed_output_for_group(
-    start_timestamp: u64,
-    end_timestamp: u64,
-    key: KeyByLabelValues,
-    policy_fp: PolicyFingerprint,
-    group_key: &GroupKey,
-    input_revisions: &BTreeMap<i64, Arc<crate::storage_engines::types::SummaryInputRevision>>,
-    series_id: u64,
-    catalog_generation: Option<&Arc<asap_types::sds::CatalogGeneration>>,
-    stored_output_reference: Option<asap_types::sds::StoredOutputReference>,
-) -> PrecomputedOutput {
-    let mut output = PrecomputedOutput::new(start_timestamp, end_timestamp, Some(key), policy_fp)
-        .with_population_labels(population_labels_from_group_key(group_key));
-    output.storage_handle = Some(series_id);
-    output.stored_output_reference = stored_output_reference;
-    output.catalog_generation = catalog_generation.cloned();
-    output.input_revision = i64::try_from(start_timestamp)
-        .ok()
-        .and_then(|start| input_revisions.get(&start).cloned());
-    output
-}
-
-#[cfg(test)]
-/// Extract the metric name from a series key like `"metric_name{key1=\"val1\"}"`.
-pub fn extract_metric_name(series_key: &str) -> &str {
-    match series_key.find('{') {
-        Some(pos) => &series_key[..pos],
-        None => series_key,
-    }
-}
-
-#[cfg(test)]
-/// Extract grouping label values from a series key string based on the
-/// aggregation config's `grouping_labels`.
-///
-/// The series key format is: `metric_name{label1="val1",label2="val2",...}`
-pub fn extract_key_from_series(
-    series_key: &str,
-    config: &PrecomputeMaterialization,
-) -> KeyByLabelValues {
-    let labels = parse_labels_from_series_key(series_key);
-    let mut values = Vec::new();
-
-    for label_name in &config.grouping_labels.names() {
-        if let Some(val) = labels.get(label_name.as_str()) {
-            values.push(val.to_string());
-        } else {
-            values.push(String::new());
-        }
-    }
-
-    KeyByLabelValues::new_with_labels(values)
-}
-
-/// Parse label key-value pairs from a series key string.
-/// `"metric{a=\"b\",c=\"d\"}"` → `{("a", "b"), ("c", "d")}`
-///
-/// The returned `&str` value is the **raw, still-escaped** slice
-/// between the opening and closing quote — e.g. for `k="a\"b"` the
-/// value is the four bytes `a\"b`, not the decoded `a"b`. Call
-/// [`decode_label_value`] if you need the decoded form. Most live
-/// callers compare against literal config values that never contain
-/// escapable characters (`"`, `\`, `\n`), so the un-decoded slice
-/// suffices and saves an allocation per label per sample.
-///
-/// The closing-quote scan walks past `\\`, `\"`, `\n` escape pairs
-/// emitted by [`format_series_key`] / `render_series_key`, so a
-/// value containing embedded `"` no longer terminates parsing
-/// prematurely (pre-fix bug — see PR following #284).
-pub fn parse_labels_from_series_key(series_key: &str) -> HashMap<&str, &str> {
-    let mut labels = HashMap::new();
-
-    let start = match series_key.find('{') {
-        Some(pos) => pos + 1,
-        None => return labels,
-    };
-    let end = match series_key.rfind('}') {
-        Some(pos) => pos,
-        None => return labels,
-    };
-
-    if start >= end {
-        return labels;
-    }
-
-    let label_str = &series_key[start..end];
-
-    // Parse comma-separated key="value" pairs.
-    let mut remaining = label_str;
-    while !remaining.is_empty() {
-        let eq_pos = match remaining.find('=') {
-            Some(pos) => pos,
-            None => break,
-        };
-        let key = remaining[..eq_pos].trim();
-
-        let after_eq = &remaining[eq_pos + 1..];
-        if !after_eq.starts_with('"') {
-            break;
-        }
-
-        // Walk after the opening quote looking for the closing quote,
-        // skipping over `\<x>` escape pairs so that values containing
-        // embedded `"` (escaped as `\"`) don't terminate early. ASCII-
-        // byte scan; safe because `\` and `"` are single-byte UTF-8
-        // and never appear as continuation bytes inside a multi-byte
-        // scalar — so byte indexing into a `&str` always lands on a
-        // char boundary at the chosen positions.
-        let value_start = 1; // skip opening quote
-        let bytes = after_eq.as_bytes();
-        let mut i = value_start;
-        let value_end = loop {
-            if i >= bytes.len() {
-                // No closing quote — malformed input, abandon parse.
-                return labels;
-            }
-            match bytes[i] {
-                b'\\' if i + 1 < bytes.len() => {
-                    // Skip the escape body byte (\", \\, \n, …).
-                    i += 2;
-                }
-                b'"' => break i,
-                _ => i += 1,
-            }
-        };
-
-        let value = &after_eq[value_start..value_end];
-        labels.insert(key, value);
-
-        let consumed = value_end + 1;
-        remaining = &after_eq[consumed..];
-        if remaining.starts_with(',') {
-            remaining = &remaining[1..];
-        }
-    }
-
-    labels
-}
-
-/// Decode a `parse_labels_from_series_key` value slice into its
-/// original textual form by undoing the `\"`, `\\`, `\n` escapes
-/// emitted by `format_series_key` / `render_series_key`.
-///
-/// Returns a borrowed `Cow` when the slice has no `\` byte (the
-/// common case — most label values are alphanumeric / dotted /
-/// dashed), avoiding allocation. Only allocates when an escape is
-/// present.
-pub fn decode_label_value(s: &str) -> std::borrow::Cow<'_, str> {
-    if !s.contains('\\') {
-        return std::borrow::Cow::Borrowed(s);
-    }
-    let mut out = String::with_capacity(s.len());
-    // Walk by `char` boundaries so multi-byte UTF-8 scalars round-
-    // trip intact. Escape recognition operates on ASCII metas (`\`,
-    // `"`, `n`) which are always single-byte chars in UTF-8.
-    let mut it = s.chars().peekable();
-    while let Some(c) = it.next() {
-        if c == '\\' {
-            match it.next() {
-                Some('"') => out.push('"'),
-                Some('\\') => out.push('\\'),
-                Some('n') => out.push('\n'),
-                Some(other) => {
-                    // Unknown escape — pass the backslash + body
-                    // through verbatim so we don't silently drop data.
-                    out.push('\\');
-                    out.push(other);
-                }
-                None => {
-                    // Trailing backslash with no escape body — keep
-                    // it so round-tripping is lossless even for
-                    // malformed input.
-                    out.push('\\');
-                }
-            }
-        } else {
-            out.push(c);
-        }
-    }
-    std::borrow::Cow::Owned(out)
-}
-
-fn installed_updater(
-    program: Option<&super::raw_dag::RawDagProgram>,
-    config: &PrecomputeMaterialization,
-) -> Result<Box<dyn AccumulatorUpdater>, String> {
-    if let Some(program) = program {
-        return program.updater();
-    }
-    #[cfg(test)]
-    {
-        Ok(create_fixture_accumulator(config))
-    }
-    #[cfg(not(test))]
-    {
-        let _ = config;
-        Err("missing installed Planner producer".into())
-    }
-}
-
-fn apply_installed_sample(
-    program: Option<&super::raw_dag::RawDagProgram>,
-    updater: &mut dyn AccumulatorUpdater,
-    series: &str,
-    value: f64,
-    timestamp: i64,
-    config: &PrecomputeMaterialization,
-) -> Result<(), String> {
-    if let Some(program) = program {
-        return program.apply(updater, series, value, timestamp);
-    }
-    #[cfg(test)]
-    {
-        apply_sample(updater, series, value, timestamp, config);
-        Ok(())
-    }
-    #[cfg(not(test))]
-    {
-        let _ = config;
-        Err("missing installed Planner producer".into())
-    }
-}
-
-/// Route a single sample to `updater`, dispatching keyed vs. non-keyed based on config.
-///
-/// For keyed accumulators (MultipleSum, CMS, HydraKLL), the key is extracted
-/// from the series' **aggregated_labels** — these are the labels that become
-/// the key dimension *inside* the sketch (e.g., which bucket in a CMS, which
-/// entry in a KeyedSumCountAccumulator's HashMap). This matches the Arroyo SQL
-/// pattern: `udf(concat_ws(';', aggregated_labels), value)`.
-#[cfg(test)]
-pub(crate) fn apply_sample(
-    updater: &mut dyn AccumulatorUpdater,
-    series_key: &str,
-    val: f64,
-    ts: i64,
-    config: &PrecomputeMaterialization,
-) {
-    if updater.is_keyed() {
-        // Planner's PromQL Top-K item is the series identity. When no
-        // explicit aggregated labels are projected, retain the canonical
-        // series key instead of collapsing every series onto an empty item.
-        let key = if config.aggregated_labels.labels.is_empty()
-            && matches!(
-                config.aggregation_type,
-                crate::storage_engines::types::AggregationType::CountMinSketchWithHeap
-                    | crate::storage_engines::types::AggregationType::CountSketchWithHeap
-            ) {
-            KeyByLabelValues::new_with_labels(vec![series_key.to_string()])
-        } else {
-            extract_aggregated_key_from_series(series_key, config)
-        };
-        updater.update_keyed(&key, val, ts);
-    } else {
-        updater.update_single(val, ts);
-    }
-}
-
-/// Convert a cumulative counter sample into a non-negative, reset-aware
-/// increment. Only the immediately preceding sample per series is retained;
-/// pane rotation therefore cannot lose the boundary increment.
-/// Whether a sample must be converted to a counter delta before it reaches the
-/// accumulator.
-///
-/// Only the legacy configured update rule does this. A selected Planner program
-/// never does: rate is an explicit upstream operator in the DAG, so the sample
-/// reaches the accumulator unchanged. Both call sites used to ask the program
-/// and were always told `false`.
-fn legacy_counter_delta(state: &GroupState) -> bool {
-    state.program.is_none()
-        && matches!(
-            state.config.sample_update_rule(),
-            SampleUpdateRule::CounterDelta { .. }
-        )
-}
-
-pub(crate) fn reset_aware_counter_delta(
-    previous: &mut HashMap<String, (i64, f64)>,
-    series_key: &str,
-    value: f64,
-    timestamp_ms: i64,
-) -> Option<f64> {
-    if !value.is_finite() {
-        return None;
-    }
-    match previous.get(series_key).copied() {
-        Some((previous_ts, _)) if timestamp_ms <= previous_ts => None,
-        Some((_, previous_value)) => {
-            previous.insert(series_key.to_owned(), (timestamp_ms, value));
-            Some(if value >= previous_value {
-                value - previous_value
-            } else {
-                value.max(0.0)
-            })
-        }
-        None => {
-            previous.insert(series_key.to_owned(), (timestamp_ms, value));
-            None
-        }
-    }
-}
-
-/// Extract aggregated label values from a series key string.
-/// These are the labels that form the key dimension *inside* keyed accumulators
-/// (MultipleSum, CMS, HydraKLL), matching Arroyo's `agg_columns`.
-fn extract_aggregated_key_from_series(
-    series_key: &str,
-    config: &PrecomputeMaterialization,
-) -> KeyByLabelValues {
-    let labels = parse_labels_from_series_key(series_key);
-    let mut values = Vec::new();
-
-    for label_name in &config.aggregated_labels.labels {
-        if let Some(val) = labels.get(label_name.as_str()) {
-            values.push(val.to_string());
-        } else {
-            values.push(String::new());
-        }
-    }
-
-    KeyByLabelValues::new_with_labels(values)
-}
-
-/// Merge the pane accumulators that constitute a closed window.
-///
-/// The oldest pane (index 0) is taken destructively from `active_panes`
-/// (no future window needs it). All later panes are snapshot-read
-/// (non-destructive; they are shared by newer overlapping windows).
-///
-/// Returns `None` if all panes for the window are absent.
-fn merge_panes_for_window(
-    active_panes: &mut BTreeMap<i64, Box<dyn AccumulatorUpdater>>,
-    pane_starts: &[i64],
-) -> Option<Box<dyn AggregateCore>> {
-    let mut merged: Option<Box<dyn AggregateCore>> = None;
-
-    for (i, &ps) in pane_starts.iter().enumerate() {
-        let pane_acc = if i == 0 {
-            // Oldest pane: evict and MOVE the accumulator out (no clone).
-            active_panes
-                .remove(&ps)
-                .map(|updater| updater.into_accumulator())
-        } else {
-            // Shared pane: non-destructive snapshot
-            active_panes
-                .get(&ps)
-                .map(|updater| updater.snapshot_accumulator())
-        };
-
-        if let Some(acc) = pane_acc {
-            merged = Some(match merged {
-                None => acc,
-                Some(existing) => existing.merge_with(acc.as_ref()).unwrap_or(existing),
-            });
-        }
-    }
-
-    merged
-}
-
-/// Merge pre-built accumulator panes for a window.
-///
-/// Equivalent to `merge_panes_for_window` but operating on the sketch pane
-/// map (`Box<dyn AggregateCore>` directly). The oldest pane is destructively
-/// taken (it will never be needed by a later window); subsequent panes are
-/// cloned so that still-open overlapping windows can still read them.
-fn merge_sketch_panes_for_window(
-    sketch_panes: &mut BTreeMap<i64, Box<dyn AggregateCore>>,
-    pane_starts: &[i64],
-) -> Option<Box<dyn AggregateCore>> {
-    let mut merged: Option<Box<dyn AggregateCore>> = None;
-
-    for (i, &ps) in pane_starts.iter().enumerate() {
-        let pane_acc: Option<Box<dyn AggregateCore>> = if i == 0 {
-            // Oldest pane: destructive take + evict
-            sketch_panes.remove(&ps)
-        } else {
-            // Shared pane: non-destructive clone
-            sketch_panes.get(&ps).map(|acc| acc.clone_boxed_core())
-        };
-
-        if let Some(acc) = pane_acc {
-            merged = Some(match merged {
-                None => acc,
-                Some(existing) => existing.merge_with(acc.as_ref()).unwrap_or(existing),
-            });
-        }
-    }
-
-    merged
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    #[test]
-    fn admitted_corrections_publish_all_fragments_under_one_receipt() {
-        let revision = Arc::new(crate::storage_engines::types::SummaryInputRevision {
-            generation: Arc::new(asap_types::sds::CatalogGeneration {
-                schema_version: 1,
-                plan_id: 1,
-                plan_version: 1,
-                snapshot_sha256: "test".into(),
-            }),
-            first_revision: 1,
-            revision: 1,
-        });
-        let mut output = PrecomputedOutput::new(0, 1000, None, PolicyFingerprint(1));
-        output.input_revision = Some(revision);
-        let merged = coalesce_admitted_outputs(vec![
-            (output.clone(), Box::new(SumAccumulator::with_sum(2.0))),
-            (output, Box::new(SumAccumulator::with_sum(3.0))),
-        ])
-        .unwrap();
-        assert_eq!(merged.len(), 1);
-        assert_eq!(
-            merged[0]
-                .1
-                .as_any()
-                .downcast_ref::<SumAccumulator>()
-                .unwrap()
-                .sum,
-            5.0
-        );
-    }
-
-    fn test_group_key(value: &str) -> Arc<GroupKey> {
-        if value.is_empty() {
-            return crate::precompute_engine::group_key::intern_pairs(std::iter::empty::<(
-                &str,
-                &str,
-            )>());
-        }
-        crate::precompute_engine::group_key::intern_pairs([("group", value)])
-    }
-
-    #[test]
-    fn counter_delta_is_reset_aware_series_local_and_cross_pane_safe() {
-        let mut previous = HashMap::new();
-        assert_eq!(reset_aware_counter_delta(&mut previous, "a", 10.0, 1), None);
-        assert_eq!(reset_aware_counter_delta(&mut previous, "b", 40.0, 1), None);
-        assert_eq!(
-            reset_aware_counter_delta(&mut previous, "a", 15.0, 2),
-            Some(5.0)
-        );
-        assert_eq!(
-            reset_aware_counter_delta(&mut previous, "a", 3.0, 3),
-            Some(3.0)
-        );
-        assert_eq!(
-            reset_aware_counter_delta(&mut previous, "b", 44.0, 4),
-            Some(4.0)
-        );
-        assert_eq!(reset_aware_counter_delta(&mut previous, "a", 99.0, 2), None);
-        assert_eq!(
-            reset_aware_counter_delta(&mut previous, "a", 5.0, 5),
-            Some(2.0)
-        );
-    }
-
-    use flate2::{write::GzEncoder, Compression};
-    use serde_json::json;
-    use std::io::Write;
-
-    #[test]
-    fn test_extract_metric_name() {
-        assert_eq!(
-            extract_metric_name("http_requests_total{method=\"GET\"}"),
-            "http_requests_total"
-        );
-        assert_eq!(extract_metric_name("up"), "up");
-        assert_eq!(
-            extract_metric_name("cpu_usage{host=\"a\",zone=\"us\"}"),
-            "cpu_usage"
-        );
-    }
-
-    #[test]
-    fn test_parse_labels() {
-        let labels = parse_labels_from_series_key("metric{method=\"GET\",status=\"200\"}");
-        assert_eq!(labels.get("method"), Some(&"GET"));
-        assert_eq!(labels.get("status"), Some(&"200"));
-    }
-
-    #[test]
-    fn test_parse_labels_no_labels() {
-        let labels = parse_labels_from_series_key("metric");
-        assert!(labels.is_empty());
-    }
-
-    #[test]
-    fn test_parse_labels_empty_braces() {
-        let labels = parse_labels_from_series_key("metric{}");
-        assert!(labels.is_empty());
-    }
-
-    #[test]
-    fn test_parse_labels_skips_escaped_closing_quote() {
-        // The closing-quote scan must walk past `\"` rather than
-        // terminating the value early. Regression for the
-        // `format_series_key` ↔ `parse_labels_from_series_key`
-        // roundtrip bug — see PR #284's discovery and the
-        // `series_key_roundtrip_tests` module in
-        // `drivers/ingest/otel.rs`.
-        let labels = parse_labels_from_series_key(r#"metric{msg="a\"b",svc="x"}"#);
-        // Raw (un-decoded) values are returned; `decode_label_value`
-        // un-escapes them.
-        assert_eq!(labels.get("msg"), Some(&r#"a\"b"#));
-        assert_eq!(labels.get("svc"), Some(&"x"));
-    }
-
-    #[test]
-    fn test_decode_label_value_unescapes_known_pairs() {
-        assert_eq!(decode_label_value("plain"), "plain");
-        assert_eq!(decode_label_value(r#"a\"b"#), r#"a"b"#);
-        assert_eq!(decode_label_value(r"a\\b"), r"a\b");
-        assert_eq!(decode_label_value(r"line1\nline2"), "line1\nline2");
-        // Unknown escapes pass through unchanged so we don't silently
-        // drop producer-side data.
-        assert_eq!(decode_label_value(r"a\xb"), r"a\xb");
-    }
-
-    #[test]
-    fn test_decode_label_value_borrows_when_no_escapes() {
-        // Borrowed for the common case — no allocation.
-        let s = "no_escapes_here";
-        match decode_label_value(s) {
-            std::borrow::Cow::Borrowed(b) => assert_eq!(b, s),
-            std::borrow::Cow::Owned(_) => panic!("expected borrowed, no `\\` in input"),
-        }
-    }
-
-    // -----------------------------------------------------------------------
-    // Helpers
-    // -----------------------------------------------------------------------
-
-    use crate::precompute_engine::config::LateDataPolicy;
-    use crate::precompute_engine::output_sink::CapturingOutputSink;
-    use crate::storage_engines::types::InstalledPrecomputePlan;
-    use asap_physical_operators::summary_kernels::datasketches_kll::DatasketchesKLLAccumulator;
-    use asap_physical_operators::summary_kernels::keyed_sum_count::KeyedSumCountAccumulator;
-    use asap_physical_operators::summary_kernels::sum::SumAccumulator;
-    use asap_sketchlib::KllSketch;
-    use asap_types::enums::WindowKind;
-    use asap_types::sds::StoredOutputId;
-    use asap_types::AggregationType;
-
-    fn make_agg_config(
-        id: u64,
-        metric: &str,
-        agg_type: AggregationType,
-        agg_sub_type: &str,
-        window_secs: u64,
-        slide_secs: u64,
-        grouping: Vec<&str>,
-    ) -> PrecomputeMaterialization {
-        make_agg_config_full(
-            id,
-            metric,
-            agg_type,
-            agg_sub_type,
-            window_secs,
-            slide_secs,
-            grouping,
-            vec![],
-        )
-    }
-
-    #[allow(clippy::too_many_arguments)]
-    fn make_agg_config_full(
-        _id: u64,
-        metric: &str,
-        agg_type: AggregationType,
-        agg_sub_type: &str,
-        window_secs: u64,
-        slide_secs: u64,
-        grouping: Vec<&str>,
-        aggregated: Vec<&str>,
-    ) -> PrecomputeMaterialization {
-        // `_id` is unused after PR 5 — identity is content-addressed
-        // via `PolicyFingerprint::from_config`. Callers below build the
-        // streaming-config map by reading `config.policy_fp_u64()`
-        // from the returned value.
-        let window_type = if slide_secs == 0 || slide_secs == window_secs {
-            WindowKind::Tumbling
-        } else {
-            WindowKind::Sliding
-        };
-        PrecomputeMaterialization::new(
-            agg_type,
-            agg_sub_type.to_string(),
-            HashMap::new(),
-            asap_types::KeyByLabelNames::new(grouping.iter().map(|s| s.to_string()).collect()),
-            asap_types::KeyByLabelNames::new(aggregated.iter().map(|s| s.to_string()).collect()),
-            asap_types::KeyByLabelNames::new(vec![]),
-            String::new(),
-            window_secs,
-            slide_secs,
-            window_type,
-            metric.to_string(),
-            metric.to_string(),
-            None,
-            None,
-            None,
-        )
-    }
-
-    fn make_worker(
-        agg_configs: HashMap<u64, PrecomputeMaterialization>,
-        sink: Arc<CapturingOutputSink>,
-        pass_raw: bool,
-        raw_agg_id: u64,
-        late_policy: LateDataPolicy,
-    ) -> Worker {
-        make_worker_with_lateness(agg_configs, sink, pass_raw, raw_agg_id, late_policy, 0)
-    }
-
-    fn make_worker_with_lateness(
-        agg_configs: HashMap<u64, PrecomputeMaterialization>,
-        sink: Arc<CapturingOutputSink>,
-        pass_raw: bool,
-        raw_agg_id: u64,
-        late_policy: LateDataPolicy,
-        allowed_lateness_ms: i64,
-    ) -> Worker {
-        let (_tx, rx) = tokio::sync::mpsc::channel(1);
-        let wm = Arc::new(AtomicI64::new(i64::MIN));
-        Worker::new(
-            0,
-            rx,
-            sink,
-            make_hot_reload(agg_configs),
-            WorkerRuntimeConfig {
-                max_buffer_per_series: 10_000,
-                allowed_lateness_ms,
-                pass_raw_samples: pass_raw,
-                raw_mode_aggregation_id: raw_agg_id,
-                late_data_policy: late_policy,
-                wall_clock_idle_grace_period_ms: 0,
-                wall_clock_max_open_grace_period_ms: 0,
-            },
-            Arc::new(AtomicUsize::new(0)),
-            wm,
-        )
-    }
-
-    /// Build a fresh `InstalledPrecomputePlanHandle` from a map of agg_id
-    /// → PrecomputeMaterialization. Worker::new takes this handle instead of
-    /// the old `HashMap<u64, Arc<PrecomputeMaterialization>>`. Tests use this
-    /// helper instead of constructing the handle inline at every
-    /// callsite.
-    fn make_hot_reload(
-        configs: HashMap<u64, PrecomputeMaterialization>,
-    ) -> crate::storage_engines::types::InstalledPrecomputePlanHandle {
-        crate::storage_engines::types::InstalledPrecomputePlanHandle::new(
-            crate::storage_engines::types::InstalledPrecomputePlan::from_raw_ids(configs),
-        )
-    }
-
-    /// Helper to make GroupSamples from simple (ts, val) pairs for a single series.
-    fn group_samples(series_key: &str, samples: Vec<(i64, f64)>) -> Vec<(String, i64, f64)> {
-        samples
-            .into_iter()
-            .map(|(ts, val)| (series_key.to_string(), ts, val))
-            .collect()
-    }
-
-    // -----------------------------------------------------------------------
-    // Test: raw mode — each sample forwarded as SumAccumulator with sum==value
-    // -----------------------------------------------------------------------
-
-    #[test]
-    fn initial_counter_observation_publishes_an_empty_delta_window() {
-        let mut config = make_agg_config(1, "counter", AggregationType::Sum, "sum", 1, 1, vec![]);
-        config
-            .parameters
-            .insert("weight_mode".into(), serde_json::json!("counter_delta"));
-        let fingerprint = config.policy_fingerprint();
-        let sink = Arc::new(CapturingOutputSink::new());
-        let mut worker = make_worker(
-            HashMap::from([(fingerprint.0, config)]),
-            sink.clone(),
-            false,
-            0,
-            LateDataPolicy::Drop,
-        );
-        worker.current_input_revision = Some(Arc::new(
-            crate::storage_engines::types::SummaryInputRevision {
-                generation: Arc::new(asap_types::sds::CatalogGeneration {
-                    schema_version: 1,
-                    plan_id: 1,
-                    plan_version: 1,
-                    snapshot_sha256: "test".into(),
-                }),
-                first_revision: 1,
-                revision: 1,
-            },
-        ));
-        worker
-            .process_group_samples(
-                1,
-                fingerprint,
-                &test_group_key(""),
-                vec![("counter".into(), 1000, 7.0)],
-            )
-            .unwrap();
-        worker.force_close_all().unwrap();
-        let captured = sink.drain();
-        assert_eq!(captured.len(), 1);
-        assert_eq!(captured[0].0.input_revision.as_ref().unwrap().revision, 1);
-        assert_eq!(
-            captured[0]
-                .1
-                .as_any()
-                .downcast_ref::<SumAccumulator>()
-                .unwrap()
-                .sum,
-            0.0
-        );
-    }
-
-    #[test]
-    fn test_raw_mode_forwarding() {
-        let sink = Arc::new(CapturingOutputSink::new());
-        let worker = make_worker(HashMap::new(), sink.clone(), true, 99, LateDataPolicy::Drop);
-
-        let samples = vec![(1000_i64, 1.5_f64), (2000, 2.5), (3000, 7.0)];
-        worker
-            .process_samples_raw("cpu{host=\"a\"}", samples.clone())
-            .unwrap();
-
-        let captured = sink.drain();
-        assert_eq!(captured.len(), 3, "should emit one output per raw sample");
-
-        for ((ts, val), (output, acc)) in samples.iter().zip(captured.iter()) {
-            assert_eq!(output.start_timestamp as i64, *ts);
-            assert_eq!(output.end_timestamp as i64, *ts);
-            // Raw mode emits PolicyFingerprint::UNSET (no source
-            // PrecomputeMaterialization in the raw-mode fast path). The sink
-            // drops UNSET outputs with a warn — verified separately
-            // via integration tests.
-            assert!(output.policy_fp.is_unset());
-            let sum_acc = acc
-                .as_any()
-                .downcast_ref::<SumAccumulator>()
-                .expect("should be SumAccumulator");
-            assert!(
-                (sum_acc.sum - val).abs() < 1e-10,
-                "sum should equal sample value"
-            );
-        }
-    }
-
-    // -----------------------------------------------------------------------
-    // Test: tumbling window — correct window boundaries and sum
-    // -----------------------------------------------------------------------
-
-    #[test]
-    fn test_tumbling_window_correctness() {
-        // 10s tumbling window
-        let config = make_agg_config(
-            1,
-            "cpu",
-            AggregationType::SingleSubpopulation,
-            "Sum",
-            10,
-            0,
-            vec![],
-        );
-        let mut agg_configs = HashMap::new();
-        agg_configs.insert(1, config);
-
-        let sink = Arc::new(CapturingOutputSink::new());
-        let mut worker = make_worker(agg_configs, sink.clone(), false, 0, LateDataPolicy::Drop);
-
-        // Samples in window [0, 10000ms): sum should be 1+2+3=6.
-        // All go to the same bucket (sid=1, group_key="")
-        let pf = PolicyFingerprint(1);
-        worker
-            .process_group_samples(
-                1,
-                pf,
-                &test_group_key(""),
-                group_samples("cpu", vec![(1000, 1.0)]),
-            )
-            .unwrap();
-        worker
-            .process_group_samples(
-                1,
-                pf,
-                &test_group_key(""),
-                group_samples("cpu", vec![(5000, 2.0)]),
-            )
-            .unwrap();
-        worker
-            .process_group_samples(
-                1,
-                pf,
-                &test_group_key(""),
-                group_samples("cpu", vec![(9000, 3.0)]),
-            )
-            .unwrap();
-        assert_eq!(sink.len(), 0);
-
-        // Sample at t=10000ms closes [0, 10000)
-        worker
-            .process_group_samples(
-                1,
-                pf,
-                &test_group_key(""),
-                group_samples("cpu", vec![(10000, 100.0)]),
-            )
-            .unwrap();
-
-        let captured = sink.drain();
-        assert_eq!(captured.len(), 1, "exactly one window should close");
-
-        let (output, acc) = &captured[0];
-        // PR-6 follow-up: `aggregation_id` field is gone; the worker
-        // now emits the config's policy fingerprint. Non-UNSET asserts
-        // the emit path threaded the source config through.
-        assert!(!output.policy_fp.is_unset());
-        assert_eq!(output.start_timestamp, 0);
-        assert_eq!(output.end_timestamp, 10_000);
-
-        let sum_acc = acc
-            .as_any()
-            .downcast_ref::<SumAccumulator>()
-            .expect("should be SumAccumulator");
-        assert!(
-            (sum_acc.sum - 6.0).abs() < 1e-10,
-            "sum should be 1+2+3=6, got {}",
-            sum_acc.sum
-        );
-    }
-
-    // -----------------------------------------------------------------------
-    // Test: GROUP BY — multiple series merged into same group accumulator
-    // -----------------------------------------------------------------------
-
-    #[test]
-    fn test_group_by_merges_series() {
-        // SingleSubpopulation Sum with no grouping labels
-        // Two different series in the same group → both feed same accumulator
-        let config = make_agg_config(
-            1,
-            "cpu",
-            AggregationType::SingleSubpopulation,
-            "Sum",
-            10,
-            0,
-            vec![],
-        );
-        let mut agg_configs = HashMap::new();
-        agg_configs.insert(1, config);
-
-        let sink = Arc::new(CapturingOutputSink::new());
-        let mut worker = make_worker(agg_configs, sink.clone(), false, 0, LateDataPolicy::Drop);
-
-        // Two different series, same bucket (sid=1, group_key="")
-        // Both feed into the same accumulator
-        let pf = PolicyFingerprint(1);
-        worker
-            .process_group_samples(
-                1,
-                pf,
-                &test_group_key(""),
-                vec![
-                    ("cpu{host=\"A\"}".to_string(), 1000, 10.0),
-                    ("cpu{host=\"B\"}".to_string(), 2000, 20.0),
-                ],
-            )
-            .unwrap();
-        assert_eq!(sink.len(), 0);
-
-        // Close the window
-        worker
-            .process_group_samples(
-                1,
-                pf,
-                &test_group_key(""),
-                group_samples("cpu{host=\"A\"}", vec![(10000, 0.0)]),
-            )
-            .unwrap();
-
-        let captured = sink.drain();
-        assert_eq!(captured.len(), 1, "one output per group per window");
-
-        let (output, acc) = &captured[0];
-        // PR-6 follow-up: `aggregation_id` field is gone; the worker
-        // now emits the config's policy fingerprint. Non-UNSET asserts
-        // the emit path threaded the source config through.
-        assert!(!output.policy_fp.is_unset());
-        assert_eq!(output.start_timestamp, 0);
-        assert_eq!(output.end_timestamp, 10_000);
-
-        let sum_acc = acc
-            .as_any()
-            .downcast_ref::<SumAccumulator>()
-            .expect("should be SumAccumulator");
-        assert!(
-            (sum_acc.sum - 30.0).abs() < 1e-10,
-            "sum should be 10+20=30, got {} (both series merged)",
-            sum_acc.sum
-        );
-    }
-
-    // -----------------------------------------------------------------------
-    // Test: GROUP BY with grouping labels — different groups produce separate outputs
-    // -----------------------------------------------------------------------
-
-    #[test]
-    fn test_different_groups_separate_outputs() {
-        let config = make_agg_config(
-            1,
-            "cpu",
-            AggregationType::SingleSubpopulation,
-            "Sum",
-            10,
-            0,
-            vec!["pattern"],
-        );
-        let mut agg_configs = HashMap::new();
-        agg_configs.insert(1, config);
-
-        let sink = Arc::new(CapturingOutputSink::new());
-        let mut worker = make_worker(agg_configs, sink.clone(), false, 0, LateDataPolicy::Drop);
-
-        // Two distinct group_keys → two distinct sids (sid IS the bucket
-        // identity; the legacy `(agg_id, group_key)` tuple folds in).
-        let pf = PolicyFingerprint(1);
-        let sid_constant = 11_u64;
-        let sid_sine = 12_u64;
-        // Bucket sid_constant gets samples
-        worker
-            .process_group_samples(
-                sid_constant,
-                pf,
-                &test_group_key("constant"),
-                group_samples("cpu{pattern=\"constant\"}", vec![(1000, 5.0)]),
-            )
-            .unwrap();
-        // Bucket sid_sine gets samples
-        worker
-            .process_group_samples(
-                sid_sine,
-                pf,
-                &test_group_key("sine"),
-                group_samples("cpu{pattern=\"sine\"}", vec![(2000, 7.0)]),
-            )
-            .unwrap();
-
-        // Close both buckets' windows
-        worker
-            .process_group_samples(
-                sid_constant,
-                pf,
-                &test_group_key("constant"),
-                group_samples("cpu{pattern=\"constant\"}", vec![(10000, 0.0)]),
-            )
-            .unwrap();
-        worker
-            .process_group_samples(
-                sid_sine,
-                pf,
-                &test_group_key("sine"),
-                group_samples("cpu{pattern=\"sine\"}", vec![(10000, 0.0)]),
-            )
-            .unwrap();
-
-        let captured = sink.drain();
-        assert_eq!(captured.len(), 2, "two groups → two outputs");
-
-        let mut sums_by_key: HashMap<String, f64> = HashMap::new();
-        for (output, acc) in &captured {
-            let sum_acc = acc.as_any().downcast_ref::<SumAccumulator>().unwrap();
-            let key = output.key.as_ref().unwrap().labels.join(";");
-            sums_by_key.insert(key, sum_acc.sum);
-        }
-        assert!((sums_by_key["constant"] - 5.0).abs() < 1e-10);
-        assert!((sums_by_key["sine"] - 7.0).abs() < 1e-10);
-    }
-
-    // -----------------------------------------------------------------------
-    // Test: KLL GROUP BY — multiple series merged into one KLL sketch per group
-    // -----------------------------------------------------------------------
-
-    #[test]
-    fn test_kll_group_by_merges_series() {
-        let mut config = make_agg_config(
-            1,
-            "latency",
-            AggregationType::DatasketchesKLL,
-            "",
-            10,
-            0,
-            vec!["pattern"],
-        );
-        config
-            .parameters
-            .insert("K".to_string(), serde_json::Value::from(20_u64));
-        let mut agg_configs = HashMap::new();
-        agg_configs.insert(1, config);
-
-        let sink = Arc::new(CapturingOutputSink::new());
-        let mut worker = make_worker(agg_configs, sink.clone(), false, 0, LateDataPolicy::Drop);
-
-        // Three different series all in group "constant" — all feed one KLL
-        let pf = PolicyFingerprint(1);
-        worker
-            .process_group_samples(
-                1,
-                pf,
-                &test_group_key("constant"),
-                vec![
-                    (
-                        "latency{pattern=\"constant\",host=\"a\"}".to_string(),
-                        1000,
-                        10.0,
-                    ),
-                    (
-                        "latency{pattern=\"constant\",host=\"b\"}".to_string(),
-                        2000,
-                        20.0,
-                    ),
-                    (
-                        "latency{pattern=\"constant\",host=\"c\"}".to_string(),
-                        3000,
-                        30.0,
-                    ),
-                ],
-            )
-            .unwrap();
-
-        // Close the window
-        worker
-            .process_group_samples(
-                1,
-                pf,
-                &test_group_key("constant"),
-                group_samples(
-                    "latency{pattern=\"constant\",host=\"a\"}",
-                    vec![(10000, 0.0)],
-                ),
-            )
-            .unwrap();
-
-        let captured = sink.drain();
-        assert_eq!(captured.len(), 1, "one KLL output for the whole group");
-
-        let (output, acc) = &captured[0];
-        // PR-6 follow-up: `aggregation_id` field is gone; the worker
-        // now emits the config's policy fingerprint. Non-UNSET asserts
-        // the emit path threaded the source config through.
-        assert!(!output.policy_fp.is_unset());
-        let kll = acc
-            .as_any()
-            .downcast_ref::<DatasketchesKLLAccumulator>()
-            .expect("should be KLL");
-        assert_eq!(
-            kll.inner.count(),
-            3,
-            "KLL should contain all 3 series' samples"
-        );
-    }
-
-    // -----------------------------------------------------------------------
-    // Test: sliding window pane sharing
-    // -----------------------------------------------------------------------
-
-    #[test]
-    fn test_sliding_window_pane_sharing() {
-        // 30s window, 10s slide → W=3 panes per window
-        let config = make_agg_config(
-            2,
-            "cpu",
-            AggregationType::SingleSubpopulation,
-            "Sum",
-            30,
-            10,
-            vec![],
-        );
-        let mut agg_configs = HashMap::new();
-        agg_configs.insert(2, config);
-
-        let sink = Arc::new(CapturingOutputSink::new());
-        let mut worker = make_worker(agg_configs, sink.clone(), false, 0, LateDataPolicy::Drop);
-
-        // Sample at t=15000ms → goes to pane 10000ms
-        let pf = PolicyFingerprint(2);
-        worker
-            .process_group_samples(
-                2,
-                pf,
-                &test_group_key(""),
-                group_samples("cpu", vec![(15_000, 42.0)]),
-            )
-            .unwrap();
-        assert_eq!(sink.len(), 0);
-
-        // Sample at t=45000ms → advances watermark to 45000ms
-        // Closes windows [0, 30000) and [10000, 40000)
-        worker
-            .process_group_samples(
-                2,
-                pf,
-                &test_group_key(""),
-                group_samples("cpu", vec![(45_000, 0.0)]),
-            )
-            .unwrap();
-
-        let captured = sink.drain();
-        assert_eq!(captured.len(), 1, "one immutable pane should emit once");
-
-        let window_starts: Vec<u64> = captured.iter().map(|(o, _)| o.start_timestamp).collect();
-        assert!(window_starts.contains(&10_000));
-
-        for (_output, acc) in &captured {
-            let sum_acc = acc
-                .as_any()
-                .downcast_ref::<SumAccumulator>()
-                .expect("should be SumAccumulator");
-            assert!(
-                (sum_acc.sum - 42.0).abs() < 1e-10,
-                "pane should have sum=42, got {}",
-                sum_acc.sum
-            );
-        }
-    }
-
-    #[test]
-    fn full_window_layout_materializes_each_overlapping_slide() {
-        let mut config = make_agg_config(
-            2,
-            "cpu",
-            AggregationType::SingleSubpopulation,
-            "Sum",
-            30,
-            10,
-            vec![],
-        );
-        config.window_layout = asap_types::WindowMaterializationLayout::FullWindow;
-        let policy = config.policy_fingerprint();
-        let sink = Arc::new(CapturingOutputSink::new());
-        let mut worker = make_worker(
-            HashMap::from([(policy.as_u64(), config)]),
-            sink.clone(),
-            false,
-            0,
-            LateDataPolicy::Drop,
-        );
-
-        worker
-            .process_group_samples(
-                2,
-                policy,
-                &test_group_key(""),
-                group_samples("cpu", vec![(15_000, 42.0)]),
-            )
-            .unwrap();
-        worker
-            .process_group_samples(
-                2,
-                policy,
-                &test_group_key(""),
-                group_samples("cpu", vec![(45_000, 0.0)]),
-            )
-            .unwrap();
-
-        let captured = sink.drain();
-        assert_eq!(captured.len(), 2);
-        assert_eq!(
-            captured
-                .iter()
-                .map(|(output, _)| output.start_timestamp)
-                .collect::<Vec<_>>(),
-            vec![0, 10_000]
-        );
-        for (_, accumulator) in captured {
-            assert_eq!(
-                accumulator
-                    .as_any()
-                    .downcast_ref::<SumAccumulator>()
-                    .unwrap()
-                    .sum,
-                42.0
-            );
-        }
-    }
-
-    // -----------------------------------------------------------------------
-    // Test: MultipleSubpopulation — keyed accumulator with aggregated labels
-    // Matches planner output: grouping=[], aggregated=[host]
-    // All series go to one group, host is the key dimension INSIDE the sketch
-    // -----------------------------------------------------------------------
-
-    #[test]
-    fn test_keyed_accumulator_aggregated_labels() {
-        // Like planner output for `sum by (host) (cpu)`:
-        // grouping=[] (empty), aggregated=[host] (key inside KeyedSumCountAccumulator)
-        let config = make_agg_config_full(
-            3,
-            "cpu",
-            AggregationType::MultipleSubpopulation,
-            "Sum",
-            10,
-            0,
-            vec![],       // grouping: empty — one output group
-            vec!["host"], // aggregated: host is the key INSIDE the sketch
-        );
-        let mut agg_configs = HashMap::new();
-        agg_configs.insert(3, config);
-
-        let sink = Arc::new(CapturingOutputSink::new());
-        let mut worker = make_worker(agg_configs, sink.clone(), false, 0, LateDataPolicy::Drop);
-
-        // Both series go to the SAME bucket (group_key="" since grouping is empty).
-        // The host label is extracted as the aggregated key inside the accumulator.
-        let pf = PolicyFingerprint(3);
-        worker
-            .process_group_samples(
-                3,
-                pf,
-                &test_group_key(""),
-                vec![
-                    ("cpu{host=\"A\"}".to_string(), 1000, 10.0),
-                    ("cpu{host=\"B\"}".to_string(), 2000, 20.0),
-                ],
-            )
-            .unwrap();
-
-        // Close the single bucket's window
-        worker
-            .process_group_samples(
-                3,
-                pf,
-                &test_group_key(""),
-                group_samples("cpu{host=\"A\"}", vec![(10000, 0.0)]),
-            )
-            .unwrap();
-
-        let captured = sink.drain();
-        assert_eq!(
-            captured.len(),
-            1,
-            "one group → one output (both hosts inside)"
-        );
-
-        let (_output, acc) = &captured[0];
-        let ms_acc = acc
-            .as_any()
-            .downcast_ref::<KeyedSumCountAccumulator>()
-            .expect("should be KeyedSumCountAccumulator");
-
-        // The KeyedSumCountAccumulator should have two internal keys: "A" and "B"
-        assert_eq!(ms_acc.sums.len(), 2, "two host keys inside one accumulator");
-
-        let mut found_a = false;
-        let mut found_b = false;
-        for (key, &sum) in &ms_acc.sums {
-            if key.labels == vec!["A".to_string()] {
-                assert!((sum - 10.0).abs() < 1e-10);
-                found_a = true;
-            }
-            if key.labels == vec!["B".to_string()] {
-                assert!((sum - 20.0).abs() < 1e-10);
-                found_b = true;
-            }
-        }
-        assert!(found_a, "expected key A inside accumulator");
-        assert!(found_b, "expected key B inside accumulator");
-    }
-
-    #[test]
-    fn test_late_data_drop() {
-        let config = make_agg_config(
-            4,
-            "cpu",
-            AggregationType::SingleSubpopulation,
-            "Sum",
-            10,
-            0,
-            vec![],
-        );
-        let mut agg_configs = HashMap::new();
-        agg_configs.insert(4, config);
-
-        let sink = Arc::new(CapturingOutputSink::new());
-        let (_tx, rx) = tokio::sync::mpsc::channel(1);
-        let wm = Arc::new(AtomicI64::new(i64::MIN));
-        let mut worker = Worker::new(
-            0,
-            rx,
-            sink.clone(),
-            make_hot_reload(agg_configs),
-            WorkerRuntimeConfig {
-                max_buffer_per_series: 10_000,
-                allowed_lateness_ms: 0,
-                pass_raw_samples: false,
-                raw_mode_aggregation_id: 0,
-                late_data_policy: LateDataPolicy::Drop,
-                wall_clock_idle_grace_period_ms: 0,
-                wall_clock_max_open_grace_period_ms: 0,
-            },
-            Arc::new(AtomicUsize::new(0)),
-            wm,
-        );
-
-        // Establish watermark at t=20000ms
-        let pf = PolicyFingerprint(4);
-        worker
-            .process_group_samples(
-                4,
-                pf,
-                &test_group_key(""),
-                group_samples("cpu", vec![(20_000, 1.0)]),
-            )
-            .unwrap();
-        let _ = sink.drain();
-
-        // Send a late sample
-        worker
-            .process_group_samples(
-                4,
-                pf,
-                &test_group_key(""),
-                group_samples("cpu", vec![(5_000, 99.0)]),
-            )
-            .unwrap();
-
-        assert_eq!(sink.len(), 0, "late sample should be dropped");
-    }
-
-    // -----------------------------------------------------------------------
-    // Test: late data ForwardToStore
-    // -----------------------------------------------------------------------
-
-    #[test]
-    fn test_late_data_forward_to_store() {
-        let config = make_agg_config(
-            5,
-            "cpu",
-            AggregationType::SingleSubpopulation,
-            "Sum",
-            10,
-            0,
-            vec![],
-        );
-        let mut agg_configs = HashMap::new();
-        agg_configs.insert(5, config);
-
-        let sink = Arc::new(CapturingOutputSink::new());
-        let (_tx, rx) = tokio::sync::mpsc::channel(1);
-        let wm = Arc::new(AtomicI64::new(i64::MIN));
-        let mut worker = Worker::new(
-            0,
-            rx,
-            sink.clone(),
-            make_hot_reload(agg_configs),
-            WorkerRuntimeConfig {
-                max_buffer_per_series: 10_000,
-                allowed_lateness_ms: 15_000,
-                pass_raw_samples: false,
-                raw_mode_aggregation_id: 0,
-                late_data_policy: LateDataPolicy::ForwardToStore,
-                wall_clock_idle_grace_period_ms: 0,
-                wall_clock_max_open_grace_period_ms: 0,
-            },
-            Arc::new(AtomicUsize::new(0)),
-            wm,
-        );
-
-        // Seed then advance max event time far enough that the 15s lateness
-        // budget permits closing [0, 10s).
-        let pf = PolicyFingerprint(5);
-        worker
-            .process_group_samples(
-                5,
-                pf,
-                &test_group_key(""),
-                group_samples("cpu", vec![(500, 1.0)]),
-            )
-            .unwrap();
-        worker
-            .process_group_samples(
-                5,
-                pf,
-                &test_group_key(""),
-                group_samples("cpu", vec![(30_000, 0.0)]),
-            )
-            .unwrap();
-        let _ = sink.drain();
-
-        // Send late sample for evicted pane
-        worker
-            .process_group_samples(
-                5,
-                pf,
-                &test_group_key(""),
-                group_samples("cpu", vec![(8_000, 55.0)]),
-            )
-            .unwrap();
-
-        let captured = sink.drain();
-        assert_eq!(captured.len(), 1, "ForwardToStore should emit");
-
-        let (output, acc) = &captured[0];
-        assert!(!output.policy_fp.is_unset());
-        assert_eq!(output.start_timestamp, 0);
-        assert_eq!(output.end_timestamp, 10_000);
-
-        let sum_acc = acc
-            .as_any()
-            .downcast_ref::<SumAccumulator>()
-            .expect("should be SumAccumulator");
-        assert!(
-            (sum_acc.sum - 55.0).abs() < 1e-10,
-            "late sample sum should be 55.0, got {}",
-            sum_acc.sum
-        );
-    }
-
-    // -----------------------------------------------------------------------
-    // Test: worker from installed_precompute_plan YAML
-    // -----------------------------------------------------------------------
-
-    #[test]
-    fn test_worker_rejects_flat_streaming_config_yaml() {
-        let data =
-            serde_yaml::from_str("aggregations: [{aggregationType: Sum, metric: m}]").unwrap();
-        assert!(
-            serde_yaml::from_value::<asap_types::precompute_plan::PrecomputePlan>(data).is_err()
-        );
-    }
-
-    #[test]
-    fn test_extract_key_from_series() {
-        let config = PrecomputeMaterialization::new(
-            AggregationType::SingleSubpopulation,
-            "Sum".to_string(),
-            HashMap::new(),
-            asap_types::KeyByLabelNames::new(vec!["method".to_string(), "status".to_string()]),
-            asap_types::KeyByLabelNames::new(vec![]),
-            asap_types::KeyByLabelNames::new(vec![]),
-            String::new(),
-            60,
-            0,
-            WindowKind::Tumbling,
-            "http_requests_total".to_string(),
-            "http_requests_total".to_string(),
-            Some(60),
-            None,
-            None,
-        );
-
-        let key = extract_key_from_series(
-            "http_requests_total{method=\"GET\",status=\"200\"}",
-            &config,
-        );
-        assert_eq!(key.labels, vec!["GET".to_string(), "200".to_string()]);
-    }
-
-    #[test]
-    fn test_build_group_key_label_values() {
-        let single = test_group_key("constant");
-        let key = build_group_key_label_values(&single);
-        assert_eq!(key.labels, vec!["constant".to_string()]);
-
-        let delimited = crate::precompute_engine::group_key::intern_pairs([
-            ("region", "us-east;1"),
-            ("service", "svc-a"),
-        ]);
-        let key = build_group_key_label_values(&delimited);
-        assert_eq!(
-            key.labels,
-            vec!["us-east;1".to_string(), "svc-a".to_string()]
-        );
-
-        let empty = test_group_key("");
-        let key = build_group_key_label_values(&empty);
-        assert!(key.labels.is_empty());
-
-        let group =
-            crate::precompute_engine::group_key::intern_pairs([("instance", "a"), ("job", "api")]);
-        let key = build_group_key_label_values(&group);
-        assert_eq!(key.labels, vec!["a".to_string(), "api".to_string()]);
-        let output = precomputed_output_for_group(
-            0,
-            5_000,
-            key,
-            PolicyFingerprint(7),
-            &group,
-            &BTreeMap::new(),
-            1,
-            None,
-            None,
-        );
-        assert_eq!(
-            output.population_labels,
-            Some(BTreeMap::from([
-                ("instance".to_string(), "a".to_string()),
-                ("job".to_string(), "api".to_string()),
-            ])),
-        );
-    }
-
-    // -----------------------------------------------------------------------
-    // Tests: cross-group watermark propagation
-    // -----------------------------------------------------------------------
-
-    #[test]
-    fn test_group_watermarks_are_isolated() {
-        // Two groups on the same worker. Group A advances to t=100s while
-        // group B remains active at t=5s. Group A is not evidence that group
-        // B's source has completed its earlier window.
-        let config = make_agg_config(
-            1,
-            "cpu",
-            AggregationType::SingleSubpopulation,
-            "Sum",
-            10,
-            0,
-            vec![],
-        );
-        let agg_configs = HashMap::from([(1, config)]);
-        let sink = Arc::new(CapturingOutputSink::new());
-        let mut worker = make_worker(agg_configs, sink.clone(), false, 0, LateDataPolicy::Drop);
-
-        // Two distinct group_keys ("groupA" / "groupB") under the same
-        // policy → two distinct sids (each sid is one bucket; the legacy
-        // `(agg_id, group_key)` tuple folded into a single u64).
-        let pf = PolicyFingerprint(1);
-        let sid_a = 21_u64;
-        let sid_b = 22_u64;
-        // Group A: send sample at t=5s (within window [0, 10s))
-        worker
-            .process_group_samples(
-                sid_a,
-                pf,
-                &test_group_key("groupA"),
-                group_samples("cpu", vec![(5_000, 1.0)]),
-            )
-            .unwrap();
-        // Group B: send sample at t=5s (within window [0, 10s))
-        worker
-            .process_group_samples(
-                sid_b,
-                pf,
-                &test_group_key("groupB"),
-                group_samples("cpu", vec![(5_000, 2.0)]),
-            )
-            .unwrap();
-        let _ = sink.drain();
-
-        // Advance group A's watermark to t=100s (closes many windows).
-        worker
-            .process_group_samples(
-                sid_a,
-                pf,
-                &test_group_key("groupA"),
-                group_samples("cpu", vec![(100_000, 3.0)]),
-            )
-            .unwrap();
-        let _ = sink.drain();
-
-        // Group B has NOT received new data — its event-time watermark is
-        // still at 5s. Flushing must not borrow group A's timestamp.
-        worker.flush_all().unwrap();
-        let flushed = sink.drain();
-
-        let group_b_outputs: Vec<_> = flushed
-            .iter()
-            .filter(|(out, _)| {
-                out.key
-                    .as_ref()
-                    .map(|k| k.labels == vec!["groupB".to_string()])
-                    .unwrap_or(false)
-            })
-            .collect();
-        assert!(
-            group_b_outputs.is_empty(),
-            "one group must not force-close another group's event-time window"
-        );
-
-        worker
-            .process_group_samples(
-                sid_b,
-                pf,
-                &test_group_key("groupB"),
-                group_samples("cpu", vec![(5_000, 4.0)]),
-            )
-            .unwrap();
-        worker.force_close_all().unwrap();
-        let group_b = sink
-            .drain()
-            .into_iter()
-            .find(|(out, _)| {
-                out.key
-                    .as_ref()
-                    .map(|k| k.labels == vec!["groupB".to_string()])
-                    .unwrap_or(false)
-            })
-            .expect("group B should emit on shutdown");
-        let sum = group_b
-            .1
-            .as_any()
-            .downcast_ref::<SumAccumulator>()
-            .expect("must emit SumAccumulator");
-        assert_eq!(sum.sum, 6.0, "group B's second sample must not be late");
-    }
-
-    #[test]
-    fn repeated_flushes_do_not_make_fixed_timestamp_input_late() {
-        let config = make_agg_config(
-            1,
-            "cpu",
-            AggregationType::SingleSubpopulation,
-            "Sum",
-            1,
-            0,
-            vec![],
-        );
-        let sink = Arc::new(CapturingOutputSink::new());
-        let mut worker = make_worker_with_lateness(
-            HashMap::from([(1, config)]),
-            sink.clone(),
-            false,
-            0,
-            LateDataPolicy::Drop,
-            1,
-        );
-        let pf = PolicyFingerprint(1);
-
-        worker
-            .process_group_samples(
-                1,
-                pf,
-                &test_group_key(""),
-                group_samples("cpu", vec![(0, 1.0)]),
-            )
-            .unwrap();
-        worker.flush_all().unwrap();
-        worker.flush_all().unwrap();
-        worker
-            .process_group_samples(
-                1,
-                pf,
-                &test_group_key(""),
-                group_samples("cpu", vec![(0, 2.0)]),
-            )
-            .unwrap();
-        worker.force_close_all().unwrap();
-
-        let emitted = sink.drain();
-        assert_eq!(emitted.len(), 1);
-        let sum = emitted[0]
-            .1
-            .as_any()
-            .downcast_ref::<SumAccumulator>()
-            .expect("must emit SumAccumulator");
-        assert_eq!(sum.sum, 3.0, "flush must not manufacture event time");
-    }
-
-    #[test]
-    fn allowed_lateness_delays_event_time_window_close() {
-        let config = make_agg_config(
-            1,
-            "cpu",
-            AggregationType::SingleSubpopulation,
-            "Sum",
-            10,
-            0,
-            vec![],
-        );
-        let sink = Arc::new(CapturingOutputSink::new());
-        let mut worker = make_worker_with_lateness(
-            HashMap::from([(1, config)]),
-            sink.clone(),
-            false,
-            0,
-            LateDataPolicy::Drop,
-            5_000,
-        );
-        let pf = PolicyFingerprint(1);
-
-        worker
-            .process_group_samples(
-                1,
-                pf,
-                &test_group_key(""),
-                group_samples("cpu", vec![(5_000, 1.0)]),
-            )
-            .unwrap();
-        worker
-            .process_group_samples(
-                1,
-                pf,
-                &test_group_key(""),
-                group_samples("cpu", vec![(10_000, 2.0)]),
-            )
-            .unwrap();
-        assert_eq!(
-            sink.len(),
-            0,
-            "window [0, 10s) remains open until max event time reaches 15s"
-        );
-
-        worker
-            .process_group_samples(
-                1,
-                pf,
-                &test_group_key(""),
-                group_samples("cpu", vec![(15_000, 3.0)]),
-            )
-            .unwrap();
-        let emitted = sink.drain();
-        assert_eq!(emitted.len(), 1);
-        assert_eq!(emitted[0].0.start_timestamp, 0);
-        assert_eq!(emitted[0].0.end_timestamp, 10_000);
-    }
-
-    #[test]
-    fn first_catch_up_batch_closes_every_complete_window() {
-        let config = make_agg_config(
-            1,
-            "cpu",
-            AggregationType::SingleSubpopulation,
-            "Sum",
-            5,
-            0,
-            vec![],
-        );
-        let sink = Arc::new(CapturingOutputSink::new());
-        let mut worker = make_worker_with_lateness(
-            HashMap::from([(1, config)]),
-            sink.clone(),
-            false,
-            0,
-            LateDataPolicy::Drop,
-            0,
-        );
-
-        worker
-            .process_group_samples(
-                1,
-                PolicyFingerprint(1),
-                &test_group_key(""),
-                group_samples(
-                    "cpu",
-                    vec![
-                        (500, 1.0),
-                        (4_200, 2.0),
-                        (5_400, 3.0),
-                        (9_400, 4.0),
-                        (10_500, 5.0),
-                    ],
-                ),
-            )
-            .unwrap();
-
-        let emitted = sink.drain();
-        assert_eq!(emitted.len(), 2);
-        assert_eq!(emitted[0].0.start_timestamp, 0);
-        assert_eq!(emitted[0].0.end_timestamp, 5_000);
-        assert_eq!(emitted[1].0.start_timestamp, 5_000);
-        assert_eq!(emitted[1].0.end_timestamp, 10_000);
-    }
-
-    #[test]
-    fn test_flush_publishes_worker_watermark() {
-        let config = make_agg_config(
-            1,
-            "cpu",
-            AggregationType::SingleSubpopulation,
-            "Sum",
-            10,
-            0,
-            vec![],
-        );
-        let agg_configs = HashMap::from([(1, config)]);
-        let sink = Arc::new(CapturingOutputSink::new());
-        let wm = Arc::new(AtomicI64::new(i64::MIN));
-        let (_tx, rx) = tokio::sync::mpsc::channel(1);
-        let mut worker = Worker::new(
-            0,
-            rx,
-            sink,
-            make_hot_reload(agg_configs),
-            WorkerRuntimeConfig {
-                max_buffer_per_series: 10_000,
-                allowed_lateness_ms: 0,
-                pass_raw_samples: false,
-                raw_mode_aggregation_id: 0,
-                late_data_policy: LateDataPolicy::Drop,
-                wall_clock_idle_grace_period_ms: 0,
-                wall_clock_max_open_grace_period_ms: 0,
-            },
-            Arc::new(AtomicUsize::new(0)),
-            wm.clone(),
-        );
-
-        assert_eq!(wm.load(Ordering::Acquire), i64::MIN);
-
-        // Send data at t=50s
-        let pf = PolicyFingerprint(1);
-        worker
-            .process_group_samples(
-                1,
-                pf,
-                &test_group_key(""),
-                group_samples("cpu", vec![(50_000, 1.0)]),
-            )
-            .unwrap();
-
-        // Flush should publish worker watermark
-        worker.flush_all().unwrap();
-        assert_eq!(
-            wm.load(Ordering::Acquire),
-            50_000,
-            "worker watermark should be published after flush"
-        );
-    }
-
-    // -----------------------------------------------------------------------
-    // Sweep blocker #2: ASAP-tier persistence path for sketch ingest.
-    //
-    // Pre-fix the OTLP sketch path produced `worker_process_accumulator`
-    // log lines but never persisted into the per_key store, so PromQL
-    // queries returned `Metric not found`. The tests below pin the
-    // `process_accumulator_input` → window-close → emit_batch contract
-    // so a future refactor can't regress it without tripping a unit
-    // test. They are deliberately written in terms of the public worker
-    // API + a real `DDSketchAccumulator`, exactly mirroring what the
-    // OTLP ingest dispatch builds via `decode_modified_otlp_sketch_bytes`.
-    // -----------------------------------------------------------------------
-
-    use asap_physical_operators::summary_kernels::DDSketchAccumulator;
-    use asap_sketchlib::DdSketch;
-
-    /// Build a fresh DDSketch holding `vals` so each test has a real,
-    /// non-empty sketch to push through `process_accumulator_input`.
-    fn make_ddsketch(alpha: f64, vals: &[f64]) -> DDSketchAccumulator {
-        let mut s = DdSketch::new(alpha);
-        for v in vals {
-            // DDSketch only ingests positive values; the agent's
-            // `_quantile` suffix metric carries latencies, so
-            // positive-only is the realistic shape.
-            s.update(*v);
-        }
-        DDSketchAccumulator {
-            inner: s,
-            sample_p: 1.0,
-        }
-    }
-
-    /// Pinning test: a single-group, single-window sketch ingest must
-    /// emit *exactly one* persisted output once the watermark advances
-    /// past the window boundary. This is the unit-level reproducer of
-    /// the sweep blocker — pre-fix the path between
-    /// `worker_process_accumulator` and the per_key store insert was
-    /// silent, so this test would never see an emit.
-    #[test]
-    fn test_process_accumulator_input_persists_after_window_close() {
-        // 30s tumbling window — matches `backend-streaming.yaml`
-        // for `http_requests_total_latency_ms_quantile`.
-        let cfg = make_agg_config(
-            1,
-            "http_requests_total_latency_ms_quantile",
-            AggregationType::DDSketch,
-            "",
-            30,
-            0,
-            vec!["zone"],
-        );
-        let agg_configs = HashMap::from([(1, cfg)]);
-        let sink = Arc::new(CapturingOutputSink::new());
-        let mut worker = make_worker(agg_configs, sink.clone(), false, 0, LateDataPolicy::Drop);
-
-        // First batch: 10 sketches at t=60_000 ms, all under the same
-        // bucket (group_key="us-east") — mirrors the agent emitting one
-        // sketch per (zone,rack,node,pod) tuple while the backend rolls
-        // them up by zone.
-        let pf = PolicyFingerprint(1);
-        let sid = 31_u64;
-        for i in 0..10 {
-            let s = make_ddsketch(0.01, &[1.0 + i as f64, 2.0, 3.0]);
-            worker
-                .process_accumulator_input(sid, pf, &test_group_key("us-east"), 60_000, Box::new(s))
-                .expect("first batch must process");
-        }
-        assert_eq!(
-            sink.len(),
-            0,
-            "first batch alone does not close any window — watermark is still at first-sample time"
-        );
-
-        // Second batch at t=120_000 ms (60s later). Watermark advances
-        // 60_000 → 120_000, and `closed_windows` must return [60_000, 90_000)
-        // (a 30s window). The pane at 60_000 holds the merged sketch from
-        // batch 1, so `merge_sketch_panes_for_window` returns Some(...)
-        // and the output is emitted.
-        let s2 = make_ddsketch(0.01, &[5.0, 6.0]);
-        worker
-            .process_accumulator_input(sid, pf, &test_group_key("us-east"), 120_000, Box::new(s2))
-            .expect("second batch must process");
-
-        let captured = sink.drain();
-        assert!(
-            !captured.is_empty(),
-            "ASAP-tier sketch persistence regressed: window close did not emit any output. \
-             pre-fix this is exactly the symptom the sweep agent saw — \
-             `worker_process_accumulator` fires but per_key store stays empty."
-        );
-        // The emitted output's window must be [60_000, 90_000) — the
-        // 30s tumbling window that contained the first batch.
-        let (output, acc) = &captured[0];
-        // PR-6 follow-up: `aggregation_id` field is gone; the worker
-        // now emits the config's policy fingerprint. Non-UNSET asserts
-        // the emit path threaded the source config through.
-        assert!(!output.policy_fp.is_unset());
-        assert_eq!(output.start_timestamp, 60_000);
-        assert_eq!(output.end_timestamp, 90_000);
-        assert_eq!(
-            acc.type_name(),
-            "DDSketchAccumulator",
-            "persisted accumulator must round-trip as DDSketchAccumulator (not silently demoted)"
-        );
-
-        // The merged sketch must contain all 10 first-batch sketches.
-        // Each sketch added 3 values, so total count = 10 * 3 = 30.
-        let dd = acc
-            .as_any()
-            .downcast_ref::<DDSketchAccumulator>()
-            .expect("must downcast back to DDSketchAccumulator");
-        assert_eq!(
-            dd.inner.total_count(),
-            30,
-            "all 10 first-batch sketches must merge into the persisted output (3 values × 10)"
-        );
-    }
-
-    /// Pin the agent-emit-shape vs. backend-grouping-config invariant from
-    /// hypothesis (A) of the sweep diagnostic. The agent emits one sketch
-    /// per `(zone, rack, node, pod)` tuple; backend's `grouping_labels =
-    /// [zone]` rolls them up. This test asserts the rollup actually
-    /// happens — sketches with different `(rack, node, pod)` but same
-    /// `zone` must collapse into a single persisted output per zone.
-    /// If a future change changes `grouping_labels` to include
-    /// `rack/node/pod`, the agent's per-tuple emit shape would land 1000
-    /// outputs in the store instead of `n_zones`, blowing up cardinality
-    /// and breaking ASAP-tier reads.
-    #[test]
-    fn test_grouping_labels_roll_up_per_tuple_sketches() {
-        let cfg = make_agg_config(
-            1,
-            "http_requests_total_latency_ms_quantile",
-            AggregationType::DDSketch,
-            "",
-            30,
-            0,
-            vec!["zone"], // sole grouping dim — rack/node/pod are rolled up
-        );
-        let agg_configs = HashMap::from([(1, cfg)]);
-        let sink = Arc::new(CapturingOutputSink::new());
-        let mut worker = make_worker(agg_configs, sink.clone(), false, 0, LateDataPolicy::Drop);
-
-        // Three sketches in the SAME zone but different (rack,node,pod)
-        // tuples — emulating what the agent ships. Group key the ingest
-        // path computes is the zone value alone; distinct group_keys
-        // (us-east vs us-west) get distinct sids.
-        let pf = PolicyFingerprint(1);
-        let sid_east = 41_u64;
-        let sid_west = 42_u64;
-        for i in 0..3 {
-            let s = make_ddsketch(0.01, &[100.0 + i as f64]);
-            worker
-                .process_accumulator_input(
-                    sid_east,
-                    pf,
-                    &test_group_key("us-east"),
-                    60_000,
-                    Box::new(s),
-                )
-                .unwrap();
-        }
-        // Two sketches in a different zone.
-        for i in 0..2 {
-            let s = make_ddsketch(0.01, &[200.0 + i as f64]);
-            worker
-                .process_accumulator_input(
-                    sid_west,
-                    pf,
-                    &test_group_key("us-west"),
-                    60_000,
-                    Box::new(s),
-                )
-                .unwrap();
-        }
-
-        // Advance the watermark past 90_000 to close window [60_000, 90_000).
-        let s = make_ddsketch(0.01, &[1.0]);
-        worker
-            .process_accumulator_input(
-                sid_east,
-                pf,
-                &test_group_key("us-east"),
-                120_000,
-                Box::new(s),
-            )
-            .unwrap();
-        let s = make_ddsketch(0.01, &[1.0]);
-        worker
-            .process_accumulator_input(
-                sid_west,
-                pf,
-                &test_group_key("us-west"),
-                120_000,
-                Box::new(s),
-            )
-            .unwrap();
-
-        let captured = sink.drain();
-        // Exactly two emissions for the closed window: one per zone.
-        // (us-east merges 3 per-tuple sketches; us-west merges 2.)
-        let closed_window_outputs: Vec<_> = captured
-            .iter()
-            .filter(|(o, _)| o.start_timestamp == 60_000 && o.end_timestamp == 90_000)
-            .collect();
-        assert_eq!(
-            closed_window_outputs.len(),
-            2,
-            "must emit exactly 2 outputs (one per zone) for the closed window — \
-             rollup over rack/node/pod must collapse the 5 per-tuple sketches into 2 per-zone outputs"
-        );
-
-        // Verify the merged counts: us-east merges 3 sketches × 1 value each = 3.
-        for (output, acc) in closed_window_outputs.iter() {
-            let dd = acc
-                .as_any()
-                .downcast_ref::<DDSketchAccumulator>()
-                .expect("must be DDSketchAccumulator");
-            let zone = output
-                .key
-                .as_ref()
-                .and_then(|k| k.labels.first().cloned())
-                .unwrap_or_default();
-            let expected_count: u64 = match zone.as_str() {
-                "us-east" => 3,
-                "us-west" => 2,
-                other => panic!("unexpected zone {other}"),
-            };
-            assert_eq!(
-                dd.inner.total_count(),
-                expected_count,
-                "zone {zone} must roll up exactly {expected_count} per-tuple sketches"
-            );
-        }
-    }
-
-    // -----------------------------------------------------------------------
-    // Sweep blocker #2 — root-cause fix: wall-clock watermark fallback.
-    //
-    // Pin the failure mode PR #82 escalated as "watermark-semantics design
-    // change": event-time stagnates (agent stamps every sketch with the same
-    // `time_unix_nano`, e.g. window-start instead of flush-time), so
-    // `closed_windows(prev_wm, prev_wm + 1)` in `flush_all` returns empty
-    // forever, the 30s window never closes, no output ever lands in the
-    // per_key store, and ASAP-tier queries come back empty even though
-    // `worker_process_accumulator` keeps logging.
-    //
-    // The fix tracks each pane's wall-clock last-touch time and force-closes
-    // its window once `now - last_touch >= window_size + grace`. This test
-    // injects a fake clock so it runs in milliseconds instead of needing
-    // `std::thread::sleep(35s)`.
-    // -----------------------------------------------------------------------
-
-    /// Build a worker with explicit wall-clock closure grace values.
-    fn make_worker_with_wall_clock_policy(
-        agg_configs: HashMap<u64, PrecomputeMaterialization>,
-        sink: Arc<CapturingOutputSink>,
-        late_data_policy: LateDataPolicy,
-        idle_grace_period_ms: i64,
-        max_open_grace_period_ms: i64,
-    ) -> Worker {
-        let (_tx, rx) = tokio::sync::mpsc::channel(1);
-        let wm = Arc::new(AtomicI64::new(i64::MIN));
-        Worker::new(
-            0,
-            rx,
-            sink,
-            make_hot_reload(agg_configs),
-            WorkerRuntimeConfig {
-                max_buffer_per_series: 10_000,
-                allowed_lateness_ms: 0,
-                pass_raw_samples: false,
-                raw_mode_aggregation_id: 0,
-                late_data_policy,
-                wall_clock_idle_grace_period_ms: idle_grace_period_ms,
-                wall_clock_max_open_grace_period_ms: max_open_grace_period_ms,
-            },
-            Arc::new(AtomicUsize::new(0)),
-            wm,
-        )
-    }
-
-    /// Direct test of the wall-clock fallback in `flush_all`. Pins
-    /// the fix for sweep blocker #2: even if event-time freezes (every
-    /// sketch arrives with the same `time_unix_nano`), the pane must
-    /// close once wall-clock time exceeds `window_size + grace`. Uses
-    /// an injected fake clock to run in microseconds rather than
-    /// sleeping 35 real seconds.
-    #[test]
-    fn wall_clock_fallback_closes_idle_window() {
-        let cfg = make_agg_config(
-            1,
-            "http_requests_total_latency_ms_quantile",
-            AggregationType::DDSketch,
-            "",
-            30, // 30-second tumbling window
-            0,
-            vec!["zone"],
-        );
-        let agg_configs = HashMap::from([(1, cfg)]);
-        let sink = Arc::new(CapturingOutputSink::new());
-        // 5s grace period — production default.
-        let mut worker = make_worker_with_wall_clock_policy(
-            agg_configs,
-            sink.clone(),
-            LateDataPolicy::Drop,
-            5_000,
-            0,
-        );
-
-        // Pin clock at t_wall = 1_000_000 ms during ingest. Every
-        // sketch arrives stamped with the SAME event-time
-        // (time_unix_nano collapsing to a constant 0 / window-start
-        // is the production failure mode the live diagnostic showed:
-        // 8000 worker_process_accumulator log lines, 0 store entries).
-        let wall_clock = Arc::new(AtomicI64::new(1_000_000));
-        let wc_clone = wall_clock.clone();
-        worker.set_now_ms_fn(Box::new(move || wc_clone.load(Ordering::Relaxed)));
-
-        // Ingest 10 sketches all stamped at frozen event-time t_event=0.
-        let pf = PolicyFingerprint(1);
-        let sid = 51_u64;
-        for i in 0..10 {
-            let s = make_ddsketch(0.01, &[1.0 + i as f64]);
-            worker
-                .process_accumulator_input(sid, pf, &test_group_key("us-east"), 0, Box::new(s))
-                .expect("ingest must accept frozen-event-time sketches");
-        }
-        assert_eq!(
-            sink.len(),
-            0,
-            "no output should be emitted yet: event-time hasn't advanced past the window"
-        );
-
-        // Flush at the same wall-clock time (only ~0s elapsed since
-        // pane creation). Wall-clock fallback must NOT trigger yet —
-        // pane is younger than window_size + grace = 35s.
-        worker.flush_all().unwrap();
-        assert_eq!(
-            sink.len(),
-            0,
-            "flush at t_wall=last_touch must not close the window — fallback fires only after grace"
-        );
-
-        // Advance fake wall-clock by exactly window_size + grace = 35s.
-        // Now the pane has been open long enough that the fallback
-        // must close + emit + persist its window, even though
-        // event-time is still pinned at 0.
-        wall_clock.store(1_000_000 + 30_000 + 5_000, Ordering::Relaxed);
-        worker.flush_all().unwrap();
-
-        let captured = sink.drain();
-        assert!(
-            !captured.is_empty(),
-            "wall-clock fallback failed to close the idle window — \
-             this is the live sweep blocker #2 root cause: with frozen event-time, \
-             the 30s window \
-             never closes."
-        );
-
-        // The emitted output must cover the window [0, 30_000)
-        // — the tumbling 30s window containing all the frozen-time
-        // sketches.
-        let (output, acc) = &captured[0];
-        // PR-6 follow-up: `aggregation_id` field is gone; the worker
-        // now emits the config's policy fingerprint. Non-UNSET asserts
-        // the emit path threaded the source config through.
-        assert!(!output.policy_fp.is_unset());
-        assert_eq!(output.start_timestamp, 0);
-        assert_eq!(output.end_timestamp, 30_000);
-        assert_eq!(
-            acc.type_name(),
-            "DDSketchAccumulator",
-            "wall-clock-fallback-emitted accumulator must round-trip as DDSketchAccumulator"
-        );
-        let dd = acc
-            .as_any()
-            .downcast_ref::<DDSketchAccumulator>()
-            .expect("must downcast back to DDSketchAccumulator");
-        assert_eq!(
-            dd.inner.total_count(),
-            10,
-            "all 10 frozen-time sketches must merge into the single emitted output"
-        );
-
-        // Calling flush_all again with no new data must NOT re-emit
-        // the same window — once a window has been closed via the
-        // fallback, its pane is drained from `sketch_panes` and from
-        // `pane_wall_clock`, so there's nothing left to
-        // close. This pins the monotonicity invariant: emitted
-        // windows have monotonically non-decreasing close times and
-        // each window is emitted at most once.
-        worker.flush_all().unwrap();
-        assert_eq!(
-            sink.len(),
-            0,
-            "wall-clock fallback must be idempotent — already-closed window must not re-emit"
-        );
-    }
-
-    #[test]
-    fn wall_clock_fallback_does_not_close_active_raw_ingest() {
-        let cfg = make_agg_config(
-            7,
-            "netflow_bytes",
-            AggregationType::SingleSubpopulation,
-            "Sum",
-            1,
-            0,
-            vec![],
-        );
-        let sink = Arc::new(CapturingOutputSink::new());
-        let mut worker = make_worker_with_wall_clock_policy(
-            HashMap::from([(7, cfg)]),
-            sink.clone(),
-            LateDataPolicy::Drop,
-            5_000,
-            0,
-        );
-        let wall_clock = Arc::new(AtomicI64::new(1_000_000));
-        let wc_clone = wall_clock.clone();
-        worker.set_now_ms_fn(Box::new(move || wc_clone.load(Ordering::Relaxed)));
-
-        let pf = PolicyFingerprint(7);
-        let mut expected_sum = 0.0;
-        for i in 0..7 {
-            wall_clock.store(1_000_000 + i * 1_000, Ordering::Relaxed);
-            let value = 1.0 + i as f64;
-            expected_sum += value;
-            worker
-                .process_group_samples(
-                    7,
-                    pf,
-                    &test_group_key(""),
-                    group_samples("netflow_bytes", vec![(0, value)]),
-                )
-                .unwrap();
-        }
-
-        // The pane is older than the old creation-time deadline, but was
-        // touched only 500ms ago. Active ingest must keep it open.
-        wall_clock.store(1_006_500, Ordering::Relaxed);
-        worker.flush_all().unwrap();
-        assert_eq!(sink.len(), 0, "active raw pane was force-closed");
-
-        wall_clock.store(1_007_000, Ordering::Relaxed);
-        expected_sum += 8.0;
-        worker
-            .process_group_samples(
-                7,
-                pf,
-                &test_group_key(""),
-                group_samples("netflow_bytes", vec![(0, 8.0)]),
-            )
-            .unwrap();
-
-        wall_clock.store(1_013_001, Ordering::Relaxed);
-        worker.flush_all().unwrap();
-        let captured = sink.drain();
-        assert_eq!(captured.len(), 1, "idle raw pane must close once");
-        let sum = captured[0]
-            .1
-            .as_any()
-            .downcast_ref::<SumAccumulator>()
-            .expect("must emit SumAccumulator");
-        assert!((sum.sum - expected_sum).abs() < 1e-9);
-    }
-
-    #[test]
-    fn absolute_wall_clock_deadline_closes_active_raw_ingest() {
-        let cfg = make_agg_config(
-            9,
-            "netflow_bytes",
-            AggregationType::SingleSubpopulation,
-            "Sum",
-            1,
-            0,
-            vec![],
-        );
-        let sink = Arc::new(CapturingOutputSink::new());
-        let mut worker = make_worker_with_wall_clock_policy(
-            HashMap::from([(9, cfg)]),
-            sink.clone(),
-            LateDataPolicy::ForwardToStore,
-            5_000,
-            5_000,
-        );
-        let wall_clock = Arc::new(AtomicI64::new(3_000_000));
-        let wc_clone = wall_clock.clone();
-        worker.set_now_ms_fn(Box::new(move || wc_clone.load(Ordering::Relaxed)));
-
-        let pf = PolicyFingerprint(9);
-        for i in 0..7 {
-            wall_clock.store(3_000_000 + i * 1_000, Ordering::Relaxed);
-            worker
-                .process_group_samples(
-                    9,
-                    pf,
-                    &test_group_key(""),
-                    group_samples("netflow_bytes", vec![(0, 1.0 + i as f64)]),
-                )
-                .unwrap();
-        }
-
-        // The last touch was only 500ms ago, but the pane has been open for
-        // 6.5s: longer than window_size + max_open_grace = 6s.
-        wall_clock.store(3_006_500, Ordering::Relaxed);
-        worker.flush_all().unwrap();
-        let mut captured = sink.drain();
-        assert_eq!(captured.len(), 1, "absolute deadline must bound freshness");
-        let initial = captured.pop().expect("deadline output").1;
-        let sum = initial
-            .as_any()
-            .downcast_ref::<SumAccumulator>()
-            .expect("must emit SumAccumulator");
-        assert_eq!(sum.sum, 28.0);
-
-        // Continuing input for the already-closed event-time window becomes a
-        // mergeable correction instead of being silently dropped.
-        wall_clock.store(3_007_000, Ordering::Relaxed);
-        worker
-            .process_group_samples(
-                9,
-                pf,
-                &test_group_key(""),
-                group_samples("netflow_bytes", vec![(0, 8.0)]),
-            )
-            .unwrap();
-        let mut corrections = sink.drain();
-        assert_eq!(corrections.len(), 1, "late input must emit a correction");
-        let correction = corrections.pop().expect("correction output").1;
-        let merged = initial
-            .merge_with(correction.as_ref())
-            .expect("deadline output and correction must merge");
-        let merged_sum = merged
-            .as_any()
-            .downcast_ref::<SumAccumulator>()
-            .expect("merged output must remain SumAccumulator");
-        assert_eq!(merged_sum.sum, 36.0);
-    }
-
-    #[test]
-    fn absolute_deadline_is_disabled_for_drop_policy() {
-        let cfg = make_agg_config(
-            11,
-            "netflow_bytes",
-            AggregationType::SingleSubpopulation,
-            "Sum",
-            1,
-            0,
-            vec![],
-        );
-        let sink = Arc::new(CapturingOutputSink::new());
-        let mut worker = make_worker_with_wall_clock_policy(
-            HashMap::from([(11, cfg)]),
-            sink.clone(),
-            LateDataPolicy::Drop,
-            0,
-            5_000,
-        );
-        let wall_clock = Arc::new(AtomicI64::new(5_000_000));
-        let wc_clone = wall_clock.clone();
-        worker.set_now_ms_fn(Box::new(move || wc_clone.load(Ordering::Relaxed)));
-
-        worker
-            .process_group_samples(
-                11,
-                PolicyFingerprint(11),
-                &test_group_key(""),
-                group_samples("netflow_bytes", vec![(0, 1.0)]),
-            )
-            .unwrap();
-        wall_clock.store(5_006_500, Ordering::Relaxed);
-        worker.flush_all().unwrap();
-        assert_eq!(
-            sink.len(),
-            0,
-            "a deadline must not close a pane when later input would be dropped"
-        );
-    }
-
-    #[test]
-    fn wall_clock_fallback_does_not_close_active_sketch_ingest() {
-        let cfg = make_agg_config(
-            8,
-            "latency",
-            AggregationType::DDSketch,
-            "",
-            1,
-            0,
-            vec!["zone"],
-        );
-        let sink = Arc::new(CapturingOutputSink::new());
-        let mut worker = make_worker_with_wall_clock_policy(
-            HashMap::from([(8, cfg)]),
-            sink.clone(),
-            LateDataPolicy::Drop,
-            5_000,
-            0,
-        );
-        let wall_clock = Arc::new(AtomicI64::new(2_000_000));
-        let wc_clone = wall_clock.clone();
-        worker.set_now_ms_fn(Box::new(move || wc_clone.load(Ordering::Relaxed)));
-
-        let pf = PolicyFingerprint(8);
-        for i in 0..7 {
-            wall_clock.store(2_000_000 + i * 1_000, Ordering::Relaxed);
-            worker
-                .process_accumulator_input(
-                    80,
-                    pf,
-                    &test_group_key("us-east"),
-                    0,
-                    Box::new(make_ddsketch(0.01, &[1.0 + i as f64])),
-                )
-                .unwrap();
-        }
-
-        wall_clock.store(2_006_500, Ordering::Relaxed);
-        worker.flush_all().unwrap();
-        assert_eq!(sink.len(), 0, "active sketch pane was force-closed");
-
-        wall_clock.store(2_007_000, Ordering::Relaxed);
-        worker
-            .process_accumulator_input(
-                80,
-                pf,
-                &test_group_key("us-east"),
-                0,
-                Box::new(make_ddsketch(0.01, &[8.0])),
-            )
-            .unwrap();
-
-        wall_clock.store(2_013_001, Ordering::Relaxed);
-        worker.flush_all().unwrap();
-        let captured = sink.drain();
-        assert_eq!(captured.len(), 1, "idle sketch pane must close once");
-        let dd = captured[0]
-            .1
-            .as_any()
-            .downcast_ref::<DDSketchAccumulator>()
-            .expect("must emit DDSketchAccumulator");
-        assert_eq!(dd.inner.total_count(), 8);
-    }
-
-    #[test]
-    fn absolute_deadline_forwards_late_sketch_correction() {
-        let cfg = make_agg_config(
-            10,
-            "latency",
-            AggregationType::DDSketch,
-            "",
-            1,
-            0,
-            vec!["zone"],
-        );
-        let sink = Arc::new(CapturingOutputSink::new());
-        let mut worker = make_worker_with_wall_clock_policy(
-            HashMap::from([(10, cfg)]),
-            sink.clone(),
-            LateDataPolicy::ForwardToStore,
-            5_000,
-            5_000,
-        );
-        let wall_clock = Arc::new(AtomicI64::new(4_000_000));
-        let wc_clone = wall_clock.clone();
-        worker.set_now_ms_fn(Box::new(move || wc_clone.load(Ordering::Relaxed)));
-
-        let pf = PolicyFingerprint(10);
-        for i in 0..7 {
-            wall_clock.store(4_000_000 + i * 1_000, Ordering::Relaxed);
-            worker
-                .process_accumulator_input(
-                    100,
-                    pf,
-                    &test_group_key("us-east"),
-                    0,
-                    Box::new(make_ddsketch(0.01, &[1.0 + i as f64])),
-                )
-                .unwrap();
-        }
-
-        wall_clock.store(4_006_500, Ordering::Relaxed);
-        worker.flush_all().unwrap();
-        let mut deadline_outputs = sink.drain();
-        assert_eq!(deadline_outputs.len(), 1);
-        let initial = deadline_outputs.pop().expect("deadline output").1;
-
-        wall_clock.store(4_007_000, Ordering::Relaxed);
-        worker
-            .process_accumulator_input(
-                100,
-                pf,
-                &test_group_key("us-east"),
-                0,
-                Box::new(make_ddsketch(0.01, &[8.0])),
-            )
-            .unwrap();
-        let mut corrections = sink.drain();
-        assert_eq!(corrections.len(), 1, "late sketch must emit a correction");
-        let correction = corrections.pop().expect("correction output").1;
-        let merged = initial
-            .merge_with(correction.as_ref())
-            .expect("deadline output and sketch correction must merge");
-        let dd = merged
-            .as_any()
-            .downcast_ref::<DDSketchAccumulator>()
-            .expect("merged output must remain DDSketchAccumulator");
-        assert_eq!(dd.inner.total_count(), 8);
-    }
-
-    /// Pin the wall-clock-fallback opt-out: setting
-    /// Disabling both wall-clock grace values preserves event-time-only
-    /// semantics, matching pre-fix behaviour. This keeps
-    /// `flush_all`'s contract backward-compatible for callers that
-    /// want strict event-time (e.g. deterministic replays).
-    #[test]
-    fn wall_clock_fallback_disabled_preserves_event_time_only_semantics() {
-        let cfg = make_agg_config(
-            1,
-            "http_requests_total_latency_ms_quantile",
-            AggregationType::DDSketch,
-            "",
-            30,
-            0,
-            vec!["zone"],
-        );
-        let agg_configs = HashMap::from([(1, cfg)]);
-        let sink = Arc::new(CapturingOutputSink::new());
-        // grace=0 disables the fallback entirely.
-        let mut worker = make_worker_with_wall_clock_policy(
-            agg_configs,
-            sink.clone(),
-            LateDataPolicy::Drop,
-            0,
-            0,
-        );
-
-        let wall_clock = Arc::new(AtomicI64::new(1_000_000));
-        let wc_clone = wall_clock.clone();
-        worker.set_now_ms_fn(Box::new(move || wc_clone.load(Ordering::Relaxed)));
-
-        let s = make_ddsketch(0.01, &[42.0]);
-        worker
-            .process_accumulator_input(
-                1,
-                PolicyFingerprint(1),
-                &test_group_key("us-east"),
-                0,
-                Box::new(s),
-            )
-            .unwrap();
-
-        // Even after a wall-clock eternity, no emit happens with
-        // grace=0 — event-time hasn't advanced past the window.
-        wall_clock.store(1_000_000 + 86_400_000, Ordering::Relaxed); // +24h
-        worker.flush_all().unwrap();
-        assert_eq!(
-            sink.len(),
-            0,
-            "grace=0 must disable the fallback — event-time-only semantics"
-        );
-    }
-
-    // -----------------------------------------------------------------------
-    // Test: shutdown force-close emits the trailing window
-    //
-    // The immediate-shutdown batch case: every record falls in one window and
-    // no later timestamp ever advances the watermark, so flush_all (with the
-    // wall-clock fallback disabled, grace=0) leaves the window open. On
-    // shutdown, force_close_all must close and emit it so the data reaches the
-    // store instead of being lost. Covers both the sample (`active_panes`) and
-    // sketch (`sketch_panes`) paths.
-    // -----------------------------------------------------------------------
-
-    // A pooled Sum is correct only for an explicit cross-entity reduction.
-    #[test]
-    fn pooled_sum_does_not_preserve_per_entity_output_rows() {
-        use asap_physical_operators::summary_kernels::SumAccumulator;
-        let config = make_agg_config(
-            1,
-            "gauge",
-            AggregationType::SingleSubpopulation,
-            "Sum",
-            10,
-            0,
-            vec![],
-        );
-        let sink = Arc::new(CapturingOutputSink::new());
-        let mut worker = make_worker(
-            HashMap::from([(1, config)]),
-            sink.clone(),
-            false,
-            0,
-            LateDataPolicy::Drop,
-        );
-        worker
-            .process_group_samples(
-                1,
-                PolicyFingerprint(1),
-                &test_group_key(""),
-                vec![
-                    ("gauge{job=\"api\"}".into(), 1000, 10.0),
-                    ("gauge{job=\"api\"}".into(), 2000, 30.0),
-                    ("gauge{job=\"worker\"}".into(), 1000, 200.0),
-                ],
-            )
-            .unwrap();
-        worker.force_close_all().unwrap();
-        let captured = sink.drain();
-        assert_eq!(captured.len(), 1);
-        assert_eq!(
-            captured[0]
-                .1
-                .as_any()
-                .downcast_ref::<SumAccumulator>()
-                .unwrap()
-                .sum,
-            240.0
-        );
-        // sum_over_time must instead emit api=40 and worker=200 separately.
-        assert_ne!(
-            captured.len(),
-            2,
-            "this producer does not retain entity rows"
-        );
-    }
-
-    // This single-series updater cannot implement a grouped sum of counter increases.
-    // The physical compiler rejects raw counter producers until series state is preserved.
-    #[test]
-    fn pooled_counter_samples_lose_independent_same_timestamp_reset() {
-        use asap_physical_operators::summary_kernels::IncreaseAccumulator;
-        let config = make_agg_config(
-            1,
-            "requests_total",
-            AggregationType::SingleSubpopulation,
-            "Increase",
-            10,
-            0,
-            vec![],
-        );
-        let sink = Arc::new(CapturingOutputSink::new());
-        let mut worker = make_worker(
-            HashMap::from([(1, config)]),
-            sink.clone(),
-            false,
-            0,
-            LateDataPolicy::Drop,
-        );
-        worker
-            .process_group_samples(
-                1,
-                PolicyFingerprint(1),
-                &test_group_key(""),
-                vec![
-                    ("requests_total{instance=\"a\"}".into(), 1000, 100.0),
-                    ("requests_total{instance=\"b\"}".into(), 1000, 50.0),
-                    ("requests_total{instance=\"a\"}".into(), 2000, 110.0),
-                    ("requests_total{instance=\"b\"}".into(), 2000, 5.0),
-                ],
-            )
-            .unwrap();
-        worker.force_close_all().unwrap();
-        let captured = sink.drain();
-        let accumulator = captured[0]
-            .1
-            .as_any()
-            .downcast_ref::<IncreaseAccumulator>()
-            .unwrap();
-        assert_eq!(accumulator.total_increase, 10.0);
-        let independent_increases = (110.0 - 100.0) + 5.0;
-        assert_eq!(independent_increases, 15.0);
-        assert_ne!(accumulator.total_increase, independent_increases);
-    }
-
-    // Acknowledgement proves FIFO input processing and trailing-window publication.
-    #[tokio::test]
-    async fn finite_input_drain_publishes_before_acknowledging() {
-        let config = make_agg_config(
-            1,
-            "cpu",
-            AggregationType::SingleSubpopulation,
-            "Sum",
-            10,
-            0,
-            vec![],
-        );
-        let sink = Arc::new(CapturingOutputSink::new());
-        let mut worker = make_worker(
-            HashMap::from([(1, config)]),
-            sink.clone(),
-            false,
-            0,
-            LateDataPolicy::Drop,
-        );
-        let (tx, rx) = tokio::sync::mpsc::channel(8);
-        worker.receiver = rx;
-        let task = tokio::spawn(worker.run());
-        tx.send(WorkerMessage::GroupSamples {
-            sid: 1,
-            policy_fp: PolicyFingerprint(1),
-            group_key: test_group_key(""),
-            samples: group_samples("cpu", vec![(1000, 2.0), (2000, 3.0)]),
-            ingest_received_at: std::time::Instant::now(),
-        })
-        .await
-        .unwrap();
-        let (ack, completed) = tokio::sync::oneshot::channel();
-        tx.send(WorkerMessage::Drain(ack)).await.unwrap();
-        completed.await.unwrap().unwrap();
-        let outputs = sink.drain();
-        assert_eq!(outputs.len(), 1);
-        assert_eq!(
-            outputs[0]
-                .1
-                .as_any()
-                .downcast_ref::<SumAccumulator>()
-                .unwrap()
-                .sum,
-            5.0
-        );
-        let (ack, completed) = tokio::sync::oneshot::channel();
-        tx.send(WorkerMessage::Drain(ack)).await.unwrap();
-        completed.await.unwrap().unwrap();
-        assert_eq!(sink.len(), 0);
-        tx.send(WorkerMessage::Shutdown).await.unwrap();
-        task.await.unwrap();
-    }
-
-    // A failed publication must close admission and never publish later input.
-    #[tokio::test]
-    async fn failed_worker_rejects_admission_and_never_retries_publication() {
-        struct FailedSink(AtomicUsize);
-        impl OutputSink for FailedSink {
-            fn emit_batch(
-                &self,
-                _: Vec<(PrecomputedOutput, Box<dyn AggregateCore>)>,
-            ) -> Result<(), Box<dyn std::error::Error + Send + Sync>> {
-                self.0.fetch_add(1, Ordering::SeqCst);
-                Err("deliberate sink failure".into())
-            }
-        }
-        let config = make_agg_config(
-            1,
-            "cpu",
-            AggregationType::SingleSubpopulation,
-            "Sum",
-            10,
-            0,
-            vec![],
-        );
-        let mut worker = make_worker(
-            HashMap::from([(1, config)]),
-            Arc::new(CapturingOutputSink::new()),
-            false,
-            0,
-            LateDataPolicy::Drop,
-        );
-        let failed = Arc::new(FailedSink(AtomicUsize::new(0)));
-        worker.output_sink = failed.clone();
-        let (tx, rx) = tokio::sync::mpsc::channel(8);
-        worker.receiver = rx;
-        let task = tokio::spawn(worker.run());
-        tx.send(WorkerMessage::GroupSamples {
-            sid: 1,
-            policy_fp: PolicyFingerprint(1),
-            group_key: test_group_key(""),
-            samples: group_samples("cpu", vec![(1000, 2.0)]),
-            ingest_received_at: std::time::Instant::now(),
-        })
-        .await
-        .unwrap();
-        let (ack, completed) = tokio::sync::oneshot::channel();
-        tx.send(WorkerMessage::Drain(ack)).await.unwrap();
-        assert!(completed
-            .await
-            .unwrap()
-            .unwrap_err()
-            .contains("deliberate sink failure"));
-        assert!(
-            tx.send(WorkerMessage::GroupSamples {
-                sid: 1,
-                policy_fp: PolicyFingerprint(1),
-                group_key: test_group_key(""),
-                samples: group_samples("cpu", vec![(21000, 4.0)]),
-                ingest_received_at: std::time::Instant::now(),
-            })
-            .await
-            .is_err(),
-            "failed workers must reject new admission"
-        );
-        task.await.unwrap();
-        assert_eq!(
-            failed.0.load(Ordering::SeqCst),
-            1,
-            "a failed worker must not process later input or publish during shutdown"
-        );
-    }
-
-    // A failed final flush must not be followed by publishing newer open panes.
-    #[tokio::test]
-    async fn shutdown_stops_after_its_first_publication_failure() {
-        struct FailedSink(AtomicUsize);
-        impl OutputSink for FailedSink {
-            fn emit_batch(
-                &self,
-                _: Vec<(PrecomputedOutput, Box<dyn AggregateCore>)>,
-            ) -> Result<(), Box<dyn std::error::Error + Send + Sync>> {
-                self.0.fetch_add(1, Ordering::SeqCst);
-                Err(Box::new(asap_physical_operators::dag::Error::MemoryLimit))
-            }
-        }
-        let config = make_agg_config(
-            1,
-            "cpu",
-            AggregationType::SingleSubpopulation,
-            "Sum",
-            10,
-            0,
-            vec![],
-        );
-        let mut worker = make_worker(
-            HashMap::from([(1, config)]),
-            Arc::new(CapturingOutputSink::new()),
-            false,
-            0,
-            LateDataPolicy::Drop,
-        );
-        let clock = Arc::new(AtomicI64::new(0));
-        let read_clock = clock.clone();
-        worker.set_now_ms_fn(Box::new(move || read_clock.load(Ordering::SeqCst)));
-        worker.wall_clock_idle_grace_period_ms = 1;
-        for (sid, now) in [(1, 0), (2, 10000)] {
-            clock.store(now, Ordering::SeqCst);
-            worker
-                .process_group_samples(
-                    sid,
-                    PolicyFingerprint(1),
-                    &test_group_key(""),
-                    group_samples("cpu", vec![(1000, 2.0)]),
-                )
-                .unwrap();
-        }
-        clock.store(15000, Ordering::SeqCst);
-        let sink = Arc::new(FailedSink(AtomicUsize::new(0)));
-        worker.output_sink = sink.clone();
-        let (tx, rx) = tokio::sync::mpsc::channel(1);
-        worker.receiver = rx;
-        tx.send(WorkerMessage::Shutdown).await.unwrap();
-        worker.run().await;
-        assert_eq!(sink.0.load(Ordering::SeqCst), 1);
-    }
-
-    #[test]
-    fn shutdown_force_close_emits_trailing_sample_window() {
-        // 10s tumbling window; make_worker uses grace=0, isolating the
-        // force-close from the wall-clock fallback.
-        let config = make_agg_config(
-            1,
-            "cpu",
-            AggregationType::SingleSubpopulation,
-            "Sum",
-            10,
-            0,
-            vec![],
-        );
-        let mut agg_configs = HashMap::new();
-        agg_configs.insert(1, config);
-        let sink = Arc::new(CapturingOutputSink::new());
-        let mut worker = make_worker(agg_configs, sink.clone(), false, 0, LateDataPolicy::Drop);
-
-        // All samples land in window [0, 10_000); the watermark freezes below
-        // the window end because no later timestamp ever arrives.
-        let pf = PolicyFingerprint(1);
-        for i in 0..5 {
-            worker
-                .process_group_samples(
-                    1,
-                    pf,
-                    &test_group_key(""),
-                    group_samples("cpu", vec![(1_000 + i * 100, 1.0)]),
-                )
-                .unwrap();
-        }
-
-        worker.flush_all().unwrap();
-        assert_eq!(
-            sink.len(),
-            0,
-            "trailing window must remain open after the final flush"
-        );
-
-        worker.force_close_all().unwrap();
-        let captured = sink.drain();
-        assert_eq!(
-            captured.len(),
-            1,
-            "shutdown force-close must emit the trailing window"
-        );
-        let (output, acc) = &captured[0];
-        assert!(!output.policy_fp.is_unset());
-        assert_eq!(output.start_timestamp, 0);
-        assert_eq!(output.end_timestamp, 10_000);
-        let sum_acc = acc
-            .as_any()
-            .downcast_ref::<SumAccumulator>()
-            .expect("should be SumAccumulator");
-        assert!(
-            (sum_acc.sum - 5.0).abs() < 1e-10,
-            "5 samples of 1.0 → sum 5, got {}",
-            sum_acc.sum
-        );
-
-        // Idempotent: panes are drained, so a second force-close emits nothing.
-        worker.force_close_all().unwrap();
-        assert_eq!(
-            sink.len(),
-            0,
-            "force-close must be idempotent once panes are drained"
-        );
-    }
-
-    #[test]
-    fn shutdown_force_close_emits_trailing_sketch_window() {
-        // 30s tumbling window; grace=0 isolates the force-close.
-        let cfg = make_agg_config(
-            1,
-            "http_requests_total_latency_ms_quantile",
-            AggregationType::DDSketch,
-            "",
-            30,
-            0,
-            vec!["zone"],
-        );
-        let agg_configs = HashMap::from([(1, cfg)]);
-        let sink = Arc::new(CapturingOutputSink::new());
-        let mut worker = make_worker_with_wall_clock_policy(
-            agg_configs,
-            sink.clone(),
-            LateDataPolicy::Drop,
-            0,
-            0,
-        );
-
-        // 10 sketches, all stamped at frozen event-time 0 → window [0, 30_000).
-        let pf = PolicyFingerprint(1);
-        for i in 0..10 {
-            let s = make_ddsketch(0.01, &[1.0 + i as f64]);
-            worker
-                .process_accumulator_input(51, pf, &test_group_key("us-east"), 0, Box::new(s))
-                .unwrap();
-        }
-
-        worker.flush_all().unwrap();
-        assert_eq!(
-            sink.len(),
-            0,
-            "trailing sketch window must remain open after flush (grace=0, event-time frozen)"
-        );
-
-        worker.force_close_all().unwrap();
-        let captured = sink.drain();
-        assert_eq!(
-            captured.len(),
-            1,
-            "shutdown force-close must emit the trailing sketch window"
-        );
-        let (output, acc) = &captured[0];
-        assert_eq!(output.start_timestamp, 0);
-        assert_eq!(output.end_timestamp, 30_000);
-        assert_eq!(acc.type_name(), "DDSketchAccumulator");
-        let dd = acc
-            .as_any()
-            .downcast_ref::<DDSketchAccumulator>()
-            .expect("must downcast to DDSketchAccumulator");
-        assert_eq!(
-            dd.inner.total_count(),
-            10,
-            "all 10 frozen-time sketches must merge into the single emitted output"
-        );
-
-        worker.force_close_all().unwrap();
-        assert_eq!(
-            sink.len(),
-            0,
-            "force-close must be idempotent once panes are drained"
-        );
-    }
-}
-
-#[cfg(test)]
-mod dag_execution_tests {
-    use super::*;
-    use crate::precompute_engine::output_sink::CapturingOutputSink;
-    use crate::storage_engines::types::InstalledPrecomputePlan;
-    use asap_physical_operators::summary_kernels::exact::ExactAccumulator;
-    use asap_types::query_plan::ExactReadout;
-
-    fn plan(query: &str) -> control_plane::physical::compiler::CompiledPhysicalPlan {
-        let mut json: serde_json::Value = serde_json::from_str(include_str!(
-            "../../../docs/examples/asapquery-compatibility-demo-snapshot.json"
-        ))
-        .unwrap();
-        let mut item = json["query_workload"]["repeating_queries"][0].clone();
-        item["query"] = query.into();
-        json["query_workload"]["repeating_queries"] = serde_json::json!([item]);
-        let snapshot = serde_json::from_value(json).unwrap();
-        crate::tests::test_utilities::planning::quoted_snapshot(snapshot, false)
-            .compile_promql()
-            .unwrap()
-    }
-
-    // Real router/engine queues preserve every partition's result as concurrency changes.
-    #[tokio::test(flavor = "multi_thread", worker_threads = 4)]
-    async fn installed_dag_results_match_with_one_and_four_workers() {
-        use crate::precompute_engine::{config::PrecomputeEngineConfig, engine::PrecomputeEngine};
-        async fn execute(query: &str, workers: usize) -> BTreeMap<(Vec<u8>, u64, u64), Vec<u8>> {
-            let physical = plan(query);
-            assert_eq!(
-                physical.precompute_plan.materializations.len(),
-                1,
-                "{query}"
-            );
-            let config = physical.precompute_plan.materializations[0].clone();
-            let runtime =
-                InstalledPrecomputePlan::from_precompute_plan(physical.precompute_plan).unwrap();
-            let rule = runtime.partitioning.clone();
-            let sink = Arc::new(CapturingOutputSink::new());
-            let engine = PrecomputeEngine::new(
-                PrecomputeEngineConfig {
-                    num_workers: workers,
-                    allowed_lateness_ms: 10_000,
-                    wall_clock_idle_grace_period_ms: 0,
-                    wall_clock_max_open_grace_period_ms: 0,
-                    ..Default::default()
-                },
-                InstalledPrecomputePlanHandle::new(runtime),
-                sink.clone(),
-                Arc::new(crate::drivers::ingest::series_resolver::SeriesIdResolver::new()),
-                Arc::new(crate::storage_engines::sketch_db::index::SketchStore::new()),
-            );
-            let ingest = engine.ingest_state();
-            let diagnostics = engine.diagnostics();
-            let running = tokio::spawn(engine.run());
-            let mut messages = Vec::new();
-            for population in 0..64 {
-                let label = format!("service-{population}");
-                messages.push(WorkerMessage::GroupSamples {
-                    sid: population + 1,
-                    policy_fp: config.policy_fingerprint(),
-                    group_key: Arc::new(GroupKey::new([("service", label.as_str())])),
-                    samples: [
-                        (1000, 10.0),
-                        (2000, 20.0),
-                        (3000, 3.0),
-                        (4000, 9.0),
-                        (5000, 12.0),
-                    ]
-                    .into_iter()
-                    .map(|(t, value)| {
-                        (
-                            format!("{}{{service=\"{}\"}}", config.metric, label),
-                            t,
-                            value,
-                        )
-                    })
-                    .collect(),
-                    ingest_received_at: std::time::Instant::now(),
-                });
-            }
-            ingest
-                .router
-                .route_group_batch(messages, std::time::Instant::now(), None)
-                .await
-                .unwrap();
-            ingest.router.drain().await.unwrap();
-            if workers > 1 && rule != super::super::partitioning::DagPartitioning::SingleWorker {
-                assert!(
-                    diagnostics
-                        .worker_group_counts
-                        .iter()
-                        .filter(|n| n.load(Ordering::Relaxed) > 0)
-                        .count()
-                        > 1,
-                    "the test must exercise multiple workers"
-                );
-            }
-            ingest.router.shutdown().await.unwrap();
-            tokio::time::timeout(std::time::Duration::from_secs(5), running)
-                .await
-                .unwrap()
-                .unwrap()
-                .unwrap();
-            let mut records = BTreeMap::new();
-            for (output, state) in sink.drain() {
-                let key = (
-                    output.key.unwrap().serialize_to_bytes(),
-                    output.start_timestamp,
-                    output.end_timestamp,
-                );
-                assert!(
-                    records.insert(key, state.serialize_to_bytes()).is_none(),
-                    "duplicate output"
-                );
-            }
-            assert!(!records.is_empty());
-            records
-        }
-        for query in [
-            "sum_over_time(asap_demo_gauge[5s])",
-            "rate(asap_demo_counter_total[5s])",
-        ] {
-            assert_eq!(execute(query, 1).await, execute(query, 4).await, "{query}");
-        }
-    }
-
-    // A selected producer must govern updates, persisted family, and query readout.
-    #[test]
-    fn installed_dag_ingestion_persistence_and_readout() {
-        for (query, readout, answer) in [
-            (
-                "sum_over_time(asap_demo_gauge[5s])",
-                ExactReadout::Sum,
-                54.0,
-            ),
-            (
-                "count_over_time(asap_demo_gauge[5s])",
-                ExactReadout::Count,
-                5.0,
-            ),
-            ("min_over_time(asap_demo_gauge[5s])", ExactReadout::Min, 3.0),
-            (
-                "max_over_time(asap_demo_gauge[5s])",
-                ExactReadout::Max,
-                20.0,
-            ),
-            ("rate(asap_demo_counter_total[5s])", ExactReadout::Rate, 5.5),
-            (
-                "increase(asap_demo_counter_total[5s])",
-                ExactReadout::Increase,
-                27.5,
-            ),
-        ] {
-            let plan = plan(query);
-            let config = plan
-                .precompute_plan
-                .materializations
-                .first()
-                .expect("ASAP producer required")
-                .clone();
-            let fp = config.policy_fingerprint();
-            let streaming =
-                InstalledPrecomputePlan::from_precompute_plan(plan.precompute_plan).unwrap();
-            let sink = Arc::new(CapturingOutputSink::new());
-            let (_tx, rx) = mpsc::channel(8);
-            let mut worker = Worker::new(
-                0,
-                rx,
-                sink.clone(),
-                InstalledPrecomputePlanHandle::new(streaming),
-                WorkerRuntimeConfig {
-                    max_buffer_per_series: 100,
-                    allowed_lateness_ms: 10_000,
-                    pass_raw_samples: false,
-                    raw_mode_aggregation_id: 0,
-                    late_data_policy: LateDataPolicy::Drop,
-                    wall_clock_idle_grace_period_ms: 0,
-                    wall_clock_max_open_grace_period_ms: 0,
-                },
-                Arc::new(AtomicUsize::new(0)),
-                Arc::new(AtomicI64::new(0)),
-            );
-            worker
-                .process_group_samples(
-                    1,
-                    fp,
-                    &Arc::new(GroupKey::new([])),
-                    [
-                        (1000, 10.0),
-                        (2000, 20.0),
-                        (3000, 3.0),
-                        (4000, 9.0),
-                        (5000, 12.0),
-                    ]
-                    .into_iter()
-                    .map(|(t, v)| (config.metric.clone(), t, v))
-                    .collect(),
-                )
-                .unwrap();
-            worker.force_close_all().unwrap();
-            let mut states = BTreeMap::new();
-            for (output, state) in sink.drain() {
-                let select = if matches!(
-                    config.window_layout,
-                    asap_types::WindowMaterializationLayout::FullWindow
-                ) {
-                    output.start_timestamp == 0 && output.end_timestamp == 5000
-                } else {
-                    output.end_timestamp <= 5000
-                };
-                if select {
-                    assert_eq!(
-                        state.get_accumulator_type().planner_exact_family(),
-                        Some(readout.planner_family())
-                    );
-                    let restored =
-                        ExactAccumulator::deserialize_from_bytes(&state.serialize_to_bytes())
-                            .unwrap();
-                    states.insert(
-                        output.end_timestamp as i64,
-                        Arc::new(restored) as Arc<dyn AggregateCore>,
-                    );
-                }
-            }
-            assert!(!states.is_empty(), "{query}: no stored states");
-            let group =
-                crate::query_engines::asap_query_engine::summary_executor::GroupState::ExactAgg {
-                    entries: vec![std::rc::Rc::new(states)],
-                    agg_type: config.aggregation_type,
-                };
-            assert_eq!(
-                group.exact_value_for(readout, &None, 0, 5000),
-                Ok(Some(answer)),
-                "{query}"
-            );
-        }
-    }
-
-    // A flat config and a DAG whose producer no longer matches its binding cannot install.
-    #[test]
-    fn execution_requires_matching_dag_producer() {
-        assert!(
-            serde_json::from_value::<asap_types::precompute_plan::PrecomputePlan>(
-                serde_json::json!({"aggregation_configs":{}})
-            )
-            .is_err()
-        );
-        let mut plan = plan("rate(asap_demo_counter_total[5s])").precompute_plan;
-        plan.executable_dags.clear();
-        assert!(InstalledPrecomputePlan::from_precompute_plan(plan)
-            .unwrap_err()
-            .to_string()
-            .contains("DAG producer"));
-    }
-    // Changing a raw update must not silently reuse the original summary identity.
-    #[test]
-    fn altered_dag_update_cannot_reuse_a_stored_definition() {
-        let mut plan = plan("sum_over_time(asap_demo_gauge[5s])").precompute_plan;
-        let installed = plan.executable_dags.values_mut().next().unwrap();
-        let mut dag = installed.document.decode().unwrap();
-        for node in &mut dag.nodes {
-            if let planner_types::post_asap::ExecutableOperatorPayload::SummaryAgg {
-                input, ..
-            } = &mut node.payload
-            {
-                input.weight = planner_types::post_asap::SummaryInputExpr::Constant(99.0);
-            }
-        }
-        installed.document = asap_types::executable_plan::OwnedPostAsapDag::from_executable(
-            installed.document.query_id.clone(),
-            &dag,
-        )
-        .unwrap();
-        installed.document.schema_version =
-            asap_types::executable_plan::PRECOMPUTE_DAG_SCHEMA_VERSION;
-        assert!(InstalledPrecomputePlan::from_precompute_plan(plan)
-            .unwrap_err()
-            .to_string()
-            .contains("update"));
-    }
-}
diff --git a/data_plane/src/query_engines/asap_clickhouse_query_engine/accelerator.rs b/data_plane/src/query_engines/asap_clickhouse_query_engine/accelerator.rs
deleted file mode 100644
index d1c2e7cd8..000000000
--- a/data_plane/src/query_engines/asap_clickhouse_query_engine/accelerator.rs
+++ /dev/null
@@ -1,1396 +0,0 @@
-//! Catalog-backed ClickHouse acceleration boundary.
-
-use asap_physical_operators::summary_kernels::SumAccumulator;
-use async_trait::async_trait;
-use axum::{
-    body::Bytes,
-    http::{HeaderMap, HeaderValue, StatusCode},
-};
-use std::{collections::BTreeMap, sync::Arc};
-
-use super::{
-    clickhouse_result_adapter::ClickHouseFormat,
-    execution::{
-        execute_sql_dag_with_external, ClickHouseDagFallback, ClickHouseDagOutcome,
-        PreparedExternalLeaves,
-    },
-    fallback::{ClickHouseExactBackend, ClickHouseRawResponse},
-    request::ClickHouseQueryRequest,
-    server::{
-        ClickHouseAccelerationFallback, ClickHouseAccelerationOutcome, ClickHouseAccelerator,
-    },
-};
-use crate::storage_engines::sketch_db::index::SketchStore;
-
-#[derive(Clone)]
-pub struct CatalogClickHouseAccelerator {
-    pub store: Arc<SketchStore>,
-    active_physical_plan: Option<crate::storage_engines::types::ActivePhysicalPlanHandle>,
-    exact_backend: Option<Arc<dyn ClickHouseExactBackend>>,
-}
-
-impl CatalogClickHouseAccelerator {
-    pub fn empty(store: Arc<SketchStore>) -> Self {
-        Self {
-            store,
-            active_physical_plan: None,
-            exact_backend: None,
-        }
-    }
-
-    pub fn with_active_physical_plan(
-        store: Arc<SketchStore>,
-        active: crate::storage_engines::types::ActivePhysicalPlanHandle,
-    ) -> Self {
-        let mut accelerator = Self::empty(store);
-        accelerator.active_physical_plan = Some(active);
-        accelerator
-    }
-
-    /// Build the production mixed-DAG runtime with its required exact subtree
-    /// backend. Keeping both dependencies in one constructor prevents a
-    /// listener from enabling acceleration while leaving `ExternalExact`
-    /// nodes unexecutable.
-    pub fn with_active_physical_plan_and_exact_backend(
-        store: Arc<SketchStore>,
-        active: crate::storage_engines::types::ActivePhysicalPlanHandle,
-        exact_backend: Arc<dyn ClickHouseExactBackend>,
-    ) -> Self {
-        Self::with_active_physical_plan(store, active).with_exact_backend(exact_backend)
-    }
-
-    pub fn with_exact_backend(mut self, exact_backend: Arc<dyn ClickHouseExactBackend>) -> Self {
-        self.exact_backend = Some(exact_backend);
-        self
-    }
-
-    async fn prepare_external_exact(
-        &self,
-        entry: &asap_types::query_plan::QueryPlanEntry,
-        start_ms: u64,
-        end_ms: u64,
-        request_context: &ClickHouseQueryRequest,
-    ) -> Result<PreparedExternalLeaves, crate::query_engines::EngineError> {
-        let miss = |detail: String| {
-            crate::query_engines::EngineError::capability_miss("clickhouse_input", detail)
-        };
-        entry
-            .validate_snapshot_sources()
-            .map_err(|error| miss(error.to_string()))?;
-        let mut held = crate::query_engines::request::reserve(0)?;
-        let mut held_bytes = 0usize;
-        let mut prepared = PreparedExternalLeaves::new();
-        let leaves = entry.nodes.iter().filter_map(|(id, node)| match node {
-            asap_types::query_plan::QueryPlanNode::ExternalExact { request, inputs }
-                if request.language == asap_types::QueryLanguage::ClickHouseSql
-                    && inputs.is_empty() =>
-            {
-                Some((*id, request))
-            }
-            _ => None,
-        });
-        for (id, bound) in leaves {
-            let backend = self
-                .exact_backend
-                .as_ref()
-                .ok_or_else(|| miss("ClickHouse exact subtree endpoint unavailable".to_owned()))?;
-            let schema = match &bound.output {
-                asap_types::query_plan::ExternalExactOutput::Relation { schema } => {
-                    serde_json::from_value(schema.clone())
-                        .map_err(|error| miss(error.to_string()))?
-                }
-                _ => {
-                    return Err(miss(
-                        "ClickHouse exact subtree must produce a relation".into(),
-                    ))
-                }
-            };
-            let mut parameters = bound
-                .parameters
-                .iter()
-                .map(|(name, value)| (format!("param_{name}"), value.clone()))
-                .collect::<BTreeMap<_, _>>();
-            if let Some(name) = &bound.start_parameter {
-                parameters.insert(format!("param_{name}"), start_ms.to_string());
-            }
-            if let Some(name) = &bound.end_parameter {
-                parameters.insert(format!("param_{name}"), end_ms.to_string());
-            }
-            parameters.insert("default_format".into(), "JSONCompact".into());
-            parameters.insert(
-                "output_format_json_map_as_array_of_tuples".into(),
-                "1".into(),
-            );
-            parameters.insert(
-                "output_format_json_named_tuples_as_objects".into(),
-                "0".into(),
-            );
-            parameters.insert("output_format_json_quote_64bit_integers".into(), "0".into());
-            // Preserve the distinction between NULL and unsupported NaN/Inf.
-            // The typed decoder rejects quoted non-finite values and falls back.
-            parameters.insert("output_format_json_quote_denormals".into(), "1".into());
-            if let Some(database) = request_context.database() {
-                parameters.insert("database".into(), database.into());
-            }
-            let request = ClickHouseQueryRequest {
-                method: axum::http::Method::POST,
-                sql: bound.expression.clone(),
-                body: Bytes::from(bound.expression.clone()),
-                parameters,
-                headers: request_context.headers.clone(),
-            };
-            let response = crate::query_engines::request::wait(backend.execute(&request))
-                .await?
-                .map_err(|error| match error {
-                    super::fallback::ClickHouseFallbackError::Physical(error) => {
-                        crate::query_engines::EngineError::Physical(error)
-                    }
-                    error => miss(error.to_string()),
-                })?;
-            if !response.status.is_success() {
-                return Err(miss(format!(
-                    "ClickHouse external subtree returned HTTP {}",
-                    response.status
-                )));
-            }
-            let decode_bytes = response
-                .body
-                .len()
-                .checked_mul(64)
-                .ok_or(asap_physical_operators::dag::Error::MemoryLimit)?;
-            let _decode = crate::query_engines::request::reserve(decode_bytes)?;
-            let mut relation = super::relational_adapter::ClickHouseRelation::from_json_compact(
-                &schema,
-                &response.body,
-            )
-            .map_err(|error| miss(error.to_string()))?;
-            relation.coverage = Some((start_ms, end_ms));
-            held_bytes = held_bytes
-                .checked_add(relation.retained_bytes())
-                .ok_or(asap_physical_operators::dag::Error::MemoryLimit)?;
-            held.resize(held_bytes)?;
-            prepared.insert(id, relation);
-        }
-        Ok(prepared)
-    }
-}
-
-fn requested_format(request: &ClickHouseQueryRequest) -> Result<ClickHouseFormat, String> {
-    if let Some(setting) = request.parameters.keys().find(|key| {
-        key.starts_with("output_format_") || key.as_str() == "format_tsv_null_representation"
-    }) {
-        return Err(format!("unsupported output setting {setting}"));
-    }
-    match request
-        .format()
-        .unwrap_or("TabSeparated")
-        .to_ascii_lowercase()
-        .as_str()
-    {
-        "tabseparated" | "tsv" => Ok(ClickHouseFormat::TabSeparated),
-        "jsoneachrow" => Ok(ClickHouseFormat::JsonEachRow),
-        "json" => Ok(ClickHouseFormat::Json),
-        other => Err(other.to_owned()),
-    }
-}
-
-#[async_trait]
-impl ClickHouseAccelerator for CatalogClickHouseAccelerator {
-    async fn execute(&self, request: &ClickHouseQueryRequest) -> ClickHouseAccelerationOutcome {
-        let Some(physical) = self
-            .active_physical_plan
-            .as_ref()
-            .map(|h| h.active_snapshot())
-        else {
-            return ClickHouseAccelerationOutcome::Fallback(
-                ClickHouseAccelerationFallback::CatalogMiss,
-            );
-        };
-        let Some(context) = physical.query_plan.clickhouse_context.as_ref() else {
-            return ClickHouseAccelerationOutcome::Fallback(
-                ClickHouseAccelerationFallback::CatalogMiss,
-            );
-        };
-        let (fixed_sql, canonical_sql, runtime_range) =
-            match control_plane::clickhouse::bind_clickhouse_sql(
-                &request.sql,
-                &control_plane::clickhouse::ClickHouseSqlCatalog {
-                    tables: context.tables.clone(),
-                },
-                context.accuracy.clone(),
-            )
-            .await
-            {
-                Ok(canonical) => canonical,
-                Err(error) => {
-                    return ClickHouseAccelerationOutcome::Fallback(
-                        ClickHouseAccelerationFallback::Planning(error.to_string()),
-                    )
-                }
-            };
-        // Concrete entries keep their own physical bindings. Older publications
-        // may instead store a template directly as the primary key.
-        if let Ok(entry) = physical.query_plan.lookup_clickhouse(&fixed_sql) {
-            return self.execute_bound(request, &physical, entry, None).await;
-        }
-        if let Ok(entry) = physical.query_plan.lookup_clickhouse(&canonical_sql) {
-            return self
-                .execute_bound(request, &physical, entry, runtime_range)
-                .await;
-        }
-        let mut outcome =
-            ClickHouseAccelerationOutcome::Fallback(ClickHouseAccelerationFallback::CatalogMiss);
-        if let Some(identities) = context.window_templates.get(&canonical_sql) {
-            for identity in identities {
-                let Ok(entry) = physical.query_plan.lookup_clickhouse(identity) else {
-                    continue;
-                };
-                outcome = self
-                    .execute_bound(request, &physical, entry, runtime_range)
-                    .await;
-                if matches!(
-                    outcome,
-                    ClickHouseAccelerationOutcome::Accelerated(_)
-                        | ClickHouseAccelerationOutcome::Failed(_)
-                ) {
-                    return outcome;
-                }
-            }
-        }
-        outcome
-    }
-}
-
-impl CatalogClickHouseAccelerator {
-    async fn execute_bound(
-        &self,
-        request: &ClickHouseQueryRequest,
-        physical: &crate::storage_engines::types::RuntimePhysicalPlan,
-        entry: &asap_types::query_plan::QueryPlanEntry,
-        runtime_range: Option<(u64, u64)>,
-    ) -> ClickHouseAccelerationOutcome {
-        let engine = self.clone();
-        let request = request.clone();
-        let physical = physical.clone();
-        let entry = entry.clone();
-        match crate::query_engines::request::run(Default::default(), move |handle| {
-            Ok(handle.block_on(engine.execute_bound_inner(
-                &request,
-                &physical,
-                &entry,
-                runtime_range,
-            )))
-        })
-        .await
-        {
-            Ok(outcome) => outcome,
-            Err(error) => ClickHouseAccelerationOutcome::Failed(error),
-        }
-    }
-
-    async fn execute_bound_inner(
-        &self,
-        request: &ClickHouseQueryRequest,
-        physical: &crate::storage_engines::types::RuntimePhysicalPlan,
-        entry: &asap_types::query_plan::QueryPlanEntry,
-        runtime_range: Option<(u64, u64)>,
-    ) -> ClickHouseAccelerationOutcome {
-        if let Err(error) = entry.validate_snapshot_sources() {
-            return ClickHouseAccelerationOutcome::Fallback(
-                ClickHouseAccelerationFallback::Planning(error.to_string()),
-            );
-        }
-        let format = match requested_format(request) {
-            Ok(format) => format,
-            Err(format) => {
-                return ClickHouseAccelerationOutcome::Fallback(
-                    ClickHouseAccelerationFallback::UnsupportedFormat(format),
-                )
-            }
-        };
-        let Some(catalog) = physical.summary_catalog.as_ref() else {
-            return ClickHouseAccelerationOutcome::Fallback(
-                ClickHouseAccelerationFallback::CatalogMiss,
-            );
-        };
-        let Some(mut range) = entry.fixed_evaluation else {
-            return ClickHouseAccelerationOutcome::Fallback(
-                ClickHouseAccelerationFallback::Execution(
-                    "ClickHouse plan is missing its fixed evaluation range".into(),
-                ),
-            );
-        };
-        if let Some((start_ms, end_ms)) = runtime_range {
-            if end_ms - start_ms != range.end_ms - range.start_ms
-                || entry.nodes.values().any(|node| {
-                    matches!(
-                        node,
-                        asap_types::query_plan::QueryPlanNode::ExternalExact { .. }
-                    )
-                })
-            {
-                return ClickHouseAccelerationOutcome::Fallback(
-                    ClickHouseAccelerationFallback::CatalogMiss,
-                );
-            }
-            range.start_ms = start_ms;
-            range.end_ms = end_ms;
-        }
-        let revisions = match self.store.revisions.read() {
-            Ok(runtime) => runtime.clone(),
-            Err(_) => {
-                return ClickHouseAccelerationOutcome::Failed(
-                    crate::query_engines::EngineError::Physical(
-                        asap_physical_operators::dag::Error::Invalid(
-                            "revision installation poisoned".into(),
-                        ),
-                    ),
-                )
-            }
-        };
-        let pinned = if let Some(revisions) = revisions {
-            let bindings = entry.materialization_bindings();
-            if bindings.is_empty() {
-                None
-            } else {
-                let now = std::time::SystemTime::now()
-                    .duration_since(std::time::UNIX_EPOCH)
-                    .unwrap_or_default()
-                    .as_millis() as u64;
-                let required = bindings
-                    .iter()
-                    .map(|binding| binding.stored_output_reference.stored_output_id)
-                    .collect();
-                let ranges = bindings
-                    .iter()
-                    .map(|binding| {
-                        (
-                            binding.stored_output_reference.stored_output_id,
-                            range.start_ms,
-                            range.end_ms,
-                        )
-                    })
-                    .collect::<Vec<_>>();
-                let Some(generation) = physical.precompute_plan.summary_catalog.as_ref() else {
-                    return ClickHouseAccelerationOutcome::Fallback(
-                        ClickHouseAccelerationFallback::CatalogMiss,
-                    );
-                };
-                match revisions.query_view(&required, now, &ranges, generation) {
-                    Ok(view) => Some(view),
-                    Err(error) => {
-                        if error.is::<crate::precompute_engine::revisions::SnapshotUnavailable>() {
-                            return ClickHouseAccelerationOutcome::Fallback(
-                                ClickHouseAccelerationFallback::IncompleteCoverage,
-                            );
-                        }
-                        return ClickHouseAccelerationOutcome::Failed(
-                            crate::query_engines::EngineError::Physical(
-                                match error.downcast::<asap_physical_operators::dag::Error>() {
-                                    Ok(error) => *error,
-                                    Err(error) => asap_physical_operators::dag::Error::Invalid(
-                                        error.to_string(),
-                                    ),
-                                },
-                            ),
-                        );
-                    }
-                }
-            }
-        } else {
-            None
-        };
-        let _snapshot = match crate::query_engines::request::reserve(
-            pinned
-                .as_ref()
-                .map_or(0, |view| view.approx_resident_bytes()),
-        ) {
-            Ok(guard) => guard,
-            Err(error) => return ClickHouseAccelerationOutcome::Failed(error.into()),
-        };
-        let prepared = match self
-            .prepare_external_exact(entry, range.start_ms, range.end_ms, request)
-            .await
-        {
-            Ok(prepared) => prepared,
-            Err(error @ crate::query_engines::EngineError::Physical(_)) => {
-                return ClickHouseAccelerationOutcome::Failed(error)
-            }
-            Err(error) => {
-                return ClickHouseAccelerationOutcome::Fallback(
-                    ClickHouseAccelerationFallback::Execution(error.to_string()),
-                )
-            }
-        };
-        let _inputs = match crate::query_engines::request::reserve(
-            prepared.values().map(|v| v.retained_bytes()).sum(),
-        ) {
-            Ok(guard) => guard,
-            Err(error) => return ClickHouseAccelerationOutcome::Failed(error.into()),
-        };
-        match execute_sql_dag_with_external(
-            pinned.as_ref().unwrap_or(self.store.as_ref()),
-            entry,
-            catalog.as_ref(),
-            &prepared,
-            range.start_ms,
-            range.end_ms,
-            range.cumulative,
-        ) {
-            ClickHouseDagOutcome::Failed(error) => {
-                ClickHouseAccelerationOutcome::Failed(error.into())
-            }
-            ClickHouseDagOutcome::Accelerated(result) => {
-                let retained = result
-                    .batches
-                    .iter()
-                    .map(|batch| batch.get_array_memory_size())
-                    .sum::<usize>();
-                let _output = match retained
-                    .checked_mul(16)
-                    .ok_or(asap_physical_operators::dag::Error::MemoryLimit)
-                    .and_then(crate::query_engines::request::reserve)
-                {
-                    Ok(guard) => guard,
-                    Err(error) => return ClickHouseAccelerationOutcome::Failed(error.into()),
-                };
-                match result.encode(format) {
-                    Ok(body) => {
-                        let _response = match crate::query_engines::request::reserve(body.len()) {
-                            Ok(guard) => guard,
-                            Err(error) => {
-                                return ClickHouseAccelerationOutcome::Failed(error.into())
-                            }
-                        };
-                        let mut headers = HeaderMap::new();
-                        headers.insert(
-                            "content-type",
-                            HeaderValue::from_static(match format {
-                                ClickHouseFormat::Json | ClickHouseFormat::JsonEachRow => {
-                                    "application/json; charset=UTF-8"
-                                }
-                                ClickHouseFormat::TabSeparated => {
-                                    "text/tab-separated-values; charset=UTF-8"
-                                }
-                            }),
-                        );
-                        let (execution, detail) = if entry.materialization_bindings().is_empty() {
-                            ("exact_fallback", "external_dag")
-                        } else if prepared.is_empty() {
-                            ("warm", "asap")
-                        } else {
-                            ("hybrid", "hybrid")
-                        };
-                        headers.insert("x-asap-execution", HeaderValue::from_static(execution));
-                        headers.insert("x-asap-execution-detail", HeaderValue::from_static(detail));
-                        ClickHouseAccelerationOutcome::Accelerated(ClickHouseRawResponse {
-                            status: StatusCode::OK,
-                            headers,
-                            body: Bytes::from(body),
-                        })
-                    }
-                    Err(error) => ClickHouseAccelerationOutcome::Fallback(
-                        ClickHouseAccelerationFallback::Execution(error.to_string()),
-                    ),
-                }
-            }
-            ClickHouseDagOutcome::Fallback(ClickHouseDagFallback::IncompleteCoverage {
-                ..
-            }) => ClickHouseAccelerationOutcome::Fallback(
-                ClickHouseAccelerationFallback::IncompleteCoverage,
-            ),
-            ClickHouseDagOutcome::Fallback(error) => ClickHouseAccelerationOutcome::Fallback(
-                ClickHouseAccelerationFallback::Execution(format!("{error:?}")),
-            ),
-        }
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    #[test]
-    fn client_output_settings_cannot_silently_change_warm_format() {
-        let mut request = ClickHouseQueryRequest {
-            method: axum::http::Method::GET,
-            sql: "SELECT labels FROM samples".into(),
-            body: Bytes::new(),
-            parameters: BTreeMap::from([("default_format".into(), "JSON".into())]),
-            headers: HeaderMap::new(),
-        };
-        assert!(requested_format(&request).is_ok());
-        for setting in [
-            "output_format_json_map_as_array_of_tuples",
-            "output_format_json_quote_64bit_integers",
-            "format_tsv_null_representation",
-        ] {
-            request.parameters.insert(setting.into(), "1".into());
-            assert!(requested_format(&request).is_err());
-            request.parameters.remove(setting);
-        }
-    }
-
-    use crate::storage_engines::sketch_db::index::{AggKind, Capability, SummarySeriesMetadata};
-    use asap_physical_operators::summary_kernels::SumAccumulator;
-    use asap_types::query_plan::{
-        ClickHousePlanningContext, ExactReadout, ExternalExactOutput, ExternalExactRequest,
-        FallbackPolicy, FixedEvaluationRange, InstantExecution, MaterializationBinding,
-        PhysicalGrouping, QueryLanguage, QueryNodeId, QueryPlan, QueryPlanEntry, QueryPlanNode,
-    };
-    use asap_types::summary_catalog::SummaryCatalog;
-    use asap_types::{AggregationType, KeyByLabelNames, PrecomputeMaterialization, WindowKind};
-    use axum::http::Method;
-
-    struct FixedExactSubtree;
-
-    #[async_trait]
-    impl ClickHouseExactBackend for FixedExactSubtree {
-        async fn execute(
-            &self,
-            request: &ClickHouseQueryRequest,
-        ) -> Result<ClickHouseRawResponse, super::super::fallback::ClickHouseFallbackError>
-        {
-            assert_eq!(
-                request.parameters.get("output_format_json_quote_denormals"),
-                Some(&"1".into())
-            );
-            assert_eq!(request.parameters.get("param_from"), Some(&"0".into()));
-            assert_eq!(request.parameters.get("param_to"), Some(&"2000".into()));
-            Ok(ClickHouseRawResponse {
-                status: StatusCode::OK,
-                headers: HeaderMap::new(),
-                body: Bytes::from_static(br#"{"meta":[{"name":"timestamp","type":"Int64"},{"name":"divisor","type":"Float64"}],"data":[[2000,10.0]],"rows":1}"#),
-            })
-        }
-
-        async fn ping(
-            &self,
-        ) -> Result<ClickHouseRawResponse, super::super::fallback::ClickHouseFallbackError>
-        {
-            unreachable!()
-        }
-    }
-    use planner_types::{
-        post_asap::{SummaryFamilyType, SummaryField, SummarySchema, ValueOperation},
-        pre_asap::{
-            ArithmeticOpKind, Column, CompareOpKind, DataType, GroupKeys, Predicate, ProjectItem,
-            QueryExpr, ScalarValue, Schema, SortKey,
-        },
-    };
-    use std::{
-        collections::{BTreeMap, BTreeSet, HashMap},
-        rc::Rc,
-    };
-
-    fn mixed_summary_external_entry(mut entry: QueryPlanEntry) -> QueryPlanEntry {
-        let left = QueryNodeId(1);
-        let external = QueryNodeId(6);
-        let join = QueryNodeId(7);
-        let project = QueryNodeId(8);
-        let left_schema = relation_schema(&[
-            ("timestamp", DataType::Timestamp),
-            ("value", DataType::Float64),
-        ]);
-        let right_schema = relation_schema(&[
-            ("timestamp", DataType::Timestamp),
-            ("divisor", DataType::Float64),
-        ]);
-        let joined_schema = relation_schema(&[
-            ("timestamp", DataType::Timestamp),
-            ("value", DataType::Float64),
-            ("timestamp", DataType::Timestamp),
-            ("divisor", DataType::Float64),
-        ]);
-        let output_schema = relation_schema(&[
-            ("timestamp", DataType::Timestamp),
-            ("ratio", DataType::Float64),
-        ]);
-        entry
-            .nodes
-            .retain(|id, _| *id == QueryNodeId(0) || *id == left);
-        entry.nodes.insert(external, QueryPlanNode::ExternalExact {
-            request: ExternalExactRequest {
-                language: QueryLanguage::ClickHouseSql,
-                expression: "SELECT toInt64(2000) AS timestamp, toFloat64(10) AS divisor WHERE {from:UInt64} <= {to:UInt64}".into(),
-                output: ExternalExactOutput::Relation { schema: serde_json::to_value(&right_schema).unwrap() },
-                parameters: BTreeMap::new(),
-                start_parameter: Some("from".into()),
-                end_parameter: Some("to".into()),
-                input_contracts: vec![],
-            },
-            inputs: vec![],
-        });
-        entry.nodes.insert(
-            join,
-            QueryPlanNode::RelationalJoin {
-                inputs: [left, external],
-                join_kind: planner_types::pre_asap::JoinKind::Inner,
-                pruning: None,
-                pred: serde_json::to_value(Predicate(Rc::new(QueryExpr::Compare {
-                    left: Rc::new(QueryExpr::Column(0)),
-                    op: CompareOpKind::Eq,
-                    right: Rc::new(QueryExpr::Column(2)),
-                })))
-                .unwrap(),
-                left_schema,
-                right_schema,
-                output_schema: joined_schema.clone(),
-            },
-        );
-        entry.nodes.insert(
-            project,
-            QueryPlanNode::Relational {
-                input: join,
-                operation: serde_json::to_value(ValueOperation::Project {
-                    cols: vec![
-                        ProjectItem {
-                            alias: Some("timestamp".into()),
-                            expr: QueryExpr::Column(0),
-                        },
-                        ProjectItem {
-                            alias: Some("ratio".into()),
-                            expr: QueryExpr::Arithmetic {
-                                op: ArithmeticOpKind::Div,
-                                left: Rc::new(QueryExpr::Column(1)),
-                                right: Rc::new(QueryExpr::Column(3)),
-                            },
-                        },
-                    ],
-                    qualifier: None,
-                })
-                .unwrap(),
-                input_schema: joined_schema,
-                output_schema,
-            },
-        );
-        entry.root = project;
-        entry
-    }
-
-    fn relation_schema(names: &[(&str, DataType)]) -> SummarySchema {
-        SummarySchema {
-            fields: names
-                .iter()
-                .map(|(name, dtype)| SummaryField {
-                    name: (*name).into(),
-                    dtype: SummaryFamilyType::Plain(dtype.clone()),
-                    nullable: false,
-                })
-                .collect(),
-            time_index: names
-                .iter()
-                .position(|(_, dtype)| *dtype == DataType::Timestamp),
-        }
-    }
-
-    async fn fixture(end_ms: u64) -> (CatalogClickHouseAccelerator, ClickHouseQueryRequest) {
-        fixture_with_store(end_ms, Arc::new(SketchStore::new()), true).await
-    }
-
-    async fn fixture_with_store(
-        end_ms: u64,
-        store: Arc<SketchStore>,
-        seed: bool,
-    ) -> (CatalogClickHouseAccelerator, ClickHouseQueryRequest) {
-        fixture_with_sql(end_ms, store, seed, false).await
-    }
-
-    async fn fixture_with_sql(
-        end_ms: u64,
-        store: Arc<SketchStore>,
-        seed: bool,
-        moving: bool,
-    ) -> (CatalogClickHouseAccelerator, ClickHouseQueryRequest) {
-        let sql = if moving {
-            format!("SELECT sum(value) FROM requests WHERE timestamp >= 0 AND timestamp < {end_ms}")
-        } else {
-            "SELECT sum(value) FROM requests".into()
-        };
-        let mut config = PrecomputeMaterialization::new(
-            AggregationType::Sum,
-            String::new(),
-            Default::default(),
-            KeyByLabelNames::empty(),
-            KeyByLabelNames::empty(),
-            KeyByLabelNames::empty(),
-            String::new(),
-            1,
-            1,
-            WindowKind::Tumbling,
-            String::new(),
-            "requests".into(),
-            None,
-            Some("asap_e2e.samples".into()),
-            Some("value".into()),
-        );
-        config.pane_origin_ms = Some(0);
-        config.table_timestamp_column = Some("timestamp_ms".into());
-        let sds = SummaryCatalog::from_materializations(41, 1, &[config.clone()]).unwrap();
-        let materialization = *sds.outputs.keys().next().unwrap();
-        let read = QueryNodeId(0);
-        let readout = QueryNodeId(1);
-        let input_schema = relation_schema(&[
-            ("timestamp", DataType::Timestamp),
-            ("value", DataType::Float64),
-        ]);
-        let projected_schema = relation_schema(&[
-            ("bucket", DataType::Timestamp),
-            ("score", DataType::Float64),
-        ]);
-        let filter = QueryNodeId(2);
-        let project = QueryNodeId(3);
-        let sort = QueryNodeId(4);
-        let root = QueryNodeId(5);
-        let executable = QueryPlanEntry {
-            language: QueryLanguage::ClickHouseSql,
-            query_id: "SELECT value FROM samples".into(),
-            canonical_query: "SELECT value FROM samples".into(),
-            fixed_evaluation: Some(FixedEvaluationRange {
-                start_ms: 0,
-                end_ms: 2_000,
-                cumulative: true,
-            }),
-            root,
-            nodes: [
-                (
-                    read,
-                    QueryPlanNode::ReadMaterialization {
-                        binding: MaterializationBinding {
-            full_window_slide_ms: None,
-                            materialization,
-                            stored_output_reference: sds.output_reference(materialization).unwrap(),
-                            output_grouping: PhysicalGrouping::Reduce(Vec::new()),
-                            item_labels: Vec::new(),
-                            window_ms: 1_000,
-                            pane_origin_ms: Some(0),
-                            readout_lookback_ms: None,
-                        },
-                    },
-                ),
-                (
-                    readout,
-                    QueryPlanNode::ExactReadout {
-                        input: read,
-                        readout: ExactReadout::Sum,
-                    },
-                ),
-                (
-                    filter,
-                    QueryPlanNode::Relational {
-                        input: readout,
-                    operation: serde_json::json!({"Filter": {"pred": Predicate(Rc::new(QueryExpr::Compare {
-                            left: Rc::new(QueryExpr::Column(1)),
-                            op: CompareOpKind::Gt,
-                            right: Rc::new(QueryExpr::Literal(ScalarValue::Float64(1.0))),
-                        }))}}),
-                        input_schema: input_schema.clone(),
-                        output_schema: input_schema.clone(),
-                    },
-                ),
-                (
-                    project,
-                    QueryPlanNode::Relational {
-                        input: filter,
-                        operation: serde_json::to_value(ValueOperation::Project {
-                            cols: vec![
-                                ProjectItem {
-                                    alias: Some("bucket".into()),
-                                    expr: QueryExpr::Column(0),
-                                },
-                                ProjectItem {
-                                    alias: Some("score".into()),
-                                    expr: QueryExpr::Arithmetic {
-                                        op: ArithmeticOpKind::Mul,
-                                        left: Rc::new(QueryExpr::Column(1)),
-                                        right: Rc::new(QueryExpr::Literal(ScalarValue::Float64(
-                                            10.0,
-                                        ))),
-                                    },
-                                },
-                            ],
-                            qualifier: None,
-                        })
-                        .unwrap(),
-                        input_schema: input_schema,
-                        output_schema: projected_schema.clone(),
-                    },
-                ),
-                (
-                    sort,
-                    QueryPlanNode::Relational {
-                        input: project,
-                        operation: serde_json::to_value(ValueOperation::Sort {
-                            keys: vec![SortKey {
-                                expr: QueryExpr::Column(1),
-                                ascending: false,
-                                nulls_first: false,
-                            }],
-                            partition_by: GroupKeys::none(),
-                        })
-                        .unwrap(),
-                        input_schema: projected_schema.clone(),
-                        output_schema: projected_schema.clone(),
-                    },
-                ),
-                (
-                    root,
-                    QueryPlanNode::Relational {
-                        input: sort,
-                        operation: serde_json::to_value(ValueOperation::Limit { n: 1, offset: 0, partition_by: planner_types::pre_asap::GroupKeys::none() })
-                            .unwrap(),
-                        input_schema: projected_schema.clone(),
-                        output_schema: projected_schema,
-                    },
-                ),
-            ]
-            .into_iter()
-            .collect(),
-            instant: InstantExecution {
-                lookback_ms: 2_000,
-                full_history: false,
-                cumulative_readout: true,
-            },
-            fallback: FallbackPolicy::ExactBackend,
-        };
-        let table_schema = Schema::with_time_index(
-            vec![
-                Column::new("timestamp", DataType::Int64, false),
-                Column::new("value", DataType::Float64, false),
-            ],
-            0,
-            vec![],
-        );
-        let tables = HashMap::from([("requests".into(), table_schema)]);
-        let (canonical_sql, template, range) = control_plane::clickhouse::bind_clickhouse_sql(
-            &sql,
-            &control_plane::clickhouse::ClickHouseSqlCatalog {
-                tables: tables.clone(),
-            },
-            planner_types::types::AccuracyTarget::Exact,
-        )
-        .await
-        .unwrap();
-        let window_templates = if range.is_some() {
-            BTreeMap::from([(template, vec![canonical_sql.clone()])])
-        } else {
-            BTreeMap::new()
-        };
-        let entry = QueryPlanEntry {
-            query_id: sql.clone(),
-            canonical_query: canonical_sql.clone(),
-            language: QueryLanguage::ClickHouseSql,
-            fixed_evaluation: Some(FixedEvaluationRange {
-                start_ms: 0,
-                end_ms,
-                cumulative: true,
-            }),
-            root: executable.root,
-            nodes: executable.nodes,
-            instant: executable.instant,
-            fallback: executable.fallback,
-        };
-        let query_plan = QueryPlan {
-            plan_id: 41,
-            plan_version: 1,
-            clickhouse_context: Some(ClickHousePlanningContext {
-                window_templates,
-                tables,
-                accuracy: planner_types::types::AccuracyTarget::Exact,
-            }),
-            selected_dags: Default::default(),
-            entries: BTreeMap::from([(
-                QueryPlan::catalog_key(QueryLanguage::ClickHouseSql, &canonical_sql),
-                entry,
-            )]),
-        };
-        store
-            .install_summary_catalog(Arc::new(sds.clone()))
-            .unwrap();
-        if seed {
-            store.register(SummarySeriesMetadata {
-                storage_handle: 7,
-                metric_name: "requests".into(),
-                group_by_keys: BTreeSet::new(),
-                capability: Some(Capability::ExactAgg(AggregationType::Sum)),
-                agg_kind: AggKind::ExactAgg {
-                    agg_type: AggregationType::Sum,
-                    parameters_canonical: String::new(),
-                    spatial_filter_canonical: String::new(),
-                },
-                accuracy: None,
-                first_seen_unix_ms: 0,
-                retired_at_ms: None,
-                expires_at_ms: None,
-                policy_fp: materialization.fingerprint(),
-            });
-            store.append_precompute(
-                7,
-                Default::default(),
-                (0, 1_000),
-                Box::new(SumAccumulator::with_sum(2.0)),
-            );
-            store.append_precompute(
-                7,
-                Default::default(),
-                (1_000, 2_000),
-                Box::new(SumAccumulator::with_sum(3.0)),
-            );
-        }
-        let envelope = asap_types::precompute_plan::PlanEnvelope {
-            plan_id: 41,
-            plan_version: 1,
-            generated_at_unix_ms: 0,
-            activation_unix_ms: 0,
-            expiry_unix_ms: None,
-            backend_compat: asap_types::precompute_plan::BACKEND_COMPAT.into(),
-            planner_revision: control_plane::physical::compiler::PLANNER_REVISION.into(),
-            capability_snapshot_id: "clickhouse-test".into(),
-        };
-        let mut precompute = asap_types::precompute_plan::PrecomputePlan::build(
-            envelope.clone(),
-            vec![config],
-            &["fixture".into()],
-        )
-        .unwrap();
-        precompute.bind_catalog(&sds).unwrap();
-        let mut transmission = control_plane::physical::compiler::build_transmission_plan(
-            envelope.clone(),
-            &precompute,
-            &BTreeMap::new(),
-        )
-        .unwrap();
-        transmission.summary_catalog = Some(sds.reference().unwrap());
-        let active = crate::drivers::query::servers::http::validate_and_build_runtime_plan(
-            crate::drivers::query::servers::http::PhysicalPlanInstallRequest {
-                summary_catalog: sds,
-                collector_plans: vec![],
-                precompute_plan: precompute,
-                transmission_plan: transmission,
-                query_plan,
-                storage_routing: None,
-                adaptation_evidence: vec![],
-            },
-            Arc::new(crate::storage_engines::types::BackendStorageRouting::empty()),
-        )
-        .unwrap();
-        let accelerator = CatalogClickHouseAccelerator::with_active_physical_plan(
-            store,
-            crate::storage_engines::types::ActivePhysicalPlanHandle::new(active),
-        );
-        let request = ClickHouseQueryRequest {
-            method: Method::GET,
-            sql,
-            body: Bytes::new(),
-            parameters: Default::default(),
-            headers: HeaderMap::new(),
-        };
-        (accelerator, request)
-    }
-
-    #[tokio::test]
-    async fn catalog_hit_executes_bound_summary_store_dag_and_encodes_typed_result() {
-        let (accelerator, request) = fixture(2_000).await;
-        let ClickHouseAccelerationOutcome::Accelerated(response) =
-            accelerator.execute(&request).await
-        else {
-            panic!("expected accelerated response")
-        };
-        assert_eq!(response.body, "1970-01-01T00:00:02\t50.0\n");
-    }
-
-    // A shifted request reads only its bound panes and falls back on a gap.
-    #[tokio::test]
-    async fn moving_window_binds_request_coverage() {
-        let (accelerator, mut request) =
-            fixture_with_sql(1_000, Arc::new(SketchStore::new()), true, true).await;
-        request.sql =
-            "SELECT sum(value) FROM requests WHERE timestamp >= 1000 AND timestamp < 2000".into();
-        let ClickHouseAccelerationOutcome::Accelerated(response) =
-            accelerator.execute(&request).await
-        else {
-            panic!("shifted covered window must accelerate");
-        };
-        assert_eq!(response.body, "1970-01-01T00:00:02\t30.0\n");
-        // Equivalent inclusive/arithmetic bounds must select the same panes.
-        request.sql =
-            "SELECT sum(value) FROM requests WHERE timestamp > 1999 - 1000 AND timestamp <= 1999"
-                .into();
-        let ClickHouseAccelerationOutcome::Accelerated(response) =
-            accelerator.execute(&request).await
-        else {
-            panic!("equivalent inclusive window must accelerate");
-        };
-        assert_eq!(response.body, "1970-01-01T00:00:02\t30.0\n");
-        request.sql =
-            "SELECT sum(value) FROM requests WHERE timestamp >= 2000 AND timestamp < 3000".into();
-        let uncovered = accelerator.execute(&request).await;
-        assert!(
-            matches!(
-                &uncovered,
-                ClickHouseAccelerationOutcome::Fallback(
-                    ClickHouseAccelerationFallback::IncompleteCoverage
-                )
-            ),
-            "{uncovered:?}"
-        );
-        request.sql =
-            "SELECT sum(value) FROM requests WHERE timestamp >= 0 AND timestamp < 2000".into();
-        assert!(matches!(
-            accelerator.execute(&request).await,
-            ClickHouseAccelerationOutcome::Fallback(ClickHouseAccelerationFallback::CatalogMiss)
-        ));
-    }
-
-    // A partially covered refresh must not return the available subset.
-    #[tokio::test]
-    async fn moving_window_partial_coverage_falls_back() {
-        let (accelerator, mut request) =
-            fixture_with_sql(2_000, Arc::new(SketchStore::new()), true, true).await;
-        request.sql =
-            "SELECT sum(value) FROM requests WHERE timestamp >= 1000 AND timestamp < 3000".into();
-        assert!(matches!(
-            accelerator.execute(&request).await,
-            ClickHouseAccelerationOutcome::Fallback(
-                ClickHouseAccelerationFallback::IncompleteCoverage
-            )
-        ));
-    }
-
-    // Concrete windows keep their identities; later windows use the shared index.
-    #[tokio::test]
-    async fn multiple_concrete_windows_share_a_template() {
-        let (accelerator, mut request) =
-            fixture_with_sql(1_000, Arc::new(SketchStore::new()), true, true).await;
-        let active = accelerator.active_physical_plan.as_ref().unwrap();
-        let mut snapshot = active.active_snapshot().as_ref().clone();
-        let context = snapshot.query_plan.clickhouse_context.as_ref().unwrap();
-        let second_sql =
-            "SELECT sum(value) FROM requests WHERE timestamp >= 1000 AND timestamp < 2000";
-        let (fixed, template, _) = control_plane::clickhouse::bind_clickhouse_sql(
-            second_sql,
-            &control_plane::clickhouse::ClickHouseSqlCatalog {
-                tables: context.tables.clone(),
-            },
-            context.accuracy.clone(),
-        )
-        .await
-        .unwrap();
-        let plan = Arc::make_mut(&mut snapshot.query_plan);
-        let mut second = plan.entries.values().next().unwrap().clone();
-        second.canonical_query = fixed.clone();
-        second.query_id = second_sql.into();
-        second.fixed_evaluation = Some(FixedEvaluationRange {
-            start_ms: 1000,
-            end_ms: 2000,
-            cumulative: true,
-        });
-        plan.entries.insert(
-            QueryPlan::catalog_key(QueryLanguage::ClickHouseSql, &fixed),
-            second,
-        );
-        plan.clickhouse_context
-            .as_mut()
-            .unwrap()
-            .window_templates
-            .get_mut(&template)
-            .unwrap()
-            .push(fixed);
-        plan.validate_against_catalog(snapshot.summary_catalog.as_ref().unwrap())
-            .unwrap();
-        active.swap(snapshot);
-        accelerator.store.append_precompute(
-            7,
-            Default::default(),
-            (2000, 3000),
-            Box::new(SumAccumulator::with_sum(5.0)),
-        );
-        for (sql, expected) in [
-            (request.sql.clone(), "1970-01-01T00:00:01\t20.0\n"),
-            (second_sql.into(), "1970-01-01T00:00:02\t30.0\n"),
-            (
-                "SELECT sum(value) FROM requests WHERE timestamp >= 2000 AND timestamp < 3000"
-                    .into(),
-                "1970-01-01T00:00:03\t50.0\n",
-            ),
-        ] {
-            request.sql = sql;
-            let ClickHouseAccelerationOutcome::Accelerated(response) =
-                accelerator.execute(&request).await
-            else {
-                panic!("concrete and refreshed windows must accelerate");
-            };
-            assert_eq!(response.body, expected);
-        }
-    }
-
-    // A publication made before time templates keeps its fixed lookup semantics.
-    #[tokio::test]
-    async fn legacy_bounded_sql_plan_still_executes() {
-        let (accelerator, mut request) =
-            fixture_with_sql(1_000, Arc::new(SketchStore::new()), true, true).await;
-        let active = accelerator.active_physical_plan.as_ref().unwrap();
-        let mut snapshot = active.active_snapshot().as_ref().clone();
-        let context = snapshot.query_plan.clickhouse_context.as_ref().unwrap();
-        let (fixed, _, _) = control_plane::clickhouse::bind_clickhouse_sql(
-            &request.sql,
-            &control_plane::clickhouse::ClickHouseSqlCatalog {
-                tables: context.tables.clone(),
-            },
-            context.accuracy.clone(),
-        )
-        .await
-        .unwrap();
-        let plan = Arc::make_mut(&mut snapshot.query_plan);
-        plan.clickhouse_context
-            .as_mut()
-            .unwrap()
-            .window_templates
-            .clear();
-        let mut entry = plan.entries.pop_first().unwrap().1;
-        entry.canonical_query = fixed.clone();
-        plan.entries.insert(
-            QueryPlan::catalog_key(QueryLanguage::ClickHouseSql, &fixed),
-            entry,
-        );
-        active.swap(snapshot);
-        let ClickHouseAccelerationOutcome::Accelerated(response) =
-            accelerator.execute(&request).await
-        else {
-            panic!("old fixed identity must remain executable");
-        };
-        assert_eq!(response.body, "1970-01-01T00:00:01\t20.0\n");
-        request.sql =
-            "SELECT sum(value) FROM requests WHERE timestamp >= 1000 AND timestamp < 2000".into();
-        assert!(matches!(
-            accelerator.execute(&request).await,
-            ClickHouseAccelerationOutcome::Fallback(ClickHouseAccelerationFallback::CatalogMiss)
-        ));
-    }
-
-    #[tokio::test]
-    async fn incomplete_summary_store_coverage_falls_back() {
-        let (accelerator, request) = fixture(3_000).await;
-        assert!(matches!(
-            accelerator.execute(&request).await,
-            ClickHouseAccelerationOutcome::Fallback(
-                ClickHouseAccelerationFallback::IncompleteCoverage
-            )
-        ));
-    }
-
-    #[tokio::test(flavor = "current_thread")]
-    async fn real_clickhouse_reader_enters_backfill_service_lifecycle() {
-        let Ok(base_url) = std::env::var("CLICKHOUSE_URL") else {
-            return;
-        };
-        let user = std::env::var("CLICKHOUSE_USER").ok();
-        let password = std::env::var("CLICKHOUSE_PASSWORD").ok();
-        let client = reqwest::Client::new();
-        for sql in [
-            "CREATE DATABASE IF NOT EXISTS asap_e2e",
-            "DROP TABLE IF EXISTS asap_e2e.samples",
-            "CREATE TABLE asap_e2e.samples(metric String, labels String, timestamp_ms Int64, value Float64) ENGINE=Memory",
-            "INSERT INTO asap_e2e.samples VALUES ('requests','requests',100,2),('errors','errors',1100,3)",
-        ] {
-            let mut request = client.post(&base_url).body(sql);
-            if let Some(user) = &user { request = request.basic_auth(user, password.as_ref()); }
-            assert!(request.send().await.unwrap().status().is_success());
-        }
-        let mut cfg = PrecomputeMaterialization::new(
-            AggregationType::Sum,
-            String::new(),
-            Default::default(),
-            KeyByLabelNames::empty(),
-            KeyByLabelNames::empty(),
-            KeyByLabelNames::empty(),
-            String::new(),
-            1,
-            1,
-            WindowKind::Tumbling,
-            String::new(),
-            "requests".into(),
-            None,
-            None,
-            None,
-        );
-        cfg.pane_origin_ms = Some(0);
-        cfg.table_name = Some("asap_e2e.samples".into());
-        cfg.table_timestamp_column = Some("timestamp_ms".into());
-        cfg.value_projection = Some(asap_types::sds::ValueProjectionIdentity::Column {
-            name: "value".into(),
-        });
-        let hot = crate::storage_engines::types::InstalledPrecomputePlanHandle::from_arc(Arc::new(
-            crate::storage_engines::types::InstalledPrecomputePlan::from_raw_ids(HashMap::from([
-                (cfg.policy_fp_u64(), cfg.clone()),
-            ])),
-        ));
-        let registry =
-            Arc::new(crate::storage_engines::sketch_db::backfill::BackfillRegistry::new());
-        let reader = crate::storage_engines::sketch_db::backfill::ClickHouseReaderConfig {
-            base_url,
-            database: "asap_e2e".into(),
-            table: "samples".into(),
-            metric_column: "metric".into(),
-            labels_column: "labels".into(),
-            timestamp_ms_column: "wrong_deployment_timestamp".into(),
-            value_column: "value".into(),
-            user,
-            password,
-        };
-        let store = Arc::new(SketchStore::new());
-        let service = crate::storage_engines::sketch_db::backfill::BackfillService::new(
-            registry.clone(),
-            hot,
-            crate::storage_engines::sketch_db::backfill::clickhouse_reader_factory(reader),
-            crate::storage_engines::sketch_db::backfill::BackfillServiceConfig {
-                poll_interval: std::time::Duration::from_millis(10),
-            },
-        )
-        .with_sketch_index(store.clone())
-        .with_series_resolver(Arc::new(
-            crate::drivers::ingest::series_resolver::SeriesIdResolver::new(),
-        ));
-        let handle = service.spawn();
-        let job = registry.create(
-            cfg.policy_fp_u64(),
-            (0, 2_000),
-            crate::storage_engines::sketch_db::backfill::BackfillSource::ClickHouse {
-                database: "asap_e2e".into(),
-                table: "samples".into(),
-            },
-            2,
-        );
-        for _ in 0..200 {
-            if registry
-                .get(job)
-                .is_some_and(|job| job.status.is_terminal())
-            {
-                break;
-            }
-            tokio::time::sleep(std::time::Duration::from_millis(10)).await;
-        }
-        handle.shutdown().await;
-        assert_eq!(
-            registry.get(job).unwrap().status,
-            crate::storage_engines::sketch_db::backfill::BackfillStatus::Complete
-        );
-        assert!(!store
-            .series_ids_for_policy(cfg.policy_fingerprint())
-            .is_empty());
-        let (accelerator, request) = fixture_with_store(2_000, store, false).await;
-        let response = match accelerator.execute(&request).await {
-            ClickHouseAccelerationOutcome::Accelerated(response) => response,
-            outcome => panic!(
-                "published SQL DAG did not read ClickHouse-backfilled SummaryStore state: {outcome:?}"
-            ),
-        };
-        assert_eq!(response.body, "1970-01-01T00:00:02\t50.0\n");
-        let mut exact = client
-            .post(std::env::var("CLICKHOUSE_URL").unwrap())
-            .body("SELECT sum(value) * 10 FROM asap_e2e.samples FORMAT TabSeparated");
-        if let Some(user) = std::env::var("CLICKHOUSE_USER").ok() {
-            exact = exact.basic_auth(user, std::env::var("CLICKHOUSE_PASSWORD").ok());
-        }
-        let exact_value: f64 = exact
-            .send()
-            .await
-            .unwrap()
-            .text()
-            .await
-            .unwrap()
-            .trim()
-            .parse()
-            .unwrap();
-        let accelerated_value: f64 = std::str::from_utf8(&response.body)
-            .unwrap()
-            .trim()
-            .split('\t')
-            .nth(1)
-            .unwrap()
-            .parse()
-            .unwrap();
-        assert_eq!(accelerated_value, exact_value);
-    }
-
-    // Rejecting mixed snapshots must preserve whole-query external execution.
-    #[tokio::test]
-    async fn external_only_sql_keeps_native_binding_and_result_encoding() {
-        let (accelerator, request) = fixture(2_000).await;
-        let physical = accelerator
-            .active_physical_plan
-            .as_ref()
-            .unwrap()
-            .active_snapshot();
-        let mut entry = mixed_summary_external_entry(
-            physical.query_plan.entries.values().next().unwrap().clone(),
-        );
-        entry.root = QueryNodeId(6);
-        entry.nodes.retain(|id, _| *id == entry.root);
-        let accelerator = accelerator.with_exact_backend(Arc::new(FixedExactSubtree));
-        let ClickHouseAccelerationOutcome::Accelerated(response) = accelerator
-            .execute_bound(&request, &physical, &entry, None)
-            .await
-        else {
-            panic!("external-only SQL should remain executable");
-        };
-        assert_eq!(
-            std::str::from_utf8(&response.body).unwrap(),
-            "1970-01-01T00:00:02\t10.0\n"
-        );
-    }
-
-    #[tokio::test]
-    async fn summary_and_external_exact_leaf_requires_snapshot_proof() {
-        let (accelerator, request) = fixture(2_000).await;
-        let physical = accelerator
-            .active_physical_plan
-            .as_ref()
-            .unwrap()
-            .active_snapshot();
-        let entry = mixed_summary_external_entry(
-            physical.query_plan.entries.values().next().unwrap().clone(),
-        );
-        assert!(entry
-            .validate_snapshot_sources()
-            .unwrap_err()
-            .to_string()
-            .contains("common snapshot proof"));
-        // Deliberately omit an external backend: rejection must precede I/O.
-        let error = accelerator
-            .prepare_external_exact(&entry, 0, 2_000, &request)
-            .await
-            .unwrap_err();
-        assert!(
-            error.to_string().contains("common snapshot proof"),
-            "{error}"
-        );
-    }
-
-    // Even a malformed already-active plan fails before it can call an external source.
-    #[tokio::test]
-    async fn active_mixed_plan_is_rejected_before_external_execution() {
-        let (accelerator, request) = fixture(2_000).await;
-        let physical = accelerator
-            .active_physical_plan
-            .as_ref()
-            .unwrap()
-            .active_snapshot();
-        let mut query_plan = physical.query_plan.as_ref().clone();
-        let key = query_plan.entries.keys().next().unwrap().clone();
-        let entry = mixed_summary_external_entry(query_plan.entries[&key].clone());
-        query_plan.entries.insert(key, entry);
-        let mut active = physical.as_ref().clone();
-        active.query_plan = Arc::new(query_plan);
-        let accelerator = CatalogClickHouseAccelerator::with_active_physical_plan_and_exact_backend(
-            accelerator.store.clone(),
-            crate::storage_engines::types::ActivePhysicalPlanHandle::new(active),
-            Arc::new(super::super::fallback::ClickHouseHttpFallback::new(
-                "http://127.0.0.1:1".into(),
-                "default".into(),
-            )),
-        );
-        assert!(matches!(accelerator.execute(&request).await,
-            ClickHouseAccelerationOutcome::Fallback(ClickHouseAccelerationFallback::Planning(reason))
-            if reason.contains("common snapshot proof")));
-    }
-}
diff --git a/data_plane/src/query_engines/asap_clickhouse_query_engine/clickhouse_result_adapter.rs b/data_plane/src/query_engines/asap_clickhouse_query_engine/clickhouse_result_adapter.rs
deleted file mode 100644
index 4541d3d28..000000000
--- a/data_plane/src/query_engines/asap_clickhouse_query_engine/clickhouse_result_adapter.rs
+++ /dev/null
@@ -1,588 +0,0 @@
-use super::fallback::ClickHouseRawResponse;
-use arrow::{
-    array::{Array, Float64Array, StringArray, TimestampMillisecondArray},
-    datatypes::{DataType, Field, Schema},
-    json::{LineDelimitedWriter, WriterBuilder},
-    record_batch::RecordBatch,
-    util::display::array_value_to_string,
-};
-use axum::response::{IntoResponse, Response};
-use serde::{
-    ser::{SerializeMap, SerializeSeq, SerializeStruct},
-    Serialize, Serializer,
-};
-use std::{collections::BTreeMap, sync::Arc};
-
-#[derive(Debug, Clone, Copy, PartialEq, Eq)]
-pub enum ClickHouseFormat {
-    TabSeparated,
-    JsonEachRow,
-    Json,
-}
-
-#[derive(Debug, thiserror::Error)]
-pub enum ClickHouseResultError {
-    #[error("cannot render Arrow value: {0}")]
-    Arrow(String),
-    #[error("cannot encode ClickHouse JSON: {0}")]
-    Json(#[from] serde_json::Error),
-}
-
-pub struct ClickHouseQueryResult {
-    pub batches: Vec<RecordBatch>,
-}
-
-pub fn from_series_rows(
-    rows: Vec<(BTreeMap<String, String>, Vec<(i64, f64)>)>,
-) -> Result<ClickHouseQueryResult, ClickHouseResultError> {
-    let mut label_names = rows
-        .iter()
-        .flat_map(|(labels, _)| labels.keys().cloned())
-        .collect::<Vec<_>>();
-    label_names.sort();
-    label_names.dedup();
-    let flattened = rows
-        .iter()
-        .flat_map(|(labels, points)| points.iter().map(move |point| (labels, point)))
-        .collect::<Vec<_>>();
-    let mut fields = label_names
-        .iter()
-        .map(|name| Field::new(name, DataType::Utf8, true))
-        .collect::<Vec<_>>();
-    fields.push(Field::new(
-        "timestamp",
-        DataType::Timestamp(arrow::datatypes::TimeUnit::Millisecond, None),
-        false,
-    ));
-    fields.push(Field::new("value", DataType::Float64, false));
-    let mut columns = label_names
-        .iter()
-        .map(|name| {
-            Arc::new(StringArray::from(
-                flattened
-                    .iter()
-                    .map(|(labels, _)| labels.get(name).map(String::as_str))
-                    .collect::<Vec<_>>(),
-            )) as arrow::array::ArrayRef
-        })
-        .collect::<Vec<_>>();
-    columns.push(Arc::new(TimestampMillisecondArray::from(
-        flattened.iter().map(|(_, (ts, _))| *ts).collect::<Vec<_>>(),
-    )));
-    columns.push(Arc::new(Float64Array::from(
-        flattened
-            .iter()
-            .map(|(_, (_, value))| *value)
-            .collect::<Vec<_>>(),
-    )));
-    let batch = RecordBatch::try_new(Arc::new(Schema::new(fields)), columns)
-        .map_err(|error| ClickHouseResultError::Arrow(error.to_string()))?;
-    Ok(ClickHouseQueryResult {
-        batches: vec![batch],
-    })
-}
-
-impl ClickHouseQueryResult {
-    pub fn encode(&self, format: ClickHouseFormat) -> Result<Vec<u8>, ClickHouseResultError> {
-        if self.batches.iter().any(|batch| {
-            batch
-                .columns()
-                .iter()
-                .any(|column| contains_map_timestamp(column.data_type(), false))
-        }) {
-            return Err(ClickHouseResultError::Arrow(
-                "nested Map timestamp output requires an explicit formatting contract".into(),
-            ));
-        }
-        // ClickHouse's 64-bit JSON quoting default is deployment-configurable.
-        // Until the client output policy is explicit, never guess it for warm output.
-        if matches!(
-            format,
-            ClickHouseFormat::Json | ClickHouseFormat::JsonEachRow
-        ) && self.batches.iter().any(|batch| {
-            batch
-                .columns()
-                .iter()
-                .any(|column| contains_json_integer64(column.data_type()))
-        }) {
-            return Err(ClickHouseResultError::Arrow(
-                "64-bit JSON integer output requires an explicit quoting contract".into(),
-            ));
-        }
-        let mut output = Vec::new();
-        for batch in &self.batches {
-            for row in 0..batch.num_rows() {
-                match format {
-                    ClickHouseFormat::TabSeparated => {
-                        for column in 0..batch.num_columns() {
-                            if column > 0 {
-                                output.push(b'\t');
-                            }
-                            if batch.column(column).is_null(row) {
-                                output.extend_from_slice(b"\\N");
-                                continue;
-                            }
-                            if matches!(batch.column(column).data_type(), DataType::Map(..)) {
-                                output.extend_from_slice(
-                                    map_literal(batch.column(column).as_ref(), row)?.as_bytes(),
-                                );
-                                continue;
-                            }
-                            let value = array_value_to_string(batch.column(column).as_ref(), row)
-                                .map_err(|error| {
-                                ClickHouseResultError::Arrow(error.to_string())
-                            })?;
-                            output.extend_from_slice(escape_tsv(&value).as_bytes());
-                        }
-                        output.push(b'\n');
-                    }
-                    ClickHouseFormat::JsonEachRow => {
-                        if batch
-                            .schema()
-                            .fields()
-                            .iter()
-                            .any(|field| matches!(field.data_type(), DataType::Map(..)))
-                        {
-                            serde_json::to_writer(&mut output, &JsonArrowRow { batch, row })?;
-                            output.push(b'\n');
-                            continue;
-                        }
-
-                        let row = batch.slice(row, 1);
-                        let mut writer: LineDelimitedWriter<_> = WriterBuilder::new()
-                            .with_explicit_nulls(true)
-                            .build(&mut output);
-                        writer
-                            .write_batches(&[&row])
-                            .map_err(|error| ClickHouseResultError::Arrow(error.to_string()))?;
-                        writer
-                            .finish()
-                            .map_err(|error| ClickHouseResultError::Arrow(error.to_string()))?;
-                    }
-                    ClickHouseFormat::Json => {}
-                }
-            }
-        }
-        if format == ClickHouseFormat::Json {
-            return self.encode_json_document();
-        }
-        Ok(output)
-    }
-
-    fn encode_json_document(&self) -> Result<Vec<u8>, ClickHouseResultError> {
-        let schema = self.batches.first().map(RecordBatch::schema);
-        let meta = schema
-            .as_ref()
-            .map(|schema| {
-                schema
-                    .fields()
-                    .iter()
-                    .map(|field| {
-                        serde_json::json!({
-                            "name": field.name(),
-                            "type": clickhouse_type(field.data_type(), field.is_nullable()),
-                        })
-                    })
-                    .collect::<Vec<_>>()
-            })
-            .unwrap_or_default();
-        if self.batches.iter().any(|batch| {
-            batch
-                .schema()
-                .fields()
-                .iter()
-                .any(|field| matches!(field.data_type(), DataType::Map(..)))
-        }) {
-            let count: usize = self.batches.iter().map(RecordBatch::num_rows).sum();
-            let mut output = Vec::new();
-            let mut serializer = serde_json::Serializer::new(&mut output);
-            let mut document = serializer.serialize_struct("ClickHouseResult", 4)?;
-            document.serialize_field("meta", &meta)?;
-            document.serialize_field("data", &JsonArrowRows(&self.batches))?;
-            document.serialize_field("rows", &count)?;
-            document.serialize_field(
-                "statistics",
-                &serde_json::json!({"elapsed":0.0,"rows_read":count,"bytes_read":0}),
-            )?;
-            SerializeStruct::end(document)?;
-            return Ok(output);
-        }
-        let mut rows = Vec::new();
-        for batch in &self.batches {
-            let mut encoded = Vec::new();
-            let mut writer: LineDelimitedWriter<_> = WriterBuilder::new()
-                .with_explicit_nulls(true)
-                .build(&mut encoded);
-            writer
-                .write_batches(&[batch])
-                .map_err(|error| ClickHouseResultError::Arrow(error.to_string()))?;
-            writer
-                .finish()
-                .map_err(|error| ClickHouseResultError::Arrow(error.to_string()))?;
-            for line in encoded
-                .split(|byte| *byte == b'\n')
-                .filter(|line| !line.is_empty())
-            {
-                rows.push(serde_json::from_slice::<serde_json::Value>(line)?);
-            }
-        }
-        Ok(serde_json::to_vec(&serde_json::json!({
-            "meta": meta,
-            "data": rows,
-            "rows": rows.len(),
-            "statistics": {"elapsed": 0.0, "rows_read": rows.len(), "bytes_read": 0}
-        }))?)
-    }
-}
-
-pub(super) fn clickhouse_type(data_type: &arrow::datatypes::DataType, nullable: bool) -> String {
-    use arrow::datatypes::DataType;
-    let base = match data_type {
-        DataType::Null => "Nothing".into(),
-        DataType::Boolean => "Bool".into(),
-        DataType::Int8 => "Int8".into(),
-        DataType::Int16 => "Int16".into(),
-        DataType::Int32 => "Int32".into(),
-        DataType::Int64 => "Int64".into(),
-        DataType::UInt8 => "UInt8".into(),
-        DataType::UInt16 => "UInt16".into(),
-        DataType::UInt32 => "UInt32".into(),
-        DataType::UInt64 => "UInt64".into(),
-        DataType::Float32 => "Float32".into(),
-        DataType::Float64 => "Float64".into(),
-        DataType::Utf8 | DataType::LargeUtf8 => "String".into(),
-        DataType::Timestamp(_, _) => "DateTime64(3)".into(),
-        DataType::Map(entries, _) => match entries.data_type() {
-            DataType::Struct(fields) if fields.len() == 2 => format!(
-                "Map({}, {})",
-                clickhouse_type(fields[0].data_type(), false),
-                clickhouse_type(fields[1].data_type(), fields[1].is_nullable())
-            ),
-            other => other.to_string(),
-        },
-        other => other.to_string(),
-    };
-    if nullable {
-        format!("Nullable({base})")
-    } else {
-        base
-    }
-}
-
-fn contains_map_timestamp(dtype: &DataType, in_map: bool) -> bool {
-    match dtype {
-        DataType::Timestamp(..) => in_map,
-        DataType::Map(entries, _) => contains_map_timestamp(entries.data_type(), true),
-        DataType::Struct(fields) => fields
-            .iter()
-            .any(|field| contains_map_timestamp(field.data_type(), in_map)),
-        _ => false,
-    }
-}
-
-fn contains_json_integer64(dtype: &DataType) -> bool {
-    match dtype {
-        DataType::Int64 | DataType::UInt64 => true,
-        DataType::Map(entries, _) => contains_json_integer64(entries.data_type()),
-        DataType::Struct(fields) => fields
-            .iter()
-            .any(|field| contains_json_integer64(field.data_type())),
-        _ => false,
-    }
-}
-
-fn escape_tsv(value: &str) -> String {
-    value
-        .replace('\\', "\\\\")
-        .replace('\t', "\\t")
-        .replace('\n', "\\n")
-}
-
-pub fn raw_response(response: ClickHouseRawResponse) -> Response {
-    let mut output = (response.status, response.body).into_response();
-    for (name, value) in response.headers {
-        if let Some(name) = name {
-            output.headers_mut().append(name, value);
-        }
-    }
-    output
-}
-
-struct JsonArrowRows<'a>(&'a [RecordBatch]);
-impl Serialize for JsonArrowRows<'_> {
-    fn serialize<S: Serializer>(&self, serializer: S) -> Result<S::Ok, S::Error> {
-        let mut rows =
-            serializer.serialize_seq(Some(self.0.iter().map(RecordBatch::num_rows).sum()))?;
-        for batch in self.0 {
-            for row in 0..batch.num_rows() {
-                rows.serialize_element(&JsonArrowRow { batch, row })?;
-            }
-        }
-        rows.end()
-    }
-}
-struct JsonArrowRow<'a> {
-    batch: &'a RecordBatch,
-    row: usize,
-}
-impl Serialize for JsonArrowRow<'_> {
-    fn serialize<S: Serializer>(&self, serializer: S) -> Result<S::Ok, S::Error> {
-        let mut object = serializer.serialize_map(Some(self.batch.num_columns()))?;
-        for (field, column) in self
-            .batch
-            .schema()
-            .fields()
-            .iter()
-            .zip(self.batch.columns())
-        {
-            object.serialize_entry(
-                field.name(),
-                &JsonArrowValue {
-                    array: column.as_ref(),
-                    row: self.row,
-                },
-            )?;
-        }
-        object.end()
-    }
-}
-struct JsonArrowValue<'a> {
-    array: &'a dyn Array,
-    row: usize,
-}
-impl Serialize for JsonArrowValue<'_> {
-    fn serialize<S: Serializer>(&self, serializer: S) -> Result<S::Ok, S::Error> {
-        use arrow::array::*;
-        use serde::ser::Error;
-        if self.array.is_null(self.row) {
-            return serializer.serialize_none();
-        }
-        macro_rules! scalar {
-            ($ty:ty) => {
-                self.array
-                    .as_any()
-                    .downcast_ref::<$ty>()
-                    .ok_or_else(|| S::Error::custom("Arrow scalar type mismatch"))?
-                    .value(self.row)
-                    .serialize(serializer)
-            };
-        }
-        match self.array.data_type() {
-            DataType::Map(..) => {
-                let map = self
-                    .array
-                    .as_any()
-                    .downcast_ref::<MapArray>()
-                    .ok_or_else(|| S::Error::custom("Arrow map type mismatch"))?;
-                let entries = map.value(self.row);
-                let mut object = serializer.serialize_map(Some(entries.len()))?;
-                for row in 0..entries.len() {
-                    object.serialize_entry(
-                        &JsonArrowValue {
-                            array: entries.column(0).as_ref(),
-                            row,
-                        },
-                        &JsonArrowValue {
-                            array: entries.column(1).as_ref(),
-                            row,
-                        },
-                    )?;
-                }
-                object.end()
-            }
-            DataType::Boolean => scalar!(BooleanArray),
-            DataType::Int8 => scalar!(Int8Array),
-            DataType::Int16 => scalar!(Int16Array),
-            DataType::Int32 => scalar!(Int32Array),
-            DataType::Int64 => scalar!(Int64Array),
-            DataType::UInt8 => scalar!(UInt8Array),
-            DataType::UInt16 => scalar!(UInt16Array),
-            DataType::UInt32 => scalar!(UInt32Array),
-            DataType::UInt64 => scalar!(UInt64Array),
-            DataType::Float32 => scalar!(Float32Array),
-            DataType::Float64 => scalar!(Float64Array),
-            DataType::Utf8 => scalar!(StringArray),
-            DataType::LargeUtf8 => scalar!(LargeStringArray),
-            DataType::Timestamp(..) => array_value_to_string(self.array, self.row)
-                .map_err(S::Error::custom)?
-                .serialize(serializer),
-            dtype => Err(S::Error::custom(format!(
-                "unsupported nested Arrow value {dtype}"
-            ))),
-        }
-    }
-}
-
-fn map_literal(array: &dyn Array, row: usize) -> Result<String, ClickHouseResultError> {
-    use arrow::array::{Float32Array, LargeStringArray, MapArray};
-    if array.is_null(row) {
-        return Ok("NULL".into());
-    }
-    match array.data_type() {
-        DataType::Map(..) => {
-            let map = array
-                .as_any()
-                .downcast_ref::<MapArray>()
-                .ok_or_else(|| ClickHouseResultError::Arrow("invalid map array".into()))?;
-            let entries = map.value(row);
-            let mut values = Vec::with_capacity(entries.len());
-            for row in 0..entries.len() {
-                values.push(format!(
-                    "{}:{}",
-                    map_literal(entries.column(0).as_ref(), row)?,
-                    map_literal(entries.column(1).as_ref(), row)?
-                ));
-            }
-            Ok(format!("{{{}}}", values.join(",")))
-        }
-        DataType::Utf8 | DataType::LargeUtf8 => {
-            let value = if let Some(array) = array.as_any().downcast_ref::<StringArray>() {
-                array.value(row)
-            } else if let Some(array) = array.as_any().downcast_ref::<LargeStringArray>() {
-                array.value(row)
-            } else {
-                return Err(ClickHouseResultError::Arrow("invalid string array".into()));
-            };
-            let mut escaped = String::from("'");
-            for ch in value.chars() {
-                match ch {
-                    '\\' => escaped.push_str("\\\\"),
-                    '\'' => escaped.push_str("\\'"),
-                    '\n' => escaped.push_str("\\n"),
-                    '\r' => escaped.push_str("\\r"),
-                    '\t' => escaped.push_str("\\t"),
-                    '\0' => escaped.push_str("\\0"),
-                    '\u{0008}' => escaped.push_str("\\b"),
-                    '\u{000c}' => escaped.push_str("\\f"),
-                    ch => escaped.push(ch),
-                }
-            }
-            escaped.push('\'');
-            Ok(escaped)
-        }
-        DataType::Float64 => Ok(array
-            .as_any()
-            .downcast_ref::<Float64Array>()
-            .unwrap()
-            .value(row)
-            .to_string()),
-        DataType::Float32 => Ok(array
-            .as_any()
-            .downcast_ref::<Float32Array>()
-            .unwrap()
-            .value(row)
-            .to_string()),
-        DataType::Timestamp(..) => Err(ClickHouseResultError::Arrow(
-            "timestamp map TSV encoding is unsupported".into(),
-        )),
-        _ => array_value_to_string(array, row)
-            .map_err(|error| ClickHouseResultError::Arrow(error.to_string())),
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use arrow::{
-        array::{Int64Array, StringArray},
-        datatypes::{DataType, Field, Schema},
-    };
-    use std::sync::Arc;
-
-    #[test]
-    fn nullable_fields_remain_explicit_in_json_and_tsv() {
-        let batch = RecordBatch::try_new(
-            Arc::new(Schema::new(vec![
-                Field::new("value", DataType::Float64, true),
-                Field::new("label", DataType::Utf8, true),
-            ])),
-            vec![
-                Arc::new(Float64Array::from(vec![Some(1.25), None, Some(2.5)])),
-                Arc::new(StringArray::from(vec![Some(""), None, Some("\\N")])),
-            ],
-        )
-        .unwrap();
-        let result = ClickHouseQueryResult {
-            batches: vec![batch],
-        };
-        let json: serde_json::Value =
-            serde_json::from_slice(&result.encode(ClickHouseFormat::Json).unwrap()).unwrap();
-        assert_eq!(
-            json["data"],
-            serde_json::json!([{ "value":1.25,"label":"" }, { "value":null,"label":null }, {"value":2.5,"label":"\\N"}])
-        );
-        let lines = result.encode(ClickHouseFormat::JsonEachRow).unwrap();
-        let null_row: serde_json::Value =
-            serde_json::from_slice(lines.split(|byte| *byte == b'\n').nth(1).unwrap()).unwrap();
-        assert_eq!(null_row, serde_json::json!({"value":null,"label":null}));
-        assert_eq!(
-            result.encode(ClickHouseFormat::TabSeparated).unwrap(),
-            b"1.25\t\n\\N\t\\N\n2.5\t\\\\N\n"
-        );
-    }
-
-    #[test]
-    fn empty_map_bottom_type_uses_clickhouse_nothing() {
-        let entries = DataType::Struct(
-            vec![
-                Field::new("key", DataType::Null, false),
-                Field::new("value", DataType::Null, false),
-            ]
-            .into(),
-        );
-        let dtype = DataType::Map(Arc::new(Field::new("entries", entries, false)), false);
-        assert_eq!(clickhouse_type(&dtype, false), "Map(Nothing, Nothing)");
-        assert_eq!(clickhouse_type(&DataType::Null, true), "Nullable(Nothing)");
-    }
-
-    #[test]
-    fn map_timestamp_transport_is_not_assumed_to_match_native_formatting() {
-        let entries = DataType::Struct(
-            vec![
-                Field::new("key", DataType::Utf8, false),
-                Field::new(
-                    "value",
-                    DataType::Timestamp(arrow::datatypes::TimeUnit::Millisecond, None),
-                    false,
-                ),
-            ]
-            .into(),
-        );
-        let dtype = DataType::Map(Arc::new(Field::new("entries", entries, false)), false);
-        let batch = RecordBatch::try_new(
-            Arc::new(Schema::new(vec![Field::new("m", dtype.clone(), false)])),
-            vec![arrow::array::new_empty_array(&dtype)],
-        )
-        .unwrap();
-        let result = ClickHouseQueryResult {
-            batches: vec![batch],
-        };
-        assert!(result.encode(ClickHouseFormat::Json).is_err());
-        assert!(result.encode(ClickHouseFormat::TabSeparated).is_err());
-    }
-
-    #[test]
-    fn encodes_table_without_using_promql_query_result() {
-        let schema = Arc::new(Schema::new(vec![
-            Field::new("zone", DataType::Utf8, false),
-            Field::new("count", DataType::Int64, false),
-        ]));
-        let batch = RecordBatch::try_new(
-            schema,
-            vec![
-                Arc::new(StringArray::from(vec!["a\tb"])),
-                Arc::new(Int64Array::from(vec![7])),
-            ],
-        )
-        .unwrap();
-        let result = ClickHouseQueryResult {
-            batches: vec![batch],
-        };
-        assert_eq!(
-            result.encode(ClickHouseFormat::TabSeparated).unwrap(),
-            b"a\\tb\t7\n"
-        );
-        assert!(result.encode(ClickHouseFormat::JsonEachRow).is_err());
-        assert!(result.encode(ClickHouseFormat::Json).is_err());
-    }
-}
diff --git a/data_plane/src/query_engines/asap_clickhouse_query_engine/execution.rs b/data_plane/src/query_engines/asap_clickhouse_query_engine/execution.rs
deleted file mode 100644
index 27edd68ae..000000000
--- a/data_plane/src/query_engines/asap_clickhouse_query_engine/execution.rs
+++ /dev/null
@@ -1,888 +0,0 @@
-//! SQL boundary around the shared, compiler-bound physical DAG executor.
-use super::{
-    clickhouse_result_adapter::{from_series_rows, ClickHouseQueryResult},
-    relational_adapter::ClickHouseRelation,
-};
-use crate::{
-    query_engines::asap_query_engine::{
-        catalog_resolver::validate_payload, post_asap_readout::execute_query_plan_from_readout,
-    },
-    storage_engines::sketch_db::index::SketchStore,
-};
-use asap_types::query_plan::{QueryNodeId, QueryPlanEntry, QueryPlanNode};
-use asap_types::summary_catalog::SummaryCatalog;
-use std::collections::{BTreeMap, BTreeSet};
-
-pub type PreparedExternalLeaves = BTreeMap<QueryNodeId, ClickHouseRelation>;
-
-#[derive(Debug, Clone, PartialEq, Eq)]
-pub enum ClickHouseDagFallback {
-    NoCandidates,
-    UnsupportedPlan(String),
-    IncompleteCoverage {
-        requested: (u64, u64),
-        observed: Option<(u64, u64)>,
-    },
-    ResultEncoding(String),
-}
-
-#[cfg(test)]
-thread_local! {
-    // Deterministically publish between branches without timing-dependent threads.
-    static AFTER_BRANCH: std::cell::Cell<Option<fn(&SketchStore)>> = const { std::cell::Cell::new(None) };
-}
-
-#[derive(Debug, thiserror::Error)]
-enum SqlExecutionError {
-    #[error("{0}")]
-    Binding(String),
-    #[error(transparent)]
-    Physical(#[from] asap_physical_operators::dag::Error),
-}
-impl From<String> for SqlExecutionError {
-    fn from(value: String) -> Self {
-        Self::Binding(value)
-    }
-}
-impl From<&str> for SqlExecutionError {
-    fn from(value: &str) -> Self {
-        Self::Binding(value.into())
-    }
-}
-impl From<crate::query_engines::asap_query_engine::post_asap_readout::LoweringSkip>
-    for SqlExecutionError
-{
-    fn from(
-        error: crate::query_engines::asap_query_engine::post_asap_readout::LoweringSkip,
-    ) -> Self {
-        use crate::query_engines::asap_query_engine::post_asap_readout::LoweringSkip;
-        match error {
-            LoweringSkip::Execution(error) => Self::Physical(error),
-            error => Self::Binding(format!("incomplete leaf coverage: {error:?}")),
-        }
-    }
-}
-
-struct RelationDagExecutor<'a> {
-    index: &'a SketchStore,
-    entry: &'a QueryPlanEntry,
-    prepared: &'a PreparedExternalLeaves,
-    t0_ms: u64,
-    t1_ms: u64,
-    is_cumulative: bool,
-    memo: BTreeMap<QueryNodeId, ClickHouseRelation>,
-    schemas: BTreeMap<QueryNodeId, planner_types::post_asap::SummarySchema>,
-    #[cfg(test)]
-    evaluations: BTreeMap<QueryNodeId, usize>,
-}
-
-impl RelationDagExecutor<'_> {
-    fn execute(
-        &mut self,
-        root: QueryNodeId,
-        expected_schema: &planner_types::post_asap::SummarySchema,
-    ) -> Result<ClickHouseRelation, SqlExecutionError> {
-        if let Some(schema) = self.schemas.get(&root) {
-            if schema != expected_schema {
-                return Err(format!(
-                    "query `{}` node {} is consumed with inconsistent relation schemas",
-                    self.entry.query_id, root.0
-                )
-                .into());
-            }
-        }
-        if let Some(relation) = self.memo.get(&root) {
-            return Ok(relation.clone());
-        }
-        self.schemas.insert(root, expected_schema.clone());
-        let relation = self.execute_graph(root, expected_schema)?;
-        self.record_evaluation(root);
-        self.memo.insert(root, relation.clone());
-        Ok(relation)
-    }
-
-    #[cfg(test)]
-    fn record_evaluation(&mut self, id: QueryNodeId) {
-        *self.evaluations.entry(id).or_default() += 1;
-        if let Some(publish) = AFTER_BRANCH.with(|hook| hook.take()) {
-            publish(self.index);
-        }
-    }
-
-    #[cfg(not(test))]
-    fn record_evaluation(&mut self, _id: QueryNodeId) {}
-
-    fn execute_graph(
-        &mut self,
-        root: QueryNodeId,
-        expected: &planner_types::post_asap::SummarySchema,
-    ) -> Result<ClickHouseRelation, SqlExecutionError> {
-        use super::relational_adapter::native;
-        use asap_physical_operators::dag::{self, operators::Operator};
-        use futures::{FutureExt, StreamExt};
-        use planner_types::post_asap::{
-            ExecutableDagNode, ExecutableOperatorPayload as Payload, ExecutionDataState,
-            PostAsapNodeId, SummarySchema,
-        };
-        use std::sync::Arc;
-        let mut pending = vec![(root, expected.clone())];
-        let mut schemas = BTreeMap::<QueryNodeId, SummarySchema>::new();
-        let mut operations = BTreeMap::new();
-        let mut sources = Vec::new();
-        // Bind the entire computation before reading any storage source.
-        while let Some((id, expected)) = pending.pop() {
-            if let Some(previous) = schemas.get(&id) {
-                if previous != &expected {
-                    return Err("inconsistent relation schemas".into());
-                }
-                continue;
-            }
-            schemas.insert(id, expected.clone());
-            let (payload, inputs) = match self.entry.nodes.get(&id) {
-                Some(QueryPlanNode::Relational {
-                    input,
-                    operation,
-                    input_schema,
-                    output_schema,
-                }) => {
-                    if output_schema != &expected {
-                        return Err("relational output schema mismatch".into());
-                    }
-                    let operation =
-                        serde_json::from_value(operation.clone()).map_err(|e| e.to_string())?;
-                    (
-                        Payload::Value { operation },
-                        vec![(*input, input_schema.clone())],
-                    )
-                }
-                Some(QueryPlanNode::RelationalJoin {
-                    inputs,
-                    join_kind,
-                    pred,
-                    left_schema,
-                    right_schema,
-                    output_schema,
-                    pruning,
-                }) => {
-                    if output_schema != &expected {
-                        return Err("join output schema mismatch".into());
-                    }
-                    if pruning.is_some() {
-                        return Err(
-                            "candidate pruning is not bound for this relation source".into()
-                        );
-                    }
-                    (
-                        Payload::RelationalJoin {
-                            join_kind: join_kind.clone(),
-                            pred: serde_json::from_value(pred.clone())
-                                .map_err(|e| e.to_string())?,
-                            pruning: None,
-                        },
-                        vec![
-                            (inputs[0], left_schema.clone()),
-                            (inputs[1], right_schema.clone()),
-                        ],
-                    )
-                }
-                Some(_) => {
-                    sources.push(id);
-                    continue;
-                }
-                None => return Err("missing relation node".into()),
-            };
-            let node = ExecutableDagNode {
-                id: PostAsapNodeId(
-                    u32::try_from(id.0).map_err(|_| "relation node ID exceeds Planner range")?,
-                ),
-                payload,
-                output_state: ExecutionDataState::QUERY_ROWS,
-                output_schema: expected,
-                guarantee: None,
-            };
-            let op = dag::planner::compile_node(
-                &node,
-                &inputs
-                    .iter()
-                    .map(|(_, schema)| Arc::new(schema.clone()))
-                    .collect::<Vec<_>>(),
-            )
-            .map_err(|e| e.to_string())?;
-            operations.insert(
-                id,
-                (inputs.iter().map(|(id, _)| id.0).collect::<Vec<_>>(), op),
-            );
-            pending.extend(inputs);
-        }
-        let compiled =
-            asap_physical_operators::physical_planner::CompiledPhysicalDag::from_operators(
-                sources
-                    .iter()
-                    .map(|id| {
-                        (
-                            id.0,
-                            asap_physical_operators::physical_planner::InputContract::bounded(
-                                Arc::new(schemas[id].clone()),
-                            ),
-                        )
-                    })
-                    .collect(),
-                operations.into_iter().map(|(id, op)| (id.0, op)).collect(),
-                vec![root.0],
-            )
-            .map_err(|e| e.to_string())?;
-        let mut resolved_inputs = BTreeMap::new();
-        let context = crate::query_engines::request::context(dag::Scope::Query {
-            evaluation_time_ms: i64::try_from(self.t1_ms)
-                .map_err(|_| "evaluation time overflow")?,
-            revision: self.index.summary_update_revision().mutation_sequence(),
-        })?;
-        let mut storage_roots = BTreeSet::new();
-        for source in &sources {
-            if !matches!(
-                self.entry.nodes[source],
-                QueryPlanNode::ExternalExact { .. }
-            ) {
-                storage_roots.insert(*source);
-                for id in self
-                    .entry
-                    .topological_order_from(*source)
-                    .map_err(|e| e.to_string())?
-                {
-                    if matches!(
-                        self.entry.nodes[&id],
-                        QueryPlanNode::ReadMaterialization { .. }
-                    ) {
-                        storage_roots.insert(id);
-                    }
-                }
-            }
-        }
-        let stored = crate::query_engines::asap_query_engine::post_asap_readout::execute_query_plan_readouts(
-            self.index,self.entry,&storage_roots.into_iter().collect::<Vec<_>>(),self.t0_ms,self.t1_ms,self.is_cumulative,context.clone(),
-        ).map_err(SqlExecutionError::from)?;
-        let mut coverage = None;
-        let mut first = true;
-        for id in sources {
-            let relation = self.execute_source(id, &schemas[&id], &stored)?;
-            coverage = if first {
-                first = false;
-                relation.coverage
-            } else {
-                match (coverage, relation.coverage) {
-                    (Some((a, b)), Some((c, d))) if a.max(c) <= b.min(d) => {
-                        Some((a.max(c), b.min(d)))
-                    }
-                    _ => None,
-                }
-            };
-            let batch = native::batch(&relation, &schemas[&id]).map_err(|e| e.to_string())?;
-            resolved_inputs.insert(
-                id.0,
-                Box::new(
-                    Operator::source(batch.schema().clone(), vec![batch])
-                        .map_err(|e| e.to_string())?,
-                ) as asap_physical_operators::physical_planner::Source<'_>,
-            );
-        }
-        let graph = compiled
-            .instantiate(resolved_inputs)
-            .map_err(|e| e.to_string())?;
-        let mut output = graph.execute(&[root.0], context)?.remove(0);
-        let mut batches = Vec::new();
-        loop {
-            crate::query_engines::request::check()?;
-            match output.next().now_or_never() {
-                Some(Some(Ok(batch))) => batches.push(batch),
-                Some(Some(Err(error))) => return Err(error.into()),
-                Some(None) => break,
-                None => continue,
-            }
-        }
-        native::relation(&batches, expected, coverage)
-            .map_err(|e| SqlExecutionError::Binding(e.to_string()))
-    }
-
-    fn execute_source(
-        &mut self,
-        root: QueryNodeId,
-        expected_schema: &planner_types::post_asap::SummarySchema,
-        stored: &BTreeMap<
-            QueryNodeId,
-            crate::query_engines::asap_query_engine::post_asap_readout::PostAsapReadoutOutcome,
-        >,
-    ) -> Result<ClickHouseRelation, SqlExecutionError> {
-        match self.entry.nodes.get(&root) {
-            Some(QueryPlanNode::ExternalExact { request, .. }) => {
-                if request.language != asap_types::QueryLanguage::ClickHouseSql {
-                    return Err(
-                        "ClickHouse DAG contains an external leaf for another language".into(),
-                    );
-                }
-                let asap_types::query_plan::ExternalExactOutput::Relation { schema } =
-                    &request.output
-                else {
-                    return Err("ClickHouse external leaf must declare relation output".into());
-                };
-                let declared: planner_types::post_asap::SummarySchema =
-                    serde_json::from_value(schema.clone()).map_err(|error| error.to_string())?;
-                if &declared != expected_schema {
-                    return Err("external exact leaf schema differs from its parent edge".into());
-                }
-                self.prepared
-                    .get(&root)
-                    .cloned()
-                    .ok_or_else(|| "published external exact leaf was not prepared".into())
-            }
-            Some(_) => {
-                let outcome = stored.get(&root).ok_or("missing bound storage frontier")?;
-                let reachable = self
-                    .entry
-                    .topological_order_from(root)
-                    .map_err(|error| format!("invalid leaf DAG: {error}"))?;
-                for (leaf_id, binding) in
-                    reachable
-                        .iter()
-                        .filter_map(|id| match self.entry.nodes.get(id) {
-                            Some(QueryPlanNode::ReadMaterialization { binding }) => {
-                                Some((*id, binding))
-                            }
-                            _ => None,
-                        })
-                {
-                    let leaf_outcome = stored
-                        .get(&leaf_id)
-                        .ok_or("missing materialization coverage")?;
-                    if !binding.covers_range(self.t0_ms, self.t1_ms)
-                        || !complete_pane_coverage(
-                            leaf_outcome.coverage,
-                            (self.t0_ms, self.t1_ms),
-                            binding.window_ms,
-                        )
-                    {
-                        return Err(format!(
-                        "incomplete leaf coverage: requested ({}, {}), observed {:?}, pane {} origin {}",
-                        self.t0_ms,
-                        self.t1_ms,
-                        leaf_outcome.coverage, binding.window_ms, binding.pane_origin_ms.unwrap_or(0)
-                    ).into());
-                    }
-                }
-                ClickHouseRelation::from_series_rows(
-                    expected_schema,
-                    outcome.series.clone(),
-                    outcome.coverage,
-                )
-                .map_err(|error| SqlExecutionError::Binding(error.to_string()))
-            }
-            None => Err(format!("published DAG references missing node {}", root.0).into()),
-        }
-    }
-}
-pub enum ClickHouseDagOutcome {
-    Accelerated(ClickHouseQueryResult),
-    Fallback(ClickHouseDagFallback),
-    Failed(asap_physical_operators::dag::Error),
-}
-
-fn complete_pane_coverage(
-    coverage: Option<(u64, u64)>,
-    requested: (u64, u64),
-    pane_ms: u64,
-) -> bool {
-    let Some((first_end, last_end)) = coverage else {
-        return false;
-    };
-    pane_ms > 0 && first_end.saturating_sub(pane_ms) <= requested.0 && last_end >= requested.1
-}
-
-pub fn execute_sql_dag_with_external(
-    index: &SketchStore,
-    entry: &QueryPlanEntry,
-    sds: &SummaryCatalog,
-    prepared: &PreparedExternalLeaves,
-    t0_ms: u64,
-    t1_ms: u64,
-    is_cumulative: bool,
-) -> ClickHouseDagOutcome {
-    if let Err(error) = entry.validate_snapshot_sources() {
-        return ClickHouseDagOutcome::Fallback(ClickHouseDagFallback::UnsupportedPlan(
-            error.to_string(),
-        ));
-    }
-    let revision = index.summary_update_revision();
-    let result = execute_sql_dag_with_external_unfenced(
-        index,
-        entry,
-        sds,
-        prepared,
-        t0_ms,
-        t1_ms,
-        is_cumulative,
-    );
-    if matches!(result, ClickHouseDagOutcome::Failed(_)) {
-        return result;
-    }
-    if !revision.matches(index.summary_update_revision()) {
-        return ClickHouseDagOutcome::Fallback(ClickHouseDagFallback::UnsupportedPlan(
-            "summary input changed during SQL DAG evaluation".into(),
-        ));
-    }
-    result
-}
-
-fn execute_sql_dag_with_external_unfenced(
-    index: &SketchStore,
-    entry: &QueryPlanEntry,
-    sds: &SummaryCatalog,
-    prepared: &PreparedExternalLeaves,
-    t0_ms: u64,
-    t1_ms: u64,
-    is_cumulative: bool,
-) -> ClickHouseDagOutcome {
-    if let Err(error) = validate_payload(Some(sds), entry, sds.plan_id, sds.plan_version) {
-        return ClickHouseDagOutcome::Fallback(ClickHouseDagFallback::UnsupportedPlan(
-            error.to_string(),
-        ));
-    }
-    let has_relational_join = entry.topological_order().is_ok_and(|ids| {
-        ids.iter().any(|id| {
-            matches!(
-                entry.nodes.get(id),
-                Some(
-                    QueryPlanNode::Relational { .. }
-                        | QueryPlanNode::RelationalJoin { .. }
-                        | QueryPlanNode::ExternalExact { .. }
-                )
-            )
-        })
-    });
-    if has_relational_join {
-        let root_schema = match entry.nodes.get(&entry.root) {
-            Some(QueryPlanNode::Relational { output_schema, .. })
-            | Some(QueryPlanNode::RelationalJoin { output_schema, .. }) => output_schema.clone(),
-            Some(QueryPlanNode::ExternalExact { request, .. }) => {
-                let asap_types::query_plan::ExternalExactOutput::Relation { schema } =
-                    &request.output
-                else {
-                    return ClickHouseDagOutcome::Fallback(ClickHouseDagFallback::UnsupportedPlan(
-                        "ClickHouse external root must declare relation output".into(),
-                    ));
-                };
-                match serde_json::from_value(schema.clone()) {
-                    Ok(schema) => schema,
-                    Err(error) => {
-                        return ClickHouseDagOutcome::Fallback(
-                            ClickHouseDagFallback::UnsupportedPlan(error.to_string()),
-                        )
-                    }
-                }
-            }
-            _ => {
-                return ClickHouseDagOutcome::Fallback(ClickHouseDagFallback::UnsupportedPlan(
-                    "relational join plan root has no relation schema".into(),
-                ))
-            }
-        };
-        let relation = match (RelationDagExecutor {
-            index,
-            entry,
-            prepared,
-            t0_ms,
-            t1_ms,
-            is_cumulative,
-            memo: BTreeMap::new(),
-            schemas: BTreeMap::new(),
-            #[cfg(test)]
-            evaluations: BTreeMap::new(),
-        })
-        .execute(entry.root, &root_schema)
-        {
-            Ok(relation) => relation,
-            Err(SqlExecutionError::Physical(error)) => return ClickHouseDagOutcome::Failed(error),
-            Err(SqlExecutionError::Binding(error))
-                if error.contains("incomplete leaf coverage") =>
-            {
-                return ClickHouseDagOutcome::Fallback(ClickHouseDagFallback::IncompleteCoverage {
-                    requested: (t0_ms, t1_ms),
-                    observed: None,
-                })
-            }
-            Err(error) => {
-                return ClickHouseDagOutcome::Fallback(ClickHouseDagFallback::UnsupportedPlan(
-                    error.to_string(),
-                ));
-            }
-        };
-        let bindings = entry.materialization_bindings();
-        let pane_ms = bindings
-            .iter()
-            .map(|binding| binding.window_ms)
-            .max()
-            .unwrap_or(0);
-        // External-only DAGs have no summary panes to cover. Their source
-        // population is defined by the independently bound exact requests.
-        if !bindings.is_empty()
-            && !complete_pane_coverage(relation.coverage, (t0_ms, t1_ms), pane_ms)
-        {
-            return ClickHouseDagOutcome::Fallback(ClickHouseDagFallback::IncompleteCoverage {
-                requested: (t0_ms, t1_ms),
-                observed: relation.coverage,
-            });
-        }
-        return match relation.into_result() {
-            Ok(result) => ClickHouseDagOutcome::Accelerated(result),
-            Err(error) => ClickHouseDagOutcome::Fallback(ClickHouseDagFallback::ResultEncoding(
-                error.to_string(),
-            )),
-        };
-    }
-    let base_root = entry.root;
-    if let Err(detail) = validate_reachable(entry, base_root) {
-        return ClickHouseDagOutcome::Fallback(ClickHouseDagFallback::UnsupportedPlan(detail));
-    }
-    let outcome =
-        match execute_query_plan_from_readout(index, entry, base_root, t0_ms, t1_ms, is_cumulative)
-        {
-            Ok(outcome) => outcome,
-            Err(
-                crate::query_engines::asap_query_engine::post_asap_readout::LoweringSkip::Execution(
-                    error,
-                ),
-            ) => return ClickHouseDagOutcome::Failed(error),
-            Err(error) => {
-                let detail = format!("{error:?}");
-                if detail.contains("missing materialized pane")
-                    || detail.contains("incomplete materialized panes")
-                {
-                    return ClickHouseDagOutcome::Fallback(
-                        ClickHouseDagFallback::IncompleteCoverage {
-                            requested: (t0_ms, t1_ms),
-                            observed: None,
-                        },
-                    );
-                }
-                return ClickHouseDagOutcome::Fallback(ClickHouseDagFallback::UnsupportedPlan(
-                    detail,
-                ));
-            }
-        };
-    let pane_ms = entry
-        .materialization_bindings()
-        .iter()
-        .map(|binding| binding.window_ms)
-        .max()
-        .unwrap_or(0);
-    if !complete_pane_coverage(outcome.coverage, (t0_ms, t1_ms), pane_ms) {
-        return ClickHouseDagOutcome::Fallback(ClickHouseDagFallback::IncompleteCoverage {
-            requested: (t0_ms, t1_ms),
-            observed: outcome.coverage,
-        });
-    }
-    match from_series_rows(outcome.series) {
-        Ok(result) => ClickHouseDagOutcome::Accelerated(result),
-        Err(error) => {
-            ClickHouseDagOutcome::Fallback(ClickHouseDagFallback::ResultEncoding(error.to_string()))
-        }
-    }
-}
-
-fn validate_reachable(entry: &QueryPlanEntry, root: QueryNodeId) -> Result<(), String> {
-    let mut pending = vec![root];
-    let mut reachable = BTreeSet::new();
-    while let Some(id) = pending.pop() {
-        if !reachable.insert(id) {
-            continue;
-        }
-        let node = entry
-            .nodes
-            .get(&id)
-            .ok_or_else(|| format!("published DAG references missing node {}", id.0))?;
-        pending.extend(node.inputs());
-    }
-    Ok(())
-}
-
-// Validate schemas and graph shape before touching deployment sources.
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use asap_types::query_plan::{
-        ExternalExactOutput, ExternalExactRequest, FallbackPolicy, InstantExecution, QueryLanguage,
-    };
-    use planner_types::{
-        post_asap::{SummaryFamilyType, SummaryField, SummarySchema},
-        pre_asap::DataType,
-    };
-
-    fn relation_schema(name: &str) -> SummarySchema {
-        SummarySchema {
-            fields: vec![SummaryField {
-                name: name.into(),
-                dtype: SummaryFamilyType::Plain(DataType::Int64),
-                nullable: false,
-            }],
-            time_index: None,
-        }
-    }
-
-    fn external_entry(schema: &SummarySchema) -> QueryPlanEntry {
-        QueryPlanEntry {
-            language: QueryLanguage::ClickHouseSql,
-            query_id: "shared-external".into(),
-            canonical_query: "SELECT x".into(),
-            fixed_evaluation: None,
-            root: QueryNodeId(0),
-            nodes: BTreeMap::from([(
-                QueryNodeId(0),
-                QueryPlanNode::ExternalExact {
-                    request: ExternalExactRequest {
-                        language: QueryLanguage::ClickHouseSql,
-                        expression: "SELECT 1 AS x".into(),
-                        output: ExternalExactOutput::Relation {
-                            schema: serde_json::to_value(schema).unwrap(),
-                        },
-                        parameters: BTreeMap::new(),
-                        start_parameter: None,
-                        end_parameter: None,
-                        input_contracts: Vec::new(),
-                    },
-                    inputs: Vec::new(),
-                },
-            )]),
-            instant: InstantExecution {
-                lookback_ms: 0,
-                full_history: false,
-                cumulative_readout: false,
-            },
-            fallback: FallbackPolicy::Reject,
-        }
-    }
-
-    // SQL's native runtime must preserve exhausted/cancelled errors at its boundary.
-    #[tokio::test]
-    async fn sql_native_resource_failure_is_terminal() {
-        for cancelled in [false, true] {
-            crate::query_engines::request::run(
-                asap_physical_operators::dag::Limits {
-                    max_bytes: if cancelled { 4096 } else { 1 },
-                    ..Default::default()
-                },
-                move |_| {
-                    if cancelled {
-                        crate::query_engines::request::context(
-                            asap_physical_operators::dag::Scope::Query {
-                                evaluation_time_ms: 1000,
-                                revision: 0,
-                            },
-                        )?
-                        .cancel();
-                    }
-                    let schema = relation_schema("x");
-                    let entry = external_entry(&schema);
-                    let mut relation = ClickHouseRelation::from_json_compact(
-                        &schema,
-                        br#"{"meta":[{"name":"x","type":"Int64"}],"data":[[1]]}"#,
-                    )
-                    .unwrap();
-                    relation.coverage = Some((0, 1000));
-                    let result = execute_sql_dag_with_external(
-                        &SketchStore::new(),
-                        &entry,
-                        &SummaryCatalog::from_materializations(1, 1, &[]).unwrap(),
-                        &[(QueryNodeId(0), relation)].into(),
-                        0,
-                        1000,
-                        true,
-                    );
-                    let ClickHouseDagOutcome::Failed(error) = result else {
-                        panic!("native failure became fallback");
-                    };
-                    fn is_resource(
-                        error: &asap_physical_operators::dag::Error,
-                        cancelled: bool,
-                    ) -> bool {
-                        use asap_physical_operators::dag::Error;
-                        match error {
-                            Error::Cancelled => cancelled,
-                            Error::MemoryLimit => !cancelled,
-                            Error::AtNode { source, .. } => is_resource(source, cancelled),
-                            _ => false,
-                        }
-                    }
-                    assert!(is_resource(&error, cancelled), "{error:?}");
-                    Ok(())
-                },
-            )
-            .await
-            .unwrap();
-        }
-    }
-
-    #[test]
-    fn relation_dag_memoizes_a_shared_node_and_enforces_one_edge_schema() {
-        let schema = relation_schema("x");
-        let entry = external_entry(&schema);
-        let relation = ClickHouseRelation::from_json_compact(
-            &schema,
-            br#"{"meta":[{"name":"x","type":"Int64"}],"data":[[1]]}"#,
-        )
-        .unwrap();
-        let prepared = BTreeMap::from([(QueryNodeId(0), relation)]);
-        let index = SketchStore::new();
-        let mut executor = RelationDagExecutor {
-            index: &index,
-            entry: &entry,
-            prepared: &prepared,
-            t0_ms: 0,
-            t1_ms: 1,
-            is_cumulative: false,
-            memo: BTreeMap::new(),
-            schemas: BTreeMap::new(),
-            evaluations: BTreeMap::new(),
-        };
-
-        executor.execute(QueryNodeId(0), &schema).unwrap();
-        executor.execute(QueryNodeId(0), &schema).unwrap();
-        assert_eq!(executor.evaluations[&QueryNodeId(0)], 1);
-
-        let error = executor
-            .execute(QueryNodeId(0), &relation_schema("different"))
-            .unwrap_err();
-        assert!(error.to_string().contains("query `shared-external` node 0"));
-        assert!(error.to_string().contains("inconsistent relation schemas"));
-    }
-
-    // A SQL diamond binds one source to both join inputs in the shared DAG.
-    #[test]
-    fn relation_dag_executes_a_shared_source_join() {
-        use planner_types::pre_asap::{JoinKind, Predicate, QueryExpr, ScalarValue};
-        let schema = relation_schema("x");
-        let mut entry = external_entry(&schema);
-        let mut output = schema.clone();
-        output.fields.push(schema.fields[0].clone());
-        entry.nodes.insert(
-            QueryNodeId(1),
-            QueryPlanNode::RelationalJoin {
-                inputs: [QueryNodeId(0), QueryNodeId(0)],
-                join_kind: JoinKind::Cross,
-                pred: serde_json::to_value(Predicate::<usize>(
-                    QueryExpr::Literal(ScalarValue::Boolean(true)).into(),
-                ))
-                .unwrap(),
-                left_schema: schema.clone(),
-                right_schema: schema.clone(),
-                output_schema: output.clone(),
-                pruning: None,
-            },
-        );
-        entry.root = QueryNodeId(1);
-        let relation = ClickHouseRelation::from_json_compact(
-            &schema,
-            br#"{"meta":[{"name":"x","type":"Int64"}],"data":[[1],[2]]}"#,
-        )
-        .unwrap();
-        let prepared = BTreeMap::from([(QueryNodeId(0), relation)]);
-        let index = SketchStore::new();
-        let mut executor = RelationDagExecutor {
-            index: &index,
-            entry: &entry,
-            prepared: &prepared,
-            t0_ms: 0,
-            t1_ms: 1,
-            is_cumulative: false,
-            memo: BTreeMap::new(),
-            schemas: BTreeMap::new(),
-            evaluations: BTreeMap::new(),
-        };
-        let result = executor
-            .execute(entry.root, &output)
-            .unwrap()
-            .into_result()
-            .unwrap();
-        assert_eq!(
-            result
-                .batches
-                .iter()
-                .map(|batch| batch.num_rows())
-                .sum::<usize>(),
-            4
-        );
-    }
-
-    /// A publication between query branches invalidates the entire result.
-    #[test]
-    fn query_wide_fence_rejects_publication_between_join_branches() {
-        use planner_types::pre_asap::{JoinKind, Predicate, QueryExpr, ScalarValue};
-        let schema = relation_schema("x");
-        let mut entry = external_entry(&schema);
-        entry
-            .nodes
-            .insert(QueryNodeId(2), entry.nodes[&QueryNodeId(0)].clone());
-        let mut output = schema.clone();
-        output.fields.push(schema.fields[0].clone());
-        entry.nodes.insert(
-            QueryNodeId(1),
-            QueryPlanNode::RelationalJoin {
-                inputs: [QueryNodeId(0), QueryNodeId(2)],
-                join_kind: JoinKind::Cross,
-                pred: serde_json::to_value(Predicate::<usize>(
-                    QueryExpr::Literal(ScalarValue::Boolean(true)).into(),
-                ))
-                .unwrap(),
-                left_schema: schema.clone(),
-                right_schema: schema.clone(),
-                output_schema: output,
-                pruning: None,
-            },
-        );
-        entry.root = QueryNodeId(1);
-        let relation = ClickHouseRelation::from_json_compact(
-            &schema,
-            br#"{"meta":[{"name":"x","type":"Int64"}],"data":[[1],[2]]}"#,
-        )
-        .unwrap();
-        let prepared = BTreeMap::from([
-            (QueryNodeId(0), relation.clone()),
-            (QueryNodeId(2), relation),
-        ]);
-        let index = SketchStore::new();
-        let catalog = SummaryCatalog::from_materializations(1, 1, &[]).unwrap();
-        let run =
-            || execute_sql_dag_with_external(&index, &entry, &catalog, &prepared, 0, 1000, false);
-        assert!(matches!(run(), ClickHouseDagOutcome::Accelerated(_)));
-        AFTER_BRANCH.with(|hook| {
-            hook.set(Some(|index| {
-                use crate::storage_engines::sketch_db::index::{SketchEncoding, SketchSampleState};
-                index.append_sample(
-                    1,
-                    BTreeMap::new(),
-                    (0, 1000),
-                    SketchSampleState {
-                        bytes: vec![1],
-                        encoding: SketchEncoding::ProtoFull,
-                    },
-                );
-            }))
-        });
-        assert!(
-            matches!(run(), ClickHouseDagOutcome::Fallback(ClickHouseDagFallback::UnsupportedPlan(reason))
-            if reason.contains("changed during SQL DAG"))
-        );
-        assert!(AFTER_BRANCH.with(|hook| hook.get().is_none()));
-    }
-
-    #[test]
-    fn exact_accumulator_window_end_coverage_includes_its_pane_start() {
-        assert!(complete_pane_coverage(
-            Some((1_000, 2_000)),
-            (0, 2_000),
-            1_000
-        ));
-        assert!(!complete_pane_coverage(
-            Some((2_000, 2_000)),
-            (0, 2_000),
-            1_000
-        ));
-    }
-}
diff --git a/data_plane/src/query_engines/asap_clickhouse_query_engine/fallback.rs b/data_plane/src/query_engines/asap_clickhouse_query_engine/fallback.rs
deleted file mode 100644
index f25f6e59b..000000000
--- a/data_plane/src/query_engines/asap_clickhouse_query_engine/fallback.rs
+++ /dev/null
@@ -1,147 +0,0 @@
-use super::request::ClickHouseQueryRequest;
-use async_trait::async_trait;
-use axum::{
-    body::Bytes,
-    http::{HeaderMap, HeaderName, HeaderValue, StatusCode},
-};
-use std::str::FromStr;
-
-#[derive(Debug)]
-pub struct ClickHouseRawResponse {
-    pub status: StatusCode,
-    pub headers: HeaderMap,
-    pub body: Bytes,
-}
-
-#[derive(Debug, thiserror::Error)]
-pub enum ClickHouseFallbackError {
-    #[error(transparent)]
-    Physical(#[from] asap_physical_operators::dag::Error),
-    #[error("ClickHouse request failed: {0}")]
-    Request(String),
-    #[error("ClickHouse returned an invalid response: {0}")]
-    Response(String),
-}
-
-#[async_trait]
-pub trait ClickHouseExactBackend: Send + Sync {
-    async fn execute(
-        &self,
-        request: &ClickHouseQueryRequest,
-    ) -> Result<ClickHouseRawResponse, ClickHouseFallbackError>;
-    async fn ping(&self) -> Result<ClickHouseRawResponse, ClickHouseFallbackError>;
-}
-
-pub struct ClickHouseHttpFallback {
-    client: reqwest::Client,
-    base_url: String,
-    default_database: String,
-}
-
-impl ClickHouseHttpFallback {
-    pub fn new(base_url: String, default_database: String) -> Self {
-        Self {
-            client: reqwest::Client::new(),
-            base_url,
-            default_database,
-        }
-    }
-
-    async fn copy_response(
-        response: reqwest::Response,
-    ) -> Result<ClickHouseRawResponse, ClickHouseFallbackError> {
-        let status = StatusCode::from_u16(response.status().as_u16())
-            .map_err(|e| ClickHouseFallbackError::Response(e.to_string()))?;
-        let mut headers = HeaderMap::new();
-        for (name, value) in response.headers() {
-            if matches!(
-                name.as_str(),
-                "connection"
-                    | "keep-alive"
-                    | "proxy-authenticate"
-                    | "proxy-authorization"
-                    | "te"
-                    | "trailer"
-                    | "transfer-encoding"
-                    | "upgrade"
-                    | "content-length"
-            ) {
-                continue;
-            }
-            if let (Ok(name), Ok(value)) = (
-                HeaderName::from_str(name.as_str()),
-                HeaderValue::from_bytes(value.as_bytes()),
-            ) {
-                headers.append(name, value);
-            }
-        }
-        let mut response = response;
-        let mut body = Vec::new();
-        while let Some(chunk) = crate::query_engines::request::wait(response.chunk())
-            .await?
-            .map_err(|e| ClickHouseFallbackError::Response(e.to_string()))?
-        {
-            let size = body
-                .len()
-                .checked_add(chunk.len())
-                .ok_or(asap_physical_operators::dag::Error::MemoryLimit)?;
-            // No parallel operator work runs while this source is being fetched.
-            // Check the whole buffered response against the remaining request budget.
-            let _check = crate::query_engines::request::reserve(size)?;
-            body.extend_from_slice(&chunk);
-        }
-        let body = Bytes::from(body);
-        Ok(ClickHouseRawResponse {
-            status,
-            headers,
-            body,
-        })
-    }
-}
-
-#[async_trait]
-impl ClickHouseExactBackend for ClickHouseHttpFallback {
-    async fn execute(
-        &self,
-        request: &ClickHouseQueryRequest,
-    ) -> Result<ClickHouseRawResponse, ClickHouseFallbackError> {
-        let mut parameters = request.parameters.clone();
-        parameters
-            .entry("database".into())
-            .or_insert_with(|| self.default_database.clone());
-        let mut upstream = self
-            .client
-            .request(
-                reqwest::Method::from_bytes(request.method.as_str().as_bytes())
-                    .map_err(|e| ClickHouseFallbackError::Request(e.to_string()))?,
-                format!("{}/", self.base_url.trim_end_matches('/')),
-            )
-            .query(&parameters)
-            .body(request.body.clone());
-        for name in [
-            "authorization",
-            "x-clickhouse-user",
-            "x-clickhouse-key",
-            "user-agent",
-        ] {
-            if let Some(value) = request.headers.get(name).and_then(|v| v.to_str().ok()) {
-                upstream = upstream.header(name, value);
-            }
-        }
-        let response = upstream
-            .send()
-            .await
-            .map_err(|e| ClickHouseFallbackError::Request(e.to_string()))?;
-        Self::copy_response(response).await
-    }
-
-    async fn ping(&self) -> Result<ClickHouseRawResponse, ClickHouseFallbackError> {
-        let response = self
-            .client
-            .get(format!("{}/ping", self.base_url.trim_end_matches('/')))
-            .send()
-            .await
-            .map_err(|e| ClickHouseFallbackError::Request(e.to_string()))?;
-        Self::copy_response(response).await
-    }
-}
diff --git a/data_plane/src/query_engines/asap_clickhouse_query_engine/mod.rs b/data_plane/src/query_engines/asap_clickhouse_query_engine/mod.rs
deleted file mode 100644
index d437e06ba..000000000
--- a/data_plane/src/query_engines/asap_clickhouse_query_engine/mod.rs
+++ /dev/null
@@ -1,13 +0,0 @@
-pub mod clickhouse_result_adapter;
-pub mod execution;
-pub mod fallback;
-pub mod relational_adapter;
-pub mod request;
-pub mod server;
-
-pub use fallback::{ClickHouseExactBackend, ClickHouseHttpFallback};
-pub use server::{
-    ClickHouseAccelerationFallback, ClickHouseAccelerationOutcome, ClickHouseAccelerator,
-    ClickHouseHttpServer,
-};
-pub mod accelerator;
diff --git a/data_plane/src/query_engines/asap_clickhouse_query_engine/relational_adapter.rs b/data_plane/src/query_engines/asap_clickhouse_query_engine/relational_adapter.rs
deleted file mode 100644
index 9b55f7ea0..000000000
--- a/data_plane/src/query_engines/asap_clickhouse_query_engine/relational_adapter.rs
+++ /dev/null
@@ -1,1349 +0,0 @@
-//! ClickHouse row semantics for planner-owned relational wrappers.
-
-#[cfg(test)]
-mod aggregate;
-mod collection;
-pub(super) mod native;
-
-use std::{collections::BTreeMap, sync::Arc};
-
-use arrow::{
-    array::{
-        ArrayRef, BooleanArray, Float64Array, Int64Array, MapArray, NullArray, StringArray,
-        StructArray, TimestampMillisecondArray,
-    },
-    datatypes::{DataType as ArrowDataType, Field, Schema},
-    record_batch::RecordBatch,
-};
-use chrono::{DateTime, NaiveDateTime, TimeZone};
-use planner_types::{
-    post_asap::{SummaryFamilyType, SummarySchema, ValueOperation},
-    pre_asap::DataType,
-};
-
-use super::clickhouse_result_adapter::ClickHouseQueryResult;
-#[cfg(test)]
-use planner_types::pre_asap::{ArithmeticOpKind, CompareOpKind, QueryExpr, ScalarValue, SortKey};
-
-#[derive(Debug, thiserror::Error, PartialEq)]
-pub enum ClickHouseRelationalError {
-    #[error(transparent)]
-    Physical(#[from] asap_physical_operators::dag::Error),
-    #[error("unsupported SQL relational operation: {0}")]
-    Unsupported(String),
-    #[error("SQL column index {0} is outside a {1}-column row")]
-    ColumnOutOfRange(usize, usize),
-    #[error("invalid SQL operation: {0}")]
-    Invalid(String),
-    #[error("cannot build Arrow result: {0}")]
-    Arrow(String),
-}
-
-#[derive(Clone, Debug, PartialEq)]
-enum Cell {
-    Null,
-    Int64(i64),
-    Float64(f64),
-    Utf8(String),
-    Bool(bool),
-    Timestamp(i64),
-    Map(Vec<(Cell, Cell)>),
-    List(Arc<[Cell]>),
-    Struct(Arc<[Cell]>),
-}
-
-fn json_cell(
-    value: &serde_json::Value,
-    dtype: &DataType,
-    nullable: bool,
-    clickhouse_type: &str,
-) -> Result<Cell, ClickHouseRelationalError> {
-    if value.is_null() && nullable {
-        return Ok(Cell::Null);
-    }
-    let invalid = || {
-        ClickHouseRelationalError::Invalid(format!(
-            "external value {value} does not match {dtype:?}"
-        ))
-    };
-    match dtype {
-        DataType::Interval | DataType::Date => Err(ClickHouseRelationalError::Unsupported(
-            "temporal value transport".into(),
-        )),
-        DataType::Null if value.is_null() => Ok(Cell::Null),
-        DataType::Null => Err(invalid()),
-        DataType::List { element } => {
-            let item_type = clickhouse_type
-                .strip_prefix("Array(")
-                .and_then(|inner| inner.strip_suffix(')'))
-                .ok_or_else(invalid)?;
-            let items = value.as_array().ok_or_else(invalid)?;
-            Ok(Cell::List(
-                items
-                    .iter()
-                    .map(|item| json_cell(item, &element.dtype, element.nullable, item_type))
-                    .collect::<Result<Vec<_>, _>>()?
-                    .into(),
-            ))
-        }
-        DataType::Struct { fields } => {
-            let types =
-                collection::tuple_field_types(clickhouse_type, fields).ok_or_else(invalid)?;
-            let items = value
-                .as_array()
-                .filter(|items| items.len() == fields.len())
-                .ok_or_else(invalid)?;
-            Ok(Cell::Struct(
-                items
-                    .iter()
-                    .zip(fields)
-                    .zip(types)
-                    .map(|((item, field), native)| {
-                        json_cell(item, &field.dtype, field.nullable, native)
-                    })
-                    .collect::<Result<Vec<_>, _>>()?
-                    .into(),
-            ))
-        }
-        DataType::Int64 => value.as_i64().map(Cell::Int64).ok_or_else(invalid),
-        DataType::Float64 => value.as_f64().map(Cell::Float64).ok_or_else(invalid),
-        DataType::Utf8 => value
-            .as_str()
-            .map(|value| Cell::Utf8(value.into()))
-            .ok_or_else(invalid),
-        DataType::Bool => value.as_bool().map(Cell::Bool).ok_or_else(invalid),
-        DataType::Map {
-            key,
-            value: value_type,
-            value_nullable,
-        } => {
-            let (key_type, item_type) = map_type_parts(clickhouse_type).ok_or_else(invalid)?;
-            let entries = value.as_array().ok_or_else(invalid)?;
-            let mut result = Vec::with_capacity(entries.len());
-            for entry in entries {
-                let pair = entry
-                    .as_array()
-                    .filter(|pair| pair.len() == 2)
-                    .ok_or_else(invalid)?;
-                result.push((
-                    json_cell(&pair[0], key, false, key_type)?,
-                    json_cell(&pair[1], value_type, *value_nullable, item_type)?,
-                ));
-            }
-            Ok(Cell::Map(result))
-        }
-        DataType::Timestamp => parse_clickhouse_timestamp(value, clickhouse_type)
-            .map(Cell::Timestamp)
-            .ok_or_else(invalid),
-    }
-}
-
-fn parse_clickhouse_timestamp(value: &serde_json::Value, clickhouse_type: &str) -> Option<i64> {
-    let clickhouse_type = clickhouse_type
-        .strip_prefix("Nullable(")
-        .and_then(|value| value.strip_suffix(')'))
-        .unwrap_or(clickhouse_type);
-    if clickhouse_type == "Int64" {
-        return value.as_i64();
-    }
-    let text = value.as_str()?;
-    if let Ok(timestamp) = DateTime::parse_from_rfc3339(text) {
-        return Some(timestamp.timestamp_millis());
-    }
-    let (scale, timezone) = if clickhouse_type == "DateTime" {
-        (0, "UTC")
-    } else if let Some(timezone) = clickhouse_type
-        .strip_prefix("DateTime(")
-        .and_then(|value| value.strip_suffix(')'))
-    {
-        (0, timezone.trim().trim_matches('\''))
-    } else {
-        let args = clickhouse_type
-            .strip_prefix("DateTime64(")?
-            .strip_suffix(')')?;
-        let mut args = args.split(',').map(str::trim);
-        let scale = args.next()?.parse::<usize>().ok()?;
-        if scale > 9 {
-            return None;
-        }
-        let timezone = args.next().unwrap_or("UTC").trim_matches('\'');
-        if args.next().is_some() {
-            return None;
-        }
-        (scale, timezone)
-    };
-    let fraction_digits = text
-        .split_once('.')
-        .map(|(_, fraction)| fraction.len())
-        .unwrap_or(0);
-    if fraction_digits != scale {
-        return None;
-    }
-    let naive = NaiveDateTime::parse_from_str(
-        text,
-        if scale == 0 {
-            "%Y-%m-%d %H:%M:%S"
-        } else {
-            "%Y-%m-%d %H:%M:%S%.f"
-        },
-    )
-    .ok()?;
-    let timezone: chrono_tz::Tz = timezone.parse().ok()?;
-    timezone
-        .from_local_datetime(&naive)
-        .single()
-        .map(|value| value.timestamp_millis())
-}
-
-#[derive(Clone, Debug)]
-pub struct ClickHouseRelation {
-    rows: Vec<Vec<Cell>>,
-    fields: Vec<(String, DataType, bool)>,
-    pub coverage: Option<(u64, u64)>,
-}
-
-impl ClickHouseRelation {
-    pub(crate) fn retained_bytes(&self) -> usize {
-        fn cell(value: &Cell) -> usize {
-            std::mem::size_of::<Cell>()
-                + match value {
-                    Cell::Utf8(value) => value.capacity(),
-                    Cell::List(values) | Cell::Struct(values) => values.iter().map(cell).sum(),
-                    Cell::Map(values) => values
-                        .iter()
-                        .map(|(key, value)| cell(key) + cell(value))
-                        .sum(),
-                    _ => 0,
-                }
-        }
-        self.rows
-            .iter()
-            .map(|row| row.iter().map(cell).sum::<usize>() + 24)
-            .sum::<usize>()
-            + self
-                .fields
-                .iter()
-                .map(|(name, _, _)| name.capacity() + 128)
-                .sum::<usize>()
-    }
-
-    pub fn from_json_compact(
-        schema: &SummarySchema,
-        body: &[u8],
-    ) -> Result<Self, ClickHouseRelationalError> {
-        let document: serde_json::Value = serde_json::from_slice(body)
-            .map_err(|error| ClickHouseRelationalError::Invalid(error.to_string()))?;
-        let meta = document
-            .get("meta")
-            .and_then(serde_json::Value::as_array)
-            .ok_or_else(|| {
-                ClickHouseRelationalError::Invalid(
-                    "ClickHouse JSONCompact response has no typed metadata".into(),
-                )
-            })?;
-        let data = document
-            .get("data")
-            .and_then(serde_json::Value::as_array)
-            .ok_or_else(|| {
-                ClickHouseRelationalError::Invalid(
-                    "ClickHouse JSONCompact response has no data rows".into(),
-                )
-            })?;
-        let fields = fields_from_schema(schema);
-        if meta.len() != fields.len()
-            || meta
-                .iter()
-                .zip(&fields)
-                .any(|(actual, (name, dtype, nullable))| {
-                    actual.get("name").and_then(serde_json::Value::as_str) != Some(name)
-                        || !clickhouse_type_matches(
-                            actual.get("type").and_then(serde_json::Value::as_str),
-                            dtype,
-                            *nullable,
-                        )
-                })
-        {
-            return Err(ClickHouseRelationalError::Invalid(
-                "ClickHouse external metadata differs from its planned schema".into(),
-            ));
-        }
-        let mut rows = Vec::with_capacity(data.len());
-        for encoded in data {
-            let encoded = encoded.as_array().ok_or_else(|| {
-                ClickHouseRelationalError::Invalid(
-                    "ClickHouse JSONCompact row is not an array".into(),
-                )
-            })?;
-            if encoded.len() != fields.len() {
-                return Err(ClickHouseRelationalError::Invalid(
-                    "ClickHouse external row differs from its planned schema".into(),
-                ));
-            }
-            rows.push(
-                encoded
-                    .iter()
-                    .zip(&fields)
-                    .zip(meta)
-                    .map(|((value, (_, dtype, nullable)), metadata)| {
-                        json_cell(
-                            value,
-                            dtype,
-                            *nullable,
-                            metadata["type"].as_str().expect("metadata validated"),
-                        )
-                    })
-                    .collect::<Result<Vec<_>, _>>()?,
-            );
-        }
-        Ok(Self {
-            rows,
-            fields,
-            coverage: None,
-        })
-    }
-
-    pub fn from_series_rows(
-        schema: &SummarySchema,
-        series: Vec<(BTreeMap<String, String>, Vec<(i64, f64)>)>,
-        coverage: Option<(u64, u64)>,
-    ) -> Result<Self, ClickHouseRelationalError> {
-        let fields = fields_from_schema(schema);
-        let mut rows = Vec::new();
-        for (group, points) in series {
-            for (timestamp, value) in points {
-                rows.push(row_from_value(&fields, &group, timestamp, value)?);
-            }
-        }
-        Ok(Self {
-            rows,
-            fields,
-            coverage,
-        })
-    }
-
-    pub fn into_result(self) -> Result<ClickHouseQueryResult, ClickHouseRelationalError> {
-        let fields = self
-            .fields
-            .iter()
-            .map(|(name, dtype, nullable)| Field::new(name, arrow_type(dtype), *nullable))
-            .collect::<Vec<_>>();
-        let columns = (0..self.fields.len())
-            .map(|column| build_array(&self.rows, column, &self.fields[column].1))
-            .collect::<Result<Vec<_>, _>>()?;
-        let batch = RecordBatch::try_new(Arc::new(Schema::new(fields)), columns)
-            .map_err(|error| ClickHouseRelationalError::Arrow(error.to_string()))?;
-        Ok(ClickHouseQueryResult {
-            batches: vec![batch],
-        })
-    }
-}
-
-fn map_type_parts(actual: &str) -> Option<(&str, &str)> {
-    let inner = actual.trim().strip_prefix("Map(")?.strip_suffix(')')?;
-    let args = collection::arguments(inner)?;
-    let [key, value] = args.as_slice() else {
-        return None;
-    };
-    Some((*key, *value))
-}
-
-fn clickhouse_type_matches(actual: Option<&str>, expected: &DataType, nullable: bool) -> bool {
-    let Some(mut actual) = actual else {
-        return false;
-    };
-    if nullable {
-        let Some(inner) = actual
-            .strip_prefix("Nullable(")
-            .and_then(|value| value.strip_suffix(')'))
-        else {
-            return false;
-        };
-        actual = inner;
-    } else if actual.starts_with("Nullable(") {
-        return false;
-    }
-    match expected {
-        DataType::Interval | DataType::Date => false,
-        DataType::Null => actual == "Nothing",
-        DataType::List { element } => {
-            !nullable
-                && actual
-                    .strip_prefix("Array(")
-                    .and_then(|inner| inner.strip_suffix(')'))
-                    .is_some_and(|inner| {
-                        clickhouse_type_matches(Some(inner), &element.dtype, element.nullable)
-                    })
-        }
-        DataType::Struct { fields } => {
-            !nullable && collection::tuple_field_types(actual, fields).is_some()
-        }
-        DataType::Int64 => actual == "Int64",
-        DataType::Float64 => actual == "Float64",
-        DataType::Utf8 => actual == "String",
-        DataType::Bool => actual == "Bool",
-        DataType::Map {
-            key,
-            value,
-            value_nullable,
-        } => map_type_parts(actual).is_some_and(|(key_type, value_type)| {
-            clickhouse_type_matches(Some(key_type), key, false)
-                && clickhouse_type_matches(Some(value_type), value, *value_nullable)
-        }),
-        DataType::Timestamp => {
-            actual == "Int64"
-                || actual == "DateTime"
-                || actual.starts_with("DateTime(")
-                || actual.starts_with("DateTime64(")
-        }
-    }
-}
-
-pub struct ClickHouseRelationalAdapter;
-
-impl ClickHouseRelationalAdapter {
-    pub fn apply_join(
-        &self,
-        kind: &planner_types::pre_asap::JoinKind,
-        pred: &planner_types::pre_asap::Predicate,
-        output_schema: &SummarySchema,
-        left: ClickHouseRelation,
-        right: ClickHouseRelation,
-    ) -> Result<ClickHouseRelation, ClickHouseRelationalError> {
-        native::execute(
-            planner_types::post_asap::ExecutableOperatorPayload::RelationalJoin {
-                join_kind: kind.clone(),
-                pred: pred.clone(),
-                pruning: None,
-            },
-            output_schema,
-            vec![left, right],
-        )
-    }
-
-    pub fn apply_filter(
-        &self,
-        pred: &planner_types::pre_asap::Predicate,
-        input: ClickHouseRelation,
-    ) -> Result<ClickHouseRelation, ClickHouseRelationalError> {
-        let schema = native::schema(&input);
-        self.apply_operation(
-            &ValueOperation::Filter { pred: pred.clone() },
-            &schema,
-            input,
-        )
-    }
-
-    pub fn apply_operation(
-        &self,
-        operation: &ValueOperation,
-        output_schema: &SummarySchema,
-        input: ClickHouseRelation,
-    ) -> Result<ClickHouseRelation, ClickHouseRelationalError> {
-        native::execute(
-            planner_types::post_asap::ExecutableOperatorPayload::Value {
-                operation: operation.clone(),
-            },
-            output_schema,
-            vec![input],
-        )
-    }
-}
-
-fn fields_from_schema(schema: &SummarySchema) -> Vec<(String, DataType, bool)> {
-    schema
-        .fields
-        .iter()
-        .map(|field| {
-            let dtype = match &field.dtype {
-                SummaryFamilyType::Plain(dtype) => dtype.clone(),
-                _ => DataType::Float64,
-            };
-            (field.name.clone(), dtype, field.nullable)
-        })
-        .collect()
-}
-
-fn row_from_value(
-    fields: &[(String, DataType, bool)],
-    group: &BTreeMap<String, String>,
-    timestamp: i64,
-    value: f64,
-) -> Result<Vec<Cell>, ClickHouseRelationalError> {
-    let mut value_used = false;
-    fields
-        .iter()
-        .map(|(name, dtype, nullable)| {
-            if let Some(value) = group.get(name) {
-                let encoded = asap_types::grouping_projection::decode_table_group_value(value)
-                    .map_err(|error| {
-                        ClickHouseRelationalError::Invalid(format!(
-                            "invalid typed group {name}: {error}"
-                        ))
-                    })?;
-                let column_type = super::clickhouse_result_adapter::clickhouse_type(
-                    &arrow_type(dtype),
-                    *nullable,
-                );
-                return json_cell(&encoded, dtype, *nullable, &column_type);
-            }
-            if *dtype == DataType::Timestamp {
-                return Ok(Cell::Timestamp(timestamp));
-            }
-            if !value_used && matches!(dtype, DataType::Float64 | DataType::Int64) {
-                value_used = true;
-                return Ok(match dtype {
-                    DataType::Int64 => Cell::Int64(value as i64),
-                    _ => Cell::Float64(value),
-                });
-            }
-            if *nullable {
-                Ok(Cell::Null)
-            } else {
-                Err(ClickHouseRelationalError::Invalid(format!(
-                    "cannot populate output column {name}"
-                )))
-            }
-        })
-        .collect()
-}
-
-#[cfg(test)]
-fn eval(
-    expr: &QueryExpr,
-    row: &[Cell],
-    schema: &planner_types::pre_asap::Schema,
-) -> Result<Cell, ClickHouseRelationalError> {
-    let relation = ClickHouseRelation {
-        fields: schema
-            .columns
-            .iter()
-            .map(|c| (c.name.clone(), c.dtype.clone(), c.nullable))
-            .collect(),
-        rows: vec![],
-        coverage: None,
-    };
-    let compiled = asap_physical_operators::dag::expressions::CompiledExpression::compile(
-        expr,
-        &Arc::new(native::schema(&relation)),
-    )
-    .map_err(|error| ClickHouseRelationalError::Unsupported(error.to_string()))?;
-    let value = compiled
-        .evaluate(&row.iter().map(native::value).collect::<Vec<_>>())
-        .map_err(|error| ClickHouseRelationalError::Invalid(error.to_string()))?;
-    native::cell(&value)
-}
-#[cfg(test)]
-fn arithmetic(
-    op: &ArithmeticOpKind,
-    left: Cell,
-    right: Cell,
-) -> Result<Cell, ClickHouseRelationalError> {
-    let dtype = |value: &Cell| match value {
-        Cell::Int64(_) => DataType::Int64,
-        _ => DataType::Float64,
-    };
-    let schema = planner_types::pre_asap::Schema::new(vec![
-        planner_types::pre_asap::Column::new("left", dtype(&left), false),
-        planner_types::pre_asap::Column::new("right", dtype(&right), false),
-    ]);
-    eval(
-        &QueryExpr::Arithmetic {
-            op: op.clone(),
-            left: std::rc::Rc::new(QueryExpr::Column(0)),
-            right: std::rc::Rc::new(QueryExpr::Column(1)),
-        },
-        &[left, right],
-        &schema,
-    )
-}
-
-fn arrow_type(dtype: &DataType) -> ArrowDataType {
-    match dtype {
-        DataType::Date => ArrowDataType::Date32,
-        DataType::Interval => ArrowDataType::Interval(arrow::datatypes::IntervalUnit::MonthDayNano),
-        DataType::Null => ArrowDataType::Null,
-        DataType::List { element } => ArrowDataType::List(Arc::new(Field::new(
-            &element.name,
-            arrow_type(&element.dtype),
-            element.nullable,
-        ))),
-        DataType::Struct { fields } => ArrowDataType::Struct(
-            fields
-                .iter()
-                .map(|field| Field::new(&field.name, arrow_type(&field.dtype), field.nullable))
-                .collect::<Vec<_>>()
-                .into(),
-        ),
-        DataType::Int64 => ArrowDataType::Int64,
-        DataType::Float64 => ArrowDataType::Float64,
-        DataType::Utf8 => ArrowDataType::Utf8,
-        DataType::Bool => ArrowDataType::Boolean,
-        DataType::Map {
-            key,
-            value,
-            value_nullable,
-        } => ArrowDataType::Map(
-            Arc::new(Field::new(
-                "entries",
-                ArrowDataType::Struct(
-                    vec![
-                        Field::new("key", arrow_type(key), false),
-                        Field::new("value", arrow_type(value), *value_nullable),
-                    ]
-                    .into(),
-                ),
-                false,
-            )),
-            false,
-        ),
-        DataType::Timestamp => {
-            ArrowDataType::Timestamp(arrow::datatypes::TimeUnit::Millisecond, None)
-        }
-    }
-}
-
-fn build_array(
-    rows: &[Vec<Cell>],
-    column: usize,
-    dtype: &DataType,
-) -> Result<ArrayRef, ClickHouseRelationalError> {
-    macro_rules! values {
-        ($variant:ident) => {{
-            rows.iter()
-                .map(|row| match row.get(column) {
-                    Some(Cell::$variant(value)) => Ok(Some(value.clone())),
-                    Some(Cell::Null) => Ok(None),
-                    _ => Err(ClickHouseRelationalError::Invalid(format!(
-                        "column {column} has an incompatible value"
-                    ))),
-                })
-                .collect::<Result<Vec<_>, _>>()?
-        }};
-    }
-    Ok(match dtype {
-        DataType::Interval | DataType::Date => {
-            return Err(ClickHouseRelationalError::Unsupported(
-                "temporal value transport".into(),
-            ))
-        }
-        DataType::Null => {
-            if rows
-                .iter()
-                .any(|row| !matches!(row.get(column), Some(Cell::Null)))
-            {
-                return Err(ClickHouseRelationalError::Invalid(
-                    "non-null value in bottom-typed column".into(),
-                ));
-            }
-            Arc::new(NullArray::new(rows.len())) as ArrayRef
-        }
-        DataType::List { .. } | DataType::Struct { .. } => {
-            return Err(ClickHouseRelationalError::Unsupported(
-                "collection value transport".into(),
-            ))
-        }
-        DataType::Int64 => Arc::new(Int64Array::from(values!(Int64))) as ArrayRef,
-        DataType::Float64 => Arc::new(Float64Array::from(values!(Float64))) as ArrayRef,
-        DataType::Utf8 => Arc::new(StringArray::from(values!(Utf8))) as ArrayRef,
-        DataType::Bool => Arc::new(BooleanArray::from(values!(Bool))) as ArrayRef,
-        DataType::Map { key, value, .. } => {
-            let mut offsets = vec![0_i32];
-            let mut valid = Vec::with_capacity(rows.len());
-            let mut entries = Vec::new();
-            for row in rows {
-                match row.get(column) {
-                    Some(Cell::Map(pairs)) => {
-                        valid.push(true);
-                        entries.extend(
-                            pairs
-                                .iter()
-                                .map(|(key, value)| vec![key.clone(), value.clone()]),
-                        );
-                    }
-                    Some(Cell::Null) => valid.push(false),
-                    _ => {
-                        return Err(ClickHouseRelationalError::Invalid(
-                            "incompatible map value".into(),
-                        ))
-                    }
-                }
-                offsets.push(i32::try_from(entries.len()).map_err(|_| {
-                    ClickHouseRelationalError::Invalid("map offset exceeds Arrow limit".into())
-                })?);
-            }
-            let ArrowDataType::Map(field, ordered) = arrow_type(dtype) else {
-                unreachable!()
-            };
-            let ArrowDataType::Struct(fields) = field.data_type() else {
-                unreachable!()
-            };
-            let values = StructArray::try_new(
-                fields.clone(),
-                vec![
-                    build_array(&entries, 0, key)?,
-                    build_array(&entries, 1, value)?,
-                ],
-                None,
-            )
-            .map_err(|error| ClickHouseRelationalError::Arrow(error.to_string()))?;
-            Arc::new(
-                MapArray::try_new(
-                    field,
-                    arrow::buffer::OffsetBuffer::new(offsets.into()),
-                    values,
-                    Some(arrow::buffer::NullBuffer::from(valid)),
-                    ordered,
-                )
-                .map_err(|error| ClickHouseRelationalError::Arrow(error.to_string()))?,
-            ) as ArrayRef
-        }
-        DataType::Timestamp => {
-            Arc::new(TimestampMillisecondArray::from(values!(Timestamp))) as ArrayRef
-        }
-    })
-}
-
-#[cfg(test)]
-mod scalar_contract_tests {
-    use super::*;
-    use planner_types::pre_asap::{Column, Schema};
-
-    fn function(name: &str, args: Vec<QueryExpr>) -> QueryExpr {
-        QueryExpr::FunctionCall {
-            name: name.into(),
-            args,
-        }
-    }
-    fn text(value: &str) -> QueryExpr {
-        QueryExpr::Literal(ScalarValue::Utf8(value.into()))
-    }
-
-    #[test]
-    fn map_access_uses_declared_default_and_first_duplicate() {
-        let dtype = DataType::Map {
-            key: Box::new(DataType::Utf8),
-            value: Box::new(DataType::Int64),
-            value_nullable: false,
-        };
-        let schema = Schema::new(vec![Column::new("m", dtype, false)]);
-        let access = function("asap_map_access", vec![QueryExpr::Column(0), text("a")]);
-        assert_eq!(
-            eval(&access, &[Cell::Map(vec![])], &schema).unwrap(),
-            Cell::Int64(0)
-        );
-        assert_eq!(
-            eval(
-                &access,
-                &[Cell::Map(vec![
-                    (Cell::Utf8("a".into()), Cell::Int64(7)),
-                    (Cell::Utf8("a".into()), Cell::Int64(9))
-                ])],
-                &schema
-            )
-            .unwrap(),
-            Cell::Int64(7)
-        );
-        let nullable = Schema::new(vec![Column::new(
-            "m",
-            DataType::Map {
-                key: Box::new(DataType::Utf8),
-                value: Box::new(DataType::Int64),
-                value_nullable: true,
-            },
-            false,
-        )]);
-        assert_eq!(
-            eval(&access, &[Cell::Map(vec![])], &nullable).unwrap(),
-            Cell::Null
-        );
-        let null_key = function(
-            "asap_map_access",
-            vec![QueryExpr::Column(0), QueryExpr::Literal(ScalarValue::Null)],
-        );
-        assert_eq!(
-            eval(&null_key, &[Cell::Map(vec![])], &schema).unwrap(),
-            Cell::Null
-        );
-    }
-
-    #[test]
-    fn map_concat_preserves_duplicates_and_empty_map() {
-        let map = |value| {
-            function(
-                "map",
-                vec![text("a"), QueryExpr::Literal(ScalarValue::Int64(value))],
-            )
-        };
-        let concat = function("mapConcat", vec![function("map", vec![]), map(7), map(9)]);
-        let schema = Schema::new(vec![]);
-        assert_eq!(
-            eval(&concat, &[], &schema).unwrap(),
-            Cell::Map(vec![
-                (Cell::Utf8("a".into()), Cell::Int64(7)),
-                (Cell::Utf8("a".into()), Cell::Int64(9))
-            ])
-        );
-        let mixed = function(
-            "map",
-            vec![
-                text("a"),
-                QueryExpr::Literal(ScalarValue::Int64(1)),
-                text("b"),
-                QueryExpr::Literal(ScalarValue::Float64(2.5)),
-            ],
-        );
-        assert!(eval(&mixed, &[], &schema).is_err());
-    }
-
-    #[test]
-    fn sorting_nested_nan_fails_before_comparator_can_treat_it_as_equal() {
-        let dtype = DataType::Map {
-            key: Box::new(DataType::Utf8),
-            value: Box::new(DataType::Float64),
-            value_nullable: false,
-        };
-        let input = ClickHouseRelation {
-            rows: vec![vec![Cell::Map(vec![(
-                Cell::Utf8("a".into()),
-                Cell::Float64(f64::NAN),
-            )])]],
-            fields: vec![("m".into(), dtype.clone(), false)],
-            coverage: None,
-        };
-        let schema = SummarySchema {
-            fields: vec![planner_types::post_asap::SummaryField {
-                name: "m".into(),
-                dtype: SummaryFamilyType::Plain(dtype),
-                nullable: false,
-            }],
-            time_index: None,
-        };
-        let operation = ValueOperation::Sort {
-            keys: vec![SortKey {
-                expr: QueryExpr::Column(0),
-                ascending: true,
-                nulls_first: false,
-            }],
-            partition_by: planner_types::pre_asap::GroupKeys::none(),
-        };
-        assert!(ClickHouseRelationalAdapter
-            .apply_operation(&operation, &schema, input)
-            .is_err());
-    }
-
-    #[test]
-    fn integer_modulo_never_rounds_through_float() {
-        assert_eq!(
-            arithmetic(
-                &ArithmeticOpKind::Mod,
-                Cell::Int64(9_007_199_254_740_993),
-                Cell::Int64(2)
-            )
-            .unwrap(),
-            Cell::Int64(1)
-        );
-        assert_eq!(
-            arithmetic(&ArithmeticOpKind::Mod, Cell::Int64(-7), Cell::Int64(3)).unwrap(),
-            Cell::Int64(-1)
-        );
-        assert!(arithmetic(&ArithmeticOpKind::Mod, Cell::Int64(7), Cell::Int64(0)).is_err());
-        assert!(arithmetic(
-            &ArithmeticOpKind::Mod,
-            Cell::Int64(i64::MIN),
-            Cell::Int64(-1)
-        )
-        .is_err());
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use planner_types::{
-        post_asap::{SummaryField, SummarySchema},
-        pre_asap::{GroupKeys, Predicate, ProjectItem},
-    };
-    use std::rc::Rc;
-
-    #[test]
-    fn decodes_declared_array_elements_without_losing_nullability() {
-        use planner_types::pre_asap::Column;
-        let dtype = DataType::List {
-            element: Box::new(Column {
-                name: "item".into(),
-                dtype: DataType::Int64,
-                nullable: true,
-                table: None,
-            }),
-        };
-        assert!(clickhouse_type_matches(
-            Some("Array(Nullable(Int64))"),
-            &dtype,
-            false
-        ));
-        assert!(!clickhouse_type_matches(
-            Some("Array(Int64)"),
-            &dtype,
-            false
-        ));
-        assert!(!clickhouse_type_matches(
-            Some("Nullable(Array(Nullable(Int64)))"),
-            &dtype,
-            true
-        ));
-        let value = json_cell(
-            &serde_json::json!([9007199254740993_i64, null, -7]),
-            &dtype,
-            false,
-            "Array(Nullable(Int64))",
-        )
-        .unwrap();
-        let Cell::List(items) = &value else {
-            panic!("expected list")
-        };
-        assert_eq!(
-            items.as_ref(),
-            &[Cell::Int64(9007199254740993), Cell::Null, Cell::Int64(-7)]
-        );
-        let Cell::List(copy) = value.clone() else {
-            unreachable!()
-        };
-        assert!(Arc::ptr_eq(items, &copy));
-        assert!(json_cell(
-            &serde_json::json!(["wrong"]),
-            &dtype,
-            false,
-            "Array(Nullable(Int64))"
-        )
-        .is_err());
-    }
-
-    #[test]
-    fn nonfinite_external_array_values_cannot_become_nulls() {
-        use planner_types::pre_asap::Column;
-        let dtype = DataType::List {
-            element: Box::new(Column::new("item", DataType::Float64, true)),
-        };
-        for value in ["inf", "-inf", "nan"] {
-            assert!(json_cell(
-                &serde_json::json!(value),
-                &DataType::Float64,
-                true,
-                "Nullable(Float64)"
-            )
-            .is_err());
-            assert!(json_cell(
-                &serde_json::json!([value]),
-                &dtype,
-                false,
-                "Array(Nullable(Float64))"
-            )
-            .is_err());
-        }
-        assert_eq!(
-            json_cell(
-                &serde_json::json!([null]),
-                &dtype,
-                false,
-                "Array(Nullable(Float64))"
-            )
-            .unwrap(),
-            Cell::List(vec![Cell::Null].into())
-        );
-    }
-
-    #[test]
-    fn array_access_uses_signed_indices_and_element_defaults() {
-        use planner_types::pre_asap::{Column, Schema};
-        let function = |name: &str, args| QueryExpr::FunctionCall {
-            name: name.into(),
-            args,
-        };
-        let dtype = DataType::List {
-            element: Box::new(Column::new("item", DataType::Int64, false)),
-        };
-        let schema = Schema::new(vec![
-            Column::new("items", dtype, false),
-            Column::new("index", DataType::Int64, true),
-        ]);
-        let access = function(
-            "asap_element_access",
-            vec![QueryExpr::Column(0), QueryExpr::Column(1)],
-        );
-        let items = Cell::List(vec![Cell::Int64(10), Cell::Int64(20)].into());
-        for (index, expected) in [
-            (1, 10),
-            (2, 20),
-            (-1, 20),
-            (-2, 10),
-            (0, 0),
-            (3, 0),
-            (i64::MIN, 0),
-            (i64::MAX, 0),
-        ] {
-            assert_eq!(
-                eval(&access, &[items.clone(), Cell::Int64(index)], &schema).unwrap(),
-                Cell::Int64(expected)
-            );
-        }
-        assert_eq!(
-            eval(&access, &[items, Cell::Null], &schema).unwrap(),
-            Cell::Null
-        );
-        let zero = function(
-            "asap_element_access",
-            vec![
-                QueryExpr::Column(0),
-                QueryExpr::Literal(ScalarValue::Int64(0)),
-            ],
-        );
-        assert!(eval(&zero, &[Cell::List(Arc::from([])), Cell::Int64(0)], &schema).is_err());
-    }
-
-    #[test]
-    fn nested_array_tuple_access_preserves_fields_and_defaults() {
-        use planner_types::pre_asap::{Column, Schema};
-        let tuple = DataType::Struct {
-            fields: vec![
-                Column::new("ts", DataType::Int64, false),
-                Column::new("value", DataType::Float64, true),
-            ],
-        };
-        let dtype = DataType::List {
-            element: Box::new(Column::new("item", tuple, false)),
-        };
-        let native = "Array(Tuple(ts Int64, value Nullable(Float64)))";
-        assert!(clickhouse_type_matches(Some(native), &dtype, false));
-        let samples = json_cell(
-            &serde_json::json!([[9007199254740993_i64, 2.5], [7, null]]),
-            &dtype,
-            false,
-            native,
-        )
-        .unwrap();
-        let schema = Schema::new(vec![Column::new("samples", dtype, false)]);
-        let field = |index, name: &str| QueryExpr::FunctionCall {
-            name: "asap_struct_field".into(),
-            args: vec![
-                QueryExpr::FunctionCall {
-                    name: "asap_element_access".into(),
-                    args: vec![
-                        QueryExpr::Column(0),
-                        QueryExpr::Literal(ScalarValue::Int64(index)),
-                    ],
-                },
-                QueryExpr::Literal(ScalarValue::Utf8(name.into())),
-            ],
-        };
-        assert_eq!(
-            eval(&field(1, "ts"), std::slice::from_ref(&samples), &schema).unwrap(),
-            Cell::Int64(9007199254740993)
-        );
-        assert_eq!(
-            eval(&field(1, "value"), std::slice::from_ref(&samples), &schema).unwrap(),
-            Cell::Float64(2.5)
-        );
-        assert_eq!(
-            eval(&field(-1, "value"), std::slice::from_ref(&samples), &schema).unwrap(),
-            Cell::Null
-        );
-        assert_eq!(
-            eval(&field(99, "ts"), std::slice::from_ref(&samples), &schema).unwrap(),
-            Cell::Int64(0)
-        );
-        assert_eq!(
-            eval(&field(99, "value"), std::slice::from_ref(&samples), &schema).unwrap(),
-            Cell::Null
-        );
-    }
-
-    fn schema(fields: &[(&str, DataType)]) -> SummarySchema {
-        SummarySchema {
-            fields: fields
-                .iter()
-                .map(|(name, dtype)| SummaryField {
-                    name: (*name).into(),
-                    dtype: SummaryFamilyType::Plain(dtype.clone()),
-                    nullable: false,
-                })
-                .collect(),
-            time_index: fields
-                .iter()
-                .position(|(_, dtype)| *dtype == DataType::Timestamp),
-        }
-    }
-
-    /// Map entries remain ordered pairs, including duplicate keys and null values.
-    #[test]
-    fn map_transport_retains_duplicate_keys_and_null_values() {
-        use super::super::clickhouse_result_adapter::{ClickHouseFormat, ClickHouseQueryResult};
-        let dtype = DataType::Map {
-            key: Box::new(DataType::Utf8),
-            value: Box::new(DataType::Utf8),
-            value_nullable: true,
-        };
-        let cell = json_cell(
-            &serde_json::json!([["job", "a"], ["job", "b"], ["zone", null]]),
-            &dtype,
-            false,
-            "Map(String, Nullable(String))",
-        )
-        .unwrap();
-        let Cell::Map(entries) = &cell else {
-            panic!("expected map")
-        };
-        assert_eq!(entries.len(), 3);
-        let array = build_array(&[vec![cell]], 0, &dtype).unwrap();
-        let batch = RecordBatch::try_new(
-            Arc::new(Schema::new(vec![Field::new(
-                "labels",
-                arrow_type(&dtype),
-                false,
-            )])),
-            vec![array],
-        )
-        .unwrap();
-        let result = ClickHouseQueryResult {
-            batches: vec![batch],
-        };
-        let body = String::from_utf8(result.encode(ClickHouseFormat::Json).unwrap()).unwrap();
-        assert!(body.contains("Map(String, Nullable(String))"), "{body}");
-        assert!(body.contains("\"job\":\"a\",\"job\":\"b\""), "{body}");
-        assert!(body.contains("\"zone\":null"), "{body}");
-        assert_eq!(
-            String::from_utf8(result.encode(ClickHouseFormat::TabSeparated).unwrap()).unwrap(),
-            "{'job':'a','job':'b','zone':NULL}\n"
-        );
-    }
-
-    #[test]
-    fn executes_filter_project_arithmetic_sort_and_limit_chain() {
-        let input_schema = schema(&[("ts", DataType::Timestamp), ("sum", DataType::Float64)]);
-        let adapter = ClickHouseRelationalAdapter;
-        let input = ClickHouseRelation {
-            rows: vec![
-                vec![Cell::Timestamp(10), Cell::Float64(2.0)],
-                vec![Cell::Timestamp(20), Cell::Float64(3.0)],
-                vec![Cell::Timestamp(30), Cell::Float64(1.0)],
-            ],
-            fields: fields_from_schema(&input_schema),
-            coverage: Some((0, 40)),
-        };
-        let mut relation = adapter
-            .apply_filter(
-                &Predicate(Rc::new(QueryExpr::Compare {
-                    left: Rc::new(QueryExpr::Column(1)),
-                    op: CompareOpKind::Gt,
-                    right: Rc::new(QueryExpr::Literal(ScalarValue::Float64(1.0))),
-                })),
-                input,
-            )
-            .unwrap();
-        assert_eq!(relation.rows.len(), 2);
-        let projected_schema = schema(&[
-            ("bucket", DataType::Timestamp),
-            ("score", DataType::Float64),
-        ]);
-        for operation in [
-            ValueOperation::Project {
-                cols: vec![
-                    ProjectItem {
-                        alias: Some("bucket".into()),
-                        expr: QueryExpr::Column(0),
-                    },
-                    ProjectItem {
-                        alias: Some("score".into()),
-                        expr: QueryExpr::Arithmetic {
-                            op: ArithmeticOpKind::Mul,
-                            left: Rc::new(QueryExpr::Column(1)),
-                            right: Rc::new(QueryExpr::Literal(ScalarValue::Float64(10.0))),
-                        },
-                    },
-                ],
-                qualifier: None,
-            },
-            ValueOperation::Sort {
-                keys: vec![SortKey {
-                    expr: QueryExpr::Column(1),
-                    ascending: false,
-                    nulls_first: false,
-                }],
-                partition_by: GroupKeys::none(),
-            },
-            ValueOperation::Limit {
-                n: 1,
-                offset: 0,
-                partition_by: planner_types::pre_asap::GroupKeys::none(),
-            },
-        ] {
-            relation = adapter
-                .apply_operation(&operation, &projected_schema, relation)
-                .expect("installed SQL operators should execute");
-        }
-        assert_eq!(relation.coverage, Some((0, 40)));
-        let result = relation.into_result().unwrap();
-        let batch = &result.batches[0];
-        assert_eq!(batch.schema().field(0).name(), "bucket");
-        assert_eq!(batch.schema().field(1).name(), "score");
-        assert_eq!(
-            batch
-                .column(0)
-                .as_any()
-                .downcast_ref::<TimestampMillisecondArray>()
-                .unwrap()
-                .value(0),
-            20
-        );
-        assert_eq!(
-            batch
-                .column(1)
-                .as_any()
-                .downcast_ref::<Float64Array>()
-                .unwrap()
-                .value(0),
-            30.0
-        );
-    }
-
-    #[test]
-    fn unsupported_scalar_expression_fails_closed() {
-        let row = vec![Cell::Float64(1.0)];
-        let error = eval(
-            &QueryExpr::FunctionCall {
-                name: "unsupported_function".into(),
-                args: vec![],
-            },
-            &row,
-            &planner_types::pre_asap::Schema::new(vec![]),
-        )
-        .unwrap_err();
-        assert!(matches!(error, ClickHouseRelationalError::Unsupported(_)));
-    }
-
-    #[test]
-    fn inner_equi_join_feeds_typed_ratio_projection() {
-        let side_schema = schema(&[("service", DataType::Utf8), ("value", DataType::Float64)]);
-        let left = ClickHouseRelation {
-            rows: vec![vec![Cell::Utf8("api".into()), Cell::Float64(2.0)]],
-            fields: fields_from_schema(&side_schema),
-            coverage: Some((300_000, 600_000)),
-        };
-        let right = ClickHouseRelation {
-            rows: vec![vec![Cell::Utf8("api".into()), Cell::Float64(10.0)]],
-            fields: fields_from_schema(&side_schema),
-            coverage: Some((300_000, 600_000)),
-        };
-        let joined_schema = schema(&[
-            ("service", DataType::Utf8),
-            ("left_value", DataType::Float64),
-            ("service", DataType::Utf8),
-            ("right_value", DataType::Float64),
-        ]);
-        let pred = planner_types::pre_asap::Predicate(Rc::new(QueryExpr::Compare {
-            left: Rc::new(QueryExpr::Column(0)),
-            op: CompareOpKind::Eq,
-            right: Rc::new(QueryExpr::Column(2)),
-        }));
-        let joined = ClickHouseRelationalAdapter
-            .apply_join(
-                &planner_types::pre_asap::JoinKind::Inner,
-                &pred,
-                &joined_schema,
-                left,
-                right,
-            )
-            .unwrap();
-        let output_schema = schema(&[("service", DataType::Utf8), ("ratio", DataType::Float64)]);
-        let projected = ClickHouseRelationalAdapter
-            .apply_operation(
-                &ValueOperation::Project {
-                    cols: vec![
-                        ProjectItem {
-                            alias: Some("service".into()),
-                            expr: QueryExpr::Column(0),
-                        },
-                        ProjectItem {
-                            alias: Some("ratio".into()),
-                            expr: QueryExpr::Arithmetic {
-                                op: ArithmeticOpKind::Div,
-                                left: Rc::new(QueryExpr::Column(1)),
-                                right: Rc::new(QueryExpr::Column(3)),
-                            },
-                        },
-                    ],
-                    qualifier: None,
-                },
-                &output_schema,
-                joined,
-            )
-            .unwrap();
-        assert_eq!(projected.coverage, Some((300_000, 600_000)));
-        let result = projected.into_result().unwrap();
-        let batch = &result.batches[0];
-        assert_eq!(batch.schema().field(1).name(), "ratio");
-        assert_eq!(
-            batch
-                .column(1)
-                .as_any()
-                .downcast_ref::<Float64Array>()
-                .unwrap()
-                .value(0),
-            0.2
-        );
-    }
-
-    // Every standardized Planner join kind has concrete row semantics.
-    #[test]
-    fn executes_all_post_asap_relational_join_kinds() {
-        use planner_types::pre_asap::JoinKind;
-
-        let side_schema = schema(&[("key", DataType::Int64)]);
-        let relation = |values: &[i64]| ClickHouseRelation {
-            rows: values
-                .iter()
-                .map(|value| vec![Cell::Int64(*value)])
-                .collect(),
-            fields: fields_from_schema(&side_schema),
-            coverage: Some((0, 10)),
-        };
-        let mut joined_schema = schema(&[("left", DataType::Int64), ("right", DataType::Int64)]);
-        for field in &mut joined_schema.fields {
-            field.nullable = true;
-        }
-        let pred = Predicate(Rc::new(QueryExpr::Compare {
-            left: Rc::new(QueryExpr::Column(0)),
-            op: CompareOpKind::Eq,
-            right: Rc::new(QueryExpr::Column(1)),
-        }));
-        let adapter = ClickHouseRelationalAdapter;
-        let execute = |kind, output_schema: &SummarySchema| {
-            adapter
-                .apply_join(
-                    &kind,
-                    &pred,
-                    output_schema,
-                    relation(&[1, 2]),
-                    relation(&[2, 3]),
-                )
-                .unwrap()
-                .rows
-        };
-
-        assert_eq!(
-            execute(JoinKind::Inner, &joined_schema),
-            vec![vec![Cell::Int64(2), Cell::Int64(2)]]
-        );
-        assert_eq!(execute(JoinKind::Left, &joined_schema).len(), 2);
-        assert_eq!(execute(JoinKind::Right, &joined_schema).len(), 2);
-        assert_eq!(execute(JoinKind::Full, &joined_schema).len(), 3);
-        assert_eq!(execute(JoinKind::Cross, &joined_schema).len(), 4);
-        assert_eq!(
-            execute(JoinKind::Semi, &side_schema),
-            vec![vec![Cell::Int64(2)]]
-        );
-        assert_eq!(
-            execute(JoinKind::Anti, &side_schema),
-            vec![vec![Cell::Int64(1)]]
-        );
-    }
-}
diff --git a/data_plane/src/query_engines/asap_clickhouse_query_engine/relational_adapter/aggregate.rs b/data_plane/src/query_engines/asap_clickhouse_query_engine/relational_adapter/aggregate.rs
deleted file mode 100644
index 49fc93018..000000000
--- a/data_plane/src/query_engines/asap_clickhouse_query_engine/relational_adapter/aggregate.rs
+++ /dev/null
@@ -1,176 +0,0 @@
-//! Integration tests bind relational reductions to Planner-owned operators.
-use super::*;
-use planner_types::pre_asap::{AggIntent, Predicate, Reduction};
-fn apply(
-    reduction: &Reduction,
-    measures: &[AggIntent],
-    having: Option<&Predicate>,
-    output: &SummarySchema,
-    input: ClickHouseRelation,
-) -> Result<ClickHouseRelation, ClickHouseRelationalError> {
-    let groups = reduction.group_keys().map_or(0, |keys| keys.keys().len());
-    ClickHouseRelationalAdapter.apply_operation(
-        &ValueOperation::Exact(planner_types::post_asap::ExactOperation::Aggregate {
-            reduction: reduction.clone(),
-            measures: measures.to_vec(),
-            having: having.cloned(),
-            output_names: output
-                .fields
-                .iter()
-                .skip(groups)
-                .map(|field| field.name.clone())
-                .collect(),
-        }),
-        output,
-        input,
-    )
-}
-fn measure(
-    intent: &AggIntent,
-    rows: &[Vec<Cell>],
-    fields: &[(String, DataType, bool)],
-) -> Result<Cell, ClickHouseRelationalError> {
-    let mut output = intent.output_column(&planner_types::pre_asap::Column::new(
-        fields[0].0.clone(),
-        fields[0].1.clone(),
-        fields[0].2,
-    ));
-    if matches!(intent, AggIntent::Min { .. } | AggIntent::Max { .. }) {
-        output.nullable = true;
-    }
-    let output = SummarySchema {
-        fields: vec![planner_types::post_asap::SummaryField {
-            name: output.name,
-            dtype: SummaryFamilyType::Plain(output.dtype),
-            nullable: output.nullable,
-        }],
-        time_index: None,
-    };
-    let result = apply(
-        &Reduction::by(vec![]),
-        &[intent.clone()],
-        None,
-        &output,
-        ClickHouseRelation {
-            rows: rows.to_vec(),
-            fields: fields.to_vec(),
-            coverage: None,
-        },
-    )?;
-    Ok(result.rows[0][0].clone())
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use planner_types::{post_asap::SummaryField, pre_asap::GroupKeys};
-
-    fn output(fields: &[(&str, DataType)]) -> SummarySchema {
-        SummarySchema {
-            fields: fields
-                .iter()
-                .map(|(name, dtype)| SummaryField {
-                    name: (*name).into(),
-                    dtype: SummaryFamilyType::Plain(dtype.clone()),
-                    nullable: false,
-                })
-                .collect(),
-            time_index: None,
-        }
-    }
-
-    #[test]
-    fn typed_grouped_sum_reduces_nonadjacent_rows_without_label_conversion() {
-        let input = ClickHouseRelation {
-            fields: vec![
-                ("group".into(), DataType::Int64, false),
-                ("value".into(), DataType::Int64, false),
-            ],
-            rows: vec![
-                vec![Cell::Int64(2), Cell::Int64(4)],
-                vec![Cell::Int64(1), Cell::Int64(9_007_199_254_740_993)],
-                vec![Cell::Int64(2), Cell::Int64(7)],
-            ],
-            coverage: Some((10, 20)),
-        };
-        let result = apply(
-            &Reduction::Reduce(GroupKeys::by(vec![0])),
-            &[AggIntent::Sum { col: Some(1) }],
-            None,
-            &output(&[("group", DataType::Int64), ("total", DataType::Int64)]),
-            input,
-        )
-        .unwrap();
-        assert_eq!(
-            result.rows,
-            vec![
-                vec![Cell::Int64(1), Cell::Int64(9_007_199_254_740_993)],
-                vec![Cell::Int64(2), Cell::Int64(11)]
-            ]
-        );
-        assert_eq!(result.coverage, Some((10, 20)));
-    }
-
-    #[test]
-    fn global_empty_sum_and_overflow_have_explicit_semantics() {
-        let input = ClickHouseRelation {
-            fields: vec![("value".into(), DataType::Int64, false)],
-            rows: vec![],
-            coverage: None,
-        };
-        let result = apply(
-            &Reduction::Reduce(GroupKeys::none()),
-            &[AggIntent::Sum { col: Some(0) }],
-            None,
-            &output(&[("sum", DataType::Int64)]),
-            input.clone(),
-        )
-        .unwrap();
-        assert_eq!(result.rows, vec![vec![Cell::Int64(0)]]);
-        let mut overflow = input;
-        overflow.rows = vec![vec![Cell::Int64(i64::MAX)], vec![Cell::Int64(1)]];
-        assert!(apply(
-            &Reduction::Reduce(GroupKeys::none()),
-            &[AggIntent::Sum { col: Some(0) }],
-            None,
-            &output(&[("sum", DataType::Int64)]),
-            overflow
-        )
-        .is_err());
-    }
-
-    #[test]
-    fn integer_average_preserves_cancellation_before_float_conversion() {
-        let fields = vec![("value".into(), DataType::Int64, false)];
-        let rows = vec![
-            vec![Cell::Int64(9_007_199_254_740_993)],
-            vec![Cell::Int64(-9_007_199_254_740_992)],
-        ];
-        assert_eq!(
-            measure(&AggIntent::Avg { col: Some(0) }, &rows, &fields).unwrap(),
-            Cell::Float64(0.5)
-        );
-    }
-
-    #[test]
-    fn numeric_reductions_preserve_nullable_planner_inputs() {
-        let fields = vec![("value".into(), DataType::Float64, false)];
-        let rows = vec![vec![Cell::Float64(2.0)], vec![Cell::Float64(8.0)]];
-        for (intent, expected) in [
-            (AggIntent::Sum { col: Some(0) }, Cell::Float64(10.0)),
-            (AggIntent::Avg { col: Some(0) }, Cell::Float64(5.0)),
-            (AggIntent::Min { col: Some(0) }, Cell::Float64(2.0)),
-            (AggIntent::Max { col: Some(0) }, Cell::Float64(8.0)),
-            (
-                AggIntent::Count {
-                    accuracy: planner_types::types::AccuracyTarget::Exact,
-                },
-                Cell::Int64(2),
-            ),
-        ] {
-            assert_eq!(measure(&intent, &rows, &fields).unwrap(), expected);
-        }
-        let nullable = vec![("value".into(), DataType::Float64, true)];
-        assert!(measure(&AggIntent::Sum { col: Some(0) }, &rows, &nullable).is_ok());
-    }
-}
diff --git a/data_plane/src/query_engines/asap_clickhouse_query_engine/relational_adapter/collection.rs b/data_plane/src/query_engines/asap_clickhouse_query_engine/relational_adapter/collection.rs
deleted file mode 100644
index 2bb43e7bb..000000000
--- a/data_plane/src/query_engines/asap_clickhouse_query_engine/relational_adapter/collection.rs
+++ /dev/null
@@ -1,120 +0,0 @@
-//! Native collection metadata is checked against the existing shared schema.
-
-use planner_types::pre_asap::Column;
-
-/// Split native type arguments without splitting nested types or quoted names.
-pub(super) fn arguments(input: &str) -> Option<Vec<&str>> {
-    let mut result = Vec::new();
-    let mut start = 0;
-    let mut depth = 0_usize;
-    let mut quote = None;
-    let mut chars = input.char_indices().peekable();
-    while let Some((position, ch)) = chars.next() {
-        if let Some(delimiter) = quote {
-            if ch == '\\' {
-                chars.next()?;
-            } else if ch == delimiter {
-                if chars.peek().is_some_and(|(_, next)| *next == delimiter) {
-                    chars.next();
-                } else {
-                    quote = None;
-                }
-            }
-            continue;
-        }
-        match ch {
-            '\'' | '`' | '"' => quote = Some(ch),
-            '(' => depth = depth.checked_add(1)?,
-            ')' => depth = depth.checked_sub(1)?,
-            ',' if depth == 0 => {
-                result.push(input[start..position].trim());
-                start = position + 1;
-            }
-            _ => {}
-        }
-    }
-    if depth != 0 || quote.is_some() {
-        return None;
-    }
-    if !input.is_empty() {
-        result.push(input[start..].trim());
-    }
-    (!result.iter().any(|argument| argument.is_empty())).then_some(result)
-}
-
-/// Anonymous native Tuple fields have explicit one-based names in the shared
-/// Struct schema. Named fields must match their native names exactly. Other
-/// Arrow names are never interpreted as an anonymous Tuple.
-pub(super) fn tuple_field_types<'a>(native: &'a str, fields: &[Column]) -> Option<Vec<&'a str>> {
-    let inner = native.strip_prefix("Tuple(")?.strip_suffix(')')?;
-    let args = arguments(inner)?;
-    if args.len() != fields.len() {
-        return None;
-    }
-    let mut types = Vec::with_capacity(fields.len());
-    for (index, (argument, field)) in args.into_iter().zip(fields).enumerate() {
-        if field.table.is_some() {
-            return None;
-        }
-        if field.name == (index + 1).to_string()
-            && super::clickhouse_type_matches(Some(argument), &field.dtype, field.nullable)
-        {
-            types.push(argument);
-            continue;
-        }
-        // Initial named transport accepts ordinary identifiers. Quoted names
-        // remain unsupported until a native identifier-decoding contract exists.
-        let (name, native_type) = argument.split_once(char::is_whitespace)?;
-        if name != field.name
-            || name.is_empty()
-            || !name
-                .chars()
-                .all(|ch| ch.is_ascii_alphanumeric() || ch == '_')
-            || !super::clickhouse_type_matches(
-                Some(native_type.trim()),
-                &field.dtype,
-                field.nullable,
-            )
-        {
-            return None;
-        }
-        types.push(native_type.trim());
-    }
-    Some(types)
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use planner_types::pre_asap::DataType;
-
-    #[test]
-    fn tuple_metadata_preserves_names_order_and_nested_types() {
-        let fields = vec![
-            Column::new("ts", DataType::Int64, false),
-            Column::new(
-                "samples",
-                DataType::List {
-                    element: Box::new(Column::new("item", DataType::Float64, true)),
-                },
-                false,
-            ),
-        ];
-        assert_eq!(
-            tuple_field_types("Tuple(ts Int64, samples Array(Nullable(Float64)))", &fields),
-            Some(vec!["Int64", "Array(Nullable(Float64))"])
-        );
-        assert!(
-            tuple_field_types("Tuple(samples Int64, ts Array(Nullable(Float64)))", &fields)
-                .is_none()
-        );
-        assert!(tuple_field_types("Tuple(Int64, Array(Nullable(Float64)))", &fields).is_none());
-        let anonymous = vec![
-            Column::new("1", DataType::Int64, false),
-            Column::new("2", DataType::Utf8, false),
-        ];
-        assert!(tuple_field_types("Tuple(Int64, String)", &anonymous).is_some());
-        assert!(arguments("Map(String, Tuple(Int64, String)), DateTime64(3, 'UTC')").is_some());
-        assert!(arguments("Map(String, Tuple(Int64, String)").is_none());
-    }
-}
diff --git a/data_plane/src/query_engines/asap_clickhouse_query_engine/relational_adapter/native.rs b/data_plane/src/query_engines/asap_clickhouse_query_engine/relational_adapter/native.rs
deleted file mode 100644
index 1888e30c6..000000000
--- a/data_plane/src/query_engines/asap_clickhouse_query_engine/relational_adapter/native.rs
+++ /dev/null
@@ -1,158 +0,0 @@
-//! JSON/Arrow transport stays in the deployment; Planner executes relation values.
-use super::{fields_from_schema, Cell, ClickHouseRelation, ClickHouseRelationalError};
-use asap_physical_operators::dag::{
-    self,
-    values::{Batch, Value},
-};
-use planner_types::post_asap::{
-    ExecutableDagNode, ExecutableOperatorPayload, ExecutionDataState, PostAsapNodeId,
-    SummaryFamilyType, SummaryField, SummarySchema,
-};
-use std::sync::Arc;
-fn error(error: impl std::fmt::Display) -> ClickHouseRelationalError {
-    ClickHouseRelationalError::Invalid(error.to_string())
-}
-pub(crate) fn schema(input: &ClickHouseRelation) -> SummarySchema {
-    SummarySchema {
-        fields: input
-            .fields
-            .iter()
-            .map(|(name, dtype, nullable)| SummaryField {
-                name: name.clone(),
-                dtype: SummaryFamilyType::Plain(dtype.clone()),
-                nullable: *nullable,
-            })
-            .collect(),
-        time_index: None,
-    }
-}
-pub(super) fn value(cell: &Cell) -> Value {
-    match cell {
-        Cell::Null => Value::Null,
-        Cell::Bool(v) => Value::Bool(*v),
-        Cell::Int64(v) => Value::Int64(*v),
-        Cell::Float64(v) => Value::Float64(*v),
-        Cell::Utf8(v) => Value::Utf8(v.clone().into()),
-        Cell::Timestamp(v) => Value::Timestamp(*v),
-        Cell::List(v) => Value::List(v.iter().map(value).collect::<Vec<_>>().into()),
-        Cell::Struct(v) => Value::Struct(v.iter().map(value).collect::<Vec<_>>().into()),
-        Cell::Map(v) => Value::Map(
-            v.iter()
-                .map(|(k, v)| (value(k), value(v)))
-                .collect::<Vec<_>>()
-                .into(),
-        ),
-    }
-}
-pub(super) fn cell(value: &Value) -> Result<Cell, ClickHouseRelationalError> {
-    Ok(match value {
-        Value::Null => Cell::Null,
-        Value::Bool(v) => Cell::Bool(*v),
-        Value::Int64(v) => Cell::Int64(*v),
-        Value::Float64(v) => Cell::Float64(*v),
-        Value::Utf8(v) => Cell::Utf8(v.to_string()),
-        Value::Timestamp(v) => Cell::Timestamp(*v),
-        Value::List(v) => Cell::List(v.iter().map(cell).collect::<Result<Vec<_>, _>>()?.into()),
-        Value::Struct(v) => Cell::Struct(v.iter().map(cell).collect::<Result<Vec<_>, _>>()?.into()),
-        Value::Map(v) => Cell::Map(
-            v.iter()
-                .map(|(k, v)| Ok((cell(k)?, cell(v)?)))
-                .collect::<Result<Vec<_>, ClickHouseRelationalError>>()?,
-        ),
-        _ => return Err(error("native value has no ClickHouse result transport")),
-    })
-}
-pub(crate) fn execute(
-    payload: ExecutableOperatorPayload,
-    output: &SummarySchema,
-    inputs: Vec<ClickHouseRelation>,
-) -> Result<ClickHouseRelation, ClickHouseRelationalError> {
-    let coverage = inputs
-        .iter()
-        .map(|input| input.coverage)
-        .reduce(|left, right| match (left, right) {
-            (Some((a, b)), Some((c, d))) if a.max(c) <= b.min(d) => Some((a.max(c), b.min(d))),
-            _ => None,
-        })
-        .flatten();
-    let batches = inputs
-        .iter()
-        .map(|input| {
-            Batch::try_new(
-                Arc::new(schema(input)),
-                input
-                    .rows
-                    .iter()
-                    .map(|row| row.iter().map(value).collect())
-                    .collect(),
-            )
-        })
-        .collect::<Result<Vec<_>, _>>()
-        .map_err(error)?;
-    let node = ExecutableDagNode {
-        id: PostAsapNodeId(0),
-        payload,
-        output_state: ExecutionDataState::QUERY_ROWS,
-        output_schema: output.clone(),
-        guarantee: None,
-    };
-    let operator = asap_physical_operators::physical_planner::compile_node(
-        &node,
-        &batches
-            .iter()
-            .map(|batch| batch.schema().clone())
-            .collect::<Vec<_>>(),
-    )
-    .map_err(|error| ClickHouseRelationalError::Unsupported(error.to_string()))?;
-    let context = crate::query_engines::request::context(dag::Scope::Query {
-        evaluation_time_ms: coverage.map_or(0, |(_, end)| end as i64),
-        revision: 0,
-    })
-    .map_err(ClickHouseRelationalError::Physical)?;
-    let batches = dag::batch_execution::evaluate_inputs(batches, operator, context)
-        .map_err(ClickHouseRelationalError::Physical)?;
-    let rows = batches
-        .iter()
-        .flat_map(|batch| batch.rows())
-        .map(|row| row.iter().map(cell).collect())
-        .collect::<Result<Vec<_>, _>>()?;
-    Ok(ClickHouseRelation {
-        rows,
-        fields: fields_from_schema(output),
-        coverage,
-    })
-}
-
-pub(crate) fn batch(
-    input: &ClickHouseRelation,
-    expected: &SummarySchema,
-) -> Result<Batch, dag::Error> {
-    if schema(input).fields != expected.fields {
-        return Err(dag::Error::Invalid(
-            "source relation differs from its declared schema".into(),
-        ));
-    }
-    Batch::try_new(
-        Arc::new(expected.clone()),
-        input
-            .rows
-            .iter()
-            .map(|row| row.iter().map(value).collect())
-            .collect(),
-    )
-}
-pub(crate) fn relation(
-    batches: &[dag::SharedValue<Batch>],
-    output: &SummarySchema,
-    coverage: Option<(u64, u64)>,
-) -> Result<ClickHouseRelation, ClickHouseRelationalError> {
-    Ok(ClickHouseRelation {
-        fields: fields_from_schema(output),
-        rows: batches
-            .iter()
-            .flat_map(|batch| batch.rows())
-            .map(|row| row.iter().map(cell).collect())
-            .collect::<Result<_, _>>()?,
-        coverage,
-    })
-}
diff --git a/data_plane/src/query_engines/asap_clickhouse_query_engine/request.rs b/data_plane/src/query_engines/asap_clickhouse_query_engine/request.rs
deleted file mode 100644
index c6cb788f6..000000000
--- a/data_plane/src/query_engines/asap_clickhouse_query_engine/request.rs
+++ /dev/null
@@ -1,35 +0,0 @@
-use axum::{
-    body::Bytes,
-    http::{HeaderMap, Method},
-};
-use std::collections::BTreeMap;
-
-#[derive(Debug, Clone)]
-pub struct ClickHouseQueryRequest {
-    pub method: Method,
-    pub sql: String,
-    pub body: Bytes,
-    pub parameters: BTreeMap<String, String>,
-    pub headers: HeaderMap,
-}
-
-impl ClickHouseQueryRequest {
-    pub fn database(&self) -> Option<&str> {
-        self.parameters.get("database").map(String::as_str)
-    }
-    pub fn query_id(&self) -> Option<&str> {
-        self.parameters.get("query_id").map(String::as_str)
-    }
-
-    pub fn format(&self) -> Option<&str> {
-        self.parameters
-            .get("default_format")
-            .map(String::as_str)
-            .or_else(|| {
-                let upper = self.sql.to_ascii_uppercase();
-                upper
-                    .rfind(" FORMAT ")
-                    .map(|index| self.sql[index + " FORMAT ".len()..].trim())
-            })
-    }
-}
diff --git a/data_plane/src/query_engines/asap_clickhouse_query_engine/server.rs b/data_plane/src/query_engines/asap_clickhouse_query_engine/server.rs
deleted file mode 100644
index 3633abaa5..000000000
--- a/data_plane/src/query_engines/asap_clickhouse_query_engine/server.rs
+++ /dev/null
@@ -1,440 +0,0 @@
-use super::{
-    clickhouse_result_adapter::raw_response,
-    fallback::{ClickHouseExactBackend, ClickHouseRawResponse},
-    request::ClickHouseQueryRequest,
-};
-use async_trait::async_trait;
-use axum::{
-    body::Bytes,
-    extract::{Query, State},
-    http::{HeaderMap, Method, StatusCode},
-    response::{IntoResponse, Response},
-    routing::get,
-    Router,
-};
-use std::{
-    collections::{BTreeMap, HashMap},
-    sync::Arc,
-};
-use tokio::net::TcpListener;
-
-#[derive(Clone)]
-struct ServerState {
-    fallback: Arc<dyn ClickHouseExactBackend>,
-    accelerator: Arc<dyn ClickHouseAccelerator>,
-}
-
-/// The SQL-language boundary for accelerated execution.
-///
-/// Implementations own plan-catalog lookup, planning/binding, DAG execution,
-/// coverage validation, and ClickHouse result encoding. Every fail-closed
-/// availability miss may route to the exact backend; execution failures terminate.
-#[async_trait]
-pub trait ClickHouseAccelerator: Send + Sync {
-    async fn execute(&self, request: &ClickHouseQueryRequest) -> ClickHouseAccelerationOutcome;
-}
-
-#[derive(Debug, Clone, PartialEq, Eq)]
-pub enum ClickHouseAccelerationFallback {
-    CatalogMiss,
-    Planning(String),
-    Execution(String),
-    IncompleteCoverage,
-    UnsupportedFormat(String),
-}
-
-impl ClickHouseAccelerationFallback {
-    pub fn stage(&self) -> &'static str {
-        match self {
-            Self::CatalogMiss => "publication",
-            Self::Planning(_) => "planner",
-            Self::Execution(_) => "executor",
-            Self::IncompleteCoverage => "validator",
-            Self::UnsupportedFormat(_) => "adapter",
-        }
-    }
-
-    pub fn reason_code(&self) -> &'static str {
-        match self {
-            Self::CatalogMiss => "catalog_miss",
-            Self::Planning(_) => "planning_failed",
-            Self::Execution(_) => "execution_failed",
-            Self::IncompleteCoverage => "incomplete_coverage",
-            Self::UnsupportedFormat(_) => "unsupported_format",
-        }
-    }
-}
-
-#[derive(Debug)]
-pub enum ClickHouseAccelerationOutcome {
-    Accelerated(ClickHouseRawResponse),
-    Fallback(ClickHouseAccelerationFallback),
-    Failed(crate::query_engines::EngineError),
-}
-
-struct DisabledAccelerator;
-
-#[async_trait]
-impl ClickHouseAccelerator for DisabledAccelerator {
-    async fn execute(&self, _request: &ClickHouseQueryRequest) -> ClickHouseAccelerationOutcome {
-        ClickHouseAccelerationOutcome::Fallback(ClickHouseAccelerationFallback::CatalogMiss)
-    }
-}
-
-pub struct ClickHouseHttpServer {
-    pub listen_address: String,
-    pub fallback: Arc<dyn ClickHouseExactBackend>,
-}
-
-impl ClickHouseHttpServer {
-    /// Builds the original exact-only router.
-    pub fn router(fallback: Arc<dyn ClickHouseExactBackend>) -> Router {
-        Self::router_with_accelerator(fallback, Arc::new(DisabledAccelerator))
-    }
-
-    /// Builds a router that attempts accelerated SQL execution before exact
-    /// fallback. The accelerator must return a fully encoded ClickHouse HTTP
-    /// response so format conversion remains at the SQL boundary.
-    pub fn router_with_accelerator(
-        fallback: Arc<dyn ClickHouseExactBackend>,
-        accelerator: Arc<dyn ClickHouseAccelerator>,
-    ) -> Router {
-        let state = ServerState {
-            fallback,
-            accelerator,
-        };
-        Router::new()
-            .route("/", get(query_get).post(query_post))
-            .route("/ping", get(ping))
-            .with_state(state)
-    }
-
-    pub async fn run(self) -> Result<(), std::io::Error> {
-        let app = Self::router(self.fallback);
-        let listener = TcpListener::bind(&self.listen_address).await?;
-        axum::serve(listener, app).await
-    }
-
-    pub async fn run_with_accelerator(
-        self,
-        accelerator: Arc<dyn ClickHouseAccelerator>,
-    ) -> Result<(), std::io::Error> {
-        let app = Self::router_with_accelerator(self.fallback, accelerator);
-        let listener = TcpListener::bind(&self.listen_address).await?;
-        axum::serve(listener, app).await
-    }
-}
-
-fn request(
-    method: Method,
-    params: HashMap<String, String>,
-    headers: HeaderMap,
-    body: Bytes,
-) -> Result<ClickHouseQueryRequest, Response> {
-    let parameters: BTreeMap<_, _> = params.into_iter().collect();
-    let sql = parameters
-        .get("query")
-        .cloned()
-        .or_else(|| String::from_utf8(body.to_vec()).ok())
-        .unwrap_or_default();
-    if sql.trim().is_empty() {
-        return Err((StatusCode::BAD_REQUEST, "missing query").into_response());
-    }
-    Ok(ClickHouseQueryRequest {
-        method,
-        sql,
-        body,
-        parameters,
-        headers,
-    })
-}
-
-async fn query_get(
-    State(state): State<ServerState>,
-    Query(params): Query<HashMap<String, String>>,
-    headers: HeaderMap,
-) -> Response {
-    let request = match request(Method::GET, params, headers, Bytes::new()) {
-        Ok(v) => v,
-        Err(e) => return e,
-    };
-    execute_or_fallback(&state, &request).await
-}
-
-async fn query_post(
-    State(state): State<ServerState>,
-    Query(params): Query<HashMap<String, String>>,
-    headers: HeaderMap,
-    body: Bytes,
-) -> Response {
-    let request = match request(Method::POST, params, headers, body) {
-        Ok(v) => v,
-        Err(e) => return e,
-    };
-    execute_or_fallback(&state, &request).await
-}
-
-async fn execute_or_fallback(state: &ServerState, request: &ClickHouseQueryRequest) -> Response {
-    match state.accelerator.execute(request).await {
-        ClickHouseAccelerationOutcome::Accelerated(response) => {
-            let mut response = raw_response(response);
-            response
-                .headers_mut()
-                .entry("x-asap-execution")
-                .or_insert(axum::http::HeaderValue::from_static("warm"));
-            response
-                .headers_mut()
-                .entry("x-asap-execution-detail")
-                .or_insert(axum::http::HeaderValue::from_static("asap"));
-            response
-        }
-        ClickHouseAccelerationOutcome::Failed(error) => {
-            (StatusCode::INTERNAL_SERVER_ERROR, error.to_string()).into_response()
-        }
-        ClickHouseAccelerationOutcome::Fallback(reason) => {
-            tracing::info!(
-                failure_stage = reason.stage(),
-                failure_reason = reason.reason_code(),
-                failure_detail = ?reason,
-                "ClickHouse acceleration routed to exact fallback"
-            );
-            let stage = reason.stage();
-            let reason = reason.reason_code();
-            return match state.fallback.execute(request).await {
-                Ok(v) => {
-                    let mut response = raw_response(v);
-                    for (name, value) in [
-                        ("x-asap-execution", "exact_fallback"),
-                        ("x-asap-execution-detail", reason),
-                        ("x-asap-failure-stage", stage),
-                        ("x-asap-failure-reason", reason),
-                    ] {
-                        response.headers_mut().insert(
-                            axum::http::HeaderName::from_static(name),
-                            axum::http::HeaderValue::from_static(value),
-                        );
-                    }
-                    response
-                }
-                Err(e) => (StatusCode::BAD_GATEWAY, e.to_string()).into_response(),
-            };
-        }
-    }
-}
-
-async fn ping(State(state): State<ServerState>) -> Response {
-    match state.fallback.ping().await {
-        Ok(v) => raw_response(v),
-        Err(e) => (StatusCode::BAD_GATEWAY, e.to_string()).into_response(),
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use crate::query_engines::asap_clickhouse_query_engine::fallback::{
-        ClickHouseFallbackError, ClickHouseRawResponse,
-    };
-    use async_trait::async_trait;
-    use http_body_util::BodyExt;
-    use std::sync::Mutex;
-    use tower::ServiceExt;
-
-    // Resource exhaustion and cancellation must never launch an exact request.
-    #[tokio::test]
-    async fn physical_failure_does_not_call_exact_fallback() {
-        for failure in [
-            asap_physical_operators::dag::Error::MemoryLimit,
-            asap_physical_operators::dag::Error::Cancelled,
-        ] {
-            let fallback = Arc::new(RecordingFallback::default());
-            let accelerator = Arc::new(FixedAccelerator {
-                outcome: Mutex::new(Some(ClickHouseAccelerationOutcome::Failed(failure.into()))),
-            });
-            let response =
-                ClickHouseHttpServer::router_with_accelerator(fallback.clone(), accelerator)
-                    .oneshot(
-                        axum::http::Request::builder()
-                            .uri("/?query=SELECT%201")
-                            .body(axum::body::Body::empty())
-                            .unwrap(),
-                    )
-                    .await
-                    .unwrap();
-            assert_eq!(response.status(), StatusCode::INTERNAL_SERVER_ERROR);
-            assert!(fallback.sql.lock().unwrap().is_empty());
-        }
-    }
-
-    #[derive(Default)]
-    struct RecordingFallback {
-        sql: Mutex<Vec<String>>,
-    }
-
-    struct FixedAccelerator {
-        outcome: Mutex<Option<ClickHouseAccelerationOutcome>>,
-    }
-
-    #[async_trait]
-    impl ClickHouseAccelerator for FixedAccelerator {
-        async fn execute(
-            &self,
-            _request: &ClickHouseQueryRequest,
-        ) -> ClickHouseAccelerationOutcome {
-            self.outcome.lock().unwrap().take().unwrap()
-        }
-    }
-
-    #[async_trait]
-    impl ClickHouseExactBackend for RecordingFallback {
-        async fn execute(
-            &self,
-            request: &ClickHouseQueryRequest,
-        ) -> Result<ClickHouseRawResponse, ClickHouseFallbackError> {
-            self.sql.lock().unwrap().push(request.sql.clone());
-            Ok(ClickHouseRawResponse {
-                status: StatusCode::OK,
-                headers: HeaderMap::new(),
-                body: Bytes::from_static(b"1\n"),
-            })
-        }
-        async fn ping(&self) -> Result<ClickHouseRawResponse, ClickHouseFallbackError> {
-            Ok(ClickHouseRawResponse {
-                status: StatusCode::OK,
-                headers: HeaderMap::new(),
-                body: Bytes::from_static(b"Ok.\n"),
-            })
-        }
-    }
-
-    #[tokio::test]
-    async fn forwards_get_raw_post_and_ping_without_promql_types() {
-        let fallback = Arc::new(RecordingFallback::default());
-        let app = ClickHouseHttpServer::router(fallback.clone());
-        let get_response = app
-            .clone()
-            .oneshot(
-                axum::http::Request::builder()
-                    .uri("/?query=SELECT%201")
-                    .body(axum::body::Body::empty())
-                    .unwrap(),
-            )
-            .await
-            .unwrap();
-        assert_eq!(get_response.status(), StatusCode::OK);
-        let post_response = app
-            .clone()
-            .oneshot(
-                axum::http::Request::builder()
-                    .method("POST")
-                    .uri("/")
-                    .body(axum::body::Body::from("SELECT 2"))
-                    .unwrap(),
-            )
-            .await
-            .unwrap();
-        assert_eq!(
-            post_response
-                .into_body()
-                .collect()
-                .await
-                .unwrap()
-                .to_bytes(),
-            "1\n"
-        );
-        let ping = app
-            .oneshot(
-                axum::http::Request::builder()
-                    .uri("/ping")
-                    .body(axum::body::Body::empty())
-                    .unwrap(),
-            )
-            .await
-            .unwrap();
-        assert_eq!(
-            ping.into_body().collect().await.unwrap().to_bytes(),
-            "Ok.\n"
-        );
-        assert_eq!(*fallback.sql.lock().unwrap(), vec!["SELECT 1", "SELECT 2"]);
-    }
-
-    #[tokio::test]
-    async fn returns_accelerated_response_without_calling_exact_backend() {
-        let fallback = Arc::new(RecordingFallback::default());
-        let accelerator = Arc::new(FixedAccelerator {
-            outcome: Mutex::new(Some(ClickHouseAccelerationOutcome::Accelerated(
-                ClickHouseRawResponse {
-                    status: StatusCode::OK,
-                    headers: HeaderMap::new(),
-                    body: Bytes::from_static(b"accelerated\n"),
-                },
-            ))),
-        });
-        let response = ClickHouseHttpServer::router_with_accelerator(fallback.clone(), accelerator)
-            .oneshot(
-                axum::http::Request::builder()
-                    .uri("/?query=SELECT%201")
-                    .body(axum::body::Body::empty())
-                    .unwrap(),
-            )
-            .await
-            .unwrap();
-        assert_eq!(response.headers()["x-asap-execution"], "warm");
-        assert_eq!(response.headers()["x-asap-execution-detail"], "asap");
-
-        assert_eq!(
-            response.into_body().collect().await.unwrap().to_bytes(),
-            "accelerated\n"
-        );
-        assert!(fallback.sql.lock().unwrap().is_empty());
-    }
-
-    #[tokio::test]
-    async fn every_acceleration_failure_routes_to_exact_backend() {
-        let cases = [
-            (ClickHouseAccelerationFallback::CatalogMiss, "catalog_miss"),
-            (
-                ClickHouseAccelerationFallback::Planning("cannot bind".into()),
-                "planning_failed",
-            ),
-            (
-                ClickHouseAccelerationFallback::Execution("unsupported operator".into()),
-                "execution_failed",
-            ),
-            (
-                ClickHouseAccelerationFallback::IncompleteCoverage,
-                "incomplete_coverage",
-            ),
-            (
-                ClickHouseAccelerationFallback::UnsupportedFormat("Native".into()),
-                "unsupported_format",
-            ),
-        ];
-
-        for (reason, expected_detail) in cases {
-            let fallback = Arc::new(RecordingFallback::default());
-            let accelerator = Arc::new(FixedAccelerator {
-                outcome: Mutex::new(Some(ClickHouseAccelerationOutcome::Fallback(reason))),
-            });
-            let response =
-                ClickHouseHttpServer::router_with_accelerator(fallback.clone(), accelerator)
-                    .oneshot(
-                        axum::http::Request::builder()
-                            .uri("/?query=SELECT%201")
-                            .body(axum::body::Body::empty())
-                            .unwrap(),
-                    )
-                    .await
-                    .unwrap();
-
-            assert_eq!(response.status(), StatusCode::OK);
-            assert_eq!(response.headers()["x-asap-execution"], "exact_fallback");
-            assert_eq!(
-                response.headers()["x-asap-execution-detail"],
-                expected_detail
-            );
-            assert_eq!(response.headers()["x-asap-failure-reason"], expected_detail);
-            assert_eq!(*fallback.sql.lock().unwrap(), vec!["SELECT 1"]);
-        }
-    }
-}
diff --git a/data_plane/src/query_engines/asap_query_engine/catalog_resolver.rs b/data_plane/src/query_engines/asap_query_engine/catalog_resolver.rs
deleted file mode 100644
index c227e5eb0..000000000
--- a/data_plane/src/query_engines/asap_query_engine/catalog_resolver.rs
+++ /dev/null
@@ -1,261 +0,0 @@
-//! Read-only resolution against the installed catalog replica. Descriptor
-//! integrity and binding source/grouping are checked once during installation;
-//! query execution checks only reachable IDs and their requested capabilities.
-use std::collections::{BTreeMap, BTreeSet};
-
-use asap_types::query_plan::{ExactReadout, QueryPlanEntry, QueryPlanNode, QueryReadout};
-use asap_types::sds::{StoredOutputId, SummaryDescriptor, SummaryOperator};
-use asap_types::summary_catalog::SummaryCatalog;
-use planner_types::post_asap::{SketchAlgorithm, SummaryFamilyType};
-
-use crate::query_engines::EngineError;
-
-pub(crate) struct ResolvedMaterialization<'a> {
-    pub summary: &'a SummaryDescriptor,
-}
-
-fn miss(reason: impl Into<String>) -> EngineError {
-    EngineError::capability_miss("summary_catalog", reason)
-}
-
-/// Borrow descriptors; never reconstruct them from bindings or store payloads.
-pub(crate) fn resolve(
-    catalog: &SummaryCatalog,
-    id: StoredOutputId,
-) -> Result<ResolvedMaterialization<'_>, EngineError> {
-    let identity = catalog
-        .outputs
-        .get(&id)
-        .ok_or_else(|| miss(format!("unknown materialization {}", id.fingerprint().0)))?;
-    let summary = catalog
-        .summary_descriptors
-        .get(&identity.summary_descriptor_id)
-        .ok_or_else(|| miss("missing summary descriptor"))?;
-    let data = catalog
-        .data_descriptors
-        .get(&identity.data_descriptor_id)
-        .ok_or_else(|| miss("missing data descriptor"))?;
-    // Installation validates the whole snapshot. Keep resolution fail-closed as
-    // defense in depth for catalogs restored from disk or supplied by a future
-    // transport implementation.
-    summary
-        .validate()
-        .map_err(|error| miss(format!("invalid summary descriptor: {error}")))?;
-    data.validate()
-        .map_err(|error| miss(format!("invalid data descriptor: {error}")))?;
-    Ok(ResolvedMaterialization { summary })
-}
-
-impl ResolvedMaterialization<'_> {
-    pub fn is_exact(&self) -> bool {
-        matches!(
-            &self.summary.operator,
-            SummaryOperator::Configured {
-                family: SummaryFamilyType::ExactAggregate(..),
-                ..
-            }
-        )
-    }
-
-    fn supports(&self, node: &QueryPlanNode) -> bool {
-        let SummaryOperator::Configured { family, .. } = &self.summary.operator else {
-            // Partial legacy descriptors cannot attest a configured capability.
-            return false;
-        };
-        match node {
-            QueryPlanNode::ExactReadout { readout, .. } => family == &readout.planner_family(),
-            QueryPlanNode::SummaryEstimate { query, .. } => match query {
-                QueryReadout::Quantile { q } => {
-                    q.is_finite()
-                        && (0.0..=1.0).contains(q)
-                        && matches!(family, SummaryFamilyType::Sketch(kind, _) if matches!(kind.algorithm(), SketchAlgorithm::Kll | SketchAlgorithm::DDSketch))
-                }
-                QueryReadout::Cardinality => {
-                    matches!(family, SummaryFamilyType::Sketch(kind, _) if matches!(kind.algorithm(), SketchAlgorithm::Hll | SketchAlgorithm::UnivMon))
-                }
-                QueryReadout::FrequencyL2 | QueryReadout::FrequencyEntropy => {
-                    matches!(family, SummaryFamilyType::Sketch(kind, _) if kind.algorithm() == &SketchAlgorithm::UnivMon)
-                }
-                QueryReadout::PointCount { value: None, .. } if matches!(family, SummaryFamilyType::Sketch(kind, _) if kind.algorithm() == &SketchAlgorithm::UnivMon) => {
-                    true
-                }
-                QueryReadout::PointCount { .. } => {
-                    matches!(family, SummaryFamilyType::Sketch(kind, _) if matches!(kind.algorithm(), SketchAlgorithm::Cms | SketchAlgorithm::CmsWithHeap | SketchAlgorithm::CountSketch | SketchAlgorithm::CountSketchWithHeap))
-                }
-                QueryReadout::TopK { .. } => {
-                    matches!(family, SummaryFamilyType::Sketch(kind, _) if matches!(kind.algorithm(), SketchAlgorithm::CmsWithHeap | SketchAlgorithm::CountSketchWithHeap))
-                }
-            },
-            _ => false,
-        }
-    }
-}
-
-/// Capability matching follows installed state edges, including merges; it
-/// never searches the catalog for a replacement materialization.
-pub(crate) fn validate_entry(
-    catalog: Option<&SummaryCatalog>,
-    entry: &QueryPlanEntry,
-    plan_id: u64,
-    plan_version: u64,
-) -> Result<(), EngineError> {
-    validate_payload(catalog, entry, plan_id, plan_version)
-}
-
-pub(crate) fn validate_payload(
-    catalog: Option<&SummaryCatalog>,
-    entry: &QueryPlanEntry,
-    plan_id: u64,
-    plan_version: u64,
-) -> Result<(), EngineError> {
-    if entry.materialization_bindings().is_empty() {
-        return Ok(());
-    }
-    let catalog = catalog.ok_or_else(|| miss("installed catalog replica unavailable"))?;
-    if (catalog.plan_id, catalog.plan_version) != (plan_id, plan_version) {
-        return Err(miss("catalog replica belongs to another plan generation"));
-    }
-    let mut states = BTreeMap::new();
-    let mut resolved = BTreeMap::new();
-    for id in entry.topological_order().map_err(|e| miss(e.to_string()))? {
-        let node = &entry.nodes[&id];
-        let state_ids = match node {
-            QueryPlanNode::ReadMaterialization { binding } => {
-                if let std::collections::btree_map::Entry::Vacant(entry) =
-                    resolved.entry(binding.materialization)
-                {
-                    entry.insert(resolve(catalog, binding.materialization)?);
-                }
-                BTreeSet::from([binding.materialization])
-            }
-            QueryPlanNode::SummaryMerge { inputs } => {
-                let mut ids = BTreeSet::new();
-                for input in inputs {
-                    let children: &BTreeSet<StoredOutputId> = states
-                        .get(input)
-                        .ok_or_else(|| miss("summary merge has no state input"))?;
-                    if children.is_empty() {
-                        return Err(miss("summary merge has value input"));
-                    }
-                    ids.extend(children);
-                }
-                ids
-            }
-            QueryPlanNode::SummaryEstimate { input, .. }
-            | QueryPlanNode::ExactReadout { input, .. } => {
-                let ids: &BTreeSet<StoredOutputId> = states
-                    .get(input)
-                    .ok_or_else(|| miss("readout has no state input"))?;
-                if ids.is_empty() || ids.iter().any(|id| !resolved[id].supports(node)) {
-                    return Err(miss("catalog descriptor cannot satisfy installed readout"));
-                }
-                BTreeSet::new()
-            }
-            _ => BTreeSet::new(),
-        };
-        states.insert(id, state_ids);
-    }
-    Ok(())
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use asap_types::summary_catalog::SummaryCatalog;
-    use asap_types::{AggregationType, KeyByLabelNames, PrecomputeMaterialization, WindowKind};
-    use control_plane::physical::compiler::BackendLocalPlanningInput;
-
-    fn fixture() -> control_plane::physical::compiler::CompiledPhysicalPlan {
-        let mut value: serde_json::Value = serde_json::from_str(include_str!(
-            "../../../../docs/examples/asapquery-planning-snapshot.json"
-        ))
-        .unwrap();
-        value["query_workload"]["repeating_queries"][0]["query"] =
-            "sum(sum_over_time(m[1m]))".into();
-        let snapshot: BackendLocalPlanningInput = serde_json::from_value(value).unwrap();
-        crate::tests::test_utilities::planning::quoted_snapshot(snapshot, false)
-            .compile_promql()
-            .unwrap()
-    }
-
-    fn catalog_fixture() -> SummaryCatalog {
-        let config = PrecomputeMaterialization::new(
-            AggregationType::Sum,
-            String::new(),
-            Default::default(),
-            KeyByLabelNames::empty(),
-            KeyByLabelNames::empty(),
-            KeyByLabelNames::empty(),
-            String::new(),
-            60,
-            60,
-            WindowKind::Tumbling,
-            String::new(),
-            "m".into(),
-            None,
-            None,
-            None,
-        );
-        SummaryCatalog::from_materializations(1, 1, &[config]).unwrap()
-    }
-
-    // A readout cannot relabel a valid sum materialization as a rate capability.
-    #[test]
-    fn rejects_wrong_readout_and_missing_or_stale_replica() {
-        let bundle = fixture();
-        let catalog = &bundle.summary_catalog;
-        let mut entry = bundle.query_plan.entries.values().next().unwrap().clone();
-        validate_entry(Some(catalog), &entry, catalog.plan_id, catalog.plan_version).unwrap();
-        assert!(validate_entry(None, &entry, catalog.plan_id, catalog.plan_version).is_err());
-        assert!(validate_entry(
-            Some(catalog),
-            &entry,
-            catalog.plan_id,
-            catalog.plan_version + 1
-        )
-        .is_err());
-        let readout = entry
-            .nodes
-            .values_mut()
-            .find(|n| matches!(n, QueryPlanNode::ExactReadout { .. }))
-            .unwrap();
-        if let QueryPlanNode::ExactReadout { readout, .. } = readout {
-            *readout = ExactReadout::Rate;
-        }
-        assert!(
-            validate_entry(Some(catalog), &entry, catalog.plan_id, catalog.plan_version).is_err()
-        );
-    }
-
-    // Resolution returns borrowed authoritative definitions, and fails closed on missing IDs.
-    #[test]
-    fn resolves_without_descriptor_copies() {
-        let bundle = fixture();
-        let catalog = &bundle.summary_catalog;
-        let id = *catalog.outputs.keys().next().unwrap();
-        let result = resolve(catalog, id).unwrap();
-        assert!(std::ptr::eq(
-            result.summary,
-            &catalog.summary_descriptors[&catalog.outputs[&id].summary_descriptor_id]
-        ));
-        let mut broken = catalog.clone();
-        broken.data_descriptors.clear();
-        assert!(resolve(&broken, id).is_err());
-    }
-
-    #[test]
-    fn rejects_operator_fidelity_mismatch_during_resolution() {
-        let mut catalog = catalog_fixture();
-        let id = *catalog.outputs.keys().next().unwrap();
-        let descriptor_id = catalog.outputs[&id].summary_descriptor_id.clone();
-        catalog
-            .summary_descriptors
-            .get_mut(&descriptor_id)
-            .unwrap()
-            .fidelity = asap_types::sds::FidelityGuarantee::KllRankError {
-            k: 200,
-            model: "rank.v1".into(),
-        };
-        assert!(resolve(&catalog, id).is_err());
-    }
-}
diff --git a/data_plane/src/query_engines/asap_query_engine/engine.rs b/data_plane/src/query_engines/asap_query_engine/engine.rs
deleted file mode 100644
index 9a72bfcd2..000000000
--- a/data_plane/src/query_engines/asap_query_engine/engine.rs
+++ /dev/null
@@ -1,2910 +0,0 @@
-use std::sync::Arc;
-use tracing::debug;
-
-use asap_types::query_requirements::QueryRequirements;
-use asap_types::KeyByLabelNames;
-
-pub(super) fn finish_query<T>(
-    result: Result<T, crate::query_engines::EngineError>,
-    unchanged: bool,
-) -> Result<T, crate::query_engines::EngineError> {
-    let result = result?;
-    if !unchanged {
-        return Err(crate::query_engines::EngineError::capability_miss(
-            "installed_logical_dag",
-            "summary input changed during query DAG evaluation",
-        ));
-    }
-    Ok(result)
-}
-
-#[derive(Clone)]
-struct QueryReadinessRequirement {
-    materializations: Vec<asap_types::PolicyFingerprint>,
-    max_window_ms: u64,
-}
-
-fn readiness_requirement(
-    entry: &asap_types::query_plan::QueryPlanEntry,
-) -> QueryReadinessRequirement {
-    let bindings = entry.materialization_bindings();
-    let mut materializations = bindings
-        .iter()
-        .map(|binding| binding.materialization.fingerprint())
-        .collect::<Vec<_>>();
-    materializations.sort_unstable();
-    materializations.dedup();
-    QueryReadinessRequirement {
-        materializations,
-        max_window_ms: bindings
-            .iter()
-            .map(|binding| binding.window_ms)
-            .max()
-            .unwrap_or(0),
-    }
-}
-
-fn complete_window_coverage(
-    coverage: Option<(u64, u64)>,
-    t0_ms: u64,
-    t1_ms: u64,
-    window_ms: u64,
-) -> bool {
-    let Some((coverage_start, coverage_end)) = coverage else {
-        return false;
-    };
-    if window_ms == 0 || coverage_start > coverage_end || t0_ms > t1_ms {
-        return false;
-    }
-    coverage_start.saturating_sub(window_ms) <= t0_ms
-        && coverage_end >= t1_ms
-        && coverage_end
-            .saturating_sub(coverage_start)
-            .saturating_add(window_ms)
-            >= t1_ms.saturating_sub(t0_ms)
-}
-
-#[cfg(test)]
-mod readiness_coverage_tests {
-    use super::complete_window_coverage;
-
-    #[test]
-    fn readiness_requires_complete_and_fresh_window_span() {
-        assert!(!complete_window_coverage(None, 100, 400, 100));
-        assert!(!complete_window_coverage(Some((200, 300)), 100, 500, 100));
-        assert!(!complete_window_coverage(Some((300, 500)), 100, 500, 100));
-        assert!(complete_window_coverage(Some((200, 500)), 100, 500, 100));
-        assert!(complete_window_coverage(Some((500, 500)), 400, 500, 100));
-    }
-}
-
-#[cfg(test)]
-mod forwarding_policy_tests {
-    use super::ASAPQueryEngine;
-    use crate::query_engines::asap_query_engine::test_plan;
-    use crate::query_engines::routing::query_engine_routing::QueryEngine;
-    use crate::query_engines::{EngineError, QueryForwardingPolicy};
-    use crate::storage_engines::sketch_db::index::SketchStore;
-    use asap_types::query_plan::{
-        ExternalExactOutput, ExternalExactRequest, FallbackPolicy, InstantExecution, QueryLanguage,
-        QueryNodeId, QueryPlanEntry, QueryPlanNode,
-    };
-    use std::collections::BTreeMap;
-    use std::sync::{
-        atomic::{AtomicUsize, Ordering},
-        Arc,
-    };
-
-    #[tokio::test]
-    async fn disabled_policy_blocks_an_installed_exact_plan_before_http() {
-        let calls = Arc::new(AtomicUsize::new(0));
-        let captured = calls.clone();
-        let app = axum::Router::new().route(
-            "/api/v1/query",
-            axum::routing::get(move || {
-                let captured = captured.clone();
-                async move {
-                    captured.fetch_add(1, Ordering::SeqCst);
-                    axum::Json(serde_json::json!({
-                        "status":"success",
-                        "data":{"resultType":"vector","result":[]}
-                    }))
-                }
-            }),
-        );
-        let listener = tokio::net::TcpListener::bind("127.0.0.1:0").await.unwrap();
-        let endpoint = format!("http://{}", listener.local_addr().unwrap());
-        let server = tokio::spawn(async move { axum::serve(listener, app).await.unwrap() });
-
-        let query = "sum(rate(m[5m]))";
-        let canonical = asap_types::query_plan::canonical_promql(query).unwrap();
-        let entry = QueryPlanEntry {
-            language: QueryLanguage::PromQl,
-            query_id: canonical.clone(),
-            canonical_query: canonical,
-            fixed_evaluation: None,
-            root: QueryNodeId(0),
-            nodes: BTreeMap::from([(
-                QueryNodeId(0),
-                QueryPlanNode::ExternalExact {
-                    request: ExternalExactRequest {
-                        language: QueryLanguage::PromQl,
-                        expression: query.into(),
-                        output: ExternalExactOutput::InstantVector,
-                        parameters: BTreeMap::new(),
-                        start_parameter: None,
-                        end_parameter: None,
-                        input_contracts: vec![],
-                    },
-                    inputs: vec![],
-                },
-            )]),
-            instant: InstantExecution {
-                lookback_ms: 300_000,
-                full_history: false,
-                cumulative_readout: true,
-            },
-            fallback: FallbackPolicy::ExactBackend,
-        };
-        let index = Arc::new(SketchStore::new());
-        let active = test_plan::install(&index, &[], vec![entry]);
-        let enabled = ASAPQueryEngine::new(15_000)
-            .with_active_physical_plan(active.clone())
-            .with_exact_subquery_endpoint(endpoint.clone());
-        enabled.execute_at(query, 1_000).await.unwrap();
-        assert_eq!(calls.load(Ordering::SeqCst), 1);
-        let engine = ASAPQueryEngine::new(15_000)
-            .with_active_physical_plan(active)
-            .with_exact_subquery_endpoint(endpoint)
-            .with_query_forwarding_policy(QueryForwardingPolicy::Disabled);
-        let result = engine.execute_at(query, 1_000).await;
-        assert!(
-            matches!(result, Err(EngineError::CapabilityMiss { .. })),
-            "{result:?}"
-        );
-        assert_eq!(calls.load(Ordering::SeqCst), 1);
-        server.abort();
-    }
-}
-
-#[cfg(test)]
-use crate::storage_engines::types::KeyByLabelValues;
-#[cfg(test)]
-use crate::AggregateCore;
-#[cfg(test)]
-use asap_types::Statistic;
-#[cfg(test)]
-use std::collections::HashMap;
-
-/// Simple query engine for processing PromQL-like queries against precomputed data
-#[derive(Clone)]
-pub struct ASAPQueryEngine {
-    #[allow(dead_code)]
-    prometheus_scrape_interval: u64,
-    /// ASAP-tier sketch index. When `Some`, the trait's
-    /// `execute` adapter classifies the query's metric/group-by against
-    /// the index and short-circuits to `EngineError::CapabilityMiss` when
-    /// no ASAP-tier identity covers the request, which the HTTP layer
-    /// forwards to the Prometheus fallback. When `None`, the
-    /// engine behaves as it did before Phase 5 wire-in (every query
-    /// goes through `handle_query`'s legacy path).
-    summary_store: Option<Arc<crate::storage_engines::sketch_db::index::SketchStore>>,
-    /// Generation-consistent physical snapshot used by the production query
-    /// path. The QueryPlan and SummaryCatalog must come from the same snapshot.
-    active_physical_plan: Option<crate::storage_engines::types::ActivePhysicalPlanHandle>,
-    exact_subquery_endpoint: Option<String>,
-    metricsql_exact_subquery_endpoint: Option<String>,
-    query_forwarding_policy: crate::query_engines::QueryForwardingPolicy,
-    exact_subquery_client: reqwest::Client,
-    execution_limits: asap_physical_operators::dag::Limits,
-}
-
-impl ASAPQueryEngine {
-    /// Pin before external-input preparation and retain the view for the entire
-    /// request, including all branches and all range evaluation timestamps.
-    fn pinned_for(
-        &self,
-        physical: &crate::storage_engines::types::RuntimePhysicalPlan,
-        entry: &asap_types::query_plan::QueryPlanEntry,
-        times: &[u64],
-    ) -> Result<Option<Self>, crate::query_engines::EngineError> {
-        let Some(index) = &self.summary_store else {
-            return Ok(None);
-        };
-        let Some(view) = crate::precompute_engine::revisions::pin_query(
-            index,
-            entry,
-            times,
-            physical.precompute_plan.summary_catalog.as_ref(),
-        )?
-        else {
-            return Ok(None);
-        };
-        let mut engine = self.clone();
-        engine.summary_store = Some(std::sync::Arc::new(view));
-        Ok(Some(engine))
-    }
-
-    pub async fn execute_metricsql_at(
-        &self,
-        identity: &str,
-        now_ms: u64,
-    ) -> Result<crate::query_engines::query_result::QueryResult, crate::query_engines::EngineError>
-    {
-        let physical = self.active_physical_plan_snapshot().ok_or_else(|| {
-            crate::query_engines::EngineError::capability_miss(
-                "query_plan",
-                "no active physical plan",
-            )
-        })?;
-        let planned = physical
-            .query_plan
-            .lookup_canonical(asap_types::query_plan::QueryLanguage::MetricsQl, identity)
-            .map_err(|error| {
-                crate::query_engines::EngineError::capability_miss("query_plan", error.to_string())
-            })?;
-        self.execute_installed_instant(&physical, planned, now_ms)
-            .await
-    }
-
-    pub async fn execute_metricsql_range(
-        &self,
-        identity: &str,
-        start_ms: u64,
-        end_ms: u64,
-        step_ms: u64,
-    ) -> Result<crate::query_engines::query_result::QueryResult, crate::query_engines::EngineError>
-    {
-        let physical = self.active_physical_plan_snapshot().ok_or_else(|| {
-            crate::query_engines::EngineError::capability_miss(
-                "query_plan",
-                "no active physical plan",
-            )
-        })?;
-        let planned = physical
-            .query_plan
-            .lookup_canonical(asap_types::query_plan::QueryLanguage::MetricsQl, identity)
-            .map_err(|error| {
-                crate::query_engines::EngineError::capability_miss("query_plan", error.to_string())
-            })?;
-        self.execute_logical_range(&physical, planned, start_ms, end_ms, step_ms)
-            .await
-    }
-
-    /// Construct the query executor. Runtime configuration is read only from
-    /// the generation-consistent `RuntimePhysicalPlan` installed separately.
-    pub fn new(prometheus_scrape_interval: u64) -> Self {
-        Self {
-            prometheus_scrape_interval,
-            execution_limits: Default::default(),
-            summary_store: None,
-            active_physical_plan: None,
-            exact_subquery_endpoint: None,
-            metricsql_exact_subquery_endpoint: None,
-            query_forwarding_policy: crate::query_engines::QueryForwardingPolicy::Enabled,
-            exact_subquery_client: reqwest::Client::builder()
-                .timeout(std::time::Duration::from_secs(60))
-                .build()
-                .expect("HTTP client"),
-        }
-    }
-
-    pub fn with_exact_subquery_endpoint(mut self, endpoint: String) -> Self {
-        self.exact_subquery_endpoint = Some(endpoint);
-        self
-    }
-
-    pub fn with_metricsql_exact_subquery_endpoint(mut self, endpoint: String) -> Self {
-        self.metricsql_exact_subquery_endpoint = Some(endpoint);
-        self
-    }
-
-    pub fn with_query_forwarding_policy(
-        mut self,
-        policy: crate::query_engines::QueryForwardingPolicy,
-    ) -> Self {
-        self.query_forwarding_policy = policy;
-        self
-    }
-    pub fn with_execution_limits(mut self, limits: asap_physical_operators::dag::Limits) -> Self {
-        self.execution_limits = limits;
-        self
-    }
-
-    async fn execute_installed_instant(
-        &self,
-        physical: &crate::storage_engines::types::RuntimePhysicalPlan,
-        entry: &asap_types::query_plan::QueryPlanEntry,
-        at: u64,
-    ) -> Result<crate::query_engines::query_result::QueryResult, crate::query_engines::EngineError>
-    {
-        let engine = self.clone();
-        let physical = physical.clone();
-        let entry = entry.clone();
-        crate::query_engines::request::run(self.execution_limits.clone(), move |handle| {
-            handle.block_on(async {
-                entry.validate_snapshot_sources().map_err(|e| {
-                    crate::query_engines::EngineError::capability_miss("query_plan", e.to_string())
-                })?;
-                let pinned = engine.pinned_for(&physical, &entry, &[at])?;
-                let _snapshot = crate::query_engines::request::reserve(
-                    pinned
-                        .as_ref()
-                        .and_then(|engine| engine.summary_store.as_ref())
-                        .map_or(0, |index| index.approx_resident_bytes()),
-                )?;
-                let engine = pinned.as_ref().unwrap_or(&engine);
-                let leaves = engine
-                    .prepare_query_inputs(&physical, &entry, &[at])
-                    .await?;
-                let _inputs = crate::query_engines::request::reserve(
-                    super::logical_dag::prepared_bytes(&leaves),
-                )?;
-                let (mut result, mut stats) =
-                    engine.execute_logical_entry(&physical, &entry, &leaves, at)?;
-                let _result = crate::query_engines::request::reserve(result.retained_bytes())?;
-                stats.remote_evaluations =
-                    leaves.values().map(|leaf| leaf.remote_evaluations).sum();
-                stats.remote_rpcs = leaves.values().map(|leaf| leaf.remote_rpcs).sum();
-                annotate_logical_execution(&mut result, &stats);
-                Ok(result)
-            })
-        })
-        .await
-    }
-
-    async fn prepare_query_inputs(
-        &self,
-        physical: &crate::storage_engines::types::RuntimePhysicalPlan,
-        entry: &asap_types::query_plan::QueryPlanEntry,
-        times: &[u64],
-    ) -> Result<super::logical_dag::PreparedLeaves, crate::query_engines::EngineError> {
-        entry.validate_snapshot_sources().map_err(|e| {
-            crate::query_engines::EngineError::capability_miss("query_plan", e.to_string())
-        })?;
-        super::catalog_resolver::validate_entry(
-            physical.summary_catalog.as_deref(),
-            entry,
-            physical.query_plan.plan_id,
-            physical.query_plan.plan_version,
-        )?;
-        // Native installed DAGs require no remote request preparation. Avoid
-        // constructing evaluation-grid maps for this common deployment path.
-        // Subqueries and raw scans still take the checked preparation path.
-        if entry.nodes.values().all(|node| match node {
-            asap_types::query_plan::QueryPlanNode::ExternalExact { .. } => false,
-            asap_types::query_plan::QueryPlanNode::Logical { operator, .. } => !matches!(
-                operator,
-                asap_types::query_plan::query_time::QueryTimeOperator::ExactSubquery { .. }
-                    | asap_types::query_plan::query_time::QueryTimeOperator::CandidateExactSubquery { .. }
-                    | asap_types::query_plan::query_time::QueryTimeOperator::Subquery { .. }
-                    | asap_types::query_plan::query_time::QueryTimeOperator::Scan { .. }
-            ),
-            _ => true,
-        }) {
-            return Ok(super::logical_dag::PreparedLeaves::new());
-        }
-        // Candidate-filtered exact cuts have a data dependency: read the
-        // installed membership subtree once, then use that vector to build the
-        // Prometheus selector. Keeping the result as a prepared leaf also means
-        // semi-join reuses the same membership readout during composition.
-        let dependencies = super::exact_subqueries::external_dependencies(entry, times)?;
-        let mut prepared = super::logical_dag::PreparedLeaves::new();
-        let unique_inputs = dependencies
-            .into_iter()
-            .map(|(_, input, at)| (input, at))
-            .collect::<std::collections::BTreeSet<_>>();
-        for (input, at) in unique_inputs {
-            let evaluation_ms = u64::try_from(at).map_err(|_| {
-                crate::query_engines::EngineError::capability_miss(
-                    "exact_subquery",
-                    "candidate evaluation predates epoch",
-                )
-            })?;
-            let mut subtree = entry.clone();
-            subtree.root = input;
-            let reachable = subtree.topological_order().map_err(|error| {
-                crate::query_engines::EngineError::capability_miss(
-                    "installed_logical_dag",
-                    error.to_string(),
-                )
-            })?;
-            subtree.nodes.retain(|id, _| reachable.contains(id));
-            let (result, _) = self.execute_logical_entry(
-                physical,
-                &subtree,
-                &super::logical_dag::PreparedLeaves::new(),
-                evaluation_ms,
-            )?;
-            prepared.insert(
-                (input, at),
-                super::logical_dag::PreparedLeaf {
-                    value: super::logical_dag::from_result(result)?,
-                    remote: false,
-                    remote_evaluations: 0,
-                    remote_rpcs: 0,
-                },
-            );
-        }
-        if !self.query_forwarding_policy.allows_external_queries()
-            && entry.nodes.values().any(|node| {
-                matches!(
-                    node,
-                    asap_types::query_plan::QueryPlanNode::ExternalExact { .. }
-                )
-            })
-        {
-            debug!(
-                language = ?entry.language,
-                query_id = %entry.query_id,
-                "query forwarding disabled; external exact subquery blocked"
-            );
-            crate::drivers::query::servers::metrics::record_query_forwarding_blocked(
-                match entry.language {
-                    asap_types::QueryLanguage::MetricsQl => "victoriametrics",
-                    _ => "prometheus",
-                },
-                "exact_subquery",
-            );
-        }
-        super::exact_subqueries::prepare_external(
-            entry,
-            times,
-            if self.query_forwarding_policy.allows_external_queries() {
-                self.exact_subquery_endpoint.as_deref()
-            } else {
-                None
-            },
-            if self.query_forwarding_policy.allows_external_queries() {
-                self.metricsql_exact_subquery_endpoint.as_deref()
-            } else {
-                None
-            },
-            &self.exact_subquery_client,
-            prepared,
-        )
-        .await
-    }
-
-    fn execute_logical_entry(
-        &self,
-        physical: &crate::storage_engines::types::RuntimePhysicalPlan,
-        entry: &asap_types::query_plan::QueryPlanEntry,
-        leaves: &super::logical_dag::PreparedLeaves,
-        at: u64,
-    ) -> Result<
-        (
-            crate::query_engines::query_result::QueryResult,
-            super::logical_dag::ExecutionStats,
-        ),
-        crate::query_engines::EngineError,
-    > {
-        use crate::query_engines::EngineError;
-        let pinned = self
-            .summary_store
-            .as_ref()
-            .map(|index| {
-                crate::precompute_engine::revisions::pin_query(
-                    index,
-                    entry,
-                    &[at],
-                    physical.precompute_plan.summary_catalog.as_ref(),
-                )
-            })
-            .transpose()?
-            .flatten();
-        let index = pinned.as_ref().or(self.summary_store.as_deref());
-        let revision = index.map(|index| index.summary_update_revision());
-        let result = super::logical_dag::execute_installed(
-            entry,
-            leaves,
-            at,
-            |root, evaluation_ms| {
-                if let Some(asap_types::query_plan::QueryPlanNode::Logical {
-                    operator:
-                        asap_types::query_plan::query_time::QueryTimeOperator::CurrentSeries {
-                            population,
-                            readout,
-                        },
-                    ..
-                }) = entry.nodes.get(&root)
-                {
-                    let index = index.ok_or_else(|| {
-                        EngineError::capability_miss("current_series", "summary store unavailable")
-                    })?;
-                    let values = index
-                        .current_series
-                        .lock()
-                        .expect("current-series state poisoned")
-                        .read(
-                            (
-                                physical.query_plan.plan_id,
-                                physical.query_plan.plan_version,
-                            ),
-                            population,
-                            readout,
-                            evaluation_ms,
-                        )
-                        .map_err(|error| EngineError::capability_miss("current_series", error))?;
-                    use crate::query_engines::query_result::{InstantVectorElement, QueryResult};
-                    return Ok(QueryResult::vector(values.into_iter().map(|(labels,value)| {
-                        InstantVectorElement::new(crate::storage_engines::types::KeyByLabelValues::new_with_labels(labels.values().cloned().collect()), value)
-                            .with_label_keys_override(labels.into_keys().collect())
-                    }).collect(), evaluation_ms));
-                }
-                let subtree = physical.readout_program(entry, root).map_err(|error| {
-                    EngineError::capability_miss("installed_logical_dag", error)
-                })?;
-                let bindings = subtree.materialization_bindings();
-                let requirement = readiness_requirement(&subtree);
-                let index = index.ok_or_else(|| {
-                    EngineError::capability_miss(
-                        "installed_logical_dag",
-                        "summary store unavailable",
-                    )
-                })?;
-                let (result, t0) = super::live_serve::serve_instant_from_query_plan(
-                    index,
-                    &subtree,
-                    evaluation_ms,
-                )
-                .map_err(EngineError::from)?;
-                let active = self.active_physical_plan.as_ref().ok_or_else(|| {
-                    EngineError::capability_miss(
-                        "installed_logical_dag",
-                        "readiness registry unavailable",
-                    )
-                })?;
-                let plan_id = physical.plan_id();
-                let version = physical.plan_version();
-                // Exact range accumulators preserve their actual first/last sample
-                // timestamps. Sparse counter series may legitimately begin after
-                // the range boundary; Prometheus evaluates the samples that exist.
-                // The physical plan's retention bound guarantees stored panes were
-                // not evicted, so requiring a sample at t0 would reject valid data.
-                let exact_accumulator_bindings =
-                    physical.summary_catalog.as_deref().is_some_and(|catalog| {
-                        bindings.iter().all(|binding| {
-                            super::catalog_resolver::resolve(catalog, binding.materialization)
-                                .is_ok_and(|resolved| resolved.is_exact())
-                        })
-                    });
-                let sparse_exact_coverage = exact_accumulator_bindings
-                    && result
-                        .coverage
-                        .is_some_and(|(_, coverage_end)| coverage_end >= evaluation_ms);
-                if !sparse_exact_coverage
-                    && !complete_window_coverage(
-                        result.coverage,
-                        t0,
-                        evaluation_ms,
-                        requirement.max_window_ms,
-                    )
-                {
-                    active.mark_materializing(
-                        plan_id,
-                        version,
-                        &requirement.materializations,
-                        result.coverage,
-                    );
-                    return Err(EngineError::capability_miss(
-                        "installed_logical_dag",
-                        format!("bound readout incomplete at {evaluation_ms}"),
-                    ));
-                }
-                let coverage = result.coverage.expect("coverage checked");
-                if !active.mark_ready(plan_id, version, &requirement.materializations, coverage)
-                    || !active.mark_serving(
-                        plan_id,
-                        version,
-                        &requirement.materializations,
-                        coverage,
-                    )
-                {
-                    return Err(EngineError::capability_miss(
-                        "installed_logical_dag",
-                        "physical generation changed during bound readout",
-                    ));
-                }
-                Ok(asap_tier_result_to_query_result(
-                    result,
-                    evaluation_ms,
-                    false,
-                ))
-            },
-        );
-        let current = index.map(|index| index.summary_update_revision());
-        finish_query(
-            result,
-            match (revision, current) {
-                (Some(before), Some(after)) => before.matches(after),
-                (None, None) => true,
-                _ => false,
-            },
-        )
-    }
-
-    async fn execute_logical_range(
-        &self,
-        physical: &crate::storage_engines::types::RuntimePhysicalPlan,
-        entry: &asap_types::query_plan::QueryPlanEntry,
-        start: u64,
-        end: u64,
-        step: u64,
-    ) -> Result<crate::query_engines::query_result::QueryResult, crate::query_engines::EngineError>
-    {
-        let engine = self.clone();
-        let physical = physical.clone();
-        let entry = entry.clone();
-        crate::query_engines::request::run(self.execution_limits.clone(), move |handle| {
-            handle.block_on(engine.execute_logical_range_inner(&physical, &entry, start, end, step))
-        })
-        .await
-    }
-
-    async fn execute_logical_range_inner(
-        &self,
-        physical: &crate::storage_engines::types::RuntimePhysicalPlan,
-        entry: &asap_types::query_plan::QueryPlanEntry,
-        start: u64,
-        end: u64,
-        step: u64,
-    ) -> Result<crate::query_engines::query_result::QueryResult, crate::query_engines::EngineError>
-    {
-        use crate::query_engines::{
-            query_result::{QueryResult, RangeVectorElement},
-            EngineError,
-        };
-        if step == 0 || start > end || (end - start) / step >= 11_000 {
-            return Err(EngineError::capability_miss(
-                "installed_logical_dag",
-                "invalid range or more than 11000 evaluations",
-            ));
-        }
-        entry
-            .validate_snapshot_sources()
-            .map_err(|e| EngineError::capability_miss("query_plan", e.to_string()))?;
-        let _grid =
-            crate::query_engines::request::reserve(((end - start) / step + 1) as usize * 8)?;
-        let times: Vec<u64> = (0..=(end - start) / step)
-            .map(|n| start + n * step)
-            .collect();
-        let pinned = self.pinned_for(physical, entry, &times)?;
-        let _snapshot = crate::query_engines::request::reserve(
-            pinned
-                .as_ref()
-                .and_then(|engine| engine.summary_store.as_ref())
-                .map_or(0, |index| index.approx_resident_bytes()),
-        )?;
-        let engine = pinned.as_ref().unwrap_or(self);
-        let leaves = engine.prepare_query_inputs(physical, entry, &times).await?;
-        let _inputs =
-            crate::query_engines::request::reserve(super::logical_dag::prepared_bytes(&leaves))?;
-        let mut retained = crate::query_engines::request::reserve(0)?;
-        let mut retained_bytes = 0usize;
-        let mut series =
-            std::collections::BTreeMap::<Vec<(String, String)>, RangeVectorElement>::new();
-        let mut total = super::logical_dag::ExecutionStats::default();
-        let mut at = start;
-        loop {
-            let (result, stats) = engine.execute_logical_entry(physical, entry, &leaves, at)?;
-            total.raw_scan_evaluations += stats.raw_scan_evaluations;
-            total.summary_readout_evaluations += stats.summary_readout_evaluations;
-            total.memo_hits += stats.memo_hits;
-            total.remote_evaluations += stats.remote_evaluations;
-            total.remote_rpcs += stats.remote_rpcs;
-            total.remote_branch_evaluations += stats.remote_branch_evaluations;
-            let _step_result = crate::query_engines::request::reserve(result.retained_bytes())?;
-            let QueryResult::Vector(result) = result else {
-                return Err(EngineError::capability_miss(
-                    "installed_logical_dag",
-                    "range step requires vector",
-                ));
-            };
-            for point in result.values {
-                // Reserve before retaining the next point and its series identity.
-                retained_bytes = retained_bytes
-                    .checked_add(point.retained_bytes() + 128)
-                    .ok_or(asap_physical_operators::dag::Error::MemoryLimit)?;
-                retained.resize(retained_bytes)?;
-                let keys = point.label_keys_override.ok_or_else(|| {
-                    EngineError::capability_miss(
-                        "installed_logical_dag",
-                        "missing range label identity",
-                    )
-                })?;
-                let identity = keys
-                    .iter()
-                    .cloned()
-                    .zip(point.labels.labels.iter().cloned())
-                    .collect();
-                series
-                    .entry(identity)
-                    .or_insert_with(|| {
-                        RangeVectorElement::new(point.labels).with_label_keys_override(keys)
-                    })
-                    .add_sample(at, point.value);
-            }
-            let Some(next) = at.checked_add(step) else {
-                break;
-            };
-            if next > end {
-                break;
-            }
-            at = next;
-        }
-        let mut result = QueryResult::matrix(series.into_values().collect());
-        total.remote_evaluations = leaves.values().map(|leaf| leaf.remote_evaluations).sum();
-        total.remote_rpcs = leaves.values().map(|leaf| leaf.remote_rpcs).sum();
-        annotate_logical_execution(&mut result, &total);
-        Ok(result)
-    }
-
-    pub fn with_active_physical_plan(
-        mut self,
-        handle: crate::storage_engines::types::ActivePhysicalPlanHandle,
-    ) -> Self {
-        self.active_physical_plan = Some(handle);
-        self
-    }
-
-    fn active_physical_plan_snapshot(
-        &self,
-    ) -> Option<Arc<crate::storage_engines::types::RuntimePhysicalPlan>> {
-        self.active_physical_plan
-            .as_ref()
-            .map(|handle| handle.active_snapshot())
-            .filter(|plan| plan.plan_id() != 0)
-    }
-
-    /// attach the shared `SketchStore` so the `QueryEngine`
-    /// trait adapter's classify+failover logic is active. Without this
-    /// call, the engine keeps the pre-Phase-5 behavior (route every
-    /// query through `handle_query`).
-    pub fn with_sketch_index(
-        mut self,
-        index: Arc<crate::storage_engines::sketch_db::index::SketchStore>,
-    ) -> Self {
-        self.summary_store = Some(index);
-        self
-    }
-
-    /// Build a minimal `QueryRequirements` from a bare PromQL string —
-    /// used by the no-sketch-index miss branch in modern `execute()`,
-    /// where we don't have a parsed candidate (analysis was skipped)
-    /// but still want to fire the capability-miss notify so the
-    /// control-plane feedback loop closes. Lifts (metric_name,
-    /// group_by_keys) from the AST via a light walker; returns `None`
-    /// for queries that don't reference a concrete metric.
-    fn requirements_from_query_str(query: &str) -> Option<QueryRequirements> {
-        use promql_parser::parser::Expr;
-        let ast = promql_parser::parser::parse(query).ok()?;
-        fn walk(expr: &Expr) -> Option<(String, std::collections::BTreeSet<String>)> {
-            match expr {
-                Expr::VectorSelector(vs) => {
-                    let mut keys = std::collections::BTreeSet::new();
-                    let mut metric = vs.name.clone().unwrap_or_default();
-                    for m in &vs.matchers.matchers {
-                        if m.name == "__name__" {
-                            if metric.is_empty() {
-                                metric = m.value.clone();
-                            }
-                            continue;
-                        }
-                        keys.insert(m.name.clone());
-                    }
-                    if metric.is_empty() {
-                        None
-                    } else {
-                        Some((metric, keys))
-                    }
-                }
-                Expr::MatrixSelector(ms) => walk(&Expr::VectorSelector(ms.vs.clone())),
-                Expr::Call(call) => call.args.args.iter().find_map(|a| walk(a)),
-                Expr::Aggregate(agg) => walk(&agg.expr),
-                Expr::Binary(bin) => walk(&bin.lhs).or_else(|| walk(&bin.rhs)),
-                Expr::Subquery(sq) => walk(&sq.expr),
-                Expr::Paren(p) => walk(&p.expr),
-                Expr::Unary(u) => walk(&u.expr),
-                _ => None,
-            }
-        }
-        let (metric, keys) = walk(&ast)?;
-        Some(QueryRequirements {
-            metric,
-            statistics: Vec::new(),
-            data_range_ms: None,
-            grouping_labels: KeyByLabelNames::new(keys.into_iter().collect()),
-            spatial_filter_normalized: String::new(),
-        })
-    }
-
-    #[cfg(test)]
-    fn query_precompute_for_statistic(
-        &self,
-        precompute: &dyn AggregateCore,
-        statistic: &Statistic,
-        key: &Option<KeyByLabelValues>,
-        query_kwargs: &HashMap<String, String>,
-    ) -> Result<f64, Box<dyn std::error::Error + Send + Sync>> {
-        // Phase 1b of the sketch DB design
-        // (docs/design_docs/summary-storage.md):
-        // for single-subpopulation queries on additive statistics
-        // (Count / Sum / Min / Max), serve from the typed aux
-        // columns without deserialising the sketch payload.
-        //
-        // Keyed queries (`key.is_some()`) still need the full
-        // `query_statistic` path — aux is per-accumulator, not
-        // per-subpopulation key.
-        //
-        // `try_answer` returns `None` when the statistic isn't
-        // covered by aux (Quantile / Cardinality / TopK / Increase /
-        // Rate) or when the accumulator doesn't track the requested
-        // aux field; both cases fall through to the existing path
-        // so the query result is semantically identical.
-        if key.is_none() {
-            if let Some(value) = precompute.aux_stats().try_answer(*statistic) {
-                return Ok(value);
-            }
-        }
-        precompute.query_statistic(*statistic, key, query_kwargs)
-    }
-
-    /// Modern warm-tier path for `/api/v1/query_range` — the range-
-    /// query equivalent of the `QueryEngine::execute(&str)` trait
-    /// surface. Used by the HTTP server as a fallback when the legacy
-    /// `handle_range_query_promql` returns `None`.
-    ///
-    /// Time semantics follow Prometheus's
-    /// `/api/v1/query_range?start&end&step` contract: the immutable
-    /// QueryPlan is evaluated independently at `start + n*step`, and
-    /// the result contains exactly those timestamps. Native summary
-    /// pane boundaries are an internal detail and never become API steps.
-    pub async fn execute_range_promql_modern(
-        &self,
-        query: &str,
-        start_ms: u64,
-        end_ms: u64,
-        step_ms: u64,
-    ) -> Result<crate::query_engines::query_result::QueryResult, crate::query_engines::EngineError>
-    {
-        if let Some(physical) = self.active_physical_plan_snapshot() {
-            if let Ok(entry) = physical.query_plan.lookup(query) {
-                return self
-                    .execute_logical_range(&physical, entry, start_ms, end_ms, step_ms)
-                    .await;
-            }
-        }
-        let Some(idx) = self.summary_store.as_ref() else {
-            return Err(crate::query_engines::EngineError::capability_miss(
-                crate::storage_engines::types::StorageBackend::SketchStore.data_source_id(),
-                format!("ASAPQueryEngine: no sketch index for `{query}` — failing over"),
-            ));
-        };
-
-        let physical_plan = self.active_physical_plan_snapshot();
-        let mut readiness = None;
-        let planned = match physical_plan.as_ref() {
-            Some(physical_plan) => match physical_plan.query_plan.lookup(query) {
-                Ok(query_entry) => {
-                    super::catalog_resolver::validate_entry(
-                        physical_plan.summary_catalog.as_deref(), query_entry,
-                        physical_plan.query_plan.plan_id, physical_plan.query_plan.plan_version,
-                    )?;
-                    readiness = Some((
-                        physical_plan.plan_id(),
-                        physical_plan.plan_version(),
-                        readiness_requirement(query_entry),
-                    ));
-                    crate::query_engines::asap_query_engine::live_serve::serve_range_steps_from_query_plan(
-                        idx,
-                        query_entry,
-                        start_ms,
-                        end_ms,
-                        step_ms,
-                    )
-                }
-                Err(reason) => Err(crate::query_engines::asap_query_engine::post_asap_readout::LoweringSkip::QueryNotPlanned(reason.to_string())),
-            },
-
-            None => Err(crate::query_engines::asap_query_engine::post_asap_readout::LoweringSkip::QueryNotPlanned(
-                "no active physical QueryPlan".into(),
-            )),
-        };
-        let result = planned.and_then(|result| {
-            if let Some((plan_id, plan_version, requirement)) = readiness.as_ref() {
-                let complete = !requirement.materializations.is_empty()
-                    && complete_window_coverage(
-                        result.coverage,
-                        start_ms,
-                        end_ms,
-                        requirement.max_window_ms,
-                    );
-                let Some(active) = self.active_physical_plan.as_ref() else {
-                    return Err(crate::query_engines::asap_query_engine::post_asap_readout::LoweringSkip::MaterializationNotReady(
-                        "physical readiness registry is unavailable".into(),
-                    ));
-                };
-                if !complete {
-                    active.mark_materializing(
-                        *plan_id,
-                        *plan_version,
-                        &requirement.materializations,
-                        result.coverage,
-                    );
-                    return Err(crate::query_engines::asap_query_engine::post_asap_readout::LoweringSkip::MaterializationNotReady(
-                        format!("coverage {:?} does not completely and freshly cover [{start_ms}, {end_ms}]", result.coverage),
-                    ));
-                }
-                let coverage = result.coverage.expect("complete coverage checked above");
-                if !active.mark_ready(
-                    *plan_id,
-                    *plan_version,
-                    &requirement.materializations,
-                    coverage,
-                ) || !active.mark_serving(
-                    *plan_id,
-                    *plan_version,
-                    &requirement.materializations,
-                    coverage,
-                ) {
-                    return Err(crate::query_engines::asap_query_engine::post_asap_readout::LoweringSkip::MaterializationNotReady(
-                        "physical generation changed while checking readiness".into(),
-                    ));
-                }
-            }
-            Ok(result)
-        }).map_err(|reason| {
-            if let super::post_asap_readout::LoweringSkip::Execution(error) = reason {
-                return crate::query_engines::EngineError::Physical(error);
-            }
-            if let Some(req) = Self::requirements_from_query_str(query) {
-            }
-            crate::query_engines::EngineError::capability_miss(
-                crate::storage_engines::types::StorageBackend::SketchStore.data_source_id(),
-                format!(
-                    "installed QueryPlan resolver could not serve `{query}` over \
-                     [{start_ms}, {end_ms}]: {reason:?} — failing over to archive"
-                ),
-            )
-        })?;
-
-        // Matrix shape — the range_query wire format requires it.
-        let warm_qr = asap_tier_result_to_query_result(result.clone(), end_ms, true);
-
-        // Complete coverage is a prerequisite above. Hybrid stitching is
-        // retained for legacy/test callers without an active QueryPlan only.
-        Ok(warm_qr)
-    }
-}
-
-// ---------------------------------------------------------------------------
-// `QueryEngine` trait impl.
-//
-// Adapter only — does NOT change `handle_query` or any other existing
-// surface. The trait's `execute(&str)` walks the same `handle_query` code
-// path the binary's HTTP driver uses today; `None` (capability miss) is
-// translated to `EngineError::CapabilityMiss` so the router can fall through
-// to the next compatible backend.
-// ---------------------------------------------------------------------------
-
-/// Adapt a [`crate::storage_engines::sketch_db::query::ASAPTierResult`] to the engine's
-/// existing `QueryResult` shape. The reducer hands back per-series
-/// time-stamped scalars; we materialize them as a
-/// `QueryResult::Matrix` whose [`crate::query_engines::query_result::RangeVectorElement`]s
-/// each map onto one (label-values, samples) entry.
-///
-/// `now_ms` is unused for the matrix variant (each sample carries its
-/// own window-end timestamp); it's plumbed for future extension to
-/// the instant-vector case (latest-pane projection).
-fn annotate_logical_execution(
-    result: &mut crate::query_engines::query_result::QueryResult,
-    stats: &super::logical_dag::ExecutionStats,
-) {
-    use crate::query_engines::query_result::QueryResult;
-    let warnings = match result {
-        QueryResult::Vector(v) => &mut v.warnings,
-        QueryResult::Matrix(m) => &mut m.warnings,
-    };
-    if stats.remote_evaluations > 0 {
-        warnings.push(
-            if stats.summary_readout_evaluations > 0 {
-                "asap_execution:hybrid"
-            } else {
-                "asap_execution:exact_dag"
-            }
-            .into(),
-        );
-    }
-    warnings.push(format!(
-        "asap_logical_stats:raw={},summary={},memo_hits={},remote={},remote_rpcs={},remote_branches={}",
-        stats.raw_scan_evaluations,
-        stats.summary_readout_evaluations,
-        stats.memo_hits,
-        stats.remote_evaluations,
-        stats.remote_rpcs,
-        stats.remote_branch_evaluations
-    ));
-}
-
-fn asap_tier_result_to_query_result(
-    result: crate::storage_engines::sketch_db::query::ASAPTierResult,
-    now_ms: u64,
-    is_range_query: bool,
-) -> crate::query_engines::query_result::QueryResult {
-    use crate::query_engines::query_result::{
-        InstantVectorElement, QueryResult, RangeVectorElement,
-    };
-    use crate::storage_engines::types::KeyByLabelValues;
-
-    // Instant-query result-shape: the Prometheus adapter's
-    // `format_success_response` rejects `Matrix` for queries the
-    // request identifies as instant — produces a
-    // 500 ”shape mismatch”. Project the per-series last sample into
-    // an `InstantVectorElement` and wrap as `Vector` so the wire
-    // response carries `resultType: vector` matching the request.
-    if !is_range_query {
-        let mut elements: Vec<InstantVectorElement> = Vec::with_capacity(result.series.len());
-        for (label_values, samples) in result.series {
-            // Mirror the range-vector branch: BTreeMap iteration is
-            // key-sorted, so `unzip` produces aligned (keys, values).
-            // Stash the keys in the per-element `label_keys_override`
-            // so the Prometheus adapter renders synthesized keys
-            // (notably ASAP-tier `topk`'s `"item"` key) instead of
-            // the empty `metric: {}` it would produce when the
-            // query-scoped `KeyByLabelNames` is empty.
-            let (keys, values): (Vec<String>, Vec<String>) = label_values.into_iter().unzip();
-            let labels = KeyByLabelValues::new_with_labels(values);
-            // Take the latest sample (the reducer returns one per
-            // window_end; for instant readout we want the most recent).
-            if let Some((_, value)) = samples.into_iter().last() {
-                elements
-                    .push(InstantVectorElement::new(labels, value).with_label_keys_override(keys));
-            }
-        }
-        return QueryResult::vector(elements, now_ms);
-    }
-
-    let mut elements: Vec<RangeVectorElement> = Vec::with_capacity(result.series.len());
-    for (label_values, samples) in result.series {
-        // `KeyByLabelValues` is a `Vec<String>` carrying VALUES only;
-        // the serializer pairs them with KEYS from a query-scoped
-        // `KeyByLabelNames`. For most queries the keys ARE the
-        // query's group-by clause, so the default path works. But
-        // ASAP-tier `topk` synthesizes an `"item"` key (the top-k
-        // entry name) that the original query's group-by doesn't
-        // carry — without an override the serializer drops it and
-        // the response shows `"metric": {}`. Project the BTreeMap's
-        // VALUES in key-sorted order (BTreeMap iteration is
-        // key-sorted), and stash the BTreeMap's KEYS in the
-        // per-element override so the serializer can pair them
-        // correctly.
-        let (keys, values): (Vec<String>, Vec<String>) = label_values.into_iter().unzip();
-        let labels = KeyByLabelValues::new_with_labels(values);
-        let mut element = RangeVectorElement::new(labels).with_label_keys_override(keys);
-        for (window_end_ms, value) in samples {
-            // `window_end_ms` is i64 from the index; cast to u64
-            // for the wire format (window_end is monotonic + post-
-            // 1970 in production).
-            let ts = if window_end_ms >= 0 {
-                window_end_ms as u64
-            } else {
-                0
-            };
-            element.add_sample(ts, value);
-        }
-        elements.push(element);
-    }
-    QueryResult::matrix(elements)
-}
-
-#[async_trait::async_trait]
-impl crate::query_engines::routing::query_engine_routing::QueryEngine for ASAPQueryEngine {
-    async fn execute(
-        &self,
-        query: &str,
-    ) -> Result<crate::query_engines::query_result::QueryResult, crate::query_engines::EngineError>
-    {
-        let now_ms = std::time::SystemTime::now()
-            .duration_since(std::time::SystemTime::UNIX_EPOCH)
-            .map(|d| d.as_millis() as u64)
-            .unwrap_or(0);
-        self.execute_at(query, now_ms).await
-    }
-
-    async fn execute_at(
-        &self,
-        query: &str,
-        now_ms: u64,
-    ) -> Result<crate::query_engines::query_result::QueryResult, crate::query_engines::EngineError>
-    {
-        if let Some(physical) = self.active_physical_plan_snapshot() {
-            if let Ok(entry) = physical.query_plan.lookup(query) {
-                return self
-                    .execute_installed_instant(&physical, entry, now_ms)
-                    .await;
-            }
-        }
-        // One authoritative warm path: ASAPPlanner post-ASAP DAG →
-        // SummaryCatalog/materialization resolver → SID lookup → DAG executor.
-        // A typed resolver/executor error becomes CapabilityMiss, which lets
-        // EngineRouter continue to the archive backend.
-        if let Some(idx) = self.summary_store.as_ref() {
-            let physical_plan = self.active_physical_plan_snapshot();
-            let mut readiness = None;
-            let planned = match physical_plan.as_ref() {
-                Some(physical_plan) => match physical_plan.query_plan.lookup(query) {
-                    Ok(query_entry) => {
-                        readiness = Some((
-                            physical_plan.plan_id(),
-                            physical_plan.plan_version(),
-                            readiness_requirement(query_entry),
-                        ));
-                        crate::query_engines::asap_query_engine::live_serve::serve_instant_from_query_plan(
-                            idx, query_entry, now_ms,
-                        )
-                    },
-                    Err(reason) => Err(crate::query_engines::asap_query_engine::post_asap_readout::LoweringSkip::QueryNotPlanned(reason.to_string())),
-                },
-
-                None => Err(crate::query_engines::asap_query_engine::post_asap_readout::LoweringSkip::QueryNotPlanned(
-                    "no active physical QueryPlan".into(),
-                )),
-            };
-            let (result, t0_ms) = planned.and_then(|(result, t0_ms)| {
-                if let Some((plan_id, plan_version, requirement)) = readiness.as_ref() {
-                    let complete = !requirement.materializations.is_empty()
-                        && complete_window_coverage(
-                            result.coverage,
-                            t0_ms,
-                            now_ms,
-                            requirement.max_window_ms,
-                        );
-                    let Some(active) = self.active_physical_plan.as_ref() else {
-                        return Err(crate::query_engines::asap_query_engine::post_asap_readout::LoweringSkip::MaterializationNotReady(
-                            "physical readiness registry is unavailable".into(),
-                        ));
-                    };
-                    if !complete {
-                        active.mark_materializing(
-                            *plan_id,
-                            *plan_version,
-                            &requirement.materializations,
-                            result.coverage,
-                        );
-                        return Err(crate::query_engines::asap_query_engine::post_asap_readout::LoweringSkip::MaterializationNotReady(
-                            format!("coverage {:?} does not completely and freshly cover [{t0_ms}, {now_ms}]", result.coverage),
-                        ));
-                    }
-                    let coverage = result.coverage.expect("complete coverage checked above");
-                    if !active.mark_ready(
-                        *plan_id,
-                        *plan_version,
-                        &requirement.materializations,
-                        coverage,
-                    ) || !active.mark_serving(
-                        *plan_id,
-                        *plan_version,
-                        &requirement.materializations,
-                        coverage,
-                    ) {
-                        return Err(crate::query_engines::asap_query_engine::post_asap_readout::LoweringSkip::MaterializationNotReady(
-                            "physical generation changed while checking readiness".into(),
-                        ));
-                    }
-                }
-                Ok((result, t0_ms))
-            }).map_err(|reason| {
-            if let super::post_asap_readout::LoweringSkip::Execution(error) = reason {
-                return crate::query_engines::EngineError::Physical(error);
-            }
-                    if let Some(req) = Self::requirements_from_query_str(query) {
-                    }
-                    crate::query_engines::EngineError::capability_miss(
-                        crate::storage_engines::types::StorageBackend::SketchStore.data_source_id(),
-                        format!(
-                            "installed QueryPlan resolver could not serve `{query}`: \n                             {reason:?} — failing over to archive"
-                        ),
-                    )
-                })?;
-
-            let warm_qr = asap_tier_result_to_query_result(result.clone(), now_ms, false);
-            return Ok(warm_qr);
-        }
-
-        // Without a sketch index, notify the control plane directly on a capability
-        // miss so the feedback loop also works for this configuration.
-        if let Some(req) = Self::requirements_from_query_str(query) {}
-        Err(crate::query_engines::EngineError::capability_miss(
-            crate::storage_engines::types::StorageBackend::SketchStore.data_source_id(),
-            format!("ASAPQueryEngine: no sketch index for `{query}` — failing over to archive"),
-        ))
-    }
-
-    /// Range-query entry point for the [`EngineRouter`] failover loop.
-    ///
-    /// Delegates to the inherent `execute_range_promql_modern`, which
-    /// runs the ASAP-tier reducer over `[start_ms, end_ms]` and returns
-    /// a `matrix` result. Without this override the router would hit the
-    /// trait default (`CapabilityMiss`) and never reach the ASAP-tier
-    /// range path, so every range query would fall straight through to
-    /// the archive even when the warm sketches can answer it.
-    async fn execute_range(
-        &self,
-        query: &str,
-        start_ms: u64,
-        end_ms: u64,
-        step_ms: u64,
-    ) -> Result<crate::query_engines::query_result::QueryResult, crate::query_engines::EngineError>
-    {
-        self.execute_range_promql_modern(query, start_ms, end_ms, step_ms)
-            .await
-    }
-
-    fn capabilities(
-        &self,
-    ) -> crate::query_engines::routing::query_engine_routing::EngineCapabilities {
-        crate::query_engines::routing::query_engine_routing::EngineCapabilities {
-            data_source_id: crate::storage_engines::types::StorageBackend::SketchStore
-                .data_source_id(),
-            storage_backend: crate::storage_engines::types::StorageBackend::SketchStore,
-            // Warm-tier sketches are O(sketch-size); call it 16 MiB ceiling
-            // for buffered ops (KLL with k=200 is well below this).
-            supports_streams_above_bytes: 16 * 1024 * 1024,
-        }
-    }
-}
-
-#[cfg(test)]
-mod sketch_query_tests {
-    // use crate::storage_engines::types::{CleanupPolicy, InstalledPrecomputePlan};
-    // use crate::query_engines::asap_query_engine::engine::ASAPQueryEngine;
-    // use crate::storage_engines::promsketch_store::PromSketchStore;
-    // use crate::storage_engines::TimestampedBucketsMap;
-    // use std::collections::HashMap;
-    // use std::sync::Arc;
-
-    // /// Minimal no-op store — sketch queries bypass the store entirely
-    // struct NoOpStore;
-
-    // impl Store for NoOpStore {
-    //     fn query_precomputed_output(
-    //         &self,
-    //         _: &str,
-    //         _: u64,
-    //         _: u64,
-    //         _: u64,
-    //     ) -> Result<TimestampedBucketsMap, Box<dyn std::error::Error + Send + Sync>> {
-    //         panic!("NoOpStore should not be called for sketch queries");
-    //     }
-    //     fn query_precomputed_output_exact(
-    //         &self,
-    //         _: &str,
-    //         _: u64,
-    //         _: u64,
-    //         _: u64,
-    //     ) -> Result<TimestampedBucketsMap, Box<dyn std::error::Error + Send + Sync>> {
-    //         panic!("NoOpStore should not be called for sketch queries");
-    //     }
-    //     fn insert_precomputed_output(
-    //         &self,
-    //         _: crate::storage_engines::types::PrecomputedOutput,
-    //         _: Box<dyn crate::storage_engines::types::AggregateCore>,
-    //     ) -> Result<(), Box<dyn std::error::Error + Send + Sync>> {
-    //         panic!("NoOpStore should not be called for sketch queries");
-    //     }
-    //     fn insert_precomputed_output_batch(
-    //         &self,
-    //         _: Vec<(
-    //             crate::storage_engines::types::PrecomputedOutput,
-    //             Box<dyn crate::storage_engines::types::AggregateCore>,
-    //         )>,
-    //     ) -> Result<(), Box<dyn std::error::Error + Send + Sync>> {
-    //         panic!("NoOpStore should not be called for sketch queries");
-    //     }
-    //     fn get_earliest_timestamp_per_aggregation_id(
-    //         &self,
-    //     ) -> Result<HashMap<u64, u64>, Box<dyn std::error::Error + Send + Sync>> {
-    //         Ok(HashMap::new())
-    //     }
-    //     fn close(&self) -> Result<(), Box<dyn std::error::Error + Send + Sync>> {
-    //         Ok(())
-    //     }
-    // }
-
-    // /// Helper: create an engine with a populated PromSketchStore.
-    // /// Inserts data points 1..=100 into a series with labels = `series_key`.
-    // fn engine_with_sketch_data(series_key: &str) -> ASAPQueryEngine {
-    //     let ps = Arc::new(PromSketchStore::with_default_config());
-    //     ps.ensure_all_sketches(series_key).unwrap();
-    //     for i in 1..=100u64 {
-    //         ps.sketch_insert(series_key, i, i as f64).unwrap();
-    //     }
-
-    //     let inference_config =
-    //         InferenceConfig::new(::promql, CleanupPolicy::NoCleanup);
-    //     let installed_precompute_plan = Arc::new(InstalledPrecomputePlan::default());
-
-    //     ASAPQueryEngine::new(
-    //         Arc::new(NoOpStore),
-    //         Some(ps),
-    //         inference_config,
-    //         installed_precompute_plan,
-    //         15,
-    //         ::promql,
-    //     )
-    // }
-
-    // // ---- Instant query tests ----
-
-    // #[test]
-    // fn test_sketch_instant_entropy_over_time() {
-    //     let engine = engine_with_sketch_data("mymetric");
-    //     // Query at time 0.1s (= 100ms) with a 100ms range
-    //     let result = engine.handle_query_promql("entropy_over_time(mymetric[100s])".into(), 0.1);
-    //     assert!(result.is_some(), "entropy_over_time should return a result");
-    //     let (labels, qr) = result.unwrap();
-    //     assert!(!labels.labels.is_empty());
-    //     if let crate::query_engines::query_result::QueryResult::Vector(iv) = qr {
-    //         assert!(!iv.values.is_empty(), "should have at least one result");
-    //         let val = iv.values[0].value;
-    //         assert!(val >= 0.0, "entropy should be non-negative, got {}", val);
-    //     } else {
-    //         panic!("expected Vector result");
-    //     }
-    // }
-
-    // #[test]
-    // fn test_sketch_instant_quantile_over_time() {
-    //     let engine = engine_with_sketch_data("mymetric");
-    //     let result =
-    //         engine.handle_query_promql("quantile_over_time(0.5, mymetric[100s])".into(), 0.1);
-    //     assert!(
-    //         result.is_some(),
-    //         "quantile_over_time should return a result"
-    //     );
-    //     let (_labels, qr) = result.unwrap();
-    //     if let crate::query_engines::query_result::QueryResult::Vector(iv) = qr {
-    //         assert!(!iv.values.is_empty());
-    //         let val = iv.values[0].value;
-    //         // Median of 1..100 should be roughly 50
-    //         assert!(
-    //             val > 20.0 && val < 80.0,
-    //             "median should be roughly 50, got {}",
-    //             val
-    //         );
-    //     } else {
-    //         panic!("expected Vector result");
-    //     }
-    // }
-
-    // #[test]
-    // fn test_sketch_instant_avg_over_time() {
-    //     let engine = engine_with_sketch_data("cpu");
-    //     let result = engine.handle_query_promql("avg_over_time(cpu[100s])".into(), 0.1);
-    //     assert!(result.is_some(), "avg_over_time should return a result");
-    //     let (_labels, qr) = result.unwrap();
-    //     if let crate::query_engines::query_result::QueryResult::Vector(iv) = qr {
-    //         assert!(!iv.values.is_empty());
-    //         let val = iv.values[0].value;
-    //         // avg of 1..100 = 50.5
-    //         assert!(val > 30.0 && val < 70.0, "avg should be ~50.5, got {}", val);
-    //     } else {
-    //         panic!("expected Vector result");
-    //     }
-    // }
-
-    // #[test]
-    // fn test_sketch_instant_returns_none_without_store() {
-    //     // Engine with promsketch_store = None
-    //     let inference_config =
-    //         InferenceConfig::new(::promql, CleanupPolicy::NoCleanup);
-    //     let installed_precompute_plan = Arc::new(InstalledPrecomputePlan::default());
-    //     let engine = ASAPQueryEngine::new(
-    //         Arc::new(NoOpStore),
-    //         inference_config,
-    //         installed_precompute_plan,
-    //         15,
-    //         ::promql,
-    //     );
-    //     // Sketch function should fall through (return None) without panicking
-    //     let result = engine.handle_sketch_query_promql("entropy_over_time(metric[5m])", 100.0);
-    //     assert!(result.is_none());
-    // }
-
-    // #[test]
-    // fn test_sketch_instant_returns_none_for_non_sketch_function() {
-    //     let engine = engine_with_sketch_data("mymetric");
-    //     // "rate" is not sketch-backed, so should return None from sketch path
-    //     let result = engine.handle_sketch_query_promql("rate(mymetric[100s])", 0.1);
-    //     assert!(result.is_none());
-    // }
-
-    // #[test]
-    // fn test_sketch_instant_returns_none_for_missing_series() {
-    //     let engine = engine_with_sketch_data("mymetric");
-    //     // Query a metric that doesn't exist in the sketch store
-    //     let result = engine.handle_sketch_query_promql("entropy_over_time(nonexistent[100s])", 0.1);
-    //     assert!(result.is_none());
-    // }
-
-    // ---- Range query tests ----
-
-    // #[test]
-    // fn test_sketch_range_entropy_over_time() {
-    //     let engine = engine_with_sketch_data("mymetric");
-    //     // Range query: start=0.01, end=0.1 (10ms to 100ms), step=0.01 (10ms)
-    //     // with a 50ms window [50s range]
-    //     let result = engine.handle_range_query_promql(
-    //         "entropy_over_time(mymetric[50s])".into(),
-    //         0.01,
-    //         0.1,
-    //         0.01,
-    //     );
-    //     assert!(
-    //         result.is_some(),
-    //         "sketch range query should return a result"
-    //     );
-    //     let (_labels, qr) = result.unwrap();
-    //     if let crate::query_engines::query_result::QueryResult::Matrix(rv) = qr {
-    //         assert!(!rv.values.is_empty(), "should have at least one series");
-    //         let samples = &rv.values[0].samples;
-    //         assert!(
-    //             samples.len() > 1,
-    //             "range query should produce multiple samples, got {}",
-    //             samples.len()
-    //         );
-    //         for sample in samples {
-    //             assert!(
-    //                 sample.value >= 0.0,
-    //                 "entropy should be non-negative, got {}",
-    //                 sample.value
-    //             );
-    //         }
-    //     } else {
-    //         panic!("expected Matrix result");
-    //     }
-    // }
-
-    // #[test]
-    // fn test_sketch_range_returns_none_without_store() {
-    //     let inference_config =
-    //         InferenceConfig::new(::promql, CleanupPolicy::NoCleanup);
-    //     let installed_precompute_plan = Arc::new(InstalledPrecomputePlan::default());
-    //     let engine = ASAPQueryEngine::new(
-    //         Arc::new(NoOpStore),
-    //         inference_config,
-    //         installed_precompute_plan,
-    //         15,
-    //         ::promql,
-    //     );
-    //     let result = engine.handle_sketch_range_query_promql(
-    //         "entropy_over_time(metric[5m])",
-    //         0.0,
-    //         100.0,
-    //         10.0,
-    //     );
-    //     assert!(result.is_none());
-    // }
-
-    // #[test]
-    // fn test_sketch_range_returns_none_for_non_sketch_function() {
-    //     let engine = engine_with_sketch_data("mymetric");
-    //     let result =
-    //         engine.handle_sketch_range_query_promql("rate(mymetric[100s])", 0.01, 0.1, 0.01);
-    //     assert!(result.is_none());
-    // }
-}
-
-// Typed auxiliary statistics must answer covered queries without invoking
-// the accumulator query method; uncovered statistics use that method.
-#[cfg(test)]
-mod aux_pushdown_tests {
-    use super::*;
-    use crate::storage_engines::types::AggregationType;
-    use asap_physical_operators::summary_kernels::{
-        max::MaxAccumulator, min::MinAccumulator, sum::SumAccumulator,
-    };
-    use asap_types::Statistic;
-    use std::sync::atomic::{AtomicUsize, Ordering};
-    use std::sync::Arc;
-
-    /// Accumulator that records how many times `query_statistic`
-    /// was invoked. Used to verify the aux fast path skips it.
-    struct SpyAccumulator {
-        inner_sum: f64,
-        query_calls: Arc<AtomicUsize>,
-    }
-
-    impl crate::storage_engines::types::SerializableToSink for SpyAccumulator {
-        fn serialize_to_bytes(&self) -> Vec<u8> {
-            Vec::new()
-        }
-        fn serialize_to_json(&self) -> serde_json::Value {
-            serde_json::Value::Null
-        }
-    }
-
-    impl AggregateCore for SpyAccumulator {
-        fn clone_boxed_core(&self) -> Box<dyn AggregateCore> {
-            Box::new(SpyAccumulator {
-                inner_sum: self.inner_sum,
-                query_calls: self.query_calls.clone(),
-            })
-        }
-        fn type_name(&self) -> &'static str {
-            "SpyAccumulator"
-        }
-        fn as_any(&self) -> &dyn std::any::Any {
-            self
-        }
-
-        fn as_any_mut(&mut self) -> &mut dyn std::any::Any {
-            self
-        }
-        fn merge_with(
-            &self,
-            _other: &dyn AggregateCore,
-        ) -> Result<Box<dyn AggregateCore>, Box<dyn std::error::Error + Send + Sync>> {
-            unimplemented!()
-        }
-        fn get_accumulator_type(&self) -> AggregationType {
-            AggregationType::Sum
-        }
-        fn get_keys(&self) -> Option<Vec<KeyByLabelValues>> {
-            None
-        }
-        fn query_statistic(
-            &self,
-            _statistic: Statistic,
-            _key: &Option<KeyByLabelValues>,
-            _query_kwargs: &HashMap<String, String>,
-        ) -> Result<f64, Box<dyn std::error::Error + Send + Sync>> {
-            self.query_calls.fetch_add(1, Ordering::Relaxed);
-            Ok(-1.0) // sentinel: fast path should not return this
-        }
-        fn aux_stats(&self) -> crate::storage_engines::types::AuxStats {
-            crate::storage_engines::types::AuxStats {
-                sum: Some(self.inner_sum),
-                ..crate::storage_engines::types::AuxStats::empty()
-            }
-        }
-    }
-
-    fn make_engine() -> ASAPQueryEngine {
-        use crate::storage_engines::types::{
-            CleanupPolicy, InstalledPrecomputePlan, InstalledPrecomputePlanHandle,
-        };
-
-        let sc = Arc::new(InstalledPrecomputePlan::new(HashMap::new()));
-        let hr = InstalledPrecomputePlanHandle::from_arc(sc.clone());
-        let _ = sc;
-        ASAPQueryEngine::new(60)
-    }
-
-    #[test]
-    fn aux_covered_stat_skips_query_statistic() {
-        let engine = make_engine();
-        let calls = Arc::new(AtomicUsize::new(0));
-        let spy = SpyAccumulator {
-            inner_sum: 42.0,
-            query_calls: calls.clone(),
-        };
-        let result = engine
-            .query_precompute_for_statistic(&spy, &Statistic::Sum, &None, &HashMap::new())
-            .expect("query ok");
-        assert_eq!(result, 42.0, "aux fast path should return aux value");
-        assert_eq!(
-            calls.load(Ordering::Relaxed),
-            0,
-            "query_statistic should NOT be called when aux covers the stat"
-        );
-    }
-
-    #[test]
-    fn aux_uncovered_stat_falls_through_to_query_statistic() {
-        let engine = make_engine();
-        let calls = Arc::new(AtomicUsize::new(0));
-        let spy = SpyAccumulator {
-            inner_sum: 42.0,
-            query_calls: calls.clone(),
-        };
-        // Quantile is not covered by aux → must fall through.
-        let result = engine
-            .query_precompute_for_statistic(&spy, &Statistic::Quantile, &None, &HashMap::new())
-            .expect("query ok");
-        assert_eq!(
-            result, -1.0,
-            "should have returned query_statistic's sentinel"
-        );
-        assert_eq!(
-            calls.load(Ordering::Relaxed),
-            1,
-            "query_statistic should be called exactly once when aux misses"
-        );
-    }
-
-    #[test]
-    fn keyed_queries_always_use_query_statistic() {
-        let engine = make_engine();
-        let calls = Arc::new(AtomicUsize::new(0));
-        let spy = SpyAccumulator {
-            inner_sum: 42.0,
-            query_calls: calls.clone(),
-        };
-        let key = Some(KeyByLabelValues::new());
-        // Even for Sum (which aux covers), a keyed query must bypass aux
-        // — aux is per-accumulator, not per-subpopulation key.
-        let result = engine
-            .query_precompute_for_statistic(&spy, &Statistic::Sum, &key, &HashMap::new())
-            .expect("query ok");
-        assert_eq!(result, -1.0);
-        assert_eq!(
-            calls.load(Ordering::Relaxed),
-            1,
-            "keyed queries must skip aux fast path"
-        );
-    }
-
-    #[test]
-    fn real_sum_accumulator_uses_aux_fast_path() {
-        // End-to-end: a real SumAccumulator goes through the fast path
-        // and returns its sum without ever hitting query_statistic.
-        let engine = make_engine();
-        let acc = SumAccumulator::with_sum(7.5);
-        let result = engine
-            .query_precompute_for_statistic(&acc, &Statistic::Sum, &None, &HashMap::new())
-            .expect("query ok");
-        assert_eq!(result, 7.5);
-    }
-
-    #[test]
-    fn real_min_max_accumulator_uses_aux_fast_path() {
-        let engine = make_engine();
-        let min_acc = MinAccumulator::with_value(3.0);
-        let max_acc = MaxAccumulator::with_value(99.0);
-        assert_eq!(
-            engine
-                .query_precompute_for_statistic(&min_acc, &Statistic::Min, &None, &HashMap::new())
-                .unwrap(),
-            3.0
-        );
-        assert_eq!(
-            engine
-                .query_precompute_for_statistic(&max_acc, &Statistic::Max, &None, &HashMap::new())
-                .unwrap(),
-            99.0
-        );
-    }
-}
-
-// ── build_query_execution_context_promql_for_agg_id (forced-agg) tests ──
-
-// ===========================================================================
-// HLL count() — capability matching + accumulator query round-trip.
-//
-// Pins that the warm engine answers `count(metric)` from an HLL-backed
-// aggregation: capability matching picks HLL (per
-// `compatible_agg_types(Statistic::Count)`), and the HLL accumulator's
-// `query_statistic` returns the cardinality estimate. This is the
-// runtime contract the wire-side _hll alias resolver above relies on.
-// ===========================================================================
-// ===========================================================================
-// KLL quantile — pin that DatasketchesKLL is in the Quantile capability
-// list and the accumulator answers `Statistic::Quantile`. Mirrors the
-// HLL-Count contract; closes the wire-side ingest gap diagnosis.
-// ===========================================================================
-// ===========================================================================
-/// Installed plans bind runtime reads and enforce complete coverage.
-#[cfg(test)]
-mod asap_tier_classify_tests {
-    use super::*;
-    use crate::query_engines::routing::query_engine_routing::QueryEngine as _;
-    use crate::query_engines::EngineError;
-    use crate::storage_engines::sketch_db::index::{
-        AccuracyBound, Capability, SketchAlgorithm, SketchConfig, SketchSampleState, SketchStore,
-        SummarySeriesMetadata,
-    };
-    use crate::storage_engines::types::{CleanupPolicy, InstalledPrecomputePlanHandle};
-    use std::collections::{BTreeMap, BTreeSet};
-
-    /// `sum by (zone) (http_requests_total)` end-to-end via the
-    /// `execute(&str)` adapter. Mirrors the MVP acceptance test's Axis-C
-    /// failure: ExactAgg(Sum) sids existed for `http_requests_total`
-    /// (one per zone), but the old reducer
-    /// returned `UnsupportedFunction("sum")` because
-    /// `SketchReducer::evaluate` only knows sketch-backed query
-    /// families. This test pins the ExactAgg dispatch branch added
-    /// to `execute` so the new path emits per-zone instant-vector
-    /// results instead of a CapabilityMiss.
-    #[tokio::test]
-    async fn execute_sum_by_zone_dispatches_to_exact_agg_reducer() {
-        use crate::query_engines::query_result::QueryResult;
-        use crate::storage_engines::sketch_db::data::AggregationType;
-        use asap_physical_operators::summary_kernels::sum::SumAccumulator;
-
-        let idx = Arc::new(SketchStore::new());
-        // Mirror the acceptance-test setup: four ExactAgg(Sum) sids, one
-        // per zone (z0..z3), registered with `group_by_keys=["zone"]`
-        // and carrying a `SumAccumulator` per window.
-        let zones = ["z0", "z1", "z2", "z3"];
-        // Anchor windows so the engine's instant-query default
-        // lookback (5 min) reaches them.
-        let now_ms = 600_000_u64;
-        let window_start = now_ms.saturating_sub(60_000);
-        let window_end = now_ms.saturating_sub(30_000);
-
-        for (i, zone) in zones.iter().enumerate() {
-            let sid = 9000 + i as u64;
-            idx.register(SummarySeriesMetadata {
-                storage_handle: sid,
-                metric_name: "http_requests_total".to_string(),
-                group_by_keys: ["zone".to_string()].into_iter().collect(),
-                capability: Some(Capability::ExactAgg(AggregationType::Sum)),
-                agg_kind: crate::storage_engines::sketch_db::index::AggKind::ExactAgg {
-                    agg_type: AggregationType::Sum,
-                    parameters_canonical: String::new(),
-                    spatial_filter_canonical: String::new(),
-                },
-                accuracy: None,
-                first_seen_unix_ms: 0,
-                retired_at_ms: None,
-                expires_at_ms: None,
-                policy_fp: asap_types::PolicyFingerprint::UNSET,
-            });
-            let value = ((i + 1) * 100) as f64;
-            let mut lm = BTreeMap::new();
-            lm.insert("zone".to_string(), zone.to_string());
-            idx.append_precompute(
-                sid,
-                lm,
-                (window_start, window_end),
-                Box::new(SumAccumulator::with_sum(value)),
-            );
-        }
-
-        use crate::query_engines::asap_query_engine::test_plan;
-        use asap_types::query_plan::*;
-        let config = test_plan::materialization(
-            "http_requests_total",
-            "Sum",
-            serde_json::json!({}),
-            &["zone"],
-            30000,
-        );
-        let query = "sum by (zone) (http_requests_total)";
-        let entry = test_plan::entry(
-            query,
-            &config,
-            PhysicalGrouping::Reduce(vec!["zone".into()]),
-            30000,
-            QueryPlanNode::ExactReadout {
-                input: QueryNodeId(0),
-                readout: ExactReadout::Sum,
-            },
-        );
-        let engine = test_plan::engine(idx, config, vec![9000, 9001, 9002, 9003], entry);
-        let result = engine
-            .execute_at(query, window_end)
-            .await
-            .expect("sum by (zone) must dispatch to ExactAgg reducer, not capability-miss");
-
-        // Expect a Vector (instant) result with one entry per zone.
-        let vector = match result {
-            QueryResult::Vector(v) => v,
-            other => panic!("expected Vector, got {other:?}"),
-        };
-        assert_eq!(vector.values.len(), 4, "one entry per zone");
-        // Per-zone values match what each SumAccumulator carries.
-        // KeyByLabelValues stores values only; the override carries
-        // the corresponding keys.
-        let mut by_zone: std::collections::HashMap<String, f64> = std::collections::HashMap::new();
-        for el in &vector.values {
-            // The element's label keys override + label values together
-            // identify the zone.
-            let keys = el
-                .label_keys_override
-                .as_ref()
-                .expect("override populated for ExactAgg path");
-            let vals = &el.labels.labels;
-            assert_eq!(keys.len(), vals.len());
-            let zone_idx = keys
-                .iter()
-                .position(|k| k == "zone")
-                .expect("zone key present");
-            by_zone.insert(vals[zone_idx].clone(), el.value);
-        }
-        assert_eq!(by_zone.get("z0").copied(), Some(100.0));
-        assert_eq!(by_zone.get("z1").copied(), Some(200.0));
-        assert_eq!(by_zone.get("z2").copied(), Some(300.0));
-        assert_eq!(by_zone.get("z3").copied(), Some(400.0));
-    }
-
-    // Build a now-anchored KLL `SummarySeriesMetadata` + sample so the
-    // engine's instant/range default lookbacks reach it. Mirrors the
-    // live MVP workload: the agent emits a bare-named KLL sketch
-    // (`http_requests_total_latency_ms`) into the SketchStore.
-    fn kll_meta(sid: u64, metric: &str) -> SummarySeriesMetadata {
-        // Latest ASAPPlanner sizes an epsilon=0.01 KLL at k=269.
-        let cfg = SketchConfig::Kll { k: 269 };
-        SummarySeriesMetadata {
-            storage_handle: sid,
-            metric_name: metric.to_string(),
-            group_by_keys: BTreeSet::new(),
-            capability: Some(Capability::QuantileApprox(Some(SketchAlgorithm::Kll))),
-            agg_kind: crate::storage_engines::sketch_db::index::AggKind::Sketch {
-                algorithm: SketchAlgorithm::Kll,
-                config: cfg.clone(),
-                spatial_filter_canonical: String::new(),
-            },
-            accuracy: Some(AccuracyBound::from_config(&cfg)),
-            first_seen_unix_ms: 0,
-            retired_at_ms: None,
-            expires_at_ms: None,
-            policy_fp: asap_types::PolicyFingerprint::UNSET,
-        }
-    }
-
-    fn encode_kll_items_proto(k: u16, items: &[f64]) -> Vec<u8> {
-        use asap_sketchlib::proto::sketchlib::{sketch_envelope, KllState, SketchEnvelope};
-        use prost::Message;
-        let state = KllState {
-            k: k as u32,
-            items: items.to_vec(),
-            levels: vec![],
-            num_levels: 0,
-            ..Default::default()
-        };
-        let env = SketchEnvelope {
-            sketch_state: Some(sketch_envelope::SketchState::Kll(state)),
-            ..Default::default()
-        };
-        env.encode_to_vec()
-    }
-
-    fn hll_meta(sid: u64, metric: &str) -> SummarySeriesMetadata {
-        // Latest ASAPPlanner requires p=14 for a 1% HLL error target.
-        let cfg = SketchConfig::Hll { precision: 14 };
-        SummarySeriesMetadata {
-            storage_handle: sid,
-            metric_name: metric.to_string(),
-            group_by_keys: BTreeSet::new(),
-            capability: Some(Capability::CardinalityApprox),
-            agg_kind: crate::storage_engines::sketch_db::index::AggKind::Sketch {
-                algorithm: SketchAlgorithm::Hll,
-                config: cfg.clone(),
-                spatial_filter_canonical: String::new(),
-            },
-            accuracy: Some(AccuracyBound::from_config(&cfg)),
-            first_seen_unix_ms: 0,
-            retired_at_ms: None,
-            expires_at_ms: None,
-            policy_fp: asap_types::PolicyFingerprint::UNSET,
-        }
-    }
-
-    fn encode_hll_with_cardinality(precision: u32, distinct: usize) -> Vec<u8> {
-        use asap_sketchlib::proto::sketchlib::{
-            sketch_envelope, HllVariant as ProtoVariant, HyperLogLogState, SketchEnvelope,
-        };
-        use asap_sketchlib::{HllSketch, HllVariant};
-        use prost::Message;
-        let mut sk = HllSketch::new(HllVariant::Regular, precision);
-        for i in 0..distinct {
-            sk.update(format!("user-{i}").as_bytes());
-        }
-        let state = HyperLogLogState {
-            variant: ProtoVariant::Regular as i32,
-            precision: sk.precision,
-            registers: sk.registers.clone(),
-            hip_kxq0: sk.hip_kxq0,
-            hip_kxq1: sk.hip_kxq1,
-            hip_est: sk.hip_est,
-            registers_sparse: None,
-        };
-        let env = SketchEnvelope {
-            sketch_state: Some(sketch_envelope::SketchState::Hll(state)),
-            ..Default::default()
-        };
-        env.encode_to_vec()
-    }
-
-    /// REGRESSION of the HLL `count(metric)` "No result" e2e failure
-    /// (`controller_plan_to_query_full_roundtrip_hll`) isolated to the
-    /// engine layer. `count(distinct_over_time(unique_users_per_min[w]))`
-    /// is the distinct-count idiom (bare `count(v)` is a row count). The Planner DAG represents this as a cardinality readout,
-    /// so the executor returns the HLL distinct-count directly. A single
-    /// FULL HLL frame (~500 users) is used so
-    /// the instant projection reads the real estimate.
-    /// Stored sketches cannot authorize a query without an installed QueryPlan.
-    #[tokio::test]
-    async fn unplanned_queries_fail_closed_even_with_matching_sketches() {
-        let idx = Arc::new(SketchStore::new());
-        idx.register(hll_meta(7500, "unique_users_per_min"));
-        idx.append_sample(
-            7500,
-            BTreeMap::new(),
-            (1_000, 2_000),
-            SketchSampleState {
-                bytes: encode_hll_with_cardinality(14, 500),
-                encoding: crate::storage_engines::sketch_db::index::SketchEncoding::ProtoFull,
-            },
-        );
-        let engine = ASAPQueryEngine::new(15000).with_sketch_index(idx);
-        let query = "count(distinct_over_time(unique_users_per_min[1m]))";
-        let instant = engine.execute_at(query, 2_000).await;
-        let range = engine
-            .execute_range_promql_modern(query, 1_000, 2_000, 1_000)
-            .await;
-        assert!(
-            instant.is_err(),
-            "instant execution must require an installed plan"
-        );
-        assert!(
-            range.is_err(),
-            "range execution must require an installed plan"
-        );
-    }
-
-    /// An installed plan authorizes only its exact query identity and still
-    /// requires readable materializations before serving.
-    #[tokio::test]
-    async fn installed_plan_rejects_unknown_queries_and_missing_samples() {
-        use crate::query_engines::asap_query_engine::test_plan;
-        use asap_types::query_plan::*;
-        let idx = Arc::new(SketchStore::new());
-        idx.register(hll_meta(7500, "unique_users_per_min"));
-        let config = test_plan::materialization(
-            "unique_users_per_min",
-            "HLL",
-            serde_json::json!({"precision":14}),
-            &[],
-            1000,
-        );
-        let query = "count(distinct_over_time(unique_users_per_min[1m]))";
-        let entry = test_plan::entry(
-            query,
-            &config,
-            PhysicalGrouping::Reduce(vec![]),
-            1000,
-            QueryPlanNode::SummaryEstimate {
-                input: QueryNodeId(0),
-                query: QueryReadout::Cardinality,
-            },
-        );
-        let engine = test_plan::engine(idx, config, vec![7500], entry);
-        for query in [query, "count(other_metric)"] {
-            assert!(engine.execute_at(query, 2000).await.is_err());
-            assert!(engine
-                .execute_range_promql_modern(query, 2000, 2000, 1000)
-                .await
-                .is_err());
-        }
-    }
-
-    #[tokio::test]
-    async fn execute_count_hll_returns_cardinality_not_rowcount() {
-        let idx = Arc::new(SketchStore::new());
-        let sid = 7500u64;
-        idx.register(hll_meta(sid, "unique_users_per_min"));
-
-        let now_ms = 600_000_u64;
-        idx.append_sample(
-            sid,
-            BTreeMap::new(),
-            (now_ms.saturating_sub(3_000), now_ms.saturating_sub(2_000)),
-            SketchSampleState {
-                bytes: encode_hll_with_cardinality(14, 500),
-                encoding: crate::storage_engines::sketch_db::index::SketchEncoding::ProtoFull,
-            },
-        );
-
-        use crate::query_engines::asap_query_engine::test_plan;
-        use asap_types::query_plan::*;
-        let config = test_plan::materialization(
-            "unique_users_per_min",
-            "HLL",
-            serde_json::json!({"precision":14}),
-            &[],
-            1000,
-        );
-        let query = "count(distinct_over_time(unique_users_per_min[1m]))";
-        let entry = test_plan::entry(
-            query,
-            &config,
-            PhysicalGrouping::Reduce(vec![]),
-            1000,
-            QueryPlanNode::SummaryEstimate {
-                input: QueryNodeId(0),
-                query: QueryReadout::Cardinality,
-            },
-        );
-        let engine = test_plan::engine(idx, config, vec![7500], entry);
-        let result = engine.execute_at(query, now_ms - 2000).await.expect(
-            "count(hll_metric) must dispatch to the Cardinality family \
-                 via the candidate capability (empty trace function) and \
-                 return the HLL distinct-count, NOT capability-miss",
-        );
-        assert!(
-            result_nonempty(&result),
-            "the distinct-count idiom over an HLL sid must return a \
-             non-empty cardinality estimate (regression: empty `asap_query` \
-             No-result)"
-        );
-        // The value must be the HLL distinct-count estimate (~500), NOT
-        // the outer-Count fold collapsing it to the row-count (1.0).
-        let est = match &result {
-            crate::query_engines::query_result::QueryResult::Vector(v) => v.values[0].value,
-            crate::query_engines::query_result::QueryResult::Matrix(m) => {
-                m.values[0].samples.last().map(|s| s.value).unwrap_or(0.0)
-            }
-        };
-        assert!(
-            est > 100.0,
-            "expected the HLL distinct-count estimate (~500), not the \
-             row-count fold (1.0); got {est}"
-        );
-    }
-
-    /// Encode an HLL FULL proto frame over an EXPLICIT set of string items,
-    /// so a test can craft overlapping / disjoint distinct sets across
-    /// series and compute the TRUE union cardinality.
-    fn encode_hll_from_items(precision: u32, items: &[String]) -> Vec<u8> {
-        use asap_sketchlib::proto::sketchlib::{
-            sketch_envelope, HllVariant as ProtoVariant, HyperLogLogState, SketchEnvelope,
-        };
-        use asap_sketchlib::{HllSketch, HllVariant};
-        use prost::Message;
-        let mut sk = HllSketch::new(HllVariant::Regular, precision);
-        for it in items {
-            sk.update(it.as_bytes());
-        }
-        let state = HyperLogLogState {
-            variant: ProtoVariant::Regular as i32,
-            precision: sk.precision,
-            registers: sk.registers.clone(),
-            hip_kxq0: sk.hip_kxq0,
-            hip_kxq1: sk.hip_kxq1,
-            hip_est: sk.hip_est,
-            registers_sparse: None,
-        };
-        SketchEnvelope {
-            sketch_state: Some(sketch_envelope::SketchState::Hll(state)),
-            ..Default::default()
-        }
-        .encode_to_vec()
-    }
-
-    /// FIX 2 — GLOBAL HLL distinct rollup. `count(hll_metric)` with no `by`
-    /// must MERGE the per-series HLL registers (register-wise max) across ALL
-    /// matched series and estimate ONCE — the distinct UNION cardinality. Two
-    /// series share an overlapping prefix of items and each carry disjoint
-    /// items, so summing per-series estimates would over-count the overlap.
-    /// The merged global estimate must land within HLL error of the true
-    /// union, and be strictly below the naive per-series sum.
-    #[tokio::test]
-    async fn execute_count_hll_global_merges_registers_across_series() {
-        let idx = Arc::new(SketchStore::new());
-        let now_ms = 600_000_u64;
-        let w_start = now_ms.saturating_sub(3_000);
-        let w_end = now_ms.saturating_sub(2_000);
-
-        // Series A: items 0..600. Series B: items 400..1000.
-        // Overlap = [400,600) = 200 items; true union = [0,1000) = 1000.
-        let precision = 14u32; // ~0.8% standard error; legal for epsilon=0.01
-        let a_items: Vec<String> = (0..600).map(|i| format!("u-{i}")).collect();
-        let b_items: Vec<String> = (400..1000).map(|i| format!("u-{i}")).collect();
-        let true_union = 1000.0_f64;
-
-        for (sid, items) in [(8200u64, &a_items), (8201u64, &b_items)] {
-            let mut meta = hll_meta(sid, "unique_users_global");
-            meta.agg_kind = crate::storage_engines::sketch_db::index::AggKind::Sketch {
-                algorithm: SketchAlgorithm::Hll,
-                config: SketchConfig::Hll { precision },
-                spatial_filter_canonical: String::new(),
-            };
-            idx.register(meta);
-            idx.append_sample(
-                sid,
-                BTreeMap::new(),
-                (w_start, w_end),
-                SketchSampleState {
-                    bytes: encode_hll_from_items(precision, items),
-                    encoding: crate::storage_engines::sketch_db::index::SketchEncoding::ProtoFull,
-                },
-            );
-        }
-
-        use crate::query_engines::asap_query_engine::test_plan;
-        use asap_types::query_plan::*;
-        let config = test_plan::materialization(
-            "unique_users_global",
-            "HLL",
-            serde_json::json!({"precision":14}),
-            &[],
-            1000,
-        );
-        let query = "count(distinct_over_time(unique_users_global[1m]))";
-        let entry = test_plan::entry(
-            query,
-            &config,
-            PhysicalGrouping::Reduce(vec![]),
-            1000,
-            QueryPlanNode::SummaryEstimate {
-                input: QueryNodeId(0),
-                query: QueryReadout::Cardinality,
-            },
-        );
-        let engine = test_plan::engine(idx, config, vec![8200, 8201], entry);
-        let result = engine
-            .execute_at(query, w_end)
-            .await
-            .expect("global distinct count over HLL sids must answer, not capability-miss");
-
-        // GLOBAL distinct is a single scalar — exactly one element.
-        let est = match &result {
-            crate::query_engines::query_result::QueryResult::Vector(v) => {
-                assert_eq!(
-                    v.values.len(),
-                    1,
-                    "a global distinct count must collapse to ONE merged estimate, got {} \
-                     (per-series leak): {v:?}",
-                    v.values.len()
-                );
-                v.values[0].value
-            }
-            crate::query_engines::query_result::QueryResult::Matrix(m) => {
-                assert_eq!(m.values.len(), 1, "one merged series");
-                m.values[0].samples.last().map(|s| s.value).unwrap_or(0.0)
-            }
-        };
-
-        // Within HLL error of the true union (p=12 → ~1.04/sqrt(2^12) ≈ 1.6%;
-        // allow a generous 8% band for the estimator's finite-sample noise).
-        let rel_err = (est - true_union).abs() / true_union;
-        assert!(
-            rel_err < 0.08,
-            "global merged estimate {est} must be within HLL error of the \
-             true union {true_union} (rel_err {rel_err:.4})"
-        );
-
-        // And strictly below the naive per-series sum (600 + 600 = 1200),
-        // proving registers were MERGED (max), not the estimates SUMMED.
-        assert!(
-            est < 1150.0,
-            "merged global estimate {est} must be well below the per-series \
-             sum (~1200) — proves register-merge, not estimate-sum"
-        );
-    }
-
-    /// REPRODUCTION (root-cause hunt): `quantile_over_time(0.99,
-    /// http_requests_total_latency_ms[30s])` end-to-end via
-    /// `execute(&str)` against a now-anchored KLL sid carrying real
-    /// sketch state. The window is inside the engine's `[now-30s, now]`
-    /// range. This pins the exact end-to-end behaviour the live deploy
-    /// shows ("No result" tagged `asap_query`) so we can see whether the
-    /// engine produces `Ok(populated)`, `Ok(empty)`, or `CapabilityMiss`.
-    #[tokio::test]
-    async fn execute_quantile_over_time_kll_now_anchored() {
-        let idx = Arc::new(SketchStore::new());
-        let sid = 7100u64;
-        idx.register(kll_meta(sid, "http_requests_total_latency_ms"));
-
-        let now_ms = 600_000_u64;
-        // One complete pane covers the requested 30 second lookback.
-        let window_start = now_ms.saturating_sub(30_000);
-        let window_end = now_ms;
-
-        let items: Vec<f64> = (1..=50).map(|i| i as f64).collect();
-        let bytes = encode_kll_items_proto(269, &items);
-        idx.append_sample(
-            sid,
-            BTreeMap::new(),
-            (window_start, window_end),
-            SketchSampleState {
-                bytes,
-                encoding: crate::storage_engines::sketch_db::index::SketchEncoding::ProtoFull,
-            },
-        );
-
-        // The sid must classify as Hit (in-memory unsealed state counts).
-        assert_eq!(
-            idx.classify(sid),
-            crate::storage_engines::sketch_db::index::SeriesLookup::Hit,
-            "KLL sid with appended in-memory state must classify Hit"
-        );
-
-        let result = engine_quantile_result(idx, now_ms).await;
-        let nonempty = match result {
-            crate::query_engines::query_result::QueryResult::Vector(v) => !v.values.is_empty(),
-            crate::query_engines::query_result::QueryResult::Matrix(m) => {
-                m.values.iter().any(|s| !s.samples.is_empty())
-            }
-        };
-        assert!(
-            nonempty,
-            "quantile_over_time over a now-anchored KLL sid must return a \
-             non-empty result (got empty → reproduces the live `asap_query` \
-             + No-result bug)"
-        );
-    }
-
-    async fn engine_quantile_result(
-        idx: Arc<SketchStore>,
-        now_ms: u64,
-    ) -> crate::query_engines::query_result::QueryResult {
-        use crate::query_engines::asap_query_engine::test_plan;
-        use asap_types::query_plan::*;
-        let config = test_plan::materialization(
-            "http_requests_total_latency_ms",
-            "DatasketchesKLL",
-            serde_json::json!({"k":269}),
-            &[],
-            30_000,
-        );
-        let query = "quantile_over_time(0.99, http_requests_total_latency_ms[30s])";
-        let entry = test_plan::entry(
-            query,
-            &config,
-            PhysicalGrouping::PerEntity,
-            30_000,
-            QueryPlanNode::SummaryEstimate {
-                input: QueryNodeId(0),
-                query: QueryReadout::Quantile { q: 0.99 },
-            },
-        );
-        let sids = idx
-            .snapshot_instances()
-            .iter()
-            .map(|m| m.storage_handle)
-            .collect();
-        let engine = test_plan::engine(idx, config, sids, entry);
-        engine.execute_at(query, now_ms).await.expect(
-            "quantile_over_time over a Hit KLL sid must NOT capability-miss \
-                 (if it does, the bug is upstream of the reducer)",
-        )
-    }
-
-    fn result_nonempty(r: &crate::query_engines::query_result::QueryResult) -> bool {
-        match r {
-            crate::query_engines::query_result::QueryResult::Vector(v) => !v.values.is_empty(),
-            crate::query_engines::query_result::QueryResult::Matrix(m) => {
-                m.values.iter().any(|s| !s.samples.is_empty())
-            }
-        }
-    }
-
-    /// REGRESSION (delta-stitching carry-in): the live agent emits a
-    /// periodic Full snapshot followed by many cheap Delta frames to
-    /// save bandwidth, so a short query window (`[30s]`) routinely
-    /// contains ONLY deltas — the Full landed earlier, outside the
-    /// window. Before the fix, `SketchStore::query_range`'s strict
-    /// containment filter (`w.0 >= start`) dropped the out-of-window
-    /// Full, the delta-apply reducer couldn't establish a rolling base,
-    /// and the engine returned `Ok(empty)` (NOT a capability-miss) — so
-    /// the router never failed over and the client saw "No result"
-    /// tagged `asap_query`. The fix splices in the most-recent Full
-    /// ending before `start` as a carry-in base. This test pins that:
-    /// a Full at now-60s + a Delta at now-10s with a `[30s]` window must
-    /// produce a NON-EMPTY answer.
-    #[tokio::test]
-    async fn quantile_over_time_kll_full_before_window_carries_in_base() {
-        let idx = Arc::new(SketchStore::new());
-        let sid = 7400u64;
-        idx.register(kll_meta(sid, "http_requests_total_latency_ms"));
-
-        let now_ms = 600_000_u64;
-
-        let items: Vec<f64> = (1..=50).map(|i| i as f64).collect();
-        // Full at now-60s..now-55s — OUTSIDE the 30s window.
-        idx.append_sample(
-            sid,
-            BTreeMap::new(),
-            (now_ms.saturating_sub(60_000), now_ms.saturating_sub(55_000)),
-            SketchSampleState {
-                bytes: encode_kll_items_proto(269, &items),
-                encoding: crate::storage_engines::sketch_db::index::SketchEncoding::ProtoFull,
-            },
-        );
-        // A delta pane covers the complete requested lookback.
-        idx.append_sample(
-            sid,
-            BTreeMap::new(),
-            (now_ms.saturating_sub(30_000), now_ms),
-            SketchSampleState {
-                bytes: encode_kll_items_proto(269, &items),
-                encoding: crate::storage_engines::sketch_db::index::SketchEncoding::ProtoDelta,
-            },
-        );
-
-        let result = engine_quantile_result(idx, now_ms).await;
-        assert!(
-            result_nonempty(&result),
-            "quantile_over_time with a Full BEFORE the window + a Delta \
-             inside it must carry in the Full as a base and return a \
-             non-empty result (regression: returned empty `asap_query` \
-             No-result)"
-        );
-    }
-
-    /// A delta-ONLY window with NO Full anywhere is the COMMON case under
-    /// the edge's per-window-reset (PWR) delta model: the edge resets its
-    /// snapshot base at each window boundary, so a window's first (here:
-    /// only) frame is a delta-from-empty that, by construction, encodes
-    /// that window's full state. The delta-apply walk bootstraps an empty
-    /// rolling state of the sketch kind and applies the delta onto it, so
-    /// the window IS queryable (delta-from-empty ⊕ empty = window state).
-    ///
-    /// Previously this returned empty (the walk skipped any delta with no
-    /// carry-in Full), which is the very bug that broke end-to-end
-    /// value-validation of delta-transmitted sketches.
-    #[tokio::test]
-    async fn quantile_over_time_kll_delta_only_no_base_reconstructs_from_empty() {
-        let idx = Arc::new(SketchStore::new());
-        let sid = 7300u64;
-        idx.register(kll_meta(sid, "http_requests_total_latency_ms"));
-
-        let now_ms = 600_000_u64;
-        let items: Vec<f64> = (1..=50).map(|i| i as f64).collect();
-        idx.append_sample(
-            sid,
-            BTreeMap::new(),
-            (now_ms.saturating_sub(30_000), now_ms),
-            SketchSampleState {
-                bytes: encode_kll_items_proto(269, &items),
-                encoding: crate::storage_engines::sketch_db::index::SketchEncoding::ProtoDelta,
-            },
-        );
-
-        let result = engine_quantile_result(idx, now_ms).await;
-        assert!(
-            result_nonempty(&result),
-            "delta-from-empty (PWR) window with no carry-in Full must \
-             reconstruct that window's state and return a non-empty result"
-        );
-    }
-
-    /// Issue #301 Layer 3: instant `sum(counter)` must return the
-    /// cumulative-since-storage value (Σ of ALL windows' deltas), NOT
-    /// the most-recent window's delta. Two windows of 600/900 per zone
-    /// → per-zone cumulative = 1200/1800; `sum by (zone)` keeps them
-    /// separate; bare `sum` collapses to 3000. This test pins the
-    /// `accumulate_windows=true` reducer path the engine selects for
-    /// `OuterFn::Plain` instant sums.
-    #[tokio::test]
-    async fn execute_instant_sum_accumulates_all_windows_not_last() {
-        use crate::query_engines::query_result::QueryResult;
-        use crate::storage_engines::sketch_db::data::AggregationType;
-        use asap_physical_operators::summary_kernels::sum::SumAccumulator;
-
-        let idx = Arc::new(SketchStore::new());
-        let now_ms = 600_000_u64;
-        let w1_start = now_ms.saturating_sub(120_000);
-        let w1_end = now_ms.saturating_sub(60_000);
-        let w2_start = w1_end;
-        let w2_end = now_ms;
-
-        for (i, (zone, per_window)) in [("z0", 600.0_f64), ("z1", 900.0)].iter().enumerate() {
-            let sid = 14_000 + i as u64;
-            idx.register(SummarySeriesMetadata {
-                storage_handle: sid,
-                metric_name: "http_requests_total".to_string(),
-                group_by_keys: ["zone".to_string()].into_iter().collect(),
-                capability: Some(Capability::ExactAgg(AggregationType::Sum)),
-                agg_kind: crate::storage_engines::sketch_db::index::AggKind::ExactAgg {
-                    agg_type: AggregationType::Sum,
-                    parameters_canonical: String::new(),
-                    spatial_filter_canonical: String::new(),
-                },
-                accuracy: None,
-                first_seen_unix_ms: 0,
-                retired_at_ms: None,
-                expires_at_ms: None,
-                policy_fp: asap_types::PolicyFingerprint::UNSET,
-            });
-            for (ws, we) in [(w1_start, w1_end), (w2_start, w2_end)] {
-                let mut lm = BTreeMap::new();
-                lm.insert("zone".to_string(), zone.to_string());
-                idx.append_precompute(
-                    sid,
-                    lm,
-                    (ws, we),
-                    Box::new(SumAccumulator::with_sum(*per_window)),
-                );
-            }
-        }
-
-        use crate::query_engines::asap_query_engine::test_plan;
-        use asap_types::query_plan::*;
-        let config = test_plan::materialization(
-            "http_requests_total",
-            "Sum",
-            serde_json::json!({}),
-            &["zone"],
-            60000,
-        );
-        let query = "sum by (zone) (http_requests_total)";
-        let entry = test_plan::entry(
-            query,
-            &config,
-            PhysicalGrouping::Reduce(vec!["zone".into()]),
-            120000,
-            QueryPlanNode::ExactReadout {
-                input: QueryNodeId(0),
-                readout: ExactReadout::Sum,
-            },
-        );
-        let engine = test_plan::engine(idx, config, vec![14000, 14001], entry);
-        let result = engine
-            .execute_at(query, now_ms)
-            .await
-            .expect("instant sum by zone must succeed");
-        let vector = match result {
-            QueryResult::Vector(v) => v,
-            other => panic!("expected Vector, got {other:?}"),
-        };
-        assert_eq!(vector.values.len(), 2, "one entry per zone");
-        let mut by_zone: std::collections::HashMap<String, f64> = std::collections::HashMap::new();
-        for el in &vector.values {
-            let keys = el.label_keys_override.as_ref().expect("keys present");
-            let vals = &el.labels.labels;
-            let zi = keys.iter().position(|k| k == "zone").expect("zone key");
-            by_zone.insert(vals[zi].clone(), el.value);
-        }
-        // Cumulative = Σ of ALL windows, NOT the last window's delta
-        // (which would be 600 / 900).
-        let z0 = by_zone.get("z0").copied().expect("z0");
-        let z1 = by_zone.get("z1").copied().expect("z1");
-        assert!(
-            (z0 - 1200.0).abs() < 1e-9,
-            "z0 cumulative expected 1200 (600+600), got {z0} — if 600 the \
-             engine took only the LAST window (Layer-3 bug)"
-        );
-        assert!(
-            (z1 - 1800.0).abs() < 1e-9,
-            "z1 cumulative expected 1800 (900+900), got {z1}"
-        );
-    }
-
-    // ── P1-1 / P2-6 — rate over FrequencyEstimate (CMS) + keyed safe-miss ──
-
-    /// A FrequencyEstimate (CountMin) sid with `total` inserts in its
-    /// matrix row 0, registered for `metric` / `group_by_keys`, carrying
-    /// one PROTO_FULL window anchored just before `now`.
-    fn register_cms_freq_sid(
-        idx: &SketchStore,
-        sid: u64,
-        metric: &str,
-        group_by: &[&str],
-        spatial_filter: &str,
-        total_inserts: i64,
-        now_ms: u64,
-    ) {
-        // Matches ControlPlaneCostModel's epsilon=0.01 CMS sizing.
-        let cfg = SketchConfig::CountMin { rows: 5, cols: 512 };
-        idx.register(SummarySeriesMetadata {
-            storage_handle: sid,
-            metric_name: metric.to_string(),
-            group_by_keys: group_by
-                .iter()
-                .map(|s| s.to_string())
-                .collect::<BTreeSet<_>>(),
-            capability: Some(Capability::FrequencyEstimate(Some(SketchAlgorithm::Cms))),
-            agg_kind: crate::storage_engines::sketch_db::index::AggKind::Sketch {
-                algorithm: SketchAlgorithm::Cms,
-                config: cfg.clone(),
-                spatial_filter_canonical: spatial_filter.to_string(),
-            },
-            accuracy: Some(AccuracyBound::from_config(&cfg)),
-            first_seen_unix_ms: 0,
-            retired_at_ms: None,
-            expires_at_ms: None,
-            policy_fp: asap_types::PolicyFingerprint::UNSET,
-        });
-        // Build a CountMinState PROTO_FULL frame whose row 0 sums to
-        // `total_inserts` (decode_frequency_total reads row 0's sum).
-        let bytes = encode_cms_state_proto(5, 512, total_inserts);
-        let window_start = now_ms.saturating_sub(60_000);
-        let window_end = now_ms.saturating_sub(30_000);
-        idx.append_sample(
-            sid,
-            BTreeMap::new(),
-            (window_start, window_end),
-            SketchSampleState {
-                bytes,
-                encoding: crate::storage_engines::sketch_db::index::SketchEncoding::ProtoFull,
-            },
-        );
-    }
-
-    /// Encode a `CountMinState` with `rows`×`cols` int matrix where row 0
-    /// holds `row0_total` in its first cell (rest zero). Mirrors the wire
-    /// form `decoders::decode_cms_from_proto` reads.
-    fn encode_cms_state_proto(rows: u32, cols: u32, row0_total: i64) -> Vec<u8> {
-        use asap_sketchlib::proto::sketchlib::{
-            sketch_envelope, CountMinState, CounterType, SketchEnvelope,
-        };
-        use prost::Message;
-        let mut counts_int = vec![0i64; (rows * cols) as usize];
-        counts_int[0] = row0_total; // row 0, col 0
-        let state = CountMinState {
-            rows,
-            cols,
-            counter_type: CounterType::Int64 as i32,
-            counts_int,
-            ..Default::default()
-        };
-        SketchEnvelope {
-            sketch_state: Some(sketch_envelope::SketchState::CountMin(state)),
-            ..Default::default()
-        }
-        .encode_to_vec()
-    }
-
-    #[tokio::test]
-    async fn bare_cms_frequency_still_answers_after_p2_6() {
-        use crate::query_engines::query_result::QueryResult;
-        // Regression guard: the working `count_over_time(cms_metric[5m])`
-        // demo (NO item key, empty spatial filter) must still be answered
-        // by the warm tier after the P2-6 safe-miss was added.
-        let now = 600_000_u64;
-        let idx = Arc::new(SketchStore::new());
-        register_cms_freq_sid(&idx, 7200, "cms_metric", &[], "", 600, now);
-
-        use crate::query_engines::asap_query_engine::test_plan;
-        use asap_types::query_plan::*;
-        let config = test_plan::materialization(
-            "cms_metric",
-            "CountMinSketch",
-            serde_json::json!({"w":512,"d":5}),
-            &[],
-            30000,
-        );
-        let query = "count_over_time(cms_metric[30s])";
-        let entry = test_plan::entry(
-            query,
-            &config,
-            PhysicalGrouping::PerEntity,
-            30000,
-            QueryPlanNode::SummaryEstimate {
-                input: QueryNodeId(0),
-                query: QueryReadout::PointCount {
-                    key: planner_types::pre_asap::ColumnRef::SampleValue,
-                    value: None,
-                },
-            },
-        );
-        let engine = test_plan::engine(idx, config, vec![7200], entry);
-        let result = engine.execute_at(query, now - 30000).await;
-        assert!(
-            matches!(
-                result,
-                Ok(QueryResult::Vector(_)) | Ok(QueryResult::Matrix(_))
-            ),
-            "bare count_over_time over CMS must still be answered warm, got {result:?}"
-        );
-    }
-}
-
-// ===========================================================================
-/// A registered series without samples must not hide a readable bound series.
-#[cfg(test)]
-mod outer_agg_integration_tests {
-    use super::*;
-    use crate::query_engines::query_result::QueryResult;
-    use crate::query_engines::routing::query_engine_routing::QueryEngine as _;
-    use crate::query_engines::EngineError;
-    use crate::storage_engines::sketch_db::index::{
-        AccuracyBound, Capability, SketchAlgorithm, SketchConfig, SketchEncoding,
-        SketchSampleState, SketchStore, SummarySeriesMetadata,
-    };
-    use crate::storage_engines::types::InstalledPrecomputePlanHandle;
-    use asap_sketchlib::DdSketch;
-    use asap_sketchlib::MessagePackCodec;
-    use std::collections::{BTreeMap, BTreeSet};
-
-    fn dd_sketch_with_values(values: &[f64]) -> Vec<u8> {
-        // The msgpack encoding round-trips through
-        // `DdSketch::deserialize_msgpack` on the engine side — simpler
-        // than the proto envelope and supported by `SketchEncoding::MsgpackFull`.
-        let mut sk = DdSketch::new(0.01);
-        for v in values {
-            sk.update(*v);
-        }
-        sk.to_msgpack().expect("ddsketch msgpack serialization")
-    }
-
-    fn dd_meta_for(sid: u64, metric: &str, group_by: &[&str]) -> SummarySeriesMetadata {
-        let cfg = SketchConfig::DDSketch {
-            relative_accuracy: 0.01,
-        };
-        SummarySeriesMetadata {
-            storage_handle: sid,
-            metric_name: metric.to_string(),
-            group_by_keys: group_by
-                .iter()
-                .map(|s| s.to_string())
-                .collect::<BTreeSet<_>>(),
-            capability: Some(Capability::QuantileApprox(Some(SketchAlgorithm::DDSketch))),
-            agg_kind: crate::storage_engines::sketch_db::index::AggKind::Sketch {
-                algorithm: SketchAlgorithm::DDSketch,
-                config: cfg.clone(),
-                spatial_filter_canonical: String::new(),
-            },
-            accuracy: Some(AccuracyBound::from_config(&cfg)),
-            first_seen_unix_ms: 0,
-            retired_at_ms: None,
-            expires_at_ms: None,
-            policy_fp: asap_types::PolicyFingerprint::UNSET,
-        }
-    }
-
-    /// Regression: a candidate's sid set legitimately contains a MIX of
-    /// `Ghost` (retired-then-evicted or merged-away, no data) and `Hit`
-    /// (Active, carrying live sketch state) sids under the same metric.
-    /// This is the exact production shape behind the warm-quantile miss:
-    /// the metric's `instances_matching` walk returns the older retired
-    /// sketch sids (now dataless ⇒ Ghost) alongside the freshly-minted
-    /// Active sketch sids. Iterating ascending-u64, the older Ghost sid
-    /// was hit first and aborted the WHOLE query to CapabilityMiss before
-    /// the Active sid could answer. After the fix, non-Hit sids are
-    /// skipped and the query resolves against the Active sid.
-    #[tokio::test]
-    async fn ghost_sid_does_not_mask_active_hit_sid_for_quantile() {
-        let idx = Arc::new(SketchStore::new());
-        let now_ms = 600_000_u64;
-        let w_start = now_ms.saturating_sub(60_000);
-        let w_end = now_ms.saturating_sub(30_000);
-
-        // Ghost sid (lower number ⇒ iterated first): registered metadata,
-        // never appended any sample state. `classify` → Ghost.
-        idx.register(dd_meta_for(1, "http_latency_ms", &["zone"]));
-
-        // Active Hit sid (higher number): carries a real DDSketch window.
-        idx.register(dd_meta_for(2, "http_latency_ms", &["zone"]));
-        idx.append_sample(
-            2,
-            BTreeMap::from([("zone".to_string(), "z0".to_string())]),
-            (w_start, w_end),
-            SketchSampleState {
-                bytes: dd_sketch_with_values(&[1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0, 10.0]),
-                encoding: SketchEncoding::MsgpackFull,
-            },
-        );
-
-        use crate::query_engines::asap_query_engine::test_plan;
-        use asap_types::query_plan::*;
-        let config = test_plan::materialization(
-            "http_latency_ms",
-            "DDSketch",
-            serde_json::json!({"alpha":0.01}),
-            &["zone"],
-            30000,
-        );
-        let query = "quantile_over_time(0.99, http_latency_ms[30s])";
-        let entry = test_plan::entry(
-            query,
-            &config,
-            PhysicalGrouping::PerEntity,
-            30000,
-            QueryPlanNode::SummaryEstimate {
-                input: QueryNodeId(0),
-                query: QueryReadout::Quantile { q: 0.99 },
-            },
-        );
-        let engine = test_plan::engine(idx, config, vec![1, 2], entry);
-        let result = engine.execute_at(query, w_end).await.expect(
-            "a dataless Ghost sid must not abort the query when an \
-                 Active Hit sid under the same metric can answer it",
-        );
-        let vector = match result {
-            QueryResult::Vector(v) => v,
-            other => panic!("expected Vector, got {other:?}"),
-        };
-        assert_eq!(
-            vector.values.len(),
-            1,
-            "the single Active sid answers; the Ghost is skipped"
-        );
-        assert!(
-            vector.values[0].value > 0.0,
-            "p99 of [1..=10] is a positive quantile, got {}",
-            vector.values[0].value
-        );
-    }
-}
-
-// ---------------------------------------------------------------------------
-/// Planned range execution requires complete warm coverage at every step.
-#[cfg(test)]
-mod range_stitch_tests {
-    use super::*;
-    use crate::query_engines::query_result::{QueryResult, RangeVectorElement, Sample};
-    use crate::query_engines::routing::query_engine_routing::{EngineCapabilities, QueryEngine};
-    use crate::query_engines::EngineError;
-    use crate::storage_engines::sketch_db::index::{
-        AccuracyBound, Capability, SketchAlgorithm, SketchConfig, SketchEncoding,
-        SketchSampleState, SketchStore, SummarySeriesMetadata,
-    };
-    use crate::storage_engines::types::{InstalledPrecomputePlanHandle, KeyByLabelValues};
-    use async_trait::async_trait;
-    use std::collections::{BTreeMap, BTreeSet};
-
-    /// Encode a CountMin FULL proto frame whose row 0 sums to `total`
-    /// (the per-window frequency TOTAL the `count_over_time` reducer reads).
-    fn cms_bytes(total: i64) -> Vec<u8> {
-        use asap_sketchlib::proto::sketchlib::{
-            sketch_envelope, CountMinState, CounterType, SketchEnvelope,
-        };
-        use prost::Message;
-        let (rows, cols) = (5u32, 512u32);
-        let mut counts_int = vec![0i64; (rows * cols) as usize];
-        counts_int[0] = total;
-        let state = CountMinState {
-            rows,
-            cols,
-            counter_type: CounterType::Int64 as i32,
-            counts_int,
-            ..Default::default()
-        };
-        SketchEnvelope {
-            sketch_state: Some(sketch_envelope::SketchState::CountMin(state)),
-            ..Default::default()
-        }
-        .encode_to_vec()
-    }
-
-    /// A CountMin FrequencyEstimate sid — `count_over_time` over it emits one
-    /// PER-WINDOW sample (not a single cumulative scalar), which is what the
-    /// range stitch needs so warm contributes one value per covered window.
-    fn cms_meta(sid: u64, metric: &str) -> SummarySeriesMetadata {
-        let cfg = SketchConfig::CountMin { rows: 5, cols: 512 };
-        SummarySeriesMetadata {
-            storage_handle: sid,
-            metric_name: metric.to_string(),
-            group_by_keys: BTreeSet::new(),
-            capability: Some(Capability::FrequencyEstimate(Some(SketchAlgorithm::Cms))),
-            agg_kind: crate::storage_engines::sketch_db::index::AggKind::Sketch {
-                algorithm: SketchAlgorithm::Cms,
-                config: cfg.clone(),
-                spatial_filter_canonical: String::new(),
-            },
-            accuracy: Some(AccuracyBound::from_config(&cfg)),
-            first_seen_unix_ms: 0,
-            retired_at_ms: None,
-            expires_at_ms: None,
-            policy_fp: asap_types::PolicyFingerprint::UNSET,
-        }
-    }
-
-    /// Incomplete installed materializations must fail closed: a missing pane
-    /// surfaces as a CapabilityMiss, which the HTTP layer forwards to the
-    /// Prometheus fallback (#746).
-    #[tokio::test]
-    async fn planned_range_rejects_partial_warm_coverage() {
-        use crate::query_engines::asap_query_engine::test_plan;
-        use asap_types::query_plan::*;
-        {
-            let idx = Arc::new(SketchStore::new());
-            idx.register(cms_meta(9100, "req_count"));
-            idx.append_sample(
-                9100,
-                BTreeMap::new(),
-                (30_000, 60_000),
-                SketchSampleState {
-                    bytes: cms_bytes(100),
-                    encoding: SketchEncoding::ProtoFull,
-                },
-            );
-            let config = test_plan::materialization(
-                "req_count",
-                "CountMinSketch",
-                serde_json::json!({"w":512,"d":5}),
-                &[],
-                30_000,
-            );
-            let query = "count_over_time(req_count[30s])";
-            let entry = test_plan::entry(
-                query,
-                &config,
-                PhysicalGrouping::PerEntity,
-                30_000,
-                QueryPlanNode::SummaryEstimate {
-                    input: QueryNodeId(0),
-                    query: QueryReadout::PointCount {
-                        key: planner_types::pre_asap::ColumnRef::SampleValue,
-                        value: None,
-                    },
-                },
-            );
-            let engine = test_plan::engine(idx, config, vec![9100], entry);
-            let result = engine
-                .execute_range_promql_modern(query, 30_000, 60_000, 30_000)
-                .await;
-            assert!(
-                matches!(result, Err(EngineError::CapabilityMiss { .. })),
-                "a missing first pane must fail closed with a CapabilityMiss: {result:?}"
-            );
-            // Stored-only range execution reports the actual shared-runtime work.
-            let complete = engine
-                .execute_range_promql_modern(query, 60_000, 60_000, 30_000)
-                .await
-                .unwrap();
-            assert!(complete
-                .warnings()
-                .iter()
-                .any(|w| w.starts_with("asap_logical_stats:raw=0,summary=1,")));
-        }
-    }
-
-    #[tokio::test]
-    async fn active_metricsql_entry_reaches_the_shared_dag_executor() {
-        use asap_types::query_plan::{
-            FallbackPolicy, InstantExecution, QueryLanguage, QueryNodeId, QueryPlanEntry,
-            QueryPlanNode,
-        };
-        let snapshot: control_plane::physical::compiler::BackendLocalPlanningInput =
-            serde_json::from_str(include_str!(
-                "../../../../docs/examples/asapquery-compatibility-demo-snapshot.json"
-            ))
-            .unwrap();
-        let mut plan = crate::tests::test_utilities::planning::quoted_snapshot(snapshot, false)
-            .compile_promql()
-            .unwrap();
-        let identity = asap_types::query_plan::canonical_promql("1 + 2").unwrap();
-        plan.query_plan.entries.insert(
-            asap_types::query_plan::QueryPlan::catalog_key(QueryLanguage::MetricsQl, &identity),
-            QueryPlanEntry {
-                language: QueryLanguage::MetricsQl,
-                query_id: "vm-scalar".into(),
-                canonical_query: identity.clone(),
-                fixed_evaluation: None,
-                root: QueryNodeId(2),
-                nodes: std::collections::BTreeMap::from([
-                    (QueryNodeId(0), QueryPlanNode::Scalar { value: 1.0 }),
-                    (QueryNodeId(1), QueryPlanNode::Scalar { value: 2.0 }),
-                    (
-                        QueryNodeId(2),
-                        QueryPlanNode::Binary {
-                            inputs: [QueryNodeId(0), QueryNodeId(1)],
-                            operator: planner_types::pre_asap::ArithmeticOpKind::Add,
-                        },
-                    ),
-                ]),
-                instant: InstantExecution {
-                    lookback_ms: 1,
-                    full_history: false,
-                    cumulative_readout: false,
-                },
-                fallback: FallbackPolicy::ExactBackend,
-            },
-        );
-        let mut active = crate::drivers::query::servers::http::validate_and_build_runtime_plan(
-            crate::drivers::query::servers::http::PhysicalPlanInstallRequest {
-                summary_catalog: plan.summary_catalog,
-                collector_plans: plan.collector_plans,
-                precompute_plan: plan.precompute_plan,
-                transmission_plan: plan.transmission_plan,
-                query_plan: plan.query_plan,
-                storage_routing: None,
-                adaptation_evidence: vec![],
-            },
-            Arc::new(crate::storage_engines::types::BackendStorageRouting::empty()),
-        )
-        .unwrap();
-        active.envelope.expiry_unix_ms = None;
-        let active = crate::storage_engines::types::ActivePhysicalPlanHandle::new(active);
-        let hot = InstalledPrecomputePlanHandle::from_active_physical_plan(active.clone());
-        let engine = ASAPQueryEngine::new(15).with_active_physical_plan(active);
-        let error = engine
-            .execute_metricsql_at(&identity, 1_000)
-            .await
-            .unwrap_err();
-        assert!(
-            error
-                .to_string()
-                .contains("bound subtree requires one explicit positive window"),
-            "{error}"
-        );
-    }
-}
diff --git a/data_plane/src/query_engines/asap_query_engine/exact_subqueries.rs b/data_plane/src/query_engines/asap_query_engine/exact_subqueries.rs
deleted file mode 100644
index 1b5fef65d..000000000
--- a/data_plane/src/query_engines/asap_query_engine/exact_subqueries.rs
+++ /dev/null
@@ -1,1095 +0,0 @@
-//! Fetch installed exact cuts from Prometheus before composing them with ASAP state.
-use super::logical_dag::{PreparedLeaf, PreparedLeaves, Value};
-use crate::query_engines::EngineError;
-use asap_types::query_plan::{
-    query_time::QueryTimeOperator, ExternalExactInput, ExternalExactRequest, QueryLanguage,
-    QueryNodeId, QueryPlanEntry, QueryPlanNode,
-};
-use std::collections::{BTreeMap, BTreeSet, HashMap};
-
-const MAX_CANDIDATE_VALUES: usize = 10_000;
-const MAX_CANDIDATE_QUERY_BYTES: usize = 1_048_576;
-
-fn miss(message: impl Into<String>) -> EngineError {
-    EngineError::capability_miss("exact_subquery", message.into())
-}
-
-/// Traverse only the installed graph, including epoch-aligned nested subquery grids.
-#[derive(Debug, Clone)]
-enum ExactLeaf {
-    Legacy(QueryTimeOperator),
-    External(ExternalExactRequest),
-}
-
-fn leaves(
-    entry: &QueryPlanEntry,
-    times: &[u64],
-) -> Result<BTreeMap<(QueryNodeId, i64), ExactLeaf>, EngineError> {
-    let mut pending = Vec::new();
-    for at in times {
-        pending.push((
-            entry.root,
-            i64::try_from(*at).map_err(|_| miss("timestamp overflow"))?,
-        ));
-    }
-    let mut visited = BTreeSet::new();
-    let mut result = BTreeMap::new();
-    while let Some((id, at)) = pending.pop() {
-        if !visited.insert((id, at)) {
-            continue;
-        }
-        if visited.len() > 200_000 {
-            return Err(miss("installed execution grid exceeds budget"));
-        }
-        let node = entry
-            .nodes
-            .get(&id)
-            .ok_or_else(|| miss("missing installed node"))?;
-        match node {
-            QueryPlanNode::Logical { operator, inputs } => match operator {
-                QueryTimeOperator::Scan { .. } => {
-                    return Err(miss("local raw Scan is forbidden in deployed plans"))
-                }
-                QueryTimeOperator::ExactSubquery { .. }
-                | QueryTimeOperator::CandidateExactSubquery { .. } => {
-                    result.insert((id, at), ExactLeaf::Legacy(operator.clone()));
-                }
-                QueryTimeOperator::Subquery {
-                    range_ms,
-                    step_ms,
-                    offset_ms,
-                } => {
-                    let step = i64::try_from(*step_ms).map_err(|_| miss("step overflow"))?;
-                    let range = i64::try_from(*range_ms).map_err(|_| miss("range overflow"))?;
-                    if step <= 0 || range / step > 100_000 {
-                        return Err(miss("invalid subquery grid"));
-                    }
-                    let end = at
-                        .checked_sub(*offset_ms)
-                        .ok_or_else(|| miss("offset overflow"))?;
-                    let start = end
-                        .checked_sub(range)
-                        .ok_or_else(|| miss("range overflow"))?;
-                    let mut t = start
-                        .div_euclid(step)
-                        .checked_add(1)
-                        .and_then(|n| n.checked_mul(step))
-                        .ok_or_else(|| miss("grid overflow"))?;
-                    let input = *inputs
-                        .first()
-                        .ok_or_else(|| miss("missing subquery input"))?;
-                    while t <= end {
-                        pending.push((input, t));
-                        t = t.checked_add(step).ok_or_else(|| miss("grid overflow"))?;
-                    }
-                }
-                _ => pending.extend(inputs.iter().map(|input| (*input, at))),
-            },
-            // A join is a typed composition node rather than a Logical
-            // wrapper, but its value input can still be a Prometheus leaf.
-            QueryPlanNode::PhysicalFragment { inputs, .. } => {
-                pending.extend(inputs.iter().map(|input| (*input, at)));
-            }
-            QueryPlanNode::RelationalJoin { inputs, .. } => {
-                pending.extend(inputs.iter().map(|input| (*input, at)));
-            }
-            QueryPlanNode::ExternalExact { request, inputs } => {
-                pending.extend(inputs.iter().map(|input| (*input, at)));
-                result.insert((id, at), ExactLeaf::External(request.clone()));
-            }
-            // Existing bound summary subtrees are read by the synchronous callback.
-            _ => {}
-        }
-    }
-    Ok(result)
-}
-
-pub(super) fn external_dependencies(
-    entry: &QueryPlanEntry,
-    times: &[u64],
-) -> Result<Vec<(QueryNodeId, QueryNodeId, i64)>, EngineError> {
-    let mut result = Vec::new();
-    for ((id, at), leaf) in leaves(entry, times)? {
-        if matches!(leaf, ExactLeaf::External(_)) {
-            result.extend(
-                entry.nodes[&id]
-                    .inputs()
-                    .iter()
-                    .map(|input| (id, *input, at)),
-            );
-        } else if matches!(
-            leaf,
-            ExactLeaf::Legacy(QueryTimeOperator::CandidateExactSubquery { .. })
-        ) {
-            let input = *entry.nodes[&id]
-                .inputs()
-                .first()
-                .ok_or_else(|| miss("candidate exact subtree has no membership input"))?;
-            result.push((id, input, at));
-        }
-    }
-    Ok(result)
-}
-
-fn inject_candidate_matcher(
-    query: &str,
-    item_label: &str,
-    candidates: &[String],
-) -> Result<String, EngineError> {
-    use promql_parser::{
-        label::{MatchOp, Matcher},
-        parser::Expr,
-    };
-    // Go's regexp.QuoteMeta (used by Prometheus) escapes a smaller set than
-    // Rust's regex::escape; in particular, `\-` is not valid RE2 syntax.
-    fn re2_quote_meta(value: &str) -> String {
-        let mut quoted = String::with_capacity(value.len());
-        for character in value.chars() {
-            match character {
-                '\\' | '.' | '+' | '*' | '?' | '(' | ')' | '|' | '[' | ']' | '{' | '}' | '^'
-                | '$' => {
-                    quoted.push('\\');
-                    quoted.push(character);
-                }
-                '\n' => quoted.push_str("\\n"),
-                '\r' => quoted.push_str("\\r"),
-                '\t' => quoted.push_str("\\t"),
-                character if character.is_control() => {
-                    quoted.push_str(&format!("\\x{{{:x}}}", character as u32));
-                }
-                _ => quoted.push(character),
-            }
-        }
-        quoted
-    }
-    let pattern = format!(
-        "^(?:{})$",
-        candidates
-            .iter()
-            .map(|value| re2_quote_meta(value))
-            .collect::<Vec<_>>()
-            .join("|")
-    );
-    // The pinned parser escapes matcher strings when formatting the AST.
-    // Keep the semantic regex value here; pre-escaping it changes which labels match.
-    let matcher = Matcher::new(
-        MatchOp::Re(regex::Regex::new(&pattern).map_err(|error| miss(error.to_string()))?),
-        item_label,
-        &pattern,
-    );
-    fn visit(expr: &mut Expr, matcher: &Matcher) {
-        let append = |matchers: &mut promql_parser::label::Matchers| {
-            if matchers.or_matchers.is_empty() {
-                matchers.matchers.push(matcher.clone());
-            } else {
-                for branch in &mut matchers.or_matchers {
-                    branch.push(matcher.clone());
-                }
-            }
-        };
-        match expr {
-            Expr::VectorSelector(selector) => append(&mut selector.matchers),
-            Expr::MatrixSelector(selector) => append(&mut selector.vs.matchers),
-            Expr::Aggregate(node) => visit(&mut node.expr, matcher),
-            Expr::Unary(node) => visit(&mut node.expr, matcher),
-            Expr::Binary(node) => {
-                visit(&mut node.lhs, matcher);
-                visit(&mut node.rhs, matcher);
-            }
-            Expr::Paren(node) => visit(&mut node.expr, matcher),
-            Expr::Subquery(node) => visit(&mut node.expr, matcher),
-            Expr::Call(node) => {
-                for input in &mut node.args.args {
-                    visit(input, matcher);
-                }
-            }
-            Expr::NumberLiteral(_) | Expr::StringLiteral(_) | Expr::Extension(_) => {}
-        }
-    }
-    let mut expression = promql_parser::parser::parse(query)
-        .map_err(|error| miss(format!("invalid candidate exact query: {error}")))?;
-    visit(&mut expression, &matcher);
-    Ok(expression.to_string())
-}
-
-fn parse_result(body: &serde_json::Value, at: i64) -> Result<Value, EngineError> {
-    if body["status"] != "success"
-        || body
-            .get("warnings")
-            .and_then(|v| v.as_array())
-            .is_some_and(|v| !v.is_empty())
-    {
-        return Err(miss(
-            "Prometheus exact subquery failed or returned partial-result warnings",
-        ));
-    }
-    let point = |v: &serde_json::Value| -> Result<f64, EngineError> {
-        let row = v
-            .as_array()
-            .filter(|row| row.len() == 2)
-            .ok_or_else(|| miss("invalid exact sample"))?;
-        let timestamp = row[0]
-            .as_f64()
-            .filter(|v| v.is_finite())
-            .ok_or_else(|| miss("invalid exact timestamp"))?;
-        if (timestamp * 1000.0 - at as f64).abs() > 0.01 {
-            return Err(miss(
-                "exact sample timestamp differs from requested evaluation",
-            ));
-        }
-        row[1]
-            .as_str()
-            .ok_or_else(|| miss("invalid exact value"))?
-            .parse::<f64>()
-            .map_err(|_| miss("invalid exact number"))
-    };
-    match body["data"]["resultType"].as_str() {
-        Some("scalar") => Ok(Value::Scalar(point(&body["data"]["result"])?)),
-        Some("vector") => {
-            let rows = body["data"]["result"]
-                .as_array()
-                .ok_or_else(|| miss("invalid exact vector"))?;
-            let mut seen = BTreeSet::new();
-            let mut values = Vec::new();
-            for row in rows {
-                let labels = row["metric"]
-                    .as_object()
-                    .ok_or_else(|| miss("missing exact labels"))?
-                    .iter()
-                    .map(|(k, v)| {
-                        Ok((
-                            k.clone(),
-                            v.as_str()
-                                .ok_or_else(|| miss("invalid exact label"))?
-                                .to_owned(),
-                        ))
-                    })
-                    .collect::<Result<BTreeMap<_, _>, EngineError>>()?;
-                if !seen.insert(labels.clone()) {
-                    return Err(miss("duplicate exact vector labels"));
-                }
-                values.push((labels, point(&row["value"])?));
-            }
-            Ok(Value::Vector(values))
-        }
-        _ => Err(miss(
-            "installed exact cuts require scalar or instant vector; matrix cut is unsupported",
-        )),
-    }
-}
-
-#[cfg(test)]
-pub(super) async fn prepare(
-    entry: &QueryPlanEntry,
-    times: &[u64],
-    endpoint: Option<&str>,
-    client: &reqwest::Client,
-) -> Result<PreparedLeaves, EngineError> {
-    prepare_external(entry, times, endpoint, None, client, PreparedLeaves::new()).await
-}
-
-pub(super) async fn prepare_external(
-    entry: &QueryPlanEntry,
-    times: &[u64],
-    prometheus_endpoint: Option<&str>,
-    metricsql_endpoint: Option<&str>,
-    client: &reqwest::Client,
-    mut prepared: PreparedLeaves,
-) -> Result<PreparedLeaves, EngineError> {
-    entry
-        .validate_snapshot_sources()
-        .map_err(|error| miss(error.to_string()))?;
-    let mut retained =
-        crate::query_engines::request::reserve(super::logical_dag::prepared_bytes(&prepared))?;
-    // Equivalent exact cuts at the same time share one actual remote request.
-    let mut remote_cache = HashMap::<(QueryLanguage, String, i64), Value>::new();
-    for ((id, at), leaf) in leaves(entry, times)? {
-        u64::try_from(at).map_err(|_| miss("subquery predates epoch"))?;
-        let (language, query, candidate_input) = match &leaf {
-            ExactLeaf::Legacy(QueryTimeOperator::ExactSubquery { query }) => {
-                (QueryLanguage::PromQl, query.clone(), None)
-            }
-            ExactLeaf::Legacy(QueryTimeOperator::CandidateExactSubquery { query, item_label }) => (
-                QueryLanguage::PromQl,
-                query.clone(),
-                Some((entry.nodes[&id].inputs()[0], item_label.as_str())),
-            ),
-            ExactLeaf::External(request) => {
-                if !matches!(
-                    request.language,
-                    QueryLanguage::PromQl | QueryLanguage::MetricsQl
-                ) {
-                    return Err(miss(format!(
-                        "external exact language {:?} has no installed adapter",
-                        request.language
-                    )));
-                }
-                let candidate = match request.input_contracts.as_slice() {
-                    [] => None,
-                    [ExternalExactInput::CandidateMembership { item_label }] => {
-                        Some((entry.nodes[&id].inputs()[0], item_label.as_str()))
-                    }
-                    _ => return Err(miss("unsupported external exact input contract")),
-                };
-                (request.language, request.expression.clone(), candidate)
-            }
-            _ => return Err(miss("prepared leaf is not an exact subtree")),
-        };
-        let (query, candidate_filtered) = if let Some((candidate_input, item_label)) =
-            candidate_input
-        {
-            if language == QueryLanguage::MetricsQl {
-                return Err(miss(
-                    "candidate-filtered MetricsQL exact subqueries are not implemented",
-                ));
-            }
-            let candidate = prepared
-                .get(&(candidate_input, at))
-                .ok_or_else(|| miss("candidate membership was not prepared"))?;
-            let Value::Vector(rows) = &candidate.value else {
-                return Err(miss("candidate membership is not an instant vector"));
-            };
-            let mut values = rows
-                .iter()
-                .map(|(labels, _)| {
-                    labels.get(item_label).cloned().ok_or_else(|| {
-                        miss(format!(
-                            "candidate membership is missing item label {item_label}"
-                        ))
-                    })
-                })
-                .collect::<Result<Vec<_>, _>>()?;
-            values.sort();
-            values.dedup();
-            if values.is_empty() {
-                prepared.insert(
-                    (id, at),
-                    PreparedLeaf {
-                        value: Value::Vector(Vec::new()),
-                        remote: true,
-                        remote_evaluations: 0,
-                        remote_rpcs: 0,
-                    },
-                );
-                continue;
-            }
-            if values.len() > MAX_CANDIDATE_VALUES {
-                return Err(miss(format!(
-                    "candidate set has {} values, exceeding limit {MAX_CANDIDATE_VALUES}",
-                    values.len()
-                )));
-            }
-            let restricted = inject_candidate_matcher(&query, item_label, &values)?;
-            if restricted.len() > MAX_CANDIDATE_QUERY_BYTES {
-                return Err(miss(format!(
-                        "candidate-filtered exact query has {} bytes, exceeding limit {MAX_CANDIDATE_QUERY_BYTES}",
-                        restricted.len()
-                    )));
-            }
-            (restricted, true)
-        } else {
-            (query, false)
-        };
-        let key = (language, query.clone(), at);
-        let cached = remote_cache.contains_key(&key);
-        let value = if let Some(value) = remote_cache.get(&key) {
-            value.clone()
-        } else {
-            let endpoint = match language {
-                QueryLanguage::PromQl => prometheus_endpoint
-                    .ok_or_else(|| miss("Prometheus exact endpoint unavailable"))?,
-                QueryLanguage::MetricsQl => metricsql_endpoint
-                    .ok_or_else(|| miss("VictoriaMetrics exact endpoint unavailable"))?,
-                QueryLanguage::ClickHouseSql => {
-                    return Err(miss("ClickHouse exact subquery needs its SQL adapter"))
-                }
-            };
-            let url = format!("{}/api/v1/query", endpoint.trim_end_matches('/'));
-            let time = format!("{:.3}", at as f64 / 1000.0);
-            // Candidate sets can be large enough to exceed proxy URL limits;
-            // Prometheus accepts the instant-query parameters as an encoded
-            // form body. Static exact cuts keep their existing GET contract.
-            let request = if candidate_filtered {
-                client
-                    .post(url)
-                    .form(&[("query", query.as_str()), ("time", time.as_str())])
-            } else {
-                client
-                    .get(url)
-                    .query(&[("query", query.as_str()), ("time", time.as_str())])
-            };
-            let response = crate::query_engines::request::wait(request.send())
-                .await?
-                .map_err(|e| miss(format!("exact request failed: {e}")))?;
-            if !response.status().is_success() {
-                return Err(miss(format!("exact endpoint HTTP {}", response.status())));
-            }
-            let mut response = response;
-            let mut bytes = Vec::new();
-            let mut wire = crate::query_engines::request::reserve(0)?;
-            while let Some(chunk) = crate::query_engines::request::wait(response.chunk())
-                .await?
-                .map_err(|e| miss(format!("invalid exact response: {e}")))?
-            {
-                let next = bytes
-                    .len()
-                    .checked_add(chunk.len())
-                    .ok_or(asap_physical_operators::dag::Error::MemoryLimit)?;
-                wire.resize(next)?;
-                bytes.extend_from_slice(&chunk);
-            }
-            // Include JSON decoding workspace as well as the retained wire body.
-            let _decode = crate::query_engines::request::reserve(
-                bytes
-                    .len()
-                    .checked_mul(64)
-                    .ok_or(asap_physical_operators::dag::Error::MemoryLimit)?,
-            )?;
-            let body: serde_json::Value = serde_json::from_slice(&bytes)
-                .map_err(|e| miss(format!("invalid exact response: {e}")))?;
-            let value = parse_result(&body, at)?;
-            remote_cache.insert(key, value.clone());
-            value
-        };
-        prepared.insert(
-            (id, at),
-            PreparedLeaf {
-                value,
-                remote: true,
-                remote_evaluations: usize::from(!cached),
-                remote_rpcs: usize::from(!cached),
-            },
-        );
-        retained.resize(
-            super::logical_dag::prepared_bytes(&prepared)
-                + remote_cache
-                    .iter()
-                    .map(|((_, query, _), value)| query.capacity() + value.retained_bytes() + 128)
-                    .sum::<usize>(),
-        )?;
-    }
-    Ok(prepared)
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use asap_types::query_plan::{FallbackPolicy, InstantExecution};
-    fn entry(nodes: BTreeMap<QueryNodeId, QueryPlanNode>) -> QueryPlanEntry {
-        QueryPlanEntry {
-            language: asap_types::query_plan::QueryLanguage::PromQl,
-            query_id: "remote-cut".into(),
-            canonical_query: "a / b".into(),
-            fixed_evaluation: None,
-            root: QueryNodeId(0),
-            nodes,
-            instant: InstantExecution {
-                lookback_ms: 300_000,
-                full_history: false,
-                cumulative_readout: true,
-            },
-            fallback: FallbackPolicy::ExactBackend,
-        }
-    }
-    #[test]
-    fn exact_boundary_rejects_partial_and_wrong_time_preserves_scalar() {
-        assert!(matches!(parse_result(&serde_json::json!({"status":"success","data":{"resultType":"scalar","result":[1,"2"]}}),1000).unwrap(),Value::Scalar(2.0)));
-        assert!(parse_result(&serde_json::json!({"status":"success","warnings":["partial"],"data":{"resultType":"scalar","result":[1,"2"]}}),1000).is_err());
-        assert!(parse_result(&serde_json::json!({"status":"success","data":{"resultType":"scalar","result":[2,"2"]}}),1000).is_err());
-    }
-
-    #[tokio::test]
-    async fn metricsql_external_leaf_uses_victoriametrics_endpoint() {
-        let app =
-            axum::Router::new().route(
-                "/api/v1/query",
-                axum::routing::get(
-                    |axum::extract::Query(params): axum::extract::Query<
-                        BTreeMap<String, String>,
-                    >| async move {
-                        assert_eq!(params["query"], "sum(rate(m[5m]))");
-                        axum::Json(serde_json::json!({
-                            "status":"success",
-                            "data":{"resultType":"scalar","result":[1,"7"]}
-                        }))
-                    },
-                ),
-            );
-        let listener = tokio::net::TcpListener::bind("127.0.0.1:0").await.unwrap();
-        let address = listener.local_addr().unwrap();
-        let server = tokio::spawn(async move { axum::serve(listener, app).await.unwrap() });
-        let mut planned = entry(BTreeMap::from([(
-            QueryNodeId(0),
-            QueryPlanNode::ExternalExact {
-                request: ExternalExactRequest {
-                    language: QueryLanguage::MetricsQl,
-                    expression: "sum(rate(m[5m]))".into(),
-                    output: asap_types::query_plan::ExternalExactOutput::InstantVector,
-                    parameters: BTreeMap::new(),
-                    start_parameter: None,
-                    end_parameter: None,
-                    input_contracts: vec![],
-                },
-                inputs: vec![],
-            },
-        )]));
-        planned.language = QueryLanguage::MetricsQl;
-        let prepared = prepare_external(
-            &planned,
-            &[1_000],
-            Some("http://127.0.0.1:9"),
-            Some(&format!("http://{address}")),
-            &reqwest::Client::new(),
-            PreparedLeaves::new(),
-        )
-        .await
-        .unwrap();
-        assert!(matches!(
-            prepared[&(QueryNodeId(0), 1_000)].value,
-            Value::Scalar(7.0)
-        ));
-        server.abort();
-    }
-
-    fn candidate_entry(query: &str) -> QueryPlanEntry {
-        entry(BTreeMap::from([
-            (
-                QueryNodeId(0),
-                QueryPlanNode::ExternalExact {
-                    request: ExternalExactRequest {
-                        language: QueryLanguage::PromQl,
-                        expression: query.into(),
-                        output: asap_types::query_plan::ExternalExactOutput::InstantVector,
-                        parameters: BTreeMap::new(),
-                        start_parameter: None,
-                        end_parameter: None,
-                        input_contracts: vec![ExternalExactInput::CandidateMembership {
-                            item_label: "job".into(),
-                        }],
-                    },
-                    inputs: vec![QueryNodeId(1)],
-                },
-            ),
-            (
-                QueryNodeId(1),
-                QueryPlanNode::SummaryMerge { inputs: vec![] },
-            ),
-        ]))
-    }
-
-    fn candidate_rows(values: impl IntoIterator<Item = String>) -> PreparedLeaves {
-        [(
-            (QueryNodeId(1), 1_000),
-            PreparedLeaf {
-                value: Value::Vector(
-                    values
-                        .into_iter()
-                        .map(|value| (BTreeMap::from([("job".into(), value)]), 1.0))
-                        .collect(),
-                ),
-                remote: false,
-                remote_evaluations: 0,
-                remote_rpcs: 0,
-            },
-        )]
-        .into_iter()
-        .collect()
-    }
-
-    #[test]
-    fn candidate_matcher_is_ast_conjoined_and_regex_escaped() {
-        use promql_parser::parser::Expr;
-        let values = vec!["api.v1".into(), "quote\"slash\\".into(), "a|b".into()];
-        let restricted = inject_candidate_matcher(
-            "sum by (job) (rate(m{cluster=\"prod\",job!=\"blocked\"}[5m]))",
-            "job",
-            &values,
-        )
-        .unwrap();
-        let expression = promql_parser::parser::parse(&restricted).unwrap();
-        let Expr::Aggregate(aggregate) = expression else {
-            panic!("aggregate expected: {restricted}")
-        };
-        let Expr::Call(call) = aggregate.expr.as_ref() else {
-            panic!("rate expected: {restricted}")
-        };
-        let Expr::MatrixSelector(selector) = &*call.args.args[0] else {
-            panic!("matrix selector expected: {restricted}")
-        };
-        assert!(selector
-            .vs
-            .matchers
-            .matchers
-            .iter()
-            .any(|matcher| matcher.name == "cluster" && matcher.is_match("prod")));
-        assert!(selector
-            .vs
-            .matchers
-            .matchers
-            .iter()
-            .any(|matcher| matcher.name == "job" && !matcher.is_match("blocked")));
-        let candidate_matcher = selector
-            .vs
-            .matchers
-            .matchers
-            .iter()
-            .find(|matcher| matcher.name == "job" && matcher.value.starts_with("^(?:"))
-            .unwrap();
-        for value in &values {
-            assert!(candidate_matcher.is_match(value), "{value:?}: {restricted}");
-        }
-        assert!(!candidate_matcher.is_match("apiXv1"));
-        assert!(!candidate_matcher.is_match("a"));
-        assert!(!candidate_matcher.is_match("b"));
-    }
-
-    #[tokio::test]
-    async fn empty_candidate_set_returns_empty_exact_leaf_without_rpc() {
-        let entry = candidate_entry("sum by (job) (rate(m[5m]))");
-        let prepared = prepare_external(
-            &entry,
-            &[1_000],
-            None,
-            None,
-            &reqwest::Client::new(),
-            candidate_rows(Vec::new()),
-        )
-        .await
-        .unwrap();
-        let exact = &prepared[&(QueryNodeId(0), 1_000)];
-        assert!(matches!(&exact.value, Value::Vector(rows) if rows.is_empty()));
-        assert_eq!((exact.remote_evaluations, exact.remote_rpcs), (0, 0));
-    }
-
-    #[tokio::test]
-    async fn missing_external_endpoint_fails_closed_before_any_rpc() {
-        let result = prepare_external(
-            &candidate_entry("sum by (job) (rate(m[5m]))"),
-            &[1_000],
-            None,
-            None,
-            &reqwest::Client::new(),
-            candidate_rows(["api".into()]),
-        )
-        .await;
-        assert!(matches!(
-            result,
-            Err(EngineError::CapabilityMiss { ref detail, .. })
-                if detail.contains("Prometheus exact endpoint unavailable")
-        ));
-    }
-
-    #[tokio::test]
-    async fn candidate_exact_is_discovered_and_prepared_behind_semi_join_root() {
-        use asap_types::query_plan::CandidateCompleteness;
-        let mut entry = candidate_entry("sum by (job) (rate(m[5m]))");
-        entry.nodes.insert(QueryNodeId(2), {
-            let schema = planner_types::post_asap::SummarySchema {
-                fields: vec![planner_types::post_asap::SummaryField {
-                    name: "job".into(),
-                    dtype: planner_types::post_asap::SummaryFamilyType::Plain(
-                        planner_types::pre_asap::DataType::Utf8,
-                    ),
-                    nullable: false,
-                }],
-                time_index: None,
-            };
-            QueryPlanNode::RelationalJoin {
-                inputs: [QueryNodeId(0), QueryNodeId(1)],
-                join_kind: planner_types::pre_asap::JoinKind::Semi,
-                pred: serde_json::to_value(planner_types::pre_asap::Predicate(std::rc::Rc::new(
-                    planner_types::pre_asap::QueryExpr::Compare {
-                        left: std::rc::Rc::new(planner_types::pre_asap::QueryExpr::Column(0)),
-                        op: planner_types::pre_asap::CompareOpKind::Eq,
-                        right: std::rc::Rc::new(planner_types::pre_asap::QueryExpr::Column(1)),
-                    },
-                )))
-                .unwrap(),
-                pruning: Some(CandidateCompleteness::BestEffort { guarantee: None }),
-                left_schema: schema.clone(),
-                right_schema: schema.clone(),
-                output_schema: schema,
-            }
-        });
-        entry.nodes.insert(
-            QueryNodeId(3),
-            QueryPlanNode::Logical {
-                operator: QueryTimeOperator::Limit {
-                    offset: 0,
-                    n: 2,
-                    grouping: asap_types::query_plan::query_time::Grouping {
-                        labels: vec![],
-                        without: false,
-                    },
-                },
-                inputs: vec![QueryNodeId(2)],
-            },
-        );
-        entry.root = QueryNodeId(3);
-        let dependencies = external_dependencies(&entry, &[1_000]).unwrap();
-        assert_eq!(dependencies, vec![(QueryNodeId(0), QueryNodeId(1), 1_000)]);
-        let prepared = prepare_external(
-            &entry,
-            &[1_000],
-            None,
-            None,
-            &reqwest::Client::new(),
-            candidate_rows(Vec::new()),
-        )
-        .await
-        .unwrap();
-        assert!(prepared.contains_key(&(QueryNodeId(0), 1_000)));
-    }
-
-    #[tokio::test]
-    async fn high_cardinality_candidates_use_one_post_and_preserve_exact_labels() {
-        use std::sync::{
-            atomic::{AtomicUsize, Ordering},
-            Arc,
-        };
-        let calls = Arc::new(AtomicUsize::new(0));
-        let count = calls.clone();
-        let app = axum::Router::new().route(
-            "/api/v1/query",
-            axum::routing::post(
-                move |axum::Form(params): axum::Form<BTreeMap<String, String>>| {
-                    let count = count.clone();
-                    async move {
-                        count.fetch_add(1, Ordering::SeqCst);
-                        assert_eq!(params["time"], "1.000");
-                        let parsed = promql_parser::parser::parse(&params["query"]).unwrap();
-                        assert!(matches!(parsed, promql_parser::parser::Expr::Aggregate(_)));
-                        assert!(params["query"].contains("job-999"));
-                        axum::Json(serde_json::json!({
-                            "status":"success",
-                            "data":{"resultType":"vector","result":[{
-                                "metric":{"__name__":"m","job":"job-999"},
-                                "value":[1,"42"]
-                            }]}
-                        }))
-                    }
-                },
-            ),
-        );
-        let listener = tokio::net::TcpListener::bind("127.0.0.1:0").await.unwrap();
-        let address = listener.local_addr().unwrap();
-        let server = tokio::spawn(async move { axum::serve(listener, app).await.unwrap() });
-        let entry = candidate_entry("sum by (job) (rate(m{job!=\"blocked\"}[5m]))");
-        let candidates = (0..1_000).map(|index| format!("job-{index}"));
-
-        let prepared = prepare_external(
-            &entry,
-            &[1_000],
-            Some(&format!("http://{address}")),
-            None,
-            &reqwest::Client::new(),
-            candidate_rows(candidates),
-        )
-        .await
-        .unwrap();
-
-        assert_eq!(calls.load(Ordering::SeqCst), 1);
-        let exact = &prepared[&(QueryNodeId(0), 1_000)];
-        assert_eq!((exact.remote_evaluations, exact.remote_rpcs), (1, 1));
-        assert!(matches!(
-            &exact.value,
-            Value::Vector(rows)
-                if rows.len() == 1
-                    && rows[0].0.get("job").map(String::as_str) == Some("job-999")
-                    && rows[0].0.get("__name__").map(String::as_str) == Some("m")
-        ));
-        server.abort();
-    }
-
-    #[tokio::test]
-    async fn candidate_exact_rpc_failure_is_a_capability_miss_for_whole_query_fallback() {
-        let app = axum::Router::new().route(
-            "/api/v1/query",
-            axum::routing::post(|| async { axum::http::StatusCode::SERVICE_UNAVAILABLE }),
-        );
-        let listener = tokio::net::TcpListener::bind("127.0.0.1:0").await.unwrap();
-        let address = listener.local_addr().unwrap();
-        let server = tokio::spawn(async move { axum::serve(listener, app).await.unwrap() });
-        let result = prepare_external(
-            &candidate_entry("sum by (job) (rate(m[5m]))"),
-            &[1_000],
-            Some(&format!("http://{address}")),
-            None,
-            &reqwest::Client::new(),
-            candidate_rows(["api".into()]),
-        )
-        .await;
-        let Err(error) = result else {
-            panic!("HTTP failure must reject the hybrid branch")
-        };
-        assert!(matches!(
-            error,
-            EngineError::CapabilityMiss { engine_id: "exact_subquery", ref detail }
-                if detail.contains("HTTP 503")
-        ));
-        server.abort();
-    }
-    #[tokio::test]
-    async fn exact_leaf_calls_prometheus_and_combines_with_prepared_summary() {
-        // A successful exact branch remains an intermediate, not a whole-root fallback.
-        use asap_types::query_plan::query_time::BinaryOperation;
-        use std::sync::{
-            atomic::{AtomicUsize, Ordering},
-            Arc,
-        };
-        let calls = Arc::new(AtomicUsize::new(0));
-        let count = calls.clone();
-        let app=axum::Router::new().route("/api/v1/query",axum::routing::get(move |axum::extract::Query(params):axum::extract::Query<BTreeMap<String,String>>| {
-            let count=count.clone(); async move { count.fetch_add(1,Ordering::SeqCst); assert_eq!(params["query"],"b"); assert_eq!(params["time"],"1.000");
-                axum::Json(serde_json::json!({"status":"success","data":{"resultType":"vector","result":[{"metric":{"job":"api"},"value":[1,"2"]}]}})) }
-        }));
-        let listener = tokio::net::TcpListener::bind("127.0.0.1:0").await.unwrap();
-        let address = listener.local_addr().unwrap();
-        let server = tokio::spawn(async move {
-            axum::serve(listener, app).await.unwrap();
-        });
-        let entry = entry(BTreeMap::from([
-            (
-                QueryNodeId(0),
-                QueryPlanNode::Logical {
-                    operator: QueryTimeOperator::Binary {
-                        operation: BinaryOperation::Div,
-                        return_bool: false,
-                    },
-                    inputs: vec![QueryNodeId(1), QueryNodeId(2)],
-                },
-            ),
-            (
-                QueryNodeId(1),
-                QueryPlanNode::SummaryMerge { inputs: vec![] },
-            ),
-            (
-                QueryNodeId(2),
-                QueryPlanNode::Logical {
-                    operator: QueryTimeOperator::ExactSubquery { query: "b".into() },
-                    inputs: vec![],
-                },
-            ),
-        ]));
-        let leaves = prepare(
-            &entry,
-            &[1000],
-            Some(&format!("http://{address}")),
-            &reqwest::Client::new(),
-        )
-        .await
-        .unwrap();
-        let (result, stats) =
-            super::super::logical_dag::execute_installed(&entry, &leaves, 1000, |id, at| {
-                assert_eq!(id, QueryNodeId(1));
-                Ok(crate::query_engines::query_result::QueryResult::vector(
-                    vec![
-                        crate::query_engines::query_result::InstantVectorElement::new(
-                            crate::storage_engines::types::KeyByLabelValues::new_with_labels(vec![
-                                "api".into(),
-                            ]),
-                            6.0,
-                        )
-                        .with_label_keys_override(vec!["job".into()]),
-                    ],
-                    at,
-                ))
-            })
-            .unwrap();
-        let crate::query_engines::query_result::QueryResult::Vector(result) = result else {
-            panic!("vector expected")
-        };
-        assert_eq!(result.values[0].value, 3.0);
-        assert_eq!(stats.raw_scan_evaluations, 0);
-        assert_eq!(stats.remote_evaluations, 1);
-        assert_eq!(stats.summary_readout_evaluations, 1);
-        assert_eq!(calls.load(Ordering::SeqCst), 1);
-        let mut repeated = entry.clone();
-        repeated.nodes.insert(
-            QueryNodeId(1),
-            QueryPlanNode::Logical {
-                operator: QueryTimeOperator::ExactSubquery { query: "b".into() },
-                inputs: vec![],
-            },
-        );
-        let prepared = prepare(
-            &repeated,
-            &[1000],
-            Some(&format!("http://{address}")),
-            &reqwest::Client::new(),
-        )
-        .await
-        .unwrap();
-        let (_, stats) = super::super::logical_dag::execute_installed(
-            &repeated,
-            &prepared,
-            1000,
-            |_, _| unreachable!(),
-        )
-        .unwrap();
-        assert_eq!(stats.remote_branch_evaluations, 2);
-        assert_eq!(stats.remote_evaluations, 1);
-        assert_eq!(stats.remote_rpcs, 1);
-        assert_eq!(
-            calls.load(Ordering::SeqCst),
-            2,
-            "each request fetched b once, never once per alias"
-        );
-        server.abort();
-    }
-
-    #[tokio::test]
-    async fn five_minute_error_ratio_rejects_external_and_local_revision_mix() {
-        use crate::storage_engines::sketch_db::{
-            data::AggKind,
-            index::{Capability, SummarySeriesMetadata},
-        };
-        use crate::storage_engines::types::Measurement;
-        use asap_physical_operators::summary_kernels::IncreaseAccumulator;
-        use asap_types::query_plan::{
-            query_time::BinaryOperation, ExactReadout, MaterializationBinding, PhysicalGrouping,
-        };
-        use std::sync::{
-            atomic::{AtomicUsize, Ordering},
-            Arc,
-        };
-
-        const AT: u64 = 300_000;
-        const MATERIALIZATION: asap_types::PolicyFingerprint = asap_types::PolicyFingerprint(9001);
-        let store = crate::storage_engines::sketch_db::index::SketchStore::new();
-        store.register(SummarySeriesMetadata {
-            storage_handle: 41,
-            metric_name: "http_requests_total".into(),
-            group_by_keys: std::collections::BTreeSet::from(["job".into()]),
-            capability: Some(Capability::ExactAgg(asap_types::AggregationType::Rate)),
-            agg_kind: AggKind::ExactAgg {
-                agg_type: asap_types::AggregationType::Rate,
-                parameters_canonical: String::new(),
-                spatial_filter_canonical: String::new(),
-            },
-            accuracy: None,
-            first_seen_unix_ms: 0,
-            retired_at_ms: None,
-            expires_at_ms: None,
-            policy_fp: MATERIALIZATION,
-        });
-        let mut denominator =
-            IncreaseAccumulator::new(Measurement::new(100.0), 0, Measurement::new(100.0), 0);
-        denominator.update(Measurement::new(400.0), AT as i64);
-        store.append_precompute(
-            41,
-            BTreeMap::from([("job".into(), "user-service".into())]),
-            (0, AT),
-            Box::new(denominator),
-        );
-
-        let exact_query =
-            "sum by (job) (rate(http_requests_total{status=~\"5..\",job=\"user-service\"}[5m]))";
-        let entry = entry(BTreeMap::from([
-            (
-                QueryNodeId(0),
-                QueryPlanNode::Logical {
-                    operator: QueryTimeOperator::Binary {
-                        operation: BinaryOperation::Div,
-                        return_bool: false,
-                    },
-                    inputs: vec![QueryNodeId(1), QueryNodeId(2)],
-                },
-            ),
-            (
-                QueryNodeId(1),
-                QueryPlanNode::Logical {
-                    operator: QueryTimeOperator::ExactSubquery {
-                        query: exact_query.into(),
-                    },
-                    inputs: vec![],
-                },
-            ),
-            (
-                QueryNodeId(2),
-                QueryPlanNode::ExactReadout {
-                    input: QueryNodeId(3),
-                    readout: ExactReadout::Rate,
-                },
-            ),
-            (
-                QueryNodeId(3),
-                QueryPlanNode::ReadMaterialization {
-                    binding: MaterializationBinding {
-                        full_window_slide_ms: None,
-                        item_labels: Vec::new(),
-                        materialization: MATERIALIZATION.into(),
-                        stored_output_reference: super::super::test_plan::bound_reference(
-                            &store,
-                            MATERIALIZATION.into(),
-                        ),
-                        output_grouping: PhysicalGrouping::Reduce(vec!["job".into()]),
-                        window_ms: AT,
-                        pane_origin_ms: Some(0),
-                        readout_lookback_ms: Some(AT),
-                    },
-                },
-            ),
-        ]));
-
-        let calls = Arc::new(AtomicUsize::new(0));
-        let observed_calls = calls.clone();
-        let app = axum::Router::new().route(
-            "/api/v1/query",
-            axum::routing::get(
-                move |axum::extract::Query(params): axum::extract::Query<
-                    BTreeMap<String, String>,
-                >| {
-                    let observed_calls = observed_calls.clone();
-                    async move {
-                        observed_calls.fetch_add(1, Ordering::SeqCst);
-                        assert_eq!(params["query"], exact_query);
-                        assert_eq!(params["time"], "300.000");
-                        axum::Json(serde_json::json!({
-                            "status": "success",
-                            "data": {"resultType": "vector", "result": [{
-                                "metric": {"job": "user-service"},
-                                "value": [300, "0.1"]
-                            }]}
-                        }))
-                    }
-                },
-            ),
-        );
-        let listener = tokio::net::TcpListener::bind("127.0.0.1:0").await.unwrap();
-        let address = listener.local_addr().unwrap();
-        let server = tokio::spawn(async move { axum::serve(listener, app).await.unwrap() });
-
-        let result = prepare(
-            &entry,
-            &[AT],
-            Some(&format!("http://{address}")),
-            &reqwest::Client::new(),
-        )
-        .await;
-        assert!(
-            matches!(result, Err(EngineError::CapabilityMiss { detail, .. }) if detail.contains("common snapshot proof"))
-        );
-        assert_eq!(calls.load(Ordering::SeqCst), 0);
-        server.abort();
-    }
-    #[test]
-    fn deployed_raw_scan_is_rejected_before_execution() {
-        let entry = entry(BTreeMap::from([(
-            QueryNodeId(0),
-            QueryPlanNode::Logical {
-                operator: QueryTimeOperator::Scan {
-                    metric: Some("m".into()),
-                    matchers: vec![],
-                    range_ms: None,
-                    offset_ms: 0,
-                },
-                inputs: vec![],
-            },
-        )]));
-        assert!(leaves(&entry, &[1000])
-            .unwrap_err()
-            .to_string()
-            .contains("forbidden"));
-    }
-}
diff --git a/data_plane/src/query_engines/asap_query_engine/live_serve.rs b/data_plane/src/query_engines/asap_query_engine/live_serve.rs
deleted file mode 100644
index 8c9e26466..000000000
--- a/data_plane/src/query_engines/asap_query_engine/live_serve.rs
+++ /dev/null
@@ -1,225 +0,0 @@
-//! Execute installed sketch-tier plans; errors allow routing to the exact backend.
-
-use std::collections::BTreeMap;
-
-use crate::query_engines::asap_query_engine::post_asap_readout::LoweringSkip;
-use crate::query_engines::asap_query_engine::post_asap_readout::{
-    execute_query_plan_instant, fold_coverage,
-};
-use crate::storage_engines::sketch_db::index::SketchStore;
-use crate::storage_engines::sketch_db::query::ASAPTierResult;
-
-/// Disable warm execution with ASAP_SUMMARY_EXECUTOR_LIVE=0, false, or off.
-pub fn summary_executor_live_enabled() -> bool {
-    let value = std::env::var("ASAP_SUMMARY_EXECUTOR_LIVE").ok();
-    summary_executor_live_value(value.as_deref())
-}
-
-fn summary_executor_live_value(value: Option<&str>) -> bool {
-    value.map(str::trim).is_none_or(|v| {
-        !(v == "0" || v.eq_ignore_ascii_case("false") || v.eq_ignore_ascii_case("off"))
-    })
-}
-
-/// Evaluate a planned range query at the exact Prometheus timestamps
-/// `start, start+step, ... <= end`. Each point executes the same immutable
-/// QueryPlan DAG with its own lookback interval; native summary window-close
-/// timestamps never leak into the public range response.
-pub fn serve_range_steps_from_query_plan(
-    index: &SketchStore,
-    entry: &asap_types::query_plan::QueryPlanEntry,
-    start_ms: u64,
-    end_ms: u64,
-    step_ms: u64,
-) -> Result<ASAPTierResult, LoweringSkip> {
-    const MAX_RANGE_STEPS: usize = 11_000;
-    if step_ms == 0 || start_ms > end_ms {
-        return Err(LoweringSkip::InvalidQueryPlan(
-            "range query requires start <= end and step > 0".into(),
-        ));
-    }
-    let step_count = end_ms.saturating_sub(start_ms) / step_ms + 1;
-    if step_count > MAX_RANGE_STEPS as u64 {
-        return Err(LoweringSkip::MaterializationNotReady(format!(
-            "range query has {step_count} steps; warm execution limit is {MAX_RANGE_STEPS}"
-        )));
-    }
-    let window_ms = entry
-        .materialization_bindings()
-        .into_iter()
-        .map(|binding| binding.window_ms)
-        .max()
-        .unwrap_or(0);
-    let mut rows = BTreeMap::<BTreeMap<String, String>, Vec<(i64, f64)>>::new();
-    let mut total_coverage = None;
-    let mut evaluation_ms = start_ms;
-    loop {
-        let (outcome, t0_ms) = execute_query_plan_instant(index, entry, evaluation_ms)?;
-        if !coverage_covers_closed_windows(outcome.coverage, t0_ms, evaluation_ms, window_ms) {
-            return Err(LoweringSkip::MaterializationNotReady(format!(
-                "coverage {:?} is incomplete at range evaluation {evaluation_ms}",
-                outcome.coverage
-            )));
-        }
-        if outcome.series.is_empty() {
-            return Err(LoweringSkip::MaterializationNotReady(format!(
-                "planned summary produced no series at range evaluation {evaluation_ms}"
-            )));
-        }
-        fold_coverage(&mut total_coverage, outcome.coverage);
-        for (labels, samples) in outcome.series {
-            let Some((_, value)) = samples.last() else {
-                return Err(LoweringSkip::MaterializationNotReady(format!(
-                    "planned summary produced no value at range evaluation {evaluation_ms}"
-                )));
-            };
-            rows.entry(labels)
-                .or_default()
-                .push((evaluation_ms as i64, *value));
-        }
-        let Some(next) = evaluation_ms.checked_add(step_ms) else {
-            break;
-        };
-        if next > end_ms {
-            break;
-        }
-        evaluation_ms = next;
-    }
-    Ok(ASAPTierResult {
-        series: rows.into_iter().collect(),
-        coverage: total_coverage,
-    })
-}
-
-fn coverage_covers_closed_windows(
-    coverage: Option<(u64, u64)>,
-    t0_ms: u64,
-    t1_ms: u64,
-    window_ms: u64,
-) -> bool {
-    let Some((start, end)) = coverage else {
-        return false;
-    };
-    window_ms > 0
-        && start <= end
-        && start.saturating_sub(window_ms) <= t0_ms
-        && end >= t1_ms
-        && end.saturating_sub(start).saturating_add(window_ms) >= t1_ms.saturating_sub(t0_ms)
-}
-
-pub fn serve_instant_from_query_plan(
-    index: &SketchStore,
-    entry: &asap_types::query_plan::QueryPlanEntry,
-    now_ms: u64,
-) -> Result<(ASAPTierResult, u64), LoweringSkip> {
-    if !summary_executor_live_enabled() {
-        return Err(LoweringSkip::Disabled);
-    }
-    let (outcome, t0_ms) = execute_query_plan_instant(index, entry, now_ms)?;
-    Ok((
-        ASAPTierResult {
-            series: outcome.series,
-            coverage: outcome.coverage,
-        },
-        t0_ms,
-    ))
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use std::collections::BTreeMap;
-
-    use crate::storage_engines::sketch_db::data::AggKind;
-    use crate::storage_engines::sketch_db::index::{Capability, SummarySeriesMetadata};
-
-    #[test]
-    fn flag_off_spellings_disable_live_serve() {
-        assert!(!summary_executor_live_value(Some("0")));
-        assert!(!summary_executor_live_value(Some(" false ")));
-        assert!(!summary_executor_live_value(Some("OFF")));
-    }
-
-    #[test]
-    fn unset_flag_defaults_to_serving() {
-        assert!(summary_executor_live_value(None));
-    }
-
-    #[test]
-    fn formal_range_plan_returns_exact_requested_steps() {
-        let idx = SketchStore::new();
-        let policy = asap_types::PolicyFingerprint(901);
-        idx.register(SummarySeriesMetadata {
-            storage_handle: 9,
-            metric_name: "bytes".into(),
-            group_by_keys: std::collections::BTreeSet::new(),
-            capability: Some(Capability::ExactAgg(asap_types::AggregationType::Sum)),
-            agg_kind: AggKind::ExactAgg {
-                agg_type: asap_types::AggregationType::Sum,
-                parameters_canonical: String::new(),
-                spatial_filter_canonical: String::new(),
-            },
-            accuracy: None,
-            first_seen_unix_ms: 0,
-            retired_at_ms: None,
-            expires_at_ms: None,
-            policy_fp: policy,
-        });
-        for (start, end, value) in [(0, 1_000, 1.0), (1_000, 2_000, 2.0), (2_000, 3_000, 3.0)] {
-            idx.append_precompute(
-                9,
-                BTreeMap::new(),
-                (start, end),
-                Box::new(asap_physical_operators::summary_kernels::SumAccumulator::with_sum(value)),
-            );
-        }
-        let entry = asap_types::query_plan::QueryPlanEntry {
-            language: asap_types::query_plan::QueryLanguage::PromQl,
-            query_id: "q-sum".into(),
-            canonical_query: "sum_over_time(bytes[1s])".into(),
-            fixed_evaluation: None,
-            root: asap_types::query_plan::QueryNodeId(0),
-            nodes: BTreeMap::from([
-                (
-                    asap_types::query_plan::QueryNodeId(0),
-                    asap_types::query_plan::QueryPlanNode::ExactReadout {
-                        input: asap_types::query_plan::QueryNodeId(1),
-                        readout: asap_types::query_plan::ExactReadout::Sum,
-                    },
-                ),
-                (
-                    asap_types::query_plan::QueryNodeId(1),
-                    asap_types::query_plan::QueryPlanNode::ReadMaterialization {
-                        binding: asap_types::query_plan::MaterializationBinding {
-                            full_window_slide_ms: None,
-                            item_labels: Vec::new(),
-                            materialization: policy.into(),
-                            stored_output_reference: super::super::test_plan::bound_reference(
-                                &idx,
-                                policy.into(),
-                            ),
-                            output_grouping: asap_types::query_plan::PhysicalGrouping::PerEntity,
-                            window_ms: 1_000,
-                            pane_origin_ms: Some(0),
-                            readout_lookback_ms: Some(1_000),
-                        },
-                    },
-                ),
-            ]),
-            instant: asap_types::query_plan::InstantExecution {
-                lookback_ms: 1_000,
-                full_history: false,
-                cumulative_readout: true,
-            },
-            fallback: asap_types::query_plan::FallbackPolicy::ExactBackend,
-        };
-
-        let result = serve_range_steps_from_query_plan(&idx, &entry, 1_000, 3_000, 1_000)
-            .expect("step-precise range execution");
-        assert_eq!(result.series.len(), 1);
-        assert_eq!(
-            result.series[0].1,
-            vec![(1_000, 1.0), (2_000, 2.0), (3_000, 3.0)]
-        );
-    }
-}
diff --git a/data_plane/src/query_engines/asap_query_engine/logical_dag.rs b/data_plane/src/query_engines/asap_query_engine/logical_dag.rs
deleted file mode 100644
index 103580df0..000000000
--- a/data_plane/src/query_engines/asap_query_engine/logical_dag.rs
+++ /dev/null
@@ -1,2036 +0,0 @@
-//! Executes the installed typed logical DAG. No serving-time PromQL parsing.
-mod native_values;
-use crate::query_engines::{
-    query_result::{InstantVectorElement, QueryResult},
-    EngineError,
-};
-use crate::storage_engines::types::KeyByLabelValues;
-use asap_physical_operators::dag as physical;
-use asap_types::query_plan::query_time::{
-    Aggregation, BinaryOperation, Grouping, QueryTimeOperator, TemporalOperation,
-};
-use asap_types::query_plan::{CandidateCompleteness, QueryNodeId, QueryPlanEntry, QueryPlanNode};
-use futures::{FutureExt, StreamExt};
-use std::cell::RefCell;
-use std::collections::{BTreeMap, BTreeSet};
-
-type Labels = BTreeMap<String, String>;
-type Vector = Vec<(Labels, f64)>;
-type Matrix = Vec<(Labels, Vec<(i64, f64)>)>;
-#[derive(Clone)]
-pub(crate) enum Value {
-    Scalar(f64),
-    Vector(Vector),
-    Matrix(Matrix, i64, i64),
-}
-impl Value {
-    pub(crate) fn retained_bytes(&self) -> usize {
-        fn labels(labels: &Labels) -> usize {
-            labels
-                .iter()
-                .map(|(key, value)| key.capacity() + value.capacity() + 96)
-                .sum()
-        }
-        match self {
-            Self::Scalar(_) => 8,
-            Self::Vector(rows) => {
-                rows.capacity() * std::mem::size_of::<(Labels, f64)>()
-                    + rows.iter().map(|(keys, _)| labels(keys)).sum::<usize>()
-            }
-            Self::Matrix(rows, ..) => {
-                rows.capacity() * std::mem::size_of::<(Labels, Vec<(i64, f64)>)>()
-                    + rows
-                        .iter()
-                        .map(|(keys, points)| labels(keys) + points.capacity() * 16)
-                        .sum::<usize>()
-            }
-        }
-    }
-}
-#[derive(Debug, Default, Clone)]
-pub struct ExecutionStats {
-    /// Kept in execution provenance for compatibility; deployed DAGs cannot
-    /// execute local raw scans, so this remains zero.
-    pub raw_scan_evaluations: usize,
-    pub summary_readout_evaluations: usize,
-    pub memo_hits: usize,
-    pub remote_evaluations: usize,
-    pub remote_rpcs: usize,
-    pub remote_branch_evaluations: usize,
-}
-fn miss(detail: impl Into<String>) -> EngineError {
-    EngineError::capability_miss("installed_logical_dag", detail)
-}
-fn no_name(mut labels: Labels) -> Labels {
-    labels.remove("__name__");
-    labels
-}
-fn vector(value: Value) -> Result<Vector, EngineError> {
-    let Value::Vector(values) = value else {
-        return Err(miss("instant vector required"));
-    };
-    let mut seen = BTreeSet::new();
-    if values.iter().any(|(labels, _)| !seen.insert(labels)) {
-        return Err(miss("duplicate vector label sets"));
-    }
-    Ok(values)
-}
-pub(crate) fn from_result(result: QueryResult) -> Result<Value, EngineError> {
-    let QueryResult::Vector(value) = result else {
-        return Err(miss("bound readout must return instant vector"));
-    };
-    if !value.warnings.is_empty() {
-        return Err(miss("partial bound readout cannot feed logical operator"));
-    }
-    let values = value
-        .values
-        .into_iter()
-        .map(|point| {
-            let keys = point
-                .label_keys_override
-                .ok_or_else(|| miss("bound readout must carry explicit label keys"))?;
-            if keys.len() != point.labels.labels.len()
-                || keys.iter().collect::<BTreeSet<_>>().len() != keys.len()
-            {
-                return Err(miss("bound readout label arity mismatch"));
-            }
-            Ok((
-                keys.into_iter().zip(point.labels.labels).collect(),
-                point.value,
-            ))
-        })
-        .collect::<Result<Vector, EngineError>>()?;
-    Ok(Value::Vector(vector(Value::Vector(values))?))
-}
-
-pub(crate) struct PreparedLeaf {
-    pub value: Value,
-    pub remote: bool,
-    pub remote_evaluations: usize,
-    pub remote_rpcs: usize,
-}
-pub(crate) type PreparedLeaves = BTreeMap<(QueryNodeId, i64), PreparedLeaf>;
-
-pub(crate) fn prepared_bytes(leaves: &PreparedLeaves) -> usize {
-    leaves
-        .values()
-        .map(|leaf| leaf.value.retained_bytes() + 128)
-        .sum()
-}
-
-pub(crate) fn execute_installed<F>(
-    entry: &QueryPlanEntry,
-    leaves: &PreparedLeaves,
-    at: u64,
-    callback: F,
-) -> Result<(QueryResult, ExecutionStats), EngineError>
-where
-    F: FnMut(QueryNodeId, u64) -> Result<QueryResult, EngineError>,
-{
-    execute_values(entry, leaves, at, callback)
-}
-
-fn execute_values<F>(
-    entry: &QueryPlanEntry,
-    leaves: &PreparedLeaves,
-    at: u64,
-    callback: F,
-) -> Result<(QueryResult, ExecutionStats), EngineError>
-where
-    F: FnMut(QueryNodeId, u64) -> Result<QueryResult, EngineError>,
-{
-    let at_signed = i64::try_from(at).map_err(|_| miss("evaluation timestamp overflow"))?;
-    let runtime = RefCell::new(ValueRuntime {
-        entry,
-        leaves,
-        callback,
-        stats: ExecutionStats::default(),
-        warnings: vec![],
-    });
-    let error = RefCell::new(None);
-    let mut graph = physical::PhysicalDag::default();
-    let mut identities = BTreeMap::from([((entry.root, at_signed), 0u64)]);
-    let mut pending = vec![(entry.root, at_signed)];
-    let mut depths = BTreeMap::from([((entry.root, at_signed), 1usize)]);
-    while let Some((id, time)) = pending.pop() {
-        let node = entry
-            .nodes
-            .get(&id)
-            .ok_or_else(|| miss("missing installed node"))?;
-        let dependencies = if leaves.contains_key(&(id, time)) {
-            vec![]
-        } else {
-            expanded_inputs(node, time)?
-        };
-        let mut input_ids = Vec::new();
-        for dependency in &dependencies {
-            if let Some(id) = identities.get(dependency) {
-                runtime.borrow_mut().stats.memo_hits += 1;
-                input_ids.push(*id);
-            } else {
-                if identities.len() >= 200_000 {
-                    return Err(physical::Error::Operator(
-                        "installed DAG evaluation budget exceeded".into(),
-                    )
-                    .into());
-                }
-                let depth = depths[&(id, time)] + 1;
-                if depth > 128 {
-                    return Err(physical::Error::Operator(
-                        "installed DAG exceeds execution depth of 128".into(),
-                    )
-                    .into());
-                }
-                depths.insert(*dependency, depth);
-                let id = identities.len() as u64;
-                identities.insert(*dependency, id);
-                pending.push(*dependency);
-                input_ids.push(id);
-            }
-        }
-        graph
-            .add(
-                identities[&(id, time)],
-                input_ids,
-                BoundValueOperator {
-                    id,
-                    time,
-                    node,
-                    dependencies,
-                    runtime: &runtime,
-                    error: &error,
-                },
-            )
-            .map_err(EngineError::from)?;
-    }
-    let context = crate::query_engines::request::context(physical::Scope::Query {
-        evaluation_time_ms: at_signed,
-        revision: 0,
-    })
-    .map_err(EngineError::from)?;
-    let mut output = graph
-        .execute(&[0], context)
-        .map_err(EngineError::from)?
-        .remove(0);
-    // I/O is prepared before this synchronous adapter; Pending is a cooperative yield.
-    let evaluated = loop {
-        crate::query_engines::request::check()?;
-        match output.next().now_or_never() {
-            Some(Some(Ok(value))) => break value.value().clone(),
-            Some(Some(Err(failure))) => {
-                return Err(error
-                    .borrow_mut()
-                    .take()
-                    .unwrap_or(EngineError::Physical(failure)));
-            }
-            Some(None) => {
-                return Err(physical::Error::Operator("query DAG produced no result".into()).into())
-            }
-            None => continue,
-        }
-    };
-    drop(output);
-    drop(graph);
-    let mut evaluator = runtime.into_inner();
-    if matches!(evaluated, Value::Scalar(_)) {
-        // QueryResult currently models vectors/matrices only. Preserve a scalar
-        // root's HTTP type by routing it to native, while scalar intermediates
-        // remain typed inside vector composition.
-        return Err(miss("scalar root requires native response adapter"));
-    }
-    let result = vector(evaluated)?;
-    let mut output = QueryResult::vector(
-        result
-            .into_iter()
-            .map(|(labels, value)| {
-                InstantVectorElement::new(
-                    KeyByLabelValues::new_with_labels(labels.values().cloned().collect()),
-                    value,
-                )
-                .with_label_keys_override(labels.into_keys().collect())
-            })
-            .collect(),
-        at,
-    );
-    if let QueryResult::Vector(vector) = &mut output {
-        vector.warnings.append(&mut evaluator.warnings);
-    }
-    Ok((output, evaluator.stats))
-}
-
-struct ValueRuntime<'a, F> {
-    entry: &'a QueryPlanEntry,
-    leaves: &'a PreparedLeaves,
-    stats: ExecutionStats,
-    callback: F,
-    warnings: Vec<String>,
-}
-impl<F: FnMut(QueryNodeId, u64) -> Result<QueryResult, EngineError>> ValueRuntime<'_, F> {
-    fn execute_node(
-        &mut self,
-        id: QueryNodeId,
-        at: i64,
-        node: &QueryPlanNode,
-        inputs: &[&Value],
-        dependencies: &[(QueryNodeId, i64)],
-        context: &physical::RunContext,
-    ) -> Result<Value, EngineError> {
-        if let Some(leaf) = self.leaves.get(&(id, at)) {
-            if leaf.remote {
-                self.stats.remote_branch_evaluations += 1;
-                self.stats.remote_evaluations += leaf.remote_evaluations;
-                self.stats.remote_rpcs += leaf.remote_rpcs;
-            } else {
-                self.stats.summary_readout_evaluations += 1;
-            }
-            let value = leaf.value.clone();
-            return Ok(value);
-        }
-        let value = match node.clone() {
-            QueryPlanNode::Scalar { value } => Value::Scalar(native_scalar(value, context)?),
-            QueryPlanNode::Logical {
-                operator: QueryTimeOperator::CurrentSeries { .. },
-                ..
-            } => {
-                self.stats.summary_readout_evaluations += 1;
-                from_result((self.callback)(
-                    id,
-                    u64::try_from(at).map_err(|_| miss("negative current-series timestamp"))?,
-                )?)?
-            }
-            QueryPlanNode::Logical { operator, .. } => {
-                if matches!(
-                    operator,
-                    QueryTimeOperator::Scan { .. }
-                        | QueryTimeOperator::ExactSubquery { .. }
-                        | QueryTimeOperator::CandidateExactSubquery { .. }
-                ) {
-                    return Err(miss(
-                        "installed Prometheus leaf was not prepared; backend raw execution is forbidden",
-                    ));
-                }
-                self.logical(operator, inputs, dependencies, at, context)?
-            }
-            QueryPlanNode::PhysicalFragment {
-                dag,
-                row_input,
-                pruning,
-                ..
-            } => {
-                let values = inputs
-                    .iter()
-                    .map(|value| vector((**value).clone()))
-                    .collect::<Result<Vec<_>, _>>()?;
-                if let Some(contract) = &pruning {
-                    native_values::validate_pruning(
-                        &dag,
-                        &values,
-                        row_input,
-                        contract,
-                        at,
-                        context.clone(),
-                    )?;
-                    if let Some(warning) = pruning_warning(Some(&contract.completeness)) {
-                        self.warnings.push(warning);
-                    }
-                }
-                Value::Vector(native_values::physical(
-                    &dag,
-                    values,
-                    row_input,
-                    at,
-                    context.clone(),
-                )?)
-            }
-            QueryPlanNode::RelationalJoin {
-                join_kind: planner_types::pre_asap::JoinKind::Semi,
-                pred,
-                pruning,
-                left_schema,
-                right_schema,
-                output_schema,
-                ..
-            } => {
-                let [values, candidates] = inputs else {
-                    return Err(miss("semi-join requires two inputs"));
-                };
-                let selected = native_values::relation(
-                    vector((**values).clone())?,
-                    vector((**candidates).clone())?,
-                    serde_json::from_value(pred)
-                        .map_err(|error| physical::Error::Invalid(error.to_string()))?,
-                    std::sync::Arc::new(left_schema),
-                    std::sync::Arc::new(right_schema),
-                    std::sync::Arc::new(output_schema),
-                    pruning.clone(),
-                    at,
-                    context.clone(),
-                )?;
-                if let Some(warning) = pruning_warning(pruning.as_ref()) {
-                    self.warnings.push(warning);
-                }
-                Value::Vector(selected)
-            }
-            _ => {
-                self.stats.summary_readout_evaluations += 1;
-                from_result((self.callback)(
-                    id,
-                    u64::try_from(at).map_err(|_| miss("summary timestamp predates epoch"))?,
-                )?)?
-            }
-        };
-        Ok(value)
-    }
-    fn logical(
-        &mut self,
-        operator: QueryTimeOperator,
-        inputs: &[&Value],
-        dependencies: &[(QueryNodeId, i64)],
-        at: i64,
-        context: &physical::RunContext,
-    ) -> Result<Value, EngineError> {
-        let input = |index: usize| {
-            inputs
-                .get(index)
-                .map(|value| (**value).clone())
-                .ok_or_else(|| miss("missing logical input"))
-        };
-        match operator {
-            QueryTimeOperator::ExactSubquery { .. }
-            | QueryTimeOperator::CandidateExactSubquery { .. } => {
-                Err(miss("Prometheus exact leaf was not prepared"))
-            }
-            QueryTimeOperator::CurrentSeries { .. } => Err(miss(
-                "current-series leaf must use its installed node identity",
-            )),
-            QueryTimeOperator::Scan { .. } => {
-                Err(miss("local raw Scan is forbidden in deployed plans"))
-            }
-            QueryTimeOperator::UnaryNegate => negate(input(0)?, context),
-            QueryTimeOperator::VectorToScalar => vector_to_scalar(vector(input(0)?)?, context),
-            QueryTimeOperator::Aggregate {
-                operation,
-                grouping,
-            } => {
-                let values = vector(input(0)?)?;
-                Ok(Value::Vector(aggregate(
-                    operation, &grouping, values, context,
-                )?))
-            }
-            QueryTimeOperator::Limit {
-                n,
-                offset,
-                grouping,
-            } => {
-                let values = vector(input(0)?)?;
-                Ok(Value::Vector(native_values::limit(
-                    values,
-                    &grouping,
-                    n,
-                    offset,
-                    context.clone(),
-                )?))
-            }
-            QueryTimeOperator::Binary {
-                operation,
-                return_bool,
-            } => {
-                let left = input(0)?;
-                let right = input(1)?;
-                binary_in_context(operation, return_bool, left, right, context)
-            }
-            QueryTimeOperator::Temporal { operation } => {
-                let Value::Matrix(values, start, end) = input(0)? else {
-                    return Err(miss("temporal operator requires range vector"));
-                };
-                let preserve_name = self.entry.language
-                    == control_plane::query_plan::QueryLanguage::MetricsQl
-                    && matches!(
-                        operation,
-                        TemporalOperation::Min | TemporalOperation::Max | TemporalOperation::Avg
-                    );
-                let result = native_temporal(values, operation, start, end, context)?;
-                Ok(Value::Vector(
-                    result
-                        .into_iter()
-                        .map(|(labels, value)| {
-                            (
-                                if preserve_name {
-                                    labels
-                                } else {
-                                    no_name(labels)
-                                },
-                                value,
-                            )
-                        })
-                        .collect(),
-                ))
-            }
-
-            QueryTimeOperator::Sort {
-                descending,
-                grouping,
-            } => {
-                let values = vector(input(0)?)?;
-                Ok(Value::Vector(native_values::sort(
-                    values,
-                    &grouping,
-                    descending,
-                    context.clone(),
-                )?))
-            }
-            QueryTimeOperator::HistogramQuantile => {
-                let Value::Scalar(quantile) = input(0)? else {
-                    return Err(miss("quantile requires scalar"));
-                };
-                let mut groups: BTreeMap<Labels, Vec<(f64, f64)>> = BTreeMap::new();
-                for (mut labels, value) in vector(input(1)?)? {
-                    if let Some(le) = labels.remove("le").and_then(|s| s.parse::<f64>().ok()) {
-                        groups.entry(no_name(labels)).or_default().push((le, value));
-                    }
-                }
-                let rows = groups
-                    .into_iter()
-                    .flat_map(|(labels, buckets)| {
-                        buckets.into_iter().map(move |(bound, count)| {
-                            vec![
-                                native_labels(&labels),
-                                physical::values::Value::Float64(bound),
-                                physical::values::Value::Float64(count),
-                            ]
-                        })
-                    })
-                    .collect();
-                Ok(Value::Vector(native_window(
-                    rows,
-                    planner_types::pre_asap::AggIntent::HistogramQuantile { q: quantile },
-                    None,
-                    context,
-                )?))
-            }
-            QueryTimeOperator::Subquery {
-                range_ms,
-                step_ms,
-                offset_ms,
-            } => {
-                let (start, end, _) = subquery_grid(at, range_ms, step_ms, offset_ms)?;
-                let mut values: BTreeMap<Labels, Vec<(i64, f64)>> = BTreeMap::new();
-                if inputs.len() != dependencies.len() {
-                    return Err(miss("subquery grid input mismatch"));
-                }
-                for (value, (_, time)) in inputs.iter().zip(dependencies) {
-                    for (labels, value) in vector((**value).clone())? {
-                        values.entry(labels).or_default().push((*time, value));
-                    }
-                }
-                Ok(Value::Matrix(values.into_iter().collect(), start, end))
-            }
-        }
-    }
-}
-
-fn subquery_grid(
-    at: i64,
-    range_ms: u64,
-    step_ms: u64,
-    offset_ms: i64,
-) -> Result<(i64, i64, Vec<i64>), EngineError> {
-    let end = at
-        .checked_sub(offset_ms)
-        .ok_or_else(|| miss("offset overflow"))?;
-    let range = i64::try_from(range_ms).map_err(|_| miss("range overflow"))?;
-    let step = i64::try_from(step_ms).map_err(|_| miss("step overflow"))?;
-    if step <= 0 || range / step > 100_000 {
-        return Err(miss("invalid or excessive subquery steps"));
-    }
-    let start = end
-        .checked_sub(range)
-        .ok_or_else(|| miss("range overflow"))?;
-    let mut time = start
-        .div_euclid(step)
-        .checked_add(1)
-        .and_then(|n| n.checked_mul(step))
-        .ok_or_else(|| miss("subquery grid overflow"))?;
-    let mut times = Vec::new();
-    while time <= end {
-        times.push(time);
-        time = time
-            .checked_add(step)
-            .ok_or_else(|| miss("subquery time overflow"))?;
-    }
-    Ok((start, end, times))
-}
-fn expanded_inputs(node: &QueryPlanNode, at: i64) -> Result<Vec<(QueryNodeId, i64)>, EngineError> {
-    match node {
-        QueryPlanNode::Logical {
-            operator:
-                QueryTimeOperator::Scan { .. }
-                | QueryTimeOperator::ExactSubquery { .. }
-                | QueryTimeOperator::CandidateExactSubquery { .. },
-            ..
-        } => Err(miss(
-            "installed leaf was not prepared; local raw execution is forbidden",
-        )),
-        QueryPlanNode::Logical {
-            operator:
-                QueryTimeOperator::Subquery {
-                    range_ms,
-                    step_ms,
-                    offset_ms,
-                },
-            inputs,
-        } => {
-            let [input] = inputs.as_slice() else {
-                return Err(miss("subquery requires one input"));
-            };
-            let (_, _, times) = subquery_grid(at, *range_ms, *step_ms, *offset_ms)?;
-            Ok(times.into_iter().map(|time| (*input, time)).collect())
-        }
-        QueryPlanNode::Logical {
-            operator: QueryTimeOperator::CurrentSeries { .. },
-            ..
-        } => Ok(vec![]),
-        QueryPlanNode::PhysicalFragment { inputs, .. } | QueryPlanNode::Logical { inputs, .. } => {
-            Ok(inputs.iter().map(|&id| (id, at)).collect())
-        }
-        QueryPlanNode::RelationalJoin { inputs, .. } => {
-            Ok(inputs.iter().map(|&id| (id, at)).collect())
-        }
-        _ => Ok(vec![]),
-    }
-}
-struct BoundValueOperator<'a, 'entry, F> {
-    id: QueryNodeId,
-    time: i64,
-    node: &'entry QueryPlanNode,
-    dependencies: Vec<(QueryNodeId, i64)>,
-    runtime: &'a RefCell<ValueRuntime<'entry, F>>,
-    error: &'a RefCell<Option<EngineError>>,
-}
-impl<F: FnMut(QueryNodeId, u64) -> Result<QueryResult, EngineError>>
-    physical::PhysicalOperator<Value, ()> for BoundValueOperator<'_, '_, F>
-{
-    fn name(&self) -> &str {
-        "InstalledValueOperator"
-    }
-    fn input_schemas(&self) -> Vec<()> {
-        vec![(); self.dependencies.len()]
-    }
-    fn output_schema(&self) {}
-    fn output_bytes(&self, value: &Value) -> usize {
-        fn labels(value: &Labels) -> usize {
-            value.iter().map(|(k, v)| k.len() + v.len()).sum()
-        }
-        match value {
-            Value::Scalar(_) => 8,
-            Value::Vector(values) => values.iter().map(|(key, _)| labels(key) + 8).sum(),
-            Value::Matrix(values, ..) => values
-                .iter()
-                .map(|(key, points)| labels(key) + points.len() * 16)
-                .sum(),
-        }
-    }
-    fn start<'a>(
-        &'a self,
-        inputs: Vec<physical::Input<'a, Value>>,
-        context: physical::RunContext,
-    ) -> Result<physical::OutputStream<'a, Value>, physical::Error> {
-        Ok(futures::stream::once(async move {
-            let values =
-                futures::future::try_join_all(inputs.into_iter().map(|mut input| async move {
-                    input.next().await.ok_or_else(|| {
-                        physical::Error::Operator("query input produced no value".into())
-                    })?
-                }))
-                .await?;
-            let values = values.iter().map(|v| v.value()).collect::<Vec<_>>();
-            self.runtime
-                .borrow_mut()
-                .execute_node(
-                    self.id,
-                    self.time,
-                    self.node,
-                    &values,
-                    &self.dependencies,
-                    &context,
-                )
-                .map_err(|error| {
-                    *self.error.borrow_mut() = Some(error);
-                    physical::Error::Operator(format!(
-                        "query node {} at {} failed",
-                        self.id.0, self.time
-                    ))
-                })
-        })
-        .boxed_local())
-    }
-}
-
-fn pruning_warning(completeness: Option<&CandidateCompleteness>) -> Option<String> {
-    match completeness {
-        None | Some(CandidateCompleteness::Certified { .. }) => None,
-        Some(CandidateCompleteness::BestEffort { guarantee }) => Some(match guarantee {
-            Some(guarantee) => format!(
-                "ASAP membership pruning is approximate: {:?}",
-                guarantee.metric
-            ),
-            None => "ASAP membership pruning is approximate and uncertified".into(),
-        }),
-    }
-}
-
-#[cfg(test)]
-fn semi_join(
-    candidates: Vector,
-    values: Vector,
-    keys: &[(String, String)],
-    completeness: Option<&CandidateCompleteness>,
-    context: &physical::RunContext,
-) -> Result<(Vector, Option<String>), EngineError> {
-    use planner_types::{
-        post_asap::{SummaryFamilyType, SummaryField, SummarySchema},
-        pre_asap::{CompareOpKind, DataType, Predicate, QueryExpr},
-    };
-    use std::{rc::Rc, sync::Arc};
-    let schema = |right: bool| {
-        Arc::new(SummarySchema {
-            fields: keys
-                .iter()
-                .map(|(l, r)| {
-                    let name = if right { r } else { l };
-                    SummaryField {
-                        name: name.clone(),
-                        dtype: SummaryFamilyType::Plain(if name == "value" {
-                            DataType::Float64
-                        } else {
-                            DataType::Utf8
-                        }),
-                        nullable: false,
-                    }
-                })
-                .collect(),
-            time_index: None,
-        })
-    };
-    let left = schema(false);
-    let right = schema(true);
-    let predicate = Predicate(Rc::new(QueryExpr::BoolAnd(
-        (0..keys.len())
-            .map(|i| QueryExpr::Compare {
-                left: Rc::new(QueryExpr::Column(i)),
-                op: CompareOpKind::Eq,
-                right: Rc::new(QueryExpr::Column(keys.len() + i)),
-            })
-            .collect(),
-    )));
-    let rows = native_values::relation(
-        values,
-        candidates,
-        predicate,
-        left.clone(),
-        right,
-        left,
-        completeness.cloned(),
-        0,
-        context.clone(),
-    )?;
-    Ok((rows, pruning_warning(completeness)))
-}
-
-pub(super) fn native_scalar(
-    value: f64,
-    context: &physical::RunContext,
-) -> Result<f64, EngineError> {
-    use physical::{batch_execution::evaluate_source, operators::Operator, values::Value as Cell};
-    let source = Operator::scalar(
-        Cell::Float64(value),
-        planner_types::pre_asap::DataType::Float64,
-    )
-    .map_err(EngineError::from)?;
-    let batches = evaluate_source(source, context.clone()).map_err(EngineError::from)?;
-    match batches
-        .first()
-        .and_then(|b| b.rows().first())
-        .and_then(|r| r.first())
-    {
-        Some(Cell::Float64(value)) => Ok(*value),
-        _ => Err(miss("native scalar source returned invalid output")),
-    }
-}
-
-fn native_labels(labels: &Labels) -> physical::values::Value {
-    physical::values::Value::Map(
-        labels
-            .iter()
-            .map(|(k, v)| {
-                (
-                    physical::values::Value::Utf8(k.as_str().into()),
-                    physical::values::Value::Utf8(v.as_str().into()),
-                )
-            })
-            .collect::<Vec<_>>()
-            .into(),
-    )
-}
-fn native_vector_batch(
-    values: Vector,
-    grouping: &Grouping,
-) -> Result<physical::values::Batch, EngineError> {
-    use physical::values::{Batch, Value as Cell};
-    use planner_types::{
-        post_asap::{SummaryFamilyType, SummaryField, SummarySchema},
-        pre_asap::DataType,
-    };
-    let label_type = DataType::Map {
-        key: Box::new(DataType::Utf8),
-        value: Box::new(DataType::Utf8),
-        value_nullable: false,
-    };
-    let schema = std::sync::Arc::new(SummarySchema {
-        fields: vec![
-            ("labels", label_type.clone()),
-            ("group", label_type),
-            ("value", DataType::Float64),
-        ]
-        .into_iter()
-        .map(|(name, dtype)| SummaryField {
-            name: name.into(),
-            dtype: SummaryFamilyType::Plain(dtype),
-            nullable: false,
-        })
-        .collect(),
-        time_index: None,
-    });
-    let rows = values
-        .into_iter()
-        .map(|(labels, value)| {
-            vec![
-                native_labels(&labels),
-                native_labels(&grouping_key(&labels, grouping)),
-                Cell::Float64(value),
-            ]
-        })
-        .collect();
-    Batch::try_new(schema, rows).map_err(EngineError::from)
-}
-fn native_batch_rows(
-    batch: physical::values::Batch,
-    ops: Vec<physical::operators::Operator>,
-    context: &physical::RunContext,
-) -> Result<Vec<Vec<physical::values::Value>>, EngineError> {
-    physical::batch_execution::evaluate_batch(batch, ops, context.clone())
-        .map(|batches| {
-            batches
-                .into_iter()
-                .flat_map(|batch| batch.rows().to_vec())
-                .collect()
-        })
-        .map_err(EngineError::from)
-}
-fn native_vector_output(
-    rows: Vec<Vec<physical::values::Value>>,
-    label_column: usize,
-    value_column: usize,
-) -> Result<Vector, EngineError> {
-    use physical::values::Value as Cell;
-    rows.into_iter()
-        .map(|row| {
-            let Some(Cell::Map(entries)) = row.get(label_column) else {
-                return Err(miss("native operator returned invalid labels"));
-            };
-            let labels = entries
-                .iter()
-                .map(|(k, v)| match (k, v) {
-                    (Cell::Utf8(k), Cell::Utf8(v)) => Ok((k.to_string(), v.to_string())),
-                    _ => Err(miss("native label map is not Utf8")),
-                })
-                .collect::<Result<Labels, _>>()?;
-            let value = match row.get(value_column) {
-                Some(Cell::Float64(value)) => *value,
-                Some(Cell::Int64(value)) if value.unsigned_abs() <= (1u64 << 53) => *value as f64,
-                _ => {
-                    return Err(miss(
-                        "native result is not representable in the query Float64 protocol",
-                    ))
-                }
-            };
-            Ok((labels, value))
-        })
-        .collect()
-}
-fn aggregate(
-    operation: Aggregation,
-    grouping: &Grouping,
-    values: Vector,
-    context: &physical::RunContext,
-) -> Result<Vector, EngineError> {
-    use physical::operators::{Operator, Reduction};
-    let batch = native_vector_batch(values, grouping)?;
-    let reduction = match operation {
-        Aggregation::Sum => Reduction::Sum(2),
-        Aggregation::Avg => Reduction::Avg(2),
-        Aggregation::Count => Reduction::Count,
-        Aggregation::Max => Reduction::Max(2),
-        Aggregation::Min => Reduction::Min(2),
-    };
-    let operator = Operator::aggregate(
-        batch.schema().clone(),
-        vec![1],
-        vec![("value".into(), reduction)],
-    )
-    .map_err(EngineError::from)?;
-    native_vector_output(native_batch_rows(batch, vec![operator], context)?, 0, 1)
-}
-
-fn negate(value: Value, context: &physical::RunContext) -> Result<Value, EngineError> {
-    use physical::operators::{Expression, Operator};
-    let scalar = matches!(value, Value::Scalar(_));
-    let values = match value {
-        Value::Scalar(v) => vec![(Labels::new(), v)],
-        Value::Vector(v) => v,
-        _ => return Err(miss("cannot negate range vector")),
-    };
-    let batch = native_vector_batch(
-        values,
-        &Grouping {
-            labels: vec![],
-            without: false,
-        },
-    )?;
-    let operator = Operator::project(
-        batch.schema().clone(),
-        vec![
-            ("labels".into(), Expression::Column(0)),
-            (
-                "value".into(),
-                Expression::Negate(Box::new(Expression::Column(2))),
-            ),
-        ],
-    )
-    .map_err(EngineError::from)?;
-    let result = native_vector_output(native_batch_rows(batch, vec![operator], context)?, 0, 1)?;
-    Ok(if scalar {
-        Value::Scalar(result[0].1)
-    } else {
-        Value::Vector(result)
-    })
-}
-fn vector_to_scalar(values: Vector, context: &physical::RunContext) -> Result<Value, EngineError> {
-    use physical::{operators::Operator, values::Value as Cell};
-    let batch = native_vector_batch(
-        values,
-        &Grouping {
-            labels: vec![],
-            without: false,
-        },
-    )?;
-    let operator =
-        Operator::vector_to_scalar(batch.schema().clone(), 2).map_err(EngineError::from)?;
-    let rows = native_batch_rows(batch, vec![operator], context)?;
-    match rows.first().and_then(|row| row.first()) {
-        Some(Cell::Float64(value)) => Ok(Value::Scalar(*value)),
-        _ => Err(miss("native scalar conversion returned invalid output")),
-    }
-}
-
-fn grouping_key(labels: &Labels, grouping: &Grouping) -> Labels {
-    labels
-        .iter()
-        .filter(|(key, _)| {
-            if grouping.without {
-                key.as_str() != "__name__" && !grouping.labels.contains(key)
-            } else {
-                grouping.labels.contains(key)
-            }
-        })
-        .map(|(key, value)| (key.clone(), value.clone()))
-        .collect()
-}
-
-/// Select by the child sample value while retaining every selected series'
-/// labels. NaN ranks below every numeric value, matching Prometheus' TOPK heap.
-/// Stable sorting also leaves equal-valued series in the child's order.
-#[cfg(test)]
-fn topk_selection(
-    k: u64,
-    grouping: &Grouping,
-    values: Vector,
-    context: &physical::RunContext,
-) -> Result<Vector, EngineError> {
-    use physical::operators::{Operator, SortKey};
-    let batch = native_vector_batch(values, grouping)?;
-    let sort = Operator::sort(
-        batch.schema().clone(),
-        vec![SortKey {
-            column: 2,
-            descending: true,
-            nulls_first: false,
-        }],
-        vec![1],
-    )
-    .map_err(EngineError::from)?;
-    let limit = Operator::limit(sort.schema(), k, 0, vec![1]).map_err(EngineError::from)?;
-    let mut output =
-        native_vector_output(native_batch_rows(batch, vec![sort, limit], context)?, 0, 2)?;
-    // The HTTP adapter preserves canonical label-group presentation; native Sort
-    // already determined score order within each group.
-    output.sort_by_key(|(labels, _)| grouping_key(labels, grouping));
-    Ok(output)
-}
-
-#[cfg(test)]
-fn binary(
-    operation: BinaryOperation,
-    boolean: bool,
-    left: Value,
-    right: Value,
-) -> Result<Value, EngineError> {
-    binary_in_context(operation, boolean, left, right, &test_native_context())
-}
-fn binary_in_context(
-    operation: BinaryOperation,
-    boolean: bool,
-    left: Value,
-    right: Value,
-    context: &physical::RunContext,
-) -> Result<Value, EngineError> {
-    use physical::{
-        operators::{Expression, Operator},
-        values::{Batch, Value as Cell},
-    };
-    use planner_types::{
-        post_asap::{BinaryOperator, SummaryFamilyType, SummaryField, SummarySchema},
-        pre_asap::{ArithmeticOpKind as A, BinaryOpKind, CompareOpKind as C, DataType},
-    };
-    let kind = match operation {
-        BinaryOperation::Add => BinaryOpKind::Arithmetic(A::Add),
-        BinaryOperation::Sub => BinaryOpKind::Arithmetic(A::Sub),
-        BinaryOperation::Mul => BinaryOpKind::Arithmetic(A::Mul),
-        BinaryOperation::Div | BinaryOperation::CheckedDiv | BinaryOperation::FiniteDiv => {
-            BinaryOpKind::Arithmetic(A::Div)
-        }
-        BinaryOperation::Mod => BinaryOpKind::Arithmetic(A::Mod),
-        BinaryOperation::Pow => BinaryOpKind::Arithmetic(A::Pow),
-        BinaryOperation::Equal => BinaryOpKind::Compare(C::Eq),
-        BinaryOperation::NotEqual => BinaryOpKind::Compare(C::Ne),
-        BinaryOperation::Less => BinaryOpKind::Compare(C::Lt),
-        BinaryOperation::LessEqual => BinaryOpKind::Compare(C::Le),
-        BinaryOperation::Greater => BinaryOpKind::Compare(C::Gt),
-        BinaryOperation::GreaterEqual => BinaryOpKind::Compare(C::Ge),
-    };
-    let arithmetic = matches!(kind, BinaryOpKind::Arithmetic(_));
-    let scalar_output = matches!((&left, &right), (Value::Scalar(_), Value::Scalar(_)));
-    if scalar_output && !arithmetic && !boolean {
-        return Err(miss("scalar comparison requires bool"));
-    }
-    if boolean
-        && matches!(
-            operation,
-            BinaryOperation::CheckedDiv | BinaryOperation::FiniteDiv
-        )
-    {
-        return Err(miss("checked division cannot return bool"));
-    }
-    // Matching and metric-name presentation are protocol bindings; all numeric
-    // computation and checked arithmetic execute in the shared operator.
-    let mut pairs = Vec::new();
-    let scalar_left = matches!(left, Value::Scalar(_));
-    match (left, right) {
-        (Value::Scalar(a), Value::Scalar(b)) => pairs.push((Labels::new(), a, b)),
-        (Value::Vector(values), Value::Scalar(b)) => {
-            for (labels, a) in vector(Value::Vector(values))? {
-                pairs.push((labels, a, b));
-            }
-        }
-        (Value::Scalar(a), Value::Vector(values)) => {
-            for (labels, b) in vector(Value::Vector(values))? {
-                pairs.push((labels, a, b));
-            }
-        }
-        (Value::Vector(left), Value::Vector(right)) => {
-            let mut rhs = BTreeMap::new();
-            for (labels, value) in right {
-                if rhs.insert(no_name(labels), value).is_some() {
-                    return Err(miss("duplicate vector matching labels"));
-                }
-            }
-            let mut seen = BTreeSet::new();
-            for (labels, value) in left {
-                let key = no_name(labels.clone());
-                if !seen.insert(key.clone()) {
-                    return Err(miss("duplicate vector matching labels"));
-                }
-                if let Some(right) = rhs.get(&key) {
-                    pairs.push((labels, value, *right));
-                }
-            }
-        }
-        _ => return Err(miss("binary matrix unsupported")),
-    }
-    let schema = std::sync::Arc::new(SummarySchema {
-        fields: ["left", "right"]
-            .into_iter()
-            .map(|name| SummaryField {
-                name: name.into(),
-                dtype: SummaryFamilyType::Plain(DataType::Float64),
-                nullable: false,
-            })
-            .collect(),
-        time_index: None,
-    });
-    let batch = Batch::try_new(
-        schema.clone(),
-        pairs
-            .iter()
-            .map(|(_, a, b)| vec![Cell::Float64(*a), Cell::Float64(*b)])
-            .collect(),
-    )
-    .map_err(EngineError::from)?;
-    let operator = Operator::project(
-        schema,
-        vec![(
-            "value".into(),
-            Expression::Binary {
-                operator: BinaryOperator {
-                    kind,
-                    vector_match: None,
-                    checked_relative_division: operation == BinaryOperation::CheckedDiv,
-                    checked_finite_division: operation == BinaryOperation::FiniteDiv,
-                },
-                left: Box::new(Expression::Column(0)),
-                right: Box::new(Expression::Column(1)),
-            },
-        )],
-    )
-    .map_err(EngineError::from)?;
-    let rows = native_batch_rows(batch, vec![operator], context)?;
-    let mut output = Vec::new();
-    for ((labels, a, b), row) in pairs.into_iter().zip(rows) {
-        let value = match row.first() {
-            Some(Cell::Float64(value)) => *value,
-            Some(Cell::Bool(value)) if boolean => {
-                if *value {
-                    1.
-                } else {
-                    0.
-                }
-            }
-            Some(Cell::Bool(true)) => {
-                if scalar_left {
-                    b
-                } else {
-                    a
-                }
-            }
-            Some(Cell::Bool(false)) => continue,
-            _ => return Err(miss("native binary result schema mismatch")),
-        };
-        output.push((
-            if arithmetic || boolean {
-                no_name(labels)
-            } else {
-                labels
-            },
-            value,
-        ));
-    }
-    if scalar_output {
-        return Ok(Value::Scalar(
-            output
-                .first()
-                .ok_or_else(|| miss("missing scalar result"))?
-                .1,
-        ));
-    }
-    Ok(Value::Vector(vector(Value::Vector(output))?))
-}
-
-fn native_temporal(
-    values: Matrix,
-    operation: TemporalOperation,
-    start: i64,
-    end: i64,
-    context: &physical::RunContext,
-) -> Result<Vector, EngineError> {
-    use planner_types::pre_asap::AggIntent;
-    let intent = match operation {
-        TemporalOperation::Rate => AggIntent::Rate,
-        TemporalOperation::Increase => AggIntent::Increase,
-        TemporalOperation::Sum => AggIntent::Sum { col: None },
-        TemporalOperation::Avg => AggIntent::Avg { col: None },
-        TemporalOperation::Min => AggIntent::Min { col: None },
-        TemporalOperation::Max => AggIntent::Max { col: None },
-        TemporalOperation::Count => AggIntent::Count {
-            accuracy: planner_types::types::AccuracyTarget::Exact,
-        },
-    };
-    let rows = values
-        .into_iter()
-        .flat_map(|(labels, points)| {
-            points.into_iter().map(move |(time, value)| {
-                vec![
-                    native_labels(&labels),
-                    physical::values::Value::Timestamp(time),
-                    physical::values::Value::Float64(value),
-                ]
-            })
-        })
-        .collect();
-    native_window(rows, intent, Some((start, end)), context)
-}
-fn native_window(
-    rows: Vec<Vec<physical::values::Value>>,
-    intent: planner_types::pre_asap::AggIntent<planner_types::pre_asap::ColumnRef>,
-    window: Option<(i64, i64)>,
-    context: &physical::RunContext,
-) -> Result<Vector, EngineError> {
-    use planner_types::{
-        post_asap::{SummaryFamilyType, SummaryField, SummarySchema},
-        pre_asap::DataType,
-    };
-    let schema = std::sync::Arc::new(SummarySchema {
-        fields: vec![
-            (
-                "labels",
-                DataType::Map {
-                    key: Box::new(DataType::Utf8),
-                    value: Box::new(DataType::Utf8),
-                    value_nullable: false,
-                },
-            ),
-            (
-                "coordinate",
-                if window.is_some() {
-                    DataType::Timestamp
-                } else {
-                    DataType::Float64
-                },
-            ),
-            ("value", DataType::Float64),
-        ]
-        .into_iter()
-        .map(|(name, dtype)| SummaryField {
-            name: name.into(),
-            dtype: SummaryFamilyType::Plain(dtype),
-            nullable: false,
-        })
-        .collect(),
-        time_index: None,
-    });
-    let batch =
-        physical::values::Batch::try_new(schema.clone(), rows).map_err(EngineError::from)?;
-    let operator = physical::operators::Operator::window(schema, intent, 1, 2, vec![0], window)
-        .map_err(EngineError::from)?;
-    native_vector_output(native_batch_rows(batch, vec![operator], context)?, 0, 1)
-}
-
-#[cfg(test)]
-fn test_native_context() -> physical::RunContext {
-    physical::RunContext::new(
-        physical::Scope::Query {
-            evaluation_time_ms: 0,
-            revision: 0,
-        },
-        physical::Limits::default(),
-    )
-    .unwrap()
-}
-
-#[cfg(test)]
-mod topk_tests {
-    use super::*;
-    use asap_types::query_plan::{FallbackPolicy, InstantExecution};
-
-    fn labels(items: &[(&str, &str)]) -> Labels {
-        items
-            .iter()
-            .map(|(key, value)| ((*key).into(), (*value).into()))
-            .collect()
-    }
-
-    // An overflowing sum cannot implement average, but zero/subnormal averages remain valid.
-    #[test]
-    fn finite_division_guards_temporal_average_without_rejecting_zero() {
-        let mut sum = asap_physical_operators::summary_kernels::sum::SumAccumulator::new();
-        sum.update(1e308);
-        sum.update(1e308);
-        assert!(binary(
-            BinaryOperation::FiniteDiv,
-            false,
-            Value::Scalar(sum.sum),
-            Value::Scalar(2.0)
-        )
-        .is_err());
-        for (a, b, expected) in [
-            (0.0, 2.0, 0.0),
-            (10.0, 2.0, 5.0),
-            (f64::MIN_POSITIVE, 2.0, f64::MIN_POSITIVE / 2.0),
-        ] {
-            let Value::Scalar(value) = binary(
-                BinaryOperation::FiniteDiv,
-                false,
-                Value::Scalar(a),
-                Value::Scalar(b),
-            )
-            .unwrap() else {
-                panic!("scalar")
-            };
-            assert_eq!(value, expected);
-        }
-        assert!(binary(
-            BinaryOperation::FiniteDiv,
-            false,
-            Value::Scalar(1.0),
-            Value::Scalar(0.0)
-        )
-        .is_err());
-    }
-
-    // A conditional accuracy certificate must fall back rather than return an unbounded ratio.
-    #[test]
-    fn checked_relative_division_enforces_its_execution_domain() {
-        for (a, b) in [
-            (1., 0.),
-            (0., 0.),
-            (1., f64::INFINITY),
-            (f64::NAN, 2.),
-            (f64::MAX, f64::MIN_POSITIVE),
-            (f64::MIN_POSITIVE, f64::MAX),
-        ] {
-            assert!(binary(
-                BinaryOperation::CheckedDiv,
-                false,
-                Value::Scalar(a),
-                Value::Scalar(b)
-            )
-            .is_err());
-        }
-        let Value::Scalar(value) = binary(
-            BinaryOperation::CheckedDiv,
-            false,
-            Value::Scalar(5.),
-            Value::Scalar(10.),
-        )
-        .unwrap() else {
-            panic!("scalar");
-        };
-        assert_eq!(value, 0.5);
-    }
-
-    #[test]
-    fn topk_selects_by_sample_value_and_preserves_series_labels() {
-        let values = vec![
-            (
-                labels(&[("__name__", "cpu"), ("job", "api"), ("pod", "a")]),
-                4.0,
-            ),
-            (
-                labels(&[("__name__", "cpu"), ("job", "api"), ("pod", "b")]),
-                9.0,
-            ),
-            (
-                labels(&[("__name__", "cpu"), ("job", "db"), ("pod", "c")]),
-                7.0,
-            ),
-            (
-                labels(&[("__name__", "cpu"), ("job", "db"), ("pod", "d")]),
-                2.0,
-            ),
-        ];
-        let selected = topk_selection(
-            1,
-            &Grouping {
-                labels: vec!["job".into()],
-                without: false,
-            },
-            values,
-            &test_native_context(),
-        )
-        .unwrap();
-        assert_eq!(selected.len(), 2);
-        assert_eq!(selected[0].0["pod"], "b");
-        assert_eq!(selected[0].1, 9.0);
-        assert_eq!(selected[1].0["pod"], "c");
-        assert_eq!(selected[1].1, 7.0);
-        assert!(selected
-            .iter()
-            .all(|(labels, _)| labels.contains_key("__name__")));
-    }
-
-    #[test]
-    fn topk_ranks_nan_below_numbers_and_keeps_exact_child_values() {
-        let selected = topk_selection(
-            2,
-            &Grouping {
-                labels: vec![],
-                without: false,
-            },
-            vec![
-                (labels(&[("series", "nan")]), f64::NAN),
-                (labels(&[("series", "low")]), -1.0),
-                (labels(&[("series", "high")]), 3.0),
-            ],
-            &test_native_context(),
-        )
-        .unwrap();
-        let selected = topk_selection(
-            2,
-            &Grouping {
-                labels: vec![],
-                without: false,
-            },
-            selected,
-            &test_native_context(),
-        )
-        .unwrap();
-        assert_eq!(
-            selected
-                .iter()
-                .map(|row| row.0["series"].as_str())
-                .collect::<Vec<_>>(),
-            vec!["high", "low"]
-        );
-        assert_eq!(
-            selected.iter().map(|row| row.1).collect::<Vec<_>>(),
-            vec![3.0, -1.0]
-        );
-    }
-
-    #[test]
-    fn installed_topk_combines_with_prometheus_exact_child() {
-        let mut entry = control_plane::query_plan::query_time::compile_logical(
-            "hybrid-topk".into(),
-            "topk(2, m)".into(),
-            InstantExecution {
-                lookback_ms: 300_000,
-                full_history: false,
-                cumulative_readout: false,
-            },
-            FallbackPolicy::ExactBackend,
-        )
-        .unwrap();
-        control_plane::query_plan::query_time::finalize_query_time_nodes(&mut entry).unwrap();
-        let leaf = entry
-            .nodes
-            .iter()
-            .find_map(|(id, node)| {
-                matches!(
-                    node,
-                    QueryPlanNode::Logical {
-                        operator: QueryTimeOperator::ExactSubquery { .. },
-                        ..
-                    }
-                )
-                .then_some(*id)
-            })
-            .unwrap();
-        let at = 1_000_u64;
-        let leaves = [(
-            (leaf, at as i64),
-            PreparedLeaf {
-                value: Value::Vector(vec![
-                    (labels(&[("pod", "a")]), 1.0),
-                    (labels(&[("pod", "b")]), 8.0),
-                    (labels(&[("pod", "c")]), 5.0),
-                ]),
-                remote: true,
-                remote_evaluations: 1,
-                remote_rpcs: 1,
-            },
-        )]
-        .into_iter()
-        .collect();
-        let (result, stats) = execute_installed(&entry, &leaves, at, |_, _| {
-            panic!("summary callback must not run for an exact-child topk")
-        })
-        .unwrap();
-        let QueryResult::Vector(result) = result else {
-            panic!("instant vector expected")
-        };
-        assert_eq!(
-            result
-                .values
-                .iter()
-                .map(|point| point.value)
-                .collect::<Vec<_>>(),
-            vec![8.0, 5.0]
-        );
-        assert_eq!(stats.remote_branch_evaluations, 1);
-        assert_eq!(stats.remote_rpcs, 1);
-        assert_eq!(stats.raw_scan_evaluations, 0);
-    }
-
-    // A temporal operator over an external subquery follows the same language
-    // policy as a summary readout; changing execution placement cannot drop names.
-    #[test]
-    fn metricsql_temporal_subdag_preserves_names_only_for_value_rollups() {
-        use control_plane::query_plan::QueryLanguage;
-        for language in [QueryLanguage::PromQl, QueryLanguage::MetricsQl] {
-            for operation in [
-                TemporalOperation::Max,
-                TemporalOperation::Min,
-                TemporalOperation::Avg,
-                TemporalOperation::Sum,
-                TemporalOperation::Count,
-                TemporalOperation::Rate,
-            ] {
-                let entry = QueryPlanEntry {
-                    language,
-                    query_id: "labels".into(),
-                    canonical_query: "test".into(),
-                    fixed_evaluation: None,
-                    root: QueryNodeId(1),
-                    nodes: BTreeMap::from([
-                        (
-                            QueryNodeId(0),
-                            QueryPlanNode::Logical {
-                                operator: QueryTimeOperator::ExactSubquery {
-                                    query: "m[1s]".into(),
-                                },
-                                inputs: vec![],
-                            },
-                        ),
-                        (
-                            QueryNodeId(1),
-                            QueryPlanNode::Logical {
-                                operator: QueryTimeOperator::Temporal { operation },
-                                inputs: vec![QueryNodeId(0)],
-                            },
-                        ),
-                    ]),
-                    instant: InstantExecution {
-                        lookback_ms: 1000,
-                        full_history: false,
-                        cumulative_readout: true,
-                    },
-                    fallback: FallbackPolicy::ExactBackend,
-                };
-                let leaves = BTreeMap::from([(
-                    (QueryNodeId(0), 1000),
-                    PreparedLeaf {
-                        value: Value::Matrix(
-                            vec![(
-                                labels(&[("__name__", "m"), ("job", "api")]),
-                                vec![(100, 1.), (900, 3.)],
-                            )],
-                            0,
-                            1000,
-                        ),
-                        remote: true,
-                        remote_evaluations: 1,
-                        remote_rpcs: 1,
-                    },
-                )]);
-                let (result, _) = execute_installed(&entry, &leaves, 1000, |_, _| {
-                    panic!("external child supplied")
-                })
-                .unwrap();
-                let QueryResult::Vector(result) = result else {
-                    panic!("vector required")
-                };
-                let expected = language == QueryLanguage::MetricsQl
-                    && matches!(
-                        operation,
-                        TemporalOperation::Max | TemporalOperation::Min | TemporalOperation::Avg
-                    );
-                assert_eq!(
-                    result.values[0]
-                        .label_keys_override
-                        .as_ref()
-                        .unwrap()
-                        .iter()
-                        .any(|name| name == "__name__"),
-                    expected,
-                    "{language:?} {operation:?}"
-                );
-            }
-        }
-    }
-
-    #[test]
-    fn installed_topk_ranks_exact_rate_summary_values() {
-        let summary = QueryNodeId(0);
-        let root = QueryNodeId(1);
-        let entry = QueryPlanEntry {
-            language: asap_types::query_plan::QueryLanguage::PromQl,
-            query_id: "summary-rate-topk".into(),
-            canonical_query: "topk(2, rate(requests_total[5m]))".into(),
-            fixed_evaluation: None,
-            root,
-            nodes: BTreeMap::from([
-                (
-                    summary,
-                    QueryPlanNode::ExactReadout {
-                        input: QueryNodeId(99),
-                        readout: asap_types::query_plan::ExactReadout::Rate,
-                    },
-                ),
-                (
-                    root,
-                    QueryPlanNode::Logical {
-                        operator: QueryTimeOperator::Limit {
-                            offset: 0,
-                            n: 2,
-                            grouping: Grouping {
-                                labels: vec![],
-                                without: false,
-                            },
-                        },
-                        inputs: vec![QueryNodeId(98)],
-                    },
-                ),
-                (
-                    QueryNodeId(98),
-                    QueryPlanNode::Logical {
-                        operator: QueryTimeOperator::Sort {
-                            descending: true,
-                            grouping: Grouping {
-                                labels: vec![],
-                                without: false,
-                            },
-                        },
-                        inputs: vec![summary],
-                    },
-                ),
-            ]),
-            instant: InstantExecution {
-                lookback_ms: 300_000,
-                full_history: false,
-                cumulative_readout: false,
-            },
-            fallback: FallbackPolicy::ExactBackend,
-        };
-        let (result, stats) = execute_installed(&entry, &BTreeMap::new(), 300_000, |id, at| {
-            assert_eq!(id, summary);
-            assert_eq!(at, 300_000);
-            Ok(QueryResult::Vector(
-                crate::query_engines::query_result::InstantVector {
-                    values: vec![
-                        InstantVectorElement::new(
-                            KeyByLabelValues::new_with_labels(vec!["a".into()]),
-                            0.4,
-                        )
-                        .with_label_keys_override(vec!["pod".into()]),
-                        InstantVectorElement::new(
-                            KeyByLabelValues::new_with_labels(vec!["b".into()]),
-                            1.2,
-                        )
-                        .with_label_keys_override(vec!["pod".into()]),
-                        InstantVectorElement::new(
-                            KeyByLabelValues::new_with_labels(vec!["c".into()]),
-                            0.8,
-                        )
-                        .with_label_keys_override(vec!["pod".into()]),
-                    ],
-                    timestamp: at,
-                    warnings: vec![],
-                    accuracy: None,
-                    window_used: Some((0, at)),
-                },
-            ))
-        })
-        .unwrap();
-        let QueryResult::Vector(result) = result else {
-            panic!("instant vector expected")
-        };
-        assert_eq!(
-            result
-                .values
-                .iter()
-                .map(|point| point.value)
-                .collect::<Vec<_>>(),
-            vec![1.2, 0.8]
-        );
-        assert_eq!(stats.summary_readout_evaluations, 1);
-        assert_eq!(stats.remote_branch_evaluations, 0);
-    }
-
-    fn topk_membership_guarantee() -> planner_types::post_asap::ResultGuarantee {
-        use planner_types::post_asap::{BoundExpr, ErrorMetric, ProbabilityExpr, ResultGuarantee};
-        ResultGuarantee {
-            metric: ErrorMetric::TopKMembership,
-            bound: BoundExpr::Zero,
-            failure_probability: ProbabilityExpr::Constant { value: 0.01 },
-            provenance: vec![],
-        }
-    }
-
-    // Numeric boundary fields must reach Planner as numbers, never absent labels.
-    #[test]
-    fn semi_join_does_not_match_unequal_numeric_samples() {
-        let (rows, _) = semi_join(
-            vec![(Labels::new(), 2.0)],
-            vec![(Labels::new(), 1.0)],
-            &[("value".into(), "value".into())],
-            None,
-            &test_native_context(),
-        )
-        .unwrap();
-        assert!(rows.is_empty(), "unequal numeric samples matched: {rows:?}");
-    }
-
-    #[test]
-    fn native_join_preserves_renamed_and_multiple_typed_keys() {
-        let left = vec![
-            (
-                labels(&[("instance", "a"), ("zone", "east"), ("extra", "kept")]),
-                1.,
-            ),
-            (labels(&[("instance", "a"), ("zone", "west")]), 2.),
-        ];
-        let right = vec![(labels(&[("pod", "a"), ("region", "east")]), 99.)];
-        let (selected, _) = semi_join(
-            right,
-            left.clone(),
-            &[
-                ("instance".into(), "pod".into()),
-                ("zone".into(), "region".into()),
-            ],
-            None,
-            &test_native_context(),
-        )
-        .unwrap();
-        assert_eq!(selected, vec![left[0].clone()]);
-        for (a, b, matched) in [(f64::NAN, f64::NAN, false), (-0., 0., true), (1., 1., true)] {
-            let (rows, _) = semi_join(
-                vec![(Labels::new(), b)],
-                vec![(Labels::new(), a)],
-                &[("value".into(), "value".into())],
-                None,
-                &test_native_context(),
-            )
-            .unwrap();
-            assert_eq!(!rows.is_empty(), matched);
-        }
-    }
-
-    #[test]
-    fn candidate_sidecar_intersects_then_reranks_exact_values() {
-        let candidates = vec![
-            (labels(&[("pod", "b")]), 99.0),
-            (labels(&[("pod", "c")]), 50.0),
-        ];
-        let exact = vec![
-            (labels(&[("pod", "a")]), 10.0),
-            (labels(&[("pod", "b")]), 8.0),
-            (labels(&[("pod", "c")]), 9.0),
-        ];
-        let (selected, warning) = semi_join(
-            candidates,
-            exact,
-            &[("pod".into(), "pod".into())],
-            Some(&CandidateCompleteness::Certified {
-                guarantee: topk_membership_guarantee(),
-            }),
-            &test_native_context(),
-        )
-        .unwrap();
-        let selected = topk_selection(
-            2,
-            &Grouping {
-                labels: vec![],
-                without: false,
-            },
-            selected,
-            &test_native_context(),
-        )
-        .unwrap();
-        assert_eq!(
-            selected
-                .iter()
-                .map(|row| row.0["pod"].as_str())
-                .collect::<Vec<_>>(),
-            vec!["c", "b"]
-        );
-        assert!(warning.is_none());
-    }
-
-    #[test]
-    fn installed_candidate_sidecar_reads_both_summary_inputs() {
-        let candidate_id = QueryNodeId(0);
-        let value_id = QueryNodeId(1);
-        let filter = QueryNodeId(2);
-        let root = QueryNodeId(3);
-        let entry = QueryPlanEntry {
-            language: asap_types::query_plan::QueryLanguage::PromQl,
-            query_id: "candidate-topk".into(),
-            canonical_query: "topk(1, rate(requests_total[5m]))".into(),
-            fixed_evaluation: None,
-            root,
-            nodes: BTreeMap::from([
-                (
-                    candidate_id,
-                    QueryPlanNode::ExactFallback {
-                        reason: "prepared sketch readout".into(),
-                    },
-                ),
-                (
-                    value_id,
-                    QueryPlanNode::ExactFallback {
-                        reason: "prepared exact counter readout".into(),
-                    },
-                ),
-                (filter, {
-                    let schema = planner_types::post_asap::SummarySchema {
-                        fields: vec![planner_types::post_asap::SummaryField {
-                            name: "pod".into(),
-                            dtype: planner_types::post_asap::SummaryFamilyType::Plain(
-                                planner_types::pre_asap::DataType::Utf8,
-                            ),
-                            nullable: false,
-                        }],
-                        time_index: None,
-                    };
-                    QueryPlanNode::RelationalJoin {
-                        inputs: [value_id, candidate_id],
-                        join_kind: planner_types::pre_asap::JoinKind::Semi,
-                        pred: serde_json::to_value(planner_types::pre_asap::Predicate(
-                            std::rc::Rc::new(planner_types::pre_asap::QueryExpr::Compare {
-                                left: std::rc::Rc::new(planner_types::pre_asap::QueryExpr::Column(
-                                    0,
-                                )),
-                                op: planner_types::pre_asap::CompareOpKind::Eq,
-                                right: std::rc::Rc::new(
-                                    planner_types::pre_asap::QueryExpr::Column(1),
-                                ),
-                            }),
-                        ))
-                        .unwrap(),
-                        pruning: Some(CandidateCompleteness::Certified {
-                            guarantee: topk_membership_guarantee(),
-                        }),
-                        left_schema: schema.clone(),
-                        right_schema: schema.clone(),
-                        output_schema: schema,
-                    }
-                }),
-                (
-                    root,
-                    QueryPlanNode::Logical {
-                        operator: QueryTimeOperator::Limit {
-                            offset: 0,
-                            n: 1,
-                            grouping: Grouping {
-                                labels: vec![],
-                                without: false,
-                            },
-                        },
-                        inputs: vec![QueryNodeId(98)],
-                    },
-                ),
-                (
-                    QueryNodeId(98),
-                    QueryPlanNode::Logical {
-                        operator: QueryTimeOperator::Sort {
-                            descending: true,
-                            grouping: Grouping {
-                                labels: vec![],
-                                without: false,
-                            },
-                        },
-                        inputs: vec![filter],
-                    },
-                ),
-            ]),
-            instant: InstantExecution {
-                lookback_ms: 300_000,
-                full_history: false,
-                cumulative_readout: false,
-            },
-            fallback: FallbackPolicy::ExactBackend,
-        };
-        let at = 300_000_i64;
-        let leaves = BTreeMap::from([
-            (
-                (candidate_id, at),
-                PreparedLeaf {
-                    value: Value::Vector(vec![
-                        (labels(&[("pod", "b")]), 100.0),
-                        (labels(&[("pod", "c")]), 1.0),
-                    ]),
-                    remote: false,
-                    remote_evaluations: 0,
-                    remote_rpcs: 0,
-                },
-            ),
-            (
-                (value_id, at),
-                PreparedLeaf {
-                    value: Value::Vector(vec![
-                        (labels(&[("pod", "a")]), 2.0),
-                        (labels(&[("pod", "b")]), 1.0),
-                        (labels(&[("pod", "c")]), 3.0),
-                    ]),
-                    remote: false,
-                    remote_evaluations: 0,
-                    remote_rpcs: 0,
-                },
-            ),
-        ]);
-        let (result, stats) = execute_installed(&entry, &leaves, at as u64, |_, _| {
-            panic!("both inputs are prepared")
-        })
-        .unwrap();
-        let QueryResult::Vector(result) = result else {
-            panic!("vector expected")
-        };
-        assert_eq!(result.values.len(), 1);
-        assert_eq!(result.values[0].value, 3.0, "exact value is authoritative");
-        assert_eq!(result.values[0].labels.labels, vec!["c"]);
-        assert_eq!(stats.summary_readout_evaluations, 2);
-        assert!(result.warnings.is_empty());
-    }
-
-    #[test]
-    fn uncertified_candidate_sidecar_warns_or_falls_back_explicitly() {
-        let candidates = vec![(labels(&[("pod", "a")]), 1.0)];
-        let exact = vec![(labels(&[("pod", "a")]), 2.0)];
-        let (_, warning) = semi_join(
-            candidates.clone(),
-            exact.clone(),
-            &[("pod".into(), "pod".into())],
-            Some(&CandidateCompleteness::BestEffort { guarantee: None }),
-            &test_native_context(),
-        )
-        .unwrap();
-        assert!(warning.unwrap().contains("approximate"));
-        // Exact queries never lower an uncertified pruning semi-join. The Planner
-        // emits its ordinary exact fallback instead; this runtime node is only
-        // valid for certified or explicitly approximate plans.
-        let certified = CandidateCompleteness::Certified {
-            guarantee: topk_membership_guarantee(),
-        };
-        assert!(semi_join(
-            vec![(labels(&[("pod", "missing")]), 1.0)],
-            exact,
-            &[("pod".into(), "pod".into())],
-            Some(&certified),
-            &test_native_context(),
-        )
-        .is_err());
-    }
-}
-
-#[cfg(test)]
-mod shared_runtime_tests {
-    use super::*;
-    use asap_types::query_plan::{FallbackPolicy, InstantExecution, QueryLanguage};
-
-    fn entry() -> QueryPlanEntry {
-        QueryPlanEntry {
-            language: QueryLanguage::PromQl,
-            query_id: "shared-grid".into(),
-            canonical_query: "shared-grid".into(),
-            fixed_evaluation: None,
-            root: QueryNodeId(3),
-            // The callback owns the absorbed summary dependencies. Only its
-            // declared readout boundary participates in this value graph.
-            nodes: BTreeMap::from([
-                (
-                    QueryNodeId(0),
-                    QueryPlanNode::ExactReadout {
-                        input: QueryNodeId(99),
-                        readout: asap_types::query_plan::ExactReadout::Sum,
-                    },
-                ),
-                (
-                    QueryNodeId(1),
-                    QueryPlanNode::Logical {
-                        operator: QueryTimeOperator::Subquery {
-                            range_ms: 2000,
-                            step_ms: 1000,
-                            offset_ms: 0,
-                        },
-                        inputs: vec![QueryNodeId(0)],
-                    },
-                ),
-                (
-                    QueryNodeId(2),
-                    QueryPlanNode::Logical {
-                        operator: QueryTimeOperator::Temporal {
-                            operation: TemporalOperation::Sum,
-                        },
-                        inputs: vec![QueryNodeId(1)],
-                    },
-                ),
-                (
-                    QueryNodeId(3),
-                    QueryPlanNode::Logical {
-                        operator: QueryTimeOperator::Binary {
-                            operation: BinaryOperation::Add,
-                            return_bool: false,
-                        },
-                        inputs: vec![QueryNodeId(2), QueryNodeId(2)],
-                    },
-                ),
-            ]),
-            instant: InstantExecution {
-                lookback_ms: 2000,
-                full_history: false,
-                cumulative_readout: false,
-            },
-            fallback: FallbackPolicy::ExactBackend,
-        }
-    }
-
-    // A shared time-grid node runs once per query; distinct times and runs stay isolated.
-    #[test]
-    fn shared_subquery_scopes_do_not_duplicate_or_leak_values() {
-        let entry = entry();
-        let mut calls = Vec::new();
-        for (at, expected) in [(3000, 10.), (4000, 14.)] {
-            let (result, stats) = execute_installed(&entry, &BTreeMap::new(), at, |id, time| {
-                assert_eq!(id, QueryNodeId(0));
-                calls.push(time);
-                Ok(QueryResult::vector(
-                    vec![InstantVectorElement::new(
-                        KeyByLabelValues::new_with_labels(vec!["a".into()]),
-                        time as f64 / 1000.,
-                    )
-                    .with_label_keys_override(vec!["pod".into()])],
-                    time,
-                ))
-            })
-            .unwrap();
-            let QueryResult::Vector(result) = result else {
-                panic!("vector required");
-            };
-            assert_eq!(result.values[0].value, expected);
-            assert_eq!(stats.summary_readout_evaluations, 2);
-            assert!(stats.memo_hits >= 1);
-        }
-        assert_eq!(calls, vec![2000, 3000, 3000, 4000]);
-    }
-
-    // Query adapters use native computation and its parent execution budget.
-    #[test]
-    fn native_scalar_and_aggregation_share_parent_resource_control() {
-        let context = test_native_context();
-        assert_eq!(native_scalar(7., &context).unwrap(), 7.);
-        let output = aggregate(
-            Aggregation::Sum,
-            &Grouping {
-                labels: vec![],
-                without: false,
-            },
-            vec![(Labels::new(), 2.), (Labels::new(), 5.)],
-            &context,
-        )
-        .unwrap();
-        assert_eq!(output, vec![(Labels::new(), 7.)]);
-        assert!(context.peak_bytes() > 0);
-        context.cancel();
-        assert!(native_scalar(7., &context).is_err());
-        assert!(negate(Value::Scalar(1.), &context).is_err());
-    }
-
-    // Source failures keep their routing classification across the shared runtime.
-    #[test]
-    fn source_error_classification_survives_execution() {
-        let error = execute_installed(&entry(), &BTreeMap::new(), 3000, |_, _| {
-            Err(EngineError::capability_miss("source", "failed"))
-        })
-        .unwrap_err();
-        assert!(matches!(error,EngineError::CapabilityMiss{engine_id,..} if engine_id=="source"));
-    }
-}
diff --git a/data_plane/src/query_engines/asap_query_engine/logical_dag/native_values.rs b/data_plane/src/query_engines/asap_query_engine/logical_dag/native_values.rs
deleted file mode 100644
index e9c709ac9..000000000
--- a/data_plane/src/query_engines/asap_query_engine/logical_dag/native_values.rs
+++ /dev/null
@@ -1,569 +0,0 @@
-//! Bind protocol vectors to native batch operators; computation stays in Planner.
-use super::{grouping_key, miss, EngineError, Grouping, Labels, Vector};
-use asap_physical_operators::dag::{
-    self, batch_execution,
-    operators::{Operator, SortKey},
-    values::{Batch, Schema, Value},
-};
-use planner_types::{
-    post_asap::{SummaryFamilyType, SummaryField, SummarySchema},
-    pre_asap::DataType,
-};
-use std::sync::Arc;
-fn schema(fields: &[(&str, DataType)]) -> Schema {
-    Arc::new(SummarySchema {
-        fields: fields
-            .iter()
-            .map(|(name, dtype)| SummaryField {
-                name: (*name).into(),
-                dtype: SummaryFamilyType::Plain(dtype.clone()),
-                nullable: false,
-            })
-            .collect(),
-        time_index: None,
-    })
-}
-fn key<T: serde::Serialize>(value: &T) -> Value {
-    Value::Utf8(
-        serde_json::to_string(value)
-            .expect("string keys serialize")
-            .into(),
-    )
-}
-fn ranked_batch(values: &Vector, grouping: &Grouping) -> Result<Batch, EngineError> {
-    let schema = schema(&[
-        ("index", DataType::Int64),
-        ("group", DataType::Utf8),
-        ("value", DataType::Float64),
-    ]);
-    Batch::try_new(
-        schema,
-        values
-            .iter()
-            .enumerate()
-            .map(|(i, (labels, v))| {
-                vec![
-                    Value::Int64(i as i64),
-                    key(&grouping_key(labels, grouping)),
-                    Value::Float64(*v),
-                ]
-            })
-            .collect(),
-    )
-    .map_err(EngineError::from)
-}
-fn output(values: Vector, batches: Vec<dag::SharedValue<Batch>>) -> Result<Vector, EngineError> {
-    batches
-        .iter()
-        .flat_map(|b| b.rows())
-        .map(|row| match row.first() {
-            Some(Value::Int64(index)) => values
-                .get(*index as usize)
-                .cloned()
-                .ok_or_else(|| miss("native result index outside input")),
-            _ => Err(miss("native result has no row identity")),
-        })
-        .collect()
-}
-pub(super) fn sort(
-    values: Vector,
-    grouping: &Grouping,
-    descending: bool,
-    context: dag::RunContext,
-) -> Result<Vector, EngineError> {
-    let batch = ranked_batch(&values, grouping)?;
-    let op = Operator::sort(
-        batch.schema().clone(),
-        vec![SortKey {
-            column: 2,
-            descending,
-            nulls_first: false,
-        }],
-        vec![1],
-    )
-    .map_err(EngineError::from)?;
-    let result =
-        batch_execution::evaluate_batch(batch, vec![op], context).map_err(EngineError::from)?;
-    output(values, result)
-}
-pub(super) fn limit(
-    values: Vector,
-    grouping: &Grouping,
-    n: u64,
-    offset: u64,
-    context: dag::RunContext,
-) -> Result<Vector, EngineError> {
-    let batch = ranked_batch(&values, grouping)?;
-    let op =
-        Operator::limit(batch.schema().clone(), n, offset, vec![1]).map_err(EngineError::from)?;
-    let result =
-        batch_execution::evaluate_batch(batch, vec![op], context).map_err(EngineError::from)?;
-    output(values, result)
-}
-/// Relational boundary used by explicit row plans. Planner owns predicate lowering.
-pub(super) fn relation(
-    values: Vector,
-    candidates: Vector,
-    predicate: planner_types::pre_asap::Predicate,
-    left: Schema,
-    right: Schema,
-    output_schema: Schema,
-    completeness: Option<planner_types::post_asap::CandidateCompleteness>,
-    at: i64,
-    context: dag::RunContext,
-) -> Result<Vector, EngineError> {
-    use asap_physical_operators::physical_planner::{
-        compile_node, CompiledPhysicalDag, InputContract,
-    };
-    use planner_types::post_asap::{
-        ExecutableDagNode, ExecutableOperatorPayload, ExecutionDataState, PostAsapNodeId,
-    };
-    let pruning = completeness
-        .as_ref()
-        .map(|completeness| {
-            Ok::<_, EngineError>(asap_types::query_plan::PruningInputContract {
-                candidate_input: 1,
-                keys: asap_physical_operators::physical_planner::equijoin_keys(
-                    &predicate, &left, &right,
-                )?,
-                completeness: completeness.clone(),
-            })
-        })
-        .transpose()?;
-    let node = ExecutableDagNode {
-        id: PostAsapNodeId(2),
-        output_state: ExecutionDataState::QUERY_ROWS,
-        output_schema: (*output_schema).clone(),
-        guarantee: None,
-        payload: ExecutableOperatorPayload::RelationalJoin {
-            join_kind: planner_types::pre_asap::JoinKind::Semi,
-            pred: predicate,
-            pruning: completeness,
-        },
-    };
-    let operator = compile_node(&node, &[left.clone(), right.clone()])?;
-    let compiled = CompiledPhysicalDag::from_operators(
-        [
-            (0, InputContract::bounded(left)),
-            (1, InputContract::bounded(right)),
-        ]
-        .into(),
-        [(2, (vec![0, 1], operator))].into(),
-        vec![2],
-    )?;
-    let encoded = compiled.encode()?;
-    let inputs = vec![values, candidates];
-    if let Some(pruning) = pruning {
-        validate_pruning(&encoded, &inputs, 0, &pruning, at, context.clone())?;
-    }
-    physical(&encoded, inputs, 0, at, context)
-}
-
-// Equality keys canonicalize signed zero and NaNs; row transport must preserve their bits.
-fn identity_key(value: &Value) -> Result<Vec<u8>, asap_physical_operators::Error> {
-    if let Value::Float64(number) = value {
-        let mut key = vec![0xff];
-        key.extend_from_slice(&number.to_bits().to_be_bytes());
-        Ok(key)
-    } else {
-        value.key()
-    }
-}
-
-/// Bind protocol values to the selected physical input contracts; no operator lowering.
-pub(super) fn physical(
-    encoded: &[u8],
-    inputs: Vec<Vector>,
-    row_input: usize,
-    at: i64,
-    context: dag::RunContext,
-) -> Result<Vector, EngineError> {
-    use asap_physical_operators::physical_planner::{CompiledPhysicalDag, Source};
-    use futures::{FutureExt, StreamExt};
-    use std::collections::{BTreeMap, VecDeque};
-    let compiled = CompiledPhysicalDag::decode(encoded)?;
-    let contracts = compiled.input_contracts().collect::<Vec<_>>();
-    if contracts.len() != inputs.len() || row_input >= inputs.len() {
-        return Err(asap_physical_operators::Error::Invalid(
-            "physical input arity mismatch".into(),
-        )
-        .into());
-    }
-    let mut identities: BTreeMap<Vec<Vec<u8>>, VecDeque<(Labels, f64)>> = BTreeMap::new();
-    let mut sources = BTreeMap::new();
-    for (position, ((id, contract), values)) in contracts.iter().zip(inputs).enumerate() {
-        let rows = values
-            .iter()
-            .map(|(labels, sample)| {
-                contract
-                    .schema
-                    .fields
-                    .iter()
-                    .enumerate()
-                    .map(|(column, field)| {
-                        if Some(column) == contract.schema.time_index {
-                            return Ok(Value::Timestamp(at));
-                        }
-                        match &field.dtype {
-                            SummaryFamilyType::Plain(DataType::Float64) => {
-                                Ok(Value::Float64(*sample))
-                            }
-                            SummaryFamilyType::Plain(DataType::Int64) => {
-                                if sample.is_finite() && sample.fract() == 0. && sample.abs() <= (1_u64 << 53) as f64 {
-                                    Ok(Value::Int64(*sample as i64))
-                                } else {
-                                    Err(asap_physical_operators::Error::Invalid("protocol sample cannot represent the required Int64 input exactly".into()).into())
-                                }
-                            }
-                            SummaryFamilyType::Plain(DataType::Utf8) => {
-                                Ok(labels.get(&field.name).map_or_else(
-                                    || {
-                                        if field.nullable {
-                                            Value::Null
-                                        } else {
-                                            Value::Utf8("".into())
-                                        }
-                                    },
-                                    |value| Value::Utf8(value.clone().into()),
-                                ))
-                            }
-                            _ => Err(miss(format!(
-                                "PromQL input cannot supply field {} of type {:?}",
-                                field.name, field.dtype
-                            ))),
-                        }
-                    })
-                    .collect::<Result<Vec<_>, EngineError>>()
-            })
-            .collect::<Result<Vec<_>, _>>()?;
-        if position == row_input {
-            for (row, original) in rows.iter().zip(values) {
-                let key = row
-                    .iter()
-                    .map(identity_key)
-                    .collect::<Result<Vec<_>, _>>()?;
-                identities.entry(key).or_default().push_back(original);
-            }
-        }
-        let batch = Batch::try_new(contract.schema.clone(), rows)?;
-        sources.insert(
-            *id,
-            Box::new(Operator::source(contract.schema.clone(), vec![batch])?) as Source<'_>,
-        );
-    }
-    let graph = compiled.instantiate(sources)?;
-    let mut streams = graph.execute(compiled.roots(), context)?;
-    if streams.len() != 1 {
-        return Err(
-            asap_physical_operators::Error::Invalid("expected one physical output".into()).into(),
-        );
-    }
-    let mut stream = streams.remove(0);
-    let mut result = Vec::new();
-    loop {
-        crate::query_engines::request::check()?;
-        match stream.next().now_or_never() {
-            Some(Some(batch)) => {
-                for row in batch?.rows() {
-                    let key = row
-                        .iter()
-                        .map(identity_key)
-                        .collect::<Result<Vec<_>, _>>()?;
-                    let original = identities
-                        .get_mut(&key)
-                        .and_then(VecDeque::pop_front)
-                        .ok_or_else(|| {
-                            asap_physical_operators::Error::Invalid(
-                                "physical row has no protocol identity".into(),
-                            )
-                        })?;
-                    result.push(original);
-                }
-            }
-            Some(None) => return Ok(result),
-            None => continue,
-        }
-    }
-}
-
-pub(super) fn validate_pruning(
-    encoded: &[u8],
-    inputs: &[Vector],
-    row_input: usize,
-    contract: &asap_types::query_plan::PruningInputContract,
-    at: i64,
-    context: dag::RunContext,
-) -> Result<(), EngineError> {
-    use asap_physical_operators::physical_planner::{CompiledPhysicalDag, InputContract};
-    use planner_types::post_asap::CandidateCompleteness;
-    if !matches!(
-        contract.completeness,
-        CandidateCompleteness::Certified { .. }
-    ) {
-        return Ok(());
-    }
-    let compiled = CompiledPhysicalDag::decode(encoded)?;
-    let schemas = compiled
-        .input_contracts()
-        .map(|(_, c)| c.schema.clone())
-        .collect::<Vec<_>>();
-    let candidates = inputs
-        .get(contract.candidate_input)
-        .ok_or_else(|| miss("missing candidate input"))?;
-    let values = inputs
-        .get(row_input)
-        .ok_or_else(|| miss("missing authoritative input"))?;
-    let coverage = Operator::semi_join(
-        schemas[contract.candidate_input].clone(),
-        schemas[row_input].clone(),
-        contract.keys.iter().map(|&(l, r)| (r, l)).collect(),
-    )?;
-    let check = CompiledPhysicalDag::from_operators(
-        [
-            (
-                0,
-                InputContract::bounded(schemas[contract.candidate_input].clone()),
-            ),
-            (1, InputContract::bounded(schemas[row_input].clone())),
-        ]
-        .into(),
-        [(2, (vec![0, 1], coverage))].into(),
-        vec![2],
-    )?;
-    let matched = physical(
-        &check.encode()?,
-        vec![candidates.clone(), values.clone()],
-        0,
-        at,
-        context,
-    )?;
-    if matched.len() != candidates.len() {
-        return Err(miss("certified pruning key has no authoritative value"));
-    }
-    Ok(())
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use asap_physical_operators::{
-        physical_planner::{CompiledPhysicalDag, InputContract},
-        Error,
-    };
-
-    // An available label is bound by Backend; Planner evaluates its predicate.
-    #[test]
-    fn planner_filter_compiles_and_executes_bound_labels() {
-        use asap_types::query_plan::{FallbackPolicy, InstantExecution, QueryPlanNode};
-        use planner_types::{
-            post_asap::{
-                execution_data_state::lift_plain, ExecutionTiming, SummaryExpr, SummaryNode,
-                ValueOperation,
-            },
-            pre_asap::QueryExpr,
-        };
-        let query = "m{instance=\"pod\"}";
-        let logical = control_plane::query_parser::parse_query_expr_canonical(
-            query,
-            planner_types::types::AccuracyTarget::Exact,
-        )
-        .unwrap();
-        let QueryExpr::TimeRange { child, .. } = logical else {
-            panic!("expected instant source")
-        };
-        let QueryExpr::Scan {
-            source,
-            predicates,
-            schema,
-        } = child.as_ref()
-        else {
-            panic!("expected source selector")
-        };
-        let pred = predicates[0].clone();
-        let child = std::rc::Rc::new(QueryExpr::Scan {
-            source: source.clone(),
-            predicates: vec![],
-            schema: schema.clone(),
-        });
-        let input = std::rc::Rc::new(SummaryNode {
-            schema: lift_plain(&child.output_schema().unwrap()),
-            guarantee: None,
-            expr: SummaryExpr::KeepPreAsap(child),
-        });
-        let root = std::rc::Rc::new(SummaryNode {
-            schema: input.schema.clone(),
-            guarantee: None,
-            expr: SummaryExpr::ValueOperation {
-                child: input,
-                operation: ValueOperation::Filter { pred },
-                timing: ExecutionTiming::QueryTime,
-            },
-        });
-        let entry = control_plane::query_plan::compile_bound_mapped(
-            "filter".into(),
-            query.into(),
-            &root,
-            InstantExecution {
-                lookback_ms: 0,
-                full_history: false,
-                cumulative_readout: false,
-            },
-            FallbackPolicy::Reject,
-            |_, _| panic!("filter requires no materialization"),
-            |_, _| {},
-        )
-        .unwrap();
-        let QueryPlanNode::PhysicalFragment { dag, row_input, .. } = &entry.nodes[&entry.root]
-        else {
-            panic!("filter was rejected: {:?}", entry.nodes)
-        };
-        let values = vec![
-            (
-                [
-                    ("instance".into(), "pod".into()),
-                    ("extra".into(), "kept".into()),
-                ]
-                .into(),
-                7.,
-            ),
-            ([("instance".into(), "other".into())].into(), 9.),
-        ];
-        let expected = values[0].clone();
-        assert_eq!(
-            physical(dag, vec![values], *row_input, 42, context(1 << 20)).unwrap(),
-            vec![expected]
-        );
-    }
-
-    fn sorted() -> Vec<u8> {
-        let input = schema(&[("value", DataType::Float64)]);
-        CompiledPhysicalDag::from_operators(
-            [(0, InputContract::bounded(input.clone()))].into(),
-            [(
-                1,
-                (
-                    vec![0],
-                    Operator::sort(
-                        input,
-                        vec![SortKey {
-                            column: 0,
-                            descending: false,
-                            nulls_first: false,
-                        }],
-                        vec![],
-                    )
-                    .unwrap(),
-                ),
-            )]
-            .into(),
-            vec![1],
-        )
-        .unwrap()
-        .encode()
-        .unwrap()
-    }
-    fn context(max_bytes: usize) -> dag::RunContext {
-        dag::RunContext::new(
-            dag::Scope::Query {
-                evaluation_time_ms: 42,
-                revision: 7,
-            },
-            dag::Limits {
-                max_bytes,
-                ..dag::Limits::default()
-            },
-        )
-        .unwrap()
-    }
-    fn cause(error: &Error) -> &Error {
-        match error {
-            Error::AtNode { source, .. } => cause(source),
-            other => other,
-        }
-    }
-
-    // A real native execution failure must remain typed through the protocol adapter.
-    #[test]
-    fn physical_budget_and_cancellation_are_terminal() {
-        for cancelled in [false, true] {
-            let run = context(if cancelled { 4096 } else { 1 });
-            if cancelled {
-                run.cancel();
-            }
-            let error = physical(
-                &sorted(),
-                vec![vec![(Labels::new(), 2.), (Labels::new(), 1.)]],
-                0,
-                42,
-                run.clone(),
-            )
-            .unwrap_err();
-            let EngineError::Physical(error) = error else {
-                panic!("physical failure lost its type")
-            };
-            assert!(
-                if cancelled {
-                    matches!(cause(&error), Error::Cancelled)
-                } else {
-                    matches!(cause(&error), Error::MemoryLimit)
-                },
-                "{error}"
-            );
-            assert_eq!(run.retained_bytes(), 0);
-        }
-    }
-
-    // Count-like values are bound as integers only when the protocol sample is exact.
-    #[test]
-    fn integer_input_binding_preserves_type_and_rejects_rounding() {
-        let input = schema(&[("count", DataType::Int64)]);
-        let compiled = CompiledPhysicalDag::from_operators(
-            [(0, InputContract::bounded(input.clone()))].into(),
-            [(1, (vec![0], Operator::limit(input, 1, 0, vec![]).unwrap()))].into(),
-            vec![1],
-        )
-        .unwrap()
-        .encode()
-        .unwrap();
-        for (sample, valid) in [
-            (3., true),
-            (-4., true),
-            (0.5, false),
-            (f64::INFINITY, false),
-            (9_007_199_254_740_994., false),
-        ] {
-            let result = physical(
-                &compiled,
-                vec![vec![(Labels::new(), sample)]],
-                0,
-                42,
-                context(4096),
-            );
-            if valid {
-                assert_eq!(result.unwrap()[0].1, sample);
-            } else {
-                assert!(matches!(
-                    result,
-                    Err(EngineError::Physical(Error::Invalid(_)))
-                ));
-            }
-        }
-    }
-
-    // Transport identity preserves the exact value selected by native total-order sorting.
-    #[test]
-    fn native_sort_preserves_signed_zero_bits() {
-        let rows = physical(
-            &sorted(),
-            vec![vec![(Labels::new(), 0.), (Labels::new(), -0.)]],
-            0,
-            42,
-            context(4096),
-        )
-        .unwrap();
-        assert_eq!(
-            rows.iter().map(|row| row.1.to_bits()).collect::<Vec<_>>(),
-            vec![0.0_f64.to_bits(), (-0.0_f64).to_bits()]
-        );
-    }
-}
diff --git a/data_plane/src/query_engines/asap_query_engine/mod.rs b/data_plane/src/query_engines/asap_query_engine/mod.rs
deleted file mode 100644
index e6c68b79b..000000000
--- a/data_plane/src/query_engines/asap_query_engine/mod.rs
+++ /dev/null
@@ -1,23 +0,0 @@
-//! Warm-tier query engine over sid-keyed sketch storage. Capability misses
-//! allow the router to try archive execution.
-
-pub(crate) mod catalog_resolver;
-pub mod engine;
-mod exact_subqueries;
-pub mod live_serve;
-pub mod logical_dag;
-pub mod post_asap_readout;
-pub mod summary_executor;
-
-pub use crate::storage_engines::sketch_db::query as asap_tier;
-
-pub use engine::ASAPQueryEngine;
-
-#[cfg(test)]
-pub mod tests;
-
-#[cfg(test)]
-mod test_plan;
-
-#[cfg(test)]
-mod request_tests;
diff --git a/data_plane/src/query_engines/asap_query_engine/post_asap_readout.rs b/data_plane/src/query_engines/asap_query_engine/post_asap_readout.rs
deleted file mode 100644
index 023318b70..000000000
--- a/data_plane/src/query_engines/asap_query_engine/post_asap_readout.rs
+++ /dev/null
@@ -1,2212 +0,0 @@
-//! Execute installed query DAGs and project their values and coverage.
-
-use std::collections::BTreeMap;
-
-use asap_physical_operators::arithmetic::evaluate_float64_arithmetic as arithmetic;
-
-use asap_types::query_plan::{QueryNodeId, QueryPlanNode};
-
-use asap_physical_operators::dag::{self, PhysicalOperator};
-use futures::StreamExt;
-/// A planned warm query cannot be served; callers may route to an exact backend.
-#[derive(Debug)]
-pub enum LoweringSkip {
-    Disabled,
-    QueryNotPlanned(String),
-    InvalidQueryPlan(String),
-    MaterializationNotReady(String),
-    ExecuteFailed(String),
-    Execution(dag::Error),
-}
-impl From<LoweringSkip> for crate::query_engines::EngineError {
-    fn from(error: LoweringSkip) -> Self {
-        match error {
-            LoweringSkip::Execution(error) => Self::Physical(error),
-            other => Self::capability_miss("installed_query_dag", format!("{other:?}")),
-        }
-    }
-}
-fn execution_failure(error: dag::Error) -> LoweringSkip {
-    fn resource(error: &dag::Error) -> bool {
-        match error {
-            dag::Error::MemoryLimit | dag::Error::Cancelled => true,
-            dag::Error::AtNode { source, .. } => resource(source),
-            _ => false,
-        }
-    }
-    if resource(&error) {
-        LoweringSkip::Execution(error)
-    } else {
-        LoweringSkip::ExecuteFailed(error.to_string())
-    }
-}
-
-use crate::query_engines::asap_query_engine::summary_executor::{
-    GroupState, QueryExecutionContext, SummaryExecutorError, SummaryValue,
-};
-use crate::storage_engines::sketch_db::index::SketchStore;
-
-/// Mirrors `ASAPTierResult.series`'s row shape — `(label_values, samples)`
-/// where `samples` is `(window_end_unix_ms, value)`.
-pub type SeriesRows = Vec<(BTreeMap<String, String>, Vec<(i64, f64)>)>;
-
-/// Summary execution result projected into `ASAPTierResult`, for both sketch
-/// values and exact accumulator states.
-///
-/// Grouping is resolved before this projection: `PerEntity` preserves each
-/// entity, while `Reduce([])` merges every candidate into a single group.
-pub struct PostAsapReadoutOutcome {
-    pub series: SeriesRows,
-    pub coverage: Option<(u64, u64)>,
-}
-
-/// Execute the materializations and readouts bound in an installed QueryPlan entry.
-pub fn execute_query_plan_readout(
-    index: &SketchStore,
-    entry: &asap_types::query_plan::QueryPlanEntry,
-    t0_ms: u64,
-    t1_ms: u64,
-    is_cumulative: bool,
-) -> Result<PostAsapReadoutOutcome, LoweringSkip> {
-    execute_physical_query_payload(index, entry, entry.root, t0_ms, t1_ms, is_cumulative)
-}
-
-pub fn execute_query_plan_from_readout(
-    index: &SketchStore,
-    entry: &asap_types::query_plan::QueryPlanEntry,
-    root: asap_types::query_plan::QueryNodeId,
-    t0_ms: u64,
-    t1_ms: u64,
-    is_cumulative: bool,
-) -> Result<PostAsapReadoutOutcome, LoweringSkip> {
-    execute_physical_query_payload(index, entry, root, t0_ms, t1_ms, is_cumulative)
-}
-
-pub fn execute_query_plan_instant(
-    index: &SketchStore,
-    entry: &asap_types::query_plan::QueryPlanEntry,
-    now_ms: u64,
-) -> Result<(PostAsapReadoutOutcome, u64), LoweringSkip> {
-    let t0_ms = if entry.instant.full_history {
-        0
-    } else {
-        now_ms.saturating_sub(entry.instant.lookback_ms)
-    };
-    if entry
-        .materialization_bindings()
-        .iter()
-        .any(|binding| binding.window_ms == 0)
-    {
-        return Err(LoweringSkip::MaterializationNotReady(
-            "materialized pane width is zero".into(),
-        ));
-    }
-    let outcome = execute_physical_query_plan(
-        index,
-        entry,
-        t0_ms,
-        now_ms,
-        entry.instant.cumulative_readout,
-    )?;
-    Ok((outcome, t0_ms))
-}
-
-#[derive(Clone)]
-enum PhysicalQueryOutput {
-    Scalar(f64),
-    State {
-        groups: Vec<(BTreeMap<String, String>, GroupState)>,
-        item_labels: Vec<String>,
-    },
-    Value(
-        Vec<(BTreeMap<String, String>, SummaryValue)>,
-        Option<(u64, u64)>,
-    ),
-}
-
-#[derive(Debug, thiserror::Error)]
-enum PhysicalNodeError {
-    #[error(transparent)]
-    Physical(#[from] dag::Error),
-    #[error("materialization/store operation failed: {0:?}")]
-    Store(SummaryExecutorError),
-    #[error("node expected summary state input")]
-    ExpectedState,
-    #[error("physical fallback requested: {0}")]
-    Fallback(String),
-}
-
-struct PhysicalQueryRuntime<'a> {
-    language: control_plane::query_plan::QueryLanguage,
-    catalog: Option<std::sync::Arc<asap_types::summary_catalog::SummaryCatalog>>,
-    context: QueryExecutionContext<'a>,
-    // All counter groups in a run use the same resolved evaluation range.
-    counter_parameters: std::cell::OnceCell<std::collections::HashMap<String, String>>,
-}
-
-impl PhysicalQueryRuntime<'_> {
-    fn execute_node(
-        &self,
-        _id: QueryNodeId,
-        node: &QueryPlanNode,
-        inputs: &[&PhysicalQueryOutput],
-        context: &dag::RunContext,
-    ) -> Result<PhysicalQueryOutput, PhysicalNodeError> {
-        match node {
-            QueryPlanNode::Scalar { value } => super::logical_dag::native_scalar(*value, context)
-                .map(PhysicalQueryOutput::Scalar)
-                .map_err(|error| match error {
-                    crate::query_engines::EngineError::Physical(error) => {
-                        PhysicalNodeError::Physical(error)
-                    }
-                    other => PhysicalNodeError::Fallback(other.to_string()),
-                }),
-            QueryPlanNode::Binary { operator, .. } => {
-                let [lhs, rhs] = inputs else {
-                    return Err(PhysicalNodeError::ExpectedState);
-                };
-                binary_values(operator, lhs, rhs)
-            }
-            QueryPlanNode::ReduceSum { grouping, .. } => {
-                let [PhysicalQueryOutput::Value(values, coverage)] = inputs else {
-                    return Err(PhysicalNodeError::ExpectedState);
-                };
-                reduce_sum_values_in_context(grouping, values, *coverage, context)
-            }
-            QueryPlanNode::ReadMaterialization { binding } => {
-                let mut groups = self
-                    .context
-                    .read_bound_materialization(binding)
-                    .map_err(PhysicalNodeError::Store)?;
-                // Metric identity belongs to the shared DataDescriptor, not to
-                // the population labels or a reconstructed query string.
-                if self.language == control_plane::query_plan::QueryLanguage::MetricsQl
-                    && binding.output_grouping
-                        == control_plane::query_plan::PhysicalGrouping::PerEntity
-                {
-                    let metric = self
-                        .catalog
-                        .as_ref()
-                        .and_then(|catalog| {
-                            let definition = catalog.outputs.get(&binding.materialization)?;
-                            catalog
-                                .data_descriptors
-                                .get(&definition.data_descriptor_id)?
-                                .time_series_metric()
-                        })
-                        .ok_or_else(|| {
-                            PhysicalNodeError::Fallback(
-                                "MetricsQL per-series readout requires catalog metric identity"
-                                    .into(),
-                            )
-                        })?;
-                    for (labels, _) in &mut groups {
-                        labels.insert("__name__".into(), metric.into());
-                    }
-                }
-                Ok(PhysicalQueryOutput::State {
-                    groups,
-                    item_labels: binding.item_labels.clone(),
-                })
-            }
-            QueryPlanNode::SummaryEstimate { query, .. } => {
-                let [PhysicalQueryOutput::State {
-                    groups,
-                    item_labels,
-                }] = inputs
-                else {
-                    return Err(PhysicalNodeError::ExpectedState);
-                };
-                let query: planner_types::post_asap::SketchQuery = query.clone().into();
-                let mut values = Vec::new();
-                let mut coverage = None;
-                for (key, state) in groups {
-                    let value = self
-                        .context
-                        .readout_bound(state, &query)
-                        .map_err(PhysicalNodeError::Store)?;
-                    let (mut rows, row_coverage) = expand_item_readout(key, value, item_labels)?;
-                    if self.language == control_plane::query_plan::QueryLanguage::MetricsQl
-                        && !matches!(
-                            query,
-                            planner_types::post_asap::SketchQuery::Quantile { .. }
-                        )
-                    {
-                        for (labels, _) in &mut rows {
-                            labels.remove("__name__");
-                        }
-                    }
-                    fold_coverage(&mut coverage, row_coverage);
-                    values.extend(rows);
-                }
-                Ok(PhysicalQueryOutput::Value(values, coverage))
-            }
-            QueryPlanNode::ExactReadout { readout, .. } => {
-                if self.language == control_plane::query_plan::QueryLanguage::MetricsQl
-                    && matches!(
-                        readout,
-                        control_plane::query_plan::ExactReadout::Rate
-                            | control_plane::query_plan::ExactReadout::Increase
-                    )
-                {
-                    return Err(PhysicalNodeError::Fallback(
-                        "native MetricsQL counter semantics require external exact execution"
-                            .into(),
-                    ));
-                }
-                let [PhysicalQueryOutput::State { groups, .. }] = inputs else {
-                    return Err(PhysicalNodeError::ExpectedState);
-                };
-                let no_parameters = std::collections::HashMap::new();
-                let parameters = if matches!(
-                    readout,
-                    control_plane::query_plan::ExactReadout::Rate
-                        | control_plane::query_plan::ExactReadout::Increase
-                ) {
-                    self.counter_parameters.get_or_init(|| {
-                        std::collections::HashMap::from([
-                            ("range_start_ms".into(), self.context.t0_ms.to_string()),
-                            ("range_end_ms".into(), self.context.t1_ms.to_string()),
-                        ])
-                    })
-                } else {
-                    &no_parameters
-                };
-                let mut coverage = None;
-                let values = groups
-                    .iter()
-                    .filter_map(|(key, state)| {
-                        let state_coverage = state.exact_coverage();
-                        fold_coverage(&mut coverage, state_coverage);
-                        let value =
-                            match state.exact_value_with_parameters(*readout, &None, parameters) {
-                                Ok(Some(value)) => value,
-                                Ok(None) => return None,
-                                Err(error) => return Some(Err(PhysicalNodeError::Fallback(error))),
-                            };
-                        Some(Ok({
-                            (
-                                {
-                                    let mut labels = key.clone();
-                                    if self.language
-                                        == control_plane::query_plan::QueryLanguage::MetricsQl
-                                        && !matches!(
-                                            readout,
-                                            control_plane::query_plan::ExactReadout::Max
-                                                | control_plane::query_plan::ExactReadout::Min
-                                        )
-                                    {
-                                        labels.remove("__name__");
-                                    }
-                                    labels
-                                },
-                                SummaryValue::Points(
-                                    vec![(self.context.t1_ms as i64, value)],
-                                    state_coverage,
-                                ),
-                            )
-                        }))
-                    })
-                    .collect::<Result<Vec<_>, _>>()?;
-                Ok(PhysicalQueryOutput::Value(values, coverage))
-            }
-            QueryPlanNode::SummaryMerge { .. } => {
-                let mut by_group: BTreeMap<BTreeMap<String, String>, Vec<GroupState>> =
-                    BTreeMap::new();
-                let mut merged_item_labels: Option<Vec<String>> = None;
-                for input in inputs {
-                    let PhysicalQueryOutput::State {
-                        groups,
-                        item_labels,
-                    } = input
-                    else {
-                        return Err(PhysicalNodeError::ExpectedState);
-                    };
-                    if merged_item_labels
-                        .as_ref()
-                        .is_some_and(|labels| labels != item_labels)
-                    {
-                        return Err(PhysicalNodeError::Fallback(
-                            "merged summaries disagree on item labels".into(),
-                        ));
-                    }
-                    merged_item_labels.get_or_insert_with(|| item_labels.clone());
-                    for (key, state) in groups {
-                        by_group.entry(key.clone()).or_default().push(state.clone());
-                    }
-                }
-                if by_group.is_empty() {
-                    return Err(PhysicalNodeError::ExpectedState);
-                }
-                by_group
-                    .into_iter()
-                    .map(|(key, states)| {
-                        self.context
-                            .merge_bound_states(states)
-                            .map(|state| (key, state))
-                            .map_err(PhysicalNodeError::Store)
-                    })
-                    .collect::<Result<Vec<_>, _>>()
-                    .map(|groups| PhysicalQueryOutput::State {
-                        groups,
-                        item_labels: merged_item_labels.unwrap_or_default(),
-                    })
-            }
-            QueryPlanNode::Logical { .. }
-            | QueryPlanNode::Relational { .. }
-            | QueryPlanNode::ExternalExact { .. }
-            | QueryPlanNode::PhysicalFragment { .. }
-            | QueryPlanNode::RelationalJoin { .. } => Err(PhysicalNodeError::Fallback(
-                "logical node requires installed logical runtime".into(),
-            )),
-            QueryPlanNode::ExactFallback { reason } => {
-                Err(PhysicalNodeError::Fallback(reason.clone()))
-            }
-        }
-    }
-}
-
-fn expand_item_rows(
-    group_key: &BTreeMap<String, String>,
-    value: SummaryValue,
-    item_labels: &[String],
-) -> Result<Vec<(BTreeMap<String, String>, SummaryValue)>, PhysicalNodeError> {
-    let SummaryValue::TopK(ranked_per_ts, coverage) = value else {
-        return Ok(vec![(group_key.clone(), value)]);
-    };
-    let [item_label] = item_labels else {
-        if item_labels.is_empty() {
-            return Ok(vec![(
-                group_key.clone(),
-                SummaryValue::TopK(ranked_per_ts, coverage),
-            )]);
-        }
-        return Err(PhysicalNodeError::Fallback(
-            "multi-label keyed sketch readout is unsupported".into(),
-        ));
-    };
-    let mut by_item: BTreeMap<String, Vec<(i64, f64)>> = BTreeMap::new();
-    for (timestamp, items) in ranked_per_ts {
-        for (item, value) in items {
-            by_item.entry(item).or_default().push((timestamp, value));
-        }
-    }
-    Ok(by_item
-        .into_iter()
-        .map(|(item, points)| {
-            let mut labels = group_key.clone();
-            labels.insert(item_label.clone(), item);
-            (labels, SummaryValue::Points(points, coverage))
-        })
-        .collect())
-}
-
-fn expand_item_readout(
-    group_key: &BTreeMap<String, String>,
-    value: SummaryValue,
-    item_labels: &[String],
-) -> Result<
-    (
-        Vec<(BTreeMap<String, String>, SummaryValue)>,
-        Option<(u64, u64)>,
-    ),
-    PhysicalNodeError,
-> {
-    let coverage = value.coverage();
-    Ok((expand_item_rows(group_key, value, item_labels)?, coverage))
-}
-
-fn binary_values(
-    operator: &planner_types::pre_asap::ArithmeticOpKind,
-    lhs: &PhysicalQueryOutput,
-    rhs: &PhysicalQueryOutput,
-) -> Result<PhysicalQueryOutput, PhysicalNodeError> {
-    type Labels = BTreeMap<String, String>;
-    type Samples = BTreeMap<(Labels, i64), (f64, Option<(u64, u64)>)>;
-    fn flatten(values: &[(Labels, SummaryValue)]) -> Result<Samples, PhysicalNodeError> {
-        let mut result = BTreeMap::new();
-        for (labels, value) in values {
-            let SummaryValue::Points(points, coverage) = value else {
-                return Err(PhysicalNodeError::ExpectedState);
-            };
-            let mut labels = labels.clone();
-            labels.remove("__name__");
-            for (timestamp, value) in points {
-                if result
-                    .insert((labels.clone(), *timestamp), (*value, *coverage))
-                    .is_some()
-                {
-                    return Err(PhysicalNodeError::Fallback(
-                        "ambiguous default vector matching".into(),
-                    ));
-                }
-            }
-        }
-        Ok(result)
-    }
-    fn points(values: Samples) -> PhysicalQueryOutput {
-        PhysicalQueryOutput::Value(
-            values
-                .into_iter()
-                .map(|((labels, timestamp), (value, coverage))| {
-                    (
-                        labels,
-                        SummaryValue::Points(vec![(timestamp, value)], coverage),
-                    )
-                })
-                .collect(),
-            None,
-        )
-    }
-    match (lhs, rhs) {
-        (PhysicalQueryOutput::Scalar(a), PhysicalQueryOutput::Scalar(b)) => {
-            Ok(PhysicalQueryOutput::Scalar(arithmetic(operator, *a, *b)))
-        }
-        (PhysicalQueryOutput::Value(values, coverage), PhysicalQueryOutput::Scalar(scalar)) => {
-            Ok({
-                let mut output = points(
-                    flatten(values)?
-                        .into_iter()
-                        .map(|(key, (value, coverage))| {
-                            (key, (arithmetic(operator, value, *scalar), coverage))
-                        })
-                        .collect(),
-                );
-                if let PhysicalQueryOutput::Value(_, out_coverage) = &mut output {
-                    *out_coverage = *coverage;
-                }
-                output
-            })
-        }
-        (PhysicalQueryOutput::Scalar(scalar), PhysicalQueryOutput::Value(values, coverage)) => {
-            Ok({
-                let mut output = points(
-                    flatten(values)?
-                        .into_iter()
-                        .map(|(key, (value, coverage))| {
-                            (key, (arithmetic(operator, *scalar, value), coverage))
-                        })
-                        .collect(),
-                );
-                if let PhysicalQueryOutput::Value(_, out_coverage) = &mut output {
-                    *out_coverage = *coverage;
-                }
-                output
-            })
-        }
-        (
-            PhysicalQueryOutput::Value(left, left_coverage),
-            PhysicalQueryOutput::Value(right, right_coverage),
-        ) => {
-            let right = flatten(right)?;
-            let mut output = points(
-                flatten(left)?
-                    .into_iter()
-                    .filter_map(|(key, (left, coverage))| {
-                        let (right, right_coverage) = right.get(&key)?;
-                        Some((
-                            key,
-                            (
-                                arithmetic(operator, left, *right),
-                                intersect_coverage(coverage, *right_coverage),
-                            ),
-                        ))
-                    })
-                    .collect(),
-            );
-            if let PhysicalQueryOutput::Value(_, coverage) = &mut output {
-                *coverage = intersect_coverage(*left_coverage, *right_coverage);
-            }
-            Ok(output)
-        }
-        _ => Err(PhysicalNodeError::ExpectedState),
-    }
-}
-
-fn intersect_coverage(left: Option<(u64, u64)>, right: Option<(u64, u64)>) -> Option<(u64, u64)> {
-    let (left, right) = (left?, right?);
-    let result = (left.0.max(right.0), left.1.min(right.1));
-    (result.0 <= result.1).then_some(result)
-}
-
-#[cfg(test)]
-fn reduce_sum_values(
-    grouping: &asap_types::query_plan::PhysicalGrouping,
-    values: &[(BTreeMap<String, String>, SummaryValue)],
-    coverage: Option<(u64, u64)>,
-) -> Result<PhysicalQueryOutput, PhysicalNodeError> {
-    let context = dag::RunContext::new(
-        dag::Scope::Query {
-            evaluation_time_ms: 0,
-            revision: 0,
-        },
-        dag::Limits::default(),
-    )
-    .unwrap();
-    reduce_sum_values_in_context(grouping, values, coverage, &context)
-}
-fn reduce_sum_values_in_context(
-    grouping: &asap_types::query_plan::PhysicalGrouping,
-    values: &[(BTreeMap<String, String>, SummaryValue)],
-    coverage: Option<(u64, u64)>,
-    context: &dag::RunContext,
-) -> Result<PhysicalQueryOutput, PhysicalNodeError> {
-    use dag::{
-        operators::{Operator, Reduction},
-        values::{Batch, Value},
-    };
-    use planner_types::{
-        post_asap::{SummaryFamilyType, SummaryField, SummarySchema},
-        pre_asap::DataType,
-    };
-    let asap_types::query_plan::PhysicalGrouping::Reduce(keys) = grouping else {
-        return Ok(PhysicalQueryOutput::Value(values.to_vec(), coverage));
-    };
-    let mut groups = BTreeMap::new();
-    for (labels, value) in values {
-        let SummaryValue::Points(points, row_coverage) = value else {
-            return Err(PhysicalNodeError::ExpectedState);
-        };
-        let labels = labels
-            .iter()
-            .filter(|(name, _)| keys.contains(name))
-            .map(|(k, v)| (k.clone(), v.clone()))
-            .collect::<BTreeMap<_, _>>();
-        for (timestamp, value) in points {
-            let group = groups
-                .entry((labels.clone(), *timestamp))
-                .or_insert_with(|| (Vec::new(), *row_coverage));
-            group.0.push(*value);
-            group.1 = intersect_coverage(group.1, *row_coverage);
-        }
-    }
-    let groups = groups.into_iter().collect::<Vec<_>>();
-    let schema = std::sync::Arc::new(SummarySchema {
-        fields: vec![("group", DataType::Int64), ("value", DataType::Float64)]
-            .into_iter()
-            .map(|(name, dtype)| SummaryField {
-                name: name.into(),
-                dtype: SummaryFamilyType::Plain(dtype),
-                nullable: false,
-            })
-            .collect(),
-        time_index: None,
-    });
-    let rows = groups
-        .iter()
-        .enumerate()
-        .flat_map(|(index, (_, (values, _)))| {
-            values
-                .iter()
-                .map(move |value| vec![Value::Int64(index as i64), Value::Float64(*value)])
-        })
-        .collect();
-    let error = PhysicalNodeError::Physical;
-    let batch = Batch::try_new(schema.clone(), rows).map_err(error)?;
-    let operator = Operator::aggregate(schema, vec![0], vec![("value".into(), Reduction::Sum(1))])
-        .map_err(error)?;
-    let output = dag::batch_execution::evaluate_batch(batch, vec![operator], context.clone())
-        .map_err(error)?;
-    let mut result = Vec::new();
-    for row in output.iter().flat_map(|batch| batch.rows()) {
-        let [Value::Int64(index), Value::Float64(sum)] = row.as_slice() else {
-            return Err(PhysicalNodeError::ExpectedState);
-        };
-        let ((labels, time), (_, row_coverage)) = &groups[*index as usize];
-        result.push((
-            labels.clone(),
-            SummaryValue::Points(vec![(*time, *sum)], *row_coverage),
-        ));
-    }
-    Ok(PhysicalQueryOutput::Value(result, coverage))
-}
-
-fn execute_physical_query_plan(
-    index: &SketchStore,
-    entry: &asap_types::query_plan::QueryPlanEntry,
-    t0_ms: u64,
-    t1_ms: u64,
-    is_cumulative: bool,
-) -> Result<PostAsapReadoutOutcome, LoweringSkip> {
-    execute_physical_query_payload(index, entry, entry.root, t0_ms, t1_ms, is_cumulative)
-}
-
-// Store adapters retain backend coverage/population metadata; dependency execution
-// and shared-node lifetime are owned by the independent physical DAG runtime.
-struct BoundQueryOperator<'a, 'store> {
-    id: QueryNodeId,
-    node: &'a QueryPlanNode,
-    runtime: &'a PhysicalQueryRuntime<'store>,
-}
-impl PhysicalOperator<PhysicalQueryOutput, ()> for BoundQueryOperator<'_, '_> {
-    fn name(&self) -> &str {
-        "InstalledQueryOperator"
-    }
-    fn input_schemas(&self) -> Vec<()> {
-        vec![(); self.node.inputs().len()]
-    }
-    fn output_schema(&self) {}
-    fn output_bytes(&self, value: &PhysicalQueryOutput) -> usize {
-        match value {
-            PhysicalQueryOutput::Scalar(_) => 8,
-            PhysicalQueryOutput::State {
-                groups,
-                item_labels,
-            } => {
-                groups
-                    .iter()
-                    .map(|(labels, state)| {
-                        labels.iter().map(|(k, v)| k.len() + v.len()).sum::<usize>()
-                            + match state {
-                                GroupState::Sketch { entries, .. } => entries
-                                    .iter()
-                                    .flat_map(|entry| entry.samples.values())
-                                    .flatten()
-                                    .map(|sample| {
-                                        sample.bytes.len() + std::mem::size_of_val(sample)
-                                    })
-                                    .sum::<usize>(),
-                                GroupState::ExactAgg { entries, .. } => entries
-                                    .iter()
-                                    .flat_map(|entry| entry.values())
-                                    .map(|state| state.approx_memory_bytes() + 8)
-                                    .sum::<usize>(),
-                            }
-                    })
-                    .sum::<usize>()
-                    + item_labels.iter().map(String::len).sum::<usize>()
-            }
-            PhysicalQueryOutput::Value(values, _) => values
-                .iter()
-                .map(|(labels, value)| {
-                    labels.iter().map(|(k, v)| k.len() + v.len()).sum::<usize>()
-                        + match value {
-                            SummaryValue::Points(points, _) => {
-                                points.len() * std::mem::size_of::<(i64, f64)>()
-                            }
-                            SummaryValue::TopK(points, _) => points
-                                .iter()
-                                .map(|(_, items)| {
-                                    8 + items.iter().map(|(key, _)| key.len() + 8).sum::<usize>()
-                                })
-                                .sum::<usize>(),
-                        }
-                })
-                .sum(),
-        }
-    }
-    fn start<'a>(
-        &'a self,
-        inputs: Vec<dag::Input<'a, PhysicalQueryOutput>>,
-        context: dag::RunContext,
-    ) -> Result<dag::OutputStream<'a, PhysicalQueryOutput>, dag::Error> {
-        Ok(futures::stream::once(async move {
-            let values =
-                futures::future::try_join_all(inputs.into_iter().map(|mut input| async move {
-                    input.next().await.ok_or_else(|| {
-                        dag::Error::Operator("query input produced no value".into())
-                    })?
-                }))
-                .await?;
-            let values = values.iter().map(|value| value.value()).collect::<Vec<_>>();
-            self.runtime
-                .execute_node(self.id, self.node, &values, &context)
-                .map_err(|error| match error {
-                    PhysicalNodeError::Physical(error) => error,
-                    other => dag::Error::Operator(format!("query node {}: {other}", self.id.0)),
-                })
-        })
-        .boxed_local())
-    }
-}
-fn execute_bound_queries(
-    entry: &asap_types::query_plan::QueryPlanEntry,
-    roots: &[QueryNodeId],
-    runtime: &PhysicalQueryRuntime<'_>,
-    context: dag::RunContext,
-) -> Result<Vec<PhysicalQueryOutput>, dag::Error> {
-    let mut order = std::collections::BTreeSet::new();
-    for root in roots {
-        order.extend(
-            entry
-                .topological_order_from(*root)
-                .map_err(|e| dag::Error::Invalid(e.to_string()))?,
-        );
-    }
-    let mut graph = dag::PhysicalDag::default();
-    for id in order {
-        let node = &entry.nodes[&id];
-        graph.add(
-            id.0,
-            node.inputs().iter().map(|id| id.0).collect(),
-            BoundQueryOperator { id, node, runtime },
-        )?;
-    }
-    let outputs = graph.execute(
-        &roots.iter().map(|root| root.0).collect::<Vec<_>>(),
-        context,
-    )?;
-    crate::query_engines::request::drive(futures::future::try_join_all(outputs.into_iter().map(
-        |mut output| async move {
-            output
-                .next()
-                .await
-                .ok_or_else(|| dag::Error::Operator("query root produced no value".into()))?
-                .map(|value| value.value().clone())
-        },
-    )))?
-}
-fn execute_bound_query(
-    entry: &asap_types::query_plan::QueryPlanEntry,
-    root: QueryNodeId,
-    runtime: &PhysicalQueryRuntime<'_>,
-    revision: u64,
-) -> Result<PhysicalQueryOutput, dag::Error> {
-    let context = crate::query_engines::request::context(dag::Scope::Query {
-        evaluation_time_ms: i64::try_from(runtime.context.t1_ms)
-            .map_err(|_| dag::Error::Invalid("query time exceeds i64".into()))?,
-        revision,
-    })?;
-    Ok(execute_bound_queries(entry, &[root], runtime, context)?.remove(0))
-}
-
-fn execute_physical_query_payload(
-    index: &SketchStore,
-    entry: &asap_types::query_plan::QueryPlanEntry,
-    root: asap_types::query_plan::QueryNodeId,
-    t0_ms: u64,
-    t1_ms: u64,
-    is_cumulative: bool,
-) -> Result<PostAsapReadoutOutcome, LoweringSkip> {
-    // Pin once for every branch; publication cannot switch a later read to r2.
-    let revisions = index
-        .revisions
-        .read()
-        .map_err(|_| LoweringSkip::ExecuteFailed("revision installation poisoned".into()))?
-        .clone();
-    let view = if let Some(revisions) = revisions {
-        let required = entry
-            .materialization_bindings()
-            .into_iter()
-            .map(|b| b.stored_output_reference.stored_output_id)
-            .collect();
-        let now = std::time::SystemTime::now()
-            .duration_since(std::time::UNIX_EPOCH)
-            .map_err(|e| LoweringSkip::ExecuteFailed(e.to_string()))?
-            .as_millis() as u64;
-        let ranges: Vec<_> = entry
-            .materialization_bindings()
-            .into_iter()
-            .map(|b| (b.materialization, t0_ms, t1_ms))
-            .collect();
-        Some(
-            revisions
-                .query_view(
-                    &required,
-                    now,
-                    &ranges,
-                    index
-                        .active_catalog_generation()
-                        .as_deref()
-                        .ok_or_else(|| {
-                            LoweringSkip::ExecuteFailed(
-                                "query revision requires a catalog generation".into(),
-                            )
-                        })?,
-                )
-                .map_err(|e| LoweringSkip::ExecuteFailed(e.to_string()))?,
-        )
-    } else {
-        None
-    };
-    let index = view.as_ref().unwrap_or(index);
-    let revision = index.summary_update_revision();
-    let result = (|| {
-        let runtime = PhysicalQueryRuntime {
-            counter_parameters: Default::default(),
-            language: entry.language,
-            catalog: index.summary_catalog_snapshot(),
-            context: QueryExecutionContext {
-                index,
-                t0_ms,
-                t1_ms,
-                is_cumulative,
-                allowed_materializations: None,
-            },
-        };
-        let output = execute_bound_query(entry, root, &runtime, revision.mutation_sequence())
-            .map_err(execution_failure)?;
-        readout_outcome(output, t1_ms)
-    })();
-    finish_readout(result, revision.matches(index.summary_update_revision()))
-}
-
-// A revision race must never replace a terminal physical execution error.
-fn finish_readout(
-    result: Result<PostAsapReadoutOutcome, LoweringSkip>,
-    revision_unchanged: bool,
-) -> Result<PostAsapReadoutOutcome, LoweringSkip> {
-    let outcome = result?;
-    if !revision_unchanged {
-        return Err(LoweringSkip::ExecuteFailed(
-            "summary input changed during query DAG evaluation".into(),
-        ));
-    }
-    Ok(outcome)
-}
-
-/// `SummaryValue::Points`/`TopK` -> `ASAPTierResult.series`'s row shape.
-/// `TopK`'s ranked-list-per-timestamp shape is pivoted into one row per
-/// item (each row = the group's label map plus an `item` label, one point
-/// per timestamp that item appeared in the ranked list) -- the SAME
-/// convention `sketch_reducer.rs`'s own topk arm already uses, not a new
-/// one invented here.
-fn summary_value_to_series(
-    group_key: &BTreeMap<String, String>,
-    value: &SummaryValue,
-) -> SeriesRows {
-    match value {
-        SummaryValue::Points(points, _coverage) => {
-            vec![(group_key.clone(), points.clone())]
-        }
-        SummaryValue::TopK(ranked_per_ts, _coverage) => {
-            let mut by_item: BTreeMap<String, Vec<(i64, f64)>> = BTreeMap::new();
-            for (ts, items) in ranked_per_ts {
-                for (item, val) in items {
-                    by_item.entry(item.clone()).or_default().push((*ts, *val));
-                }
-            }
-            by_item
-                .into_iter()
-                .map(|(item, points)| {
-                    let mut lv = group_key.clone();
-                    lv.insert("item".to_string(), item);
-                    (lv, points)
-                })
-                .collect()
-        }
-    }
-}
-
-pub(crate) fn fold_coverage(coverage: &mut Option<(u64, u64)>, next: Option<(u64, u64)>) {
-    let Some((lo, hi)) = next else { return };
-    *coverage = Some(match *coverage {
-        Some((clo, chi)) => (clo.min(lo), chi.max(hi)),
-        None => (lo, hi),
-    });
-}
-
-fn readout_outcome(
-    output: PhysicalQueryOutput,
-    t1_ms: u64,
-) -> Result<PostAsapReadoutOutcome, LoweringSkip> {
-    match output {
-        PhysicalQueryOutput::Scalar(_) => Err(LoweringSkip::ExecuteFailed(
-            "scalar-only query is not a warm vector result".into(),
-        )),
-        PhysicalQueryOutput::Value(values, coverage) => {
-            let mut series = Vec::new();
-            for (group_key, value) in &values {
-                series.extend(summary_value_to_series(group_key, value));
-            }
-            Ok(PostAsapReadoutOutcome { series, coverage })
-        }
-        PhysicalQueryOutput::State { groups, .. } => {
-            let mut coverage = None;
-            let mut series = Vec::new();
-            for (group_key, state) in &groups {
-                if let GroupState::Sketch { entries, .. } = state {
-                    for entry in entries {
-                        for time in entry.samples.keys() {
-                            let time = (*time).max(0) as u64;
-                            fold_coverage(&mut coverage, Some((time, time)));
-                        }
-                    }
-                } else {
-                    fold_coverage(&mut coverage, state.exact_coverage());
-                }
-                if let Some(value) = state.exact_value(&None) {
-                    series.push((group_key.clone(), vec![(t1_ms as i64, value)]));
-                }
-            }
-            Ok(PostAsapReadoutOutcome { series, coverage })
-        }
-    }
-}
-
-/// Evaluate all storage frontiers in one run so common dependencies are shared.
-pub(crate) fn execute_query_plan_readouts(
-    index: &SketchStore,
-    entry: &asap_types::query_plan::QueryPlanEntry,
-    roots: &[QueryNodeId],
-    t0_ms: u64,
-    t1_ms: u64,
-    is_cumulative: bool,
-    context: dag::RunContext,
-) -> Result<BTreeMap<QueryNodeId, PostAsapReadoutOutcome>, LoweringSkip> {
-    if roots.is_empty() {
-        return Ok(BTreeMap::new());
-    }
-    let revision = index.summary_update_revision();
-    let runtime = PhysicalQueryRuntime {
-        counter_parameters: Default::default(),
-        language: entry.language,
-        catalog: index.summary_catalog_snapshot(),
-        context: QueryExecutionContext {
-            index,
-            t0_ms,
-            t1_ms,
-            is_cumulative,
-            allowed_materializations: None,
-        },
-    };
-    let output =
-        execute_bound_queries(entry, roots, &runtime, context).map_err(execution_failure)?;
-    let result = roots
-        .iter()
-        .copied()
-        .zip(output)
-        .map(|(id, value)| readout_outcome(value, t1_ms).map(|value| (id, value)))
-        .collect();
-    if !revision.matches(index.summary_update_revision()) {
-        return Err(LoweringSkip::ExecuteFailed(
-            "summary input changed during query DAG evaluation".into(),
-        ));
-    }
-    result
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use crate::query_engines::asap_query_engine::test_plan;
-    use asap_types::query_plan::{ExactReadout, PhysicalGrouping, QueryReadout};
-    use planner_types::pre_asap::ArithmeticOpKind;
-
-    // Real DAG resource failures survive both summary-readout and engine error adapters.
-    #[test]
-    fn summary_dag_resource_failures_never_become_capability_misses() {
-        use asap_types::query_plan::{
-            FallbackPolicy, InstantExecution, QueryLanguage, QueryPlanEntry,
-        };
-        let store = SketchStore::new();
-        let runtime = PhysicalQueryRuntime {
-            counter_parameters: Default::default(),
-            language: QueryLanguage::PromQl,
-            catalog: None,
-            context: QueryExecutionContext {
-                index: &store,
-                t0_ms: 0,
-                t1_ms: 42,
-                is_cumulative: false,
-                allowed_materializations: None,
-            },
-        };
-        let entry = QueryPlanEntry {
-            language: QueryLanguage::PromQl,
-            query_id: "resource-test".into(),
-            canonical_query: "1".into(),
-            fixed_evaluation: None,
-            root: QueryNodeId(0),
-            nodes: [(QueryNodeId(0), QueryPlanNode::Scalar { value: 1. })].into(),
-            instant: InstantExecution {
-                lookback_ms: 0,
-                full_history: false,
-                cumulative_readout: false,
-            },
-            fallback: FallbackPolicy::ExactBackend,
-        };
-        for cancelled in [false, true] {
-            let context = dag::RunContext::new(
-                dag::Scope::Query {
-                    evaluation_time_ms: 42,
-                    revision: 1,
-                },
-                dag::Limits {
-                    max_bytes: if cancelled { 4096 } else { 1 },
-                    ..dag::Limits::default()
-                },
-            )
-            .unwrap();
-            if cancelled {
-                context.cancel();
-            }
-            let error =
-                match execute_bound_queries(&entry, &[entry.root], &runtime, context.clone()) {
-                    Err(error) => error,
-                    Ok(_) => panic!("resource-limited execution succeeded"),
-                };
-            let engine: crate::query_engines::EngineError = execution_failure(error).into();
-            assert!(
-                matches!(engine, crate::query_engines::EngineError::Physical(_)),
-                "{engine:?}"
-            );
-            assert_eq!(context.retained_bytes(), 0);
-        }
-    }
-
-    // Even when a writer invalidates the read fence, resource errors stay terminal.
-    #[test]
-    fn revision_change_cannot_mask_terminal_execution_failure() {
-        for error in [dag::Error::MemoryLimit, dag::Error::Cancelled] {
-            let result = finish_readout(Err(LoweringSkip::Execution(error)), false);
-            let engine: crate::query_engines::EngineError = result.err().unwrap().into();
-            assert!(
-                matches!(engine, crate::query_engines::EngineError::Physical(_)),
-                "{engine:?}"
-            );
-        }
-    }
-
-    // A sparse counter is omitted without dropping other series in the vector.
-    #[test]
-    fn counter_readout_omits_only_series_with_fewer_than_two_samples() {
-        use crate::storage_engines::types::Measurement;
-        let idx = SketchStore::new();
-        let runtime = PhysicalQueryRuntime {
-            counter_parameters: Default::default(),
-            language: control_plane::query_plan::QueryLanguage::PromQl,
-            catalog: None,
-            context: QueryExecutionContext {
-                index: &idx,
-                t0_ms: 0,
-                t1_ms: 60_000,
-                is_cumulative: true,
-                allowed_materializations: None,
-            },
-        };
-        let groups = [1, 2]
-            .into_iter()
-            .map(|samples| {
-                let mut state = asap_physical_operators::summary_kernels::IncreaseAccumulator::new(
-                    Measurement::new(10.0),
-                    10_000,
-                    Measurement::new(10.0),
-                    10_000,
-                );
-                if samples == 2 {
-                    state.update(Measurement::new(20.0), 20_000);
-                }
-                (
-                    BTreeMap::from([("instance".into(), samples.to_string())]),
-                    GroupState::ExactAgg {
-                        entries: vec![std::rc::Rc::new(BTreeMap::from([(
-                            60_000,
-                            std::sync::Arc::new(state)
-                                as std::sync::Arc<dyn crate::storage_engines::types::AggregateCore>,
-                        )]))],
-                        agg_type: asap_types::AggregationType::Rate,
-                    },
-                )
-            })
-            .collect();
-        let context = dag::RunContext::new(
-            dag::Scope::Query {
-                evaluation_time_ms: 60_000,
-                revision: 0,
-            },
-            dag::Limits::default(),
-        )
-        .unwrap();
-        let output = runtime
-            .execute_node(
-                QueryNodeId(0),
-                &QueryPlanNode::ExactReadout {
-                    input: QueryNodeId(1),
-                    readout: control_plane::query_plan::ExactReadout::Rate,
-                },
-                &[&PhysicalQueryOutput::State {
-                    groups,
-                    item_labels: vec![],
-                }],
-                &context,
-            )
-            .unwrap();
-        let PhysicalQueryOutput::Value(rows, _) = output else {
-            panic!("value rows required")
-        };
-        assert_eq!(rows.len(), 1);
-        assert_eq!(rows[0].0["instance"], "2");
-    }
-
-    // Empty leading/trailing panes do not invalidate a bounded counter window.
-    #[test]
-    fn sparse_counter_panes_preserve_full_requested_range() {
-        use crate::storage_engines::types::Measurement;
-        let idx = SketchStore::new();
-        let policy = asap_types::PolicyFingerprint(778);
-        idx.register(SummarySeriesMetadata {
-            storage_handle: 7,
-            metric_name: "requests_total".into(),
-            group_by_keys: std::collections::BTreeSet::new(),
-            capability: Some(Capability::ExactAgg(asap_types::AggregationType::Rate)),
-            agg_kind: AggKind::ExactAgg {
-                agg_type: asap_types::AggregationType::Rate,
-                parameters_canonical: String::new(),
-                spatial_filter_canonical: String::new(),
-            },
-            accuracy: None,
-            first_seen_unix_ms: 0,
-            retired_at_ms: None,
-            expires_at_ms: None,
-            policy_fp: policy,
-        });
-        for (start, time, value) in [(20_000, 25_000, 10.), (40_000, 45_000, 20.)] {
-            let state = asap_physical_operators::summary_kernels::IncreaseAccumulator::new(
-                Measurement::new(value),
-                time,
-                Measurement::new(value),
-                time,
-            );
-            idx.append_precompute(7, BTreeMap::new(), (start, start + 10_000), Box::new(state));
-        }
-        let binding = asap_types::query_plan::MaterializationBinding {
-            full_window_slide_ms: None,
-            item_labels: vec![],
-            materialization: policy.into(),
-            stored_output_reference: super::super::test_plan::bound_reference(&idx, policy.into()),
-            output_grouping: asap_types::query_plan::PhysicalGrouping::PerEntity,
-            window_ms: 10_000,
-            pane_origin_ms: Some(0),
-            readout_lookback_ms: Some(60_000),
-        };
-        let context = QueryExecutionContext {
-            index: &idx,
-            t0_ms: 0,
-            t1_ms: 60_000,
-            is_cumulative: true,
-            allowed_materializations: None,
-        };
-        let groups = context.read_bound_materialization(&binding).unwrap();
-        assert_eq!(groups.len(), 1);
-        let result = groups[0]
-            .1
-            .exact_value_for(
-                control_plane::query_plan::ExactReadout::Rate,
-                &None,
-                0,
-                60_000,
-            )
-            .unwrap()
-            .unwrap();
-        assert!((result - 11. / 24.).abs() < 1e-12);
-        let partial = QueryExecutionContext {
-            t0_ms: 25_000,
-            ..context
-        };
-        assert!(partial.read_bound_materialization(&binding).is_err());
-    }
-
-    // Per-series reads preserve source order so stable ranking retains tied inputs.
-    #[test]
-    fn per_entity_read_preserves_source_order() {
-        let idx = SketchStore::new();
-        let policy = asap_types::PolicyFingerprint(779);
-        for (sid, instance) in [(1, "z"), (2, "a")] {
-            idx.register(SummarySeriesMetadata {
-                storage_handle: sid,
-                metric_name: "m".into(),
-                group_by_keys: std::collections::BTreeSet::new(),
-                capability: Some(Capability::ExactAgg(asap_types::AggregationType::Sum)),
-                agg_kind: AggKind::ExactAgg {
-                    agg_type: asap_types::AggregationType::Sum,
-                    parameters_canonical: String::new(),
-                    spatial_filter_canonical: String::new(),
-                },
-                accuracy: None,
-                first_seen_unix_ms: 0,
-                retired_at_ms: None,
-                expires_at_ms: None,
-                policy_fp: policy,
-            });
-            idx.append_precompute(
-                sid,
-                BTreeMap::from([("instance".into(), instance.into())]),
-                (0, 1_000),
-                Box::new(asap_physical_operators::summary_kernels::SumAccumulator::with_sum(1.)),
-            );
-        }
-        let binding = asap_types::query_plan::MaterializationBinding {
-            full_window_slide_ms: None,
-            item_labels: vec![],
-            materialization: policy.into(),
-            stored_output_reference: super::super::test_plan::bound_reference(&idx, policy.into()),
-            output_grouping: asap_types::query_plan::PhysicalGrouping::PerEntity,
-            window_ms: 1_000,
-            pane_origin_ms: Some(0),
-            readout_lookback_ms: Some(1_000),
-        };
-        let context = QueryExecutionContext {
-            index: &idx,
-            t0_ms: 0,
-            t1_ms: 1_000,
-            is_cumulative: true,
-            allowed_materializations: None,
-        };
-        let groups = context.read_bound_materialization(&binding).unwrap();
-        assert_eq!(
-            groups
-                .iter()
-                .map(|(labels, _)| labels["instance"].as_str())
-                .collect::<Vec<_>>(),
-            vec!["z", "a"]
-        );
-    }
-
-    // A stored sketch frontier exposes pane coverage without treating it as exact state.
-    #[test]
-    fn sketch_frontier_retains_coverage_for_relation_binding() {
-        use crate::storage_engines::sketch_db::{
-            data::SketchTimeSeries, query::delta_apply::DeltaSketchKind,
-        };
-        let state = GroupState::Sketch {
-            kind: DeltaSketchKind::Hll { precision: 10 },
-            entries: vec![std::rc::Rc::new(SketchTimeSeries {
-                sid: 1,
-                series_label_values: BTreeMap::new(),
-                samples: BTreeMap::from([(1000, vec![]), (2000, vec![])]),
-            })],
-        };
-        let outcome = readout_outcome(
-            PhysicalQueryOutput::State {
-                groups: vec![(BTreeMap::new(), state)],
-                item_labels: vec![],
-            },
-            2000,
-        )
-        .unwrap();
-        assert_eq!(outcome.coverage, Some((1000, 2000)));
-        assert!(outcome.series.is_empty());
-    }
-
-    // Multiple storage frontiers share one run and inherit parent cancellation.
-    #[test]
-    fn multi_root_readout_uses_one_parent_context() {
-        let entry = asap_types::query_plan::QueryPlanEntry {
-            language: asap_types::query_plan::QueryLanguage::PromQl,
-            query_id: "shared".into(),
-            canonical_query: "1+1".into(),
-            fixed_evaluation: None,
-            root: QueryNodeId(1),
-            nodes: BTreeMap::from([
-                (QueryNodeId(0), QueryPlanNode::Scalar { value: 1. }),
-                (
-                    QueryNodeId(1),
-                    QueryPlanNode::Binary {
-                        operator: ArithmeticOpKind::Add,
-                        inputs: [QueryNodeId(0), QueryNodeId(0)],
-                    },
-                ),
-            ]),
-            instant: asap_types::query_plan::InstantExecution {
-                lookback_ms: 0,
-                full_history: false,
-                cumulative_readout: false,
-            },
-            fallback: asap_types::query_plan::FallbackPolicy::Reject,
-        };
-        let index = SketchStore::new();
-        let runtime = PhysicalQueryRuntime {
-            counter_parameters: Default::default(),
-            language: entry.language,
-            catalog: None,
-            context: QueryExecutionContext {
-                index: &index,
-                t0_ms: 0,
-                t1_ms: 1,
-                is_cumulative: false,
-                allowed_materializations: None,
-            },
-        };
-        let context = dag::RunContext::new(
-            dag::Scope::Query {
-                evaluation_time_ms: 1,
-                revision: 1,
-            },
-            dag::Limits::default(),
-        )
-        .unwrap();
-        let outputs = execute_bound_queries(
-            &entry,
-            &[QueryNodeId(1), QueryNodeId(0)],
-            &runtime,
-            context.clone(),
-        )
-        .unwrap();
-        assert!(
-            matches!(outputs.as_slice(),[PhysicalQueryOutput::Scalar(a),PhysicalQueryOutput::Scalar(b)] if *a==2. && *b==1.)
-        );
-        context.cancel();
-        assert!(execute_bound_queries(&entry, &[QueryNodeId(1)], &runtime, context).is_err());
-    }
-
-    fn exact_points(metric: &str, service: &str, value: f64) -> PhysicalQueryOutput {
-        PhysicalQueryOutput::Value(
-            vec![(
-                BTreeMap::from([
-                    ("__name__".into(), metric.into()),
-                    ("service".into(), service.into()),
-                ]),
-                SummaryValue::Points(vec![(2000, value)], Some((1000, 2000))),
-            )],
-            Some((1000, 2000)),
-        )
-    }
-
-    // Arithmetic follows default vector matching, not positional row pairing.
-    #[test]
-    fn exact_binary_matches_labels_and_preserves_scalar_orientation() {
-        let left = exact_points("sum", "api", 24.0);
-        let right = exact_points("count", "api", 3.0);
-        let PhysicalQueryOutput::Value(result, _) =
-            binary_values(&ArithmeticOpKind::Div, &left, &right).unwrap()
-        else {
-            panic!("expected vector")
-        };
-        assert_eq!(
-            result[0].0,
-            BTreeMap::from([("service".into(), "api".into())])
-        );
-        let SummaryValue::Points(points, coverage) = &result[0].1 else {
-            panic!("expected points")
-        };
-        assert_eq!(points, &vec![(2000, 8.0)]);
-        assert_eq!(*coverage, Some((1000, 2000)));
-        let PhysicalQueryOutput::Value(result, _) = binary_values(
-            &ArithmeticOpKind::Div,
-            &PhysicalQueryOutput::Scalar(48.0),
-            &left,
-        )
-        .unwrap() else {
-            panic!("expected vector")
-        };
-        let SummaryValue::Points(points, _) = &result[0].1 else {
-            panic!("expected points")
-        };
-        assert_eq!(points, &vec![(2000, 2.0)]);
-        let PhysicalQueryOutput::Value(result, _) = binary_values(
-            &ArithmeticOpKind::Div,
-            &left,
-            &exact_points("count", "worker", 3.0),
-        )
-        .unwrap() else {
-            panic!("expected vector")
-        };
-        assert!(result.is_empty());
-    }
-
-    // Zero denominators remain IEEE results; duplicate matches must fall back.
-    #[test]
-    fn exact_binary_handles_zero_and_rejects_ambiguous_matches() {
-        assert!(arithmetic(&ArithmeticOpKind::Div, 1.0, 0.0).is_infinite());
-        assert!(arithmetic(&ArithmeticOpKind::Div, 0.0, 0.0).is_nan());
-        let PhysicalQueryOutput::Value(mut values, coverage) = exact_points("a", "api", 1.0) else {
-            unreachable!()
-        };
-        values.push(values[0].clone());
-        assert!(binary_values(
-            &ArithmeticOpKind::Add,
-            &PhysicalQueryOutput::Value(values, coverage),
-            &PhysicalQueryOutput::Scalar(1.0)
-        )
-        .is_err());
-        assert_eq!(
-            intersect_coverage(Some((1000, 2000)), Some((1500, 2500))),
-            Some((1500, 2000))
-        );
-        assert_eq!(intersect_coverage(Some((1000, 2000)), None), None);
-    }
-
-    // Rollup adds partial counts rather than counting the number of series.
-    #[test]
-    fn exact_rollup_adds_uneven_observation_counts() {
-        let values = [("a", 1.0), ("b", 3.0)]
-            .into_iter()
-            .map(|(instance, value)| {
-                (
-                    BTreeMap::from([
-                        ("service".into(), "api".into()),
-                        ("instance".into(), instance.into()),
-                    ]),
-                    SummaryValue::Points(vec![(2000, value)], Some((1000, 2000))),
-                )
-            })
-            .collect::<Vec<_>>();
-        let PhysicalQueryOutput::Value(result, _) = reduce_sum_values(
-            &asap_types::query_plan::PhysicalGrouping::Reduce(vec!["service".into()]),
-            &values,
-            Some((1000, 2000)),
-        )
-        .unwrap() else {
-            panic!("expected vector")
-        };
-        assert_eq!(result.len(), 1);
-        let SummaryValue::Points(points, _) = &result[0].1 else {
-            panic!("expected points")
-        };
-        assert_eq!(points, &vec![(2000, 4.0)]);
-    }
-    use crate::storage_engines::sketch_db::data::{AggKind, SketchConfig};
-    use crate::storage_engines::sketch_db::index::{
-        AccuracyBound, Capability, SketchAlgorithm, SketchSampleState, SummarySeriesMetadata,
-    };
-
-    fn register_hll(idx: &SketchStore, sid: u64, service: &str, items: &[&str]) {
-        // precision 14 -- what `ControlPlaneCostModel` actually picks for
-        // `AccuracyTarget::Epsilon(0.01)` (confirmed by inspecting the
-        // bound tree directly); `find_candidates`'s exact-match contract
-        // means a mismatched precision here would just silently produce
-        // `NoCandidates`, not a wrong answer -- but that's not what these
-        // tests are checking.
-        let cfg = SketchConfig::Hll { precision: 14 };
-        let mut group_by_keys = std::collections::BTreeSet::new();
-        group_by_keys.insert("service".to_string());
-        idx.register(SummarySeriesMetadata {
-            storage_handle: sid,
-            metric_name: "unique_users".to_string(),
-            group_by_keys,
-            capability: Some(Capability::CardinalityApprox),
-            agg_kind: AggKind::Sketch {
-                algorithm: SketchAlgorithm::Hll,
-                config: cfg.clone(),
-                spatial_filter_canonical: String::new(),
-            },
-            accuracy: Some(AccuracyBound::from_config(&cfg)),
-            first_seen_unix_ms: 0,
-            retired_at_ms: None,
-            expires_at_ms: None,
-            policy_fp: asap_types::PolicyFingerprint(123),
-        });
-        use asap_sketchlib::{HllSketch, HllVariant, MessagePackCodec};
-        let mut sk = HllSketch::new(HllVariant::Regular, 14);
-        for item in items {
-            sk.update(item.as_bytes());
-        }
-        let mut labels = BTreeMap::new();
-        labels.insert("service".to_string(), service.to_string());
-        idx.append_sample(
-            sid,
-            labels,
-            (1_000, 2_000),
-            SketchSampleState {
-                bytes: sk.to_msgpack().expect("encode HLL"),
-                encoding: crate::storage_engines::sketch_db::index::SketchEncoding::MsgpackFull,
-            },
-        );
-    }
-
-    fn ddsketch_fixture() -> SketchStore {
-        let idx = SketchStore::new();
-        // alpha 0.01 -- what `ControlPlaneCostModel` actually picks for
-        // `quantile_over_time` at `AccuracyTarget::Epsilon(0.01)` (DDSketch,
-        // not KLL -- confirmed by inspecting the bound tree directly).
-        let cfg = SketchConfig::DDSketch {
-            relative_accuracy: 0.01,
-        };
-        idx.register(SummarySeriesMetadata {
-            storage_handle: 1,
-            metric_name: "latency_ms".to_string(),
-            group_by_keys: std::collections::BTreeSet::new(),
-            capability: Some(Capability::QuantileApprox(Some(SketchAlgorithm::DDSketch))),
-            agg_kind: AggKind::Sketch {
-                algorithm: SketchAlgorithm::DDSketch,
-                config: cfg.clone(),
-                spatial_filter_canonical: String::new(),
-            },
-            accuracy: Some(AccuracyBound::from_config(&cfg)),
-            first_seen_unix_ms: 0,
-            retired_at_ms: None,
-            expires_at_ms: None,
-            policy_fp: asap_types::PolicyFingerprint::UNSET,
-        });
-        use asap_sketchlib::{DdSketch, MessagePackCodec};
-        let mut sk = DdSketch::new(0.01);
-        for i in 1..=100 {
-            sk.update(i as f64);
-        }
-        idx.append_sample(
-            1,
-            BTreeMap::new(),
-            (1_000, 2_000),
-            SketchSampleState {
-                bytes: sk.to_msgpack().expect("encode DDSketch"),
-                encoding: crate::storage_engines::sketch_db::index::SketchEncoding::MsgpackFull,
-            },
-        );
-        idx
-    }
-
-    // The same installed summary follows each language's metric-name semantics;
-    // spatial reduction must not invent a source metric on the aggregate.
-    #[test]
-    fn metricsql_quantile_preserves_catalog_metric_name_only_per_entity() {
-        use control_plane::query_plan::*;
-        let config: asap_types::PrecomputeMaterialization =
-            serde_json::from_value(serde_json::json!({
-                "aggregation_type": "DDSketch", "aggregation_sub_type": "",
-                "metric": "latency_ms", "window_size": 1, "slide_interval": 1,
-                "window_type": "tumbling", "num_aggregates_to_retain": 3,
-                "parameters": {"alpha": 0.01}, "pane_origin_ms": 0,
-                "partitioning": "per_entity", "window_layout": {"kind": "pane", "pane_secs": 1},
-                "grouping_labels": {"labels": []}, "aggregated_labels": {"labels": []},
-                "rollup_labels": {"labels": []}, "spatial_filter": "",
-                "spatial_filter_normalized": "", "original_yaml": ""
-            }))
-            .unwrap();
-        let idx = ddsketch_fixture();
-        let mut metadata = (*idx.instance(1).unwrap()).clone();
-        metadata.policy_fp = config.policy_fingerprint();
-        idx.install_summary_catalog(std::sync::Arc::new(
-            asap_types::summary_catalog::SummaryCatalog::from_materializations(
-                1,
-                1,
-                &[config.clone()],
-            )
-            .unwrap(),
-        ))
-        .unwrap();
-        idx.register(metadata);
-        let mut entry = QueryPlanEntry {
-            language: QueryLanguage::MetricsQl,
-            query_id: "quantile".into(),
-            canonical_query: "quantile_over_time(0.9, latency_ms[1s])".into(),
-            fixed_evaluation: None,
-            root: QueryNodeId(0),
-            nodes: BTreeMap::from([
-                (
-                    QueryNodeId(0),
-                    QueryPlanNode::SummaryEstimate {
-                        input: QueryNodeId(1),
-                        query: QueryReadout::Quantile { q: 0.9 },
-                    },
-                ),
-                (
-                    QueryNodeId(1),
-                    QueryPlanNode::ReadMaterialization {
-                        binding: MaterializationBinding {
-                            full_window_slide_ms: None,
-                            materialization: config.policy_fingerprint().into(),
-                            stored_output_reference: super::super::test_plan::bound_reference(
-                                &idx,
-                                config.policy_fingerprint().into(),
-                            ),
-                            output_grouping: PhysicalGrouping::PerEntity,
-                            item_labels: vec![],
-                            window_ms: 1000,
-                            pane_origin_ms: Some(0),
-                            readout_lookback_ms: Some(1000),
-                        },
-                    },
-                ),
-            ]),
-            instant: InstantExecution {
-                lookback_ms: 1000,
-                full_history: false,
-                cumulative_readout: true,
-            },
-            fallback: FallbackPolicy::ExactBackend,
-        };
-        let result = execute_query_plan_readout(&idx, &entry, 1000, 2000, true).unwrap();
-        assert_eq!(
-            result.series[0].0.get("__name__").map(String::as_str),
-            Some("latency_ms")
-        );
-        entry.language = QueryLanguage::PromQl;
-        let result = execute_query_plan_readout(&idx, &entry, 1000, 2000, true).unwrap();
-        assert!(!result.series[0].0.contains_key("__name__"));
-        entry.language = QueryLanguage::MetricsQl;
-        let QueryPlanNode::ReadMaterialization { binding } =
-            entry.nodes.get_mut(&QueryNodeId(1)).unwrap()
-        else {
-            unreachable!()
-        };
-        binding.output_grouping = PhysicalGrouping::Reduce(vec![]);
-        let result = execute_query_plan_readout(&idx, &entry, 1000, 2000, true).unwrap();
-        assert!(!result.series[0].0.contains_key("__name__"));
-    }
-
-    #[test]
-    fn formal_query_plan_executes_only_its_bound_policy() {
-        let idx = SketchStore::new();
-        register_hll(&idx, 1, "api", &["a", "b"]);
-        register_hll(&idx, 2, "worker", &["b", "c"]);
-        let config = crate::query_engines::asap_query_engine::test_plan::materialization(
-            "unique_users",
-            "HLL",
-            serde_json::json!({"precision": 14}),
-            &["service"],
-            1000,
-        );
-        let entry = crate::query_engines::asap_query_engine::test_plan::entry(
-            "count(distinct_over_time(unique_users[1m]))",
-            &config,
-            asap_types::query_plan::PhysicalGrouping::PerEntity,
-            1000,
-            QueryPlanNode::SummaryEstimate {
-                input: QueryNodeId(0),
-                query: asap_types::query_plan::QueryReadout::Cardinality,
-            },
-        );
-        crate::query_engines::asap_query_engine::test_plan::install(
-            &idx,
-            &[(config, vec![1])],
-            vec![entry.clone()],
-        );
-        let result = execute_query_plan_readout(&idx, &entry, 1_000, 2_000, true)
-            .expect("execute formal QueryPlan");
-        assert_eq!(result.series.len(), 1, "unbound policy must not contribute");
-        assert_eq!(
-            result.series[0].0.get("service").map(String::as_str),
-            Some("api")
-        );
-        assert!((result.series[0].1[0].1 - 2.0).abs() < 0.1);
-    }
-
-    #[test]
-    fn bare_range_function_keeps_one_series_per_entity() {
-        let idx = ddsketch_fixture();
-        let config = test_plan::materialization(
-            "latency_ms",
-            "DDSketch",
-            serde_json::json!({"alpha": 0.01}),
-            &[],
-            1000,
-        );
-        let entry = test_plan::entry(
-            "quantile_over_time(0.99, latency_ms[1s])",
-            &config,
-            PhysicalGrouping::PerEntity,
-            1000,
-            QueryPlanNode::SummaryEstimate {
-                input: QueryNodeId(0),
-                query: QueryReadout::Quantile { q: 0.99 },
-            },
-        );
-        test_plan::install(&idx, &[(config, vec![1])], vec![entry.clone()]);
-        let outcome = execute_query_plan_readout(&idx, &entry, 1000, 2000, true).unwrap();
-        assert_eq!(outcome.series.len(), 1);
-    }
-
-    #[test]
-    fn global_merge_shape_now_merges_instead_of_being_declined() {
-        // An ungrouped count reduces two HLL sids into one answer. `Reduce([])`
-        // assigns both candidates the same group key so their states merge.
-        let idx = SketchStore::new();
-        register_hll(&idx, 1, "svc-a", &["a", "b", "c"]);
-        register_hll(&idx, 2, "svc-b", &["d", "e", "f"]);
-        let config = test_plan::materialization(
-            "unique_users",
-            "HLL",
-            serde_json::json!({"precision": 14}),
-            &["service"],
-            1000,
-        );
-        let entry = test_plan::entry(
-            "count(distinct_over_time(unique_users[1m]))",
-            &config,
-            PhysicalGrouping::Reduce(vec![]),
-            1000,
-            QueryPlanNode::SummaryEstimate {
-                input: QueryNodeId(0),
-                query: QueryReadout::Cardinality,
-            },
-        );
-        test_plan::install(&idx, &[(config, vec![1, 2])], vec![entry.clone()]);
-        let outcome = execute_query_plan_readout(&idx, &entry, 1000, 2000, true).unwrap();
-        assert_eq!(
-            outcome.series.len(),
-            1,
-            "a by-less distinct count is a full reduction -- both HLL sids must merge into \
-             ONE series, not stay split (and not be declined), got {:?}",
-            outcome.series
-        );
-        // Disjoint item sets {a,b,c} + {d,e,f} -> merged cardinality ~6.
-        let (_group, points) = &outcome.series[0];
-        let card = points[0].1;
-        assert!(
-            (4.0..=8.0).contains(&card),
-            "merged cardinality {card} should be ~6 (both sids' disjoint items), not ~3"
-        );
-    }
-
-    #[test]
-    fn exact_agg_outcome_reports_window_end_coverage() {
-        let idx = SketchStore::new();
-        idx.register(
-            crate::storage_engines::sketch_db::index::SummarySeriesMetadata {
-                storage_handle: 1,
-                metric_name: "bytes_total".to_string(),
-                group_by_keys: std::collections::BTreeSet::new(),
-                capability: Some(Capability::ExactAgg(asap_types::AggregationType::Sum)),
-                agg_kind: AggKind::ExactAgg {
-                    agg_type: asap_types::AggregationType::Sum,
-                    parameters_canonical: String::new(),
-                    spatial_filter_canonical: String::new(),
-                },
-                accuracy: None,
-                first_seen_unix_ms: 0,
-                retired_at_ms: None,
-                expires_at_ms: None,
-                policy_fp: asap_types::PolicyFingerprint::UNSET,
-            },
-        );
-        idx.append_precompute(
-            1,
-            BTreeMap::new(),
-            (1_000, 2_000),
-            Box::new(asap_physical_operators::summary_kernels::SumAccumulator::with_sum(42.0)),
-        );
-        let config =
-            test_plan::materialization("bytes_total", "Sum", serde_json::json!({}), &[], 1000);
-        let entry = test_plan::entry(
-            "sum(bytes_total)",
-            &config,
-            PhysicalGrouping::Reduce(vec![]),
-            1000,
-            QueryPlanNode::ExactReadout {
-                input: QueryNodeId(0),
-                readout: ExactReadout::Sum,
-            },
-        );
-        test_plan::install(&idx, &[(config, vec![1])], vec![entry.clone()]);
-        let outcome = execute_query_plan_readout(&idx, &entry, 1000, 2000, true).unwrap();
-        // Window-end-only coverage: a single window (1_000, 2_000) is
-        // keyed by its end (2_000) alone, so both bounds equal 2_000 --
-        // same semantics as `SummaryValue::coverage()`, reconfirmed for
-        // `exact_coverage` by this module's A0 test in `summary_executor.rs`.
-        assert_eq!(outcome.coverage, Some((2_000, 2_000)));
-    }
-
-    // Exercise the compiled plan and runtime bucket assignment against raw integer samples.
-    #[test]
-    fn compiled_window_schedules_execute_exact_ranges() {
-        use crate::precompute_engine::window_manager::WindowManager;
-        use control_plane::physical::compiler::{
-            BackendLocalPlanningInput, DeploymentPlanCompiler,
-        };
-        for evaluation_secs in [20, 45, 60, 120, 90] {
-            for phase_ms in [0, 5_000] {
-                for full in [false, true] {
-                    if full && evaluation_secs == 60 {
-                        continue;
-                    }
-                    let mut snapshot: serde_json::Value = serde_json::from_str(include_str!(
-                        "../../../../docs/examples/asapquery-planning-snapshot.json"
-                    ))
-                    .unwrap();
-                    let entry = &mut snapshot["query_workload"]["repeating_queries"][0];
-                    entry["query"] = serde_json::json!("sum_over_time(a[1m])");
-                    entry["requirements"]["accuracy"]["explicit"] = serde_json::json!("Exact");
-                    entry["demand"]["fixed_interval_at"] = serde_json::json!({
-                        "interval": evaluation_secs * 1_000, "evaluation_phase": phase_ms
-                    });
-                    let snapshot: BackendLocalPlanningInput =
-                        serde_json::from_value(snapshot).unwrap();
-                    let (mut request, env) = snapshot.into_physical_compilation_request().unwrap();
-                    request.queries[0]
-                        .window_realization_candidates
-                        .retain(|c| {
-                            matches!(
-                                c.layout,
-                                asap_types::WindowMaterializationLayout::FullWindow
-                            ) == full
-                        });
-                    let plan = DeploymentPlanCompiler.compile_promql(request, env).unwrap();
-                    let config = &plan.precompute_plan.materializations[0];
-                    let manager = WindowManager::with_layout(
-                        config.window_size,
-                        config.slide_interval,
-                        config.pane_origin_ms,
-                        &config.window_layout,
-                    );
-                    let mut buckets = BTreeMap::<(u64, u64), f64>::new();
-                    for second in 1..=800 {
-                        for start in manager.stored_bucket_starts(second * 1_000 - 1) {
-                            let (_, end) = manager.stored_bucket_bounds(start);
-                            if start >= 0 && end <= 800_000 {
-                                *buckets.entry((start as u64, end as u64)).or_default() +=
-                                    second as f64;
-                            }
-                        }
-                    }
-                    let idx = SketchStore::new();
-                    idx.install_summary_catalog(std::sync::Arc::new(plan.summary_catalog.clone()))
-                        .unwrap();
-                    idx.register(SummarySeriesMetadata {
-                        storage_handle: 7,
-                        metric_name: "a".into(),
-                        group_by_keys: Default::default(),
-                        capability: Some(Capability::ExactAgg(asap_types::AggregationType::Sum)),
-                        agg_kind: crate::storage_engines::sketch_db::data::agg_kind_for_config(
-                            config,
-                        ),
-                        accuracy: None,
-                        first_seen_unix_ms: 0,
-                        retired_at_ms: None,
-                        expires_at_ms: None,
-                        policy_fp: config.policy_fingerprint(),
-                    });
-                    for (bounds, sum) in buckets {
-                        idx.append_precompute(
-                            7,
-                            BTreeMap::new(),
-                            bounds,
-                            Box::new(
-                                asap_physical_operators::summary_kernels::SumAccumulator::with_sum(
-                                    sum,
-                                ),
-                            ),
-                        );
-                    }
-                    let entry = plan.query_plan.entries.values().next().unwrap();
-                    for tick in 3..6 {
-                        let end = phase_ms + evaluation_secs * 1_000 * tick;
-                        let (outcome, _) = super::super::live_serve::serve_instant_from_query_plan(
-                            &idx, entry, end,
-                        )
-                        .unwrap_or_else(|error| {
-                            panic!("E={evaluation_secs} phase={phase_ms} full={full}: {error:?}")
-                        });
-                        let expected = ((end / 1_000 - 59)..=end / 1_000).sum::<u64>() as f64;
-                        assert_eq!(outcome.series[0].1.last().unwrap().1, expected);
-                        assert!(super::super::live_serve::serve_instant_from_query_plan(
-                            &idx,
-                            entry,
-                            end + 1
-                        )
-                        .is_err());
-                    }
-                }
-            }
-        }
-    }
-
-    // Compile the two readouts, store one pane series, and execute the actual ratio.
-    #[test]
-    fn compiled_shared_sum_panes_preserve_each_lookback() {
-        use control_plane::physical::compiler::{
-            BackendLocalPlanningInput, DeploymentPlanCompiler,
-        };
-        let mut snapshot: serde_json::Value = serde_json::from_str(include_str!(
-            "../../../../docs/examples/asapquery-planning-snapshot.json"
-        ))
-        .unwrap();
-        let entry = &mut snapshot["query_workload"]["repeating_queries"][0];
-        entry["query"] = serde_json::json!("sum_over_time(a[1m]) / sum_over_time(a[10m])");
-        entry["requirements"]["accuracy"]["explicit"] = serde_json::json!("Exact");
-        entry["demand"]["fixed_interval_at"]["interval"] = serde_json::json!(60_000);
-        let snapshot: BackendLocalPlanningInput = serde_json::from_value(snapshot).unwrap();
-        let (request, env) = snapshot.into_physical_compilation_request().unwrap();
-        let plan = DeploymentPlanCompiler.compile_promql(request, env).unwrap();
-        assert_eq!(plan.precompute_plan.materializations.len(), 1);
-        let config = &plan.precompute_plan.materializations[0];
-        let policy = config.policy_fingerprint();
-        let idx = SketchStore::new();
-        idx.install_summary_catalog(std::sync::Arc::new(plan.summary_catalog.clone()))
-            .unwrap();
-        idx.register(SummarySeriesMetadata {
-            storage_handle: 7,
-            metric_name: "a".into(),
-            group_by_keys: Default::default(),
-            capability: Some(Capability::ExactAgg(asap_types::AggregationType::Sum)),
-            agg_kind: crate::storage_engines::sketch_db::data::agg_kind_for_config(config),
-            accuracy: None,
-            first_seen_unix_ms: 0,
-            retired_at_ms: None,
-            expires_at_ms: None,
-            policy_fp: policy,
-        });
-        for pane in 0..11 {
-            idx.append_precompute(
-                7,
-                BTreeMap::new(),
-                (pane * 60_000, (pane + 1) * 60_000),
-                Box::new(
-                    asap_physical_operators::summary_kernels::SumAccumulator::with_sum(
-                        (pane + 1) as f64,
-                    ),
-                ),
-            );
-        }
-        let entry = plan.query_plan.entries.values().next().unwrap();
-        for (now, expected) in [(600_000, 10.0 / 55.0), (660_000, 11.0 / 65.0)] {
-            let (outcome, stats) = super::super::logical_dag::execute_installed(
-                entry,
-                &BTreeMap::new(),
-                now,
-                |root, at| {
-                    let mut subtree = entry.clone();
-                    subtree.root = root;
-                    let reachable = subtree.topological_order().unwrap();
-                    subtree.nodes.retain(|id, _| reachable.contains(id));
-                    subtree.instant.lookback_ms = subtree.materialization_bindings()[0]
-                        .readout_lookback_ms
-                        .unwrap();
-                    super::super::live_serve::serve_instant_from_query_plan(&idx, &subtree, at)
-                        .map(|(result, _)| {
-                            use crate::query_engines::query_result::{InstantVectorElement, QueryResult};
-                            let values = result.series.into_iter().map(|(labels, samples)| {
-                                let (keys, values) = labels.into_iter().unzip();
-                                InstantVectorElement::new(crate::storage_engines::types::KeyByLabelValues::new_with_labels(values), samples.last().unwrap().1)
-                                    .with_label_keys_override(keys)
-                            }).collect();
-                            QueryResult::vector(values, at)
-                        })
-                        .map_err(|error| {
-                            crate::query_engines::EngineError::capability_miss(
-                                "test",
-                                format!("{error:?}"),
-                            )
-                        })
-                },
-            )
-            .unwrap();
-            let crate::query_engines::query_result::QueryResult::Vector(outcome) = outcome else {
-                panic!("expected vector");
-            };
-            assert_eq!(stats.summary_readout_evaluations, 2);
-            assert_eq!(outcome.values.len(), 1);
-            assert!((outcome.values[0].value - expected).abs() < 1e-12);
-        }
-    }
-
-    #[test]
-    fn repeated_multi_pane_reads_exclude_expired_state_and_reject_gaps() {
-        let idx = SketchStore::new();
-        let policy = asap_types::PolicyFingerprint(777);
-        idx.register(SummarySeriesMetadata {
-            storage_handle: 7,
-            metric_name: "requests_total".into(),
-            group_by_keys: std::collections::BTreeSet::new(),
-            capability: Some(Capability::ExactAgg(asap_types::AggregationType::Sum)),
-            agg_kind: AggKind::ExactAgg {
-                agg_type: asap_types::AggregationType::Sum,
-                parameters_canonical: String::new(),
-                spatial_filter_canonical: String::new(),
-            },
-            accuracy: None,
-            first_seen_unix_ms: 0,
-            retired_at_ms: None,
-            expires_at_ms: None,
-            policy_fp: policy,
-        });
-        // Old panes remain stored; each advancing query must select only its lookback.
-        for pane in 0..8 {
-            idx.append_precompute(
-                7,
-                BTreeMap::new(),
-                (pane * 10_000, (pane + 1) * 10_000),
-                Box::new(
-                    asap_physical_operators::summary_kernels::SumAccumulator::with_sum(
-                        (pane + 1) as f64,
-                    ),
-                ),
-            );
-        }
-
-        let entry = asap_types::query_plan::QueryPlanEntry {
-            language: asap_types::query_plan::QueryLanguage::PromQl,
-            query_id: "q-rate".into(),
-            canonical_query: "rate(requests_total[1m])".into(),
-            fixed_evaluation: None,
-            root: asap_types::query_plan::QueryNodeId(0),
-            nodes: BTreeMap::from([
-                (
-                    asap_types::query_plan::QueryNodeId(0),
-                    QueryPlanNode::ExactReadout {
-                        input: asap_types::query_plan::QueryNodeId(1),
-                        readout: asap_types::query_plan::ExactReadout::Sum,
-                    },
-                ),
-                (
-                    asap_types::query_plan::QueryNodeId(1),
-                    QueryPlanNode::ReadMaterialization {
-                        binding: asap_types::query_plan::MaterializationBinding {
-                            full_window_slide_ms: None,
-                            item_labels: Vec::new(),
-                            materialization: policy.into(),
-                            stored_output_reference: super::super::test_plan::bound_reference(
-                                &idx,
-                                policy.into(),
-                            ),
-                            output_grouping: asap_types::query_plan::PhysicalGrouping::PerEntity,
-                            window_ms: 10_000,
-                            pane_origin_ms: Some(0),
-                            readout_lookback_ms: Some(60_000),
-                        },
-                    },
-                ),
-            ]),
-            instant: asap_types::query_plan::InstantExecution {
-                lookback_ms: 60_000,
-                full_history: false,
-                cumulative_readout: true,
-            },
-            fallback: asap_types::query_plan::FallbackPolicy::ExactBackend,
-        };
-        for (now, expected) in [(60_000, 21.0), (70_000, 27.0), (80_000, 33.0)] {
-            let (outcome, _) = execute_query_plan_instant(&idx, &entry, now).unwrap();
-            assert_eq!(outcome.series[0].1[0].1, expected);
-        }
-        assert!(
-            execute_query_plan_instant(&idx, &entry, 70_001).is_err(),
-            "partial additive pane must fall back"
-        );
-        assert!(
-            execute_query_plan_instant(&idx, &entry, 90_000).is_err(),
-            "open/missing trailing pane must fall back"
-        );
-        // Both endpoints exist, but the missing interior pane is not evidence of zero samples.
-        let gap_idx = SketchStore::new();
-        idx.with_instance(7, |meta| gap_idx.register(meta.clone()));
-        for pane in [0, 1, 3, 4, 5] {
-            gap_idx.append_precompute(
-                7,
-                BTreeMap::new(),
-                (pane * 10_000, (pane + 1) * 10_000),
-                Box::new(asap_physical_operators::summary_kernels::SumAccumulator::with_sum(1.0)),
-            );
-        }
-        assert!(
-            execute_query_plan_instant(&gap_idx, &entry, 60_000).is_err(),
-            "interior gap must fall back"
-        );
-    }
-
-    #[test]
-    fn exact_query_plan_rate_uses_reset_aware_readout() {
-        let idx = SketchStore::new();
-        let policy = asap_types::PolicyFingerprint(777);
-        idx.register(SummarySeriesMetadata {
-            storage_handle: 7,
-            metric_name: "requests_total".into(),
-            group_by_keys: std::collections::BTreeSet::new(),
-            capability: Some(Capability::ExactAgg(asap_types::AggregationType::Rate)),
-            agg_kind: AggKind::ExactAgg {
-                agg_type: asap_types::AggregationType::Rate,
-                parameters_canonical: String::new(),
-                spatial_filter_canonical: String::new(),
-            },
-            accuracy: None,
-            first_seen_unix_ms: 0,
-            retired_at_ms: None,
-            expires_at_ms: None,
-            policy_fp: policy,
-        });
-        use crate::storage_engines::types::Measurement;
-        let mut accumulator = asap_physical_operators::summary_kernels::IncreaseAccumulator::new(
-            Measurement::new(10.0),
-            10_000,
-            Measurement::new(10.0),
-            10_000,
-        );
-        accumulator.update(Measurement::new(20.0), 20_000);
-        accumulator.update(Measurement::new(3.0), 30_000);
-        accumulator.update(Measurement::new(13.0), 50_000);
-        idx.append_precompute(7, BTreeMap::new(), (0, 60_000), Box::new(accumulator));
-
-        let entry = asap_types::query_plan::QueryPlanEntry {
-            language: asap_types::query_plan::QueryLanguage::PromQl,
-            query_id: "q-rate".into(),
-            canonical_query: "rate(requests_total[1m])".into(),
-            fixed_evaluation: None,
-            root: asap_types::query_plan::QueryNodeId(0),
-            nodes: BTreeMap::from([
-                (
-                    asap_types::query_plan::QueryNodeId(0),
-                    QueryPlanNode::ExactReadout {
-                        input: asap_types::query_plan::QueryNodeId(1),
-                        readout: asap_types::query_plan::ExactReadout::Rate,
-                    },
-                ),
-                (
-                    asap_types::query_plan::QueryNodeId(1),
-                    QueryPlanNode::ReadMaterialization {
-                        binding: asap_types::query_plan::MaterializationBinding {
-                            full_window_slide_ms: None,
-                            item_labels: Vec::new(),
-                            materialization: policy.into(),
-                            stored_output_reference: super::super::test_plan::bound_reference(
-                                &idx,
-                                policy.into(),
-                            ),
-                            output_grouping: asap_types::query_plan::PhysicalGrouping::PerEntity,
-                            window_ms: 60_000,
-                            pane_origin_ms: Some(0),
-                            readout_lookback_ms: Some(60_000),
-                        },
-                    },
-                ),
-            ]),
-            instant: asap_types::query_plan::InstantExecution {
-                lookback_ms: 60_000,
-                full_history: false,
-                cumulative_readout: true,
-            },
-            fallback: asap_types::query_plan::FallbackPolicy::ExactBackend,
-        };
-        let outcome = execute_query_plan_readout(&idx, &entry, 0, 60_000, true)
-            .expect("execute exact rate DAG");
-        let value = outcome.series[0].1[0].1;
-        assert!((value - 0.575).abs() < 1e-12, "reset-aware rate={value}");
-        let native_runtime = PhysicalQueryRuntime {
-            counter_parameters: Default::default(),
-            language: control_plane::query_plan::QueryLanguage::MetricsQl,
-            catalog: None,
-            context: QueryExecutionContext {
-                index: &idx,
-                t0_ms: 0,
-                t1_ms: 60_000,
-                is_cumulative: true,
-                allowed_materializations: None,
-            },
-        };
-        for readout in [
-            control_plane::query_plan::ExactReadout::Rate,
-            control_plane::query_plan::ExactReadout::Increase,
-        ] {
-            assert!(matches!(native_runtime.execute_node(QueryNodeId(0),
-                &QueryPlanNode::ExactReadout { input:QueryNodeId(1),readout }, &[], &dag::RunContext::new(dag::Scope::Query { evaluation_time_ms: 0, revision: 0 }, dag::Limits::default()).unwrap()),
-                Err(PhysicalNodeError::Fallback(reason))
-                    if reason.contains("native MetricsQL counter semantics require external exact execution")));
-        }
-        assert!(
-            execute_query_plan_readout(&idx, &entry, 1, 60_000, true).is_err(),
-            "a partial leading counter pane needs Prometheus boundary samples"
-        );
-        assert!(
-            execute_query_plan_readout(&idx, &entry, 0, 59_999, true).is_err(),
-            "a partial trailing counter pane needs Prometheus boundary samples"
-        );
-    }
-
-    #[test]
-    fn global_heap_items_keep_the_inner_aggregate_label_for_candidate_join() {
-        let value = SummaryValue::TopK(
-            vec![(60_000, vec![("payment".into(), 9.0), ("order".into(), 7.0)])],
-            Some((0, 60_000)),
-        );
-        let rows = expand_item_rows(&BTreeMap::new(), value, &["job".into()]).unwrap();
-        assert_eq!(rows.len(), 2);
-        assert_eq!(rows[0].0.get("job").map(String::as_str), Some("order"));
-        assert_eq!(rows[1].0.get("job").map(String::as_str), Some("payment"));
-        assert!(rows.iter().all(|(labels, value)| {
-            !labels.contains_key("item") && matches!(value, SummaryValue::Points(_, _))
-        }));
-    }
-
-    #[test]
-    fn empty_global_heap_keeps_complete_coverage_at_actual_evaluation_phase() {
-        const EVALUATION_MS: u64 = 1_788_891_296_000;
-        let coverage = Some((EVALUATION_MS - 3_600_000 + 60_000, EVALUATION_MS));
-        let (rows, retained_coverage) = expand_item_readout(
-            &BTreeMap::new(),
-            SummaryValue::TopK(vec![(EVALUATION_MS as i64, vec![])], coverage),
-            &["job".into()],
-        )
-        .unwrap();
-        assert!(rows.is_empty());
-        assert_eq!(retained_coverage, coverage);
-        assert_eq!((EVALUATION_MS - 56_000) % 60_000, 0);
-    }
-}
diff --git a/data_plane/src/query_engines/asap_query_engine/request_tests.rs b/data_plane/src/query_engines/asap_query_engine/request_tests.rs
deleted file mode 100644
index f70712abf..000000000
--- a/data_plane/src/query_engines/asap_query_engine/request_tests.rs
+++ /dev/null
@@ -1,226 +0,0 @@
-//! Installed query → real HTTP input → shared physical execution contracts.
-use super::{engine::ASAPQueryEngine, test_plan};
-use crate::query_engines::{routing::query_engine_routing::QueryEngine, EngineError};
-use crate::storage_engines::sketch_db::index::SketchStore;
-use asap_physical_operators::dag::{Error, Limits};
-use asap_types::query_plan::*;
-use std::{collections::BTreeMap, sync::Arc};
-
-fn external_entry() -> QueryPlanEntry {
-    QueryPlanEntry {
-        language: QueryLanguage::PromQl,
-        query_id: "m".into(),
-        canonical_query: "m".into(),
-        fixed_evaluation: None,
-        root: QueryNodeId(0),
-        nodes: BTreeMap::from([(
-            QueryNodeId(0),
-            QueryPlanNode::ExternalExact {
-                request: ExternalExactRequest {
-                    language: QueryLanguage::PromQl,
-                    expression: "m".into(),
-                    output: ExternalExactOutput::InstantVector,
-                    parameters: BTreeMap::new(),
-                    start_parameter: None,
-                    end_parameter: None,
-                    input_contracts: vec![],
-                },
-                inputs: vec![],
-            },
-        )]),
-        instant: InstantExecution {
-            lookback_ms: 1000,
-            full_history: false,
-            cumulative_readout: true,
-        },
-        fallback: FallbackPolicy::ExactBackend,
-    }
-}
-
-// One step fits; many steps must not each acquire an independent memory limit.
-#[tokio::test]
-async fn installed_range_enforces_one_budget_and_keeps_external_only_queries() {
-    let app = axum::Router::new().route("/api/v1/query", axum::routing::get(|axum::extract::Query(params): axum::extract::Query<BTreeMap<String, String>>| async move {
-        axum::Json(serde_json::json!({"status":"success", "data":{"resultType":"vector", "result":[
-            {"metric":{"job":"api"},"value":[params["time"].parse::<f64>().unwrap(),"2"]}
-        ]}}))
-    }));
-    let listener = tokio::net::TcpListener::bind("127.0.0.1:0").await.unwrap();
-    let endpoint = format!("http://{}", listener.local_addr().unwrap());
-    let server = tokio::spawn(async move {
-        axum::serve(listener, app).await.unwrap();
-    });
-    let index = Arc::new(SketchStore::new());
-    let active = test_plan::install(&index, &[], vec![external_entry()]);
-    let engine = ASAPQueryEngine::new(1000)
-        .with_active_physical_plan(active)
-        .with_exact_subquery_endpoint(endpoint)
-        .with_execution_limits(Limits {
-            max_bytes: 12_000,
-            ..Limits::default()
-        });
-    engine.execute_at("m", 1000).await.unwrap();
-    let error = engine
-        .execute_range_promql_modern("m", 1000, 101_000, 1000)
-        .await
-        .unwrap_err();
-    assert!(
-        matches!(error, EngineError::Physical(Error::MemoryLimit)),
-        "{error:?}"
-    );
-    server.abort();
-}
-
-// Candidate membership and arithmetic branches cannot smuggle local state
-// into an external request without a shared input snapshot contract.
-#[test]
-fn mixed_bound_outputs_rejected_before_any_source_is_read() {
-    let config = test_plan::materialization("m", "Sum", serde_json::json!({}), &[], 1000);
-    let local = test_plan::entry(
-        "sum_over_time(m[1s])",
-        &config,
-        PhysicalGrouping::PerEntity,
-        1000,
-        QueryPlanNode::ExactReadout {
-            input: QueryNodeId(0),
-            readout: ExactReadout::Sum,
-        },
-    );
-    let mut entry = external_entry();
-    entry
-        .nodes
-        .insert(QueryNodeId(1), local.nodes[&QueryNodeId(0)].clone());
-    if let QueryPlanNode::ExternalExact { inputs, request } =
-        entry.nodes.get_mut(&QueryNodeId(0)).unwrap()
-    {
-        inputs.push(QueryNodeId(1));
-        request
-            .input_contracts
-            .push(ExternalExactInput::CandidateMembership {
-                item_label: "job".into(),
-            });
-    }
-    let error = entry
-        .validate(&[config.policy_fingerprint()].into_iter().collect())
-        .unwrap_err();
-    assert!(
-        error.to_string().contains("common snapshot proof"),
-        "{error}"
-    );
-    entry.nodes.insert(
-        QueryNodeId(1),
-        QueryPlanNode::Logical {
-            operator: query_time::QueryTimeOperator::CurrentSeries {
-                population: current_series::SeriesPopulation {
-                    metric: "m".into(),
-                    matchers: vec![],
-                    grouping: query_time::Grouping {
-                        labels: vec!["job".into()],
-                        without: false,
-                    },
-                    lookback_ms: 1000,
-                    max_input_lag_ms: 1000,
-                    history_retention_ms: 0,
-                    max_series: 100,
-                    max_bytes: 100_000,
-                    max_k: 3,
-                    quantiles: false,
-                },
-                readout: current_series::SeriesReadout::Sum,
-            },
-            inputs: vec![],
-        },
-    );
-    assert!(entry
-        .validate_snapshot_sources()
-        .unwrap_err()
-        .to_string()
-        .contains("common snapshot proof"));
-    // An unreachable local node cannot turn an external-only graph into a mixed graph.
-    if let QueryPlanNode::ExternalExact { inputs, request } =
-        entry.nodes.get_mut(&QueryNodeId(0)).unwrap()
-    {
-        inputs.clear();
-        request.input_contracts.clear();
-    }
-    entry.validate_snapshot_sources().unwrap();
-}
-
-// A concurrent publication cannot turn terminal execution failure into fallback.
-#[test]
-fn revision_race_preserves_execution_failure() {
-    for failure in [Error::MemoryLimit, Error::Cancelled] {
-        let result = super::engine::finish_query::<()>(Err(EngineError::Physical(failure)), false);
-        assert!(
-            matches!(result, Err(EngineError::Physical(_))),
-            "{result:?}"
-        );
-    }
-}
-
-// Local readouts fit individually; retained range output eventually exhausts
-// the same budget used by subsequent native evaluations.
-#[tokio::test]
-async fn installed_local_range_accounts_for_accumulated_results() {
-    use crate::storage_engines::sketch_db::index::{AggKind, Capability, SummarySeriesMetadata};
-    let config = test_plan::materialization("m", "Sum", serde_json::json!({}), &[], 1000);
-    let entry = test_plan::entry(
-        "sum_over_time(m[1s])",
-        &config,
-        PhysicalGrouping::PerEntity,
-        1000,
-        QueryPlanNode::ExactReadout {
-            input: QueryNodeId(0),
-            readout: ExactReadout::Sum,
-        },
-    );
-    let index = Arc::new(SketchStore::new());
-    index.register(SummarySeriesMetadata {
-        storage_handle: 1,
-        metric_name: "m".into(),
-        group_by_keys: Default::default(),
-        capability: Some(Capability::ExactAgg(asap_types::AggregationType::Sum)),
-        agg_kind: AggKind::ExactAgg {
-            agg_type: asap_types::AggregationType::Sum,
-            parameters_canonical: String::new(),
-            spatial_filter_canonical: String::new(),
-        },
-        accuracy: None,
-        first_seen_unix_ms: 0,
-        retired_at_ms: None,
-        expires_at_ms: None,
-        policy_fp: config.policy_fingerprint(),
-    });
-    let engine =
-        test_plan::engine(index.clone(), config, vec![1], entry).with_execution_limits(Limits {
-            max_bytes: 8192,
-            ..Limits::default()
-        });
-    for pane in 0..100 {
-        index.append_precompute(
-            1,
-            BTreeMap::new(),
-            (pane * 1000, (pane + 1) * 1000),
-            Box::new(asap_physical_operators::summary_kernels::SumAccumulator::with_sum(2.0)),
-        );
-    }
-    engine
-        .execute_at("sum_over_time(m[1s])", 1000)
-        .await
-        .unwrap();
-    let error = engine
-        .execute_range_promql_modern("sum_over_time(m[1s])", 1000, 100_000, 1000)
-        .await
-        .unwrap_err();
-    fn resource(error: &Error) -> bool {
-        match error {
-            Error::MemoryLimit => true,
-            Error::AtNode { source, .. } => resource(source),
-            _ => false,
-        }
-    }
-    assert!(
-        matches!(error, EngineError::Physical(ref error) if resource(error)),
-        "{error:?}"
-    );
-}
diff --git a/data_plane/src/query_engines/asap_query_engine/summary_executor.rs b/data_plane/src/query_engines/asap_query_engine/summary_executor.rs
deleted file mode 100644
index 0511e1aad..000000000
--- a/data_plane/src/query_engines/asap_query_engine/summary_executor.rs
+++ /dev/null
@@ -1,1320 +0,0 @@
-//! Deployment adapters for resolving, decoding, and reading installed materializations.
-use asap_physical_operators::summary_kernels::{MaxAccumulator, MinAccumulator};
-use std::collections::{BTreeMap, BTreeSet};
-use std::rc::Rc;
-use std::sync::Arc;
-
-use planner_types::post_asap::{
-    ExactKind, SketchAlgorithm, SketchParams, SketchQuery, SummaryFamilyType,
-};
-use planner_types::pre_asap::{QueryExpr, Source};
-
-use crate::storage_engines::sketch_db::data::{AggKind, SketchConfig, SketchTimeSeries};
-use crate::storage_engines::sketch_db::index::{SketchSampleState, SketchStore};
-use crate::storage_engines::sketch_db::query::delta_apply::{
-    cumulative_summary_state, per_window_summary_states, DeltaSketchKind, SummaryState,
-};
-use crate::storage_engines::types::{AggregateCore, AggregationType, KeyByLabelValues};
-
-/// Per-query, per-call execution context — constructed fresh for each
-/// incoming query (never shared across concurrent queries, never
-/// mutated after construction). This is what carries the time range and
-/// cumulative-vs-per-window mode. `ASAPQueryEngine` itself is called
-/// concurrently (`Arc<dyn QueryEngine>`), so threading the range through
-/// shared mutable state on the engine would be a race — a fresh,
-/// each call receives its own stack-local context.
-pub struct QueryExecutionContext<'a> {
-    pub index: &'a SketchStore,
-    pub t0_ms: u64,
-    pub t1_ms: u64,
-    /// `true` for `quantile_over_time`/`count_distinct_over_time`-shaped
-    /// instant queries (fold the whole range into one answer, via
-    /// `readout_cumulative`); `false` for a per-window matrix (one merged
-    /// answer per window, via `readout_per_window`).
-    pub is_cumulative: bool,
-    /// Materializations authorized by the installed QueryPlan bindings.
-    /// `None` is the explicit dynamic-test mode; `Some` fails closed and
-    /// excludes stale or unrelated SIDs even when their metric/family match.
-    pub allowed_materializations: Option<BTreeSet<asap_types::PolicyFingerprint>>,
-}
-
-/// One group's accumulated candidates. `Sketch` entries all share one
-/// `DeltaSketchKind`; `ExactAgg` entries all share one `AggregationType`
-/// (validated by the deployment binding) — a
-/// group is never a mix of the two (`merge_states` errors if it somehow
-/// were).
-#[derive(Clone)]
-pub enum GroupState {
-    Sketch {
-        entries: Vec<Rc<SketchTimeSeries>>,
-        kind: DeltaSketchKind,
-    },
-    ExactAgg {
-        entries: Vec<Rc<BTreeMap<i64, Arc<dyn AggregateCore>>>>,
-        agg_type: AggregationType,
-    },
-}
-
-impl std::fmt::Debug for GroupState {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        match self {
-            GroupState::Sketch { entries, kind } => f
-                .debug_struct("GroupState::Sketch")
-                .field("entry_count", &entries.len())
-                .field("kind", kind)
-                .finish(),
-            GroupState::ExactAgg { entries, agg_type } => f
-                .debug_struct("GroupState::ExactAgg")
-                .field("entry_count", &entries.len())
-                .field("agg_type", agg_type)
-                .finish(),
-        }
-    }
-}
-
-impl GroupState {
-    /// Finalize the group's exact state using its declared family.
-    /// Typed query execution uses `exact_value_for` to preserve readout errors.
-    pub fn exact_value(&self, key: &Option<KeyByLabelValues>) -> Option<f64> {
-        let GroupState::ExactAgg { entries, agg_type } = self else {
-            return None;
-        };
-        let stat = match agg_type.planner_exact_family()? {
-            SummaryFamilyType::ExactAggregate(ExactKind::Sum, _) => asap_types::Statistic::Sum,
-            SummaryFamilyType::ExactAggregate(ExactKind::Count, _) => asap_types::Statistic::Count,
-            SummaryFamilyType::ExactAggregate(ExactKind::Increase, _) => {
-                asap_types::Statistic::Increase
-            }
-            SummaryFamilyType::ExactAggregate(ExactKind::Rate, _) => asap_types::Statistic::Rate,
-            _ => return None,
-        };
-        asap_physical_operators::stored_state::readout::exact_readout(
-            entries.iter().flat_map(|windows| windows.values().cloned()),
-            stat,
-            key,
-            &std::collections::HashMap::new(),
-        )
-        .ok()
-    }
-
-    /// Finalize the Planner-declared exact family with its matching readout.
-    pub fn exact_value_for(
-        &self,
-        readout: asap_types::query_plan::ExactReadout,
-        key: &Option<KeyByLabelValues>,
-        range_start_ms: u64,
-        range_end_ms: u64,
-    ) -> Result<Option<f64>, String> {
-        let parameters = std::collections::HashMap::from([
-            ("range_start_ms".to_string(), range_start_ms.to_string()),
-            ("range_end_ms".to_string(), range_end_ms.to_string()),
-        ]);
-        self.exact_value_with_parameters(readout, key, &parameters)
-    }
-
-    pub(crate) fn exact_value_with_parameters(
-        &self,
-        readout: asap_types::query_plan::ExactReadout,
-        key: &Option<KeyByLabelValues>,
-        parameters: &std::collections::HashMap<String, String>,
-    ) -> Result<Option<f64>, String> {
-        let GroupState::ExactAgg { entries, agg_type } = self else {
-            return Err("exact readout requires matching exact state".into());
-        };
-        if agg_type.planner_exact_family().as_ref() != Some(&readout.planner_family()) {
-            return Err("exact readout requires matching exact state".into());
-        }
-        let stat = match readout {
-            asap_types::query_plan::ExactReadout::Count => asap_types::Statistic::Count,
-            asap_types::query_plan::ExactReadout::Sum => asap_types::Statistic::Sum,
-            asap_types::query_plan::ExactReadout::Increase => asap_types::Statistic::Increase,
-            asap_types::query_plan::ExactReadout::Rate => asap_types::Statistic::Rate,
-            asap_types::query_plan::ExactReadout::Min => asap_types::Statistic::Min,
-            asap_types::query_plan::ExactReadout::Max => asap_types::Statistic::Max,
-        };
-
-        asap_physical_operators::stored_state::readout::exact_readout_optional(
-            entries.iter().flat_map(|windows| windows.values().cloned()),
-            stat,
-            key,
-            parameters,
-        )
-    }
-
-    /// Coverage analog of `exact_value` — folds `(min_window_end_ms,
-    /// max_window_end_ms)` from every window observed across the group's
-    /// entries, via the same `fold_coverage` helper
-    /// `readout_cumulative`/`readout_per_window` already use for the
-    /// sketch family (same window-end-only caveat — see `SummaryValue`'s
-    /// doc). Without this, a caller reading an `ExactAgg` group's value
-    /// via `exact_value` would have no coverage signal at all to decide
-    /// whether an archive tier also needs to be consulted — unlike
-    /// `SummaryValue::coverage()` on the sketch side. `None` for a
-    /// `Sketch` state or a group with no windows in range.
-    pub fn exact_coverage(&self) -> Option<(u64, u64)> {
-        let GroupState::ExactAgg { entries, .. } = self else {
-            return None;
-        };
-        let mut coverage: Option<(u64, u64)> = None;
-        for windows in entries {
-            for &w_end in windows.keys() {
-                fold_coverage(&mut coverage, w_end);
-            }
-        }
-        coverage
-    }
-}
-
-#[derive(Debug)]
-pub enum SummaryExecutorError {
-    /// No sid in the catalog matches the requested `(metric, by,
-    /// SummaryFamilyType)` — mirrors today's `CapabilityMiss`
-    /// contract; the caller fails over to archive.
-    NoCandidates,
-    /// A candidate sid claims a `SummaryFamilyType` this executor doesn't
-    /// implement cross-sid merge for, or the sid's on-disk
-    /// `SketchConfig` didn't decode into a `DeltaSketchKind`.
-    UnsupportedFamily,
-    /// Decode/merge failure surfaced from `delta_apply`/`asap_sketchlib`.
-    Decode(String),
-    /// A query shape not covered by this executor — see the module doc.
-    Unsupported(&'static str),
-}
-
-/// A query answer: one scalar per point (`Points` — everything but
-/// `TopK`), or one ranked `(item, count)` list per point (`TopK` only).
-/// Which variant a query produces is determined entirely by the
-/// `SketchQuery` issued (`TopK` vs everything else); callers match on
-/// their own query to know which variant to expect.
-///
-/// Both variants carry a trailing `coverage: Option<(u64, u64)>` — this
-/// GROUP's own `(min_window_end_ms, max_window_end_ms)` observed across
-/// the windows its readout actually walked. `None` only when a group
-/// somehow produced a value with zero windows observed (shouldn't
-/// happen in practice: `NoCandidates` fires first).
-///
-/// Mirrors `ASAPTierResult.coverage`'s ACTUAL semantics (see
-/// `sketch_reducer.rs`'s doc and `evaluate_core`/`evaluate_cardinality_global`):
-/// despite that field's doc naming it "min_window_start_ms", the sketch
-/// path stores no window-start at all (`SketchTimeSeries::samples` is
-/// keyed by window-END only — see that struct's doc), so both bounds
-/// are folded from window-END timestamps. Also, like the legacy
-/// per-window path, this is computed from RAW window-ends *before* the
-/// `w_end < t0_ms` carry-in-base filter — a carry-in Full spliced in by
-/// `SketchStore::query_range` to seed a leading delta never appears as
-/// an output point, but its window-end still legitimately extends this
-/// group's covered range further back than the first in-range point.
-#[derive(Debug, Clone)]
-pub enum SummaryValue {
-    Points(Vec<(i64, f64)>, Option<(u64, u64)>),
-    TopK(Vec<(i64, Vec<(String, f64)>)>, Option<(u64, u64)>),
-}
-
-impl SummaryValue {
-    pub fn coverage(&self) -> Option<(u64, u64)> {
-        match self {
-            SummaryValue::Points(_, coverage) | SummaryValue::TopK(_, coverage) => *coverage,
-        }
-    }
-}
-
-#[cfg(test)]
-fn validate_binding_phase(
-    binding: &asap_types::query_plan::MaterializationBinding,
-    evaluation_ms: u64,
-) -> Result<(), SummaryExecutorError> {
-    let start = evaluation_ms.checked_sub(binding.readout_lookback_ms.unwrap_or(binding.window_ms));
-    if start.is_some_and(|start| binding.covers_range(start, evaluation_ms)) {
-        Ok(())
-    } else {
-        Err(SummaryExecutorError::Unsupported(
-            "query range does not match materialized window boundaries",
-        ))
-    }
-}
-
-impl QueryExecutionContext<'_> {
-    /// Resolve exactly one compiler-bound materialization. This is the formal
-    /// QueryPlan path: the validated stored output resolves to its definition's
-    /// generation-scoped SID index. Metadata checks never broaden that set.
-    pub fn read_bound_materialization(
-        &self,
-        binding: &asap_types::query_plan::MaterializationBinding,
-    ) -> Result<Vec<(BTreeMap<String, String>, GroupState)>, SummaryExecutorError> {
-        use asap_types::query_plan::PhysicalGrouping;
-
-        if binding.stored_output_reference.validate().is_err()
-            || binding.stored_output_reference.stored_output_id != binding.materialization
-        {
-            return Err(SummaryExecutorError::Unsupported(
-                "read binding has invalid stored output",
-            ));
-        }
-
-        if self
-            .allowed_materializations
-            .as_ref()
-            .is_some_and(|allowed| !allowed.contains(&binding.materialization.fingerprint()))
-        {
-            return Err(SummaryExecutorError::Unsupported(
-                "materialization is not authorized by the installed query",
-            ));
-        }
-        let catalog =
-            self.index
-                .summary_catalog_snapshot()
-                .ok_or(SummaryExecutorError::Unsupported(
-                    "bound read requires installed SDS definitions",
-                ))?;
-        let expected = catalog
-            .output_reference(binding.materialization)
-            .map_err(|_| SummaryExecutorError::Unsupported("stored output is not installed"))?;
-        if binding.stored_output_reference != expected {
-            return Err(SummaryExecutorError::Unsupported(
-                "bound read semantic identity differs from installed output",
-            ));
-        }
-
-        let inventory_revision = self.index.summary_update_revision();
-        let query_range = asap_types::sds::HalfOpenTimeRange {
-            start_ms: i64::try_from(self.t0_ms).map_err(|_| {
-                SummaryExecutorError::Unsupported("query start exceeds signed event time")
-            })?,
-            end_ms: i64::try_from(self.t1_ms).map_err(|_| {
-                SummaryExecutorError::Unsupported("query end exceeds signed event time")
-            })?,
-        };
-        if self.index.has_pending_summary_updates(
-            binding.materialization,
-            query_range,
-            binding.full_window_slide_ms.is_some(),
-        ) {
-            return Err(SummaryExecutorError::Unsupported(
-                "materialization population has unpublished input",
-            ));
-        }
-        if !binding.covers_range(self.t0_ms, self.t1_ms) {
-            return Err(SummaryExecutorError::Unsupported(
-                "query range does not match materialized window boundaries",
-            ));
-        }
-
-        enum Candidate {
-            Sketch(DeltaSketchKind),
-            ExactAgg(AggregationType),
-        }
-
-        // A missing pane can mean delayed ingestion, not an empty interval.
-        // Until explicit empty-pane completion exists, multi-pane reads require
-        // every pane for each stored series, before any cross-series merge.
-        let check_panes = |ends: Vec<i64>| -> Result<(), SummaryExecutorError> {
-            let width = binding.window_ms;
-            if width == 0 {
-                return Err(SummaryExecutorError::Unsupported("zero pane width"));
-            }
-            if self.t1_ms.saturating_sub(self.t0_ms) <= width {
-                return Ok(());
-            }
-            let mut expected = self.t0_ms.checked_add(width);
-            for end in ends {
-                let Ok(end) = u64::try_from(end) else {
-                    continue;
-                };
-                if end <= self.t0_ms {
-                    continue;
-                } // delta decoding carry-in is not an answer pane
-                if Some(end) != expected {
-                    return Err(SummaryExecutorError::Unsupported(
-                        "missing materialized pane",
-                    ));
-                }
-                expected = end.checked_add(width);
-            }
-            if expected != self.t1_ms.checked_add(width) {
-                return Err(SummaryExecutorError::Unsupported(
-                    "incomplete materialized panes",
-                ));
-            }
-            Ok(())
-        };
-        let mut sids = self
-            .index
-            .storage_handles_for_output(&binding.stored_output_reference);
-        sids.sort_unstable();
-        sids.dedup();
-        let mut matched_metadata = 0usize;
-        let mut by_group: BTreeMap<BTreeMap<String, String>, Vec<GroupState>> = BTreeMap::new();
-        let mut source_order = BTreeMap::new();
-
-        for sid in sids.iter().copied() {
-            if self
-                .index
-                .summary_window_known_empty(binding.materialization, sid, query_range)
-            {
-                continue;
-            }
-            let candidate = self
-                .index
-                .with_instance(sid, |meta| {
-                    if meta.policy_fp != binding.materialization.fingerprint() {
-                        return None;
-                    }
-                    match &meta.agg_kind {
-                        AggKind::Sketch {
-                            algorithm, config, ..
-                        } => to_delta_kind(algorithm.clone(), config).map(Candidate::Sketch),
-                        AggKind::ExactAgg { agg_type, .. } => Some(Candidate::ExactAgg(*agg_type)),
-                    }
-                })
-                .flatten();
-            let Some(candidate) = candidate else { continue };
-            matched_metadata += 1;
-            match candidate {
-                Candidate::Sketch(kind) => {
-                    let Some(mut series) = self
-                        .index
-                        .query_range(sid, self.t0_ms, self.t1_ms)
-                        .into_iter()
-                        .next()
-                    else {
-                        check_panes(Vec::new())?;
-                        continue;
-                    };
-                    if binding.full_window_slide_ms.is_some() {
-                        // Overlap lookup also returns neighboring complete windows.
-                        // They overlap the answer and must never be merged into it.
-                        series.samples.retain(|end, _| *end == self.t1_ms as i64);
-                        if series.samples.is_empty() {
-                            // A series that reported nothing in this window has no
-                            // full-window snapshot. The generic `known_empty` skip at
-                            // the top of the loop is layout-blind and lets such a sid
-                            // through; when the layout-aware check proves it empty,
-                            // skip it rather than discarding the sids already
-                            // accumulated and dropping the query to the exact path.
-                            if self.index.full_summary_window_known_empty(
-                                binding.materialization,
-                                sid,
-                                query_range,
-                            ) {
-                                continue;
-                            }
-                            return Err(SummaryExecutorError::NoCandidates);
-                        }
-                    }
-                    check_panes(series.samples.keys().copied().collect())?;
-                    let key = match &binding.output_grouping {
-                        PhysicalGrouping::PerEntity => series.series_label_values.clone(),
-                        PhysicalGrouping::Reduce(keys) => {
-                            project_group_key(keys, &series.series_label_values)
-                        }
-                    };
-                    source_order.entry(key.clone()).or_insert(sid);
-                    by_group.entry(key).or_default().push(GroupState::Sketch {
-                        entries: vec![Rc::new(series)],
-                        kind,
-                    });
-                }
-                Candidate::ExactAgg(agg_type) => {
-                    let exact_family = agg_type.planner_exact_family();
-                    if matches!(
-                        exact_family.as_ref(),
-                        Some(SummaryFamilyType::ExactAggregate(
-                            ExactKind::Increase | ExactKind::Rate,
-                            _
-                        ))
-                    ) {
-                        // Sparse counters may have empty edge panes. Every
-                        // stored pane must still lie wholly within the requested
-                        // range and on its declared grid; cutting a pane would
-                        // require raw boundary samples that this state lacks.
-                        let coverage = self
-                            .index
-                            .exact_agg_coverage_bounds(sid, self.t0_ms, self.t1_ms);
-                        let Some((start, end)) = coverage else {
-                            continue;
-                        };
-                        if start < self.t0_ms
-                            || end > self.t1_ms
-                            || !binding.covers_range(start, end)
-                        {
-                            return Err(SummaryExecutorError::Unsupported(
-                                "counter SDS requires full-pane query coverage",
-                            ));
-                        }
-                    }
-                    if let Some((reduction, is_min)) = match exact_family.as_ref() {
-                        Some(SummaryFamilyType::ExactAggregate(ExactKind::Min, _)) => Some((
-                            crate::storage_engines::sketch_db::index::RollupReduction::Min,
-                            true,
-                        )),
-                        Some(SummaryFamilyType::ExactAggregate(ExactKind::Max, _)) => Some((
-                            crate::storage_engines::sketch_db::index::RollupReduction::Max,
-                            false,
-                        )),
-                        _ => None,
-                    } {
-                        if let Some(series) = binding
-                            .full_window_slide_ms
-                            .is_none()
-                            .then(|| {
-                                self.index
-                                    .query_rollup_range(reduction, sid, self.t0_ms, self.t1_ms)
-                            })
-                            .flatten()
-                        {
-                            for (labels, value) in series {
-                                let key = match &binding.output_grouping {
-                                    PhysicalGrouping::PerEntity => labels,
-                                    PhysicalGrouping::Reduce(keys) => {
-                                        project_group_key(keys, &labels)
-                                    }
-                                };
-                                let accumulator: Arc<dyn AggregateCore> = if is_min {
-                                    Arc::new(MinAccumulator::with_value(value))
-                                } else {
-                                    Arc::new(MaxAccumulator::with_value(value))
-                                };
-                                source_order.entry(key.clone()).or_insert(sid);
-                                by_group.entry(key).or_default().push(GroupState::ExactAgg {
-                                    entries: vec![Rc::new(BTreeMap::from([(
-                                        self.t1_ms as i64,
-                                        accumulator,
-                                    )]))],
-                                    agg_type,
-                                });
-                            }
-                            continue;
-                        }
-                    }
-                    let Some((labels, windows)) = self
-                        .index
-                        .query_exact_agg_range(sid, self.t0_ms, self.t1_ms)
-                        .into_iter()
-                        .next()
-                    else {
-                        continue;
-                    };
-                    // Exact accumulators carry their own first/last event
-                    // timestamps. Empty panes need no stored identity and
-                    // gaps between sampled panes are therefore valid for
-                    // counter and extrema state. Additive pane summaries must
-                    // remain contiguous because a missing pane is not zero.
-                    if matches!(
-                        exact_family.as_ref(),
-                        Some(SummaryFamilyType::ExactAggregate(
-                            ExactKind::Sum | ExactKind::Count,
-                            _
-                        ))
-                    ) {
-                        check_panes(windows.keys().copied().collect())?;
-                    }
-                    let key = match &binding.output_grouping {
-                        PhysicalGrouping::PerEntity => labels,
-                        PhysicalGrouping::Reduce(keys) => project_group_key(keys, &labels),
-                    };
-                    source_order.entry(key.clone()).or_insert(sid);
-                    by_group.entry(key).or_default().push(GroupState::ExactAgg {
-                        entries: vec![Rc::new(windows)],
-                        agg_type,
-                    });
-                }
-            }
-        }
-        if by_group.is_empty() {
-            tracing::debug!(
-                materialization = %binding.materialization.as_u64(),
-                ?sids,
-                matched_metadata,
-                t0_ms = self.t0_ms,
-                t1_ms = self.t1_ms,
-                "bound materialization produced no readable state"
-            );
-            return Err(SummaryExecutorError::NoCandidates);
-        }
-        let mut result: Vec<_> = by_group
-            .into_iter()
-            .map(|(key, states)| self.merge_states(states).map(|state| (key, state)))
-            .collect::<Result<_, _>>()?;
-        if binding.output_grouping == PhysicalGrouping::PerEntity {
-            // Stable native ranking retains the first source on equal values.
-            // Grouping by labels must not replace the source's series order.
-            result.sort_by_key(|(key, _)| source_order[key]);
-        }
-        if !inventory_revision.matches(self.index.summary_update_revision()) {
-            return Err(SummaryExecutorError::Unsupported(
-                "summary input changed during read",
-            ));
-        }
-        Ok(result)
-    }
-
-    pub fn readout_bound(
-        &self,
-        state: &GroupState,
-        query: &SketchQuery,
-    ) -> Result<SummaryValue, SummaryExecutorError> {
-        self.readout(state, query)
-    }
-
-    pub fn merge_bound_states(
-        &self,
-        states: Vec<GroupState>,
-    ) -> Result<GroupState, SummaryExecutorError> {
-        self.merge_states(states)
-    }
-}
-
-/// Fold `w_end` (a raw window-end timestamp, may be negative pre-epoch
-/// in principle) into a running `(min, max)` coverage accumulator —
-/// shared by `readout_cumulative`/`readout_per_window` so both compute
-/// coverage identically. Mirrors `sketch_reducer.rs`'s repeated
-/// `cov_lo`/`cov_hi` fold (see `SummaryValue`'s doc).
-fn fold_coverage(coverage: &mut Option<(u64, u64)>, w_end: i64) {
-    let w = if w_end >= 0 { w_end as u64 } else { 0 };
-    *coverage = Some(match *coverage {
-        Some((lo, hi)) => (lo.min(w), hi.max(w)),
-        None => (w, w),
-    });
-}
-
-impl QueryExecutionContext<'_> {
-    fn merge_states(&self, states: Vec<GroupState>) -> Result<GroupState, SummaryExecutorError> {
-        // The actual decode/merge math (`cumulative_summary_state`/
-        // `merge_same_family`) happens in `readout`, not here: it needs
-        // to distinguish cumulative vs. per-window mode
-        // (`self.is_cumulative`), which only `readout` is positioned to
-        // do generically for both callers. `merge_states` and
-        // `fetch_state` just assemble the group's full candidate list.
-        // ExactAgg has no such split (`GroupState::exact_value` always
-        // folds the whole range), but still just accumulates entries here.
-        let mut states = states.into_iter();
-        let mut acc = states.next().ok_or(SummaryExecutorError::NoCandidates)?;
-        for s in states {
-            match (&mut acc, s) {
-                (GroupState::Sketch { entries, .. }, GroupState::Sketch { entries: more, .. }) => {
-                    entries.extend(more);
-                }
-                (
-                    GroupState::ExactAgg { entries, agg_type },
-                    GroupState::ExactAgg {
-                        entries: more,
-                        agg_type: incoming,
-                    },
-                ) => {
-                    if agg_type.planner_exact_family() != incoming.planner_exact_family() {
-                        return Err(SummaryExecutorError::UnsupportedFamily);
-                    }
-                    entries.extend(more);
-                }
-                // `find_candidates`'s exact-match contract never produces a
-                // mixed group (a `(SummaryFamilyType)` query
-                // matches either sketch-family sids or ExactAgg sids, never
-                // both) -- defensive, not a real path.
-                _ => return Err(SummaryExecutorError::UnsupportedFamily),
-            }
-        }
-        Ok(acc)
-    }
-
-    fn readout(
-        &self,
-        state: &GroupState,
-        query: &SketchQuery,
-    ) -> Result<SummaryValue, SummaryExecutorError> {
-        let GroupState::Sketch { entries, kind } = state else {
-            return Err(SummaryExecutorError::UnsupportedFamily);
-        };
-        if self.is_cumulative {
-            readout_cumulative(entries, *kind, query, self.t1_ms as i64)
-        } else {
-            readout_per_window(entries, *kind, query, self.t0_ms as i64)
-        }
-    }
-}
-
-/// Fold a group's whole `[t0, t1]` into one merged state and read out one
-/// scalar -- `quantile_over_time`/`count_distinct_over_time`-shaped
-/// instant queries.
-fn readout_cumulative(
-    entries: &[Rc<SketchTimeSeries>],
-    kind: DeltaSketchKind,
-    query: &SketchQuery,
-    t1_ms: i64,
-) -> Result<SummaryValue, SummaryExecutorError> {
-    let mut merged: Option<SummaryState> = None;
-    let mut latest_window_end: Option<i64> = None;
-    let mut coverage: Option<(u64, u64)> = None;
-    for entry in entries {
-        let samples_vec: Vec<(i64, &SketchSampleState)> = entry
-            .samples
-            .iter()
-            .flat_map(|(t, frames)| frames.iter().map(move |s| (*t, s)))
-            .collect();
-        if let Some((w, _)) = samples_vec.last() {
-            latest_window_end = Some(latest_window_end.map_or(*w, |prev| prev.max(*w)));
-        }
-        for (w, _) in &samples_vec {
-            fold_coverage(&mut coverage, *w);
-        }
-        let rs =
-            cumulative_summary_state(&samples_vec, kind).map_err(SummaryExecutorError::Decode)?;
-        if let Some(rs) = rs {
-            merged = Some(match merged.take() {
-                None => rs,
-                Some(mut acc) => {
-                    acc.merge_same_family(&rs)
-                        .map_err(SummaryExecutorError::Decode)?;
-                    acc
-                }
-            });
-        }
-    }
-    let Some(merged) = merged else {
-        return Err(SummaryExecutorError::NoCandidates);
-    };
-    let w_end = latest_window_end.unwrap_or(t1_ms);
-    if let SketchQuery::TopK { k } = query {
-        Ok(SummaryValue::TopK(
-            vec![(w_end, topk_ranked(&merged, *k)?)],
-            coverage,
-        ))
-    } else {
-        Ok(SummaryValue::Points(
-            vec![(w_end, sketch_query_value(&merged, query)?)],
-            coverage,
-        ))
-    }
-}
-
-/// Per-window matrix/range-query readout: reconstruct each of the
-/// group's sids' own per-window states, then merge same-window states
-/// *across* sids before evaluating each window -- one merged answer per
-/// window, not one merged answer for the whole range. Windows are
-/// unioned across sids: a sid that's missing a particular window just
-/// doesn't contribute to it, rather than the whole window being dropped.
-fn readout_per_window(
-    entries: &[Rc<SketchTimeSeries>],
-    kind: DeltaSketchKind,
-    query: &SketchQuery,
-    t0_ms: i64,
-) -> Result<SummaryValue, SummaryExecutorError> {
-    let mut by_window: BTreeMap<i64, SummaryState> = BTreeMap::new();
-    // Tracked from RAW window-ends, before the `w_end < t0_ms` carry-in
-    // filter below -- see `SummaryValue`'s doc for why.
-    let mut coverage: Option<(u64, u64)> = None;
-    for entry in entries {
-        let samples_vec: Vec<(i64, &SketchSampleState)> = entry
-            .samples
-            .iter()
-            .flat_map(|(t, frames)| frames.iter().map(move |s| (*t, s)))
-            .collect();
-        for (w, _) in &samples_vec {
-            fold_coverage(&mut coverage, *w);
-        }
-        let (per_window, _skipped) =
-            per_window_summary_states(&samples_vec, kind).map_err(SummaryExecutorError::Decode)?;
-        for (w_end, rs) in per_window {
-            // `SketchStore::query_range` may splice in a carry-in Full
-            // snapshot ending before the requested range so the
-            // delta-apply walk can establish a rolling base for a
-            // delta-only leading window; that base must not surface as
-            // an output point.
-            if w_end < t0_ms {
-                continue;
-            }
-            match by_window.get_mut(&w_end) {
-                Some(acc) => acc
-                    .merge_same_family(&rs)
-                    .map_err(SummaryExecutorError::Decode)?,
-                None => {
-                    by_window.insert(w_end, rs);
-                }
-            }
-        }
-    }
-    if by_window.is_empty() {
-        return Err(SummaryExecutorError::NoCandidates);
-    }
-    if let SketchQuery::TopK { k } = query {
-        let points = by_window
-            .into_iter()
-            .map(|(w_end, rs)| topk_ranked(&rs, *k).map(|items| (w_end, items)))
-            .collect::<Result<Vec<_>, _>>()?;
-        Ok(SummaryValue::TopK(points, coverage))
-    } else {
-        let points = by_window
-            .into_iter()
-            .map(|(w_end, rs)| sketch_query_value(&rs, query).map(|v| (w_end, v)))
-            .collect::<Result<Vec<_>, _>>()?;
-        Ok(SummaryValue::Points(points, coverage))
-    }
-}
-
-/// Read one scalar out of a merged `SummaryState` for the requested
-/// `SketchQuery` -- shared by both the cumulative and per-window readout
-/// paths.
-fn sketch_query_value(
-    state: &SummaryState,
-    query: &SketchQuery,
-) -> Result<f64, SummaryExecutorError> {
-    asap_physical_operators::stored_state::readout::sketch_query_value(state, query).map_err(
-        |asap_physical_operators::stored_state::readout::Error::Unsupported(reason)| {
-            SummaryExecutorError::Unsupported(reason)
-        },
-    )
-}
-fn topk_ranked(state: &SummaryState, k: usize) -> Result<Vec<(String, f64)>, SummaryExecutorError> {
-    asap_physical_operators::stored_state::readout::topk_ranked(state, k).map_err(
-        |asap_physical_operators::stored_state::readout::Error::Unsupported(reason)| {
-            SummaryExecutorError::Unsupported(reason)
-        },
-    )
-}
-
-/// Exact canonical `SketchKind` match against a sid's own
-/// `(SketchAlgorithm, SketchConfig)` -- the check `find_candidates`'s
-/// trait contract requires (not the looser family-only
-/// `Capability::is_satisfied_by` check the legacy analyzer path uses),
-/// so a `SummaryMerge`'s precondition (every child agrees on kind AND
-/// params) is guaranteed by construction for anything routed through
-/// this executor.
-fn summary_family_matches_sketch(
-    family: &SummaryFamilyType,
-    kind: SketchAlgorithm,
-    config: &SketchConfig,
-) -> bool {
-    // `SketchParams::{Cms,CmsWithHeap,CountSketch,CountSketchWithHeap}`
-    // use width=cols/depth=rows (matches the control-plane wire
-    // convention -- see `sketch_config_to_json`'s comment). `SketchConfig`
-    // has no `heap_size` field at all (heap-bearing kinds reuse their
-    // heap-less base's config shape for identity -- see
-    // `base_sketch_algorithm`'s doc in `drivers/ingest/otel.rs`), so
-    // heap_size can't be part of this match; width/depth are.
-    let SummaryFamilyType::Sketch(sketch, _) = family else {
-        return false;
-    };
-    match (sketch.algorithm(), sketch.params(), kind, config) {
-        (
-            SketchAlgorithm::UnivMon,
-            SketchParams::UnivMon {
-                heap_size,
-                sketch_rows,
-                sketch_cols,
-                layers,
-            },
-            SketchAlgorithm::UnivMon,
-            SketchConfig::UnivMon {
-                heap_size: h,
-                sketch_rows: r,
-                sketch_cols: c,
-                layers: l,
-            },
-        ) => heap_size == h && sketch_rows == r && sketch_cols == c && layers == l,
-        (
-            SketchAlgorithm::DDSketch,
-            SketchParams::DDSketch { alpha },
-            SketchAlgorithm::DDSketch,
-            SketchConfig::DDSketch { relative_accuracy },
-        ) => alpha == relative_accuracy,
-        (
-            SketchAlgorithm::Kll,
-            SketchParams::Kll { k },
-            SketchAlgorithm::Kll,
-            SketchConfig::Kll { k: sid_k },
-        ) => k == sid_k,
-        (
-            SketchAlgorithm::Hll,
-            SketchParams::Hll { precision },
-            SketchAlgorithm::Hll,
-            SketchConfig::Hll { precision: sid_p },
-        ) => u32::from(*precision) == *sid_p,
-        (
-            SketchAlgorithm::Cms,
-            SketchParams::Cms { width, depth },
-            SketchAlgorithm::Cms,
-            SketchConfig::CountMin { rows, cols },
-        ) => *depth as i32 == *rows && *width as i32 == *cols,
-        (
-            SketchAlgorithm::CountSketch,
-            SketchParams::CountSketch { width, depth },
-            SketchAlgorithm::CountSketch,
-            SketchConfig::CountSketch { rows, cols },
-        ) => *depth as i32 == *rows && *width as i32 == *cols,
-        (
-            SketchAlgorithm::CmsWithHeap,
-            SketchParams::CmsWithHeap { width, depth, .. },
-            SketchAlgorithm::CmsWithHeap,
-            SketchConfig::CountMin { rows, cols },
-        ) => *depth as i32 == *rows && *width as i32 == *cols,
-        (
-            SketchAlgorithm::CountSketchWithHeap,
-            SketchParams::CountSketchWithHeap { width, depth, .. },
-            SketchAlgorithm::CountSketchWithHeap,
-            SketchConfig::CountSketch { rows, cols },
-        ) => *depth as i32 == *rows && *width as i32 == *cols,
-        _ => false,
-    }
-}
-
-/// Exact-aggregate analog of `summary_family_matches_sketch`, for
-/// `AggKind::ExactAgg` sids. `ExactParams` variants carry no tuning
-/// parameters, so this is a pure `ExactKind` identity check against the sid's
-/// `AggregationType`, mirroring the canonical `AggregationType ->
-/// ExactKind` mapping `asap_types::accumulator_spec` uses on the write
-/// side. Count and Rate remain distinct families even though their runtime
-/// accumulators share implementations with Sum and Increase.
-///
-/// Installed QueryPlans carry an explicit `ExactReadout`, and
-/// `read_bound_materialization` serves those forms safely.
-fn summary_family_matches_exact(family: &SummaryFamilyType, agg_type: AggregationType) -> bool {
-    matches!(
-        family,
-        SummaryFamilyType::ExactAggregate(
-            ExactKind::Sum | ExactKind::Count | ExactKind::Increase | ExactKind::Rate,
-            _
-        )
-    ) && agg_type.planner_exact_family().as_ref() == Some(family)
-}
-
-/// Project a full label-values map down to the requested `by` columns --
-/// used by the `ExactAgg` branch of `find_candidates`. Missing keys
-/// become empty strings so a sid registered with a subset of the
-/// requested keys still groups deterministically (mirrors
-/// `sketch_reducer.rs::evaluate_exact_agg`'s identical projection,
-/// including its `by=[]` behavior: Sum/Increase are additive PromQL
-/// aggregation operators, so an empty `by` legitimately means "reduce
-/// fully" -- every matching sid collapses to ONE group and gets summed
-/// together, which is the correct `sum(metric)`/`increase(metric[r])`
-/// answer, not a bug to route around).
-fn project_group_key(
-    by_names: &[String],
-    label_values: &BTreeMap<String, String>,
-) -> BTreeMap<String, String> {
-    by_names
-        .iter()
-        .map(|k| (k.clone(), label_values.get(k).cloned().unwrap_or_default()))
-        .collect()
-}
-
-/// `SketchConfig` (data_plane's per-sid stored params) -> `DeltaSketchKind`
-/// (`delta_apply`'s decode/merge parameter carrier).
-fn to_delta_kind(kind: SketchAlgorithm, config: &SketchConfig) -> Option<DeltaSketchKind> {
-    // Default heap_size when bootstrapping an empty Heap state for a
-    // delta-from-empty leading window -- `SketchConfig` carries no
-    // heap_size (see `summary_params_match`'s doc), so this only matters
-    // transiently: `CountMinSketchWithHeap::merge` takes `min(self,
-    // other)`, so it converges to the real decoded value as soon as any
-    // actual frame merges in. Matches this codebase's existing
-    // heap_size-absent default (`accuracy.rs`).
-    const DEFAULT_HEAP_SIZE: usize = 100;
-    match (kind, config) {
-        (
-            SketchAlgorithm::UnivMon,
-            SketchConfig::UnivMon {
-                heap_size,
-                sketch_rows,
-                sketch_cols,
-                layers,
-            },
-        ) => Some(DeltaSketchKind::UnivMon {
-            heap_size: *heap_size,
-            sketch_rows: *sketch_rows,
-            sketch_cols: *sketch_cols,
-            layers: *layers,
-        }),
-        (SketchAlgorithm::DDSketch, SketchConfig::DDSketch { relative_accuracy }) => {
-            Some(DeltaSketchKind::DDSketch {
-                alpha: *relative_accuracy,
-            })
-        }
-        (SketchAlgorithm::Kll, SketchConfig::Kll { k }) => Some(DeltaSketchKind::Kll { k: *k }),
-        (SketchAlgorithm::Hll, SketchConfig::Hll { precision }) => Some(DeltaSketchKind::Hll {
-            precision: *precision,
-        }),
-        (SketchAlgorithm::Cms, SketchConfig::CountMin { rows, cols }) => {
-            Some(DeltaSketchKind::Cms {
-                rows: *rows as usize,
-                cols: *cols as usize,
-            })
-        }
-        (SketchAlgorithm::CountSketch, SketchConfig::CountSketch { rows, cols }) => {
-            Some(DeltaSketchKind::CountSketch {
-                rows: *rows as usize,
-                cols: *cols as usize,
-            })
-        }
-        (SketchAlgorithm::CmsWithHeap, SketchConfig::CountMin { rows, cols }) => {
-            Some(DeltaSketchKind::CmsWithHeap {
-                rows: *rows as usize,
-                cols: *cols as usize,
-                heap_size: DEFAULT_HEAP_SIZE,
-            })
-        }
-        (SketchAlgorithm::CountSketchWithHeap, SketchConfig::CountSketch { rows, cols }) => {
-            Some(DeltaSketchKind::CountSketchWithHeap {
-                rows: *rows as usize,
-                cols: *cols as usize,
-                heap_size: DEFAULT_HEAP_SIZE,
-            })
-        }
-        _ => None,
-    }
-}
-
-/// Walk a canonical `QueryExpr` down to its first `Scan {
-/// source: Source::TimeSeries { metric }, .. }` to recover the target
-/// metric name.
-/// (serving time must know which metric to check the `SketchStore`
-/// against BEFORE binding — see that module's docs).
-pub(crate) fn find_metric_in_query_expr(qe: &QueryExpr) -> Option<String> {
-    match qe {
-        QueryExpr::Scan {
-            source: Source::TimeSeries { metric },
-            ..
-        } => Some(metric.clone()),
-        QueryExpr::Filter { child, .. }
-        | QueryExpr::Project { child, .. }
-        | QueryExpr::Aggregate { child, .. }
-        | QueryExpr::Dedup { child, .. }
-        | QueryExpr::Sort { child, .. }
-        | QueryExpr::Limit { child, .. }
-        | QueryExpr::PromqlSubquery { child, .. }
-        | QueryExpr::TimeRange { child, .. }
-        | QueryExpr::TimeShift { child, .. }
-        | QueryExpr::SQLWindowFunc { child, .. } => find_metric_in_query_expr(child),
-        QueryExpr::Concat { children, .. } => children.iter().find_map(find_metric_in_query_expr),
-        QueryExpr::Join { left, .. } | QueryExpr::SetOp { left, .. } => {
-            find_metric_in_query_expr(left)
-        }
-        QueryExpr::BinaryOp { lhs, .. } => find_metric_in_query_expr(lhs),
-        // The PromQL-surface superset (Scan's siblings: Ref/Scalar/
-        // EvalTime/VectorFromScalar/ScalarFromVector/Relabel/InfoJoin/
-        // Sample) isn't constructed by this parser today -- mirrors
-        // `collect_aggregate_roots`'s same no-op default.
-        _ => None,
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use crate::storage_engines::sketch_db::index::{
-        AccuracyBound, Capability, SketchSampleState, SketchStore, SummarySeriesMetadata,
-    };
-    use planner_types::post_asap::{SummaryField, SummarySchema};
-    use planner_types::pre_asap::{Column, ColumnRef, DataType, Schema};
-    use std::rc::Rc;
-
-    #[test]
-    fn keyed_count_state_follows_planner_family_and_query_readout() {
-        use asap_physical_operators::summary_kernels::KeyedSumCountAccumulator;
-        use asap_types::query_plan::ExactReadout;
-
-        let key = KeyByLabelValues::new_with_labels(vec!["web".to_string()]);
-        let mut payload = KeyedSumCountAccumulator::for_family(ExactKind::Count);
-        payload.update(key.clone(), 10.0);
-        payload.update(key.clone(), 20.0);
-        let state = GroupState::ExactAgg {
-            entries: vec![Rc::new(BTreeMap::from([(
-                60_000,
-                Arc::new(payload) as Arc<dyn AggregateCore>,
-            )]))],
-            agg_type: AggregationType::Count,
-        };
-        assert_eq!(
-            state.exact_value_for(ExactReadout::Count, &Some(key.clone()), 0, 60_000),
-            Ok(Some(2.0))
-        );
-        assert!(state
-            .exact_value_for(ExactReadout::Sum, &Some(key), 0, 60_000)
-            .is_err());
-    }
-
-    #[test]
-    fn state_merge_rejects_different_planner_families() {
-        let index = SketchStore::new();
-        let context = QueryExecutionContext {
-            index: &index,
-            t0_ms: 0,
-            t1_ms: 60_000,
-            is_cumulative: true,
-            allowed_materializations: None,
-        };
-        let states = vec![
-            GroupState::ExactAgg {
-                entries: vec![],
-                agg_type: AggregationType::Rate,
-            },
-            GroupState::ExactAgg {
-                entries: vec![],
-                agg_type: AggregationType::Increase,
-            },
-        ];
-        assert!(matches!(
-            context.merge_states(states),
-            Err(SummaryExecutorError::UnsupportedFamily)
-        ));
-    }
-
-    #[test]
-    fn pane_only_reads_require_the_planned_evaluation_phase() {
-        let binding = asap_types::query_plan::MaterializationBinding {
-            full_window_slide_ms: None,
-            item_labels: Vec::new(),
-            materialization: asap_types::PolicyFingerprint(7).into(),
-            stored_output_reference: asap_types::sds::StoredOutputReference::for_output(
-                asap_types::PolicyFingerprint(7).into(),
-            ),
-            output_grouping: asap_types::query_plan::PhysicalGrouping::PerEntity,
-            window_ms: 60_000,
-            pane_origin_ms: Some(7_000),
-            readout_lookback_ms: Some(60_000),
-        };
-        validate_binding_phase(&binding, 67_000).unwrap();
-        assert!(validate_binding_phase(&binding, 68_000).is_err());
-
-        let legacy = asap_types::query_plan::MaterializationBinding {
-            full_window_slide_ms: None,
-            item_labels: Vec::new(),
-            pane_origin_ms: None,
-            ..binding
-        };
-        assert!(validate_binding_phase(&legacy, 67_000).is_err());
-    }
-
-    fn kll_meta(sid: u64, metric: &str, group_by: &[&str]) -> SummarySeriesMetadata {
-        let cfg = SketchConfig::Kll { k: 200 };
-        SummarySeriesMetadata {
-            storage_handle: sid,
-            metric_name: metric.to_string(),
-            group_by_keys: group_by
-                .iter()
-                .map(|s| s.to_string())
-                .collect::<BTreeSet<_>>(),
-            capability: Some(Capability::QuantileApprox(Some(SketchAlgorithm::Kll))),
-            agg_kind: crate::storage_engines::sketch_db::index::AggKind::Sketch {
-                algorithm: SketchAlgorithm::Kll,
-                config: cfg.clone(),
-                spatial_filter_canonical: String::new(),
-            },
-            accuracy: Some(AccuracyBound::from_config(&cfg)),
-            first_seen_unix_ms: 0,
-            retired_at_ms: None,
-            expires_at_ms: None,
-            policy_fp: asap_types::PolicyFingerprint::UNSET,
-        }
-    }
-
-    fn encode_kll_items_proto(k: u16, items: &[f64]) -> Vec<u8> {
-        use asap_sketchlib::proto::sketchlib::{sketch_envelope, KllState, SketchEnvelope};
-        use prost::Message;
-        let state = KllState {
-            k: k as u32,
-            items: items.to_vec(),
-            levels: vec![],
-            num_levels: 0,
-            ..Default::default()
-        };
-        let env = SketchEnvelope {
-            sketch_state: Some(sketch_envelope::SketchState::Kll(state)),
-            ..Default::default()
-        };
-        env.encode_to_vec()
-    }
-
-    /// Encode a CMS msgpack frame whose row-0 total is `total_weight`
-    /// (`update`s a single synthetic key `total_weight` times -- row 0's
-    /// sum equals the number of insertions regardless of hashing, since
-    /// every insertion touches every row including row 0).
-    fn encode_cms_with_total(rows: usize, cols: usize, total_weight: usize) -> Vec<u8> {
-        use asap_sketchlib::{CountMinSketch, MessagePackCodec};
-        let mut sk = CountMinSketch::new(rows, cols);
-        for _ in 0..total_weight {
-            sk.update("k", 1.0);
-        }
-        sk.to_msgpack().expect("encode CountMinSketch msgpack")
-    }
-
-    // Neighboring overlapping complete windows are not additional answer panes.
-    #[test]
-    fn full_window_sketch_read_excludes_neighboring_windows() {
-        use asap_types::query_plan::{MaterializationBinding, PhysicalGrouping};
-        let index = SketchStore::new();
-        let fp = asap_types::PolicyFingerprint(703);
-        let mut metadata = kll_meta(1, "m", &[]);
-        metadata.policy_fp = fp;
-        index.register(metadata);
-        for (start, values) in [
-            (0, vec![1_000.0, 2_000.0, 3_000.0]),
-            (20_000, vec![10.0, 20.0, 30.0]),
-            (40_000, vec![1_000.0, 2_000.0, 3_000.0]),
-        ] {
-            index.append_sample(
-                1,
-                BTreeMap::new(),
-                (start, start + 60_000),
-                SketchSampleState {
-                    bytes: encode_kll_items_proto(200, &values),
-                    encoding: crate::storage_engines::sketch_db::index::SketchEncoding::ProtoFull,
-                },
-            );
-        }
-        let context = QueryExecutionContext {
-            index: &index,
-            t0_ms: 20_000,
-            t1_ms: 80_000,
-            is_cumulative: true,
-            allowed_materializations: Some(BTreeSet::from([fp])),
-        };
-        let binding = MaterializationBinding {
-            full_window_slide_ms: Some(20_000),
-            materialization: fp.into(),
-            stored_output_reference: super::super::test_plan::bound_reference(&index, fp.into()),
-            output_grouping: PhysicalGrouping::PerEntity,
-            item_labels: vec![],
-            window_ms: 60_000,
-            pane_origin_ms: Some(0),
-            readout_lookback_ms: Some(60_000),
-        };
-        let unauthorized = QueryExecutionContext {
-            allowed_materializations: Some(BTreeSet::from([asap_types::PolicyFingerprint(999)])),
-            ..context
-        };
-        assert!(unauthorized.read_bound_materialization(&binding).is_err());
-        let context = QueryExecutionContext {
-            allowed_materializations: Some(BTreeSet::from([fp])),
-            ..unauthorized
-        };
-        let states = context.read_bound_materialization(&binding).unwrap();
-        let SummaryValue::Points(points, coverage) = context
-            .readout_bound(&states[0].1, &SketchQuery::Quantile { q: 0.5 })
-            .unwrap()
-        else {
-            panic!("expected points");
-        };
-        assert_eq!(points, vec![(80_000, 20.0)]);
-        assert_eq!(coverage, Some((80_000, 80_000)));
-    }
-
-    /// One installed frequency summary merges panes before all four readouts.
-    #[test]
-    fn bound_univmon_merges_panes_for_four_readouts() {
-        use crate::storage_engines::sketch_db::index::SketchEncoding;
-        use crate::storage_engines::types::SerializableToSink;
-        use asap_physical_operators::summary_kernels::univmon::UnivMonAccumulator;
-        use asap_types::query_plan::{MaterializationBinding, PhysicalGrouping};
-        let index = SketchStore::new();
-        let fp = asap_types::PolicyFingerprint(701);
-        let mut meta = kll_meta(1, "m", &["job"]);
-        meta.policy_fp = fp;
-        meta.agg_kind = AggKind::Sketch {
-            algorithm: SketchAlgorithm::UnivMon,
-            config: SketchConfig::UnivMon {
-                heap_size: 32,
-                sketch_rows: 5,
-                sketch_cols: 1024,
-                layers: 4,
-            },
-            spatial_filter_canonical: String::new(),
-        };
-        meta.accuracy = None;
-        meta.capability = Some(Capability::CardinalityApprox);
-        index.register(meta);
-        for (start, values) in [(0, [1.0, 2.0]), (1000, [2.0, 3.0])] {
-            let mut state = UnivMonAccumulator::new(32, 5, 1024, 4).unwrap();
-            for value in values {
-                state.insert_sample(value).unwrap();
-            }
-            index.append_sample(
-                1,
-                BTreeMap::from([("job".into(), "a".into())]),
-                (start, start + 1000),
-                SketchSampleState {
-                    bytes: state.serialize_to_bytes(),
-                    encoding: SketchEncoding::MsgpackFull,
-                },
-            );
-        }
-        let context = QueryExecutionContext {
-            index: &index,
-            t0_ms: 0,
-            t1_ms: 2000,
-            is_cumulative: true,
-            allowed_materializations: Some(BTreeSet::from([fp])),
-        };
-        let binding = MaterializationBinding {
-            full_window_slide_ms: None,
-            materialization: fp.into(),
-            stored_output_reference: super::super::test_plan::bound_reference(&index, fp.into()),
-            output_grouping: PhysicalGrouping::PerEntity,
-            item_labels: vec![],
-            window_ms: 1000,
-            pane_origin_ms: Some(0),
-            readout_lookback_ms: Some(2000),
-        };
-        let states = context.read_bound_materialization(&binding).unwrap();
-        assert_eq!(states.len(), 1);
-        assert_eq!(states[0].0.get("job").unwrap(), "a");
-        for (query, expected) in [
-            (
-                SketchQuery::PointCount {
-                    key: ColumnRef::SampleValue,
-                    value: None,
-                },
-                4.0,
-            ),
-            (SketchQuery::Cardinality, 3.0),
-            (SketchQuery::FrequencyL2, 6.0f64.sqrt()),
-            (SketchQuery::FrequencyEntropy, 1.5),
-        ] {
-            let SummaryValue::Points(points, _) =
-                context.readout_bound(&states[0].1, &query).unwrap()
-            else {
-                panic!("expected scalar points")
-            };
-            assert_eq!(points.len(), 1);
-            assert!(
-                (points[0].1 - expected).abs() < 0.05,
-                "{query:?}: {:?}",
-                points
-            );
-        }
-        let mut unknown = binding;
-        unknown.materialization = asap_types::PolicyFingerprint(702).into();
-        assert!(context.read_bound_materialization(&unknown).is_err());
-    }
-
-    #[test]
-    fn typed_dds_quantile_interpolates_without_changing_portable_rank_semantics() {
-        let mut sketch = asap_sketchlib::DdSketch::new(0.01);
-        assert!(sketch_query_value(
-            &SummaryState::Dd(sketch.clone()),
-            &SketchQuery::Quantile { q: 0.9 }
-        )
-        .is_err());
-        sketch.update(20.0);
-        for q in [0.0, 0.5, 0.9, 1.0] {
-            let value = sketch_query_value(
-                &SummaryState::Dd(sketch.clone()),
-                &SketchQuery::Quantile { q },
-            )
-            .unwrap();
-            assert!((value - 20.0).abs() <= 0.2);
-        }
-        sketch.update(40.0);
-        assert!(sketch.quantile(0.9).unwrap() < 21.0);
-        for (q, expected) in [(0.0, 20.0), (0.5, 30.0), (0.9, 38.0), (1.0, 40.0)] {
-            let value = sketch_query_value(
-                &SummaryState::Dd(sketch.clone()),
-                &SketchQuery::Quantile { q },
-            )
-            .unwrap();
-            assert!((value - expected).abs() <= expected * 0.01);
-        }
-        assert!(sketch_query_value(
-            &SummaryState::Dd(sketch),
-            &SketchQuery::Quantile { q: f64::NAN }
-        )
-        .is_err());
-    }
-}
diff --git a/data_plane/src/query_engines/asap_query_engine/test_plan.rs b/data_plane/src/query_engines/asap_query_engine/test_plan.rs
deleted file mode 100644
index ef0a54c52..000000000
--- a/data_plane/src/query_engines/asap_query_engine/test_plan.rs
+++ /dev/null
@@ -1,193 +0,0 @@
-//! Explicit installed plans for runtime tests. Fixtures choose the materialization
-//! and readout; query text is only canonicalized, never planned here.
-
-use super::engine::ASAPQueryEngine;
-use crate::drivers::query::servers::http::{
-    validate_and_build_runtime_plan, PhysicalPlanInstallRequest,
-};
-use crate::storage_engines::sketch_db::index::SketchStore;
-use crate::storage_engines::types::{ActivePhysicalPlanHandle, BackendStorageRouting};
-use asap_types::precompute_plan::{PlanEnvelope, PrecomputePlan, BACKEND_COMPAT};
-use asap_types::query_plan::*;
-use asap_types::PrecomputeMaterialization;
-use control_plane::physical::compiler::PLANNER_REVISION;
-use std::{collections::BTreeMap, sync::Arc};
-
-pub(super) fn materialization(
-    metric: &str,
-    aggregation: &str,
-    parameters: serde_json::Value,
-    labels: &[&str],
-    pane_ms: u64,
-) -> PrecomputeMaterialization {
-    assert_eq!(pane_ms % 1000, 0);
-    serde_json::from_value(serde_json::json!({
-        "aggregation_type": aggregation, "aggregation_sub_type": "",
-        "metric": metric, "window_size": pane_ms / 1000, "slide_interval": pane_ms / 1000,
-        "window_type": "tumbling", "num_aggregates_to_retain": 100,
-        "parameters": parameters, "pane_origin_ms": 0,
-        "partitioning": "per_entity",
-        "window_layout": {"kind": "pane", "pane_secs": pane_ms / 1000},
-        "grouping_labels": {"labels": labels}, "aggregated_labels": {"labels": []},
-        "rollup_labels": {"labels": []}, "spatial_filter": "",
-        "spatial_filter_normalized": "", "original_yaml": ""
-    }))
-    .unwrap()
-}
-
-pub(super) fn entry(
-    query: &str,
-    config: &PrecomputeMaterialization,
-    grouping: PhysicalGrouping,
-    lookback_ms: u64,
-    readout: QueryPlanNode,
-) -> QueryPlanEntry {
-    let canonical = canonical_promql(query).unwrap();
-    QueryPlanEntry {
-        language: QueryLanguage::PromQl,
-        query_id: canonical.clone(),
-        canonical_query: canonical,
-        fixed_evaluation: None,
-        root: QueryNodeId(1),
-        nodes: BTreeMap::from([
-            (
-                QueryNodeId(0),
-                QueryPlanNode::ReadMaterialization {
-                    binding: MaterializationBinding {
-                        full_window_slide_ms: matches!(
-                            config.window_layout,
-                            asap_types::WindowMaterializationLayout::FullWindow
-                        )
-                        .then_some(config.slide_interval * 1000),
-                        materialization: config.policy_fingerprint().into(),
-                        stored_output_reference:
-                            asap_types::summary_catalog::SummaryCatalog::from_materializations(
-                                1,
-                                1,
-                                &[config.clone()],
-                            )
-                            .unwrap()
-                            .output_reference(config.policy_fingerprint().into())
-                            .unwrap(),
-                        output_grouping: grouping,
-                        item_labels: config.aggregated_labels.labels.clone(),
-                        window_ms: config.stored_window_ms(),
-                        pane_origin_ms: config.pane_origin_ms,
-                        readout_lookback_ms: Some(lookback_ms),
-                    },
-                },
-            ),
-            (QueryNodeId(1), readout),
-        ]),
-        instant: InstantExecution {
-            lookback_ms,
-            full_history: false,
-            cumulative_readout: true,
-        },
-        fallback: FallbackPolicy::ExactBackend,
-    }
-}
-
-pub(super) fn install(
-    index: &SketchStore,
-    configs: &[(PrecomputeMaterialization, Vec<u64>)],
-    entries: Vec<QueryPlanEntry>,
-) -> ActivePhysicalPlanHandle {
-    let envelope = PlanEnvelope {
-        plan_id: 1,
-        plan_version: 1,
-        generated_at_unix_ms: 0,
-        activation_unix_ms: 0,
-        expiry_unix_ms: None,
-        backend_compat: BACKEND_COMPAT.into(),
-        planner_revision: PLANNER_REVISION.into(),
-        capability_snapshot_id: "runtime-fixture".into(),
-    };
-    let materializations: Vec<_> = configs.iter().map(|(c, _)| c.clone()).collect();
-    let catalog =
-        asap_types::summary_catalog::SummaryCatalog::from_materializations(1, 1, &materializations)
-            .unwrap();
-    let mut precompute =
-        PrecomputePlan::build(envelope.clone(), materializations, &["fixture".into()]).unwrap();
-    precompute.bind_catalog(&catalog).unwrap();
-    let mut transmission = control_plane::physical::compiler::build_transmission_plan(
-        envelope,
-        &precompute,
-        &BTreeMap::new(),
-    )
-    .unwrap();
-    transmission.summary_catalog = Some(catalog.reference().unwrap());
-    index
-        .install_summary_catalog(Arc::new(catalog.clone()))
-        .unwrap();
-    for (config, sids) in configs {
-        for sid in sids {
-            let mut metadata = (*index.instance(*sid).expect("registered fixture sid")).clone();
-            metadata.policy_fp = config.policy_fingerprint();
-            index.register(metadata);
-        }
-    }
-    let active = validate_and_build_runtime_plan(
-        PhysicalPlanInstallRequest {
-            summary_catalog: catalog,
-            collector_plans: vec![],
-            precompute_plan: precompute,
-            transmission_plan: transmission,
-            query_plan: QueryPlan {
-                plan_id: 1,
-                plan_version: 1,
-                clickhouse_context: None,
-                selected_dags: Default::default(),
-                entries: entries
-                    .into_iter()
-                    .map(|e| (e.canonical_query.clone(), e))
-                    .collect(),
-            },
-            storage_routing: None,
-            adaptation_evidence: vec![],
-        },
-        Arc::new(BackendStorageRouting::empty()),
-    )
-    .unwrap();
-    ActivePhysicalPlanHandle::new(active)
-}
-
-pub(super) fn engine(
-    index: Arc<SketchStore>,
-    config: PrecomputeMaterialization,
-    sids: Vec<u64>,
-    query_entry: QueryPlanEntry,
-) -> ASAPQueryEngine {
-    let active = install(&index, &[(config, sids)], vec![query_entry]);
-    ASAPQueryEngine::new(15_000)
-        .with_sketch_index(index)
-        .with_active_physical_plan(active)
-}
-
-/// Low-level operator fixtures install the descriptors of their explicit states.
-/// Process tests use compiled publications instead of this fixture adapter.
-pub(super) fn bound_reference(
-    index: &SketchStore,
-    output: asap_types::sds::StoredOutputId,
-) -> asap_types::sds::StoredOutputReference {
-    if let Some(catalog) = index.summary_catalog_snapshot() {
-        return catalog.output_reference(output).unwrap();
-    }
-    let metadata = index.snapshot_instances();
-    let entries = metadata
-        .iter()
-        .filter(|m| !m.policy_fp.is_unset())
-        .map(|m| {
-            let (summary, data) = index.descriptors_for_series_id(m.storage_handle).unwrap();
-            (m.policy_fp, (*summary).clone(), (*data).clone())
-        })
-        .collect::<Vec<_>>();
-    let catalog = asap_types::summary_catalog::SummaryCatalog::build(1, 1, entries).unwrap();
-    index
-        .install_summary_catalog(Arc::new(catalog.clone()))
-        .unwrap();
-    for metadata in metadata {
-        index.register((*metadata).clone());
-    }
-    catalog.output_reference(output).unwrap()
-}
diff --git a/data_plane/src/query_engines/asap_query_engine/tests.rs b/data_plane/src/query_engines/asap_query_engine/tests.rs
deleted file mode 100644
index 1262a0296..000000000
--- a/data_plane/src/query_engines/asap_query_engine/tests.rs
+++ /dev/null
@@ -1,13 +0,0 @@
-//! Placeholder for simple-engine tests.
-//!
-//! Step-1 of the JSONL deprecation refactor moved
-//! `query-engines/simple_engine.rs` to `query-engines/asap_query/engine.rs`. The
-//! engine's tests live inline in [`super::engine`] (~6 distinct
-//! `#[cfg(test)] mod tests { ... }` blocks, each pinning a
-//! specific dispatch axis). They are exercised under
-//! `crate::query_engines::asap_query_engine::engine::tests` rather than this file
-//! to preserve `git blame` continuity across the move.
-//!
-//! Step-2 (Prometheus-block format + Thanos store-gateway) can
-//! pull the inline test blocks out into this file once the
-//! engine's data model stabilises.
diff --git a/data_plane/src/query_engines/mod.rs b/data_plane/src/query_engines/mod.rs
deleted file mode 100644
index f586fc4be..000000000
--- a/data_plane/src/query_engines/mod.rs
+++ /dev/null
@@ -1,101 +0,0 @@
-//! Query engines.
-//!
-//! The public query-engine surface is intentionally small:
-//! [`asap_query_engine`] answers from ASAP's sketch store. Queries the
-//! ASAP tier cannot serve fall through to the Prometheus fallback in
-//! the HTTP layer (there is no archive tier — see #746).
-//!
-//! ## Public surface
-//!
-//! Engines + the shared error envelope:
-//!
-//! * [`asap_query_engine::ASAPQueryEngine`] — ASAP-tier sketch query
-//!   engine.
-//! * [`EngineError`] — the trait-level error envelope every
-//!   `crate::query_engines::routing::QueryEngine` impl returns.
-
-pub mod asap_clickhouse_query_engine;
-pub mod asap_query_engine;
-pub mod query_forwarding;
-pub mod query_result;
-pub mod routing;
-
-// Post-M2.3 reorg: timeline_dispatch + window_merger are ASAP-tier driver
-// primitives (they reason about reconfigure boundaries that only exist
-// inside a SketchStore). They moved into `sketch_db::query`. The
-// orchestration layer consumes them through the canonical path; these
-// aliases keep legacy `query_engines::timeline_dispatch::*` callers
-// compiling.
-pub use crate::storage_engines::sketch_db::query::timeline_dispatch;
-pub use crate::storage_engines::sketch_db::query::window_merger;
-
-pub use asap_query_engine::ASAPQueryEngine;
-pub use query_forwarding::QueryForwardingPolicy;
-pub use query_result::{InstantVector, QueryResult, RangeVector, RangeVectorElement, Sample};
-pub use timeline_dispatch::{combine_statistic, CombinedResult};
-pub use window_merger::{create_window_merger, NaiveMerger, WindowMerger};
-
-// ---------------------------------------------------------------------------
-// Shared `EngineError` surface returned by the `QueryEngine` trait.
-//
-// The trait is engine-agnostic, so its `execute` must return an error type
-// that can wrap *any* concrete engine's failure mode. Today's two engines
-// — `ASAPQueryEngine` (capability-miss → `None`) and archive/query forwarders
-// (rich `EngineError`) — fold into this common envelope.
-// ---------------------------------------------------------------------------
-
-use thiserror::Error;
-
-/// Top-level error returned by any [`crate::query_engines::routing::QueryEngine`] impl.
-///
-/// Concrete engines convert their internal error types into this envelope.
-/// The router uses the variant to decide whether a failover is sensible
-/// (e.g. `Backend(_)` falls through to the next compatible backend;
-/// `CapabilityMiss` does not — the caller should escalate).
-#[derive(Debug, Error)]
-pub enum EngineError {
-    /// A failed physical execution is terminal; it must never select another engine.
-    #[error(transparent)]
-    Physical(#[from] asap_physical_operators::Error),
-
-    /// The engine has no aggregation that can answer this query. Mirrors
-    /// `ASAPQueryEngine::handle_query` returning `None`. The router treats
-    /// this as a "hard miss" and falls through to the next backend in
-    /// the `compatible_storage_backends` list. After Step-1 of the
-    /// JSONL deprecation, the surviving failovers are ASAP-tier
-    /// sketch ↔ Gorilla-S3 archive only (the cold JSONL leg was
-    /// deleted).
-    #[error("no compatible aggregation in {engine_id}: {detail}")]
-    CapabilityMiss {
-        engine_id: &'static str,
-        detail: String,
-    },
-
-    /// The engine's backend (archive store, S3, planner, …) failed
-    /// during execution. Wraps the underlying engine's error as a
-    /// string so the router doesn't take a hard dep on every engine's
-    /// error type.
-    #[error("backend failure in {engine_id}: {message}")]
-    Backend {
-        engine_id: &'static str,
-        message: String,
-    },
-}
-
-impl EngineError {
-    pub fn capability_miss(engine_id: &'static str, detail: impl Into<String>) -> Self {
-        Self::CapabilityMiss {
-            engine_id,
-            detail: detail.into(),
-        }
-    }
-
-    pub fn backend(engine_id: &'static str, source: impl ToString) -> Self {
-        Self::Backend {
-            engine_id,
-            message: source.to_string(),
-        }
-    }
-}
-
-pub(crate) mod request;
diff --git a/data_plane/src/query_engines/query_forwarding.rs b/data_plane/src/query_engines/query_forwarding.rs
deleted file mode 100644
index a1eb2d24c..000000000
--- a/data_plane/src/query_engines/query_forwarding.rs
+++ /dev/null
@@ -1,13 +0,0 @@
-/// Controls whether query-serving code may contact an external backend.
-#[derive(Debug, Clone, Copy, Default, PartialEq, Eq)]
-pub enum QueryForwardingPolicy {
-    #[default]
-    Enabled,
-    Disabled,
-}
-
-impl QueryForwardingPolicy {
-    pub const fn allows_external_queries(self) -> bool {
-        matches!(self, Self::Enabled)
-    }
-}
diff --git a/data_plane/src/query_engines/query_result.rs b/data_plane/src/query_engines/query_result.rs
deleted file mode 100644
index e1e927f49..000000000
--- a/data_plane/src/query_engines/query_result.rs
+++ /dev/null
@@ -1,482 +0,0 @@
-use crate::storage_engines::sketch_db::AccuracyEnvelope;
-use crate::storage_engines::types::KeyByLabelValues;
-use serde::{Deserialize, Serialize};
-
-/// Whether a [`QueryResult`] is a PromQL instant-vector or range-vector
-/// result -- mirrors the Prometheus HTTP API's `resultType` response
-/// field. Formerly `promql_utilities::query_logics::enums::QueryResultType`;
-/// moved here (its only real production consumer) since it's an
-/// HTTP-response-shape tag with no meaning outside a query server --
-/// ASAPController has no HTTP query server and no equivalent concept.
-#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash, Serialize, Deserialize)]
-pub enum QueryResultType {
-    InstantVector,
-    RangeVector,
-}
-
-impl std::fmt::Display for QueryResultType {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        match self {
-            QueryResultType::InstantVector => write!(f, "instant_vector"),
-            QueryResultType::RangeVector => write!(f, "range_vector"),
-        }
-    }
-}
-
-/// Represents the result of a PromQL query
-#[derive(Debug, Clone, Serialize, Deserialize)]
-pub enum QueryResult {
-    Vector(InstantVector),
-    Matrix(RangeVector),
-}
-
-impl QueryResult {
-    pub(crate) fn retained_bytes(&self) -> usize {
-        match self {
-            Self::Vector(rows) => rows
-                .values
-                .iter()
-                .map(InstantVectorElement::retained_bytes)
-                .sum(),
-            Self::Matrix(rows) => rows
-                .values
-                .iter()
-                .map(|row| {
-                    std::mem::size_of::<RangeVectorElement>()
-                        + string_bytes(&row.labels.labels)
-                        + row
-                            .label_keys_override
-                            .as_ref()
-                            .map_or(0, |keys| string_bytes(keys))
-                        + row.samples.capacity() * std::mem::size_of::<Sample>()
-                })
-                .sum(),
-        }
-    }
-
-    pub fn result_type(&self) -> QueryResultType {
-        match self {
-            QueryResult::Vector(_) => QueryResultType::InstantVector,
-            QueryResult::Matrix(_) => QueryResultType::RangeVector,
-        }
-    }
-
-    pub fn vector(values: Vec<InstantVectorElement>, timestamp: u64) -> Self {
-        QueryResult::Vector(InstantVector {
-            values,
-            timestamp,
-            warnings: Vec::new(),
-            accuracy: None,
-            window_used: None,
-        })
-    }
-
-    #[cfg(test)]
-    /// Construct an instant vector with a non-empty warnings list.
-    /// Used by the schema-timeline dispatcher when the query spans
-    /// a reconfigure boundary and one or more segments could not
-    /// contribute to the answer (non-combinable statistic, purged
-    /// data, or agg_id removed from config mid-flight). Prometheus's
-    /// native JSON surface carries these back to the caller via the
-    /// top-level `warnings` field, matching the upstream contract.
-    pub fn vector_with_warnings(
-        values: Vec<InstantVectorElement>,
-        timestamp: u64,
-        warnings: Vec<String>,
-    ) -> Self {
-        QueryResult::Vector(InstantVector {
-            values,
-            timestamp,
-            warnings,
-            accuracy: None,
-            window_used: None,
-        })
-    }
-
-    pub fn matrix(values: Vec<RangeVectorElement>) -> Self {
-        QueryResult::Matrix(RangeVector {
-            values,
-            warnings: Vec::new(),
-            accuracy: None,
-            window_used: None,
-        })
-    }
-
-    /// Accumulated per-result warnings. Empty for single-schema
-    /// queries; populated by the §7 timeline dispatcher when a query
-    /// spans a reconfigure boundary.
-    pub fn warnings(&self) -> &[String] {
-        match self {
-            QueryResult::Vector(iv) => &iv.warnings,
-            QueryResult::Matrix(m) => &m.warnings,
-        }
-    }
-
-    /// Theoretical accuracy envelope for this answer (§6.4 of
-    /// the sketch-DB design). `None` when the engine couldn't
-    /// resolve a schema — legacy paths that haven't been wired
-    /// yet, or fallback-produced responses.
-    pub fn accuracy(&self) -> Option<&AccuracyEnvelope> {
-        match self {
-            QueryResult::Vector(iv) => iv.accuracy.as_ref(),
-            QueryResult::Matrix(m) => m.accuracy.as_ref(),
-        }
-    }
-
-    /// Attach an accuracy envelope. Chainable so engine paths
-    /// can build the bare result first and decorate once the
-    /// `agg_id → PrecomputeMaterialization → AccuracyProfile` lookup
-    /// has resolved.
-    pub fn with_accuracy(mut self, envelope: AccuracyEnvelope) -> Self {
-        match &mut self {
-            QueryResult::Vector(iv) => iv.accuracy = Some(envelope),
-            QueryResult::Matrix(m) => m.accuracy = Some(envelope),
-        }
-        self
-    }
-
-    /// Actual `[start_ms, end_ms)` precompute window used to answer
-    /// the query. Set by the engine when a window-style query (e.g.
-    /// `quantile_over_time(...[1m])`) resolved to a single closest
-    /// pane rather than a merge across the request range — the
-    /// caller's request range and the answered range are not the
-    /// same in that case, and the user needs to know which window
-    /// was actually consulted.
-    pub fn window_used(&self) -> Option<(u64, u64)> {
-        match self {
-            QueryResult::Vector(iv) => iv.window_used,
-            QueryResult::Matrix(m) => m.window_used,
-        }
-    }
-}
-
-/// Instant vector - a set of time series containing a single sample for each time series, all sharing the same timestamp
-#[derive(Debug, Clone, Serialize, Deserialize)]
-pub struct InstantVector {
-    pub values: Vec<InstantVectorElement>,
-    pub timestamp: u64,
-    /// Non-error advisories attached to this result, surfaced on
-    /// Prometheus's top-level `warnings` field. Empty for
-    /// single-schema queries; populated by the schema-timeline
-    /// dispatcher when one or more segments produced a
-    /// [`crate::query_engines::timeline_dispatch::CombinedResult::Partial`]
-    /// (non-combinable statistic, purged coverage, or agg_id
-    /// missing from the current config).
-    #[serde(default, skip_serializing_if = "Vec::is_empty")]
-    pub warnings: Vec<String>,
-    /// §6.4 accuracy envelope. Attached by the engine once the
-    /// `agg_id` is resolved; surfaced as `PrometheusResponse`'s
-    /// top-level `accuracy` field and mirrored to `infos` for
-    /// Grafana 11+ inline display.
-    #[serde(default, skip_serializing_if = "Option::is_none")]
-    pub accuracy: Option<AccuracyEnvelope>,
-    /// `[start_ms, end_ms)` of the precompute window the engine
-    /// actually used to answer this query. Set when a window query
-    /// resolved to a single closest pane (latest pane that overlaps
-    /// the request range) rather than a merge across the full
-    /// request range — the caller's request and the answered range
-    /// differ in that case, and they need to know which window was
-    /// consulted. Surfaced as a `precompute_window` info line in
-    /// `PrometheusResponse.infos` for the Prometheus HTTP adapter.
-    #[serde(default, skip_serializing_if = "Option::is_none")]
-    pub window_used: Option<(u64, u64)>,
-}
-
-#[derive(Debug, Clone, Serialize, Deserialize)]
-pub struct InstantVectorElement {
-    pub labels: KeyByLabelValues,
-    pub value: f64,
-    /// Optional per-element label-key override. Mirrors the field on
-    /// `RangeVectorElement` — when `Some`, the HTTP serializer uses
-    /// these keys for the PromQL response's `"metric"` object instead
-    /// of the query-scoped `KeyByLabelNames` argument. Used by ASAP-tier
-    /// `topk(...)` (whose reducer synthesizes an `"item"` key not
-    /// present in the query's group-by clause). `None` for everyone
-    /// else — the existing serializer path is unaffected.
-    #[serde(default, skip_serializing_if = "Option::is_none")]
-    pub label_keys_override: Option<Vec<String>>,
-}
-
-fn string_bytes(values: &[String]) -> usize {
-    std::mem::size_of_val(values) + values.iter().map(String::capacity).sum::<usize>()
-}
-
-impl InstantVectorElement {
-    pub(crate) fn retained_bytes(&self) -> usize {
-        std::mem::size_of::<Self>()
-            + string_bytes(&self.labels.labels)
-            + self
-                .label_keys_override
-                .as_ref()
-                .map_or(0, |keys| string_bytes(keys))
-    }
-
-    pub fn new(labels: KeyByLabelValues, value: f64) -> Self {
-        Self {
-            labels,
-            value,
-            label_keys_override: None,
-        }
-    }
-
-    /// Attach a per-element label-key override (see field doc on
-    /// `InstantVectorElement::label_keys_override`).
-    pub fn with_label_keys_override(mut self, keys: Vec<String>) -> Self {
-        self.label_keys_override = Some(keys);
-        self
-    }
-}
-
-/// Range vector - a set of time series containing multiple samples over a time range
-#[derive(Debug, Clone, Serialize, Deserialize)]
-pub struct RangeVector {
-    pub values: Vec<RangeVectorElement>,
-    /// See [`InstantVector::warnings`].
-    #[serde(default, skip_serializing_if = "Vec::is_empty")]
-    pub warnings: Vec<String>,
-    /// See [`InstantVector::accuracy`].
-    #[serde(default, skip_serializing_if = "Option::is_none")]
-    pub accuracy: Option<AccuracyEnvelope>,
-    /// See [`InstantVector::window_used`].
-    #[serde(default, skip_serializing_if = "Option::is_none")]
-    pub window_used: Option<(u64, u64)>,
-}
-
-/// Individual element in a range vector
-#[derive(Debug, Clone, Serialize, Deserialize)]
-pub struct RangeVectorElement {
-    pub labels: KeyByLabelValues,
-    pub samples: Vec<Sample>,
-    /// Optional per-element label-key override. When `Some`, the
-    /// HTTP serializer uses these keys for the PromQL response's
-    /// `"metric"` object instead of the query-scoped
-    /// `KeyByLabelNames` argument. Used by ASAP-tier `topk` (whose
-    /// reducer synthesizes an `"item"` key not present in the
-    /// query's group-by clause) and other adapters that materialize
-    /// labels the caller doesn't know about. `None` for everyone
-    /// else — the existing serializer path is unaffected.
-    #[serde(default, skip_serializing_if = "Option::is_none")]
-    pub label_keys_override: Option<Vec<String>>,
-}
-
-/// A single sample (timestamp, value) pair
-#[derive(Debug, Clone, Serialize, Deserialize)]
-pub struct Sample {
-    pub timestamp: u64,
-    pub value: f64,
-}
-
-impl Sample {
-    pub fn new(timestamp: u64, value: f64) -> Self {
-        Self { timestamp, value }
-    }
-}
-
-impl RangeVectorElement {
-    pub fn new(labels: KeyByLabelValues) -> Self {
-        Self {
-            labels,
-            samples: Vec::new(),
-            label_keys_override: None,
-        }
-    }
-
-    /// Attach a per-element label-key override (see field doc on
-    /// `RangeVectorElement::label_keys_override`).
-    pub fn with_label_keys_override(mut self, keys: Vec<String>) -> Self {
-        self.label_keys_override = Some(keys);
-        self
-    }
-
-    pub fn add_sample(&mut self, timestamp: u64, value: f64) {
-        self.samples.push(Sample::new(timestamp, value));
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use std::vec;
-
-    use super::*;
-
-    fn create_test_labels() -> KeyByLabelValues {
-        KeyByLabelValues::new_with_labels(vec![
-            "localhost:9090".to_string(),
-            "prometheus".to_string(),
-        ])
-    }
-
-    #[test]
-    fn test_instant_vector_creation() {
-        let labels = create_test_labels();
-        let element = InstantVectorElement::new(labels.clone(), 42.0);
-        let vector = QueryResult::vector(vec![element], 1000);
-
-        assert_eq!(vector.result_type(), QueryResultType::InstantVector);
-
-        if let QueryResult::Vector(iv) = vector {
-            assert_eq!(iv.values.len(), 1);
-            assert_eq!(iv.values[0].value, 42.0);
-            assert_eq!(iv.values[0].labels, labels);
-        } else {
-            panic!("Expected Vector result");
-        }
-    }
-
-    #[test]
-    fn test_range_vector_creation() {
-        let labels = create_test_labels();
-        let mut element = RangeVectorElement::new(labels.clone());
-        element.add_sample(1000, 42.0);
-        element.add_sample(2000, 43.0);
-
-        let result = QueryResult::matrix(vec![element]);
-
-        assert_eq!(result.result_type(), QueryResultType::RangeVector);
-
-        if let QueryResult::Matrix(matrix) = result {
-            assert_eq!(matrix.values.len(), 1);
-            assert_eq!(matrix.values[0].samples.len(), 2);
-            assert_eq!(matrix.values[0].samples[0].timestamp, 1000);
-            assert_eq!(matrix.values[0].samples[0].value, 42.0);
-            assert_eq!(matrix.values[0].samples[1].timestamp, 2000);
-            assert_eq!(matrix.values[0].samples[1].value, 43.0);
-        } else {
-            panic!("Expected Matrix result");
-        }
-    }
-
-    #[test]
-    fn test_serialization() {
-        let labels = create_test_labels();
-        let element = InstantVectorElement::new(labels, 42.0);
-        let vector = QueryResult::vector(vec![element], 1000);
-
-        let json = serde_json::to_string(&vector).unwrap();
-        let deserialized: QueryResult = serde_json::from_str(&json).unwrap();
-
-        assert_eq!(vector.result_type(), deserialized.result_type());
-    }
-
-    #[test]
-    fn test_range_vector_serialization() {
-        let labels = create_test_labels();
-        let mut element = RangeVectorElement::new(labels);
-        element.add_sample(1000, 42.0);
-        element.add_sample(2000, 43.0);
-
-        let result = QueryResult::matrix(vec![element]);
-
-        let json = serde_json::to_string(&result).unwrap();
-        let deserialized: QueryResult = serde_json::from_str(&json).unwrap();
-
-        assert_eq!(result.result_type(), deserialized.result_type());
-    }
-
-    #[test]
-    fn test_range_vector_empty_samples() {
-        let labels = create_test_labels();
-        let element = RangeVectorElement::new(labels.clone());
-
-        assert!(element.samples.is_empty());
-        assert_eq!(element.labels, labels);
-
-        let result = QueryResult::matrix(vec![element]);
-        if let QueryResult::Matrix(matrix) = result {
-            assert_eq!(matrix.values.len(), 1);
-            assert!(matrix.values[0].samples.is_empty());
-        } else {
-            panic!("Expected Matrix result");
-        }
-    }
-
-    #[test]
-    fn test_range_vector_multiple_elements() {
-        let labels1 = KeyByLabelValues::new_with_labels(vec!["host1".to_string()]);
-        let labels2 = KeyByLabelValues::new_with_labels(vec!["host2".to_string()]);
-
-        let mut element1 = RangeVectorElement::new(labels1.clone());
-        element1.add_sample(1000, 10.0);
-        element1.add_sample(2000, 20.0);
-
-        let mut element2 = RangeVectorElement::new(labels2.clone());
-        element2.add_sample(1000, 100.0);
-        element2.add_sample(2000, 200.0);
-
-        let result = QueryResult::matrix(vec![element1, element2]);
-
-        if let QueryResult::Matrix(matrix) = result {
-            assert_eq!(matrix.values.len(), 2);
-
-            // First element
-            assert_eq!(matrix.values[0].labels, labels1);
-            assert_eq!(matrix.values[0].samples.len(), 2);
-
-            // Second element
-            assert_eq!(matrix.values[1].labels, labels2);
-            assert_eq!(matrix.values[1].samples.len(), 2);
-            assert_eq!(matrix.values[1].samples[0].value, 100.0);
-        } else {
-            panic!("Expected Matrix result");
-        }
-    }
-
-    #[test]
-    fn test_sample_ordering_preserved() {
-        let labels = create_test_labels();
-        let mut element = RangeVectorElement::new(labels);
-
-        // Add samples in specific order
-        element.add_sample(3000, 30.0);
-        element.add_sample(1000, 10.0);
-        element.add_sample(2000, 20.0);
-
-        // Order should be preserved (not sorted)
-        assert_eq!(element.samples[0].timestamp, 3000);
-        assert_eq!(element.samples[1].timestamp, 1000);
-        assert_eq!(element.samples[2].timestamp, 2000);
-    }
-
-    #[test]
-    fn test_sample_new() {
-        let sample = Sample::new(12345, 99.9);
-        assert_eq!(sample.timestamp, 12345);
-        assert_eq!(sample.value, 99.9);
-    }
-
-    #[test]
-    fn vector_without_warnings_returns_empty_slice_and_omits_field_in_json() {
-        let labels = create_test_labels();
-        let el = InstantVectorElement::new(labels, 1.0);
-        let qr = QueryResult::vector(vec![el], 100);
-        assert!(qr.warnings().is_empty());
-        let json = serde_json::to_string(&qr).unwrap();
-        assert!(
-            !json.contains("\"warnings\""),
-            "default-empty warnings must be skip-serialised for wire compatibility"
-        );
-    }
-
-    #[test]
-    fn vector_with_warnings_round_trips_through_serde() {
-        let labels = create_test_labels();
-        let el = InstantVectorElement::new(labels, 1.0);
-        let warnings = vec!["partial result: 2 schemas".to_string()];
-        let qr = QueryResult::vector_with_warnings(vec![el], 100, warnings.clone());
-        assert_eq!(qr.warnings(), warnings.as_slice());
-
-        let json = serde_json::to_string(&qr).unwrap();
-        assert!(json.contains("\"warnings\""));
-        let back: QueryResult = serde_json::from_str(&json).unwrap();
-        assert_eq!(back.warnings(), warnings.as_slice());
-    }
-
-    #[test]
-    fn matrix_warnings_default_empty_and_skip_serialised() {
-        let el = RangeVectorElement::new(create_test_labels());
-        let qr = QueryResult::matrix(vec![el]);
-        assert!(qr.warnings().is_empty());
-        let json = serde_json::to_string(&qr).unwrap();
-        assert!(!json.contains("\"warnings\""));
-    }
-}
diff --git a/data_plane/src/query_engines/request.rs b/data_plane/src/query_engines/request.rs
deleted file mode 100644
index c7ccc2929..000000000
--- a/data_plane/src/query_engines/request.rs
+++ /dev/null
@@ -1,239 +0,0 @@
-//! Own one native control for the lifetime of a request, including async inputs.
-//!
-//! Planner's native context is !Send. A blocking worker owns it while Tokio's
-//! handle drives input I/O on that same thread. The thread-local is scoped to
-//! this worker invocation; it is never installed on a Tokio scheduler thread.
-use super::EngineError;
-use asap_physical_operators::dag::{Error, Limits, Reservation, RunContext, Scope};
-use std::{
-    cell::RefCell,
-    future::Future,
-    sync::{
-        atomic::{AtomicBool, Ordering},
-        Arc,
-    },
-};
-
-#[derive(Default)]
-struct Cancellation {
-    cancelled: AtomicBool,
-    changed: tokio::sync::Notify,
-}
-struct CancelOnDrop(Arc<Cancellation>);
-impl Drop for CancelOnDrop {
-    fn drop(&mut self) {
-        self.0.cancelled.store(true, Ordering::Release);
-        self.0.changed.notify_one();
-    }
-}
-struct ActiveRequest {
-    context: RunContext,
-    cancellation: Arc<Cancellation>,
-}
-thread_local! {
-    static ACTIVE: RefCell<Option<ActiveRequest>> = const { RefCell::new(None) };
-}
-struct ClearRequest;
-impl Drop for ClearRequest {
-    fn drop(&mut self) {
-        ACTIVE.with(|slot| {
-            slot.borrow_mut().take();
-        });
-    }
-}
-
-/// Dropping the caller future cancels remote reads and cooperative native work.
-pub(crate) async fn run<T, F>(limits: Limits, operation: F) -> Result<T, EngineError>
-where
-    T: Send + 'static,
-    F: FnOnce(tokio::runtime::Handle) -> Result<T, EngineError> + Send + 'static,
-{
-    let cancellation = Arc::new(Cancellation::default());
-    let _cancel = CancelOnDrop(cancellation.clone());
-    let handle = tokio::runtime::Handle::current();
-    tokio::task::spawn_blocking(move || {
-        let context = RunContext::new(
-            Scope::Query {
-                evaluation_time_ms: 0,
-                revision: 0,
-            },
-            limits,
-        )?;
-        ACTIVE.with(|slot| {
-            assert!(slot.borrow().is_none(), "nested request executor");
-            *slot.borrow_mut() = Some(ActiveRequest {
-                context,
-                cancellation,
-            });
-        });
-        let _clear = ClearRequest;
-        check()?;
-        operation(handle)
-    })
-    .await
-    .map_err(|error| {
-        EngineError::Physical(Error::Operator(format!("query worker failed: {error}")))
-    })?
-}
-
-pub(crate) fn check() -> Result<(), Error> {
-    ACTIVE.with(|slot| {
-        if let Some(active) = slot.borrow().as_ref() {
-            if active.cancellation.cancelled.load(Ordering::Acquire) {
-                active.context.cancel();
-            }
-            if active.context.is_cancelled() {
-                return Err(Error::Cancelled);
-            }
-        }
-        Ok(())
-    })
-}
-
-pub(crate) fn context(scope: Scope) -> Result<RunContext, Error> {
-    check()?;
-    ACTIVE.with(|slot| match slot.borrow().as_ref() {
-        Some(active) => {
-            let mut context = active.context.clone();
-            context.scope = scope;
-            Ok(context)
-        }
-        None => RunContext::new(scope, Limits::default()),
-    })
-}
-
-pub(crate) fn reserve(bytes: usize) -> Result<Reservation, Error> {
-    context(Scope::Query {
-        evaluation_time_ms: 0,
-        revision: 0,
-    })?
-    .reserve(bytes)
-}
-
-/// Drive a local native future while bridging caller cancellation on each poll.
-/// This must not enter another executor: native operators may synchronously run
-/// a nested DAG while they are polled.
-pub(crate) fn drive<T>(future: impl Future<Output = T>) -> Result<T, Error> {
-    use futures::FutureExt;
-    let mut future = Box::pin(future);
-    loop {
-        check()?;
-        if let Some(result) = future.as_mut().now_or_never() {
-            check()?;
-            return Ok(result);
-        }
-        std::thread::yield_now();
-    }
-}
-
-pub(crate) async fn wait<T>(future: impl Future<Output = T>) -> Result<T, Error> {
-    check()?;
-    let cancellation = ACTIVE.with(|slot| {
-        slot.borrow()
-            .as_ref()
-            .map(|active| active.cancellation.clone())
-    });
-    if let Some(cancellation) = cancellation {
-        tokio::select! {
-            result = future => { check()?; Ok(result) },
-            _ = cancellation.changed.notified() => Err(Error::Cancelled),
-        }
-    } else {
-        Ok(future.await)
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    // Evaluation scopes share accounting; independent HTTP requests do not.
-    #[tokio::test]
-    async fn range_scopes_share_retained_input_and_result_budget() {
-        let error = run(
-            Limits {
-                max_bytes: 1024,
-                ..Limits::default()
-            },
-            |_| {
-                let first = context(Scope::Query {
-                    evaluation_time_ms: 1,
-                    revision: 7,
-                })?;
-                let _input = first.reserve(600)?;
-                let next = context(Scope::Query {
-                    evaluation_time_ms: 2,
-                    revision: 7,
-                })?;
-                let _result = next.reserve(500)?;
-                Ok(())
-            },
-        )
-        .await
-        .unwrap_err();
-        assert!(matches!(error, EngineError::Physical(Error::MemoryLimit)));
-        run(
-            Limits {
-                max_bytes: 1024,
-                ..Limits::default()
-            },
-            |_| {
-                let _all = reserve(1024)?;
-                Ok(())
-            },
-        )
-        .await
-        .unwrap();
-    }
-
-    // Cancellation must also stop a nested, cooperatively yielding native run.
-    #[tokio::test]
-    async fn dropping_request_cancels_native_polling() {
-        let (started, ready) = tokio::sync::oneshot::channel();
-        let (finished, done) = tokio::sync::oneshot::channel();
-        let task = tokio::spawn(run(Limits::default(), move |_| {
-            let context = context(Scope::Query {
-                evaluation_time_ms: 1,
-                revision: 1,
-            })?;
-            started.send(()).unwrap();
-            let result = drive(std::future::pending::<()>());
-            finished
-                .send(matches!(result, Err(Error::Cancelled)) && context.is_cancelled())
-                .unwrap();
-            result.map_err(EngineError::from)
-        }));
-        ready.await.unwrap();
-        task.abort();
-        assert!(
-            tokio::time::timeout(std::time::Duration::from_secs(2), done)
-                .await
-                .unwrap()
-                .unwrap()
-        );
-    }
-
-    // Aborting the async caller wakes a remote read even when it never replies.
-    #[tokio::test]
-    async fn dropping_request_cancels_inflight_input_and_worker() {
-        let (started, ready) = tokio::sync::oneshot::channel();
-        let (finished, done) = tokio::sync::oneshot::channel();
-        let task = tokio::spawn(run(Limits::default(), move |handle| {
-            handle.block_on(async {
-                started.send(()).unwrap();
-                let result = wait(std::future::pending::<()>()).await;
-                let cancelled = matches!(result, Err(Error::Cancelled));
-                finished.send(cancelled).unwrap();
-                result.map_err(EngineError::from)
-            })
-        }));
-        ready.await.unwrap();
-        task.abort();
-        assert!(
-            tokio::time::timeout(std::time::Duration::from_secs(2), done)
-                .await
-                .unwrap()
-                .unwrap()
-        );
-    }
-}
diff --git a/data_plane/src/query_engines/routing/backend_storage_routing.rs b/data_plane/src/query_engines/routing/backend_storage_routing.rs
deleted file mode 100644
index e3aa2b397..000000000
--- a/data_plane/src/query_engines/routing/backend_storage_routing.rs
+++ /dev/null
@@ -1,1768 +0,0 @@
-//! Per-metric routing with optional query-shape filters.
-//!
-//! YAML accepts single targets under `metrics` and target lists under `routes`.
-//! For metrics listed in both, `routes` wins. Missing metrics use the configured
-//! default, which defaults to `SketchStore`. JSON configuration is also accepted
-//! through [`BackendStorageRouting::from_json_payload`].
-//!
-//! The HTTP layer snapshots the hot-reload routing handle per request so each
-//! query sees one consistent table during concurrent configuration updates.
-
-use std::collections::HashMap;
-use std::path::Path;
-
-use anyhow::{Context, Result};
-use serde::{Deserialize, Serialize};
-use serde_json::Value as JsonValue;
-use tracing::{debug, info};
-
-use crate::storage_engines::types::{
-    parse_storage_backend_engine_id, StorageBackend, CANONICAL_QUERY_ENGINE_IDS,
-};
-
-// ---------------------------------------------------------------------------
-// Query-shape taxonomy
-// ---------------------------------------------------------------------------
-
-/// Coarse PromQL shape used to match a routing target's
-/// `applies_to_query_shape` filter.
-#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash, Serialize, Deserialize)]
-#[serde(rename_all = "snake_case")]
-pub enum QueryOperatorShape {
-    /// `count(<metric>{...})` — series count after label predicates.
-    /// Cold archive serves exactly via postings index; ASAP tier has
-    /// no compatible aggregation (a CMS doesn't track per-series
-    /// existence).
-    Count,
-    /// `topk(k, ...)` — top-k by value. Cold archive answers by
-    /// streaming through chunk samples and tracking k-largest; warm
-    /// tier needs a `CountMinSketchWithHeap` to answer at all.
-    Topk,
-    /// `rate(<metric>[<range>])` — per-second rate over a range.
-    /// Marked "post-hoc" because the ASAP tier's pre-computed
-    /// `Increase` aggregation answers `rate` natively for known
-    /// queries, so this shape only kicks in for ad-hoc rate queries
-    /// the control plane didn't pre-plan for.
-    RatePostHoc,
-    /// `quantile_over_time(φ, <metric>[<range>])` and
-    /// `quantile(...)` aggregations. Warm tier serves natively via
-    /// DDSketch / KLL accumulators; cold archive can also serve but
-    /// at higher latency.
-    Quantile,
-    /// `sum_over_time(...)` and `sum(...) by (...)`. Warm tier
-    /// serves via a sum-typed accumulator.
-    Sum,
-    /// `last_over_time(<metric>[<range>])`. Used by the v6
-    /// freshness probes — ASAP tier serves via a counter-typed
-    /// accumulator (Change B), archive serves by selecting the
-    /// most-recent sample in each chunk.
-    LastOverTime,
-    /// `histogram_quantile(φ, ...)` — Prometheus-native histogram
-    /// readout. No ASAP-tier sketch fits the bucket-vector input
-    /// shape; archive serves via post-hoc bucket scan.
-    HistogramQuantile,
-    /// `delta(<counter>[<range>])` — first-difference over a range.
-    /// Archive-only.
-    Delta,
-    /// `deriv(<gauge>[<range>])` — least-squares slope of a gauge.
-    /// Archive-only.
-    Deriv,
-    /// `absent(<metric>{...})` — 1 if no series match, vacuous
-    /// vector otherwise. Archive answers natively from the postings
-    /// index; ASAP-tier sketch has no compatible aggregation.
-    Absent,
-    /// Anything else — `min/max_over_time`, `count_over_time`,
-    /// `avg_over_time`, etc. Lets the routing table register
-    /// targets that catch the long tail without enumerating every
-    /// PromQL function.
-    Other,
-}
-
-impl QueryOperatorShape {
-    /// Stable string tag used in YAML / JSON. Mirrors the control plane's
-    /// `config::stage_config::emit_backend_storage_routing` shape
-    /// vocabulary — the wire form is the canonical PromQL function
-    /// name (or a `_` prefixed variant for shapes without a single
-    /// canonical name, e.g. `rate_post_hoc`).
-    pub fn as_str(self) -> &'static str {
-        match self {
-            QueryOperatorShape::Count => "count",
-            QueryOperatorShape::Topk => "topk",
-            QueryOperatorShape::RatePostHoc => "rate_post_hoc",
-            QueryOperatorShape::Quantile => "quantile",
-            QueryOperatorShape::Sum => "sum",
-            QueryOperatorShape::LastOverTime => "last_over_time",
-            QueryOperatorShape::HistogramQuantile => "histogram_quantile",
-            QueryOperatorShape::Delta => "delta",
-            QueryOperatorShape::Deriv => "deriv",
-            QueryOperatorShape::Absent => "absent",
-            QueryOperatorShape::Other => "other",
-        }
-    }
-}
-
-/// Classify a parsed PromQL expression into a [`QueryOperatorShape`]. Walks
-/// the AST and returns the first shape that matches any node — so
-/// `topk(5, sum by (zone) (rate(http_requests_total[5m])))` is
-/// classified as `Topk` (the outermost shape wins).
-///
-/// `RatePostHoc` is conservative: any `rate(...)` call surfaces as
-/// `RatePostHoc`. The routing-table consumer can decide whether to
-/// honour that or fall through to the default target.
-pub fn classify_query_shape(expr: &promql_parser::parser::Expr) -> QueryOperatorShape {
-    use promql_parser::parser::Expr;
-    match expr {
-        // Aggregations are the outermost shape — `topk(...)` wins
-        // over any inner call. We use the operator's Display impl
-        // (the canonical PromQL keyword: "sum", "count", "topk",
-        // "quantile", ...) — Debug-formatting the underlying
-        // `TokenType` returns the numeric token id, not the
-        // keyword.
-        Expr::Aggregate(agg) => {
-            let op = agg.op.to_string().to_lowercase();
-            if op == "topk" || op == "bottomk" {
-                QueryOperatorShape::Topk
-            } else if op == "count" || op == "count_values" {
-                QueryOperatorShape::Count
-            } else if op == "quantile" {
-                QueryOperatorShape::Quantile
-            } else if op == "sum" {
-                // `sum by (...) (...)` — recurse on the inner
-                // expression; if the inner is a `rate(...)` the
-                // post-hoc rate path wins.
-                let inner = classify_query_shape(&agg.expr);
-                if matches!(inner, QueryOperatorShape::RatePostHoc) {
-                    QueryOperatorShape::RatePostHoc
-                } else {
-                    QueryOperatorShape::Sum
-                }
-            } else {
-                // min/max/avg/group/stddev/stdvar/...
-                classify_query_shape(&agg.expr)
-            }
-        }
-        Expr::Call(call) => {
-            let name = call.func.name.to_lowercase();
-            if name == "rate" || name == "irate" {
-                QueryOperatorShape::RatePostHoc
-            } else if name == "quantile_over_time" {
-                QueryOperatorShape::Quantile
-            } else if name == "sum_over_time" {
-                QueryOperatorShape::Sum
-            } else if name == "count_over_time" {
-                QueryOperatorShape::Count
-            } else if name == "last_over_time" {
-                QueryOperatorShape::LastOverTime
-            } else if name == "histogram_quantile" {
-                QueryOperatorShape::HistogramQuantile
-            } else if name == "delta" || name == "increase" {
-                QueryOperatorShape::Delta
-            } else if name == "deriv" {
-                QueryOperatorShape::Deriv
-            } else if name == "absent" || name == "absent_over_time" {
-                QueryOperatorShape::Absent
-            } else {
-                QueryOperatorShape::Other
-            }
-        }
-        Expr::Paren(p) => classify_query_shape(&p.expr),
-        Expr::Unary(u) => classify_query_shape(&u.expr),
-        Expr::Binary(bin) => {
-            // Pick whichever side has the more-specific shape; a
-            // `rate(...)` on either side is enough to mark
-            // RatePostHoc.
-            let l = classify_query_shape(&bin.lhs);
-            if !matches!(l, QueryOperatorShape::Other) {
-                l
-            } else {
-                classify_query_shape(&bin.rhs)
-            }
-        }
-        Expr::Subquery(sq) => classify_query_shape(&sq.expr),
-        // Bare vector / matrix selectors — no function applied.
-        _ => QueryOperatorShape::Other,
-    }
-}
-
-// ---------------------------------------------------------------------------
-// On-disk YAML schema
-// ---------------------------------------------------------------------------
-
-/// One target in the v7 multi-target form.
-#[derive(Debug, Clone, Serialize, Deserialize, PartialEq, Eq)]
-struct RoutingTargetYaml {
-    backend: StorageBackend,
-    /// Optional list of query shapes this target applies to. When
-    /// `None`, the target is the default — it catches any shape the
-    /// other targets didn't claim. When `Some(list)`, the target
-    /// only fires when the incoming query's shape is in `list`.
-    #[serde(default, skip_serializing_if = "Option::is_none")]
-    applies_to_query_shape: Option<Vec<QueryOperatorShape>>,
-}
-
-/// One row in the v7 multi-target form.
-#[derive(Debug, Clone, Serialize, Deserialize)]
-struct RouteYaml {
-    metric: String,
-    targets: Vec<RoutingTargetYaml>,
-}
-
-/// On-disk YAML schema. Public only so the loader / tests can build it
-/// from literals; runtime callers should go through
-/// [`BackendStorageRouting`].
-#[derive(Debug, Clone, Default, Serialize, Deserialize)]
-struct BackendStorageRoutingYaml {
-    /// Tenant id this routing table services. Optional; defaults to
-    /// [`DEFAULT_TENANT`] for single-tenant deployments / existing
-    /// YAMLs that predate the per-tenant routing field.
-    #[serde(default, skip_serializing_if = "Option::is_none")]
-    tenant: Option<String>,
-    /// Fallback storage backend for any metric not explicitly listed.
-    /// Optional; defaults to `SketchStore`.
-    #[serde(default)]
-    default: StorageBackend,
-    /// v6.1 form — per-metric overrides keyed by the bare metric name
-    /// (no labels). Each value is a single `StorageBackend`. A metric
-    /// listed here keeps the v6.1 semantics: every query for the
-    /// metric routes to the named backend regardless of shape.
-    #[serde(default)]
-    metrics: HashMap<String, StorageBackend>,
-    /// v7 form — per-metric overrides as a list of `(backend,
-    /// applies_to_query_shape)` targets. The HTTP handler inspects
-    /// the parsed PromQL, classifies it via [`classify_query_shape`],
-    /// and picks the first target whose `applies_to_query_shape`
-    /// either is `None` (default) or contains the query's shape.
-    /// Falls back to the first target on no match.
-    #[serde(default)]
-    routes: Vec<RouteYaml>,
-}
-
-// ---------------------------------------------------------------------------
-// In-memory routing table
-// ---------------------------------------------------------------------------
-
-/// One target in the in-memory routing table — the runtime form of
-/// [`RoutingTargetYaml`].
-#[derive(Debug, Clone, PartialEq, Eq)]
-pub struct RoutingTarget {
-    /// Storage backend the HTTP handler should dispatch to.
-    pub backend: StorageBackend,
-    /// Optional list of query shapes this target claims. `None` =
-    /// default (always fires); `Some(list)` = this target only fires
-    /// when the query's classified shape is in `list`.
-    pub applies_to_query_shape: Option<Vec<QueryOperatorShape>>,
-}
-
-impl RoutingTarget {
-    /// Build a target that applies to every query shape (the v6.1
-    /// single-target form).
-    pub fn always(backend: StorageBackend) -> Self {
-        Self {
-            backend,
-            applies_to_query_shape: None,
-        }
-    }
-
-    /// Build a target that only applies to the listed shapes.
-    pub fn for_shapes(backend: StorageBackend, shapes: Vec<QueryOperatorShape>) -> Self {
-        Self {
-            backend,
-            applies_to_query_shape: Some(shapes),
-        }
-    }
-}
-
-/// Tenant id used when the deploy is single-tenant (no `X-ASAP-Tenant`
-/// header on the request and no explicit `tenant` field on the
-/// control-plane-emitted JSON). Multi-tenant deployments thread an
-/// explicit non-`default` id through both surfaces.
-pub const DEFAULT_TENANT: &str = "default";
-
-/// In-memory routing table consulted by the HTTP handler at request
-/// time. Build via [`Self::from_yaml_file`] / [`Self::from_yaml_str`]
-/// or [`Self::empty`] (everything routes to `SketchStore`).
-///
-/// ## Tenant scope (per-tenant routing, follow-up to PR #333)
-///
-/// Each `BackendStorageRouting` is scoped to a single tenant —
-/// identified by the [`Self::tenant`] field. The table services
-/// requests carrying `X-ASAP-Tenant: <tenant>` (default
-/// [`DEFAULT_TENANT`] when the header is missing). Multi-tenant
-/// deployments hold a `tenant → BackendStorageRouting` map in
-/// [`HotReloadBackendStorageRouting`] and look up per-tenant tables
-/// at request time, falling back to the [`DEFAULT_TENANT`] table when
-/// the request's tenant has no entry.
-///
-/// **MVP scope:** the `tenant` field is unauthenticated — anyone can
-/// pick any tenant by setting the header. Tenant-aware AUTH is
-/// out-of-scope for this MVP and will be added before any
-/// multi-tenant deploy is considered production-ready. Sketch state
-/// is still global; only the routing table is tenant-scoped.
-#[derive(Debug, Clone)]
-pub struct BackendStorageRouting {
-    /// Tenant id this routing table services. Defaults to
-    /// [`DEFAULT_TENANT`] for single-tenant deployments and existing
-    /// call sites that never specify a tenant.
-    tenant: String,
-    default: StorageBackend,
-    /// For each metric, the ordered list of targets the HTTP handler
-    /// walks to pick a backend. v6.1 single-target rows come in as a
-    /// single-element vec with `applies_to_query_shape: None`.
-    metrics: HashMap<String, Vec<RoutingTarget>>,
-}
-
-impl BackendStorageRouting {
-    /// Build an empty router — every metric resolves to
-    /// `SketchStore`. Equivalent to "no routing config at all" and
-    /// preserves pre-Phase-5 dispatch (`ASAPQueryEngine` direct path).
-    /// Scoped to the [`DEFAULT_TENANT`] tenant.
-    pub fn empty() -> Self {
-        Self {
-            tenant: DEFAULT_TENANT.to_string(),
-            default: StorageBackend::default(),
-            metrics: HashMap::new(),
-        }
-    }
-
-    /// Build an empty router scoped to a specific tenant. Used by
-    /// per-tenant hot-reload to bootstrap a tenant slot before its
-    /// first push lands.
-    pub fn empty_for_tenant(tenant: impl Into<String>) -> Self {
-        Self {
-            tenant: tenant.into(),
-            default: StorageBackend::default(),
-            metrics: HashMap::new(),
-        }
-    }
-
-    /// Construct directly from an explicit map. Used by tests; production
-    /// callers go through [`Self::from_yaml_file`]. Scoped to the
-    /// [`DEFAULT_TENANT`] tenant — use [`Self::with_tenant`] to
-    /// re-scope.
-    pub fn new(default: StorageBackend, metrics: HashMap<String, Vec<RoutingTarget>>) -> Self {
-        Self {
-            tenant: DEFAULT_TENANT.to_string(),
-            default,
-            metrics,
-        }
-    }
-
-    #[cfg(test)]
-    /// Return a copy of this routing table re-scoped to `tenant`.
-    /// Used by tests / per-tenant hot-reload to retag a table built
-    /// from a tenant-agnostic JSON / YAML payload.
-    pub fn with_tenant(mut self, tenant: impl Into<String>) -> Self {
-        self.tenant = tenant.into();
-        self
-    }
-
-    /// Read-only view of the tenant id this routing table services.
-    pub fn tenant(&self) -> &str {
-        &self.tenant
-    }
-
-    /// Construct from the v6.1 single-target map shape. Each entry
-    /// maps to a single-target list with no query-shape filter.
-    /// Preserved for tests and existing call sites; new code should
-    /// use [`Self::new`] with explicit `RoutingTarget`s.
-    pub fn new_from_single_targets(
-        default: StorageBackend,
-        metrics: HashMap<String, StorageBackend>,
-    ) -> Self {
-        let metrics = metrics
-            .into_iter()
-            .map(|(k, v)| (k, vec![RoutingTarget::always(v)]))
-            .collect();
-        Self {
-            tenant: DEFAULT_TENANT.to_string(),
-            default,
-            metrics,
-        }
-    }
-
-    /// Parse YAML text. See module docs for the schema.
-    pub fn from_yaml_str(text: &str) -> Result<Self> {
-        let parsed: BackendStorageRoutingYaml =
-            serde_yaml::from_str(text).context("failed to parse backend-storage-routing YAML")?;
-
-        // Start from the v6.1 single-target map.
-        let mut metrics: HashMap<String, Vec<RoutingTarget>> = parsed
-            .metrics
-            .into_iter()
-            .map(|(k, v)| (k, vec![RoutingTarget::always(v)]))
-            .collect();
-
-        // Overlay v7 multi-target rows. A metric in BOTH wins from
-        // `routes:` (multi-target overrides single-target).
-        for row in parsed.routes {
-            if row.targets.is_empty() {
-                anyhow::bail!(
-                    "backend-storage-routing: metric '{}' has empty targets list",
-                    row.metric,
-                );
-            }
-            let targets = row
-                .targets
-                .into_iter()
-                .map(|t| RoutingTarget {
-                    backend: t.backend,
-                    applies_to_query_shape: t.applies_to_query_shape,
-                })
-                .collect();
-            metrics.insert(row.metric, targets);
-        }
-
-        Ok(Self {
-            tenant: parsed.tenant.unwrap_or_else(|| DEFAULT_TENANT.to_string()),
-            default: parsed.default,
-            metrics,
-        })
-    }
-
-    /// Read + parse a YAML file. Returns the populated router on
-    /// success. The caller is expected to log the entry count at
-    /// startup so operators can spot-check the deployment.
-    pub fn from_yaml_file(path: &Path) -> Result<Self> {
-        let text = std::fs::read_to_string(path)
-            .with_context(|| format!("failed to read backend-storage-routing YAML: {:?}", path))?;
-        let routing = Self::from_yaml_str(&text)?;
-        info!(
-            path = %path.display(),
-            default = ?routing.default,
-            entries = routing.metrics.len(),
-            multi_target_entries = routing.metrics.values().filter(|t| t.len() > 1).count(),
-            "Loaded backend-storage-routing YAML",
-        );
-        Ok(routing)
-    }
-
-    /// parse a control-plane-emitted JSON document into a
-    /// fresh routing table. The schema mirrors
-    /// `control_plane/src/emit/stage_config.rs::emit_backend_storage_routing`:
-    ///
-    /// ```json
-    /// {
-    ///   "default_engine": "asap_query",
-    ///   "metrics": [
-    ///     { "name": "http_requests_total",
-    ///       "targets": [
-    ///         { "engine": "asap_query" },
-    ///         { "engine": "prometheus_remote",
-    ///           "applies_to_query_shape": ["count", "topk", "rate_post_hoc",
-    ///                                      "histogram_quantile", "delta", "absent"] }
-    ///       ]
-    ///     }
-    ///   ]
-    /// }
-    /// ```
-    ///
-    /// Engine-name compatibility (control plane → backend `StorageBackend`):
-    ///
-    /// * `asap_query` → `SketchStore`
-    /// * `double_write` → `DoubleWrite`
-    /// * `prometheus_remote` → `PrometheusRemote`
-    ///
-    /// `thanos_query` is no longer accepted: #746 deleted the archive tier,
-    /// so a plan naming it is rejected like any other unknown engine.
-    ///
-    /// Unknown query-shape strings are mapped to [`QueryOperatorShape::Other`]
-    /// rather than failing the parse — the control plane's vocabulary may
-    /// drift forward of the backend's. Empty `targets` arrays are
-    /// rejected (same contract as `from_yaml_str`).
-    ///
-    /// Side fields (e.g. `asap_tier_native_shapes`) the control plane emits
-    /// for operator inspection are ignored — the JSON parser pulls only
-    /// `default_engine` and `metrics:[...]`.
-    pub fn from_json_payload(value: &JsonValue) -> Result<Self> {
-        let tenant = value
-            .get("tenant")
-            .and_then(|v| v.as_str())
-            .map(|s| s.to_string())
-            .unwrap_or_else(|| DEFAULT_TENANT.to_string());
-        let default_engine = value
-            .get("default_engine")
-            .and_then(|v| v.as_str())
-            .unwrap_or("asap_query");
-        let default = parse_engine_string(default_engine).with_context(|| {
-            format!(
-                "backend-storage-routing JSON: invalid default_engine '{}'",
-                default_engine
-            )
-        })?;
-
-        let metrics_arr = value
-            .get("metrics")
-            .and_then(|v| v.as_array())
-            .ok_or_else(|| {
-                anyhow::anyhow!("backend-storage-routing JSON: missing 'metrics' array")
-            })?;
-
-        let mut metrics: HashMap<String, Vec<RoutingTarget>> = HashMap::new();
-        for (i, entry) in metrics_arr.iter().enumerate() {
-            let name = entry
-                .get("name")
-                .and_then(|v| v.as_str())
-                .ok_or_else(|| {
-                    anyhow::anyhow!(
-                        "backend-storage-routing JSON: metrics[{}] missing 'name'",
-                        i
-                    )
-                })?
-                .to_string();
-            let targets_arr = entry
-                .get("targets")
-                .and_then(|v| v.as_array())
-                .ok_or_else(|| {
-                    anyhow::anyhow!(
-                        "backend-storage-routing JSON: metric '{}' missing 'targets' array",
-                        name,
-                    )
-                })?;
-            if targets_arr.is_empty() {
-                anyhow::bail!(
-                    "backend-storage-routing JSON: metric '{}' has empty targets list",
-                    name,
-                );
-            }
-            let mut targets: Vec<RoutingTarget> = Vec::with_capacity(targets_arr.len());
-            for (j, t) in targets_arr.iter().enumerate() {
-                let engine_str = t.get("engine").and_then(|v| v.as_str()).ok_or_else(|| {
-                    anyhow::anyhow!(
-                        "backend-storage-routing JSON: metric '{}' targets[{}] missing 'engine'",
-                        name,
-                        j,
-                    )
-                })?;
-                let backend = parse_engine_string(engine_str).with_context(|| {
-                    format!(
-                        "backend-storage-routing JSON: metric '{}' targets[{}] invalid engine '{}'",
-                        name, j, engine_str,
-                    )
-                })?;
-                let applies_to_query_shape = t
-                    .get("applies_to_query_shape")
-                    .and_then(|v| v.as_array())
-                    .map(|arr| {
-                        arr.iter()
-                            .filter_map(|s| s.as_str())
-                            .map(parse_query_shape_string)
-                            .collect::<Vec<_>>()
-                    });
-                targets.push(RoutingTarget {
-                    backend,
-                    applies_to_query_shape,
-                });
-            }
-            metrics.insert(name, targets);
-        }
-
-        Ok(Self {
-            tenant,
-            default,
-            metrics,
-        })
-    }
-
-    /// Atomically replace this routing table's contents with `new_table`.
-    /// Used by the `POST /api/v1/storage_routing` swap handler — the
-    /// HTTP layer wraps the table in `arc_swap::ArcSwap` so the swap is
-    /// observed atomically by all in-flight queries; this method is the
-    /// in-place form that callers without an `ArcSwap` wrapper can use
-    /// (e.g. tests, single-threaded shadow-mode evaluation). Production
-    /// deployments should go through [`HotReloadBackendStorageRouting`]
-    /// instead.
-    pub fn replace(&mut self, new_table: BackendStorageRouting) {
-        let added = new_table.metrics.len();
-        let removed = self.metrics.len();
-        *self = new_table;
-        info!(
-            added,
-            removed,
-            new_default = ?self.default,
-            "BackendStorageRouting: replaced (in-place)",
-        );
-    }
-
-    /// Look up the storage backend for `metric_name`, ignoring query
-    /// shape. Walks the metric's target list and returns the first
-    /// target's backend (the v6.1 default-target slot). Falls back
-    /// to the table's `default` when the metric is not listed.
-    ///
-    /// Exists for v6.1 callers that haven't been threaded with a
-    /// parsed PromQL query. New code on the dual-routing path
-    /// should call [`Self::lookup_with_shape`].
-    pub fn lookup(&self, metric_name: &str) -> StorageBackend {
-        match self.metrics.get(metric_name) {
-            Some(targets) => {
-                let backend = targets.first().map(|t| t.backend).unwrap_or(self.default);
-                debug!(
-                    metric = metric_name,
-                    backend = ?backend,
-                    target_count = targets.len(),
-                    "backend-storage-routing: lookup (no shape) — picked first target",
-                );
-                backend
-            }
-            None => {
-                debug!(
-                    metric = metric_name,
-                    default = ?self.default,
-                    "backend-storage-routing: no override, using default",
-                );
-                self.default
-            }
-        }
-    }
-
-    /// Look up the storage backend for `(metric_name, query_shape)`.
-    ///
-    /// Walks the metric's target list and returns the backend of the
-    /// first target whose `applies_to_query_shape` either is `None`
-    /// (default) or contains `shape`. If no target matches (empty
-    /// or all filters miss), returns the first target's backend
-    /// (matches v6.1's single-target semantics for the default
-    /// slot). Falls back to `self.default` when the metric is not
-    /// listed.
-    ///
-    /// Selection ordering: v7 puts the *default* target (no filter)
-    /// first in the YAML, then the shape-specific overrides; this
-    /// matches v6.1 behaviour for callers that don't supply a
-    /// shape, but lets shape-specific lookups skip past the default
-    /// slot if any later target's filter matches `shape`. The
-    /// implementation walks the list in two passes:
-    ///   1. First, prefer a target whose filter explicitly includes
-    ///      `shape` — this lets a `[count, topk, rate_post_hoc]`
-    ///      target win over the default ASAP-tier slot for those
-    ///      shapes.
-    ///   2. If no shape-specific target matches, fall back to the
-    ///      first target with `applies_to_query_shape: None`
-    ///      (the default slot).
-    ///   3. If even that's missing, use the first target.
-    pub fn lookup_with_shape(
-        &self,
-        metric_name: &str,
-        shape: QueryOperatorShape,
-    ) -> StorageBackend {
-        match self.metrics.get(metric_name) {
-            Some(targets) => {
-                // Pass 1: explicit shape match.
-                for t in targets {
-                    if let Some(list) = &t.applies_to_query_shape {
-                        if list.contains(&shape) {
-                            debug!(
-                                metric = metric_name,
-                                shape = ?shape,
-                                backend = ?t.backend,
-                                "backend-storage-routing: shape-specific match",
-                            );
-                            return t.backend;
-                        }
-                    }
-                }
-                // Pass 2: default slot.
-                for t in targets {
-                    if t.applies_to_query_shape.is_none() {
-                        debug!(
-                            metric = metric_name,
-                            shape = ?shape,
-                            backend = ?t.backend,
-                            "backend-storage-routing: default-slot fallback",
-                        );
-                        return t.backend;
-                    }
-                }
-                // Pass 3: the first target, regardless of filter
-                // (only reachable when the metric only has
-                // shape-specific targets and none matched).
-                let backend = targets.first().map(|t| t.backend).unwrap_or(self.default);
-                debug!(
-                    metric = metric_name,
-                    shape = ?shape,
-                    backend = ?backend,
-                    "backend-storage-routing: no match; first-target fallback",
-                );
-                backend
-            }
-            None => {
-                debug!(
-                    metric = metric_name,
-                    shape = ?shape,
-                    default = ?self.default,
-                    "backend-storage-routing: metric unlisted, using default",
-                );
-                self.default
-            }
-        }
-    }
-
-    /// Read-only view of the configured default. Tests use this; the
-    /// HTTP handler goes through `lookup` / `lookup_with_shape`.
-    pub fn default_backend(&self) -> StorageBackend {
-        self.default
-    }
-
-    /// Number of explicit per-metric overrides. Tests / operator
-    /// tooling.
-    pub fn len(&self) -> usize {
-        self.metrics.len()
-    }
-
-    /// `true` iff no per-metric overrides are configured. Equivalent to
-    /// `Self::empty()` but preserves a custom `default`.
-    pub fn is_empty(&self) -> bool {
-        self.metrics.is_empty()
-    }
-
-    /// Number of targets registered for `metric_name`. Returns 0 for
-    /// unlisted metrics. Tests use this to assert dual-routing is
-    /// wired correctly.
-    pub fn target_count(&self, metric_name: &str) -> usize {
-        self.metrics.get(metric_name).map(|t| t.len()).unwrap_or(0)
-    }
-}
-
-impl Default for BackendStorageRouting {
-    fn default() -> Self {
-        Self::empty()
-    }
-}
-
-/// Map a JSON `engine` string into a backend `StorageBackend` variant.
-/// `thanos_query` is rejected since #746 removed the archive tier.
-/// `unknown_engine` returns an error so a typo doesn't silently turn
-/// into a default-routing footgun.
-fn parse_engine_string(s: &str) -> Result<StorageBackend> {
-    parse_storage_backend_engine_id(s).ok_or_else(|| {
-        anyhow::anyhow!(
-            "unknown engine '{}': expected one of [{}]",
-            s,
-            CANONICAL_QUERY_ENGINE_IDS.join(", "),
-        )
-    })
-}
-
-/// Map a JSON `applies_to_query_shape` string into a backend
-/// `QueryOperatorShape`. Unknown shapes are mapped to [`QueryOperatorShape::Other`] —
-/// the control plane's vocabulary may emit shape names a backend revision
-/// doesn't yet understand, and `Other` is the safe fall-through (the
-/// archive's claim list typically includes `Other` so unknowns still
-/// route to the archive).
-fn parse_query_shape_string(s: &str) -> QueryOperatorShape {
-    match s {
-        "count" => QueryOperatorShape::Count,
-        "topk" => QueryOperatorShape::Topk,
-        "rate_post_hoc" | "rate" | "irate" => QueryOperatorShape::RatePostHoc,
-        "quantile" | "quantile_over_time" => QueryOperatorShape::Quantile,
-        "sum" | "sum_over_time" => QueryOperatorShape::Sum,
-        "last_over_time" => QueryOperatorShape::LastOverTime,
-        "histogram_quantile" => QueryOperatorShape::HistogramQuantile,
-        "delta" | "increase" => QueryOperatorShape::Delta,
-        "deriv" => QueryOperatorShape::Deriv,
-        "absent" | "absent_over_time" => QueryOperatorShape::Absent,
-        _ => QueryOperatorShape::Other,
-    }
-}
-
-/// Compute a stable, short hash of a `BackendStorageRouting` table for
-/// the swap handler's response. The control plane uses this to verify the
-/// backend installed exactly the bytes it pushed (cheap drift check on
-/// every plan emit).
-///
-/// The hash is computed over the routing table's data fields — default
-/// + sorted metric → sorted target list. We sort to make the hash
-/// reproducible across `HashMap` iteration orders.
-pub fn routing_table_hash(table: &BackendStorageRouting) -> String {
-    use std::collections::hash_map::DefaultHasher;
-    use std::hash::{Hash, Hasher};
-
-    let mut h = DefaultHasher::new();
-    // Default tag.
-    table.default.data_source_id().hash(&mut h);
-    // Sort metric names for determinism.
-    let mut names: Vec<&String> = table.metrics.keys().collect();
-    names.sort();
-    for name in names {
-        name.hash(&mut h);
-        let targets = &table.metrics[name];
-        for t in targets {
-            t.backend.data_source_id().hash(&mut h);
-            if let Some(shapes) = &t.applies_to_query_shape {
-                for s in shapes {
-                    s.as_str().hash(&mut h);
-                }
-                "}".hash(&mut h);
-            } else {
-                "*".hash(&mut h);
-            }
-        }
-    }
-    format!("{:016x}", h.finish())
-}
-
-// ---------------------------------------------------------------------------
-// HotReloadBackendStorageRouting — atomic-swap wrapper
-// ---------------------------------------------------------------------------
-
-/// Per-tenant atomic-swap wrapper around `BackendStorageRouting`,
-/// mirroring [`crate::storage_engines::types::InstalledPrecomputePlanHandle`]. Lets the
-/// `POST /api/v1/storage_routing` HTTP handler swap one tenant's table
-/// at runtime without restarting the backend or touching any other
-/// tenant's table. Cloneable; clones share the underlying `ArcSwap` so
-/// all holders see the same swaps.
-///
-/// ## Multi-tenant model
-///
-/// Internally holds a `HashMap<tenant_id, Arc<BackendStorageRouting>>`
-/// behind a single `ArcSwap`. The HTTP layer reads the
-/// `X-ASAP-Tenant` header off each request (default
-/// [`DEFAULT_TENANT`]) and snapshots that tenant's table; the request
-/// path falls back to the [`DEFAULT_TENANT`] table when the requested
-/// tenant has no entry. Per-tenant push is a copy-on-write swap — the
-/// writer clones the current map, replaces only the named tenant's
-/// entry, and CASes the new map in. Other tenants' tables are
-/// unaffected.
-///
-/// ## Read path
-///
-/// HTTP query handler calls [`Self::snapshot_for_tenant`] once per
-/// request with the tenant id from the header. Returns a stable
-/// `Arc<BackendStorageRouting>` the handler can call
-/// `lookup_with_shape` on. The snapshot is cheap (single atomic load
-/// + map clone of the relevant `Arc`) and lock-free; concurrent swaps
-/// don't block readers.
-///
-/// ## Write path
-///
-/// The swap handler calls [`Self::swap_tenant`] with the tenant id
-/// and the new table parsed from the control plane's JSON. The previous
-/// `Arc` is dropped when the last in-flight reader goes out of scope.
-///
-/// ## Bootstrap
-///
-/// Built at backend startup from either:
-/// * `Self::from_arc(initial)` — install a single-tenant
-///   `DEFAULT_TENANT` table loaded from
-///   `deploy/configs/backend-storage-routing.yaml` (legacy
-///   bootstrap; preserved for dev / standalone deployments).
-/// * `Self::empty()` — start with an empty table; the control plane's
-///   first push fills it.
-#[derive(Clone)]
-pub struct HotReloadBackendStorageRouting {
-    /// Map keyed by tenant id. Wrapped in `Arc<HashMap>` so swaps can
-    /// publish a fresh map atomically; readers snapshot the whole map
-    /// once and pick the tenant's `Arc<BackendStorageRouting>`.
-    inner:
-        std::sync::Arc<arc_swap::ArcSwap<HashMap<String, std::sync::Arc<BackendStorageRouting>>>>,
-    active: Option<crate::storage_engines::types::ActivePhysicalPlanHandle>,
-}
-
-impl HotReloadBackendStorageRouting {
-    /// Construct with a single-tenant initial routing table. The
-    /// table's `tenant` field decides the map key; existing
-    /// single-tenant call sites that pass a `BackendStorageRouting`
-    /// built from `empty()` / `from_yaml_*` get
-    /// [`DEFAULT_TENANT`] semantics for free.
-    pub fn new(initial: BackendStorageRouting) -> Self {
-        let mut map: HashMap<String, std::sync::Arc<BackendStorageRouting>> = HashMap::new();
-        map.insert(initial.tenant.clone(), std::sync::Arc::new(initial));
-        Self {
-            inner: std::sync::Arc::new(arc_swap::ArcSwap::new(std::sync::Arc::new(map))),
-            active: None,
-        }
-    }
-
-    /// Construct with an empty table — every tenant resolves to a
-    /// freshly-allocated empty `BackendStorageRouting` until the
-    /// first push lands. Specifically, the [`DEFAULT_TENANT`]
-    /// entry is pre-populated with an empty table so single-tenant
-    /// deploys never see a "tenant unknown" miss before the first
-    /// control plane push.
-    pub fn empty() -> Self {
-        Self::new(BackendStorageRouting::empty())
-    }
-
-    /// Construct from a pre-built `Arc<BackendStorageRouting>` —
-    /// avoids a redundant clone when the caller already holds one.
-    /// The resulting wrapper has exactly one tenant entry, keyed by
-    /// the table's [`BackendStorageRouting::tenant`] field.
-    pub fn from_arc(initial: std::sync::Arc<BackendStorageRouting>) -> Self {
-        let mut map: HashMap<String, std::sync::Arc<BackendStorageRouting>> = HashMap::new();
-        map.insert(initial.tenant.clone(), initial);
-        Self {
-            inner: std::sync::Arc::new(arc_swap::ArcSwap::new(std::sync::Arc::new(map))),
-            active: None,
-        }
-    }
-
-    pub fn from_active(active: crate::storage_engines::types::ActivePhysicalPlanHandle) -> Self {
-        let initial = active.active_snapshot().storage_routing.clone();
-        let mut map = HashMap::new();
-        map.insert(initial.tenant().to_string(), initial);
-        Self {
-            inner: std::sync::Arc::new(arc_swap::ArcSwap::new(std::sync::Arc::new(map))),
-            active: Some(active),
-        }
-    }
-
-    /// Cheap, cloneable snapshot of the [`DEFAULT_TENANT`] tenant's
-    /// table — the single-tenant convenience accessor. Stable for the
-    /// caller's lifetime; concurrent swaps don't invalidate it.
-    /// Returns an empty default-tenant table when no entry exists
-    /// (preserves the original `snapshot()` contract for callers
-    /// that haven't been threaded with a tenant id yet).
-    pub fn snapshot(&self) -> std::sync::Arc<BackendStorageRouting> {
-        self.snapshot_for_tenant(DEFAULT_TENANT)
-    }
-
-    /// Cheap, cloneable snapshot of the named tenant's routing table.
-    /// Falls back to the [`DEFAULT_TENANT`] table when the named
-    /// tenant has no entry; falls back to a freshly-allocated empty
-    /// table when even the default tenant is missing. Stable for the
-    /// caller's lifetime; concurrent swaps don't invalidate it.
-    pub fn snapshot_for_tenant(&self, tenant: &str) -> std::sync::Arc<BackendStorageRouting> {
-        if let Some(active) = &self.active {
-            let routing = active.active_snapshot().storage_routing.clone();
-            if routing.tenant() == tenant || tenant == DEFAULT_TENANT {
-                return routing;
-            }
-        }
-        let map = self.inner.load_full();
-        if let Some(t) = map.get(tenant) {
-            return t.clone();
-        }
-        if let Some(t) = map.get(DEFAULT_TENANT) {
-            debug!(
-                requested = tenant,
-                "backend-storage-routing: tenant not found, falling back to default tenant",
-            );
-            return t.clone();
-        }
-        debug!(
-            requested = tenant,
-            "backend-storage-routing: tenant not found and no default tenant entry; \
-             returning fresh empty table",
-        );
-        std::sync::Arc::new(BackendStorageRouting::empty())
-    }
-
-    /// Atomically replace the [`DEFAULT_TENANT`] tenant's table —
-    /// the single-tenant convenience accessor. Returns the `Arc`
-    /// that was just replaced (or `None` when no prior entry
-    /// existed) for callers that want to log the diff.
-    pub fn swap(&self, new: BackendStorageRouting) -> std::sync::Arc<BackendStorageRouting> {
-        // Preserve the original return type (always returns the
-        // previous Arc, fabricating an empty one when none existed)
-        // so callers depending on the old contract don't break.
-        let tenant = new.tenant.clone();
-        match self.swap_tenant(&tenant, new) {
-            Some(prev) => prev,
-            None => std::sync::Arc::new(BackendStorageRouting::empty_for_tenant(tenant)),
-        }
-    }
-
-    /// Atomically replace only the named tenant's table, leaving
-    /// every other tenant's table unchanged. Returns the previous
-    /// `Arc` for that tenant (or `None` if the tenant had no prior
-    /// entry). The new table's `tenant` field is overwritten with
-    /// the `tenant` argument so the map key and table-internal
-    /// tenant id are guaranteed to agree.
-    pub fn swap_tenant(
-        &self,
-        tenant: &str,
-        mut new: BackendStorageRouting,
-    ) -> Option<std::sync::Arc<BackendStorageRouting>> {
-        new.tenant = tenant.to_string();
-        let new_arc = std::sync::Arc::new(new);
-        // CAS-loop over the ArcSwap so concurrent per-tenant pushes
-        // for *different* tenants don't lose updates.
-        loop {
-            let cur = self.inner.load_full();
-            let mut next: HashMap<String, std::sync::Arc<BackendStorageRouting>> = (*cur).clone();
-            let prev = next.insert(tenant.to_string(), new_arc.clone());
-            let next_arc = std::sync::Arc::new(next);
-            // `compare_and_swap` returns the value that was actually
-            // stored before the attempt — equality with `cur`
-            // (Arc-pointer-eq) means our swap won.
-            let observed = self.inner.compare_and_swap(&cur, next_arc);
-            if std::sync::Arc::ptr_eq(&observed, &cur) {
-                return prev;
-            }
-            // Another writer beat us; retry with the new map.
-        }
-    }
-
-    /// Read-only iterator over all tenant ids currently registered
-    /// in the wrapper. Used by operator diagnostics / tests; the
-    /// HTTP read-path does not iterate.
-    pub fn tenant_ids(&self) -> Vec<String> {
-        let map = self.inner.load_full();
-        let mut ids: Vec<String> = map.keys().cloned().collect();
-        ids.sort();
-        ids
-    }
-}
-
-impl std::fmt::Debug for HotReloadBackendStorageRouting {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        let map = self.inner.load_full();
-        let total_entries: usize = map.values().map(|t| t.metrics.len()).sum();
-        f.debug_struct("HotReloadBackendStorageRouting")
-            .field("tenants", &map.len())
-            .field("total_entries", &total_entries)
-            .finish()
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    #[test]
-    fn empty_router_routes_everything_to_asap_tier() {
-        let r = BackendStorageRouting::empty();
-        assert_eq!(r.lookup("anything"), StorageBackend::SketchStore);
-        assert_eq!(r.lookup("http_requests_total"), StorageBackend::SketchStore);
-        assert_eq!(
-            r.lookup_with_shape("anything", QueryOperatorShape::Count),
-            StorageBackend::SketchStore
-        );
-    }
-
-    #[test]
-    fn yaml_with_per_metric_override_routes_correctly_v6_1_form() {
-        // v6.1 form: `metrics:` map. Each value is a single backend.
-        let yaml = r#"
-default: sketch_store
-metrics:
-  http_requests_total: double_write
-  audit_events: double_write
-"#;
-        let r = BackendStorageRouting::from_yaml_str(yaml).expect("parse");
-        assert_eq!(r.lookup("http_requests_total"), StorageBackend::DoubleWrite);
-        assert_eq!(r.lookup("audit_events"), StorageBackend::DoubleWrite);
-        assert_eq!(r.lookup("unlisted"), StorageBackend::SketchStore);
-        assert_eq!(r.len(), 2);
-    }
-
-    #[test]
-    fn yaml_default_only_routes_all_metrics_to_default() {
-        let yaml = "default: double_write\n";
-        let r = BackendStorageRouting::from_yaml_str(yaml).expect("parse");
-        assert_eq!(r.lookup("anything"), StorageBackend::DoubleWrite);
-        assert!(r.is_empty());
-        assert_eq!(r.default_backend(), StorageBackend::DoubleWrite);
-    }
-
-    #[test]
-    fn yaml_omitted_default_falls_back_to_asap_query() {
-        let yaml = "metrics:\n  foo: double_write\n";
-        let r = BackendStorageRouting::from_yaml_str(yaml).expect("parse");
-        assert_eq!(r.lookup("foo"), StorageBackend::DoubleWrite);
-        assert_eq!(r.lookup("bar"), StorageBackend::SketchStore);
-    }
-
-    #[test]
-    fn empty_yaml_is_valid_and_empty() {
-        let r = BackendStorageRouting::from_yaml_str("").expect("empty parse");
-        assert_eq!(r.lookup("foo"), StorageBackend::SketchStore);
-        assert!(r.is_empty());
-    }
-
-    #[test]
-    fn invalid_yaml_returns_error() {
-        let yaml = "metrics: not-a-map\n";
-        assert!(BackendStorageRouting::from_yaml_str(yaml).is_err());
-    }
-
-    // ── v7 dual-routing tests ──────────────────────────────────────────
-
-    #[test]
-    fn yaml_v7_multi_target_routes_count_to_archive_quantile_to_warm() {
-        // v7 form: `routes:` list. http_requests_total has TWO
-        // targets — the default ASAP-tier slot and a cold-archive
-        // slot scoped to count/topk/rate_post_hoc.
-        let yaml = r#"
-default: sketch_store
-routes:
-  - metric: http_requests_total
-    targets:
-      - backend: sketch_store
-      - backend: double_write
-        applies_to_query_shape: [count, topk, rate_post_hoc]
-  - metric: http_freshness_probe_warm
-    targets:
-      - backend: sketch_store
-  - metric: http_freshness_probe_archive
-    targets:
-      - backend: double_write
-"#;
-        let r = BackendStorageRouting::from_yaml_str(yaml).expect("parse");
-
-        // Count + topk + rate_post_hoc → archive.
-        assert_eq!(
-            r.lookup_with_shape("http_requests_total", QueryOperatorShape::Count),
-            StorageBackend::DoubleWrite,
-        );
-        assert_eq!(
-            r.lookup_with_shape("http_requests_total", QueryOperatorShape::Topk),
-            StorageBackend::DoubleWrite,
-        );
-        assert_eq!(
-            r.lookup_with_shape("http_requests_total", QueryOperatorShape::RatePostHoc),
-            StorageBackend::DoubleWrite,
-        );
-
-        // Quantile + sum_over_time + everything else → warm.
-        assert_eq!(
-            r.lookup_with_shape("http_requests_total", QueryOperatorShape::Quantile),
-            StorageBackend::SketchStore,
-        );
-        assert_eq!(
-            r.lookup_with_shape("http_requests_total", QueryOperatorShape::Sum),
-            StorageBackend::SketchStore,
-        );
-        assert_eq!(
-            r.lookup_with_shape("http_requests_total", QueryOperatorShape::Other),
-            StorageBackend::SketchStore,
-        );
-
-        // Single-target metrics keep v6.1 semantics regardless of shape.
-        assert_eq!(
-            r.lookup_with_shape(
-                "http_freshness_probe_warm",
-                QueryOperatorShape::LastOverTime
-            ),
-            StorageBackend::SketchStore,
-        );
-        assert_eq!(
-            r.lookup_with_shape(
-                "http_freshness_probe_archive",
-                QueryOperatorShape::LastOverTime
-            ),
-            StorageBackend::DoubleWrite,
-        );
-    }
-
-    #[test]
-    fn yaml_v6_1_single_target_keeps_old_semantics_under_lookup_with_shape() {
-        // A v6.1 entry with no targets list — every shape resolves
-        // to the same backend (no dual-routing).
-        let yaml = r#"
-metrics:
-  audit_events: double_write
-"#;
-        let r = BackendStorageRouting::from_yaml_str(yaml).expect("parse");
-        for shape in [
-            QueryOperatorShape::Count,
-            QueryOperatorShape::Topk,
-            QueryOperatorShape::Quantile,
-            QueryOperatorShape::Sum,
-            QueryOperatorShape::Other,
-        ] {
-            assert_eq!(
-                r.lookup_with_shape("audit_events", shape),
-                StorageBackend::DoubleWrite,
-                "shape={shape:?} must resolve to double_write (single-target)",
-            );
-        }
-    }
-
-    #[test]
-    fn yaml_mixed_metrics_and_routes_routes_wins() {
-        // Both `metrics:` and `routes:` populated; a metric in BOTH
-        // wins from `routes:` (multi-target overrides single-target).
-        let yaml = r#"
-default: sketch_store
-metrics:
-  http_requests_total: double_write
-routes:
-  - metric: http_requests_total
-    targets:
-      - backend: sketch_store
-      - backend: double_write
-        applies_to_query_shape: [count]
-"#;
-        let r = BackendStorageRouting::from_yaml_str(yaml).expect("parse");
-        // Default slot (warm) wins for non-count shapes.
-        assert_eq!(
-            r.lookup_with_shape("http_requests_total", QueryOperatorShape::Quantile),
-            StorageBackend::SketchStore,
-        );
-        // Count → archive.
-        assert_eq!(
-            r.lookup_with_shape("http_requests_total", QueryOperatorShape::Count),
-            StorageBackend::DoubleWrite,
-        );
-        // The `metrics:` entry was overridden by the multi-target
-        // `routes:` entry (the single-target archive vanished).
-        assert_eq!(r.target_count("http_requests_total"), 2);
-    }
-
-    #[test]
-    fn empty_targets_list_is_a_parse_error() {
-        let yaml = r#"
-routes:
-  - metric: http_requests_total
-    targets: []
-"#;
-        let err = BackendStorageRouting::from_yaml_str(yaml).expect_err("must reject empty list");
-        assert!(err.to_string().contains("empty targets"));
-    }
-
-    #[test]
-    fn lookup_falls_back_to_first_target_when_no_shape_matches() {
-        // Manually-built entry where every target has a filter and
-        // none matches `Quantile`. The lookup must return *some*
-        // backend rather than panic.
-        let mut metrics = HashMap::new();
-        metrics.insert(
-            "x".to_string(),
-            vec![
-                RoutingTarget::for_shapes(
-                    StorageBackend::DoubleWrite,
-                    vec![QueryOperatorShape::Count],
-                ),
-                RoutingTarget::for_shapes(
-                    StorageBackend::SketchStore,
-                    vec![QueryOperatorShape::Topk],
-                ),
-            ],
-        );
-        let r = BackendStorageRouting::new(StorageBackend::SketchStore, metrics);
-        // No filter matches `Quantile`; must return the first target's
-        // backend.
-        assert_eq!(
-            r.lookup_with_shape("x", QueryOperatorShape::Quantile),
-            StorageBackend::DoubleWrite,
-        );
-    }
-
-    // ── classify_query_shape unit tests ────────────────────────────────
-
-    fn parse(query: &str) -> promql_parser::parser::Expr {
-        promql_parser::parser::parse(query).expect("parse")
-    }
-
-    #[test]
-    fn classifies_count_aggregate_as_count() {
-        let e = parse("count(http_requests_total{service=\"payments\"})");
-        assert_eq!(classify_query_shape(&e), QueryOperatorShape::Count);
-    }
-
-    #[test]
-    fn classifies_topk_as_topk() {
-        let e = parse("topk(5, sum by (zone) (rate(http_requests_total[5m])))");
-        assert_eq!(classify_query_shape(&e), QueryOperatorShape::Topk);
-    }
-
-    #[test]
-    fn classifies_rate_call_as_rate_post_hoc() {
-        let e = parse("rate(http_requests_total[5m])");
-        assert_eq!(classify_query_shape(&e), QueryOperatorShape::RatePostHoc);
-    }
-
-    #[test]
-    fn classifies_sum_by_rate_as_rate_post_hoc() {
-        // `sum by (zone) (rate(...))` — the inner rate makes this
-        // post-hoc, the outer sum doesn't change that.
-        let e = parse("sum by (zone) (rate(http_requests_total[5m]))");
-        assert_eq!(classify_query_shape(&e), QueryOperatorShape::RatePostHoc);
-    }
-
-    #[test]
-    fn classifies_quantile_over_time_as_quantile() {
-        let e = parse("quantile_over_time(0.99, http_requests_total_latency_ms[1m])");
-        assert_eq!(classify_query_shape(&e), QueryOperatorShape::Quantile);
-    }
-
-    #[test]
-    fn classifies_sum_by_as_sum() {
-        let e = parse("sum by (zone) (http_requests_total)");
-        assert_eq!(classify_query_shape(&e), QueryOperatorShape::Sum);
-    }
-
-    #[test]
-    fn classifies_sum_over_time_as_sum() {
-        let e = parse("sum_over_time(http_requests_total[1m])");
-        assert_eq!(classify_query_shape(&e), QueryOperatorShape::Sum);
-    }
-
-    #[test]
-    fn classifies_last_over_time_as_last_over_time() {
-        let e = parse("last_over_time(http_freshness_probe_warm[10s])");
-        assert_eq!(classify_query_shape(&e), QueryOperatorShape::LastOverTime);
-    }
-
-    #[test]
-    fn classifies_bare_selector_as_other() {
-        let e = parse("http_requests_total");
-        assert_eq!(classify_query_shape(&e), QueryOperatorShape::Other);
-    }
-
-    // ── from_json_payload + replace + hot-reload tests ────────
-
-    fn fixture_json() -> serde_json::Value {
-        serde_json::json!({
-            "default_engine": "asap_query",
-            "metrics": [
-                {
-                    "name": "http_requests_total",
-                    "targets": [
-                        { "engine": "asap_query" },
-                        {
-                            "engine": "double_write",
-                            "applies_to_query_shape": [
-                                "histogram_quantile", "delta", "deriv",
-                                "absent", "rate_post_hoc", "count"
-                            ]
-                        }
-                    ],
-                    "asap_tier_native_shapes": ["topk", "rate", "sum"]
-                },
-                {
-                    "name": "request_latency_seconds",
-                    "targets": [
-                        { "engine": "asap_query" },
-                        {
-                            "engine": "double_write",
-                            "applies_to_query_shape": [
-                                "histogram_quantile", "delta", "absent",
-                                "rate_post_hoc", "topk", "count"
-                            ]
-                        }
-                    ]
-                }
-            ]
-        })
-    }
-
-    #[test]
-    fn json_payload_parses_control_plane_fixture() {
-        let r = BackendStorageRouting::from_json_payload(&fixture_json()).expect("parse");
-        assert_eq!(r.default_backend(), StorageBackend::SketchStore);
-        assert_eq!(r.len(), 2);
-
-        // http_requests_total: histogram_quantile / delta / etc → archive,
-        // quantile / sum / topk → warm.
-        assert_eq!(
-            r.lookup_with_shape("http_requests_total", QueryOperatorShape::HistogramQuantile),
-            StorageBackend::DoubleWrite,
-        );
-        assert_eq!(
-            r.lookup_with_shape("http_requests_total", QueryOperatorShape::Delta),
-            StorageBackend::DoubleWrite,
-        );
-        assert_eq!(
-            r.lookup_with_shape("http_requests_total", QueryOperatorShape::Count),
-            StorageBackend::DoubleWrite,
-        );
-        assert_eq!(
-            r.lookup_with_shape("http_requests_total", QueryOperatorShape::Quantile),
-            StorageBackend::SketchStore,
-        );
-        assert_eq!(
-            r.lookup_with_shape("http_requests_total", QueryOperatorShape::Topk),
-            StorageBackend::SketchStore,
-        );
-        // LastOverTime not in the archive's filter list → falls
-        // through to the default (warm) slot.
-        assert_eq!(
-            r.lookup_with_shape("http_requests_total", QueryOperatorShape::LastOverTime),
-            StorageBackend::SketchStore,
-        );
-    }
-
-    #[test]
-    fn json_payload_unknown_shape_defaults_to_other() {
-        let value = serde_json::json!({
-            "default_engine": "asap_query",
-            "metrics": [
-                {
-                    "name": "x",
-                    "targets": [
-                        { "engine": "asap_query" },
-                        {
-                            "engine": "double_write",
-                            "applies_to_query_shape": ["some_future_shape", "count"]
-                        }
-                    ]
-                }
-            ]
-        });
-        let r = BackendStorageRouting::from_json_payload(&value).expect("parse");
-        // count still routes to archive; the unknown shape was mapped
-        // to QueryOperatorShape::Other (silently — forward-compat).
-        assert_eq!(
-            r.lookup_with_shape("x", QueryOperatorShape::Count),
-            StorageBackend::DoubleWrite,
-        );
-        assert_eq!(
-            r.lookup_with_shape("x", QueryOperatorShape::Other),
-            StorageBackend::DoubleWrite,
-        );
-    }
-
-    #[test]
-    fn json_payload_invalid_engine_errors() {
-        let value = serde_json::json!({
-            "default_engine": "asap_query",
-            "metrics": [{
-                "name": "x",
-                "targets": [{ "engine": "not_a_real_engine" }]
-            }]
-        });
-        let err = BackendStorageRouting::from_json_payload(&value).expect_err("must reject");
-        // The bad engine name appears somewhere in the error chain
-        // (the parser wraps the inner `parse_engine_string` error in
-        // a context that mentions the metric/target index).
-        let chain_str = format!("{err:#}");
-        assert!(
-            chain_str.contains("not_a_real_engine"),
-            "error chain must mention the bad engine: {chain_str}"
-        );
-    }
-
-    #[test]
-    fn json_payload_empty_targets_errors() {
-        let value = serde_json::json!({
-            "default_engine": "asap_query",
-            "metrics": [{ "name": "x", "targets": [] }]
-        });
-        let err = BackendStorageRouting::from_json_payload(&value).expect_err("must reject");
-        assert!(err.to_string().contains("empty targets"));
-    }
-
-    #[test]
-    fn json_payload_missing_metrics_errors() {
-        let value = serde_json::json!({ "default_engine": "asap_query" });
-        let err = BackendStorageRouting::from_json_payload(&value).expect_err("must reject");
-        assert!(err.to_string().contains("metrics"));
-    }
-
-    #[test]
-    fn json_payload_default_engine_optional_falls_back_to_warm() {
-        let value = serde_json::json!({
-            "metrics": [
-                { "name": "x", "targets": [{ "engine": "asap_query" }] }
-            ]
-        });
-        let r = BackendStorageRouting::from_json_payload(&value).expect("parse");
-        assert_eq!(r.default_backend(), StorageBackend::SketchStore);
-    }
-
-    /// #746 deleted the archive tier. A stale plan still naming
-    /// `thanos_query` must be rejected outright rather than silently
-    /// resolving to some other tier — a typo'd engine and a removed engine
-    /// fail the same way.
-    #[test]
-    fn json_payload_rejects_the_removed_thanos_query_engine() {
-        let value = serde_json::json!({
-            "default_engine": "asap_query",
-            "metrics": [{
-                "name": "audit_events",
-                "targets": [
-                    { "engine": "thanos_query" }
-                ]
-            }]
-        });
-        let err = BackendStorageRouting::from_json_payload(&value)
-            .expect_err("thanos_query must not parse");
-        assert!(
-            err.to_string().contains("thanos_query"),
-            "the error must name the offending engine; got {err}",
-        );
-    }
-
-    /// the control plane's Mode 3
-    /// (`RawAtEdgePrometheusArchive`) emits `engine: prometheus_remote`
-    /// in the routing JSON for metrics whose raw data is shipped to
-    /// Prometheus's native OTLP receiver. The backend's parser must
-    /// accept this string and resolve to `StorageBackend::PrometheusRemote`
-    /// so the dispatcher's `engine_by_id` lookup hits the registered
-    /// `PrometheusForwardEngine`.
-    #[test]
-    fn json_payload_prometheus_remote_parses_to_prometheus_remote_backend() {
-        let value = serde_json::json!({
-            "default_engine": "asap_query",
-            "metrics": [{
-                "name": "node_cpu_seconds_total",
-                "targets": [
-                    { "engine": "prometheus_remote" }
-                ]
-            }]
-        });
-        let r = BackendStorageRouting::from_json_payload(&value).expect("parse");
-        assert_eq!(
-            r.lookup("node_cpu_seconds_total"),
-            StorageBackend::PrometheusRemote,
-        );
-        assert_eq!(
-            StorageBackend::PrometheusRemote.data_source_id(),
-            "prometheus_remote",
-            "the routing-table lookup must produce the same id the engine \
-             registers under so the dispatcher can find it",
-        );
-    }
-
-    #[test]
-    fn replace_swaps_table_in_place() {
-        let mut r = BackendStorageRouting::new_from_single_targets(
-            StorageBackend::SketchStore,
-            HashMap::from([("old_metric".to_string(), StorageBackend::DoubleWrite)]),
-        );
-        let new = BackendStorageRouting::from_json_payload(&fixture_json()).expect("parse");
-        r.replace(new);
-        // Old metric is gone; new metrics are visible.
-        assert_eq!(r.lookup("old_metric"), StorageBackend::SketchStore);
-        assert_eq!(
-            r.lookup_with_shape("http_requests_total", QueryOperatorShape::HistogramQuantile),
-            StorageBackend::DoubleWrite,
-        );
-    }
-
-    #[test]
-    fn hot_reload_wrapper_swap_is_observed_by_clones() {
-        let hr = HotReloadBackendStorageRouting::empty();
-        let hr_writer = hr.clone();
-
-        let new = BackendStorageRouting::from_json_payload(&fixture_json()).expect("parse");
-        hr_writer.swap(new);
-
-        let snap = hr.snapshot();
-        assert_eq!(snap.len(), 2);
-        assert_eq!(
-            snap.lookup_with_shape("http_requests_total", QueryOperatorShape::Delta),
-            StorageBackend::DoubleWrite,
-        );
-    }
-
-    #[test]
-    fn hot_reload_wrapper_concurrent_readers_see_no_torn_state() {
-        use std::thread;
-        let hr = HotReloadBackendStorageRouting::empty();
-        let writer_hr = hr.clone();
-        let writer = thread::spawn(move || {
-            for i in 0..50 {
-                let mut metrics = HashMap::new();
-                metrics.insert(
-                    format!("metric_{i}"),
-                    vec![RoutingTarget::always(StorageBackend::DoubleWrite)],
-                );
-                let new = BackendStorageRouting::new(StorageBackend::SketchStore, metrics);
-                writer_hr.swap(new);
-            }
-        });
-        let reader_hr = hr.clone();
-        let reader = thread::spawn(move || {
-            for _ in 0..200 {
-                let snap = reader_hr.snapshot();
-                // Snapshot must always be internally consistent —
-                // either empty (initial) or one-entry (post-swap).
-                let n = snap.len();
-                assert!(n == 0 || n == 1, "torn snapshot: {n} entries");
-            }
-        });
-        writer.join().unwrap();
-        reader.join().unwrap();
-    }
-
-    #[test]
-    fn routing_table_hash_is_stable_across_runs() {
-        let r1 = BackendStorageRouting::from_json_payload(&fixture_json()).expect("parse 1");
-        let r2 = BackendStorageRouting::from_json_payload(&fixture_json()).expect("parse 2");
-        assert_eq!(routing_table_hash(&r1), routing_table_hash(&r2));
-    }
-
-    #[test]
-    fn routing_table_hash_differs_when_table_differs() {
-        let r1 = BackendStorageRouting::from_json_payload(&fixture_json()).expect("parse");
-        let r2 = BackendStorageRouting::empty();
-        assert_ne!(routing_table_hash(&r1), routing_table_hash(&r2));
-    }
-
-    #[test]
-    fn classifies_histogram_quantile_correctly() {
-        let e =
-            parse("histogram_quantile(0.99, sum by (le) (rate(http_request_duration_bucket[5m])))");
-        assert_eq!(
-            classify_query_shape(&e),
-            QueryOperatorShape::HistogramQuantile
-        );
-    }
-
-    #[test]
-    fn classifies_delta_correctly() {
-        let e = parse("delta(http_requests_total[5m])");
-        assert_eq!(classify_query_shape(&e), QueryOperatorShape::Delta);
-    }
-
-    #[test]
-    fn classifies_absent_correctly() {
-        let e = parse("absent(http_requests_total{job=\"x\"})");
-        assert_eq!(classify_query_shape(&e), QueryOperatorShape::Absent);
-    }
-
-    // ── Per-tenant routing tests (follow-up to PR #333) ───────────────
-
-    #[test]
-    fn empty_routing_carries_default_tenant() {
-        let r = BackendStorageRouting::empty();
-        assert_eq!(r.tenant(), DEFAULT_TENANT);
-    }
-
-    #[test]
-    fn json_payload_tenant_field_is_optional_and_defaults_to_default() {
-        // A JSON without a `tenant` field — the existing single-tenant
-        // control plane emit shape — must parse cleanly and resolve to
-        // the [`DEFAULT_TENANT`] tenant.
-        let r = BackendStorageRouting::from_json_payload(&fixture_json()).expect("parse");
-        assert_eq!(r.tenant(), DEFAULT_TENANT);
-    }
-
-    #[test]
-    fn json_payload_tenant_field_is_picked_up_when_present() {
-        let value = serde_json::json!({
-            "tenant": "tenant-a",
-            "default_engine": "asap_query",
-            "metrics": [
-                { "name": "http_requests_total",
-                  "targets": [{ "engine": "asap_query" }] }
-            ]
-        });
-        let r = BackendStorageRouting::from_json_payload(&value).expect("parse");
-        assert_eq!(r.tenant(), "tenant-a");
-    }
-
-    #[test]
-    fn yaml_tenant_field_is_optional_and_defaults_to_default() {
-        // Existing YAMLs in the wild don't have `tenant:` — they
-        // must keep parsing and resolve to [`DEFAULT_TENANT`].
-        let yaml = r#"
-default: sketch_store
-metrics:
-  http_requests_total: double_write
-"#;
-        let r = BackendStorageRouting::from_yaml_str(yaml).expect("parse");
-        assert_eq!(r.tenant(), DEFAULT_TENANT);
-    }
-
-    #[test]
-    fn yaml_tenant_field_is_picked_up_when_present() {
-        let yaml = r#"
-tenant: tenant-b
-default: sketch_store
-metrics:
-  http_requests_total: double_write
-"#;
-        let r = BackendStorageRouting::from_yaml_str(yaml).expect("parse");
-        assert_eq!(r.tenant(), "tenant-b");
-    }
-
-    #[test]
-    fn hot_reload_swap_tenant_replaces_only_one_tenant() {
-        // Bootstrap with two tenants. swap_tenant("tenant-a") must
-        // leave tenant-b intact.
-        let hr = HotReloadBackendStorageRouting::empty();
-        // Push tenant-a's table.
-        let table_a = BackendStorageRouting::new_from_single_targets(
-            StorageBackend::SketchStore,
-            HashMap::from([("metric_a".to_string(), StorageBackend::DoubleWrite)]),
-        );
-        hr.swap_tenant("tenant-a", table_a);
-        // Push tenant-b's table.
-        let table_b = BackendStorageRouting::new_from_single_targets(
-            StorageBackend::SketchStore,
-            HashMap::from([("metric_b".to_string(), StorageBackend::DoubleWrite)]),
-        );
-        hr.swap_tenant("tenant-b", table_b);
-
-        // Replace tenant-a only.
-        let table_a_v2 = BackendStorageRouting::new_from_single_targets(
-            StorageBackend::SketchStore,
-            HashMap::from([("metric_a_v2".to_string(), StorageBackend::DoubleWrite)]),
-        );
-        hr.swap_tenant("tenant-a", table_a_v2);
-
-        // tenant-a now reflects v2; tenant-b is unchanged.
-        let snap_a = hr.snapshot_for_tenant("tenant-a");
-        assert_eq!(snap_a.lookup("metric_a"), StorageBackend::SketchStore);
-        assert_eq!(snap_a.lookup("metric_a_v2"), StorageBackend::DoubleWrite);
-        let snap_b = hr.snapshot_for_tenant("tenant-b");
-        assert_eq!(snap_b.lookup("metric_b"), StorageBackend::DoubleWrite);
-        assert_eq!(snap_b.lookup("metric_a_v2"), StorageBackend::SketchStore);
-    }
-
-    #[test]
-    fn hot_reload_unknown_tenant_falls_back_to_default_tenant() {
-        // When a request asks for a tenant that has no entry, we
-        // fall back to the [`DEFAULT_TENANT`] table.
-        let hr = HotReloadBackendStorageRouting::empty();
-        // Default tenant has an explicit override.
-        let default_table = BackendStorageRouting::new_from_single_targets(
-            StorageBackend::SketchStore,
-            HashMap::from([("shared_metric".to_string(), StorageBackend::DoubleWrite)]),
-        );
-        hr.swap_tenant(DEFAULT_TENANT, default_table);
-
-        // Unknown tenant: fallback to default's table.
-        let snap = hr.snapshot_for_tenant("nonexistent-tenant");
-        assert_eq!(snap.lookup("shared_metric"), StorageBackend::DoubleWrite,);
-        // Default tenant: same answer.
-        let snap_default = hr.snapshot_for_tenant(DEFAULT_TENANT);
-        assert_eq!(
-            snap_default.lookup("shared_metric"),
-            StorageBackend::DoubleWrite,
-        );
-    }
-
-    #[test]
-    fn hot_reload_swap_tenant_overwrites_table_internal_tenant_id() {
-        // swap_tenant("X", table) must overwrite table.tenant = "X"
-        // even when the table was built with a different tenant id —
-        // the map key is the source of truth.
-        let hr = HotReloadBackendStorageRouting::empty();
-        let mut table = BackendStorageRouting::new_from_single_targets(
-            StorageBackend::SketchStore,
-            HashMap::from([("m".to_string(), StorageBackend::DoubleWrite)]),
-        );
-        table = table.with_tenant("WRONG-TENANT");
-        hr.swap_tenant("right-tenant", table);
-        let snap = hr.snapshot_for_tenant("right-tenant");
-        assert_eq!(snap.tenant(), "right-tenant");
-    }
-
-    #[test]
-    fn hot_reload_tenant_ids_lists_all_registered_tenants() {
-        let hr = HotReloadBackendStorageRouting::empty();
-        // Bootstrap (default tenant only).
-        assert_eq!(hr.tenant_ids(), vec![DEFAULT_TENANT.to_string()]);
-
-        let table = BackendStorageRouting::empty();
-        hr.swap_tenant("tenant-a", table.clone());
-        hr.swap_tenant("tenant-b", table);
-
-        let mut ids = hr.tenant_ids();
-        ids.sort();
-        assert_eq!(
-            ids,
-            vec![
-                DEFAULT_TENANT.to_string(),
-                "tenant-a".to_string(),
-                "tenant-b".to_string(),
-            ]
-        );
-    }
-
-    #[test]
-    fn hot_reload_legacy_swap_routes_to_default_tenant() {
-        // The original `swap()` API (no tenant arg) replaces the
-        // [`DEFAULT_TENANT`] table — preserved so existing callers
-        // (and the existing test suite below) keep working.
-        let hr = HotReloadBackendStorageRouting::empty();
-        let new = BackendStorageRouting::from_json_payload(&fixture_json()).expect("parse");
-        hr.swap(new);
-
-        let snap = hr.snapshot_for_tenant(DEFAULT_TENANT);
-        assert_eq!(snap.len(), 2);
-    }
-}
diff --git a/data_plane/src/query_engines/routing/capability_matching.rs b/data_plane/src/query_engines/routing/capability_matching.rs
deleted file mode 100644
index ca588a650..000000000
--- a/data_plane/src/query_engines/routing/capability_matching.rs
+++ /dev/null
@@ -1,136 +0,0 @@
-//! Storage-backend routing policy: given the storage tier a metric is
-//! configured for, decide which backends can serve it and in what
-//! preference order.
-//!
-//! Split out of `asap_types`'s former `capability_matching` module (see
-//! `scratchpad/artifacts/enum-unification-plan.md`). `StorageBackend` and
-//! the `InstalledPrecomputePlan` wire format it's a field of both turned out to
-//! have zero real `control_plane` dependency either — see
-//! [`crate::storage_engines::types::storage_backend`]'s module doc — so
-//! both moved into this crate; only the routing *decision* below was ever
-//! split out separately.
-//!
-//! Since #746 there is no archive tier, so the policy has one branch left:
-//! `PrometheusRemote` metrics answer from Prometheus, everything else from
-//! the ASAP sketch tier. A query the ASAP tier cannot serve falls through
-//! to the HTTP layer's Prometheus fallback rather than to another engine.
-
-use crate::storage_engines::types::StorageBackend;
-use asap_types::Statistic;
-pub use planner_types::types::AccuracyTarget;
-
-/// Returns the storage backends that can serve a query when the metric is
-/// configured for `metric_storage_config`.
-///
-/// The returned list is **ordered by preference**: the router walks it in
-/// order and dispatches to the first backend whose engine is registered,
-/// falling through on `CapabilityMiss` / `Backend` to the next entry. With
-/// the archive tier gone every list holds exactly one backend, so the
-/// failover loop is a no-op in practice — it stays because the router is
-/// also the `X-ASAP-Engine` override surface.
-///
-/// * `PrometheusRemote` → `[PrometheusRemote]`: the metric's raw samples
-///   never landed in ASAP-managed storage, so there is no ASAP-tier sketch
-///   to answer from. A missing engine surfaces as a `NoEngineRegistered`
-///   503 from the HTTP handler — the correct fail-loud behaviour for a
-///   misconfigured deploy.
-/// * every ASAP-managed tier (`SketchStore`, `DoubleWrite`) →
-///   `[SketchStore]`: the ASAP tier is the only engine left.
-///
-/// The `AccuracyTarget` no longer participates: an `Exact` request means
-/// "do not answer from ε/δ-bounded sketches", which the HTTP handler
-/// serves by forwarding to Prometheus before it ever reaches the router.
-pub fn compatible_storage_backends(
-    _stat: Statistic,
-    metric_storage_config: StorageBackend,
-) -> Vec<StorageBackend> {
-    match metric_storage_config {
-        // Prometheus-remote owns its own storage; there is no ASAP-tier
-        // sketch to fall back on.
-        StorageBackend::PrometheusRemote => vec![StorageBackend::PrometheusRemote],
-
-        // Every ASAP-managed tier answers from the sketch tier.
-        StorageBackend::SketchStore | StorageBackend::DoubleWrite => {
-            vec![StorageBackend::SketchStore]
-        }
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    // -----------------------------------------------------------------------
-    // storage-backend routing
-    //
-    // The `EngineRouter` (see `query_engine_routing.rs`) consults
-    // `compatible_storage_backends(stat, metric_storage)` to pick a backend.
-    // These tests pin the routing matrix so the dispatcher stays in lock-step
-    // with the module doc.
-    // -----------------------------------------------------------------------
-
-    #[test]
-    fn asap_managed_tiers_route_to_the_sketch_tier() {
-        // #746: no archive tier. Every ASAP-managed storage axis answers
-        // from the sketch tier.
-        for cfg in [StorageBackend::SketchStore, StorageBackend::DoubleWrite] {
-            let backends = compatible_storage_backends(Statistic::Quantile, cfg);
-            assert_eq!(
-                backends,
-                vec![StorageBackend::SketchStore],
-                "ASAP-managed tier {cfg:?} must route to the sketch tier",
-            );
-        }
-    }
-
-    #[test]
-    fn prometheus_remote_keeps_its_own_slot() {
-        let backends =
-            compatible_storage_backends(Statistic::Sum, StorageBackend::PrometheusRemote);
-        assert_eq!(backends, vec![StorageBackend::PrometheusRemote]);
-    }
-
-    /// Source-of-truth agreement check for the storage axis.
-    ///
-    /// For every `(Statistic, StorageBackend)` pair the returned backend
-    /// list must be non-empty and dispatchable.
-    #[test]
-    fn capability_storage_backend_agreement() {
-        let stats = [
-            Statistic::Count,
-            Statistic::Sum,
-            Statistic::Cardinality,
-            Statistic::Increase,
-            Statistic::Rate,
-            Statistic::Min,
-            Statistic::Max,
-            Statistic::Quantile,
-            Statistic::Topk,
-        ];
-        let configs = [
-            StorageBackend::SketchStore,
-            StorageBackend::DoubleWrite,
-            StorageBackend::PrometheusRemote,
-        ];
-
-        for &stat in &stats {
-            for &cfg in &configs {
-                let backends = compatible_storage_backends(stat, cfg);
-                assert!(
-                    !backends.is_empty(),
-                    "compatible_storage_backends({stat:?}, {cfg:?}) returned empty \
-                     — every metric configuration must route to at least one backend",
-                );
-                let expected_head = match cfg {
-                    StorageBackend::PrometheusRemote => StorageBackend::PrometheusRemote,
-                    _ => StorageBackend::SketchStore,
-                };
-                assert_eq!(
-                    backends[0], expected_head,
-                    "head mismatch for ({stat:?}, {cfg:?}): expected {expected_head:?}, got {:?}",
-                    backends[0],
-                );
-            }
-        }
-    }
-}
diff --git a/data_plane/src/query_engines/routing/freshness_probe_cache.rs b/data_plane/src/query_engines/routing/freshness_probe_cache.rs
deleted file mode 100644
index 3bd6e7e5c..000000000
--- a/data_plane/src/query_engines/routing/freshness_probe_cache.rs
+++ /dev/null
@@ -1,308 +0,0 @@
-//! In-memory last-value cache for `http_freshness_probe_*` counters.
-//!
-//! ## Why this exists (issue #46 ⑥ — freshness UNKNOWN → CAPTURED)
-//!
-//! The MVP demo's freshness criterion polls
-//! `last_over_time(http_freshness_probe_warm[10s])` from the replay
-//! client at 10 Hz over a 60 s window and expects every poll to land
-//! the latest probe sample. The probe metric flows through the agent
-//! pipeline as a raw counter:
-//!
-//! ```text
-//!   producer → agent: [gorillas3 → ddsketch → batch] → backend OTLP
-//!                          │
-//!                          └──▶ TSDB block (60 s window) → MinIO
-//!                                                            │
-//!                                                            └─▶ Thanos store-gateway
-//! ```
-//!
-//! `gorillas3` flushes a finalised TSDB block every 60 s and the
-//! Thanos store-gateway syncs S3 every 30 s, so the *cold* tier sees
-//! the probe sample only after a 60–90 s lag. A `[10s]` lookback
-//! against Thanos therefore returns an empty vector even though the
-//! probe is being emitted at 1 Hz and reaching the backend's OTLP
-//! receiver in real time. The replay client logged
-//! `attempted=600 got=0` for both the warm and archive paths, which
-//! pinned criterion ⑥ at UNKNOWN.
-//!
-//! The fix routes around the cold-tier flush latency at the query
-//! surface: the OTLP ingest path captures the latest `(ts_ms, value)`
-//! for every probe metric in a small RAM-resident cache, and the HTTP
-//! query handler intercepts `last_over_time(<probe>[<range>])` for
-//! probe-shaped metric names and answers from this cache when a
-//! sample within `[now − range_ms, now]` is present. The long-term
-//! TSDB write path is preserved verbatim — we only short-circuit the
-//! freshness-poll query, not the storage pipeline.
-//!
-//! ## Scope of the cache
-//!
-//! * Captures only metrics whose name starts with
-//!   `http_freshness_probe_` (matches the three demo probe spellings:
-//!   `_raw`, `_warm`, `_archive`). Every other metric is ignored;
-//!   the cache adds no per-sample work to the hot ingest path beyond
-//!   a string prefix check.
-//! * Stores one entry per metric — labels are dropped. The MVP demo
-//!   emits each probe with a single (no-label) series, and the
-//!   replay client queries the bare metric. If a future probe
-//!   variant adds labels, the lookup still returns the most-recent
-//!   sample regardless of which series produced it; that's
-//!   acceptable for a freshness probe (we want "latest emission",
-//!   not per-series breakdown).
-//! * Bounded by the prefix filter: at most one entry per probe
-//!   metric the agent ever emits. The MVP runs three probes; the
-//!   cache holds three entries indefinitely.
-//!
-//! ## Concurrency model
-//!
-//! Wraps a `HashMap` in a `RwLock`. Ingest writes acquire a write
-//! lock for the brief window of an `insert`; queries acquire a read
-//! lock to look up. The cache is only consulted when the parsed
-//! query matches the probe pattern — every other PromQL query
-//! bypasses it entirely.
-
-use std::collections::HashMap;
-use std::sync::RwLock;
-use std::time::{SystemTime, UNIX_EPOCH};
-
-/// Substring the cache filters on. Any metric name containing this
-/// token (with the trailing underscore to keep the tier suffix
-/// disambiguated) is captured. The MVP fake-exporter emits three
-/// probes named `http_freshness_probe_{raw,warm,archive}`; user-
-/// extensible probes (e.g. `latency_freshness_probe_*`) are matched
-/// without a code change.
-const PROBE_NAME_TOKEN: &str = "freshness_probe_";
-
-/// Returns `true` iff the metric name belongs to the freshness-probe
-/// family — used by both the ingest write path (filter before
-/// storing) and the query read path (intercept before normal
-/// routing).
-pub fn is_freshness_probe(metric: &str) -> bool {
-    metric.contains(PROBE_NAME_TOKEN)
-}
-
-/// One cached entry: the most-recent `(timestamp, value)` for a
-/// single probe metric. Timestamps are unix epoch milliseconds — the
-/// same scale as the `ts_ms` carried on `MetricPoint` in the OTLP
-/// receiver.
-#[derive(Debug, Clone, Copy, PartialEq)]
-pub struct ProbeSample {
-    pub ts_ms: i64,
-    pub value: f64,
-}
-
-/// In-memory `metric_name → ProbeSample` cache.
-///
-/// Construct one shared `Arc<FreshnessProbeCache>` at backend
-/// startup, hand it to the OTLP receiver (write path) and the HTTP
-/// query handler (read path). The cache is `Send + Sync`; cloning
-/// an `Arc` is the canonical way to share it across tasks.
-#[derive(Debug, Default)]
-pub struct FreshnessProbeCache {
-    inner: RwLock<HashMap<String, ProbeSample>>,
-}
-
-impl FreshnessProbeCache {
-    /// Build an empty cache. Same as `Default::default` — the
-    /// explicit constructor reads better at the wiring sites in
-    /// `main.rs`.
-    pub fn new() -> Self {
-        Self {
-            inner: RwLock::new(HashMap::new()),
-        }
-    }
-
-    /// Capture a sample for `metric` at `ts_ms` with `value`. No-op
-    /// if the metric name does not match the probe prefix. When the
-    /// metric matches and the cache already holds an entry for it,
-    /// the new sample replaces the old one *only* if its `ts_ms` is
-    /// strictly newer — out-of-order OTLP arrivals don't clobber a
-    /// fresher sample. Returns `true` iff the cache was updated.
-    pub fn record(&self, metric: &str, ts_ms: i64, value: f64) -> bool {
-        if !is_freshness_probe(metric) {
-            return false;
-        }
-        let mut guard = match self.inner.write() {
-            Ok(g) => g,
-            Err(poisoned) => poisoned.into_inner(),
-        };
-        match guard.get(metric) {
-            Some(prev) if prev.ts_ms >= ts_ms => false,
-            _ => {
-                guard.insert(metric.to_string(), ProbeSample { ts_ms, value });
-                true
-            }
-        }
-    }
-
-    /// Look up the most-recent sample for `metric`. Returns `None`
-    /// when the cache has no entry for the metric, when the metric
-    /// is not a probe (cheap rejection), or when the entry's `ts_ms`
-    /// falls outside the lookback window `[now_ms − range_ms,
-    /// now_ms]`. The window check matches PromQL's
-    /// `last_over_time(metric[range])` semantics — only samples
-    /// inside the matrix selector contribute.
-    pub fn lookup(&self, metric: &str, now_ms: i64, range_ms: i64) -> Option<ProbeSample> {
-        if !is_freshness_probe(metric) {
-            return None;
-        }
-        let guard = match self.inner.read() {
-            Ok(g) => g,
-            Err(poisoned) => poisoned.into_inner(),
-        };
-        let sample = guard.get(metric).copied()?;
-        let lo = now_ms.saturating_sub(range_ms);
-        if sample.ts_ms >= lo && sample.ts_ms <= now_ms {
-            Some(sample)
-        } else {
-            None
-        }
-    }
-
-    /// Number of cached entries. Visible for tests + debug
-    /// instrumentation; not used by the hot path.
-    pub fn len(&self) -> usize {
-        self.inner.read().map(|g| g.len()).unwrap_or(0)
-    }
-
-    /// `true` iff the cache holds no entries — convenience for the
-    /// `len() == 0` check.
-    pub fn is_empty(&self) -> bool {
-        self.len() == 0
-    }
-}
-
-/// Wall-clock `now` in unix epoch milliseconds. The lookup helper
-/// uses this when the caller doesn't pin a query time (instant
-/// queries default to wall-clock now). Pulled out as a free function
-/// so tests can substitute by passing an explicit `now_ms` to
-/// `lookup`.
-pub fn now_ms() -> i64 {
-    SystemTime::now()
-        .duration_since(UNIX_EPOCH)
-        .map(|d| d.as_millis() as i64)
-        .unwrap_or(0)
-}
-
-// ---------------------------------------------------------------------------
-// Tests
-// ---------------------------------------------------------------------------
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    #[test]
-    fn ignores_non_probe_metrics() {
-        let cache = FreshnessProbeCache::new();
-        assert!(!cache.record("http_requests_total", 1_000, 42.0));
-        assert!(cache.is_empty());
-        assert_eq!(cache.lookup("http_requests_total", 2_000, 10_000), None);
-    }
-
-    #[test]
-    fn records_probe_metrics() {
-        let cache = FreshnessProbeCache::new();
-        assert!(cache.record("http_freshness_probe_warm", 1_000, 1_000.0));
-        assert!(cache.record("http_freshness_probe_archive", 1_000, 1_000.0));
-        assert_eq!(cache.len(), 2);
-    }
-
-    #[test]
-    fn lookup_returns_sample_inside_window() {
-        let cache = FreshnessProbeCache::new();
-        // Sample at t=1000ms, value=1000 (the probe's emission ts).
-        cache.record("http_freshness_probe_warm", 1_000, 1_000.0);
-
-        // Query at t=1005ms with a 10s lookback — sample is 5ms old,
-        // well inside [now-10s, now].
-        let got = cache
-            .lookup("http_freshness_probe_warm", 1_005, 10_000)
-            .expect("sample should be inside window");
-        assert_eq!(
-            got,
-            ProbeSample {
-                ts_ms: 1_000,
-                value: 1_000.0
-            }
-        );
-    }
-
-    #[test]
-    fn lookup_misses_outside_window() {
-        let cache = FreshnessProbeCache::new();
-        cache.record("http_freshness_probe_warm", 1_000, 1_000.0);
-
-        // Query at t=20_000ms with a 10s lookback — sample is 19s
-        // old, outside [10_000, 20_000]. The pre-fix Thanos behavior:
-        // 60 s flush gap + 10 s window = always empty.
-        assert_eq!(
-            cache.lookup("http_freshness_probe_warm", 20_000, 10_000),
-            None,
-            "sample older than the lookback window must not be returned",
-        );
-    }
-
-    #[test]
-    fn lookup_unknown_metric_returns_none() {
-        let cache = FreshnessProbeCache::new();
-        assert_eq!(
-            cache.lookup("http_freshness_probe_warm", 1_000, 10_000),
-            None,
-        );
-    }
-
-    #[test]
-    fn record_keeps_newest_sample() {
-        let cache = FreshnessProbeCache::new();
-        cache.record("http_freshness_probe_warm", 1_000, 1_000.0);
-        // Older sample — must NOT clobber the entry.
-        assert!(!cache.record("http_freshness_probe_warm", 500, 500.0));
-        let got = cache
-            .lookup("http_freshness_probe_warm", 1_005, 10_000)
-            .unwrap();
-        assert_eq!(got.ts_ms, 1_000);
-        assert_eq!(got.value, 1_000.0);
-
-        // Newer sample — replaces the entry.
-        assert!(cache.record("http_freshness_probe_warm", 2_000, 2_000.0));
-        let got = cache
-            .lookup("http_freshness_probe_warm", 2_005, 10_000)
-            .unwrap();
-        assert_eq!(got.ts_ms, 2_000);
-        assert_eq!(got.value, 2_000.0);
-    }
-
-    #[test]
-    fn lookup_window_includes_endpoints() {
-        let cache = FreshnessProbeCache::new();
-        cache.record("http_freshness_probe_warm", 1_000, 1_000.0);
-        // sample.ts == now − range_ms — inclusive lower bound.
-        assert!(
-            cache
-                .lookup("http_freshness_probe_warm", 11_000, 10_000)
-                .is_some(),
-            "lower bound must be inclusive (ts_ms == now − range_ms)",
-        );
-        // sample.ts == now — inclusive upper bound.
-        assert!(
-            cache
-                .lookup("http_freshness_probe_warm", 1_000, 10_000)
-                .is_some(),
-            "upper bound must be inclusive (ts_ms == now)",
-        );
-        // sample.ts == now − range_ms − 1 — outside lower bound.
-        assert!(cache
-            .lookup("http_freshness_probe_warm", 11_001, 10_000)
-            .is_none(),);
-    }
-
-    #[test]
-    fn is_freshness_probe_matches_three_demo_spellings() {
-        assert!(is_freshness_probe("http_freshness_probe_raw"));
-        assert!(is_freshness_probe("http_freshness_probe_warm"));
-        assert!(is_freshness_probe("http_freshness_probe_archive"));
-        assert!(!is_freshness_probe("http_freshness_probe"));
-        assert!(!is_freshness_probe("http_requests_total"));
-        assert!(!is_freshness_probe(""));
-    }
-}
diff --git a/data_plane/src/query_engines/routing/mod.rs b/data_plane/src/query_engines/routing/mod.rs
deleted file mode 100644
index caa5f5548..000000000
--- a/data_plane/src/query_engines/routing/mod.rs
+++ /dev/null
@@ -1,45 +0,0 @@
-//! Per-metric storage-backend routing.
-//!
-//! This module is the dispatch boundary between the HTTP query
-//! handler and the tier-co-located engines (warm sketch tier in
-//! [`crate::query_engines::asap_query_engine`]). Two cooperating
-//! pieces:
-//!
-//! * [`backend_storage_routing`] — config loader + multi-target
-//!   per-metric lookup (`metric → [(backend, query-shape filter), ...]`).
-//!   Loaded once at backend startup from
-//!   `deploy/configs/backend-storage-routing.yaml`; queried on
-//!   every HTTP request.
-//! * [`query_engine_routing`] — the engine dispatcher. Holds a small map
-//!   of `data_source_id → Arc<dyn QueryEngine>` and walks the
-//!   compatibility list returned by
-//!   [`capability_matching::compatible_storage_backends`] to pick which
-//!   engine answers a given `(query, metric_storage)` pair.
-//! * [`capability_matching`] — the storage-backend routing policy itself
-//!   (`AccuracyTarget`, `compatible_storage_backends`). Split out of
-//!   `asap_types`'s former `capability_matching` module. `StorageBackend`
-//!   itself later moved into this crate too, alongside `InstalledPrecomputePlan`
-//!   (see `crate::storage_engines::types::storage_backend`'s module doc) —
-//!   `control_plane` turned out to have zero real dependency on either.
-//!
-//! Step-1 of the JSONL deprecation refactor lifted these out of
-//! `data_model/backend_storage_routing.rs` and `query-engines/router.rs`
-//! into this dedicated `routing/` directory so the HTTP handler's
-//! dispatch surface is a single import (`use crate::query_engines::routing::*`)
-//! instead of straddling two unrelated module trees.
-
-pub mod backend_storage_routing;
-pub mod capability_matching;
-pub mod freshness_probe_cache;
-pub mod query_engine_routing;
-
-pub use capability_matching::{compatible_storage_backends, AccuracyTarget};
-
-pub use backend_storage_routing::{
-    classify_query_shape, routing_table_hash, BackendStorageRouting,
-    HotReloadBackendStorageRouting, QueryOperatorShape, RoutingTarget, DEFAULT_TENANT,
-};
-pub use freshness_probe_cache::{
-    is_freshness_probe, now_ms as freshness_probe_now_ms, FreshnessProbeCache, ProbeSample,
-};
-pub use query_engine_routing::{EngineCapabilities, EngineRouter, EngineRouterError, QueryEngine};
diff --git a/data_plane/src/query_engines/routing/query_engine_routing.rs b/data_plane/src/query_engines/routing/query_engine_routing.rs
deleted file mode 100644
index 89b6cb1d8..000000000
--- a/data_plane/src/query_engines/routing/query_engine_routing.rs
+++ /dev/null
@@ -1,794 +0,0 @@
-//! Phase-5 capability router: dispatches a `(query, metric_storage)` pair
-//! to the engine that owns the chosen storage tier.
-//!
-//! The router holds a small map keyed by
-//! [`crate::storage_engines::types::StorageBackend::data_source_id`]
-//! and walks the ordered backend list returned by
-//! [`super::capability_matching::compatible_storage_backends`]. The first registered
-//! engine answers; on a recoverable backend failure (`EngineError::Backend`),
-//! the router falls through to the next compatible backend if the list
-//! still has options. A hard capability miss in the head engine likewise
-//! falls through (matching the pre-Phase-5 §5.2 fallback contract).
-//!
-//! See `docs/design-gorilla-s3-cold-engine.md` §8 for the design rationale
-//! and the routing matrix the router walks.
-
-use std::collections::HashMap;
-use std::sync::Arc;
-
-use async_trait::async_trait;
-use thiserror::Error;
-use tracing::{debug, warn};
-
-use crate::storage_engines::types::StorageBackend;
-use asap_types::Statistic;
-
-use super::capability_matching::{compatible_storage_backends, AccuracyTarget};
-use crate::query_engines::{EngineError, QueryResult};
-
-// ---------------------------------------------------------------------------
-// `QueryEngine` trait — the abstraction the router holds.
-//
-// The trait is intentionally narrow: a single `execute(&str)` method (so it
-// integrates with both `ASAPQueryEngine::handle_query` and
-// `GorillaQueryEngine::execute` without forcing either side to refactor its
-// public surface), plus a `capabilities()` accessor the router consults at
-// registration time.
-// ---------------------------------------------------------------------------
-
-/// What a [`QueryEngine`] can serve. The router uses this to key its
-/// internal map (`data_source_id`) and to estimate cost when several
-/// compatible engines are registered.
-#[derive(Debug, Clone, Copy, PartialEq, Eq)]
-pub struct EngineCapabilities {
-    /// Stable identifier for the storage tier this engine answers from.
-    /// Must equal `self.storage_backend().data_source_id()`. Pinned so the
-    /// router can byte-compare and so dashboards parsing the wire response's
-    /// `data_source: <id>` info-line stay in sync.
-    pub data_source_id: &'static str,
-    /// Which physical tier this engine owns. The router asks
-    /// `compatible_storage_backends(...)` for an ordered list of
-    /// `StorageBackend`s and looks each up via this field.
-    pub storage_backend: StorageBackend,
-    /// Informational memory budget for streaming aggregation. The router does
-    /// not currently use it to rank eligible engines.
-    pub supports_streams_above_bytes: usize,
-}
-
-/// Dispatch interface for engines held as `Arc<dyn QueryEngine>`.
-/// Queries arrive as strings and results use the shared `QueryResult` shape.
-#[async_trait]
-pub trait QueryEngine: Send + Sync {
-    /// Answer `query` against this engine's storage tier.
-    async fn execute(&self, query: &str) -> Result<QueryResult, EngineError>;
-
-    /// Evaluate an instant query at an explicit Unix-millisecond timestamp.
-    /// Engines without a time-aware implementation retain their existing
-    /// behavior; the ASAP QueryPlan runtime overrides this method.
-    async fn execute_at(
-        &self,
-        query: &str,
-        evaluation_ms: u64,
-    ) -> Result<QueryResult, EngineError> {
-        let _ = evaluation_ms;
-        self.execute(query).await
-    }
-
-    /// Forward a range query to this engine's storage tier.
-    ///
-    /// Params are milliseconds since epoch. The default returns `CapabilityMiss`
-    /// so existing impls need not change; override when the engine has native
-    /// range-query support (e.g. the ASAP-tier reducer).
-    async fn execute_range(
-        &self,
-        query: &str,
-        start_ms: u64,
-        end_ms: u64,
-        step_ms: u64,
-    ) -> Result<QueryResult, EngineError> {
-        let _ = (query, start_ms, end_ms, step_ms);
-        Err(EngineError::capability_miss(
-            self.capabilities().data_source_id,
-            "execute_range not implemented for this engine",
-        ))
-    }
-
-    /// What this engine can serve. Cheap; the router calls it on every
-    /// `register` and may re-call to refresh cost estimates.
-    fn capabilities(&self) -> EngineCapabilities;
-}
-
-// ---------------------------------------------------------------------------
-// `EngineRouter` — the dispatcher.
-// ---------------------------------------------------------------------------
-
-/// Errors surfaced by [`EngineRouter::execute`] when neither the head engine
-/// nor any failover backend can answer the query.
-#[derive(Debug, Error)]
-pub enum EngineRouterError {
-    /// The router has no engine registered for any of the compatible
-    /// backends. This is a configuration bug — the deploy didn't
-    /// register an engine for a tier the metric is supposed to use.
-    #[error(
-        "no engine registered for any compatible backend; \
-         tried {tried:?}, registered={registered:?}"
-    )]
-    NoEngineRegistered {
-        tried: Vec<StorageBackend>,
-        registered: Vec<&'static str>,
-    },
-
-    /// The router walked the failover sequence and every engine errored
-    /// or missed. Returns the *last* error so callers see the deepest
-    /// failure (typically the cold-tier fallback's error, which is the
-    /// most informative).
-    #[error("all compatible engines failed; last error: {last}")]
-    AllFailed { last: EngineError },
-}
-
-/// Dispatches PromQL queries to the engine that owns the chosen storage
-/// tier. Built once at startup, cloned cheaply (the inner map holds
-/// `Arc<dyn QueryEngine>` so engines are shared, not duplicated).
-#[derive(Default, Clone)]
-pub struct EngineRouter {
-    /// Keyed by [`EngineCapabilities::data_source_id`] for O(1) lookup.
-    engines: HashMap<&'static str, Arc<dyn QueryEngine>>,
-}
-
-impl EngineRouter {
-    /// Build an empty router. Use [`Self::register`] to plug engines in.
-    pub fn new() -> Self {
-        Self {
-            engines: HashMap::new(),
-        }
-    }
-
-    /// Register an engine. The router keys it by
-    /// `engine.capabilities().data_source_id`. If two engines claim the
-    /// same `data_source_id` the later registration wins (matches
-    /// `HashMap::insert` semantics; tests assume this for hot-swap).
-    pub fn register(&mut self, engine: Arc<dyn QueryEngine>) {
-        let caps = engine.capabilities();
-        debug!(
-            data_source_id = caps.data_source_id,
-            backend = ?caps.storage_backend,
-            "router: registering engine",
-        );
-        self.engines.insert(caps.data_source_id, engine);
-    }
-
-    /// Number of engines registered. Test-only convenience.
-    pub fn len(&self) -> usize {
-        self.engines.len()
-    }
-
-    /// Whether no engines are registered. Test-only convenience.
-    pub fn is_empty(&self) -> bool {
-        self.engines.is_empty()
-    }
-
-    /// Look up a registered engine by its `data_source_id`. Returns
-    /// `None` when no engine has registered under that id.
-    ///
-    /// Used by the per-query engine override path in the HTTP layer
-    /// (`X-ASAP-Engine` header / `?engine=` query param). Bypasses the
-    /// capability matrix entirely — the caller has explicitly named the
-    /// engine and accepts the consequences. Used by the accuracy
-    /// reducer to query the same PromQL against the warm sketch and
-    /// a second named engine so it can compute apples-to-apples
-    /// relative error.
-    pub fn engine_by_id(&self, data_source_id: &str) -> Option<&Arc<dyn QueryEngine>> {
-        self.engines.get(data_source_id)
-    }
-
-    /// Iterate over the `data_source_id`s of every registered engine.
-    /// Used by the HTTP layer to surface a useful error message when
-    /// an explicit `X-ASAP-Engine` override names an engine that
-    /// hasn't been registered.
-    pub fn registered_ids(&self) -> impl Iterator<Item = &'static str> + '_ {
-        self.engines.keys().copied()
-    }
-
-    /// Walk the compatible-backend list for `(stat, metric_storage)`,
-    /// dispatch to the first registered engine, and (on
-    /// [`EngineError::Backend`] or [`EngineError::CapabilityMiss`]) fall
-    /// through to the next compatible backend.
-    ///
-    /// On exhaustion returns either:
-    /// - [`EngineRouterError::NoEngineRegistered`] if zero of the
-    ///   compatible backends had an engine registered, or
-    /// - [`EngineRouterError::AllFailed`] if every registered engine in
-    ///   the failover sequence returned an error.
-    pub async fn execute(
-        &self,
-        query: &str,
-        stat: Statistic,
-        metric_storage: StorageBackend,
-    ) -> Result<QueryResult, EngineRouterError> {
-        self.execute_routed(query, stat, metric_storage)
-            .await
-            .map(|(result, _)| result)
-    }
-
-    /// Instant dispatch that also returns the canonical id of the engine that
-    /// answered. HTTP callers use this to report truthful provenance after a
-    /// routing decision.
-    pub async fn execute_routed(
-        &self,
-        query: &str,
-        stat: Statistic,
-        metric_storage: StorageBackend,
-    ) -> Result<(QueryResult, &'static str), EngineRouterError> {
-        let backends = compatible_storage_backends(stat, metric_storage);
-        debug!(
-            query = query,
-            stat = ?stat,
-            metric_storage = ?metric_storage,
-            backends = ?backends,
-            "router: dispatching",
-        );
-
-        let mut last_err: Option<EngineError> = None;
-        let mut any_engine_tried = false;
-
-        for backend in &backends {
-            let id = backend.data_source_id();
-            let Some(engine) = self.engines.get(id) else {
-                debug!(
-                    backend = ?backend,
-                    data_source_id = id,
-                    "router: no engine registered, trying next failover",
-                );
-                continue;
-            };
-            any_engine_tried = true;
-            match engine.execute(query).await {
-                Ok(result) => {
-                    debug!(
-                        backend = ?backend,
-                        "router: dispatch succeeded",
-                    );
-                    return Ok((result, id));
-                }
-                Err(e @ EngineError::Physical(_)) => {
-                    return Err(EngineRouterError::AllFailed { last: e });
-                }
-                Err(e) => {
-                    warn!(
-                        backend = ?backend,
-                        error = %e,
-                        "router: engine failed, falling through to next backend",
-                    );
-                    last_err = Some(e);
-                }
-            }
-        }
-
-        if !any_engine_tried {
-            return Err(EngineRouterError::NoEngineRegistered {
-                tried: backends,
-                registered: self.engines.keys().copied().collect(),
-            });
-        }
-
-        Err(EngineRouterError::AllFailed {
-            last: last_err.expect("at least one engine ran (any_engine_tried=true)"),
-        })
-    }
-
-    /// Range-query sibling of [`Self::execute`]. Walks the identical
-    /// compatible-backend list for `(stat, metric_storage)`, but
-    /// dispatches to `engine.execute_range(query, start_ms, end_ms,
-    /// step_ms)` instead of `engine.execute(query)`.
-    ///
-    /// On exhaustion returns the same [`EngineRouterError`] variants as
-    /// [`Self::execute`]; the HTTP handler turns those into a Prometheus
-    /// fallback (#746).
-    #[allow(clippy::too_many_arguments)]
-    pub async fn execute_range(
-        &self,
-        query: &str,
-        stat: Statistic,
-        metric_storage: StorageBackend,
-        start_ms: u64,
-        end_ms: u64,
-        step_ms: u64,
-    ) -> Result<QueryResult, EngineRouterError> {
-        self.execute_range_routed(query, stat, metric_storage, start_ms, end_ms, step_ms)
-            .await
-            .map(|(result, _)| result)
-    }
-
-    /// Range dispatch with the identity of the engine that produced the
-    /// successful result. Transport adapters use this to annotate responses
-    /// truthfully.
-    #[allow(clippy::too_many_arguments)]
-    pub async fn execute_range_routed(
-        &self,
-        query: &str,
-        stat: Statistic,
-        metric_storage: StorageBackend,
-        start_ms: u64,
-        end_ms: u64,
-        step_ms: u64,
-    ) -> Result<(QueryResult, &'static str), EngineRouterError> {
-        let backends = compatible_storage_backends(stat, metric_storage);
-        debug!(
-            query = query,
-            stat = ?stat,
-            metric_storage = ?metric_storage,
-            backends = ?backends,
-            start_ms,
-            end_ms,
-            step_ms,
-            "router: dispatching range query",
-        );
-
-        let mut last_err: Option<EngineError> = None;
-        let mut any_engine_tried = false;
-
-        for backend in &backends {
-            let id = backend.data_source_id();
-            let Some(engine) = self.engines.get(id) else {
-                debug!(
-                    backend = ?backend,
-                    data_source_id = id,
-                    "router: no engine registered, trying next failover (range)",
-                );
-                continue;
-            };
-            any_engine_tried = true;
-            match engine.execute_range(query, start_ms, end_ms, step_ms).await {
-                Ok(result) => {
-                    debug!(
-                        backend = ?backend,
-                        "router: range dispatch succeeded",
-                    );
-                    return Ok((result, id));
-                }
-                Err(e @ EngineError::Physical(_)) => {
-                    return Err(EngineRouterError::AllFailed { last: e });
-                }
-                Err(e) => {
-                    warn!(
-                        backend = ?backend,
-                        error = %e,
-                        "router: engine failed on range query, falling through to next backend",
-                    );
-                    last_err = Some(e);
-                }
-            }
-        }
-
-        if !any_engine_tried {
-            return Err(EngineRouterError::NoEngineRegistered {
-                tried: backends,
-                registered: self.engines.keys().copied().collect(),
-            });
-        }
-
-        Err(EngineRouterError::AllFailed {
-            last: last_err.expect("at least one engine ran (any_engine_tried=true)"),
-        })
-    }
-}
-
-// ---------------------------------------------------------------------------
-// Tests
-// ---------------------------------------------------------------------------
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use crate::query_engines::query_result::QueryResult;
-    use std::sync::atomic::{AtomicUsize, Ordering};
-
-    /// Stub engine that records call counts and returns either a canned
-    /// vector result or a configured error. Keeps the router tests
-    /// hermetic — no ASAPQueryEngine / GorillaQueryEngine wire-up needed.
-    struct StubEngine {
-        caps: EngineCapabilities,
-        calls: Arc<AtomicUsize>,
-        outcome: Outcome,
-    }
-
-    enum Outcome {
-        Ok,
-        Backend,
-        CapabilityMiss,
-    }
-
-    impl StubEngine {
-        fn new(backend: StorageBackend, outcome: Outcome) -> (Arc<Self>, Arc<AtomicUsize>) {
-            let calls = Arc::new(AtomicUsize::new(0));
-            let engine = Arc::new(Self {
-                caps: EngineCapabilities {
-                    data_source_id: backend.data_source_id(),
-                    storage_backend: backend,
-                    supports_streams_above_bytes: 1024 * 1024,
-                },
-                calls: calls.clone(),
-                outcome,
-            });
-            (engine, calls)
-        }
-    }
-
-    #[async_trait]
-    impl QueryEngine for StubEngine {
-        async fn execute(&self, _query: &str) -> Result<QueryResult, EngineError> {
-            self.calls.fetch_add(1, Ordering::SeqCst);
-            match self.outcome {
-                Outcome::Ok => Ok(QueryResult::vector(Vec::new(), 0)),
-                Outcome::Backend => Err(EngineError::backend(
-                    self.caps.data_source_id,
-                    "simulated backend failure",
-                )),
-                Outcome::CapabilityMiss => Err(EngineError::capability_miss(
-                    self.caps.data_source_id,
-                    "no compatible aggregation",
-                )),
-            }
-        }
-        // Mirror `execute`'s outcome so the router's range failover loop
-        // can be exercised hermetically (the trait default would always
-        // CapabilityMiss, which wouldn't test Ok / Backend dispatch).
-        async fn execute_range(
-            &self,
-            _query: &str,
-            _start_ms: u64,
-            _end_ms: u64,
-            _step_ms: u64,
-        ) -> Result<QueryResult, EngineError> {
-            self.calls.fetch_add(1, Ordering::SeqCst);
-            match self.outcome {
-                Outcome::Ok => Ok(QueryResult::matrix(Vec::new())),
-                Outcome::Backend => Err(EngineError::backend(
-                    self.caps.data_source_id,
-                    "simulated backend failure (range)",
-                )),
-                Outcome::CapabilityMiss => Err(EngineError::capability_miss(
-                    self.caps.data_source_id,
-                    "no compatible aggregation (range)",
-                )),
-            }
-        }
-        fn capabilities(&self) -> EngineCapabilities {
-            self.caps
-        }
-    }
-
-    #[tokio::test]
-    async fn router_dispatches_to_asap_tier_for_sketch_metrics() {
-        let mut router = EngineRouter::new();
-        let (warm, warm_calls) = StubEngine::new(StorageBackend::SketchStore, Outcome::Ok);
-        let (archive, archive_calls) = StubEngine::new(StorageBackend::DoubleWrite, Outcome::Ok);
-        router.register(warm);
-        router.register(archive);
-
-        let result = router
-            .execute(
-                "sum_over_time(foo[5m])",
-                Statistic::Sum,
-                StorageBackend::SketchStore,
-            )
-            .await;
-        assert!(result.is_ok());
-        assert_eq!(warm_calls.load(Ordering::SeqCst), 1);
-        assert_eq!(
-            archive_calls.load(Ordering::SeqCst),
-            0,
-            "archive must not run for a ASAP-tier-only metric (Step-1 deleted the JSONL fallback slot)",
-        );
-    }
-
-    #[tokio::test]
-    async fn router_dispatches_double_write_metrics_to_the_sketch_tier() {
-        let mut router = EngineRouter::new();
-        let (warm, warm_calls) = StubEngine::new(StorageBackend::SketchStore, Outcome::Ok);
-        let (gorilla, gorilla_calls) = StubEngine::new(StorageBackend::DoubleWrite, Outcome::Ok);
-        router.register(warm);
-        router.register(gorilla);
-
-        let result = router
-            .execute(
-                "sum_over_time(audit_events[1h])",
-                Statistic::Sum,
-                StorageBackend::DoubleWrite,
-            )
-            .await;
-        assert!(result.is_ok());
-        assert_eq!(
-            warm_calls.load(Ordering::SeqCst),
-            1,
-            "#746: every ASAP-managed axis answers from the sketch tier",
-        );
-        assert_eq!(
-            gorilla_calls.load(Ordering::SeqCst),
-            0,
-            "no archive engine is dispatched to any more",
-        );
-    }
-
-    #[tokio::test]
-    async fn router_surfaces_warm_miss_on_double_write_instead_of_failing_over() {
-        // #746: with the archive tier gone a double-write query has only
-        // the sketch tier to try. A CapabilityMiss is terminal here — the
-        // HTTP handler turns it into a Prometheus fallback.
-        let mut router = EngineRouter::new();
-        let (warm, warm_calls) =
-            StubEngine::new(StorageBackend::SketchStore, Outcome::CapabilityMiss);
-        let (gorilla, gorilla_calls) = StubEngine::new(StorageBackend::DoubleWrite, Outcome::Ok);
-        router.register(warm);
-        router.register(gorilla);
-
-        let result = router
-            .execute(
-                "sum_over_time(foo[5m])",
-                Statistic::Sum,
-                StorageBackend::DoubleWrite,
-            )
-            .await;
-        assert!(
-            matches!(result, Err(EngineRouterError::AllFailed { .. })),
-            "a warm CapabilityMiss is terminal without an archive leg; got {result:?}",
-        );
-        assert_eq!(warm_calls.load(Ordering::SeqCst), 1);
-        assert_eq!(
-            gorilla_calls.load(Ordering::SeqCst),
-            0,
-            "the archive leg no longer exists",
-        );
-    }
-
-    #[tokio::test]
-    async fn router_with_no_engines_errors_cleanly() {
-        let router = EngineRouter::new();
-        let result = router
-            .execute(
-                "sum_over_time(foo[5m])",
-                Statistic::Sum,
-                StorageBackend::SketchStore,
-            )
-            .await;
-        match result {
-            Err(EngineRouterError::NoEngineRegistered { tried, registered }) => {
-                // #746: the archive leg is gone, so the list is the
-                // sketch tier alone.
-                assert_eq!(tried, vec![StorageBackend::SketchStore]);
-                assert!(registered.is_empty());
-            }
-            other => panic!("expected NoEngineRegistered, got {other:?}"),
-        }
-    }
-
-    #[tokio::test]
-    async fn router_returns_all_failed_when_every_engine_errors() {
-        // After Step-1 deleted JSONL, the SketchStore failover
-        // sequence is just `[SketchStore]`. A failing ASAP-tier
-        // engine is the only error path on this metric.
-        let mut router = EngineRouter::new();
-        let (warm, _) = StubEngine::new(StorageBackend::SketchStore, Outcome::Backend);
-        router.register(warm);
-
-        let result = router
-            .execute(
-                "sum_over_time(foo[5m])",
-                Statistic::Sum,
-                StorageBackend::SketchStore,
-            )
-            .await;
-        match result {
-            Err(EngineRouterError::AllFailed { last }) => {
-                assert!(matches!(last, EngineError::Backend { .. }));
-            }
-            other => panic!("expected AllFailed, got {other:?}"),
-        }
-    }
-
-    #[tokio::test]
-    async fn engine_by_id_returns_registered_engines_or_none() {
-        let mut router = EngineRouter::new();
-        let (warm, _) = StubEngine::new(StorageBackend::SketchStore, Outcome::Ok);
-        let (gorilla, gorilla_calls) = StubEngine::new(StorageBackend::DoubleWrite, Outcome::Ok);
-        router.register(warm);
-        router.register(gorilla);
-
-        // Hit by id — must return the engine for that backend.
-        let second = router
-            .engine_by_id("double_write")
-            .expect("double_write engine registered");
-        let _ = second.execute("count(foo)").await;
-        assert_eq!(
-            gorilla_calls.load(Ordering::SeqCst),
-            1,
-            "engine_by_id must return the engine that was registered under that id",
-        );
-
-        // Miss — unknown id returns None.
-        assert!(router.engine_by_id("does_not_exist").is_none());
-
-        // Iter exposes every registered id.
-        let mut ids: Vec<&str> = router.registered_ids().collect();
-        ids.sort();
-        assert_eq!(ids, vec!["asap_query", "double_write"]);
-    }
-
-    #[tokio::test]
-    async fn register_overwrites_same_data_source_id() {
-        let mut router = EngineRouter::new();
-        let (first, first_calls) = StubEngine::new(StorageBackend::SketchStore, Outcome::Ok);
-        let (second, second_calls) = StubEngine::new(StorageBackend::SketchStore, Outcome::Ok);
-        router.register(first);
-        router.register(second);
-        assert_eq!(
-            router.len(),
-            1,
-            "two registrations under same id collapse to one"
-        );
-
-        let _ = router
-            .execute(
-                "sum_over_time(foo[5m])",
-                Statistic::Sum,
-                StorageBackend::SketchStore,
-            )
-            .await;
-        assert_eq!(first_calls.load(Ordering::SeqCst), 0);
-        assert_eq!(
-            second_calls.load(Ordering::SeqCst),
-            1,
-            "later registration wins"
-        );
-    }
-
-    /// a routing-table entry with
-    /// `metric_storage = StorageBackend::PrometheusRemote` must
-    /// dispatch to the engine registered under `prometheus_remote`.
-    /// Mirrors the gorilla-archive single-backend dispatch test;
-    /// PrometheusRemote also has no failover (the metric's data
-    /// never landed in ASAP-managed storage) so the failover
-    /// sequence is just `[PrometheusRemote]`.
-    #[tokio::test]
-    async fn router_dispatches_to_prometheus_remote_for_mode3_metrics() {
-        let mut router = EngineRouter::new();
-        let (prom, prom_calls) = StubEngine::new(StorageBackend::PrometheusRemote, Outcome::Ok);
-        let (warm, warm_calls) = StubEngine::new(StorageBackend::SketchStore, Outcome::Ok);
-        router.register(prom);
-        router.register(warm);
-
-        let result = router
-            .execute(
-                "rate(node_cpu_seconds_total[5m])",
-                Statistic::Rate,
-                StorageBackend::PrometheusRemote,
-            )
-            .await;
-        assert!(result.is_ok());
-        assert_eq!(prom_calls.load(Ordering::SeqCst), 1);
-        assert_eq!(
-            warm_calls.load(Ordering::SeqCst),
-            0,
-            "ASAP-tier must not run for a Mode 3 metric — Prometheus owns the storage",
-        );
-    }
-
-    /// when `ASAP_PROMETHEUS_QUERY_URL` is unset the
-    /// `prometheus_remote` engine is not registered, and a routing
-    /// entry that targets it must surface a clear
-    /// `NoEngineRegistered` error rather than silently falling
-    /// through.
-    #[tokio::test]
-    async fn router_with_no_prometheus_engine_errors_for_mode3_metric() {
-        let router = EngineRouter::new();
-        let result = router
-            .execute(
-                "rate(node_cpu_seconds_total[5m])",
-                Statistic::Rate,
-                StorageBackend::PrometheusRemote,
-            )
-            .await;
-        match result {
-            Err(EngineRouterError::NoEngineRegistered { tried, registered }) => {
-                assert_eq!(tried, vec![StorageBackend::PrometheusRemote]);
-                assert!(registered.is_empty());
-            }
-            other => panic!("expected NoEngineRegistered, got {other:?}"),
-        }
-    }
-
-    // ── range-query dispatch (`EngineRouter::execute_range`) ────────────
-
-    /// ASAP-first refactor: an `Approximate` range query tries the
-    /// ASAP-tier sketch first and answers there when it can.
-    #[tokio::test]
-    async fn router_range_dispatches_to_asap_tier_first() {
-        let mut router = EngineRouter::new();
-        let (warm, warm_calls) = StubEngine::new(StorageBackend::SketchStore, Outcome::Ok);
-        let (archive, archive_calls) = StubEngine::new(StorageBackend::DoubleWrite, Outcome::Ok);
-        router.register(warm);
-        router.register(archive);
-
-        let result = router
-            .execute_range(
-                "rate(http_requests_total[1m])",
-                Statistic::Sum,
-                StorageBackend::SketchStore,
-                1_700_000_000_000,
-                1_700_003_600_000,
-                15_000,
-            )
-            .await;
-        assert!(result.is_ok());
-        assert_eq!(warm_calls.load(Ordering::SeqCst), 1);
-        assert_eq!(
-            archive_calls.load(Ordering::SeqCst),
-            0,
-            "archive must not run when the ASAP-tier answers the range query",
-        );
-    }
-
-    /// #746: a range CapabilityMiss in the ASAP tier is terminal — there
-    /// is no archive leg to fail over to. The HTTP handler turns this into
-    /// a Prometheus fallback.
-    #[tokio::test]
-    async fn router_range_surfaces_capability_miss_without_archive_failover() {
-        let mut router = EngineRouter::new();
-        let (warm, warm_calls) =
-            StubEngine::new(StorageBackend::SketchStore, Outcome::CapabilityMiss);
-        let (archive, archive_calls) = StubEngine::new(StorageBackend::DoubleWrite, Outcome::Ok);
-        router.register(warm);
-        router.register(archive);
-
-        let result = router
-            .execute_range(
-                "rate(http_requests_total[1m])",
-                Statistic::Sum,
-                StorageBackend::SketchStore,
-                0,
-                1_000,
-                1_000,
-            )
-            .await;
-        assert!(
-            matches!(result, Err(EngineRouterError::AllFailed { .. })),
-            "a warm CapabilityMiss is terminal for ranges too; got {result:?}",
-        );
-        assert_eq!(warm_calls.load(Ordering::SeqCst), 1);
-        assert_eq!(
-            archive_calls.load(Ordering::SeqCst),
-            0,
-            "the archive leg no longer exists",
-        );
-    }
-
-    /// #746: every ASAP-managed axis — `DoubleWrite` included — answers
-    /// range queries from the sketch tier. (`Exact` requests never reach
-    /// the router; the HTTP handler forwards them to Prometheus.)
-    #[tokio::test]
-    async fn router_range_double_write_answers_from_the_sketch_tier() {
-        let mut router = EngineRouter::new();
-        let (warm, warm_calls) = StubEngine::new(StorageBackend::SketchStore, Outcome::Ok);
-        let (archive, archive_calls) = StubEngine::new(StorageBackend::DoubleWrite, Outcome::Ok);
-        router.register(warm);
-        router.register(archive);
-
-        let result = router
-            .execute_range(
-                "audit_events",
-                Statistic::Sum,
-                StorageBackend::DoubleWrite,
-                0,
-                1_000,
-                1_000,
-            )
-            .await;
-        assert!(result.is_ok());
-        assert_eq!(warm_calls.load(Ordering::SeqCst), 1);
-        assert_eq!(
-            archive_calls.load(Ordering::SeqCst),
-            0,
-            "no archive engine is dispatched to any more",
-        );
-    }
-}
diff --git a/data_plane/src/remote_write.rs b/data_plane/src/remote_write.rs
new file mode 100644
index 000000000..55a864a73
--- /dev/null
+++ b/data_plane/src/remote_write.rs
@@ -0,0 +1,208 @@
+//! Prometheus Remote Write v1 decoding and validation.
+
+use prost::Message;
+
+#[derive(Clone, PartialEq, Message)]
+pub struct WriteRequest {
+    #[prost(message, repeated, tag = "1")]
+    pub timeseries: Vec<TimeSeries>,
+}
+
+#[derive(Clone, PartialEq, Message)]
+pub struct TimeSeries {
+    #[prost(message, repeated, tag = "1")]
+    pub labels: Vec<Label>,
+    #[prost(message, repeated, tag = "2")]
+    pub samples: Vec<Sample>,
+}
+
+#[derive(Clone, PartialEq, Message)]
+pub struct Label {
+    #[prost(string, tag = "1")]
+    pub name: String,
+    #[prost(string, tag = "2")]
+    pub value: String,
+}
+
+#[derive(Clone, PartialEq, Message)]
+pub struct Sample {
+    #[prost(double, tag = "1")]
+    pub value: f64,
+    #[prost(int64, tag = "2")]
+    pub timestamp: i64,
+}
+
+/// Request size limits; a request over any limit is rejected whole.
+#[derive(Debug, Clone)]
+pub struct Limits {
+    pub max_compressed_bytes: usize,
+    pub max_decompressed_bytes: usize,
+    pub max_samples: usize,
+}
+
+impl Default for Limits {
+    fn default() -> Self {
+        Self {
+            max_compressed_bytes: 32 * 1024 * 1024,
+            max_decompressed_bytes: 128 * 1024 * 1024,
+            max_samples: 1_000_000,
+        }
+    }
+}
+
+#[derive(Debug, thiserror::Error, PartialEq)]
+pub enum RemoteWriteError {
+    #[error("compressed request exceeds {0} bytes")]
+    CompressedTooLarge(usize),
+    #[error("decompressed request exceeds {0} bytes")]
+    DecompressedTooLarge(usize),
+    #[error("snappy decompression failed: {0}")]
+    Snappy(String),
+    #[error("protobuf decoding failed: {0}")]
+    Protobuf(String),
+    #[error("request has more than {0} samples")]
+    TooManySamples(usize),
+    #[error("series without a __name__ label")]
+    MissingMetricName,
+    #[error("series has duplicate label {0:?}")]
+    DuplicateLabel(String),
+}
+
+/// Decodes a snappy-compressed Remote Write v1 body. Every series must name
+/// its metric and carry each label once.
+pub fn decode(body: &[u8], limits: &Limits) -> Result<WriteRequest, RemoteWriteError> {
+    if body.len() > limits.max_compressed_bytes {
+        return Err(RemoteWriteError::CompressedTooLarge(
+            limits.max_compressed_bytes,
+        ));
+    }
+    let len =
+        snap::raw::decompress_len(body).map_err(|e| RemoteWriteError::Snappy(e.to_string()))?;
+    if len > limits.max_decompressed_bytes {
+        return Err(RemoteWriteError::DecompressedTooLarge(
+            limits.max_decompressed_bytes,
+        ));
+    }
+    let decoded = snap::raw::Decoder::new()
+        .decompress_vec(body)
+        .map_err(|e| RemoteWriteError::Snappy(e.to_string()))?;
+    let request = WriteRequest::decode(decoded.as_slice())
+        .map_err(|e| RemoteWriteError::Protobuf(e.to_string()))?;
+    let samples: usize = request.timeseries.iter().map(|s| s.samples.len()).sum();
+    if samples > limits.max_samples {
+        return Err(RemoteWriteError::TooManySamples(limits.max_samples));
+    }
+    for series in &request.timeseries {
+        let mut names: Vec<&str> = series.labels.iter().map(|l| l.name.as_str()).collect();
+        names.sort_unstable();
+        if let Some(pair) = names.windows(2).find(|pair| pair[0] == pair[1]) {
+            return Err(RemoteWriteError::DuplicateLabel(pair[0].to_string()));
+        }
+        if !names.contains(&"__name__") {
+            return Err(RemoteWriteError::MissingMetricName);
+        }
+    }
+    Ok(request)
+}
+
+/// Snappy-compressed encoding of `request`, as a Remote Write sender sends it.
+pub fn encode(request: &WriteRequest) -> Vec<u8> {
+    snap::raw::Encoder::new()
+        .compress_vec(&request.encode_to_vec())
+        .expect("snappy compresses any input")
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    fn series(labels: &[(&str, &str)], samples: &[(i64, f64)]) -> TimeSeries {
+        TimeSeries {
+            labels: labels
+                .iter()
+                .map(|(name, value)| Label {
+                    name: name.to_string(),
+                    value: value.to_string(),
+                })
+                .collect(),
+            samples: samples
+                .iter()
+                .map(|&(timestamp, value)| Sample { value, timestamp })
+                .collect(),
+        }
+    }
+
+    /// A well-formed request decodes to the series and samples it was built from.
+    #[test]
+    fn decodes_what_a_sender_encodes() {
+        let request = WriteRequest {
+            timeseries: vec![series(
+                &[("__name__", "http_requests_total"), ("job", "api")],
+                &[(1_000, 1.0), (16_000, 3.0)],
+            )],
+        };
+        assert_eq!(decode(&encode(&request), &Limits::default()), Ok(request));
+    }
+
+    /// Bodies that are not snappy or not Remote Write protobuf are rejected.
+    #[test]
+    fn rejects_malformed_bodies() {
+        let limits = Limits::default();
+        assert!(matches!(
+            decode(b"not snappy", &limits),
+            Err(RemoteWriteError::Snappy(_))
+        ));
+        let garbage = snap::raw::Encoder::new().compress_vec(&[0xff; 8]).unwrap();
+        assert!(matches!(
+            decode(&garbage, &limits),
+            Err(RemoteWriteError::Protobuf(_))
+        ));
+    }
+
+    /// Series must name their metric and may not repeat a label.
+    #[test]
+    fn rejects_invalid_series() {
+        let limits = Limits::default();
+        let unnamed = WriteRequest {
+            timeseries: vec![series(&[("job", "api")], &[(1, 1.0)])],
+        };
+        assert_eq!(
+            decode(&encode(&unnamed), &limits),
+            Err(RemoteWriteError::MissingMetricName)
+        );
+        let duplicate = WriteRequest {
+            timeseries: vec![series(
+                &[("__name__", "x"), ("job", "a"), ("job", "b")],
+                &[(1, 1.0)],
+            )],
+        };
+        assert_eq!(
+            decode(&encode(&duplicate), &limits),
+            Err(RemoteWriteError::DuplicateLabel("job".into()))
+        );
+    }
+
+    /// Requests over a size limit are rejected before they are processed.
+    #[test]
+    fn enforces_limits() {
+        let request = WriteRequest {
+            timeseries: vec![series(&[("__name__", "x")], &[(1, 1.0), (2, 2.0)])],
+        };
+        let limits = Limits {
+            max_samples: 1,
+            ..Limits::default()
+        };
+        assert_eq!(
+            decode(&encode(&request), &limits),
+            Err(RemoteWriteError::TooManySamples(1))
+        );
+        let limits = Limits {
+            max_compressed_bytes: 1,
+            ..Limits::default()
+        };
+        assert_eq!(
+            decode(&encode(&request), &limits),
+            Err(RemoteWriteError::CompressedTooLarge(1))
+        );
+    }
+}
diff --git a/data_plane/src/storage_engines/mod.rs b/data_plane/src/storage_engines/mod.rs
deleted file mode 100644
index e752580b6..000000000
--- a/data_plane/src/storage_engines/mod.rs
+++ /dev/null
@@ -1,29 +0,0 @@
-//! Store layer.
-//!
-//! * `traits` — the `Store` trait every concrete store implements.
-//! * `types` — data types used by the storage layer (and consumed
-//!   cross-module by drivers / precompute_engine / query_engines).
-//!   Renamed from `schema/` in the 2026-05 reorg to avoid the
-//!   name-clash with `sketch_db::schema/` (per-`agg_id` lifecycle).
-//! * `sketch_db` — the in-memory + persisted sketch DB. Logical
-//!   layer (schema registry, schema timeline, backfill types /
-//!   workers / HTTP endpoints) AND the physical storage backend
-//!   (`sketch_db::index`) are co-located under this path.
-//!
-//! There is no archive tier: the superseded in-process
-//! `gorilla_object_store` (custom GORILLA1 container format) and the
-//! Thanos forwarder that replaced it have both been deleted (#746).
-//!
-//! `SketchStore` is re-exported at the top level
-//! (`crate::storage_engines::SketchStore`) for call-site stability.
-
-pub mod sketch_db;
-pub mod traits;
-pub mod types;
-
-pub use sketch_db::index::{
-    AccuracyBound, Capability, SeriesLookup, SketchAlgorithm, SketchConfig, SketchEncoding,
-    SketchSampleState, SketchStore, SketchTimeSeries, SummarySeriesMetadata,
-};
-pub use sketch_db::AggStatus;
-pub use traits::*;
diff --git a/data_plane/src/storage_engines/sketch_db/accuracy.rs b/data_plane/src/storage_engines/sketch_db/accuracy.rs
deleted file mode 100644
index 084c87cc6..000000000
--- a/data_plane/src/storage_engines/sketch_db/accuracy.rs
+++ /dev/null
@@ -1,779 +0,0 @@
-//! `AccuracyProfile` — derived error / confidence bound for each
-//! `PrecomputeMaterialization`.
-//!
-//! Implements backend accuracy metadata consumed through SummaryCatalog and QueryPlan. Logical
-//! guarantees are owned by ASAPPlanner and family bounds by summary libraries.
-//! Given the `aggregation_type` + `parameters` pinned on an
-//! `AggSchema`, the registry can expose the theoretical accuracy
-//! bound of every query answer computed from it — so users and
-//! control planes see "this quantile is within ε relative error with
-//! probability 1 - δ" as a first-class part of the schema, not a
-//! number they have to rederive from the sketch literature.
-//!
-//! ## Scope of this module
-//!
-//! Pure derivation: `derive(&PrecomputeMaterialization)`
-//! looks at `aggregation_type` and the relevant entries in
-//! `config.parameters` and returns an `AccuracyProfile`. No
-//! runtime measurement, no sampling — just the textbook bound.
-//!
-//! These bounds are asymptotic / probabilistic worst-case
-//! guarantees from the original sketch papers. Real error
-//! distributions are often tighter; see §19 of the design doc
-//! for empirical vs theoretical. For user-facing renderings
-//! ("how far off might this answer be?") the theoretical bound
-//! is the honest upper envelope.
-//!
-//! CMS, HLL, KLL, and DDSketch profiles come from ASAPPlanner's
-//! `DefaultAccuracyModel`. HLL reports relative standard error with unknown
-//! failure probability (`delta: null`), rather than a deterministic guarantee.
-//! CountSketch, heap-retention extensions, and GOS augmentation remain local.
-
-use serde::{Deserialize, Serialize};
-
-use asap_types::aggregation_config::PrecomputeMaterialization;
-use asap_types::AggregationType;
-
-pub use asap_types::accuracy::{AccuracyKind, AccuracyProfile};
-use planner_types::post_asap::SketchParams as PlannerParams;
-
-/// Derive an [`AccuracyProfile`] from a pinned
-/// [`PrecomputeMaterialization`]. Reads `aggregation_type` and any
-/// necessary entries in `parameters`; falls back to exact for
-/// unknown / legacy variants (harmless — the caller just gets
-/// "0 error" rather than a panic).
-///
-/// GOS continuous-query envelope (design-gos-unified-edge-telemetry.md §4,
-/// Theorem 1): when the edge gates delta transmission by the GOS relative
-/// threshold (`parameters["gos_delta_epsilon"] = ε_st > 0`), the warm
-/// sketch answered from delta-applied state carries an extra DETERMINISTIC
-/// staleness term of at most `ε_st` (relative) at any query time — it adds
-/// linearly to the sketch's own probabilistic bound (`ε_total = ε_sk +
-/// ε_st`; the random parts compose in quadrature but the staleness part is
-/// adversarial, so linear addition is the honest envelope). δ is
-/// unchanged (staleness is not probabilistic).
-pub fn derive(config: &PrecomputeMaterialization) -> AccuracyProfile {
-    let mut profile = derive_sketch_only(config);
-    let eps_st = config
-        .parameters
-        .get("gos_delta_epsilon")
-        .and_then(|v| v.as_f64())
-        .unwrap_or(0.0);
-    if eps_st > 0.0 && profile.kind != AccuracyKind::Exact {
-        profile.epsilon += eps_st;
-    }
-    profile
-}
-
-/// Source adapter for installed aggregation configs.
-pub trait BackendAccuracyProfile {
-    fn derive(config: &PrecomputeMaterialization) -> Self;
-    fn derive_sketch_only(config: &PrecomputeMaterialization) -> Self;
-}
-impl BackendAccuracyProfile for AccuracyProfile {
-    fn derive(config: &PrecomputeMaterialization) -> Self {
-        derive(config)
-    }
-    fn derive_sketch_only(config: &PrecomputeMaterialization) -> Self {
-        derive_sketch_only(config)
-    }
-}
-
-/// The sketch's own theoretical bound, without the GOS staleness term.
-fn derive_sketch_only(config: &PrecomputeMaterialization) -> AccuracyProfile {
-    match config.aggregation_type {
-        AggregationType::UnivMon => AccuracyProfile {
-            epsilon: f64::MAX,
-            delta: Some(1.0),
-            kind: AccuracyKind::Uncalibrated,
-        },
-        // Exact aggregates. (The `SetAggregator` /
-        // `DeltaSetAggregator` exact-set-membership family lived
-        // here too before its retirement.)
-        AggregationType::Sum
-        | AggregationType::Count
-        | AggregationType::Increase
-        | AggregationType::Rate
-        | AggregationType::Min
-        | AggregationType::Max => AccuracyProfile::exact(),
-
-        AggregationType::CountMinSketch => {
-            let (rows, cols) = cms_params(config);
-            shared_profile(PlannerParams::Cms {
-                depth: u32::try_from(rows).unwrap_or(u32::MAX).max(1),
-                width: u32::try_from(cols).unwrap_or(u32::MAX).max(1),
-            })
-        }
-
-        // CountMinSketchWithHeap: CMS frequency estimator
-        // coupled with a heap of the top-`k` heaviest items
-        // (Metwally et al.'s SpaceSaving-style retention).
-        // Two bounds apply:
-        //   * per-item point-lookup: ε_point = e/w
-        //     (inherited from the CMS part)
-        //   * top-K retention: any item with true frequency
-        //     ≥ N/heap_size is guaranteed to be in the top-K
-        //     output; each retained count is within N/heap_size
-        //     of the true value (SpaceSaving guarantee).
-        // We report the **tighter** of the two as the
-        // user-facing ε — typically the heap bound
-        // `1/heap_size` dominates when heap_size ≪ w, and the
-        // CMS bound `e/w` dominates when the heap is generously
-        // sized. `kind = TopK` signals that ε is the
-        // combined frequency + retention guarantee.
-        // δ stays `exp(-d)` from the CMS half; retention itself
-        // is deterministic given an adversarial-free stream,
-        // but the count estimate remains probabilistic at
-        // depth d.
-        // Sources:
-        //   - Cormode & Muthukrishnan 2005 (CMS bound)
-        //   - Metwally, Agrawal, El Abbadi. "Efficient
-        //     computation of frequent and top-k elements in
-        //     data streams." ICDT 2005. (top-K retention)
-        AggregationType::CountMinSketchWithHeap => {
-            let (rows, cols) = cms_params(config);
-            let heap = cms_heap_size(config);
-            let cms = shared_profile(PlannerParams::Cms {
-                depth: u32::try_from(rows).unwrap_or(u32::MAX).max(1),
-                width: u32::try_from(cols).unwrap_or(u32::MAX).max(1),
-            });
-            let heap_epsilon = 1.0 / (heap as f64).max(1.0);
-            // Worst of the two — a user should expect errors
-            // no bigger than `ε · N`.
-            let epsilon = cms.epsilon.max(heap_epsilon);
-            let delta = cms.delta;
-            AccuracyProfile {
-                epsilon,
-                delta,
-                kind: AccuracyKind::TopK,
-            }
-        }
-
-        // CountSketch: ε = 1/√w, δ = 1/2^d (Charikar-Chen-
-        // Farach-Colton). Signed counters → tighter epsilon
-        // than CMS but same confidence ramp with depth.
-        AggregationType::CountSketch => {
-            let (rows, cols) = cms_params(config);
-            let epsilon = 1.0 / (cols as f64).max(1.0).sqrt();
-            let delta = Some(0.5_f64.powi(rows as i32));
-            AccuracyProfile {
-                epsilon,
-                delta,
-                kind: AccuracyKind::AdditiveFrequency,
-            }
-        }
-
-        // CountSketchWithHeap: CountSketch frequency estimator
-        // paired with a top-k heap. Mirrors the
-        // CountMinSketchWithHeap branch above — the CountSketch
-        // half gives ε_point = 1/√w; the heap half gives
-        // ε_heap = 1/heap_size for retention. Report the
-        // tighter (max) of the two.
-        AggregationType::CountSketchWithHeap => {
-            let (rows, cols) = cms_params(config);
-            let heap = cms_heap_size(config);
-            let cs_epsilon = 1.0 / (cols as f64).max(1.0).sqrt();
-            let heap_epsilon = 1.0 / (heap as f64).max(1.0);
-            let epsilon = cs_epsilon.max(heap_epsilon);
-            let delta = Some(0.5_f64.powi(rows as i32));
-            AccuracyProfile {
-                epsilon,
-                delta,
-                kind: AccuracyKind::TopK,
-            }
-        }
-
-        AggregationType::HLL => shared_profile(PlannerParams::Hll {
-            precision: u8::try_from(hll_precision(config)).unwrap_or(14),
-        }),
-        AggregationType::DatasketchesKLL | AggregationType::HydraKLL => {
-            shared_profile(PlannerParams::Kll {
-                k: kll_k(config).max(1),
-            })
-        }
-        AggregationType::DDSketch => shared_profile(PlannerParams::DDSketch {
-            alpha: ddsketch_alpha(config),
-        }),
-
-        // Legacy / wrapper variants. Return exact — they are
-        // config-shape placeholders that dispatch to concrete
-        // aggregator types elsewhere; their accuracy profile
-        // depends on the sub_type, which the factory resolves
-        // at updater-construction time. Phase 6.4 v2 can walk
-        // sub_type to give a tighter answer.
-        AggregationType::SingleSubpopulation | AggregationType::MultipleSubpopulation => {
-            AccuracyProfile::exact()
-        }
-    }
-}
-
-fn shared_profile(params: PlannerParams) -> AccuracyProfile {
-    AccuracyProfile::from_sketch_params(&params).expect("shared family has a numeric planner bound")
-}
-
-// Parameter extraction helpers. Kept file-local (not pub) because
-// they duplicate tiny bits of `precompute_engine::accumulator_factory`
-// and the backfill-vs-live separation rule (see that module's doc)
-// says it's OK for them to drift — this module is the single
-// authority on *accuracy*, not on *construction*.
-
-/// Read canonical depth `d` and width `w` parameters.
-fn cms_params(config: &PrecomputeMaterialization) -> (u64, u64) {
-    let rows = config
-        .parameters
-        .get("d")
-        .and_then(|v| v.as_u64())
-        .unwrap_or(4);
-    let cols = config
-        .parameters
-        .get("w")
-        .and_then(|v| v.as_u64())
-        .unwrap_or(1000);
-    (rows, cols)
-}
-
-fn hll_precision(config: &PrecomputeMaterialization) -> u32 {
-    config
-        .parameters
-        .get("precision")
-        .or_else(|| config.parameters.get("p"))
-        .and_then(|v| v.as_u64())
-        .and_then(|v| u32::try_from(v).ok())
-        .unwrap_or(14)
-}
-
-fn kll_k(config: &PrecomputeMaterialization) -> u32 {
-    config
-        .parameters
-        .get("K")
-        .or_else(|| config.parameters.get("k"))
-        .and_then(|v| v.as_u64())
-        .and_then(|v| u32::try_from(v).ok())
-        .unwrap_or(200)
-}
-
-fn ddsketch_alpha(config: &PrecomputeMaterialization) -> f64 {
-    config
-        .parameters
-        .get("alpha")
-        .and_then(|v| v.as_f64())
-        .unwrap_or(0.01)
-}
-
-/// CMS-with-heap heap size (the `k` in "top-k retention"). Read
-/// from `parameters["heap_size"]` with a default of 100 —
-/// matches the default the control plane's planner uses when the
-/// caller didn't override.
-fn cms_heap_size(config: &PrecomputeMaterialization) -> u64 {
-    config
-        .parameters
-        .get("heap_size")
-        .or_else(|| config.parameters.get("topk"))
-        .or_else(|| config.parameters.get("k"))
-        .and_then(|v| v.as_u64())
-        .unwrap_or(100)
-}
-
-/// Per-segment accuracy record. Attached to a multi-segment
-/// [`AccuracyEnvelope`] so clients can see the error bound for
-/// each piece of the schema-timeline-crossing query.
-#[derive(Debug, Clone, Serialize, Deserialize, PartialEq)]
-pub struct PerSegmentAccuracy {
-    pub agg_id: u64,
-    /// Half-open millisecond range `[start_ms, end_ms)` this
-    /// segment covered.
-    pub range_ms: [i64; 2],
-    #[serde(flatten)]
-    pub profile: AccuracyProfile,
-}
-
-/// Wire-side envelope emitted on PromQL responses as the
-/// top-level `accuracy` field. Single-schema queries fill
-/// `profile`; queries that span a schema-timeline boundary also
-/// populate `per_segment` so the caller can see each piece's
-/// bound. The top-level `profile` is the worst-case (max ε,
-/// max δ) across segments — a conservative upper envelope.
-#[derive(Debug, Clone, Serialize, Deserialize, PartialEq)]
-pub struct AccuracyEnvelope {
-    #[serde(flatten)]
-    pub profile: AccuracyProfile,
-    #[serde(default, skip_serializing_if = "Vec::is_empty")]
-    pub per_segment: Vec<PerSegmentAccuracy>,
-}
-
-impl AccuracyEnvelope {
-    /// Envelope for a single resolved aggregation.
-    pub fn single(profile: AccuracyProfile) -> Self {
-        Self {
-            profile,
-            per_segment: Vec::new(),
-        }
-    }
-
-    /// Build an envelope from a slice of per-segment tuples.
-    /// Top-level `profile.epsilon` is `max(segment.epsilon)` and
-    /// same for δ — the conservative envelope across segments.
-    /// Returns `None` when the slice is empty.
-    pub fn from_segments(segs: Vec<PerSegmentAccuracy>) -> Option<Self> {
-        if segs.is_empty() {
-            return None;
-        }
-        let mut epsilon = 0.0_f64;
-        let mut delta = Some(0.0_f64);
-        // Pick the "most lossy" kind: any non-Exact wins over
-        // Exact; if mixed non-Exact kinds span segments we pick
-        // the first non-Exact and trust the per-segment data for
-        // the caller's finer needs.
-        let mut kind = AccuracyKind::Exact;
-        for s in &segs {
-            if s.profile.epsilon > epsilon {
-                epsilon = s.profile.epsilon;
-            }
-            // A known bound from another segment cannot fill unknown confidence.
-            delta = match (delta, s.profile.delta) {
-                (Some(a), Some(b)) => Some(a.max(b)),
-                _ => None,
-            };
-            if matches!(kind, AccuracyKind::Exact) && !matches!(s.profile.kind, AccuracyKind::Exact)
-            {
-                kind = s.profile.kind;
-            }
-        }
-        Some(Self {
-            profile: AccuracyProfile {
-                epsilon,
-                delta,
-                kind,
-            },
-            per_segment: segs,
-        })
-    }
-
-    /// Summary line suitable for Prometheus `infos`.
-    pub fn summary(&self) -> String {
-        if self.per_segment.is_empty() {
-            self.profile.summary()
-        } else {
-            format!(
-                "{} (worst-case over {} schema-timeline segments)",
-                self.profile.summary(),
-                self.per_segment.len()
-            )
-        }
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use asap_types::enums::WindowKind;
-    use asap_types::KeyByLabelNames;
-    use serde_json::{json, Value};
-    use std::collections::HashMap;
-
-    fn base_config(
-        agg_type: AggregationType,
-        params: HashMap<String, Value>,
-    ) -> PrecomputeMaterialization {
-        PrecomputeMaterialization::new(
-            agg_type,
-            String::new(),
-            params,
-            KeyByLabelNames::empty(),
-            KeyByLabelNames::empty(),
-            KeyByLabelNames::empty(),
-            String::new(),
-            60,
-            60,
-            WindowKind::Tumbling,
-            String::new(),
-            "m".to_string(),
-            None,
-            None,
-            None,
-        )
-    }
-
-    /// Both source adapters must agree for the same normalized family parameters.
-    #[test]
-    fn planner_and_backend_shared_family_parity() {
-        use control_plane::types::SketchParams;
-        let cases = vec![
-            (
-                SketchParams::CountMinSketch {
-                    rows: 4,
-                    cols: 1000,
-                    metric_name: "m".into(),
-                },
-                AggregationType::CountMinSketch,
-                json!({"d": 4, "w": 1000}),
-            ),
-            (
-                SketchParams::CountMinSketch {
-                    rows: 7,
-                    cols: 4096,
-                    metric_name: "m".into(),
-                },
-                AggregationType::CountMinSketch,
-                json!({"d": 7, "w": 4096}),
-            ),
-            (
-                SketchParams::HLL { precision: 14 },
-                AggregationType::HLL,
-                json!({"precision": 14}),
-            ),
-            (
-                SketchParams::HLL { precision: 10 },
-                AggregationType::HLL,
-                json!({"p": 10}),
-            ),
-            (
-                SketchParams::KLL {
-                    k: 200,
-                    quantiles: vec![],
-                },
-                AggregationType::DatasketchesKLL,
-                json!({"K": 200}),
-            ),
-            (
-                SketchParams::KLL {
-                    k: 512,
-                    quantiles: vec![],
-                },
-                AggregationType::HydraKLL,
-                json!({"k": 512}),
-            ),
-            (
-                SketchParams::DDSketch {
-                    relative_accuracy: 0.01,
-                    quantiles: vec![],
-                },
-                AggregationType::DDSketch,
-                json!({"alpha": 0.01}),
-            ),
-            (
-                SketchParams::DDSketch {
-                    relative_accuracy: 0.05,
-                    quantiles: vec![],
-                },
-                AggregationType::DDSketch,
-                json!({"alpha": 0.05}),
-            ),
-        ];
-        for (params, family, wire) in cases {
-            let config = base_config(family, serde_json::from_value(wire).unwrap());
-            let planner = control_plane::accuracy::derive(&params);
-            let backend = derive(&config);
-            assert_eq!(planner, backend, "parameters: {params:?}");
-            assert_eq!(
-                serde_json::to_value(planner).unwrap(),
-                serde_json::to_value(backend).unwrap()
-            );
-        }
-    }
-
-    /// GOS widens epsilon without inventing confidence for HLL.
-    #[test]
-    fn shared_family_gos_preserves_planner_confidence() {
-        for family in [
-            AggregationType::CountMinSketch,
-            AggregationType::HLL,
-            AggregationType::DatasketchesKLL,
-            AggregationType::DDSketch,
-        ] {
-            let base = derive(&base_config(family, HashMap::new()));
-            let widened = derive(&base_config(
-                family,
-                HashMap::from([("gos_delta_epsilon".into(), json!(0.05))]),
-            ));
-            assert_eq!(widened.epsilon, base.epsilon + 0.05);
-            assert_eq!(widened.delta, base.delta);
-            assert_eq!(widened.kind, base.kind);
-        }
-    }
-
-    /// Unknown confidence stays unknown regardless of segment order.
-    #[test]
-    fn envelope_preserves_unknown_failure_probability() {
-        let hll = derive(&base_config(AggregationType::HLL, HashMap::new()));
-        assert_eq!(hll.delta, None);
-        for profiles in [
-            [hll, AccuracyProfile::exact()],
-            [AccuracyProfile::exact(), hll],
-        ] {
-            let segments = profiles
-                .into_iter()
-                .enumerate()
-                .map(|(i, profile)| PerSegmentAccuracy {
-                    agg_id: i as u64,
-                    range_ms: [i as i64, i as i64 + 1],
-                    profile,
-                })
-                .collect();
-            let envelope = AccuracyEnvelope::from_segments(segments).unwrap();
-            assert_eq!(envelope.profile.delta, None);
-            assert!(serde_json::to_value(envelope).unwrap()["delta"].is_null());
-        }
-    }
-
-    /// Backend-only UnivMon must not acquire a calibrated shared-family bound.
-    #[test]
-    fn univmon_remains_uncalibrated() {
-        let profile = derive(&base_config(AggregationType::UnivMon, HashMap::new()));
-        assert_eq!(profile.kind, AccuracyKind::Uncalibrated);
-        assert_eq!(profile.epsilon, f64::MAX);
-        assert_eq!(profile.delta, Some(1.0));
-    }
-
-    #[test]
-    fn sum_is_exact() {
-        let p = derive(&base_config(AggregationType::Sum, HashMap::new()));
-        assert_eq!(p.kind, AccuracyKind::Exact);
-        assert_eq!(p.epsilon, 0.0);
-        assert_eq!(p.delta, Some(0.0));
-    }
-
-    #[test]
-    fn min_max_increase_are_exact() {
-        for t in [
-            AggregationType::Min,
-            AggregationType::Max,
-            AggregationType::Increase,
-        ] {
-            let p = derive(&base_config(t, HashMap::new()));
-            assert_eq!(p.kind, AccuracyKind::Exact);
-        }
-    }
-
-    #[test]
-    fn gos_staleness_widens_epsilon_linearly() {
-        // A CountSketch (ε_sk = 1/√w) whose edge gates deltas at ε_st carries
-        // ε_total = ε_sk + ε_st in the continuous-query envelope (Theorem 1);
-        // δ is unchanged (staleness is deterministic).
-        let mut params = HashMap::new();
-        params.insert("d".to_string(), json!(5));
-        params.insert("w".to_string(), json!(256));
-        let base = derive(&base_config(AggregationType::CountSketch, params.clone()));
-        params.insert("gos_delta_epsilon".to_string(), json!(0.05));
-        let widened = derive(&base_config(AggregationType::CountSketch, params));
-        assert!((widened.epsilon - (base.epsilon + 0.05)).abs() < 1e-12);
-        assert_eq!(widened.delta, base.delta);
-        assert_eq!(widened.kind, base.kind);
-    }
-
-    #[test]
-    fn gos_staleness_does_not_touch_exact() {
-        // Exact aggregates are not GOS-gated (Count-Sketch families only), so a
-        // stray parameter must not fabricate an ε>0 "exact" answer.
-        let mut params = HashMap::new();
-        params.insert("gos_delta_epsilon".to_string(), json!(0.05));
-        let p = derive(&base_config(AggregationType::Sum, params));
-        assert_eq!(p.epsilon, 0.0);
-        assert_eq!(p.kind, AccuracyKind::Exact);
-    }
-
-    #[test]
-    fn cms_epsilon_is_e_over_w() {
-        let mut params = HashMap::new();
-        params.insert("d".to_string(), json!(5));
-        params.insert("w".to_string(), json!(2718));
-        let p = derive(&base_config(AggregationType::CountMinSketch, params));
-        // e / 2718 ≈ 0.0010001 — very close to 0.001.
-        assert_eq!(p.kind, AccuracyKind::AdditiveFrequency);
-        assert!((p.epsilon - std::f64::consts::E / 2718.0).abs() < 1e-12);
-        // δ = 1/2^5 = 0.03125
-        assert!((p.delta.unwrap() - (-5.0_f64).exp()).abs() < 1e-12);
-    }
-
-    #[test]
-    fn cms_uses_defaults_when_params_absent() {
-        let p = derive(&base_config(
-            AggregationType::CountMinSketch,
-            HashMap::new(),
-        ));
-        // Defaults rows=4, cols=1000 per accumulator_factory.
-        assert!((p.epsilon - std::f64::consts::E / 1000.0).abs() < 1e-12);
-        assert!((p.delta.unwrap() - (-4.0_f64).exp()).abs() < 1e-12); // 1/16
-    }
-
-    #[test]
-    fn cms_with_heap_carries_top_k_kind_and_heap_bound() {
-        // Large heap: 1/heap_size (= 1e-4) dominates the e/w CMS
-        // bound (e/1e6 ≈ 2.72e-6). Expect ε = 1/heap.
-        let mut params = HashMap::new();
-        params.insert("d".to_string(), json!(5));
-        params.insert("w".to_string(), json!(1_000_000));
-        params.insert("heap_size".to_string(), json!(10_000));
-        let p = derive(&base_config(
-            AggregationType::CountMinSketchWithHeap,
-            params,
-        ));
-        assert_eq!(p.kind, AccuracyKind::TopK);
-        assert!((p.epsilon - 1.0 / 10_000.0).abs() < 1e-12);
-        assert!((p.delta.unwrap() - (-5.0_f64).exp()).abs() < 1e-12); // 1/2^5
-    }
-
-    #[test]
-    fn cms_with_heap_cms_bound_dominates_when_heap_is_generous() {
-        // Generously-sized heap (1e6) + narrow CMS (w=100) →
-        // 1/heap (1e-6) ≪ e/w (2.7e-2), so the CMS bound dominates.
-        let mut params = HashMap::new();
-        params.insert("d".to_string(), json!(4));
-        params.insert("w".to_string(), json!(100));
-        params.insert("heap_size".to_string(), json!(1_000_000));
-        let p = derive(&base_config(
-            AggregationType::CountMinSketchWithHeap,
-            params,
-        ));
-        assert_eq!(p.kind, AccuracyKind::TopK);
-        assert!((p.epsilon - std::f64::consts::E / 100.0).abs() < 1e-12);
-    }
-
-    #[test]
-    fn cms_with_heap_uses_default_heap_size_100() {
-        let mut params = HashMap::new();
-        params.insert("d".to_string(), json!(4));
-        params.insert("w".to_string(), json!(1000));
-        // heap_size absent → default 100 → 1/100 = 0.01 dominates
-        // e/1000 ≈ 0.00272.
-        let p = derive(&base_config(
-            AggregationType::CountMinSketchWithHeap,
-            params,
-        ));
-        assert_eq!(p.kind, AccuracyKind::TopK);
-        assert!((p.epsilon - 0.01).abs() < 1e-12);
-    }
-
-    #[test]
-    fn cms_with_heap_accepts_alternative_param_names() {
-        // Config may name the heap "k" or "topk" instead of
-        // "heap_size" — all three should work.
-        for alias in ["heap_size", "topk", "k"] {
-            let mut params = HashMap::new();
-            params.insert("d".to_string(), json!(4));
-            params.insert("w".to_string(), json!(1_000_000));
-            params.insert(alias.to_string(), json!(500));
-            let p = derive(&base_config(
-                AggregationType::CountMinSketchWithHeap,
-                params,
-            ));
-            assert!(
-                (p.epsilon - 1.0 / 500.0).abs() < 1e-12,
-                "alias '{}' should produce heap-driven ε",
-                alias
-            );
-        }
-    }
-
-    #[test]
-    fn countsketch_epsilon_is_one_over_sqrt_w() {
-        let mut params = HashMap::new();
-        params.insert("d".to_string(), json!(4));
-        params.insert("w".to_string(), json!(100));
-        let p = derive(&base_config(AggregationType::CountSketch, params));
-        assert_eq!(p.kind, AccuracyKind::AdditiveFrequency);
-        assert!((p.epsilon - 0.1).abs() < 1e-9); // 1/√100 = 0.1
-        assert!((p.delta.unwrap() - 0.0625).abs() < 1e-12); // Backend-only CountSketch convention.
-    }
-
-    #[test]
-    fn hll_epsilon_matches_flajolet_bound() {
-        let mut params = HashMap::new();
-        params.insert("precision".to_string(), json!(14));
-        let p = derive(&base_config(AggregationType::HLL, params));
-        assert_eq!(p.kind, AccuracyKind::RelativeCardinality);
-        // 1.04 / √16384 = 1.04 / 128 = 0.008125
-        assert!((p.epsilon - 0.008125).abs() < 1e-9);
-    }
-
-    #[test]
-    fn hll_uses_default_precision_14() {
-        let p = derive(&base_config(AggregationType::HLL, HashMap::new()));
-        assert!((p.epsilon - 0.008125).abs() < 1e-9);
-    }
-
-    #[test]
-    fn kll_epsilon_matches_karnin_lang_liberty_bound() {
-        let mut params = HashMap::new();
-        params.insert("K".to_string(), json!(200));
-        let p = derive(&base_config(AggregationType::DatasketchesKLL, params));
-        assert_eq!(p.kind, AccuracyKind::RankQuantile);
-        // Planner uses the DataSketches empirical 99th-percentile rank-error fit.
-        assert!((p.epsilon - 2.296 / 200.0_f64.powf(0.9723)).abs() < 1e-12);
-        assert!((p.delta.unwrap() - 0.01).abs() < 1e-12);
-    }
-
-    #[test]
-    fn hydra_kll_follows_the_same_kll_bound() {
-        let mut params = HashMap::new();
-        params.insert("k".to_string(), json!(400));
-        let p = derive(&base_config(AggregationType::HydraKLL, params));
-        // Planner uses the DataSketches empirical 99th-percentile rank-error fit.
-        assert!((p.epsilon - 2.296 / 400.0_f64.powf(0.9723)).abs() < 1e-12);
-    }
-
-    #[test]
-    fn ddsketch_epsilon_is_alpha_directly() {
-        let mut params = HashMap::new();
-        params.insert("alpha".to_string(), json!(0.02));
-        let p = derive(&base_config(AggregationType::DDSketch, params));
-        assert_eq!(p.kind, AccuracyKind::RelativeQuantile);
-        assert_eq!(p.epsilon, 0.02);
-        assert_eq!(p.delta, Some(0.0));
-    }
-
-    #[test]
-    fn ddsketch_uses_default_alpha_0_01() {
-        let p = derive(&base_config(AggregationType::DDSketch, HashMap::new()));
-        assert_eq!(p.epsilon, 0.01);
-    }
-
-    #[test]
-    fn legacy_wrapper_types_fall_back_to_exact() {
-        // `SingleSubpopulation` / `MultipleSubpopulation` are
-        // config-shape wrappers whose real type is in sub_type.
-        // Without resolving sub_type we return exact (harmless
-        // lower bound). Phase 6.4 v2 may tighten this.
-        for t in [
-            AggregationType::SingleSubpopulation,
-            AggregationType::MultipleSubpopulation,
-        ] {
-            let p = derive(&base_config(t, HashMap::new()));
-            assert_eq!(p.kind, AccuracyKind::Exact);
-        }
-    }
-
-    #[test]
-    fn accuracy_profile_roundtrips_through_serde() {
-        let input = AccuracyProfile {
-            epsilon: 0.008125,
-            delta: None,
-            kind: AccuracyKind::RelativeCardinality,
-        };
-        let json = serde_json::to_string(&input).unwrap();
-        assert!(json.contains("\"relative_cardinality\""));
-        let back: AccuracyProfile = serde_json::from_str(&json).unwrap();
-        assert_eq!(back, input);
-    }
-
-    #[test]
-    fn cms_and_countsketch_differ_by_sqrt_e() {
-        // Sanity check: for the same (w, d), CountSketch's ε is
-        // smaller by a factor of √e / √w × 1/√w = 1/(√e) —
-        // i.e. CountSketch is a factor ~1.65 tighter than CMS on
-        // epsilon alone. Confirms the bounds are not copy-pasted.
-        let mut params = HashMap::new();
-        params.insert("d".to_string(), json!(4));
-        params.insert("w".to_string(), json!(10000));
-        let cms = derive(&base_config(
-            AggregationType::CountMinSketch,
-            params.clone(),
-        ));
-        let cs = derive(&base_config(AggregationType::CountSketch, params));
-        // cms.epsilon = e/10000 ≈ 2.718e-4
-        // cs.epsilon = 1/√10000 = 0.01 = 1e-2
-        // So cms < cs (for w=10000). They cross at w = e.
-        assert!(cms.epsilon < cs.epsilon);
-        assert!(cs.epsilon > 0.0);
-    }
-}
diff --git a/data_plane/src/storage_engines/sketch_db/backfill/clickhouse_reader.rs b/data_plane/src/storage_engines/sketch_db/backfill/clickhouse_reader.rs
deleted file mode 100644
index acea64985..000000000
--- a/data_plane/src/storage_engines/sketch_db/backfill/clickhouse_reader.rs
+++ /dev/null
@@ -1,625 +0,0 @@
-//! ClickHouse-backed historical sample reader for the existing backfill worker.
-
-use async_trait::async_trait;
-use serde::Deserialize;
-
-use super::raw_sample_reader::{LabelFilter, RawSample, RawSampleReader, RawSampleReaderError};
-use super::{BackfillSource, ReaderFactory};
-use std::sync::Arc;
-
-#[derive(Clone, Debug)]
-pub struct ClickHouseReaderConfig {
-    pub base_url: String,
-    pub database: String,
-    pub table: String,
-    pub metric_column: String,
-    pub labels_column: String,
-    pub timestamp_ms_column: String,
-    pub value_column: String,
-    pub user: Option<String>,
-    pub password: Option<String>,
-}
-
-impl ClickHouseReaderConfig {
-    pub fn validate(&self) -> Result<(), RawSampleReaderError> {
-        for (name, value) in [
-            ("database", self.database.as_str()),
-            ("table", self.table.as_str()),
-            ("metric column", self.metric_column.as_str()),
-            ("labels column", self.labels_column.as_str()),
-            ("timestamp column", self.timestamp_ms_column.as_str()),
-            ("value column", self.value_column.as_str()),
-        ] {
-            if value.is_empty()
-                || !value.as_bytes()[0].is_ascii_alphabetic() && !value.starts_with('_')
-                || !value
-                    .bytes()
-                    .all(|byte| byte.is_ascii_alphanumeric() || byte == b'_')
-            {
-                return Err(RawSampleReaderError::Other {
-                    reason: format!("invalid ClickHouse {name}: {value:?}"),
-                });
-            }
-        }
-        Ok(())
-    }
-}
-
-pub struct ClickHouseReader {
-    config: ClickHouseReaderConfig,
-    http: reqwest::Client,
-    population: Option<asap_types::table_population::TablePopulation>,
-    value_projection: Option<asap_types::sds::ValueProjectionIdentity>,
-    /// Producer typing for the projected column, when the materialization
-    /// carries it. Drives [`ClickHouseReader::value_column_guards`].
-    value_source_column: Option<planner_types::pre_asap::Column>,
-    output_metric: Option<String>,
-    grouping_projection: Option<asap_types::GroupingProjection>,
-}
-
-#[derive(Deserialize)]
-#[serde(untagged)]
-enum ClickHouseLabels {
-    Series(String),
-    Map(std::collections::BTreeMap<String, String>),
-    Columns(Vec<(String, String)>),
-}
-
-#[derive(Deserialize)]
-struct ClickHouseSampleRow {
-    labels: ClickHouseLabels,
-    timestamp_ms: i64,
-    value: f64,
-}
-
-impl ClickHouseReader {
-    pub fn new(config: ClickHouseReaderConfig) -> Result<Self, RawSampleReaderError> {
-        config.validate()?;
-        Ok(Self {
-            config,
-            http: reqwest::Client::new(),
-            population: None,
-            value_projection: None,
-            value_source_column: None,
-            output_metric: None,
-            grouping_projection: None,
-        })
-    }
-
-    fn sql(&self) -> String {
-        let c = &self.config;
-        let labels = self.grouping_projection.as_ref().map_or_else(
-            || c.labels_column.clone(),
-            |grouping| {
-                let entries = grouping
-                    .columns()
-                    .iter()
-                    .map(|column| {
-                        let value = format!("base64Encode(toJSONString({}))", column.name);
-                        format!("'{}', {value}", column.name)
-                    })
-                    .collect::<Vec<_>>()
-                    .join(", ");
-                format!("map({entries})")
-            },
-        );
-        let population = self.population.as_ref().map_or_else(
-            || format!("{} = {{metric:String}}", c.metric_column),
-            |population| {
-                if population.predicates.is_empty() {
-                    return "1".into();
-                }
-                population
-                    .predicates
-                    .iter()
-                    .enumerate()
-                    .map(|(index, predicate)| {
-                        use planner_types::pre_asap::{CompareOpKind, ScalarValue};
-                        let operator = match predicate.operator {
-                            CompareOpKind::Eq => "=",
-                            CompareOpKind::Ne => "!=",
-                            CompareOpKind::Lt => "<",
-                            CompareOpKind::Le => "<=",
-                            CompareOpKind::Gt => ">",
-                            CompareOpKind::Ge => ">=",
-                            _ => unreachable!("validated table predicate"),
-                        };
-                        let kind = match predicate.value {
-                            ScalarValue::Utf8(_) => "String",
-                            ScalarValue::Int64(_) => "Int64",
-                            ScalarValue::Float64(_) => "Float64",
-                            ScalarValue::Boolean(_) => "Bool",
-                            ScalarValue::Null | ScalarValue::Interval { .. } => {
-                                unreachable!("validated table literal")
-                            }
-                        };
-                        format!(
-                            "{} {operator} {{population_{index}:{kind}}}",
-                            predicate.column
-                        )
-                    })
-                    .collect::<Vec<_>>()
-                    .join(" AND ")
-            },
-        );
-        let value = match &self.value_projection {
-            Some(asap_types::sds::ValueProjectionIdentity::Constant {
-                value: planner_types::pre_asap::ScalarValue::Int64(_),
-            }) => "{projected_value:Int64}".to_string(),
-            Some(asap_types::sds::ValueProjectionIdentity::Constant {
-                value: planner_types::pre_asap::ScalarValue::Float64(_),
-            }) => "{projected_value:Float64}".to_string(),
-            // A typed column projection is read through its declared type:
-            // integers via an explicit widening, everything else as-is.
-            _ => match self
-                .value_source_column
-                .as_ref()
-                .map(|column| &column.dtype)
-            {
-                Some(planner_types::pre_asap::DataType::Int64) => {
-                    format!("toFloat64({})", c.value_column)
-                }
-                _ => c.value_column.clone(),
-            },
-        };
-        format!(
-            "SELECT {labels} AS labels, {timestamp} AS timestamp_ms, {value} AS value \
-             FROM {database}.{table} WHERE {population}{value_guards} \
-             AND {timestamp} >= {{start_ms:Int64}} AND {timestamp} < {{end_ms:Int64}} \
-             ORDER BY labels, timestamp_ms FORMAT JSONEachRow",
-            labels = labels,
-            timestamp = c.timestamp_ms_column,
-            value = value,
-            value_guards = self.value_column_guards(),
-            database = c.database,
-            table = c.table,
-        )
-    }
-
-    /// Predicates the typed value column needs before its rows may enter
-    /// summary state.
-    ///
-    /// * **NULL**: a SQL aggregate skips NULL inputs, so the summary that
-    ///   stands in for `sum(col)` / `count(col)` / `quantile(col)` has to skip
-    ///   them too. (Without this the JSON decode fails on the first NULL row,
-    ///   which is why nullable columns used to be refused at planning time.)
-    /// * **Integer exactness**: summary state is f64. Beyond 2^53 an integer
-    ///   no longer round-trips, so instead of silently summarising a rounded
-    ///   value the read fails loudly on the offending row. The guard evaluates
-    ///   to NULL for NULL rows, which the NULL predicate has already excluded.
-    fn value_column_guards(&self) -> String {
-        let Some(column) = self.value_source_column.as_ref() else {
-            return String::new();
-        };
-        let name = &self.config.value_column;
-        let mut guards = String::new();
-        if column.nullable {
-            guards.push_str(&format!(" AND {name} IS NOT NULL"));
-        }
-        if column.dtype == planner_types::pre_asap::DataType::Int64 {
-            guards.push_str(&format!(
-                " AND throwIf(abs({name}) > 9007199254740992, \
-                 'ASAP ClickHouse ingest: integer value exceeds the exact Float64 range') = 0"
-            ));
-        }
-        guards
-    }
-}
-
-/// Resolve a typed table source using deployment-local connection settings.
-pub fn clickhouse_reader_factory(config: ClickHouseReaderConfig) -> ReaderFactory {
-    let fallback = super::service::default_reader_factory();
-    Arc::new(move |source, materialization| match source {
-        BackfillSource::ClickHouse { database, table } => {
-            if database != &config.database {
-                return Err(RawSampleReaderError::Other {
-                    reason: "ClickHouse source database differs from the deployment database"
-                        .into(),
-                }
-                .into());
-            }
-            materialization
-                .grouping_labels
-                .validate_table_group_codec()?;
-            let mut source_config = config.clone();
-            source_config.database = database.clone();
-            source_config.table = table.clone();
-            source_config.timestamp_ms_column = materialization
-                .table_timestamp_column
-                .clone()
-                .ok_or("table materialization has no timestamp projection")?;
-            match materialization.effective_value_projection() {
-                asap_types::sds::ValueProjectionIdentity::Column { name } => {
-                    source_config.value_column = name.clone()
-                }
-                asap_types::sds::ValueProjectionIdentity::Constant {
-                    value: planner_types::pre_asap::ScalarValue::Int64(value),
-                } if value.unsigned_abs() > (1_u64 << 53) => {
-                    return Err("integer projection exceeds exact Float64 ingest range".into())
-                }
-                asap_types::sds::ValueProjectionIdentity::Constant { .. } => {}
-                asap_types::sds::ValueProjectionIdentity::SampleValue => {
-                    return Err("table materialization has no explicit value projection".into())
-                }
-            }
-            materialization.population_filter_canonical()?;
-            let mut reader = ClickHouseReader::new(source_config)?;
-            reader.population = Some(materialization.table_population.clone().unwrap_or_default());
-            reader.value_projection = Some(materialization.effective_value_projection().clone());
-            reader.value_source_column = materialization.value_source_column.clone();
-            reader.output_metric = Some(materialization.metric.clone());
-            reader.grouping_projection = Some(materialization.grouping_labels.clone());
-            Ok(Arc::new(reader) as Arc<dyn RawSampleReader>)
-        }
-        source => fallback(source, materialization),
-    })
-}
-
-#[async_trait]
-impl RawSampleReader for ClickHouseReader {
-    async fn read_samples(
-        &self,
-        start_ms: u64,
-        end_ms: u64,
-        filter: &LabelFilter,
-    ) -> Result<Vec<RawSample>, RawSampleReaderError> {
-        if start_ms > end_ms || end_ms > i64::MAX as u64 {
-            return Err(RawSampleReaderError::InvalidRange {
-                reason: format!("unsupported range [{start_ms}, {end_ms})"),
-            });
-        }
-        let start_ms = start_ms.to_string();
-        let end_ms = end_ms.to_string();
-        let mut request = self.http.post(&self.config.base_url).query(&[
-            ("param_metric", filter.metric.as_str()),
-            ("param_start_ms", start_ms.as_str()),
-            ("param_end_ms", end_ms.as_str()),
-        ]);
-        if self.grouping_projection.is_some() {
-            request = request.query(&[
-                ("output_format_json_map_as_array_of_tuples", "1"),
-                ("output_format_json_named_tuples_as_objects", "0"),
-                ("output_format_json_quote_64bit_integers", "0"),
-            ]);
-        }
-        if let Some(asap_types::sds::ValueProjectionIdentity::Constant { value }) =
-            &self.value_projection
-        {
-            let value = match value {
-                planner_types::pre_asap::ScalarValue::Int64(value) => value.to_string(),
-                planner_types::pre_asap::ScalarValue::Float64(value) => value.to_string(),
-                _ => {
-                    return Err(RawSampleReaderError::Other {
-                        reason: "unsupported constant projection".into(),
-                    })
-                }
-            };
-            request = request.query(&[("param_projected_value", value)]);
-        }
-        if let Some(population) = &self.population {
-            for (index, predicate) in population.predicates.iter().enumerate() {
-                use planner_types::pre_asap::ScalarValue;
-                let value = match &predicate.value {
-                    ScalarValue::Utf8(value) => value.clone(),
-                    ScalarValue::Int64(value) => value.to_string(),
-                    ScalarValue::Float64(value) => value.to_string(),
-                    ScalarValue::Boolean(value) => value.to_string(),
-                    ScalarValue::Null | ScalarValue::Interval { .. } => {
-                        unreachable!("validated table literal")
-                    }
-                };
-                request = request.query(&[(format!("param_population_{index}"), value)]);
-            }
-        }
-        if let Some(user) = &self.config.user {
-            request = request.basic_auth(user, self.config.password.as_ref());
-        }
-        let response = request.body(self.sql()).send().await.map_err(|error| {
-            RawSampleReaderError::Upstream {
-                reason: error.to_string(),
-            }
-        })?;
-        let status = response.status();
-        let body = response
-            .text()
-            .await
-            .map_err(|error| RawSampleReaderError::Decode {
-                reason: error.to_string(),
-            })?;
-        if !status.is_success() {
-            return Err(RawSampleReaderError::Upstream {
-                reason: format!("ClickHouse HTTP {status}: {body}"),
-            });
-        }
-        let mut samples = Vec::new();
-        for line in body.lines().filter(|line| !line.trim().is_empty()) {
-            let row: ClickHouseSampleRow =
-                serde_json::from_str(line).map_err(|error| RawSampleReaderError::Decode {
-                    reason: error.to_string(),
-                })?;
-            let labels = match row.labels {
-                ClickHouseLabels::Columns(columns) => {
-                    let count = columns.len();
-                    let labels = columns
-                        .into_iter()
-                        .map(|(name, value)| {
-                            asap_types::grouping_projection::decode_table_group_value(&value)
-                                .and_then(|value| {
-                                    asap_types::grouping_projection::encode_table_group_value(
-                                        &value,
-                                    )
-                                })
-                                .map(|value| (name, value))
-                                .map_err(|reason| RawSampleReaderError::Decode { reason })
-                        })
-                        .collect::<Result<std::collections::BTreeMap<_, _>, _>>()?;
-                    if labels.len() != count {
-                        return Err(RawSampleReaderError::Decode {
-                            reason: "duplicate source grouping columns".into(),
-                        });
-                    }
-                    ClickHouseLabels::Map(labels)
-                }
-                labels => labels,
-            };
-            let sample = RawSample {
-                labels: match labels {
-                    ClickHouseLabels::Columns(_) => unreachable!("columns normalized above"),
-                    ClickHouseLabels::Series(series) => {
-                        if self.population.is_some() {
-                            let metric = self.output_metric.as_deref().unwrap_or(&filter.metric);
-                            let suffix = series.find('{').map_or("", |start| &series[start..]);
-                            format!("{metric}{suffix}")
-                        } else {
-                            series
-                        }
-                    }
-                    ClickHouseLabels::Map(labels) => {
-                        let metric = self.output_metric.as_deref().unwrap_or(&filter.metric);
-                        let labels = labels
-                            .iter()
-                            .map(|(key, value)| {
-                                format!(
-                                    "{key}={}",
-                                    serde_json::to_string(value).expect("label serialization")
-                                )
-                            })
-                            .collect::<Vec<_>>()
-                            .join(",");
-                        if labels.is_empty() {
-                            metric.into()
-                        } else {
-                            format!("{metric}{{{labels}}}")
-                        }
-                    }
-                },
-                timestamp_ms: row.timestamp_ms,
-                value: row.value,
-            };
-            if super::raw_sample_reader::sample_matches(&sample.labels, filter) {
-                samples.push(sample);
-            }
-        }
-        Ok(samples)
-    }
-
-    fn source_name(&self) -> &'static str {
-        "ClickHouseReader"
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    fn config(table: &str) -> ClickHouseReaderConfig {
-        ClickHouseReaderConfig {
-            base_url: "http://localhost:8123".into(),
-            database: "metrics".into(),
-            table: table.into(),
-            metric_column: "metric".into(),
-            labels_column: "labels".into(),
-            timestamp_ms_column: "timestamp_ms".into(),
-            value_column: "value".into(),
-            user: None,
-            password: None,
-        }
-    }
-
-    #[test]
-    fn validates_identifiers_and_parameterizes_values() {
-        assert!(ClickHouseReader::new(config("samples; DROP TABLE x")).is_err());
-        let reader = ClickHouseReader::new(config("samples")).unwrap();
-        let sql = reader.sql();
-        assert!(sql.contains("metric = {metric:String}"));
-        assert!(sql.contains("FORMAT JSONEachRow"));
-    }
-
-    #[test]
-    fn table_population_values_are_parameters_not_sql_fragments() {
-        let mut reader = ClickHouseReader::new(config("samples")).unwrap();
-        reader.population = Some(asap_types::table_population::TablePopulation {
-            predicates: vec![asap_types::table_population::TableColumnPredicate {
-                column: "metric".into(),
-                operator: planner_types::pre_asap::CompareOpKind::Eq,
-                value: planner_types::pre_asap::ScalarValue::Utf8("requests' OR 1=1 --".into()),
-            }],
-        });
-        let sql = reader.sql();
-        assert!(sql.contains("metric = {population_0:String}"));
-        assert!(!sql.contains("requests"));
-        assert!(!sql.contains("metric = {metric:String}"));
-    }
-
-    #[test]
-    fn unfiltered_table_population_does_not_filter_by_output_metric() {
-        let mut reader = ClickHouseReader::new(config("samples")).unwrap();
-        reader.population = Some(Default::default());
-        let sql = reader.sql();
-        assert!(sql.contains("WHERE 1 AND"));
-        assert!(!sql.contains("{metric:String}"));
-    }
-
-    /// SQL aggregates skip NULL inputs, so the summary standing in for one has
-    /// to skip them too — and a NULL row would otherwise fail the row decode,
-    /// which is why nullable columns used to be refused at planning time.
-    #[test]
-    fn nullable_value_columns_skip_null_rows_the_way_sql_aggregates_do() {
-        let mut reader = ClickHouseReader::new(config("samples")).unwrap();
-        reader.value_projection = Some(asap_types::sds::ValueProjectionIdentity::Column {
-            name: "value".into(),
-        });
-        reader.value_source_column = Some(planner_types::pre_asap::Column::new(
-            "value",
-            planner_types::pre_asap::DataType::Float64,
-            true,
-        ));
-        let sql = reader.sql();
-        assert!(sql.contains("AND value IS NOT NULL"), "{sql}");
-        // A float column is read as it comes; only integers are widened.
-        assert!(sql.contains(" value AS value"), "{sql}");
-        assert!(!sql.contains("toFloat64"), "{sql}");
-    }
-
-    /// A non-null column needs no NULL predicate: the guard tracks the declared
-    /// nullability, it is not applied blindly.
-    #[test]
-    fn non_null_value_columns_are_read_without_extra_predicates() {
-        let mut reader = ClickHouseReader::new(config("samples")).unwrap();
-        reader.value_projection = Some(asap_types::sds::ValueProjectionIdentity::Column {
-            name: "value".into(),
-        });
-        reader.value_source_column = Some(planner_types::pre_asap::Column::new(
-            "value",
-            planner_types::pre_asap::DataType::Float64,
-            false,
-        ));
-        let sql = reader.sql();
-        assert!(!sql.contains("IS NOT NULL"), "{sql}");
-        assert!(!sql.contains("throwIf"), "{sql}");
-    }
-
-    /// Summary state is f64. An integer column is widened explicitly, and a
-    /// value that no longer round-trips fails the read instead of entering the
-    /// summary rounded.
-    #[test]
-    fn integer_value_columns_are_widened_under_an_exactness_guard() {
-        let mut reader = ClickHouseReader::new(config("samples")).unwrap();
-        reader.value_projection = Some(asap_types::sds::ValueProjectionIdentity::Column {
-            name: "value".into(),
-        });
-        reader.value_source_column = Some(planner_types::pre_asap::Column::new(
-            "value",
-            planner_types::pre_asap::DataType::Int64,
-            false,
-        ));
-        let sql = reader.sql();
-        assert!(sql.contains("toFloat64(value) AS value"), "{sql}");
-        assert!(
-            sql.contains("throwIf(abs(value) > 9007199254740992"),
-            "{sql}"
-        );
-        assert!(!sql.contains("IS NOT NULL"), "{sql}");
-    }
-
-    /// A legacy definition without producer typing keeps its previous read.
-    #[test]
-    fn untyped_column_projection_reads_exactly_as_before() {
-        let mut reader = ClickHouseReader::new(config("samples")).unwrap();
-        reader.value_projection = Some(asap_types::sds::ValueProjectionIdentity::Column {
-            name: "value".into(),
-        });
-        let sql = reader.sql();
-        assert!(sql.contains(" value AS value"), "{sql}");
-        assert!(!sql.contains("IS NOT NULL"), "{sql}");
-        assert!(!sql.contains("throwIf"), "{sql}");
-    }
-
-    #[test]
-    fn constant_projection_uses_a_typed_parameter_without_a_fake_column() {
-        let mut reader = ClickHouseReader::new(config("samples")).unwrap();
-        reader.value_projection = Some(asap_types::sds::ValueProjectionIdentity::Constant {
-            value: planner_types::pre_asap::ScalarValue::Int64(1),
-        });
-        assert!(reader.sql().contains("{projected_value:Int64} AS value"));
-        assert!(!reader.sql().contains(" value AS value"));
-    }
-
-    #[test]
-    fn typed_source_enters_clickhouse_backfill_lifecycle() {
-        let mut materialization = asap_types::PrecomputeMaterialization::new(
-            asap_types::AggregationType::Sum,
-            String::new(),
-            Default::default(),
-            asap_types::KeyByLabelNames::empty(),
-            asap_types::KeyByLabelNames::empty(),
-            asap_types::KeyByLabelNames::empty(),
-            String::new(),
-            1,
-            1,
-            asap_types::WindowKind::Tumbling,
-            String::new(),
-            "samples.value".into(),
-            None,
-            Some("another_table".into()),
-            Some("value".into()),
-        );
-        let factory = clickhouse_reader_factory(config("samples"));
-        materialization.table_timestamp_column = Some("timestamp_ms".into());
-        let reader = factory(
-            &BackfillSource::ClickHouse {
-                database: "metrics".into(),
-                table: "another_table".into(),
-            },
-            &materialization,
-        )
-        .unwrap();
-        assert_eq!(reader.source_name(), "ClickHouseReader");
-        let mut typed = materialization.clone();
-        typed.grouping_labels =
-            asap_types::GroupingProjection::new(vec![planner_types::pre_asap::Column::new(
-                "tenant",
-                planner_types::pre_asap::DataType::Int64,
-                false,
-            )]);
-        assert!(factory(
-            &BackfillSource::ClickHouse {
-                database: "metrics".into(),
-                table: "another_table".into()
-            },
-            &typed,
-        )
-        .is_ok());
-        typed.grouping_labels =
-            asap_types::GroupingProjection::new(vec![planner_types::pre_asap::Column::new(
-                "tenant",
-                planner_types::pre_asap::DataType::Int64,
-                true,
-            )]);
-        let rejected = factory(
-            &BackfillSource::ClickHouse {
-                database: "metrics".into(),
-                table: "another_table".into(),
-            },
-            &typed,
-        );
-        assert!(matches!(rejected, Err(error) if error.to_string().contains("null-key encoding")));
-
-        assert!(factory(
-            &BackfillSource::ClickHouse {
-                database: "another_database".into(),
-                table: "samples".into(),
-            },
-            &materialization
-        )
-        .is_err());
-        assert!(factory(
-            &BackfillSource::ClickHouse {
-                database: "metrics".into(),
-                table: "samples; DROP TABLE x".into(),
-            },
-            &materialization
-        )
-        .is_err());
-    }
-}
diff --git a/data_plane/src/storage_engines/sketch_db/backfill/mod.rs b/data_plane/src/storage_engines/sketch_db/backfill/mod.rs
deleted file mode 100644
index 9dacddcfb..000000000
--- a/data_plane/src/storage_engines/sketch_db/backfill/mod.rs
+++ /dev/null
@@ -1,1432 +0,0 @@
-//! Backfill job lifecycle, registry, readers, and rebuild workers.
-//!
-//! Backfill reconstructs windows preceding a materialization's live ingestion
-//! from source samples. Jobs progress from Queued to Running and then Complete,
-//! Failed, or Cancelled. The registry tracks written windows for coverage lookup
-//! and optionally persists job records across restarts.
-
-use std::collections::HashMap;
-use std::path::{Path, PathBuf};
-use std::sync::atomic::{AtomicU64, Ordering};
-use std::sync::RwLock;
-use std::time::{SystemTime, UNIX_EPOCH};
-
-use asap_types::aggregation_config::PrecomputeMaterialization;
-use serde::{Deserialize, Serialize};
-use tracing::{debug, warn};
-
-/// Source of raw samples a backfill job reads from. The DB picks a
-/// concrete reader at job-dispatch time based on deployment config
-/// (§10.2 of the design). All variants feed the same sketch builder
-/// downstream; the reader abstraction lives in Phase 5b.
-#[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
-pub enum BackfillSource {
-    /// Gorilla-compressed files in S3 / MinIO / GCS, produced by
-    /// DataCollector's gorillacol + S3 Files exporter.
-    S3Gorilla { bucket: String, prefix: String },
-    /// Prometheus (or VictoriaMetrics / Thanos / Cortex) via the
-    /// HTTP range-query API.
-    Prometheus { url: String },
-    /// ClickHouse table read through the deployment's configured connection.
-    /// The source identity belongs to the job; credentials remain local.
-    ClickHouse { database: String, table: String },
-    /// Rebuild from a different sketch already in the store. Used for
-    /// lossless schema widenings (e.g. CMS(256) → CMS(2048)) where
-    /// the source sketch is a strict subset of the target's
-    /// representable state. The reader converts `source_agg_id`'s
-    /// precomputes into the target's shape without touching the exact
-    /// DB — cheaper than a full S3 / Prometheus reread when
-    /// applicable.
-    OtherSketch { source_agg_id: u64 },
-}
-
-/// Lifecycle state of a [`BackfillJob`]. Transitions:
-///
-/// ```text
-///            ┌──────────┐
-///            │  Queued  │────────────────┐
-///            └────┬─────┘                │ cancel() before run
-///                 │ worker picks up      ▼
-///                 ▼                 ┌───────────┐
-///            ┌──────────┐           │ Cancelled │
-///            │  Running │─── cancel ▶│           │
-///            └────┬─────┘           └───────────┘
-///                 │
-///        ┌────────┼────────┐
-///        │                 │
-///        ▼                 ▼
-///  ┌──────────┐      ┌──────────┐
-///  │ Complete │      │  Failed  │
-///  └──────────┘      └──────────┘
-/// ```
-///
-/// Complete / Failed / Cancelled are terminal. The registry keeps
-/// terminal jobs visible for a tunable retention so operators and
-/// the HTTP list endpoint can see recent history.
-#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
-pub enum BackfillStatus {
-    /// Accepted by the registry, waiting for a worker. Registry's
-    /// default state right after `create`.
-    Queued,
-    /// A worker has picked the job up and is replaying samples. The
-    /// `windows_done` field ticks during this state.
-    Running,
-    /// All windows in `[time_range.0, time_range.1)` have been
-    /// rebuilt and written. Terminal.
-    Complete,
-    /// A permanent error stopped the rebuild (exact-DB read error,
-    /// sketch builder mismatch, write rejected by §6.3 schema
-    /// barrier, etc.). Terminal. The human-readable reason is in
-    /// [`BackfillJob::error_message`].
-    Failed,
-    /// The operator (or the admission-control loop) aborted the
-    /// job. Terminal. Any windows already written are kept — the
-    /// job merely stops rebuilding further ones.
-    Cancelled,
-}
-
-impl BackfillStatus {
-    /// Whether the status is terminal. Terminal jobs cannot be
-    /// re-transitioned; `start`, `mark_complete`, `mark_failed`, and
-    /// `cancel` are no-ops once reached.
-    pub fn is_terminal(&self) -> bool {
-        matches!(
-            self,
-            BackfillStatus::Complete | BackfillStatus::Failed | BackfillStatus::Cancelled
-        )
-    }
-}
-
-/// A single REFRESH MATERIALIZED VIEW unit: rebuild `agg_id` over
-/// `time_range` from the sample stream described by `source`. See
-/// §10.2 of the design.
-#[derive(Debug, Clone, Serialize, Deserialize)]
-pub struct BackfillJob {
-    /// Monotonically-increasing id assigned by the registry on
-    /// `create`. Unique per-process.
-    pub job_id: u64,
-    /// Target aggregation. The registry does not itself verify that
-    /// the agg_id is `Active` in any sid lifecycle table — Phase 5c's
-    /// worker consults the sid-level write barrier before writing.
-    pub agg_id: u64,
-    /// Inclusive-exclusive `[start_ms, end_ms)` window to rebuild.
-    pub time_range: (u64, u64),
-    pub source: BackfillSource,
-    pub status: BackfillStatus,
-    /// Worker-set counter that ticks as windows are rebuilt. Lets
-    /// `coverage()` report a `BackfillInProgress { pct }` without
-    /// polling the source. `0` while the job is `Queued` or the
-    /// worker hasn't emitted its first window yet.
-    pub windows_done: u64,
-    /// Planner-estimated total number of windows this job will
-    /// rebuild. Set at `create` time from `(time_range, window_size)`.
-    /// Exposed so the progress percentage is a simple ratio.
-    pub windows_total: u64,
-    /// Wall-clock millis at `create` time.
-    pub created_at_ms: u64,
-    /// Wall-clock millis when the status first transitioned to
-    /// `Running`. `None` while `Queued`.
-    pub started_at_ms: Option<u64>,
-    /// Wall-clock millis at the terminal transition. `None` while
-    /// non-terminal.
-    pub completed_at_ms: Option<u64>,
-    /// Human-readable reason present only for `Failed` jobs.
-    pub error_message: Option<String>,
-}
-
-impl BackfillJob {
-    /// Progress as a ratio in `[0, 1]`. Returns `0.0` for jobs where
-    /// `windows_total == 0` (empty range — rarely useful, but a job
-    /// can be created with a tight `[t, t)` range and will be
-    /// trivially complete).
-    pub fn progress(&self) -> f64 {
-        if self.windows_total == 0 {
-            return match self.status {
-                BackfillStatus::Complete => 1.0,
-                _ => 0.0,
-            };
-        }
-        (self.windows_done as f64 / self.windows_total as f64).clamp(0.0, 1.0)
-    }
-}
-
-/// §10.4 coverage classification for a `(agg_id, range)` pair. Used
-/// by the query engine in Phase 5f to decide whether to read from
-/// the sketch (Complete), wait briefly / fall back to the exact DB
-/// (BackfillInProgress), or fall back immediately (Missing).
-#[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
-pub enum Coverage {
-    /// Every window in the requested range has been written by
-    /// either native ingest or a completed backfill. Query proceeds
-    /// against the sketch.
-    Complete,
-    /// A backfill job is currently rebuilding this range. The `pct`
-    /// is the job's `progress()` so the caller can decide whether to
-    /// wait (e.g. if >90%) or fall back.
-    BackfillInProgress { job_id: u64, pct: f64 },
-    /// Neither native nor backfill covers this range. Caller must
-    /// fall back to the exact DB.
-    Missing,
-}
-
-/// Thread-safe registry of backfill jobs, all in memory.
-///
-/// ## Guarantees
-///
-/// * `job_id` allocation is monotonically increasing and unique per
-///   registry instance. `AtomicU64::fetch_add` guarantees no two
-///   concurrent `create` calls observe the same id.
-/// * Read paths (`get`, `list`, `by_status`) take only a `read()`
-///   lock on the inner map; writes take `write()`. A single `RwLock`
-///   fits the workload — backfill creations are human / control plane
-///   triggered, much rarer than reads.
-/// * All state transitions go through `update_status` (or the sugar
-///   methods `start` / `mark_complete` / `mark_failed` / `cancel`)
-///   which enforce terminal-state immutability: once a job is
-///   Complete / Failed / Cancelled, further transitions are
-///   rejected with `false` return.
-///
-/// ## Persistence
-///
-/// Opt-in via [`Self::with_persistence`] or the
-/// [`Self::load_or_new`] constructor. When set, the registry
-/// atomically rewrites the snapshot to `persist_path` (write tmp +
-/// rename) after every status transition — `create`, `start`,
-/// `mark_complete`, `mark_failed`, `cancel`, `evict_old_terminal`.
-/// `tick_progress` is deliberately **not** persisted: workers can
-/// tick many times per second, and losing the last few ticks
-/// across a restart is harmless (Phase 5e's worker will re-derive
-/// `windows_done` from whatever the store already has when it
-/// picks a Running job back up).
-///
-/// I/O errors on save are logged and dropped — the registry is
-/// always authoritative in memory. Corrupt files on load are
-/// logged and the registry falls back to empty, matching Phase
-/// 2c's semantics.
-pub struct BackfillRegistry {
-    jobs: RwLock<HashMap<u64, BackfillJob>>,
-    next_job_id: AtomicU64,
-    /// Optional on-disk snapshot path. Set via `with_persistence`.
-    persist_path: Option<PathBuf>,
-    /// Per-`job_id` list of [`WrittenWindow`] entries that
-    /// the corresponding backfill actually wrote to the store.
-    /// Phase 5e populates this via `record_window_written`;
-    /// Phase 5f's coverage tracker reads it to distinguish
-    /// `Backfilled` from `Missing` coverage for a given range.
-    ///
-    /// Kept separately from `jobs` so writes don't have to pay the
-    /// cost of cloning the whole job on every window — only the
-    /// provenance list grows.
-    ///
-    /// Not persisted to disk in Phase 5e. Phase 5g persistence
-    /// covered job lifecycle but not written-windows; if restart
-    /// recovery of the provenance list becomes necessary, it'll be
-    /// a Phase 5g-2 extension.
-    written_windows: RwLock<HashMap<u64, Vec<WrittenWindow>>>,
-}
-
-/// A single `(agg_id, window_range)` record of a window written by
-/// a backfill job. Phase 5f's coverage tracker reads these lists
-/// to distinguish `Backfilled { job_id }` coverage from `Missing`.
-pub type WrittenWindow = (u64, (u64, u64));
-
-/// On-disk format version for the persisted backfill registry.
-/// Bumped on any incompatible change to [`BackfillJob`] or
-/// [`PersistedSnapshot`]; version mismatch on load is treated as
-/// a corrupt file (registry starts empty, next save rewrites the
-/// current version).
-pub const PERSIST_FORMAT_VERSION: u32 = 1;
-
-/// Errors returned by [`BackfillRegistry::create_checked`]. Exists
-/// so the control-plane-facing HTTP endpoint can render distinct
-/// 400 vs 404 vs 409 depending on which invariant was violated,
-/// rather than swallowing the detail in a string.
-#[derive(Debug, PartialEq, Eq)]
-pub enum CreateError {
-    /// The `agg_id` isn't known to the schema registry. Caller
-    /// probably has a stale config or a typo.
-    UnknownAgg { agg_id: u64 },
-    /// The requested `end_ms` extends past the agg's
-    /// `created_at_ms`, which would put the backfill in conflict
-    /// with live ingest. §10.5 time-disjoint invariant.
-    Overlap {
-        agg_id: u64,
-        requested_end_ms: u64,
-        created_at_ms: u64,
-    },
-    /// The requested `start_ms` is older than the `SketchStore`
-    /// data-retention horizon — any windows the backfill writes
-    /// at that range would immediately be evicted by the
-    /// retention sweep. Method B from the design discussion: fail
-    /// fast at job creation rather than silently letting the
-    /// backfill produce windows that get wiped.
-    ///
-    /// `earliest_retained_ms` is `now - persistence_delete_older_than_ms`,
-    /// i.e. the smallest timestamp that would still survive
-    /// retention at creation time.
-    OutOfRetention {
-        agg_id: u64,
-        requested_start_ms: u64,
-        earliest_retained_ms: u64,
-    },
-}
-
-impl std::fmt::Display for CreateError {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        match self {
-            Self::UnknownAgg { agg_id } => {
-                write!(f, "unknown agg_id {agg_id} (not in schema registry)")
-            }
-            Self::Overlap {
-                agg_id,
-                requested_end_ms,
-                created_at_ms,
-            } => write!(
-                f,
-                "backfill end_ms {requested_end_ms} > agg {agg_id} created_at_ms {created_at_ms}; \
-                 live ingest already owns [{created_at_ms}, ∞), refuse to race"
-            ),
-            Self::OutOfRetention {
-                agg_id,
-                requested_start_ms,
-                earliest_retained_ms,
-            } => write!(
-                f,
-                "backfill start_ms {requested_start_ms} for agg {agg_id} is older than the store's \
-                 earliest_retained_ms {earliest_retained_ms}; any written windows would be evicted \
-                 by retention — extend persistence_delete_older_than before creating this job"
-            ),
-        }
-    }
-}
-
-impl std::error::Error for CreateError {}
-
-/// Top-level structure written by `persist_path`. Captures the
-/// current `next_job_id` alongside the jobs so a restart doesn't
-/// accidentally reuse a previously-allocated id.
-#[derive(Debug, Serialize, Deserialize)]
-struct PersistedSnapshot {
-    version: u32,
-    next_job_id: u64,
-    jobs: Vec<BackfillJob>,
-}
-
-impl Default for BackfillRegistry {
-    fn default() -> Self {
-        Self::new()
-    }
-}
-
-impl BackfillRegistry {
-    pub fn new() -> Self {
-        Self {
-            jobs: RwLock::new(HashMap::new()),
-            next_job_id: AtomicU64::new(1),
-            persist_path: None,
-            written_windows: RwLock::new(HashMap::new()),
-        }
-    }
-
-    /// Enable on-disk persistence at `path`. Every status transition
-    /// from here on atomically rewrites the snapshot. Prefer
-    /// [`Self::load_or_new`] over this builder if the file already
-    /// exists and you want to recover its contents.
-    pub fn with_persistence(mut self, path: impl Into<PathBuf>) -> Self {
-        self.persist_path = Some(path.into());
-        self
-    }
-
-    /// Build a registry that recovers prior job records from `path`
-    /// (if it exists) and then enables persistence at the same path.
-    /// The right way to construct a registry in production code.
-    ///
-    /// Load semantics:
-    /// * File does not exist → fresh empty registry; first transition
-    ///   writes the snapshot so the next restart has something to
-    ///   read.
-    /// * File exists and parses → load all jobs verbatim, restore
-    ///   `next_job_id` so IDs don't collide with persisted ones.
-    /// * File exists but is corrupt / wrong version → log warning,
-    ///   fall back to empty registry. Forward progress over
-    ///   historical accuracy, matching Phase 2c's schema-registry
-    ///   behaviour.
-    pub fn load_or_new(path: impl Into<PathBuf>) -> Self {
-        let path = path.into();
-        let mut registry = match Self::load_from_disk(&path) {
-            Ok(Some(r)) => {
-                debug!(
-                    "Loaded {} persisted backfill job(s) from {}",
-                    r.jobs.read().map(|m| m.len()).unwrap_or(0),
-                    path.display()
-                );
-                r
-            }
-            Ok(None) => Self::new(),
-            Err(e) => {
-                warn!(
-                    "Failed to load backfill registry from {}: {e}. Starting fresh.",
-                    path.display()
-                );
-                Self::new()
-            }
-        };
-        registry.persist_path = Some(path);
-        // Write an initial snapshot so a first-run file exists even
-        // before any job transitions happen.
-        registry.save_to_disk_if_persistent();
-        registry
-    }
-
-    fn load_from_disk(path: &Path) -> Result<Option<Self>, std::io::Error> {
-        let bytes = match std::fs::read(path) {
-            Ok(b) => b,
-            Err(e) if e.kind() == std::io::ErrorKind::NotFound => return Ok(None),
-            Err(e) => return Err(e),
-        };
-        let snap: PersistedSnapshot = serde_json::from_slice(&bytes)
-            .map_err(|e| std::io::Error::new(std::io::ErrorKind::InvalidData, e))?;
-        if snap.version != PERSIST_FORMAT_VERSION {
-            return Err(std::io::Error::new(
-                std::io::ErrorKind::InvalidData,
-                format!(
-                    "unsupported backfill persist format version {} (expected {})",
-                    snap.version, PERSIST_FORMAT_VERSION
-                ),
-            ));
-        }
-        let mut map = HashMap::with_capacity(snap.jobs.len());
-        for job in snap.jobs {
-            map.insert(job.job_id, job);
-        }
-        Ok(Some(Self {
-            jobs: RwLock::new(map),
-            next_job_id: AtomicU64::new(snap.next_job_id.max(1)),
-            persist_path: None,
-            written_windows: RwLock::new(HashMap::new()),
-        }))
-    }
-
-    fn save_to_disk_if_persistent(&self) {
-        let Some(path) = self.persist_path.as_ref() else {
-            return;
-        };
-        let jobs: Vec<BackfillJob> = match self.jobs.read() {
-            Ok(m) => m.values().cloned().collect(),
-            Err(e) => {
-                warn!("Backfill registry lock poisoned; skipping persist: {e}");
-                return;
-            }
-        };
-        let snap = PersistedSnapshot {
-            version: PERSIST_FORMAT_VERSION,
-            next_job_id: self.next_job_id.load(Ordering::Relaxed),
-            jobs,
-        };
-        let bytes = match serde_json::to_vec_pretty(&snap) {
-            Ok(b) => b,
-            Err(e) => {
-                warn!("Failed to serialise backfill registry: {e}");
-                return;
-            }
-        };
-        let tmp = path.with_extension("tmp");
-        if let Some(parent) = path.parent() {
-            if !parent.as_os_str().is_empty() {
-                let _ = std::fs::create_dir_all(parent);
-            }
-        }
-        if let Err(e) = std::fs::write(&tmp, &bytes) {
-            warn!(
-                "Failed to write backfill registry tmp file {}: {e}",
-                tmp.display()
-            );
-            return;
-        }
-        if let Err(e) = std::fs::rename(&tmp, path) {
-            warn!(
-                "Failed to rename backfill registry {} → {}: {e}",
-                tmp.display(),
-                path.display()
-            );
-        }
-    }
-
-    /// Allocate a fresh `job_id`, stamp `created_at_ms`, and insert
-    /// the job as `Queued`. Returns the allocated id.
-    pub fn create(
-        &self,
-        agg_id: u64,
-        time_range: (u64, u64),
-        source: BackfillSource,
-        windows_total: u64,
-    ) -> u64 {
-        let job_id = self.next_job_id.fetch_add(1, Ordering::Relaxed);
-        let job = BackfillJob {
-            job_id,
-            agg_id,
-            time_range,
-            source,
-            status: BackfillStatus::Queued,
-            windows_done: 0,
-            windows_total,
-            created_at_ms: now_ms(),
-            started_at_ms: None,
-            completed_at_ms: None,
-            error_message: None,
-        };
-        if let Ok(mut map) = self.jobs.write() {
-            map.insert(job_id, job);
-        }
-        self.save_to_disk_if_persistent();
-        job_id
-    }
-
-    /// Create a job with all §10.5 invariants enforced:
-    ///
-    /// * **Time-disjoint**: `time_range.1 <= created_at_ms`
-    ///   so backfill writes don't race live writes on the same
-    ///   `(agg_id, window)` pair. The caller passes the agg's
-    ///   `created_at_ms` directly — in the post-schema-retirement
-    ///   world there is no `SchemaRegistry::get(agg_id)` to look
-    ///   it up from, and the caller (typically the HTTP handler
-    ///   or control plane) already has the wall-clock snapshot in
-    ///   scope from its `InstalledPrecomputePlan` reconcile event.
-    /// * **Within data retention** (if `data_retention_ms` is
-    ///   provided): `time_range.0 >= now - data_retention_ms`.
-    ///   Method B from the design discussion — fail fast instead
-    ///   of letting the backfill produce windows that the
-    ///   SketchStore retention sweep would immediately evict.
-    ///   Pass `None` to skip the check (tests, or deployments
-    ///   where retention is disabled).
-    ///
-    /// The `agg_id` is taken from `config.aggregation_id`; the
-    /// caller no longer threads it separately.
-    ///
-    /// Errors map to distinct [`CreateError`] variants so the
-    /// control-plane-facing HTTP endpoint can return specific 404 /
-    /// 409 / 400 statuses. `CreateError::UnknownAgg` is no longer
-    /// returned from this method — the caller proves the agg
-    /// exists by holding the `PrecomputeMaterialization` — but the variant
-    /// is kept on the enum for HTTP error-mapping compatibility
-    /// (the handler still produces it when its own lookup misses).
-    pub fn create_checked(
-        &self,
-        config: &PrecomputeMaterialization,
-        created_at_ms: u64,
-        time_range: (u64, u64),
-        source: BackfillSource,
-        windows_total: u64,
-        data_retention_ms: Option<u64>,
-    ) -> Result<u64, CreateError> {
-        let agg_id = config.policy_fp_u64();
-        // Time-disjoint invariant: live ingest writes `[created_at, ∞)`
-        // so backfill must stay strictly inside `[0, created_at)` or
-        // touch the boundary exactly.
-        if time_range.1 > created_at_ms {
-            return Err(CreateError::Overlap {
-                agg_id,
-                requested_end_ms: time_range.1,
-                created_at_ms,
-            });
-        }
-        // Data-retention check (Method B): if the store would
-        // immediately evict the windows this job would write,
-        // reject up-front with a clear message rather than
-        // silently wasting CPU + I/O.
-        if let Some(retention_ms) = data_retention_ms {
-            let earliest_retained_ms = now_ms().saturating_sub(retention_ms);
-            if time_range.0 < earliest_retained_ms {
-                return Err(CreateError::OutOfRetention {
-                    agg_id,
-                    requested_start_ms: time_range.0,
-                    earliest_retained_ms,
-                });
-            }
-        }
-        Ok(self.create(agg_id, time_range, source, windows_total))
-    }
-
-    pub fn get(&self, job_id: u64) -> Option<BackfillJob> {
-        self.jobs.read().ok()?.get(&job_id).cloned()
-    }
-
-    /// Iterate (clones) all jobs in the registry. Order is
-    /// HashMap-iteration — non-deterministic. Callers that need a
-    /// stable order should sort by `job_id` themselves.
-    pub fn list(&self) -> Vec<BackfillJob> {
-        self.jobs
-            .read()
-            .map(|m| m.values().cloned().collect())
-            .unwrap_or_default()
-    }
-
-    /// All jobs in a given status. Same ordering caveat as `list`.
-    pub fn list_by_status(&self, status: &BackfillStatus) -> Vec<BackfillJob> {
-        self.jobs
-            .read()
-            .map(|m| {
-                m.values()
-                    .filter(|j| &j.status == status)
-                    .cloned()
-                    .collect()
-            })
-            .unwrap_or_default()
-    }
-
-    /// Transition `job_id` to `Running`, stamping `started_at_ms`.
-    /// Returns `false` if the job doesn't exist or is already past
-    /// `Queued` (terminal or already Running). The worker calls this
-    /// right before replaying its first window.
-    pub fn start(&self, job_id: u64) -> bool {
-        let mut map = match self.jobs.write() {
-            Ok(m) => m,
-            Err(_) => return false,
-        };
-        let Some(job) = map.get_mut(&job_id) else {
-            return false;
-        };
-        if !matches!(job.status, BackfillStatus::Queued) {
-            return false;
-        }
-        job.status = BackfillStatus::Running;
-        job.started_at_ms = Some(now_ms());
-        drop(map);
-        self.save_to_disk_if_persistent();
-        true
-    }
-
-    /// Bump `windows_done` by 1. No-op if the job doesn't exist or
-    /// is not `Running`. Does NOT cap at `windows_total` — a worker
-    /// that overestimates has already shipped, and clamping would
-    /// hide the bug.
-    pub fn tick_progress(&self, job_id: u64) -> bool {
-        let mut map = match self.jobs.write() {
-            Ok(m) => m,
-            Err(_) => return false,
-        };
-        let Some(job) = map.get_mut(&job_id) else {
-            return false;
-        };
-        if !matches!(job.status, BackfillStatus::Running) {
-            return false;
-        }
-        job.windows_done = job.windows_done.saturating_add(1);
-        true
-    }
-
-    pub fn mark_complete(&self, job_id: u64) -> bool {
-        self.finish(job_id, BackfillStatus::Complete, None)
-    }
-
-    pub fn mark_failed(&self, job_id: u64, error: impl Into<String>) -> bool {
-        self.finish(job_id, BackfillStatus::Failed, Some(error.into()))
-    }
-
-    /// Cancel the job. Works from `Queued` OR `Running` (see the
-    /// state diagram on [`BackfillStatus`]); rejects terminal
-    /// states.
-    pub fn cancel(&self, job_id: u64) -> bool {
-        let mut map = match self.jobs.write() {
-            Ok(m) => m,
-            Err(_) => return false,
-        };
-        let Some(job) = map.get_mut(&job_id) else {
-            return false;
-        };
-        if job.status.is_terminal() {
-            return false;
-        }
-        job.status = BackfillStatus::Cancelled;
-        job.completed_at_ms = Some(now_ms());
-        drop(map);
-        self.save_to_disk_if_persistent();
-        true
-    }
-
-    fn finish(&self, job_id: u64, new_status: BackfillStatus, error: Option<String>) -> bool {
-        let mut map = match self.jobs.write() {
-            Ok(m) => m,
-            Err(_) => return false,
-        };
-        let Some(job) = map.get_mut(&job_id) else {
-            return false;
-        };
-        if job.status.is_terminal() {
-            return false;
-        }
-        job.status = new_status;
-        job.completed_at_ms = Some(now_ms());
-        if error.is_some() {
-            job.error_message = error;
-        }
-        drop(map);
-        self.save_to_disk_if_persistent();
-        true
-    }
-
-    /// Record that job `job_id` wrote a backfilled window at
-    /// `(agg_id, window_range)`. Called by Phase 5e's
-    /// `BackfillWindowProcessor` after a successful per-window
-    /// write to the store — this is how the registry knows which
-    /// `(agg_id, range)` pairs have been backfilled, which Phase
-    /// 5f's coverage tracker uses to distinguish `Backfilled` from
-    /// `Missing` coverage.
-    ///
-    /// Idempotent: recording the same `(job_id, agg_id, range)`
-    /// twice appends duplicate entries. Callers shouldn't do that,
-    /// but the registry doesn't police it — de-duplication is a
-    /// Phase 5f concern.
-    pub fn record_window_written(&self, job_id: u64, agg_id: u64, window_range: (u64, u64)) {
-        if let Ok(mut map) = self.written_windows.write() {
-            map.entry(job_id).or_default().push((agg_id, window_range));
-        }
-    }
-
-    /// All `(agg_id, window_range)` pairs written by `job_id`.
-    /// Empty (or missing) list means either the job hasn't started
-    /// writing yet or was cancelled before any window completed.
-    pub fn windows_written_by(&self, job_id: u64) -> Vec<WrittenWindow> {
-        self.written_windows
-            .read()
-            .ok()
-            .and_then(|m| m.get(&job_id).cloned())
-            .unwrap_or_default()
-    }
-
-    /// §10.4 coverage classification for `(agg_id, range)`.
-    ///
-    /// Walks the registry's jobs for `agg_id` and classifies
-    /// `range` (half-open `[start_ms, end_ms)`) as:
-    ///
-    /// * [`Coverage::Complete`] — every ms in the range is covered
-    ///   by at least one `Complete` job's written-window list.
-    /// * [`Coverage::BackfillInProgress`] — at least one `Running`
-    ///   job overlaps the range, and we can't prove Complete
-    ///   coverage. Returns the job's current progress so the
-    ///   caller can decide whether to wait or fall back.
-    /// * [`Coverage::Missing`] — no Complete coverage, no Running
-    ///   coverage. Caller should fall back to the exact DB per
-    ///   §7.3.
-    ///
-    /// ## Scope
-    ///
-    /// This method looks ONLY at backfill state. It does **not**
-    /// know about live ingest — callers that want the full
-    /// `[Coverage of `range`] = backfill + live` picture should
-    /// split the query range at the target agg's `created_at_ms`
-    /// first (§10.5 time-disjoint) and ask this method only about
-    /// the `[start, created_at)` historical portion. The live
-    /// `[created_at, end)` portion is always `Complete` by
-    /// definition of the live ingest path.
-    ///
-    /// ## Algorithm
-    ///
-    /// 1. Collect every window from every `Complete` job for
-    ///    `agg_id` into a flat list.
-    /// 2. Sort + merge overlapping intervals into a coverage set.
-    /// 3. Check if `range` is fully inside the coverage set —
-    ///    if so, return `Complete`.
-    /// 4. Otherwise, check `Running` jobs: if one exists whose
-    ///    `time_range` overlaps `range`, return
-    ///    `BackfillInProgress { job_id, pct }` with that job's
-    ///    current progress.
-    /// 5. Otherwise return `Missing`.
-    ///
-    /// Cost: linear in the total windows written by jobs for
-    /// `agg_id`. For a 24h backfill with 1-minute windows that's
-    /// 1440 windows — a trivial walk. If a single agg accumulates
-    /// thousands of jobs with millions of windows each, this will
-    /// want caching — deferred until the profile says so.
-    pub fn coverage(&self, agg_id: u64, range: (u64, u64)) -> Coverage {
-        if range.0 >= range.1 {
-            // Empty / inverted range: treat as trivially complete.
-            // Saves the caller an `is_empty` branch at every site.
-            return Coverage::Complete;
-        }
-
-        // Snapshot jobs + written windows. Clone both so we don't
-        // hold locks across the interval-merge logic.
-        let jobs: Vec<BackfillJob> = self
-            .jobs
-            .read()
-            .map(|m| m.values().filter(|j| j.agg_id == agg_id).cloned().collect())
-            .unwrap_or_default();
-        let written: HashMap<u64, Vec<WrittenWindow>> = self
-            .written_windows
-            .read()
-            .map(|m| m.clone())
-            .unwrap_or_default();
-
-        // Step 1+2: collect and merge Complete-job windows.
-        let mut complete_ranges: Vec<(u64, u64)> = Vec::new();
-        for job in &jobs {
-            if !matches!(job.status, BackfillStatus::Complete) {
-                continue;
-            }
-            if let Some(windows) = written.get(&job.job_id) {
-                for &(wagg, wrange) in windows {
-                    if wagg == agg_id {
-                        complete_ranges.push(wrange);
-                    }
-                }
-            }
-        }
-        if range_covered_by(range, &complete_ranges) {
-            return Coverage::Complete;
-        }
-
-        // Step 4: any Running job overlapping range?
-        for job in &jobs {
-            if !matches!(job.status, BackfillStatus::Running) {
-                continue;
-            }
-            let (s, e) = job.time_range;
-            let overlaps = s < range.1 && e > range.0;
-            if overlaps {
-                return Coverage::BackfillInProgress {
-                    job_id: job.job_id,
-                    pct: job.progress(),
-                };
-            }
-        }
-
-        Coverage::Missing
-    }
-
-    #[cfg(test)]
-    /// Remove any terminal job older than `older_than_ms`. Used by
-    /// the eventual retention sweep; returns the number of jobs
-    /// evicted. Non-terminal jobs are never evicted.
-    pub fn evict_old_terminal(&self, older_than_ms: u64) -> usize {
-        let cutoff = now_ms().saturating_sub(older_than_ms);
-        let mut map = match self.jobs.write() {
-            Ok(m) => m,
-            Err(_) => return 0,
-        };
-        let before = map.len();
-        // Use `<=` so `older_than_ms = 0` evicts everything terminal
-        // *now* (intuitive meaning of "anything older than 0ms ago"),
-        // including jobs that completed in the same millisecond as
-        // this call — which is the common case in tests and in
-        // control-plane-driven eviction loops where both timestamps
-        // come from the same wall clock.
-        map.retain(|_, job| {
-            !(job.status.is_terminal() && job.completed_at_ms.map(|t| t <= cutoff).unwrap_or(false))
-        });
-        let evicted = before - map.len();
-        drop(map);
-        if evicted > 0 {
-            self.save_to_disk_if_persistent();
-        }
-        evicted
-    }
-}
-
-/// Merge `ranges` into a sorted non-overlapping list and check
-/// whether the half-open `[target.0, target.1)` is fully covered.
-/// Does not mutate `ranges`. Empty `ranges` → `false` for any
-/// non-empty `target`. Exposed at module scope so the unit tests
-/// can exercise the interval math independently of the registry.
-fn range_covered_by(target: (u64, u64), ranges: &[(u64, u64)]) -> bool {
-    if target.0 >= target.1 {
-        return true;
-    }
-    let mut sorted: Vec<(u64, u64)> = ranges.iter().filter(|(a, b)| a < b).copied().collect();
-    if sorted.is_empty() {
-        return false;
-    }
-    sorted.sort_unstable();
-    // Walk left-to-right, merging overlapping/adjacent spans and
-    // checking that the merged span covers `target` monotonically.
-    let mut cursor = target.0;
-    for (start, end) in sorted {
-        if start > cursor {
-            // Gap between where we'd need coverage and the next
-            // span's start — short-circuit.
-            return false;
-        }
-        if end > cursor {
-            cursor = end;
-        }
-        if cursor >= target.1 {
-            return true;
-        }
-    }
-    cursor >= target.1
-}
-
-fn now_ms() -> u64 {
-    SystemTime::now()
-        .duration_since(UNIX_EPOCH)
-        .map(|d| d.as_millis() as u64)
-        .unwrap_or(0)
-}
-
-// 2026-05 reorg: backfill-* and the two BackfillSource impls moved
-// into this folder as submodules.
-pub mod clickhouse_reader;
-pub mod processor;
-pub mod prometheus_reader;
-pub mod raw_sample_reader;
-pub mod service;
-pub mod window_builder;
-pub mod worker;
-
-pub use clickhouse_reader::{clickhouse_reader_factory, ClickHouseReader, ClickHouseReaderConfig};
-pub use processor::BackfillWindowProcessor;
-pub use prometheus_reader::PrometheusReader;
-pub use raw_sample_reader::{
-    LabelFilter, MockRawSampleReader, RawSample, RawSampleReader, RawSampleReaderError,
-};
-pub use service::{
-    default_reader_factory, noop_reader_factory, BackfillService, BackfillServiceConfig,
-    BackfillServiceHandle, ReaderFactory,
-};
-#[cfg(test)]
-pub use window_builder::build_backfilled_accumulator;
-pub use window_builder::build_dag_accumulator;
-pub use worker::{BackfillWorker, BackfillWorkerError, WindowProcessor};
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    fn prom_source() -> BackfillSource {
-        BackfillSource::Prometheus {
-            url: "http://prom.local:9090".to_string(),
-        }
-    }
-
-    #[test]
-    fn create_allocates_monotonic_ids_and_defaults_to_queued() {
-        let r = BackfillRegistry::new();
-        let a = r.create(42, (100, 200), prom_source(), 10);
-        let b = r.create(42, (200, 300), prom_source(), 10);
-        assert_eq!(a, 1);
-        assert_eq!(b, 2);
-        let job_a = r.get(a).unwrap();
-        assert_eq!(job_a.status, BackfillStatus::Queued);
-        assert!(job_a.started_at_ms.is_none());
-        assert!(job_a.completed_at_ms.is_none());
-        assert_eq!(job_a.windows_done, 0);
-        assert_eq!(job_a.windows_total, 10);
-    }
-
-    #[test]
-    fn get_returns_none_for_unknown_job() {
-        let r = BackfillRegistry::new();
-        assert!(r.get(9999).is_none());
-    }
-
-    #[test]
-    fn start_transitions_queued_to_running_and_stamps_started_at() {
-        let r = BackfillRegistry::new();
-        let id = r.create(1, (0, 100), prom_source(), 5);
-        assert!(r.start(id));
-        let job = r.get(id).unwrap();
-        assert_eq!(job.status, BackfillStatus::Running);
-        assert!(job.started_at_ms.is_some());
-    }
-
-    #[test]
-    fn start_is_idempotent_against_already_running_or_terminal() {
-        let r = BackfillRegistry::new();
-        let id = r.create(1, (0, 100), prom_source(), 5);
-        assert!(r.start(id));
-        // Second start is a no-op — returns false, state unchanged.
-        assert!(!r.start(id));
-        assert!(r.mark_complete(id));
-        assert!(!r.start(id));
-    }
-
-    #[test]
-    fn tick_progress_only_during_running() {
-        let r = BackfillRegistry::new();
-        let id = r.create(1, (0, 100), prom_source(), 3);
-        // Queued: ticks rejected.
-        assert!(!r.tick_progress(id));
-        assert_eq!(r.get(id).unwrap().windows_done, 0);
-
-        r.start(id);
-        assert!(r.tick_progress(id));
-        assert!(r.tick_progress(id));
-        assert_eq!(r.get(id).unwrap().windows_done, 2);
-
-        r.mark_complete(id);
-        assert!(!r.tick_progress(id));
-        assert_eq!(r.get(id).unwrap().windows_done, 2);
-    }
-
-    #[test]
-    fn mark_complete_closes_job_and_stamps_completed_at() {
-        let r = BackfillRegistry::new();
-        let id = r.create(1, (0, 100), prom_source(), 1);
-        r.start(id);
-        assert!(r.mark_complete(id));
-        let job = r.get(id).unwrap();
-        assert_eq!(job.status, BackfillStatus::Complete);
-        assert!(job.completed_at_ms.is_some());
-        assert!(job.error_message.is_none());
-    }
-
-    #[test]
-    fn mark_failed_stores_error_message() {
-        let r = BackfillRegistry::new();
-        let id = r.create(1, (0, 100), prom_source(), 1);
-        r.start(id);
-        assert!(r.mark_failed(id, "exact DB unreachable"));
-        let job = r.get(id).unwrap();
-        assert_eq!(job.status, BackfillStatus::Failed);
-        assert_eq!(job.error_message.as_deref(), Some("exact DB unreachable"));
-        assert!(job.completed_at_ms.is_some());
-    }
-
-    #[test]
-    fn terminal_states_reject_further_transitions() {
-        let r = BackfillRegistry::new();
-        let id = r.create(1, (0, 100), prom_source(), 1);
-        r.start(id);
-        r.mark_complete(id);
-        assert!(!r.mark_failed(id, "ignored"));
-        assert!(!r.mark_complete(id));
-        assert!(!r.cancel(id));
-        let job = r.get(id).unwrap();
-        assert_eq!(job.status, BackfillStatus::Complete);
-        assert!(job.error_message.is_none());
-    }
-
-    #[test]
-    fn cancel_works_from_queued_and_running() {
-        let r = BackfillRegistry::new();
-        let queued = r.create(1, (0, 100), prom_source(), 1);
-        assert!(r.cancel(queued));
-        assert_eq!(r.get(queued).unwrap().status, BackfillStatus::Cancelled);
-
-        let running = r.create(2, (0, 100), prom_source(), 1);
-        r.start(running);
-        assert!(r.cancel(running));
-        assert_eq!(r.get(running).unwrap().status, BackfillStatus::Cancelled);
-    }
-
-    #[test]
-    fn cancel_rejects_terminal_jobs() {
-        let r = BackfillRegistry::new();
-        let id = r.create(1, (0, 100), prom_source(), 1);
-        r.start(id);
-        r.mark_complete(id);
-        assert!(!r.cancel(id));
-    }
-
-    #[test]
-    fn list_and_list_by_status_return_expected_sets() {
-        let r = BackfillRegistry::new();
-        let a = r.create(1, (0, 100), prom_source(), 1);
-        let b = r.create(1, (100, 200), prom_source(), 1);
-        let c = r.create(1, (200, 300), prom_source(), 1);
-        r.start(b);
-        r.start(c);
-        r.mark_complete(c);
-
-        assert_eq!(r.list().len(), 3);
-
-        let mut queued = r
-            .list_by_status(&BackfillStatus::Queued)
-            .into_iter()
-            .map(|j| j.job_id)
-            .collect::<Vec<_>>();
-        queued.sort();
-        assert_eq!(queued, vec![a]);
-
-        let running = r.list_by_status(&BackfillStatus::Running);
-        assert_eq!(running.len(), 1);
-        assert_eq!(running[0].job_id, b);
-
-        let done = r.list_by_status(&BackfillStatus::Complete);
-        assert_eq!(done.len(), 1);
-        assert_eq!(done[0].job_id, c);
-    }
-
-    #[test]
-    fn progress_is_zero_when_total_is_zero_and_not_complete() {
-        let r = BackfillRegistry::new();
-        let id = r.create(1, (0, 0), prom_source(), 0);
-        let job = r.get(id).unwrap();
-        assert_eq!(job.progress(), 0.0);
-    }
-
-    #[test]
-    fn progress_is_one_when_total_is_zero_and_complete() {
-        let r = BackfillRegistry::new();
-        let id = r.create(1, (0, 0), prom_source(), 0);
-        r.start(id);
-        r.mark_complete(id);
-        let job = r.get(id).unwrap();
-        assert_eq!(job.progress(), 1.0);
-    }
-
-    #[test]
-    fn progress_clamped_between_zero_and_one() {
-        let r = BackfillRegistry::new();
-        let id = r.create(1, (0, 100), prom_source(), 10);
-        r.start(id);
-        for _ in 0..25 {
-            r.tick_progress(id);
-        }
-        // windows_done is 25 > windows_total 10; progress clamps to 1.0.
-        assert_eq!(r.get(id).unwrap().progress(), 1.0);
-    }
-
-    #[test]
-    fn unknown_job_transitions_return_false() {
-        let r = BackfillRegistry::new();
-        assert!(!r.start(42));
-        assert!(!r.tick_progress(42));
-        assert!(!r.mark_complete(42));
-        assert!(!r.mark_failed(42, "nope"));
-        assert!(!r.cancel(42));
-    }
-
-    #[test]
-    fn evict_old_terminal_removes_only_terminal_past_cutoff() {
-        let r = BackfillRegistry::new();
-        let live = r.create(1, (0, 100), prom_source(), 1);
-        let done = r.create(1, (100, 200), prom_source(), 1);
-        r.start(done);
-        r.mark_complete(done);
-
-        // Cutoff in the future (max u64 interpretation): everything
-        // terminal is "older than" so should be evicted; live job stays.
-        let evicted = r.evict_old_terminal(0);
-        assert_eq!(evicted, 1);
-        assert!(r.get(live).is_some());
-        assert!(r.get(done).is_none());
-    }
-
-    #[test]
-    fn backfill_source_roundtrips_through_serde() {
-        for src in [
-            BackfillSource::ClickHouse {
-                database: "telemetry".into(),
-                table: "samples".into(),
-            },
-            BackfillSource::Prometheus {
-                url: "u".to_string(),
-            },
-            BackfillSource::S3Gorilla {
-                bucket: "b".to_string(),
-                prefix: "p".to_string(),
-            },
-            BackfillSource::OtherSketch { source_agg_id: 17 },
-        ] {
-            let json = serde_json::to_string(&src).unwrap();
-            let back: BackfillSource = serde_json::from_str(&json).unwrap();
-            assert_eq!(src, back);
-        }
-    }
-
-    #[test]
-    fn status_is_terminal_exhaustive_check() {
-        assert!(!BackfillStatus::Queued.is_terminal());
-        assert!(!BackfillStatus::Running.is_terminal());
-        assert!(BackfillStatus::Complete.is_terminal());
-        assert!(BackfillStatus::Failed.is_terminal());
-        assert!(BackfillStatus::Cancelled.is_terminal());
-    }
-
-    // ─── persistence tests ───────────────────────────────
-
-    #[test]
-    fn persistence_roundtrip_preserves_job_state() {
-        let dir = tempfile::tempdir().unwrap();
-        let path = dir.path().join("backfill.json");
-
-        let r = BackfillRegistry::load_or_new(&path);
-        let id = r.create(42, (100, 200), prom_source(), 4);
-        r.start(id);
-        r.mark_complete(id);
-
-        let before = r.get(id).unwrap();
-        drop(r);
-
-        // Simulate a restart.
-        let reloaded = BackfillRegistry::load_or_new(&path);
-        let after = reloaded.get(id).expect("job survived restart");
-        assert_eq!(after.status, BackfillStatus::Complete);
-        assert_eq!(after.agg_id, 42);
-        assert_eq!(after.time_range, (100, 200));
-        assert_eq!(after.windows_total, 4);
-        assert_eq!(after.started_at_ms, before.started_at_ms);
-        assert_eq!(after.completed_at_ms, before.completed_at_ms);
-    }
-
-    #[test]
-    fn persistence_preserves_next_job_id_across_restart() {
-        let dir = tempfile::tempdir().unwrap();
-        let path = dir.path().join("backfill.json");
-
-        let r = BackfillRegistry::load_or_new(&path);
-        let first = r.create(1, (0, 10), prom_source(), 1);
-        let second = r.create(1, (10, 20), prom_source(), 1);
-        assert_eq!(first, 1);
-        assert_eq!(second, 2);
-        drop(r);
-
-        // Restart: next id should be 3, not 1, so we don't collide
-        // with the persisted job_id=2.
-        let reloaded = BackfillRegistry::load_or_new(&path);
-        let third = reloaded.create(1, (20, 30), prom_source(), 1);
-        assert_eq!(third, 3);
-    }
-
-    #[test]
-    fn persistence_writes_file_on_create_even_when_empty_before() {
-        let dir = tempfile::tempdir().unwrap();
-        let path = dir.path().join("backfill.json");
-        assert!(!path.exists());
-
-        let r = BackfillRegistry::load_or_new(&path);
-        // load_or_new writes an initial empty snapshot so the file
-        // always exists after construction.
-        assert!(path.exists());
-        let _ = r.create(1, (0, 10), prom_source(), 1);
-        let bytes = std::fs::read(&path).unwrap();
-        let snap: serde_json::Value = serde_json::from_slice(&bytes).unwrap();
-        assert_eq!(snap["version"], 1);
-        assert_eq!(snap["jobs"].as_array().unwrap().len(), 1);
-    }
-
-    #[test]
-    fn persistence_survives_cancel_and_fail_transitions() {
-        let dir = tempfile::tempdir().unwrap();
-        let path = dir.path().join("backfill.json");
-
-        let r = BackfillRegistry::load_or_new(&path);
-        let cancelled = r.create(1, (0, 10), prom_source(), 1);
-        r.cancel(cancelled);
-        let failed = r.create(1, (10, 20), prom_source(), 1);
-        r.start(failed);
-        r.mark_failed(failed, "boom");
-        drop(r);
-
-        let reloaded = BackfillRegistry::load_or_new(&path);
-        assert_eq!(
-            reloaded.get(cancelled).unwrap().status,
-            BackfillStatus::Cancelled
-        );
-        let j = reloaded.get(failed).unwrap();
-        assert_eq!(j.status, BackfillStatus::Failed);
-        assert_eq!(j.error_message.as_deref(), Some("boom"));
-    }
-
-    #[test]
-    fn persistence_evict_rewrites_snapshot() {
-        let dir = tempfile::tempdir().unwrap();
-        let path = dir.path().join("backfill.json");
-
-        let r = BackfillRegistry::load_or_new(&path);
-        let done = r.create(1, (0, 10), prom_source(), 1);
-        r.start(done);
-        r.mark_complete(done);
-        let live = r.create(1, (10, 20), prom_source(), 1);
-        // Evict everything terminal right now.
-        let evicted = r.evict_old_terminal(0);
-        assert_eq!(evicted, 1);
-
-        let reloaded = BackfillRegistry::load_or_new(&path);
-        assert!(reloaded.get(done).is_none());
-        assert!(reloaded.get(live).is_some());
-    }
-
-    #[test]
-    fn corrupt_persist_file_falls_back_to_empty() {
-        let dir = tempfile::tempdir().unwrap();
-        let path = dir.path().join("backfill.json");
-        std::fs::write(&path, b"this is not json").unwrap();
-
-        let r = BackfillRegistry::load_or_new(&path);
-        assert!(r.list().is_empty());
-        // Next create should succeed and write a fresh valid snapshot.
-        let id = r.create(1, (0, 10), prom_source(), 1);
-        let bytes = std::fs::read(&path).unwrap();
-        let snap: serde_json::Value = serde_json::from_slice(&bytes).unwrap();
-        assert_eq!(snap["version"], 1);
-        assert_eq!(snap["jobs"][0]["job_id"], id);
-    }
-
-    #[test]
-    fn unsupported_persist_version_is_rejected_and_rewritten() {
-        let dir = tempfile::tempdir().unwrap();
-        let path = dir.path().join("backfill.json");
-        let snap = serde_json::json!({"version": 999, "next_job_id": 1, "jobs": []});
-        std::fs::write(&path, serde_json::to_vec(&snap).unwrap()).unwrap();
-
-        let r = BackfillRegistry::load_or_new(&path);
-        let _ = r.create(1, (0, 10), prom_source(), 1);
-        // File has been rewritten with the current version.
-        let bytes = std::fs::read(&path).unwrap();
-        let got: serde_json::Value = serde_json::from_slice(&bytes).unwrap();
-        assert_eq!(got["version"], 1);
-    }
-
-    #[test]
-    fn non_persistent_registry_writes_no_file() {
-        let dir = tempfile::tempdir().unwrap();
-        let path = dir.path().join("should_not_exist.json");
-        let r = BackfillRegistry::new();
-        let _ = r.create(1, (0, 10), prom_source(), 1);
-        assert!(!path.exists());
-    }
-
-    // ─── coverage() tests ─────────────────────────────
-
-    #[test]
-    fn range_covered_by_empty_ranges_is_false() {
-        assert!(!range_covered_by((0, 100), &[]));
-    }
-
-    #[test]
-    fn range_covered_by_single_spanning_range() {
-        assert!(range_covered_by((10, 50), &[(0, 100)]));
-    }
-
-    #[test]
-    fn range_covered_by_merges_adjacent_and_overlapping() {
-        assert!(range_covered_by((0, 30), &[(0, 10), (10, 20), (15, 30)]));
-        assert!(range_covered_by((5, 25), &[(0, 10), (10, 20), (20, 30)]));
-    }
-
-    #[test]
-    fn range_covered_by_gap_is_false() {
-        assert!(!range_covered_by((0, 30), &[(0, 10), (20, 30)]));
-    }
-
-    #[test]
-    fn range_covered_by_empty_target_is_trivially_true() {
-        assert!(range_covered_by((10, 10), &[]));
-    }
-
-    #[test]
-    fn coverage_missing_when_no_jobs() {
-        let r = BackfillRegistry::new();
-        assert_eq!(r.coverage(1, (0, 100)), Coverage::Missing);
-    }
-
-    #[test]
-    fn coverage_missing_when_only_other_agg_has_jobs() {
-        let r = BackfillRegistry::new();
-        let job_id = r.create(2, (0, 100), prom_source(), 1);
-        r.start(job_id);
-        r.record_window_written(job_id, 2, (0, 100));
-        r.mark_complete(job_id);
-        assert_eq!(r.coverage(1, (0, 100)), Coverage::Missing);
-    }
-
-    #[test]
-    fn coverage_complete_when_one_job_covers_full_range() {
-        let r = BackfillRegistry::new();
-        let job_id = r.create(1, (0, 100), prom_source(), 1);
-        r.start(job_id);
-        r.record_window_written(job_id, 1, (0, 100));
-        r.mark_complete(job_id);
-        assert_eq!(r.coverage(1, (0, 100)), Coverage::Complete);
-    }
-
-    #[test]
-    fn coverage_complete_when_merged_windows_cover_range() {
-        let r = BackfillRegistry::new();
-        let job_id = r.create(1, (0, 100), prom_source(), 10);
-        r.start(job_id);
-        // Write 10 adjacent windows, each 10ms.
-        for i in 0..10 {
-            r.record_window_written(job_id, 1, (i * 10, (i + 1) * 10));
-        }
-        r.mark_complete(job_id);
-        assert_eq!(r.coverage(1, (0, 100)), Coverage::Complete);
-        // Subrange query is also Complete.
-        assert_eq!(r.coverage(1, (25, 75)), Coverage::Complete);
-    }
-
-    #[test]
-    fn coverage_partial_from_completed_job_is_not_complete() {
-        let r = BackfillRegistry::new();
-        let job_id = r.create(1, (0, 100), prom_source(), 1);
-        r.start(job_id);
-        // Only part of the range was written before the job somehow
-        // got marked Complete (shouldn't happen, but defensive).
-        r.record_window_written(job_id, 1, (0, 50));
-        r.mark_complete(job_id);
-        // Full range isn't covered → Missing (no Running job).
-        assert_eq!(r.coverage(1, (0, 100)), Coverage::Missing);
-        // But the covered sub-range IS complete.
-        assert_eq!(r.coverage(1, (0, 50)), Coverage::Complete);
-    }
-
-    #[test]
-    fn coverage_running_overlap_reports_in_progress_with_pct() {
-        let r = BackfillRegistry::new();
-        let job_id = r.create(1, (0, 100), prom_source(), 10);
-        r.start(job_id);
-        r.tick_progress(job_id);
-        r.tick_progress(job_id);
-        // 2 of 10 ticked → 20% progress.
-        match r.coverage(1, (0, 100)) {
-            Coverage::BackfillInProgress { job_id: id, pct } => {
-                assert_eq!(id, job_id);
-                assert!((pct - 0.2).abs() < 1e-9, "pct = {pct}");
-            }
-            other => panic!("expected BackfillInProgress, got {other:?}"),
-        }
-    }
-
-    #[test]
-    fn coverage_complete_takes_precedence_over_running() {
-        // A Complete job covers the range fully; a later Running
-        // job (say for a retry / adjacent range) exists too. The
-        // coverage should still be Complete — Complete is the
-        // best classification we can give.
-        let r = BackfillRegistry::new();
-        let complete = r.create(1, (0, 100), prom_source(), 1);
-        r.start(complete);
-        r.record_window_written(complete, 1, (0, 100));
-        r.mark_complete(complete);
-
-        let running = r.create(1, (50, 150), prom_source(), 5);
-        r.start(running);
-
-        // Query inside the Complete range → Complete wins.
-        assert_eq!(r.coverage(1, (0, 100)), Coverage::Complete);
-        // Query extending into the Running job's range → not fully
-        // complete, Running overlaps → InProgress.
-        match r.coverage(1, (50, 150)) {
-            Coverage::BackfillInProgress { .. } => {}
-            other => panic!("expected InProgress for (50, 150), got {other:?}"),
-        }
-    }
-
-    #[test]
-    fn coverage_cancelled_and_failed_jobs_do_not_contribute() {
-        let r = BackfillRegistry::new();
-        // Cancelled job: even though some windows were written
-        // before cancellation, they are not counted as coverage
-        // because the job didn't complete cleanly.
-        let cancelled = r.create(1, (0, 50), prom_source(), 5);
-        r.start(cancelled);
-        r.record_window_written(cancelled, 1, (0, 50));
-        r.cancel(cancelled);
-        // Failed job: same treatment.
-        let failed = r.create(1, (50, 100), prom_source(), 5);
-        r.start(failed);
-        r.record_window_written(failed, 1, (50, 100));
-        r.mark_failed(failed, "simulated");
-
-        assert_eq!(r.coverage(1, (0, 100)), Coverage::Missing);
-    }
-
-    #[test]
-    fn coverage_empty_range_is_trivially_complete() {
-        let r = BackfillRegistry::new();
-        assert_eq!(r.coverage(1, (42, 42)), Coverage::Complete);
-        assert_eq!(r.coverage(1, (50, 10)), Coverage::Complete);
-    }
-}
diff --git a/data_plane/src/storage_engines/sketch_db/backfill/processor.rs b/data_plane/src/storage_engines/sketch_db/backfill/processor.rs
deleted file mode 100644
index f72eaa481..000000000
--- a/data_plane/src/storage_engines/sketch_db/backfill/processor.rs
+++ /dev/null
@@ -1,1007 +0,0 @@
-//! Rebuild window accumulators from a raw sample reader and write them to storage.
-//!
-//! Backfill runs in its own worker, separate from live ingestion and active panes.
-//! It shares the pure accumulator factory with live ingest and records written
-//! windows in the backfill registry for coverage lookup.
-//!
-//! Jobs created through `BackfillRegistry::create_checked` end at or before the
-//! materialization's creation time, keeping replay ranges disjoint from live
-//! ingestion.
-//!
-//! For backend-native construction, the same samples in the same order use the
-//! same factory and update operations as live ingest. Cross-language collector
-//! construction requires separate parity verification.
-
-use std::collections::HashMap;
-use std::sync::Arc;
-
-use async_trait::async_trait;
-use tracing::debug;
-
-use crate::drivers::ingest::population_attrs_fingerprint;
-use crate::drivers::ingest::series_resolver::SeriesIdResolver;
-use crate::precompute_engine::worker::parse_labels_from_series_key;
-use crate::storage_engines::types::{
-    AggregateCore, InstalledPrecomputePlanHandle, KeyByLabelValues,
-};
-use asap_types::aggregation_config::PrecomputeMaterialization;
-use asap_types::PolicyFingerprint;
-
-use super::raw_sample_reader::RawSample;
-#[cfg(test)]
-use super::window_builder::build_backfilled_accumulator;
-use super::worker::WindowProcessor;
-use super::BackfillRegistry;
-
-/// Turn a series key into the `group_key` string the
-/// grouping_labels-based partitioning produces in live ingest.
-/// Semicolon-joined label values, empty string for missing labels
-/// — same shape `IngestState::extract_group_key_for` emits, which
-/// is the string `build_group_key_label_values` reverses.
-///
-/// Kept local to the backfill module (not shared with live) per
-/// the §5e separation ask; the implementations must stay identical
-/// by convention.
-fn extract_group_key(series_key: &str, config: &PrecomputeMaterialization) -> String {
-    let labels = parse_labels_from_series_key(series_key);
-    let mut values = Vec::new();
-    for label_name in &config.grouping_labels.names() {
-        if let Some(val) = labels.get(label_name.as_str()) {
-            values.push(*val);
-        } else {
-            values.push("");
-        }
-    }
-    values.join(";")
-}
-
-/// Rebuild `group_key` string into the `KeyByLabelValues` struct
-/// that `PrecomputedOutput` expects. Local copy of the live
-/// `build_group_key_label_values` helper.
-fn build_group_key_label_values(group_key: &str) -> KeyByLabelValues {
-    let labels: Vec<String> = group_key.split(';').map(|s| s.to_string()).collect();
-    KeyByLabelValues::new_with_labels(labels)
-}
-
-/// B7.7 — resolve the bucket sid for a backfill sample's
-/// `(config, series_key)` pair. Mirrors
-/// `resolve_bucket_sid_for_agg_config` in `drivers/ingest/otel.rs`
-/// but adapted to the backfill side: the raw sample carries its labels
-/// embedded in `series_key` (the `metric{k1="v1",k2="v2"}` text shape
-/// `RawSample::labels` holds), so we parse them out first.
-///
-/// Policy and grouping identity must match live ingestion so historical and
-/// live windows occupy the same storage row.
-fn resolve_backfill_bucket_sid(
-    resolver: &SeriesIdResolver,
-    config: &PrecomputeMaterialization,
-    series_key: &str,
-    store: Option<&crate::storage_engines::sketch_db::index::SketchStore>,
-    captured_generation: Option<&asap_types::sds::CatalogGeneration>,
-) -> Result<u64, String> {
-    if !config.population_key_encoding.is_legacy() {
-        return Err("canonical population requires typed backfill label propagation".into());
-    }
-    let labels = parse_labels_from_series_key(series_key);
-    let grouping_pairs: Vec<(&str, &str)> = config
-        .grouping_labels
-        .iter()
-        .map(|name| (name.as_str(), *labels.get(name.as_str()).unwrap_or(&"")))
-        .collect();
-    let attrs_fp = population_attrs_fingerprint(config.population_key_encoding, &grouping_pairs)?;
-    if let Some(store) = store {
-        return store.resolve_output_storage_handle(
-            resolver,
-            config.policy_fingerprint().into(),
-            &attrs_fp,
-            captured_generation,
-        );
-    }
-    #[cfg(test)]
-    {
-        let store = crate::storage_engines::sketch_db::index::SketchStore::new();
-        store.resolve_output_storage_handle(
-            resolver,
-            config.policy_fingerprint().into(),
-            &attrs_fp,
-            captured_generation,
-        )
-    }
-    #[cfg(not(test))]
-    Err("backfill output requires an installed SummaryStore".into())
-}
-
-/// Fallback bucket id for the resolver-less code path (registry-only
-/// processors / legacy tests). Stable per `group_key` so all samples
-/// in one group still aggregate into one bucket; the value never
-/// reaches `SketchStore` because the resolver-less branch in
-/// `process_window` skips the precompute write entirely.
-fn fallback_bucket_id(group_key: &str) -> u64 {
-    use std::collections::hash_map::DefaultHasher;
-    use std::hash::{Hash, Hasher};
-    let mut h = DefaultHasher::new();
-    group_key.hash(&mut h);
-    h.finish()
-}
-
-/// `WindowProcessor` that rebuilds sketches from raw samples and
-/// writes them to the store. Holds references to the shared
-/// registries / config so each window can look up its own config
-/// without round-tripping through the worker.
-pub struct BackfillWindowProcessor {
-    /// Live config source. The processor snapshots the latest
-    /// `InstalledPrecomputePlan` at each window to find the
-    /// `PrecomputeMaterialization` for `agg_id`. The snapshot is cheap
-    /// (Arc refcount bump) so we don't optimise further.
-    config: InstalledPrecomputePlanHandle,
-    /// Destination for rebuilt windows. Tests may omit it to record registry
-    /// provenance without storing payloads.
-    summary_store: Option<Arc<crate::storage_engines::sketch_db::index::SketchStore>>,
-    /// Shared sid mint authority. Same `SeriesIdResolver` the OTel
-    /// ingest path uses, so backfilled precompute sids land in the
-    /// same unified namespace as live precompute / sketch sids. Only
-    /// consulted when `sketch_index` is also set (no sketch_index ⇒
-    /// no precompute write ⇒ no sid mint).
-    series_resolver: Option<Arc<crate::drivers::ingest::series_resolver::SeriesIdResolver>>,
-    /// Registry where we record which `(agg_id, window_range)`
-    /// tuples this job wrote. Phase 5f's coverage tracker reads
-    /// this list.
-    registry: Arc<BackfillRegistry>,
-    /// The job this processor is running on behalf of. Threaded
-    /// into provenance calls; never used for dispatch logic.
-    job_id: u64,
-    catalog_generation: Option<Arc<asap_types::sds::CatalogGeneration>>,
-}
-
-impl BackfillWindowProcessor {
-    pub fn new(
-        config: InstalledPrecomputePlanHandle,
-        registry: Arc<BackfillRegistry>,
-        job_id: u64,
-    ) -> Self {
-        Self {
-            config,
-            summary_store: None,
-            series_resolver: None,
-            registry,
-            job_id,
-            catalog_generation: None,
-        }
-    }
-
-    /// Attach a `SketchStore` so each batch lands there. Builder-style
-    /// so existing call sites opt in with one chained call.
-    pub fn with_sketch_index(
-        mut self,
-        summary_store: Arc<crate::storage_engines::sketch_db::index::SketchStore>,
-    ) -> Self {
-        self.catalog_generation = summary_store.active_catalog_generation();
-        self.summary_store = Some(summary_store);
-        self
-    }
-
-    /// Attach the shared `SeriesIdResolver` so precompute writes mint
-    /// sids via the same registry the OTel ingest path uses. Required
-    /// alongside [`Self::with_sketch_index`] — without a resolver the
-    /// processor still runs but skips the precompute write (registry
-    /// provenance still recorded, with a warn-log per missing call).
-    pub fn with_series_resolver(
-        mut self,
-        series_resolver: Arc<crate::drivers::ingest::series_resolver::SeriesIdResolver>,
-    ) -> Self {
-        self.series_resolver = Some(series_resolver);
-        self
-    }
-}
-
-/// One per-sid bucket assembled by [`BackfillWindowProcessor::process_window`].
-/// Carries the grouping-label string alongside the samples so emit-time
-/// `KeyByLabelValues` rendering matches what the live ingest path produces.
-struct SidBucket {
-    group_key: String,
-    samples: Vec<RawSample>,
-}
-
-#[async_trait]
-impl WindowProcessor for BackfillWindowProcessor {
-    async fn process_window(
-        &self,
-        agg_id: u64,
-        window_range: (u64, u64),
-        samples: Vec<RawSample>,
-    ) -> Result<(), Box<dyn std::error::Error + Send + Sync>> {
-        let snapshot = self.config.snapshot();
-        let config = snapshot
-            .get_aggregation_config(asap_types::sds::StoredOutputId(agg_id))
-            .cloned()
-            .ok_or_else(|| format!("agg_id {agg_id} not in current InstalledPrecomputePlan"))?;
-        let program = snapshot.raw_programs.get(&agg_id).cloned();
-        #[cfg(not(test))]
-        if program.is_none() {
-            return Err("backfill requires a post-ASAP DAG installation".into());
-        }
-
-        // B7.7 — sid-keyed bucketing. Per the schema-retirement #5
-        // step 6 plan, the backfill processor's per-window grouping is
-        // rekeyed from `group_key: String` to `sid: u64`. The grouping
-        // label values fold into the sid via
-        // `SeriesIdResolver::resolve(metric, attrs_fp, agg_kind)` —
-        // the same identity contract the live ingest path uses, so a
-        // backfilled bucket lands on the SAME sid that live ingest
-        // would mint for the same `(metric, grouping-values, agg_kind)`
-        // tuple. `group_key` is kept alongside the sid so emit-time
-        // `KeyByLabelValues` rendering on `PrecomputedOutput` matches
-        // what live ingest produces. Uses insertion-order preserving
-        // Vec per bucket so §10.5 ordering is preserved within each
-        // bucket's sample stream.
-        //
-        // When no SeriesIdResolver is attached (legacy / registry-only
-        // tests), we fall back to a stable per-`group_key` bucket id —
-        // the per-window write is skipped anyway in that path, so the
-        // bucket identity doesn't matter beyond preserving sample
-        // ordering for the (unused) accumulator builds.
-        let resolver_opt = self.series_resolver.as_ref();
-        let mut by_bucket: HashMap<u64, SidBucket> = HashMap::new();
-        for sample in samples {
-            let group_key = extract_group_key(&sample.labels, &config);
-            let sid = match resolver_opt {
-                Some(r) => resolve_backfill_bucket_sid(
-                    r.as_ref(),
-                    &config,
-                    &sample.labels,
-                    self.summary_store.as_deref(),
-                    self.catalog_generation.as_deref(),
-                )?,
-                None => fallback_bucket_id(&group_key),
-            };
-            by_bucket
-                .entry(sid)
-                .or_insert_with(|| SidBucket {
-                    group_key: group_key.clone(),
-                    samples: Vec::new(),
-                })
-                .samples
-                .push(sample);
-        }
-
-        if by_bucket.is_empty() {
-            // Empty window — no samples, no writes. Still count as
-            // "processed" since the worker's tick_progress will
-            // increment.
-            debug!(
-                agg_id,
-                window_start = window_range.0,
-                window_end = window_range.1,
-                "BackfillWindowProcessor: empty window, skipping store write"
-            );
-            return Ok(());
-        }
-
-        // Build per-sid `(sid, PrecomputedOutput, accumulator)` triples.
-        // Carrying the sid alongside the pair lets the write loop hand
-        // it straight to `ingest_precompute_with_series_id` instead of
-        // re-resolving inside the mint-driven path.
-        let mut batch: Vec<(
-            u64,
-            crate::storage_engines::types::PrecomputedOutput,
-            Box<dyn AggregateCore>,
-        )> = Vec::with_capacity(by_bucket.len());
-
-        for (sid, bucket) in by_bucket {
-            let SidBucket { group_key, samples } = bucket;
-            let accumulator = if let Some(program) = &program {
-                super::window_builder::build_dag_accumulator(program, &samples)?
-            } else {
-                #[cfg(test)]
-                {
-                    build_backfilled_accumulator(&config, &samples)
-                }
-                #[cfg(not(test))]
-                {
-                    return Err("missing backfill DAG producer".into());
-                }
-            };
-            // Keyed accumulators (MultipleSubpopulation) carry their
-            // subpopulation keys internally; the PrecomputedOutput's
-            // `key` represents the *group* key (grouping_labels
-            // values), not the aggregated-label key. Mirrors what
-            // live worker emits.
-            let key = if group_key.is_empty() {
-                None
-            } else {
-                Some(build_group_key_label_values(&group_key))
-            };
-            let mut output = crate::storage_engines::types::PrecomputedOutput::new_backfilled(
-                window_range.0,
-                window_range.1,
-                key,
-                self.job_id,
-                PolicyFingerprint::from_config(&config),
-            );
-            output.storage_handle = Some(sid);
-            output.stored_output_reference =
-                snapshot.stored_output_reference(config.policy_fingerprint().into());
-            output.catalog_generation = self.catalog_generation.clone();
-            batch.push((sid, output, accumulator));
-        }
-
-        // Tests without a sketch index record provenance only. Writes with an index
-        // require the shared sid resolver; otherwise log a warning and skip them.
-        if let Some(idx) = self.summary_store.as_ref() {
-            match self.series_resolver.as_ref() {
-                Some(_resolver) => {
-                    // B7.7 — sid is pre-resolved per bucket above; hand
-                    // it directly to the index's sid-direct ingest
-                    // path. The mint-driven sibling
-                    // `ingest_precompute_for_agg_config` would resolve
-                    // to the same sid (the resolver is idempotent),
-                    // but the round-trip is redundant now that we hold
-                    // the value.
-                    for (_handle, output, accumulator) in &batch {
-                        let reference = output
-                            .stored_output_reference
-                            .clone()
-                            .ok_or("backfill has no selected stored output")?;
-                        let (plan_id, plan_version) = self
-                            .catalog_generation
-                            .as_deref()
-                            .map(|generation| (generation.plan_id, generation.plan_version))
-                            .unwrap_or((0, 0));
-                        let address = asap_types::sds::StoredSummaryKey {
-                            plan_id,
-                            plan_version,
-                            stored_output_id: reference.stored_output_id,
-                            population: config
-                                .grouping_labels
-                                .iter()
-                                .cloned()
-                                .zip(output.key.clone().unwrap_or_default().labels)
-                                .collect(),
-                            window: asap_types::sds::HalfOpenTimeRange {
-                                start_ms: i64::try_from(output.start_timestamp)?,
-                                end_ms: i64::try_from(output.end_timestamp)?,
-                            },
-                        };
-                        idx.publish_unadmitted_summary_update(|writer| {
-                            writer.write_stored_summary(
-                                &address,
-                                _resolver,
-                                &config,
-                                output,
-                                accumulator.as_ref(),
-                            )
-                        })
-                        .ok_or("backfill summary state publication rejected")?;
-                    }
-                }
-                None => {
-                    tracing::warn!(
-                        job_id = self.job_id,
-                        agg_id,
-                        batch_size = batch.len(),
-                        "BackfillWindowProcessor has sketch_index but no \
-                         series_resolver attached; skipping precompute writes \
-                         for this window",
-                    );
-                }
-            }
-        }
-        // Hold `batch` alive until after the registry record below,
-        // so it shows up in trace logs if the registry call fails.
-        drop(batch);
-
-        // Success: record provenance. Done AFTER the write so
-        // `windows_written_by` only ever reflects actually-landed
-        // windows.
-        self.registry
-            .record_window_written(self.job_id, agg_id, window_range);
-
-        Ok(())
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use crate::storage_engines::sketch_db::backfill::raw_sample_reader::{
-        LabelFilter, MockRawSampleReader,
-    };
-    use crate::storage_engines::sketch_db::backfill::worker::BackfillWorker;
-    use crate::storage_engines::sketch_db::backfill::BackfillSource;
-    use crate::storage_engines::types::InstalledPrecomputePlan;
-    use asap_types::enums::WindowKind;
-    use asap_types::AggregationType;
-    use asap_types::KeyByLabelNames;
-    use std::sync::Arc;
-
-    fn sum_config(_agg_id: u64, metric: &str, grouping: Vec<&str>) -> PrecomputeMaterialization {
-        // `_agg_id` is unused after PR 5 — identity is content-addressed
-        // via `PolicyFingerprint::from_config`.
-        let grouping_labels = if grouping.is_empty() {
-            KeyByLabelNames::empty()
-        } else {
-            KeyByLabelNames::from_names(grouping.into_iter().map(String::from).collect())
-        };
-        PrecomputeMaterialization::new(
-            AggregationType::Sum,
-            String::new(),
-            std::collections::HashMap::new(),
-            grouping_labels,
-            KeyByLabelNames::empty(),
-            KeyByLabelNames::empty(),
-            String::new(),
-            60,
-            60,
-            WindowKind::Tumbling,
-            String::new(),
-            metric.to_string(),
-            None,
-            None,
-            None,
-        )
-    }
-
-    fn streaming_config_with(config: PrecomputeMaterialization) -> Arc<InstalledPrecomputePlan> {
-        let mut map = std::collections::HashMap::new();
-        map.insert(config.policy_fp_u64(), config);
-        Arc::new(InstalledPrecomputePlan::from_raw_ids(map))
-    }
-
-    #[tokio::test]
-    async fn happy_path_writes_one_output_per_group() {
-        let cfg = sum_config(1, "latency", vec!["svc"]);
-        let fp = cfg.policy_fp_u64();
-        let streaming = streaming_config_with(cfg.clone());
-        let hot = InstalledPrecomputePlanHandle::from_arc(streaming.clone());
-        let registry = Arc::new(BackfillRegistry::new());
-        let job_id = registry.create(
-            fp,
-            (0, 100),
-            BackfillSource::Prometheus { url: "x".into() },
-            1,
-        );
-
-        let processor = BackfillWindowProcessor::new(hot, registry.clone(), job_id);
-
-        // Two services → two groups → expect two PrecomputedOutput
-        // entries for window (0, 100).
-        let samples = vec![
-            RawSample {
-                labels: "latency{svc=\"a\"}".into(),
-                timestamp_ms: 10,
-                value: 1.0,
-            },
-            RawSample {
-                labels: "latency{svc=\"a\"}".into(),
-                timestamp_ms: 20,
-                value: 2.0,
-            },
-            RawSample {
-                labels: "latency{svc=\"b\"}".into(),
-                timestamp_ms: 15,
-                value: 3.0,
-            },
-        ];
-        processor
-            .process_window(fp, (0, 100), samples)
-            .await
-            .expect("happy path");
-
-        // Registry records exactly one (agg_id, range) entry (per-window, not per-group).
-        let written = registry.windows_written_by(job_id);
-        assert_eq!(written, vec![(fp, (0u64, 100u64))]);
-    }
-
-    #[tokio::test]
-    async fn unknown_agg_id_fails_cleanly() {
-        let cfg = sum_config(1, "m", vec![]);
-        let streaming = streaming_config_with(cfg);
-        let hot = InstalledPrecomputePlanHandle::from_arc(streaming.clone());
-        let registry = Arc::new(BackfillRegistry::new());
-        let job_id = registry.create(
-            999,
-            (0, 10),
-            BackfillSource::Prometheus { url: "x".into() },
-            1,
-        );
-        let processor = BackfillWindowProcessor::new(hot, registry.clone(), job_id);
-        // agg_id=999 isn't in the InstalledPrecomputePlan.
-        let err = processor
-            .process_window(999, (0, 10), vec![])
-            .await
-            .expect_err("unknown agg should fail");
-        assert!(err
-            .to_string()
-            .contains("not in current InstalledPrecomputePlan"));
-        assert!(registry.windows_written_by(job_id).is_empty());
-    }
-
-    #[tokio::test]
-    async fn empty_samples_complete_without_write() {
-        let cfg = sum_config(1, "m", vec![]);
-        let fp = cfg.policy_fp_u64();
-        let streaming = streaming_config_with(cfg);
-        let hot = InstalledPrecomputePlanHandle::from_arc(streaming.clone());
-        let registry = Arc::new(BackfillRegistry::new());
-        let job_id = registry.create(
-            fp,
-            (0, 10),
-            BackfillSource::Prometheus { url: "x".into() },
-            1,
-        );
-        let processor = BackfillWindowProcessor::new(hot, registry.clone(), job_id);
-        processor.process_window(fp, (0, 10), vec![]).await.unwrap();
-        // Empty window: no provenance record (nothing was written).
-        assert!(registry.windows_written_by(job_id).is_empty());
-    }
-
-    #[tokio::test]
-    async fn end_to_end_via_backfill_worker() {
-        // Exercise the full chain: BackfillWorker drives the
-        // processor over a job that covers 4 windows.
-        let cfg = sum_config(1, "latency", vec!["svc"]);
-        let fp = cfg.policy_fp_u64();
-        let streaming = streaming_config_with(cfg);
-        let hot = InstalledPrecomputePlanHandle::from_arc(streaming.clone());
-        let registry = Arc::new(BackfillRegistry::new());
-        let job_id = registry.create(
-            fp,
-            (0, 40),
-            BackfillSource::Prometheus { url: "x".into() },
-            4,
-        );
-
-        let reader = MockRawSampleReader::new(vec![
-            RawSample {
-                labels: "latency{svc=\"a\"}".into(),
-                timestamp_ms: 5,
-                value: 1.0,
-            },
-            RawSample {
-                labels: "latency{svc=\"a\"}".into(),
-                timestamp_ms: 15,
-                value: 2.0,
-            },
-            RawSample {
-                labels: "latency{svc=\"b\"}".into(),
-                timestamp_ms: 25,
-                value: 3.0,
-            },
-            RawSample {
-                labels: "latency{svc=\"b\"}".into(),
-                timestamp_ms: 35,
-                value: 4.0,
-            },
-        ]);
-
-        let processor = BackfillWindowProcessor::new(hot, registry.clone(), job_id);
-        let worker = BackfillWorker::new(registry.clone());
-        worker
-            .run_job(
-                job_id,
-                &LabelFilter::for_metric("latency"),
-                &reader,
-                &processor,
-            )
-            .await
-            .expect("worker ok");
-
-        assert_eq!(
-            registry.get(job_id).unwrap().status,
-            super::super::BackfillStatus::Complete
-        );
-        // 4 windows × 1 write each (some windows have 1 group — the
-        // writes are per-window batches, not per-group entries).
-        let written = registry.windows_written_by(job_id);
-        assert_eq!(written.len(), 4);
-        // Each recorded window corresponds to a writable window
-        // (non-empty). Ordering is the worker's iteration order.
-        assert_eq!(written[0], (fp, (0, 10)));
-        assert_eq!(written[1], (fp, (10, 20)));
-        assert_eq!(written[2], (fp, (20, 30)));
-        assert_eq!(written[3], (fp, (30, 40)));
-
-        // The exact window assertions above prove the worker completed
-        // every expected write.
-    }
-
-    /// Sum accumulators built by live and backfill paths must serialize identically
-    /// when given the same ordered samples.
-    #[test]
-    fn backfill_builds_bit_identical_sum_accumulator_to_live() {
-        use crate::tests::accumulator_fixture::create_fixture_accumulator;
-
-        let cfg = sum_config(1, "m", vec![]);
-
-        // Sample sequence.
-        let samples = vec![
-            RawSample {
-                labels: "m".into(),
-                timestamp_ms: 0,
-                value: 1.5,
-            },
-            RawSample {
-                labels: "m".into(),
-                timestamp_ms: 1,
-                value: -0.25,
-            },
-            RawSample {
-                labels: "m".into(),
-                timestamp_ms: 2,
-                value: 10.0,
-            },
-        ];
-
-        // Live path: factory + update_single per sample in order.
-        let live_bytes = {
-            let mut updater = create_fixture_accumulator(&cfg);
-            for s in &samples {
-                updater.update_single(s.value, s.timestamp_ms);
-            }
-            let acc = updater.take_accumulator();
-            acc.serialize_to_bytes()
-        };
-
-        // Backfill path: build_backfilled_accumulator.
-        let backfill_bytes = {
-            let acc = build_backfilled_accumulator(&cfg, &samples);
-            acc.serialize_to_bytes()
-        };
-
-        assert_eq!(
-            live_bytes, backfill_bytes,
-            "Live and backfill paths must produce bit-identical \
-             serialisations for SumAccumulator. \
-             If this test fails, something diverged — check:\n\
-             (1) Is `build_backfilled_accumulator` still calling \
-                 `create_fixture_accumulator`?\n\
-             (2) Did a recent change to `SumAccumulator` introduce \
-                 non-deterministic state (e.g. a seed)?\n\
-             (3) Does `serialize_to_bytes` include any timestamp \
-                 or wall-clock field?"
-        );
-    }
-
-    // ─── Time-disjoint invariant tests ─────────────────────────────────────
-
-    /// Snapshot a wall-clock millis "now" the same way the registry
-    /// does. The schema-retirement migration dropped
-    /// `AggSchema::created_at_ms`; tests now stamp their own.
-    fn now_ms() -> u64 {
-        std::time::SystemTime::now()
-            .duration_since(std::time::UNIX_EPOCH)
-            .unwrap()
-            .as_millis() as u64
-    }
-
-    #[test]
-    fn create_checked_rejects_end_past_created_at() {
-        use super::super::CreateError;
-        let cfg = sum_config(1, "m", vec![]);
-        let expected_fp = cfg.policy_fp_u64();
-        let created = now_ms();
-        let registry = BackfillRegistry::new();
-
-        // end_ms one past created_at_ms — should be rejected.
-        let err = registry
-            .create_checked(
-                &cfg,
-                created,
-                (0, created + 1),
-                BackfillSource::Prometheus { url: "x".into() },
-                1,
-                None,
-            )
-            .expect_err("overlap should be rejected");
-        match err {
-            CreateError::Overlap { agg_id, .. } => assert_eq!(agg_id, expected_fp),
-            other => panic!("expected Overlap, got {other:?}"),
-        }
-    }
-
-    #[test]
-    fn create_checked_accepts_end_at_boundary() {
-        let cfg = sum_config(1, "m", vec![]);
-        let created = now_ms();
-        let registry = BackfillRegistry::new();
-        // end_ms exactly at created_at_ms is allowed — live owns
-        // [created_at, ∞) as a half-open interval on the left, so
-        // the boundary point is backfill's.
-        let job_id = registry
-            .create_checked(
-                &cfg,
-                created,
-                (0, created),
-                BackfillSource::Prometheus { url: "x".into() },
-                1,
-                None,
-            )
-            .expect("boundary-touching range should be accepted");
-        assert!(registry.get(job_id).is_some());
-    }
-
-    /// Retention guard: requesting a start_ms older than the store's
-    /// data-retention horizon is rejected. Method B from the design
-    /// discussion — fail fast at creation rather than let the backfill
-    /// write windows the retention sweep will immediately delete.
-    #[test]
-    fn create_checked_rejects_start_older_than_data_retention() {
-        use super::super::CreateError;
-        let cfg = sum_config(1, "m", vec![]);
-        let expected_fp = cfg.policy_fp_u64();
-        let created = now_ms();
-        let registry = BackfillRegistry::new();
-        // Created-at is now_ms(), so data retention of 1 hour with
-        // `start_ms = 0` means we're requesting data from the epoch —
-        // way outside retention.
-        let err = registry
-            .create_checked(
-                &cfg,
-                created,
-                (0, 1_000),
-                BackfillSource::Prometheus { url: "x".into() },
-                1,
-                Some(3_600_000), // 1 hour
-            )
-            .expect_err("out-of-retention should be rejected");
-        match err {
-            CreateError::OutOfRetention {
-                agg_id,
-                requested_start_ms,
-                earliest_retained_ms,
-            } => {
-                assert_eq!(agg_id, expected_fp);
-                assert_eq!(requested_start_ms, 0);
-                assert!(earliest_retained_ms > 0);
-            }
-            other => panic!("expected OutOfRetention, got {other:?}"),
-        }
-    }
-
-    /// `data_retention_ms = None` skips the retention check entirely —
-    /// lets tests and retention-disabled deployments bypass.
-    #[test]
-    fn create_checked_none_retention_skips_check() {
-        let cfg = sum_config(1, "m", vec![]);
-        let created = now_ms();
-        let registry = BackfillRegistry::new();
-        // start_ms = 0 would normally fail any realistic retention
-        // window, but None skips the check.
-        let job_id = registry
-            .create_checked(
-                &cfg,
-                created,
-                (0, created),
-                BackfillSource::Prometheus { url: "x".into() },
-                1,
-                None,
-            )
-            .expect("None retention → accepted");
-        assert!(registry.get(job_id).is_some());
-    }
-
-    /// Within-retention start is accepted even when a retention is
-    /// configured. Guards against off-by-one at the boundary.
-    #[test]
-    fn create_checked_accepts_start_within_retention() {
-        let cfg = sum_config(1, "m", vec![]);
-        let registry = BackfillRegistry::new();
-        let now = now_ms();
-        let retention = 3_600_000_u64; // 1h
-                                       // start_ms = now - 30 min: well within 1h retention.
-        let start = now.saturating_sub(1_800_000);
-        let created = now;
-        // Clip end to the schema boundary so time-disjoint passes.
-        let end = created.min(now);
-        let job_id = registry
-            .create_checked(
-                &cfg,
-                created,
-                (start, end),
-                BackfillSource::Prometheus { url: "x".into() },
-                1,
-                Some(retention),
-            )
-            .expect("within-retention start should be accepted");
-        assert!(registry.get(job_id).is_some());
-    }
-
-    // ─── B7.7: sid-keyed bucketing tests ─────────────────────────────────
-
-    /// Regression for B7.7 (schema-retirement #5 step 6): the
-    /// backfill processor groups raw samples by `sid: u64` and writes
-    /// each bucket via `SketchStore::ingest_precompute_with_series_id`. The
-    /// sids it allocates match what the shared `SeriesIdResolver`
-    /// would mint for the same `(metric, grouping-values, agg_kind)`
-    /// tuple — i.e. live ingest and backfill share one sid namespace.
-    ///
-    /// Drives `process_window` end-to-end with samples spanning two
-    /// distinct `svc` values × two samples each. Asserts:
-    ///   - exactly two `SummarySeriesMetadata` entries land in the
-    ///     `SketchStore` (one per distinct sid bucket)
-    ///   - their sids equal what the shared `SeriesIdResolver` would
-    ///     mint for the same `(metric, grouping-values, agg_kind)`
-    ///     tuple (so live-vs-backfill sid identity holds)
-    ///   - both sids `classify()` as `Hit` (i.e. the per-sid append
-    ///     paths landed under the same sids the metadata was
-    ///     registered with)
-    ///   - the registry recorded one provenance entry for the window
-    #[tokio::test]
-    async fn process_window_buckets_by_sid_via_resolver() {
-        use crate::drivers::ingest::series_resolver::SeriesIdResolver;
-        use crate::storage_engines::sketch_db::index::{SeriesLookup, SketchStore};
-
-        let cfg = sum_config(1, "latency", vec!["svc"]);
-        let fp = cfg.policy_fp_u64();
-        let streaming = streaming_config_with(cfg.clone());
-        let hot = InstalledPrecomputePlanHandle::from_arc(streaming.clone());
-        let registry = Arc::new(BackfillRegistry::new());
-        let summary_store = Arc::new(SketchStore::new());
-        let catalog = asap_types::summary_catalog::SummaryCatalog::from_materializations(
-            1,
-            1,
-            &[cfg.clone()],
-        )
-        .unwrap();
-        summary_store
-            .install_summary_catalog(Arc::new(catalog))
-            .unwrap();
-        let resolver = Arc::new(SeriesIdResolver::new());
-
-        let job_id = registry.create(
-            fp,
-            (0, 100),
-            BackfillSource::Prometheus { url: "x".into() },
-            1,
-        );
-
-        let processor = BackfillWindowProcessor::new(hot, registry.clone(), job_id)
-            .with_sketch_index(summary_store.clone())
-            .with_series_resolver(resolver.clone());
-
-        // Two distinct svc values × two samples each. Same window
-        // (0, 100). After the processor runs, we expect exactly two
-        // sids in the SketchStore — one per distinct svc value.
-        let samples = vec![
-            RawSample {
-                labels: "latency{svc=\"a\"}".into(),
-                timestamp_ms: 10,
-                value: 1.0,
-            },
-            RawSample {
-                labels: "latency{svc=\"a\"}".into(),
-                timestamp_ms: 20,
-                value: 2.0,
-            },
-            RawSample {
-                labels: "latency{svc=\"b\"}".into(),
-                timestamp_ms: 15,
-                value: 3.0,
-            },
-            RawSample {
-                labels: "latency{svc=\"b\"}".into(),
-                timestamp_ms: 25,
-                value: 4.0,
-            },
-        ];
-        processor
-            .process_window(fp, (0, 100), samples)
-            .await
-            .expect("happy path");
-
-        // Two distinct sids landed in the index.
-        assert_eq!(
-            summary_store.instance_count(),
-            2,
-            "one sid per distinct svc bucket"
-        );
-
-        // The sids the processor allocated equal what
-        // `SeriesIdResolver::lookup` would return for the same
-        // `(metric, grouping-values, agg_kind)` tuple — i.e. live
-        // ingest and backfill share one sid namespace.
-        let generation = summary_store.active_catalog_generation().unwrap();
-        let sid_a = resolve_backfill_bucket_sid(
-            &resolver,
-            &cfg,
-            "latency{svc=\"a\"}",
-            Some(&summary_store),
-            Some(&generation),
-        )
-        .unwrap();
-        let sid_b = resolve_backfill_bucket_sid(
-            &resolver,
-            &cfg,
-            "latency{svc=\"b\"}",
-            Some(&summary_store),
-            Some(&generation),
-        )
-        .unwrap();
-        assert_ne!(sid_a, sid_b, "distinct svc values mint distinct sids");
-        assert_eq!(summary_store.classify(sid_a), SeriesLookup::Hit);
-        assert_eq!(summary_store.classify(sid_b), SeriesLookup::Hit);
-
-        // Provenance was recorded once per window (not once per
-        // bucket) — same shape as the pre-rekey path.
-        let written = registry.windows_written_by(job_id);
-        assert_eq!(written, vec![(fp, (0u64, 100u64))]);
-    }
-
-    /// Replay and the actual live storage sink must resolve the same row.
-    #[test]
-    fn backfill_sid_matches_live_ingest_sid_for_same_grouping_values() {
-        for encoding in [
-            asap_types::PopulationKeyEncoding::LegacyDelimited,
-            asap_types::PopulationKeyEncoding::CanonicalLabelsV1,
-        ] {
-            assert_backfill_sid_matches_live(encoding);
-        }
-    }
-
-    fn assert_backfill_sid_matches_live(encoding: asap_types::PopulationKeyEncoding) {
-        use crate::drivers::ingest::series_resolver::SeriesIdResolver;
-
-        let mut cfg = sum_config(1, "latency", vec!["svc", "zone"]);
-        cfg.population_key_encoding = encoding;
-        let resolver = SeriesIdResolver::new();
-
-        // Backfill side: derive sid via the new helper.
-        let backfill_result = resolve_backfill_bucket_sid(
-            &resolver,
-            &cfg,
-            "latency{svc=\"a\",zone=\"z0\"}",
-            None,
-            None,
-        );
-        let attrs =
-            population_attrs_fingerprint(encoding, &[("svc", "a"), ("zone", "z0")]).unwrap();
-        let store = crate::storage_engines::sketch_db::index::SketchStore::new();
-        let expected_sid = store
-            .resolve_output_storage_handle(&resolver, cfg.policy_fingerprint().into(), &attrs, None)
-            .unwrap();
-        if encoding.is_legacy() {
-            assert_eq!(backfill_result.unwrap(), expected_sid);
-        } else {
-            assert!(backfill_result
-                .unwrap_err()
-                .contains("typed backfill label propagation"));
-        }
-
-        // Exercise the actual live sink instead of duplicating its SID formula.
-        let store = crate::storage_engines::sketch_db::index::SketchStore::new();
-        let output = crate::storage_engines::types::PrecomputedOutput::new(
-            100,
-            200,
-            Some(
-                crate::storage_engines::types::KeyByLabelValues::new_with_labels(vec![
-                    "a".into(),
-                    "z0".into(),
-                ]),
-            ),
-            cfg.policy_fingerprint(),
-        );
-        let acc = asap_physical_operators::summary_kernels::sum::SumAccumulator::with_sum(1.0);
-        let live_sid = store
-            .ingest_precompute_for_agg_config(
-                |_metric, attrs, _kind| {
-                    store
-                        .resolve_output_storage_handle(
-                            &resolver,
-                            cfg.policy_fingerprint().into(),
-                            attrs,
-                            None,
-                        )
-                        .ok()
-                },
-                &cfg,
-                &output,
-                &acc,
-            )
-            .expect("live sink write");
-
-        assert_eq!(
-            expected_sid, live_sid,
-            "live sink must use the configured codec and policy identity"
-        );
-    }
-}
diff --git a/data_plane/src/storage_engines/sketch_db/backfill/prometheus_reader.rs b/data_plane/src/storage_engines/sketch_db/backfill/prometheus_reader.rs
deleted file mode 100644
index 8bee0b53a..000000000
--- a/data_plane/src/storage_engines/sketch_db/backfill/prometheus_reader.rs
+++ /dev/null
@@ -1,672 +0,0 @@
-//! `PrometheusReader` — concrete `RawSampleReader` that reads
-//! historical samples from a Prometheus-compatible HTTP API.
-//!
-//! Implements §10.2's `BackfillSource::Prometheus` variant. Also
-//! works with any API-compatible alternative (VictoriaMetrics,
-//! Thanos, Cortex, Mimir) — the /api/v1/query_range endpoint shape
-//! is common across them.
-//!
-//! ## How it reads "raw samples"
-//!
-//! Prometheus does not expose a "give me all ingested samples"
-//! API directly. The closest primitives are:
-//!
-//! 1. **`/api/v1/query_range`** — evaluates a PromQL expression at
-//!    a fixed `step` across `[start, end]`, returning
-//!    `[(ts, value), …]` per matched series. Returns what Prometheus
-//!    considers the value AT each step, which for raw counters /
-//!    gauges without rate / aggregation on them equals the sample
-//!    at that timestamp (or the last sample ≤ that timestamp, per
-//!    Prometheus's staleness rules).
-//!
-//! 2. **`/api/v1/read`** — the remote-read protobuf API, returns
-//!    the actual raw samples. More accurate but heavier to
-//!    implement.
-//!
-//! This reader uses option 1. With `step` set to the scrape
-//! interval (default 15s), the returned values are the actual
-//! ingested samples. Deployments that scrape at a different
-//! cadence should pass their real scrape interval via
-//! [`PrometheusReader::with_step`] before registering the reader.
-//!
-//! If a future release needs bit-identical replay down to the
-//! sub-scrape-interval resolution, `/api/v1/read` is a drop-in
-//! replacement — the trait contract is unchanged.
-//!
-//! ## Error policy
-//!
-//! Every network / parse failure is mapped to a
-//! [`RawSampleReaderError`] variant. The backfill worker
-//! stringifies the error into
-//! `BackfillJob::error_message` and marks the job `Failed`, so a
-//! broken Prometheus URL fails loud instead of quietly looping.
-
-use async_trait::async_trait;
-use serde::Deserialize;
-use std::time::Duration;
-
-use super::raw_sample_reader::{LabelFilter, RawSample, RawSampleReader, RawSampleReaderError};
-
-/// Default evaluation step for `/api/v1/query_range` — matches the
-/// typical Prometheus scrape interval. Deployments scraping at a
-/// different cadence should override via `with_step`.
-pub const DEFAULT_STEP: Duration = Duration::from_secs(15);
-
-/// Reads historical samples from a Prometheus-compatible
-/// `/api/v1/query_range` endpoint. See module doc for the
-/// "raw samples" semantics.
-pub struct PrometheusReader {
-    base_url: String,
-    step: Duration,
-    http: reqwest::Client,
-}
-
-impl PrometheusReader {
-    /// Build a reader pointing at `base_url` (e.g.
-    /// `http://prom.svc:9090`). The `/api/v1/query_range`
-    /// suffix is appended per-call; `base_url` should NOT include
-    /// that path.
-    ///
-    /// The HTTP client has no timeout by default — set one via
-    /// `with_timeout` if operating against a slow / flaky
-    /// Prometheus. Phase 5c's `BackfillWorker` does not itself
-    /// time out individual reads, so a hung Prometheus will
-    /// block a whole job.
-    pub fn new(base_url: impl Into<String>) -> Self {
-        Self {
-            base_url: base_url.into(),
-            step: DEFAULT_STEP,
-            http: reqwest::Client::new(),
-        }
-    }
-
-    fn url(&self) -> String {
-        format!("{}/api/v1/query_range", self.base_url.trim_end_matches('/'))
-    }
-}
-
-#[async_trait]
-impl RawSampleReader for PrometheusReader {
-    async fn read_samples(
-        &self,
-        start_ms: u64,
-        end_ms: u64,
-        filter: &LabelFilter,
-    ) -> Result<Vec<RawSample>, RawSampleReaderError> {
-        if start_ms > end_ms {
-            return Err(RawSampleReaderError::InvalidRange {
-                reason: format!("start_ms {start_ms} > end_ms {end_ms}"),
-            });
-        }
-
-        let query = build_promql(filter);
-        // Prometheus API takes timestamps as seconds-with-fraction.
-        let start_s = ms_to_fractional_seconds(start_ms);
-        let end_s = ms_to_fractional_seconds(end_ms);
-        let step_s = self.step.as_secs_f64();
-        if step_s <= 0.0 {
-            return Err(RawSampleReaderError::Other {
-                reason: format!("step must be positive, got {:?} ({:?})", self.step, step_s),
-            });
-        }
-
-        let response = self
-            .http
-            .get(self.url())
-            .query(&[
-                ("query", query.as_str()),
-                ("start", &start_s),
-                ("end", &end_s),
-                ("step", &format!("{}s", step_s)),
-            ])
-            .send()
-            .await
-            .map_err(|e| RawSampleReaderError::Upstream {
-                reason: format!("HTTP request failed: {e}"),
-            })?;
-
-        let status = response.status();
-        let body = response
-            .text()
-            .await
-            .map_err(|e| RawSampleReaderError::Upstream {
-                reason: format!("failed to read response body: {e}"),
-            })?;
-        if !status.is_success() {
-            return Err(RawSampleReaderError::Upstream {
-                reason: format!(
-                    "Prometheus returned HTTP {}: {}",
-                    status,
-                    body.chars().take(500).collect::<String>()
-                ),
-            });
-        }
-
-        let parsed: QueryRangeResponse =
-            serde_json::from_str(&body).map_err(|e| RawSampleReaderError::Decode {
-                reason: format!("failed to parse query_range JSON: {e}"),
-            })?;
-        if parsed.status != "success" {
-            return Err(RawSampleReaderError::Upstream {
-                reason: format!(
-                    "Prometheus status={}, errorType={:?}, error={:?}",
-                    parsed.status, parsed.error_type, parsed.error
-                ),
-            });
-        }
-        let Some(data) = parsed.data else {
-            return Ok(Vec::new());
-        };
-        if data.result_type != "matrix" {
-            return Err(RawSampleReaderError::Decode {
-                reason: format!("expected resultType=matrix, got {:?}", data.result_type),
-            });
-        }
-
-        let mut out = Vec::new();
-        for series in data.result {
-            let labels = render_series_key(filter.metric.as_str(), &series.metric);
-            for point in series.values {
-                let ts_ms = fractional_seconds_to_ms(point.timestamp);
-                out.push(RawSample {
-                    labels: labels.clone(),
-                    timestamp_ms: ts_ms,
-                    value: point.value,
-                });
-            }
-        }
-        // Prometheus returns per-series groupings with per-series
-        // ordering by timestamp. For global ingest-order
-        // determinism (§10.5) the worker relies on per-group
-        // ordering, and each group's samples come from one series,
-        // so no global sort is required. Validated in the
-        // `ordering_preserved_per_series` test.
-        Ok(out)
-    }
-
-    fn source_name(&self) -> &'static str {
-        "PrometheusReader"
-    }
-}
-
-/// Translate a `LabelFilter` into a PromQL matcher string like
-/// `metric{k1="v1",k2="v2"}`. Values are wrapped in double quotes;
-/// embedded double-quotes and backslashes are escaped per the
-/// PromQL lexer rules.
-fn build_promql(filter: &LabelFilter) -> String {
-    if filter.equality.is_empty() {
-        return filter.metric.clone();
-    }
-    let mut pairs: Vec<(&String, &String)> = filter.equality.iter().collect();
-    // Stable order so the URL is deterministic (easier to debug,
-    // easier to cache-hit at upstream proxies).
-    pairs.sort_by(|a, b| a.0.cmp(b.0));
-    let joined: String = pairs
-        .iter()
-        .map(|(k, v)| format!("{}=\"{}\"", k, escape_label_value(v)))
-        .collect::<Vec<_>>()
-        .join(",");
-    format!("{}{{{}}}", filter.metric, joined)
-}
-
-fn escape_label_value(v: &str) -> String {
-    let mut out = String::with_capacity(v.len());
-    for c in v.chars() {
-        match c {
-            '\\' => out.push_str("\\\\"),
-            '"' => out.push_str("\\\""),
-            '\n' => out.push_str("\\n"),
-            other => out.push(other),
-        }
-    }
-    out
-}
-
-/// Render a `metric{k1="v1",...}` series key from a Prometheus
-/// response's `metric` object. Used to populate `RawSample.labels`
-/// with the same shape the downstream sketch builder expects.
-fn render_series_key(
-    default_metric: &str,
-    metric: &std::collections::HashMap<String, String>,
-) -> String {
-    let name = metric
-        .get("__name__")
-        .map(String::as_str)
-        .unwrap_or(default_metric);
-    if metric.len() <= 1 {
-        // Only __name__ (or nothing) — bare metric name.
-        return name.to_string();
-    }
-    let mut pairs: Vec<(&String, &String)> = metric
-        .iter()
-        .filter(|(k, _)| k.as_str() != "__name__")
-        .collect();
-    pairs.sort_by(|a, b| a.0.cmp(b.0));
-    let joined: String = pairs
-        .iter()
-        .map(|(k, v)| format!("{}=\"{}\"", k, escape_label_value(v)))
-        .collect::<Vec<_>>()
-        .join(",");
-    format!("{}{{{}}}", name, joined)
-}
-
-fn ms_to_fractional_seconds(ms: u64) -> String {
-    // Prometheus accepts "1234567890.123". Use a simple divmod to
-    // avoid locale-dependent float formatting surprises.
-    let whole = ms / 1000;
-    let frac = ms % 1000;
-    format!("{}.{:03}", whole, frac)
-}
-
-fn fractional_seconds_to_ms(ts: f64) -> i64 {
-    // Keep in i64 because `RawSample.timestamp_ms` is i64. Negative
-    // timestamps are not meaningful for backfill but we don't
-    // clamp — let the downstream sketch handle them if they appear.
-    (ts * 1000.0).round() as i64
-}
-
-// ── Prometheus query_range response shape ───────────────────────────
-
-#[derive(Debug, Deserialize)]
-struct QueryRangeResponse {
-    status: String,
-    #[serde(default)]
-    data: Option<QueryRangeData>,
-    #[serde(default, rename = "errorType")]
-    error_type: Option<String>,
-    #[serde(default)]
-    error: Option<String>,
-}
-
-#[derive(Debug, Deserialize)]
-struct QueryRangeData {
-    #[serde(rename = "resultType")]
-    result_type: String,
-    #[serde(default)]
-    result: Vec<MatrixSeries>,
-}
-
-#[derive(Debug, Deserialize)]
-struct MatrixSeries {
-    metric: std::collections::HashMap<String, String>,
-    #[serde(default)]
-    values: Vec<MatrixPoint>,
-}
-
-/// Prometheus returns each sample as the two-element array
-/// `[timestamp_seconds, "value_string"]`. Custom deserialisation
-/// parses the string into `f64`.
-#[derive(Debug)]
-struct MatrixPoint {
-    timestamp: f64,
-    value: f64,
-}
-
-impl<'de> Deserialize<'de> for MatrixPoint {
-    fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
-    where
-        D: serde::Deserializer<'de>,
-    {
-        let (ts, val_str): (f64, String) = Deserialize::deserialize(deserializer)?;
-        let value = val_str.parse::<f64>().map_err(serde::de::Error::custom)?;
-        Ok(Self {
-            timestamp: ts,
-            value,
-        })
-    }
-}
-
-// ── Integration tests against a mock Prometheus HTTP server ─────────
-
-#[cfg(test)]
-mod integration_tests {
-    use super::*;
-    use axum::extract::Query;
-    use axum::response::IntoResponse;
-    use axum::{routing::get, Router};
-    use std::collections::HashMap;
-    use std::net::SocketAddr;
-    use std::sync::Arc;
-    use std::sync::Mutex;
-    use tokio::net::TcpListener;
-
-    /// Shared state captured by the mock handler so tests can
-    /// assert on what the reader actually asked for.
-    #[derive(Default, Clone)]
-    struct MockState {
-        last_params: Arc<Mutex<Option<HashMap<String, String>>>>,
-        response_body: Arc<Mutex<String>>,
-        response_status: Arc<Mutex<u16>>,
-    }
-
-    async fn handler(
-        axum::extract::State(state): axum::extract::State<MockState>,
-        Query(params): Query<HashMap<String, String>>,
-    ) -> axum::response::Response {
-        *state.last_params.lock().unwrap() = Some(params);
-        let status = *state.response_status.lock().unwrap();
-        let body = state.response_body.lock().unwrap().clone();
-        let response = (
-            axum::http::StatusCode::from_u16(status).unwrap(),
-            [(axum::http::header::CONTENT_TYPE, "application/json")],
-            body,
-        );
-        response.into_response()
-    }
-
-    async fn spawn_mock(state: MockState) -> (SocketAddr, tokio::task::JoinHandle<()>) {
-        let app = Router::new()
-            .route("/api/v1/query_range", get(handler))
-            .with_state(state);
-        let listener = TcpListener::bind("127.0.0.1:0").await.unwrap();
-        let addr = listener.local_addr().unwrap();
-        let handle = tokio::spawn(async move {
-            let _ = axum::serve(listener, app).await;
-        });
-        (addr, handle)
-    }
-
-    #[tokio::test]
-    async fn happy_path_parses_samples() {
-        let state = MockState::default();
-        *state.response_status.lock().unwrap() = 200;
-        *state.response_body.lock().unwrap() = r#"{
-            "status": "success",
-            "data": {
-                "resultType": "matrix",
-                "result": [
-                    {
-                        "metric": {"__name__": "latency", "svc": "a"},
-                        "values": [
-                            [10.0, "1.5"],
-                            [25.0, "2.25"]
-                        ]
-                    },
-                    {
-                        "metric": {"__name__": "latency", "svc": "b"},
-                        "values": [
-                            [15.0, "9.0"]
-                        ]
-                    }
-                ]
-            }
-        }"#
-        .to_string();
-        let (addr, handle) = spawn_mock(state.clone()).await;
-
-        let reader = PrometheusReader::new(format!("http://{addr}"));
-        let samples = reader
-            .read_samples(0, 30_000, &LabelFilter::for_metric("latency"))
-            .await
-            .expect("read ok");
-
-        assert_eq!(samples.len(), 3);
-        // Series A's samples
-        assert_eq!(samples[0].labels, r#"latency{svc="a"}"#);
-        assert_eq!(samples[0].timestamp_ms, 10_000);
-        assert_eq!(samples[0].value, 1.5);
-        assert_eq!(samples[1].labels, r#"latency{svc="a"}"#);
-        assert_eq!(samples[1].timestamp_ms, 25_000);
-        assert_eq!(samples[1].value, 2.25);
-        // Series B
-        assert_eq!(samples[2].labels, r#"latency{svc="b"}"#);
-        assert_eq!(samples[2].value, 9.0);
-
-        // Verify the reader passed sensible params.
-        let params = state.last_params.lock().unwrap().clone().unwrap();
-        assert_eq!(params.get("query"), Some(&"latency".to_string()));
-        assert_eq!(params.get("start"), Some(&"0.000".to_string()));
-        assert_eq!(params.get("end"), Some(&"30.000".to_string()));
-        assert!(params
-            .get("step")
-            .map(|s| s.ends_with('s'))
-            .unwrap_or(false));
-
-        handle.abort();
-    }
-
-    #[tokio::test]
-    async fn filter_becomes_promql_matcher() {
-        let state = MockState::default();
-        *state.response_status.lock().unwrap() = 200;
-        *state.response_body.lock().unwrap() = r#"{
-            "status": "success",
-            "data": {"resultType": "matrix", "result": []}
-        }"#
-        .to_string();
-        let (addr, handle) = spawn_mock(state.clone()).await;
-
-        let reader = PrometheusReader::new(format!("http://{addr}"));
-        let filter = LabelFilter::for_metric("latency")
-            .with_label("env", "prod")
-            .with_label("svc", "a");
-        let _ = reader.read_samples(0, 100, &filter).await.unwrap();
-
-        let params = state.last_params.lock().unwrap().clone().unwrap();
-        assert_eq!(
-            params.get("query"),
-            Some(&r#"latency{env="prod",svc="a"}"#.to_string())
-        );
-        handle.abort();
-    }
-
-    #[tokio::test]
-    async fn http_5xx_maps_to_upstream_error() {
-        let state = MockState::default();
-        *state.response_status.lock().unwrap() = 503;
-        *state.response_body.lock().unwrap() = "service unavailable".to_string();
-        let (addr, handle) = spawn_mock(state.clone()).await;
-
-        let reader = PrometheusReader::new(format!("http://{addr}"));
-        let err = reader
-            .read_samples(0, 100, &LabelFilter::for_metric("m"))
-            .await
-            .unwrap_err();
-        match err {
-            RawSampleReaderError::Upstream { reason } => {
-                assert!(reason.contains("503"), "reason = {reason}");
-            }
-            other => panic!("expected Upstream, got {other}"),
-        }
-        handle.abort();
-    }
-
-    #[tokio::test]
-    async fn prometheus_error_status_maps_to_upstream_error() {
-        let state = MockState::default();
-        *state.response_status.lock().unwrap() = 200;
-        *state.response_body.lock().unwrap() = r#"{
-            "status": "error",
-            "errorType": "bad_data",
-            "error": "parse error at char 8"
-        }"#
-        .to_string();
-        let (addr, handle) = spawn_mock(state.clone()).await;
-
-        let reader = PrometheusReader::new(format!("http://{addr}"));
-        let err = reader
-            .read_samples(0, 100, &LabelFilter::for_metric("m"))
-            .await
-            .unwrap_err();
-        match err {
-            RawSampleReaderError::Upstream { reason } => {
-                assert!(reason.contains("parse error"), "reason = {reason}");
-            }
-            other => panic!("expected Upstream, got {other}"),
-        }
-        handle.abort();
-    }
-
-    #[tokio::test]
-    async fn malformed_json_maps_to_decode_error() {
-        let state = MockState::default();
-        *state.response_status.lock().unwrap() = 200;
-        *state.response_body.lock().unwrap() = "not json".to_string();
-        let (addr, handle) = spawn_mock(state.clone()).await;
-
-        let reader = PrometheusReader::new(format!("http://{addr}"));
-        let err = reader
-            .read_samples(0, 100, &LabelFilter::for_metric("m"))
-            .await
-            .unwrap_err();
-        match err {
-            RawSampleReaderError::Decode { .. } => {}
-            other => panic!("expected Decode, got {other}"),
-        }
-        handle.abort();
-    }
-
-    #[tokio::test]
-    async fn ordering_preserved_per_series() {
-        // Prometheus returns per-series ordering by timestamp; our
-        // reader preserves it. The worker's group-keying is per
-        // series, so per-series ingest order is what §10.5 asks
-        // for.
-        let state = MockState::default();
-        *state.response_status.lock().unwrap() = 200;
-        *state.response_body.lock().unwrap() = r#"{
-            "status": "success",
-            "data": {
-                "resultType": "matrix",
-                "result": [{
-                    "metric": {"__name__": "m"},
-                    "values": [
-                        [1.0, "10"],
-                        [2.0, "20"],
-                        [3.0, "30"]
-                    ]
-                }]
-            }
-        }"#
-        .to_string();
-        let (addr, handle) = spawn_mock(state.clone()).await;
-
-        let reader = PrometheusReader::new(format!("http://{addr}"));
-        let samples = reader
-            .read_samples(0, 10_000, &LabelFilter::for_metric("m"))
-            .await
-            .unwrap();
-        let ts: Vec<i64> = samples.iter().map(|s| s.timestamp_ms).collect();
-        assert_eq!(ts, vec![1000, 2000, 3000]);
-
-        handle.abort();
-    }
-
-    #[tokio::test]
-    async fn empty_result_returns_empty_vec() {
-        let state = MockState::default();
-        *state.response_status.lock().unwrap() = 200;
-        *state.response_body.lock().unwrap() = r#"{
-            "status": "success",
-            "data": {"resultType": "matrix", "result": []}
-        }"#
-        .to_string();
-        let (addr, handle) = spawn_mock(state.clone()).await;
-
-        let reader = PrometheusReader::new(format!("http://{addr}"));
-        let samples = reader
-            .read_samples(0, 100, &LabelFilter::for_metric("m"))
-            .await
-            .unwrap();
-        assert!(samples.is_empty());
-        handle.abort();
-    }
-
-    #[tokio::test]
-    async fn wrong_result_type_returns_decode_error() {
-        let state = MockState::default();
-        *state.response_status.lock().unwrap() = 200;
-        *state.response_body.lock().unwrap() = r#"{
-            "status": "success",
-            "data": {"resultType": "vector", "result": []}
-        }"#
-        .to_string();
-        let (addr, handle) = spawn_mock(state.clone()).await;
-
-        let reader = PrometheusReader::new(format!("http://{addr}"));
-        let err = reader
-            .read_samples(0, 100, &LabelFilter::for_metric("m"))
-            .await
-            .unwrap_err();
-        match err {
-            RawSampleReaderError::Decode { reason } => {
-                assert!(reason.contains("matrix"), "reason = {reason}");
-            }
-            other => panic!("expected Decode, got {other}"),
-        }
-        handle.abort();
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use std::collections::HashMap;
-
-    #[test]
-    fn build_promql_bare_metric_when_no_filters() {
-        let f = LabelFilter::for_metric("latency");
-        assert_eq!(build_promql(&f), "latency");
-    }
-
-    #[test]
-    fn build_promql_stable_ordering() {
-        let f = LabelFilter::for_metric("m")
-            .with_label("b", "2")
-            .with_label("a", "1");
-        // Sorted by key regardless of insertion order.
-        assert_eq!(build_promql(&f), r#"m{a="1",b="2"}"#);
-    }
-
-    #[test]
-    fn build_promql_escapes_quotes_and_backslashes() {
-        let f = LabelFilter::for_metric("m").with_label("k", r#"val"with\slash"#);
-        assert_eq!(build_promql(&f), r#"m{k="val\"with\\slash"}"#);
-    }
-
-    #[test]
-    fn render_series_key_uses_name_and_sorts_labels() {
-        let mut metric = HashMap::new();
-        metric.insert("__name__".to_string(), "latency".to_string());
-        metric.insert("svc".to_string(), "a".to_string());
-        metric.insert("env".to_string(), "prod".to_string());
-        assert_eq!(
-            render_series_key("fallback", &metric),
-            r#"latency{env="prod",svc="a"}"#
-        );
-    }
-
-    #[test]
-    fn render_series_key_handles_bare_metric() {
-        let mut metric = HashMap::new();
-        metric.insert("__name__".to_string(), "lone".to_string());
-        assert_eq!(render_series_key("fallback", &metric), "lone");
-    }
-
-    #[test]
-    fn render_series_key_falls_back_to_default_when_no_name() {
-        let metric: HashMap<String, String> = HashMap::new();
-        assert_eq!(render_series_key("fallback", &metric), "fallback");
-    }
-
-    #[test]
-    fn fractional_seconds_round_trip() {
-        assert_eq!(ms_to_fractional_seconds(0), "0.000");
-        assert_eq!(ms_to_fractional_seconds(1_234_567), "1234.567");
-        assert_eq!(fractional_seconds_to_ms(1.5), 1500);
-        assert_eq!(fractional_seconds_to_ms(0.0), 0);
-    }
-
-    #[tokio::test]
-    async fn read_samples_inverted_range_returns_invalid_range() {
-        let r = PrometheusReader::new("http://unused");
-        let err = r
-            .read_samples(100, 50, &LabelFilter::for_metric("m"))
-            .await
-            .unwrap_err();
-        match err {
-            RawSampleReaderError::InvalidRange { .. } => {}
-            other => panic!("expected InvalidRange, got {other}"),
-        }
-    }
-}
diff --git a/data_plane/src/storage_engines/sketch_db/backfill/raw_sample_reader.rs b/data_plane/src/storage_engines/sketch_db/backfill/raw_sample_reader.rs
deleted file mode 100644
index 79d9ccdb0..000000000
--- a/data_plane/src/storage_engines/sketch_db/backfill/raw_sample_reader.rs
+++ /dev/null
@@ -1,416 +0,0 @@
-//! `RawSampleReader` — trait + mock implementation for reading raw
-//! samples from the exact DB during a [`BackfillJob`] run.
-//!
-//! Prometheus and ClickHouse implement the same worker-facing sample interface.
-//! S3/Gorilla and rebuilding from another stored sketch remain unsupported.
-//!
-//! ## Contracts
-//!
-//! * `RawSample` struct — the decoded-sample shape used end-to-end
-//!   from exact-DB read through sketch replay.
-//! * `LabelFilter` struct — the subset of the series selector the
-//!   reader needs to apply (metric + grouping label equality).
-//!   SQL populations and projections come from the installed materialization
-//!   when constructing the reader, rather than being interpreted as PromQL.
-//! * `RawSampleReader` trait — async `read_samples(range, filter)`
-//!   returning a `Vec<RawSample>`. Each requested window is buffered; large
-//!   windows still require a future streaming processor interface.
-//! * `MockRawSampleReader` — in-memory implementation used by
-//!   Phase 5c's worker tests and Phase 5e's rebuild tests.
-//!
-
-use std::collections::HashMap;
-
-use async_trait::async_trait;
-
-/// A single raw sample read from the exact DB during a backfill.
-/// Shape mirrors what the OTLP ingest path emits internally so the
-/// downstream sketch builder can consume both native ingest and
-/// backfill output through one code path.
-#[derive(Debug, Clone, PartialEq)]
-pub struct RawSample {
-    /// Full series key (Prometheus-style `metric{k="v",...}` string)
-    /// so the downstream grouping code can extract group-key label
-    /// values just as it does for live samples. Phase 5e may switch
-    /// to a structured label map if profiling shows string parsing
-    /// dominates rebuild cost.
-    pub labels: String,
-    pub timestamp_ms: i64,
-    pub value: f64,
-}
-
-/// Narrow subset of PromQL label matchers the backfill reader must
-/// honour. Exactly one metric name plus zero or more equality
-/// matchers on grouping labels — no regex, no negation, no
-/// lexicographic ranges. The control plane picks the subset of
-/// `PrecomputeMaterialization.grouping_labels` that should gate the read.
-///
-/// Rationale: every supported exact-DB backend (Prometheus,
-/// ClickHouse, S3+Gorilla) can evaluate this filter efficiently,
-/// and richer matchers would invite divergence between live and
-/// backfill paths.
-#[derive(Debug, Clone, Default, PartialEq)]
-pub struct LabelFilter {
-    pub metric: String,
-    /// Label-name → expected-value pairs. An empty map selects every
-    /// series for `metric`.
-    pub equality: HashMap<String, String>,
-}
-
-impl LabelFilter {
-    pub fn for_metric(metric: impl Into<String>) -> Self {
-        Self {
-            metric: metric.into(),
-            equality: HashMap::new(),
-        }
-    }
-
-    pub fn with_label(mut self, name: impl Into<String>, value: impl Into<String>) -> Self {
-        self.equality.insert(name.into(), value.into());
-        self
-    }
-}
-
-/// Errors the reader can surface to the worker pool. Kept coarse on
-/// purpose — Phase 5c's worker will transition the job to `Failed`
-/// with the `Display` text in `BackfillJob::error_message`, so the
-/// variants don't need to be programmatically matched.
-#[derive(Debug)]
-pub enum RawSampleReaderError {
-    /// The range is malformed (start > end) or outside the reader's
-    /// retention.
-    InvalidRange { reason: String },
-    /// The exact DB is unreachable or refused the query.
-    Upstream { reason: String },
-    /// A fatal decode / parse failure on an individual sample.
-    Decode { reason: String },
-    /// Any other unexpected failure. Phase 5c treats this identically
-    /// to `Upstream` for now; kept separate so future readers can
-    /// widen their reporting without a breaking change.
-    Other { reason: String },
-}
-
-impl std::fmt::Display for RawSampleReaderError {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        match self {
-            Self::InvalidRange { reason } => write!(f, "invalid range: {reason}"),
-            Self::Upstream { reason } => write!(f, "upstream error: {reason}"),
-            Self::Decode { reason } => write!(f, "decode error: {reason}"),
-            Self::Other { reason } => write!(f, "error: {reason}"),
-        }
-    }
-}
-
-impl std::error::Error for RawSampleReaderError {}
-
-/// Source-agnostic read API the backfill worker calls against
-/// whichever `BackfillSource` the job points at. `async` because
-/// every concrete reader (Prometheus HTTP, S3 Gorilla, ClickHouse)
-/// is I/O-bound; `async_trait` is used instead of the naked
-/// impl-trait-in-trait so the trait stays object-safe and the
-/// worker can hold `Arc<dyn RawSampleReader>`.
-#[async_trait]
-pub trait RawSampleReader: Send + Sync {
-    /// Read every sample the exact DB has for `filter` over the
-    /// half-open range `[start_ms, end_ms)`. Samples should be
-    /// returned in **ingest order** per-series — §10.5 requires
-    /// deterministic replay, and the contract is easiest to
-    /// satisfy at the reader layer.
-    ///
-    /// An empty `Vec` means "no samples in the range" (not an
-    /// error). Errors are reserved for upstream failures.
-    async fn read_samples(
-        &self,
-        start_ms: u64,
-        end_ms: u64,
-        filter: &LabelFilter,
-    ) -> Result<Vec<RawSample>, RawSampleReaderError>;
-
-    /// Human-readable name used in structured logs and the §15.2
-    /// HTTP list endpoint. Defaults to the trait-object's Rust
-    /// type name; concrete readers can override for friendlier
-    /// output.
-    fn source_name(&self) -> &'static str {
-        std::any::type_name::<Self>()
-    }
-}
-
-/// In-memory reader used by unit tests and the Phase 5c worker
-/// deterministic test adapter. Seeded with a flat `Vec<RawSample>` at construction;
-/// `read_samples` applies `(range, filter)` on every call.
-///
-/// Not for production use — it doesn't scale past a few thousand
-/// samples and offers no retention semantics.
-pub struct MockRawSampleReader {
-    samples: Vec<RawSample>,
-}
-
-impl MockRawSampleReader {
-    pub fn new(samples: Vec<RawSample>) -> Self {
-        Self { samples }
-    }
-
-    #[cfg(test)]
-    /// Total number of samples the reader was seeded with —
-    /// independent of any range / filter. Exposed so tests can
-    /// assert reader setup without round-tripping through
-    /// `read_samples`.
-    pub fn seeded_count(&self) -> usize {
-        self.samples.len()
-    }
-}
-
-#[async_trait]
-impl RawSampleReader for MockRawSampleReader {
-    async fn read_samples(
-        &self,
-        start_ms: u64,
-        end_ms: u64,
-        filter: &LabelFilter,
-    ) -> Result<Vec<RawSample>, RawSampleReaderError> {
-        if start_ms > end_ms {
-            return Err(RawSampleReaderError::InvalidRange {
-                reason: format!("start_ms {start_ms} > end_ms {end_ms}"),
-            });
-        }
-        let out = self
-            .samples
-            .iter()
-            .filter(|s| {
-                let ts = s.timestamp_ms;
-                ts >= 0 && (ts as u64) >= start_ms && (ts as u64) < end_ms
-            })
-            .filter(|s| sample_matches(&s.labels, filter))
-            .cloned()
-            .collect();
-        Ok(out)
-    }
-
-    fn source_name(&self) -> &'static str {
-        "MockRawSampleReader"
-    }
-}
-
-/// Check whether a series-key string `metric{a="b",c="d"}` satisfies
-/// the filter: metric name must match, and every equality-matcher
-/// entry must be present with the expected value. Unknown labels
-/// on the series are ignored.
-pub(super) fn sample_matches(series_key: &str, filter: &LabelFilter) -> bool {
-    let (metric, labels_str) = match series_key.find('{') {
-        Some(i) => (
-            &series_key[..i],
-            series_key[i + 1..]
-                .strip_suffix('}')
-                .unwrap_or(&series_key[i + 1..]),
-        ),
-        None => (series_key, ""),
-    };
-    if metric != filter.metric {
-        return false;
-    }
-    if filter.equality.is_empty() {
-        return true;
-    }
-    // Parse `a="b",c="d"` lazily. Don't unescape — the filter values
-    // must match the raw label strings the producer emitted. If a
-    // series has fewer labels than the filter asks for, it can't
-    // satisfy all equality clauses and we reject.
-    let mut found = HashMap::new();
-    for pair in labels_str.split(',').filter(|s| !s.is_empty()) {
-        let mut it = pair.splitn(2, '=');
-        let (Some(k), Some(v)) = (it.next(), it.next()) else {
-            continue;
-        };
-        let k = k.trim();
-        let v = v.trim().trim_matches('"');
-        found.insert(k.to_string(), v.to_string());
-    }
-    filter
-        .equality
-        .iter()
-        .all(|(k, v)| found.get(k).map(|fv| fv == v).unwrap_or(false))
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    fn s(labels: &str, ts: i64, v: f64) -> RawSample {
-        RawSample {
-            labels: labels.to_string(),
-            timestamp_ms: ts,
-            value: v,
-        }
-    }
-
-    #[tokio::test]
-    async fn read_samples_returns_everything_in_range() {
-        let r = MockRawSampleReader::new(vec![
-            s("latency{svc=\"a\"}", 10, 1.0),
-            s("latency{svc=\"b\"}", 20, 2.0),
-            s("latency{svc=\"a\"}", 30, 3.0),
-        ]);
-        let out = r
-            .read_samples(0, 100, &LabelFilter::for_metric("latency"))
-            .await
-            .unwrap();
-        assert_eq!(out.len(), 3);
-    }
-
-    #[tokio::test]
-    async fn read_samples_enforces_half_open_range() {
-        let r = MockRawSampleReader::new(vec![
-            s("latency", 10, 1.0),
-            s("latency", 20, 2.0),
-            s("latency", 30, 3.0),
-        ]);
-        // [10, 30) — excludes ts=30.
-        let out = r
-            .read_samples(10, 30, &LabelFilter::for_metric("latency"))
-            .await
-            .unwrap();
-        assert_eq!(out.len(), 2);
-        assert!(out.iter().all(|s| s.timestamp_ms < 30));
-    }
-
-    #[tokio::test]
-    async fn read_samples_filters_by_metric_name() {
-        let r = MockRawSampleReader::new(vec![
-            s("latency{svc=\"a\"}", 10, 1.0),
-            s("qps{svc=\"a\"}", 20, 2.0),
-        ]);
-        let out = r
-            .read_samples(0, 100, &LabelFilter::for_metric("latency"))
-            .await
-            .unwrap();
-        assert_eq!(out.len(), 1);
-        assert!(out[0].labels.starts_with("latency"));
-    }
-
-    #[tokio::test]
-    async fn read_samples_filters_by_label_equality() {
-        let r = MockRawSampleReader::new(vec![
-            s("latency{svc=\"a\",env=\"prod\"}", 10, 1.0),
-            s("latency{svc=\"b\",env=\"prod\"}", 20, 2.0),
-            s("latency{svc=\"a\",env=\"stage\"}", 30, 3.0),
-        ]);
-        let filter = LabelFilter::for_metric("latency")
-            .with_label("svc", "a")
-            .with_label("env", "prod");
-        let out = r.read_samples(0, 100, &filter).await.unwrap();
-        assert_eq!(out.len(), 1);
-        assert_eq!(out[0].value, 1.0);
-    }
-
-    #[tokio::test]
-    async fn read_samples_empty_filter_selects_metric_only() {
-        let r = MockRawSampleReader::new(vec![
-            s("latency{svc=\"a\"}", 10, 1.0),
-            s("latency{svc=\"b\"}", 20, 2.0),
-            s("qps{svc=\"a\"}", 30, 3.0),
-        ]);
-        let out = r
-            .read_samples(0, 100, &LabelFilter::for_metric("latency"))
-            .await
-            .unwrap();
-        assert_eq!(out.len(), 2);
-    }
-
-    #[tokio::test]
-    async fn read_samples_label_matcher_requires_all_to_match() {
-        let r = MockRawSampleReader::new(vec![s("latency{svc=\"a\"}", 10, 1.0)]);
-        let filter = LabelFilter::for_metric("latency")
-            .with_label("svc", "a")
-            .with_label("env", "prod"); // not present
-        let out = r.read_samples(0, 100, &filter).await.unwrap();
-        assert!(out.is_empty());
-    }
-
-    #[tokio::test]
-    async fn read_samples_metric_without_labels_matches_bare_metric_filter() {
-        let r = MockRawSampleReader::new(vec![s("bare_metric", 10, 1.0)]);
-        let out = r
-            .read_samples(0, 100, &LabelFilter::for_metric("bare_metric"))
-            .await
-            .unwrap();
-        assert_eq!(out.len(), 1);
-    }
-
-    #[tokio::test]
-    async fn read_samples_rejects_inverted_range() {
-        let r = MockRawSampleReader::new(vec![]);
-        let err = r
-            .read_samples(100, 50, &LabelFilter::for_metric("m"))
-            .await
-            .unwrap_err();
-        match err {
-            RawSampleReaderError::InvalidRange { .. } => {}
-            other => panic!("expected InvalidRange, got {other}"),
-        }
-    }
-
-    #[tokio::test]
-    async fn read_samples_returns_empty_when_no_overlap() {
-        let r = MockRawSampleReader::new(vec![s("latency", 10, 1.0), s("latency", 20, 2.0)]);
-        let out = r
-            .read_samples(100, 200, &LabelFilter::for_metric("latency"))
-            .await
-            .unwrap();
-        assert!(out.is_empty());
-    }
-
-    #[tokio::test]
-    async fn read_samples_preserves_ingest_order() {
-        // §10.5 requires deterministic replay. The mock preserves
-        // insertion order on construction; verify the contract.
-        let r = MockRawSampleReader::new(vec![s("m", 10, 1.0), s("m", 10, 2.0), s("m", 20, 3.0)]);
-        let out = r
-            .read_samples(0, 100, &LabelFilter::for_metric("m"))
-            .await
-            .unwrap();
-        assert_eq!(
-            out.iter().map(|s| s.value).collect::<Vec<_>>(),
-            vec![1.0, 2.0, 3.0]
-        );
-    }
-
-    #[tokio::test]
-    async fn reader_is_dyn_compatible() {
-        // Make sure the trait can live behind a trait object — the
-        // worker pool in Phase 5c will hold Arc<dyn RawSampleReader>.
-        let r: std::sync::Arc<dyn RawSampleReader> =
-            std::sync::Arc::new(MockRawSampleReader::new(vec![s("m", 10, 1.0)]));
-        let out = r
-            .read_samples(0, 100, &LabelFilter::for_metric("m"))
-            .await
-            .unwrap();
-        assert_eq!(out.len(), 1);
-        assert_eq!(r.source_name(), "MockRawSampleReader");
-    }
-
-    #[test]
-    fn seeded_count_reports_total() {
-        let r = MockRawSampleReader::new(vec![s("m", 10, 1.0), s("m", 20, 2.0), s("m", 30, 3.0)]);
-        assert_eq!(r.seeded_count(), 3);
-    }
-
-    #[test]
-    fn label_filter_builder_accumulates_equalities() {
-        let f = LabelFilter::for_metric("latency")
-            .with_label("svc", "a")
-            .with_label("env", "prod");
-        assert_eq!(f.metric, "latency");
-        assert_eq!(f.equality.len(), 2);
-        assert_eq!(f.equality.get("svc"), Some(&"a".to_string()));
-    }
-
-    #[test]
-    fn error_display_is_human_readable() {
-        let e = RawSampleReaderError::Upstream {
-            reason: "conn refused".to_string(),
-        };
-        let s = format!("{e}");
-        assert!(s.contains("upstream"));
-        assert!(s.contains("conn refused"));
-    }
-}
diff --git a/data_plane/src/storage_engines/sketch_db/backfill/service.rs b/data_plane/src/storage_engines/sketch_db/backfill/service.rs
deleted file mode 100644
index 8e5639424..000000000
--- a/data_plane/src/storage_engines/sketch_db/backfill/service.rs
+++ /dev/null
@@ -1,604 +0,0 @@
-//! `BackfillService` — tokio task that drains the `BackfillRegistry`
-//! for `Queued` jobs and runs them via a `BackfillWorker` +
-//! `BackfillWindowProcessor`.
-//!
-//! Implements the worker-pool side of §10.3 (refresh as a separate
-//! worker pool) from the sketch DB design. Phase 5e-v1 runs **one
-//! job at a time** — the multi-worker + priority / quota controls
-//! from §11.4 land in a follow-up.
-//!
-//! ## Architecture
-//!
-//! ```text
-//!   POST /api/v1/db/backfill     BackfillService task
-//!      │                                │
-//!      │ create()                       │ loop {
-//!      ▼                                │   pick Queued job
-//!   BackfillRegistry ◀─ tick / mark ────┤   reader = factory(source)
-//!      (Queued)                         │   worker.run_job(
-//!      (Running)                        │     job_id, filter,
-//!      (Complete / Failed / Cancelled)  │     reader, processor)
-//!                                       │   sleep(poll_interval)
-//!                                       │ }
-//! ```
-//!
-//! ## Reader factory
-//!
-//! The service doesn't know how to talk to Prometheus / S3
-//! — those are network-backed and deployment-specific. Instead, the
-//! caller provides a [`ReaderFactory`] that takes a `BackfillSource` and the
-//! installed materialization's population and projection contract,
-//! and returns an `Arc<dyn RawSampleReader>`. When no factory is
-//! registered for a given source variant, the job fails with a clear
-//! "no reader configured" message (better than hanging in Queued).
-//!
-//! Production factories implement Prometheus and ClickHouse. Tests can
-//! substitute `MockRawSampleReader` without changing the worker lifecycle.
-//!
-//! ## Time-disjoint enforcement
-//!
-//! The service assumes jobs in the registry have passed
-//! [`BackfillRegistry::create_checked`]'s time-disjoint validation.
-//! It does NOT re-check the invariant — if a job snuck in via the
-//! unchecked `create()` (tests only), it'll still run, and writes
-//! could race live. The HTTP endpoint wiring is what enforces
-//! "all production jobs go through `create_checked`".
-
-use std::sync::Arc;
-use std::time::Duration;
-
-use tokio::sync::oneshot;
-use tracing::{debug, info, warn};
-
-use crate::storage_engines::sketch_db::backfill::processor::BackfillWindowProcessor;
-use crate::storage_engines::sketch_db::backfill::raw_sample_reader::{
-    LabelFilter, RawSampleReader,
-};
-use crate::storage_engines::sketch_db::backfill::worker::BackfillWorker;
-use crate::storage_engines::sketch_db::backfill::{
-    BackfillRegistry, BackfillSource, BackfillStatus,
-};
-use crate::storage_engines::types::InstalledPrecomputePlanHandle;
-
-/// Given a `BackfillSource`, return a reader that can read raw
-/// samples from it. Used by the service to pick a concrete reader
-/// per job. Boxed fn because the caller will typically close over
-/// deployment-specific config (HTTP clients, S3 creds) that can't
-/// be reconstructed from `BackfillSource` alone.
-pub type ReaderFactory = Arc<
-    dyn Fn(
-            &BackfillSource,
-            &asap_types::PrecomputeMaterialization,
-        ) -> Result<Arc<dyn RawSampleReader>, Box<dyn std::error::Error + Send + Sync>>
-        + Send
-        + Sync,
->;
-
-/// Config for the [`BackfillService`] background task. Tunable
-/// separately from the live-ingest pipeline since backfill should
-/// not starve live.
-#[derive(Clone, Debug)]
-pub struct BackfillServiceConfig {
-    /// How often to poll the registry for new Queued jobs when
-    /// idle. Kept coarse (default 1s) — backfill is not
-    /// latency-sensitive.
-    pub poll_interval: Duration,
-}
-
-impl Default for BackfillServiceConfig {
-    fn default() -> Self {
-        Self {
-            poll_interval: Duration::from_secs(1),
-        }
-    }
-}
-
-/// Long-running tokio task that drains Queued backfill jobs. Spawn
-/// via [`Self::spawn`]; the returned handle can be used to stop
-/// the loop gracefully.
-pub struct BackfillService {
-    registry: Arc<BackfillRegistry>,
-    /// Destination for rebuilt windows.
-    summary_store: Option<Arc<crate::storage_engines::sketch_db::index::SketchStore>>,
-    /// Shared sid mint authority — wired alongside `sketch_index` so
-    /// backfilled precompute sids share the namespace with live ingest.
-    series_resolver: Option<Arc<crate::drivers::ingest::series_resolver::SeriesIdResolver>>,
-    config_source: InstalledPrecomputePlanHandle,
-    reader_factory: ReaderFactory,
-    service_config: BackfillServiceConfig,
-}
-
-impl BackfillService {
-    pub fn new(
-        registry: Arc<BackfillRegistry>,
-        config_source: InstalledPrecomputePlanHandle,
-        reader_factory: ReaderFactory,
-        service_config: BackfillServiceConfig,
-    ) -> Self {
-        Self {
-            registry,
-            summary_store: None,
-            series_resolver: None,
-            config_source,
-            reader_factory,
-            service_config,
-        }
-    }
-
-    /// Attach a `SketchStore` so each replayed batch is also mirrored
-    /// there. Builder-style; safe to omit (legacy tests).
-    pub fn with_sketch_index(
-        mut self,
-        summary_store: Arc<crate::storage_engines::sketch_db::index::SketchStore>,
-    ) -> Self {
-        self.summary_store = Some(summary_store);
-        self
-    }
-
-    /// Attach the shared `SeriesIdResolver` so the per-job
-    /// `BackfillWindowProcessor` mints sids via the same registry the
-    /// OTel ingest path uses. Builder-style; should be paired with
-    /// [`Self::with_sketch_index`] in production (without it,
-    /// processor writes are skipped with a warn).
-    pub fn with_series_resolver(
-        mut self,
-        series_resolver: Arc<crate::drivers::ingest::series_resolver::SeriesIdResolver>,
-    ) -> Self {
-        self.series_resolver = Some(series_resolver);
-        self
-    }
-
-    /// Spawn the service as a tokio task. Returns a `BackfillServiceHandle`
-    /// with a `shutdown` oneshot so `main.rs` can stop it cleanly on
-    /// ctrl-c.
-    pub fn spawn(self) -> BackfillServiceHandle {
-        let (shutdown_tx, shutdown_rx) = oneshot::channel();
-        let task = tokio::spawn(async move {
-            self.run(shutdown_rx).await;
-        });
-        BackfillServiceHandle {
-            task: Some(task),
-            shutdown: Some(shutdown_tx),
-        }
-    }
-
-    /// Main drain loop. Returns when `shutdown` is signalled.
-    ///
-    /// Pick-up policy: on each tick, take ONE queued job (sorted by
-    /// `job_id` for determinism) and run it to completion. While
-    /// running, the loop doesn't poll for new jobs — backfill
-    /// serialisation is explicit in v1. Multi-worker parallelism
-    /// is §11.4 follow-up work.
-    async fn run(self, mut shutdown: oneshot::Receiver<()>) {
-        info!(
-            poll_interval_ms = self.service_config.poll_interval.as_millis(),
-            "BackfillService starting drain loop"
-        );
-        loop {
-            tokio::select! {
-                biased;
-                _ = &mut shutdown => {
-                    info!("BackfillService received shutdown signal");
-                    return;
-                }
-                _ = tokio::time::sleep(self.service_config.poll_interval) => {}
-            }
-
-            let mut queued = self.registry.list_by_status(&BackfillStatus::Queued);
-            if queued.is_empty() {
-                continue;
-            }
-            queued.sort_by_key(|j| j.job_id);
-            let job = queued.remove(0);
-
-            debug!(
-                job_id = job.job_id,
-                agg_id = job.agg_id,
-                start_ms = job.time_range.0,
-                end_ms = job.time_range.1,
-                "BackfillService picking up queued job"
-            );
-
-            let snapshot = self.config_source.snapshot();
-            let Some(materialization) =
-                snapshot.get_aggregation_config(asap_types::sds::StoredOutputId(job.agg_id))
-            else {
-                self.registry
-                    .mark_failed(job.job_id, "backfill materialization is not installed");
-                continue;
-            };
-            if materialization.table_population.is_some()
-                && !matches!(job.source, BackfillSource::ClickHouse { .. })
-            {
-                self.registry.mark_failed(
-                    job.job_id,
-                    "typed table population requires a ClickHouse reader",
-                );
-                continue;
-            }
-            if let BackfillSource::ClickHouse { database, table } = &job.source {
-                let configured_table = materialization.table_name.as_deref();
-                let qualified_table = format!("{database}.{table}");
-                if configured_table != Some(table.as_str())
-                    && configured_table != Some(qualified_table.as_str())
-                {
-                    self.registry.mark_failed(
-                        job.job_id,
-                        "ClickHouse source differs from the installed materialization table",
-                    );
-                    continue;
-                }
-            }
-            let reader = match (self.reader_factory)(&job.source, materialization) {
-                Ok(r) => r,
-                Err(e) => {
-                    let msg = format!("reader factory failed: {e}");
-                    warn!(job_id = job.job_id, error = %msg, "marking job Failed");
-                    self.registry.mark_failed(job.job_id, msg);
-                    continue;
-                }
-            };
-
-            // Build the per-job processor with the current config
-            // snapshot. The processor snapshots again per window so
-            // mid-job config swaps stay visible.
-            let mut processor = BackfillWindowProcessor::new(
-                self.config_source.clone(),
-                self.registry.clone(),
-                job.job_id,
-            );
-            if let Some(idx) = self.summary_store.as_ref() {
-                processor = processor.with_sketch_index(idx.clone());
-            }
-            if let Some(resolver) = self.series_resolver.as_ref() {
-                processor = processor.with_series_resolver(resolver.clone());
-            }
-            let worker = BackfillWorker::new(self.registry.clone());
-
-            let filter = LabelFilter::for_metric(materialization.metric.clone());
-            match worker
-                .run_job(job.job_id, &filter, reader.as_ref(), &processor)
-                .await
-            {
-                Ok(()) => {
-                    info!(
-                        job_id = job.job_id,
-                        status = ?self.registry.get(job.job_id).map(|j| j.status),
-                        "BackfillService job complete"
-                    );
-                }
-                Err(e) => {
-                    warn!(
-                        job_id = job.job_id,
-                        error = %e,
-                        "BackfillService job errored; worker already marked job Failed"
-                    );
-                }
-            }
-        }
-    }
-}
-
-/// Handle returned by [`BackfillService::spawn`]. Dropping the
-/// handle triggers shutdown via the oneshot (best-effort). Call
-/// [`Self::shutdown`] to also await the task's exit.
-pub struct BackfillServiceHandle {
-    task: Option<tokio::task::JoinHandle<()>>,
-    shutdown: Option<oneshot::Sender<()>>,
-}
-
-impl BackfillServiceHandle {
-    /// Signal the service to stop and await its exit. Idempotent.
-    pub async fn shutdown(mut self) {
-        if let Some(tx) = self.shutdown.take() {
-            let _ = tx.send(());
-        }
-        if let Some(task) = self.task.take() {
-            let _ = task.await;
-        }
-    }
-}
-
-impl Drop for BackfillServiceHandle {
-    fn drop(&mut self) {
-        if let Some(tx) = self.shutdown.take() {
-            let _ = tx.send(());
-        }
-        // Task is left to finish on its own — callers who want to
-        // await should use `shutdown` instead of relying on Drop.
-    }
-}
-
-/// A `ReaderFactory` that always returns
-/// `Err("no reader registered for <source>")`. Useful as a default
-/// in `main.rs` when no real readers are wired yet: posted jobs
-/// get picked up, attempted, and fail fast with a clear reason.
-pub fn noop_reader_factory() -> ReaderFactory {
-    Arc::new(|source, _materialization| {
-        Err(format!("no RawSampleReader registered for source variant {source:?}").into())
-    })
-}
-
-/// Default reader factory for Prometheus sources. ClickHouse requires a
-/// deployment reader factory; unsupported sources fail with an error visible
-/// on the backfill job.
-pub fn default_reader_factory() -> ReaderFactory {
-    Arc::new(|source, _materialization| match source {
-        BackfillSource::Prometheus { url } => {
-            let reader = super::prometheus_reader::PrometheusReader::new(url.clone());
-            Ok(Arc::new(reader) as Arc<dyn RawSampleReader>)
-        }
-        BackfillSource::ClickHouse { .. }
-        | BackfillSource::S3Gorilla { .. }
-        | BackfillSource::OtherSketch { .. } => Err(format!(
-            "no reader configured for {source:?}; ClickHouse requires its deployment reader factory"
-        )
-        .into()),
-    })
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use crate::storage_engines::sketch_db::backfill::raw_sample_reader::{
-        MockRawSampleReader, RawSample,
-    };
-    use crate::storage_engines::types::InstalledPrecomputePlan;
-    use asap_types::aggregation_config::PrecomputeMaterialization;
-    use asap_types::enums::WindowKind;
-    use asap_types::AggregationType;
-    use asap_types::KeyByLabelNames;
-    use std::sync::Mutex;
-
-    fn sum_config(_agg_id: u64, metric: &str) -> PrecomputeMaterialization {
-        // `_agg_id` is unused after PR 5 — identity is content-addressed.
-        PrecomputeMaterialization::new(
-            AggregationType::Sum,
-            String::new(),
-            std::collections::HashMap::new(),
-            KeyByLabelNames::empty(),
-            KeyByLabelNames::empty(),
-            KeyByLabelNames::empty(),
-            String::new(),
-            60,
-            60,
-            WindowKind::Tumbling,
-            String::new(),
-            metric.to_string(),
-            None,
-            None,
-            None,
-        )
-    }
-
-    fn streaming_with(cfg: PrecomputeMaterialization) -> Arc<InstalledPrecomputePlan> {
-        let mut m = std::collections::HashMap::new();
-        m.insert(cfg.policy_fp_u64(), cfg);
-        Arc::new(InstalledPrecomputePlan::from_raw_ids(m))
-    }
-
-    async fn wait_for_status(
-        registry: &BackfillRegistry,
-        job_id: u64,
-        target: BackfillStatus,
-        timeout_ms: u64,
-    ) -> BackfillStatus {
-        let deadline = crate::tests::test_utilities::timing::deadline(
-            std::time::Duration::from_millis(timeout_ms),
-        );
-        loop {
-            if let Some(j) = registry.get(job_id) {
-                if j.status == target || j.status.is_terminal() {
-                    return j.status;
-                }
-            }
-            if std::time::Instant::now() >= deadline {
-                return registry
-                    .get(job_id)
-                    .map(|j| j.status)
-                    .unwrap_or(BackfillStatus::Queued);
-            }
-            tokio::time::sleep(std::time::Duration::from_millis(10)).await;
-        }
-    }
-
-    #[tokio::test(flavor = "current_thread")]
-    async fn clickhouse_source_must_match_installed_table_before_reader_creation() {
-        let mut cfg = sum_config(1, "latency");
-        cfg.table_name = Some("expected_table".into());
-        let agg_fp = cfg.policy_fp_u64();
-        let hot = InstalledPrecomputePlanHandle::from_arc(streaming_with(cfg));
-        let registry = Arc::new(BackfillRegistry::new());
-        let calls = Arc::new(std::sync::atomic::AtomicUsize::new(0));
-        let called = calls.clone();
-        let service = BackfillService::new(
-            registry.clone(),
-            hot,
-            Arc::new(move |_, _| {
-                called.fetch_add(1, std::sync::atomic::Ordering::Relaxed);
-                Ok(Arc::new(MockRawSampleReader::new(vec![])))
-            }),
-            BackfillServiceConfig {
-                poll_interval: Duration::from_millis(5),
-            },
-        );
-        let handle = service.spawn();
-        let job_id = registry.create(
-            agg_fp,
-            (0, 20),
-            BackfillSource::ClickHouse {
-                database: "default".into(),
-                table: "wrong_table".into(),
-            },
-            1,
-        );
-        let status = wait_for_status(&registry, job_id, BackfillStatus::Failed, 2000).await;
-        handle.shutdown().await;
-        assert_eq!(status, BackfillStatus::Failed);
-        assert_eq!(calls.load(std::sync::atomic::Ordering::Relaxed), 0);
-    }
-
-    #[tokio::test(flavor = "current_thread")]
-    async fn service_drains_queued_job_to_complete() {
-        let cfg = sum_config(1, "latency");
-        let agg_fp = cfg.policy_fp_u64();
-        let streaming = streaming_with(cfg);
-        let hot = InstalledPrecomputePlanHandle::from_arc(streaming.clone());
-        let registry = Arc::new(BackfillRegistry::new());
-
-        // Factory returns a fresh mock reader per call — seeded with a
-        // handful of samples that cover the job's range.
-        let reader_factory: ReaderFactory = Arc::new(|_src, _materialization| {
-            Ok(Arc::new(MockRawSampleReader::new(vec![
-                RawSample {
-                    labels: "latency".into(),
-                    timestamp_ms: 5,
-                    value: 1.0,
-                },
-                RawSample {
-                    labels: "latency".into(),
-                    timestamp_ms: 15,
-                    value: 2.0,
-                },
-            ])) as Arc<dyn RawSampleReader>)
-        });
-
-        let service = BackfillService::new(
-            registry.clone(),
-            hot,
-            reader_factory,
-            BackfillServiceConfig {
-                poll_interval: Duration::from_millis(20),
-            },
-        );
-        let handle = service.spawn();
-
-        let job_id = registry.create(
-            agg_fp,
-            (0, 20),
-            BackfillSource::Prometheus { url: "x".into() },
-            2,
-        );
-        let status = wait_for_status(&registry, job_id, BackfillStatus::Complete, 2000).await;
-        handle.shutdown().await;
-        assert_eq!(status, BackfillStatus::Complete);
-        assert_eq!(registry.windows_written_by(job_id).len(), 2);
-    }
-
-    #[tokio::test(flavor = "current_thread")]
-    async fn service_marks_job_failed_when_reader_factory_fails() {
-        let cfg = sum_config(1, "latency");
-        let agg_fp = cfg.policy_fp_u64();
-        let streaming = streaming_with(cfg);
-        let hot = InstalledPrecomputePlanHandle::from_arc(streaming.clone());
-        let registry = Arc::new(BackfillRegistry::new());
-
-        let service = BackfillService::new(
-            registry.clone(),
-            hot,
-            noop_reader_factory(),
-            BackfillServiceConfig {
-                poll_interval: Duration::from_millis(20),
-            },
-        );
-        let handle = service.spawn();
-
-        let job_id = registry.create(
-            agg_fp,
-            (0, 20),
-            BackfillSource::Prometheus { url: "x".into() },
-            1,
-        );
-        let status = wait_for_status(&registry, job_id, BackfillStatus::Failed, 2000).await;
-        handle.shutdown().await;
-        assert_eq!(status, BackfillStatus::Failed);
-        let job = registry.get(job_id).unwrap();
-        assert!(job
-            .error_message
-            .unwrap()
-            .contains("no RawSampleReader registered"));
-    }
-
-    #[tokio::test(flavor = "current_thread")]
-    async fn service_processes_multiple_jobs_in_id_order() {
-        let cfg = sum_config(1, "latency");
-        let agg_fp = cfg.policy_fp_u64();
-        let streaming = streaming_with(cfg);
-        let hot = InstalledPrecomputePlanHandle::from_arc(streaming.clone());
-        let registry = Arc::new(BackfillRegistry::new());
-
-        // Factory records the order in which it's invoked.
-        let invocations: Arc<Mutex<Vec<String>>> = Arc::new(Mutex::new(Vec::new()));
-        let invocations_clone = invocations.clone();
-        let reader_factory: ReaderFactory = Arc::new(move |src, _materialization| {
-            invocations_clone.lock().unwrap().push(format!("{src:?}"));
-            Ok(Arc::new(MockRawSampleReader::new(vec![])) as Arc<dyn RawSampleReader>)
-        });
-
-        let service = BackfillService::new(
-            registry.clone(),
-            hot,
-            reader_factory,
-            BackfillServiceConfig {
-                poll_interval: Duration::from_millis(20),
-            },
-        );
-        let handle = service.spawn();
-
-        let job1 = registry.create(
-            agg_fp,
-            (0, 10),
-            BackfillSource::Prometheus { url: "a".into() },
-            1,
-        );
-        let job2 = registry.create(
-            agg_fp,
-            (0, 10),
-            BackfillSource::Prometheus { url: "b".into() },
-            1,
-        );
-        let job3 = registry.create(
-            agg_fp,
-            (0, 10),
-            BackfillSource::Prometheus { url: "c".into() },
-            1,
-        );
-
-        for id in [job1, job2, job3] {
-            let _ = wait_for_status(&registry, id, BackfillStatus::Complete, 2000).await;
-        }
-        handle.shutdown().await;
-
-        // All three completed.
-        assert_eq!(registry.get(job1).unwrap().status, BackfillStatus::Complete);
-        assert_eq!(registry.get(job2).unwrap().status, BackfillStatus::Complete);
-        assert_eq!(registry.get(job3).unwrap().status, BackfillStatus::Complete);
-
-        // Factory was invoked in job_id order (a, b, c).
-        let got = invocations.lock().unwrap().clone();
-        assert_eq!(got.len(), 3);
-        assert!(got[0].contains("\"a\""), "first invocation: {:?}", got[0]);
-        assert!(got[1].contains("\"b\""), "second invocation: {:?}", got[1]);
-        assert!(got[2].contains("\"c\""), "third invocation: {:?}", got[2]);
-    }
-
-    #[tokio::test(flavor = "current_thread")]
-    async fn service_shutdown_stops_the_loop() {
-        let cfg = sum_config(1, "m");
-        let streaming = streaming_with(cfg);
-        let hot = InstalledPrecomputePlanHandle::from_arc(streaming.clone());
-        let registry = Arc::new(BackfillRegistry::new());
-
-        let service = BackfillService::new(
-            registry,
-            hot,
-            noop_reader_factory(),
-            BackfillServiceConfig {
-                poll_interval: Duration::from_millis(50),
-            },
-        );
-        let handle = service.spawn();
-        handle.shutdown().await;
-        // If this test doesn't hang, shutdown worked.
-    }
-}
diff --git a/data_plane/src/storage_engines/sketch_db/backfill/window_builder.rs b/data_plane/src/storage_engines/sketch_db/backfill/window_builder.rs
deleted file mode 100644
index ae89f9fd6..000000000
--- a/data_plane/src/storage_engines/sketch_db/backfill/window_builder.rs
+++ /dev/null
@@ -1,181 +0,0 @@
-//! Build a backfill window accumulator from source samples in ingestion order.
-//!
-//! Backfill has its own worker pipeline and does not touch live active panes.
-//! It shares the pure accumulator factory and update primitives with live ingest
-//! so both paths use the same sketch semantics.
-
-#[cfg(test)]
-use crate::precompute_engine::worker::apply_sample;
-use crate::storage_engines::sketch_db::backfill::raw_sample_reader::RawSample;
-use crate::storage_engines::types::AggregateCore;
-#[cfg(test)]
-use crate::tests::accumulator_fixture::create_fixture_accumulator;
-#[cfg(test)]
-use asap_physical_operators::factory::AccumulatorUpdater;
-#[cfg(test)]
-use asap_types::aggregation_config::PrecomputeMaterialization;
-
-/// Construct the accumulator for one `(agg_id, window)` pair by
-/// feeding `samples` in order into a fresh `AccumulatorUpdater`.
-///
-/// Samples carry full series keys. Replay uses the live worker's sample
-/// dispatch so keyed identity and update semantics remain identical.
-///
-/// Ordering contract: samples are consumed in the iteration order
-/// of the input `Vec`. §10.5 requires that the caller preserve
-/// ingest order — this function does not sort or reorder.
-///
-/// The function is synchronous + pure (no I/O, no async, no global
-/// state). Suitable to call from inside a `WindowProcessor`
-/// implementation without worrying about the async runtime.
-#[cfg(test)]
-pub fn build_backfilled_accumulator(
-    config: &PrecomputeMaterialization,
-    samples: &[RawSample],
-) -> Box<dyn AggregateCore> {
-    let mut updater: Box<dyn AccumulatorUpdater> = create_fixture_accumulator(config);
-    for sample in samples {
-        apply_sample(
-            &mut *updater,
-            &sample.labels,
-            sample.value,
-            sample.timestamp_ms,
-            config,
-        );
-    }
-    updater.take_accumulator()
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use asap_types::aggregation_config::PrecomputeMaterialization;
-    use asap_types::enums::WindowKind;
-    use asap_types::AggregationType;
-    use asap_types::KeyByLabelNames;
-    use std::collections::HashMap;
-
-    fn sum_config() -> PrecomputeMaterialization {
-        PrecomputeMaterialization::new(
-            AggregationType::Sum,
-            String::new(),
-            HashMap::new(),
-            KeyByLabelNames::empty(),
-            KeyByLabelNames::empty(),
-            KeyByLabelNames::empty(),
-            String::new(),
-            60,
-            60,
-            WindowKind::Tumbling,
-            String::new(),
-            "m".to_string(),
-            None,
-            None,
-            None,
-        )
-    }
-
-    fn raw(labels: &str, ts: i64, v: f64) -> RawSample {
-        RawSample {
-            labels: labels.to_string(),
-            timestamp_ms: ts,
-            value: v,
-        }
-    }
-
-    // Replay must preserve each series and rank by the selected update mode.
-    #[test]
-    fn backfilled_topk_preserves_series_and_weight_mode() {
-        use asap_physical_operators::summary_kernels::{
-            CountMinSketchWithHeapAccumulator, CountSketchWithHeapAccumulator,
-        };
-        for kind in [
-            AggregationType::CountMinSketchWithHeap,
-            AggregationType::CountSketchWithHeap,
-        ] {
-            for mode in ["count", "value"] {
-                let mut config = sum_config();
-                config.aggregation_type = kind;
-                config.parameters = serde_json::from_value(serde_json::json!({
-                    "d": 4, "w": 1024, "heap_size": 10, "weight_mode": mode
-                }))
-                .unwrap();
-                let samples = vec![
-                    raw("m{svc=\"a\"}", 10, 100.0),
-                    raw("m{svc=\"b\"}", 20, 2.0),
-                    raw("m{svc=\"b\"}", 30, 3.0),
-                ];
-                let acc = build_backfilled_accumulator(&config, &samples);
-                let mut ranked: Vec<(String, f64)> = if let Some(heap) =
-                    acc.as_any()
-                        .downcast_ref::<CountMinSketchWithHeapAccumulator>()
-                {
-                    heap.inner
-                        .topk_heap_items()
-                        .into_iter()
-                        .map(|i| (i.key, i.value))
-                        .collect()
-                } else {
-                    acc.as_any()
-                        .downcast_ref::<CountSketchWithHeapAccumulator>()
-                        .unwrap()
-                        .inner
-                        .topk_heap_items()
-                        .into_iter()
-                        .map(|i| (i.key, i.value))
-                        .collect()
-                };
-                ranked.sort_by(|a, b| b.1.total_cmp(&a.1));
-                let expected = if mode == "count" {
-                    vec![("m{svc=\"b\"}".into(), 2.0), ("m{svc=\"a\"}".into(), 1.0)]
-                } else {
-                    vec![("m{svc=\"a\"}".into(), 100.0), ("m{svc=\"b\"}".into(), 5.0)]
-                };
-                assert_eq!(ranked, expected, "{kind:?} {mode}");
-            }
-        }
-    }
-
-    #[test]
-    fn sum_accumulator_sums_all_samples_in_order() {
-        let config = sum_config();
-        let samples = vec![
-            raw("m{svc=\"a\"}", 10, 1.0),
-            raw("m{svc=\"a\"}", 20, 2.0),
-            raw("m{svc=\"a\"}", 30, 3.0),
-        ];
-        let acc = build_backfilled_accumulator(&config, &samples);
-        // SumAccumulator's AuxStats exposes the sum.
-        let aux = acc.aux_stats();
-        assert_eq!(aux.sum, Some(6.0));
-    }
-
-    #[test]
-    fn empty_samples_produce_empty_accumulator() {
-        let config = sum_config();
-        let acc = build_backfilled_accumulator(&config, &[]);
-        let aux = acc.aux_stats();
-        // A fresh SumAccumulator has sum = Some(0.0) per its AuxStats
-        // implementation (identity element).
-        assert!(aux.sum == Some(0.0) || aux.sum.is_none());
-    }
-}
-
-/// Backfill uses the same selected DAG producer and update expressions as live input.
-pub fn build_dag_accumulator(
-    program: &crate::precompute_engine::raw_dag::RawDagProgram,
-    samples: &[RawSample],
-) -> Result<Box<dyn AggregateCore>, String> {
-    let mut updater = program.updater()?;
-    // A selected program never converts samples to counter deltas; rate is an
-    // explicit upstream operator, so each sample is applied as it arrives.
-    for sample in samples {
-        program.apply(
-            &mut *updater,
-            &sample.labels,
-            sample.value,
-            sample.timestamp_ms,
-        )?;
-    }
-    Ok(updater.take_accumulator())
-}
diff --git a/data_plane/src/storage_engines/sketch_db/backfill/worker.rs b/data_plane/src/storage_engines/sketch_db/backfill/worker.rs
deleted file mode 100644
index c9e22b179..000000000
--- a/data_plane/src/storage_engines/sketch_db/backfill/worker.rs
+++ /dev/null
@@ -1,550 +0,0 @@
-//! Drive one backfill job through its registry lifecycle.
-//!
-//! Transition Queued to Running, divide the requested range into windows, and
-//! read and process each window in order. The final window absorbs any integer
-//! rounding remainder. Check cancellation between windows, record progress,
-//! and mark the job Complete or Failed. Reader selection and sketch construction
-//! are supplied by the caller.
-
-use std::sync::Arc;
-
-use async_trait::async_trait;
-
-use super::raw_sample_reader::{LabelFilter, RawSample, RawSampleReader};
-use super::{BackfillRegistry, BackfillStatus};
-
-/// Per-window callback after source samples are read. Separates job
-/// orchestration from accumulator construction and storage writes.
-#[async_trait]
-pub trait WindowProcessor: Send + Sync {
-    async fn process_window(
-        &self,
-        agg_id: u64,
-        window_range: (u64, u64),
-        samples: Vec<RawSample>,
-    ) -> Result<(), Box<dyn std::error::Error + Send + Sync>>;
-}
-
-/// Errors the worker can surface. Terminology matches §10.3:
-/// every variant below causes the worker to `mark_failed` the job
-/// with the stringified error. The error is also returned to the
-/// caller so higher-level orchestration (e.g. a retry loop) can
-/// classify + react.
-#[derive(Debug)]
-pub enum BackfillWorkerError {
-    /// `run_job` was called with a `job_id` that doesn't exist in
-    /// the registry. Never alters job state (there is no state
-    /// to alter).
-    UnknownJob(u64),
-    /// `run_job` was called on a job that isn't in `Queued`. Either
-    /// already picked up by another worker or already terminal.
-    /// Never alters job state.
-    NotQueued { job_id: u64, status: BackfillStatus },
-    /// The reader returned an error for some window. Job has been
-    /// marked Failed.
-    Reader {
-        job_id: u64,
-        window_range: (u64, u64),
-        reason: String,
-    },
-    /// The processor returned an error for some window. Job has been
-    /// marked Failed.
-    Processor {
-        job_id: u64,
-        window_range: (u64, u64),
-        reason: String,
-    },
-}
-
-impl std::fmt::Display for BackfillWorkerError {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        match self {
-            Self::UnknownJob(id) => write!(f, "unknown job_id {id}"),
-            Self::NotQueued { job_id, status } => {
-                write!(f, "job {job_id} is {status:?}, expected Queued")
-            }
-            Self::Reader {
-                job_id,
-                window_range,
-                reason,
-            } => write!(
-                f,
-                "reader failed on job {job_id} window {window_range:?}: {reason}"
-            ),
-            Self::Processor {
-                job_id,
-                window_range,
-                reason,
-            } => write!(
-                f,
-                "processor failed on job {job_id} window {window_range:?}: {reason}"
-            ),
-        }
-    }
-}
-
-impl std::error::Error for BackfillWorkerError {}
-
-/// Drives a single backfill job. Holds a shared reference to the
-/// registry so lifecycle transitions stay coherent with external
-/// readers (HTTP list endpoint in Phase 5d, coverage tracker in
-/// Phase 5f).
-pub struct BackfillWorker {
-    registry: Arc<BackfillRegistry>,
-}
-
-impl BackfillWorker {
-    pub fn new(registry: Arc<BackfillRegistry>) -> Self {
-        Self { registry }
-    }
-
-    /// Run `job_id` to completion (or failure). The worker reads
-    /// via `reader`, filtering with `filter`, and calls `processor`
-    /// once per window. See the module doc for the full state-machine.
-    pub async fn run_job<R, P>(
-        &self,
-        job_id: u64,
-        filter: &LabelFilter,
-        reader: &R,
-        processor: &P,
-    ) -> Result<(), BackfillWorkerError>
-    where
-        R: RawSampleReader + ?Sized,
-        P: WindowProcessor + ?Sized,
-    {
-        let job = match self.registry.get(job_id) {
-            Some(j) => j,
-            None => return Err(BackfillWorkerError::UnknownJob(job_id)),
-        };
-        if !matches!(job.status, BackfillStatus::Queued) {
-            return Err(BackfillWorkerError::NotQueued {
-                job_id,
-                status: job.status,
-            });
-        }
-        // `start` returns `false` if another worker raced us; in
-        // that case we must not continue — the other worker owns
-        // the job. This is the only place the worker respects
-        // inter-worker exclusion; the registry's write lock
-        // serialises the transition.
-        if !self.registry.start(job_id) {
-            let current = self
-                .registry
-                .get(job_id)
-                .map(|j| j.status)
-                .unwrap_or(BackfillStatus::Queued);
-            return Err(BackfillWorkerError::NotQueued {
-                job_id,
-                status: current,
-            });
-        }
-
-        let (start_ms, end_ms) = job.time_range;
-        let total_windows = job.windows_total.max(1);
-        let total_span = end_ms.saturating_sub(start_ms);
-        let base_window_size = total_span / total_windows;
-
-        for i in 0..total_windows {
-            // Check for external cancellation before starting the
-            // next window. A cancelled job stops processing without
-            // `mark_failed` — it's already terminal.
-            if let Some(current) = self.registry.get(job_id) {
-                if matches!(current.status, BackfillStatus::Cancelled) {
-                    return Ok(());
-                }
-            }
-
-            let w_start = start_ms + i * base_window_size;
-            // Last window absorbs any leftover ms from integer division
-            // so the worker emits exactly `total_windows` windows and
-            // the full `[start_ms, end_ms)` range is covered.
-            let w_end = if i + 1 == total_windows {
-                end_ms
-            } else {
-                start_ms + (i + 1) * base_window_size
-            };
-
-            let samples = match reader.read_samples(w_start, w_end, filter).await {
-                Ok(v) => v,
-                Err(e) => {
-                    let msg = e.to_string();
-                    self.registry.mark_failed(job_id, &msg);
-                    return Err(BackfillWorkerError::Reader {
-                        job_id,
-                        window_range: (w_start, w_end),
-                        reason: msg,
-                    });
-                }
-            };
-
-            if let Err(e) = processor
-                .process_window(job.agg_id, (w_start, w_end), samples)
-                .await
-            {
-                let msg = e.to_string();
-                self.registry.mark_failed(job_id, &msg);
-                return Err(BackfillWorkerError::Processor {
-                    job_id,
-                    window_range: (w_start, w_end),
-                    reason: msg,
-                });
-            }
-
-            self.registry.tick_progress(job_id);
-        }
-
-        self.registry.mark_complete(job_id);
-        Ok(())
-    }
-}
-
-/// One recorded `process_window` call: `(agg_id, window_range, sample_count)`.
-#[cfg(test)]
-pub type RecordedCall = (u64, (u64, u64), usize);
-
-/// Test processor that captures every `process_window` call. Lets
-/// tests assert on the window sequence + sample counts after a
-/// `run_job`. Also supports a "fail on nth call" mode for exercising
-/// the worker's error path.
-#[cfg(test)]
-pub struct RecordingProcessor {
-    calls: std::sync::Mutex<Vec<RecordedCall>>,
-    fail_on_call: Option<usize>,
-}
-
-#[cfg(test)]
-impl Default for RecordingProcessor {
-    fn default() -> Self {
-        Self::new()
-    }
-}
-
-#[cfg(test)]
-impl RecordingProcessor {
-    pub fn new() -> Self {
-        Self {
-            calls: std::sync::Mutex::new(Vec::new()),
-            fail_on_call: None,
-        }
-    }
-
-    pub fn failing_on(call_index: usize) -> Self {
-        Self {
-            calls: std::sync::Mutex::new(Vec::new()),
-            fail_on_call: Some(call_index),
-        }
-    }
-
-    pub fn calls(&self) -> Vec<RecordedCall> {
-        self.calls.lock().unwrap().clone()
-    }
-}
-
-#[cfg(test)]
-#[async_trait]
-impl WindowProcessor for RecordingProcessor {
-    async fn process_window(
-        &self,
-        agg_id: u64,
-        window_range: (u64, u64),
-        samples: Vec<RawSample>,
-    ) -> Result<(), Box<dyn std::error::Error + Send + Sync>> {
-        let mut calls = self.calls.lock().unwrap();
-        let idx = calls.len();
-        calls.push((agg_id, window_range, samples.len()));
-        if self.fail_on_call == Some(idx) {
-            return Err(format!("simulated processor failure at call {idx}").into());
-        }
-        Ok(())
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use crate::storage_engines::sketch_db::{BackfillSource, MockRawSampleReader};
-
-    fn prom_source() -> BackfillSource {
-        BackfillSource::Prometheus {
-            url: "http://prom.local".to_string(),
-        }
-    }
-
-    fn mk_sample(labels: &str, ts: i64, v: f64) -> RawSample {
-        RawSample {
-            labels: labels.to_string(),
-            timestamp_ms: ts,
-            value: v,
-        }
-    }
-
-    #[tokio::test]
-    async fn run_job_happy_path_transitions_to_complete() {
-        let registry = Arc::new(BackfillRegistry::new());
-        let job_id = registry.create(7, (0, 40), prom_source(), 4);
-        let reader = MockRawSampleReader::new(vec![
-            mk_sample("m", 5, 1.0),
-            mk_sample("m", 15, 2.0),
-            mk_sample("m", 25, 3.0),
-            mk_sample("m", 35, 4.0),
-        ]);
-        let processor = RecordingProcessor::new();
-        let worker = BackfillWorker::new(registry.clone());
-
-        worker
-            .run_job(job_id, &LabelFilter::for_metric("m"), &reader, &processor)
-            .await
-            .expect("happy path should succeed");
-
-        let job = registry.get(job_id).unwrap();
-        assert_eq!(job.status, BackfillStatus::Complete);
-        assert_eq!(job.windows_done, 4);
-        assert_eq!(job.agg_id, 7);
-        assert!(job.completed_at_ms.is_some());
-
-        let calls = processor.calls();
-        assert_eq!(calls.len(), 4);
-        // Windows are contiguous and non-overlapping; each gets
-        // exactly the sample that falls in its range.
-        assert_eq!(calls[0].1, (0, 10));
-        assert_eq!(calls[1].1, (10, 20));
-        assert_eq!(calls[2].1, (20, 30));
-        assert_eq!(calls[3].1, (30, 40));
-        assert_eq!(
-            calls.iter().map(|c| c.2).collect::<Vec<_>>(),
-            vec![1, 1, 1, 1]
-        );
-    }
-
-    #[tokio::test]
-    async fn run_job_last_window_absorbs_leftover_when_range_not_divisible() {
-        // Range of 23ms split into 4 windows: each base window is
-        // 23/4 = 5ms, and the last window absorbs the leftover 3ms
-        // → windows [0,5), [5,10), [10,15), [15,23).
-        let registry = Arc::new(BackfillRegistry::new());
-        let job_id = registry.create(1, (0, 23), prom_source(), 4);
-        let reader = MockRawSampleReader::new(vec![]);
-        let processor = RecordingProcessor::new();
-        let worker = BackfillWorker::new(registry.clone());
-
-        worker
-            .run_job(job_id, &LabelFilter::for_metric("m"), &reader, &processor)
-            .await
-            .unwrap();
-
-        let calls = processor.calls();
-        assert_eq!(calls.len(), 4);
-        assert_eq!(calls[0].1, (0, 5));
-        assert_eq!(calls[1].1, (5, 10));
-        assert_eq!(calls[2].1, (10, 15));
-        // Last window covers up to exact end_ms.
-        assert_eq!(calls[3].1, (15, 23));
-    }
-
-    #[tokio::test]
-    async fn run_job_empty_samples_still_counts_progress() {
-        let registry = Arc::new(BackfillRegistry::new());
-        let job_id = registry.create(1, (0, 30), prom_source(), 3);
-        let reader = MockRawSampleReader::new(vec![]);
-        let processor = RecordingProcessor::new();
-        let worker = BackfillWorker::new(registry.clone());
-
-        worker
-            .run_job(job_id, &LabelFilter::for_metric("m"), &reader, &processor)
-            .await
-            .unwrap();
-
-        let job = registry.get(job_id).unwrap();
-        assert_eq!(job.status, BackfillStatus::Complete);
-        assert_eq!(job.windows_done, 3);
-        assert!(processor.calls().iter().all(|c| c.2 == 0));
-    }
-
-    #[tokio::test]
-    async fn run_job_processor_error_marks_failed() {
-        let registry = Arc::new(BackfillRegistry::new());
-        let job_id = registry.create(1, (0, 30), prom_source(), 3);
-        let reader = MockRawSampleReader::new(vec![]);
-        // Fail on the second processor call.
-        let processor = RecordingProcessor::failing_on(1);
-        let worker = BackfillWorker::new(registry.clone());
-
-        let err = worker
-            .run_job(job_id, &LabelFilter::for_metric("m"), &reader, &processor)
-            .await
-            .expect_err("should propagate processor error");
-        match err {
-            BackfillWorkerError::Processor {
-                job_id: got_id,
-                window_range,
-                ..
-            } => {
-                assert_eq!(got_id, job_id);
-                assert_eq!(window_range, (10, 20));
-            }
-            other => panic!("expected Processor error, got {other}"),
-        }
-
-        let job = registry.get(job_id).unwrap();
-        assert_eq!(job.status, BackfillStatus::Failed);
-        assert!(
-            job.error_message.is_some(),
-            "error_message should be populated"
-        );
-        assert_eq!(
-            job.windows_done, 1,
-            "only first window ticked before failure"
-        );
-    }
-
-    #[tokio::test]
-    async fn run_job_reader_error_marks_failed() {
-        // InvalidRange error from the reader when passed an inverted
-        // range. Phase 5c worker should classify as Reader error
-        // and mark the job Failed. Construct a job with inverted
-        // time_range so the first window read fails.
-        let registry = Arc::new(BackfillRegistry::new());
-        let job_id = registry.create(1, (100, 10), prom_source(), 1);
-        let reader = MockRawSampleReader::new(vec![]);
-        let processor = RecordingProcessor::new();
-        let worker = BackfillWorker::new(registry.clone());
-
-        let err = worker
-            .run_job(job_id, &LabelFilter::for_metric("m"), &reader, &processor)
-            .await
-            .expect_err("reader should reject inverted range");
-        match err {
-            BackfillWorkerError::Reader { .. } => {}
-            other => panic!("expected Reader error, got {other}"),
-        }
-        assert_eq!(registry.get(job_id).unwrap().status, BackfillStatus::Failed);
-    }
-
-    #[tokio::test]
-    async fn run_job_cancel_mid_run_stops_cleanly() {
-        // Processor cancels the job on its first call; the worker
-        // should see Cancelled before the next window and return Ok
-        // without mark_failed.
-        struct CancellingProcessor {
-            registry: Arc<BackfillRegistry>,
-            job_id: u64,
-        }
-        #[async_trait]
-        impl WindowProcessor for CancellingProcessor {
-            async fn process_window(
-                &self,
-                _agg_id: u64,
-                _window_range: (u64, u64),
-                _samples: Vec<RawSample>,
-            ) -> Result<(), Box<dyn std::error::Error + Send + Sync>> {
-                self.registry.cancel(self.job_id);
-                Ok(())
-            }
-        }
-
-        let registry = Arc::new(BackfillRegistry::new());
-        let job_id = registry.create(1, (0, 30), prom_source(), 3);
-        let reader = MockRawSampleReader::new(vec![]);
-        let processor = CancellingProcessor {
-            registry: registry.clone(),
-            job_id,
-        };
-        let worker = BackfillWorker::new(registry.clone());
-
-        worker
-            .run_job(job_id, &LabelFilter::for_metric("m"), &reader, &processor)
-            .await
-            .expect("cancel mid-run should return Ok");
-
-        let job = registry.get(job_id).unwrap();
-        assert_eq!(job.status, BackfillStatus::Cancelled);
-        // Progress is 0: processor cancelled the job mid-window, so
-        // the subsequent `tick_progress` was rejected (job already
-        // terminal). This is intentional — `windows_done` should
-        // never lag behind the actual terminal state.
-        assert_eq!(job.windows_done, 0);
-    }
-
-    #[tokio::test]
-    async fn run_job_rejects_unknown_job_id() {
-        let registry = Arc::new(BackfillRegistry::new());
-        let worker = BackfillWorker::new(registry.clone());
-        let reader = MockRawSampleReader::new(vec![]);
-        let processor = RecordingProcessor::new();
-        let err = worker
-            .run_job(999, &LabelFilter::for_metric("m"), &reader, &processor)
-            .await
-            .unwrap_err();
-        assert!(matches!(err, BackfillWorkerError::UnknownJob(999)));
-    }
-
-    #[tokio::test]
-    async fn run_job_rejects_already_running_job() {
-        // A second worker trying to pick up a `Running` job should
-        // bail with NotQueued — no state mutation.
-        let registry = Arc::new(BackfillRegistry::new());
-        let job_id = registry.create(1, (0, 10), prom_source(), 1);
-        // Pre-transition to Running.
-        assert!(registry.start(job_id));
-        let worker = BackfillWorker::new(registry.clone());
-        let reader = MockRawSampleReader::new(vec![]);
-        let processor = RecordingProcessor::new();
-
-        let err = worker
-            .run_job(job_id, &LabelFilter::for_metric("m"), &reader, &processor)
-            .await
-            .unwrap_err();
-        match err {
-            BackfillWorkerError::NotQueued { status, .. } => {
-                assert_eq!(status, BackfillStatus::Running);
-            }
-            other => panic!("expected NotQueued, got {other}"),
-        }
-        // State unchanged.
-        assert_eq!(
-            registry.get(job_id).unwrap().status,
-            BackfillStatus::Running
-        );
-    }
-
-    #[tokio::test]
-    async fn run_job_windows_total_zero_treated_as_single_window() {
-        // Defensive: a bad caller might create a job with
-        // windows_total=0. Worker normalises to 1 so we don't panic
-        // on division-by-zero.
-        let registry = Arc::new(BackfillRegistry::new());
-        let job_id = registry.create(1, (0, 100), prom_source(), 0);
-        let reader = MockRawSampleReader::new(vec![mk_sample("m", 50, 1.0)]);
-        let processor = RecordingProcessor::new();
-        let worker = BackfillWorker::new(registry.clone());
-
-        worker
-            .run_job(job_id, &LabelFilter::for_metric("m"), &reader, &processor)
-            .await
-            .unwrap();
-        assert_eq!(processor.calls().len(), 1);
-        assert_eq!(processor.calls()[0].1, (0, 100));
-    }
-
-    #[tokio::test]
-    async fn run_job_forwards_filter_to_reader() {
-        let registry = Arc::new(BackfillRegistry::new());
-        let job_id = registry.create(1, (0, 10), prom_source(), 1);
-        let reader = MockRawSampleReader::new(vec![
-            mk_sample("m{env=\"prod\"}", 5, 1.0),
-            mk_sample("m{env=\"stage\"}", 5, 2.0),
-        ]);
-        let processor = RecordingProcessor::new();
-        let worker = BackfillWorker::new(registry.clone());
-
-        let filter = LabelFilter::for_metric("m").with_label("env", "prod");
-        worker
-            .run_job(job_id, &filter, &reader, &processor)
-            .await
-            .unwrap();
-
-        let calls = processor.calls();
-        assert_eq!(calls.len(), 1);
-        assert_eq!(calls[0].2, 1, "filter should restrict to env=prod");
-    }
-}
diff --git a/data_plane/src/storage_engines/sketch_db/current_series.rs b/data_plane/src/storage_engines/sketch_db/current_series.rs
deleted file mode 100644
index e72ebe171..000000000
--- a/data_plane/src/storage_engines/sketch_db/current_series.rs
+++ /dev/null
@@ -1,841 +0,0 @@
-//! Bounded current-value state. Never pools a series' old samples into a quantile.
-use crate::drivers::ingest::prometheus_remote_write::CanonicalSample;
-use asap_types::query_plan::{
-    current_series::{SeriesPopulation, SeriesReadout},
-    query_time::{LabelMatch, QueryTimeOperator},
-    QueryPlan, QueryPlanNode,
-};
-use std::collections::{BTreeMap, BTreeSet};
-
-type Labels = BTreeMap<String, String>;
-pub type Vector = Vec<(Labels, f64)>;
-#[derive(Debug, Clone)]
-struct Ranked {
-    value: f64,
-    labels: Labels,
-}
-impl PartialEq for Ranked {
-    fn eq(&self, other: &Self) -> bool {
-        self.cmp(other).is_eq()
-    }
-}
-impl Eq for Ranked {}
-impl PartialOrd for Ranked {
-    fn partial_cmp(&self, other: &Self) -> Option<std::cmp::Ordering> {
-        Some(self.cmp(other))
-    }
-}
-impl Ord for Ranked {
-    fn cmp(&self, other: &Self) -> std::cmp::Ordering {
-        self.value
-            .total_cmp(&other.value)
-            .then(self.labels.cmp(&other.labels))
-    }
-}
-#[derive(Clone)]
-struct Member {
-    timestamp: i64,
-    value: Option<f64>,
-    group: Labels,
-    bytes: u64,
-}
-#[derive(Default, Clone)]
-struct Group {
-    ordered: BTreeSet<Ranked>,
-    cached: Option<(Vec<f64>, Vector, f64, f64)>,
-}
-#[derive(Clone)]
-struct Population {
-    definition: SeriesPopulation,
-    members: BTreeMap<Labels, Member>,
-    expiry: BTreeSet<(i64, Labels)>,
-    groups: BTreeMap<Labels, Group>,
-    bytes: u64,
-    /// Input timestamp at which the budget blew, cleared once the lookback
-    /// window has moved entirely past it. `None` means the population serves.
-    unavailable: Option<i64>,
-    cache_builds: u64,
-    last_read: i64,
-    matchers: Vec<promql_parser::label::Matcher>,
-}
-impl Population {
-    fn new(definition: SeriesPopulation) -> Result<Self, String> {
-        definition.validate().map_err(|e| e.to_string())?;
-        let mut matchers = vec![];
-        for matcher in &definition.matchers {
-            use promql_parser::parser::token::{T_EQL, T_EQL_REGEX, T_NEQ, T_NEQ_REGEX};
-            let token = match matcher.operation {
-                LabelMatch::Equal => T_EQL,
-                LabelMatch::NotEqual => T_NEQ,
-                LabelMatch::Regex => T_EQL_REGEX,
-                LabelMatch::NotRegex => T_NEQ_REGEX,
-            };
-            matchers.push(promql_parser::label::Matcher::new_matcher(
-                token,
-                matcher.name.clone(),
-                matcher.value.clone(),
-            )?);
-        }
-        Ok(Self {
-            definition,
-            members: BTreeMap::new(),
-            expiry: BTreeSet::new(),
-            groups: BTreeMap::new(),
-            bytes: 0,
-            unavailable: None,
-            cache_builds: 0,
-            last_read: i64::MIN,
-            matchers,
-        })
-    }
-    fn remove(&mut self, labels: &Labels) {
-        if let Some(old) = self.members.remove(labels) {
-            self.expiry.remove(&(old.timestamp, labels.clone()));
-            self.bytes -= old.bytes;
-            if let Some(value) = old.value {
-                if let Some(group) = self.groups.get_mut(&old.group) {
-                    group.ordered.remove(&Ranked {
-                        value,
-                        labels: labels.clone(),
-                    });
-                    group.cached = None;
-                    if group.ordered.is_empty() {
-                        self.groups.remove(&old.group);
-                    }
-                }
-            }
-        }
-    }
-    /// A budget overflow clears the population, so holding the latch past the
-    /// offending window would strand the plan on Prometheus until an operator
-    /// forces a replan. Re-arm once the burst has aged out of the lookback.
-    fn rearm(&mut self, cutoff: i64) {
-        if self.unavailable.is_some_and(|blew_at| cutoff >= blew_at) {
-            self.unavailable = None;
-        }
-    }
-    fn expire(&mut self, cutoff: i64) {
-        while let Some((timestamp, labels)) = self.expiry.first().cloned() {
-            if timestamp > cutoff {
-                break;
-            }
-            self.remove(&labels);
-        }
-    }
-    fn update(&mut self, sample: &CanonicalSample, cutoff: i64) {
-        self.rearm(cutoff);
-        if self.unavailable.is_some()
-            || sample.metric.as_ref() != self.definition.metric
-            || sample.timestamp_ms <= cutoff
-        {
-            return;
-        }
-        let mut labels: Labels = sample
-            .labels
-            .iter()
-            .map(|(k, v)| (k.clone(), v.clone()))
-            .collect();
-        labels.insert("__name__".into(), sample.metric.to_string());
-        if !self.matchers.iter().all(|matcher| {
-            matcher.is_match(labels.get(&matcher.name).map(String::as_str).unwrap_or(""))
-        }) {
-            return;
-        }
-        if self
-            .members
-            .get(&labels)
-            .is_some_and(|old| old.timestamp >= sample.timestamp_ms)
-        {
-            return;
-        }
-        let group: Labels = labels
-            .iter()
-            .filter(|(key, _)| {
-                if self.definition.grouping.without {
-                    key.as_str() != "__name__" && !self.definition.grouping.labels.contains(key)
-                } else {
-                    self.definition.grouping.labels.contains(key)
-                }
-            })
-            .map(|(k, v)| (k.clone(), v.clone()))
-            .collect();
-        self.remove(&labels);
-        // Bound the retained keys, tree nodes, and shared readout caches together.
-        let bytes = 1024
-            + labels
-                .iter()
-                .map(|(k, v)| (k.len() + v.len()) as u64 * 16)
-                .sum::<u64>();
-        if self.members.len() >= self.definition.max_series
-            || self.bytes.saturating_add(bytes) > self.definition.max_bytes
-        {
-            self.unavailable = Some(sample.timestamp_ms);
-            self.members.clear();
-            self.groups.clear();
-            self.expiry.clear();
-            self.bytes = 0;
-            return;
-        }
-        self.bytes += bytes;
-        self.expiry.insert((sample.timestamp_ms, labels.clone()));
-        self.members.insert(
-            labels.clone(),
-            Member {
-                timestamp: sample.timestamp_ms,
-                value: sample.value,
-                group: group.clone(),
-                bytes,
-            },
-        );
-        if let Some(value) = sample.value {
-            let state = self.groups.entry(group).or_default();
-            state.ordered.insert(Ranked { value, labels });
-            state.cached = None;
-        }
-    }
-    fn read(&mut self, readout: &SeriesReadout) -> Vector {
-        let mut result = vec![];
-        for (labels, group) in &mut self.groups {
-            if group.cached.is_none() {
-                let values = if self.definition.quantiles {
-                    group.ordered.iter().map(|r| r.value).collect()
-                } else {
-                    vec![]
-                };
-                let top = group
-                    .ordered
-                    .iter()
-                    .rev()
-                    .take(self.definition.max_k as usize)
-                    .map(|r| (r.labels.clone(), r.value))
-                    .collect();
-                let sum = compensated_sum(group.ordered.iter().map(|r| r.value));
-                let count = group.ordered.len() as f64;
-                let average = if sum.is_finite() {
-                    sum / count
-                } else {
-                    compensated_sum(group.ordered.iter().map(|r| r.value / count))
-                };
-                group.cached = Some((values, top, sum, average));
-                self.cache_builds += 1;
-            }
-            let (values, top, sum, average) = group.cached.as_ref().unwrap();
-            match readout {
-                SeriesReadout::Quantile { q } => {
-                    // `values` is only populated for a quantile-carrying population.
-                    // `QueryTimeOperator::validate` rejects the mismatched pairing at
-                    // install, so this is defensive: answer like Prometheus does for
-                    // an empty group rather than underflow `values.len() - 1` while
-                    // holding the lock every remote-write batch waits on.
-                    let value = if values.is_empty() {
-                        f64::NAN
-                    } else if *q < 0. {
-                        f64::NEG_INFINITY
-                    } else if *q > 1. {
-                        f64::INFINITY
-                    } else {
-                        let rank = q * (values.len() - 1) as f64;
-                        let lo = rank.floor() as usize;
-                        let hi = (lo + 1).min(values.len() - 1);
-                        let weight = rank - lo as f64;
-                        values[lo] * (1. - weight) + values[hi] * weight
-                    };
-                    result.push((labels.clone(), value));
-                }
-                SeriesReadout::TopK { k } => result.extend(top.iter().take(*k as usize).cloned()),
-                SeriesReadout::Sum => result.push((labels.clone(), *sum)),
-                SeriesReadout::Count => result.push((labels.clone(), group.ordered.len() as f64)),
-                SeriesReadout::Average => result.push((labels.clone(), *average)),
-            }
-        }
-        result
-    }
-}
-
-// Rebuild shared statistics after replacement/expiry, avoiding subtraction drift.
-fn compensated_sum(values: impl Iterator<Item = f64>) -> f64 {
-    let (mut sum, mut correction) = (0.0_f64, 0.0);
-    for value in values {
-        let next = sum + value;
-        if next.is_finite() {
-            correction += if sum.abs() >= value.abs() {
-                (sum - next) + value
-            } else {
-                (value - next) + sum
-            };
-        } else {
-            correction = 0.0;
-        }
-        sum = next;
-    }
-    sum + correction
-}
-
-#[derive(Default)]
-pub struct CurrentSeriesStore {
-    generation: Option<(u64, u64)>,
-    populations: BTreeMap<String, Population>,
-    first: Option<i64>,
-    watermark: Option<i64>,
-    // Completed population versions, bounded by the same declared state budget.
-    history: BTreeMap<String, BTreeMap<i64, (i64, Population)>>,
-    history_bytes: BTreeMap<String, u64>,
-}
-impl CurrentSeriesStore {
-    pub(crate) fn approx_resident_bytes(&self) -> usize {
-        self.populations
-            .values()
-            .map(|population| population.bytes as usize + 1024)
-            .sum::<usize>()
-            + self
-                .history_bytes
-                .values()
-                .map(|bytes| *bytes as usize)
-                .sum::<usize>()
-    }
-
-    /// Called only after the complete Remote Write batch was admitted successfully.
-    pub fn ingest(&mut self, plan: &QueryPlan, samples: &[CanonicalSample]) {
-        let generation = (plan.plan_id, plan.plan_version);
-        if self.generation != Some(generation) {
-            *self = Self::default();
-            self.generation = Some(generation);
-            for entry in plan.entries.values() {
-                for node in entry.nodes.values() {
-                    if let QueryPlanNode::Logical {
-                        operator: QueryTimeOperator::CurrentSeries { population, .. },
-                        ..
-                    } = node
-                    {
-                        if let Ok(state) = Population::new(population.clone()) {
-                            self.populations.entry(population.key()).or_insert(state);
-                        }
-                    }
-                }
-            }
-        }
-        if self.populations.is_empty() || samples.is_empty() {
-            return;
-        }
-        let mut batches = BTreeMap::<i64, Vec<&CanonicalSample>>::new();
-        for sample in samples {
-            batches.entry(sample.timestamp_ms).or_default().push(sample);
-        }
-        if self
-            .watermark
-            .is_some_and(|w| batches.keys().any(|t| *t <= w))
-        {
-            // Late writes invalidate completed versions; never serve a stale revision.
-            self.history.clear();
-            self.history_bytes.clear();
-        }
-        let max_lag = self
-            .populations
-            .values()
-            .map(|p| p.definition.max_input_lag_ms)
-            .min()
-            .unwrap() as i64;
-        for (timestamp, batch) in batches {
-            if self
-                .watermark
-                .is_some_and(|w| timestamp > w.saturating_add(max_lag))
-            {
-                self.first = Some(timestamp);
-            }
-            self.first.get_or_insert(timestamp);
-            self.watermark = Some(self.watermark.unwrap_or(timestamp).max(timestamp));
-            let watermark = self.watermark.unwrap();
-            for (key, population) in &mut self.populations {
-                let cutoff = watermark.saturating_sub(population.definition.lookback_ms as i64);
-                population.expire(cutoff);
-                for sample in &batch {
-                    population.update(sample, cutoff);
-                }
-                let retention = population.definition.history_retention_ms;
-                if retention == 0 || timestamp < watermark {
-                    continue;
-                }
-                let history = self.history.entry(key.clone()).or_default();
-                let bytes = self.history_bytes.entry(key.clone()).or_default();
-                let oldest = watermark.saturating_sub(retention as i64);
-                let checkpoint_bytes = population.bytes.saturating_add(1024);
-                // Include fixed per-version metadata even for an empty population.
-                while history.first_key_value().is_some_and(|(t, _)| *t < oldest)
-                    || (!history.is_empty()
-                        && bytes
-                            .saturating_add(checkpoint_bytes)
-                            .saturating_add(population.bytes)
-                            > population.definition.max_bytes)
-                {
-                    let (_, (_, expired)) = history.pop_first().unwrap();
-                    *bytes -= expired.bytes.saturating_add(1024);
-                }
-                if population.unavailable.is_none()
-                    && bytes
-                        .saturating_add(checkpoint_bytes)
-                        .saturating_add(population.bytes)
-                        <= population.definition.max_bytes
-                {
-                    if let Some((_, previous)) =
-                        history.insert(timestamp, (self.first.unwrap(), population.clone()))
-                    {
-                        *bytes -= previous.bytes.saturating_add(1024);
-                    }
-                    *bytes += checkpoint_bytes;
-                } else {
-                    // A missing version must not let a historical read reuse an older value.
-                    history.clear();
-                    *bytes = 0;
-                }
-            }
-        }
-    }
-
-    pub fn read(
-        &mut self,
-        generation: (u64, u64),
-        definition: &SeriesPopulation,
-        readout: &SeriesReadout,
-        at: u64,
-    ) -> Result<Vector, String> {
-        if self.generation != Some(generation) {
-            return Err("current-series generation is not ingested".into());
-        }
-        let at = i64::try_from(at).map_err(|_| "invalid evaluation timestamp")?;
-        let watermark = self.watermark.ok_or("current-series state is cold")?;
-        if at < watermark
-            || (at == watermark
-                && self
-                    .history
-                    .get(&definition.key())
-                    .is_some_and(|h| h.contains_key(&at)))
-        {
-            if definition.history_retention_ms == 0
-                || at < watermark.saturating_sub(definition.history_retention_ms as i64)
-            {
-                return Err("current-series state cannot answer historical evaluations outside declared retention".into());
-            }
-            let (timestamp, (first, saved)) = self
-                .history
-                .get(&definition.key())
-                .and_then(|h| h.range(..=at).next_back())
-                .ok_or("current-series historical coverage is unavailable")?;
-            if at > timestamp.saturating_add(definition.max_input_lag_ms as i64)
-                || at.saturating_sub(definition.lookback_ms as i64) < *first
-            {
-                return Err("current-series historical lookback is not covered".into());
-            }
-            let mut population = saved.clone();
-            population.expire(at.saturating_sub(definition.lookback_ms as i64));
-            return Ok(population.read(readout));
-        }
-        if at > watermark.saturating_add(definition.max_input_lag_ms as i64) {
-            return Err("current-series input is behind evaluation time".into());
-        }
-        if at.saturating_sub(definition.lookback_ms as i64)
-            < self.first.ok_or("current-series state is cold")?
-        {
-            return Err("current-series lookback is not covered yet".into());
-        }
-        let population = self
-            .populations
-            .get_mut(&definition.key())
-            .ok_or("current-series population is not installed")?;
-        population.rearm(at.saturating_sub(definition.lookback_ms as i64));
-        if population.unavailable.is_some() {
-            return Err("current-series population exceeded its resource budget".into());
-        }
-        if at < population.last_read {
-            return Err("current-series evaluation precedes already expired state".into());
-        }
-        population.last_read = at;
-        population.expire(at.saturating_sub(definition.lookback_ms as i64));
-        Ok(population.read(readout))
-    }
-    pub fn stats(&self) -> (usize, u64) {
-        (
-            self.populations.len(),
-            self.populations.values().map(|p| p.cache_builds).sum(),
-        )
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use crate::drivers::ingest::prometheus_remote_write::{
-        canonicalize_request, Label, PrometheusRemoteWriteConfig, Sample, TimeSeries, WriteRequest,
-        STALE_NAN_BITS,
-    };
-    use asap_types::query_plan::{
-        FallbackPolicy, InstantExecution, QueryLanguage, QueryNodeId, QueryPlanEntry,
-    };
-    fn definition() -> SeriesPopulation {
-        SeriesPopulation {
-            metric: "a".into(),
-            matchers: vec![],
-            grouping: asap_types::query_plan::query_time::Grouping {
-                labels: vec!["job".into()],
-                without: false,
-            },
-            lookback_ms: 300_000,
-            max_input_lag_ms: 60_000,
-            history_retention_ms: 0,
-            max_series: 100,
-            max_bytes: 1_000_000,
-            max_k: 3,
-            quantiles: true,
-        }
-    }
-
-    // A declared one-second horizon expires the left-boundary sample, not five minutes later.
-    #[test]
-    fn declared_one_second_horizon_expires_members() {
-        let mut population = definition();
-        population.lookback_ms = 1_000;
-        population.max_input_lag_ms = 1_000;
-        population.validate().unwrap();
-        let plan = plan(&population);
-        let mut store = CurrentSeriesStore::default();
-        store.ingest(&plan, &[sample("old", "api", 0, Some(10.))]);
-        store.ingest(&plan, &[sample("new", "api", 500, Some(3.))]);
-        let values = store
-            .read((7, 1), &population, &SeriesReadout::Sum, 1_000)
-            .unwrap();
-        assert_eq!(values.len(), 1);
-        assert_eq!(values[0].1, 3.);
-        let values = store
-            .read((7, 1), &population, &SeriesReadout::Sum, 1_500)
-            .unwrap();
-        assert!(values.is_empty());
-    }
-    // Historical reads use the state at that timestamp, never the latest values.
-    #[test]
-    fn declared_history_retains_as_of_population_within_budget() {
-        let mut population = definition();
-        population.lookback_ms = 1_000;
-        population.max_input_lag_ms = 1_000;
-        population.history_retention_ms = 2_000;
-        let plan = plan(&population);
-        let mut store = CurrentSeriesStore::default();
-        store.ingest(
-            &plan,
-            &[
-                sample("one", "api", 0, Some(1.)),
-                sample("one", "api", 1_000, Some(2.)),
-                sample("one", "api", 2_000, Some(3.)),
-                sample("one", "api", 3_000, Some(4.)),
-            ],
-        );
-        assert_eq!(
-            store
-                .read((7, 1), &population, &SeriesReadout::Sum, 1_000)
-                .unwrap()[0]
-                .1,
-            2.
-        );
-        assert_eq!(
-            store
-                .read((7, 1), &population, &SeriesReadout::Sum, 3_000)
-                .unwrap()[0]
-                .1,
-            4.
-        );
-        assert!(store
-            .read((7, 1), &population, &SeriesReadout::Sum, 999)
-            .is_err());
-        assert!(
-            store.history_bytes[&population.key()] + store.populations[&population.key()].bytes
-                <= population.max_bytes
-        );
-    }
-
-    // Resource exhaustion and late revisions cannot masquerade as historical coverage.
-    #[test]
-    fn retained_history_rejects_evicted_and_late_revisions() {
-        let mut population = definition();
-        population.lookback_ms = 1_000;
-        population.max_input_lag_ms = 1_000;
-        population.history_retention_ms = 2_000;
-        let installed = plan(&population);
-        let mut store = CurrentSeriesStore::default();
-        store.ingest(
-            &installed,
-            &[
-                sample("one", "api", 0, Some(1.)),
-                sample("one", "api", 1_000, Some(2.)),
-                sample("one", "api", 2_000, Some(3.)),
-            ],
-        );
-        store.ingest(&installed, &[sample("two", "api", 1_500, Some(20.))]);
-        assert!(store
-            .read((7, 1), &population, &SeriesReadout::Sum, 1_000)
-            .is_err());
-        let mut bounded = population.clone();
-        bounded.max_bytes = 2_500;
-        let mut store = CurrentSeriesStore::default();
-        store.ingest(
-            &plan(&bounded),
-            &[
-                sample("one", "api", 0, Some(1.)),
-                sample("one", "api", 1_000, Some(2.)),
-                sample("one", "api", 2_000, Some(3.)),
-            ],
-        );
-        assert!(store
-            .read((7, 1), &bounded, &SeriesReadout::Sum, 1_000)
-            .is_err());
-        assert!(
-            store.history_bytes[&bounded.key()] + store.populations[&bounded.key()].bytes
-                <= bounded.max_bytes
-        );
-    }
-
-    fn plan(p: &SeriesPopulation) -> QueryPlan {
-        let mut plan = QueryPlan::empty();
-        plan.plan_id = 7;
-        plan.plan_version = 1;
-        plan.entries.insert(
-            "test".into(),
-            QueryPlanEntry {
-                language: QueryLanguage::PromQl,
-                query_id: "test".into(),
-                canonical_query: "quantile by (job) (0.5, a)".into(),
-                fixed_evaluation: None,
-                root: QueryNodeId(0),
-                nodes: BTreeMap::from([(
-                    QueryNodeId(0),
-                    QueryPlanNode::Logical {
-                        operator: QueryTimeOperator::CurrentSeries {
-                            population: p.clone(),
-                            readout: SeriesReadout::Quantile { q: 0.5 },
-                        },
-                        inputs: vec![],
-                    },
-                )]),
-                instant: InstantExecution {
-                    lookback_ms: 300_000,
-                    full_history: false,
-                    cumulative_readout: true,
-                },
-                fallback: FallbackPolicy::ExactBackend,
-            },
-        );
-        plan
-    }
-    fn sample(pod: &str, job: &str, timestamp: i64, value: Option<f64>) -> CanonicalSample {
-        canonicalize_request(
-            &WriteRequest {
-                timeseries: vec![TimeSeries {
-                    labels: [("__name__", "a"), ("pod", pod), ("job", job)]
-                        .into_iter()
-                        .map(|(name, value)| Label {
-                            name: name.into(),
-                            value: value.into(),
-                        })
-                        .collect(),
-                    samples: vec![Sample {
-                        timestamp,
-                        value: value.unwrap_or(f64::from_bits(STALE_NAN_BITS)),
-                    }],
-                    exemplars: vec![],
-                    histograms: vec![],
-                }],
-            },
-            &PrometheusRemoteWriteConfig::default(),
-        )
-        .unwrap()
-        .remove(0)
-    }
-    fn warm(store: &mut CurrentSeriesStore, plan: &QueryPlan) {
-        for t in (0..=300_000).step_by(60_000) {
-            store.ingest(
-                plan,
-                &[
-                    sample("x", "api", t, Some(1.)),
-                    sample("y", "api", t, Some(9.)),
-                    sample("z", "api", t, Some(5.)),
-                    sample("w", "db", t, Some(50.)),
-                ],
-            );
-        }
-    }
-    // Equal sample values still represent two series; replacements and stale markers retract them.
-    #[test]
-    fn sum_count_average_follow_current_series_membership() {
-        let p = definition();
-        let plan = plan(&p);
-        let mut store = CurrentSeriesStore::default();
-        warm(&mut store, &plan);
-        for (at, samples, expected) in [
-            (
-                301_000,
-                vec![sample("y", "api", 301_000, Some(1.))],
-                [7., 3., 7. / 3.],
-            ),
-            (
-                302_000,
-                vec![sample("z", "api", 302_000, None)],
-                [2., 2., 1.],
-            ),
-        ] {
-            store.ingest(&plan, &samples);
-            for (readout, truth) in [
-                SeriesReadout::Sum,
-                SeriesReadout::Count,
-                SeriesReadout::Average,
-            ]
-            .into_iter()
-            .zip(expected)
-            {
-                let values = store.read((7, 1), &p, &readout, at).unwrap();
-                assert!(
-                    (values[0].1 - truth).abs() < 1e-12,
-                    "{readout:?}: {values:?}"
-                );
-            }
-        }
-    }
-
-    /// Four quantiles reuse one distribution, and smaller k reads the shared maximum-k prefix.
-    #[test]
-    fn quantiles_and_topk_share_state_and_promote_after_updates_and_staleness() {
-        let p = definition();
-        let plan = plan(&p);
-        let mut store = CurrentSeriesStore::default();
-        warm(&mut store, &plan);
-        for (q, expected) in [(0.5, 5.), (0.9, 8.2), (0.95, 8.6), (0.99, 8.92)] {
-            let result = store
-                .read((7, 1), &p, &SeriesReadout::Quantile { q }, 300_000)
-                .unwrap();
-            assert!((result[0].1 - expected).abs() < 1e-10);
-            assert_eq!(result[1].1, 50.);
-        }
-        for percentile in 1..100 {
-            let q = percentile as f64 / 100.;
-            let result = store
-                .read((7, 1), &p, &SeriesReadout::Quantile { q }, 300_000)
-                .unwrap();
-            assert!((result[0].1 - (1. + 8. * q)).abs() < 1e-10);
-        }
-        let small = store
-            .read((7, 1), &p, &SeriesReadout::TopK { k: 1 }, 300_000)
-            .unwrap();
-        let big = store
-            .read((7, 1), &p, &SeriesReadout::TopK { k: 3 }, 300_000)
-            .unwrap();
-        assert_eq!(small[0].0["pod"], "y");
-        assert_eq!(big[0], small[0]);
-        assert_eq!(store.stats(), (1, 2));
-        store.ingest(&plan, &[sample("y", "api", 301_000, Some(-5.))]);
-        assert_eq!(
-            store
-                .read((7, 1), &p, &SeriesReadout::TopK { k: 1 }, 301_000)
-                .unwrap()[0]
-                .0["pod"],
-            "z"
-        );
-        store.ingest(&plan, &[sample("z", "api", 302_000, None)]);
-        assert_eq!(
-            store
-                .read((7, 1), &p, &SeriesReadout::TopK { k: 1 }, 302_000)
-                .unwrap()[0]
-                .0["pod"],
-            "x"
-        );
-        // Out-of-order old values must not resurrect the stale series.
-        store.ingest(&plan, &[sample("z", "api", 301_000, Some(100.))]);
-        assert_eq!(
-            store
-                .read((7, 1), &p, &SeriesReadout::TopK { k: 1 }, 302_000)
-                .unwrap()[0]
-                .0["pod"],
-            "x"
-        );
-    }
-    /// Cold state, gaps, old generations and historical timestamps cannot masquerade as complete populations.
-    #[test]
-    fn coverage_expiration_generation_and_capacity_fail_closed() {
-        let p = definition();
-        let plan = plan(&p);
-        let mut store = CurrentSeriesStore::default();
-        store.ingest(&plan, &[sample("x", "api", 0, Some(1.))]);
-        assert!(store
-            .read((7, 1), &p, &SeriesReadout::Quantile { q: 0.5 }, 0)
-            .is_err());
-        warm(&mut store, &plan);
-        assert!(store
-            .read((7, 2), &p, &SeriesReadout::Quantile { q: 0.5 }, 300_000)
-            .is_err());
-        assert!(store
-            .read((7, 1), &p, &SeriesReadout::Quantile { q: 0.5 }, 299_000)
-            .is_err());
-        for t in (360_000..=600_000).step_by(60_000) {
-            store.ingest(&plan, &[sample("y", "api", t, Some(9.))]);
-        }
-        assert_eq!(
-            store
-                .read((7, 1), &p, &SeriesReadout::Quantile { q: 0.5 }, 600_000)
-                .unwrap()
-                .len(),
-            1
-        ); // Prometheus 3.5 lookback is left-open
-        assert_eq!(
-            store
-                .read((7, 1), &p, &SeriesReadout::Quantile { q: 0.5 }, 600_001)
-                .unwrap()
-                .len(),
-            1
-        );
-        assert!(store
-            .read((7, 1), &p, &SeriesReadout::Quantile { q: 0.5 }, 600_000)
-            .is_err());
-        store.ingest(&plan, &[sample("y", "api", 900_000, Some(9.))]);
-        assert!(store
-            .read((7, 1), &p, &SeriesReadout::Quantile { q: 0.5 }, 900_000)
-            .is_err());
-        let mut bounded = p.clone();
-        bounded.max_series = 3;
-        let plan = super::tests::plan(&bounded);
-        let mut store = CurrentSeriesStore::default();
-        warm(&mut store, &plan);
-        assert!(store
-            .read(
-                (7, 1),
-                &bounded,
-                &SeriesReadout::Quantile { q: 0.5 },
-                300_000
-            )
-            .unwrap_err()
-            .contains("budget"));
-    }
-
-    // Prometheus 3.5 selectors exclude samples exactly at evaluation - lookback.
-    #[test]
-    fn lookback_left_boundary_expires_members_for_all_shared_readouts() {
-        let p = definition();
-        let plan = plan(&p);
-        let mut store = CurrentSeriesStore::default();
-        warm(&mut store, &plan);
-        for t in (360_000..=600_000).step_by(60_000) {
-            store.ingest(&plan, &[sample("y", "api", t, Some(9.))]);
-        }
-        for (readout, expected) in [
-            (SeriesReadout::Count, 1.0),
-            (SeriesReadout::Sum, 9.0),
-            (SeriesReadout::Average, 9.0),
-            (SeriesReadout::Quantile { q: 0.5 }, 9.0),
-        ] {
-            let rows = store.read((7, 1), &p, &readout, 600_000).unwrap();
-            assert_eq!(
-                rows,
-                vec![(BTreeMap::from([("job".into(), "api".into())]), expected)]
-            );
-        }
-        let rows = store
-            .read((7, 1), &p, &SeriesReadout::TopK { k: 3 }, 600_000)
-            .unwrap();
-        assert_eq!(rows.len(), 1);
-        assert_eq!(rows[0].0["pod"], "y");
-    }
-}
diff --git a/data_plane/src/storage_engines/sketch_db/data/mod.rs b/data_plane/src/storage_engines/sketch_db/data/mod.rs
deleted file mode 100644
index 475fc6b14..000000000
--- a/data_plane/src/storage_engines/sketch_db/data/mod.rs
+++ /dev/null
@@ -1,611 +0,0 @@
-//! Sketch-DB data taxonomy — payload types, the sketch-vs-precompute
-//! kind discriminator, the canonical sid hash, and the accuracy-bound
-//! derivation.
-//!
-//! This module is intentionally **stateless**: every type here is a
-//! plain data carrier or a pure function. The `index/` module (sid
-//! registry + per-sid columnar substrate) and `lifecycle/` module
-//! (Active/Retired/Expired) layer state on top of these.
-//!
-//! ## What's here
-//!
-//! - [`AggKind`] — `Sketch { kind, config, spatial_filter_canonical }
-//!   | ExactAgg { agg_type, parameters_canonical,
-//!   spatial_filter_canonical }`. The discriminator that decides
-//!   what shape a sid's payload takes. The `spatial_filter_canonical`
-//!   field on each variant participates in sid identity so
-//!   filter-distinct policies don't collide.
-//! - [`AggPayload`] — `Sketch(SketchSampleState) | ExactAgg(Box<dyn
-//!   AggregateCore>)`. The actual byte/accumulator stored at each
-//!   (sid, window, label_values) cell.
-//! - [`SketchConfig`] — variant-specific tuning parameters
-//!   (DDSketch's α, KLL's k, HLL's precision, etc.). Part of
-//!   `AggKind::Sketch`.
-//! - [`SketchSampleState`] — `bytes + encoding` carried by sketch
-//!   payloads.
-//! - [`SketchEncoding`] — wire-format hint (PROTO / PROTO_DELTA /
-//!   MSGPACK / MSGPACK_DELTA).
-//! - [`SketchTimeSeries`] — one materialized series row returned by
-//!   the read path (sid + label values + per-window samples).
-//! - [`AccuracyBound`] — `(epsilon, confidence)` derived from a
-//!   `SketchConfig`. Surfaces in HTTP response headers.
-//! - sid minting is no longer in this module — `SeriesIdResolver`
-//!   (in `drivers::ingest::series_resolver`) is the single mint
-//!   authority for every sid in the system. `AggKind::canonical_string()`
-//!   here produces the third element of the resolver's cache key.
-//! - [`canonical_parameters`] — helper that renders a parameters
-//!   `HashMap` into the canonical string form
-//!   `AggKind::ExactAgg::parameters_canonical` expects.
-//!
-//! ## Re-exports for callers
-//!
-//! - [`Capability`] / [`SketchAlgorithm`] — the canonical
-//!   control-plane-side capability vocabulary.
-//! - [`AggregationType`] — the agg-type enum that
-//!   `AggKind::ExactAgg` carries.
-
-// ── Capability re-exports ────────────────────────────────────────────────────
-//
-// Step 2a consolidated all capability state into
-// `control_plane::physical::runtime_capability`. The backend re-exports the
-// canonical types so there's exactly one definition in the codebase.
-// `is_satisfied_by` (used by the engine ASAP-tier hook) lives on the
-// control-plane-side `Capability` impl.
-
-pub use control_plane::physical::runtime_capability::{Capability, SketchAlgorithm};
-
-/// Re-export so callers don't need to depend on promql_utilities
-/// directly for the agg_type tag.
-pub use asap_types::AggregationType;
-
-// ── Payload taxonomy ────────────────────────────────────────────────────────
-
-/// Sketch-instance configuration carried per-Metric on the OTLP wire
-/// (Phase 2 lifted these from per-DP up to the parent sketch container).
-/// Backend reads the relevant variant at ingest time and stores it in
-/// `SummarySeriesMetadata.agg_kind`.
-#[derive(Debug, Clone)]
-pub enum SketchConfig {
-    UnivMon {
-        heap_size: u32,
-        sketch_rows: u32,
-        sketch_cols: u32,
-        layers: u8,
-    },
-    DDSketch {
-        relative_accuracy: f64,
-    },
-    Kll {
-        k: u32,
-    },
-    Hll {
-        precision: u32,
-    },
-    CountSketch {
-        rows: i32,
-        cols: i32,
-    },
-    CountMin {
-        rows: i32,
-        cols: i32,
-    },
-}
-
-/// What kind of aggregation a `sid` identifies. M2.3 generalization
-/// — sids cover BOTH opaque-sketch state and exact-aggregation state
-/// (Sum / Count / Avg / Rate / MinMax / SetAggregator / …), so a
-/// single store can host both.
-///
-/// The sid resolver distinguishes the two branches structurally:
-/// a `Sketch` sid keys on `(metric, attrs, sketch_kind, sketch_config,
-/// spatial_filter)`; an `ExactAgg` sid keys on `(metric, attrs,
-/// agg_type, parameters, spatial_filter)`. The spatial_filter
-/// participates in identity so two policies differing only in
-/// their ingest-side label predicate (e.g. `status="200"` vs
-/// `status="500"`) mint distinct sids even after the filter
-/// dimension is projected out by group-by.
-#[derive(Debug, Clone)]
-pub enum AggKind {
-    /// Opaque sketch state — DDSketch, KLL, HLL, CountMin, CountSketch.
-    /// Payload at storage layer is an encoded byte string
-    /// (`SketchSampleState`).
-    Sketch {
-        algorithm: SketchAlgorithm,
-        config: SketchConfig,
-        /// Canonical form of the policy's spatial-filter predicate,
-        /// produced by [`asap_types::utils::normalize_spatial_filter`]
-        /// (e.g. `{status="200",zone="us-east"}`). Empty string when
-        /// the policy has no spatial filter.
-        spatial_filter_canonical: String,
-    },
-    /// Exact accumulator state. Payload bytes come from the corresponding
-    /// accumulator serializer.
-    ExactAgg {
-        agg_type: AggregationType,
-        /// Stable canonical encoding of the agg's
-        /// `parameters: HashMap<String, Value>` — sorted keys, each
-        /// value rendered via serde_json. Held as a single owned
-        /// string so equality / hashing stay cheap and independent of
-        /// the original HashMap's iteration order.
-        parameters_canonical: String,
-        /// Canonical form of the policy's spatial-filter predicate;
-        /// see the `Sketch` variant's field doc.
-        spatial_filter_canonical: String,
-    },
-}
-
-/// Complete resolver identity for a configured materialization. All live and
-/// replay paths must include policy semantics, not just the sketch family.
-pub(crate) fn materialization_kind_for_config(
-    config: &asap_types::aggregation_config::PrecomputeMaterialization,
-) -> String {
-    format!(
-        "{}|{}",
-        agg_kind_for_config(config).canonical_string(),
-        config.policy_fingerprint()
-    )
-}
-
-/// Resolve the physical state family produced by a precompute policy. This is
-/// shared by SID minting and store registration so a sketch policy can never
-/// be minted as `ExactAgg` and later registered as `Sketch` (or vice versa).
-pub fn agg_kind_for_config(
-    config: &asap_types::aggregation_config::PrecomputeMaterialization,
-) -> AggKind {
-    use planner_types::post_asap::{SketchAlgorithm as Algorithm, SketchParams, SummaryFamilyType};
-
-    // HLL is intentionally absent from raw-value accumulator dispatch because
-    // it arrives through SketchEnvelope ingest. It is still a sketch for SID
-    // identity and store registration, so classify it before consulting the
-    // accumulator factory contract.
-    let sketch = (config.aggregation_type == AggregationType::HLL)
-        .then(|| {
-            let precision = config
-                .parameters
-                .get("precision")
-                .or_else(|| config.parameters.get("p"))
-                .and_then(serde_json::Value::as_u64)
-                .and_then(|value| u32::try_from(value).ok())
-                .unwrap_or(14);
-            AggKind::Sketch {
-                algorithm: SketchAlgorithm::Hll,
-                config: SketchConfig::Hll { precision },
-                spatial_filter_canonical: config.spatial_filter_normalized.clone(),
-            }
-        })
-        .or_else(|| {
-            config.accumulator_spec().ok().and_then(|spec| {
-                let SummaryFamilyType::Sketch(kind, _) = spec.family else {
-                    return None;
-                };
-                let algorithm = kind.algorithm().clone();
-                let physical = match (kind.algorithm(), kind.params()) {
-                    (
-                        Algorithm::UnivMon,
-                        SketchParams::UnivMon {
-                            heap_size,
-                            sketch_rows,
-                            sketch_cols,
-                            layers,
-                        },
-                    ) => SketchConfig::UnivMon {
-                        heap_size: *heap_size,
-                        sketch_rows: *sketch_rows,
-                        sketch_cols: *sketch_cols,
-                        layers: *layers,
-                    },
-                    (Algorithm::DDSketch, SketchParams::DDSketch { alpha }) => {
-                        SketchConfig::DDSketch {
-                            relative_accuracy: *alpha,
-                        }
-                    }
-                    (Algorithm::Kll, SketchParams::Kll { k }) => SketchConfig::Kll { k: *k },
-                    (Algorithm::Hll, SketchParams::Hll { precision }) => SketchConfig::Hll {
-                        precision: (*precision).into(),
-                    },
-                    (Algorithm::Cms, SketchParams::Cms { width, depth })
-                    | (Algorithm::CmsWithHeap, SketchParams::CmsWithHeap { width, depth, .. }) => {
-                        SketchConfig::CountMin {
-                            rows: *depth as i32,
-                            cols: *width as i32,
-                        }
-                    }
-                    (Algorithm::CountSketch, SketchParams::CountSketch { width, depth })
-                    | (
-                        Algorithm::CountSketchWithHeap,
-                        SketchParams::CountSketchWithHeap { width, depth, .. },
-                    ) => SketchConfig::CountSketch {
-                        rows: *depth as i32,
-                        cols: *width as i32,
-                    },
-                    _ => return None,
-                };
-                Some(AggKind::Sketch {
-                    algorithm,
-                    config: physical,
-                    spatial_filter_canonical: config.spatial_filter_normalized.clone(),
-                })
-            })
-        });
-
-    sketch.unwrap_or_else(|| AggKind::ExactAgg {
-        agg_type: config.aggregation_type,
-        parameters_canonical: canonical_parameters(&config.parameters),
-        spatial_filter_canonical: config.spatial_filter_normalized.clone(),
-    })
-}
-
-impl AggKind {
-    /// Canonical summary-operator identity. Population filters belong to the
-    /// SDS Data Descriptor and are intentionally excluded here.
-    pub fn operator_canonical_string(&self) -> String {
-        match self {
-            Self::Sketch {
-                algorithm, config, ..
-            } => format!(
-                "summary:v1:sketch:{}:{}",
-                sketch_algorithm_canonical(algorithm.clone()),
-                sketch_config_canonical(config)
-            ),
-            Self::ExactAgg {
-                agg_type,
-                parameters_canonical,
-                ..
-            } => format!("summary:v1:exact:{agg_type}:{parameters_canonical}"),
-        }
-    }
-
-    pub fn spatial_filter_canonical(&self) -> &str {
-        match self {
-            Self::Sketch {
-                spatial_filter_canonical,
-                ..
-            }
-            | Self::ExactAgg {
-                spatial_filter_canonical,
-                ..
-            } => spatial_filter_canonical,
-        }
-    }
-
-    /// Runtime query capability and accuracy metadata implied by this state.
-    pub fn capability_and_accuracy(&self) -> (Capability, Option<AccuracyBound>) {
-        match self {
-            Self::ExactAgg { agg_type, .. } => (Capability::ExactAgg(*agg_type), None),
-            Self::Sketch {
-                algorithm, config, ..
-            } => {
-                let capability = match algorithm {
-                    SketchAlgorithm::DDSketch | SketchAlgorithm::Kll => {
-                        Capability::QuantileApprox(Some(algorithm.clone()))
-                    }
-                    SketchAlgorithm::Hll | SketchAlgorithm::UnivMon => {
-                        Capability::CardinalityApprox
-                    }
-                    SketchAlgorithm::Cms | SketchAlgorithm::CountSketch => {
-                        Capability::FrequencyEstimate(Some(algorithm.clone()))
-                    }
-                    SketchAlgorithm::CmsWithHeap | SketchAlgorithm::CountSketchWithHeap => {
-                        Capability::FrequencyTopk(Some(algorithm.clone()))
-                    }
-                    SketchAlgorithm::Kmv | SketchAlgorithm::Theta => Capability::CardinalityApprox,
-                };
-                (capability, Some(AccuracyBound::from_config(config)))
-            }
-        }
-    }
-}
-
-/// Render a `HashMap<String, Value>` of parameters into the canonical
-/// string form `AggKind::ExactAgg::parameters_canonical` expects.
-/// Keys sorted lexicographically; each value via `serde_json`.
-pub fn canonical_parameters(
-    parameters: &std::collections::HashMap<String, serde_json::Value>,
-) -> String {
-    let sorted: std::collections::BTreeMap<&String, &serde_json::Value> =
-        parameters.iter().collect();
-    let mut buf = String::new();
-    for (k, v) in sorted {
-        buf.push_str(k);
-        buf.push('=');
-        buf.push_str(&serde_json::to_string(v).unwrap_or_default());
-        buf.push(';');
-    }
-    buf
-}
-
-impl AggKind {
-    /// Stable string form of this `AggKind`, used as the third element
-    /// of the `SeriesIdResolver` cache key and as the `agg_kind_canonical`
-    /// field in the resolver's WAL.
-    ///
-    /// Sid identity is `(metric, attrs_fingerprint, agg_kind_canonical)`.
-    /// Two `AggKind`s that compare equal MUST produce the same
-    /// canonical string; two that differ in any observable parameter
-    /// MUST produce different strings.
-    ///
-    /// Format — always a `:filter=...` suffix (empty after `=` means
-    /// no spatial filter), so consumers can parse without knowing
-    /// whether a filter exists:
-    /// - `Sketch { DDSketch, α=0.01, no filter }`
-    ///   → `"sketch:DDSketch:D:0.01:filter="`
-    /// - `Sketch { Kll, k=200, status=200 }`
-    ///   → `"sketch:Kll:K:200:filter={status=\"200\"}"`
-    /// - `ExactAgg { Sum, no params, no filter }`
-    ///   → `"exact_agg:Sum::filter="`
-    /// - `ExactAgg { DatasketchesKLL, k=200, zone=us-east }`
-    ///   → `"exact_agg:DatasketchesKLL:k=200;:filter={zone=\"us-east\"}"`
-    pub fn canonical_string(&self) -> String {
-        match self {
-            AggKind::Sketch {
-                algorithm: kind,
-                config,
-                spatial_filter_canonical,
-            } => {
-                format!(
-                    "sketch:{}:{}:filter={}",
-                    sketch_algorithm_canonical(kind.clone()),
-                    sketch_config_canonical(config),
-                    spatial_filter_canonical,
-                )
-            }
-            AggKind::ExactAgg {
-                agg_type,
-                parameters_canonical,
-                spatial_filter_canonical,
-            } => {
-                // `AggregationType`'s `Display` impl is stable
-                // (matches the snake-case form on the wire) and
-                // `parameters_canonical` is already canonicalized
-                // upstream (see [`canonical_parameters`]).
-                format!(
-                    "exact_agg:{}:{}:filter={}",
-                    agg_type, parameters_canonical, spatial_filter_canonical,
-                )
-            }
-        }
-    }
-}
-
-fn sketch_algorithm_canonical(k: SketchAlgorithm) -> &'static str {
-    match k {
-        SketchAlgorithm::DDSketch => "DDSketch",
-        SketchAlgorithm::Kll => "Kll",
-        SketchAlgorithm::Hll => "Hll",
-        SketchAlgorithm::UnivMon => "UnivMon",
-        SketchAlgorithm::CountSketch => "CountSketch",
-        SketchAlgorithm::Cms => "CountMin",
-        SketchAlgorithm::CmsWithHeap => "CmsWithHeap",
-        SketchAlgorithm::CountSketchWithHeap => "CountSketchWithHeap",
-        // `Any` is the analysis-time wildcard; never reaches the
-        // ingest path which detects a concrete kind from the OTLP
-        // wire variant. Mapping it to a unique tag anyway keeps the
-        // canonical form total.
-        SketchAlgorithm::Kmv => "Kmv",
-        SketchAlgorithm::Theta => "Theta",
-    }
-}
-
-fn sketch_config_canonical(cfg: &SketchConfig) -> String {
-    match cfg {
-        SketchConfig::UnivMon {
-            heap_size,
-            sketch_rows,
-            sketch_cols,
-            layers,
-        } => format!("U:{heap_size}:{sketch_rows}:{sketch_cols}:{layers}"),
-        SketchConfig::DDSketch { relative_accuracy } => {
-            format!("D:{relative_accuracy}")
-        }
-        SketchConfig::Kll { k } => format!("K:{k}"),
-        SketchConfig::Hll { precision } => format!("H:{precision}"),
-        SketchConfig::CountSketch { rows, cols } => format!("S:{rows}:{cols}"),
-        SketchConfig::CountMin { rows, cols } => format!("M:{rows}:{cols}"),
-    }
-}
-
-// ── Accuracy ────────────────────────────────────────────────────────────────
-
-/// Accuracy bound derived from `SketchConfig`. Surfaced to the user
-/// via query response metadata so they know the precision / confidence
-/// of each result.
-#[derive(Debug, Clone, Copy)]
-pub struct AccuracyBound {
-    /// Approximate error bound (e.g. DDSketch's α, HLL's std-error).
-    pub epsilon: f64,
-    /// Probability of staying within `epsilon` (1.0 - δ).
-    pub confidence: f64,
-}
-
-impl AccuracyBound {
-    /// Compute accuracy bound from sketch config. Variant-specific
-    /// formulas; the HTTP layer can present this in
-    /// `X-ASAP-Accuracy: 0.01` so callers know the ASAP-tier answer's
-    /// error envelope.
-    pub fn from_config(cfg: &SketchConfig) -> Self {
-        match cfg {
-            // Family dimensions alone do not establish a readout error bound.
-            SketchConfig::UnivMon { .. } => Self {
-                epsilon: f64::MAX,
-                confidence: 0.0,
-            },
-            SketchConfig::DDSketch { relative_accuracy } => Self {
-                epsilon: *relative_accuracy,
-                confidence: 1.0,
-            },
-            SketchConfig::Kll { k } => Self {
-                epsilon: if *k > 0 { 1.0 / (*k as f64) } else { 1.0 },
-                confidence: 0.99,
-            },
-            SketchConfig::Hll { precision } => Self {
-                epsilon: 1.04 / ((1u64 << *precision) as f64).sqrt(),
-                confidence: 0.68,
-            },
-            SketchConfig::CountSketch { rows, cols } => {
-                let e = std::f64::consts::E;
-                let eps = if *cols > 0 {
-                    (e / (*cols as f64)).sqrt()
-                } else {
-                    1.0
-                };
-                let half_rows = (*rows as f64) / 2.0;
-                let delta = 2f64.powf(-half_rows);
-                Self {
-                    epsilon: eps,
-                    confidence: 1.0 - delta,
-                }
-            }
-            SketchConfig::CountMin { rows, cols } => {
-                let e = std::f64::consts::E;
-                let eps = if *cols > 0 { e / (*cols as f64) } else { 1.0 };
-                let delta = (-(*rows as f64)).exp();
-                Self {
-                    epsilon: eps,
-                    confidence: 1.0 - delta,
-                }
-            }
-        }
-    }
-}
-
-// ── Per-sample payload ──────────────────────────────────────────────────────
-
-/// Per-sample sketch state. Stored as the payload column inside the
-/// per-sid `SidStoreData` columnar storage.
-pub use asap_physical_operators::stored_state::{SketchEncoding, SketchSampleState};
-
-/// One materialized series row returned by the query path. Resolved
-/// from the per-sid intern table at read time.
-#[derive(Debug, Clone)]
-pub struct SketchTimeSeries {
-    pub sid: u64,
-    pub series_label_values: std::collections::BTreeMap<String, String>,
-    /// `window_end_unix_ms → sketch payload(s)`. BTreeMap so the query
-    /// path can iterate in time order without an extra sort.
-    ///
-    /// The value is a `Vec` because the edge can emit MULTIPLE frames that
-    /// all stamp the SAME `(window_start, window_end)` range — the
-    /// sub-window delta_transmission case, where each sub-window emit
-    /// carries the FULL window range rather than the sub-window slice. All
-    /// such frames must survive read-back (the leading `Full`/seed
-    /// establishes the rolling base; the trailing `Delta`s are increments
-    /// onto it), in INSERTION ORDER. Keying by `window_end` alone and
-    /// storing one payload silently dropped all but the last frame, which
-    /// erased the base and produced empty / wildly-wrong warm-tier query
-    /// answers under delta_transmission (the `fix/pwr-delta-query` bug).
-    /// The reducer's `per_window_evaluate` / `cumulative_evaluate` already
-    /// fold repeated-window-end frames correctly once they arrive.
-    pub samples: std::collections::BTreeMap<i64, Vec<SketchSampleState>>,
-}
-
-/// Unified payload variant — what one window of one (sid, label-values
-/// vector) physically holds. Phase 5 M2.3 generalizes storage so the
-/// same store can host both sketch state and partial-accumulator state
-/// under content-addressed sids.
-///
-/// Each sid stores exactly one variant for its entire lifetime — the
-/// variant is fixed by the sid's `agg_kind` at registration. Mixing
-/// variants under one sid is a logic error the storage layer doesn't
-/// guard against (a mismatch crashes the reducer at runtime). The
-/// ingest path is responsible for not doing that.
-#[derive(Clone)]
-pub enum AggPayload {
-    /// Opaque sketch state — see [`SketchSampleState`].
-    Sketch(SketchSampleState),
-    /// Exact-aggregation state — Sum / Count / Avg / Rate / MinMax.
-    /// Shared by range readers so querying thousands of panes does not clone
-    /// every accumulator while holding the store lock.
-    ExactAgg(std::sync::Arc<dyn crate::storage_engines::types::AggregateCore>),
-}
-
-impl std::fmt::Debug for AggPayload {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        match self {
-            AggPayload::Sketch(s) => f.debug_tuple("Sketch").field(s).finish(),
-            AggPayload::ExactAgg(p) => f
-                .debug_struct("ExactAgg")
-                .field("type_name", &p.type_name())
-                .finish(),
-        }
-    }
-}
-
-impl AggPayload {
-    /// Return the sketch payload if this is a sketch variant; `None`
-    /// otherwise. The ASAP-tier sketch reducer uses this to filter
-    /// non-sketch payloads out of its `query_range` results.
-    pub fn as_sketch(&self) -> Option<&SketchSampleState> {
-        match self {
-            AggPayload::Sketch(s) => Some(s),
-            AggPayload::ExactAgg(_) => None,
-        }
-    }
-
-    /// Return the exact-aggregation payload if this is an exact-agg
-    /// variant; `None` otherwise. The exact-aggregation query path
-    /// uses this.
-    pub fn as_exact_agg(&self) -> Option<&dyn crate::storage_engines::types::AggregateCore> {
-        match self {
-            AggPayload::ExactAgg(p) => Some(p.as_ref()),
-            AggPayload::Sketch(_) => None,
-        }
-    }
-
-    pub fn as_exact_agg_arc(
-        &self,
-    ) -> Option<&std::sync::Arc<dyn crate::storage_engines::types::AggregateCore>> {
-        match self {
-            AggPayload::ExactAgg(payload) => Some(payload),
-            AggPayload::Sketch(_) => None,
-        }
-    }
-
-    /// Approximate in-memory byte footprint of the payload — used by
-    /// the persistence layer's memory-pressure trigger. Sketch payloads
-    /// report their byte buffer length (the dominant cost);
-    /// exact-aggregation payloads forward to the accumulator's own
-    /// `approx_memory_bytes()`.
-    pub fn approx_bytes(&self) -> usize {
-        match self {
-            AggPayload::Sketch(s) => s.bytes.len() + std::mem::size_of::<SketchSampleState>(),
-            AggPayload::ExactAgg(p) => p.approx_memory_bytes(),
-        }
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use asap_types::{enums::WindowKind, KeyByLabelNames};
-    use std::collections::HashMap;
-
-    #[test]
-    fn hll_envelope_config_is_registered_as_a_sketch() {
-        let config = asap_types::aggregation_config::PrecomputeMaterialization::new(
-            AggregationType::HLL,
-            String::new(),
-            HashMap::from([("precision".to_string(), serde_json::json!(12))]),
-            KeyByLabelNames::empty(),
-            KeyByLabelNames::empty(),
-            KeyByLabelNames::empty(),
-            String::new(),
-            60,
-            60,
-            WindowKind::Tumbling,
-            String::new(),
-            "unique_users".to_string(),
-            None,
-            None,
-            None,
-        );
-
-        assert!(matches!(
-            agg_kind_for_config(&config),
-            AggKind::Sketch {
-                algorithm: SketchAlgorithm::Hll,
-                config: SketchConfig::Hll { precision: 12 },
-                ..
-            }
-        ));
-    }
-}
diff --git a/data_plane/src/storage_engines/sketch_db/index/INDEX_DESIGN.md b/data_plane/src/storage_engines/sketch_db/index/INDEX_DESIGN.md
deleted file mode 100644
index bacef36fe..000000000
--- a/data_plane/src/storage_engines/sketch_db/index/INDEX_DESIGN.md
+++ /dev/null
@@ -1,228 +0,0 @@
-# SketchStore Index Design
-
-## Overview
-
-`SketchStore` uses an **epoch-partitioned columnar store** with label interning. The design applies six optimizations targeting the two most expensive paths: ingestion and range scan.
-
-| Opt | What | Where |
-|-----|------|-------|
-| 1 | Lazy `window_to_ids` index — built on first exact query, invalidated cheaply on insert | `MutableEpoch` |
-| 2 | Offset-based index — stores `u32` column offsets, not `Arc` clones | `MutableEpoch::exact_query` |
-| 3 | Monotonic ingest fast path — skip `HashSet` probe for consecutive same-window inserts | `MutableEpoch::insert` |
-| 4 | Batch metadata hoisting — config lookup, label interning, timestamp update moved out of per-item loop | `global.rs`, `per_key.rs` |
-| 5 | Columnar storage — three parallel arrays; range scan hot loop touches only `windows_col` | `MutableEpoch` |
-| 6 | Pre-allocated epoch buffers — `with_capacity(prev_epoch.len())` on rotation | `maybe_rotate_epoch` |
-
----
-
-## Data Structures
-
-### Types (`common.rs`)
-
-```rust
-pub type MetricID        = u32;              // compact interned label ID
-pub type EpochID         = u64;              // monotonically increasing epoch counter
-pub type TimestampRange  = (u64, u64);       // (start_timestamp, end_timestamp)
-pub type MetricBucketMap = HashMap<MetricID, Vec<(TimestampRange, Arc<dyn AggregateCore>)>>;
-```
-
-### `InternTable` (`common.rs`)
-
-```
-InternTable {
-    label_to_id: HashMap<Option<KeyByLabelValues>, MetricID>
-    id_to_label: Vec<Option<KeyByLabelValues>>
-}
-```
-
-- `intern(label)` — O(1) amortized via `HashMap::entry`; no double-hashing
-- `resolve(id)` — O(1) indexed Vec lookup
-- All internal maps key on `MetricID` (u32), never on full label strings
-
-### `MutableEpoch` (`common.rs`)
-
-Active epoch: append-only insert, O(1) amortized.
-
-```
-MutableEpoch {
-    // Columnar storage (Opt 5): three parallel arrays
-    windows_col:     Vec<TimestampRange>
-    metric_ids_col:  Vec<MetricID>
-    aggregates_col:  Vec<Arc<dyn AggregateCore>>
-
-    // Distinct-window count for epoch rotation threshold
-    windows_set:     HashSet<TimestampRange>
-
-    // Monotonic ingest fast path (Opt 3)
-    last_window:     Option<TimestampRange>
-
-    // Lazy offset index (Opt 1 + 2): built on first exact_query, None after any insert
-    window_to_ids:   Option<HashMap<TimestampRange, Vec<u32>>>
-
-    // Epoch bounds for O(1) skip check (updated incrementally on insert)
-    min_start:       Option<u64>
-    max_end:         Option<u64>
-}
-```
-
-**Insert** (`O(1)` amortized):
-- Opt 3: if incoming window == `last_window`, skip `windows_set.insert` entirely
-- Three `Vec::push` calls — no secondary index maintenance
-- `window_to_ids = None` — single pointer-width write to invalidate the index
-
-**`seal()` → `SealedEpoch`** (`O(M log M)`, paid once at rotation):
-- Zips the three columns into tuples, sorts by `(TimestampRange, MetricID)`, moves `Arc`s without cloning
-
-**`exact_query(&mut self)`** (`O(M)` first call after a write, `O(m)` cached):
-- Opt 1 + 2: if `window_to_ids` is `None`, build it from `windows_col` in one pass storing `u32` offsets
-- Cache is valid until the next `insert`
-
-**`range_query_into`** (`O(M)` mutable epoch):
-- Opt 5: hot loop iterates only `windows_col`; aggregate pointer only chased on match
-
-### `SealedEpoch` (`common.rs`)
-
-Immutable epoch: flat sorted `Vec` for cache-friendly binary-search scans.
-
-```
-SealedEpoch {
-    entries:   Vec<(TimestampRange, MetricID, Arc<dyn AggregateCore>)>  // sorted by (TR, MetricID)
-    min_start: Option<u64>
-    max_end:   Option<u64>
-}
-```
-
-**`range_query_into`** (`O(log N + k)`): `partition_point` to find start, linear scan until `tr.0 > end`
-
-**`exact_query`** (`O(log N + m)`): `partition_point` to find the window, linear scan while `tr == range`
-
-### Per-Key Store (`per_key.rs`)
-
-Each `aggregation_id` gets its own `StoreKeyData` behind a per-key `RwLock`:
-
-```
-DashMap<aggregation_id, Arc<RwLock<StoreKeyData>>>
-
-StoreKeyData {
-    intern:           InternTable
-    current_epoch:    MutableEpoch          // always present, accepts inserts
-    sealed_epochs:    BTreeMap<EpochID, SealedEpoch>
-    current_epoch_id: EpochID
-    epoch_capacity:   Option<usize>         // None = unlimited
-    max_epochs:       usize                 // default 4
-}
-```
-
-### Global Store (`global.rs`)
-
-Same per-key epoch structure, but all aggregation_ids share a single `Mutex<StoreData>`:
-
-```
-Mutex<StoreData>
-
-StoreData {
-    stores:  HashMap<aggregation_id, PerKeyState>
-    metrics: HashSet<String>
-}
-
-PerKeyState {
-    intern:           InternTable
-    current_epoch:    MutableEpoch
-    sealed_epochs:    BTreeMap<EpochID, SealedEpoch>
-    current_epoch_id: EpochID
-    epoch_capacity:   Option<usize>
-    max_epochs:       usize
-}
-```
-
----
-
-## Complexity
-
-### Variables
-
-| Symbol | Meaning |
-|--------|---------|
-| A | Distinct aggregation IDs |
-| L | Distinct label combinations |
-| N | Distinct time windows per epoch |
-| E | Epochs retained (≤ `max_epochs`, default 4) |
-| M | Total entries in an epoch (`windows_col.len()`) |
-| k | Matched results or entries removed |
-| m | Labels present in a specific time window |
-
-### Time Complexity
-
-| Operation | Time | Notes |
-|-----------|------|-------|
-| **Insert** | O(1) amortized | Three `Vec::push` + conditional `HashSet::insert` (skipped by Opt 3 on ordered ingest) |
-| **Seal** | O(M log M) | Paid once at rotation; not on insert hot path |
-| **Epoch rotation** | O(M log M + 1) | Seal current + drop oldest in O(1) |
-| **Range query** (mutable epoch) | O(M) | Linear scan of `windows_col` only |
-| **Range query** (sealed epoch) | O(log N + k) | Binary search + linear scan |
-| **Range query** (full store) | O(M + E · (log N + k)) | One mutable scan + binary-search per sealed epoch |
-| **Exact query** (first after write) | O(M) | Build `window_to_ids` from `windows_col` |
-| **Exact query** (cached) | O(m) | HashMap lookup + `Arc::clone` per offset |
-| **Exact query** (sealed epoch) | O(log N + m) | Binary search to window + linear scan |
-| **get_earliest_timestamp** | O(A) | DashMap iteration with AtomicU64 loads |
-
-### Space
-
-| Structure | Space |
-|-----------|-------|
-| `InternTable` | O(L) per agg_id |
-| `MutableEpoch` columns | O(M) |
-| `SealedEpoch` entries | O(M) per sealed epoch |
-| `window_to_ids` (when built) | O(M) |
-| **Total** | **O(A · E · M)** where E ≤ `max_epochs` |
-
----
-
-## Query Mechanics
-
-### Range Query `[start, end]`
-
-1. Acquire **read lock** on `StoreKeyData`
-2. Scan `current_epoch.range_query_into(start, end)` — O(M), touches only `windows_col` in hot loop
-3. For each sealed epoch (newest first):
-   - Skip if `min_start > end || max_end < start` — O(1) bounds check
-   - `sealed_epoch.range_query_into(start, end)` — O(log N + k) binary search + scan
-4. Resolve MetricIDs → labels via `InternTable` in one pass
-
-### Exact Query `(exact_start, exact_end)`
-
-1. Acquire **write lock** (needed to potentially build the lazy `window_to_ids` index)
-2. Try `current_epoch.exact_query(range)` — builds/uses cached `window_to_ids`
-3. If not found, iterate `sealed_epochs.values().rev()` calling `SealedEpoch::exact_query`
-4. Return owned `Vec<(MetricID, Arc<dyn AggregateCore>)>`, drop write lock
-5. Re-acquire read lock to resolve MetricIDs → labels
-
----
-
-## Cleanup Policies
-
-### CircularBuffer
-
-Epoch-based eviction — O(1) amortized per insert:
-
-1. On first insert: set `epoch_capacity` from `num_aggregates_to_retain`
-2. After each insert: call `maybe_rotate_epoch()`
-   - If `current_epoch.window_count() >= epoch_capacity`: seal current epoch, open new one with `with_capacity(hint)` (Opt 6)
-   - If `1 + sealed_epochs.len() > max_epochs`: pop oldest sealed epoch in O(1)
-
-### NoCleanup
-
-No eviction — data accumulates indefinitely.
-
----
-
-## Concurrency (Per-Key Store)
-
-| Operation | Lock |
-|-----------|------|
-| **Insert** | `RwLock::write` for the batch duration |
-| **Range query** | `RwLock::read` for the scan |
-| **Exact query** | `RwLock::write` (lazy index build) → drop → `RwLock::read` for label resolution |
-| **Cleanup** | Under existing write lock |
-
-Multiple readers per `aggregation_id` run concurrently. Writers only block readers of the same `aggregation_id`.
diff --git a/data_plane/src/storage_engines/sketch_db/index/admission.rs b/data_plane/src/storage_engines/sketch_db/index/admission.rs
deleted file mode 100644
index 4ad4a5452..000000000
--- a/data_plane/src/storage_engines/sketch_db/index/admission.rs
+++ /dev/null
@@ -1,606 +0,0 @@
-//! Store-owned tracking of accepted, not necessarily published summary updates.
-//! This records known work; it does not infer an event-time watermark.
-
-use asap_types::sds::StoredOutputId;
-use asap_types::sds::{CatalogGeneration, HalfOpenTimeRange, SummaryInstanceCoordinates};
-use std::collections::{BTreeMap, BTreeSet};
-
-#[derive(Default)]
-struct WindowRevision {
-    admitted: u64,
-    published: u64,
-    series_id: Option<u64>,
-    pending: BTreeSet<u64>,
-}
-
-#[derive(Default, PartialEq, Eq)]
-enum FiniteInputState {
-    #[default]
-    Open,
-    Closing,
-    Complete,
-}
-
-#[derive(Default)]
-pub(super) struct AdmissionInventory {
-    generation: Option<CatalogGeneration>,
-    revision: u64,
-    windows: BTreeMap<SummaryInstanceCoordinates, WindowRevision>,
-    metadata_bytes: usize,
-    replay_floors: BTreeMap<StoredOutputId, i64>,
-    observed_extent: Option<HalfOpenTimeRange>,
-    finite_input: FiniteInputState,
-    published_series: BTreeMap<u64, u64>,
-    pending_revisions: usize,
-}
-
-impl AdmissionInventory {
-    const MAX_WINDOWS: usize = 262_144;
-    const MAX_METADATA_BYTES: usize = 64 * 1024 * 1024;
-
-    pub(super) fn install(&mut self, generation: CatalogGeneration) {
-        if self.generation.as_ref() != Some(&generation) {
-            self.generation = Some(generation);
-            self.windows.clear();
-            self.metadata_bytes = 0;
-            self.replay_floors.clear();
-            self.observed_extent = None;
-            self.finite_input = FiniteInputState::Open;
-            self.published_series.clear();
-            self.pending_revisions = 0;
-            self.revision = self.revision.saturating_add(1);
-        }
-    }
-
-    /// All validation and capacity checks precede mutation. The caller reserves
-    /// the whole queue batch before invoking this operation.
-    pub(super) fn admit(
-        &mut self,
-        generation: &CatalogGeneration,
-        coordinates: BTreeSet<SummaryInstanceCoordinates>,
-    ) -> Result<u64, String> {
-        if self.generation.as_ref() != Some(generation) {
-            return Err("summary admission catalog generation differs".into());
-        }
-        if self.is_finite_closed() {
-            return Err("finite summary input is closed".into());
-        }
-        let mut added = 0usize;
-        let mut bytes = 0usize;
-        for coordinate in &coordinates {
-            if self
-                .replay_floors
-                .get(&coordinate.stored_output_id)
-                .is_some_and(|floor| coordinate.time_range.end_ms <= *floor)
-            {
-                return Err("summary input precedes retained replay horizon".into());
-            }
-            coordinate
-                .time_range
-                .validate()
-                .map_err(|e| e.to_string())?;
-            if !self.windows.contains_key(coordinate) {
-                added += 1;
-                bytes = bytes.saturating_add(Self::coordinate_bytes(coordinate));
-            }
-        }
-        if self.pending_revisions.saturating_add(coordinates.len()) > Self::MAX_WINDOWS
-            || self.windows.len().saturating_add(added) > Self::MAX_WINDOWS
-            || self.metadata_bytes.saturating_add(bytes) > Self::MAX_METADATA_BYTES
-        {
-            return Err("summary admission inventory capacity exceeded".into());
-        }
-        let revision = self
-            .revision
-            .checked_add(1)
-            .ok_or("summary admission revision exhausted")?;
-        for coordinate in coordinates {
-            self.observed_extent = Some(match self.observed_extent {
-                Some(range) => HalfOpenTimeRange {
-                    start_ms: range.start_ms.min(coordinate.time_range.start_ms),
-                    end_ms: range.end_ms.max(coordinate.time_range.end_ms),
-                },
-                None => coordinate.time_range,
-            });
-            let window = self.windows.entry(coordinate).or_default();
-            window.admitted = revision;
-            window.pending.insert(revision);
-            self.pending_revisions += 1;
-        }
-        self.metadata_bytes += bytes;
-        self.revision = revision;
-        Ok(revision)
-    }
-
-    pub(super) fn validate_publication(
-        &self,
-        generation: &CatalogGeneration,
-        coordinate: &SummaryInstanceCoordinates,
-        first_revision: u64,
-        revision: u64,
-    ) -> Result<bool, String> {
-        if self.generation.as_ref() != Some(generation) {
-            return Err("summary publication catalog generation differs".into());
-        }
-        let window = self
-            .windows
-            .get(coordinate)
-            .ok_or("summary publication was not admitted")?;
-        if revision == 0 || revision > window.admitted {
-            return Err("summary publication revision was not admitted".into());
-        }
-        if window.published >= revision {
-            return Ok(true);
-        }
-        if window.series_id.is_none() && self.published_series.len() >= Self::MAX_WINDOWS {
-            return Err("summary admission series capacity exceeded".into());
-        }
-        if self.revision == u64::MAX {
-            return Err("summary admission revision exhausted".into());
-        }
-        if !window.pending.contains(&revision) {
-            return Err("summary output revision was not admitted to this coordinate".into());
-        }
-        if first_revision == 0
-            || first_revision > revision
-            || window
-                .pending
-                .first()
-                .is_some_and(|pending| first_revision > *pending)
-        {
-            return Err("summary output omitted an earlier unpublished input revision".into());
-        }
-        Ok(false)
-    }
-
-    pub(super) fn acknowledge(
-        &mut self,
-        generation: &CatalogGeneration,
-        coordinate: &SummaryInstanceCoordinates,
-        revision: u64,
-    ) -> Result<(), String> {
-        if self.generation.as_ref() != Some(generation) {
-            return Err("summary publication catalog generation differs".into());
-        }
-        let window = self
-            .windows
-            .get_mut(coordinate)
-            .ok_or("summary publication was not admitted")?;
-        if revision == 0 || revision > window.admitted {
-            return Err("summary publication revision was not admitted".into());
-        }
-        window.published = window.published.max(revision);
-        let before = window.pending.len();
-        window.pending.retain(|pending| *pending > revision);
-        self.pending_revisions -= before - window.pending.len();
-        // A newer admission remains pending even if an old write completes now.
-        self.revision = self
-            .revision
-            .checked_add(1)
-            .ok_or("summary admission revision exhausted")?;
-        Ok(())
-    }
-
-    pub(super) fn record_series(
-        &mut self,
-        generation: &CatalogGeneration,
-        coordinate: &SummaryInstanceCoordinates,
-        series_id: u64,
-    ) -> Result<(), String> {
-        if self.generation.as_ref() != Some(generation) {
-            return Err("summary series publication catalog generation differs".into());
-        }
-        if !self.published_series.contains_key(&series_id)
-            && self.published_series.len() >= Self::MAX_WINDOWS
-        {
-            return Err("summary admission series capacity exceeded".into());
-        }
-        let window = self
-            .windows
-            .get_mut(coordinate)
-            .ok_or("published window was not admitted")?;
-        if window
-            .series_id
-            .is_some_and(|previous| previous != series_id)
-        {
-            return Err("summary coordinate changed series identity".into());
-        }
-        window.series_id = Some(series_id);
-        let end = u64::try_from(coordinate.time_range.end_ms)
-            .map_err(|_| "published window end is outside storage timestamp range")?;
-        self.published_series
-            .entry(series_id)
-            .and_modify(|current| *current = (*current).max(end))
-            .or_insert(end);
-        Ok(())
-    }
-
-    pub(super) fn validate_finite(&self, generation: &CatalogGeneration) -> Result<u64, String> {
-        if self.generation.as_ref() != Some(generation) {
-            return Err("finite completion catalog generation differs".into());
-        }
-        if self
-            .windows
-            .values()
-            .any(|window| window.published < window.admitted)
-        {
-            return Err("finite source has unpublished summary windows".into());
-        }
-        self.revision
-            .checked_add(1)
-            .ok_or_else(|| "summary admission revision exhausted".into())
-    }
-
-    pub(super) fn seal_finite(&mut self, generation: &CatalogGeneration) -> Result<(), String> {
-        let revision = self.validate_finite(generation)?;
-        self.finite_input = FiniteInputState::Complete;
-        self.revision = revision;
-        Ok(())
-    }
-
-    pub(super) fn begin_finite_close(&mut self) {
-        self.finite_input = FiniteInputState::Closing;
-    }
-
-    pub(super) fn is_finite_closed(&self) -> bool {
-        self.finite_input != FiniteInputState::Open
-    }
-
-    pub(super) fn is_finite_complete(&self) -> bool {
-        self.finite_input == FiniteInputState::Complete
-    }
-
-    pub(super) fn known_empty(
-        &self,
-        definition: StoredOutputId,
-        series_id: u64,
-        range: HalfOpenTimeRange,
-    ) -> bool {
-        self.known_empty_with_layout(definition, series_id, range, false)
-    }
-
-    pub(super) fn known_empty_with_layout(
-        &self,
-        definition: StoredOutputId,
-        series_id: u64,
-        range: HalfOpenTimeRange,
-        full_window: bool,
-    ) -> bool {
-        self.finite_input == FiniteInputState::Complete
-            && self.published_series.contains_key(&series_id)
-            && self.observed_extent.is_some_and(|extent| {
-                range.start_ms >= extent.start_ms && range.end_ms <= extent.end_ms
-            })
-            && self
-                .replay_floors
-                .get(&definition)
-                .is_none_or(|floor| range.start_ms >= *floor)
-            && !self.windows.iter().any(|(coordinate, state)| {
-                coordinate.stored_output_id == definition
-                    && (if full_window {
-                        coordinate.time_range == range
-                    } else {
-                        coordinate.time_range.start_ms < range.end_ms
-                            && coordinate.time_range.end_ms > range.start_ms
-                    })
-                    && state.series_id == Some(series_id)
-            })
-    }
-
-    pub(super) fn published_frontiers(&self) -> &BTreeMap<u64, u64> {
-        &self.published_series
-    }
-
-    pub(super) fn revision(&self) -> u64 {
-        self.revision
-    }
-
-    pub(super) fn has_pending(
-        &self,
-        definition: StoredOutputId,
-        range: HalfOpenTimeRange,
-        full_window: bool,
-    ) -> bool {
-        self.windows.iter().any(|(coordinate, state)| {
-            coordinate.stored_output_id == definition
-                && (if full_window {
-                    coordinate.time_range == range
-                } else {
-                    coordinate.time_range.start_ms < range.end_ms
-                        && coordinate.time_range.end_ms > range.start_ms
-                })
-                && state.published < state.admitted
-        })
-    }
-
-    /// Advancing this configured replay floor also rejects future old admission.
-    /// Pending work is never forgotten because a different series ran ahead.
-    pub(super) fn retire_completed_before(&mut self, definition: StoredOutputId, frontier_ms: i64) {
-        let floor = self.replay_floors.entry(definition).or_insert(i64::MIN);
-        *floor = (*floor).max(frontier_ms);
-        let frontier_ms = *floor;
-        let pending: BTreeSet<_> = self
-            .windows
-            .values()
-            .flat_map(|state| state.pending.iter().copied())
-            .collect();
-        self.windows.retain(|coordinate, state| {
-            let remove = coordinate.stored_output_id == definition
-                && coordinate.time_range.end_ms <= frontier_ms
-                && state.published >= state.admitted
-                && !pending.contains(&state.admitted);
-            if remove {
-                self.metadata_bytes = self
-                    .metadata_bytes
-                    .saturating_sub(Self::coordinate_bytes(coordinate));
-            }
-            !remove
-        });
-    }
-
-    fn coordinate_bytes(coordinate: &SummaryInstanceCoordinates) -> usize {
-        std::mem::size_of::<SummaryInstanceCoordinates>()
-            + coordinate
-                .group_values
-                .iter()
-                .map(|(key, value)| key.len() + value.len() + 64)
-                .sum::<usize>()
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    fn generation(version: u64) -> CatalogGeneration {
-        CatalogGeneration {
-            schema_version: 1,
-            plan_id: 1,
-            plan_version: version,
-            snapshot_sha256: format!("snapshot-{version}"),
-        }
-    }
-    fn window(series: &str) -> SummaryInstanceCoordinates {
-        SummaryInstanceCoordinates {
-            stored_output_id: StoredOutputId::from(asap_types::PolicyFingerprint(7)),
-            time_range: HalfOpenTimeRange {
-                start_ms: 0,
-                end_ms: 1000,
-            },
-            group_values: BTreeMap::from([("instance".into(), series.into())]),
-        }
-    }
-
-    #[test]
-    fn fast_series_publication_cannot_hide_a_queued_series() {
-        let generation = generation(1);
-        let mut inventory = AdmissionInventory::default();
-        inventory.install(generation.clone());
-        let a = window("a");
-        let b = window("b");
-        let revision = inventory
-            .admit(&generation, BTreeSet::from([a.clone(), b.clone()]))
-            .unwrap();
-        inventory.acknowledge(&generation, &a, revision).unwrap();
-        assert!(inventory.has_pending(a.stored_output_id, a.time_range, false));
-        inventory.acknowledge(&generation, &b, revision).unwrap();
-        assert!(!inventory.has_pending(a.stored_output_id, a.time_range, false));
-    }
-
-    #[test]
-    fn old_publication_cannot_acknowledge_a_newer_update() {
-        let generation = generation(1);
-        let mut inventory = AdmissionInventory::default();
-        inventory.install(generation.clone());
-        let coordinate = window("a");
-        let first = inventory
-            .admit(&generation, BTreeSet::from([coordinate.clone()]))
-            .unwrap();
-        let second = inventory
-            .admit(&generation, BTreeSet::from([coordinate.clone()]))
-            .unwrap();
-        let before = inventory.revision();
-        inventory
-            .acknowledge(&generation, &coordinate, first)
-            .unwrap();
-        assert_ne!(before, inventory.revision());
-        assert!(inventory.has_pending(coordinate.stored_output_id, coordinate.time_range, false));
-        inventory.retire_completed_before(coordinate.stored_output_id, 1000);
-        assert_eq!(inventory.windows.len(), 1);
-        inventory
-            .record_series(&generation, &coordinate, 42)
-            .unwrap();
-        inventory
-            .acknowledge(&generation, &coordinate, second)
-            .unwrap();
-        inventory.retire_completed_before(coordinate.stored_output_id, 1000);
-        assert!(inventory.windows.is_empty());
-        assert_eq!(
-            inventory.published_frontiers().get(&42),
-            Some(&(coordinate.time_range.end_ms as u64))
-        );
-    }
-
-    #[test]
-    fn later_output_cannot_hide_an_unpublished_earlier_input() {
-        let generation = generation(1);
-        let mut inventory = AdmissionInventory::default();
-        inventory.install(generation.clone());
-        let coordinate = window("a");
-        let first = inventory
-            .admit(&generation, BTreeSet::from([coordinate.clone()]))
-            .unwrap();
-        let second = inventory
-            .admit(&generation, BTreeSet::from([coordinate.clone()]))
-            .unwrap();
-        assert!(inventory
-            .validate_publication(&generation, &coordinate, second, second)
-            .is_err());
-        assert_eq!(
-            inventory.validate_publication(&generation, &coordinate, first, second),
-            Ok(false)
-        );
-        inventory
-            .acknowledge(&generation, &coordinate, first)
-            .unwrap();
-        assert_eq!(
-            inventory.validate_publication(&generation, &coordinate, second, second),
-            Ok(false)
-        );
-    }
-
-    #[test]
-    fn generation_switch_rejects_old_completion_and_admission() {
-        let mut inventory = AdmissionInventory::default();
-        let old = generation(1);
-        inventory.install(old.clone());
-        let coordinate = window("a");
-        let revision = inventory
-            .admit(&old, BTreeSet::from([coordinate.clone()]))
-            .unwrap();
-        inventory.install(generation(2));
-        assert!(inventory.acknowledge(&old, &coordinate, revision).is_err());
-        assert!(inventory.admit(&old, BTreeSet::from([coordinate])).is_err());
-    }
-
-    // Unpublished future snapshots cannot block an already-published full window.
-    #[test]
-    fn pending_full_window_checks_only_the_requested_snapshot() {
-        let generation = generation(1);
-        let mut inventory = AdmissionInventory::default();
-        inventory.install(generation.clone());
-        let current = window("a");
-        let mut future = current.clone();
-        future.time_range = HalfOpenTimeRange {
-            start_ms: 500,
-            end_ms: 1500,
-        };
-        let revision = inventory
-            .admit(&generation, BTreeSet::from([current.clone(), future]))
-            .unwrap();
-        assert!(inventory.has_pending(current.stored_output_id, current.time_range, true));
-        inventory
-            .acknowledge(&generation, &current, revision)
-            .unwrap();
-        assert!(inventory.has_pending(current.stored_output_id, current.time_range, false));
-        assert!(!inventory.has_pending(current.stored_output_id, current.time_range, true));
-    }
-
-    // A neighboring full snapshot may overlap an empty query population.
-    #[test]
-    fn full_window_empty_proof_uses_exact_window_identity() {
-        let generation = generation(1);
-        let mut inventory = AdmissionInventory::default();
-        inventory.install(generation.clone());
-        let first = window("a");
-        let mut neighbor = first.clone();
-        neighbor.time_range = HalfOpenTimeRange {
-            start_ms: 500,
-            end_ms: 1500,
-        };
-        let mut other = window("b");
-        other.time_range = HalfOpenTimeRange {
-            start_ms: 1000,
-            end_ms: 2000,
-        };
-        let revision = inventory
-            .admit(
-                &generation,
-                BTreeSet::from([first.clone(), neighbor.clone(), other.clone()]),
-            )
-            .unwrap();
-        for (coordinate, sid) in [(&first, 1), (&neighbor, 1), (&other, 2)] {
-            inventory
-                .record_series(&generation, coordinate, sid)
-                .unwrap();
-            inventory
-                .acknowledge(&generation, coordinate, revision)
-                .unwrap();
-        }
-        assert!(!inventory.known_empty_with_layout(
-            first.stored_output_id,
-            1,
-            other.time_range,
-            true
-        ));
-        inventory.seal_finite(&generation).unwrap();
-        assert!(!inventory.known_empty(first.stored_output_id, 1, other.time_range));
-        assert!(inventory.known_empty_with_layout(
-            first.stored_output_id,
-            1,
-            other.time_range,
-            true
-        ));
-        assert!(!inventory.known_empty_with_layout(
-            first.stored_output_id,
-            2,
-            other.time_range,
-            true
-        ));
-        inventory.retire_completed_before(first.stored_output_id, 2000);
-        assert!(!inventory.known_empty_with_layout(
-            first.stored_output_id,
-            1,
-            other.time_range,
-            true
-        ));
-    }
-
-    #[test]
-    fn only_finite_completion_proves_an_inactive_series_window_empty() {
-        let generation = generation(1);
-        let mut inventory = AdmissionInventory::default();
-        inventory.install(generation.clone());
-        let first = window("a");
-        let mut second = window("b");
-        second.time_range = HalfOpenTimeRange {
-            start_ms: 1000,
-            end_ms: 2000,
-        };
-        let revision = inventory
-            .admit(&generation, BTreeSet::from([first.clone(), second.clone()]))
-            .unwrap();
-        inventory.record_series(&generation, &first, 1).unwrap();
-        inventory
-            .acknowledge(&generation, &first, revision)
-            .unwrap();
-        assert!(inventory.seal_finite(&generation).is_err());
-        inventory.record_series(&generation, &second, 2).unwrap();
-        inventory
-            .acknowledge(&generation, &second, revision)
-            .unwrap();
-        assert!(!inventory.known_empty(first.stored_output_id, 1, second.time_range));
-        inventory.seal_finite(&generation).unwrap();
-        assert!(inventory.known_empty(first.stored_output_id, 1, second.time_range));
-        assert!(!inventory.known_empty(first.stored_output_id, 2, second.time_range));
-        assert!(!inventory.known_empty(first.stored_output_id, 999, second.time_range));
-        assert!(!inventory.known_empty(
-            first.stored_output_id,
-            1,
-            HalfOpenTimeRange {
-                start_ms: 2000,
-                end_ms: 3000
-            }
-        ));
-        assert!(inventory
-            .admit(&generation, BTreeSet::from([first]))
-            .is_err());
-    }
-
-    #[test]
-    fn metadata_budget_rejects_admission_without_partial_mutation() {
-        let generation = generation(1);
-        let mut inventory = AdmissionInventory::default();
-        inventory.install(generation.clone());
-        let before = inventory.revision();
-        let mut coordinate = window("a");
-        coordinate.group_values.insert(
-            "large".into(),
-            "x".repeat(AdmissionInventory::MAX_METADATA_BYTES),
-        );
-        assert!(inventory
-            .admit(&generation, BTreeSet::from([window("b"), coordinate]))
-            .is_err());
-        assert!(inventory.windows.is_empty());
-        assert_eq!(before, inventory.revision());
-    }
-}
diff --git a/data_plane/src/storage_engines/sketch_db/index/epoch_columnar.rs b/data_plane/src/storage_engines/sketch_db/index/epoch_columnar.rs
deleted file mode 100644
index 544b2acbb..000000000
--- a/data_plane/src/storage_engines/sketch_db/index/epoch_columnar.rs
+++ /dev/null
@@ -1,1387 +0,0 @@
-//! Epoch-partitioned columnar storage with a generic payload type.
-//!
-//! Parallel window, label-id, and payload columns let range scans inspect only
-//! window metadata. Indexes store offsets rather than cloning payloads; the
-//! window index is built lazily and invalidated on insert. Monotonic ingestion
-//! skips redundant probes, and rotation preallocates epoch buffers.
-//!
-//! Label-value vectors are interned as `LabelValuesId`; the owning sid already
-//! identifies the metric. Callers can hoist shared metadata when batching writes.
-
-use std::collections::{BTreeMap, HashMap, HashSet};
-
-/// Compact identifier for an interned label-values vector. 4 bytes —
-/// hashing/comparing this in the hot loop is one CPU instruction
-/// instead of a `BTreeMap<String, String>` walk.
-pub type LabelValuesId = u32;
-
-/// Monotonically increasing epoch counter.
-pub type EpochId = u64;
-
-/// `(start_unix_ms, end_unix_ms)`.
-pub type TimestampRange = (u64, u64);
-
-/// Intern table for per-series group-by VALUES vectors.
-///
-/// Each `SidStoreData` owns one InternTable. The first time a series's
-/// label-values vector is seen, it gets assigned a `LabelValuesId`
-/// (`u32`); all subsequent appearances re-use the existing id. Hot-path
-/// columnar arrays carry only the `u32` ids — the full label-values
-/// vectors live once in the intern table and are resolved on query.
-///
-/// Bumped from legacy's `Option<KeyByLabelValues>` key to
-/// `BTreeMap<String,String>` because the new SketchStore receives
-/// canonicalized group-by attributes from the OTLP DataPoint (sorted
-/// by key already at the receive layer).
-pub struct InternTable<K: Eq + std::hash::Hash + Clone> {
-    label_to_id: HashMap<K, LabelValuesId>,
-    id_to_label: Vec<K>,
-}
-
-impl<K: Eq + std::hash::Hash + Clone> InternTable<K> {
-    pub fn new() -> Self {
-        Self {
-            label_to_id: HashMap::new(),
-            id_to_label: Vec::new(),
-        }
-    }
-
-    /// Intern a key, assigning a new `LabelValuesId` if first seen.
-    /// Uses `HashMap::entry` to avoid double-hashing.
-    pub fn intern(&mut self, key: K) -> LabelValuesId {
-        let next_id = self.id_to_label.len() as LabelValuesId;
-        match self.label_to_id.entry(key) {
-            std::collections::hash_map::Entry::Occupied(e) => *e.get(),
-            std::collections::hash_map::Entry::Vacant(e) => {
-                self.id_to_label.push(e.key().clone());
-                *e.insert(next_id)
-            }
-        }
-    }
-
-    /// O(1) resolution by id.
-    pub fn resolve(&self, id: LabelValuesId) -> Option<&K> {
-        self.id_to_label.get(id as usize)
-    }
-
-    pub fn len(&self) -> usize {
-        self.id_to_label.len()
-    }
-
-    pub fn is_empty(&self) -> bool {
-        self.id_to_label.is_empty()
-    }
-}
-
-impl<K: Eq + std::hash::Hash + Clone> Default for InternTable<K> {
-    fn default() -> Self {
-        Self::new()
-    }
-}
-
-impl InternTable<BTreeMap<String, String>> {
-    /// Approximate RESIDENT heap bytes of the interned label maps for the
-    /// concrete `BTreeMap<String, String>` key the SketchStore uses.
-    ///
-    /// Both `id_to_label` (the `Vec`) and `label_to_id` (the `HashMap`)
-    /// retain a clone of every interned key, so each distinct label map is
-    /// counted twice, plus backing-store slot capacity. This is the
-    /// dominant per-sid resident cost once sketch payloads have been
-    /// flushed to disk — and it is exactly the cost the payload-only
-    /// [`crate::storage_engines::sketch_db::index::persistence::EpochSource::approx_memory_bytes`]
-    /// (the flusher's eviction gauge) does NOT see, which is why the memory
-    /// diagnostic read ~0 KB while RSS sat in the hundreds of MB.
-    pub fn approx_heap_bytes(&self) -> usize {
-        let mut key_bytes = 0usize;
-        for m in &self.id_to_label {
-            for (k, v) in m.iter() {
-                // string bytes + the two `String` headers + a BTree node.
-                key_bytes += k.len() + v.len() + 2 * std::mem::size_of::<String>() + 32;
-            }
-            key_bytes += std::mem::size_of::<BTreeMap<String, String>>();
-        }
-        // ×2 for the cloned copy held by `label_to_id`, plus the backing
-        // Vec / HashMap slot capacity.
-        key_bytes * 2
-            + self.id_to_label.capacity() * std::mem::size_of::<BTreeMap<String, String>>()
-            + self.label_to_id.capacity()
-                * (std::mem::size_of::<BTreeMap<String, String>>()
-                    + std::mem::size_of::<LabelValuesId>())
-    }
-}
-
-/// Active (mutable) epoch: append-only insert, O(1) amortized.
-///
-/// Three parallel columns (Opt 5) — windows / label-id / payload —
-/// keep the range-scan hot loop hitting only `windows_col`. The
-/// payload column is owned (no `Arc` indirection); legacy used
-/// `Arc<dyn AggregateCore>` because aggregation type was variable,
-/// but the SketchStore specializes to `SketchSampleState` (typed
-/// bytes + encoding tag).
-pub struct MutableEpoch<P> {
-    // Columnar storage: three parallel arrays (Opt 5)
-    windows_col: Vec<TimestampRange>,
-    label_ids_col: Vec<LabelValuesId>,
-    payloads_col: Vec<P>,
-
-    // Distinct-window count for epoch rotation threshold.
-    windows_set: HashSet<TimestampRange>,
-
-    // Monotonic ingest fast path: skip windows_set probe for consecutive
-    // same-window inserts — the common case in ordered ingestion (Opt 3).
-    last_window: Option<TimestampRange>,
-
-    // Lazy offset index — Some(_) after the first exact_query;
-    // invalidated to None on any insert (one pointer-width write).
-    // Stores `Vec<u32>` column offsets, not payload clones (Opt 1 + 2).
-    window_to_ids: Option<HashMap<TimestampRange, Vec<u32>>>,
-
-    // Epoch time bounds for O(1) skip-check, updated incrementally on insert.
-    min_start: Option<u64>,
-    max_end: Option<u64>,
-}
-
-impl<P> MutableEpoch<P> {
-    pub fn new() -> Self {
-        Self::with_capacity(0)
-    }
-
-    /// Pre-allocate column buffers with a capacity hint (Opt 6).
-    pub fn with_capacity(cap: usize) -> Self {
-        Self {
-            windows_col: Vec::with_capacity(cap),
-            label_ids_col: Vec::with_capacity(cap),
-            payloads_col: Vec::with_capacity(cap),
-            windows_set: HashSet::new(),
-            last_window: None,
-            window_to_ids: None,
-            min_start: None,
-            max_end: None,
-        }
-    }
-
-    pub fn window_count(&self) -> usize {
-        self.windows_set.len()
-    }
-
-    /// Iterate every `(window, label_id, &payload)` entry in insertion
-    /// order. Used by the persistence layer's memory accounting so the
-    /// un-sealed hot epoch's footprint is visible (mirrors
-    /// [`SealedEpoch::entries`]).
-    pub fn iter_entries(&self) -> impl Iterator<Item = (TimestampRange, LabelValuesId, &P)> {
-        self.windows_col
-            .iter()
-            .zip(self.label_ids_col.iter())
-            .zip(self.payloads_col.iter())
-            .map(|((w, id), p)| (*w, *id, p))
-    }
-
-    pub fn len(&self) -> usize {
-        self.windows_col.len()
-    }
-
-    pub fn is_empty(&self) -> bool {
-        self.windows_col.is_empty()
-    }
-
-    pub fn min_start(&self) -> Option<u64> {
-        self.min_start
-    }
-
-    pub fn max_end(&self) -> Option<u64> {
-        self.max_end
-    }
-
-    /// Append-only insert. O(1) amortized.
-    ///
-    /// Hot path: three `Vec::push` calls + conditional `windows_set` probe
-    /// (skipped by Opt 3 on consecutive same-window inserts) + invalidation
-    /// of `window_to_ids` to `None` (single pointer-width write).
-    pub fn insert(&mut self, window: TimestampRange, label_id: LabelValuesId, payload: P) {
-        // Opt 3: monotonic same-window fast path.
-        if self.last_window != Some(window) {
-            self.windows_set.insert(window);
-            self.last_window = Some(window);
-        }
-
-        self.windows_col.push(window);
-        self.label_ids_col.push(label_id);
-        self.payloads_col.push(payload);
-
-        // Opt 1: invalidate the lazy index — single pointer-width write.
-        self.window_to_ids = None;
-
-        // Update epoch bounds incrementally for O(1) range-skip check.
-        match self.min_start {
-            Some(s) if s <= window.0 => {}
-            _ => self.min_start = Some(window.0),
-        }
-        match self.max_end {
-            Some(e) if e >= window.1 => {}
-            _ => self.max_end = Some(window.1),
-        }
-    }
-
-    /// Build (or rebuild) the lazy `window_to_ids` index from `windows_col` —
-    /// O(M) one-pass scan, called on the first exact query after any insert.
-    fn ensure_window_index(&mut self) -> &HashMap<TimestampRange, Vec<u32>> {
-        if self.window_to_ids.is_none() {
-            let mut idx = HashMap::with_capacity(self.windows_set.len());
-            for (i, w) in self.windows_col.iter().enumerate() {
-                idx.entry(*w).or_insert_with(Vec::new).push(i as u32);
-            }
-            self.window_to_ids = Some(idx);
-        }
-        self.window_to_ids.as_ref().unwrap()
-    }
-
-    /// Return all entries whose window matches `target` exactly.
-    /// O(M) on first call after a write (builds the index); O(m) cached.
-    pub fn exact_query(&mut self, target: TimestampRange) -> Vec<(LabelValuesId, &P)> {
-        let idx = self.ensure_window_index();
-        let offsets = match idx.get(&target) {
-            Some(v) => v.clone(),
-            None => return Vec::new(),
-        };
-        offsets
-            .into_iter()
-            .map(|off| {
-                let i = off as usize;
-                (self.label_ids_col[i], &self.payloads_col[i])
-            })
-            .collect()
-    }
-
-    /// Range query into a caller-provided buffer. Hot loop touches only
-    /// `windows_col` (Opt 5) — chase the payload pointer only on a hit.
-    /// O(M) — linear scan; bounded by the epoch size.
-    pub fn range_query_into<'a>(
-        &'a self,
-        start: u64,
-        end: u64,
-        out: &mut Vec<(TimestampRange, LabelValuesId, &'a P)>,
-    ) {
-        // O(1) skip if the epoch's bounds don't overlap the query range.
-        if let (Some(min_s), Some(max_e)) = (self.min_start, self.max_end) {
-            if min_s > end || max_e < start {
-                return;
-            }
-        }
-        for (i, w) in self.windows_col.iter().enumerate() {
-            if w.0 >= start && w.1 <= end {
-                out.push((*w, self.label_ids_col[i], &self.payloads_col[i]));
-            }
-        }
-    }
-
-    /// Range query with HALF-OPEN OVERLAP semantics: include any window
-    /// whose `[w.0, w.1)` intersects `[start, end)` (i.e. `w.1 > start &&
-    /// w.0 < end`). Sister of [`Self::range_query_into`], which uses
-    /// strict CONTAINMENT (`w.0 >= start && w.1 <= end`).
-    ///
-    /// The sketch read path ([`SketchStore::query_range`]) needs overlap,
-    /// not containment: the agent emits ~30s tumbling panes, and a short
-    /// query window (e.g. `quantile_over_time(...[30s])`, or an instant
-    /// query whose freshest pane straddles `now`) routinely fails to FULLY
-    /// CONTAIN any single pane — the pane that covers the window's edge
-    /// starts before `start` or ends after `end`. Containment then returns
-    /// ZERO in-window samples, so the delta-stitching carry-in never fires
-    /// (it keys off the earliest in-window sample) and the reducer yields
-    /// an empty series → the live "No result for query" bug for `[30s]`
-    /// and bare-instant selectors. Overlap admits the straddling pane; the
-    /// reducer's per-window `w_end >= t0` filter and cumulative `latest_end`
-    /// projection already drop windows that fall outside the requested
-    /// `[t0, t1]` time domain, so no out-of-range value leaks into the
-    /// answer. This matches the overlap filter [`Self::range_query_into_grouped`]
-    /// already uses (and the legacy `SketchStore`'s 30s-pane fix).
-    pub fn range_query_overlap_into<'a>(
-        &'a self,
-        start: u64,
-        end: u64,
-        out: &mut Vec<(TimestampRange, LabelValuesId, &'a P)>,
-    ) {
-        // O(1) skip if the epoch's bounds don't overlap the query range.
-        if let (Some(min_s), Some(max_e)) = (self.min_start, self.max_end) {
-            if min_s >= end || max_e <= start {
-                return;
-            }
-        }
-        for (i, w) in self.windows_col.iter().enumerate() {
-            if w.1 > start && w.0 < end {
-                out.push((*w, self.label_ids_col[i], &self.payloads_col[i]));
-            }
-        }
-    }
-
-    /// Push every entry whose window-END is at or before `before` into
-    /// `out`. Used by the sketch read path to fetch a delta-stitching
-    /// "carry-in base" — the most-recent Full snapshot that landed
-    /// before the query window — so a short query window that contains
-    /// only delta frames can still establish its rolling state. The
-    /// caller is responsible for picking the latest Full per label (the
-    /// columnar layer is payload-agnostic). O(M) linear scan.
-    pub fn collect_ending_at_or_before<'a>(
-        &'a self,
-        before: u64,
-        out: &mut Vec<(TimestampRange, LabelValuesId, &'a P)>,
-    ) {
-        if let Some(min_s) = self.min_start {
-            if min_s > before {
-                return;
-            }
-        }
-        for (i, w) in self.windows_col.iter().enumerate() {
-            if w.1 <= before {
-                out.push((*w, self.label_ids_col[i], &self.payloads_col[i]));
-            }
-        }
-    }
-
-    /// Total accumulated entries — caller compares against
-    /// `epoch_capacity` to decide whether to seal + rotate.
-    pub fn distinct_windows(&self) -> usize {
-        self.windows_set.len()
-    }
-
-    /// `(min_start, max_end)` across all windows, or `None` if empty.
-    /// Convenience for the epoch-skip check
-    /// `min_start > end || max_end < start`.
-    pub fn time_bounds(&self) -> Option<(u64, u64)> {
-        match (self.min_start, self.max_end) {
-            (Some(s), Some(e)) => Some((s, e)),
-            _ => None,
-        }
-    }
-
-    /// Consume self and produce a `SealedEpoch<P>` — convenience for
-    /// epoch rotation. Equivalent to `SealedEpoch::from_mutable(self)`.
-    pub fn seal(self) -> SealedEpoch<P> {
-        SealedEpoch::from_mutable(self)
-    }
-
-    /// Drop every entry whose window-END is at or before `cutoff_end`,
-    /// returning the number of distinct windows evicted.
-    ///
-    /// This is the in-memory retention primitive for the WARM sketch
-    /// store: it bounds `current_epoch` to a recent time horizon so its
-    /// memory is `O(active_series × horizon)` rather than
-    /// `O(active_series × total_elapsed_time)`. It does NOT require
-    /// sealing — unsealed recent windows stay queryable (the read path
-    /// scans `current_epoch` directly), which is the explicit design
-    /// intent. Older data lives in the cold/raw tier.
-    ///
-    /// Uses window-END (`w.1 <= cutoff_end`) rather than window-START so
-    /// a half-open pane that straddles the cutoff is RETAINED until it is
-    /// fully behind the horizon — the read path's overlap scan and the
-    /// delta-stitching carry-in (`collect_ending_at_or_before`) can still
-    /// see it. Callers pick `cutoff_end = newest_end - horizon`, so
-    /// anything kept is within `horizon` of the freshest window.
-    ///
-    /// O(N) — rebuilds the three columns in one pass, same shape as
-    /// [`Self::remove_windows`].
-    pub fn evict_window_ends_before(&mut self, cutoff_end: u64) -> usize {
-        // O(1) skip: nothing is old enough to evict.
-        match self.min_start {
-            // Cheapest guard: if the earliest window-START is already
-            // past the cutoff, no window can END at/before it either.
-            Some(min_s) if min_s > cutoff_end => return 0,
-            None => return 0,
-            _ => {}
-        }
-        let old_windows = std::mem::take(&mut self.windows_col);
-        let old_ids = std::mem::take(&mut self.label_ids_col);
-        let old_payloads = std::mem::take(&mut self.payloads_col);
-        let prev_distinct = self.windows_set.len();
-        self.windows_set.clear();
-        for ((w, id), p) in old_windows.into_iter().zip(old_ids).zip(old_payloads) {
-            if w.1 <= cutoff_end {
-                continue;
-            }
-            self.windows_set.insert(w);
-            self.windows_col.push(w);
-            self.label_ids_col.push(id);
-            self.payloads_col.push(p);
-        }
-        let dropped = prev_distinct.saturating_sub(self.windows_set.len());
-        if dropped > 0 {
-            self.window_to_ids = None;
-            self.last_window = None;
-            self.min_start = self.windows_col.iter().map(|w| w.0).min();
-            self.max_end = self.windows_col.iter().map(|w| w.1).max();
-        }
-        dropped
-    }
-
-    /// Split off every entry whose window-END is at or before
-    /// `cutoff_end`, returning them as a fresh `MutableEpoch` (the
-    /// retained, more-recent entries stay in `self`). Mirrors
-    /// [`Self::evict_window_ends_before`] but PRESERVES the aged entries
-    /// (returned) instead of dropping them, so a time-driven seal can
-    /// turn the aged-but-un-sealed tail of `current_epoch` into a sealed
-    /// epoch the persistence flusher can make durable.
-    ///
-    /// Returns `None` when nothing is old enough to split (so the caller
-    /// can skip the seal+rotate entirely). O(N) — one rebuild pass, same
-    /// shape as `evict_window_ends_before`.
-    pub fn split_window_ends_before(&mut self, cutoff_end: u64) -> Option<MutableEpoch<P>> {
-        // O(1) skip: the earliest window-START is already past the
-        // cutoff, so no window can END at/before it either.
-        match self.min_start {
-            Some(min_s) if min_s > cutoff_end => return None,
-            None => return None,
-            _ => {}
-        }
-        let old_windows = std::mem::take(&mut self.windows_col);
-        let old_ids = std::mem::take(&mut self.label_ids_col);
-        let old_payloads = std::mem::take(&mut self.payloads_col);
-        self.windows_set.clear();
-        self.window_to_ids = None;
-        self.last_window = None;
-        self.min_start = None;
-        self.max_end = None;
-
-        let mut aged: MutableEpoch<P> = MutableEpoch::new();
-        for ((w, id), p) in old_windows.into_iter().zip(old_ids).zip(old_payloads) {
-            if w.1 <= cutoff_end {
-                aged.insert(w, id, p);
-            } else {
-                self.insert(w, id, p);
-            }
-        }
-        if aged.is_empty() {
-            None
-        } else {
-            Some(aged)
-        }
-    }
-
-    /// Remove all entries whose window is in `windows`.
-    /// Mirrors the legacy `SketchStore` CircularBuffer
-    /// cleanup contract. O(N) — rebuilds columns in one pass.
-    pub fn remove_windows(&mut self, windows: &[TimestampRange]) {
-        use std::collections::HashSet as StdHashSet;
-        let drop_set: StdHashSet<TimestampRange> = windows.iter().copied().collect();
-        let old_windows = std::mem::take(&mut self.windows_col);
-        let old_ids = std::mem::take(&mut self.label_ids_col);
-        let old_payloads = std::mem::take(&mut self.payloads_col);
-        for ((w, id), p) in old_windows.into_iter().zip(old_ids).zip(old_payloads) {
-            if !drop_set.contains(&w) {
-                self.windows_col.push(w);
-                self.label_ids_col.push(id);
-                self.payloads_col.push(p);
-            }
-        }
-        for w in windows {
-            self.windows_set.remove(w);
-        }
-        self.window_to_ids = None;
-        self.last_window = None;
-        self.min_start = self.windows_col.iter().map(|w| w.0).min();
-        self.max_end = self.windows_col.iter().map(|w| w.1).max();
-    }
-}
-
-impl<P: Clone> MutableEpoch<P> {
-    /// Range query into a caller-provided `HashMap<LabelValuesId, Vec<(TimestampRange, P)>>`,
-    /// matching the legacy `SketchStore`'s `MetricBucketMap` shape.
-    /// Also pushes each matched window into `matched_windows` for the
-    /// downstream accounting (e.g. metrics).
-    ///
-    /// Uses the same overlap-filter semantics as the flat
-    /// `range_query_into`: include any window whose `[w.0, w.1)`
-    /// intersects `[start, end)`. Tumbling panes that straddle the
-    /// query boundaries match; same fix that the legacy implementation
-    /// carried (see legacy module comment about
-    /// `quantile_over_time(...[1m])` against 30s panes).
-    pub fn range_query_into_grouped(
-        &self,
-        start: u64,
-        end: u64,
-        out: &mut HashMap<LabelValuesId, Vec<(TimestampRange, P)>>,
-        matched_windows: &mut Vec<TimestampRange>,
-    ) {
-        for (i, &w) in self.windows_col.iter().enumerate() {
-            if w.1 <= start || w.0 >= end {
-                continue;
-            }
-            out.entry(self.label_ids_col[i])
-                .or_default()
-                .push((w, self.payloads_col[i].clone()));
-            matched_windows.push(w);
-        }
-    }
-
-    /// Exact-window query returning OWNED payload clones — for callers
-    /// that need to hand the payload out across a lock boundary.
-    /// `None` when the window has no entries.
-    pub fn exact_query_owned(&mut self, target: TimestampRange) -> Option<Vec<(LabelValuesId, P)>> {
-        let r = self.exact_query(target);
-        if r.is_empty() {
-            None
-        } else {
-            Some(r.into_iter().map(|(id, p)| (id, p.clone())).collect())
-        }
-    }
-}
-
-impl<P> Default for MutableEpoch<P> {
-    fn default() -> Self {
-        Self::new()
-    }
-}
-
-/// Sealed (immutable) epoch: flat sorted `Vec` for cache-friendly
-/// binary-search range scans. Built once at rotation time from the
-/// then-active `MutableEpoch`.
-pub struct SealedEpoch<P> {
-    /// Sorted by `(TimestampRange, LabelValuesId)`. Binary search on
-    /// `start_unix_ms` to seek; linear scan within the matched range.
-    pub entries: Vec<(TimestampRange, LabelValuesId, P)>,
-    min_start: Option<u64>,
-    max_end: Option<u64>,
-}
-
-impl<P> SealedEpoch<P> {
-    /// Consume a `MutableEpoch` and produce its sorted immutable form.
-    /// O(M log M) — paid once at rotation, off the insert hot path.
-    ///
-    /// Safe payload move: zip-consumes the three parallel columns
-    /// into owned tuples. Previously used `MaybeUninit::zeroed()` +
-    /// `mem::forget` which is UB for any `P` with non-trivial Drop
-    /// (e.g. `Arc<_>`); the new form has the same algorithmic cost
-    /// and works for arbitrary `P`.
-    pub fn from_mutable(m: MutableEpoch<P>) -> Self {
-        let min_start = m.min_start;
-        let max_end = m.max_end;
-        let mut entries: Vec<(TimestampRange, LabelValuesId, P)> = m
-            .windows_col
-            .into_iter()
-            .zip(m.label_ids_col)
-            .zip(m.payloads_col)
-            .map(|((w, lid), p)| (w, lid, p))
-            .collect();
-        entries.sort_by(|a, b| a.0.cmp(&b.0).then(a.1.cmp(&b.1)));
-        Self {
-            entries,
-            min_start,
-            max_end,
-        }
-    }
-
-    pub fn min_start(&self) -> Option<u64> {
-        self.min_start
-    }
-
-    pub fn max_end(&self) -> Option<u64> {
-        self.max_end
-    }
-
-    pub fn len(&self) -> usize {
-        self.entries.len()
-    }
-
-    pub fn is_empty(&self) -> bool {
-        self.entries.is_empty()
-    }
-
-    /// Range query — O(log N + k) via binary search to the first
-    /// matching entry, then linear scan.
-    pub fn range_query_into<'a>(
-        &'a self,
-        start: u64,
-        end: u64,
-        out: &mut Vec<(TimestampRange, LabelValuesId, &'a P)>,
-    ) {
-        if let (Some(min_s), Some(max_e)) = (self.min_start, self.max_end) {
-            if min_s > end || max_e < start {
-                return;
-            }
-        }
-        // Binary search for the first entry whose start >= start.
-        let from = self.entries.partition_point(|e| e.0 .0 < start);
-        for entry in &self.entries[from..] {
-            if entry.0 .0 > end {
-                break;
-            }
-            if entry.0 .1 <= end {
-                out.push((entry.0, entry.1, &entry.2));
-            }
-        }
-    }
-
-    /// Range query with HALF-OPEN OVERLAP semantics: include any window
-    /// whose `[w.0, w.1)` intersects `[start, end)` (`w.1 > start && w.0 <
-    /// end`). Sealed sister of [`MutableEpoch::range_query_overlap_into`] —
-    /// see its doc for why the sketch read path needs overlap rather than
-    /// the containment that [`Self::range_query_into`] applies.
-    ///
-    /// Entries are sorted by window-START, but an overlapping window may
-    /// START before `start` (it straddles the left edge), so the
-    /// `partition_point(|e| e.0.0 < start)` seek the containment variant
-    /// uses would WRONGLY skip it. We instead scan from the front while
-    /// `w.0 < end`, testing `w.1 > start` per entry. O(k) over the prefix
-    /// of windows that start before `end` — bounded by the epoch size and
-    /// fine for the warm read path (epochs are small; nothing is sealed in
-    /// the live single-epoch deployment anyway).
-    pub fn range_query_overlap_into<'a>(
-        &'a self,
-        start: u64,
-        end: u64,
-        out: &mut Vec<(TimestampRange, LabelValuesId, &'a P)>,
-    ) {
-        if let (Some(min_s), Some(max_e)) = (self.min_start, self.max_end) {
-            if min_s >= end || max_e <= start {
-                return;
-            }
-        }
-        for entry in &self.entries {
-            // Sorted by start; once a window starts at/after `end` it (and
-            // every later one) cannot overlap `[start, end)`.
-            if entry.0 .0 >= end {
-                break;
-            }
-            if entry.0 .1 > start {
-                out.push((entry.0, entry.1, &entry.2));
-            }
-        }
-    }
-
-    /// Push every entry whose window-END is at or before `before` into
-    /// `out`. Sealed sister of
-    /// [`MutableEpoch::collect_ending_at_or_before`]. Entries sort by
-    /// window-START; since `w.1 >= w.0`, any entry with `w.1 <= before`
-    /// also has `w.0 <= before`, so we can stop the scan once
-    /// `w.0 > before`. O(log N + k).
-    pub fn collect_ending_at_or_before<'a>(
-        &'a self,
-        before: u64,
-        out: &mut Vec<(TimestampRange, LabelValuesId, &'a P)>,
-    ) {
-        if let Some(min_s) = self.min_start {
-            if min_s > before {
-                return;
-            }
-        }
-        for entry in &self.entries {
-            if entry.0 .0 > before {
-                break;
-            }
-            if entry.0 .1 <= before {
-                out.push((entry.0, entry.1, &entry.2));
-            }
-        }
-    }
-
-    /// Exact-window query — O(log N + m). Binary search for the
-    /// matching range; linear scan while the range matches.
-    pub fn exact_query(&self, target: TimestampRange) -> Vec<(LabelValuesId, &P)> {
-        let from = self.entries.partition_point(|e| e.0 < target);
-        let mut out = Vec::new();
-        for entry in &self.entries[from..] {
-            if entry.0 != target {
-                break;
-            }
-            out.push((entry.1, &entry.2));
-        }
-        out
-    }
-
-    /// `(min_start, max_end)` or `None` if empty.
-    pub fn time_bounds(&self) -> Option<(u64, u64)> {
-        match (self.min_start, self.max_end) {
-            (Some(s), Some(e)) => Some((s, e)),
-            _ => None,
-        }
-    }
-
-    /// Remove all entries whose window is in `windows`. O(N) scan;
-    /// preserves sortedness since `retain` keeps relative order.
-    pub fn remove_windows(&mut self, windows: &[TimestampRange]) {
-        use std::collections::HashSet as StdHashSet;
-        let drop_set: StdHashSet<TimestampRange> = windows.iter().copied().collect();
-        self.entries.retain(|(w, _, _)| !drop_set.contains(w));
-        self.min_start = self.entries.iter().map(|(w, _, _)| w.0).min();
-        self.max_end = self.entries.iter().map(|(w, _, _)| w.1).max();
-    }
-}
-
-impl<P: Clone> SealedEpoch<P> {
-    /// Range query into a caller-provided
-    /// `HashMap<LabelValuesId, Vec<(TimestampRange, P)>>` — the
-    /// legacy `MetricBucketMap` shape used by `SketchStore`.
-    /// Binary-search start + linear scan. Same overlap semantics
-    /// as the mutable variant.
-    pub fn range_query_into_grouped(
-        &self,
-        start: u64,
-        end: u64,
-        out: &mut HashMap<LabelValuesId, Vec<(TimestampRange, P)>>,
-        matched_windows: &mut Vec<TimestampRange>,
-    ) {
-        // Entries are sorted by `(w.0, label_id)`. Bound the upper
-        // end with `w.0 < end`; entries past that point can't overlap.
-        let end_pos = self.entries.partition_point(|(w, _, _)| w.0 < end);
-        for (w, id, p) in &self.entries[..end_pos] {
-            if w.1 <= start {
-                continue;
-            }
-            out.entry(*id).or_default().push((*w, p.clone()));
-            matched_windows.push(*w);
-        }
-    }
-
-    /// Exact-window query returning OWNED clones — used by callers
-    /// that need to release the lock before reading the payloads.
-    /// `None` when no entry matches.
-    pub fn exact_query_owned(&self, target: TimestampRange) -> Option<Vec<(LabelValuesId, P)>> {
-        let r = self.exact_query(target);
-        if r.is_empty() {
-            None
-        } else {
-            Some(r.into_iter().map(|(id, p)| (id, p.clone())).collect())
-        }
-    }
-}
-
-/// Per-sid storage — drop-in replacement for the new SketchStore's
-/// `series` map's value type. Pairs an active `MutableEpoch` with a
-/// rotation-ordered `BTreeMap<EpochId, SealedEpoch>`. Concurrency is
-/// owned by the outer `RwLock<SidStoreData>` (mirrors legacy's
-/// per-key concurrency model).
-pub struct SidStoreData<K: Eq + std::hash::Hash + Clone, P> {
-    pub intern: InternTable<K>,
-    pub current_epoch: MutableEpoch<P>,
-    pub sealed_epochs: BTreeMap<EpochId, SealedEpoch<P>>,
-    pub current_epoch_id: EpochId,
-    pub epoch_capacity: Option<usize>,
-    pub max_epochs: usize,
-    /// In-memory WARM retention horizon, in milliseconds. On each
-    /// insert, windows whose END is older than `newest_end - horizon`
-    /// are evicted from `current_epoch` (and from any `sealed_epochs`),
-    /// bounding per-sid memory to `O(horizon)` instead of growing with
-    /// total elapsed time. `None` disables retention (legacy/unbounded
-    /// behavior — used by tests that want full history).
-    ///
-    /// Defaults from [`default_retention_horizon_ms`] which reads the
-    /// `ASAP_SKETCH_RETENTION_MS` env once. The horizon is deliberately
-    /// larger than the max query window (~30m) plus the delta-stitching
-    /// carry-in reach, so recent range/instant queries never lose a
-    /// window or its Full base. See `evict_window_ends_before`.
-    pub retention_horizon_ms: Option<u64>,
-    /// Seal cadence (in DISTINCT WINDOWS) for the durable tier. When
-    /// `Some(n)`, `current_epoch` is sealed into `sealed_epochs` once it
-    /// holds `n` distinct windows, so the persistence flusher has sealed
-    /// epochs to flush to disk. `None` (the default) means "never seal
-    /// on cadence" — the in-memory-only deployment where #327 retention
-    /// bounds memory by dropping aged windows from `current_epoch`.
-    ///
-    /// Distinct from [`Self::epoch_capacity`], which is the test-only
-    /// rotation threshold; both feed [`Self::maybe_rotate_epoch`], and
-    /// the smaller of the two (when set) wins. The store sets THIS field
-    /// (not `epoch_capacity`) when persistence is enabled so the
-    /// production seal cadence is decoupled from the test knob.
-    pub seal_window_count: Option<usize>,
-    /// When `true`, this sid's memory is bounded by the persistence
-    /// flush-then-evict loop, NOT by [`Self::enforce_retention`]. The
-    /// flusher owns the lifecycle of sealed epochs (seal → flush to a
-    /// durable disk part → evict from memory), and the disk-tier TTL
-    /// (`delete_older_than_ms`) bounds the durable copy. Retention must
-    /// not drop a sealed epoch out from under a pending flush, nor evict
-    /// un-sealed `current_epoch` windows that were never made durable.
-    /// So when this is `true`, `enforce_retention` is a no-op. When
-    /// `false` (the default), #327 retention is the memory bound.
-    pub persistence_enabled: bool,
-    /// Wall-clock millis of the most recent write (append) into this sid.
-    /// `0` means "never written" / freshly (re)hydrated. Drives idle-sid
-    /// eviction: a sid with no writes for the idle threshold whose state
-    /// is fully durable on disk can have this whole `SidStoreData` dropped
-    /// from memory while its queryable `SummarySeriesMetadata` is kept
-    /// (the series stays answerable from the disk tier and rehydrates on
-    /// the next write). Updated under the per-sid write lock the append
-    /// path already holds, so it costs nothing extra on the hot path.
-    pub last_write_unix_ms: u64,
-}
-
-/// Default in-memory retention horizon (ms) for the WARM sketch store.
-/// 2 hours — comfortably exceeds the ~30m max range-query window plus
-/// the delta-stitching carry-in's Full-base reach, so bounding memory
-/// to this horizon cannot regress the recent-window read path. Older
-/// data is served from the cold/raw tier.
-pub const DEFAULT_SKETCH_RETENTION_MS: u64 = 2 * 60 * 60 * 1000;
-
-/// Resolve the WARM retention horizon once from the
-/// `ASAP_SKETCH_RETENTION_MS` env var, caching the result for the life
-/// of the process (read off the per-insert hot path). Falls back to
-/// [`DEFAULT_SKETCH_RETENTION_MS`] when unset or unparseable. A value of
-/// `0` explicitly DISABLES retention (returns `None`) for operators who
-/// need full in-memory history (and accept the unbounded growth).
-pub fn default_retention_horizon_ms() -> Option<u64> {
-    use std::sync::OnceLock;
-    static HORIZON: OnceLock<Option<u64>> = OnceLock::new();
-    *HORIZON.get_or_init(|| match std::env::var("ASAP_SKETCH_RETENTION_MS") {
-        Ok(v) => match v.trim().parse::<u64>() {
-            Ok(0) => None,
-            Ok(ms) => Some(ms),
-            Err(_) => Some(DEFAULT_SKETCH_RETENTION_MS),
-        },
-        Err(_) => Some(DEFAULT_SKETCH_RETENTION_MS),
-    })
-}
-
-impl<K: Eq + std::hash::Hash + Clone, P> SidStoreData<K, P> {
-    pub fn new() -> Self {
-        Self {
-            intern: InternTable::new(),
-            current_epoch: MutableEpoch::new(),
-            sealed_epochs: BTreeMap::new(),
-            current_epoch_id: 0,
-            epoch_capacity: None,
-            max_epochs: 4,
-            retention_horizon_ms: default_retention_horizon_ms(),
-            seal_window_count: None,
-            persistence_enabled: false,
-            last_write_unix_ms: 0,
-        }
-    }
-
-    /// Insert a labeled payload for a specific time window. Caller has
-    /// already canonicalized the label-values key (e.g. sorted). Hot
-    /// path: amortized O(1) per the optimizations above, plus a bounded
-    /// retention sweep when the freshest window advances the horizon.
-    pub fn insert(&mut self, window: TimestampRange, label_key: K, payload: P) {
-        let label_id = self.intern.intern(label_key);
-        self.current_epoch.insert(window, label_id, payload);
-        self.maybe_rotate_epoch();
-        self.enforce_retention();
-    }
-
-    /// Bound in-memory footprint to the configured horizon. Drops every
-    /// window (in `current_epoch` AND any `sealed_epochs`) whose END is
-    /// older than `newest_end - horizon`. This is what makes SketchStore
-    /// memory `O(active_series × horizon)`: without it `current_epoch`
-    /// accumulates one window per tumbling pane forever (the leak), since
-    /// nothing seals (`epoch_capacity == None`) and the persistence
-    /// flusher only ever evicts SEALED epochs.
-    ///
-    /// Reads stay correct: anything within `horizon` of the freshest
-    /// window is retained, so a `[30m]` range query and the carry-in
-    /// Full base both still resolve. Eviction keys on window-END so a
-    /// straddling pane survives until fully behind the horizon.
-    fn enforce_retention(&mut self) {
-        // Persistence-enabled sids are bounded by the flush-then-evict
-        // loop, not by dropping. Retention must NOT race the flusher by
-        // dropping a sealed epoch before it has been made durable, nor
-        // evict un-sealed `current_epoch` windows that were never
-        // flushed. The flusher's disk-tier TTL bounds the durable copy.
-        if self.persistence_enabled {
-            return;
-        }
-        let Some(horizon) = self.retention_horizon_ms else {
-            return;
-        };
-        // Newest window-end across mutable + sealed state defines "now"
-        // for retention; using max_end (not wall-clock) keeps the bound
-        // robust to clock skew and backfill.
-        let newest_end = self
-            .current_epoch
-            .max_end()
-            .into_iter()
-            .chain(self.sealed_epochs.values().filter_map(|s| s.max_end()))
-            .max();
-        let Some(newest_end) = newest_end else {
-            return;
-        };
-        let cutoff_end = newest_end.saturating_sub(horizon);
-        if cutoff_end == 0 {
-            return;
-        }
-        self.current_epoch.evict_window_ends_before(cutoff_end);
-        if !self.sealed_epochs.is_empty() {
-            let drop_ids: Vec<EpochId> = self
-                .sealed_epochs
-                .iter()
-                .filter(|(_, ep)| ep.max_end().map(|e| e <= cutoff_end).unwrap_or(true))
-                .map(|(id, _)| *id)
-                .collect();
-            for id in drop_ids {
-                self.sealed_epochs.remove(&id);
-            }
-        }
-    }
-
-    /// Whether any hot or queued-for-flush state belongs to this completion prefix.
-    pub(crate) fn contains_window_ending_at_or_before(&self, end_ms: u64) -> bool {
-        self.current_epoch
-            .iter_entries()
-            .any(|(window, _, _)| window.1 <= end_ms)
-            || self.sealed_epochs.values().any(|epoch| {
-                epoch
-                    .entries
-                    .iter()
-                    .any(|(window, _, _)| window.1 <= end_ms)
-            })
-    }
-
-    /// Time-driven seal for the persistence tier: roll every window in
-    /// `current_epoch` whose END is at or before `cutoff_end` into a
-    /// freshly-sealed epoch, leaving the more-recent windows in
-    /// `current_epoch`. Returns the number of distinct windows sealed.
-    ///
-    /// The count-driven [`Self::maybe_rotate_epoch`] cadence only seals
-    /// once `current_epoch` accumulates `seal_window_count` DISTINCT
-    /// windows. A slow or stalled series never reaches that threshold, so
-    /// its aged windows sit un-sealed in `current_epoch` forever — and the
-    /// flusher's hot-window phase only ever flushes SEALED epochs, so they
-    /// are never made durable (the live `parts/`-stays-empty bug). This
-    /// method, called by the flusher each tick with `cutoff_end = now -
-    /// hot_window`, guarantees that any window older than the hot window
-    /// becomes sealed (and therefore flushable) regardless of cadence.
-    ///
-    /// No-op when persistence is disabled (the in-memory-only path bounds
-    /// memory via retention-drop, not flush).
-    pub fn seal_aged_windows(&mut self, cutoff_end: u64) -> usize {
-        if !self.persistence_enabled {
-            return 0;
-        }
-        let Some(aged) = self.current_epoch.split_window_ends_before(cutoff_end) else {
-            return 0;
-        };
-        let sealed_windows = aged.distinct_windows();
-        let sealed = SealedEpoch::from_mutable(aged);
-        self.sealed_epochs.insert(self.current_epoch_id, sealed);
-        self.current_epoch_id += 1;
-        sealed_windows
-    }
-
-    fn maybe_rotate_epoch(&mut self) {
-        // The effective rotation threshold is the smaller of the
-        // test-only `epoch_capacity` and the durable-tier
-        // `seal_window_count` (whichever is set); when both are unset,
-        // we never seal on cadence.
-        let cap = match (self.epoch_capacity, self.seal_window_count) {
-            (Some(a), Some(b)) => a.min(b),
-            (Some(a), None) => a,
-            (None, Some(b)) => b,
-            (None, None) => return,
-        };
-        if cap == 0 || self.current_epoch.distinct_windows() < cap {
-            return;
-        }
-        // Seal the current epoch and rotate.
-        let prev_len = self.current_epoch.len();
-        let sealed = SealedEpoch::from_mutable(std::mem::replace(
-            &mut self.current_epoch,
-            MutableEpoch::with_capacity(prev_len),
-        ));
-        self.sealed_epochs.insert(self.current_epoch_id, sealed);
-        self.current_epoch_id += 1;
-
-        // Drop oldest sealed if we exceed `max_epochs` — but ONLY when
-        // persistence is OFF. Under persistence the flusher owns sealed-
-        // epoch lifecycle (seal → durable part → evict); dropping a
-        // sealed epoch here would discard data that was never flushed,
-        // defeating the durable tier. So persistence-enabled sids keep
-        // every sealed epoch in memory until the flusher evicts it.
-        if !self.persistence_enabled {
-            while self.sealed_epochs.len() + 1 > self.max_epochs {
-                // BTreeMap::pop_first is stable in 1.66+
-                if let Some((id, _)) = self.sealed_epochs.iter().next().map(|(k, _)| (*k, ())) {
-                    self.sealed_epochs.remove(&id);
-                } else {
-                    break;
-                }
-            }
-        }
-    }
-}
-
-impl<K: Eq + std::hash::Hash + Clone, P> Default for SidStoreData<K, P> {
-    fn default() -> Self {
-        Self::new()
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    #[test]
-    fn intern_idempotent() {
-        let mut t = InternTable::<String>::new();
-        let a = t.intern("foo".into());
-        let b = t.intern("foo".into());
-        let c = t.intern("bar".into());
-        assert_eq!(a, b);
-        assert_ne!(a, c);
-        assert_eq!(t.resolve(a), Some(&"foo".to_string()));
-        assert_eq!(t.resolve(c), Some(&"bar".to_string()));
-        assert_eq!(t.len(), 2);
-    }
-
-    #[test]
-    fn mutable_epoch_insert_and_query() {
-        let mut e = MutableEpoch::<String>::new();
-        e.insert((0, 100), 1, "a".into());
-        e.insert((100, 200), 2, "b".into());
-        e.insert((100, 200), 3, "c".into()); // Opt 3 fast path: same window
-        e.insert((200, 300), 4, "d".into());
-        assert_eq!(e.distinct_windows(), 3);
-        assert_eq!(e.len(), 4);
-
-        // Exact query (builds lazy index)
-        let r = e.exact_query((100, 200));
-        let mut ids: Vec<_> = r.iter().map(|(id, _)| *id).collect();
-        ids.sort();
-        assert_eq!(ids, vec![2, 3]);
-
-        // Range query
-        let mut buf = Vec::new();
-        e.range_query_into(50, 250, &mut buf);
-        let mut ids2: Vec<_> = buf.iter().map(|(_, id, _)| *id).collect();
-        ids2.sort();
-        assert_eq!(ids2, vec![2, 3]); // (0,100) is below; (200,300) is above
-    }
-
-    #[test]
-    fn mutable_epoch_overlap_vs_containment() {
-        let mut e = MutableEpoch::<u32>::new();
-        e.insert((0, 100), 1, 100);
-        e.insert((100, 200), 2, 200);
-        e.insert((200, 300), 3, 300);
-
-        // Containment `[50, 250]`: only (100,200) is fully inside.
-        let mut buf = Vec::new();
-        e.range_query_into(50, 250, &mut buf);
-        let mut ids: Vec<_> = buf.iter().map(|(_, id, _)| *id).collect();
-        ids.sort();
-        assert_eq!(ids, vec![2]);
-
-        // Overlap `[50, 250)`: (0,100) straddles left, (100,200) inside,
-        // (200,300) straddles right → all three intersect.
-        buf.clear();
-        e.range_query_overlap_into(50, 250, &mut buf);
-        let mut ids: Vec<_> = buf.iter().map(|(_, id, _)| *id).collect();
-        ids.sort();
-        assert_eq!(ids, vec![1, 2, 3]);
-
-        // Half-open boundary: a window ending exactly at `start` does NOT
-        // overlap; one starting exactly at `end` does NOT either.
-        buf.clear();
-        e.range_query_overlap_into(100, 200, &mut buf); // start=100, end=200
-        let mut ids: Vec<_> = buf.iter().map(|(_, id, _)| *id).collect();
-        ids.sort();
-        // (0,100) ends at start → out; (100,200) overlaps; (200,300) starts at end → out.
-        assert_eq!(ids, vec![2]);
-    }
-
-    #[test]
-    fn sealed_epoch_binary_search_range() {
-        let mut m = MutableEpoch::<u32>::new();
-        m.insert((0, 10), 1, 100);
-        m.insert((10, 20), 2, 200);
-        m.insert((20, 30), 3, 300);
-        m.insert((30, 40), 4, 400);
-        let s = SealedEpoch::from_mutable(m);
-        let mut buf = Vec::new();
-        s.range_query_into(10, 30, &mut buf);
-        let payloads: Vec<u32> = buf.iter().map(|(_, _, p)| **p).collect();
-        // (10,20)=200 and (20,30)=300 are fully within [10,30]
-        assert!(payloads.contains(&200));
-        assert!(payloads.contains(&300));
-    }
-
-    #[test]
-    fn sealed_epoch_overlap_admits_straddling_windows() {
-        let mut m = MutableEpoch::<u32>::new();
-        m.insert((0, 10), 1, 100);
-        m.insert((10, 20), 2, 200);
-        m.insert((20, 30), 3, 300);
-        m.insert((30, 40), 4, 400);
-        let s = SealedEpoch::from_mutable(m);
-
-        // Overlap `[5, 25)`: (0,10) straddles left edge — a window the
-        // start-keyed binary search of the containment scan would skip.
-        let mut buf = Vec::new();
-        s.range_query_overlap_into(5, 25, &mut buf);
-        let mut payloads: Vec<u32> = buf.iter().map(|(_, _, p)| **p).collect();
-        payloads.sort();
-        // (0,10) overlaps (10>5), (10,20) inside, (20,30) overlaps (20<25);
-        // (30,40) is entirely after.
-        assert_eq!(payloads, vec![100, 200, 300]);
-
-        // Half-open: window ending at `start` excluded; starting at `end`
-        // excluded.
-        buf.clear();
-        s.range_query_overlap_into(10, 30, &mut buf); // [10,30)
-        let mut payloads: Vec<u32> = buf.iter().map(|(_, _, p)| **p).collect();
-        payloads.sort();
-        // (0,10) ends at 10=start → out; (10,20) & (20,30) overlap;
-        // (30,40) starts at 30=end → out.
-        assert_eq!(payloads, vec![200, 300]);
-    }
-
-    #[test]
-    fn sid_store_rotation() {
-        let mut s = SidStoreData::<String, String>::new();
-        s.epoch_capacity = Some(2);
-        s.max_epochs = 2;
-        s.insert((0, 10), "a".into(), "p1".into());
-        s.insert((10, 20), "a".into(), "p2".into()); // capacity hit → seal
-        s.insert((20, 30), "a".into(), "p3".into()); // new epoch
-        s.insert((30, 40), "a".into(), "p4".into()); // capacity hit → seal again
-        s.insert((40, 50), "a".into(), "p5".into()); // third epoch; oldest sealed evicted
-        assert!(s.sealed_epochs.len() <= 2);
-    }
-
-    #[test]
-    fn evict_window_ends_before_drops_old_keeps_recent() {
-        let mut e = MutableEpoch::<u32>::new();
-        e.insert((0, 100), 1, 1);
-        e.insert((100, 200), 2, 2);
-        e.insert((150, 250), 3, 3); // straddles a cutoff of 200 (ends after)
-        e.insert((200, 300), 4, 4);
-        assert_eq!(e.distinct_windows(), 4);
-
-        // Cutoff 200: drop windows ending <= 200, i.e. (0,100) & (100,200).
-        // (150,250) straddles (ends at 250 > 200) → retained.
-        let dropped = e.evict_window_ends_before(200);
-        assert_eq!(dropped, 2);
-        assert_eq!(e.distinct_windows(), 2);
-        let mut buf = Vec::new();
-        e.range_query_overlap_into(0, 400, &mut buf);
-        let mut ids: Vec<_> = buf.iter().map(|(_, id, _)| *id).collect();
-        ids.sort();
-        assert_eq!(ids, vec![3, 4]);
-        // bounds recomputed
-        assert_eq!(e.min_start(), Some(150));
-        assert_eq!(e.max_end(), Some(300));
-    }
-
-    #[test]
-    fn evict_window_ends_before_noop_when_all_recent() {
-        let mut e = MutableEpoch::<u32>::new();
-        e.insert((1000, 1100), 1, 1);
-        e.insert((1100, 1200), 2, 2);
-        // Cutoff below everything → nothing dropped, no rebuild.
-        assert_eq!(e.evict_window_ends_before(500), 0);
-        assert_eq!(e.distinct_windows(), 2);
-    }
-
-    #[test]
-    fn retention_bounds_window_count_over_long_elapsed_time() {
-        // Ingest a long stream of 30s tumbling windows. With a bounded
-        // horizon the per-sid distinct-window count stays bounded even as
-        // elapsed time grows without limit — the production leak fix.
-        let horizon_ms = 60 * 60 * 1000; // 1h
-        let window_ms = 30_000u64; // 30s panes
-        let mut s = SidStoreData::<String, u32>::new();
-        s.retention_horizon_ms = Some(horizon_ms);
-
-        let mut start = 0u64;
-        // 4 hours of ingest = 480 windows; unbounded would retain all 480.
-        for i in 0..480u32 {
-            let w = (start, start + window_ms);
-            s.insert(w, "series".into(), i);
-            start += window_ms;
-        }
-
-        // Bounded: at most ~horizon/window windows retained (plus the
-        // straddling boundary pane). 1h / 30s = 120 windows.
-        let retained = s.current_epoch.distinct_windows();
-        assert!(
-            retained <= (horizon_ms / window_ms) as usize + 2,
-            "retained {retained} windows; expected ~{} (bounded by horizon)",
-            horizon_ms / window_ms
-        );
-        // And it actually dropped the bulk of them.
-        assert!(retained < 480, "retention did not evict old windows");
-    }
-
-    #[test]
-    fn retention_disabled_keeps_full_history() {
-        let mut s = SidStoreData::<String, u32>::new();
-        s.retention_horizon_ms = None; // disabled
-        let window_ms = 30_000u64;
-        let mut start = 0u64;
-        for i in 0..200u32 {
-            s.insert((start, start + window_ms), "series".into(), i);
-            start += window_ms;
-        }
-        assert_eq!(s.current_epoch.distinct_windows(), 200);
-    }
-
-    #[test]
-    fn retention_keeps_windows_within_horizon_queryable() {
-        // The freshest `horizon` worth of windows must survive eviction
-        // so a recent range query still resolves (no regression to the
-        // overlap-scan / carry-in read path).
-        let horizon_ms = 60 * 60 * 1000; // 1h
-        let window_ms = 30_000u64;
-        let mut s = SidStoreData::<String, u32>::new();
-        s.retention_horizon_ms = Some(horizon_ms);
-
-        let mut start = 0u64;
-        let mut last_end = 0u64;
-        for i in 0..480u32 {
-            last_end = start + window_ms;
-            s.insert((start, last_end), "series".into(), i);
-            start += window_ms;
-        }
-
-        // A 30m range query ending at the newest window must still find
-        // windows (well inside the 1h horizon).
-        let q_start = last_end - 30 * 60 * 1000;
-        let mut buf = Vec::new();
-        s.current_epoch
-            .range_query_overlap_into(q_start, last_end, &mut buf);
-        assert!(
-            !buf.is_empty(),
-            "30m range query within horizon returned no windows — read path regressed"
-        );
-    }
-
-    #[test]
-    fn seal_window_count_seals_current_epoch_on_cadence() {
-        // Persistence mode: seal every 3 distinct windows. After 7
-        // windows we expect 2 sealed epochs (windows 0..3, 3..6) plus a
-        // partial current epoch (window 6). Nothing is dropped — the
-        // flusher owns sealed-epoch lifecycle, so max_epochs does NOT
-        // bite under persistence.
-        let mut s = SidStoreData::<String, u32>::new();
-        s.seal_window_count = Some(3);
-        s.persistence_enabled = true;
-        s.max_epochs = 2; // would normally cap sealed at 1; ignored here
-        let window_ms = 30_000u64;
-        let mut start = 0u64;
-        for i in 0..7u32 {
-            s.insert((start, start + window_ms), "series".into(), i);
-            start += window_ms;
-        }
-        assert_eq!(
-            s.sealed_epochs.len(),
-            2,
-            "expected 2 sealed epochs at cadence 3 over 7 windows; max_epochs must not drop under persistence"
-        );
-        assert!(s.current_epoch.distinct_windows() >= 1);
-    }
-
-    #[test]
-    fn persistence_enabled_disables_retention_drop() {
-        // With persistence on, enforce_retention must be a no-op even
-        // when a retention horizon is set — the flush-then-evict loop
-        // (not dropping) is the memory bound. A long stream keeps every
-        // window in memory until the flusher evicts the sealed epochs.
-        let mut s = SidStoreData::<String, u32>::new();
-        s.persistence_enabled = true;
-        s.retention_horizon_ms = Some(60 * 60 * 1000); // 1h — would normally drop
-                                                       // No seal cadence: everything stays in current_epoch.
-        let window_ms = 30_000u64;
-        let mut start = 0u64;
-        for i in 0..480u32 {
-            // 4h of ingest
-            s.insert((start, start + window_ms), "series".into(), i);
-            start += window_ms;
-        }
-        assert_eq!(
-            s.current_epoch.distinct_windows(),
-            480,
-            "persistence mode must not retention-drop; the flusher bounds memory instead"
-        );
-    }
-
-    #[test]
-    fn split_window_ends_before_partitions_aged_tail() {
-        let mut e = MutableEpoch::<u32>::new();
-        e.insert((0, 100), 1, 1);
-        e.insert((100, 200), 2, 2);
-        e.insert((150, 250), 3, 3); // straddles 200 (ends after) → retained
-        e.insert((200, 300), 4, 4);
-
-        // Cutoff 200: aged = windows ending <= 200 → (0,100) & (100,200).
-        let aged = e.split_window_ends_before(200).expect("aged tail exists");
-        let mut aged_ids: Vec<_> = aged.iter_entries().map(|(_, id, _)| id).collect();
-        aged_ids.sort();
-        assert_eq!(aged_ids, vec![1, 2]);
-        // Retained: (150,250) & (200,300).
-        let mut kept_ids: Vec<_> = e.iter_entries().map(|(_, id, _)| id).collect();
-        kept_ids.sort();
-        assert_eq!(kept_ids, vec![3, 4]);
-        assert_eq!(e.min_start(), Some(150));
-        assert_eq!(e.max_end(), Some(300));
-    }
-
-    #[test]
-    fn split_window_ends_before_noop_when_all_recent() {
-        let mut e = MutableEpoch::<u32>::new();
-        e.insert((1000, 1100), 1, 1);
-        assert!(e.split_window_ends_before(500).is_none());
-        assert_eq!(e.distinct_windows(), 1);
-    }
-
-    #[test]
-    fn seal_aged_windows_rolls_unsealed_tail_under_persistence() {
-        // The time-driven seal: aged windows below the count-cadence must
-        // still seal so the flusher can make them durable.
-        let mut s = SidStoreData::<String, u32>::new();
-        s.seal_window_count = Some(10); // high cadence → never count-seals
-        s.persistence_enabled = true;
-        for i in 0..3u32 {
-            let start = (i as u64) * 30_000;
-            s.insert((start, start + 30_000), "series".into(), i);
-        }
-        // Below cadence → nothing sealed yet.
-        assert_eq!(s.sealed_epochs.len(), 0);
-        // Seal everything ending at/before 90_000 (all 3 windows).
-        let sealed = s.seal_aged_windows(90_000);
-        assert_eq!(sealed, 3, "all three aged windows should seal");
-        assert_eq!(s.sealed_epochs.len(), 1);
-        assert_eq!(s.current_epoch.distinct_windows(), 0);
-    }
-
-    #[test]
-    fn completion_prefix_does_not_wait_for_future_windows() {
-        let mut store = SidStoreData::<Vec<String>, i32>::new();
-        store.insert((30, 60), vec![], 1);
-        assert!(!store.contains_window_ending_at_or_before(30));
-        store.insert((0, 30), vec![], 2);
-        assert!(store.contains_window_ending_at_or_before(30));
-        store.persistence_enabled = true;
-        store.seal_aged_windows(31);
-        assert!(store.contains_window_ending_at_or_before(30));
-        store.sealed_epochs.clear();
-        assert!(!store.contains_window_ending_at_or_before(30));
-        assert!(store.contains_window_ending_at_or_before(60));
-    }
-
-    #[test]
-    fn seal_aged_windows_noop_when_persistence_disabled() {
-        let mut s = SidStoreData::<String, u32>::new();
-        s.persistence_enabled = false;
-        s.insert((0, 30_000), "series".into(), 1);
-        assert_eq!(s.seal_aged_windows(60_000), 0);
-        assert_eq!(s.sealed_epochs.len(), 0);
-    }
-
-    #[test]
-    fn sealed_epochs_survive_for_flush_under_persistence() {
-        // Sealed epochs accumulate (pending flush) and are NOT dropped by
-        // either max_epochs rotation or retention while persistence is on.
-        let mut s = SidStoreData::<String, u32>::new();
-        s.seal_window_count = Some(2);
-        s.persistence_enabled = true;
-        s.retention_horizon_ms = Some(1); // aggressive; must be ignored
-        s.max_epochs = 2;
-        let window_ms = 30_000u64;
-        let mut start = 0u64;
-        for i in 0..10u32 {
-            s.insert((start, start + window_ms), "series".into(), i);
-            start += window_ms;
-        }
-        // 10 windows / cadence 2 = up to 5 sealed epochs; none dropped.
-        assert!(
-            s.sealed_epochs.len() >= 4,
-            "sealed epochs were dropped under persistence (got {})",
-            s.sealed_epochs.len()
-        );
-    }
-}
diff --git a/data_plane/src/storage_engines/sketch_db/index/maintenance.rs b/data_plane/src/storage_engines/sketch_db/index/maintenance.rs
deleted file mode 100644
index 3224b7248..000000000
--- a/data_plane/src/storage_engines/sketch_db/index/maintenance.rs
+++ /dev/null
@@ -1,1546 +0,0 @@
-//! Immutable maintenance inputs read from the existing durable summary tier.
-//!
-//! Unlike query fallback helpers, this path must propagate corrupt/missing part
-//! errors: silently omitting a source window would permanently corrupt an outer
-//! summary. Completion is an admission barrier, not merely an emitted flag.
-use super::*;
-use crate::storage_engines::types::AggregateCore;
-
-pub(crate) struct FrozenExactWindows {
-    pub(crate) stored_output_reference: asap_types::sds::StoredOutputReference,
-    pub(crate) storage_handle: u64,
-    pub(crate) definition: StoredOutputId,
-    pub(crate) generation: Arc<CatalogGeneration>,
-    pub(crate) group: BTreeMap<String, String>,
-    pub(crate) windows: BTreeMap<(u64, u64), Arc<dyn AggregateCore>>,
-    pub(crate) singleton_population_complete: bool,
-}
-
-/// Store-issued evidence that every durable raw population contributes the
-/// same window. This is deliberately not serializable or caller-constructible.
-pub(crate) struct CompleteRawMaintenanceCohort {
-    inputs: Vec<FrozenExactWindows>,
-    window: (u64, u64),
-}
-
-impl CompleteRawMaintenanceCohort {
-    pub(crate) fn inputs(&self) -> &[FrozenExactWindows] {
-        &self.inputs
-    }
-}
-
-enum FrozenPublicationInputs<'a> {
-    Requested(&'a [FrozenExactWindows]),
-    Complete(&'a CompleteRawMaintenanceCohort),
-}
-
-impl FrozenPublicationInputs<'_> {
-    fn inputs(&self) -> &[FrozenExactWindows] {
-        match self {
-            Self::Requested(inputs) => inputs,
-            Self::Complete(cohort) => cohort.inputs(),
-        }
-    }
-}
-
-impl SketchStore {
-    /// Acquire a complete immutable read set before any output is reserved.
-    /// Individual payloads are immutable; checking the shared generation again
-    /// after all reads prevents a catalog transition from mixing incarnations.
-    pub(crate) fn read_frozen_exact_cohort(
-        &self,
-        generation: &Arc<CatalogGeneration>,
-        expected_definitions: &BTreeSet<StoredOutputId>,
-        requests: &[(
-            u64,
-            StoredOutputId,
-            BTreeSet<(u64, u64)>,
-            BTreeMap<String, String>,
-        )],
-    ) -> Result<Vec<FrozenExactWindows>, String> {
-        if requests.is_empty() || requests.len() > 65_536 {
-            return Err("immutable input cohort has invalid population count".into());
-        }
-        let supplied = requests
-            .iter()
-            .map(|(_, definition, _, _)| *definition)
-            .collect();
-        if expected_definitions != &supplied {
-            return Err("immutable input cohort differs from installed input definitions".into());
-        }
-        let mut ordered: Vec<_> = requests.iter().collect();
-        ordered.sort_by(|left, right| (left.1, left.0, &left.3).cmp(&(right.1, right.0, &right.3)));
-        if ordered
-            .windows(2)
-            .any(|pair| (pair[0].1, pair[0].0, &pair[0].3) == (pair[1].1, pair[1].0, &pair[1].3))
-        {
-            return Err("immutable input cohort repeats a physical population".into());
-        }
-        self.validate_routed_catalog_generation(Some(generation.as_ref()))?;
-        let inputs = ordered
-            .into_iter()
-            .map(|(sid, definition, windows, group)| {
-                self.read_frozen_exact_windows(*sid, *definition, generation, windows, group)
-            })
-            .collect::<Result<Vec<_>, _>>()?;
-        self.validate_routed_catalog_generation(Some(generation.as_ref()))?;
-        Ok(inputs)
-    }
-
-    pub(crate) fn read_complete_raw_maintenance_cohort(
-        &self,
-        generation: &Arc<CatalogGeneration>,
-        definitions: &BTreeSet<StoredOutputId>,
-        window: (u64, u64),
-    ) -> Result<CompleteRawMaintenanceCohort, String> {
-        if definitions.is_empty() || window.0 >= window.1 {
-            return Err("complete raw cohort has an empty definition set or window".into());
-        }
-        let mut requests = Vec::new();
-        for definition in definitions {
-            let populations = self.complete_raw_maintenance_population(*definition, generation)?;
-            for (sid, groups) in populations {
-                for (group, windows) in groups {
-                    if !windows.contains(&window) {
-                        return Err("complete raw cohort is missing a population window".into());
-                    }
-                    requests.push((sid, *definition, BTreeSet::from([window]), group));
-                }
-            }
-        }
-        let inputs = self.read_frozen_exact_cohort(generation, definitions, &requests)?;
-        Ok(CompleteRawMaintenanceCohort { inputs, window })
-    }
-
-    fn durable_maintenance_population_ids(
-        &self,
-        definition: StoredOutputId,
-    ) -> Result<BTreeSet<u64>, String> {
-        let metadata = self
-            .persistence_metadata
-            .read()
-            .map_err(|_| "persistence metadata registry poisoned")?;
-        let writer = metadata
-            .as_ref()
-            .ok_or("immutable population proof requires durable metadata")?;
-        // Retained populations remain a completeness fence even when their
-        // generation is no longer readable. Losing their binding cannot certify
-        // that a newly observed subset is the complete source population.
-        Ok(writer
-            .load_strict()
-            .map_err(|error| error.to_string())?
-            .into_iter()
-            .filter(|record| !record.removed && record.stored_output_id == Some(definition))
-            .map(|record| record.storage_handle)
-            .collect())
-    }
-
-    /// Enumerate durable source coordinates; the consumer revalidates exact
-    /// coverage and incarnation before reading or publishing any state.
-    pub(crate) fn completed_maintenance_coordinates(
-        &self,
-        definition: StoredOutputId,
-        generation: &CatalogGeneration,
-    ) -> Result<BTreeMap<u64, BTreeMap<BTreeMap<String, String>, BTreeSet<(u64, u64)>>>, String>
-    {
-        self.maintenance_coordinates(definition, generation, false)
-    }
-
-    /// Prove the complete raw population before a group-aware consumer joins it.
-    /// Historical durable SIDs cannot disappear merely because restart did not
-    /// bind them to the current catalog.
-    pub(crate) fn complete_raw_maintenance_population(
-        &self,
-        definition: StoredOutputId,
-        generation: &CatalogGeneration,
-    ) -> Result<BTreeMap<u64, BTreeMap<BTreeMap<String, String>, BTreeSet<(u64, u64)>>>, String>
-    {
-        self.maintenance_coordinates(definition, generation, true)
-    }
-
-    fn maintenance_coordinates(
-        &self,
-        definition: StoredOutputId,
-        generation: &CatalogGeneration,
-        require_complete_population: bool,
-    ) -> Result<BTreeMap<u64, BTreeMap<BTreeMap<String, String>, BTreeSet<(u64, u64)>>>, String>
-    {
-        let admission = self
-            .admission
-            .read()
-            .map_err(|_| "admission registry poisoned")?;
-        self.validate_routed_catalog_generation(Some(generation))?;
-        if require_complete_population && !admission.is_finite_complete() {
-            return Err("complete raw population requires a finite source closure".into());
-        }
-        let handle = self
-            .persistence_read
-            .read()
-            .map_err(|_| "persistence registry poisoned")?
-            .clone()
-            .ok_or("immutable maintenance requires durable input state")?;
-        let instances = self
-            .instances
-            .read()
-            .map_err(|_| "instance registry poisoned")?;
-        let mut population_ids = self.durable_maintenance_population_ids(definition)?;
-        population_ids.extend(
-            instances
-                .iter()
-                .filter(|(_, binding)| {
-                    binding.metadata.policy_fp == definition.fingerprint()
-                        && binding.stored_output_reference
-                            == self.descriptors.stored_output_reference(definition)
-                        && binding.catalog_generation.as_deref() == Some(generation)
-                })
-                .map(|(sid, _)| *sid),
-        );
-        if !require_complete_population && population_ids.len() > 1 {
-            return Err("immutable maintenance requires one durable physical population".into());
-        }
-        let completed = self
-            .completed_windows
-            .read()
-            .map_err(|_| "completion registry poisoned")?;
-        if require_complete_population {
-            if population_ids.is_empty() {
-                return Err("raw population has no durable physical instances".into());
-            }
-            for sid in &population_ids {
-                let binding = instances
-                    .get(sid)
-                    .ok_or("durable population SID is not bound in this catalog")?;
-                if binding.catalog_generation.as_deref() != Some(generation)
-                    || !binding.metadata.is_writable()
-                    || matches!(
-                        binding.data_descriptor.source,
-                        asap_types::sds::DataSourceIdentity::Derived { .. }
-                    )
-                    || !completed.contains_key(sid)
-                {
-                    return Err("raw population contains an incomplete or foreign lifetime".into());
-                }
-            }
-        }
-        let mut coordinates = BTreeMap::new();
-        for (sid, binding) in instances.iter() {
-            if binding.metadata.policy_fp != definition.fingerprint()
-                || binding.stored_output_reference
-                    != self.descriptors.stored_output_reference(definition)
-                || binding.catalog_generation.as_deref() != Some(generation)
-                || !binding.metadata.is_writable()
-            {
-                continue;
-            }
-            let Some(end) = completed.get(sid).copied() else {
-                continue;
-            };
-            let keys: Vec<_> = binding.metadata.group_by_keys.iter().cloned().collect();
-            for part in handle.manifest.live_parts_overlapping(0, end) {
-                let reader = handle
-                    .part_cache
-                    .get_or_load(part.part_id)
-                    .map_err(|e| e.to_string())?;
-                for record in reader.index_records() {
-                    if record.agg_id != *sid || record.end_ts > end {
-                        continue;
-                    }
-                    let entry = reader.load_entry(&record).map_err(|e| e.to_string())?;
-                    if entry.label.as_ref().map_or(0, |label| label.labels.len()) != keys.len() {
-                        return Err(
-                            "immutable input label arity differs from its descriptor".into()
-                        );
-                    }
-                    coordinates
-                        .entry(*sid)
-                        .or_insert_with(BTreeMap::new)
-                        .entry(Self::rebuild_label_map(&keys, &entry.label))
-                        .or_insert_with(BTreeSet::new)
-                        .insert((record.start_ts, record.end_ts));
-                }
-            }
-        }
-        if require_complete_population
-            && coordinates.keys().copied().collect::<BTreeSet<_>>() != population_ids
-        {
-            return Err("completed raw population is missing durable payload coordinates".into());
-        }
-        Ok(coordinates)
-    }
-
-    pub(crate) fn read_frozen_exact_windows(
-        &self,
-        sid: u64,
-        definition: StoredOutputId,
-        generation: &Arc<CatalogGeneration>,
-        expected_windows: &BTreeSet<(u64, u64)>,
-        group: &BTreeMap<String, String>,
-    ) -> Result<FrozenExactWindows, String> {
-        let start_ms = expected_windows
-            .iter()
-            .map(|window| window.0)
-            .min()
-            .ok_or("immutable input has no requested windows")?;
-        let end_ms = expected_windows
-            .iter()
-            .map(|window| window.1)
-            .max()
-            .unwrap();
-        if expected_windows.iter().any(|(start, end)| start >= end) || end_ms > i64::MAX as u64 {
-            return Err("invalid immutable input window".into());
-        }
-        self.validate_routed_catalog_generation(Some(generation.as_ref()))?;
-        // Do not retain either lock while opening parts. The immutable frontier
-        // is monotone, and final publication rechecks the catalog incarnation.
-        let admission = self
-            .admission
-            .read()
-            .map_err(|_| "admission registry poisoned")?;
-        let (keys, singleton_population_complete, stored_output_reference) = {
-            let bindings = self
-                .instances
-                .read()
-                .map_err(|_| "instance registry poisoned")?;
-            let binding = bindings.get(&sid).ok_or("immutable input SID is absent")?;
-            if binding.metadata.policy_fp != definition.fingerprint()
-                || binding.stored_output_reference
-                    != self.descriptors.stored_output_reference(definition)
-                || binding.catalog_generation.as_deref() != Some(generation.as_ref())
-                || binding.metadata.status() == AggStatus::Expired
-            {
-                return Err("immutable input identity or lifetime differs".into());
-            }
-            let mut population_ids = self.durable_maintenance_population_ids(definition)?;
-            population_ids.extend(
-                bindings
-                    .iter()
-                    .filter(|(_, candidate)| {
-                        candidate.metadata.policy_fp == definition.fingerprint()
-                            && candidate.stored_output_reference
-                                == self.descriptors.stored_output_reference(definition)
-                            && candidate.catalog_generation.as_deref() == Some(generation.as_ref())
-                    })
-                    .map(|(sid, _)| *sid),
-            );
-            let singleton = admission.is_finite_complete()
-                && !matches!(
-                    binding.data_descriptor.source,
-                    asap_types::sds::DataSourceIdentity::Derived { .. }
-                )
-                && population_ids == BTreeSet::from([sid]);
-            (
-                binding.metadata.group_by_keys.clone(),
-                singleton,
-                binding
-                    .stored_output_reference
-                    .clone()
-                    .ok_or("immutable input has no stored-output binding")?,
-            )
-        };
-        drop(admission);
-        if group.keys().cloned().collect::<BTreeSet<_>>() != keys {
-            return Err("immutable input population does not match its descriptor".into());
-        }
-        let keys: Vec<_> = keys.into_iter().collect();
-        if self
-            .completed_windows
-            .read()
-            .map_err(|_| "completion registry poisoned")?
-            .get(&sid)
-            .is_none_or(|frontier| *frontier < end_ms)
-        {
-            return Err("immutable input window is not complete".into());
-        }
-        let handle = self
-            .persistence_read
-            .read()
-            .map_err(|_| "persistence registry poisoned")?
-            .clone()
-            .ok_or("immutable maintenance requires durable input state")?;
-        let mut windows = BTreeMap::new();
-        let mut observed_populations = BTreeSet::new();
-        for part in handle.manifest.live_parts_overlapping(start_ms, end_ms) {
-            let reader = handle
-                .part_cache
-                .get_or_load(part.part_id)
-                .map_err(|e| e.to_string())?;
-            for record in reader.index_records() {
-                if record.agg_id != sid || record.start_ts < start_ms || record.end_ts > end_ms {
-                    continue;
-                }
-                let entry = reader.load_entry(&record).map_err(|e| e.to_string())?;
-                if entry.label.as_ref().map_or(0, |label| label.labels.len()) != keys.len() {
-                    return Err("immutable input label arity differs from its descriptor".into());
-                }
-                let population = Self::rebuild_label_map(&keys, &entry.label);
-                observed_populations.insert(population.clone());
-                if population != *group {
-                    continue;
-                }
-                let state = reconstruct_exact_agg(&entry.sketch_type_name, &entry.sketch_bytes)
-                    .ok_or("immutable input accumulator cannot be decoded")?;
-                if windows
-                    .insert((record.start_ts, record.end_ts), Arc::from(state))
-                    .is_some()
-                {
-                    // No last-writer-wins or implicit merge at a frozen source
-                    // boundary: the producer must publish one complete state.
-                    return Err("immutable input has multiple states for one window".into());
-                }
-            }
-        }
-        if windows.keys().copied().collect::<BTreeSet<_>>() != *expected_windows {
-            return Err("immutable input window coverage is missing, expired, or ambiguous".into());
-        }
-        self.validate_routed_catalog_generation(Some(generation.as_ref()))?;
-        Ok(FrozenExactWindows {
-            stored_output_reference,
-            storage_handle: sid,
-            definition,
-            generation: Arc::clone(generation),
-            group: group.clone(),
-            windows,
-            singleton_population_complete: singleton_population_complete
-                && observed_populations.len() == 1,
-        })
-    }
-}
-
-impl SketchStore {
-    fn validate_frozen_cohort_bindings<'a>(
-        &self,
-        config: &asap_types::PrecomputeMaterialization,
-        sources: &'a [FrozenExactWindows],
-        instances: &HashMap<u64, SdsBinding>,
-    ) -> Result<&'a Arc<CatalogGeneration>, String> {
-        let generation = &sources
-            .first()
-            .ok_or("immutable publication input cohort is empty")?
-            .generation;
-        let definitions = sources.iter().map(|source| source.definition).collect();
-        if config
-            .derived_input
-            .as_ref()
-            .is_none_or(|input| input.inputs != definitions)
-        {
-            return Err(
-                "immutable publication input definitions differ from installed identity".into(),
-            );
-        }
-        let mut populations = BTreeSet::new();
-        for source in sources {
-            if &source.generation != generation
-                || !populations.insert((source.definition, source.storage_handle, &source.group))
-            {
-                return Err(
-                    "immutable publication input cohort has mixed generations or duplicates".into(),
-                );
-            }
-            let binding = instances
-                .get(&source.storage_handle)
-                .ok_or("immutable source was removed")?;
-            if binding.stored_output_reference != Some(source.stored_output_reference.clone())
-                || binding.metadata.policy_fp != source.definition.fingerprint()
-                || binding.catalog_generation.as_deref() != Some(generation.as_ref())
-                || !binding.metadata.is_writable()
-            {
-                return Err("immutable source identity or lifetime changed".into());
-            }
-        }
-        self.validate_routed_catalog_generation(Some(generation.as_ref()))?;
-        Ok(generation)
-    }
-
-    fn validate_complete_raw_cohort_locked(
-        &self,
-        cohort: &CompleteRawMaintenanceCohort,
-        instances: &HashMap<u64, SdsBinding>,
-        finite_complete: bool,
-    ) -> Result<(), String> {
-        if !finite_complete {
-            return Err("complete raw publication requires the original finite closure".into());
-        }
-        let mut supplied = BTreeMap::<StoredOutputId, BTreeSet<u64>>::new();
-        for input in cohort.inputs() {
-            supplied
-                .entry(input.definition)
-                .or_default()
-                .insert(input.storage_handle);
-        }
-        for (definition, supplied_sids) in supplied {
-            let mut current = self.durable_maintenance_population_ids(definition)?;
-            current.extend(
-                instances
-                    .iter()
-                    .filter(|(_, binding)| {
-                        binding.metadata.policy_fp == definition.fingerprint()
-                            && binding.stored_output_reference
-                                == self.descriptors.stored_output_reference(definition)
-                            && binding.catalog_generation.as_deref()
-                                == cohort
-                                    .inputs()
-                                    .first()
-                                    .map(|input| input.generation.as_ref())
-                    })
-                    .map(|(sid, _)| *sid),
-            );
-            if current != supplied_sids {
-                return Err("complete raw population changed before publication".into());
-            }
-        }
-        // The caller holds admission through commit. A finite closure rejects
-        // all raw additive entry points, so the stored group payload set cannot
-        // grow between inventory capture and this transaction.
-        Ok(())
-    }
-
-    pub(crate) fn recover_frozen_maintenance_output(
-        &self,
-        sid: u64,
-        config: &asap_types::PrecomputeMaterialization,
-        sources: &[FrozenExactWindows],
-        digest: [u8; 32],
-        window: (u64, u64),
-    ) -> Result<bool, String> {
-        self.recover_frozen_output(
-            sid,
-            config,
-            FrozenPublicationInputs::Requested(sources),
-            digest,
-            window,
-        )
-    }
-
-    pub(crate) fn recover_complete_raw_maintenance_output(
-        &self,
-        sid: u64,
-        config: &asap_types::PrecomputeMaterialization,
-        cohort: &CompleteRawMaintenanceCohort,
-        digest: [u8; 32],
-        window: (u64, u64),
-    ) -> Result<bool, String> {
-        self.recover_frozen_output(
-            sid,
-            config,
-            FrozenPublicationInputs::Complete(cohort),
-            digest,
-            window,
-        )
-    }
-
-    fn recover_frozen_output(
-        &self,
-        sid: u64,
-        config: &asap_types::PrecomputeMaterialization,
-        proof: FrozenPublicationInputs<'_>,
-        digest: [u8; 32],
-        window: (u64, u64),
-    ) -> Result<bool, String> {
-        let sources = proof.inputs();
-        let _admission = self
-            .admission
-            .read()
-            .map_err(|_| "admission registry poisoned")?;
-        let instances = self
-            .instances
-            .read()
-            .map_err(|_| "instance registry poisoned")?;
-        let generation = self.validate_frozen_cohort_bindings(config, sources, &instances)?;
-        if let FrozenPublicationInputs::Complete(cohort) = &proof {
-            if cohort.window != window {
-                return Err("complete raw cohort window differs from output".into());
-            }
-            self.validate_complete_raw_cohort_locked(
-                cohort,
-                &instances,
-                _admission.is_finite_complete(),
-            )?;
-        }
-
-        let Some(binding) = instances.get(&sid) else {
-            return Ok(false);
-        };
-        if binding.metadata.policy_fp != config.policy_fingerprint()
-            || binding.catalog_generation.as_deref() != Some(generation.as_ref())
-            || !binding.metadata.is_writable()
-        {
-            return Err("immutable output identity or lifetime changed".into());
-        }
-        let record = self
-            .metadata_record_without_completion(binding)
-            .ok_or("immutable output has no catalog metadata")?;
-        let publisher = self
-            .immutable_publisher
-            .read()
-            .map_err(|_| "publisher registry poisoned")?
-            .upgrade()
-            .ok_or("immutable publication requires active persistence")?;
-        let _mutation = self.begin_state_mutation();
-        let mut completed = self
-            .completed_windows
-            .write()
-            .map_err(|_| "completion registry poisoned")?;
-        if publisher
-            .resume_matching_immutable_window(&record, digest, window.0, window.1)
-            .map_err(|error| error.to_string())?
-            .is_some()
-        {
-            completed
-                .entry(sid)
-                .and_modify(|end| *end = (*end).max(window.1))
-                .or_insert(window.1);
-            return Ok(true);
-        }
-        let found = publisher
-            .lookup_immutable_window(&record, digest, window.0, window.1)
-            .map_err(|error| error.to_string())?
-            .is_some();
-        if found {
-            completed
-                .entry(sid)
-                .and_modify(|end| *end = (*end).max(window.1))
-                .or_insert(window.1);
-        }
-        Ok(found)
-    }
-
-    /// Publish a derived result without passing it through additive hot-state
-    /// append. The existing part reservation commits it once and seals it.
-    pub(crate) fn publish_frozen_maintenance_output(
-        &self,
-        sid: u64,
-        config: &asap_types::PrecomputeMaterialization,
-        output: &crate::storage_engines::types::PrecomputedOutput,
-        state: &dyn AggregateCore,
-        sources: &[FrozenExactWindows],
-        input_digest: [u8; 32],
-    ) -> Result<bool, String> {
-        self.publish_frozen_output(
-            sid,
-            config,
-            output,
-            state,
-            FrozenPublicationInputs::Requested(sources),
-            input_digest,
-        )
-    }
-
-    pub(crate) fn publish_complete_raw_maintenance_output(
-        &self,
-        sid: u64,
-        config: &asap_types::PrecomputeMaterialization,
-        output: &crate::storage_engines::types::PrecomputedOutput,
-        state: &dyn AggregateCore,
-        cohort: &CompleteRawMaintenanceCohort,
-        input_digest: [u8; 32],
-    ) -> Result<bool, String> {
-        self.publish_frozen_output(
-            sid,
-            config,
-            output,
-            state,
-            FrozenPublicationInputs::Complete(cohort),
-            input_digest,
-        )
-    }
-
-    fn publish_frozen_output(
-        &self,
-        sid: u64,
-        config: &asap_types::PrecomputeMaterialization,
-        output: &crate::storage_engines::types::PrecomputedOutput,
-        state: &dyn AggregateCore,
-        proof: FrozenPublicationInputs<'_>,
-        input_digest: [u8; 32],
-    ) -> Result<bool, String> {
-        let sources = proof.inputs();
-        use persistence::source::{EpochSnapshot, EpochSnapshotEntry};
-        // One guard excludes source retirement through target registration
-        // and commit; admission excludes catalog transitions in the same span.
-        let _admission = self
-            .admission
-            .read()
-            .map_err(|_| "admission registry poisoned")?;
-        let mut instances = self
-            .instances
-            .write()
-            .map_err(|_| "instance registry poisoned")?;
-        let generation = self.validate_frozen_cohort_bindings(config, sources, &instances)?;
-        if let FrozenPublicationInputs::Complete(cohort) = &proof {
-            if cohort.window != (output.start_timestamp, output.end_timestamp) {
-                return Err("complete raw cohort window differs from output".into());
-            }
-            self.validate_complete_raw_cohort_locked(
-                cohort,
-                &instances,
-                _admission.is_finite_complete(),
-            )?;
-        }
-
-        if output.policy_fp != config.policy_fingerprint()
-            || output.catalog_generation.as_deref() != Some(generation.as_ref())
-        {
-            return Err("derived publication differs from its installed input identity".into());
-        }
-        let labels = self
-            .register_precompute_output_with_instances(sid, config, output, &mut instances)
-            .ok_or("derived output registration failed")?;
-        let _mutation = self.begin_state_mutation();
-        let binding = instances.get(&sid).ok_or("derived output was removed")?;
-        if !binding.metadata.is_writable()
-            || binding.metadata.policy_fp != output.policy_fp
-            || binding.catalog_generation.as_deref() != Some(generation.as_ref())
-        {
-            return Err("derived publication physical lifetime changed".into());
-        }
-        let mut completed = self
-            .completed_windows
-            .write()
-            .map_err(|_| "completion registry poisoned")?;
-        let record = self
-            .metadata_record_without_completion(binding)
-            .ok_or("derived publication lacks catalog metadata")?;
-        let publisher = self
-            .immutable_publisher
-            .read()
-            .map_err(|_| "publisher registry poisoned")?
-            .upgrade()
-            .ok_or("immutable publication requires active persistence")?;
-        let bytes = state.serialize_to_bytes();
-        let snapshot = EpochSnapshot {
-            agg_id: sid,
-            epoch_id: 0,
-            min_ts: output.start_timestamp,
-            max_ts: output.end_timestamp,
-            approx_bytes: bytes.len(),
-            entries: vec![EpochSnapshotEntry {
-                start_ts: output.start_timestamp,
-                end_ts: output.end_timestamp,
-                label: Some(crate::storage_engines::types::KeyByLabelValues {
-                    labels: labels.into_values().collect(),
-                }),
-                sketch_type_name: state.type_name().to_string(),
-                encoding_tag: match binding.metadata.agg_kind {
-                    AggKind::Sketch { .. } => encoding_to_tag(SketchEncoding::MsgpackFull),
-                    AggKind::ExactAgg { .. } => 0,
-                },
-                sketch_bytes: bytes,
-            }],
-        };
-        // Another executor may have completed the same input after our first
-        // lookup. Reuse its durable payload instead of comparing a newly built,
-        // potentially randomized sketch byte representation.
-        if publisher
-            .lookup_immutable_window(
-                &record,
-                input_digest,
-                output.start_timestamp,
-                output.end_timestamp,
-            )
-            .map_err(|error| error.to_string())?
-            .is_some()
-        {
-            completed
-                .entry(sid)
-                .and_modify(|end| *end = (*end).max(output.end_timestamp))
-                .or_insert(output.end_timestamp);
-            return Ok(false);
-        }
-        let published = publisher
-            .publish_immutable_window(&record, input_digest, &snapshot)
-            .map_err(|error| error.to_string())?;
-        completed
-            .entry(sid)
-            .and_modify(|end| *end = (*end).max(output.end_timestamp))
-            .or_insert(output.end_timestamp);
-        if !published.already_published {
-            crate::precompute_engine::metrics::record_materialized_outputs(1);
-        }
-        Ok(!published.already_published)
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use crate::storage_engines::types::PrecomputedOutput;
-    use asap_physical_operators::summary_kernels::SumAccumulator;
-    use asap_types::traits::SerializableToSink;
-
-    #[test]
-    fn complete_population_keeps_every_sid_and_rejects_missing_live_binding() {
-        // Multiple SIDs are inventory entries, never an implicit singleton;
-        // removing a live binding cannot hide its retained durable population.
-        let snapshot: control_plane::physical::compiler::BackendLocalPlanningInput =
-            serde_json::from_str(include_str!(
-                "../../../../../docs/examples/asapquery-planning-snapshot.json"
-            ))
-            .unwrap();
-        let plan = crate::tests::test_utilities::planning::quoted_snapshot(snapshot, false)
-            .compile_promql()
-            .unwrap();
-        let mut first = plan.precompute_plan.materializations[0].clone();
-        first.aggregation_type = asap_types::AggregationType::Sum;
-        first.aggregation_sub_type = "sum".into();
-        first.grouping_labels = ["instance".to_string()].into_iter().collect();
-        let mut target = first.clone();
-        target.derived_input = Some(asap_types::derived_input::DerivedInputIdentity {
-            inputs: BTreeSet::from([first.policy_fingerprint().into()]),
-            program_sha256: "0".repeat(64),
-        });
-        let configs = [first.clone(), first, target];
-        let catalog =
-            asap_types::summary_catalog::SummaryCatalog::from_materializations(1, 1, &configs)
-                .unwrap();
-        let store = Arc::new(SketchStore::new());
-        store
-            .install_summary_catalog(Arc::new(catalog.clone()))
-            .unwrap();
-        let generation = store.active_catalog_generation().unwrap();
-        let directory = tempfile::tempdir().unwrap();
-        let mut config = persistence::config::SketchStorePersistenceConfig::with_memory_limit(
-            1 << 24,
-            directory.path().to_path_buf(),
-        );
-        config.delete_older_than_ms = None;
-        config.hot_window_ms = None;
-        let mut persistence = store.start_persistence(config).unwrap();
-        for (index, config) in configs.iter().take(2).enumerate() {
-            let definition = config.policy_fingerprint().into();
-            let population = BTreeMap::from([("instance".to_string(), index.to_string())]);
-            let coordinate = asap_types::sds::SummaryInstanceCoordinates {
-                stored_output_id: definition,
-                time_range: HalfOpenTimeRange {
-                    start_ms: 0,
-                    end_ms: 1000,
-                },
-                group_values: population.clone(),
-            };
-            let revision = store
-                .admit_summary_updates(&generation, BTreeSet::from([coordinate.clone()]))
-                .unwrap();
-            let mut output = PrecomputedOutput::new(0, 1000, None, config.policy_fingerprint());
-            output.catalog_generation = Some(Arc::clone(&generation));
-            output.population_labels = Some(population);
-            let mut sum = SumAccumulator::new();
-            sum.update(5.0 + index as f64);
-            let sid = 900 + index as u64;
-            store
-                .publish_admitted_summary_update(
-                    &generation,
-                    &coordinate,
-                    revision,
-                    revision,
-                    2000,
-                    |writer| writer.ingest_precompute_with_series_id(sid, config, &output, &sum),
-                )
-                .unwrap();
-        }
-        let deadline =
-            crate::tests::test_utilities::timing::deadline(std::time::Duration::from_secs(5));
-        while !store.seal_finite_summary_input(&generation).unwrap() {
-            assert!(std::time::Instant::now() < deadline);
-            std::thread::sleep(std::time::Duration::from_millis(5));
-        }
-        let definition = configs[0].policy_fingerprint().into();
-        let parts = persistence.manifest.live_parts().len();
-        let metadata = persistence
-            .flusher
-            .metadata_store()
-            .load_strict()
-            .unwrap()
-            .len();
-        let inventory = store
-            .complete_raw_maintenance_population(definition, &generation)
-            .unwrap();
-        assert_eq!(
-            inventory.keys().copied().collect::<BTreeSet<_>>(),
-            BTreeSet::from([900, 901])
-        );
-        assert!(inventory.values().all(|groups| groups.len() == 1));
-        assert!(store
-            .completed_maintenance_coordinates(definition, &generation)
-            .is_err());
-        store.instances.write().unwrap().remove(&901);
-        assert!(store
-            .complete_raw_maintenance_population(definition, &generation)
-            .is_err());
-        assert_eq!(persistence.manifest.live_parts().len(), parts);
-        assert_eq!(
-            persistence
-                .flusher
-                .metadata_store()
-                .load_strict()
-                .unwrap()
-                .len(),
-            metadata
-        );
-        persistence.shutdown();
-    }
-
-    #[test]
-    fn cohort_requires_every_durable_source_in_one_catalog_generation() {
-        // Neither a missing second window nor a new catalog may yield a
-        // partially acquired cohort, even when the first source is complete.
-        let snapshot: control_plane::physical::compiler::BackendLocalPlanningInput =
-            serde_json::from_str(include_str!(
-                "../../../../../docs/examples/asapquery-planning-snapshot.json"
-            ))
-            .unwrap();
-        let plan = crate::tests::test_utilities::planning::quoted_snapshot(snapshot, false)
-            .compile_promql()
-            .unwrap();
-        let mut first = plan.precompute_plan.materializations[0].clone();
-        first.aggregation_type = asap_types::AggregationType::Sum;
-        first.aggregation_sub_type = "sum".into();
-        first.grouping_labels = std::iter::empty::<String>().collect();
-        let mut second = first.clone();
-        second.metric = "cohort_second".into();
-        let mut target = first.clone();
-        target.derived_input = Some(asap_types::derived_input::DerivedInputIdentity {
-            inputs: BTreeSet::from([
-                first.policy_fingerprint().into(),
-                second.policy_fingerprint().into(),
-            ]),
-            program_sha256: "0".repeat(64),
-        });
-        let configs = [first, second, target];
-        let catalog =
-            asap_types::summary_catalog::SummaryCatalog::from_materializations(1, 1, &configs)
-                .unwrap();
-        let mut store = Arc::new(SketchStore::new());
-        store
-            .install_summary_catalog(Arc::new(catalog.clone()))
-            .unwrap();
-        let generation = store.active_catalog_generation().unwrap();
-        let directory = tempfile::tempdir().unwrap();
-        let mut config = persistence::config::SketchStorePersistenceConfig::with_memory_limit(
-            1 << 24,
-            directory.path().to_path_buf(),
-        );
-        config.delete_older_than_ms = None;
-        config.hot_window_ms = None;
-        let mut persistence = store.start_persistence(config).unwrap();
-        let mut requests = Vec::new();
-        for (index, config) in configs.iter().take(2).enumerate() {
-            let definition = config.policy_fingerprint().into();
-            let coordinate = asap_types::sds::SummaryInstanceCoordinates {
-                stored_output_id: definition,
-                time_range: HalfOpenTimeRange {
-                    start_ms: 0,
-                    end_ms: 1000,
-                },
-                group_values: BTreeMap::new(),
-            };
-            let revision = store
-                .admit_summary_updates(&generation, BTreeSet::from([coordinate.clone()]))
-                .unwrap();
-            let mut output = PrecomputedOutput::new(0, 1000, None, config.policy_fingerprint());
-            output.catalog_generation = Some(Arc::clone(&generation));
-            let mut sum = SumAccumulator::new();
-            sum.update(5.0 + index as f64);
-            let sid = 900 + index as u64;
-            store
-                .publish_admitted_summary_update(
-                    &generation,
-                    &coordinate,
-                    revision,
-                    revision,
-                    2000,
-                    |writer| writer.ingest_precompute_with_series_id(sid, config, &output, &sum),
-                )
-                .unwrap();
-            requests.push((
-                sid,
-                definition,
-                BTreeSet::from([(0, 1000)]),
-                BTreeMap::new(),
-            ));
-        }
-        // Only the first population has the next window: completeness must
-        // reject the partial cohort even after all writes are durably sealed.
-        let extra_coordinate = asap_types::sds::SummaryInstanceCoordinates {
-            stored_output_id: configs[0].policy_fingerprint().into(),
-            time_range: HalfOpenTimeRange {
-                start_ms: 1000,
-                end_ms: 2000,
-            },
-            group_values: BTreeMap::new(),
-        };
-        let extra_revision = store
-            .admit_summary_updates(&generation, BTreeSet::from([extra_coordinate.clone()]))
-            .unwrap();
-        let mut extra_window =
-            PrecomputedOutput::new(1000, 2000, None, configs[0].policy_fingerprint());
-        extra_window.catalog_generation = Some(Arc::clone(&generation));
-        let mut extra_sum = SumAccumulator::new();
-        extra_sum.update(99.0);
-        store
-            .publish_admitted_summary_update(
-                &generation,
-                &extra_coordinate,
-                extra_revision,
-                extra_revision,
-                3000,
-                |writer| {
-                    writer.ingest_precompute_with_series_id(
-                        900,
-                        &configs[0],
-                        &extra_window,
-                        &extra_sum,
-                    )
-                },
-            )
-            .unwrap();
-        let deadline =
-            crate::tests::test_utilities::timing::deadline(std::time::Duration::from_secs(5));
-        while !store.seal_finite_summary_input(&generation).unwrap() {
-            assert!(std::time::Instant::now() < deadline);
-            std::thread::sleep(std::time::Duration::from_millis(5));
-        }
-        let definitions = requests.iter().map(|request| request.1).collect();
-        let parts = persistence.manifest.live_parts().len();
-        let complete = store
-            .read_complete_raw_maintenance_cohort(&generation, &definitions, (0, 1000))
-            .unwrap();
-        assert_eq!(complete.inputs().len(), 2);
-        assert!(store
-            .read_complete_raw_maintenance_cohort(&generation, &definitions, (1000, 2000))
-            .is_err());
-        let cohort = store
-            .read_frozen_exact_cohort(&generation, &definitions, &requests)
-            .unwrap();
-        assert_eq!(cohort.len(), 2);
-        assert!(cohort.iter().all(|input| input.generation == generation));
-        requests[1].2.insert((1000, 2000));
-        assert!(store
-            .read_frozen_exact_cohort(&generation, &definitions, &requests)
-            .is_err());
-        assert_eq!(persistence.manifest.live_parts().len(), parts);
-        let target = &configs[2];
-        let mut output = PrecomputedOutput::new(0, 1000, None, target.policy_fingerprint());
-        output.catalog_generation = Some(Arc::clone(&generation));
-        let mut sum = SumAccumulator::new();
-        sum.update(11.0);
-        assert!(store
-            .publish_complete_raw_maintenance_output(
-                902, target, &output, &sum, &complete, [42; 32]
-            )
-            .unwrap());
-        assert!(store
-            .recover_complete_raw_maintenance_output(902, target, &complete, [42; 32], (0, 1000))
-            .unwrap());
-        let published_parts = persistence.manifest.live_parts().len();
-        assert!(store
-            .recover_complete_raw_maintenance_output(902, target, &complete, [42; 32], (1000, 2000))
-            .is_err());
-        // Reconstruct the proof from durable sources after a real restart;
-        // recovery must reuse the committed output without rebuilding it.
-        persistence.shutdown();
-        store = Arc::new(SketchStore::new());
-        store
-            .install_summary_catalog(Arc::new(catalog.clone()))
-            .unwrap();
-        let mut restart_config =
-            persistence::config::SketchStorePersistenceConfig::with_memory_limit(
-                1 << 24,
-                directory.path().to_path_buf(),
-            );
-        restart_config.delete_older_than_ms = None;
-        restart_config.hot_window_ms = None;
-        persistence = store.start_persistence(restart_config).unwrap();
-        let complete = store
-            .read_complete_raw_maintenance_cohort(&generation, &definitions, (0, 1000))
-            .unwrap();
-        assert!(store
-            .recover_complete_raw_maintenance_output(902, target, &complete, [42; 32], (0, 1000))
-            .unwrap());
-        assert_eq!(persistence.manifest.live_parts().len(), published_parts);
-        // A retained proof cannot authorize a subset after even an empty raw
-        // lifetime is registered. No new target reservation may be created.
-        let mut extra = PrecomputedOutput::new(0, 1000, None, configs[0].policy_fingerprint());
-        extra.catalog_generation = Some(Arc::clone(&generation));
-        assert!(store
-            .register_precompute_output(904, &configs[0], &extra)
-            .is_some());
-        assert!(store
-            .publish_complete_raw_maintenance_output(
-                905, target, &output, &sum, &complete, [42; 32]
-            )
-            .is_err());
-        assert!(!store.instances.read().unwrap().contains_key(&905));
-        assert_eq!(persistence.manifest.live_parts().len(), published_parts);
-        assert!(!persistence
-            .flusher
-            .metadata_store()
-            .load_strict()
-            .unwrap()
-            .iter()
-            .any(|record| record.storage_handle == 905));
-        store.force_expire(901).unwrap();
-        assert!(store
-            .publish_frozen_maintenance_output(903, target, &output, &sum, &cohort, [42; 32])
-            .is_err());
-        assert!(store
-            .recover_frozen_maintenance_output(902, target, &cohort, [42; 32], (0, 1000))
-            .is_err());
-        assert!(!store.instances.read().unwrap().contains_key(&903));
-        assert_eq!(persistence.manifest.live_parts().len(), published_parts);
-        assert!(!store
-            .persistence_metadata
-            .read()
-            .unwrap()
-            .as_ref()
-            .unwrap()
-            .load_strict()
-            .unwrap()
-            .iter()
-            .any(|record| record.storage_handle == 903));
-        let mut next = catalog;
-        next.plan_version += 1;
-        store.install_summary_catalog(Arc::new(next)).unwrap();
-        requests[1].2.remove(&(1000, 2000));
-        assert!(store
-            .read_frozen_exact_cohort(&generation, &definitions, &requests)
-            .is_err());
-        persistence.shutdown();
-    }
-
-    #[test]
-    fn complete_populations_publish_once_and_reject_foreign_generation() {
-        let mut fixture: serde_json::Value = serde_json::from_str(include_str!(
-            "../../../../../docs/examples/asapquery-compatibility-demo-snapshot.json"
-        ))
-        .unwrap();
-        let mut entry = fixture["query_workload"]["repeating_queries"][3].clone();
-        entry["query"] = "quantile(0.9, sum_over_time(immutable_value[1m]))".into();
-        entry["demand"]["fixed_interval_at"]["interval"] = 60_000.into();
-        entry["demand"]["fixed_interval_at"]["evaluation_phase"] = 0.into();
-        fixture["query_workload"]["repeating_queries"] = serde_json::json!([entry]);
-        let snapshot: control_plane::physical::compiler::BackendLocalPlanningInput =
-            serde_json::from_value(fixture).unwrap();
-        let plan = crate::tests::test_utilities::planning::quoted_snapshot(snapshot, false)
-            .compile_promql()
-            .unwrap();
-        let source = plan
-            .precompute_plan
-            .materializations
-            .iter()
-            .find(|config| config.derived_input.is_none())
-            .unwrap();
-        let target = plan
-            .precompute_plan
-            .materializations
-            .iter()
-            .find(|config| config.derived_input.is_some())
-            .unwrap();
-        let store = Arc::new(SketchStore::new());
-        store
-            .install_summary_catalog(Arc::new(plan.summary_catalog.clone()))
-            .unwrap();
-        let generation = store.active_catalog_generation().unwrap();
-        let directory = tempfile::tempdir().unwrap();
-        let mut config = persistence::config::SketchStorePersistenceConfig::with_memory_limit(
-            1 << 24,
-            directory.path().to_path_buf(),
-        );
-        config.delete_older_than_ms = None;
-        config.hot_window_ms = None;
-        let mut persistence = store.start_persistence(config).unwrap();
-        for (instance, value) in [("a", 5.0), ("b", 15.0)] {
-            let population = BTreeMap::from([("instance".to_string(), instance.to_string())]);
-            let coordinate = asap_types::sds::SummaryInstanceCoordinates {
-                stored_output_id: source.policy_fingerprint().into(),
-                time_range: HalfOpenTimeRange {
-                    start_ms: 0,
-                    end_ms: 60_000,
-                },
-                group_values: population.clone(),
-            };
-            let revision = store
-                .admit_summary_updates(&generation, BTreeSet::from([coordinate.clone()]))
-                .unwrap();
-            let mut output = PrecomputedOutput::new(0, 60_000, None, source.policy_fingerprint());
-            output.population_labels = Some(population);
-            output.catalog_generation = Some(Arc::clone(&generation));
-            let mut sum = SumAccumulator::new();
-            sum.update(value);
-            store
-                .publish_admitted_summary_update(
-                    &generation,
-                    &coordinate,
-                    revision,
-                    revision,
-                    120_000,
-                    |writer| writer.ingest_precompute_with_series_id(700, source, &output, &sum),
-                )
-                .unwrap();
-        }
-        assert!(store
-            .complete_raw_maintenance_population(source.policy_fingerprint().into(), &generation)
-            .is_err());
-        let deadline =
-            crate::tests::test_utilities::timing::deadline(std::time::Duration::from_secs(5));
-        while !store.seal_finite_summary_input(&generation).unwrap() {
-            assert!(std::time::Instant::now() < deadline);
-            std::thread::sleep(std::time::Duration::from_millis(5));
-        }
-        let source_id = source.policy_fingerprint().into();
-        let coordinates = store
-            .completed_maintenance_coordinates(source_id, &generation)
-            .unwrap();
-        assert_eq!(coordinates.len(), 1);
-        assert_eq!(coordinates[&700].len(), 2);
-        assert_eq!(
-            store
-                .complete_raw_maintenance_population(source_id, &generation)
-                .unwrap(),
-            coordinates
-        );
-
-        let group = BTreeMap::from([("instance".into(), "a".into())]);
-        let frozen = store
-            .read_frozen_exact_windows(
-                700,
-                source_id,
-                &generation,
-                &BTreeSet::from([(0, 60_000)]),
-                &group,
-            )
-            .unwrap();
-        assert!(!frozen.singleton_population_complete);
-        // The global reduction must consume both populations in one read set.
-        let request = |name: &str| {
-            (
-                700,
-                source_id,
-                BTreeSet::from([(0, 60_000)]),
-                BTreeMap::from([("instance".to_string(), name.to_string())]),
-            )
-        };
-        let cohort = store
-            .read_frozen_exact_cohort(
-                &generation,
-                &BTreeSet::from([source_id]),
-                &[request("b"), request("a")],
-            )
-            .unwrap();
-        assert_eq!(cohort.len(), 2);
-        assert_eq!(cohort[0].group["instance"], "a");
-        assert_eq!(cohort[1].group["instance"], "b");
-        assert!(store
-            .read_frozen_exact_cohort(
-                &generation,
-                &BTreeSet::from([source_id]),
-                &[request("a"), request("a")]
-            )
-            .is_err());
-        assert!(store
-            .read_frozen_exact_cohort(
-                &generation,
-                &BTreeSet::from([source_id, target.policy_fingerprint().into()]),
-                &[request("a")]
-            )
-            .is_err());
-        assert!(store
-            .read_frozen_exact_cohort(
-                &generation,
-                &BTreeSet::from([source_id]),
-                &[request("a"), request("absent")]
-            )
-            .is_err());
-        let parts_before = persistence.manifest.live_parts().len();
-        let resolver = crate::drivers::ingest::series_resolver::SeriesIdResolver::new();
-        crate::precompute_engine::maintenance_runtime::execute_finite_maintenance(
-            &store,
-            &resolver,
-            &plan.precompute_plan,
-        )
-        .unwrap();
-        let targets = store.series_ids_for_policy(target.policy_fingerprint());
-        assert_eq!(targets.len(), 1);
-        let target_sid = targets[0];
-        let published = store
-            .completed_maintenance_coordinates(target.policy_fingerprint().into(), &generation)
-            .unwrap();
-        assert_eq!(
-            published,
-            BTreeMap::from([(
-                target_sid,
-                BTreeMap::from([(BTreeMap::new(), BTreeSet::from([(0, 60_000)]))]),
-            )])
-        );
-        let assert_complete_output = |store: &SketchStore| {
-            use crate::storage_engines::sketch_db::data::SketchEncoding;
-            use asap_physical_operators::summary_kernels::DDSketchAccumulator;
-            let rows = store.query_range(target_sid, 0, 60_000);
-            assert_eq!(rows.len(), 1);
-            assert!(rows[0].series_label_values.is_empty());
-            assert_eq!(rows[0].samples.len(), 1);
-            let frames = &rows[0].samples[&60_000];
-            assert_eq!(frames.len(), 1);
-            let sketch = match frames[0].encoding {
-                SketchEncoding::MsgpackFull => {
-                    DDSketchAccumulator::from_msgpack_bytes(&frames[0].bytes).unwrap()
-                }
-                SketchEncoding::ProtoFull => {
-                    DDSketchAccumulator::from_sketchlib_proto_bytes(&frames[0].bytes).unwrap()
-                }
-                other => panic!("unexpected derived encoding: {other:?}"),
-            };
-            assert_eq!(sketch.inner.total_count(), 2);
-            for (q, expected) in [(0.0, 5.0), (1.0, 15.0)] {
-                let actual = sketch.inner.quantile(q).unwrap();
-                assert!((actual - expected).abs() <= expected * sketch.inner.wire_alpha());
-            }
-            frames[0].bytes.clone()
-        };
-        let bytes = assert_complete_output(&store);
-        assert_eq!(persistence.manifest.live_parts().len(), parts_before + 1);
-        crate::precompute_engine::maintenance_runtime::execute_finite_maintenance(
-            &store,
-            &resolver,
-            &plan.precompute_plan,
-        )
-        .unwrap();
-        assert_eq!(assert_complete_output(&store), bytes);
-        assert_eq!(persistence.manifest.live_parts().len(), parts_before + 1);
-        persistence.shutdown();
-
-        // Replaying the same generation after recovery must reuse the output.
-        let recovered = Arc::new(SketchStore::new());
-        recovered
-            .install_summary_catalog(Arc::new(plan.summary_catalog.clone()))
-            .unwrap();
-        let mut recovery_config =
-            persistence::config::SketchStorePersistenceConfig::with_memory_limit(
-                1 << 24,
-                directory.path().to_path_buf(),
-            );
-        recovery_config.delete_older_than_ms = None;
-        recovery_config.hot_window_ms = None;
-        let mut recovery = recovered.start_persistence(recovery_config).unwrap();
-        crate::precompute_engine::maintenance_runtime::execute_finite_maintenance(
-            &recovered,
-            &resolver,
-            &plan.precompute_plan,
-        )
-        .unwrap();
-        assert_eq!(assert_complete_output(&recovered), bytes);
-        assert_eq!(recovery.manifest.live_parts().len(), parts_before + 1);
-        recovery.shutdown();
-
-        // A catalog transition deliberately leaves old-generation payload
-        // unbound on restart. It must still count against singleton proof.
-        let mut next_catalog = plan.summary_catalog.clone();
-        next_catalog.plan_version += 1;
-        let restarted = Arc::new(SketchStore::new());
-        restarted
-            .install_summary_catalog(Arc::new(next_catalog))
-            .unwrap();
-        let next_generation = restarted.active_catalog_generation().unwrap();
-        let mut restart_config =
-            persistence::config::SketchStorePersistenceConfig::with_memory_limit(
-                1 << 24,
-                directory.path().to_path_buf(),
-            );
-        restart_config.delete_older_than_ms = None;
-        restart_config.hot_window_ms = None;
-        let mut restored = restarted.start_persistence(restart_config).unwrap();
-        let population = BTreeMap::from([("instance".to_string(), "new".to_string())]);
-        let coordinate = asap_types::sds::SummaryInstanceCoordinates {
-            stored_output_id: source_id,
-            time_range: HalfOpenTimeRange {
-                start_ms: 0,
-                end_ms: 60_000,
-            },
-            group_values: population.clone(),
-        };
-        let revision = restarted
-            .admit_summary_updates(&next_generation, BTreeSet::from([coordinate.clone()]))
-            .unwrap();
-        let mut output = PrecomputedOutput::new(0, 60_000, None, source.policy_fingerprint());
-        output.population_labels = Some(population.clone());
-        output.catalog_generation = Some(Arc::clone(&next_generation));
-        let mut sum = SumAccumulator::new();
-        sum.update(9.0);
-        restarted
-            .publish_admitted_summary_update(
-                &next_generation,
-                &coordinate,
-                revision,
-                revision,
-                120_000,
-                |writer| writer.ingest_precompute_with_series_id(702, source, &output, &sum),
-            )
-            .unwrap();
-        let deadline =
-            crate::tests::test_utilities::timing::deadline(std::time::Duration::from_secs(5));
-        while !restarted
-            .seal_finite_summary_input(&next_generation)
-            .unwrap()
-        {
-            assert!(std::time::Instant::now() < deadline);
-            std::thread::sleep(std::time::Duration::from_millis(5));
-        }
-        assert_eq!(
-            restarted
-                .durable_maintenance_population_ids(source_id)
-                .unwrap(),
-            BTreeSet::from([700, 702])
-        );
-        assert!(
-            !restarted
-                .read_frozen_exact_windows(
-                    702,
-                    source_id,
-                    &next_generation,
-                    &BTreeSet::from([(0, 60_000)]),
-                    &population
-                )
-                .unwrap()
-                .singleton_population_complete
-        );
-        let mut next_plan = plan.precompute_plan.clone();
-        next_plan.summary_catalog = Some(next_generation.as_ref().clone());
-        let parts_before = restored.manifest.live_parts().len();
-        let durable_records = || {
-            restored
-                .flusher
-                .metadata_store()
-                .load_strict()
-                .unwrap()
-                .into_iter()
-                .map(|record| (record.storage_handle, serde_json::to_value(record).unwrap()))
-                .collect::<BTreeMap<_, _>>()
-        };
-        let records_before = durable_records();
-        assert!(
-            crate::precompute_engine::maintenance_runtime::execute_finite_maintenance(
-                &restarted, &resolver, &next_plan
-            )
-            .is_err()
-        );
-        assert!(restarted
-            .series_ids_for_policy(target.policy_fingerprint())
-            .is_empty());
-        assert_eq!(restored.manifest.live_parts().len(), parts_before);
-        assert_eq!(durable_records(), records_before);
-        restored.shutdown();
-    }
-
-    #[test]
-    fn committed_recovery_restores_live_seal_and_rejects_additive_derived_writes() {
-        // A durable sidecar may survive an I/O error before the caller updates
-        // its live seal. Recovery must repair admission, not only return a hit.
-        let snapshot: control_plane::physical::compiler::BackendLocalPlanningInput =
-            serde_json::from_str(include_str!(
-                "../../../../../docs/examples/asapquery-planning-snapshot.json"
-            ))
-            .unwrap();
-        let plan = crate::tests::test_utilities::planning::quoted_snapshot(snapshot, false)
-            .compile_promql()
-            .unwrap();
-        let mut source_config = plan.precompute_plan.materializations[0].clone();
-        source_config.aggregation_type = asap_types::AggregationType::Sum;
-        source_config.aggregation_sub_type = "sum".into();
-        let source_id = source_config.policy_fingerprint().into();
-        let mut target = source_config.clone();
-        target.derived_input = Some(asap_types::derived_input::DerivedInputIdentity {
-            inputs: BTreeSet::from([source_id]),
-            program_sha256: "0".repeat(64),
-        });
-        let catalog = asap_types::summary_catalog::SummaryCatalog::from_materializations(
-            1,
-            1,
-            &[source_config.clone(), target.clone()],
-        )
-        .unwrap();
-        let store = Arc::new(SketchStore::new());
-        store.install_summary_catalog(Arc::new(catalog)).unwrap();
-        let directory = tempfile::tempdir().unwrap();
-        let mut config = persistence::config::SketchStorePersistenceConfig::with_memory_limit(
-            1 << 24,
-            directory.path().to_path_buf(),
-        );
-        config.delete_older_than_ms = None;
-        config.hot_window_ms = None;
-        let mut persistence = store.start_persistence(config).unwrap();
-        let generation = store.active_catalog_generation().unwrap();
-        let mut output = PrecomputedOutput::new(0, 1000, None, target.policy_fingerprint());
-        output.catalog_generation = Some(Arc::clone(&generation));
-        let mut source_output = output.clone();
-        source_output.policy_fp = source_config.policy_fingerprint();
-        store
-            .register_precompute_output(600, &source_config, &source_output)
-            .unwrap();
-        store
-            .register_precompute_output(601, &target, &output)
-            .unwrap();
-        let record = store
-            .metadata_record(&store.instances.read().unwrap()[&601])
-            .unwrap();
-        let state = SumAccumulator::new();
-        let snapshot = persistence::source::EpochSnapshot {
-            agg_id: 601,
-            epoch_id: 0,
-            min_ts: 0,
-            max_ts: 1000,
-            approx_bytes: 0,
-            entries: vec![persistence::source::EpochSnapshotEntry {
-                start_ts: 0,
-                end_ts: 1000,
-                label: None,
-                sketch_type_name: state.type_name().into(),
-                encoding_tag: 0,
-                sketch_bytes: state.serialize_to_bytes(),
-            }],
-        };
-        persistence
-            .flusher
-            .publish_immutable_window(&record, [7; 32], &snapshot)
-            .unwrap();
-        assert!(!store.completed_windows.read().unwrap().contains_key(&601));
-        let input = FrozenExactWindows {
-            stored_output_reference: store
-                .descriptors
-                .stored_output_reference(source_id)
-                .unwrap(),
-            storage_handle: 600,
-            definition: source_id,
-            generation,
-            group: BTreeMap::new(),
-            windows: BTreeMap::new(),
-            singleton_population_complete: false,
-        };
-        assert!(store
-            .recover_frozen_maintenance_output(
-                601,
-                &target,
-                std::slice::from_ref(&input),
-                [7; 32],
-                (0, 1000)
-            )
-            .unwrap());
-        assert_eq!(
-            store.completed_windows.read().unwrap().get(&601),
-            Some(&1000)
-        );
-        assert!(!store.append_precompute(
-            601,
-            BTreeMap::new(),
-            (2000, 3000),
-            Box::new(SumAccumulator::new())
-        ));
-        assert!(!store.append_sample(
-            601,
-            BTreeMap::new(),
-            (2000, 3000),
-            SketchSampleState {
-                bytes: vec![],
-                encoding: SketchEncoding::MsgpackFull,
-            }
-        ));
-        persistence.shutdown();
-    }
-}
diff --git a/data_plane/src/storage_engines/sketch_db/index/mod.rs b/data_plane/src/storage_engines/sketch_db/index/mod.rs
deleted file mode 100644
index d831682f2..000000000
--- a/data_plane/src/storage_engines/sketch_db/index/mod.rs
+++ /dev/null
@@ -1,6923 +0,0 @@
-//! Sketch index — Phase 5 of the controller-into-backend refactor (2026-05).
-//!
-//! Two-level index:
-//! - `instances`: sid → SummarySeriesMetadata (one entry per logical
-//!   sketch instance — its metric name, group-by KEY set, capability,
-//!   sketch_type, sketch_config, accuracy bound).
-//! - `series`: sid → per-sid storage (`SidStoreData`) carrying the
-//!   per-window sketch state. Intern table per sid maps the group-by
-//!   VALUES vector to a compact `LabelValuesId = u32`; columnar
-//!   `MutableEpoch` + sealed-epoch ring delivers the legacy
-//!   SketchStore's six storage optimizations end-to-end.
-//!
-//! Ghost sids (registered but never carrying state) are valid — they
-//! exist when an agent registers a pre-merge identity that the gateway
-//! folds into a different (post-merge) identity before backend ever sees
-//! the sketch payload. Query path treats ghost sids as ASAP-tier MISS
-//! and reports a capability miss (the HTTP layer forwards those).
-//!
-//! See design doc §4.6 ("OTLP metadata model + backend store layout") at
-//! `docs/design_docs/series-identity.md`.
-
-use asap_types::sds::StoredOutputReference;
-use std::collections::{BTreeMap, BTreeSet, HashMap, HashSet};
-use std::sync::{Arc, RwLock};
-use std::time::{Duration, SystemTime, UNIX_EPOCH};
-
-use asap_types::sds::{
-    CatalogGeneration, HalfOpenTimeRange, InstanceCompleteness, InstanceLifecycle,
-    ObservedSummaryInventory, StoredOutputId, SummaryInstance, SummaryInstanceStatus,
-    SummaryPlacement, SummaryStateReference,
-};
-use asap_types::PolicyFingerprint;
-use dashmap::DashMap;
-
-use self::epoch_columnar::{LabelValuesId, SidStoreData, TimestampRange};
-use crate::storage_engines::sketch_db::lifecycle::AggStatus;
-use crate::storage_engines::sketch_db::sds::{
-    DataDescriptor, SdsBinding, SummaryDescriptor, SummaryDescriptorRegistry,
-};
-
-pub use crate::storage_engines::sketch_db::data::{
-    canonical_parameters, AccuracyBound, AggKind, AggPayload, AggregationType, Capability,
-    SketchAlgorithm, SketchConfig, SketchEncoding, SketchSampleState, SketchTimeSeries,
-};
-
-fn now_ms() -> u64 {
-    SystemTime::now()
-        .duration_since(UNIX_EPOCH)
-        .map(|d| d.as_millis() as u64)
-        .unwrap_or(0)
-}
-
-/// Map a [`SketchEncoding`] to the on-disk encoding tag stored per part
-/// entry, so the disk read-back path can reconstruct the Full-vs-Delta
-/// distinction the delta-stitching carry-in relies on.
-fn encoding_to_tag(enc: SketchEncoding) -> u8 {
-    use crate::storage_engines::sketch_db::persistence::part::encoding_tag as t;
-    match enc {
-        SketchEncoding::ProtoFull => t::PROTO_FULL,
-        SketchEncoding::ProtoDelta => t::PROTO_DELTA,
-        SketchEncoding::MsgpackFull => t::MSGPACK_FULL,
-        SketchEncoding::MsgpackDelta => t::MSGPACK_DELTA,
-        SketchEncoding::NativeBatchV1 => t::NATIVE_BATCH_V1,
-    }
-}
-
-/// Inverse of [`encoding_to_tag`]. The unknown tag (`0`, written by the
-/// original v1 part writer) decodes to `ProtoFull` — the safe default
-/// for a carry-in base, since a Full snapshot establishes its own
-/// rolling state with no predecessor.
-fn tag_to_encoding(tag: u8) -> SketchEncoding {
-    use crate::storage_engines::sketch_db::persistence::part::encoding_tag as t;
-    match tag {
-        t::PROTO_DELTA => SketchEncoding::ProtoDelta,
-        t::MSGPACK_FULL => SketchEncoding::MsgpackFull,
-        t::MSGPACK_DELTA => SketchEncoding::MsgpackDelta,
-        t::NATIVE_BATCH_V1 => SketchEncoding::NativeBatchV1,
-        // t::PROTO_FULL and t::UNKNOWN (legacy) both → Full.
-        _ => SketchEncoding::ProtoFull,
-    }
-}
-
-/// Reconstruct an exact-aggregation accumulator from its on-disk
-/// `(type_name, bytes)` pair so the durable tier can serve the
-/// exact-agg query path (`query_exact_agg_range` / `sum by (...)`) after
-/// flush+evict. Covers the deterministic scalar accumulators the live
-/// marquee `sum by (zone)` path uses; the sketch-backed accumulator forms
-/// (DDSketch/KLL/HLL/CountSketch — registered as `AggKind::Sketch`) are
-/// served as opaque bytes via [`SketchStore::query_range`] and are NOT
-/// reconstructed here. Returns `None` for an unrecognized `type_name`
-/// (the caller skips the disk entry rather than fabricating a wrong
-/// payload) — see the remaining-follow-up note in the PR.
-fn reconstruct_exact_agg(
-    type_name: &str,
-    bytes: &[u8],
-) -> Option<Box<dyn crate::storage_engines::types::AggregateCore>> {
-    use crate::storage_engines::types::AggregateCore;
-    use asap_physical_operators::summary_kernels::{
-        IncreaseAccumulator, KeyedCounterState, KeyedSumCountAccumulator, MaxAccumulator,
-        MinAccumulator, SumAccumulator,
-    };
-    match type_name {
-        "PlannerExactAccumulatorV1" => asap_physical_operators::summary_kernels::exact::ExactAccumulator::deserialize_from_bytes(bytes).ok().map(|a|Box::new(a) as Box<dyn AggregateCore>),
-        "SumAccumulator" => SumAccumulator::deserialize_from_bytes(bytes)
-            .ok()
-            .map(|a| Box::new(a) as Box<dyn AggregateCore>),
-        "IncreaseAccumulator" => IncreaseAccumulator::deserialize_from_bytes(bytes)
-            .ok()
-            .map(|a| Box::new(a) as Box<dyn AggregateCore>),
-        "MinAccumulator" => MinAccumulator::deserialize_from_bytes(bytes)
-            .ok()
-            .map(|a| Box::new(a) as Box<dyn AggregateCore>),
-        "MaxAccumulator" => MaxAccumulator::deserialize_from_bytes(bytes)
-            .ok()
-            .map(|a| Box::new(a) as Box<dyn AggregateCore>),
-        "KeyedSumCountAccumulator" => {
-            KeyedSumCountAccumulator::deserialize_from_bytes(bytes)
-                .ok()
-                .map(|a| Box::new(a) as Box<dyn AggregateCore>)
-        }
-        "KeyedCounterState" => KeyedCounterState::deserialize_from_bytes(bytes)
-            .ok()
-            .map(|a| Box::new(a) as Box<dyn AggregateCore>),
-        // The keyed `MultipleMin`/`MultipleMax` forms and the
-        // sketch-backed accumulators have no generic byte factory — left
-        // to the deferred exact-agg/sketch precompute read-back work (see
-        // PR follow-up note). They are still served from memory; only the
-        // evicted-to-disk portion is skipped for these types.
-        _ => None,
-    }
-}
-
-/// Joint helper shared by [`SketchStore::ingest_precompute_for_agg_config`]
-/// and [`SketchStore::ingest_precompute_with_series_id`] — folds the
-/// grouping-label values on `output` against the
-/// `agg_cfg.grouping_labels` ordering into:
-///
-/// 1. `attrs_fp`: the `key=value;` canonical attrs-fingerprint string
-///    `SeriesIdResolver` uses as one third of the sid identity tuple.
-/// 2. `label_values_map`: the `BTreeMap<String, String>` shape
-///    `append_precompute` records on the per-window precompute row.
-///
-/// Both are pure functions of `(agg_cfg, output.key)` — kept together
-/// so the mint-driven path (B7.6) and the sid-direct path (B7.7) stay
-/// byte-identical on the values they hand to the index.
-fn build_attrs_fp_and_label_map(
-    agg_cfg: &asap_types::aggregation_config::PrecomputeMaterialization,
-    output: &crate::storage_engines::types::PrecomputedOutput,
-) -> Result<(String, BTreeMap<String, String>), String> {
-    if let Some(labels) = &output.population_labels {
-        let pairs = labels
-            .iter()
-            .map(|(name, value)| (name.as_str(), value.as_str()))
-            .collect::<Vec<_>>();
-        let attrs_fp = crate::drivers::ingest::population_attrs_fingerprint(
-            agg_cfg.population_key_encoding,
-            &pairs,
-        )?;
-        return Ok((attrs_fp, labels.clone()));
-    }
-    if !agg_cfg.population_key_encoding.is_legacy()
-        && agg_cfg.partitioning == Some(asap_types::sds::PopulationPartitioning::PerEntity)
-    {
-        return Err("canonical PerEntity output requires complete population labels".into());
-    }
-    let label_values_vec = output
-        .key
-        .as_ref()
-        .map(|k| k.labels.clone())
-        .unwrap_or_default();
-    let key_names = &agg_cfg.grouping_labels.names();
-    let mut attrs_fp = String::new();
-    let mut label_values_map: BTreeMap<String, String> = BTreeMap::new();
-    for (k, v) in key_names.iter().zip(label_values_vec.iter()) {
-        attrs_fp.push_str(k);
-        attrs_fp.push('=');
-        attrs_fp.push_str(v);
-        attrs_fp.push(';');
-        label_values_map.insert(k.clone(), v.clone());
-    }
-    if !agg_cfg.population_key_encoding.is_legacy() {
-        if key_names.len() != label_values_vec.len() {
-            return Err("population key label arity mismatch".into());
-        }
-        let pairs = key_names
-            .iter()
-            .zip(label_values_vec.iter())
-            .map(|(name, value)| (name.as_str(), value.as_str()))
-            .collect::<Vec<_>>();
-        attrs_fp = crate::drivers::ingest::population_attrs_fingerprint(
-            agg_cfg.population_key_encoding,
-            &pairs,
-        )?;
-    }
-    Ok((attrs_fp, label_values_map))
-}
-
-/// Physical metadata for one stored-output population. Its local handle locates
-/// rows; the owning `SdsBinding` retains the selected output and plan generation.
-///
-/// Lifecycle status is derived from retirement and expiry timestamps plus the
-/// wall clock. Only active instances accept writes.
-#[derive(Debug, Clone)]
-pub struct SummarySeriesMetadata {
-    pub storage_handle: u64,
-    pub metric_name: String,
-    /// The group-by KEY set — `dp.attributes.keys()` after the agent's
-    /// `AggregateBy` rollup folded other labels into the sketch state.
-    pub group_by_keys: BTreeSet<String>,
-    /// Warm-tier capability surfaced to the analyzer. For sketch-backed
-    /// instances this is one of the `*Approx` variants; for precompute-
-    /// backed instances (M2.3+) it's `None` because precomputes answer
-    /// exact statistics — the analyzer routes them via `agg_kind` /
-    /// `agg_type` instead.
-    pub capability: Option<Capability>,
-    /// M2.3 — the canonical "what kind of aggregation lives at this
-    /// sid" descriptor. Replaces the M2-era `sketch_kind` +
-    /// `sketch_config` field pair so a single registry can host both
-    /// sketches and partial-accumulator (Sum/Count/Avg/Rate/Min/Max)
-    /// state.
-    pub agg_kind: AggKind,
-    /// Approximate accuracy bound — `Some` for sketch-backed sids,
-    /// `None` for exact precomputes.
-    pub accuracy: Option<AccuracyBound>,
-    pub first_seen_unix_ms: i64,
-
-    /// Wall-clock millis when the sid was retired (removed from the
-    /// active config). `None` while `Active`. Mirrors
-    /// `AggSchema::retired_at_ms`.
-    pub retired_at_ms: Option<u64>,
-    /// Wall-clock millis after which the sid's data may be deleted.
-    /// `None` while `Active`. Set on retirement to
-    /// `retired_at_ms + retention_ms`. Mirrors
-    /// `AggSchema::expires_at_ms`.
-    pub expires_at_ms: Option<u64>,
-    /// Content-addressed back-reference to the policy that minted this
-    /// sid. Together with [`SketchStore::output_to_storage_handles`] this gives
-    /// the query path a direct `policy_fp → [sid]` index without
-    /// walking the metadata map. `PolicyFingerprint::UNSET` is reserved
-    /// for the legacy registration path that doesn't carry a source
-    /// `PrecomputeMaterialization` (test fixtures + the early-Phase-5 sketch
-    /// ingest path that didn't thread the config through); the index
-    /// skips those entries — they're reachable through the legacy
-    /// `instances_matching(metric, gbk)` walk if a query needs them.
-    pub policy_fp: PolicyFingerprint,
-}
-
-impl SummarySeriesMetadata {
-    /// Compute the current `AggStatus` against the wall clock.
-    /// Mirrors `AggSchema::status` — purely a function of timestamps.
-    pub fn status(&self) -> AggStatus {
-        let now = now_ms();
-        match (self.retired_at_ms, self.expires_at_ms) {
-            (None, _) => AggStatus::Active,
-            (Some(_), Some(exp)) if now >= exp => AggStatus::Expired,
-            (Some(_), _) => AggStatus::Retired,
-        }
-    }
-
-    /// Whether this sid accepts writes: `status() == AggStatus::Active`.
-    pub fn is_writable(&self) -> bool {
-        matches!(self.status(), AggStatus::Active)
-    }
-
-    /// Mark the sid retired, scheduling expiry `retention` from now.
-    /// Idempotent — re-retiring a Retired sid is a no-op.
-    pub fn retire(&mut self, retention: Duration) {
-        if self.retired_at_ms.is_some() {
-            return;
-        }
-        let now = now_ms();
-        self.retired_at_ms = Some(now);
-        self.expires_at_ms = Some(now + retention.as_millis() as u64);
-    }
-
-    /// Sketch-handle accessor for the legacy sketch path. Returns
-    /// `Some(handle)` iff this sid is sketch-backed; `None` for
-    /// exact-aggregation-backed sids. Consumers that only meaningfully
-    /// run on sketches (e.g. the ASAP-tier reducer) `.expect` it.
-    pub fn sketch_algorithm(&self) -> Option<SketchAlgorithm> {
-        match &self.agg_kind {
-            AggKind::Sketch {
-                algorithm: kind, ..
-            } => Some(kind.clone()),
-            AggKind::ExactAgg { .. } => None,
-        }
-    }
-}
-
-/// Per-sid storage value — wraps `SidStoreData` in an `RwLock` so the
-/// outer DashMap stays read-mostly and per-sid writes don't block one
-/// another. Payload type is the unified [`AggPayload`] enum so one
-/// `SketchStore` can host both sketches and precomputes.
-type SidStore = Arc<RwLock<SidStoreData<BTreeMap<String, String>, AggPayload>>>;
-
-#[derive(Debug, Clone, Copy)]
-struct ReductionRollupNode {
-    end_ms: u64,
-    value: f64,
-}
-
-#[derive(Debug)]
-struct ReductionRollupSeries {
-    reduction: RollupReduction,
-    anchor_start_ms: Option<u64>,
-    base_width_ms: Option<u64>,
-    next_start_ms: Option<u64>,
-    valid: bool,
-    levels: Vec<BTreeMap<u64, ReductionRollupNode>>,
-}
-
-impl ReductionRollupSeries {
-    fn new(reduction: RollupReduction) -> Self {
-        Self {
-            reduction,
-            anchor_start_ms: None,
-            base_width_ms: None,
-            next_start_ms: None,
-            valid: false,
-            levels: Vec::new(),
-        }
-    }
-}
-
-impl ReductionRollupSeries {
-    fn append(&mut self, window: TimestampRange, value: f64, retention_horizon_ms: Option<u64>) {
-        let width = window.1.saturating_sub(window.0);
-        if width == 0 || self.next_start_ms.is_some_and(|next| next != window.0) {
-            self.valid = false;
-            return;
-        }
-        let anchor = *self.anchor_start_ms.get_or_insert(window.0);
-        let base_width = *self.base_width_ms.get_or_insert(width);
-        if width != base_width
-            || window.0 < anchor
-            || !(window.0 - anchor).is_multiple_of(base_width)
-        {
-            self.valid = false;
-            return;
-        }
-        self.valid = true;
-        self.next_start_ms = Some(window.1);
-        if self.levels.is_empty() {
-            self.levels.push(BTreeMap::new());
-        }
-        self.levels[0].insert(
-            window.0,
-            ReductionRollupNode {
-                end_ms: window.1,
-                value,
-            },
-        );
-
-        let mut level = 0usize;
-        let mut node_start = window.0;
-        let mut node = ReductionRollupNode {
-            end_ms: window.1,
-            value,
-        };
-        loop {
-            let level_width = match base_width.checked_shl(level as u32) {
-                Some(width) => width,
-                None => break,
-            };
-            let ordinal = (node_start - anchor) / level_width;
-            if ordinal.is_multiple_of(2) || node_start < level_width {
-                break;
-            }
-            let left_start = node_start - level_width;
-            let Some(left) = self.levels[level].get(&left_start).copied() else {
-                break;
-            };
-            if left.end_ms != node_start {
-                break;
-            }
-            node_start = left_start;
-            node = ReductionRollupNode {
-                end_ms: node.end_ms,
-                value: self.reduction.combine(left.value, node.value),
-            };
-            level += 1;
-            if self.levels.len() <= level {
-                self.levels.push(BTreeMap::new());
-            }
-            self.levels[level].insert(node_start, node);
-        }
-
-        if let Some(horizon) = retention_horizon_ms {
-            let cutoff = window.1.saturating_sub(horizon);
-            for nodes in &mut self.levels {
-                while nodes
-                    .first_key_value()
-                    .is_some_and(|(_, node)| node.end_ms < cutoff)
-                {
-                    nodes.pop_first();
-                }
-            }
-        }
-    }
-
-    fn query(&self, start_ms: u64, end_ms: u64) -> Option<f64> {
-        if !self.valid {
-            return None;
-        }
-        let base = self.levels.first()?;
-        let mut cursor = start_ms;
-        let mut result: Option<f64> = None;
-        loop {
-            let Some((&base_start, base_node)) =
-                base.range(cursor..).find(|(_, node)| node.end_ms <= end_ms)
-            else {
-                return result;
-            };
-            let mut chosen = *base_node;
-            for nodes in self.levels.iter().skip(1) {
-                match nodes.get(&base_start) {
-                    Some(node) if node.end_ms <= end_ms => chosen = *node,
-                    _ => break,
-                }
-            }
-            result = Some(result.map_or(chosen.value, |current| {
-                self.reduction.combine(current, chosen.value)
-            }));
-            cursor = chosen.end_ms;
-            if cursor >= end_ms || base.range(cursor..).next().is_none() {
-                return result;
-            }
-        }
-    }
-
-    fn approx_bytes(&self) -> usize {
-        self.levels
-            .iter()
-            .map(|nodes| nodes.len() * std::mem::size_of::<(u64, ReductionRollupNode)>())
-            .sum()
-    }
-}
-
-/// Readout categories supported by the derived rollup tier. New categories
-/// belong here rather than as additional top-level `SketchStore` fields.
-#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
-pub enum RollupReduction {
-    Min,
-    Max,
-}
-
-impl RollupReduction {
-    fn combine(self, left: f64, right: f64) -> f64 {
-        match self {
-            Self::Min => left.min(right),
-            Self::Max => left.max(right),
-        }
-    }
-}
-
-type ReductionRollupMap = DashMap<
-    (RollupReduction, u64),
-    Arc<RwLock<HashMap<BTreeMap<String, String>, ReductionRollupSeries>>>,
->;
-
-/// Rebuildable indexes over canonical SummaryStore panes. This owns derived
-/// query accelerators only; base summary instances remain the source of truth.
-#[derive(Default)]
-struct Rollups {
-    reductions: ReductionRollupMap,
-}
-
-impl Rollups {
-    fn append(
-        &self,
-        reduction: RollupReduction,
-        sid: u64,
-        labels: BTreeMap<String, String>,
-        window: TimestampRange,
-        value: f64,
-        retention_horizon_ms: Option<u64>,
-    ) {
-        self.reductions
-            .entry((reduction, sid))
-            .or_insert_with(|| Arc::new(RwLock::new(HashMap::new())))
-            .write()
-            .unwrap()
-            .entry(labels)
-            .or_insert_with(|| ReductionRollupSeries::new(reduction))
-            .append(window, value, retention_horizon_ms);
-    }
-
-    fn query(
-        &self,
-        reduction: RollupReduction,
-        sid: u64,
-        start_unix_ms: u64,
-        end_unix_ms: u64,
-    ) -> Option<Vec<(BTreeMap<String, String>, f64)>> {
-        let rollups = self.reductions.get(&(reduction, sid))?.clone();
-        let guard = rollups.read().unwrap();
-        let values = guard
-            .iter()
-            .map(|(labels, series)| {
-                series
-                    .query(start_unix_ms, end_unix_ms)
-                    .map(|value| (labels.clone(), value))
-            })
-            .collect::<Option<Vec<_>>>()?;
-        (!values.is_empty()).then_some(values)
-    }
-
-    fn remove_sid(&self, sid: u64) {
-        self.reductions
-            .retain(|(_, series_id), _| *series_id != sid);
-    }
-
-    fn clear(&self) {
-        self.reductions.clear();
-    }
-
-    fn approx_bytes(&self) -> usize {
-        self.reductions
-            .iter()
-            .filter_map(|entry| {
-                entry.value().read().ok().map(|series| {
-                    series
-                        .iter()
-                        .map(|(labels, rollup)| {
-                            labels
-                                .iter()
-                                .map(|(key, value)| key.len() + value.len())
-                                .sum::<usize>()
-                                + rollup.approx_bytes()
-                        })
-                        .sum::<usize>()
-                })
-            })
-            .sum()
-    }
-}
-
-#[derive(Debug, Clone, PartialEq, Eq, Hash)]
-struct IncompleteSummaryLineage {
-    plan_id: u64,
-    plan_version: u64,
-    producer_id: String,
-    producer_epoch: String,
-    window_start_unix_ms: u64,
-    window_end_unix_ms: u64,
-}
-
-impl From<&asap_types::producer_plan::SummaryFrameIdentity> for IncompleteSummaryLineage {
-    fn from(frame: &asap_types::producer_plan::SummaryFrameIdentity) -> Self {
-        Self {
-            plan_id: frame.plan_id,
-            plan_version: frame.plan_version,
-            producer_id: frame.producer_id.clone(),
-            producer_epoch: frame.producer_epoch.clone(),
-            window_start_unix_ms: frame.window_start_unix_nano / 1_000_000,
-            window_end_unix_ms: frame.window_end_unix_nano / 1_000_000,
-        }
-    }
-}
-
-/// Two-level sketch index. Metadata uses `RwLock<HashMap>` for infrequent
-/// registration and frequent reads; per-sid data uses `DashMap` for writes on
-/// every datapoint.
-#[derive(Clone, Copy)]
-pub(crate) struct SummaryReadRevision {
-    admission: u64,
-    mutation: u64,
-    in_flight: usize,
-}
-impl SummaryReadRevision {
-    pub(crate) fn mutation_sequence(self) -> u64 {
-        self.mutation
-    }
-
-    fn capture(
-        admission: u64,
-        mutation: &std::sync::atomic::AtomicU64,
-        active: &std::sync::atomic::AtomicUsize,
-        between_reads: impl FnOnce(),
-    ) -> Self {
-        use std::sync::atomic::Ordering::SeqCst;
-        let before = mutation.load(SeqCst);
-        between_reads();
-        let in_flight = active.load(SeqCst);
-        let after = mutation.load(SeqCst);
-        Self {
-            admission,
-            mutation: after,
-            in_flight: if before == after {
-                in_flight
-            } else {
-                in_flight.max(1)
-            },
-        }
-    }
-
-    pub(crate) fn matches(self, other: Self) -> bool {
-        self.in_flight == 0
-            && other.in_flight == 0
-            && self.admission == other.admission
-            && self.mutation == other.mutation
-    }
-}
-
-struct StateMutation<'a>(&'a SketchStore);
-impl Drop for StateMutation<'_> {
-    fn drop(&mut self) {
-        use std::sync::atomic::Ordering::SeqCst;
-        self.0.mutation_revision.fetch_add(1, SeqCst);
-        self.0.active_mutations.fetch_sub(1, SeqCst);
-    }
-}
-
-#[derive(Default)]
-pub struct SketchStore {
-    pub(crate) revisions: RwLock<Option<Arc<crate::precompute_engine::revisions::RevisionRuntime>>>,
-    pub current_series: std::sync::Mutex<super::current_series::CurrentSeriesStore>,
-    /// Held through each state append; completion takes the exclusive guard.
-    completed_windows: RwLock<HashMap<u64, u64>>,
-    completion_flush_before: std::sync::atomic::AtomicU64,
-    admission: RwLock<admission::AdmissionInventory>,
-    mutation_revision: std::sync::atomic::AtomicU64,
-    active_mutations: std::sync::atomic::AtomicUsize,
-    admitted_mutations: std::sync::atomic::AtomicU64,
-    finite_mutation_revision: std::sync::atomic::AtomicU64,
-    /// sid → metadata. May contain ghost sids (registered identities
-    /// whose state was merged away by an upstream gateway before
-    /// reaching this backend).
-    instances: RwLock<HashMap<u64, SdsBinding>>,
-    /// Interns immutable SDS descriptors across all Series IDs and panes.
-    descriptors: SummaryDescriptorRegistry,
-    /// sid → item_label (the data-point attribute NAME, e.g. "service"
-    /// or "endpoint") for CountMin/CountSketch sids registered in
-    /// per-item mode. Its presence is what makes a CMS sid answerable by
-    /// the per-item `estimate(key)` path (the query engine extracts the
-    /// matching selector value and gates the safe-miss on it). Absent =>
-    /// per-attribute-set CMS (only the bucket total is meaningful).
-    /// Kept as a decoupled side-table so recording item_label does not
-    /// change sid identity (`AggKind` canonical string) or churn the many
-    /// `SummarySeriesMetadata` / `AggKind::Sketch` literals.
-    item_labels: RwLock<HashMap<u64, String>>,
-    /// sid → per-sid columnar storage. Empty `SidStoreData` (or absent
-    /// key) for ghost sids — query path detects this and falls through
-    /// as a capability miss.
-    series: DashMap<u64, SidStore>,
-    /// Derived rollup categories over canonical SummaryStore panes.
-    rollups: Rollups,
-    /// Receiver-observed delta gaps. Query reads overlapping an incomplete
-    /// lineage fail closed to the exact tier until a recovery full checkpoint
-    /// for that exact producer/window lineage is accepted.
-    incomplete_summary_lineages: DashMap<u64, HashSet<IncompleteSummaryLineage>>,
-    /// Reverse index: `policy_fp → {sids}`. Lets the query path resolve
-    /// "which sids belong to this policy?" in O(1) without walking
-    /// `instances`. Maintained by [`Self::register`] /
-    /// [`Self::remove_instance`].
-    /// Entries with `PolicyFingerprint::UNSET` are NOT recorded (the
-    /// sentinel means "no source config"); legacy callers that mint
-    /// sids without a fingerprint reach those sids through
-    /// `instances_matching(metric, gbk)`.
-    ///
-    /// ## Cross-index atomicity invariant (P2-1)
-    ///
-    /// `instances`, `output_to_storage_handles`, and `metric_to_series_ids` form ONE
-    /// logical index whose three maps must agree: every sid present in
-    /// `instances` must also be present in `metric_to_series_ids` (keyed by
-    /// its metric_name) and — when its `policy_fp` is non-UNSET — in
-    /// `output_to_storage_handles`. A concurrent reader must never observe a sid in
-    /// `instances` that is missing from the secondary indexes (or vice
-    /// versa). To preserve this, every writer ([`Self::register`],
-    /// [`Self::remove_instance`]) acquires ALL THREE write guards
-    /// together in the fixed order `instances → output_to_storage_handles →
-    /// metric_to_series_ids` BEFORE mutating any of them, so the update is
-    /// atomic with respect to any reader that takes the `instances` lock.
-    /// The fixed acquisition order is also the deadlock-avoidance order:
-    /// no code path takes these locks in a different order.
-    output_to_storage_handles: RwLock<HashMap<StoredOutputId, BTreeSet<u64>>>,
-    /// Secondary index: `metric_name → {sids}` (P2-2). Lets
-    /// [`Self::instances_matching`] do a keyed lookup of the sids for a
-    /// metric instead of an O(N) full scan of `instances`. Maintained in
-    /// lock-step with `instances` under the same write-lock domain (see
-    /// the atomicity invariant on `output_to_storage_handles`). Holds every
-    /// registered sid (UNSET-policy sids included), since the query path
-    /// keys candidate selection on metric name, not policy.
-    metric_to_series_ids: RwLock<HashMap<String, BTreeSet<u64>>>,
-    /// Pointer (as `usize`) of the `Arc<InstalledPrecomputePlan>` this store
-    /// last reconciled against. `reconcile_from_streaming_config` runs
-    /// on every ingest batch, but the config is a lock-free
-    /// `Arc<ArcSwap<InstalledPrecomputePlan>>` that only changes its `Arc`
-    /// identity on a control-plane swap (rare). Gating the full
-    /// catalog scan on a cheap pointer compare against this field lets
-    /// the steady-state ingest path skip reconcile entirely.
-    /// `0` (the `Default`) means "never reconciled" so the first batch
-    /// always runs. A real `Arc` data pointer is never null.
-    last_reconciled_config_ptr: std::sync::atomic::AtomicUsize,
-    /// Durable-tier read handle, installed by [`Self::start_persistence`]
-    /// when `--persistence-enabled`. `None` (the default) means the
-    /// in-memory-only deployment: `query_range` reads HOT + SEALED
-    /// in-memory state and #327 retention bounds memory. When `Some`,
-    /// `query_range` ALSO unions in flushed-then-evicted DISK parts for
-    /// the portion of the range that has left memory, and the per-sid
-    /// `SidStoreData` is configured to seal on a cadence (so the flusher
-    /// has sealed epochs to persist) with retention-drop disabled (the
-    /// flush-then-evict loop is the memory bound).
-    persistence_read: RwLock<Option<Arc<PersistenceReadHandle>>>,
-    persistence_metadata: RwLock<Option<Arc<persistence::metadata::StoredOutputMetadataFile>>>,
-    immutable_publisher: RwLock<std::sync::Weak<persistence::flusher::FlusherShared>>,
-    removed_sids: RwLock<
-        BTreeMap<
-            u64,
-            (
-                Option<Arc<asap_types::sds::CatalogGeneration>>,
-                Option<StoredOutputId>,
-            ),
-        >,
-    >,
-    /// Seal cadence in distinct windows, applied to every per-sid
-    /// `SidStoreData` once persistence is enabled. `0` (the default)
-    /// disables cadence sealing. Set by [`Self::enable_persistence_mode`].
-    seal_window_count: std::sync::atomic::AtomicUsize,
-}
-
-/// Read-side handle to the durable tier — the manifest of live disk
-/// parts plus the byte-bounded `PartCache` that mmaps them. Cloned (as
-/// an `Arc`) into `SketchStore::persistence_read` so the query path can
-/// consult disk parts without holding a reference to the flusher.
-///
-/// Also recovered on restart: `start_persistence` installs a fresh
-/// handle pointing at the recovered manifest, so a reopened store sees
-/// every part that was durable before the crash.
-pub struct PersistenceReadHandle {
-    pub manifest: Arc<crate::storage_engines::sketch_db::index::persistence::Manifest>,
-    pub part_cache: crate::storage_engines::sketch_db::index::persistence::cache::PartCache,
-}
-
-/// Three possible outcomes of looking up a sid in the SketchStore.
-/// Query path uses this enum to drive routing decisions:
-/// - `Hit`: ASAP-tier sketch has data — evaluate.
-/// - `Ghost`: backend knows the identity (metadata is present) but no
-///   sketch state ever arrived under this sid — capability miss
-///   for raw archive. See design doc §5.4 ("Ghost sids").
-/// - `Unknown`: sid not registered. Sender's cache is stale; respond
-///   with `unknown_series_ids` so sender re-emits with attributes.
-#[derive(Debug, Clone, Copy, PartialEq)]
-pub enum SeriesLookup {
-    Hit,
-    Ghost,
-    Unknown,
-}
-
-/// Borrowed write access issued only while the store holds its admission guard.
-/// Receipt fields are data, not evidence that this synchronization is held.
-pub(crate) struct SummaryPublicationWriter<'a>(&'a SketchStore);
-
-impl SummaryPublicationWriter<'_> {
-    pub(crate) fn write_stored_summary(
-        &self,
-        address: &asap_types::sds::StoredSummaryKey,
-        resolver: &crate::drivers::ingest::series_resolver::SeriesIdResolver,
-        config: &asap_types::PrecomputeMaterialization,
-        output: &crate::storage_engines::types::PrecomputedOutput,
-        state: &dyn crate::storage_engines::types::AggregateCore,
-    ) -> Option<u64> {
-        address.validate().ok()?;
-        let expected = self
-            .0
-            .descriptors
-            .stored_output_reference(address.stored_output_id)?;
-        if address.stored_output_id.fingerprint() != output.policy_fp
-            || output
-                .stored_output_reference
-                .as_ref()
-                .is_some_and(|reference| expected.validate().is_ok() && reference != &expected)
-            || config.policy_fingerprint() != output.policy_fp
-        {
-            return None;
-        }
-        let (population_key, population) = build_attrs_fp_and_label_map(config, output).ok()?;
-        if population != address.population
-            || (output.start_timestamp, output.end_timestamp)
-                != (
-                    u64::try_from(address.window.start_ms).ok()?,
-                    u64::try_from(address.window.end_ms).ok()?,
-                )
-        {
-            return None;
-        }
-        let generation = output.catalog_generation.as_deref();
-        if generation
-            .is_some_and(|g| (g.plan_id, g.plan_version) != (address.plan_id, address.plan_version))
-        {
-            return None;
-        }
-        let handle = self
-            .0
-            .resolve_output_storage_handle(
-                resolver,
-                address.stored_output_id,
-                &population_key,
-                generation,
-            )
-            .ok()?;
-        if output
-            .storage_handle
-            .is_some_and(|captured| captured != handle)
-        {
-            return None;
-        }
-        self.0
-            .ingest_precompute_with_admission(handle, config, output, state)
-    }
-
-    #[cfg(test)]
-    pub(crate) fn ingest_precompute_with_series_id(
-        &self,
-        sid: u64,
-        config: &asap_types::PrecomputeMaterialization,
-        output: &crate::storage_engines::types::PrecomputedOutput,
-        state: &dyn crate::storage_engines::types::AggregateCore,
-    ) -> Option<u64> {
-        self.0
-            .ingest_precompute_with_admission(sid, config, output, state)
-    }
-
-    #[cfg(test)]
-    fn append_sample(
-        &self,
-        sid: u64,
-        labels: BTreeMap<String, String>,
-        window: TimestampRange,
-        sample: SketchSampleState,
-    ) -> bool {
-        let _instances = self.0.instances.read().unwrap();
-        self.0
-            .append_sample_with_binding(sid, labels, window, sample)
-    }
-}
-
-impl SketchStore {
-    pub fn new() -> Self {
-        Self::default()
-    }
-
-    /// Resolve a local row handle from the installed DAG output and population.
-    /// The durable identity includes the plan version and exact output reference.
-    pub fn resolve_output_storage_handle(
-        &self,
-        resolver: &crate::drivers::ingest::series_resolver::SeriesIdResolver,
-        definition: StoredOutputId,
-        population_key: &str,
-        generation: Option<&CatalogGeneration>,
-    ) -> Result<u64, String> {
-        self.validate_routed_catalog_generation(generation)?;
-        let output = self
-            .descriptors
-            .stored_output_reference(definition)
-            .ok_or("definition has no installed stored output")?;
-        let (plan_id, plan_version) = match generation {
-            Some(generation) => (generation.plan_id, generation.plan_version),
-            #[cfg(test)]
-            None => (0, 0),
-            #[cfg(not(test))]
-            None => return Err("stored output requires an installed plan generation".into()),
-        };
-        let identity =
-            serde_json::to_string(&(plan_id, plan_version, output)).map_err(|e| e.to_string())?;
-        resolver
-            .try_resolve("stored-output", population_key, &identity)
-            .map_err(|e| e.to_string())
-    }
-
-    /// Classify a sid for query routing. See `SeriesLookup` for semantics.
-    pub fn classify(&self, sid: u64) -> SeriesLookup {
-        let known = self.instances.read().unwrap().contains_key(&sid);
-        if !known {
-            return SeriesLookup::Unknown;
-        }
-        match self.series.get(&sid) {
-            Some(store) => {
-                let g = store.read().unwrap();
-                if !g.current_epoch.is_empty() || !g.sealed_epochs.is_empty() {
-                    SeriesLookup::Hit
-                } else {
-                    SeriesLookup::Ghost
-                }
-            }
-            None => SeriesLookup::Ghost,
-        }
-    }
-
-    /// Insert metadata for a freshly-resolved sid. Also records the sid
-    /// in the `policy_fp → {sids}` reverse index (when the metadata
-    /// carries a non-UNSET fingerprint) and in the `metric_name →
-    /// {sids}` secondary index.
-    ///
-    /// ## Atomicity (P2-1)
-    ///
-    /// All three index write guards are acquired together, in the fixed
-    /// order `instances → output_to_storage_handles → metric_to_series_ids`, BEFORE any
-    /// map is mutated. This makes the three updates atomic with respect
-    /// to a concurrent reader that takes the `instances` lock: such a
-    /// reader can never see the sid in `instances` while it is still
-    /// absent from `output_to_storage_handles` / `metric_to_series_ids` (the pre-fix race
-    /// where the two indexes were written under separate sequential
-    /// locks). See the index-field doc comments for the full invariant.
-    pub fn register(&self, meta: SummarySeriesMetadata) {
-        let mut instances = self.instances.write().unwrap();
-        self.register_with_instances(meta, &mut instances);
-    }
-
-    fn register_with_instances(
-        &self,
-        meta: SummarySeriesMetadata,
-        instances: &mut HashMap<u64, SdsBinding>,
-    ) -> bool {
-        let sid = meta.storage_handle;
-        // A non-legacy materialization must resolve through the installed
-        // authoritative catalog. Unknown identities fail closed and never
-        // become queryable SummaryStore entries.
-        let instance = match self.descriptors.bind(meta) {
-            Ok(instance) => instance,
-            Err(error) => {
-                tracing::warn!(sid, %error, "rejecting SummaryStore registration outside the active SummaryCatalog");
-                return false;
-            }
-        };
-        let metric_name = instance
-            .data_descriptor
-            .time_series_metric()
-            .map(str::to_owned);
-        // Fixed lock order: instances → output_to_storage_handles → metric_to_series_ids.
-        if self.removed_sids.read().unwrap().contains_key(&sid) {
-            tracing::warn!(sid, "rejecting reuse of a removed summary instance ID");
-            return false;
-        }
-        let mut policy_idx = self.output_to_storage_handles.write().unwrap();
-        let mut metric_idx = self.metric_to_series_ids.write().unwrap();
-        if let Some(output) = &instance.stored_output_reference {
-            policy_idx
-                .entry(output.stored_output_id)
-                .or_default()
-                .insert(sid);
-        }
-        instances.insert(sid, instance);
-        if let Some(metric_name) = metric_name {
-            metric_idx.entry(metric_name).or_default().insert(sid);
-        }
-        true
-    }
-
-    /// Install one authoritative catalog snapshot for future registrations.
-    /// Existing Series IDs retain their generation's descriptor Arcs while draining.
-    #[cfg(test)]
-    pub fn install_summary_catalog(
-        &self,
-        catalog: Arc<asap_types::summary_catalog::SummaryCatalog>,
-    ) -> Result<(), String> {
-        let outputs = catalog
-            .outputs
-            .keys()
-            .map(|id| (*id, catalog.output_reference(*id).unwrap()))
-            .collect();
-        self.install_catalog_outputs(catalog, outputs)
-    }
-
-    /// Install the exact selected writer references together with their catalog.
-    pub fn install_precompute_plan(
-        &self,
-        catalog: Arc<asap_types::summary_catalog::SummaryCatalog>,
-        plan: &asap_types::precompute_plan::PrecomputePlan,
-    ) -> Result<(), String> {
-        plan.validate_against_catalog(&catalog)
-            .map_err(|e| e.to_string())?;
-        let outputs = plan
-            .schemas
-            .iter()
-            .map(|schema| {
-                (
-                    schema.materialization,
-                    schema.stored_output_reference.clone(),
-                )
-            })
-            .collect::<BTreeMap<_, _>>();
-        if outputs.len() != plan.schemas.len() {
-            return Err("stored output bindings must be unique per definition".into());
-        }
-        self.install_catalog_outputs(catalog, outputs)
-    }
-
-    fn install_catalog_outputs(
-        &self,
-        catalog: Arc<asap_types::summary_catalog::SummaryCatalog>,
-        outputs: BTreeMap<StoredOutputId, StoredOutputReference>,
-    ) -> Result<(), String> {
-        for (definition, output) in &outputs {
-            output.validate().map_err(|e| e.to_string())?;
-            if output.stored_output_id != *definition
-                || catalog.output_reference(*definition).ok().as_ref() != Some(output)
-            {
-                return Err("stored output does not match the installed catalog".into());
-            }
-        }
-        if outputs
-            .values()
-            .map(|output| output.stored_output_id)
-            .collect::<BTreeSet<_>>()
-            .len()
-            != outputs.len()
-        {
-            return Err("a stored output ID cannot name different definitions".into());
-        }
-        let reference = catalog.reference().map_err(|error| error.to_string())?;
-        if let Some(writer) = self.persistence_metadata.read().unwrap().as_ref() {
-            writer
-                .persist_catalog(&catalog)
-                .map_err(|e| e.to_string())?;
-        }
-        let mut inventory = self.admission.write().unwrap();
-        let generation = CatalogGeneration {
-            schema_version: reference.schema_version,
-            plan_id: reference.plan_id,
-            plan_version: reference.plan_version,
-            snapshot_sha256: reference.snapshot_sha256,
-        };
-        let closed = self
-            .persistence_metadata
-            .read()
-            .unwrap()
-            .as_ref()
-            .map(|writer| writer.load_finite_closure())
-            .transpose()
-            .map_err(|error| error.to_string())?
-            .flatten();
-        self.descriptors
-            .install_catalog_with_outputs(Arc::clone(&catalog), outputs)
-            .map_err(|error| error.to_string())?;
-        inventory.install(generation.clone());
-        if closed.as_ref() == Some(&generation) {
-            inventory.seal_finite(&generation)?;
-        }
-        Ok(())
-    }
-
-    pub(crate) fn admit_summary_updates(
-        &self,
-        generation: &CatalogGeneration,
-        coordinates: BTreeSet<asap_types::sds::SummaryInstanceCoordinates>,
-    ) -> Result<u64, String> {
-        let catalog = self
-            .descriptors
-            .authoritative_catalog()
-            .ok_or("summary admission requires an installed catalog")?;
-        if coordinates
-            .iter()
-            .any(|coordinate| !catalog.outputs.contains_key(&coordinate.stored_output_id))
-        {
-            return Err("summary admission references an uninstalled definition".into());
-        }
-        self.admission
-            .write()
-            .unwrap()
-            .admit(generation, coordinates)
-    }
-
-    pub(crate) fn publish_unadmitted_summary_update(
-        &self,
-        persist: impl FnOnce(&SummaryPublicationWriter<'_>) -> Option<u64>,
-    ) -> Option<u64> {
-        let admission = self.admission.read().ok()?;
-        if admission.is_finite_closed() {
-            return None;
-        }
-        persist(&SummaryPublicationWriter(self))
-    }
-
-    pub(crate) fn publish_admitted_summary_update(
-        &self,
-        generation: &CatalogGeneration,
-        coordinate: &asap_types::sds::SummaryInstanceCoordinates,
-        first_revision: u64,
-        revision: u64,
-        replay_horizon_ms: u64,
-        persist: impl FnOnce(&SummaryPublicationWriter<'_>) -> Option<u64>,
-    ) -> Result<(), String> {
-        // Fence installation and read validation across the state write: an old
-        // producer cannot mutate a new generation before its receipt is rejected.
-        let mut inventory = self.admission.write().unwrap();
-        if inventory.validate_publication(generation, coordinate, first_revision, revision)? {
-            return Ok(());
-        }
-        let series_id =
-            persist(&SummaryPublicationWriter(self)).ok_or("summary state publication failed")?;
-        inventory.record_series(generation, coordinate, series_id)?;
-        inventory.acknowledge(generation, coordinate, revision)?;
-        self.admitted_mutations
-            .fetch_add(1, std::sync::atomic::Ordering::SeqCst);
-        let floor = coordinate
-            .time_range
-            .end_ms
-            .saturating_sub(i64::try_from(replay_horizon_ms).unwrap_or(i64::MAX));
-        inventory.retire_completed_before(coordinate.stored_output_id, floor);
-        Ok(())
-    }
-
-    pub(crate) fn seal_finite_summary_input(
-        &self,
-        generation: &CatalogGeneration,
-    ) -> Result<bool, String> {
-        use std::sync::atomic::Ordering::SeqCst;
-        // Same order as admitted publication: admission -> metadata -> append fence.
-        // Closing a receiver alone is insufficient: the fence also rejects writes
-        // from every other producer once these physical windows are complete.
-        let mut inventory = self.admission.write().unwrap();
-        inventory.validate_finite(generation)?;
-        if inventory.is_finite_complete() {
-            return Ok(true);
-        }
-        let frontiers = inventory.published_frontiers().clone();
-        let instances = self.instances.read().unwrap();
-        let mut records = Vec::new();
-        for (sid, end) in &frontiers {
-            let instance = instances
-                .get(sid)
-                .ok_or("completed series has no identity")?;
-            let mut record = self
-                .metadata_record(instance)
-                .ok_or("completed series has no catalog provenance")?;
-            record.completed_through_ms = record.completed_through_ms.max(Some(*end));
-            records.push(record);
-        }
-        let mut completed = self.completed_windows.write().unwrap();
-        let mutation = self.mutation_revision.load(SeqCst);
-        if self.active_mutations.load(SeqCst) != 0
-            || mutation != self.admitted_mutations.load(SeqCst)
-        {
-            return Err("finite summary completion cannot certify untracked state writes".into());
-        }
-        inventory.validate_finite(generation)?;
-        if self.persistence_read.read().unwrap().is_some() {
-            if let Some(end) = frontiers.values().max() {
-                self.completion_flush_before
-                    .fetch_max(end.saturating_add(1), SeqCst);
-            }
-            // The flusher evicts an epoch only after its payload and manifest
-            // are durable. Until then a restart must remain able to replay it.
-            let pending = frontiers.iter().any(|(sid, end)| {
-                self.series.get(sid).is_some_and(|data| {
-                    data.read()
-                        .unwrap()
-                        .contains_window_ending_at_or_before(*end)
-                })
-            });
-            if pending {
-                return Ok(false);
-            }
-        }
-        // A failed durable close remains closed to raw writers but is not a
-        // usable completion proof. Retrying the barrier finishes persistence.
-        inventory.begin_finite_close();
-        if let Some(writer) = self.persistence_metadata.read().unwrap().as_ref() {
-            writer
-                .upsert_all(&records)
-                .map_err(|error| error.to_string())?;
-            writer
-                .persist_finite_closure(generation)
-                .map_err(|error| error.to_string())?;
-        }
-        inventory.seal_finite(generation)?;
-        for (sid, end) in frontiers {
-            completed
-                .entry(sid)
-                .and_modify(|value| *value = (*value).max(end))
-                .or_insert(end);
-        }
-        self.finite_mutation_revision.store(mutation, SeqCst);
-        Ok(true)
-    }
-
-    pub(crate) fn summary_window_known_empty(
-        &self,
-        definition: StoredOutputId,
-        series_id: u64,
-        range: HalfOpenTimeRange,
-    ) -> bool {
-        use std::sync::atomic::Ordering::SeqCst;
-        self.active_mutations.load(SeqCst) == 0
-            && self.finite_mutation_revision.load(SeqCst) == self.mutation_revision.load(SeqCst)
-            && self
-                .admission
-                .read()
-                .unwrap()
-                .known_empty(definition, series_id, range)
-    }
-
-    /// A closed full-window producer publishes every nonempty exact window.
-    /// Overlapping neighboring snapshots do not establish population in this one.
-    pub(crate) fn full_summary_window_known_empty(
-        &self,
-        definition: StoredOutputId,
-        series_id: u64,
-        range: HalfOpenTimeRange,
-    ) -> bool {
-        use std::sync::atomic::Ordering::SeqCst;
-        self.active_mutations.load(SeqCst) == 0
-            && self.finite_mutation_revision.load(SeqCst) == self.mutation_revision.load(SeqCst)
-            && self
-                .admission
-                .read()
-                .unwrap()
-                .known_empty_with_layout(definition, series_id, range, true)
-    }
-
-    pub(crate) fn summary_update_revision(&self) -> SummaryReadRevision {
-        SummaryReadRevision::capture(
-            self.admission.read().unwrap().revision(),
-            &self.mutation_revision,
-            &self.active_mutations,
-            || {},
-        )
-    }
-
-    fn begin_state_mutation(&self) -> StateMutation<'_> {
-        self.active_mutations
-            .fetch_add(1, std::sync::atomic::Ordering::SeqCst);
-        StateMutation(self)
-    }
-
-    pub(crate) fn has_pending_summary_updates(
-        &self,
-        definition: StoredOutputId,
-        range: HalfOpenTimeRange,
-        full_window: bool,
-    ) -> bool {
-        self.admission
-            .read()
-            .unwrap()
-            .has_pending(definition, range, full_window)
-    }
-
-    /// Share the installed metadata snapshot without copying descriptors or state.
-    pub(crate) fn summary_catalog_snapshot(
-        &self,
-    ) -> Option<Arc<asap_types::summary_catalog::SummaryCatalog>> {
-        self.descriptors.authoritative_catalog()
-    }
-
-    /// Record that `sid` is a per-item (item_label-mode) frequency sketch
-    /// keyed by the data-point attribute `label` (e.g. "service"). The
-    /// query engine consults this to decide whether a keyed selector like
-    /// `cms_metric{service="X"}` can be answered by the per-item
-    /// `estimate(key)` path. A no-op `label` (empty) clears it.
-    pub fn set_item_label(&self, sid: u64, label: &str) {
-        let mut m = self.item_labels.write().unwrap();
-        if label.is_empty() {
-            m.remove(&sid);
-        } else {
-            m.insert(sid, label.to_string());
-        }
-    }
-
-    /// Resolve a policy fingerprint to the set of sids it has minted.
-    /// Returns an empty vector when no sid is bound to the fingerprint
-    /// (e.g. fresh policy with no ingest activity yet) or when the
-    /// caller passes [`PolicyFingerprint::UNSET`]. The order of the
-    /// returned slice is sorted (the underlying index is a `BTreeSet`)
-    /// so callers can hash / compare it deterministically.
-    pub fn series_ids_for_policy(&self, policy_fp: PolicyFingerprint) -> Vec<u64> {
-        if policy_fp.is_unset() {
-            return Vec::new();
-        }
-        let Some(output) = self.descriptors.stored_output_reference(policy_fp.into()) else {
-            return Vec::new();
-        };
-        self.storage_handles_for_output(&output)
-    }
-
-    pub(crate) fn is_current_storage_handle(&self, handle: u64) -> bool {
-        let generation = self.active_catalog_generation();
-        self.instances
-            .read()
-            .unwrap()
-            .get(&handle)
-            .is_some_and(|binding| {
-                binding.catalog_generation == generation
-                    && binding.stored_output_reference
-                        == self
-                            .descriptors
-                            .stored_output_reference(binding.policy_fp.into())
-            })
-    }
-
-    pub fn stored_output_for_handle(&self, handle: u64) -> Option<StoredOutputReference> {
-        self.instances
-            .read()
-            .unwrap()
-            .get(&handle)
-            .and_then(|binding| binding.stored_output_reference.clone())
-    }
-
-    pub fn storage_handles_for_output(&self, output: &StoredOutputReference) -> Vec<u64> {
-        if self
-            .descriptors
-            .stored_output_reference(output.stored_output_id)
-            != Some(output.clone())
-        {
-            return Vec::new();
-        }
-        let candidates: Vec<_> = self
-            .output_to_storage_handles
-            .read()
-            .unwrap()
-            .get(&output.stored_output_id)
-            .map(|set| set.iter().copied().collect())
-            .unwrap_or_default();
-        let generation = self.active_catalog_generation();
-        let instances = self.instances.read().unwrap();
-        candidates
-            .into_iter()
-            .filter(|sid| {
-                instances.get(sid).is_some_and(|binding| {
-                    Self::instance_visible_in_generation(binding, generation.as_deref())
-                })
-            })
-            .collect()
-    }
-
-    fn instance_visible_in_generation(
-        binding: &SdsBinding,
-        generation: Option<&CatalogGeneration>,
-    ) -> bool {
-        match generation {
-            Some(generation) => binding.catalog_generation.as_deref() == Some(generation),
-            None => !matches!(
-                binding.data_descriptor.source,
-                asap_types::sds::DataSourceIdentity::Derived { .. }
-            ),
-        }
-    }
-
-    #[cfg(test)]
-    /// Live policy count — number of distinct fingerprints with at
-    /// least one sid. Useful for telemetry / `/runtime` introspection
-    /// (mirrors the legacy "active aggregation count" metric).
-    pub fn policy_count(&self) -> usize {
-        self.output_to_storage_handles.read().unwrap().len()
-    }
-
-    /// Look up the metadata for a sid (cloned because callers usually
-    /// release the index lock before working with it).
-    pub fn instance(&self, sid: u64) -> Option<Arc<SummarySeriesMetadata>> {
-        self.instances
-            .read()
-            .unwrap()
-            .get(&sid)
-            .map(|instance| Arc::clone(&instance.metadata))
-    }
-
-    /// Shared SDS descriptors bound to a materialized SeriesId.
-    pub fn descriptors_for_series_id(
-        &self,
-        sid: u64,
-    ) -> Option<(Arc<SummaryDescriptor>, Arc<DataDescriptor>)> {
-        let instances = self.instances.read().ok()?;
-        let instance = instances.get(&sid)?;
-        Some((
-            Arc::clone(&instance.summary_descriptor),
-            Arc::clone(&instance.data_descriptor),
-        ))
-    }
-
-    #[cfg(test)]
-    pub fn descriptor_counts(&self) -> (usize, usize) {
-        (
-            self.descriptors.summary_count(),
-            self.descriptors.data_count(),
-        )
-    }
-
-    /// Build observed SDS inventory from the actual registered SummaryStore
-    /// entries across the memory and durable tiers. Payload bytes remain in the
-    /// store and are referenced by their fully-spelled-out series identity.
-    pub fn observed_summary_inventory(
-        &self,
-        reporter_id: &str,
-        storage_node_id: &str,
-        producers: &BTreeMap<StoredOutputId, (asap_types::sds::StoredOutputId, String)>,
-        inventory_version: u64,
-        observed_at_ms: i64,
-    ) -> Result<ObservedSummaryInventory, String> {
-        let catalog = self
-            .descriptors
-            .authoritative_catalog()
-            .ok_or_else(|| "no authoritative SummaryCatalog is installed".to_string())?;
-        let reference = catalog.reference().map_err(|error| error.to_string())?;
-        let generation = CatalogGeneration {
-            schema_version: reference.schema_version,
-            plan_id: reference.plan_id,
-            plan_version: reference.plan_version,
-            snapshot_sha256: reference.snapshot_sha256,
-        };
-        let instances = self.instances.read().unwrap();
-        let durable = self.persistence_read.read().unwrap().clone();
-        let mut reported = BTreeMap::new();
-        for (series_id, binding) in instances.iter() {
-            if !Self::instance_visible_in_generation(binding, Some(&generation)) {
-                continue;
-            }
-            let stored_output_id = StoredOutputId::from(binding.metadata.policy_fp);
-            if binding.metadata.policy_fp.is_unset()
-                || !catalog.outputs.contains_key(&stored_output_id)
-            {
-                continue;
-            }
-            let (stored_output_id, producer_id) =
-                producers.get(&stored_output_id).ok_or_else(|| {
-                    format!(
-                        "materialization {} has no producer in the active PrecomputePlan",
-                        stored_output_id.as_u64()
-                    )
-                })?;
-            let store = self
-                .series
-                .get(series_id)
-                .map(|entry| Arc::clone(entry.value()));
-            let completed_through = self
-                .completed_windows
-                .read()
-                .unwrap()
-                .get(series_id)
-                .copied();
-            let status = match binding.metadata.status() {
-                AggStatus::Active => SummaryInstanceStatus::Ready,
-                AggStatus::Retired | AggStatus::Expired => SummaryInstanceStatus::Retiring,
-            };
-            let mut record = |window: TimestampRange,
-                              group_values: BTreeMap<String, String>|
-             -> Result<(), String> {
-                let start_ms = i64::try_from(window.0)
-                    .map_err(|_| "summary instance start exceeds signed timestamp range")?;
-                let end_ms = i64::try_from(window.1)
-                    .map_err(|_| "summary instance end exceeds signed timestamp range")?;
-                let output = StoredOutputReference {
-                    stored_output_id: *stored_output_id,
-                    definition_id: binding
-                        .stored_output_reference
-                        .as_ref()
-                        .ok_or("missing semantic binding")?
-                        .definition_id
-                        .clone(),
-                };
-                if binding.stored_output_reference != Some(output.clone()) {
-                    return Err("inventory output differs from stored payload binding".into());
-                }
-                let address = asap_types::sds::StoredSummaryKey {
-                    plan_id: generation.plan_id,
-                    plan_version: generation.plan_version,
-                    stored_output_id: output.stored_output_id,
-                    population: group_values.clone(),
-                    window: HalfOpenTimeRange { start_ms, end_ms },
-                };
-                let instance_id = asap_types::sds::SummaryInstanceId::new(
-                    address.storage_key().map_err(|e| e.to_string())?,
-                )
-                .map_err(|e| e.to_string())?;
-                let payload_address = address;
-                let instance = SummaryInstance {
-                    instance_id: instance_id.clone(),
-                    stored_output_id: *stored_output_id,
-                    summary_definition_id: binding
-                        .stored_output_reference
-                        .as_ref()
-                        .ok_or("missing semantic binding")?
-                        .definition_id
-                        .clone(),
-                    summary_descriptor_id: binding.summary_descriptor.id().clone(),
-                    data_descriptor_id: binding.data_descriptor.id().clone(),
-                    time_range: HalfOpenTimeRange { start_ms, end_ms },
-                    group_values,
-                    catalog_generation: generation.clone(),
-                    placement: SummaryPlacement {
-                        producer_id: producer_id.clone(),
-                        storage_node_id: storage_node_id.into(),
-                    },
-                    state_reference: SummaryStateReference {
-                        store: "summary-store".into(),
-                        key: payload_address.storage_key().map_err(|e| e.to_string())?,
-                        state_schema_version: binding.summary_descriptor.state_schema_version,
-                        generation: generation.plan_version,
-                        sequence: window.1,
-                        checksum: None,
-                    },
-                    status: status.clone(),
-                    completeness: if completed_through.is_some_and(|end| window.1 <= end) {
-                        InstanceCompleteness::Complete
-                    } else {
-                        InstanceCompleteness::Unknown
-                    },
-                    lifecycle: InstanceLifecycle::Persistent,
-                    observed_at_ms,
-                };
-                instance.validate().map_err(|error| error.to_string())?;
-                reported.insert(instance_id, instance);
-                Ok(())
-            };
-            if let Some(store) = store {
-                let store = store.read().map_err(|_| "summary series lock poisoned")?;
-                for (window, label_id, _) in store.current_epoch.iter_entries() {
-                    let group = store.intern.resolve(label_id).cloned().ok_or_else(|| {
-                        "summary instance has an unresolved group identity".to_string()
-                    })?;
-                    record(window, group)?;
-                }
-                for epoch in store.sealed_epochs.values() {
-                    for (window, label_id, _) in &epoch.entries {
-                        let group = store.intern.resolve(*label_id).cloned().ok_or_else(|| {
-                            "summary instance has an unresolved group identity".to_string()
-                        })?;
-                        record(*window, group)?;
-                    }
-                }
-            }
-            if let Some(handle) = &durable {
-                let keys: Vec<_> = binding.metadata.group_by_keys.iter().cloned().collect();
-                for part in handle.manifest.live_parts() {
-                    let reader = handle
-                        .part_cache
-                        .get_or_load(part.part_id)
-                        .map_err(|error| format!("load summary part {}: {error}", part.part_id))?;
-                    for index in reader.index_records() {
-                        if index.agg_id != *series_id {
-                            continue;
-                        }
-                        let entry = reader.load_entry(&index).map_err(|error| {
-                            format!("load summary part {} entry: {error}", part.part_id)
-                        })?;
-                        let values = entry.label.map(|label| label.labels).unwrap_or_default();
-                        if values.len() != keys.len() {
-                            return Err(format!(
-                                "summary series {series_id} has {} group keys but durable state has {} values",
-                                keys.len(), values.len()
-                            ));
-                        }
-                        record(
-                            (entry.start_ts, entry.end_ts),
-                            keys.iter().cloned().zip(values).collect(),
-                        )?;
-                    }
-                }
-            }
-        }
-        let inventory = ObservedSummaryInventory {
-            schema_version: 1,
-            reporter_id: reporter_id.into(),
-            inventory_version,
-            observed_at_ms,
-            instances: reported,
-        };
-        inventory
-            .validate_against_catalog(&catalog)
-            .map_err(|error| error.to_string())?;
-        Ok(inventory)
-    }
-
-    /// Borrow-style metadata accessor (P2-2). Runs `f(&meta)` while
-    /// holding the `instances` read lock and returns its result, WITHOUT
-    /// cloning the (allocation-heavy: `String` + `BTreeSet<String>` +
-    /// `AggKind`) metadata. Returns `None` (without invoking `f`) when
-    /// the sid is unknown.
-    ///
-    /// Prefer this over [`Self::instance`] on hot per-candidate paths
-    /// (the engine's capability check + the topk-over-rate fallback)
-    /// that only need to *read* a field or two from the metadata. `f`
-    /// runs under the read lock, so it must not call back into the store
-    /// (which would deadlock) and should stay allocation-light — extract
-    /// the small data you need (a `Capability` clone, a `bool`) and act
-    /// after this returns.
-    pub fn with_instance<R, F: FnOnce(&SummarySeriesMetadata) -> R>(
-        &self,
-        sid: u64,
-        f: F,
-    ) -> Option<R> {
-        let g = self.instances.read().ok()?;
-        g.get(&sid).map(|instance| f(&instance.metadata))
-    }
-
-    /// Append a window's sketch state under `sid`. Caller is responsible
-    /// for ensuring the corresponding `SummarySeriesMetadata` was
-    /// registered (or the sketch arrives orphan and the caller chooses
-    /// to drop / reject / register-on-the-fly).
-    ///
-    /// `window` is the OTLP DataPoint's `(start_time_unix_ms, time_unix_ms)`.
-    pub fn append_sample(
-        &self,
-        sid: u64,
-        series_label_values: BTreeMap<String, String>,
-        window: TimestampRange,
-        sample: SketchSampleState,
-    ) -> bool {
-        // Hold the existing admission guard through append so the global
-        // finite barrier cannot race an unadmitted producer's last write.
-        let admission = self.admission.read().unwrap();
-        if admission.is_finite_closed() {
-            return false;
-        }
-        let instances = self.instances.read().unwrap();
-        if instances.get(&sid).is_some_and(|binding| {
-            matches!(
-                binding.data_descriptor.source,
-                asap_types::sds::DataSourceIdentity::Derived { .. }
-            )
-        }) {
-            return false;
-        }
-        self.append_sample_with_binding(sid, series_label_values, window, sample)
-    }
-
-    // Caller retains the existing metadata guard and has rejected derived
-    // definitions. Avoid recursively acquiring it when a writer is waiting.
-    fn append_sample_with_binding(
-        &self,
-        sid: u64,
-        series_label_values: BTreeMap<String, String>,
-        window: TimestampRange,
-        sample: SketchSampleState,
-    ) -> bool {
-        let completed = self.completed_windows.read().unwrap();
-        if completed.get(&sid).is_some_and(|end| window.1 <= *end) {
-            return false;
-        }
-        let _mutation = self.begin_state_mutation();
-        let store = self
-            .series
-            .entry(sid)
-            .or_insert_with(|| Arc::new(RwLock::new(self.fresh_sid_store())))
-            .clone();
-        let mut guard = store.write().unwrap();
-        guard.insert(window, series_label_values, AggPayload::Sketch(sample));
-        guard.last_write_unix_ms = now_ms();
-        true
-    }
-
-    /// Build a `SidStoreData` pre-configured for the store's current
-    /// persistence mode. When persistence is enabled it seals on the
-    /// configured window cadence and disables retention-drop (the
-    /// flush-then-evict loop bounds memory). When disabled it's the
-    /// plain in-memory store with #327 retention.
-    fn fresh_sid_store(&self) -> SidStoreData<BTreeMap<String, String>, AggPayload> {
-        use std::sync::atomic::Ordering;
-        let mut data = SidStoreData::new();
-        let cadence = self.seal_window_count.load(Ordering::Relaxed);
-        if cadence > 0 {
-            data.seal_window_count = Some(cadence);
-            data.persistence_enabled = true;
-        }
-        data
-    }
-
-    /// Append a window's exact-aggregation (Sum/Count/Avg/Rate/Min/Max)
-    /// state under `sid`. Mirror of [`Self::append_sample`] for the
-    /// exact-agg branch — Phase 5 M2.3.3.
-    ///
-    /// Caller invariant: `sid` was registered with
-    /// `AggKind::ExactAgg { .. }`. Mixing sketch + exact-agg
-    /// payloads under one sid is a logic error this layer doesn't
-    /// guard against (it'll crash the reducer at runtime, not silently
-    /// corrupt).
-    pub fn append_precompute(
-        &self,
-        sid: u64,
-        series_label_values: BTreeMap<String, String>,
-        window: TimestampRange,
-        payload: Box<dyn crate::storage_engines::types::AggregateCore>,
-    ) -> bool {
-        // Hold the existing admission guard through append so the global
-        // finite barrier cannot race an unadmitted producer's last write.
-        let admission = self.admission.read().unwrap();
-        if admission.is_finite_closed() {
-            return false;
-        }
-        let instances = self.instances.read().unwrap();
-        if instances.get(&sid).is_some_and(|binding| {
-            matches!(
-                binding.data_descriptor.source,
-                asap_types::sds::DataSourceIdentity::Derived { .. }
-            )
-        }) {
-            return false;
-        }
-        self.append_precompute_with_binding(sid, series_label_values, window, payload)
-    }
-
-    // Caller retains the existing metadata guard and has rejected derived
-    // definitions. Avoid recursively acquiring it when a writer is waiting.
-    fn append_precompute_with_binding(
-        &self,
-        sid: u64,
-        series_label_values: BTreeMap<String, String>,
-        window: TimestampRange,
-        payload: Box<dyn crate::storage_engines::types::AggregateCore>,
-    ) -> bool {
-        let completed = self.completed_windows.read().unwrap();
-        if completed.get(&sid).is_some_and(|end| window.1 <= *end) {
-            return false;
-        }
-        let _mutation = self.begin_state_mutation();
-        // Extremum state feeds the derived rollup series that serves
-        // `min_over_time` / `max_over_time` without walking every pane.
-        // Both directions are their own accumulator type, so the reduction
-        // follows from the payload's type rather than from a `sub_type`
-        // string that had to agree with it.
-        let rollup_value = payload
-            .as_any()
-            .downcast_ref::<asap_physical_operators::summary_kernels::MinAccumulator>()
-            .map(|acc| (RollupReduction::Min, acc.value))
-            .or_else(|| {
-                payload
-                    .as_any()
-                    .downcast_ref::<asap_physical_operators::summary_kernels::MaxAccumulator>()
-                    .map(|acc| (RollupReduction::Max, acc.value))
-            });
-        let store = self
-            .series
-            .entry(sid)
-            .or_insert_with(|| Arc::new(RwLock::new(self.fresh_sid_store())))
-            .clone();
-        let mut guard = store.write().unwrap();
-        guard.insert(
-            window,
-            series_label_values.clone(),
-            AggPayload::ExactAgg(Arc::from(payload)),
-        );
-        guard.last_write_unix_ms = now_ms();
-        let retention_horizon_ms = guard.retention_horizon_ms;
-        drop(guard);
-        if let Some((reduction, value)) =
-            rollup_value.filter(|_| self.persistence_read.read().unwrap().is_none())
-        {
-            self.rollups.append(
-                reduction,
-                sid,
-                series_label_values,
-                window,
-                value,
-                retention_horizon_ms,
-            );
-        }
-        true
-    }
-
-    /// Read a category through the derived in-memory rollup. Returns `None`
-    /// when persistence/recovery is active or no complete rollup exists, so
-    /// callers can fall back to the canonical exact-agg range path.
-    pub fn query_rollup_range(
-        &self,
-        category: RollupReduction,
-        sid: u64,
-        start_unix_ms: u64,
-        end_unix_ms: u64,
-    ) -> Option<Vec<(BTreeMap<String, String>, f64)>> {
-        if self.persistence_read.read().unwrap().is_some() {
-            return None;
-        }
-        self.rollups
-            .query(category, sid, start_unix_ms, end_unix_ms)
-    }
-
-    /// Range-query the ASAP-tier state for one sid. Window-end-keyed
-    /// time series result, one entry per distinct group-by VALUES
-    /// vector. `(start, end)` is the inclusive query window; entries
-    /// whose `(window_start, window_end)` lies fully within the query
-    /// range are returned.
-    pub fn query_range(
-        &self,
-        sid: u64,
-        start_unix_ms: u64,
-        end_unix_ms: u64,
-    ) -> Vec<SketchTimeSeries> {
-        if self
-            .incomplete_summary_lineages
-            .get(&sid)
-            .is_some_and(|lineages| {
-                lineages.iter().any(|lineage| {
-                    lineage.window_start_unix_ms < end_unix_ms
-                        && lineage.window_end_unix_ms > start_unix_ms
-                })
-            })
-        {
-            return Vec::new();
-        }
-        // Result is keyed by the resolved label MAP so the in-memory tier
-        // (its own intern space) and the durable disk tier (independent
-        // intern space) union by label identity, not `LabelValuesId`.
-        let mut by_label_map: HashMap<
-            BTreeMap<String, String>,
-            BTreeMap<i64, Vec<SketchSampleState>>,
-        > = HashMap::new();
-
-        // ── In-memory tier ──────────────────────────────────────────────
-        // Absent series is NOT an early return: under persistence the
-        // sid's hot+sealed state may have been fully flushed-then-evicted
-        // (or recovered from disk after a restart with no fresh ingest
-        // yet), so the answer can live entirely on disk. We still run the
-        // disk union below.
-        if let Some(store) = self.series.get(&sid).map(|s| s.clone()) {
-            let guard = store.write().unwrap(); // exact_query may build the lazy index
-            let mut by_label_id: HashMap<LabelValuesId, BTreeMap<i64, Vec<SketchSampleState>>> =
-                HashMap::new();
-
-            let mut buf: Vec<(TimestampRange, LabelValuesId, &AggPayload)> = Vec::new();
-            // Sketch read path uses HALF-OPEN OVERLAP, not containment: the
-            // agent emits ~30s tumbling panes, so a short query window (a
-            // `[30s]` range, or an instant query whose freshest pane straddles
-            // `now`) can't FULLY CONTAIN any pane. Containment then returns
-            // zero in-window samples → the carry-in never fires and the
-            // reducer yields an empty series (the live "No result" bug for
-            // `[30s]` + bare-instant selectors). The reducer's own
-            // `w_end >= t0` / `latest_end` filters keep out-of-range values
-            // from leaking into the answer. See
-            // `MutableEpoch::range_query_overlap_into`.
-            guard
-                .current_epoch
-                .range_query_overlap_into(start_unix_ms, end_unix_ms, &mut buf);
-            for (win, label_id, payload) in &buf {
-                // Filter to sketch-variant payloads only; precompute sids
-                // (M2.3) are served via the precompute query path
-                // (M2.3.5).
-                if let Some(s) = payload.as_sketch() {
-                    // PUSH, not insert: a window_end can carry MULTIPLE
-                    // sub-window frames (delta_transmission), all of which
-                    // must survive in insertion (= column) order. The
-                    // overlap scan iterates `windows_col` by index, so push
-                    // preserves the producer's emit order within a window.
-                    by_label_id
-                        .entry(*label_id)
-                        .or_default()
-                        .entry(win.1 as i64)
-                        .or_default()
-                        .push(s.clone());
-                }
-            }
-            buf.clear();
-
-            for sealed in guard.sealed_epochs.values() {
-                sealed.range_query_overlap_into(start_unix_ms, end_unix_ms, &mut buf);
-                for (win, label_id, payload) in &buf {
-                    if let Some(s) = payload.as_sketch() {
-                        by_label_id
-                            .entry(*label_id)
-                            .or_default()
-                            .entry(win.1 as i64)
-                            .or_default()
-                            .push(s.clone());
-                    }
-                }
-                buf.clear();
-            }
-
-            // Delta-stitching carry-in (issue: quantile/HLL "No result"
-            // bug). The agent emits a periodic Full snapshot followed by
-            // many cheap Delta frames. A short query window (e.g. `[30s]`)
-            // routinely contains ONLY deltas — the Full landed earlier,
-            // outside `[start, end]`. The downstream delta-apply reducer
-            // can't establish a rolling base from a leading delta, so it
-            // silently produces an empty result that the engine returns as
-            // `Ok(empty)` (NOT a capability-miss), so the router never
-            // fails over and the caller sees "No result". To fix, for each
-            // label series whose earliest in-window sample is a Delta,
-            // splice in the most-recent Full snapshot ending at or before
-            // `start` as a carry-in base. Its window-end is `< start`, so
-            // it sorts first in the per-label `BTreeMap` and the reducer's
-            // cumulative/per-window walk uses it as the base; the reducer
-            // drops out-of-range output windows so the carry-in never leaks
-            // into the answer's time domain.
-            if start_unix_ms > 0 {
-                // Which labels need a base? Those present in-window whose
-                // earliest sample is a Delta (a leading Full needs nothing).
-                let need_base: Vec<LabelValuesId> = by_label_id
-                    .iter()
-                    .filter(|(_, samples)| {
-                        // Earliest window's FIRST frame: a leading Full (or
-                        // sub-window seed Full) needs no carry-in.
-                        samples
-                            .values()
-                            .next()
-                            .and_then(|frames| frames.first())
-                            .map(|s| {
-                                matches!(
-                                    s.encoding,
-                                    SketchEncoding::ProtoDelta | SketchEncoding::MsgpackDelta
-                                )
-                            })
-                            .unwrap_or(false)
-                    })
-                    .map(|(label_id, _)| *label_id)
-                    .collect();
-
-                if !need_base.is_empty() {
-                    let before = start_unix_ms.saturating_sub(1);
-                    // Track the latest Full per label (by window-end).
-                    let mut latest_full: HashMap<LabelValuesId, (i64, SketchSampleState)> =
-                        HashMap::new();
-                    let mut consider = |buf: &Vec<(TimestampRange, LabelValuesId, &AggPayload)>| {
-                        for (win, label_id, payload) in buf {
-                            if !need_base.contains(label_id) {
-                                continue;
-                            }
-                            let Some(s) = payload.as_sketch() else {
-                                continue;
-                            };
-                            if !matches!(
-                                s.encoding,
-                                SketchEncoding::ProtoFull | SketchEncoding::MsgpackFull
-                            ) {
-                                continue;
-                            }
-                            let w_end = win.1 as i64;
-                            match latest_full.get(label_id) {
-                                Some((prev_end, _)) if *prev_end >= w_end => {}
-                                _ => {
-                                    latest_full.insert(*label_id, (w_end, s.clone()));
-                                }
-                            }
-                        }
-                    };
-                    guard
-                        .current_epoch
-                        .collect_ending_at_or_before(before, &mut buf);
-                    consider(&buf);
-                    buf.clear();
-                    for sealed in guard.sealed_epochs.values() {
-                        sealed.collect_ending_at_or_before(before, &mut buf);
-                        consider(&buf);
-                        buf.clear();
-                    }
-                    for (label_id, (w_end, state)) in latest_full {
-                        // Carry-in base sorts before `start` (its w_end <
-                        // start), so it heads the per-label BTreeMap and the
-                        // reducer uses it as the rolling base. Only splice it
-                        // when that window-end has no frames yet (don't
-                        // duplicate a base the in-window scan already saw).
-                        let frames = by_label_id
-                            .entry(label_id)
-                            .or_default()
-                            .entry(w_end)
-                            .or_default();
-                        if frames.is_empty() {
-                            frames.push(state);
-                        }
-                    }
-                }
-            }
-
-            // Materialize the in-memory result keyed by the resolved label
-            // MAP so the disk tier (which has its own intern space) can be
-            // unioned by label identity rather than `LabelValuesId`. Merge
-            // per-window-end frame lists rather than overwriting, so two
-            // label_ids that resolve to the same label map (distinct intern
-            // ids, same values) union their frames instead of clobbering.
-            for (label_id, samples) in by_label_id {
-                let label_values = guard.intern.resolve(label_id).cloned().unwrap_or_default();
-                let dst = by_label_map.entry(label_values).or_default();
-                for (w_end, frames) in samples {
-                    dst.entry(w_end).or_default().extend(frames);
-                }
-            }
-            // Release the per-sid lock before touching disk — disk reads can
-            // mmap/decode and must not hold the hot ingest lock.
-            drop(guard);
-        } // end in-memory tier
-
-        // Union the DURABLE DISK TIER for the part of `[start, end)` that
-        // has been flushed-then-evicted from memory. Preserves the
-        // #323–#326 read contract across the in-mem/on-disk boundary:
-        // the same half-open overlap admits straddling panes, and a
-        // delta-stitching carry-in Full base is fetched from disk when
-        // it has aged out of memory. In-memory samples win on a
-        // window-end collision (disk is a strict older suffix in steady
-        // state; the guard is belt-and-suspenders).
-        self.union_disk_parts_into(sid, start_unix_ms, end_unix_ms, &mut by_label_map);
-
-        by_label_map
-            .into_iter()
-            .map(|(label_values, samples)| SketchTimeSeries {
-                sid,
-                series_label_values: label_values,
-                samples,
-            })
-            .collect()
-    }
-
-    /// Resolve the sorted group-by KEYS for a sid from its instance
-    /// metadata. Disk parts store only label VALUES (a `KeyByLabelValues`
-    /// vector); the per-sid intern table records `BTreeMap<String,String>`
-    /// (key-sorted), so `values()` yields values in key-sorted order.
-    /// Zipping the sorted `group_by_keys` against a disk values vector
-    /// rebuilds the exact `BTreeMap<String,String>` that the in-memory
-    /// path produced — no part-format change needed to round-trip keys.
-    fn sid_group_by_keys(&self, sid: u64) -> Option<Vec<String>> {
-        self.instances
-            .read()
-            .ok()?
-            .get(&sid)
-            .map(|m| m.group_by_keys.iter().cloned().collect())
-    }
-
-    /// Reconstruct the full label MAP for one disk entry by zipping the
-    /// sid's sorted group-by keys against the stored values vector.
-    fn rebuild_label_map(
-        keys: &[String],
-        label: &Option<crate::storage_engines::types::KeyByLabelValues>,
-    ) -> BTreeMap<String, String> {
-        let mut out = BTreeMap::new();
-        if let Some(kv) = label {
-            for (k, v) in keys.iter().zip(kv.labels.iter()) {
-                out.insert(k.clone(), v.clone());
-            }
-        }
-        out
-    }
-
-    /// Union the durable disk tier into `by_label_map` for the requested
-    /// `[start, end)`. No-op when persistence is disabled. Mirrors the
-    /// in-memory read contract: half-open overlap admits straddling
-    /// panes, and the delta-stitching carry-in fetches a Full base from
-    /// disk when it has aged out of memory. In-memory samples already in
-    /// `by_label_map` win on a window-end collision.
-    fn union_disk_parts_into(
-        &self,
-        sid: u64,
-        start_unix_ms: u64,
-        end_unix_ms: u64,
-        by_label_map: &mut HashMap<BTreeMap<String, String>, BTreeMap<i64, Vec<SketchSampleState>>>,
-    ) {
-        let handle = {
-            let g = self.persistence_read.read().unwrap();
-            match g.as_ref() {
-                Some(h) => Arc::clone(h),
-                None => return,
-            }
-        };
-        let Some(keys) = self.sid_group_by_keys(sid) else {
-            return;
-        };
-
-        // Snapshot which `(label_map, window_end)` keys the in-memory tier
-        // already populated, so the disk scan can apply the "in-memory wins"
-        // rule per window-end without colliding frame lists across tiers.
-        let in_mem_owned_ends: std::collections::HashSet<(BTreeMap<String, String>, i64)> =
-            by_label_map
-                .iter()
-                .flat_map(|(lm, by_end)| by_end.keys().map(move |w| (lm.clone(), *w)))
-                .collect();
-
-        // ---- Overlap scan over disk parts in [start, end) ----
-        let parts = handle
-            .manifest
-            .live_parts_overlapping(start_unix_ms, end_unix_ms);
-        for pe in &parts {
-            let reader = match handle.part_cache.get_or_load(pe.part_id) {
-                Ok(r) => r,
-                Err(e) => {
-                    tracing::warn!(part_id = pe.part_id, error = %e, "sketch disk read: open part failed");
-                    continue;
-                }
-            };
-            for rec in reader.index_records() {
-                if rec.agg_id != sid {
-                    continue;
-                }
-                // Half-open overlap, matching the in-memory scan:
-                // `end_ts > start && start_ts < end`.
-                if !(rec.end_ts > start_unix_ms && rec.start_ts < end_unix_ms) {
-                    continue;
-                }
-                let Ok(entry) = reader.load_entry(&rec) else {
-                    continue;
-                };
-                let label_map = Self::rebuild_label_map(&keys, &entry.label);
-                let sample = SketchSampleState {
-                    bytes: entry.sketch_bytes,
-                    encoding: tag_to_encoding(entry.encoding_tag),
-                };
-                let w_end = rec.end_ts as i64;
-                // In-memory wins on a window-end collision: only contribute
-                // disk frames at window-ends the in-memory tier left empty.
-                // When disk uniquely owns a window-end it may hold MULTIPLE
-                // sub-window frames there (a flushed sub-window window kept
-                // every frame); push them all in disk-record order. We never
-                // mix disk + in-memory frames at one window-end.
-                let by_end = by_label_map.entry(label_map.clone()).or_default();
-                if in_mem_owned_ends.contains(&(label_map, w_end)) {
-                    continue;
-                }
-                by_end.entry(w_end).or_default().push(sample);
-            }
-        }
-
-        // ---- Delta-stitching carry-in from disk ----
-        // For each label whose earliest in-window sample is a Delta and
-        // which lacks a Full base ending before `start`, fetch the
-        // most-recent Full snapshot ending at/before `start-1` from disk.
-        if start_unix_ms == 0 {
-            return;
-        }
-        let before = start_unix_ms.saturating_sub(1);
-        let need_base: std::collections::HashSet<BTreeMap<String, String>> = by_label_map
-            .iter()
-            .filter(|(_, samples)| {
-                // Earliest sample is a Delta and there is no Full base
-                // already present at/before `start`.
-                let earliest_is_delta = samples
-                    .values()
-                    .next()
-                    .and_then(|frames| frames.first())
-                    .map(|s| {
-                        matches!(
-                            s.encoding,
-                            SketchEncoding::ProtoDelta | SketchEncoding::MsgpackDelta
-                        )
-                    })
-                    .unwrap_or(false);
-                let has_base_before = samples.iter().any(|(w_end, frames)| {
-                    *w_end < start_unix_ms as i64
-                        && frames.iter().any(|s| {
-                            matches!(
-                                s.encoding,
-                                SketchEncoding::ProtoFull | SketchEncoding::MsgpackFull
-                            )
-                        })
-                });
-                earliest_is_delta && !has_base_before
-            })
-            .map(|(label_map, _)| label_map.clone())
-            .collect();
-        if need_base.is_empty() {
-            return;
-        }
-
-        let carry_parts = handle.manifest.live_parts_overlapping(0, before);
-        // latest Full per label-map (by window-end).
-        let mut latest_full: HashMap<BTreeMap<String, String>, (i64, SketchSampleState)> =
-            HashMap::new();
-        for pe in &carry_parts {
-            let reader = match handle.part_cache.get_or_load(pe.part_id) {
-                Ok(r) => r,
-                Err(_) => continue,
-            };
-            for rec in reader.index_records() {
-                if rec.agg_id != sid || rec.end_ts > before {
-                    continue;
-                }
-                let Ok(entry) = reader.load_entry(&rec) else {
-                    continue;
-                };
-                let encoding = tag_to_encoding(entry.encoding_tag);
-                if !matches!(
-                    encoding,
-                    SketchEncoding::ProtoFull | SketchEncoding::MsgpackFull
-                ) {
-                    continue;
-                }
-                let label_map = Self::rebuild_label_map(&keys, &entry.label);
-                if !need_base.contains(&label_map) {
-                    continue;
-                }
-                let w_end = rec.end_ts as i64;
-                match latest_full.get(&label_map) {
-                    Some((prev_end, _)) if *prev_end >= w_end => {}
-                    _ => {
-                        latest_full.insert(
-                            label_map,
-                            (
-                                w_end,
-                                SketchSampleState {
-                                    bytes: entry.sketch_bytes,
-                                    encoding,
-                                },
-                            ),
-                        );
-                    }
-                }
-            }
-        }
-        for (label_map, (w_end, state)) in latest_full {
-            let frames = by_label_map
-                .entry(label_map)
-                .or_default()
-                .entry(w_end)
-                .or_default();
-            if frames.is_empty() {
-                frames.push(state);
-            }
-        }
-    }
-
-    /// Range-query the ExactAgg state for ONE sid. Sister of
-    /// [`Self::query_range`] for the exact-aggregation branch — same
-    /// `[start, end]` semantics, but yields `Box<dyn AggregateCore>`
-    /// payloads keyed by their FULL `BTreeMap<String, String>` label
-    /// map (label KEYS preserved, not just values).
-    ///
-    /// Used by the ASAP-tier `sum by (...)` dispatch path
-    /// (`SketchReducer::evaluate_exact_agg`) so the engine can
-    /// project label maps onto a query-time `group_by_keys` subset
-    /// (`{zone: z0, rack: r0}` → grouped by `zone` only). The
-    /// existing [`Self::query_precomputes_by_agg`] flattens labels
-    /// to a `KeyByLabelValues` (values only, no keys), which loses
-    /// the projection information the engine needs.
-    ///
-    /// Returns an empty Vec when the sid carries no ExactAgg state
-    /// in `[start, end]` (or is sketch-backed). Defensive — caller
-    /// is responsible for confirming the sid's `agg_kind` is
-    /// `AggKind::ExactAgg { .. }` before calling.
-    pub fn query_exact_agg_range(
-        &self,
-        sid: u64,
-        start_unix_ms: u64,
-        end_unix_ms: u64,
-    ) -> Vec<(
-        BTreeMap<String, String>,
-        BTreeMap<i64, Arc<dyn crate::storage_engines::types::AggregateCore>>,
-    )> {
-        // Key by the resolved label MAP (not `LabelValuesId`) so the
-        // in-memory tier and the durable disk tier — which carry
-        // independent intern spaces — union by label identity. Mirrors
-        // `query_range`. Absent in-memory store is NOT an early return:
-        // under persistence the windows may have been flushed-then-evicted
-        // (or recovered from disk on restart), so the disk union below
-        // still runs.
-        let mut by_label_map: HashMap<
-            BTreeMap<String, String>,
-            BTreeMap<i64, Arc<dyn crate::storage_engines::types::AggregateCore>>,
-        > = HashMap::new();
-
-        if let Some(store) = self.series.get(&sid).map(|s| s.clone()) {
-            let guard = store.write().unwrap();
-            let mut by_label_id: HashMap<
-                LabelValuesId,
-                BTreeMap<i64, Arc<dyn crate::storage_engines::types::AggregateCore>>,
-            > = HashMap::new();
-
-            let mut buf: Vec<(TimestampRange, LabelValuesId, &AggPayload)> = Vec::new();
-            guard
-                .current_epoch
-                .range_query_into(start_unix_ms, end_unix_ms, &mut buf);
-            for (win, label_id, payload) in &buf {
-                if let Some(p) = payload.as_exact_agg_arc() {
-                    by_label_id
-                        .entry(*label_id)
-                        .or_default()
-                        .insert(win.1 as i64, Arc::clone(p));
-                }
-            }
-            buf.clear();
-
-            for sealed in guard.sealed_epochs.values() {
-                sealed.range_query_into(start_unix_ms, end_unix_ms, &mut buf);
-                for (win, label_id, payload) in &buf {
-                    if let Some(p) = payload.as_exact_agg_arc() {
-                        by_label_id
-                            .entry(*label_id)
-                            .or_default()
-                            .insert(win.1 as i64, Arc::clone(p));
-                    }
-                }
-                buf.clear();
-            }
-
-            for (label_id, samples) in by_label_id {
-                let label_values_map = guard.intern.resolve(label_id).cloned().unwrap_or_default();
-                by_label_map
-                    .entry(label_values_map)
-                    .or_default()
-                    .extend(samples);
-            }
-            drop(guard);
-        }
-
-        // Union the durable disk tier for the flushed-then-evicted portion
-        // of the range. In-memory wins on a window-end collision.
-        self.union_disk_exact_agg_into(sid, start_unix_ms, end_unix_ms, &mut by_label_map);
-
-        by_label_map.into_iter().collect()
-    }
-
-    /// Union the durable disk tier's exact-aggregation entries into
-    /// `by_label_map` for `[start, end)`. No-op when persistence is off.
-    /// Disk entries are reconstructed via [`reconstruct_exact_agg`]; an
-    /// unrecognized accumulator type is skipped (sketch-backed forms are
-    /// served by `query_range`, not here — see PR follow-up note).
-    /// Containment scan (`start_ts >= start && end_ts <= end`) matches the
-    /// in-memory exact-agg `range_query_into`.
-    fn union_disk_exact_agg_into(
-        &self,
-        sid: u64,
-        start_unix_ms: u64,
-        end_unix_ms: u64,
-        by_label_map: &mut HashMap<
-            BTreeMap<String, String>,
-            BTreeMap<i64, Arc<dyn crate::storage_engines::types::AggregateCore>>,
-        >,
-    ) {
-        let handle = {
-            let g = self.persistence_read.read().unwrap();
-            match g.as_ref() {
-                Some(h) => Arc::clone(h),
-                None => return,
-            }
-        };
-        let Some(keys) = self.sid_group_by_keys(sid) else {
-            return;
-        };
-        let parts = handle
-            .manifest
-            .live_parts_overlapping(start_unix_ms, end_unix_ms);
-        for pe in &parts {
-            let reader = match handle.part_cache.get_or_load(pe.part_id) {
-                Ok(r) => r,
-                Err(e) => {
-                    tracing::warn!(part_id = pe.part_id, error = %e, "exact-agg disk read: open part failed");
-                    continue;
-                }
-            };
-            for rec in reader.index_records() {
-                if rec.agg_id != sid {
-                    continue;
-                }
-                // Containment, matching the in-memory exact-agg scan.
-                if !(rec.start_ts >= start_unix_ms && rec.end_ts <= end_unix_ms) {
-                    continue;
-                }
-                let Ok(entry) = reader.load_entry(&rec) else {
-                    continue;
-                };
-                let Some(acc) = reconstruct_exact_agg(&entry.sketch_type_name, &entry.sketch_bytes)
-                else {
-                    continue;
-                };
-                let label_map = Self::rebuild_label_map(&keys, &entry.label);
-                by_label_map
-                    .entry(label_map)
-                    .or_default()
-                    // In-memory wins — only fill window-ends disk uniquely owns.
-                    .entry(rec.end_ts as i64)
-                    .or_insert_with(|| Arc::from(acc));
-            }
-        }
-    }
-
-    /// Actual coverage bounds `(min_window_start_ms, max_window_end_ms)`
-    /// of the exact-agg windows this sid holds within `[start_unix_ms,
-    /// end_unix_ms]`. `None` when no in-range exact-agg window exists.
-    ///
-    /// Issue #301 (Layer 4): `evaluate_exact_agg_rate` must divide by the
-    /// ACTUAL data span — not the nominal `[r]` — when the producer has
-    /// run for less than the requested range. `query_exact_agg_range`
-    /// keys samples by `window_end` only, dropping `window_start`; this
-    /// companion preserves the full `(start, end)` so the rate reducer
-    /// can compute a coverage-aware divisor. Cheap (one epoch scan); the
-    /// rate reducer already walks the same windows.
-    pub fn exact_agg_coverage_bounds(
-        &self,
-        sid: u64,
-        start_unix_ms: u64,
-        end_unix_ms: u64,
-    ) -> Option<(u64, u64)> {
-        let mut min_start: u64 = u64::MAX;
-        let mut max_end: u64 = 0;
-        let mut any = false;
-
-        // In-memory tier (absent store is not an early return — disk may
-        // still cover the range after flush+evict / restart).
-        if let Some(store) = self.series.get(&sid).map(|s| s.clone()) {
-            let guard = store.read().unwrap();
-            let mut buf: Vec<(TimestampRange, LabelValuesId, &AggPayload)> = Vec::new();
-            guard
-                .current_epoch
-                .range_query_into(start_unix_ms, end_unix_ms, &mut buf);
-            for (win, _label_id, payload) in &buf {
-                if payload.as_exact_agg().is_some() {
-                    any = true;
-                    min_start = min_start.min(win.0);
-                    max_end = max_end.max(win.1);
-                }
-            }
-            buf.clear();
-
-            for sealed in guard.sealed_epochs.values() {
-                sealed.range_query_into(start_unix_ms, end_unix_ms, &mut buf);
-                for (win, _label_id, payload) in &buf {
-                    if payload.as_exact_agg().is_some() {
-                        any = true;
-                        min_start = min_start.min(win.0);
-                        max_end = max_end.max(win.1);
-                    }
-                }
-                buf.clear();
-            }
-        }
-
-        // Durable disk tier — same coverage-aware divisor must see the
-        // flushed-then-evicted windows, else `rate` over-divides by the
-        // nominal `[r]` once the recent data ages onto disk.
-        if let Some(handle) = {
-            let g = self.persistence_read.read().unwrap();
-            g.as_ref().map(Arc::clone)
-        } {
-            let parts = handle
-                .manifest
-                .live_parts_overlapping(start_unix_ms, end_unix_ms);
-            for pe in &parts {
-                let Ok(reader) = handle.part_cache.get_or_load(pe.part_id) else {
-                    continue;
-                };
-                for rec in reader.index_records() {
-                    if rec.agg_id != sid {
-                        continue;
-                    }
-                    if !(rec.start_ts >= start_unix_ms && rec.end_ts <= end_unix_ms) {
-                        continue;
-                    }
-                    // Only count entries that reconstruct as exact-agg
-                    // (skip sketch-backed disk entries under this sid).
-                    let Ok(entry) = reader.load_entry(&rec) else {
-                        continue;
-                    };
-                    if reconstruct_exact_agg(&entry.sketch_type_name, &entry.sketch_bytes).is_none()
-                    {
-                        continue;
-                    }
-                    any = true;
-                    min_start = min_start.min(rec.start_ts);
-                    max_end = max_end.max(rec.end_ts);
-                }
-            }
-        }
-
-        if any {
-            Some((min_start, max_end))
-        } else {
-            None
-        }
-    }
-
-    /// Phase 5 M2.3.5 — query the precompute payloads across every sid
-    /// belonging to one `PrecomputeMaterialization` (identified by `metric` +
-    /// `agg_cfg.aggregation_type`), shaped as the legacy `Store`
-    /// trait's `TimestampedBucketsMap`. Lets the query engine swap
-    /// `Store::query_precomputed_output` for `SketchStore` without
-    /// reshaping its consumer code in the same PR.
-    ///
-    /// `start_unix_ms`, `end_unix_ms` are inclusive window bounds —
-    /// rows whose `(start, end)` falls within the range are returned.
-    ///
-    /// Iterates the `instances` map once. Cheap for the registry sizes
-    /// the production deployment runs at; if instance counts grow into
-    /// the millions, replace with an `agg_id → Vec<sid>` secondary
-    /// index.
-    pub fn query_precomputes_by_agg(
-        &self,
-        metric: &str,
-        agg_type: AggregationType,
-        start_unix_ms: u64,
-        end_unix_ms: u64,
-    ) -> std::collections::HashMap<
-        Option<crate::storage_engines::types::KeyByLabelValues>,
-        Vec<(
-            (u64, u64),
-            Arc<dyn crate::storage_engines::types::AggregateCore>,
-        )>,
-    > {
-        let mut out: std::collections::HashMap<
-            Option<crate::storage_engines::types::KeyByLabelValues>,
-            Vec<(
-                (u64, u64),
-                Arc<dyn crate::storage_engines::types::AggregateCore>,
-            )>,
-        > = std::collections::HashMap::new();
-
-        // Pick the sids whose metadata describes this (metric,
-        // agg_type) tuple. We don't gate on `group_by_keys` here —
-        // the engine's query-side filtering (label matchers) handles
-        // that. Returning the superset is correct; over-returning is
-        // just a perf cost the engine already absorbs.
-        //
-        // ── KNOWN GAP — sketch-backed aggs return empty here ────────
-        // The `matches!` predicate below ONLY matches
-        // `AggKind::ExactAgg`. Sketch-backed sids
-        // (`AggKind::Sketch { algorithm: kind, config, .. }`, registered by
-        // `route_modified_otlp_sketches_to_precompute` for every
-        // OTLP DDSketch/KLL/HLL/CountSketch/CountMinSketch DP) are
-        // NEVER picked up — and the agg-keyed precompute query
-        // unconditionally returns an empty map for them. The
-        // legacy `ASAPQueryEngine::handle_query` path
-        // (`query_engines/asap_query_engine/engine.rs::execute_store_query`)
-        // falls through to "No precomputed outputs found" → the
-        // HTTP layer renders `errorType: bad_data` / `error: "No
-        // result for query"`. Sketches ARE in `SketchStore` and
-        // are readable via the sid-keyed `query_range(sid, ...)`
-        // path — they just aren't reachable via this agg-keyed
-        // precompute lookup. Closing the gap means either teaching
-        // this function to also collect sketch payloads (assemble
-        // `Box<dyn AggregateCore>` from `payload.as_sketch()`),
-        // OR routing `handle_query` through the newer
-        // `ASAPQueryEngine::execute(&str)` trait path which uses
-        // `idx.series_ids_for_policy(fp)` + reducer dispatch and
-        // already handles sketches natively.
-        //
-        // Diagnosed in the e2e test arc (#247 → #248 → #249 →
-        // #250 → engine-path debug session 2026-05).
-        let candidate_sids: Vec<u64> = {
-            let g = self.instances.read().unwrap();
-            g.iter()
-                .filter(|(_, m)| {
-                    if m.metric_name != metric {
-                        return false;
-                    }
-                    matches!(
-                        &m.agg_kind,
-                        AggKind::ExactAgg { agg_type: t, .. } if *t == agg_type
-                    )
-                })
-                .map(|(sid, _)| *sid)
-                .collect()
-        };
-
-        for sid in candidate_sids {
-            let store = match self.series.get(&sid) {
-                Some(s) => s.clone(),
-                None => continue,
-            };
-            let guard = store.write().unwrap();
-            let mut buf: Vec<(TimestampRange, LabelValuesId, &AggPayload)> = Vec::new();
-            guard
-                .current_epoch
-                .range_query_into(start_unix_ms, end_unix_ms, &mut buf);
-            for (win, label_id, payload) in &buf {
-                if let Some(p) = payload.as_exact_agg() {
-                    let label_values_map =
-                        guard.intern.resolve(*label_id).cloned().unwrap_or_default();
-                    let key = if label_values_map.is_empty() {
-                        None
-                    } else {
-                        Some(crate::storage_engines::types::KeyByLabelValues {
-                            labels: label_values_map.values().cloned().collect(),
-                        })
-                    };
-                    out.entry(key)
-                        .or_default()
-                        .push((*win, Arc::from(p.clone_boxed_core())));
-                }
-            }
-            buf.clear();
-
-            for sealed in guard.sealed_epochs.values() {
-                sealed.range_query_into(start_unix_ms, end_unix_ms, &mut buf);
-                for (win, label_id, payload) in &buf {
-                    if let Some(p) = payload.as_exact_agg() {
-                        let label_values_map =
-                            guard.intern.resolve(*label_id).cloned().unwrap_or_default();
-                        let key = if label_values_map.is_empty() {
-                            None
-                        } else {
-                            Some(crate::storage_engines::types::KeyByLabelValues {
-                                labels: label_values_map.values().cloned().collect(),
-                            })
-                        };
-                        out.entry(key)
-                            .or_default()
-                            .push((*win, Arc::from(p.clone_boxed_core())));
-                    }
-                }
-                buf.clear();
-            }
-        }
-
-        out
-    }
-
-    /// Find every registered sid whose instance matches `metric_name` and
-    /// whose `group_by_keys` is a superset of (or equal to) the user's
-    /// requested label-key set. Phase 5 query path uses this to pick
-    /// candidate sids for ASAP-tier dispatch — a sid whose group-by KEYS
-    /// don't cover the user's PromQL label matchers can't answer the
-    /// query and must fall through to archive.
-    ///
-    /// Returns `Vec<u64>` rather than an iterator so callers can release
-    /// the read lock immediately. The `instances` map is read-mostly
-    /// (one write per first-seen sid), so taking the lock per query is
-    /// inexpensive.
-    ///
-    /// P2-2: uses the `metric_to_series_ids` secondary index for a keyed
-    /// lookup of the candidate sids for `metric_name` instead of an O(N)
-    /// full scan of `instances`; only that metric's (typically small)
-    /// sid set is then filtered on the `group_by_keys` superset test.
-    /// The two locks are taken in a read-only, non-overlapping fashion
-    /// (metric index first, then a brief `instances` read per matched
-    /// sid through the held guard) so the keyed path observes a
-    /// consistent snapshot of the same write domain `register` /
-    /// `remove_instance` maintain atomically.
-    pub fn instances_matching(
-        &self,
-        metric_name: &str,
-        required_keys: &BTreeSet<String>,
-    ) -> Vec<u64> {
-        let candidate_sids: Vec<_> = self
-            .metric_to_series_ids
-            .read()
-            .unwrap()
-            .get(metric_name)
-            .map(|sids| sids.iter().copied().collect())
-            .unwrap_or_default();
-        let generation = self.active_catalog_generation();
-        let instances = self.instances.read().unwrap();
-        candidate_sids
-            .iter()
-            .filter(|sid| {
-                instances
-                    .get(sid)
-                    .map(|m| {
-                        required_keys.is_subset(&m.group_by_keys)
-                            && Self::instance_visible_in_generation(m, generation.as_deref())
-                    })
-                    .unwrap_or(false)
-            })
-            .copied()
-            .collect()
-    }
-
-    /// Number of distinct sids carrying state (excludes ghosts).
-    pub fn series_len(&self) -> usize {
-        self.series.len()
-    }
-
-    #[cfg(test)]
-    /// Total count of in-memory SEALED epochs across all sids — i.e.
-    /// epochs sealed (pending flush) but not yet evicted to disk. `0`
-    /// once the flusher has drained everything. Used by tests and
-    /// `/runtime` diagnostics to observe the flush-then-evict loop.
-    pub fn list_sealed_epochs_len(&self) -> usize {
-        let mut n = 0usize;
-        for entry in self.series.iter() {
-            if let Ok(data) = entry.value().read() {
-                n += data.sealed_epochs.len();
-            }
-        }
-        n
-    }
-
-    /// Number of registered instances (includes ghosts).
-    pub fn instance_count(&self) -> usize {
-        self.instances.read().unwrap().len()
-    }
-
-    /// True when a sid's in-memory `SidStoreData` may be dropped to reclaim
-    /// resident memory: persistence owns its durability, NOTHING is pending
-    /// in memory (so dropping it loses no un-flushed data), and it has been
-    /// write-idle for at least `idle_threshold_ms`. `last_write_unix_ms == 0`
-    /// (never written / freshly rehydrated) is never evictable.
-    fn is_idle_evictable(
-        data: &SidStoreData<BTreeMap<String, String>, AggPayload>,
-        now: u64,
-        idle_threshold_ms: u64,
-    ) -> bool {
-        data.persistence_enabled
-            && data.sealed_epochs.is_empty()
-            && data.current_epoch.is_empty()
-            && data.last_write_unix_ms != 0
-            && now.saturating_sub(data.last_write_unix_ms) >= idle_threshold_ms
-    }
-
-    /// Idle-sid eviction (memory reclaim). Drops the in-memory
-    /// `SidStoreData` (epoch columns + intern-table label cache + the
-    /// `series` slot) for every sketch sid that has gone write-idle past
-    /// `idle_threshold_ms` AND whose state is fully durable on disk, while
-    /// KEEPING its [`SummarySeriesMetadata`] in `instances`.
-    ///
-    /// Why keep the metadata: the query path's disk union
-    /// ([`Self::query_range`] → `union_disk_parts_into`) needs
-    /// `sid_group_by_keys(sid)` and `instances_matching` needs the
-    /// metric/keys entry — drop those and the series silently stops
-    /// resolving warm and falls through to the archive. So only the heavy,
-    /// reconstructable part is evicted; the series stays queryable from the
-    /// durable tier and the append path
-    /// ([`Self::append_sample`]/[`Self::append_precompute`], both
-    /// `entry(..).or_insert_with(..)`) transparently rehydrates a fresh
-    /// store on the next write.
-    ///
-    /// Returns the number of sids evicted. `idle_threshold_ms == 0` is a
-    /// no-op (feature disabled). O(N sids); meant for a periodic sweep, not
-    /// the hot path. NOTE: because eviction requires `current_epoch` to be
-    /// empty (all windows sealed+flushed), the effective idle horizon is
-    /// `max(idle_threshold_ms, persistence_hot_window)`.
-    pub fn evict_idle_series(&self, idle_threshold_ms: u64) -> usize {
-        if idle_threshold_ms == 0 {
-            return 0;
-        }
-        let now = now_ms();
-
-        // Pass 1: collect candidates under read-only iteration. Removing
-        // during `iter()` can deadlock against our own shard guards, so we
-        // only gather here and remove afterwards.
-        let mut candidates = Vec::new();
-        for entry in self.series.iter() {
-            if let Ok(data) = entry.value().read() {
-                if Self::is_idle_evictable(&data, now, idle_threshold_ms) {
-                    candidates.push(*entry.key());
-                }
-            }
-        }
-        if candidates.is_empty() {
-            return 0;
-        }
-
-        // Pass 2: remove each, RE-CHECKING under the per-sid write lock so a
-        // concurrent write that rehydrated/appended between the two passes
-        // is not dropped. `remove_if` only deletes when the closure returns
-        // true; taking the write lock there serializes with the append
-        // path's `store.write()`. (No lock-order inversion: no path holds a
-        // per-sid lock while acquiring a `series` shard lock.)
-        let mut evicted = 0usize;
-        for sid in candidates {
-            let removed = self.series.remove_if(&sid, |_, store| {
-                store
-                    .write()
-                    .map(|d| Self::is_idle_evictable(&d, now, idle_threshold_ms))
-                    .unwrap_or(false)
-            });
-            if removed.is_some() {
-                self.rollups.remove_sid(sid);
-                evicted += 1;
-            }
-        }
-        evicted
-    }
-
-    /// Approximate TOTAL resident bytes held by the store — the honest
-    /// counterpart to the [`persistence::EpochSource::approx_memory_bytes`]
-    /// payload gauge.
-    ///
-    /// `approx_memory_bytes` (used by the flusher's pressure trigger)
-    /// counts ONLY live sketch payloads in `current_epoch` + `sealed_epochs`
-    /// — which is correct for deciding what to FLUSH, because flushing only
-    /// relieves payload. But once payloads are sealed to disk it reads ~0,
-    /// even while the per-sid registry (`instances` metadata, the secondary
-    /// indexes, and the per-series `InternTable` label caches) keeps
-    /// hundreds of MB resident. That residue is NOT evictable by flushing —
-    /// it is only released by retiring/evicting the sid itself — so it must
-    /// not feed the flush trigger, but the memory DIAGNOSTIC must surface it
-    /// or operators are blind to the real footprint. This method is that
-    /// surface; it is O(N sids) and meant for the 30 s diagnostic tick, not
-    /// the hot path.
-    pub fn approx_resident_bytes(&self) -> usize {
-        let mut total = 0usize;
-
-        // 1. SeriesId bindings, compatibility metadata, and shared SDS descriptors.
-        if let Ok(insts) = self.instances.read() {
-            for m in insts.values() {
-                total += std::mem::size_of::<SummarySeriesMetadata>();
-                total += m.metric_name.len();
-                for k in &m.group_by_keys {
-                    total += k.len() + std::mem::size_of::<String>();
-                }
-            }
-            total +=
-                insts.capacity() * (std::mem::size_of::<u64>() + std::mem::size_of::<SdsBinding>());
-        }
-        total += self.descriptors.approx_resident_bytes();
-
-        // 2. Per-sid series storage: live payloads + interned label maps +
-        //    the `Arc<RwLock<SidStoreData>>` container slot.
-        for entry in self.series.iter() {
-            let Ok(data) = entry.value().read() else {
-                continue;
-            };
-            for (_, _, payload) in data.current_epoch.iter_entries() {
-                total += payload.approx_bytes();
-            }
-            for epoch in data.sealed_epochs.values() {
-                for (_, _, payload) in &epoch.entries {
-                    total += payload.approx_bytes();
-                }
-            }
-            total += data.intern.approx_heap_bytes();
-            total += std::mem::size_of::<SidStore>();
-        }
-
-        // 3. Derived exact-max rollups. They are deliberately reported in
-        // resident memory even though they are not part of the durable
-        // payload/flush accounting.
-        total += self.rollups.approx_bytes();
-        if let Ok(current) = self.current_series.lock() {
-            total += current.approx_resident_bytes();
-        }
-
-        total
-    }
-
-    /// Snapshot shared metadata handles without holding the registry lock
-    /// across user code. This is O(N) pointer cloning and does not copy
-    /// descriptor strings, label sets, or aggregation configuration.
-    pub fn snapshot_instances(&self) -> Vec<Arc<SummarySeriesMetadata>> {
-        match self.instances.read() {
-            Ok(map) => map
-                .values()
-                .map(|instance| Arc::clone(&instance.metadata))
-                .collect(),
-            Err(_) => Vec::new(),
-        }
-    }
-
-    // Sid lifecycle transitions and status lookup.
-
-    /// Whether `sid` accepts writes. Equivalent to
-    /// `status(sid) == AggStatus::Active`. Returns `false` for
-    /// unknown sids (caller falls through to the `Unknown` path).
-    /// O(1) on a `RwLock::read` of the instances map.
-    pub fn is_writable(&self, sid: u64) -> bool {
-        self.instances
-            .read()
-            .ok()
-            .and_then(|m| m.get(&sid).map(|s| s.is_writable()))
-            .unwrap_or(false)
-    }
-
-    /// Record that the store has reconciled against the
-    /// `Arc<InstalledPrecomputePlan>` identified by `config_ptr` (the value of
-    /// `Arc::as_ptr(..) as usize`), returning `true` if this is a *new*
-    /// config pointer (i.e. the caller should run a full reconcile) or
-    /// `false` if the store already reconciled against this exact
-    /// config and the scan can be skipped.
-    ///
-    /// Used by [`crate::storage_engines::sketch_db::lifecycle::reconcile_if_config_changed`]
-    /// to make the per-ingest-batch reconcile a single relaxed atomic
-    /// load in the common (config-unchanged) case.
-    pub fn mark_reconciled_config(&self, config_ptr: usize) -> bool {
-        use std::sync::atomic::Ordering;
-        if self.last_reconciled_config_ptr.load(Ordering::Relaxed) == config_ptr {
-            return false;
-        }
-        self.last_reconciled_config_ptr
-            .store(config_ptr, Ordering::Relaxed);
-        true
-    }
-
-    /// Visit every registered binding under a single read lock,
-    /// invoking `f(sid, &meta)` for each. Lets read-side scans that
-    /// only need to *inspect* metadata (signature derivation,
-    /// status filtering) avoid even the O(N) `Arc` snapshot allocation.
-    ///
-    /// The closure runs while the read lock is held, so it must not
-    /// call back into the store (which would deadlock) and should stay
-    /// allocation-light. Callers that need to mutate or call user code
-    /// should collect the cheap data they need (e.g. `Vec<u64>` of
-    /// sids) here, then act after this returns.
-    pub fn for_each_instance<F: FnMut(u64, &SummarySeriesMetadata)>(&self, mut f: F) {
-        if let Ok(map) = self.instances.read() {
-            for (sid, meta) in map.iter() {
-                f(*sid, meta);
-            }
-        }
-    }
-
-    /// Iterate (clones) all instance metadata matching `status`.
-    /// Used by the eviction service to enumerate `Expired` sids
-    /// without holding a long read lock.
-    pub fn list_by_status(&self, status: AggStatus) -> Vec<Arc<SummarySeriesMetadata>> {
-        let map = match self.instances.read() {
-            Ok(m) => m,
-            Err(_) => return Vec::new(),
-        };
-        map.values()
-            .filter(|s| s.status() == status)
-            .map(|instance| Arc::clone(&instance.metadata))
-            .collect()
-    }
-
-    fn metadata_record(
-        &self,
-        m: &SdsBinding,
-    ) -> Option<persistence::metadata::StoredOutputMetadataRecord> {
-        let mut record = self.metadata_record_without_completion(m)?;
-        record.completed_through_ms = self
-            .completed_windows
-            .read()
-            .unwrap()
-            .get(&m.storage_handle)
-            .copied();
-        Some(record)
-    }
-
-    fn metadata_record_without_completion(
-        &self,
-        m: &SdsBinding,
-    ) -> Option<persistence::metadata::StoredOutputMetadataRecord> {
-        let mut record =
-            crate::storage_engines::sketch_db::index::persistence::metadata::StoredOutputMetadataRecord::new(
-                m.storage_handle,
-                m.metric_name.clone(),
-                m.group_by_keys.iter().cloned().collect(),
-                &m.agg_kind,
-                m.first_seen_unix_ms,
-            );
-        if !m.policy_fp.is_unset() {
-            record.stored_output_reference = m.stored_output_reference.clone();
-            record.stored_output_id = Some(StoredOutputId::from(m.policy_fp));
-            record.summary_definition_id =
-                Some(m.stored_output_reference.as_ref()?.definition_id.clone());
-            record.catalog_generation = Some(Arc::clone(m.catalog_generation.as_ref()?));
-        }
-        record.retired_at_ms = m.retired_at_ms;
-        record.expires_at_ms = m.expires_at_ms;
-        Some(record)
-    }
-
-    fn persist_lifecycle(&self, instance: &SdsBinding, removed: bool) -> Result<(), String> {
-        let Some(writer) = self.persistence_metadata.read().unwrap().clone() else {
-            return Ok(());
-        };
-        // A retired definition can disappear from the desired catalog before
-        // its stored instances are collected. Preserve its persisted provenance
-        // rather than rebinding it to the new catalog generation.
-        let mut record = match self.metadata_record(instance) {
-            Some(record) => record,
-            None => writer
-                .load()
-                .map_err(|error| error.to_string())?
-                .into_iter()
-                .find(|record| record.storage_handle == instance.storage_handle)
-                .ok_or("cannot persist lifecycle without catalog identity")?,
-        };
-        record.retired_at_ms = instance.retired_at_ms;
-        record.expires_at_ms = instance.expires_at_ms;
-        record.removed = removed;
-        writer.upsert_all(&[record]).map_err(|error| {
-            tracing::error!(sid = instance.storage_handle, %error, "durable summary lifecycle publication failed");
-            error.to_string()
-        })
-    }
-
-    /// Force `sid` into `Retired` status, scheduling expiry
-    /// `retention` from now. Idempotent — re-retiring a Retired or
-    /// Expired sid is a no-op and returns the unchanged metadata.
-    /// Returns `None` if the sid is unknown or durable lifecycle publication fails.
-    pub fn force_retire(
-        &self,
-        sid: u64,
-        retention: Duration,
-    ) -> Option<Arc<SummarySeriesMetadata>> {
-        let _mutation = self.begin_state_mutation();
-        let mut map = self.instances.write().ok()?;
-        let instance = map.get_mut(&sid)?;
-        let mut next = instance.clone();
-        let meta = Arc::make_mut(&mut next.metadata);
-        if matches!(meta.status(), AggStatus::Active) {
-            meta.retire(retention);
-        }
-        self.persist_lifecycle(&next, false).ok()?;
-        *instance = next;
-        Some(Arc::clone(&instance.metadata))
-    }
-
-    /// Force `sid` into `Expired` status immediately by setting both
-    /// `retired_at_ms` and `expires_at_ms` to now. Returns the new
-    /// state, or `None` if the sid is unknown. Intended for
-    /// operator / debug-endpoint use so eviction can be observed in
-    /// e2e tests without waiting out retirement retention.
-    pub fn force_expire(&self, sid: u64) -> Option<Arc<SummarySeriesMetadata>> {
-        let _mutation = self.begin_state_mutation();
-        let mut map = self.instances.write().ok()?;
-        let instance = map.get_mut(&sid)?;
-        let mut next = instance.clone();
-        let meta = Arc::make_mut(&mut next.metadata);
-        let now = now_ms();
-        meta.retired_at_ms = Some(meta.retired_at_ms.unwrap_or(now).min(now));
-        meta.expires_at_ms = Some(meta.expires_at_ms.unwrap_or(now).min(now));
-        self.persist_lifecycle(&next, false).ok()?;
-        *instance = next;
-        Some(Arc::clone(&instance.metadata))
-    }
-
-    pub(crate) fn active_catalog_generation(
-        &self,
-    ) -> Option<Arc<asap_types::sds::CatalogGeneration>> {
-        self.descriptors
-            .authoritative_snapshot()
-            .map(|(_, generation)| generation)
-    }
-
-    /// Resolving a logical key may already return a replacement physical SID.
-    /// Validate producer provenance before either a cache hit or a rotation.
-    pub(crate) fn validate_routed_catalog_generation(
-        &self,
-        captured: Option<&asap_types::sds::CatalogGeneration>,
-    ) -> Result<(), String> {
-        if self.active_catalog_generation().as_deref() != captured {
-            return Err(
-                "unbound or stale producer cannot resolve the active catalog's physical series"
-                    .into(),
-            );
-        }
-        Ok(())
-    }
-
-    /// Return the current generation only when it explicitly reintroduces a
-    /// previously removed logical materialization. Ordinary same-generation
-    /// writes and missing provenance cannot start a new physical lifetime.
-    pub(crate) fn authorize_series_reactivation(
-        &self,
-        sid: u64,
-        definition: StoredOutputId,
-    ) -> Result<Option<Arc<asap_types::sds::CatalogGeneration>>, String> {
-        if let Some(binding) = self
-            .instances
-            .read()
-            .map_err(|_| "instance registry poisoned")?
-            .get(&sid)
-        {
-            if matches!(
-                binding.data_descriptor.source,
-                asap_types::sds::DataSourceIdentity::Derived { .. }
-            ) || binding.catalog_generation.as_deref()
-                != self.active_catalog_generation().as_deref()
-            {
-                let (catalog, generation) = self
-                    .descriptors
-                    .authoritative_snapshot()
-                    .ok_or("series reactivation requires an authoritative catalog")?;
-                if binding.metadata.policy_fp != definition.fingerprint()
-                    || !catalog.outputs.contains_key(&definition)
-                {
-                    return Err("series reactivation differs from its installed definition".into());
-                }
-                if binding.catalog_generation.as_deref() != Some(generation.as_ref()) {
-                    return Ok(Some(generation));
-                }
-            }
-        }
-        let removed = self
-            .removed_sids
-            .read()
-            .map_err(|_| "series tombstone lock poisoned")?;
-        let Some((old_generation, old_definition)) = removed.get(&sid) else {
-            return Ok(None);
-        };
-        let (catalog, generation) = self
-            .descriptors
-            .authoritative_snapshot()
-            .ok_or("series reactivation requires an authoritative catalog")?;
-        if *old_definition != Some(definition) || !catalog.outputs.contains_key(&definition) {
-            return Err("series reactivation does not match the installed materialization".into());
-        }
-        let old_generation = old_generation
-            .as_ref()
-            .ok_or("removed series has no catalog provenance")?;
-        if old_generation.as_ref() == generation.as_ref() {
-            return Err("same-generation append cannot reactivate a removed series".into());
-        }
-        Ok(Some(generation))
-    }
-
-    /// Drop a sid's metadata + its series state + both secondary-index
-    /// entries (`output_to_storage_handles` and `metric_to_series_ids`). Mirrors
-    /// `SchemaRegistry::remove_schema` for the eviction path's
-    /// post-data-drop cleanup. Returns the removed metadata, or `None`
-    /// if the sid was absent.
-    ///
-    /// ## Atomicity (P2-1)
-    ///
-    /// Takes all three index write guards together in the fixed order
-    /// `instances → output_to_storage_handles → metric_to_series_ids` so the removal is
-    /// atomic with respect to a concurrent reader — the sid never
-    /// lingers in a secondary index after it has left `instances`. The
-    /// `series` DashMap is touched after the index guards are released
-    /// (it is independently keyed and not part of the metadata-index
-    /// invariant).
-    pub fn remove_instance(&self, sid: u64) -> Option<Arc<SummarySeriesMetadata>> {
-        let _mutation = self.begin_state_mutation();
-        let removed = {
-            // Fixed lock order: instances → output_to_storage_handles → metric_to_series_ids.
-            let mut instances = self.instances.write().ok()?;
-            if let Some(instance) = instances.get(&sid) {
-                self.persist_lifecycle(instance, true).ok()?;
-                let record = self.metadata_record(instance);
-                self.removed_sids.write().ok()?.insert(
-                    sid,
-                    (
-                        record
-                            .as_ref()
-                            .and_then(|value| value.catalog_generation.clone()),
-                        record.and_then(|value| value.stored_output_id),
-                    ),
-                );
-            }
-            let mut policy_idx = self.output_to_storage_handles.write().unwrap();
-            let mut metric_idx = self.metric_to_series_ids.write().unwrap();
-            let removed = instances.remove(&sid);
-            if let Some(meta) = &removed {
-                if let Some(output) = &meta.stored_output_reference {
-                    if let Some(set) = policy_idx.get_mut(&output.stored_output_id) {
-                        set.remove(&sid);
-                        if set.is_empty() {
-                            policy_idx.remove(&output.stored_output_id);
-                        }
-                    }
-                }
-                if let Some(set) = metric_idx.get_mut(&meta.metric_name) {
-                    set.remove(&sid);
-                    if set.is_empty() {
-                        metric_idx.remove(&meta.metric_name);
-                    }
-                }
-            }
-            removed.map(|instance| instance.metadata)
-        };
-        if removed.is_some() {
-            self.series.remove(&sid);
-            self.rollups.remove_sid(sid);
-            self.incomplete_summary_lineages.remove(&sid);
-            self.descriptors.prune();
-        }
-        removed
-    }
-
-    /// Mark a producer/window delta lineage unsafe for warm reads.
-    pub fn mark_summary_lineage_incomplete(
-        &self,
-        sid: u64,
-        frame: &asap_types::producer_plan::SummaryFrameIdentity,
-    ) {
-        self.incomplete_summary_lineages
-            .entry(sid)
-            .or_default()
-            .insert(frame.into());
-    }
-
-    /// A full checkpoint repairs only its exact producer/window lineage.
-    pub fn clear_summary_lineage_incomplete(
-        &self,
-        sid: u64,
-        frame: &asap_types::producer_plan::SummaryFrameIdentity,
-    ) {
-        let key = IncompleteSummaryLineage::from(frame);
-        if let Some(mut lineages) = self.incomplete_summary_lineages.get_mut(&sid) {
-            lineages.remove(&key);
-        }
-    }
-}
-
-impl SketchStore {
-    /// Return first-seen timestamps per sid for runtime diagnostics. The HTTP
-    /// adapter exposes this as `earliest_timestamp_per_sid`.
-    pub fn earliest_timestamps_per_series_id(&self) -> std::collections::HashMap<u64, u64> {
-        let g = self.instances.read().unwrap();
-        g.iter()
-            .map(|(sid, m)| (*sid, m.first_seen_unix_ms.max(0) as u64))
-            .collect()
-    }
-
-    /// Phase 5 M2.3.6e — write-side helper. Given an
-    /// `PrecomputeMaterialization` and one `(PrecomputedOutput, AggregateCore)`
-    /// pair (the shape both the live worker AND the backfill processor
-    /// emit), compute the precompute sid, register a metadata entry on
-    /// first sight, and append the payload window. Used by
-    /// `SketchStoreSink` (live ingest) and `BackfillWindowProcessor`
-    /// (archive replay) so they share one canonical sid-derivation
-    /// path.
-    ///
-    /// Returns the sid the entry landed under, or `None` when the
-    /// write is dropped: either because the agg_config / output
-    /// combination doesn't fit the precompute model (caller logs and
-    /// skips), or because the sid already exists in `Retired` /
-    /// `Expired` status. The latter is the sid-level mirror of the
-    /// `SchemaRegistry::is_writable(agg_id)` §6.3 ingest barrier:
-    /// once a sid is retired by [`crate::storage_engines::sketch_db::lifecycle::reconcile_from_streaming_config`]
-    /// further writes are rejected here so the eviction sweep can
-    /// drop residual state cleanly.
-    #[cfg(test)]
-    pub fn ingest_precompute_for_agg_config<R: Into<Option<u64>>>(
-        &self,
-        mint_sid: impl FnOnce(&str, &str, &str) -> R,
-        agg_cfg: &asap_types::aggregation_config::PrecomputeMaterialization,
-        output: &crate::storage_engines::types::PrecomputedOutput,
-        accumulator: &dyn crate::storage_engines::types::AggregateCore,
-    ) -> Option<u64> {
-        let admission = self.admission.read().ok()?;
-        if admission.is_finite_closed() {
-            return None;
-        }
-        self.ingest_precompute_config_with_admission(mint_sid, agg_cfg, output, accumulator)
-    }
-
-    #[cfg(test)]
-    fn ingest_precompute_config_with_admission<R: Into<Option<u64>>>(
-        &self,
-        mint_sid: impl FnOnce(&str, &str, &str) -> R,
-        agg_cfg: &asap_types::PrecomputeMaterialization,
-        output: &crate::storage_engines::types::PrecomputedOutput,
-        accumulator: &dyn crate::storage_engines::types::AggregateCore,
-    ) -> Option<u64> {
-        // B7.7 — this wrapper now derives the sid via `mint_sid` and
-        // delegates to `ingest_precompute_with_series_id`. Callers that
-        // already hold the bucket sid (B7.6's worker passes it on the
-        // `WorkerMessage`; B7.7's backfill processor groups raw
-        // samples by sid up-front) skip the resolver round-trip by
-        // invoking the sid-direct sibling.
-        let (attrs_fp, _label_values_map) = build_attrs_fp_and_label_map(agg_cfg, output).ok()?;
-        let agg_kind_canonical =
-            crate::storage_engines::sketch_db::data::materialization_kind_for_config(agg_cfg);
-        let sid = mint_sid(&agg_cfg.metric, &attrs_fp, &agg_kind_canonical).into()?;
-        self.ingest_precompute_with_admission(sid, agg_cfg, output, accumulator)
-    }
-
-    fn register_precompute_output(
-        &self,
-        sid: u64,
-        agg_cfg: &asap_types::PrecomputeMaterialization,
-        output: &crate::storage_engines::types::PrecomputedOutput,
-    ) -> Option<BTreeMap<String, String>> {
-        let mut instances = self.instances.write().ok()?;
-        self.register_precompute_output_with_instances(sid, agg_cfg, output, &mut instances)
-    }
-
-    fn register_precompute_output_with_instances(
-        &self,
-        sid: u64,
-        agg_cfg: &asap_types::PrecomputeMaterialization,
-        output: &crate::storage_engines::types::PrecomputedOutput,
-        instances: &mut HashMap<u64, SdsBinding>,
-    ) -> Option<BTreeMap<String, String>> {
-        let (_attrs_fp, label_values_map) = build_attrs_fp_and_label_map(agg_cfg, output).ok()?;
-        let key_names = &agg_cfg.grouping_labels.names();
-        let agg_kind = crate::storage_engines::sketch_db::data::agg_kind_for_config(agg_cfg);
-        let (capability, accuracy) = agg_kind.capability_and_accuracy();
-
-        match instances.get(&sid) {
-            None => {
-                if self.active_catalog_generation().as_deref()
-                    != output.catalog_generation.as_deref()
-                {
-                    return None;
-                }
-
-                let group_by_keys: BTreeSet<String> = if agg_cfg.partitioning
-                    == Some(asap_types::sds::PopulationPartitioning::PerEntity)
-                {
-                    // The catalog describes per-entity partitioning; physical
-                    // SID metadata must retain the observed label names used
-                    // to decode its value-only durable population key.
-                    output
-                        .population_labels
-                        .as_ref()
-                        .map(|labels| labels.keys().cloned().collect())
-                        .unwrap_or_else(|| key_names.iter().cloned().collect())
-                } else {
-                    key_names.iter().cloned().collect()
-                };
-                // PR 6 follow-up: ExactAgg-backed sids carry an
-                // `ExactAgg(agg_type)` capability so the analyzer can
-                // route ASAP-tier-answerable exact intents (Sum / Rate /
-                // Increase / Count{Exact}) to this sid instead of falling
-                // through to the archive engine. Pre-PR-6 this field was
-                // unconditionally `None`, which meant ASAP-tier ExactAgg
-                // state was reachable only through the legacy precompute
-                // query path; capability-matching couldn't see it.
-                if !self.register_with_instances(
-                    SummarySeriesMetadata {
-                        storage_handle: sid,
-                        metric_name: agg_cfg.metric.clone(),
-                        group_by_keys,
-                        capability: Some(capability),
-                        agg_kind,
-                        accuracy,
-                        first_seen_unix_ms: output.start_timestamp as i64,
-                        retired_at_ms: None,
-                        expires_at_ms: None,
-                        // Trust the caller's output — it carries the
-                        // policy fingerprint computed at emit time
-                        // (precompute worker / backfill processor).
-                        // Falling back to `from_config(&agg_cfg)` here
-                        // would also be correct but redundant.
-                        policy_fp: output.policy_fp,
-                    },
-                    instances,
-                ) {
-                    return None;
-                }
-            }
-            Some(existing) if !existing.is_writable() || existing.policy_fp != output.policy_fp => {
-                return None;
-            }
-            Some(_) => {}
-        }
-
-        Some(label_values_map)
-    }
-
-    /// B7.7 sid-direct sibling of [`Self::ingest_precompute_for_agg_config`].
-    ///
-    /// Callers that already hold the bucket sid (the live worker after
-    /// B7.6 reshaped its `WorkerMessage`, and the backfill processor
-    /// after B7.7 rekeyed its per-window grouping from group_key to
-    /// sid) skip the mint round-trip by handing the sid in directly.
-    /// The mint-driven [`Self::ingest_precompute_for_agg_config`] is
-    /// content-addressed and idempotent with this method — passing the
-    /// resolver-minted sid here yields the same state under the same
-    /// sid — so both methods can coexist while migration finishes.
-    ///
-    /// The §6.3 ingest barrier (`Retired` / `Expired` sids reject
-    /// writes) and first-sight metadata registration are identical to
-    /// the mint-driven path.
-    #[cfg(test)]
-    pub fn ingest_precompute_with_series_id(
-        &self,
-        sid: u64,
-        agg_cfg: &asap_types::aggregation_config::PrecomputeMaterialization,
-        output: &crate::storage_engines::types::PrecomputedOutput,
-        accumulator: &dyn crate::storage_engines::types::AggregateCore,
-    ) -> Option<u64> {
-        let admission = self.admission.read().ok()?;
-        if admission.is_finite_closed() {
-            return None;
-        }
-        self.ingest_precompute_with_admission(sid, agg_cfg, output, accumulator)
-    }
-
-    fn ingest_precompute_with_admission(
-        &self,
-        sid: u64,
-        agg_cfg: &asap_types::PrecomputeMaterialization,
-        output: &crate::storage_engines::types::PrecomputedOutput,
-        accumulator: &dyn crate::storage_engines::types::AggregateCore,
-    ) -> Option<u64> {
-        let expected = agg_cfg.accumulator_spec().ok()?.family;
-        if matches!(
-            expected,
-            planner_types::post_asap::SummaryFamilyType::ExactAggregate(..)
-        ) && accumulator
-            .get_accumulator_type()
-            .planner_exact_family()
-            .as_ref()
-            != Some(&expected)
-        {
-            return None;
-        }
-        let label_values_map = self.register_precompute_output(sid, agg_cfg, output)?;
-
-        // Keep the physical lifetime alive through publication. Removal takes
-        // this same lock exclusively, so it cannot race metadata validation and
-        // recreate orphan payload after the tombstone commits.
-        let instances = self.instances.read().ok()?;
-        let binding = instances.get(&sid)?;
-        if !binding.metadata.is_writable()
-            || binding.metadata.policy_fp != output.policy_fp
-            || matches!(
-                binding.data_descriptor.source,
-                asap_types::sds::DataSourceIdentity::Derived { .. }
-            )
-        {
-            return None;
-        }
-        if binding.catalog_generation.is_some() && output.catalog_generation.is_none() {
-            return None;
-        }
-        if let Some(captured) = output.catalog_generation.as_deref() {
-            // Existing unchanged series may drain their birth generation or
-            // accept the currently installed generation. A replacement born in
-            // a newer generation cannot accept an older unbound cache hit.
-            if binding.catalog_generation.as_deref() != Some(captured)
-                && self.active_catalog_generation().as_deref() != Some(captured)
-            {
-                return None;
-            }
-        }
-
-        if let Some(retained_windows) = agg_cfg.num_aggregates_to_retain {
-            let required_horizon_ms = retained_windows
-                .saturating_mul(agg_cfg.slide_interval)
-                .saturating_mul(1_000);
-            let store = self
-                .series
-                .entry(sid)
-                .or_insert_with(|| Arc::new(RwLock::new(self.fresh_sid_store())))
-                .clone();
-            let mut store = store.write().unwrap();
-            if !store.persistence_enabled {
-                store.retention_horizon_ms = Some(
-                    store
-                        .retention_horizon_ms
-                        .unwrap_or(0)
-                        .max(required_horizon_ms),
-                );
-            }
-        }
-
-        let window = (output.start_timestamp, output.end_timestamp);
-        let accepted = match crate::storage_engines::sketch_db::data::agg_kind_for_config(agg_cfg) {
-            AggKind::Sketch { .. } => self.append_sample_with_binding(
-                sid,
-                label_values_map,
-                window,
-                SketchSampleState {
-                    bytes: accumulator.serialize_to_bytes(),
-                    encoding: SketchEncoding::MsgpackFull,
-                },
-            ),
-            AggKind::ExactAgg { .. } => self.append_precompute_with_binding(
-                sid,
-                label_values_map,
-                window,
-                accumulator.clone_boxed_core(),
-            ),
-        };
-        accepted.then_some(sid)
-    }
-}
-
-/// Persistence harness for `SketchStore` — Phase 5 M2.3.6c.
-///
-/// Owns the manifest + flusher thread + part cache that back the
-/// sid-keyed ASAP tier. Constructed via [`SketchStore::start_persistence`];
-/// the flusher reads sealed epochs through the
-/// [`EpochSource`](crate::storage_engines::sketch_db::index::persistence::EpochSource)
-/// impl on `SketchStore` and writes parts under `disk_path/parts/`.
-///
-/// Drop or call [`Self::shutdown`] to stop the flusher cleanly. The
-/// `part_cache` backs disk reads; `query_range` combines durable parts with
-/// live in-memory state through the installed persistence read handle.
-pub struct SketchIndexPersistence {
-    pub manifest: Arc<crate::storage_engines::sketch_db::index::persistence::Manifest>,
-    pub part_cache: crate::storage_engines::sketch_db::index::persistence::cache::PartCache,
-    pub flusher: crate::storage_engines::sketch_db::index::persistence::flusher::FlusherHandle,
-    pub parts_root: std::path::PathBuf,
-}
-
-impl SketchIndexPersistence {
-    pub fn shutdown(&mut self) {
-        self.flusher.shutdown();
-    }
-}
-
-impl SketchStore {
-    /// Spin up the persistence layer behind this `SketchStore`. Runs
-    /// startup recovery (sweeps corrupt + orphan parts), opens the
-    /// manifest, and starts the background flusher thread with
-    /// `Arc::clone(self)` as its `EpochSource`. The returned
-    /// `SketchIndexPersistence` MUST stay alive for the lifetime of
-    /// the index — dropping it shuts the flusher down and stops
-    /// flushing to disk.
-    pub fn start_persistence(
-        self: &Arc<Self>,
-        cfg: crate::storage_engines::sketch_db::index::persistence::SketchStorePersistenceConfig,
-    ) -> crate::storage_engines::sketch_db::index::persistence::PersistResult<SketchIndexPersistence>
-    {
-        use crate::storage_engines::sketch_db::index::persistence::{
-            cache::PartCache, flusher::FlusherHandle, recovery, Manifest,
-        };
-
-        // Publish the writer before recovery or any background work so a
-        // concurrent lifecycle operation cannot succeed without persistence.
-        let metadata_writer = Arc::new(persistence::metadata::StoredOutputMetadataFile::new(
-            &cfg.disk_path,
-        ));
-        if let Some(catalog) = self.descriptors.authoritative_catalog() {
-            metadata_writer.persist_catalog(&catalog)?;
-        }
-        // Restore the generation-wide raw admission barrier before exposing
-        // recovered state or accepting another producer after restart.
-        if let Some(closed) = metadata_writer.load_finite_closure()? {
-            if self.active_catalog_generation().as_deref() == Some(&closed) {
-                self.admission
-                    .write()
-                    .unwrap()
-                    .seal_finite(&closed)
-                    .map_err(persistence::PersistError::Internal)?;
-            }
-        }
-        {
-            // Registration and lifecycle changes take this lock first too.
-            let _instances = self.instances.write().unwrap();
-            *self.persistence_metadata.write().unwrap() = Some(Arc::clone(&metadata_writer));
-            self.removed_sids.write().unwrap().extend(
-                metadata_writer
-                    .load()?
-                    .into_iter()
-                    .filter(|record| record.removed)
-                    .map(|record| {
-                        (
-                            record.storage_handle,
-                            (record.catalog_generation, record.stored_output_id),
-                        )
-                    }),
-            );
-        }
-        let (_loaded_manifest, report) = recovery::recover(&cfg.disk_path)?;
-        tracing::info!(
-            live = report.live_parts,
-            corrupt_removed = report.corrupt_parts_removed,
-            orphans_removed = report.orphan_parts_removed,
-            "SketchStore persistence recovery complete"
-        );
-
-        // Re-register every disk-resident sid from the metadata sidecar so
-        // the query path can find and serve recovered series. Without this
-        // a freshly-reopened store recovers the parts manifest/cache but
-        // has an EMPTY `instances` registry (registration only happens on
-        // the live ingest path), so `instances_matching` enumerates nothing
-        // for the recovered metrics and `query_range`'s disk-union
-        // early-returns on the missing `sid_group_by_keys` → "No result"
-        // cluster-wide even though the data is durable on disk. Idempotent:
-        // sids already registered (e.g. by an in-flight DataPoint) are kept.
-        let recovered = self.register_recovered_disk_series(&cfg.disk_path)?;
-        if recovered > 0 {
-            tracing::info!(
-                recovered_sids = recovered,
-                "SketchStore: re-registered disk-resident sids from metadata sidecar"
-            );
-        }
-
-        let manifest = Arc::new(Manifest::open_or_init(&cfg.disk_path)?);
-        let parts_root = crate::storage_engines::sketch_db::index::persistence::flusher::parts_root(
-            &cfg.disk_path,
-        );
-        let part_cache = PartCache::new(parts_root.clone(), cfg.part_cache_bytes);
-
-        // Install the durable-tier read handle + seal cadence so the
-        // query path unions disk parts and the per-sid stores seal on
-        // cadence with retention-drop disabled. Done BEFORE the flusher
-        // starts so any series created between here and the first flush
-        // tick are already in persistence mode.
-        self.enable_persistence_mode(
-            cfg.seal_window_count,
-            Arc::new(PersistenceReadHandle {
-                manifest: Arc::clone(&manifest),
-                part_cache: part_cache.clone(),
-            }),
-        );
-
-        let flusher = FlusherHandle::start_with_metadata(
-            cfg,
-            Arc::clone(&manifest),
-            Arc::clone(self),
-            metadata_writer,
-        )?;
-
-        *self.immutable_publisher.write().unwrap() = Arc::downgrade(&flusher.publication_handle());
-        Ok(SketchIndexPersistence {
-            manifest,
-            part_cache,
-            flusher,
-            parts_root,
-        })
-    }
-
-    /// Replay the per-sid metadata sidecar at `disk_path` and register
-    /// each disk-resident sid as a queryable instance, UNLESS the sid is
-    /// already registered (a live DataPoint won the race — its in-memory
-    /// metadata is authoritative, so we don't clobber it). Returns the
-    /// number of sids freshly registered from disk.
-    ///
-    /// Persisted metadata errors propagate to startup. Only an absent file is
-    /// treated as a fresh store.
-    pub fn register_recovered_disk_series(
-        &self,
-        disk_path: &std::path::Path,
-    ) -> persistence::PersistResult<usize> {
-        use crate::storage_engines::sketch_db::index::persistence::metadata::StoredOutputMetadataFile;
-        let records = StoredOutputMetadataFile::new(disk_path).load()?;
-
-        let mut registered = 0usize;
-        for rec in records {
-            if let Some(end) = rec.completed_through_ms {
-                self.completed_windows
-                    .write()
-                    .unwrap()
-                    .entry(rec.storage_handle)
-                    .and_modify(|current| *current = (*current).max(end))
-                    .or_insert(end);
-            }
-            if rec.removed || rec.expires_at_ms.is_some_and(|expiry| expiry <= now_ms()) {
-                continue;
-            }
-            // Don't clobber a live-registered instance.
-            if self.instance(rec.storage_handle).is_some() {
-                continue;
-            }
-            let catalog = self.descriptors.authoritative_snapshot();
-            let policy_fp = match (&rec.stored_output_id, &rec.catalog_generation, &catalog) {
-                (Some(definition), Some(generation), Some((catalog, installed_generation))) => {
-                    let persisted = persistence::metadata::StoredOutputMetadataFile::new(disk_path)
-                        .load_catalog(generation);
-                    if generation != installed_generation
-                        || rec.stored_output_reference != catalog.output_reference(*definition).ok()
-                        || persisted.as_ref().ok() != Some(catalog.as_ref())
-                        || !catalog.outputs.get(definition).is_some_and(|output| {
-                            Some(&output.definition_id) == rec.summary_definition_id.as_ref()
-                        })
-                    {
-                        // A new version must allocate a fresh physical series. Otherwise
-                        // the persisted resolver can route fresh input back to this
-                        // excluded series and its already-completed windows.
-                        if generation.plan_id == installed_generation.plan_id
-                            && generation.plan_version < installed_generation.plan_version
-                            && catalog.outputs.contains_key(definition)
-                        {
-                            self.removed_sids.write().unwrap().insert(
-                                rec.storage_handle,
-                                (Some(Arc::clone(generation)), Some(*definition)),
-                            );
-                        }
-                        tracing::warn!(
-                            sid = rec.storage_handle,
-                            "persisted summary catalog provenance differs; leaving state unbound"
-                        );
-                        continue;
-                    }
-                    definition.fingerprint()
-                }
-                // Legacy deployments without an authoritative plan retain their
-                // legacy path. Never promote such state into a catalog binding.
-                (None, None, None) => PolicyFingerprint::UNSET,
-                _ => {
-                    tracing::warn!(sid = rec.storage_handle, "persisted summary has no matching authoritative identity; leaving state unbound");
-                    continue;
-                }
-            };
-            let Some(agg_kind) = rec.agg_kind() else {
-                tracing::warn!(
-                    sid = rec.storage_handle,
-                    "skipping recovered sid: unrecognized agg_kind in sidecar"
-                );
-                continue;
-            };
-            let capability = rec.capability();
-            let accuracy = rec.accuracy();
-            self.register(SummarySeriesMetadata {
-                storage_handle: rec.storage_handle,
-                metric_name: rec.metric_name,
-                group_by_keys: rec.group_by_keys.into_iter().collect(),
-                capability,
-                agg_kind,
-                accuracy,
-                first_seen_unix_ms: rec.first_seen_unix_ms,
-                retired_at_ms: rec.retired_at_ms,
-                expires_at_ms: rec.expires_at_ms,
-                policy_fp,
-            });
-            if self.instance(rec.storage_handle).is_some() {
-                registered += 1;
-            }
-        }
-        Ok(registered)
-    }
-
-    /// Switch the store into durable-tier mode: install the read handle
-    /// the query path uses to consult disk parts, set the per-sid seal
-    /// cadence, and retro-fit any already-created `SidStoreData` so they
-    /// seal on cadence and stop dropping aged windows (the flush-then-
-    /// evict loop becomes the memory bound). Idempotent.
-    pub fn enable_persistence_mode(
-        &self,
-        seal_window_count: usize,
-        read_handle: Arc<PersistenceReadHandle>,
-    ) {
-        use std::sync::atomic::Ordering;
-        *self.persistence_read.write().unwrap() = Some(read_handle);
-        self.rollups.clear();
-        self.seal_window_count
-            .store(seal_window_count, Ordering::Relaxed);
-        if seal_window_count > 0 {
-            // Retro-fit existing per-sid stores (e.g. series that
-            // ingested before persistence finished starting).
-            for entry in self.series.iter() {
-                if let Ok(mut data) = entry.value().write() {
-                    data.seal_window_count = Some(seal_window_count);
-                    data.persistence_enabled = true;
-                }
-            }
-        }
-    }
-}
-
-// Persistence epoch interface. The `agg_id` field on epoch references carries
-// a sid in this store; persistence readers and writers must interpret it so.
-impl crate::storage_engines::sketch_db::index::persistence::EpochSource for SketchStore {
-    fn flush_before_ms(&self) -> Option<u64> {
-        let cutoff = self
-            .completion_flush_before
-            .load(std::sync::atomic::Ordering::SeqCst);
-        (cutoff != 0).then_some(cutoff)
-    }
-
-    fn list_sealed_epochs(
-        &self,
-    ) -> Vec<crate::storage_engines::sketch_db::index::persistence::SealedEpochRef> {
-        use crate::storage_engines::sketch_db::index::persistence::SealedEpochRef;
-        let mut out = Vec::new();
-        for entry in self.series.iter() {
-            let sid = *entry.key();
-            let Ok(data) = entry.value().read() else {
-                continue;
-            };
-            for (epoch_id, epoch) in data.sealed_epochs.iter() {
-                if let Some((_, max_end)) = epoch.time_bounds() {
-                    let approx_bytes: usize =
-                        epoch.entries.iter().map(|(_, _, p)| p.approx_bytes()).sum();
-                    out.push(SealedEpochRef {
-                        agg_id: sid,
-                        epoch_id: *epoch_id,
-                        end_ts: max_end,
-                        approx_bytes,
-                    });
-                }
-            }
-        }
-        out
-    }
-
-    fn instance_metadata_for_persist(
-        &self,
-        sid: u64,
-    ) -> Option<
-        crate::storage_engines::sketch_db::index::persistence::metadata::StoredOutputMetadataRecord,
-    > {
-        let g = self.instances.read().ok()?;
-        let m = g.get(&sid)?;
-        self.metadata_record(m)
-    }
-
-    fn snapshot_sealed_epoch(
-        &self,
-        sid: u64,
-        epoch_id: u64,
-    ) -> crate::storage_engines::sketch_db::index::persistence::PersistResult<
-        Option<crate::storage_engines::sketch_db::index::persistence::source::EpochSnapshot>,
-    > {
-        use crate::storage_engines::sketch_db::index::persistence::source::{
-            EpochSnapshot, EpochSnapshotEntry,
-        };
-        use crate::storage_engines::sketch_db::index::persistence::PersistError;
-
-        let Some(store_ref) = self.series.get(&sid) else {
-            return Ok(None);
-        };
-        let data = store_ref
-            .read()
-            .map_err(|_| PersistError::Internal(format!("sid {sid}: read lock poisoned")))?;
-        let Some(epoch) = data.sealed_epochs.get(&epoch_id) else {
-            return Ok(None);
-        };
-        let Some((min_ts, max_ts)) = epoch.time_bounds() else {
-            return Ok(None);
-        };
-
-        // Resolve sketch_kind once from instance metadata so sketch
-        // payloads can label their bytes for read-back dispatch.
-        // Precompute payloads pull their type_name directly from the
-        // accumulator trait.
-        let sketch_kind_label: Option<String> = {
-            self.instances
-                .read()
-                .ok()
-                .and_then(|g| g.get(&sid).cloned())
-                .and_then(|m| match &m.agg_kind {
-                    AggKind::Sketch {
-                        algorithm: kind, ..
-                    } => Some(format!("{:?}", kind)),
-                    AggKind::ExactAgg { .. } => None,
-                })
-        };
-
-        let mut entries = Vec::with_capacity(epoch.entries.len());
-        let mut approx_bytes: usize = 0;
-        for (window, label_id, payload) in &epoch.entries {
-            let label_map = data.intern.resolve(*label_id).cloned();
-            let label_kv = label_map.and_then(|m| {
-                if m.is_empty() {
-                    None
-                } else {
-                    Some(crate::storage_engines::types::KeyByLabelValues {
-                        labels: m.values().cloned().collect(),
-                    })
-                }
-            });
-            let (type_name, encoding_tag, bytes) = match payload {
-                AggPayload::Sketch(s) => (
-                    sketch_kind_label
-                        .clone()
-                        .unwrap_or_else(|| "UnknownSketch".to_string()),
-                    encoding_to_tag(s.encoding),
-                    s.bytes.clone(),
-                ),
-                AggPayload::ExactAgg(p) => (p.type_name().to_string(), 0u8, p.serialize_to_bytes()),
-            };
-            approx_bytes += payload.approx_bytes();
-            entries.push(EpochSnapshotEntry {
-                start_ts: window.0,
-                end_ts: window.1,
-                label: label_kv,
-                sketch_type_name: type_name,
-                encoding_tag,
-                sketch_bytes: bytes,
-            });
-        }
-
-        Ok(Some(EpochSnapshot {
-            agg_id: sid,
-            epoch_id,
-            min_ts,
-            max_ts,
-            entries,
-            approx_bytes,
-        }))
-    }
-
-    fn evict_sealed_epoch(&self, sid: u64, epoch_id: u64) {
-        let Some(store_ref) = self.series.get(&sid) else {
-            return;
-        };
-        let Ok(mut data) = store_ref.write() else {
-            return;
-        };
-        data.sealed_epochs.remove(&epoch_id);
-    }
-
-    fn seal_aged_epochs(&self, cutoff_end: u64) -> usize {
-        let mut sealed = 0usize;
-        for entry in self.series.iter() {
-            let Ok(mut data) = entry.value().write() else {
-                continue;
-            };
-            sealed += data.seal_aged_windows(cutoff_end);
-        }
-        sealed
-    }
-
-    fn approx_memory_bytes(&self) -> usize {
-        // Account for BOTH `current_epoch` (hot, un-sealed) AND sealed
-        // epochs. Counting sealed-only under-reports the true footprint
-        // (the live "0.00–0.12 KB approx sealed bytes" diagnostic) and,
-        // worse, blinds the flusher's memory-pressure trigger to the bulk
-        // of memory — which under persistence (retention-drop disabled)
-        // lives in `current_epoch` until the time-driven seal rolls it
-        // over. The hot-window seal (`seal_aged_epochs`) handles the
-        // common case; this keeps the memory-pressure backstop honest for
-        // a burst that outruns the hot window.
-        let mut total = 0usize;
-        for entry in self.series.iter() {
-            let Ok(data) = entry.value().read() else {
-                continue;
-            };
-            for (_, _, payload) in data.current_epoch.iter_entries() {
-                total += payload.approx_bytes();
-            }
-            for epoch in data.sealed_epochs.values() {
-                for (_, _, payload) in &epoch.entries {
-                    total += payload.approx_bytes();
-                }
-            }
-        }
-        total
-    }
-}
-
-// Compatibility imports; new callers use the domain names above.
-#[deprecated(note = "Use SummarySeriesMetadata")]
-pub use SummarySeriesMetadata as SketchInstanceMetadata;
-
-// 2026-05 reorg: generic epoch-partitioned columnar storage lives
-// alongside the store that uses it.
-mod admission;
-mod maintenance;
-pub(crate) use maintenance::{CompleteRawMaintenanceCohort, FrozenExactWindows};
-pub mod epoch_columnar;
-
-// `persistence` moved up to `sketch_db::persistence`. Re-exported here
-// so legacy `crate::storage_engines::sketch_db::index::persistence::*`
-// paths continue working without consumer changes.
-pub use crate::storage_engines::sketch_db::persistence;
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    #[test]
-    fn max_rollup_answers_aligned_and_partial_ranges_and_prunes_history() {
-        let mut rollup = ReductionRollupSeries::new(RollupReduction::Max);
-        for index in 0..16u64 {
-            let start = 5_000 + index * 30_000;
-            rollup.append((start, start + 30_000), index as f64, Some(12 * 30_000));
-        }
-        assert_eq!(
-            rollup.query(5_000 + 4 * 30_000, 5_000 + 16 * 30_000),
-            Some(15.0)
-        );
-        assert_eq!(
-            rollup.query(5_000 + 7 * 30_000, 5_000 + 11 * 30_000),
-            Some(10.0)
-        );
-        assert_eq!(rollup.query(5_000, 35_000), None);
-
-        let mut gapped = ReductionRollupSeries::new(RollupReduction::Max);
-        gapped.append((0, 30_000), 1.0, None);
-        gapped.append((60_000, 90_000), 2.0, None);
-        assert_eq!(gapped.query(0, 90_000), None);
-    }
-
-    fn meta(sid: u64) -> SummarySeriesMetadata {
-        meta_with_policy(sid, asap_types::PolicyFingerprint::UNSET)
-    }
-
-    fn meta_for_config(
-        sid: u64,
-        config: &asap_types::PrecomputeMaterialization,
-    ) -> SummarySeriesMetadata {
-        let mut metadata = meta_with_policy(sid, config.policy_fingerprint());
-        metadata.agg_kind = crate::storage_engines::sketch_db::data::agg_kind_for_config(config);
-        metadata
-    }
-
-    fn meta_with_policy(
-        sid: u64,
-        policy_fp: asap_types::PolicyFingerprint,
-    ) -> SummarySeriesMetadata {
-        let cfg = SketchConfig::DDSketch {
-            relative_accuracy: 0.01,
-        };
-        SummarySeriesMetadata {
-            storage_handle: sid,
-            metric_name: "m".into(),
-            group_by_keys: BTreeSet::new(),
-            capability: Some(Capability::QuantileApprox(Some(SketchAlgorithm::DDSketch))),
-            agg_kind: AggKind::Sketch {
-                algorithm: SketchAlgorithm::DDSketch,
-                config: cfg.clone(),
-                spatial_filter_canonical: String::new(),
-            },
-            accuracy: Some(AccuracyBound::from_config(&cfg)),
-            first_seen_unix_ms: 0,
-            retired_at_ms: None,
-            expires_at_ms: None,
-            policy_fp,
-        }
-    }
-
-    #[test]
-    fn completing_writer_between_revision_loads_cannot_certify_a_snapshot() {
-        let store = SketchStore::new();
-        let before = store.summary_update_revision();
-        let writer = store.begin_state_mutation();
-        let after = SummaryReadRevision::capture(
-            0,
-            &store.mutation_revision,
-            &store.active_mutations,
-            || drop(writer),
-        );
-        assert!(!before.matches(after));
-        assert!(!after.matches(after), "capture crossed a writer completion");
-    }
-
-    #[test]
-    fn direct_store_writes_invalidate_query_snapshots_even_without_admission() {
-        let store = SketchStore::new();
-        let before = store.summary_update_revision();
-        let mutation = store.begin_state_mutation();
-        let during = store.summary_update_revision();
-        assert!(
-            !during.matches(during),
-            "an in-flight write cannot certify a snapshot"
-        );
-        drop(mutation);
-        assert!(!before.matches(store.summary_update_revision()));
-        let before = store.summary_update_revision();
-        store.append_sample(1, BTreeMap::new(), (0, 1000), sample(1));
-        assert!(!before.matches(store.summary_update_revision()));
-    }
-
-    #[test]
-    fn recovery_rejects_unsupported_or_corrupt_metadata() {
-        let directory = tempfile::tempdir().unwrap();
-        let store = SketchStore::new();
-        let sidecar = persistence::metadata::StoredOutputMetadataFile::new(directory.path());
-        assert_eq!(
-            store
-                .register_recovered_disk_series(directory.path())
-                .unwrap(),
-            0
-        );
-        for bytes in [b"{not json".as_slice(), b"{\"schema_version\":1}", b"{}"] {
-            std::fs::write(sidecar.path(), bytes).unwrap();
-            assert!(store
-                .register_recovered_disk_series(directory.path())
-                .is_err());
-            assert!(store.snapshot_instances().is_empty());
-        }
-    }
-
-    #[test]
-    fn store_lookups_and_equivalent_sids_share_sds_allocations() {
-        let store = SketchStore::new();
-        store.register(meta(1));
-        store.register(meta(2));
-
-        let first_lookup = store.instance(1).unwrap();
-        let second_lookup = store.instance(1).unwrap();
-        assert!(Arc::ptr_eq(&first_lookup, &second_lookup));
-
-        let (summary_a, data_a) = store.descriptors_for_series_id(1).unwrap();
-        let (summary_b, data_b) = store.descriptors_for_series_id(2).unwrap();
-        assert!(Arc::ptr_eq(&summary_a, &summary_b));
-        assert!(Arc::ptr_eq(&data_a, &data_b));
-        assert_eq!(store.descriptor_counts(), (1, 1));
-    }
-
-    #[test]
-    fn observed_inventory_uses_installed_catalog_and_real_store_entries() {
-        let snapshot: control_plane::physical::compiler::BackendLocalPlanningInput =
-            serde_json::from_str(include_str!(
-                "../../../../../docs/examples/asapquery-compatibility-demo-snapshot.json"
-            ))
-            .unwrap();
-        let plan = crate::tests::test_utilities::planning::quoted_snapshot(snapshot, false)
-            .compile_promql()
-            .unwrap();
-        let state_config = plan
-            .precompute_plan
-            .materializations
-            .iter()
-            .find(|config| {
-                matches!(
-                    config.accumulator_spec().unwrap().family,
-                    planner_types::post_asap::SummaryFamilyType::Sketch(..)
-                )
-            })
-            .unwrap()
-            .clone();
-        let fingerprint = state_config.policy_fingerprint();
-        let store = SketchStore::new();
-        store
-            .install_summary_catalog(Arc::new(plan.summary_catalog.clone()))
-            .unwrap();
-        store.register(meta_for_config(41, &state_config));
-        store.append_sample(
-            41,
-            BTreeMap::from([("job".to_string(), "api".to_string())]),
-            (0, 10_000),
-            sample(1),
-        );
-        store.append_sample(
-            41,
-            BTreeMap::from([("job".to_string(), "worker".to_string())]),
-            (10_000, 20_000),
-            sample(2),
-        );
-
-        let producers = BTreeMap::from([(
-            StoredOutputId::from(fingerprint),
-            (
-                asap_types::sds::StoredOutputReference::for_output(fingerprint.into())
-                    .stored_output_id,
-                "producer-a".to_string(),
-            ),
-        )]);
-        let inventory = store
-            .observed_summary_inventory("backend-a", "store-a", &producers, 1, 100)
-            .unwrap();
-        inventory.validate().unwrap();
-        assert_eq!(inventory.instances.len(), 2);
-        let instance = inventory.instances.values().next().unwrap();
-        assert_eq!(instance.stored_output_id.fingerprint(), fingerprint);
-        assert_eq!(
-            instance.stored_output_id,
-            asap_types::sds::StoredOutputReference::for_output(fingerprint.into()).stored_output_id
-        );
-        assert_eq!(instance.status, SummaryInstanceStatus::Ready);
-        assert_eq!(instance.completeness, InstanceCompleteness::Unknown);
-        assert!(!instance.group_values.is_empty());
-        assert!(inventory
-            .instances
-            .values()
-            .all(|instance| instance.time_range.start_ms < instance.time_range.end_ms));
-        assert_eq!(
-            inventory
-                .instances
-                .values()
-                .map(|instance| instance.state_reference.key.as_str())
-                .collect::<BTreeSet<_>>()
-                .len(),
-            2
-        );
-        let next_inventory = store
-            .observed_summary_inventory("backend-a", "store-a", &producers, 2, 200)
-            .unwrap();
-        assert_eq!(
-            inventory.instances.keys().collect::<Vec<_>>(),
-            next_inventory.instances.keys().collect::<Vec<_>>()
-        );
-        let catalog_identity = &plan.summary_catalog.outputs[&instance.stored_output_id];
-        assert_eq!(
-            instance.summary_descriptor_id,
-            catalog_identity.summary_descriptor_id
-        );
-        assert_eq!(
-            instance.data_descriptor_id,
-            catalog_identity.data_descriptor_id
-        );
-    }
-
-    #[test]
-    fn registered_series_without_payload_is_not_a_summary_instance() {
-        let snapshot: control_plane::physical::compiler::BackendLocalPlanningInput =
-            serde_json::from_str(include_str!(
-                "../../../../../docs/examples/asapquery-compatibility-demo-snapshot.json"
-            ))
-            .unwrap();
-        let plan = crate::tests::test_utilities::planning::quoted_snapshot(snapshot, false)
-            .compile_promql()
-            .unwrap();
-        let state_config = plan
-            .precompute_plan
-            .materializations
-            .iter()
-            .find(|config| {
-                matches!(
-                    config.accumulator_spec().unwrap().family,
-                    planner_types::post_asap::SummaryFamilyType::Sketch(..)
-                )
-            })
-            .unwrap()
-            .clone();
-        let fingerprint = state_config.policy_fingerprint();
-        let store = SketchStore::new();
-        store
-            .install_summary_catalog(Arc::new(plan.summary_catalog))
-            .unwrap();
-        store.register(meta_for_config(42, &state_config));
-        let producers = BTreeMap::from([(
-            StoredOutputId::from(fingerprint),
-            (
-                asap_types::sds::StoredOutputReference::for_output(fingerprint.into())
-                    .stored_output_id,
-                "producer-a".to_string(),
-            ),
-        )]);
-        let inventory = store
-            .observed_summary_inventory("backend-a", "store-a", &producers, 1, 100)
-            .unwrap();
-        assert!(inventory.instances.is_empty());
-    }
-
-    fn sample(b: u8) -> SketchSampleState {
-        SketchSampleState {
-            bytes: vec![b],
-            encoding: SketchEncoding::ProtoFull,
-        }
-    }
-
-    #[test]
-    fn ghost_classification() {
-        let idx = SketchStore::new();
-        idx.register(meta(42));
-        assert_eq!(idx.classify(42), SeriesLookup::Ghost);
-        assert_eq!(idx.classify(999), SeriesLookup::Unknown);
-    }
-
-    #[test]
-    fn hit_after_append() {
-        let idx = SketchStore::new();
-        idx.register(meta(7));
-        idx.append_sample(7, BTreeMap::new(), (1000, 1010), sample(1));
-        assert_eq!(idx.classify(7), SeriesLookup::Hit);
-    }
-
-    #[test]
-    fn range_query_returns_distinct_series() {
-        let idx = SketchStore::new();
-        idx.register(meta(11));
-        let mut lv_a = BTreeMap::new();
-        lv_a.insert("host".to_string(), "a".to_string());
-        let mut lv_b = BTreeMap::new();
-        lv_b.insert("host".to_string(), "b".to_string());
-
-        idx.append_sample(11, lv_a.clone(), (0, 10), sample(1));
-        idx.append_sample(11, lv_a.clone(), (10, 20), sample(2));
-        idx.append_sample(11, lv_b.clone(), (10, 20), sample(3));
-        idx.append_sample(11, lv_b.clone(), (20, 30), sample(4));
-
-        let mut series = idx.query_range(11, 0, 30);
-        series.sort_by(|x, y| x.series_label_values.cmp(&y.series_label_values));
-        assert_eq!(series.len(), 2);
-
-        let s_a = &series[0];
-        assert_eq!(s_a.series_label_values, lv_a);
-        assert_eq!(s_a.samples.len(), 2);
-        assert_eq!(s_a.samples[&10][0].bytes, vec![1]);
-        assert_eq!(s_a.samples[&20][0].bytes, vec![2]);
-
-        let s_b = &series[1];
-        assert_eq!(s_b.series_label_values, lv_b);
-        assert_eq!(s_b.samples.len(), 2);
-    }
-
-    #[test]
-    fn incomplete_delta_window_fails_closed_until_matching_full_checkpoint() {
-        use asap_types::producer_plan::{SummaryFrameIdentity, SummaryFrameKind};
-        use control_plane::physical::compiler::StateEncoding;
-
-        let idx = SketchStore::new();
-        idx.register(meta(12));
-        idx.append_sample(12, BTreeMap::new(), (0, 10), sample(0));
-        idx.append_sample(12, BTreeMap::new(), (1000, 1010), sample(1));
-        let frame = SummaryFrameIdentity {
-            identity_version: 1,
-            plan_id: 7,
-            plan_version: 2,
-            backend_compat: "asap-query-backend.v1".into(),
-            materialization: PolicyFingerprint(41).into(),
-            series_identity: "service=checkout,zone=a".into(),
-            schema_id: "schema-41".into(),
-            producer_id: "edge-a".into(),
-            producer_epoch: "boot-1".into(),
-            window_start_unix_nano: 1_000_000_000,
-            window_end_unix_nano: 1_010_000_000,
-            sequence: 3,
-            kind: SummaryFrameKind::Delta,
-            encoding: StateEncoding::SketchlibProtobufV1,
-            checkpoint_id: None,
-            base_checkpoint_id: Some("cp-1".into()),
-        };
-        idx.mark_summary_lineage_incomplete(12, &frame);
-        assert!(idx.query_range(12, 1000, 1010).is_empty());
-        assert_eq!(idx.query_range(12, 0, 999).len(), 1);
-
-        let recovery = SummaryFrameIdentity {
-            kind: SummaryFrameKind::Full,
-            checkpoint_id: Some("cp-4".into()),
-            base_checkpoint_id: None,
-            sequence: 4,
-            ..frame
-        };
-        idx.clear_summary_lineage_incomplete(12, &recovery);
-        assert_eq!(idx.query_range(12, 1000, 1010).len(), 1);
-    }
-
-    #[test]
-    fn range_query_uses_overlap_not_containment() {
-        // The sketch read path uses HALF-OPEN OVERLAP, not containment:
-        // any pane intersecting `[start, end)` is returned so the reducer
-        // can establish a rolling base even when no pane is fully
-        // contained (the ~30s-pane case behind the live `[30s]` "No
-        // result" bug). Of `(0,10)`, `(10,20)`, `(20,30)` against `[5,25)`:
-        //  - `(0,10)`  overlaps  (10 > 5)            → included (straddles left edge)
-        //  - `(10,20)` overlaps                       → included
-        //  - `(20,30)` overlaps  (20 < 25)            → included (straddles right edge)
-        let idx = SketchStore::new();
-        idx.register(meta(13));
-        let lv = BTreeMap::new();
-        idx.append_sample(13, lv.clone(), (0, 10), sample(1));
-        idx.append_sample(13, lv.clone(), (10, 20), sample(2));
-        idx.append_sample(13, lv.clone(), (20, 30), sample(3));
-
-        let series = idx.query_range(13, 5, 25);
-        assert_eq!(series.len(), 1);
-        let s = &series[0];
-        assert_eq!(s.samples.len(), 3, "all three panes overlap [5,25)");
-        assert!(s.samples.contains_key(&10));
-        assert!(s.samples.contains_key(&20));
-        assert!(s.samples.contains_key(&30));
-    }
-
-    #[test]
-    fn range_query_excludes_non_overlapping_panes() {
-        // Overlap must still EXCLUDE panes that don't intersect the
-        // window — a pane ending exactly at `start` (half-open: `w.1 >
-        // start` is false) and one starting at/after `end`.
-        let idx = SketchStore::new();
-        idx.register(meta(14));
-        let lv = BTreeMap::new();
-        idx.append_sample(14, lv.clone(), (0, 10), sample(1)); // ends at start=10 → excluded
-        idx.append_sample(14, lv.clone(), (10, 20), sample(2)); // overlaps → included
-        idx.append_sample(14, lv.clone(), (30, 40), sample(3)); // starts at end=30 → excluded
-
-        let series = idx.query_range(14, 10, 30);
-        assert_eq!(series.len(), 1);
-        let s = &series[0];
-        assert_eq!(s.samples.len(), 1, "only the (10,20) pane overlaps [10,30)");
-        assert!(s.samples.contains_key(&20));
-    }
-
-    #[test]
-    fn range_query_short_window_straddling_pane_with_delta_carry_in() {
-        // Live gap 1: a `[30s]`-style window narrower than the agent's
-        // ~30s pane cadence. The freshest pane STRADDLES the window's left
-        // edge (starts before `start`, ends inside), so strict containment
-        // returned nothing → "No result". Overlap admits the straddling
-        // delta pane, and the carry-in splices the prior Full as its base.
-        let idx = SketchStore::new();
-        idx.register(meta(15));
-        let lv = BTreeMap::new();
-        // Full pane fully before the window.
-        idx.append_sample(15, lv.clone(), (260, 290), sample(1));
-        // Delta pane STRADDLING the window's left edge [300,330): starts
-        // at 295 (< 300), ends at 325 (inside). Containment excludes it
-        // (295 < 300); overlap includes it.
-        idx.append_sample(15, lv.clone(), (295, 325), delta_sample(2));
-
-        let series = idx.query_range(15, 300, 330);
-        assert_eq!(series.len(), 1, "straddling delta pane is now visible");
-        let s = &series[0];
-        assert!(
-            s.samples.contains_key(&325),
-            "straddling in-window delta (end=325) admitted by overlap"
-        );
-        assert!(
-            s.samples.contains_key(&290),
-            "prior Full (end=290) carried in as the delta's base"
-        );
-    }
-
-    fn delta_sample(b: u8) -> SketchSampleState {
-        SketchSampleState {
-            bytes: vec![b],
-            encoding: SketchEncoding::ProtoDelta,
-        }
-    }
-
-    #[test]
-    fn range_query_carries_in_latest_full_before_window() {
-        // The delta-stitching carry-in: a Full lands BEFORE the query
-        // window and only deltas land inside it. `query_range` must
-        // splice in the most-recent pre-window Full so the downstream
-        // delta-apply reducer can establish a rolling base. Without it,
-        // a short window that contains only deltas yields an
-        // unanswerable series (the live quantile/HLL "No result" bug).
-        let idx = SketchStore::new();
-        idx.register(meta(21));
-        let lv = BTreeMap::new();
-        // Two Fulls before the window; the LATER one (end=200) is the
-        // base that must be carried in.
-        idx.append_sample(21, lv.clone(), (90, 100), sample(1));
-        idx.append_sample(21, lv.clone(), (190, 200), sample(2));
-        // Delta-only inside the window [300, 400].
-        idx.append_sample(21, lv.clone(), (310, 320), delta_sample(3));
-
-        let series = idx.query_range(21, 300, 400);
-        assert_eq!(series.len(), 1);
-        let s = &series[0];
-        // In-window delta (end=320) + carried-in latest Full (end=200).
-        assert!(s.samples.contains_key(&320), "in-window delta present");
-        assert!(
-            s.samples.contains_key(&200),
-            "latest pre-window Full (end=200) carried in as base"
-        );
-        assert!(
-            !s.samples.contains_key(&100),
-            "only the LATEST pre-window Full is carried in, not older ones"
-        );
-        // The carried-in entry must be a Full (the reducer needs a base).
-        assert_eq!(
-            s.samples.get(&200).unwrap()[0].encoding,
-            SketchEncoding::ProtoFull
-        );
-    }
-
-    #[test]
-    fn range_query_no_carry_in_when_window_leads_with_full() {
-        // If the in-window samples already lead with a Full, no carry-in
-        // is needed (and none should be spliced — it would be redundant
-        // and could skew coverage).
-        let idx = SketchStore::new();
-        idx.register(meta(22));
-        let lv = BTreeMap::new();
-        idx.append_sample(22, lv.clone(), (90, 100), sample(1));
-        idx.append_sample(22, lv.clone(), (310, 320), sample(2)); // Full in-window
-        idx.append_sample(22, lv.clone(), (330, 340), delta_sample(3));
-
-        let series = idx.query_range(22, 300, 400);
-        assert_eq!(series.len(), 1);
-        let s = &series[0];
-        assert!(s.samples.contains_key(&320));
-        assert!(s.samples.contains_key(&340));
-        assert!(
-            !s.samples.contains_key(&100),
-            "no carry-in when the window already leads with a Full"
-        );
-    }
-
-    /// Test-only: override a single sid's WARM retention horizon so a
-    /// test can drive eviction without mutating the process-global
-    /// `ASAP_SKETCH_RETENTION_MS` env (which would race other tests).
-    /// The sid must already have state (call after the first
-    /// `append_sample`).
-    fn set_retention_horizon_for_test(store: &SketchStore, sid: u64, horizon_ms: Option<u64>) {
-        if let Some(s) = store.series.get(&sid) {
-            s.write().unwrap().retention_horizon_ms = horizon_ms;
-        }
-    }
-
-    #[test]
-    fn retention_bounds_memory_yet_keeps_recent_windows_queryable() {
-        // Regression for the production leak: under steady ~30s-pane
-        // ingest the per-sid window count grew unbounded because nothing
-        // sealed and `current_epoch` was never trimmed. With a bounded
-        // horizon (a) old windows are evicted (memory stays O(horizon)),
-        // and (b) recent windows within the horizon remain queryable via
-        // the overlap-scan + delta carry-in read path (#323–#326).
-        let idx = SketchStore::new();
-        idx.register(meta(77));
-        let lv = BTreeMap::new();
-        let window_ms = 30_000u64; // 30s panes
-        let horizon_ms = 60 * 60 * 1000u64; // 1h
-
-        // Seed one window, then set the horizon, then stream the rest.
-        idx.append_sample(77, lv.clone(), (0, window_ms), sample(0));
-        set_retention_horizon_for_test(&idx, 77, Some(horizon_ms));
-
-        // 4h of ingest = 480 panes. Emit a Full at the start of each
-        // 30-pane (~15m) block, deltas otherwise — mirrors the agent's
-        // periodic-Full + cheap-delta cadence so the carry-in has a base.
-        let mut start = window_ms;
-        let mut last_end = window_ms;
-        for i in 1..480u64 {
-            last_end = start + window_ms;
-            let s = if i % 30 == 0 {
-                sample((i % 250) as u8)
-            } else {
-                delta_sample((i % 250) as u8)
-            };
-            idx.append_sample(77, lv.clone(), (start, last_end), s);
-            start += window_ms;
-        }
-
-        // (a) Memory bound: distinct windows ≈ horizon/window, NOT 480.
-        let retained = {
-            let g = idx.series.get(&77).unwrap();
-            let r = g.read().unwrap().current_epoch.distinct_windows();
-            r
-        };
-        let expected = (horizon_ms / window_ms) as usize;
-        assert!(
-            retained <= expected + 2,
-            "retained {retained} windows; horizon should bound to ~{expected}"
-        );
-        assert!(
-            retained < 480,
-            "old windows were not evicted (leak persists)"
-        );
-
-        // (b) A 30m range query ending at the freshest window still
-        // resolves (well within the 1h horizon) AND the carry-in finds a
-        // Full base for any leading delta — no regression to #323–#326.
-        let q_start = last_end - 30 * 60 * 1000;
-        let series = idx.query_range(77, q_start, last_end);
-        assert_eq!(series.len(), 1, "recent 30m window must stay queryable");
-        let s = &series[0];
-        assert!(!s.samples.is_empty(), "30m range query returned no samples");
-        let first = &s.samples.values().next().unwrap()[0];
-        assert!(
-            matches!(
-                first.encoding,
-                SketchEncoding::ProtoFull | SketchEncoding::MsgpackFull
-            ),
-            "earliest sample in the answer must be a Full base (carry-in intact)"
-        );
-    }
-
-    #[test]
-    fn ddsketch_accuracy_bound() {
-        let bound = AccuracyBound::from_config(&SketchConfig::DDSketch {
-            relative_accuracy: 0.01,
-        });
-        assert!((bound.epsilon - 0.01).abs() < 1e-9);
-        assert!((bound.confidence - 1.0).abs() < 1e-9);
-    }
-
-    // ── Phase 5 M1 lifecycle tests ────────────────────────────────────
-
-    #[test]
-    fn fresh_instance_is_active_and_writable() {
-        let idx = SketchStore::new();
-        idx.register(meta(1));
-        let m = idx.instance(1).unwrap();
-        assert_eq!(m.status(), AggStatus::Active);
-        assert!(m.is_writable());
-        assert!(idx.is_writable(1));
-    }
-
-    #[test]
-    fn unknown_sid_is_not_writable() {
-        let idx = SketchStore::new();
-        assert!(!idx.is_writable(999));
-    }
-
-    #[test]
-    fn force_retire_transitions_active_to_retired() {
-        let idx = SketchStore::new();
-        idx.register(meta(1));
-        let after = idx
-            .force_retire(1, Duration::from_secs(3600))
-            .expect("sid known");
-        assert_eq!(after.status(), AggStatus::Retired);
-        assert!(after.retired_at_ms.is_some());
-        assert!(after.expires_at_ms.is_some());
-        // is_writable now returns false through the index too.
-        assert!(!idx.is_writable(1));
-    }
-
-    #[test]
-    fn force_retire_is_idempotent() {
-        let idx = SketchStore::new();
-        idx.register(meta(1));
-        let first = idx.force_retire(1, Duration::from_secs(3600)).unwrap();
-        let first_retired_at = first.retired_at_ms.unwrap();
-        let first_expires_at = first.expires_at_ms.unwrap();
-        // Re-retire after a tick — same timestamps.
-        std::thread::sleep(Duration::from_millis(2));
-        let second = idx.force_retire(1, Duration::from_secs(7200)).unwrap();
-        assert_eq!(second.retired_at_ms, Some(first_retired_at));
-        assert_eq!(second.expires_at_ms, Some(first_expires_at));
-    }
-
-    #[test]
-    fn force_expire_makes_status_expired_immediately() {
-        let idx = SketchStore::new();
-        idx.register(meta(1));
-        let after = idx.force_expire(1).expect("sid known");
-        assert_eq!(after.status(), AggStatus::Expired);
-        assert!(!idx.is_writable(1));
-    }
-
-    #[test]
-    fn list_by_status_partitions_correctly() {
-        let idx = SketchStore::new();
-        idx.register(meta(1));
-        idx.register(meta(2));
-        idx.register(meta(3));
-        idx.force_retire(2, Duration::from_secs(3600));
-        idx.force_expire(3);
-
-        let active = idx.list_by_status(AggStatus::Active);
-        let retired = idx.list_by_status(AggStatus::Retired);
-        let expired = idx.list_by_status(AggStatus::Expired);
-        assert_eq!(active.len(), 1);
-        assert_eq!(active[0].storage_handle, 1);
-        assert_eq!(retired.len(), 1);
-        assert_eq!(retired[0].storage_handle, 2);
-        assert_eq!(expired.len(), 1);
-        assert_eq!(expired[0].storage_handle, 3);
-    }
-
-    #[test]
-    fn remove_instance_drops_metadata_and_series() {
-        let idx = SketchStore::new();
-        idx.register(meta(1));
-        idx.append_sample(1, BTreeMap::new(), (0, 10), sample(1));
-        assert_eq!(idx.classify(1), SeriesLookup::Hit);
-        let removed = idx.remove_instance(1).expect("sid known");
-        assert_eq!(removed.storage_handle, 1);
-        assert_eq!(idx.classify(1), SeriesLookup::Unknown);
-    }
-
-    #[test]
-    fn unknown_sid_returns_none_from_lifecycle_methods() {
-        let idx = SketchStore::new();
-        assert!(idx.force_retire(999, Duration::from_secs(1)).is_none());
-        assert!(idx.force_expire(999).is_none());
-        assert!(idx.remove_instance(999).is_none());
-    }
-
-    #[test]
-    fn epoch_rotation_is_visible_to_query() {
-        let idx = SketchStore::new();
-        idx.register(meta(17));
-
-        // Force aggressive rotation by touching the SidStoreData
-        // capacity *after* the entry is created. We do this by
-        // first appending one sample to materialize the entry, then
-        // mutating its config, then appending more.
-        idx.append_sample(17, BTreeMap::new(), (0, 10), sample(1));
-        if let Some(s) = idx.series.get(&17) {
-            let mut g = s.write().unwrap();
-            g.epoch_capacity = Some(2);
-            g.max_epochs = 4;
-        }
-        idx.append_sample(17, BTreeMap::new(), (10, 20), sample(2));
-        idx.append_sample(17, BTreeMap::new(), (20, 30), sample(3));
-        idx.append_sample(17, BTreeMap::new(), (30, 40), sample(4));
-
-        // All four windows should still be query-visible across the
-        // mutable + sealed boundary.
-        let series = idx.query_range(17, 0, 40);
-        assert_eq!(series.len(), 1);
-        assert_eq!(series[0].samples.len(), 4);
-    }
-
-    // sid-hash unit tests removed alongside `compute_sid` (PR-4) and
-    // `compute_sketch_sid` (PR-3). The identity properties they
-    // exercised — `(metric, attrs, agg_kind)` discriminates sids,
-    // sketch and precompute never collide, agg_type and parameters
-    // each contribute to identity — are now covered by:
-    //
-    //  - `series_resolver::tests::distinct_agg_kinds_same_series_distinct_sids`
-    //    (the resolver's identity contract under Interpretation B)
-    //  - `AggKind::canonical_string` is exhaustive over the AggKind
-    //    enum, so two variants whose fields differ produce different
-    //    canonical strings → different resolver cache keys → different
-    //    sids by construction.
-
-    #[test]
-    fn canonical_parameters_is_insertion_order_independent() {
-        let mut p_ab = std::collections::HashMap::new();
-        p_ab.insert("alpha".to_string(), serde_json::json!(1));
-        p_ab.insert("beta".to_string(), serde_json::json!(2));
-        let mut p_ba = std::collections::HashMap::new();
-        p_ba.insert("beta".to_string(), serde_json::json!(2));
-        p_ba.insert("alpha".to_string(), serde_json::json!(1));
-        assert_eq!(canonical_parameters(&p_ab), canonical_parameters(&p_ba));
-    }
-
-    #[test]
-    fn precompute_payload_round_trips_through_storage() {
-        use asap_physical_operators::summary_kernels::SumAccumulator;
-
-        let idx = SketchStore::new();
-        let cfg = SketchConfig::DDSketch {
-            relative_accuracy: 0.01,
-        };
-        let mut precompute_meta = meta(42);
-        precompute_meta.capability = None;
-        precompute_meta.accuracy = None;
-        precompute_meta.agg_kind = AggKind::ExactAgg {
-            agg_type: AggregationType::Sum,
-            parameters_canonical: String::new(),
-            spatial_filter_canonical: String::new(),
-        };
-        let _ = cfg; // silence unused-binding lint
-        idx.register(precompute_meta);
-
-        idx.append_precompute(
-            42,
-            BTreeMap::new(),
-            (1000, 1010),
-            Box::new(SumAccumulator::with_sum(5.0)),
-        );
-
-        // Sketch-side query_range filters out precompute payloads, so
-        // a precompute sid produces no SketchTimeSeries entries even
-        // though the storage has data.
-        let series = idx.query_range(42, 0, 5000);
-        assert!(
-            series.iter().all(|s| s.samples.is_empty()),
-            "precompute payloads must not surface as sketch results"
-        );
-        assert_eq!(
-            idx.classify(42),
-            SeriesLookup::Hit,
-            "storage has data — Hit"
-        );
-    }
-
-    #[test]
-    fn query_precomputes_by_agg_returns_data_grouped_by_label_values() {
-        use asap_physical_operators::summary_kernels::SumAccumulator;
-
-        let idx = SketchStore::new();
-        let cfg = SketchConfig::DDSketch {
-            relative_accuracy: 0.01,
-        };
-        let _ = cfg;
-        let mut precompute_meta = meta(99);
-        precompute_meta.metric_name = "cpu_seconds".into();
-        precompute_meta.capability = None;
-        precompute_meta.accuracy = None;
-        precompute_meta.agg_kind = AggKind::ExactAgg {
-            agg_type: AggregationType::Sum,
-            parameters_canonical: String::new(),
-            spatial_filter_canonical: String::new(),
-        };
-        idx.register(precompute_meta);
-
-        // Two writes under sid=99 with the same label_values + different
-        // windows — they should collapse into the same group_key on
-        // the way out.
-        let mut lv = BTreeMap::new();
-        lv.insert("zone".to_string(), "z0".to_string());
-        idx.append_precompute(
-            99,
-            lv.clone(),
-            (1000, 2000),
-            Box::new(SumAccumulator::with_sum(1.0)),
-        );
-        idx.append_precompute(
-            99,
-            lv,
-            (2000, 3000),
-            Box::new(SumAccumulator::with_sum(2.0)),
-        );
-
-        let result = idx.query_precomputes_by_agg("cpu_seconds", AggregationType::Sum, 0, 10_000);
-        assert_eq!(result.len(), 1, "one label-values key");
-        let buckets = result.values().next().expect("populated");
-        assert_eq!(buckets.len(), 2, "two windows for that key");
-    }
-
-    #[test]
-    fn query_precomputes_by_agg_skips_sketch_payloads() {
-        let idx = SketchStore::new();
-        // A SKETCH sid for the same metric — must not show up in the
-        // precompute query path.
-        idx.register(meta(7));
-        idx.append_sample(7, BTreeMap::new(), (1000, 2000), sample(1));
-
-        let result = idx.query_precomputes_by_agg("m", AggregationType::Sum, 0, 10_000);
-        assert!(result.is_empty(), "sketch sids must not surface");
-    }
-
-    /// Helper: append one sample to materialize the SidStoreData, then
-    /// set its epoch_capacity so subsequent appends rotate aggressively.
-    fn with_tight_rotation(idx: &SketchStore, sid: u64) {
-        idx.append_sample(sid, BTreeMap::new(), (0, 10), sample(0));
-        if let Some(s) = idx.series.get(&sid) {
-            let mut g = s.write().unwrap();
-            g.epoch_capacity = Some(1);
-            g.max_epochs = 8;
-        }
-    }
-
-    #[test]
-    fn epoch_source_lists_only_sealed_epochs() {
-        use crate::storage_engines::sketch_db::index::persistence::EpochSource;
-        let idx = SketchStore::new();
-        idx.register(meta(13));
-        with_tight_rotation(&idx, 13);
-        idx.append_sample(13, BTreeMap::new(), (10, 20), sample(2));
-        idx.append_sample(13, BTreeMap::new(), (20, 30), sample(3));
-
-        let refs = idx.list_sealed_epochs();
-        assert!(
-            !refs.is_empty(),
-            "rotation should have produced at least one sealed epoch"
-        );
-        assert!(
-            refs.iter().all(|r| r.agg_id == 13),
-            "all sealed-epoch refs come from sid=13"
-        );
-    }
-
-    #[test]
-    fn epoch_source_snapshot_round_trips_sketch_payload() {
-        use crate::storage_engines::sketch_db::index::persistence::EpochSource;
-        let idx = SketchStore::new();
-        idx.register(meta(21));
-        with_tight_rotation(&idx, 21);
-        idx.append_sample(21, BTreeMap::new(), (1000, 2000), sample(0xAB));
-        idx.append_sample(21, BTreeMap::new(), (2000, 3000), sample(0xCD));
-
-        let refs = idx.list_sealed_epochs();
-        let first = refs.first().expect("a sealed epoch exists");
-        let snap = idx
-            .snapshot_sealed_epoch(first.agg_id, first.epoch_id)
-            .expect("snapshot ok")
-            .expect("populated");
-        assert_eq!(snap.agg_id, 21);
-        assert!(!snap.entries.is_empty());
-        let entry = &snap.entries[0];
-        assert!(
-            entry.sketch_type_name.starts_with("DDSketch"),
-            "sketch_type_name should reflect sid metadata's sketch_kind: {}",
-            entry.sketch_type_name
-        );
-        assert_eq!(
-            entry.sketch_bytes.len(),
-            1,
-            "single-byte sample bytes carry"
-        );
-    }
-
-    #[test]
-    fn epoch_source_evict_drops_the_epoch() {
-        use crate::storage_engines::sketch_db::index::persistence::EpochSource;
-        let idx = SketchStore::new();
-        idx.register(meta(31));
-        with_tight_rotation(&idx, 31);
-        idx.append_sample(31, BTreeMap::new(), (10, 20), sample(2));
-
-        let refs = idx.list_sealed_epochs();
-        let one = refs.first().cloned().expect("populated");
-        idx.evict_sealed_epoch(one.agg_id, one.epoch_id);
-        let after = idx.list_sealed_epochs();
-        assert!(
-            !after.iter().any(|r| r.epoch_id == one.epoch_id),
-            "the evicted epoch must no longer appear"
-        );
-    }
-
-    #[test]
-    fn epoch_source_approx_memory_bytes_grows_with_sealed_state() {
-        use crate::storage_engines::sketch_db::index::persistence::EpochSource;
-        let idx = SketchStore::new();
-        let before = idx.approx_memory_bytes();
-        idx.register(meta(41));
-        with_tight_rotation(&idx, 41);
-        idx.append_sample(41, BTreeMap::new(), (10, 20), sample(2));
-        let after = idx.approx_memory_bytes();
-        assert!(after > before, "sealed state contributes to memory total");
-    }
-
-    #[test]
-    fn agg_payload_accessors_are_disjoint() {
-        let sketch = AggPayload::Sketch(SketchSampleState {
-            bytes: vec![0xAA],
-            encoding: SketchEncoding::ProtoFull,
-        });
-        assert!(sketch.as_sketch().is_some());
-        assert!(sketch.as_exact_agg().is_none());
-
-        use asap_physical_operators::summary_kernels::SumAccumulator;
-        let exact_agg = AggPayload::ExactAgg(Arc::new(SumAccumulator::with_sum(1.0)));
-        assert!(exact_agg.as_sketch().is_none());
-        assert!(exact_agg.as_exact_agg().is_some());
-    }
-
-    // `compute_sketch_sid_matches_new_compute_sid_for_sketch_branch`
-    // removed — it tested parity between two hash wrappers, and the
-    // outer wrapper is now gone. The remaining `compute_sid_*` tests
-    // exercise the encoding properties that PR-4 will lean on when it
-    // migrates the precompute path to the resolver.
-
-    // ── policy_fp reverse-index tests ────────────────────────────────
-
-    #[test]
-    fn series_ids_for_policy_returns_empty_for_unset_or_missing() {
-        let idx = SketchStore::new();
-        // Empty store → nothing for any fp.
-        assert!(idx
-            .series_ids_for_policy(asap_types::PolicyFingerprint(42))
-            .is_empty());
-        // The UNSET sentinel always returns empty regardless of state.
-        idx.register(meta_with_policy(1, asap_types::PolicyFingerprint::UNSET));
-        assert!(idx
-            .series_ids_for_policy(asap_types::PolicyFingerprint::UNSET)
-            .is_empty());
-    }
-
-    #[test]
-    fn register_indexes_one_sid_under_its_policy() {
-        let idx = SketchStore::new();
-        let fp = asap_types::PolicyFingerprint(7);
-        idx.register(meta_with_policy(1, fp));
-        assert_eq!(idx.series_ids_for_policy(fp), vec![1]);
-        assert_eq!(idx.policy_count(), 1);
-    }
-
-    #[test]
-    fn register_groups_multiple_sids_under_one_policy() {
-        let idx = SketchStore::new();
-        let fp = asap_types::PolicyFingerprint(7);
-        idx.register(meta_with_policy(1, fp));
-        idx.register(meta_with_policy(2, fp));
-        idx.register(meta_with_policy(3, fp));
-        let mut sids = idx.series_ids_for_policy(fp);
-        sids.sort();
-        assert_eq!(sids, vec![1, 2, 3]);
-        assert_eq!(idx.policy_count(), 1);
-    }
-
-    #[test]
-    fn register_separates_distinct_policies() {
-        let idx = SketchStore::new();
-        let fp_a = asap_types::PolicyFingerprint(7);
-        let fp_b = asap_types::PolicyFingerprint(8);
-        idx.register(meta_with_policy(1, fp_a));
-        idx.register(meta_with_policy(2, fp_b));
-        idx.register(meta_with_policy(3, fp_a));
-        assert_eq!(idx.series_ids_for_policy(fp_a), vec![1, 3]);
-        assert_eq!(idx.series_ids_for_policy(fp_b), vec![2]);
-        assert_eq!(idx.policy_count(), 2);
-    }
-
-    #[test]
-    fn unset_policy_sids_are_not_in_reverse_index() {
-        let idx = SketchStore::new();
-        let fp = asap_types::PolicyFingerprint(7);
-        idx.register(meta_with_policy(1, fp));
-        // sid 2 has UNSET — should NOT show up under any fp.
-        idx.register(meta_with_policy(2, asap_types::PolicyFingerprint::UNSET));
-        assert_eq!(idx.series_ids_for_policy(fp), vec![1]);
-        assert_eq!(idx.policy_count(), 1);
-        // But it IS still in the main `instances` map.
-        assert!(idx.instance(2).is_some());
-    }
-
-    #[test]
-    fn remove_instance_drops_reverse_index_entry() {
-        let idx = SketchStore::new();
-        let fp = asap_types::PolicyFingerprint(7);
-        idx.register(meta_with_policy(1, fp));
-        idx.register(meta_with_policy(2, fp));
-        idx.remove_instance(1);
-        assert_eq!(idx.series_ids_for_policy(fp), vec![2]);
-        assert_eq!(idx.policy_count(), 1);
-        idx.remove_instance(2);
-        assert!(idx.series_ids_for_policy(fp).is_empty());
-        // Empty entry collapses — policy_count drops to 0.
-        assert_eq!(idx.policy_count(), 0);
-    }
-
-    // ── metric_to_series_ids secondary-index tests (P2-2) ──────────────────
-
-    /// Metadata with a chosen metric name + group-by key set, so the
-    /// secondary-index tests can register several metrics/keys.
-    fn meta_metric_keys(sid: u64, metric: &str, keys: &[&str]) -> SummarySeriesMetadata {
-        let mut m = meta(sid);
-        m.metric_name = metric.to_string();
-        m.group_by_keys = keys.iter().map(|k| k.to_string()).collect();
-        m
-    }
-
-    #[test]
-    fn instances_matching_keyed_lookup_filters_by_metric_and_keys() {
-        let idx = SketchStore::new();
-        // Two metrics; sid 1/2 on metric_a (different key coverage),
-        // sid 3 on metric_b.
-        idx.register(meta_metric_keys(1, "metric_a", &["zone", "rack"]));
-        idx.register(meta_metric_keys(2, "metric_a", &["zone"]));
-        idx.register(meta_metric_keys(3, "metric_b", &["zone"]));
-
-        // Keyed lookup returns ONLY the requested metric's sids, and only
-        // those whose group_by_keys ⊇ required_keys.
-        let req_zone: BTreeSet<String> = ["zone".to_string()].into_iter().collect();
-        let mut a = idx.instances_matching("metric_a", &req_zone);
-        a.sort_unstable();
-        assert_eq!(a, vec![1, 2], "both metric_a sids cover {{zone}}");
-
-        let req_zone_rack: BTreeSet<String> = ["zone".to_string(), "rack".to_string()]
-            .into_iter()
-            .collect();
-        assert_eq!(
-            idx.instances_matching("metric_a", &req_zone_rack),
-            vec![1],
-            "only sid 1 covers {{zone,rack}}"
-        );
-
-        assert_eq!(idx.instances_matching("metric_b", &req_zone), vec![3]);
-        // A metric with no registered sids → empty (no full scan, no panic).
-        assert!(idx
-            .instances_matching("metric_absent", &BTreeSet::new())
-            .is_empty());
-    }
-
-    #[test]
-    fn instances_matching_secondary_index_updated_on_retire_and_remove() {
-        let idx = SketchStore::new();
-        idx.register(meta_metric_keys(1, "metric_a", &["zone"]));
-        idx.register(meta_metric_keys(2, "metric_a", &["zone"]));
-        let req: BTreeSet<String> = ["zone".to_string()].into_iter().collect();
-        let mut got = idx.instances_matching("metric_a", &req);
-        got.sort_unstable();
-        assert_eq!(got, vec![1, 2]);
-
-        // Retire (force_retire) does NOT remove the sid from the index —
-        // it stays queryable so an in-flight query can still read its
-        // pre-expiry state; the eviction sweep calls remove_instance
-        // later. Confirm the index still surfaces both.
-        idx.force_retire(1, Duration::from_secs(3600));
-        let mut still = idx.instances_matching("metric_a", &req);
-        still.sort_unstable();
-        assert_eq!(
-            still,
-            vec![1, 2],
-            "retire keeps the sid in the metric index"
-        );
-
-        // remove_instance (the post-eviction cleanup) drops it from the
-        // secondary index too.
-        idx.remove_instance(1);
-        assert_eq!(
-            idx.instances_matching("metric_a", &req),
-            vec![2],
-            "removed sid leaves the metric index"
-        );
-        idx.remove_instance(2);
-        assert!(
-            idx.instances_matching("metric_a", &req).is_empty(),
-            "last sid gone → metric key collapses, keyed lookup empty"
-        );
-    }
-
-    #[test]
-    fn metric_index_agrees_with_instances_after_mixed_churn() {
-        // Cross-check the P2-1 atomicity invariant statically: after a
-        // sequence of register/remove the metric index's union must equal
-        // the set of sids in `instances`.
-        let idx = SketchStore::new();
-        idx.register(meta_metric_keys(10, "m1", &["a"]));
-        idx.register(meta_metric_keys(11, "m1", &["a", "b"]));
-        idx.register(meta_metric_keys(12, "m2", &["a"]));
-        idx.remove_instance(10);
-        idx.register(meta_metric_keys(13, "m2", &["a"]));
-
-        let from_instances: BTreeSet<u64> = idx.instances.read().unwrap().keys().copied().collect();
-        let from_metric_idx: BTreeSet<u64> = idx
-            .metric_to_series_ids
-            .read()
-            .unwrap()
-            .values()
-            .flat_map(|s| s.iter().copied())
-            .collect();
-        assert_eq!(
-            from_instances, from_metric_idx,
-            "metric_to_series_ids union must equal the instances key set (P2-1 invariant)"
-        );
-        // And the cleared metric key must be gone, not lingering empty.
-        assert_eq!(
-            idx.instances_matching(
-                "m1",
-                &["a".to_string()].into_iter().collect::<BTreeSet<_>>()
-            ),
-            vec![11]
-        );
-    }
-
-    // ── Durable disk-backed tier (feat/sketch-durable-tier) ─────────────
-
-    use crate::storage_engines::sketch_db::index::persistence::EpochSource;
-    use crate::storage_engines::sketch_db::index::persistence::SketchStorePersistenceConfig;
-
-    /// Metadata with a single group-by key `host`, so the disk read-back
-    /// path can rebuild the `{host: <v>}` label map from the stored
-    /// values vector.
-    fn meta_with_host_key(sid: u64) -> SummarySeriesMetadata {
-        let mut m = meta(sid);
-        m.group_by_keys = ["host".to_string()].into_iter().collect();
-        m
-    }
-
-    fn lv_host(v: &str) -> BTreeMap<String, String> {
-        let mut m = BTreeMap::new();
-        m.insert("host".to_string(), v.to_string());
-        m
-    }
-
-    /// Aggressive persistence config: seal every window, force-flush
-    /// everything (hot_window=0), tiny flush interval, no disk TTL, small
-    /// part cache. Memory limit high so the seal/flush is driven by the
-    /// hot-window watermark, not memory pressure — keeps the test
-    /// deterministic.
-    fn durable_cfg(disk_path: std::path::PathBuf) -> SketchStorePersistenceConfig {
-        SketchStorePersistenceConfig {
-            memory_limit_bytes: 1 << 30,
-            memory_low_watermark_bytes: 1 << 29,
-            hard_cap_bytes: 1 << 31,
-            hot_window_ms: Some(0), // every sealed epoch is "old" → flush now
-            delete_older_than_ms: None,
-            flush_interval: std::time::Duration::from_millis(5),
-            disk_path,
-            part_cache_bytes: 1 << 20,
-            seal_window_count: 1, // seal on every distinct window
-        }
-    }
-
-    fn wait_until<F: Fn() -> bool>(f: F, timeout: std::time::Duration) -> bool {
-        // Scaled: these waits are on background flusher / sealer threads that
-        // compete with the test harness for cores. See
-        // `crate::tests::test_utilities::timing`.
-        let deadline = crate::tests::test_utilities::timing::deadline(timeout);
-        while std::time::Instant::now() < deadline {
-            if f() {
-                return true;
-            }
-            std::thread::sleep(std::time::Duration::from_millis(10));
-        }
-        f()
-    }
-
-    #[test]
-    fn sealing_fires_under_persistence() {
-        let tmp = tempfile::TempDir::new().unwrap();
-        let idx = Arc::new(SketchStore::new());
-        idx.register(meta_with_host_key(101));
-        let _p = idx
-            .start_persistence(durable_cfg(tmp.path().to_path_buf()))
-            .unwrap();
-
-        // seal_window_count = 1: each *new distinct window* seals the
-        // prior one. Append several distinct windows for one series.
-        for i in 0..5u64 {
-            let s = i * 30_000;
-            idx.append_sample(101, lv_host("a"), (s, s + 30_000), sample(i as u8));
-        }
-        // At least some sealed epochs must exist (each new window seals
-        // the prior current_epoch). The flusher may evict some before we
-        // look, so we assert that sealing happened OR a part landed.
-        let sealed_now = !idx.list_sealed_epochs().is_empty();
-        let flushed = wait_until(
-            || !_p.manifest.live_parts().is_empty(),
-            std::time::Duration::from_secs(3),
-        );
-        assert!(
-            sealed_now || flushed,
-            "no epochs sealed and nothing flushed — sealing did not fire under persistence"
-        );
-    }
-
-    #[test]
-    fn sealed_epochs_flush_to_disk_and_memory_drops() {
-        let tmp = tempfile::TempDir::new().unwrap();
-        let idx = Arc::new(SketchStore::new());
-        idx.register(meta_with_host_key(202));
-        let p = idx
-            .start_persistence(durable_cfg(tmp.path().to_path_buf()))
-            .unwrap();
-
-        for i in 0..10u64 {
-            let s = i * 30_000;
-            idx.append_sample(202, lv_host("a"), (s, s + 30_000), sample(i as u8));
-        }
-
-        // The flusher should drain sealed epochs to disk; memory
-        // (sealed-epoch bytes) drops to ~0 and parts appear.
-        let drained = wait_until(
-            || idx.approx_memory_bytes() == 0 && !p.manifest.live_parts().is_empty(),
-            std::time::Duration::from_secs(5),
-        );
-        assert!(
-            drained,
-            "flush+evict did not bound memory: sealed_bytes={}, parts={}",
-            idx.approx_memory_bytes(),
-            p.manifest.live_parts().len()
-        );
-    }
-
-    #[test]
-    fn query_resolves_from_disk_after_flush_evict() {
-        let tmp = tempfile::TempDir::new().unwrap();
-        let idx = Arc::new(SketchStore::new());
-        idx.register(meta_with_host_key(303));
-        let p = idx
-            .start_persistence(durable_cfg(tmp.path().to_path_buf()))
-            .unwrap();
-
-        // Append windows for series "a" across [0, 300_000).
-        for i in 0..10u64 {
-            let s = i * 30_000;
-            idx.append_sample(303, lv_host("a"), (s, s + 30_000), sample((i + 1) as u8));
-        }
-        // Wait for everything to flush+evict from memory.
-        assert!(
-            wait_until(
-                || idx.approx_memory_bytes() == 0 && idx.list_sealed_epochs_len() == 0,
-                std::time::Duration::from_secs(5)
-            ),
-            "data never fully evicted from memory"
-        );
-        // current_epoch may still hold the most-recent un-sealed window;
-        // query a range covering the EVICTED portion [0, 150_000).
-        let series = idx.query_range(303, 0, 150_000);
-        assert_eq!(series.len(), 1, "expected one series resolved from disk");
-        let s = &series[0];
-        assert_eq!(
-            s.series_label_values,
-            lv_host("a"),
-            "label map rebuilt from disk"
-        );
-        assert!(
-            !s.samples.is_empty(),
-            "query over evicted range returned no samples from disk"
-        );
-        // Window-end 30_000 (window (0,30_000)) must be present from disk.
-        assert!(
-            s.samples.contains_key(&30_000),
-            "disk window (0,30000) missing from query result: {:?}",
-            s.samples.keys().collect::<Vec<_>>()
-        );
-        drop(p);
-    }
-
-    #[test]
-    fn query_carry_in_full_base_lives_on_disk() {
-        let tmp = tempfile::TempDir::new().unwrap();
-        let idx = Arc::new(SketchStore::new());
-        idx.register(meta_with_host_key(404));
-        let p = idx
-            .start_persistence(durable_cfg(tmp.path().to_path_buf()))
-            .unwrap();
-
-        // A Full snapshot early (end=100_000), then delta windows later.
-        idx.append_sample(404, lv_host("a"), (70_000, 100_000), sample(1)); // Full base
-        for i in 0..6u64 {
-            let s = 100_000 + i * 30_000;
-            idx.append_sample(
-                404,
-                lv_host("a"),
-                (s, s + 30_000),
-                delta_sample((i + 2) as u8),
-            );
-        }
-        // Flush+evict everything to disk.
-        assert!(
-            wait_until(
-                || idx.approx_memory_bytes() == 0 && idx.list_sealed_epochs_len() == 0,
-                std::time::Duration::from_secs(5)
-            ),
-            "data never fully evicted"
-        );
-
-        // Query a window that contains ONLY deltas; the Full base lives on
-        // disk before the window. The carry-in must splice it in.
-        let series = idx.query_range(404, 200_000, 280_000);
-        assert_eq!(series.len(), 1);
-        let s = &series[0];
-        // A Full-encoded carry-in base (end < 200_000) must be present.
-        let has_full_base = s.samples.iter().any(|(w_end, frames)| {
-            *w_end < 200_000
-                && frames.iter().any(|smp| {
-                    matches!(
-                        smp.encoding,
-                        SketchEncoding::ProtoFull | SketchEncoding::MsgpackFull
-                    )
-                })
-        });
-        assert!(
-            has_full_base,
-            "delta-only window did not get a disk-resident Full carry-in base: {:?}",
-            s.samples
-                .iter()
-                .map(|(k, v)| (*k, v.iter().map(|s| s.encoding).collect::<Vec<_>>()))
-                .collect::<Vec<_>>()
-        );
-        drop(p);
-    }
-
-    #[test]
-    fn restart_recovery_makes_flushed_data_queryable() {
-        let tmp = tempfile::TempDir::new().unwrap();
-        let disk = tmp.path().to_path_buf();
-        {
-            let idx = Arc::new(SketchStore::new());
-            idx.register(meta_with_host_key(505));
-            let p = idx.start_persistence(durable_cfg(disk.clone())).unwrap();
-            for i in 0..8u64 {
-                let s = i * 30_000;
-                idx.append_sample(505, lv_host("a"), (s, s + 30_000), sample((i + 1) as u8));
-            }
-            assert!(
-                wait_until(
-                    || !p.manifest.live_parts().is_empty()
-                        && idx.list_sealed_epochs_len() == 0
-                        && idx.approx_memory_bytes() == 0,
-                    std::time::Duration::from_secs(5)
-                ),
-                "data never flushed before restart"
-            );
-            // Shutdown the flusher cleanly so the manifest is durable.
-            let mut p = p;
-            p.shutdown();
-        }
-
-        // "Restart": brand-new store + resolver on the SAME disk dir. The
-        // metadata is re-registered (the SeriesIdResolver WAL recovers
-        // sids in prod; here we re-register to model that), then
-        // persistence recovers the manifest+parts.
-        let idx2 = Arc::new(SketchStore::new());
-        idx2.register(meta_with_host_key(505));
-        let p2 = idx2.start_persistence(durable_cfg(disk.clone())).unwrap();
-        assert!(
-            !p2.manifest.live_parts().is_empty(),
-            "recovery did not reload any parts"
-        );
-
-        let series = idx2.query_range(505, 0, 120_000);
-        assert_eq!(series.len(), 1, "recovered data not queryable");
-        let s = &series[0];
-        assert_eq!(s.series_label_values, lv_host("a"));
-        assert!(
-            s.samples.contains_key(&30_000),
-            "recovered disk window missing after restart"
-        );
-        drop(p2);
-    }
-
-    #[test]
-    fn catalog_recovery_keeps_legacy_and_foreign_generation_state_unbound() {
-        use crate::storage_engines::sketch_db::index::persistence::metadata::{
-            StoredOutputMetadataFile, StoredOutputMetadataRecord,
-        };
-        let snapshot: control_plane::physical::compiler::BackendLocalPlanningInput =
-            serde_json::from_str(include_str!(
-                "../../../../../docs/examples/asapquery-compatibility-demo-snapshot.json"
-            ))
-            .unwrap();
-        let plan = crate::tests::test_utilities::planning::quoted_snapshot(snapshot, false)
-            .compile_promql()
-            .unwrap();
-        let state_config = plan
-            .precompute_plan
-            .materializations
-            .iter()
-            .find(|config| {
-                matches!(
-                    config.accumulator_spec().unwrap().family,
-                    planner_types::post_asap::SummaryFamilyType::Sketch(..)
-                )
-            })
-            .unwrap()
-            .clone();
-        let fingerprint = state_config.policy_fingerprint();
-        let metadata = meta_for_config(507, &state_config);
-        let record = StoredOutputMetadataRecord::new(
-            metadata.storage_handle,
-            metadata.metric_name.clone(),
-            metadata.group_by_keys.iter().cloned().collect(),
-            &metadata.agg_kind,
-            0,
-        );
-        let tmp = tempfile::tempdir().unwrap();
-        let sidecar = StoredOutputMetadataFile::new(tmp.path());
-        sidecar.upsert_all(&[record.clone()]).unwrap();
-        let store = SketchStore::new();
-        store
-            .install_summary_catalog(Arc::new(plan.summary_catalog.clone()))
-            .unwrap();
-        assert_eq!(store.register_recovered_disk_series(tmp.path()).unwrap(), 0);
-        assert!(store.instance(507).is_none());
-        let mut foreign = record;
-        foreign.stored_output_id = Some(fingerprint.into());
-        let reference = plan.summary_catalog.reference().unwrap();
-        foreign.catalog_generation = Some(Arc::new(CatalogGeneration {
-            schema_version: reference.schema_version,
-            plan_id: reference.plan_id,
-            plan_version: reference.plan_version + 1,
-            snapshot_sha256: reference.snapshot_sha256,
-        }));
-        sidecar.upsert_all(&[foreign]).unwrap();
-        assert_eq!(store.register_recovered_disk_series(tmp.path()).unwrap(), 0);
-        assert!(store.series_ids_for_policy(fingerprint).is_empty());
-    }
-
-    #[test]
-    fn new_generation_requires_fresh_state_for_unchanged_definition() {
-        let snapshot: control_plane::physical::compiler::BackendLocalPlanningInput =
-            serde_json::from_str(include_str!(
-                "../../../../../docs/examples/asapquery-compatibility-demo-snapshot.json"
-            ))
-            .unwrap();
-        let plan = crate::tests::test_utilities::planning::quoted_snapshot(snapshot, false)
-            .compile_promql()
-            .unwrap();
-        let state_config = plan
-            .precompute_plan
-            .materializations
-            .iter()
-            .find(|config| {
-                matches!(
-                    config.accumulator_spec().unwrap().family,
-                    planner_types::post_asap::SummaryFamilyType::Sketch(..)
-                )
-            })
-            .unwrap()
-            .clone();
-        let fingerprint = state_config.policy_fingerprint();
-        let store = SketchStore::new();
-        store
-            .install_summary_catalog(Arc::new(plan.summary_catalog.clone()))
-            .unwrap();
-        store.register(meta_for_config(509, &state_config));
-        store.append_sample(509, BTreeMap::new(), (0, 10_000), sample(1));
-        let mut next = plan.summary_catalog;
-        next.plan_version += 1;
-        store.install_summary_catalog(Arc::new(next)).unwrap();
-        assert!(
-            store.series_ids_for_policy(fingerprint).is_empty(),
-            "new version must start cold"
-        );
-        assert!(
-            store
-                .authorize_series_reactivation(509, fingerprint.into())
-                .unwrap()
-                .is_some(),
-            "live version change must allocate a fresh physical series"
-        );
-        let output =
-            asap_types::sds::StoredOutputReference::for_output(fingerprint.into()).stored_output_id;
-        let inventory = store
-            .observed_summary_inventory(
-                "backend-a",
-                "store-a",
-                &BTreeMap::from([(
-                    StoredOutputId::from(fingerprint),
-                    (output, "producer-a".into()),
-                )]),
-                1,
-                100,
-            )
-            .unwrap();
-        assert!(inventory.instances.is_empty());
-        store.register(meta_for_config(510, &state_config));
-        store.append_sample(510, BTreeMap::new(), (0, 10_000), sample(2));
-        assert_eq!(store.series_ids_for_policy(fingerprint), vec![510]);
-        let incompatible = asap_types::summary_catalog::SummaryCatalog::from_materializations(
-            plan.precompute_plan.envelope.plan_id,
-            plan.precompute_plan.envelope.plan_version + 2,
-            &[],
-        )
-        .unwrap();
-        store
-            .install_summary_catalog(Arc::new(incompatible))
-            .unwrap();
-        assert!(store.series_ids_for_policy(fingerprint).is_empty());
-    }
-
-    #[test]
-    fn catalog_reactivation_uses_new_physical_series_without_old_disk_payload() {
-        use crate::drivers::ingest::series_resolver::SeriesIdResolver;
-        let snapshot: control_plane::physical::compiler::BackendLocalPlanningInput =
-            serde_json::from_str(include_str!(
-                "../../../../../docs/examples/asapquery-compatibility-demo-snapshot.json"
-            ))
-            .unwrap();
-        let plan = crate::tests::test_utilities::planning::quoted_snapshot(snapshot, false)
-            .compile_promql()
-            .unwrap();
-        let state_config = plan
-            .precompute_plan
-            .materializations
-            .iter()
-            .find(|config| {
-                matches!(
-                    config.accumulator_spec().unwrap().family,
-                    planner_types::post_asap::SummaryFamilyType::Sketch(..)
-                )
-            })
-            .unwrap()
-            .clone();
-        let fingerprint = state_config.policy_fingerprint();
-        let definition = fingerprint.into();
-        let mut next_catalog = plan.summary_catalog.clone();
-        next_catalog.plan_version += 1;
-        let directory = tempfile::tempdir().unwrap();
-        let disk = directory.path().join("state");
-        let wal = directory.path().join("resolver.wal");
-        let old_sid;
-        let new_sid;
-        {
-            let resolver = SeriesIdResolver::open(wal.clone()).unwrap();
-            let store = Arc::new(SketchStore::new());
-            store
-                .install_summary_catalog(Arc::new(plan.summary_catalog))
-                .unwrap();
-            let mut persistence = store.start_persistence(durable_cfg(disk.clone())).unwrap();
-            old_sid = resolver.resolve("metric", "group", "family");
-            store.register(meta_for_config(old_sid, &state_config));
-            for pane in 0..4 {
-                store.append_sample(
-                    old_sid,
-                    BTreeMap::new(),
-                    (pane * 30_000, (pane + 1) * 30_000),
-                    sample(1),
-                );
-            }
-            assert!(wait_until(
-                || !persistence.manifest.live_parts().is_empty(),
-                Duration::from_secs(5)
-            ));
-            store.remove_instance(old_sid).unwrap();
-            assert!(resolver
-                .resolve_with_reactivation("metric", "group", "family", |sid| store
-                    .authorize_series_reactivation(sid, definition))
-                .is_err());
-            store
-                .install_summary_catalog(Arc::new(next_catalog.clone()))
-                .unwrap();
-            new_sid = resolver
-                .resolve_with_reactivation("metric", "group", "family", |sid| {
-                    store.authorize_series_reactivation(sid, definition)
-                })
-                .unwrap();
-            assert_ne!(new_sid, old_sid);
-            store.register(meta_for_config(new_sid, &state_config));
-            for pane in 0..4 {
-                store.append_sample(
-                    new_sid,
-                    BTreeMap::new(),
-                    (pane * 30_000, (pane + 1) * 30_000),
-                    sample(2),
-                );
-            }
-            assert!(wait_until(
-                || {
-                    // Old-series epochs may still publish after reactivation. Wait
-                    // for this series, not an unrelated increase in part count.
-                    persistence.manifest.live_parts().iter().any(|part| {
-                        let path =
-                            persistence::part::part_dir_path(&persistence.parts_root, part.part_id);
-                        persistence::part::PartReader::open(&path).is_ok_and(|reader| {
-                            reader
-                                .index_records()
-                                .iter()
-                                .any(|row| row.agg_id == new_sid && row.start_ts < 90_000)
-                        })
-                    })
-                },
-                Duration::from_secs(5)
-            ));
-            persistence.shutdown();
-        }
-        let resolver = SeriesIdResolver::open(wal).unwrap();
-        assert_eq!(resolver.resolve("metric", "group", "family"), new_sid);
-        let recovered = Arc::new(SketchStore::new());
-        recovered
-            .install_summary_catalog(Arc::new(next_catalog))
-            .unwrap();
-        let _persistence = recovered.start_persistence(durable_cfg(disk)).unwrap();
-        assert!(recovered.query_range(old_sid, 0, 90_000).is_empty());
-        let rows = recovered.query_range(new_sid, 0, 90_000);
-        assert!(!rows.is_empty());
-        assert!(rows
-            .iter()
-            .flat_map(|row| row.samples.values())
-            .flatten()
-            .all(|sample| sample.bytes == vec![2]));
-    }
-
-    #[test]
-    fn force_expire_never_extends_existing_lifecycle_deadlines() {
-        let store = SketchStore::new();
-        let mut metadata = meta(799);
-        metadata.retired_at_ms = Some(1);
-        metadata.expires_at_ms = Some(2);
-        store.register(metadata);
-        let expired = store.force_expire(799).unwrap();
-        assert_eq!(expired.retired_at_ms, Some(1));
-        assert_eq!(expired.expires_at_ms, Some(2));
-    }
-
-    #[test]
-    fn completed_windows_reject_late_updates_after_restart() {
-        // Completion is a storage admission rule, including legacy producers,
-        // and survives restart without allowing a correction into consumed state.
-        let snapshot: control_plane::physical::compiler::BackendLocalPlanningInput =
-            serde_json::from_str(include_str!(
-                "../../../../../docs/examples/asapquery-compatibility-demo-snapshot.json"
-            ))
-            .unwrap();
-        let plan = crate::tests::test_utilities::planning::quoted_snapshot(snapshot, false)
-            .compile_promql()
-            .unwrap();
-        let state_config = plan
-            .precompute_plan
-            .materializations
-            .iter()
-            .find(|config| {
-                matches!(
-                    config.accumulator_spec().unwrap().family,
-                    planner_types::post_asap::SummaryFamilyType::Sketch(..)
-                )
-            })
-            .unwrap()
-            .clone();
-        let fingerprint = state_config.policy_fingerprint();
-        let directory = tempfile::tempdir().unwrap();
-        let store = SketchStore::new();
-        store
-            .install_summary_catalog(Arc::new(plan.summary_catalog.clone()))
-            .unwrap();
-        store.register(meta_for_config(850, &state_config));
-        let generation = store.active_catalog_generation().unwrap();
-        let writer = Arc::new(persistence::metadata::StoredOutputMetadataFile::new(
-            directory.path(),
-        ));
-        *store.persistence_metadata.write().unwrap() = Some(writer.clone());
-        let coordinate = asap_types::sds::SummaryInstanceCoordinates {
-            stored_output_id: fingerprint.into(),
-            time_range: HalfOpenTimeRange {
-                start_ms: 0,
-                end_ms: 30_000,
-            },
-            group_values: BTreeMap::new(),
-        };
-        let revision = store
-            .admit_summary_updates(&generation, [coordinate.clone()].into())
-            .unwrap();
-        assert!(store.seal_finite_summary_input(&generation).is_err());
-        store
-            .publish_admitted_summary_update(
-                &generation,
-                &coordinate,
-                revision,
-                revision,
-                120_000,
-                |writer| {
-                    writer
-                        .append_sample(850, BTreeMap::new(), (0, 30_000), sample(1))
-                        .then_some(850)
-                },
-            )
-            .unwrap();
-        let stale_record = store
-            .metadata_record(&store.instances.read().unwrap()[&850])
-            .unwrap();
-        let before_failed_seal = store.summary_update_revision();
-        std::fs::create_dir(writer.path()).unwrap();
-        assert!(store.seal_finite_summary_input(&generation).is_err());
-        assert!(store.summary_update_revision().matches(before_failed_seal));
-        assert!(!store.completed_windows.read().unwrap().contains_key(&850));
-        std::fs::remove_dir(writer.path()).unwrap();
-        store.seal_finite_summary_input(&generation).unwrap();
-        let producers = BTreeMap::from([(
-            fingerprint.into(),
-            (
-                asap_types::sds::StoredOutputReference::for_output(fingerprint.into())
-                    .stored_output_id,
-                "producer".to_string(),
-            ),
-        )]);
-        let inventory = store
-            .observed_summary_inventory("backend", "store", &producers, 1, 30_000)
-            .unwrap();
-        assert_eq!(inventory.instances.len(), 1);
-        assert_eq!(
-            inventory.instances.values().next().unwrap().completeness,
-            InstanceCompleteness::Complete
-        );
-        assert!(!store.append_sample(850, BTreeMap::new(), (0, 30_000), sample(2)));
-        assert!(!store.append_precompute(
-            850,
-            BTreeMap::new(),
-            (0, 30_000),
-            Box::new(asap_physical_operators::summary_kernels::SumAccumulator::new())
-        ));
-        // A flusher that captured metadata before completion cannot reopen it.
-        writer.upsert_all(&[stale_record]).unwrap();
-        assert_eq!(writer.load().unwrap()[0].completed_through_ms, Some(30_000));
-        let restored = SketchStore::new();
-        restored
-            .install_summary_catalog(Arc::new(plan.summary_catalog))
-            .unwrap();
-        restored
-            .register_recovered_disk_series(directory.path())
-            .unwrap();
-        assert!(!restored.append_sample(850, BTreeMap::new(), (0, 30_000), sample(3)));
-        assert!(restored.append_sample(850, BTreeMap::new(), (30_000, 60_000), sample(4)));
-    }
-
-    #[test]
-    fn finite_completion_flushes_payload_before_persisting_immutability() {
-        // With neither memory pressure nor a hot-tier deadline, completion must
-        // explicitly flush its payload before persisting a non-replayable window.
-        let snapshot: control_plane::physical::compiler::BackendLocalPlanningInput =
-            serde_json::from_str(include_str!(
-                "../../../../../docs/examples/asapquery-compatibility-demo-snapshot.json"
-            ))
-            .unwrap();
-        let plan = crate::tests::test_utilities::planning::quoted_snapshot(snapshot, false)
-            .compile_promql()
-            .unwrap();
-        let state_config = plan
-            .precompute_plan
-            .materializations
-            .iter()
-            .find(|config| {
-                matches!(
-                    config.accumulator_spec().unwrap().family,
-                    planner_types::post_asap::SummaryFamilyType::Sketch(..)
-                )
-            })
-            .unwrap()
-            .clone();
-        let fingerprint = state_config.policy_fingerprint();
-        let directory = tempfile::tempdir().unwrap();
-        {
-            let store = Arc::new(SketchStore::new());
-            store
-                .install_summary_catalog(Arc::new(plan.summary_catalog.clone()))
-                .unwrap();
-            store.register(meta_for_config(851, &state_config));
-            let mut config = durable_cfg(directory.path().to_path_buf());
-            config.hot_window_ms = None;
-            config.seal_window_count = 100;
-            let mut persistence = store.start_persistence(config).unwrap();
-            let generation = store.active_catalog_generation().unwrap();
-            let coordinate = asap_types::sds::SummaryInstanceCoordinates {
-                stored_output_id: fingerprint.into(),
-                time_range: HalfOpenTimeRange {
-                    start_ms: 0,
-                    end_ms: 30_000,
-                },
-                group_values: BTreeMap::new(),
-            };
-            let revision = store
-                .admit_summary_updates(&generation, [coordinate.clone()].into())
-                .unwrap();
-            store
-                .publish_admitted_summary_update(
-                    &generation,
-                    &coordinate,
-                    revision,
-                    revision,
-                    120_000,
-                    |writer| {
-                        writer
-                            .append_sample(851, BTreeMap::new(), (0, 30_000), sample(1))
-                            .then_some(851)
-                    },
-                )
-                .unwrap();
-            assert!(!store.seal_finite_summary_input(&generation).unwrap());
-            assert!(!store.completed_windows.read().unwrap().contains_key(&851));
-            let checkpoint = directory.path().join("finite_input_generation.json");
-            std::fs::create_dir(&checkpoint).unwrap();
-            assert!(wait_until(
-                || store.seal_finite_summary_input(&generation).is_err(),
-                Duration::from_secs(5)
-            ));
-            assert!(store.admission.read().unwrap().is_finite_closed());
-            assert!(!store.admission.read().unwrap().is_finite_complete());
-            assert!(!store.append_sample(851, BTreeMap::new(), (30_000, 60_000), sample(2)));
-            std::fs::remove_dir(&checkpoint).unwrap();
-            assert!(store.seal_finite_summary_input(&generation).unwrap());
-            assert!(!persistence.manifest.live_parts().is_empty());
-            persistence.shutdown();
-        }
-        let restored = Arc::new(SketchStore::new());
-        restored
-            .install_summary_catalog(Arc::new(plan.summary_catalog))
-            .unwrap();
-        let _persistence = restored
-            .start_persistence(durable_cfg(directory.path().to_path_buf()))
-            .unwrap();
-        assert!(!restored.append_sample(851, BTreeMap::new(), (0, 30_000), sample(2)));
-        // Finite closure also rejects a new future window and a newly arriving
-        // physical series after restart; per-window frontiers alone cannot.
-        assert!(!restored.append_sample(851, BTreeMap::new(), (30_000, 60_000), sample(2)));
-        restored.register(meta(852));
-        assert!(!restored.append_sample(852, BTreeMap::new(), (30_000, 60_000), sample(2)));
-        assert!(restored
-            .publish_unadmitted_summary_update(|_| panic!("closed callback ran"))
-            .is_none());
-        let rows = restored.query_range(851, 0, 30_000);
-        assert_eq!(rows.len(), 1);
-        let payloads: Vec<_> = rows
-            .iter()
-            .flat_map(|row| row.samples.values())
-            .flatten()
-            .collect();
-        assert_eq!(payloads.len(), 1);
-        assert_eq!(payloads[0].bytes, vec![1]);
-    }
-
-    #[test]
-    fn failed_durable_lifecycle_write_preserves_live_instance() {
-        let store = SketchStore::new();
-        store.register(meta(800));
-        let directory = tempfile::tempdir().unwrap();
-        let writer = Arc::new(persistence::metadata::StoredOutputMetadataFile::new(
-            directory.path(),
-        ));
-        // A directory in place of the sidecar causes the real writer to fail.
-        std::fs::create_dir(writer.path()).unwrap();
-        *store.persistence_metadata.write().unwrap() = Some(writer);
-        assert!(store.force_retire(800, Duration::from_secs(60)).is_none());
-        assert!(store.force_expire(800).is_none());
-        assert!(store.remove_instance(800).is_none());
-        let instance = store.instance(800).unwrap();
-        assert!(instance.retired_at_ms.is_none());
-        assert!(instance.expires_at_ms.is_none());
-    }
-
-    #[test]
-    fn durable_lifecycle_is_not_resurrected_by_restart_or_a_stale_flush() {
-        let snapshot: control_plane::physical::compiler::BackendLocalPlanningInput =
-            serde_json::from_str(include_str!(
-                "../../../../../docs/examples/asapquery-compatibility-demo-snapshot.json"
-            ))
-            .unwrap();
-        let plan = crate::tests::test_utilities::planning::quoted_snapshot(snapshot, false)
-            .compile_promql()
-            .unwrap();
-        let state_config = plan
-            .precompute_plan
-            .materializations
-            .iter()
-            .find(|config| {
-                matches!(
-                    config.accumulator_spec().unwrap().family,
-                    planner_types::post_asap::SummaryFamilyType::Sketch(..)
-                )
-            })
-            .unwrap()
-            .clone();
-        let fingerprint = state_config.policy_fingerprint();
-        let directory = tempfile::tempdir().unwrap();
-        let disk = directory.path().to_path_buf();
-        let expected_retirement;
-        {
-            let store = Arc::new(SketchStore::new());
-            store
-                .install_summary_catalog(Arc::new(plan.summary_catalog.clone()))
-                .unwrap();
-            for sid in [801, 802, 803] {
-                store.register(meta_for_config(sid, &state_config));
-            }
-            let mut persistence = store.start_persistence(durable_cfg(disk.clone())).unwrap();
-            for sid in [801, 802, 803] {
-                for pane in 0..4 {
-                    store.append_sample(
-                        sid,
-                        BTreeMap::new(),
-                        (pane * 30_000, (pane + 1) * 30_000),
-                        sample(1),
-                    );
-                }
-            }
-            assert!(wait_until(
-                || !persistence.manifest.live_parts().is_empty(),
-                Duration::from_secs(5)
-            ));
-            let stale: Vec<_> = {
-                let instances = store.instances.read().unwrap();
-                [801, 802, 803]
-                    .iter()
-                    .map(|sid| store.metadata_record(&instances[sid]).unwrap())
-                    .collect()
-            };
-            expected_retirement = store.force_retire(801, Duration::from_secs(3600)).unwrap();
-            assert!(store.force_expire(802).is_some());
-            assert!(store.remove_instance(803).is_some());
-            store.register(meta_for_config(803, &state_config));
-            assert!(
-                store.instance(803).is_none(),
-                "removed SID reused before restart"
-            );
-            // This models a flush that captured metadata before the lifecycle
-            // operation and reaches the shared writer afterward.
-            persistence
-                .flusher
-                .metadata_store()
-                .upsert_all(&stale)
-                .unwrap();
-            persistence.shutdown();
-        }
-        let recovered = Arc::new(SketchStore::new());
-        recovered
-            .install_summary_catalog(Arc::new(plan.summary_catalog))
-            .unwrap();
-        let _persistence = recovered.start_persistence(durable_cfg(disk)).unwrap();
-        let retired = recovered.instance(801).unwrap();
-        assert_eq!(retired.retired_at_ms, expected_retirement.retired_at_ms);
-        assert_eq!(retired.expires_at_ms, expected_retirement.expires_at_ms);
-        assert!(
-            recovered.instance(802).is_none(),
-            "expired state resurrected"
-        );
-        assert!(
-            recovered.instance(803).is_none(),
-            "removed state resurrected"
-        );
-        recovered.register(meta_for_config(803, &state_config));
-        assert!(
-            recovered.instance(803).is_none(),
-            "removed SID reused after restart"
-        );
-    }
-
-    #[test]
-    fn observed_inventory_includes_durable_instances_after_restart() {
-        let snapshot: control_plane::physical::compiler::BackendLocalPlanningInput =
-            serde_json::from_str(include_str!(
-                "../../../../../docs/examples/asapquery-compatibility-demo-snapshot.json"
-            ))
-            .unwrap();
-        let plan = crate::tests::test_utilities::planning::quoted_snapshot(snapshot, false)
-            .compile_promql()
-            .unwrap();
-        let state_config = plan
-            .precompute_plan
-            .materializations
-            .iter()
-            .find(|config| {
-                matches!(
-                    config.accumulator_spec().unwrap().family,
-                    planner_types::post_asap::SummaryFamilyType::Sketch(..)
-                )
-            })
-            .unwrap()
-            .clone();
-        let fingerprint = state_config.policy_fingerprint();
-        let definition_id = StoredOutputId::from(fingerprint);
-        let producers = BTreeMap::from([(
-            definition_id,
-            (
-                asap_types::sds::StoredOutputReference::for_output(definition_id).stored_output_id,
-                "producer-a".to_string(),
-            ),
-        )]);
-        let tmp = tempfile::TempDir::new().unwrap();
-        let disk = tmp.path().to_path_buf();
-        let mut metadata = meta_for_config(506, &state_config);
-        metadata.group_by_keys = ["job".to_string()].into_iter().collect();
-
-        {
-            let store = Arc::new(SketchStore::new());
-            store
-                .install_summary_catalog(Arc::new(plan.summary_catalog.clone()))
-                .unwrap();
-            store.register(metadata.clone());
-            let mut persistence = store.start_persistence(durable_cfg(disk.clone())).unwrap();
-            for index in 0..4u64 {
-                let start = index * 30_000;
-                store.append_sample(
-                    506,
-                    BTreeMap::from([("job".to_string(), "api".to_string())]),
-                    (start, start + 30_000),
-                    sample((index + 1) as u8),
-                );
-            }
-            assert!(wait_until(
-                || !persistence.manifest.live_parts().is_empty(),
-                std::time::Duration::from_secs(5)
-            ));
-            persistence.shutdown();
-        }
-
-        let recovered = Arc::new(SketchStore::new());
-        recovered
-            .install_summary_catalog(Arc::new(plan.summary_catalog))
-            .unwrap();
-        let persistence = recovered.start_persistence(durable_cfg(disk)).unwrap();
-        assert!(!persistence.manifest.live_parts().is_empty());
-        assert_eq!(recovered.series_ids_for_policy(fingerprint), vec![506]);
-        assert!(!recovered.query_range(506, 0, 120_000).is_empty());
-        let inventory = recovered
-            .observed_summary_inventory("backend-a", "store-a", &producers, 1, 100)
-            .unwrap();
-        assert!(!inventory.instances.is_empty());
-        assert!(inventory.instances.values().all(|instance| {
-            instance.group_values.get("job").map(String::as_str) == Some("api")
-                && serde_json::from_str::<asap_types::sds::StoredSummaryKey>(
-                    &instance.state_reference.key,
-                )
-                .is_ok_and(|key| {
-                    key.stored_output_id.fingerprint() == fingerprint
-                        && key.population == instance.group_values
-                        && key.window == instance.time_range
-                })
-        }));
-    }
-
-    // ── query-from-recovered-disk (fix/query-from-recovered-disk) ───────
-    //
-    // The #330 tests `restart_recovery_makes_flushed_data_queryable` and
-    // `live_aged_unsealed_panes_flush_and_survive_restart` both call
-    // `idx2.register(...)` on the FRESH store BEFORE querying (they even
-    // comment "here we re-register to model that"). That masks the real
-    // restart bug: in production NOBODY calls `SketchStore::register` on
-    // restart — registration only happens on the LIVE INGEST path when a
-    // fresh DataPoint arrives. The SeriesIdResolver WAL recovers
-    // `(metric, attrs_fp, agg_kind) → sid` but does NOT push identities
-    // into the SketchStore's `instances` registry. So after a true restart
-    // the `instances` map is EMPTY for the recovered metrics:
-    //   * `instances_matching(metric, gbk)` enumerates nothing → the engine
-    //     returns "No result" before reading any window, and
-    //   * even if a sid were enumerated, `query_range`'s `union_disk_parts_into`
-    //     early-returns on the missing `sid_group_by_keys(sid)`.
-    // → the cluster-wide "No result" + collapsed-SketchStore symptom.
-    //
-    // These two tests do a GENUINE fresh reopen (no `register`) for BOTH
-    // the sketch (KLL quantile) and exact-agg (Sum) shapes. On origin/main
-    // they FAIL ("No result"); with the metadata-sidecar fix they pass
-    // because recovery re-registers the disk-resident sids.
-
-    fn meta_kll_host(sid: u64) -> SummarySeriesMetadata {
-        let cfg = SketchConfig::Kll { k: 200 };
-        SummarySeriesMetadata {
-            storage_handle: sid,
-            metric_name: "http_latency".into(),
-            group_by_keys: ["host".to_string()].into_iter().collect(),
-            capability: Some(Capability::QuantileApprox(Some(SketchAlgorithm::Kll))),
-            agg_kind: AggKind::Sketch {
-                algorithm: SketchAlgorithm::Kll,
-                config: cfg.clone(),
-                spatial_filter_canonical: String::new(),
-            },
-            accuracy: Some(AccuracyBound::from_config(&cfg)),
-            first_seen_unix_ms: 0,
-            retired_at_ms: None,
-            expires_at_ms: None,
-            policy_fp: asap_types::PolicyFingerprint::UNSET,
-        }
-    }
-
-    #[test]
-    fn recovered_sketch_series_queryable_after_fresh_reopen_without_register() {
-        let tmp = tempfile::TempDir::new().unwrap();
-        let disk = tmp.path().to_path_buf();
-        // ---- session 1: ingest → seal → flush → EVICT (disk-only) ----
-        {
-            let idx = Arc::new(SketchStore::new());
-            idx.register(meta_kll_host(7100));
-            let p = idx.start_persistence(durable_cfg(disk.clone())).unwrap();
-            for i in 0..10u64 {
-                let s = i * 30_000;
-                idx.append_sample(7100, lv_host("a"), (s, s + 30_000), sample((i + 1) as u8));
-            }
-            assert!(
-                wait_until(
-                    || !p.manifest.live_parts().is_empty()
-                        && idx.approx_memory_bytes() == 0
-                        && idx.list_sealed_epochs_len() == 0,
-                    std::time::Duration::from_secs(5),
-                ),
-                "data never flushed+evicted before restart"
-            );
-            let mut p = p;
-            p.shutdown();
-        }
-
-        // ---- session 2: TRUE fresh reopen — NO register() ----
-        let idx2 = Arc::new(SketchStore::new());
-        // Sanity: before recovery the registry is empty (mirrors prod).
-        assert_eq!(idx2.instance_count(), 0, "precondition: empty registry");
-        let p2 = idx2.start_persistence(durable_cfg(disk.clone())).unwrap();
-        assert!(
-            !p2.manifest.live_parts().is_empty(),
-            "recovery did not reload any parts"
-        );
-
-        // (a) instances_matching must find the recovered series WITHOUT a
-        //     re-register. On origin/main this is empty → "No result".
-        let gbk = ["host".to_string()].into_iter().collect();
-        let sids = idx2.instances_matching("http_latency", &gbk);
-        assert_eq!(
-            sids,
-            vec![7100],
-            "instances_matching blind to disk-only series after fresh reopen \
-             (registry={})",
-            idx2.instance_count(),
-        );
-        // The recovered sid's metadata must be query-routable.
-        let meta = idx2.instance(7100).expect("recovered sid metadata present");
-        assert_eq!(meta.metric_name, "http_latency");
-        assert!(matches!(
-            meta.capability,
-            Some(Capability::QuantileApprox(Some(SketchAlgorithm::Kll)))
-        ));
-
-        // (b) a range query over the EVICTED window returns the data.
-        let series = idx2.query_range(7100, 0, 150_000);
-        assert_eq!(series.len(), 1, "recovered KLL series not queryable");
-        let s = &series[0];
-        assert_eq!(
-            s.series_label_values,
-            lv_host("a"),
-            "label map rebuilt from recovered group_by_keys + disk values"
-        );
-        assert!(
-            s.samples.contains_key(&30_000),
-            "recovered disk window (0,30000) missing: {:?}",
-            s.samples.keys().collect::<Vec<_>>()
-        );
-        drop(p2);
-    }
-
-    #[test]
-    fn recovered_exact_agg_series_queryable_after_fresh_reopen_without_register() {
-        use crate::storage_engines::types::AggregationType;
-        let tmp = tempfile::TempDir::new().unwrap();
-        let disk = tmp.path().to_path_buf();
-
-        let lv_zone = |v: &str| {
-            let mut x = BTreeMap::new();
-            x.insert("zone".to_string(), v.to_string());
-            x
-        };
-
-        // ---- session 1: ExactAgg(Sum) by (zone), flush+evict ----
-        {
-            let idx = Arc::new(SketchStore::new());
-            let mut m = meta(8100);
-            m.metric_name = "http_requests_total".into();
-            m.group_by_keys = ["zone".to_string()].into_iter().collect();
-            m.capability = Some(Capability::ExactAgg(AggregationType::Sum));
-            m.agg_kind = AggKind::ExactAgg {
-                agg_type: AggregationType::Sum,
-                parameters_canonical: String::new(),
-                spatial_filter_canonical: String::new(),
-            };
-            m.accuracy = None;
-            idx.register(m);
-            let p = idx.start_persistence(durable_cfg(disk.clone())).unwrap();
-            for i in 0..10u64 {
-                let s = i * 30_000;
-                idx.append_precompute(
-                    8100,
-                    lv_zone("z0"),
-                    (s, s + 30_000),
-                    Box::new(
-                        asap_physical_operators::summary_kernels::SumAccumulator::with_sum(
-                            (i + 1) as f64,
-                        ),
-                    ),
-                );
-            }
-            assert!(
-                wait_until(
-                    || !p.manifest.live_parts().is_empty()
-                        && idx.approx_memory_bytes() == 0
-                        && idx.list_sealed_epochs_len() == 0,
-                    std::time::Duration::from_secs(5),
-                ),
-                "exact-agg windows never flushed+evicted"
-            );
-            let mut p = p;
-            p.shutdown();
-        }
-
-        // ---- session 2: TRUE fresh reopen — NO register() ----
-        let idx2 = Arc::new(SketchStore::new());
-        assert_eq!(idx2.instance_count(), 0, "precondition: empty registry");
-        let p2 = idx2.start_persistence(durable_cfg(disk.clone())).unwrap();
-
-        // instances_matching must surface the exact-agg sid.
-        let gbk = ["zone".to_string()].into_iter().collect();
-        assert_eq!(
-            idx2.instances_matching("http_requests_total", &gbk),
-            vec![8100],
-            "exact-agg sid blind to instances_matching after fresh reopen"
-        );
-        let meta = idx2.instance(8100).expect("recovered exact-agg metadata");
-        assert!(matches!(
-            meta.agg_kind,
-            AggKind::ExactAgg {
-                agg_type: AggregationType::Sum,
-                ..
-            }
-        ));
-
-        // The Sum exact-agg range query must resolve from disk.
-        let series = idx2.query_exact_agg_range(8100, 0, 150_000);
-        assert!(
-            !series.is_empty(),
-            "recovered exact-agg query returned No result after fresh reopen"
-        );
-        let (label, samples) = &series[0];
-        assert_eq!(label.get("zone").map(String::as_str), Some("z0"));
-        assert!(
-            samples.contains_key(&30_000),
-            "recovered exact-agg window (0,30000) missing from disk read-back"
-        );
-        // Rate divisor helper must also see the recovered disk windows.
-        assert!(
-            idx2.exact_agg_coverage_bounds(8100, 0, 150_000).is_some(),
-            "exact_agg_coverage_bounds blind to recovered disk after fresh reopen"
-        );
-        drop(p2);
-    }
-
-    #[test]
-    fn persistence_disabled_keeps_327_retention_behavior() {
-        // Non-regression: with persistence OFF, query_range reads
-        // in-memory only and #327 retention still bounds memory. The
-        // #323–#326 overlap + carry-in shapes still pass (covered by the
-        // dedicated tests above); here we confirm the disk union is a
-        // no-op when no read handle is installed.
-        let idx = SketchStore::new();
-        idx.register(meta_with_host_key(606));
-        idx.append_sample(606, lv_host("a"), (0, 10), sample(1));
-        idx.append_sample(606, lv_host("a"), (10, 20), sample(2));
-        let series = idx.query_range(606, 0, 20);
-        assert_eq!(series.len(), 1);
-        assert_eq!(series[0].samples.len(), 2);
-        // No persistence handle → seal cadence disabled → no sealing.
-        assert!(idx.persistence_read.read().unwrap().is_none());
-    }
-
-    // ── LIVE-scenario regression tests (fix/sketch-durable-live) ────────
-    //
-    // The unit tests above use `hot_window_ms: Some(0)` + epoch-1970
-    // timestamps, which force-flush everything immediately. The LIVE run
-    // (`--persistence-seal-window-count=4 --persistence-hot-window-secs=120`)
-    // ingests panes stamped at WALL-CLOCK ms and uses a 120s hot window,
-    // and exposed three bugs these helpers must reproduce.
-
-    fn now_ms_wall() -> u64 {
-        std::time::SystemTime::now()
-            .duration_since(std::time::UNIX_EPOCH)
-            .unwrap()
-            .as_millis() as u64
-    }
-
-    /// Mirror of the live config: seal every 4 windows, 120s hot window,
-    /// memory limit high (so the flush is driven by the hot-window
-    /// watermark, exactly as in the live run that produced empty parts/).
-    fn live_cfg(disk_path: std::path::PathBuf) -> SketchStorePersistenceConfig {
-        SketchStorePersistenceConfig {
-            memory_limit_bytes: 2048 * 1024 * 1024,
-            memory_low_watermark_bytes: 2048 * 1024 * 1024 * 8 / 10,
-            hard_cap_bytes: 2048 * 1024 * 1024 * 125 / 100,
-            hot_window_ms: Some(120_000), // live: --persistence-hot-window-secs=120
-            delete_older_than_ms: None,
-            flush_interval: std::time::Duration::from_millis(20),
-            disk_path,
-            part_cache_bytes: 1 << 20,
-            seal_window_count: 4, // live: --persistence-seal-window-count=4
-        }
-    }
-
-    /// BUG #1 + #3 (most severe): in the LIVE run the freshest windows of
-    /// every series sit UN-SEALED in `current_epoch` — sealing only fires
-    /// once `current_epoch` reaches the cadence (4 distinct windows). The
-    /// flusher's hot-window phase ONLY ever considers SEALED epochs, so
-    /// any window that ages past the 120s hot window while still in
-    /// `current_epoch` (because the series stopped/slowed before hitting
-    /// cadence) is NEVER flushed. That is exactly what produced the empty
-    /// `parts/` + 0-byte manifest log on node2 after 13 min of ingest:
-    /// data flowed (the resolver WAL grew) but nothing was ever made
-    /// durable, so a `docker restart` recovered `live=0` and the post-
-    /// restart query returned "No result".
-    ///
-    /// This test ingests aged panes that DON'T reach cadence-4, so they
-    /// stay un-sealed, then asserts the flusher still makes them durable
-    /// and they survive a restart. On origin/main nothing flushes.
-    #[test]
-    fn live_aged_unsealed_panes_flush_and_survive_restart() {
-        let tmp = tempfile::TempDir::new().unwrap();
-        let disk = tmp.path().to_path_buf();
-        // Panes ending 10 minutes ago → comfortably behind the 120s hot
-        // window the moment they're ingested.
-        let base = now_ms_wall().saturating_sub(10 * 60 * 1000);
-        {
-            let idx = Arc::new(SketchStore::new());
-            idx.register(meta_with_host_key(7001));
-            let p = idx.start_persistence(live_cfg(disk.clone())).unwrap();
-            // Only 3 distinct 30s panes — BELOW the 4-window seal cadence,
-            // so they never rotate into sealed_epochs and (on origin/main)
-            // the flusher's sealed-only hot-window scan never sees them.
-            for i in 0..3u64 {
-                let s = base + i * 30_000;
-                idx.append_sample(7001, lv_host("a"), (s, s + 30_000), sample((i + 1) as u8));
-            }
-            // These aged windows MUST become durable parts even though the
-            // cadence was never reached. On origin/main this never happens
-            // → empty parts/, matching the live failure.
-            let flushed = wait_until(
-                || !p.manifest.live_parts().is_empty(),
-                std::time::Duration::from_secs(5),
-            );
-            assert!(
-                flushed,
-                "LIVE BUG #1: aged un-sealed panes never flushed to disk \
-                 (parts={}, sealed={}, sealed_bytes={})",
-                p.manifest.live_parts().len(),
-                idx.list_sealed_epochs_len(),
-                idx.approx_memory_bytes(),
-            );
-            let mut p = p;
-            p.shutdown();
-        }
-
-        // "Restart" on the SAME dir — recovery must reload the parts.
-        let idx2 = Arc::new(SketchStore::new());
-        idx2.register(meta_with_host_key(7001));
-        let p2 = idx2.start_persistence(live_cfg(disk.clone())).unwrap();
-        assert!(
-            !p2.manifest.live_parts().is_empty(),
-            "LIVE BUG #1: recovery found 0 live parts after restart"
-        );
-        let series = idx2.query_range(7001, base, base + 90_000);
-        assert_eq!(
-            series.len(),
-            1,
-            "recovered data not queryable after restart"
-        );
-        assert!(
-            !series[0].samples.is_empty(),
-            "restart query returned No result — flushed data lost"
-        );
-        drop(p2);
-    }
-
-    /// BUG #2: after flush+evict, an exact-agg (`sum by (zone)` shape)
-    /// range query must still resolve from disk. On origin/main
-    /// `query_exact_agg_range` reads ONLY the in-memory current+sealed
-    /// epochs — it never unions disk parts — so once the windows are
-    /// flushed-then-evicted the query returns empty ("No result").
-    #[test]
-    fn live_exact_agg_resolves_from_disk_after_evict() {
-        use crate::storage_engines::types::AggregationType;
-        let tmp = tempfile::TempDir::new().unwrap();
-        let idx = Arc::new(SketchStore::new());
-        // Register an ExactAgg(Sum) sid keyed by `zone`.
-        let mut m = meta(8001);
-        m.metric_name = "http_requests_total".into();
-        m.group_by_keys = ["zone".to_string()].into_iter().collect();
-        m.agg_kind = AggKind::ExactAgg {
-            agg_type: AggregationType::Sum,
-            parameters_canonical: String::new(),
-            spatial_filter_canonical: String::new(),
-        };
-        idx.register(m);
-        let p = idx
-            .start_persistence(durable_cfg(tmp.path().to_path_buf()))
-            .unwrap();
-
-        let lv_zone = |v: &str| {
-            let mut x = BTreeMap::new();
-            x.insert("zone".to_string(), v.to_string());
-            x
-        };
-        for i in 0..10u64 {
-            let s = i * 30_000;
-            idx.append_precompute(
-                8001,
-                lv_zone("z0"),
-                (s, s + 30_000),
-                Box::new(
-                    asap_physical_operators::summary_kernels::SumAccumulator::with_sum(
-                        (i + 1) as f64,
-                    ),
-                ),
-            );
-        }
-        assert!(
-            wait_until(
-                || idx.approx_memory_bytes() == 0 && idx.list_sealed_epochs_len() == 0,
-                std::time::Duration::from_secs(5),
-            ),
-            "exact-agg windows never fully evicted"
-        );
-        // Query the EVICTED portion [0, 150_000) — must come back from disk.
-        let series = idx.query_exact_agg_range(8001, 0, 150_000);
-        assert!(
-            !series.is_empty(),
-            "LIVE BUG #2: exact-agg query returned No result after flush+evict \
-             (disk read-back missing)"
-        );
-        let (_label, samples) = &series[0];
-        assert!(
-            samples.contains_key(&30_000),
-            "LIVE BUG #2: evicted exact-agg window (0,30000) missing from disk read-back"
-        );
-        // The coverage-bounds helper (rate divisor) must also see disk.
-        let cov = idx.exact_agg_coverage_bounds(8001, 0, 150_000);
-        assert!(
-            cov.is_some(),
-            "LIVE BUG #2: exact_agg_coverage_bounds blind to disk after evict"
-        );
-        drop(p);
-    }
-
-    // Raw sample counts must survive production durable storage.
-    #[test]
-    fn raw_count_survives_disk_eviction() {
-        use crate::storage_engines::types::AggregationType;
-        let tmp = tempfile::TempDir::new().unwrap();
-        let idx = Arc::new(SketchStore::new());
-        // Register an ExactAgg(Sum) sid keyed by `zone`.
-        let mut m = meta(8001);
-        m.metric_name = "http_requests_total".into();
-        m.group_by_keys = ["zone".to_string()].into_iter().collect();
-        m.agg_kind = AggKind::ExactAgg {
-            agg_type: AggregationType::Sum,
-            parameters_canonical: String::new(),
-            spatial_filter_canonical: String::new(),
-        };
-        idx.register(m);
-        let p = idx
-            .start_persistence(durable_cfg(tmp.path().to_path_buf()))
-            .unwrap();
-
-        let lv_zone = |v: &str| {
-            let mut x = BTreeMap::new();
-            x.insert("zone".to_string(), v.to_string());
-            x
-        };
-        for i in 0..10u64 {
-            let s = i * 30_000;
-            idx.append_precompute(
-                8001,
-                lv_zone("z0"),
-                (s, s + 30_000),
-                Box::new({
-                    let mut acc = asap_physical_operators::summary_kernels::SumAccumulator::new();
-                    acc.update((i + 1) as f64);
-                    acc.update(10.0);
-                    acc
-                }),
-            );
-        }
-        assert!(
-            wait_until(
-                || idx.approx_memory_bytes() == 0 && idx.list_sealed_epochs_len() == 0,
-                std::time::Duration::from_secs(5),
-            ),
-            "exact-agg windows never fully evicted"
-        );
-        // Query the EVICTED portion [0, 150_000) — must come back from disk.
-        let series = idx.query_exact_agg_range(8001, 0, 150_000);
-        assert!(
-            !series.is_empty(),
-            "exact-agg query returned no result after flush and eviction"
-        );
-        let (_label, samples) = &series[0];
-        assert!(
-            samples.contains_key(&30_000),
-            "evicted exact-agg window missing from disk"
-        );
-        let stats = samples[&30_000].aux_stats();
-        assert_eq!(stats.count, Some(2));
-        assert_eq!(stats.sum, Some(11.0));
-        assert_eq!(stats.sum.unwrap() / stats.count.unwrap() as f64, 5.5);
-        drop(p);
-    }
-
-    /// BUG #3: the memory diagnostic + the flusher's memory-pressure
-    /// trigger must account for `current_epoch`, not just sealed epochs.
-    /// On origin/main `approx_memory_bytes()` sums ONLY sealed epochs, so
-    /// a store holding megabytes of un-sealed `current_epoch` data reports
-    /// ~0 bytes (the live "0.00–0.12 KB approx sealed bytes" under-report)
-    /// and the flusher's `mem > memory_limit` trigger never fires.
-    #[test]
-    fn live_total_memory_accounts_for_current_epoch() {
-        let idx = SketchStore::new();
-        idx.register(meta_with_host_key(9001));
-        // No persistence → no sealing → all data sits in current_epoch.
-        for i in 0..20u64 {
-            let s = i * 30_000;
-            idx.append_sample(9001, lv_host("a"), (s, s + 30_000), sample((i + 1) as u8));
-        }
-        assert_eq!(
-            idx.list_sealed_epochs_len(),
-            0,
-            "precondition: nothing sealed (no persistence)"
-        );
-        assert!(
-            idx.approx_memory_bytes() > 0,
-            "LIVE BUG #3: approx_memory_bytes() reports 0 while current_epoch holds 20 \
-             windows — the diagnostic under-reports and the flusher's memory trigger is blind"
-        );
-    }
-
-    /// The idle under-report this fix targets: once a sid's payload has
-    /// been flushed/evicted to disk, `approx_memory_bytes` (the flusher's
-    /// evictable gauge) reads 0 — but the registered sid still costs
-    /// resident registry/metadata memory. `approx_resident_bytes` must
-    /// surface that so the memory diagnostic isn't blind (the live
-    /// "0.00 KB while 600 MB RSS" symptom).
-    #[test]
-    fn approx_resident_bytes_counts_registry_when_payload_is_zero() {
-        let idx = SketchStore::new();
-        idx.register(meta_with_host_key(9001));
-        // No samples appended → no live payload (models the idle sid whose
-        // epochs were sealed+flushed to disk).
-        assert_eq!(
-            idx.approx_memory_bytes(),
-            0,
-            "precondition: no resident payload"
-        );
-        assert!(
-            idx.approx_resident_bytes() > 0,
-            "approx_resident_bytes must account for the registered sid's \
-             metadata even when no payload is resident"
-        );
-    }
-
-    /// Resident accounting must include the per-series intern-table label
-    /// cache, which grows with the number of distinct label-value maps a
-    /// sid has seen — the dominant per-sid resident cost at scale.
-    #[test]
-    fn approx_resident_bytes_grows_with_interned_label_cardinality() {
-        let idx = SketchStore::new();
-        idx.register(meta_with_host_key(9100));
-        for i in 0..50u64 {
-            let s = i * 30_000;
-            idx.append_sample(
-                9100,
-                lv_host(&format!("host-{i}")),
-                (s, s + 30_000),
-                sample((i + 1) as u8),
-            );
-        }
-        let many = idx.approx_resident_bytes();
-
-        let idx2 = SketchStore::new();
-        idx2.register(meta_with_host_key(9101));
-        idx2.append_sample(9101, lv_host("host-0"), (0, 30_000), sample(1));
-        let few = idx2.approx_resident_bytes();
-
-        assert!(
-            many > few,
-            "resident bytes should grow with interned label cardinality: \
-             many={many} few={few}"
-        );
-    }
-
-    #[test]
-    fn is_idle_evictable_predicate() {
-        let now = now_ms();
-        let mut d = SidStoreData::<BTreeMap<String, String>, AggPayload>::new();
-        d.persistence_enabled = true;
-        d.last_write_unix_ms = now.saturating_sub(120_000);
-        assert!(
-            SketchStore::is_idle_evictable(&d, now, 60_000),
-            "idle 120s past a 60s threshold, durable + empty → evictable"
-        );
-        assert!(
-            !SketchStore::is_idle_evictable(&d, now, 300_000),
-            "idle 120s under a 300s threshold → spared"
-        );
-        d.last_write_unix_ms = 0;
-        assert!(
-            !SketchStore::is_idle_evictable(&d, now, 1),
-            "never-written (0) is never evictable"
-        );
-        // In-memory-only (no persistence) sids are never idle-evicted — there
-        // is no durable copy to serve them from.
-        let mut d2 = SidStoreData::<BTreeMap<String, String>, AggPayload>::new();
-        d2.persistence_enabled = false;
-        d2.last_write_unix_ms = now.saturating_sub(120_000);
-        assert!(!SketchStore::is_idle_evictable(&d2, now, 1));
-    }
-
-    #[test]
-    fn evict_idle_series_drops_state_but_keeps_metadata() {
-        let idx = SketchStore::new();
-        idx.register(meta_with_host_key(7001));
-        // Durable, write-idle, empty-in-memory sid (models a series whose
-        // windows have all sealed+flushed to disk and then gone quiet).
-        let mut d = SidStoreData::<BTreeMap<String, String>, AggPayload>::new();
-        d.persistence_enabled = true;
-        d.last_write_unix_ms = now_ms().saturating_sub(120_000);
-        idx.series.insert(7001, Arc::new(RwLock::new(d)));
-        assert_eq!(idx.series.len(), 1);
-
-        let evicted = idx.evict_idle_series(60_000);
-        assert_eq!(evicted, 1, "the idle sid is evicted");
-        assert_eq!(idx.series.len(), 0, "in-memory state dropped");
-        assert!(
-            idx.instances.read().unwrap().contains_key(&7001),
-            "metadata retained → series stays queryable from disk + rehydrates"
-        );
-
-        // A subsequent append rehydrates the series entry transparently.
-        idx.append_sample(7001, lv_host("h"), (0, 30_000), sample(1));
-        assert_eq!(idx.series.len(), 1, "append rehydrated the evicted sid");
-    }
-
-    #[test]
-    fn evict_idle_series_spares_recent_and_pending_sids() {
-        let idx = SketchStore::new();
-        // Recently written → not idle.
-        idx.register(meta_with_host_key(7101));
-        let mut recent = SidStoreData::<BTreeMap<String, String>, AggPayload>::new();
-        recent.persistence_enabled = true;
-        recent.last_write_unix_ms = now_ms();
-        idx.series.insert(7101, Arc::new(RwLock::new(recent)));
-        // Idle, but still holds un-flushed data in current_epoch → dropping it
-        // would lose data, so it MUST be spared.
-        idx.register(meta_with_host_key(7102));
-        let mut pending = SidStoreData::<BTreeMap<String, String>, AggPayload>::new();
-        pending.persistence_enabled = true;
-        pending.last_write_unix_ms = now_ms().saturating_sub(120_000);
-        pending.insert((0, 30_000), lv_host("h"), AggPayload::Sketch(sample(1)));
-        idx.series.insert(7102, Arc::new(RwLock::new(pending)));
-
-        assert_eq!(
-            idx.evict_idle_series(60_000),
-            0,
-            "recent + pending-data sids are spared"
-        );
-        assert_eq!(idx.series.len(), 2);
-    }
-    // Flush and reopen must preserve Planner family rather than reconstructing Rate as Increase.
-    #[test]
-    fn planner_exact_families_survive_disk_eviction_and_restart() {
-        use crate::storage_engines::types::{AggregateCore, AggregationType};
-        use asap_physical_operators::summary_kernels::exact::ExactAccumulator;
-        let kinds = [
-            AggregationType::Sum,
-            AggregationType::Count,
-            AggregationType::Min,
-            AggregationType::Max,
-            AggregationType::Rate,
-            AggregationType::Increase,
-        ];
-        let stats = [
-            asap_types::Statistic::Sum,
-            asap_types::Statistic::Count,
-            asap_types::Statistic::Min,
-            asap_types::Statistic::Max,
-            asap_types::Statistic::Rate,
-            asap_types::Statistic::Increase,
-        ];
-        let expected = [16.0, 3.0, 2.0, 8.0, 3.0, 6.0];
-        let temp = tempfile::tempdir().unwrap();
-        {
-            let store = Arc::new(SketchStore::new());
-            for (i, kind) in kinds.iter().enumerate() {
-                let mut metadata = meta(9000 + i as u64);
-                metadata.agg_kind = AggKind::ExactAgg {
-                    agg_type: *kind,
-                    parameters_canonical: String::new(),
-                    spatial_filter_canonical: String::new(),
-                };
-                metadata.capability = Some(Capability::ExactAgg(*kind));
-                metadata.accuracy = None;
-                store.register(metadata);
-            }
-            let mut persistence = store
-                .start_persistence(durable_cfg(temp.path().to_path_buf()))
-                .unwrap();
-            for (i, kind) in kinds.iter().enumerate() {
-                for window in 0..10u64 {
-                    let mut state =
-                        ExactAccumulator::new(kind.planner_exact_family().unwrap(), false).unwrap();
-                    for (time, value) in [(1000, 8.0), (2000, 2.0), (3000, 6.0)] {
-                        state.update(None, value, time);
-                    }
-                    store.append_precompute(
-                        9000 + i as u64,
-                        BTreeMap::new(),
-                        (window * 30000, (window + 1) * 30000),
-                        Box::new(state),
-                    );
-                }
-            }
-            assert!(wait_until(
-                || !persistence.manifest.live_parts().is_empty()
-                    && store.approx_memory_bytes() == 0
-                    && store.list_sealed_epochs_len() == 0,
-                std::time::Duration::from_secs(5)
-            ));
-            persistence.shutdown();
-        }
-        let store = Arc::new(SketchStore::new());
-        let mut persistence = store
-            .start_persistence(durable_cfg(temp.path().to_path_buf()))
-            .unwrap();
-        for (i, kind) in kinds.iter().enumerate() {
-            let series = store.query_exact_agg_range(9000 + i as u64, 0, 30001);
-            assert_eq!(series.len(), 1, "{kind:?}");
-            let state = &series[0].1[&30000];
-            assert_eq!(state.get_accumulator_type(), *kind);
-            assert_eq!(
-                state
-                    .query_statistic(stats[i], &None, &HashMap::new())
-                    .unwrap(),
-                expected[i]
-            );
-            for (j, stat) in stats.iter().enumerate() {
-                if i != j {
-                    assert!(state
-                        .query_statistic(*stat, &None, &HashMap::new())
-                        .is_err());
-                }
-            }
-        }
-        persistence.shutdown();
-    }
-    // Exact selected-output bindings survive disk recovery and cannot be
-    // rebound to a different output merely because its definition matches.
-    #[test]
-    fn stored_output_reference_isolates_identity_and_survives_restart() {
-        use crate::drivers::ingest::series_resolver::SeriesIdResolver;
-        let snapshot = serde_json::from_str(include_str!(
-            "../../../../../docs/examples/asapquery-compatibility-demo-snapshot.json"
-        ))
-        .unwrap();
-        let mut plan = crate::tests::test_utilities::planning::quoted_snapshot(snapshot, false)
-            .compile_promql()
-            .unwrap();
-        let config = plan
-            .precompute_plan
-            .materializations
-            .iter()
-            .find(|config| {
-                matches!(
-                    config.accumulator_spec().unwrap().family,
-                    planner_types::post_asap::SummaryFamilyType::Sketch(..)
-                )
-            })
-            .unwrap()
-            .clone();
-        let output = plan
-            .summary_catalog
-            .output_reference(config.policy_fingerprint().into())
-            .unwrap();
-        let directory = tempfile::tempdir().unwrap();
-        let disk = directory.path().join("state");
-        let wal = directory.path().join("outputs.wal");
-        let handle;
-        {
-            let store = Arc::new(SketchStore::new());
-            store
-                .install_precompute_plan(
-                    Arc::new(plan.summary_catalog.clone()),
-                    &plan.precompute_plan,
-                )
-                .unwrap();
-            let resolver = SeriesIdResolver::open(wal.clone()).unwrap();
-            let generation = store.active_catalog_generation().unwrap();
-            handle = store
-                .resolve_output_storage_handle(
-                    &resolver,
-                    output.stored_output_id,
-                    "population-a",
-                    Some(&generation),
-                )
-                .unwrap();
-            let other_population = store
-                .resolve_output_storage_handle(
-                    &resolver,
-                    output.stored_output_id,
-                    "population-b",
-                    Some(&generation),
-                )
-                .unwrap();
-            assert_ne!(handle, other_population);
-            store.register(meta_for_config(handle, &config));
-            let mut persistence = store.start_persistence(durable_cfg(disk.clone())).unwrap();
-            for pane in 0..4 {
-                store.append_sample(
-                    handle,
-                    BTreeMap::new(),
-                    (pane * 30_000, (pane + 1) * 30_000),
-                    sample(1),
-                );
-            }
-            assert!(wait_until(
-                || !persistence.manifest.live_parts().is_empty()
-                    && store.list_sealed_epochs_len() == 0,
-                Duration::from_secs(5)
-            ));
-            assert_eq!(store.storage_handles_for_output(&output), vec![handle]);
-            let wrong = StoredOutputReference {
-                stored_output_id: asap_types::sds::StoredOutputId(102),
-                ..output.clone()
-            };
-            assert!(store.storage_handles_for_output(&wrong).is_empty());
-            persistence.shutdown();
-        }
-        {
-            let store = Arc::new(SketchStore::new());
-            store
-                .install_precompute_plan(
-                    Arc::new(plan.summary_catalog.clone()),
-                    &plan.precompute_plan,
-                )
-                .unwrap();
-            let resolver = SeriesIdResolver::open(wal.clone()).unwrap();
-            let generation = store.active_catalog_generation().unwrap();
-            assert_eq!(
-                store
-                    .resolve_output_storage_handle(
-                        &resolver,
-                        output.stored_output_id,
-                        "population-a",
-                        Some(&generation)
-                    )
-                    .unwrap(),
-                handle
-            );
-            let mut persistence = store.start_persistence(durable_cfg(disk.clone())).unwrap();
-            assert_eq!(store.storage_handles_for_output(&output), vec![handle]);
-            assert!(!store.query_range(handle, 0, 120_000).is_empty());
-            persistence.shutdown();
-        }
-        plan.precompute_plan.schemas[0]
-            .stored_output_reference
-            .stored_output_id = asap_types::sds::StoredOutputId(102);
-        let store = SketchStore::new();
-        assert!(store
-            .install_precompute_plan(
-                Arc::new(plan.summary_catalog.clone()),
-                &plan.precompute_plan
-            )
-            .is_err());
-    }
-    // A versioned output address cannot silently resolve the previous version.
-    #[test]
-    fn stored_output_reference_does_not_alias_previous_plan_version() {
-        let snapshot = serde_json::from_str(include_str!(
-            "../../../../../docs/examples/asapquery-compatibility-demo-snapshot.json"
-        ))
-        .unwrap();
-        let plan = crate::tests::test_utilities::planning::quoted_snapshot(snapshot, false)
-            .compile_promql()
-            .unwrap();
-        let output = plan.precompute_plan.schemas[0]
-            .stored_output_reference
-            .clone();
-        let store = SketchStore::new();
-        store
-            .install_precompute_plan(
-                Arc::new(plan.summary_catalog.clone()),
-                &plan.precompute_plan,
-            )
-            .unwrap();
-        store.register(meta_for_config(
-            100,
-            plan.precompute_plan
-                .materializations
-                .iter()
-                .find(|config| config.policy_fingerprint() == output.stored_output_id.fingerprint())
-                .unwrap(),
-        ));
-        assert_eq!(store.storage_handles_for_output(&output), vec![100]);
-        let mut next = plan.summary_catalog;
-        next.plan_version += 1;
-        store
-            .install_catalog_outputs(
-                Arc::new(next),
-                plan.precompute_plan
-                    .schemas
-                    .iter()
-                    .map(|schema| {
-                        (
-                            schema.materialization,
-                            schema.stored_output_reference.clone(),
-                        )
-                    })
-                    .collect(),
-            )
-            .unwrap();
-        assert!(store.storage_handles_for_output(&output).is_empty());
-        assert!(!store.is_current_storage_handle(100));
-    }
-}
-
-impl SketchStore {
-    /// Build an isolated read view from one already pinned query-wide snapshot.
-    pub(crate) fn from_revision(
-        plan: &crate::storage_engines::types::RuntimePhysicalPlan,
-        pinned: &crate::precompute_engine::revisions::PinnedRevision,
-    ) -> Result<Self, crate::precompute_engine::revisions::RevisionError> {
-        use crate::storage_engines::types::{KeyByLabelValues, PrecomputedOutput};
-        let view = Self::new();
-        view.install_precompute_plan(
-            plan.summary_catalog
-                .clone()
-                .ok_or("revision view requires catalog")?,
-            &plan.precompute_plan,
-        )?;
-        let generation = Arc::new(
-            plan.precompute_plan
-                .summary_catalog
-                .clone()
-                .ok_or("revision view requires generation")?,
-        );
-        let mut sids = BTreeMap::new();
-        for record in &pinned.records {
-            let definition = record.reference.stored_output_id;
-            let expected = plan
-                .installed_precompute_plan
-                .stored_output_reference(definition)
-                .ok_or("revision view has unbound output")?;
-            if expected != record.reference {
-                return Err("revision view semantic binding mismatch".into());
-            }
-            let config = plan
-                .precompute_plan
-                .materializations
-                .iter()
-                .find(|c| c.policy_fingerprint() == definition.fingerprint())
-                .ok_or("revision view lacks output configuration")?;
-            let next_sid = sids.len() as u64 + 1;
-            let sid = *sids
-                .entry((definition, record.group.clone()))
-                .or_insert(next_sid);
-            let mut output = PrecomputedOutput::new(
-                record.start_ms,
-                record.end_ms,
-                Some(KeyByLabelValues::new_with_labels(
-                    config
-                        .grouping_labels
-                        .iter()
-                        .map(|k| record.group.get(k).cloned().unwrap_or_default())
-                        .collect(),
-                )),
-                definition.fingerprint(),
-            );
-            output.population_labels = Some(record.group.clone());
-            output.catalog_generation = Some(Arc::clone(&generation));
-            output.stored_output_reference = Some(record.reference.clone());
-            let state = crate::precompute_engine::revisions::decode_state(record, config)?;
-            let labels = view
-                .register_precompute_output(sid, config, &output)
-                .ok_or("revision view rejected output metadata")?;
-            // This is an immutable read view of already committed revisions,
-            // not additive producer admission (which correctly rejects derived
-            // writes). Every payload was decoded against its installed family.
-            let accepted =
-                match crate::storage_engines::sketch_db::data::agg_kind_for_config(config) {
-                    AggKind::Sketch { .. } => view.append_sample_with_binding(
-                        sid,
-                        labels,
-                        (record.start_ms, record.end_ms),
-                        SketchSampleState {
-                            bytes: state.serialize_to_bytes(),
-                            encoding: SketchEncoding::MsgpackFull,
-                        },
-                    ),
-                    AggKind::ExactAgg { .. } => view.append_precompute_with_binding(
-                        sid,
-                        labels,
-                        (record.start_ms, record.end_ms),
-                        state.clone_boxed_core(),
-                    ),
-                };
-            if !accepted {
-                return Err("revision view rejected committed payload".into());
-            }
-        }
-        let mut samples =
-            crate::drivers::ingest::prometheus_remote_write::revision_samples(&pinned.inputs)?;
-        samples
-            .sort_by(|a, b| (a.timestamp_ms, &a.series_key).cmp(&(b.timestamp_ms, &b.series_key)));
-        view.current_series
-            .lock()
-            .map_err(|_| "revision current-series view poisoned")?
-            .ingest(&plan.query_plan, &samples);
-        Ok(view)
-    }
-}
diff --git a/data_plane/src/storage_engines/sketch_db/lifecycle/eviction.rs b/data_plane/src/storage_engines/sketch_db/lifecycle/eviction.rs
deleted file mode 100644
index 4788aaca0..000000000
--- a/data_plane/src/storage_engines/sketch_db/lifecycle/eviction.rs
+++ /dev/null
@@ -1,395 +0,0 @@
-//! Remove expired sid instances and their stored data on a periodic sweep.
-//!
-//! Lifecycle retention is separate from age-based data retention. Configure
-//! `persistence_delete_older_than > retirement_retention` so whole-instance
-//! eviction can precede age-based record removal.
-//!
-//! Dry-run logs discovered instances without removing them. Backfill jobs are
-//! policy-keyed, so this sid-level sweep does not cancel those jobs.
-
-use std::sync::Arc;
-use std::time::Duration;
-
-use tokio::sync::oneshot;
-use tokio::task::JoinHandle;
-use tracing::{info, warn};
-
-use crate::storage_engines::sketch_db::backfill::BackfillRegistry;
-use crate::storage_engines::sketch_db::index::SketchStore;
-use crate::storage_engines::sketch_db::lifecycle::{AggStatus, DEFAULT_RETIREMENT_RETENTION};
-
-/// Eviction schedule and dry-run configuration.
-#[derive(Clone, Debug)]
-pub struct SchemaEvictionConfig {
-    /// How often to scan for Expired schemas. Coarse (default 5 min)
-    /// — eviction is not latency-sensitive.
-    pub poll_interval: Duration,
-    /// When true, log what would be evicted but don't call
-    /// `drop_agg_id` or `remove_schema`. Use for staging / validation.
-    pub dry_run: bool,
-}
-
-impl Default for SchemaEvictionConfig {
-    fn default() -> Self {
-        Self {
-            poll_interval: Duration::from_secs(300),
-            dry_run: false,
-        }
-    }
-}
-
-/// Background task that removes expired instances from the sid catalog.
-/// The backfill registry is retained but is not consulted for cancellation.
-pub struct SchemaEvictionService {
-    backfill: Arc<BackfillRegistry>,
-    summary_store: Arc<SketchStore>,
-    retirement_retention: Duration,
-    config: SchemaEvictionConfig,
-}
-
-impl SchemaEvictionService {
-    pub fn new(
-        summary_store: Arc<SketchStore>,
-        backfill: Arc<BackfillRegistry>,
-        config: SchemaEvictionConfig,
-    ) -> Self {
-        Self {
-            backfill,
-            summary_store,
-            retirement_retention: DEFAULT_RETIREMENT_RETENTION,
-            config,
-        }
-    }
-
-    /// Spawn as a tokio task. Returns a handle whose `shutdown`
-    /// oneshot stops the loop cleanly on ctrl-c.
-    pub fn spawn(self) -> SchemaEvictionHandle {
-        let (shutdown_tx, shutdown_rx) = oneshot::channel();
-        let task = tokio::spawn(async move {
-            self.run(shutdown_rx).await;
-        });
-        SchemaEvictionHandle {
-            task: Some(task),
-            shutdown: Some(shutdown_tx),
-        }
-    }
-
-    /// Main loop. Exits when `shutdown` fires.
-    async fn run(self, mut shutdown: oneshot::Receiver<()>) {
-        info!(
-            poll_interval_secs = self.config.poll_interval.as_secs(),
-            dry_run = self.config.dry_run,
-            retirement_retention_secs = self.retirement_retention.as_secs(),
-            "SchemaEvictionService starting"
-        );
-        loop {
-            tokio::select! {
-                biased;
-                _ = &mut shutdown => {
-                    info!("SchemaEvictionService received shutdown signal");
-                    return;
-                }
-                _ = tokio::time::sleep(self.config.poll_interval) => {}
-            }
-            self.run_once();
-        }
-    }
-
-    /// Synchronous single sweep. Exposed as `pub` so tests can drive
-    /// the service deterministically without spinning up a tokio
-    /// runtime + polling loop.
-    pub fn run_once(&self) {
-        let expired = self.summary_store.list_by_status(AggStatus::Expired);
-        if expired.is_empty() {
-            return;
-        }
-        info!(
-            count = expired.len(),
-            "SchemaEviction: {} Expired sids discovered",
-            expired.len()
-        );
-
-        // Suppress an unused-field warning until backfill cancellation
-        // is rewired on sid. The registry handle is retained on the
-        // service for that follow-up.
-        let _ = &self.backfill;
-
-        for meta in expired {
-            let sid = meta.storage_handle;
-            let metric = meta.metric_name.clone();
-
-            if self.config.dry_run {
-                info!(
-                    sid,
-                    %metric,
-                    retired_at_ms = ?meta.retired_at_ms,
-                    expires_at_ms = ?meta.expires_at_ms,
-                    "SchemaEviction[DRY RUN]: would remove_instance"
-                );
-                continue;
-            }
-            let removed = self.summary_store.remove_instance(sid).is_some();
-            info!(
-                sid,
-                %metric,
-                removed,
-                retired_at_ms = ?meta.retired_at_ms,
-                expires_at_ms = ?meta.expires_at_ms,
-                "SchemaEviction: dropped sid"
-            );
-        }
-    }
-}
-
-/// Handle returned by `SchemaEvictionService::spawn`. Drop triggers
-/// shutdown; call `shutdown().await` to also await task exit.
-pub struct SchemaEvictionHandle {
-    task: Option<JoinHandle<()>>,
-    shutdown: Option<oneshot::Sender<()>>,
-}
-
-impl SchemaEvictionHandle {
-    pub async fn shutdown(mut self) {
-        if let Some(tx) = self.shutdown.take() {
-            let _ = tx.send(());
-        }
-        if let Some(task) = self.task.take() {
-            let _ = task.await;
-        }
-    }
-}
-
-impl Drop for SchemaEvictionHandle {
-    fn drop(&mut self) {
-        if let Some(tx) = self.shutdown.take() {
-            let _ = tx.send(());
-        }
-    }
-}
-
-/// Log a warning if `data_retention` is shorter than
-/// `retirement_retention`. The design expects the opposite
-/// (`data_retention > retirement_retention`) so that schema
-/// eviction runs strictly before age-based retention can beat it
-/// to an Expired agg's records. Inversion isn't a hard error —
-/// test setups may want it — just worth surfacing once at startup.
-pub fn warn_if_retention_inverted(
-    data_retention: Option<Duration>,
-    retirement_retention: Duration,
-) {
-    if let Some(d) = data_retention {
-        if d < retirement_retention {
-            warn!(
-                data_retention_secs = d.as_secs(),
-                retirement_retention_secs = retirement_retention.as_secs(),
-                "persistence_delete_older_than < schema retirement_retention; \
-                 data retention may race schema eviction. Consider extending \
-                 persistence_delete_older_than to at least the retirement window."
-            );
-        }
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use crate::storage_engines::types::{AggregationType, InstalledPrecomputePlan};
-    use asap_physical_operators::summary_kernels::SumAccumulator;
-    use asap_types::aggregation_config::PrecomputeMaterialization;
-    use asap_types::enums::WindowKind;
-    use asap_types::KeyByLabelNames;
-    use std::collections::HashMap;
-
-    fn sum_agg_config(id: u64) -> PrecomputeMaterialization {
-        PrecomputeMaterialization {
-            stored_output_id: None,
-            semantic_fragment: None,
-            population_key_encoding: Default::default(),
-            aggregation_type: AggregationType::Sum,
-            aggregation_sub_type: String::new(),
-            parameters: HashMap::new(),
-            grouping_labels: KeyByLabelNames::empty().into(),
-            aggregated_labels: KeyByLabelNames::empty(),
-            rollup_labels: KeyByLabelNames::empty(),
-            original_yaml: String::new(),
-            window_size: 1,
-            slide_interval: 1,
-            window_type: WindowKind::Tumbling,
-            window_layout: asap_types::WindowMaterializationLayout::Pane { pane_secs: 1 },
-            pane_origin_ms: None,
-            spatial_filter: String::new(),
-            spatial_filter_normalized: String::new(),
-            metric: format!("metric_{id}"),
-            num_aggregates_to_retain: None,
-            table_name: None,
-            value_projection: None,
-            table_population: None,
-            derived_input: None,
-            table_timestamp_column: None,
-            partitioning: None,
-            value_source_column: None,
-        }
-    }
-
-    /// Build a streaming-config keyed on the policy-fingerprint u64
-    /// derived from each dummy_agg. Returns the config plus the
-    /// marker_id → fingerprint mapping so callers can look up the
-    /// right key.
-    fn make_streaming_config(ids: &[u64]) -> (Arc<InstalledPrecomputePlan>, HashMap<u64, u64>) {
-        let mut map = HashMap::new();
-        let mut id_to_fp = HashMap::new();
-        for &id in ids {
-            let cfg = sum_agg_config(id);
-            let fp = cfg.policy_fp_u64();
-            id_to_fp.insert(id, fp);
-            map.insert(fp, cfg);
-        }
-        (
-            Arc::new(InstalledPrecomputePlan::from_raw_ids(map)),
-            id_to_fp,
-        )
-    }
-
-    fn write_one(
-        summary_store: &SketchStore,
-        installed_precompute_plan: &InstalledPrecomputePlan,
-        agg_id: u64,
-        ts: u64,
-    ) -> u64 {
-        use crate::drivers::ingest::series_resolver::SeriesIdResolver;
-        use std::sync::Arc;
-        let acc = SumAccumulator::with_sum(1.0);
-        let output = crate::storage_engines::types::PrecomputedOutput::new(
-            ts,
-            ts + 1000,
-            None,
-            asap_types::PolicyFingerprint(agg_id),
-        );
-        let agg_cfg = installed_precompute_plan
-            .get_aggregation_config(asap_types::sds::StoredOutputId(agg_id))
-            .unwrap();
-        // Test-scoped resolver — each call mints fresh. Production
-        // shares one resolver across all sinks; tests don't need that
-        // because each fixture is isolated. Static-lifetime so multiple
-        // `write_one` calls in the same test share `next_sid` (matches
-        // the production single-resolver model).
-        thread_local! {
-            static RESOLVER: Arc<SeriesIdResolver> = Arc::new(SeriesIdResolver::new());
-        }
-        let resolver = RESOLVER.with(|r| r.clone());
-        summary_store
-            .ingest_precompute_for_agg_config(
-                |m, fp, ak| resolver.resolve(m, fp, ak),
-                agg_cfg,
-                &output,
-                &acc,
-            )
-            .expect("registered sid")
-    }
-
-    /// Seed two sids (metric_1, metric_2), then mark every metric_1
-    /// sid as `Expired` so the sweep picks them up while metric_2's
-    /// sids stay `Active`.
-    fn fixture_with_expired_metric_1() -> (Arc<BackfillRegistry>, Arc<SketchStore>) {
-        let (initial, id_to_fp) = make_streaming_config(&[1, 2]);
-        let summary_store = Arc::new(SketchStore::new());
-        let sid_a = write_one(&summary_store, &initial, id_to_fp[&1], 100);
-        let _ = write_one(&summary_store, &initial, id_to_fp[&1], 200);
-        let _ = write_one(&summary_store, &initial, id_to_fp[&2], 300);
-        // Both metric_1 writes share the same agg-signature → one
-        // sid; mark it Expired directly. metric_2's sid stays Active.
-        summary_store.force_expire(sid_a);
-
-        (Arc::new(BackfillRegistry::new()), summary_store)
-    }
-
-    #[tokio::test(flavor = "current_thread")]
-    async fn run_once_drops_expired_sid() {
-        let (backfill, summary_store) = fixture_with_expired_metric_1();
-        let before_metric_2: usize = summary_store
-            .list_by_status(AggStatus::Active)
-            .into_iter()
-            .filter(|m| m.metric_name == "metric_2")
-            .count();
-        assert!(before_metric_2 >= 1, "fixture seeded metric_2 sid");
-
-        let svc = SchemaEvictionService::new(
-            summary_store.clone(),
-            backfill,
-            SchemaEvictionConfig {
-                poll_interval: Duration::from_secs(60),
-                dry_run: false,
-            },
-        );
-        svc.run_once();
-
-        // metric_1's expired sid is gone; metric_2's active sid
-        // remains.
-        let metric_1_remaining = summary_store
-            .list_by_status(AggStatus::Active)
-            .into_iter()
-            .chain(summary_store.list_by_status(AggStatus::Retired))
-            .chain(summary_store.list_by_status(AggStatus::Expired))
-            .filter(|m| m.metric_name == "metric_1")
-            .count();
-        assert_eq!(metric_1_remaining, 0, "expired sid must be removed");
-        assert!(
-            summary_store
-                .list_by_status(AggStatus::Active)
-                .iter()
-                .any(|m| m.metric_name == "metric_2"),
-            "metric_2's sid still registered"
-        );
-    }
-
-    #[tokio::test(flavor = "current_thread")]
-    async fn run_once_is_noop_without_expired_sids() {
-        let (initial, id_to_fp) = make_streaming_config(&[1]);
-        let backfill = Arc::new(BackfillRegistry::new());
-        let summary_store = Arc::new(SketchStore::new());
-        let _ = write_one(&summary_store, &initial, id_to_fp[&1], 100);
-        let before = summary_store.instance_count();
-
-        let svc = SchemaEvictionService::new(
-            summary_store.clone(),
-            backfill,
-            SchemaEvictionConfig::default(),
-        );
-        svc.run_once();
-
-        assert_eq!(
-            summary_store.instance_count(),
-            before,
-            "no expired sids — SketchStore untouched"
-        );
-    }
-
-    #[tokio::test(flavor = "current_thread")]
-    async fn dry_run_logs_but_does_not_drop() {
-        let (backfill, summary_store) = fixture_with_expired_metric_1();
-        let before = summary_store.instance_count();
-        let svc = SchemaEvictionService::new(
-            summary_store.clone(),
-            backfill,
-            SchemaEvictionConfig {
-                poll_interval: Duration::from_secs(60),
-                dry_run: true,
-            },
-        );
-        svc.run_once();
-
-        // Dry-run: every sid stays.
-        assert_eq!(summary_store.instance_count(), before);
-    }
-
-    #[test]
-    fn retention_inverted_warning_fires_only_when_inverted() {
-        // Pure call-it-and-nothing-panics check. The warn goes to
-        // tracing; we can't assert on the log without a subscriber
-        // mock, but we can confirm the function doesn't panic on
-        // either branch.
-        warn_if_retention_inverted(Some(Duration::from_secs(1_000)), Duration::from_secs(100)); // Not inverted — no warn.
-        warn_if_retention_inverted(Some(Duration::from_secs(100)), Duration::from_secs(1_000)); // Inverted — warn.
-        warn_if_retention_inverted(None, Duration::from_secs(1_000)); // Skip.
-    }
-}
diff --git a/data_plane/src/storage_engines/sketch_db/lifecycle/mod.rs b/data_plane/src/storage_engines/sketch_db/lifecycle/mod.rs
deleted file mode 100644
index 12f9b40ae..000000000
--- a/data_plane/src/storage_engines/sketch_db/lifecycle/mod.rs
+++ /dev/null
@@ -1,17 +0,0 @@
-//! Sid lifecycle reconciliation and eviction.
-//!
-//! Instance metadata in the index owns retirement and expiry timestamps.
-//! [`reconcile::reconcile_from_streaming_config`] retires orphaned precompute
-//! instances; [`eviction::SchemaEvictionService`] removes expired instances.
-
-pub mod eviction;
-pub mod reconcile;
-pub mod status;
-
-pub use eviction::{
-    warn_if_retention_inverted, SchemaEvictionConfig, SchemaEvictionHandle, SchemaEvictionService,
-};
-pub use reconcile::{
-    reconcile_from_streaming_config, reconcile_if_config_changed, SidReconcileSummary,
-};
-pub use status::{AggStatus, DEFAULT_RETIREMENT_RETENTION};
diff --git a/data_plane/src/storage_engines/sketch_db/lifecycle/reconcile.rs b/data_plane/src/storage_engines/sketch_db/lifecycle/reconcile.rs
deleted file mode 100644
index d6310b46f..000000000
--- a/data_plane/src/storage_engines/sketch_db/lifecycle/reconcile.rs
+++ /dev/null
@@ -1,532 +0,0 @@
-//! Reconcile sid lifecycle against a streaming configuration snapshot.
-//!
-//! Retire precompute instances whose content signature is absent from the
-//! configuration. New sids are registered lazily by ingestion.
-//!
-//! Sketch sids use different signatures from the precompute configuration and
-//! are excluded from this reconciliation; their lifecycle is managed separately.
-
-use std::collections::{BTreeSet, HashSet};
-use std::sync::Arc;
-use std::time::Duration;
-
-use crate::storage_engines::types::InstalledPrecomputePlan;
-use asap_types::aggregation_config::PrecomputeMaterialization;
-
-use crate::storage_engines::sketch_db::data::{canonical_parameters, AggKind};
-use crate::storage_engines::sketch_db::index::SketchStore;
-use crate::storage_engines::sketch_db::lifecycle::AggStatus;
-
-/// Sids the reconciler force-retired this call.
-#[derive(Debug, Default, Clone, PartialEq, Eq)]
-pub struct SidReconcileSummary {
-    /// Sids that transitioned `Active → Retired` because their
-    /// content signature is no longer present in the new
-    /// `InstalledPrecomputePlan`. Already-Retired or already-Expired sids
-    /// are not re-touched.
-    pub retired: Vec<u64>,
-}
-
-/// Iterate every sid in `store`; force-retire any whose signature
-/// `(metric_name, agg_kind, group_by_keys)` is not represented in
-/// `config`. `retention` is forwarded to
-/// [`SketchStore::force_retire`] so the schedule of eventual
-/// `Retired → Expired` matches the pre-retirement `SchemaRegistry`
-/// behavior.
-/// Ingest-path entry point: reconcile only when `config` is a config
-/// the store has not yet reconciled against. The streaming config is a
-/// lock-free `Arc<ArcSwap<InstalledPrecomputePlan>>` whose `Arc` identity only
-/// changes on a (rare) control-plane swap, so in steady state every
-/// ingest batch hands us the *same* `Arc`. Gating on the `Arc` data
-/// pointer collapses the per-batch reconcile to a single relaxed atomic
-/// load in that common case, skipping the full catalog scan + any
-/// signature derivation.
-///
-/// Pass the same `Arc<InstalledPrecomputePlan>` the ingest batch snapshotted so
-/// the pointer is stable; the snapshot is held alive for the call's
-/// duration, so the pointer cannot be reused by a concurrently-dropped
-/// config (no ABA hazard within a batch).
-///
-/// Returns `None` when the scan was skipped (config unchanged), or
-/// `Some(summary)` with the retired sids when a reconcile actually ran.
-pub fn reconcile_if_config_changed(
-    store: &SketchStore,
-    config: &Arc<InstalledPrecomputePlan>,
-    retention: Duration,
-) -> Option<SidReconcileSummary> {
-    let config_ptr = Arc::as_ptr(config) as usize;
-    if !store.mark_reconciled_config(config_ptr) {
-        return None;
-    }
-    Some(reconcile_from_streaming_config(store, config, retention))
-}
-
-pub fn reconcile_from_streaming_config(
-    store: &SketchStore,
-    config: &InstalledPrecomputePlan,
-    retention: Duration,
-) -> SidReconcileSummary {
-    let live_signatures = build_live_signature_set(config);
-
-    // First pass: find orphaned Active sids without cloning the
-    // catalog. `reconcile_from_streaming_config` runs on every ingest
-    // batch, and the old `snapshot_instances()` here deep-cloned every
-    // `SummarySeriesMetadata` (String + BTreeSet<String> + AggKind)
-    // on each call — the dominant ingest-path CPU cost in profiling
-    // (BTreeMap/String clone + malloc churn). We only need to read each
-    // instance's signature under the read lock; collect just the cheap
-    // `u64` sids to retire, then act after the lock drops.
-    //
-    // Reuse one scratch buffer across instances so signature
-    // derivation doesn't allocate a fresh `Vec<u8>` per sid.
-    let mut orphans: Vec<u64> = Vec::new();
-    let mut scratch: Vec<u8> = Vec::new();
-    store.for_each_instance(|sid, meta| {
-        if !matches!(meta.status(), AggStatus::Active) {
-            return;
-        }
-        // `live_signatures` is built exclusively from
-        // `signature_from_agg_config`, which canonicalizes every
-        // streaming-config `PrecomputeMaterialization` to an `AggKind::ExactAgg`
-        // signature (`P`-prefixed). An `AggKind::Sketch` sid (OTLP
-        // modified-sketch ingest path: KLL / HLL / DDSketch / CMS /
-        // CountSketch) always produces an `S`-prefixed signature, so it
-        // can NEVER be present in `live_signatures` — meaning this scan
-        // would unconditionally orphan and retire EVERY sketch-backed sid
-        // on the first config reconcile. That is exactly the opposite of
-        // the documented intent (see this module's header: "sketch sids
-        // never compare equal so they're never retired by this path").
-        //
-        // Retiring a sketch sid bars further ingest (the §6.3 write
-        // barrier rejects writes to Retired/Expired sids), then eviction
-        // drops its per-window state; the query path then classifies it
-        // as `Ghost`, and the analyzer-driven dispatch short-circuits the
-        // whole quantile / cardinality query to CapabilityMiss before it
-        // can reach a freshly-minted Active sketch sid carrying live data.
-        // Sketch-sid lifecycle is driven by the control plane's eviction
-        // RPC, NOT by this precompute-shaped signature reconcile, so skip
-        // them here.
-        if matches!(meta.agg_kind, AggKind::Sketch { .. }) {
-            return;
-        }
-        scratch.clear();
-        signature_into(
-            &meta.metric_name,
-            &meta.agg_kind,
-            &meta.group_by_keys,
-            &mut scratch,
-        );
-        if !live_signatures.contains(scratch.as_slice()) {
-            orphans.push(sid);
-        }
-    });
-
-    // Second pass: retire the orphans (takes the write lock per sid).
-    // Common case is zero orphans — steady-state ingest matches every
-    // live signature — so this loop is usually empty.
-    let mut retired = Vec::new();
-    for sid in orphans {
-        if store.force_retire(sid, retention).is_some() {
-            retired.push(sid);
-        }
-    }
-    SidReconcileSummary { retired }
-}
-
-/// Canonical byte encoding of a sid's content signature, used as the
-/// HashSet key. Two sids of the same signature produce identical
-/// bytes; cross-signature collisions require a 64-bit hash birthday
-/// — we don't compress here, we compare the full bytes.
-fn signature_bytes(
-    metric_name: &str,
-    agg_kind: &AggKind,
-    group_by_keys: &BTreeSet<String>,
-) -> Vec<u8> {
-    let mut buf: Vec<u8> = Vec::new();
-    signature_into(metric_name, agg_kind, group_by_keys, &mut buf);
-    buf
-}
-
-/// Append the canonical signature encoding into `buf` (which the
-/// caller may have pre-cleared and reuse across instances to avoid
-/// per-sid allocation).
-fn signature_into(
-    metric_name: &str,
-    agg_kind: &AggKind,
-    group_by_keys: &BTreeSet<String>,
-    buf: &mut Vec<u8>,
-) {
-    buf.extend_from_slice(metric_name.as_bytes());
-    buf.push(0);
-    encode_agg_kind(agg_kind, buf);
-    buf.push(0);
-    for k in group_by_keys {
-        buf.extend_from_slice(k.as_bytes());
-        buf.push(b',');
-    }
-}
-
-fn signature_from_agg_config(cfg: &PrecomputeMaterialization) -> Vec<u8> {
-    let agg_kind = AggKind::ExactAgg {
-        agg_type: cfg.aggregation_type,
-        parameters_canonical: canonical_parameters(&cfg.parameters),
-        spatial_filter_canonical: cfg.spatial_filter_normalized.clone(),
-    };
-    let group_by_keys: BTreeSet<String> = cfg.grouping_labels.iter().cloned().collect();
-    signature_bytes(&cfg.metric, &agg_kind, &group_by_keys)
-}
-
-fn build_live_signature_set(config: &InstalledPrecomputePlan) -> HashSet<Vec<u8>> {
-    config
-        .materializations()
-        .values()
-        .map(signature_from_agg_config)
-        .collect()
-}
-
-fn encode_agg_kind(agg_kind: &AggKind, buf: &mut Vec<u8>) {
-    use crate::storage_engines::sketch_db::data::{SketchAlgorithm, SketchConfig};
-    match agg_kind {
-        AggKind::Sketch {
-            algorithm: kind,
-            config,
-            spatial_filter_canonical,
-        } => {
-            buf.push(b'S');
-            buf.push(match kind {
-                SketchAlgorithm::DDSketch => 1,
-                SketchAlgorithm::Kll => 2,
-                SketchAlgorithm::Hll => 3,
-                SketchAlgorithm::CountSketch => 4,
-                SketchAlgorithm::Cms => 5,
-                SketchAlgorithm::CmsWithHeap => 6,
-                SketchAlgorithm::CountSketchWithHeap => 7,
-                SketchAlgorithm::Kmv => 8,
-                SketchAlgorithm::Theta => 9,
-                SketchAlgorithm::UnivMon => 10,
-            });
-            match config {
-                SketchConfig::UnivMon {
-                    heap_size,
-                    sketch_rows,
-                    sketch_cols,
-                    layers,
-                } => {
-                    buf.push(b'U');
-                    buf.extend_from_slice(&heap_size.to_le_bytes());
-                    buf.extend_from_slice(&sketch_rows.to_le_bytes());
-                    buf.extend_from_slice(&sketch_cols.to_le_bytes());
-                    buf.push(*layers);
-                }
-                SketchConfig::DDSketch { relative_accuracy } => {
-                    buf.push(b'D');
-                    buf.extend_from_slice(&relative_accuracy.to_le_bytes());
-                }
-                SketchConfig::Kll { k } => {
-                    buf.push(b'K');
-                    buf.extend_from_slice(&k.to_le_bytes());
-                }
-                SketchConfig::Hll { precision } => {
-                    buf.push(b'H');
-                    buf.extend_from_slice(&precision.to_le_bytes());
-                }
-                SketchConfig::CountSketch { rows, cols } => {
-                    buf.push(b'S');
-                    buf.extend_from_slice(&rows.to_le_bytes());
-                    buf.extend_from_slice(&cols.to_le_bytes());
-                }
-                SketchConfig::CountMin { rows, cols } => {
-                    buf.push(b'M');
-                    buf.extend_from_slice(&rows.to_le_bytes());
-                    buf.extend_from_slice(&cols.to_le_bytes());
-                }
-            }
-            buf.push(b'F');
-            buf.extend_from_slice(spatial_filter_canonical.as_bytes());
-        }
-        AggKind::ExactAgg {
-            agg_type,
-            parameters_canonical,
-            spatial_filter_canonical,
-        } => {
-            buf.push(b'P');
-            buf.extend_from_slice(agg_type.as_str().as_bytes());
-            buf.push(b';');
-            buf.extend_from_slice(parameters_canonical.as_bytes());
-            buf.push(b'F');
-            buf.extend_from_slice(spatial_filter_canonical.as_bytes());
-        }
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use std::collections::HashMap;
-
-    use asap_types::aggregation_config::PrecomputeMaterialization;
-    use asap_types::enums::WindowKind;
-    use asap_types::AggregationType;
-    use asap_types::KeyByLabelNames;
-
-    use crate::storage_engines::sketch_db::data::AggKind;
-    use crate::storage_engines::sketch_db::index::{SketchStore, SummarySeriesMetadata};
-
-    fn agg_config(
-        metric: &str,
-        agg_type: AggregationType,
-        group_by: Vec<&str>,
-    ) -> PrecomputeMaterialization {
-        PrecomputeMaterialization::new(
-            agg_type,
-            String::new(),
-            HashMap::new(),
-            KeyByLabelNames::new(group_by.into_iter().map(|s| s.to_string()).collect()),
-            KeyByLabelNames::empty(),
-            KeyByLabelNames::empty(),
-            String::new(),
-            1,
-            1,
-            WindowKind::Tumbling,
-            String::new(),
-            metric.to_string(),
-            None,
-            None,
-            None,
-        )
-    }
-
-    fn meta(
-        sid: u64,
-        metric: &str,
-        agg_type: AggregationType,
-        group_by: Vec<&str>,
-    ) -> SummarySeriesMetadata {
-        let group_by_keys: BTreeSet<String> = group_by.into_iter().map(|s| s.to_string()).collect();
-        SummarySeriesMetadata {
-            storage_handle: sid,
-            metric_name: metric.to_string(),
-            group_by_keys,
-            capability: None,
-            agg_kind: AggKind::ExactAgg {
-                agg_type,
-                parameters_canonical: String::new(),
-                spatial_filter_canonical: String::new(),
-            },
-            accuracy: None,
-            first_seen_unix_ms: 0,
-            retired_at_ms: None,
-            expires_at_ms: None,
-            policy_fp: asap_types::PolicyFingerprint::UNSET,
-        }
-    }
-
-    fn streaming(configs: Vec<PrecomputeMaterialization>) -> InstalledPrecomputePlan {
-        let mut map = HashMap::new();
-        for (i, c) in configs.into_iter().enumerate() {
-            map.insert(i as u64 + 1, c);
-        }
-        InstalledPrecomputePlan::from_raw_ids(map)
-    }
-
-    #[test]
-    fn empty_config_retires_every_active_sid() {
-        let store = SketchStore::new();
-        store.register(meta(1, "cpu", AggregationType::Sum, vec!["host"]));
-        store.register(meta(2, "mem", AggregationType::Sum, vec!["host"]));
-        let summary =
-            reconcile_from_streaming_config(&store, &streaming(vec![]), Duration::from_secs(60));
-        let mut retired = summary.retired.clone();
-        retired.sort();
-        assert_eq!(retired, vec![1, 2]);
-    }
-
-    #[test]
-    fn config_with_matching_signature_keeps_sid_active() {
-        let store = SketchStore::new();
-        store.register(meta(1, "cpu", AggregationType::Sum, vec!["host"]));
-        let cfg = streaming(vec![agg_config("cpu", AggregationType::Sum, vec!["host"])]);
-        let summary = reconcile_from_streaming_config(&store, &cfg, Duration::from_secs(60));
-        assert!(summary.retired.is_empty());
-    }
-
-    #[test]
-    fn config_with_different_signature_retires_orphan() {
-        let store = SketchStore::new();
-        // sid 1 is Sum-by-host; only Sum-by-region is in the new config.
-        store.register(meta(1, "cpu", AggregationType::Sum, vec!["host"]));
-        let cfg = streaming(vec![agg_config(
-            "cpu",
-            AggregationType::Sum,
-            vec!["region"],
-        )]);
-        let summary = reconcile_from_streaming_config(&store, &cfg, Duration::from_secs(60));
-        assert_eq!(summary.retired, vec![1]);
-    }
-
-    #[test]
-    fn already_retired_sid_is_not_re_retired() {
-        let store = SketchStore::new();
-        store.register(meta(1, "cpu", AggregationType::Sum, vec!["host"]));
-        // First reconcile with empty config retires it.
-        let _ =
-            reconcile_from_streaming_config(&store, &streaming(vec![]), Duration::from_secs(60));
-        // Second reconcile reports nothing new.
-        let summary =
-            reconcile_from_streaming_config(&store, &streaming(vec![]), Duration::from_secs(60));
-        assert!(summary.retired.is_empty());
-    }
-
-    #[test]
-    fn distinct_metrics_do_not_cross_match() {
-        let store = SketchStore::new();
-        store.register(meta(1, "cpu", AggregationType::Sum, vec!["host"]));
-        // Same agg_kind + grouping, different metric — sid 1 must
-        // still retire because its signature includes the metric.
-        let cfg = streaming(vec![agg_config("mem", AggregationType::Sum, vec!["host"])]);
-        let summary = reconcile_from_streaming_config(&store, &cfg, Duration::from_secs(60));
-        assert_eq!(summary.retired, vec![1]);
-    }
-
-    #[test]
-    fn different_agg_type_does_not_match() {
-        let store = SketchStore::new();
-        store.register(meta(1, "cpu", AggregationType::Sum, vec!["host"]));
-        let cfg = streaming(vec![agg_config(
-            "cpu",
-            AggregationType::Increase,
-            vec!["host"],
-        )]);
-        let summary = reconcile_from_streaming_config(&store, &cfg, Duration::from_secs(60));
-        assert_eq!(summary.retired, vec![1]);
-    }
-
-    fn meta_sketch(
-        sid: u64,
-        metric: &str,
-        kind: crate::storage_engines::sketch_db::data::SketchAlgorithm,
-        config: crate::storage_engines::sketch_db::data::SketchConfig,
-        group_by: Vec<&str>,
-    ) -> SummarySeriesMetadata {
-        let group_by_keys: BTreeSet<String> = group_by.into_iter().map(|s| s.to_string()).collect();
-        SummarySeriesMetadata {
-            storage_handle: sid,
-            metric_name: metric.to_string(),
-            group_by_keys,
-            capability: None,
-            agg_kind: AggKind::Sketch {
-                algorithm: kind,
-                config,
-                spatial_filter_canonical: String::new(),
-            },
-            accuracy: None,
-            first_seen_unix_ms: 0,
-            retired_at_ms: None,
-            expires_at_ms: None,
-            policy_fp: asap_types::PolicyFingerprint::UNSET,
-        }
-    }
-
-    // Regression: the precompute-shaped signature reconcile must NOT
-    // retire `AggKind::Sketch` sids. `build_live_signature_set` only ever
-    // emits `ExactAgg`-shaped (`P`-prefixed) signatures from the streaming
-    // config, so a sketch sid's `S`-prefixed signature can never be in the
-    // live set. Before the fix this scan unconditionally orphaned every
-    // OTLP-ingested KLL / HLL / DDSketch sid on the first reconcile, which
-    // barred ingest, let eviction drop their state, and turned them into
-    // query-time `Ghost`s that short-circuited warm quantile / cardinality
-    // queries to CapabilityMiss. Sketch-sid lifecycle is the control
-    // plane's eviction RPC's job, not this path's.
-    #[test]
-    fn sketch_sids_are_never_retired_by_signature_reconcile() {
-        use crate::storage_engines::sketch_db::data::{SketchAlgorithm, SketchConfig};
-        let store = SketchStore::new();
-        store.register(meta_sketch(
-            1,
-            "http_requests_total_latency_ms",
-            SketchAlgorithm::Kll,
-            SketchConfig::Kll { k: 200 },
-            vec!["node", "pod", "zone"],
-        ));
-        store.register(meta_sketch(
-            2,
-            "unique_users_per_min",
-            SketchAlgorithm::Hll,
-            SketchConfig::Hll { precision: 12 },
-            vec!["zone"],
-        ));
-        // A precompute (ExactAgg) sid with no live config entry SHOULD
-        // still retire — the fix is scoped to sketch sids only.
-        store.register(meta(3, "cpu", AggregationType::Sum, vec!["host"]));
-
-        // Live config carries an unrelated ExactAgg policy; none of the
-        // sketch sids' signatures can match it.
-        let cfg = streaming(vec![agg_config("mem", AggregationType::Sum, vec!["host"])]);
-        let summary = reconcile_from_streaming_config(&store, &cfg, Duration::from_secs(60));
-
-        // Only the orphaned precompute sid retires; both sketch sids stay
-        // Active so the warm query path can keep resolving them.
-        assert_eq!(summary.retired, vec![3], "only the ExactAgg orphan retires");
-        assert!(
-            matches!(
-                store.classify(1),
-                crate::storage_engines::sketch_db::index::SeriesLookup::Ghost
-            ),
-            "sketch sid 1 stays registered + Active (Ghost only because no data appended in-test)"
-        );
-        let inst1 = store.instance(1).expect("sketch sid 1 still registered");
-        assert_eq!(
-            inst1.status(),
-            AggStatus::Active,
-            "KLL sketch sid must remain Active after reconcile"
-        );
-        let inst2 = store.instance(2).expect("sketch sid 2 still registered");
-        assert_eq!(
-            inst2.status(),
-            AggStatus::Active,
-            "HLL sketch sid must remain Active after reconcile"
-        );
-    }
-
-    #[test]
-    fn gate_skips_reconcile_on_unchanged_config_arc() {
-        let store = SketchStore::new();
-        store.register(meta(1, "cpu", AggregationType::Sum, vec!["host"]));
-        // Empty config would orphan sid 1.
-        let cfg = Arc::new(streaming(vec![]));
-
-        // First call against this Arc runs a real reconcile and
-        // retires the orphan.
-        let first = reconcile_if_config_changed(&store, &cfg, Duration::from_secs(60));
-        assert_eq!(first.expect("first call reconciles").retired, vec![1]);
-
-        // Second call with the SAME Arc is skipped entirely — no
-        // catalog scan, returns None. (Even though a fresh
-        // unconditional reconcile would report nothing, the point is
-        // the scan didn't run.)
-        let second = reconcile_if_config_changed(&store, &cfg, Duration::from_secs(60));
-        assert!(second.is_none(), "same config Arc must skip the scan");
-    }
-
-    #[test]
-    fn gate_runs_reconcile_when_config_arc_changes() {
-        let store = SketchStore::new();
-        store.register(meta(1, "cpu", AggregationType::Sum, vec!["host"]));
-
-        // A config that keeps sid 1 alive — first reconcile retires
-        // nothing and arms the gate.
-        let keep = Arc::new(streaming(vec![agg_config(
-            "cpu",
-            AggregationType::Sum,
-            vec!["host"],
-        )]));
-        let r1 = reconcile_if_config_changed(&store, &keep, Duration::from_secs(60));
-        assert!(r1.expect("first reconcile runs").retired.is_empty());
-
-        // A NEW Arc (different config) must defeat the gate and run a
-        // fresh reconcile that now retires the orphaned sid.
-        let drop_all = Arc::new(streaming(vec![]));
-        let r2 = reconcile_if_config_changed(&store, &drop_all, Duration::from_secs(60));
-        assert_eq!(r2.expect("changed config Arc reconciles").retired, vec![1]);
-    }
-}
diff --git a/data_plane/src/storage_engines/sketch_db/lifecycle/status.rs b/data_plane/src/storage_engines/sketch_db/lifecycle/status.rs
deleted file mode 100644
index f73f1a69b..000000000
--- a/data_plane/src/storage_engines/sketch_db/lifecycle/status.rs
+++ /dev/null
@@ -1,38 +0,0 @@
-//! Lifecycle state shared by the sid catalog and the eviction
-//! service. The status enum is intrinsic to *every* per-instance
-//! lifecycle (whether keyed by agg_id historically or by sid today),
-//! so it lives here next to the eviction + reconcile services that
-//! drive transitions.
-
-use std::time::Duration;
-
-/// Lifecycle state of one sketch instance (sid). Derived from the
-/// instance's `retired_at_ms` / `expires_at_ms` timestamps and the
-/// current wall clock — never stored directly because retirement is
-/// time-driven (a `Retired` sid auto-promotes to `Expired` when the
-/// clock crosses `expires_at_ms`, without any state mutation).
-#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
-pub enum AggStatus {
-    /// Sid is reachable from the current `InstalledPrecomputePlan`. Writes
-    /// accepted; queries see live data.
-    Active,
-    /// Sid's signature no longer appears in the current
-    /// `InstalledPrecomputePlan` but its data is still within retention.
-    /// Writes rejected by the §6.3 sid-level ingest barrier
-    /// (`SketchStore::ingest_precompute_for_agg_config` returns
-    /// `None`); reads allowed for queries that reference the
-    /// historical window.
-    Retired,
-    /// Past retention. Scheduled for deletion by the eviction sweep
-    /// in [`crate::storage_engines::sketch_db::lifecycle::eviction::SchemaEvictionService`].
-    Expired,
-}
-
-/// Default retention for a sid before eviction.
-///
-/// 24 hours — covers dashboards / ad-hoc queries that may still
-/// reference an old agg-signature mid-reconfigure. Shorter than the
-/// typical SketchStore data retention (7d+) so sid-level eviction
-/// runs first, freeing space cleanly without fighting per-record
-/// retention.
-pub const DEFAULT_RETIREMENT_RETENTION: Duration = Duration::from_secs(24 * 3600);
diff --git a/data_plane/src/storage_engines/sketch_db/metrics.rs b/data_plane/src/storage_engines/sketch_db/metrics.rs
deleted file mode 100644
index c03031f0b..000000000
--- a/data_plane/src/storage_engines/sketch_db/metrics.rs
+++ /dev/null
@@ -1,26 +0,0 @@
-//! Prometheus metrics exposed on `/metrics` for the sketch DB.
-//!
-//! Scope: counters / gauges that turn otherwise-silent ingest or
-//! eviction behaviour into graphable signals. Registered via
-//! `lazy_static` + `prometheus::register_counter_vec!`, so a single
-//! `prometheus::gather()` at the HTTP handler picks them up
-//! automatically.
-
-use lazy_static::lazy_static;
-use prometheus::{register_counter_vec, CounterVec};
-
-lazy_static! {
-    /// §6.3 write-side barrier drops, per `agg_id`. Incremented when
-    /// the ingest path matches a sample's metric to an agg config
-    /// whose `AggSchema` is Retired or Expired, so the sample is
-    /// dropped instead of being routed to a worker. A non-zero rate
-    /// with no Retired/Expired schemas in the registry means the
-    /// reconcile / hot-reload path is lagging — silent drop becomes
-    /// a graphable alert condition.
-    pub static ref SAMPLES_BLOCKED_BY_SCHEMA_BARRIER: CounterVec = register_counter_vec!(
-        "queryengine_ingest_samples_blocked_by_schema_barrier_total",
-        "Ingest samples dropped by the §6.3 write-side schema barrier, keyed by agg_id",
-        &["agg_id"]
-    )
-    .unwrap();
-}
diff --git a/data_plane/src/storage_engines/sketch_db/mod.rs b/data_plane/src/storage_engines/sketch_db/mod.rs
deleted file mode 100644
index 0ef39870c..000000000
--- a/data_plane/src/storage_engines/sketch_db/mod.rs
+++ /dev/null
@@ -1,36 +0,0 @@
-//! Summary storage, persistence, query composition, lifecycle, and backfill.
-//!
-//! The sid-keyed index holds instance metadata and per-window state. Lifecycle
-//! services reconcile configured policies and evict expired instances. Backfill
-//! rebuilds windows from source samples through its own worker and registry.
-
-pub mod accuracy;
-pub mod backfill;
-pub mod data;
-pub mod index;
-pub mod lifecycle;
-pub mod metrics;
-pub mod persistence;
-pub mod query;
-pub mod sds;
-
-pub use accuracy::{AccuracyEnvelope, AccuracyKind, AccuracyProfile, PerSegmentAccuracy};
-pub use backfill::{
-    build_dag_accumulator, clickhouse_reader_factory, default_reader_factory, noop_reader_factory,
-    BackfillJob, BackfillRegistry, BackfillService, BackfillServiceConfig, BackfillServiceHandle,
-    BackfillSource, BackfillStatus, BackfillWindowProcessor, BackfillWorker, BackfillWorkerError,
-    ClickHouseReaderConfig, Coverage, CreateError, LabelFilter, MockRawSampleReader,
-    PrometheusReader, RawSample, RawSampleReader, RawSampleReaderError, ReaderFactory,
-    WindowProcessor,
-};
-pub use lifecycle::{
-    warn_if_retention_inverted, AggStatus, SchemaEvictionConfig, SchemaEvictionHandle,
-    SchemaEvictionService, DEFAULT_RETIREMENT_RETENTION,
-};
-pub use query::timeline::{TimelineCoverage, TimelineSegment};
-pub use sds::{
-    DataDescriptor, DataDescriptorId, SdsBinding, SummaryDescriptor, SummaryDescriptorId,
-    SummaryDescriptorRegistry, SummaryOperator,
-};
-
-pub mod current_series;
diff --git a/data_plane/src/storage_engines/sketch_db/persistence/cache.rs b/data_plane/src/storage_engines/sketch_db/persistence/cache.rs
deleted file mode 100644
index 0c235a451..000000000
--- a/data_plane/src/storage_engines/sketch_db/persistence/cache.rs
+++ /dev/null
@@ -1,77 +0,0 @@
-//! Tier-2 read-side part cache. Moka-backed, bounded by bytes,
-//! W-TinyLFU eviction. Keyed on `PartId`; values are `Arc<PartReader>`
-//! which holds the mmap handles for a part's three files.
-//!
-//! The cache has no consistency obligations (it is never dirty), so
-//! the flusher can invalidate entries whenever it deletes a part.
-
-use std::path::Path;
-use std::sync::Arc;
-
-use moka::sync::Cache;
-
-use super::part::{part_dir_path, PartId, PartReader};
-use super::PersistResult;
-
-/// A cached, mmap-backed `PartReader`. Returned by [`PartCache::get`].
-pub type LoadedPart = Arc<PartReader>;
-
-/// Bounded cache of decoded parts. Cheap to clone — it's an `Arc`
-/// inside.
-#[derive(Clone)]
-pub struct PartCache {
-    inner: Option<Cache<PartId, LoadedPart>>,
-    parts_root: std::path::PathBuf,
-}
-
-impl PartCache {
-    /// Construct a cache with a byte budget. A budget of 0 disables
-    /// caching entirely — every query path goes straight to disk.
-    pub fn new(parts_root: std::path::PathBuf, byte_budget: u64) -> Self {
-        let inner = if byte_budget == 0 {
-            None
-        } else {
-            Some(
-                Cache::builder()
-                    .weigher(|_k: &PartId, v: &LoadedPart| -> u32 {
-                        // Weight = sum of mmap'd bytes. Moka's weigher
-                        // returns u32, so clamp large parts.
-                        let len = v.meta.data_len + v.meta.index_len;
-                        len.min(u32::MAX as u64) as u32
-                    })
-                    .max_capacity(byte_budget)
-                    .build(),
-            )
-        };
-        Self { inner, parts_root }
-    }
-
-    /// Get (or load) a `PartReader` for `part_id`. On miss, mmaps the
-    /// part's files from disk.
-    pub fn get_or_load(&self, part_id: PartId) -> PersistResult<LoadedPart> {
-        if let Some(inner) = &self.inner {
-            if let Some(hit) = inner.get(&part_id) {
-                return Ok(hit);
-            }
-            let part_dir = part_dir_path(&self.parts_root, part_id);
-            let reader = Arc::new(PartReader::open(&part_dir)?);
-            inner.insert(part_id, Arc::clone(&reader));
-            Ok(reader)
-        } else {
-            let part_dir = part_dir_path(&self.parts_root, part_id);
-            Ok(Arc::new(PartReader::open(&part_dir)?))
-        }
-    }
-
-    /// Drop the cached entry for `part_id`. Idempotent.
-    pub fn invalidate(&self, part_id: PartId) {
-        if let Some(inner) = &self.inner {
-            inner.invalidate(&part_id);
-        }
-    }
-
-    /// Diagnostic: approximate entry count (0 if caching disabled).
-    pub fn entry_count(&self) -> u64 {
-        self.inner.as_ref().map(|c| c.entry_count()).unwrap_or(0)
-    }
-}
diff --git a/data_plane/src/storage_engines/sketch_db/persistence/config.rs b/data_plane/src/storage_engines/sketch_db/persistence/config.rs
deleted file mode 100644
index 13999a1a1..000000000
--- a/data_plane/src/storage_engines/sketch_db/persistence/config.rs
+++ /dev/null
@@ -1,87 +0,0 @@
-use std::path::PathBuf;
-use std::time::Duration;
-
-/// Configuration for the SketchStore persistence layer.
-///
-/// The two bounding knobs, in priority order:
-///
-/// * **Memory budget (primary).** When in-memory sealed-epoch bytes exceed
-///   `memory_limit_bytes`, the background flusher evicts oldest-sealed-epoch
-///   first (globally, by `end_ts`) until usage drops below
-///   `memory_low_watermark_bytes`. If usage reaches `hard_cap_bytes` inside
-///   an insert, the insert path blocks until the flusher catches up.
-///
-/// * **Time watermark (secondary).** Any sealed epoch whose `end_ts` is
-///   older than `now - hot_window_ms` is flushed on the next tick even if
-///   the store is nowhere near the memory budget. Guarantees a predictable
-///   hot-set size under light ingest.
-///
-/// Plus a disk-retention knob:
-///
-/// * **Cold TTL.** Any part whose `max_ts` is older than
-///   `now - delete_older_than_ms` is deleted from disk on the next tick.
-///   Bounds manifest size and long-running directory growth.
-#[derive(Debug, Clone)]
-pub struct SketchStorePersistenceConfig {
-    // ---- Primary: memory budget ----
-    pub memory_limit_bytes: usize,
-    pub memory_low_watermark_bytes: usize,
-    pub hard_cap_bytes: usize,
-
-    // ---- Secondary: time watermark T ----
-    /// Hot-window length in milliseconds. `None` disables time-based flushing.
-    pub hot_window_ms: Option<u64>,
-
-    // ---- Disk retention ----
-    /// Cold-tier TTL in milliseconds. `None` disables cold deletion.
-    /// Should be much larger than `hot_window_ms` (hours or days).
-    pub delete_older_than_ms: Option<u64>,
-
-    // ---- Misc ----
-    /// Cadence of the background flusher loop.
-    pub flush_interval: Duration,
-
-    /// Root directory for segment files and the parts manifest.
-    pub disk_path: PathBuf,
-
-    /// Tier-2 part-cache byte budget. 0 disables the cache (every cold
-    /// query pays disk I/O). Default is `min(10% * memory_limit_bytes,
-    /// 512 MiB)` — scale it with the write budget, not a fixed number.
-    pub part_cache_bytes: u64,
-
-    /// Seal cadence in DISTINCT WINDOWS. The per-sid hot `current_epoch`
-    /// is sealed into the (in-memory, pending-flush) sealed-epoch ring
-    /// once it accumulates this many distinct windows; the background
-    /// flusher then turns sealed epochs into durable disk parts and
-    /// evicts them. This is what makes sealing fire in production — the
-    /// in-memory-only deployment never seals (`epoch_capacity == None`).
-    ///
-    /// Sizing: the agent emits ~30s tumbling panes, so `20` windows is
-    /// ~10 min of one series per part — large enough to amortize the
-    /// per-part header/index overhead, small enough that the most-recent
-    /// fully-behind-`hot_window` data is actually sealed (and thus
-    /// flushable) rather than stuck un-sealed in `current_epoch`.
-    /// `0` disables cadence sealing (no durable tier even if a disk_path
-    /// is set).
-    pub seal_window_count: usize,
-}
-
-impl SketchStorePersistenceConfig {
-    /// Build a config with sensible defaults relative to a memory budget.
-    pub fn with_memory_limit(memory_limit_bytes: usize, disk_path: PathBuf) -> Self {
-        let low_water = memory_limit_bytes * 8 / 10; // 80% of high water
-        let hard_cap = memory_limit_bytes * 125 / 100; // 125% of high water
-        let cache = (memory_limit_bytes / 10).min(512 * 1024 * 1024) as u64;
-        Self {
-            memory_limit_bytes,
-            memory_low_watermark_bytes: low_water,
-            hard_cap_bytes: hard_cap,
-            hot_window_ms: Some(60 * 60 * 1000), // 1 hour
-            delete_older_than_ms: Some(7 * 24 * 60 * 60 * 1000), // 7 days
-            flush_interval: Duration::from_secs(1),
-            disk_path,
-            part_cache_bytes: cache,
-            seal_window_count: 20, // ~10 min of 30s panes per part
-        }
-    }
-}
diff --git a/data_plane/src/storage_engines/sketch_db/persistence/flusher.rs b/data_plane/src/storage_engines/sketch_db/persistence/flusher.rs
deleted file mode 100644
index dc9e8cb6c..000000000
--- a/data_plane/src/storage_engines/sketch_db/persistence/flusher.rs
+++ /dev/null
@@ -1,763 +0,0 @@
-//! Background flusher thread. Pulls sealed epochs out of an
-//! [`EpochSource`], bundles them into on-disk parts, and evicts them
-//! from memory.
-//!
-//! One part per flush tick. Three phases:
-//!
-//! 1. **Memory pressure** — if `source.approx_memory_bytes()` exceeds
-//!    `memory_limit_bytes`, collect oldest-first (round-robin by agg)
-//!    until projected memory drops under `memory_low_watermark_bytes`.
-//! 2. **Time watermark** — any sealed epoch whose `end_ts` is older
-//!    than `now - hot_window_ms` is added to the flush set even if the
-//!    store is well under the memory budget.
-//! 3. **T2 retention sweep** — parts whose `max_ts` is older than
-//!    `now - delete_older_than_ms` are removed from the manifest and
-//!    their directories are `rm -rf`'d.
-
-use std::collections::HashMap;
-use std::path::PathBuf;
-use std::sync::atomic::{AtomicBool, AtomicU64, Ordering};
-use std::sync::{Arc, Condvar, Mutex};
-use std::thread::{self, JoinHandle};
-use std::time::{Duration, Instant, SystemTime, UNIX_EPOCH};
-
-use tracing::{debug, error, info, warn};
-
-use super::config::SketchStorePersistenceConfig;
-use super::manifest::{Manifest, PartEntry};
-use super::part::{part_dir_path, PartWriter};
-use super::source::{EpochSnapshot, EpochSource, SealedEpochRef};
-use super::{PersistError, PersistResult};
-
-/// Handle to a running flusher thread. Dropping the handle signals
-/// shutdown and joins the thread.
-pub struct FlusherHandle {
-    pub(super) inner: Arc<FlusherShared>,
-    thread: Option<JoinHandle<()>>,
-}
-
-pub(crate) struct FlusherShared {
-    pub cfg: SketchStorePersistenceConfig,
-    pub manifest: Arc<Manifest>,
-    /// Per-sid metadata sidecar — upserted on every flush so recovery can
-    /// re-register disk-resident sids as queryable instances. See
-    /// [`super::metadata`].
-    pub sid_metadata: Arc<super::metadata::StoredOutputMetadataFile>,
-    pub next_part_id: AtomicU64,
-    pub shutdown: AtomicBool,
-    /// Woken by the insert path when it hits `hard_cap_bytes` and by
-    /// the flusher when it finishes a tick.
-    pub pressure_cv: Condvar,
-    pub pressure_mutex: Mutex<()>,
-    /// Monotonic counter of how many times `wait_for_memory_under`
-    /// has entered its blocking wait loop because `mem_counter >= cap`.
-    /// Incremented exactly once per back-pressure-triggered call; used
-    /// as a timing-independent signal in tests (wall-clock thresholds
-    /// are flaky on fast CI runners where a flush tick completes in
-    /// <1 ms).
-    pub back_pressure_wait_count: AtomicU64,
-}
-
-impl FlusherShared {
-    pub(super) fn allocate_part_id(&self) -> PersistResult<u64> {
-        self.next_part_id
-            .fetch_update(Ordering::Relaxed, Ordering::Relaxed, |id| id.checked_add(1))
-            .map_err(|_| PersistError::Internal("part ID exhausted".into()))
-    }
-}
-
-impl FlusherHandle {
-    /// Start a flusher thread. Takes an `EpochSource` (typically the
-    /// store itself, wrapped in `Arc`).
-    pub fn start<S>(
-        cfg: SketchStorePersistenceConfig,
-        manifest: Arc<Manifest>,
-        source: Arc<S>,
-    ) -> PersistResult<Self>
-    where
-        S: EpochSource + 'static,
-    {
-        let metadata = Arc::new(super::metadata::StoredOutputMetadataFile::new(
-            &cfg.disk_path,
-        ));
-        Self::start_with_metadata(cfg, manifest, source, metadata)
-    }
-
-    pub(crate) fn start_with_metadata<S>(
-        cfg: SketchStorePersistenceConfig,
-        manifest: Arc<Manifest>,
-        source: Arc<S>,
-        sid_metadata: Arc<super::metadata::StoredOutputMetadataFile>,
-    ) -> PersistResult<Self>
-    where
-        S: EpochSource + 'static,
-    {
-        // Pick a starting part_id: one past the max currently in the
-        // manifest (so IDs are monotonically increasing across restarts).
-        let reserved = sid_metadata.load_strict()?.into_iter().flat_map(|r| {
-            [r.pending_immutable, r.last_immutable]
-                .into_iter()
-                .flatten()
-                .map(|p| p.part_id)
-        });
-        let next_id = manifest
-            .live_parts()
-            .iter()
-            .map(|p| p.part_id)
-            .chain(reserved)
-            .max()
-            .map(|m| {
-                m.checked_add(1)
-                    .ok_or_else(|| PersistError::Internal("part ID exhausted".into()))
-            })
-            .transpose()?
-            .unwrap_or(1);
-
-        let shared = Arc::new(FlusherShared {
-            cfg: cfg.clone(),
-            manifest: manifest.clone(),
-            sid_metadata,
-            next_part_id: AtomicU64::new(next_id),
-            shutdown: AtomicBool::new(false),
-            pressure_cv: Condvar::new(),
-            pressure_mutex: Mutex::new(()),
-            back_pressure_wait_count: AtomicU64::new(0),
-        });
-
-        let shared_for_thread = Arc::clone(&shared);
-        let thread = thread::Builder::new()
-            .name("simple-map-store-flusher".into())
-            .spawn(move || run_flusher_loop(shared_for_thread, source))
-            .map_err(PersistError::Io)?;
-
-        Ok(Self {
-            inner: shared,
-            thread: Some(thread),
-        })
-    }
-
-    pub(crate) fn metadata_store(&self) -> Arc<super::metadata::StoredOutputMetadataFile> {
-        Arc::clone(&self.inner.sid_metadata)
-    }
-
-    /// Signal shutdown and wait for the thread to finish its current
-    /// tick. Safe to call multiple times; subsequent calls are no-ops.
-    pub fn shutdown(&mut self) {
-        self.inner.shutdown.store(true, Ordering::Release);
-        self.inner.pressure_cv.notify_all();
-        if let Some(handle) = self.thread.take() {
-            if let Err(e) = handle.join() {
-                error!("flusher thread panicked on join: {:?}", e);
-            }
-        }
-    }
-
-    /// Access to the manifest for the query read-through path.
-    pub fn manifest(&self) -> Arc<Manifest> {
-        Arc::clone(&self.inner.manifest)
-    }
-
-    /// Total number of times the insert hot path has entered
-    /// `wait_for_memory_under`'s blocking wait loop (i.e. observed
-    /// sealed memory at or above `hard_cap_bytes`). Monotonic counter,
-    /// used by back-pressure tests as a timing-independent signal.
-    pub fn back_pressure_wait_count(&self) -> u64 {
-        self.inner.back_pressure_wait_count.load(Ordering::Relaxed)
-    }
-
-    pub fn disk_path(&self) -> &std::path::Path {
-        &self.inner.cfg.disk_path
-    }
-}
-
-impl Drop for FlusherHandle {
-    fn drop(&mut self) {
-        self.shutdown();
-    }
-}
-
-fn run_flusher_loop<S: EpochSource>(shared: Arc<FlusherShared>, source: Arc<S>) {
-    info!(
-        "flusher thread started: disk_path={:?}, memory_limit={} bytes, hot_window={:?} ms, flush_interval={:?}",
-        shared.cfg.disk_path,
-        shared.cfg.memory_limit_bytes,
-        shared.cfg.hot_window_ms,
-        shared.cfg.flush_interval,
-    );
-
-    loop {
-        if shared.shutdown.load(Ordering::Acquire) {
-            break;
-        }
-
-        // Cond-var wait: sleep for up to `flush_interval`, woken early
-        // on pressure.
-        {
-            let guard = shared.pressure_mutex.lock().unwrap();
-            let _ = shared
-                .pressure_cv
-                .wait_timeout(guard, shared.cfg.flush_interval)
-                .unwrap();
-        }
-
-        if shared.shutdown.load(Ordering::Acquire) {
-            break;
-        }
-
-        let tick_start = Instant::now();
-        match run_tick(&shared, source.as_ref()) {
-            Ok(stats) => {
-                if stats.entries_flushed > 0 || stats.parts_deleted > 0 {
-                    debug!(
-                        "flusher tick done in {:?}: entries={}, parts_written={}, parts_deleted={}",
-                        tick_start.elapsed(),
-                        stats.entries_flushed,
-                        stats.parts_written,
-                        stats.parts_deleted,
-                    );
-                }
-            }
-            Err(e) => {
-                error!("flusher tick error: {}", e);
-            }
-        }
-
-        // Always notify the pressure condvar so blocked inserts wake
-        // up when memory has been freed.
-        shared.pressure_cv.notify_all();
-    }
-
-    info!("flusher thread exiting cleanly");
-}
-
-#[derive(Debug, Default)]
-struct TickStats {
-    entries_flushed: usize,
-    parts_written: usize,
-    parts_deleted: usize,
-}
-
-fn run_tick<S: EpochSource>(shared: &Arc<FlusherShared>, source: &S) -> PersistResult<TickStats> {
-    let mut stats = TickStats::default();
-    let now = now_ms();
-    let cfg = &shared.cfg;
-
-    // ---- Phase 0: time-driven seal of aged un-sealed windows ----
-    // The count-driven seal cadence (`seal_window_count`) only fires once
-    // a series' `current_epoch` reaches N distinct windows. A slow or
-    // stalled series never gets there, so its aged windows sit un-sealed
-    // in `current_epoch` — and the hot-window phase below only flushes
-    // SEALED epochs, so those windows would never be made durable. Roll
-    // any window older than the hot window into a sealed epoch first so
-    // it becomes flushable this same tick. (Without `hot_window_ms` the
-    // durable tier is purely memory-pressure driven and phase 1 below
-    // handles eviction.)
-    let flush_cutoff = cfg
-        .hot_window_ms
-        .map(|hot| now.saturating_sub(hot))
-        .max(source.flush_before_ms());
-    if let Some(cutoff) = flush_cutoff {
-        source.seal_aged_epochs(cutoff);
-    }
-
-    // ---- Collect candidates across phase 1 and phase 2 ----
-    let mut all = source.list_sealed_epochs();
-    // Oldest-first by end_ts.
-    all.sort_by_key(|r| r.end_ts);
-
-    let mem = source.approx_memory_bytes();
-
-    let need_memory_pressure = mem > cfg.memory_limit_bytes;
-    let low_water_goal = cfg.memory_low_watermark_bytes;
-    let mut projected_after_evict: i64 = mem as i64;
-
-    let mut selected: Vec<SealedEpochRef> = Vec::new();
-    // Phase 1: memory pressure.
-    if need_memory_pressure {
-        for r in &all {
-            if projected_after_evict <= low_water_goal as i64 {
-                break;
-            }
-            selected.push(*r);
-            projected_after_evict -= r.approx_bytes as i64;
-        }
-    }
-
-    // Phase 2: time watermark (any epoch older than now - hot_window).
-    if let Some(cutoff) = flush_cutoff {
-        for r in &all {
-            if r.end_ts < cutoff
-                && !selected
-                    .iter()
-                    .any(|s| s.agg_id == r.agg_id && s.epoch_id == r.epoch_id)
-            {
-                selected.push(*r);
-            }
-        }
-    }
-
-    if !selected.is_empty() {
-        // Round-robin across agg-ids inside the tick for lock spread.
-        let selected = round_robin_by_agg(selected);
-
-        // Take snapshots one by one, skipping any that have already
-        // been evicted racily.
-        let mut snapshots: Vec<EpochSnapshot> = Vec::new();
-        for r in &selected {
-            match source.snapshot_sealed_epoch(r.agg_id, r.epoch_id) {
-                Ok(Some(s)) => snapshots.push(s),
-                Ok(None) => {
-                    // Already evicted by a concurrent flusher tick (shouldn't
-                    // happen with a single flusher) or by the store itself.
-                    debug!(
-                        "flusher: snapshot of ({}, {}) returned None, skipping",
-                        r.agg_id, r.epoch_id
-                    );
-                }
-                Err(e) => {
-                    warn!(
-                        "flusher: snapshot of ({}, {}) failed: {}; skipping",
-                        r.agg_id, r.epoch_id, e
-                    );
-                }
-            }
-        }
-
-        if !snapshots.is_empty() {
-            // Build one part for the tick.
-            let part_id = shared.allocate_part_id()?;
-            let part_dir = part_dir_path(&parts_root(&cfg.disk_path), part_id);
-            let entries_total: usize = snapshots.iter().map(|s| s.len()).sum();
-            let size_bytes_estimate: u64 = snapshots.iter().map(|s| s.approx_bytes as u64).sum();
-
-            let report = PartWriter::write_part(&part_dir, part_id, &snapshots)?;
-            shared.manifest.append_add(PartEntry {
-                part_id,
-                min_ts: report.min_ts,
-                max_ts: report.max_ts,
-                size_bytes: report.data_len + report.index_len + size_bytes_estimate,
-            })?;
-
-            // Persist the per-sid metadata sidecar for every sid this part
-            // makes durable, BEFORE eviction. The on-disk part carries only
-            // label VALUES + sketch_type_name; the sidecar carries the
-            // metric name, group-by KEYS, and structured `AggKind` that the
-            // query path's `instances_matching` / disk-union need to serve
-            // the series after a restart. Done before evict so the metadata
-            // is durable whenever the part it describes is. A sidecar write
-            // failure must NOT abort the flush (the part is already durable)
-            // — log and continue; recovery degrades to live-ingest re-register.
-            let sid_meta: Vec<super::metadata::StoredOutputMetadataRecord> = {
-                let mut seen = std::collections::HashSet::new();
-                snapshots
-                    .iter()
-                    .filter(|s| seen.insert(s.agg_id))
-                    .filter_map(|s| source.instance_metadata_for_persist(s.agg_id))
-                    .collect()
-            };
-            if let Err(e) = shared.sid_metadata.upsert_all(&sid_meta) {
-                warn!(
-                    part_id,
-                    error = %e,
-                    "flusher: sid-metadata sidecar upsert failed; recovered series \
-                     for these sids may need a live DataPoint to become queryable"
-                );
-            }
-
-            // Now that the part is durable and referenced, evict the
-            // source epochs.
-            for s in &snapshots {
-                source.evict_sealed_epoch(s.agg_id, s.epoch_id);
-            }
-
-            stats.entries_flushed = entries_total;
-            stats.parts_written = 1;
-        }
-    }
-
-    // Phase 3: T2 sweep.
-    if let Some(ttl) = cfg.delete_older_than_ms {
-        let cutoff = now.saturating_sub(ttl);
-        let expired: Vec<PartEntry> = shared
-            .manifest
-            .live_parts()
-            .into_iter()
-            .filter(|p| p.max_ts < cutoff)
-            .collect();
-        // Read reservations after capturing candidates: a newly published part
-        // cannot enter the older candidate set after this check.
-        let reserved: std::collections::HashSet<_> = shared
-            .sid_metadata
-            .load_strict()?
-            .into_iter()
-            .filter_map(|record| record.pending_immutable.map(|pending| pending.part_id))
-            .collect();
-        let expired: Vec<_> = expired
-            .into_iter()
-            .filter(|part| !reserved.contains(&part.part_id))
-            .collect();
-        for p in &expired {
-            shared.manifest.append_delete(p.part_id)?;
-            let dir = part_dir_path(&parts_root(&cfg.disk_path), p.part_id);
-            if let Err(e) = std::fs::remove_dir_all(&dir) {
-                warn!(
-                    "flusher T2 sweep: failed to rm {:?}: {} (will be retried on restart)",
-                    dir, e
-                );
-            }
-        }
-        stats.parts_deleted = expired.len();
-    }
-
-    Ok(stats)
-}
-
-/// Interleave a selected-epoch list by agg-id so a burst on one hot
-/// agg doesn't monopolize the flush-tick lock sequence.
-fn round_robin_by_agg(selected: Vec<SealedEpochRef>) -> Vec<SealedEpochRef> {
-    let mut by_agg: HashMap<u64, Vec<SealedEpochRef>> = HashMap::new();
-    // Preserve oldest-first order within each agg.
-    for r in selected {
-        by_agg.entry(r.agg_id).or_default().push(r);
-    }
-    // Sort agg_ids for deterministic order (test-friendly).
-    let mut agg_ids: Vec<u64> = by_agg.keys().copied().collect();
-    agg_ids.sort_unstable();
-    let mut out = Vec::new();
-    let mut i = 0usize;
-    loop {
-        let mut made_progress = false;
-        for ag in &agg_ids {
-            if let Some(lst) = by_agg.get_mut(ag) {
-                if i < lst.len() {
-                    out.push(lst[i]);
-                    made_progress = true;
-                }
-            }
-        }
-        if !made_progress {
-            break;
-        }
-        i += 1;
-    }
-    out
-}
-
-pub(crate) fn parts_root(disk_path: &std::path::Path) -> PathBuf {
-    disk_path.join("parts")
-}
-
-fn now_ms() -> u64 {
-    SystemTime::now()
-        .duration_since(UNIX_EPOCH)
-        .map(|d| d.as_millis() as u64)
-        .unwrap_or(0)
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use crate::storage_engines::sketch_db::index::persistence::source::{
-        EpochSnapshot, EpochSnapshotEntry,
-    };
-    use crate::storage_engines::types::KeyByLabelValues;
-    use std::sync::Mutex as StdMutex;
-    use std::time::Duration;
-    use tempfile::TempDir;
-
-    /// A fake `EpochSource` with a fixed set of sealed epochs.
-    struct FakeSource {
-        epochs: StdMutex<HashMap<(u64, u64), EpochSnapshot>>,
-        memory: AtomicU64,
-    }
-
-    impl FakeSource {
-        fn new(snapshots: Vec<EpochSnapshot>) -> Self {
-            let mut map = HashMap::new();
-            let mut total = 0u64;
-            for s in snapshots {
-                total += s.approx_bytes as u64;
-                map.insert((s.agg_id, s.epoch_id), s);
-            }
-            Self {
-                epochs: StdMutex::new(map),
-                memory: AtomicU64::new(total),
-            }
-        }
-    }
-
-    impl EpochSource for FakeSource {
-        fn list_sealed_epochs(&self) -> Vec<SealedEpochRef> {
-            self.epochs
-                .lock()
-                .unwrap()
-                .values()
-                .map(|s| SealedEpochRef {
-                    agg_id: s.agg_id,
-                    epoch_id: s.epoch_id,
-                    end_ts: s.max_ts,
-                    approx_bytes: s.approx_bytes,
-                })
-                .collect()
-        }
-
-        fn snapshot_sealed_epoch(
-            &self,
-            agg_id: u64,
-            epoch_id: u64,
-        ) -> PersistResult<Option<EpochSnapshot>> {
-            Ok(self
-                .epochs
-                .lock()
-                .unwrap()
-                .get(&(agg_id, epoch_id))
-                .cloned())
-        }
-
-        fn evict_sealed_epoch(&self, agg_id: u64, epoch_id: u64) {
-            let mut map = self.epochs.lock().unwrap();
-            if let Some(removed) = map.remove(&(agg_id, epoch_id)) {
-                self.memory
-                    .fetch_sub(removed.approx_bytes as u64, Ordering::Relaxed);
-            }
-        }
-
-        fn approx_memory_bytes(&self) -> usize {
-            self.memory.load(Ordering::Relaxed) as usize
-        }
-    }
-
-    /// A fake source whose epochs start UN-SEALED — they only become
-    /// visible to `list_sealed_epochs` once `seal_aged_epochs` rolls them
-    /// over. Models the live `current_epoch` → `sealed_epochs` transition
-    /// the flusher's phase-0 time-seal drives.
-    struct LazySealSource {
-        unsealed: StdMutex<HashMap<(u64, u64), EpochSnapshot>>,
-        sealed: StdMutex<HashMap<(u64, u64), EpochSnapshot>>,
-        memory: AtomicU64,
-    }
-
-    impl LazySealSource {
-        fn new(snapshots: Vec<EpochSnapshot>) -> Self {
-            let mut map = HashMap::new();
-            let mut total = 0u64;
-            for s in snapshots {
-                total += s.approx_bytes as u64;
-                map.insert((s.agg_id, s.epoch_id), s);
-            }
-            Self {
-                unsealed: StdMutex::new(map),
-                sealed: StdMutex::new(HashMap::new()),
-                memory: AtomicU64::new(total),
-            }
-        }
-    }
-
-    impl EpochSource for LazySealSource {
-        fn list_sealed_epochs(&self) -> Vec<SealedEpochRef> {
-            self.sealed
-                .lock()
-                .unwrap()
-                .values()
-                .map(|s| SealedEpochRef {
-                    agg_id: s.agg_id,
-                    epoch_id: s.epoch_id,
-                    end_ts: s.max_ts,
-                    approx_bytes: s.approx_bytes,
-                })
-                .collect()
-        }
-
-        fn seal_aged_epochs(&self, cutoff_end: u64) -> usize {
-            let mut un = self.unsealed.lock().unwrap();
-            let mut sealed = self.sealed.lock().unwrap();
-            let aged: Vec<(u64, u64)> = un
-                .iter()
-                .filter(|(_, s)| s.max_ts <= cutoff_end)
-                .map(|(k, _)| *k)
-                .collect();
-            let mut n = 0;
-            for k in aged {
-                if let Some(s) = un.remove(&k) {
-                    sealed.insert(k, s);
-                    n += 1;
-                }
-            }
-            n
-        }
-
-        fn snapshot_sealed_epoch(
-            &self,
-            agg_id: u64,
-            epoch_id: u64,
-        ) -> PersistResult<Option<EpochSnapshot>> {
-            Ok(self
-                .sealed
-                .lock()
-                .unwrap()
-                .get(&(agg_id, epoch_id))
-                .cloned())
-        }
-
-        fn evict_sealed_epoch(&self, agg_id: u64, epoch_id: u64) {
-            let mut map = self.sealed.lock().unwrap();
-            if let Some(removed) = map.remove(&(agg_id, epoch_id)) {
-                self.memory
-                    .fetch_sub(removed.approx_bytes as u64, Ordering::Relaxed);
-            }
-        }
-
-        fn approx_memory_bytes(&self) -> usize {
-            self.memory.load(Ordering::Relaxed) as usize
-        }
-    }
-
-    fn snap(agg_id: u64, epoch_id: u64, min_ts: u64, max_ts: u64, approx: usize) -> EpochSnapshot {
-        EpochSnapshot {
-            agg_id,
-            epoch_id,
-            min_ts,
-            max_ts,
-            approx_bytes: approx,
-            entries: vec![EpochSnapshotEntry {
-                start_ts: min_ts,
-                end_ts: max_ts,
-                label: Some(KeyByLabelValues::new_with_labels(vec!["host".into()])),
-                sketch_type_name: "SumAccumulator".into(),
-                encoding_tag: 0,
-                sketch_bytes: b"dummy-payload".to_vec(),
-            }],
-        }
-    }
-
-    fn test_cfg(disk_path: PathBuf, mem_limit: usize) -> SketchStorePersistenceConfig {
-        SketchStorePersistenceConfig {
-            memory_limit_bytes: mem_limit,
-            memory_low_watermark_bytes: mem_limit / 2,
-            hard_cap_bytes: mem_limit * 2,
-            hot_window_ms: None,
-            delete_older_than_ms: None,
-            flush_interval: Duration::from_millis(10),
-            disk_path,
-            part_cache_bytes: 0,
-            seal_window_count: 20,
-        }
-    }
-
-    #[test]
-    fn memory_pressure_flushes_oldest_first() {
-        let tmp = TempDir::new().unwrap();
-        let snaps = vec![
-            snap(1, 1, 100, 150, 500),
-            snap(1, 2, 150, 200, 500),
-            snap(2, 1, 200, 250, 500),
-        ];
-        let source = Arc::new(FakeSource::new(snaps));
-        let manifest = Arc::new(Manifest::init(tmp.path()).unwrap());
-        let cfg = test_cfg(tmp.path().to_path_buf(), 1200); // over limit
-        let mut handle = FlusherHandle::start(cfg, manifest.clone(), source.clone()).unwrap();
-
-        // Wait until memory is below the low-water mark.
-        let deadline = crate::tests::test_utilities::timing::deadline(Duration::from_secs(2));
-        while source.approx_memory_bytes() > 600 && Instant::now() < deadline {
-            thread::sleep(Duration::from_millis(20));
-        }
-        handle.shutdown();
-
-        assert!(
-            source.approx_memory_bytes() <= 600,
-            "flusher did not reach low water: {} remaining",
-            source.approx_memory_bytes()
-        );
-        // At least one part should be in the manifest.
-        let live = manifest.live_parts();
-        assert!(!live.is_empty(), "no parts were produced");
-    }
-
-    #[test]
-    fn hot_window_flushes_even_without_memory_pressure() {
-        let tmp = TempDir::new().unwrap();
-        // Everything older than (now - 1ms) — effectively everything.
-        let now = now_ms();
-        let snaps = vec![snap(
-            1,
-            1,
-            now.saturating_sub(10_000),
-            now.saturating_sub(5_000),
-            100,
-        )];
-        let source = Arc::new(FakeSource::new(snaps));
-        let manifest = Arc::new(Manifest::init(tmp.path()).unwrap());
-        let mut cfg = test_cfg(tmp.path().to_path_buf(), 100_000); // well under limit
-        cfg.hot_window_ms = Some(1_000); // 1 second hot window
-        let mut handle = FlusherHandle::start(cfg, manifest.clone(), source.clone()).unwrap();
-
-        let deadline = crate::tests::test_utilities::timing::deadline(Duration::from_secs(2));
-        while source.approx_memory_bytes() > 0 && Instant::now() < deadline {
-            thread::sleep(Duration::from_millis(20));
-        }
-        handle.shutdown();
-
-        assert_eq!(source.approx_memory_bytes(), 0);
-        assert!(!manifest.live_parts().is_empty());
-    }
-
-    #[test]
-    fn hot_window_time_seals_unsealed_aged_epochs_then_flushes() {
-        // LIVE BUG #1 at the flusher level: an epoch that is still
-        // UN-SEALED (below the count cadence) but aged past the hot window
-        // must be time-sealed by phase 0 and then flushed in the SAME
-        // tick. Without the `seal_aged_epochs` hook the flusher's
-        // sealed-only scan never sees it → empty parts/ (the live bug).
-        let tmp = TempDir::new().unwrap();
-        let now = now_ms();
-        // Aged 10 min; never sealed by the source on its own.
-        let snaps = vec![snap(
-            1,
-            1,
-            now.saturating_sub(600_000),
-            now.saturating_sub(595_000),
-            100,
-        )];
-        let source = Arc::new(LazySealSource::new(snaps));
-        let manifest = Arc::new(Manifest::init(tmp.path()).unwrap());
-        let mut cfg = test_cfg(tmp.path().to_path_buf(), 100_000); // under mem limit
-        cfg.hot_window_ms = Some(120_000); // 120s hot window, like live
-        let mut handle = FlusherHandle::start(cfg, manifest.clone(), source.clone()).unwrap();
-
-        let deadline = crate::tests::test_utilities::timing::deadline(Duration::from_secs(3));
-        while manifest.live_parts().is_empty() && Instant::now() < deadline {
-            thread::sleep(Duration::from_millis(20));
-        }
-        handle.shutdown();
-        assert!(
-            !manifest.live_parts().is_empty(),
-            "time-driven seal did not make the aged un-sealed epoch durable"
-        );
-    }
-
-    #[test]
-    fn t2_sweep_deletes_old_parts() {
-        let tmp = TempDir::new().unwrap();
-        let source = Arc::new(FakeSource::new(vec![snap(1, 1, 100, 200, 100)]));
-        let manifest = Arc::new(Manifest::init(tmp.path()).unwrap());
-        let mut cfg = test_cfg(tmp.path().to_path_buf(), 100_000);
-        cfg.hot_window_ms = Some(0); // force-flush everything
-        cfg.delete_older_than_ms = Some(0); // then immediately expire it
-        let mut handle = FlusherHandle::start(cfg, manifest.clone(), source.clone()).unwrap();
-
-        let deadline = crate::tests::test_utilities::timing::deadline(Duration::from_secs(2));
-        while !manifest.live_parts().is_empty() && Instant::now() < deadline {
-            thread::sleep(Duration::from_millis(20));
-        }
-        // Let the sweep run at least once more to catch up.
-        thread::sleep(Duration::from_millis(50));
-        handle.shutdown();
-
-        assert!(
-            manifest.live_parts().is_empty(),
-            "expected live_parts empty after T2 sweep, got {:?}",
-            manifest.live_parts()
-        );
-    }
-}
diff --git a/data_plane/src/storage_engines/sketch_db/persistence/immutable_output.rs b/data_plane/src/storage_engines/sketch_db/persistence/immutable_output.rs
deleted file mode 100644
index 76025600b..000000000
--- a/data_plane/src/storage_engines/sketch_db/persistence/immutable_output.rs
+++ /dev/null
@@ -1,714 +0,0 @@
-//! Crash-resumable publication of one immutable output window. The SID sidecar
-//! reserves the existing part ID before writing; no second payload store is used.
-use serde::{Deserialize, Serialize};
-use sha2::{Digest, Sha256};
-
-use super::flusher::{FlusherHandle, FlusherShared};
-use super::manifest::PartEntry;
-use super::metadata::StoredOutputMetadataRecord;
-use super::part::{part_dir_path, PartReader, PartWriter};
-use super::source::{EpochSnapshot, EpochSnapshotEntry};
-use super::{PersistError, PersistResult};
-
-#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
-pub struct ImmutableOutputReservation {
-    pub part_id: u64,
-    pub input_digest: [u8; 32],
-    pub payload_digest: [u8; 32],
-    pub start_ms: u64,
-    pub end_ms: u64,
-}
-
-#[derive(Debug, Clone, PartialEq, Eq)]
-pub struct ImmutableWindowPublication {
-    pub part_id: u64,
-    pub already_published: bool,
-}
-
-fn invalid(message: &str) -> PersistError {
-    PersistError::Format(message.into())
-}
-
-fn validate_identity(
-    current: &StoredOutputMetadataRecord,
-    record: &StoredOutputMetadataRecord,
-) -> PersistResult<()> {
-    if current.storage_handle != record.storage_handle
-        || current.removed
-        || current.retired_at_ms.is_some()
-        || current.expires_at_ms.is_some()
-        || current.stored_output_reference != record.stored_output_reference
-        || current.summary_definition_id != record.summary_definition_id
-        || current.catalog_generation != record.catalog_generation
-        || current.metric_name != record.metric_name
-        || current.group_by_keys != record.group_by_keys
-        || !current.same_kind(record)
-    {
-        return Err(invalid("immutable publication metadata identity changed"));
-    }
-    Ok(())
-}
-
-fn fingerprint(snapshot: &EpochSnapshot) -> PersistResult<[u8; 32]> {
-    if snapshot.entries.is_empty() || snapshot.min_ts >= snapshot.max_ts {
-        return Err(invalid("immutable publication requires a nonempty window"));
-    }
-    let mut rows = Vec::with_capacity(snapshot.entries.len());
-    for entry in &snapshot.entries {
-        if entry.start_ts != snapshot.min_ts || entry.end_ts != snapshot.max_ts {
-            return Err(invalid("immutable publication spans multiple windows"));
-        }
-        let label = entry.label.as_ref().map(|label| label.serialize_to_bytes());
-        rows.push((
-            label,
-            &entry.sketch_type_name,
-            entry.encoding_tag,
-            &entry.sketch_bytes,
-        ));
-    }
-    rows.sort();
-    if rows.windows(2).any(|pair| pair[0].0 == pair[1].0) {
-        return Err(invalid(
-            "immutable publication contains duplicate label populations",
-        ));
-    }
-    let mut digest = Sha256::new();
-    digest.update(b"asap-immutable-window-v1");
-    for value in [
-        snapshot.agg_id,
-        snapshot.min_ts,
-        snapshot.max_ts,
-        rows.len() as u64,
-    ] {
-        digest.update(value.to_le_bytes());
-    }
-    for (label, kind, encoding, payload) in rows {
-        digest.update([u8::from(label.is_some())]);
-        let label = label.as_deref().unwrap_or_default();
-        for bytes in [label, kind.as_bytes()] {
-            digest.update((bytes.len() as u64).to_le_bytes());
-            digest.update(bytes);
-        }
-        digest.update([encoding]);
-        digest.update((payload.len() as u64).to_le_bytes());
-        digest.update(payload);
-    }
-    Ok(digest.finalize().into())
-}
-
-impl FlusherHandle {
-    /// Reuse the existing persistence state without transferring ownership of
-    /// its worker thread. The store can retain a Weak reference to this Arc.
-    pub(crate) fn publication_handle(&self) -> std::sync::Arc<FlusherShared> {
-        std::sync::Arc::clone(&self.inner)
-    }
-    pub fn publish_immutable_window(
-        &self,
-        record: &StoredOutputMetadataRecord,
-        input_digest: [u8; 32],
-        snapshot: &EpochSnapshot,
-    ) -> PersistResult<ImmutableWindowPublication> {
-        self.inner
-            .publish_immutable_window(record, input_digest, snapshot)
-    }
-    pub fn resume_pending_immutable_window(
-        &self,
-        sid: u64,
-    ) -> PersistResult<Option<ImmutableWindowPublication>> {
-        self.inner.resume_pending_immutable_window(sid)
-    }
-}
-
-impl FlusherShared {
-    /// Find the latest committed result before evaluating a potentially
-    /// randomized sketch again. This never creates or replaces a payload.
-    pub fn lookup_immutable_window(
-        &self,
-        record: &StoredOutputMetadataRecord,
-        input_digest: [u8; 32],
-        start_ms: u64,
-        end_ms: u64,
-    ) -> PersistResult<Option<ImmutableWindowPublication>> {
-        self.sid_metadata.transaction(|records, _| {
-            let Some(current) = records.get(&record.storage_handle.to_string()) else {
-                return Ok(None);
-            };
-            validate_identity(current, record)?;
-            let Some(previous) = &current.last_immutable else {
-                return Ok(None);
-            };
-            if previous.start_ms != start_ms || previous.end_ms != end_ms {
-                return Ok(None);
-            }
-            if previous.input_digest != input_digest {
-                return Err(invalid("immutable lookup input lineage differs"));
-            }
-            self.validate_reserved_part(record.storage_handle, previous)?;
-            if !self
-                .manifest
-                .live_parts()
-                .iter()
-                .any(|part| part.part_id == previous.part_id)
-            {
-                return Err(invalid("completed immutable part is no longer published"));
-            }
-            Ok(Some(ImmutableWindowPublication {
-                part_id: previous.part_id,
-                already_published: true,
-            }))
-        })
-    }
-
-    /// Publish a finalized window. A retry must present exactly the reserved
-    /// input and payload. This does not guarantee source availability after GC.
-    pub fn publish_immutable_window(
-        &self,
-        record: &StoredOutputMetadataRecord,
-        input_digest: [u8; 32],
-        snapshot: &EpochSnapshot,
-    ) -> PersistResult<ImmutableWindowPublication> {
-        if snapshot.agg_id != record.storage_handle || record.removed {
-            return Err(invalid("immutable publication SID is invalid or removed"));
-        }
-        let payload_digest = fingerprint(snapshot)?;
-        self.sid_metadata.transaction(|records, metadata| {
-            let key = record.storage_handle.to_string();
-            let mut current = records.get(&key).cloned().unwrap_or_else(|| record.clone());
-            validate_identity(&current, record)?;
-            // Completion fences window ends. An advancing overlapping full
-            // window is a new immutable publication, not a correction.
-            if current
-                .completed_through_ms
-                .is_some_and(|end| snapshot.max_ts <= end)
-            {
-                let Some(previous) = &current.last_immutable else {
-                    return Err(invalid(
-                        "completed immutable window has no retained lineage proof",
-                    ));
-                };
-                if previous.input_digest != input_digest
-                    || previous.payload_digest != payload_digest
-                    || previous.start_ms != snapshot.min_ts
-                    || previous.end_ms != snapshot.max_ts
-                {
-                    return Err(invalid(
-                        "completed immutable retry differs from latest publication",
-                    ));
-                }
-                self.validate_reserved_part(record.storage_handle, previous)?;
-                if !self
-                    .manifest
-                    .live_parts()
-                    .iter()
-                    .any(|part| part.part_id == previous.part_id)
-                {
-                    return Err(invalid("completed immutable part is no longer published"));
-                }
-                return Ok(ImmutableWindowPublication {
-                    part_id: previous.part_id,
-                    already_published: true,
-                });
-            }
-            let reservation = match current.pending_immutable.clone() {
-                Some(pending) => {
-                    if pending.input_digest != input_digest
-                        || pending.payload_digest != payload_digest
-                        || pending.start_ms != snapshot.min_ts
-                        || pending.end_ms != snapshot.max_ts
-                    {
-                        return Err(invalid(
-                            "another immutable publication is pending for this SID",
-                        ));
-                    }
-                    pending
-                }
-                None => {
-                    let pending = ImmutableOutputReservation {
-                        part_id: self.allocate_part_id()?,
-                        input_digest,
-                        payload_digest,
-                        start_ms: snapshot.min_ts,
-                        end_ms: snapshot.max_ts,
-                    };
-                    current.pending_immutable = Some(pending.clone());
-                    records.insert(key.clone(), current.clone());
-                    metadata.write_records(records)?;
-                    pending
-                }
-            };
-            let path = part_dir_path(&self.cfg.disk_path.join("parts"), reservation.part_id);
-            if path.exists() {
-                // Never overwrite a reserved part silently: callers can recover a
-                // durable part without sources; damaged/partial parts fail closed.
-                self.validate_reserved_part(record.storage_handle, &reservation)?;
-            } else {
-                PartWriter::write_part(&path, reservation.part_id, std::slice::from_ref(snapshot))?;
-                std::fs::File::open(
-                    path.parent()
-                        .ok_or_else(|| invalid("missing parts parent"))?,
-                )?
-                .sync_all()?;
-                self.validate_reserved_part(record.storage_handle, &reservation)?;
-            }
-            self.finish_reserved_part(&mut current, &reservation)?;
-            records.insert(key, current);
-            metadata.write_records(records)?;
-            Ok(ImmutableWindowPublication {
-                part_id: reservation.part_id,
-                already_published: false,
-            })
-        })
-    }
-
-    /// Resume only the caller's pending lineage, atomically with metadata
-    /// validation. A different pending input cannot be acknowledged by this call.
-    pub fn resume_matching_immutable_window(
-        &self,
-        record: &StoredOutputMetadataRecord,
-        input_digest: [u8; 32],
-        start_ms: u64,
-        end_ms: u64,
-    ) -> PersistResult<Option<ImmutableWindowPublication>> {
-        self.resume_immutable_window(
-            record.storage_handle,
-            Some((record, input_digest, start_ms, end_ms)),
-        )
-    }
-
-    /// Complete a pending durable part without reconstructing its source input.
-    /// A reservation whose part was never completed returns an error, preserving
-    /// the reservation for an explicit recovery policy rather than losing data.
-    pub fn resume_pending_immutable_window(
-        &self,
-        sid: u64,
-    ) -> PersistResult<Option<ImmutableWindowPublication>> {
-        self.resume_immutable_window(sid, None)
-    }
-
-    fn resume_immutable_window(
-        &self,
-        sid: u64,
-        expected: Option<(&StoredOutputMetadataRecord, [u8; 32], u64, u64)>,
-    ) -> PersistResult<Option<ImmutableWindowPublication>> {
-        self.sid_metadata.transaction(|records, metadata| {
-            let key = sid.to_string();
-            let Some(mut current) = records.get(&key).cloned() else {
-                return Ok(None);
-            };
-            let Some(pending) = current.pending_immutable.clone() else {
-                return Ok(None);
-            };
-            if current.removed || current.retired_at_ms.is_some() || current.expires_at_ms.is_some()
-            {
-                return Err(invalid("pending immutable SID was removed"));
-            }
-            if let Some((record, digest, start, end)) = expected {
-                validate_identity(&current, record)?;
-                if pending.input_digest != digest
-                    || pending.start_ms != start
-                    || pending.end_ms != end
-                {
-                    return Err(invalid("pending immutable recovery lineage differs"));
-                }
-            }
-            self.validate_reserved_part(sid, &pending)?;
-            self.finish_reserved_part(&mut current, &pending)?;
-            records.insert(key, current);
-            metadata.write_records(records)?;
-            Ok(Some(ImmutableWindowPublication {
-                part_id: pending.part_id,
-                already_published: true,
-            }))
-        })
-    }
-
-    fn validate_reserved_part(
-        &self,
-        sid: u64,
-        pending: &ImmutableOutputReservation,
-    ) -> PersistResult<()> {
-        let reader = PartReader::open(&part_dir_path(
-            &self.cfg.disk_path.join("parts"),
-            pending.part_id,
-        ))?;
-        if reader.meta.part_id != pending.part_id {
-            return Err(invalid("reserved part ID mismatch"));
-        }
-        let mut entries = Vec::new();
-        for index in reader.index_records() {
-            let row = reader.load_entry(&index)?;
-            if row.agg_id != sid {
-                return Err(invalid("reserved part contains another SID"));
-            }
-            entries.push(EpochSnapshotEntry {
-                start_ts: row.start_ts,
-                end_ts: row.end_ts,
-                label: row.label,
-                sketch_type_name: row.sketch_type_name,
-                encoding_tag: row.encoding_tag,
-                sketch_bytes: row.sketch_bytes,
-            });
-        }
-        let snapshot = EpochSnapshot {
-            agg_id: sid,
-            epoch_id: 0,
-            min_ts: pending.start_ms,
-            max_ts: pending.end_ms,
-            entries,
-            approx_bytes: 0,
-        };
-        if fingerprint(&snapshot)? != pending.payload_digest {
-            return Err(invalid("reserved immutable payload digest mismatch"));
-        }
-        Ok(())
-    }
-
-    fn finish_reserved_part(
-        &self,
-        current: &mut StoredOutputMetadataRecord,
-        pending: &ImmutableOutputReservation,
-    ) -> PersistResult<()> {
-        let path = part_dir_path(&self.cfg.disk_path.join("parts"), pending.part_id);
-        // The reservation may have been recovered before its parent-directory
-        // entry was durable; make that durable before manifest publication too.
-        std::fs::File::open(
-            path.parent()
-                .ok_or_else(|| invalid("missing parts parent"))?,
-        )?
-        .sync_all()?;
-        if !self
-            .manifest
-            .live_parts()
-            .iter()
-            .any(|part| part.part_id == pending.part_id)
-        {
-            let size_bytes = std::fs::read_dir(&path)?.try_fold(0u64, |sum, entry| {
-                let length = entry?.metadata()?.len();
-                sum.checked_add(length)
-                    .ok_or_else(|| std::io::Error::other("part size overflow"))
-            })?;
-            self.manifest.append_add(PartEntry {
-                part_id: pending.part_id,
-                min_ts: pending.start_ms,
-                max_ts: pending.end_ms,
-                size_bytes,
-            })?;
-        }
-        current.completed_through_ms = Some(
-            current
-                .completed_through_ms
-                .unwrap_or(0)
-                .max(pending.end_ms),
-        );
-        current.last_immutable = Some(pending.clone());
-        current.pending_immutable = None;
-        Ok(())
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::super::{
-        config::SketchStorePersistenceConfig,
-        manifest::Manifest,
-        source::{EpochSource, SealedEpochRef},
-    };
-    use super::*;
-    use crate::storage_engines::{sketch_db::data::AggKind, types::AggregationType};
-    use std::sync::Arc;
-
-    struct EmptySource;
-    impl EpochSource for EmptySource {
-        fn list_sealed_epochs(&self) -> Vec<SealedEpochRef> {
-            vec![]
-        }
-        fn snapshot_sealed_epoch(&self, _: u64, _: u64) -> PersistResult<Option<EpochSnapshot>> {
-            Ok(None)
-        }
-        fn evict_sealed_epoch(&self, _: u64, _: u64) {}
-        fn approx_memory_bytes(&self) -> usize {
-            0
-        }
-    }
-    fn handle(path: &std::path::Path) -> FlusherHandle {
-        let mut config = SketchStorePersistenceConfig::with_memory_limit(1024, path.into());
-        config.hot_window_ms = None;
-        config.delete_older_than_ms = None;
-        FlusherHandle::start(
-            config,
-            Arc::new(Manifest::open_or_init(path).unwrap()),
-            Arc::new(EmptySource),
-        )
-        .unwrap()
-    }
-    fn record() -> StoredOutputMetadataRecord {
-        StoredOutputMetadataRecord::new(
-            1,
-            "derived".into(),
-            vec![],
-            &AggKind::ExactAgg {
-                agg_type: AggregationType::Sum,
-                parameters_canonical: String::new(),
-                spatial_filter_canonical: String::new(),
-            },
-            0,
-        )
-    }
-    fn snapshot() -> EpochSnapshot {
-        EpochSnapshot {
-            agg_id: 1,
-            epoch_id: 0,
-            min_ts: 10,
-            max_ts: 20,
-            approx_bytes: 8,
-            entries: vec![EpochSnapshotEntry {
-                start_ts: 10,
-                end_ts: 20,
-                label: None,
-                sketch_type_name: "SumAccumulator".into(),
-                encoding_tag: 0,
-                sketch_bytes: vec![1, 2, 3],
-            }],
-        }
-    }
-    fn reserve(handle: &FlusherHandle, snapshot: &EpochSnapshot) -> ImmutableOutputReservation {
-        let pending = ImmutableOutputReservation {
-            part_id: handle.inner.allocate_part_id().unwrap(),
-            input_digest: [7; 32],
-            payload_digest: fingerprint(snapshot).unwrap(),
-            start_ms: 10,
-            end_ms: 20,
-        };
-        handle
-            .inner
-            .sid_metadata
-            .transaction(|records, metadata| {
-                let mut record = record();
-                record.pending_immutable = Some(pending.clone());
-                records.insert("1".into(), record);
-                metadata.write_records(records)
-            })
-            .unwrap();
-        pending
-    }
-    #[test]
-    fn completed_retry_and_concurrent_publications_do_not_duplicate_parts() {
-        let temp = tempfile::tempdir().unwrap();
-        let handle = handle(temp.path());
-        std::thread::scope(|scope| {
-            let workers: Vec<_> = (0..4)
-                .map(|_| {
-                    scope.spawn(|| {
-                        handle
-                            .publish_immutable_window(&record(), [7; 32], &snapshot())
-                            .unwrap()
-                    })
-                })
-                .collect();
-            let ids: Vec<_> = workers
-                .into_iter()
-                .map(|worker| worker.join().unwrap().part_id)
-                .collect();
-            assert!(ids.iter().all(|id| *id == ids[0]));
-        });
-        assert_eq!(handle.manifest().live_parts().len(), 1);
-        assert!(handle
-            .publish_immutable_window(&record(), [8; 32], &snapshot())
-            .is_err());
-        let metadata = handle.inner.sid_metadata.load_strict().unwrap();
-        assert_eq!(metadata[0].completed_through_ms, Some(20));
-        assert!(metadata[0].pending_immutable.is_none());
-        let mut different = snapshot();
-        different.entries[0].sketch_bytes.push(4);
-        assert!(handle
-            .publish_immutable_window(&record(), [7; 32], &different)
-            .is_err());
-        let part_id = handle.manifest().live_parts()[0].part_id;
-        handle.manifest().append_delete(part_id).unwrap();
-        assert!(handle
-            .publish_immutable_window(&record(), [7; 32], &snapshot())
-            .is_err());
-    }
-    #[test]
-    fn overlapping_windows_advance_end_frontier_and_reject_old_corrections_after_restart() {
-        // Completion fences window ends, allowing an explicitly planned full
-        // window to overlap its predecessor without reopening that predecessor.
-        fn window(start: u64, end: u64) -> EpochSnapshot {
-            let mut state = snapshot();
-            state.min_ts = start;
-            state.max_ts = end;
-            state.entries[0].start_ts = start;
-            state.entries[0].end_ts = end;
-            state
-        }
-        let temp = tempfile::tempdir().unwrap();
-        let mut first = handle(temp.path());
-        first
-            .publish_immutable_window(&record(), [1; 32], &window(0, 60))
-            .unwrap();
-        let next = first
-            .publish_immutable_window(&record(), [2; 32], &window(10, 70))
-            .unwrap();
-        assert!(!next.already_published);
-        assert_eq!(first.manifest().live_parts().len(), 2);
-        first.shutdown();
-        drop(first);
-        let mut restored = handle(temp.path());
-        let retried = restored
-            .publish_immutable_window(&record(), [2; 32], &window(10, 70))
-            .unwrap();
-        assert!(retried.already_published);
-        assert_eq!(retried.part_id, next.part_id);
-        for (start, end, digest) in [(0, 60, [1; 32]), (0, 70, [2; 32]), (10, 70, [3; 32])] {
-            assert!(restored
-                .publish_immutable_window(&record(), digest, &window(start, end))
-                .is_err());
-        }
-        let mut changed_payload = window(10, 70);
-        changed_payload.entries[0].sketch_bytes.push(9);
-        assert!(restored
-            .publish_immutable_window(&record(), [2; 32], &changed_payload)
-            .is_err());
-        assert_eq!(restored.manifest().live_parts().len(), 2);
-        let metadata = restored.inner.sid_metadata.load_strict().unwrap();
-        assert_eq!(metadata[0].completed_through_ms, Some(70));
-        assert!(metadata[0].pending_immutable.is_none());
-        restored.shutdown();
-    }
-    #[test]
-    fn restart_preserves_reserved_part_and_resumes_without_source() {
-        let temp = tempfile::tempdir().unwrap();
-        let mut first = handle(temp.path());
-        let state = snapshot();
-        let pending = reserve(&first, &state);
-        let path = part_dir_path(&temp.path().join("parts"), pending.part_id);
-        PartWriter::write_part(&path, pending.part_id, &[state]).unwrap();
-        first.shutdown();
-        drop(first);
-        let (_, recovery) = super::super::recovery::recover(temp.path()).unwrap();
-        assert_eq!(recovery.orphan_parts_removed, 0);
-        let resumed = handle(temp.path());
-        assert!(resumed.inner.allocate_part_id().unwrap() > pending.part_id);
-        let result = resumed.resume_pending_immutable_window(1).unwrap().unwrap();
-        assert_eq!(result.part_id, pending.part_id);
-        assert_eq!(resumed.manifest().live_parts().len(), 1);
-        assert!(resumed
-            .resume_pending_immutable_window(1)
-            .unwrap()
-            .is_none());
-    }
-    #[test]
-    fn pending_missing_part_requires_source_and_stale_upsert_preserves_reservation() {
-        let temp = tempfile::tempdir().unwrap();
-        let handle = handle(temp.path());
-        let pending = reserve(&handle, &snapshot());
-        handle.inner.sid_metadata.upsert_all(&[record()]).unwrap();
-        assert_eq!(
-            handle.inner.sid_metadata.load_strict().unwrap()[0].pending_immutable,
-            Some(pending.clone())
-        );
-        assert!(handle.resume_pending_immutable_window(1).is_err());
-        assert_eq!(
-            handle
-                .publish_immutable_window(&record(), [7; 32], &snapshot())
-                .unwrap()
-                .part_id,
-            pending.part_id
-        );
-        handle.inner.sid_metadata.upsert_all(&[record()]).unwrap();
-        assert!(handle.inner.sid_metadata.load_strict().unwrap()[0]
-            .pending_immutable
-            .is_none());
-    }
-    #[test]
-    fn malformed_metadata_fails_before_part_publication() {
-        let temp = tempfile::tempdir().unwrap();
-        let handle = handle(temp.path());
-        std::fs::write(handle.inner.sid_metadata.path(), b"broken").unwrap();
-        assert!(handle
-            .publish_immutable_window(&record(), [7; 32], &snapshot())
-            .is_err());
-        assert!(handle.manifest().live_parts().is_empty());
-    }
-    #[test]
-    fn failed_manifest_leaves_recoverable_payload_and_no_completion() {
-        let temp = tempfile::tempdir().unwrap();
-        let handle = handle(temp.path());
-        let log = handle.manifest().log_path();
-        let backup = log.with_extension("saved");
-        std::fs::rename(&log, &backup).unwrap();
-        std::fs::create_dir(&log).unwrap();
-        assert!(handle
-            .publish_immutable_window(&record(), [7; 32], &snapshot())
-            .is_err());
-        let records = handle.inner.sid_metadata.load_strict().unwrap();
-        let pending = records[0].pending_immutable.clone().unwrap();
-        assert_eq!(records[0].completed_through_ms, None);
-        assert!(handle.manifest().live_parts().is_empty());
-        std::fs::remove_dir(&log).unwrap();
-        std::fs::rename(&backup, &log).unwrap();
-        let published = handle.resume_pending_immutable_window(1).unwrap().unwrap();
-        assert_eq!(published.part_id, pending.part_id);
-        assert_eq!(handle.manifest().live_parts().len(), 1);
-    }
-    #[test]
-    fn committed_lookup_reuses_payload_without_recomputing_randomized_state() {
-        let temp = tempfile::tempdir().unwrap();
-        let mut first = handle(temp.path());
-        let publication = first
-            .publish_immutable_window(&record(), [7; 32], &snapshot())
-            .unwrap();
-        first.shutdown();
-        drop(first);
-        let reopened = handle(temp.path());
-        let found = reopened
-            .inner
-            .lookup_immutable_window(&record(), [7; 32], 10, 20)
-            .unwrap()
-            .unwrap();
-        assert_eq!(found.part_id, publication.part_id);
-        assert!(reopened
-            .inner
-            .lookup_immutable_window(&record(), [8; 32], 10, 20)
-            .is_err());
-        reopened
-            .manifest()
-            .append_delete(publication.part_id)
-            .unwrap();
-        assert!(reopened
-            .inner
-            .lookup_immutable_window(&record(), [7; 32], 10, 20)
-            .is_err());
-    }
-    #[test]
-    fn matching_resume_rejects_other_lineage_without_mutating_reservation() {
-        let temp = tempfile::tempdir().unwrap();
-        let handle = handle(temp.path());
-        let state = snapshot();
-        let pending = reserve(&handle, &state);
-        let path = part_dir_path(&temp.path().join("parts"), pending.part_id);
-        PartWriter::write_part(&path, pending.part_id, &[state]).unwrap();
-        assert!(handle
-            .inner
-            .resume_matching_immutable_window(&record(), [8; 32], 10, 20)
-            .is_err());
-        assert!(handle
-            .inner
-            .resume_matching_immutable_window(&record(), [7; 32], 20, 30)
-            .is_err());
-        assert!(handle.manifest().live_parts().is_empty());
-        assert_eq!(
-            handle.inner.sid_metadata.load_strict().unwrap()[0].pending_immutable,
-            Some(pending.clone())
-        );
-        assert_eq!(
-            handle
-                .inner
-                .resume_matching_immutable_window(&record(), [7; 32], 10, 20)
-                .unwrap()
-                .unwrap()
-                .part_id,
-            pending.part_id
-        );
-    }
-}
diff --git a/data_plane/src/storage_engines/sketch_db/persistence/manifest.rs b/data_plane/src/storage_engines/sketch_db/persistence/manifest.rs
deleted file mode 100644
index c6bde0849..000000000
--- a/data_plane/src/storage_engines/sketch_db/persistence/manifest.rs
+++ /dev/null
@@ -1,547 +0,0 @@
-//! Append-only parts manifest: `parts_manifest.log` + periodic
-//! `parts_manifest.snapshot`. The manifest is the one piece of global
-//! state on disk and the authoritative list of which parts are live.
-//!
-//! ## Binary layout
-//!
-//! Both files share a common record shape for add/delete operations:
-//!
-//! ```text
-//! AddPart     : [u8 tag=1][u8 pad;7][u64 part_id][u64 min_ts][u64 max_ts][u64 size_bytes]
-//! DeletePart  : [u8 tag=2][u8 pad;7][u64 part_id][u64 0][u64 0][u64 0]
-//! ```
-//!
-//! 40 bytes per record, 8-byte aligned. The snapshot is simply a
-//! sequence of `AddPart` records for the currently-live set, followed
-//! by a u32 CRC trailer. The log is written by appending records, with
-//! the same trailer rewritten atomically after each tick.
-//!
-//! The snapshot is rewritten (write → fsync → rename) whenever the log
-//! has grown past some multiple of the live-set size. On recovery,
-//! snapshot is loaded first, then the log is replayed from the start
-//! since v1 does not yet track "log offset at snapshot time."
-
-use std::fs::{self, File, OpenOptions};
-use std::io::{Read, Seek, SeekFrom, Write};
-use std::path::{Path, PathBuf};
-use std::sync::{Arc, RwLock};
-
-use super::part::PartId;
-use super::{PersistError, PersistResult};
-
-pub const RECORD_SIZE: usize = 40;
-pub const TAG_ADD: u8 = 1;
-pub const TAG_DELETE: u8 = 2;
-pub const SNAPSHOT_FILE: &str = "parts_manifest.snapshot";
-pub const LOG_FILE: &str = "parts_manifest.log";
-
-/// One live part, as seen by queries and the flusher.
-#[derive(Debug, Clone, Copy, PartialEq, Eq)]
-pub struct PartEntry {
-    pub part_id: PartId,
-    pub min_ts: u64,
-    pub max_ts: u64,
-    pub size_bytes: u64,
-}
-
-#[derive(Debug, Clone, Copy)]
-enum Record {
-    Add(PartEntry),
-    Delete(PartId),
-}
-
-fn encode_record(rec: Record, out: &mut [u8; RECORD_SIZE]) {
-    for b in out.iter_mut() {
-        *b = 0;
-    }
-    match rec {
-        Record::Add(entry) => {
-            out[0] = TAG_ADD;
-            out[8..16].copy_from_slice(&entry.part_id.to_le_bytes());
-            out[16..24].copy_from_slice(&entry.min_ts.to_le_bytes());
-            out[24..32].copy_from_slice(&entry.max_ts.to_le_bytes());
-            out[32..40].copy_from_slice(&entry.size_bytes.to_le_bytes());
-        }
-        Record::Delete(part_id) => {
-            out[0] = TAG_DELETE;
-            out[8..16].copy_from_slice(&part_id.to_le_bytes());
-        }
-    }
-}
-
-fn decode_record(bytes: &[u8; RECORD_SIZE]) -> PersistResult<Record> {
-    let tag = bytes[0];
-    let part_id = u64::from_le_bytes(bytes[8..16].try_into().unwrap());
-    match tag {
-        TAG_ADD => {
-            let min_ts = u64::from_le_bytes(bytes[16..24].try_into().unwrap());
-            let max_ts = u64::from_le_bytes(bytes[24..32].try_into().unwrap());
-            let size_bytes = u64::from_le_bytes(bytes[32..40].try_into().unwrap());
-            Ok(Record::Add(PartEntry {
-                part_id,
-                min_ts,
-                max_ts,
-                size_bytes,
-            }))
-        }
-        TAG_DELETE => Ok(Record::Delete(part_id)),
-        other => Err(PersistError::Manifest(format!(
-            "unknown manifest record tag: {}",
-            other
-        ))),
-    }
-}
-
-/// The authoritative in-memory list of live parts plus the on-disk
-/// log file handle. Cheap to clone via `Arc`.
-pub struct Manifest {
-    disk_path: PathBuf,
-    live: Arc<RwLock<Vec<PartEntry>>>,
-    /// Number of log records since the last snapshot. When this grows
-    /// past `live.len() * 4`, we rewrite the snapshot and truncate the
-    /// log. The threshold is arbitrary; re-tune if it bites.
-    log_records_since_snapshot: std::sync::Mutex<u64>,
-    io_uncertain: std::sync::atomic::AtomicBool,
-}
-
-impl Manifest {
-    /// Create an empty, fresh on-disk manifest in `disk_path`. Errors
-    /// if `disk_path` already contains a snapshot or a non-empty log —
-    /// callers should use [`Manifest::open_or_init`] for the common
-    /// path.
-    pub fn init(disk_path: &Path) -> PersistResult<Self> {
-        fs::create_dir_all(disk_path)?;
-        let snapshot_path = disk_path.join(SNAPSHOT_FILE);
-        let log_path = disk_path.join(LOG_FILE);
-        if snapshot_path.exists() || log_path.exists() {
-            return Err(PersistError::Manifest(format!(
-                "manifest already initialized at {:?}",
-                disk_path
-            )));
-        }
-
-        write_snapshot_atomic(&snapshot_path, &[])?;
-        OpenOptions::new()
-            .create_new(true)
-            .write(true)
-            .open(&log_path)?;
-
-        Ok(Self {
-            disk_path: disk_path.to_path_buf(),
-            live: Arc::new(RwLock::new(Vec::new())),
-            log_records_since_snapshot: std::sync::Mutex::new(0),
-            io_uncertain: std::sync::atomic::AtomicBool::new(false),
-        })
-    }
-
-    /// Load an existing manifest from `disk_path`. Initializes one if
-    /// the directory has no snapshot yet.
-    pub fn open_or_init(disk_path: &Path) -> PersistResult<Self> {
-        fs::create_dir_all(disk_path)?;
-        let snapshot_path = disk_path.join(SNAPSHOT_FILE);
-        let log_path = disk_path.join(LOG_FILE);
-        if !snapshot_path.exists() && !log_path.exists() {
-            return Self::init(disk_path);
-        }
-
-        // Load snapshot (if present) then replay the log.
-        let mut live: Vec<PartEntry> = if snapshot_path.exists() {
-            read_snapshot(&snapshot_path)?
-        } else {
-            Vec::new()
-        };
-
-        if log_path.exists() {
-            let records = read_log(&log_path)?;
-            for rec in records {
-                apply_record(&mut live, rec);
-            }
-        } else {
-            OpenOptions::new()
-                .create_new(true)
-                .write(true)
-                .open(&log_path)?;
-        }
-
-        // Keep `live` sorted by part_id for stable iteration.
-        live.sort_unstable_by_key(|e| e.part_id);
-
-        Ok(Self {
-            disk_path: disk_path.to_path_buf(),
-            live: Arc::new(RwLock::new(live)),
-            log_records_since_snapshot: std::sync::Mutex::new(0),
-            io_uncertain: std::sync::atomic::AtomicBool::new(false),
-        })
-    }
-
-    pub fn snapshot_path(&self) -> PathBuf {
-        self.disk_path.join(SNAPSHOT_FILE)
-    }
-
-    pub fn log_path(&self) -> PathBuf {
-        self.disk_path.join(LOG_FILE)
-    }
-
-    /// A clone-on-read snapshot of the live parts list. Cheap —
-    /// returns an owned `Vec` but the entries themselves are `Copy`.
-    pub fn live_parts(&self) -> Vec<PartEntry> {
-        self.live.read().unwrap().clone()
-    }
-
-    /// Parts whose `[min_ts, max_ts]` overlaps `[query_start,
-    /// query_end]`. Linear scan — the manifest is tiny in v1.
-    pub fn live_parts_overlapping(&self, query_start: u64, query_end: u64) -> Vec<PartEntry> {
-        self.live
-            .read()
-            .unwrap()
-            .iter()
-            .filter(|p| !(p.max_ts < query_start || p.min_ts > query_end))
-            .copied()
-            .collect()
-    }
-
-    /// Publish only after the part's manifest record is durable.
-    /// The caller must have already fsync'd the part's own files.
-    pub fn append_add(&self, entry: PartEntry) -> PersistResult<()> {
-        self.append_record(Record::Add(entry))
-    }
-
-    /// Remove visibility only after the deletion record is durable.
-    pub fn append_delete(&self, part_id: PartId) -> PersistResult<()> {
-        self.append_record(Record::Delete(part_id))
-    }
-
-    fn append_record(&self, rec: Record) -> PersistResult<()> {
-        // Serialize log writes and compaction, including live publication.
-        let mut counter = self.log_records_since_snapshot.lock().unwrap();
-        self.check_io_state()?;
-        let mut buf = [0u8; RECORD_SIZE];
-        encode_record(rec, &mut buf);
-        {
-            let mut f = OpenOptions::new().append(true).open(self.log_path())?;
-            let original_len = f.metadata()?.len();
-            if let Err(error) = f.write_all(&buf).and_then(|_| f.sync_data()) {
-                // A complete but unacknowledged record must not survive a retry
-                // that assigns the same source epochs a different part ID.
-                if let Err(rollback) = f.set_len(original_len).and_then(|_| f.sync_all()) {
-                    self.io_uncertain
-                        .store(true, std::sync::atomic::Ordering::SeqCst);
-                    return Err(PersistError::Manifest(format!(
-                        "manifest append failed ({error}); rollback failed ({rollback}); reopen required"
-                    )));
-                }
-                return Err(error.into());
-            }
-        }
-        // fsync the parent directory for the log-file size update.
-        if let Ok(dir) = File::open(&self.disk_path) {
-            let _ = dir.sync_all();
-        }
-
-        {
-            let mut live = self.live.write().unwrap();
-            apply_record(&mut live, rec);
-            live.sort_unstable_by_key(|entry| entry.part_id);
-        }
-        // Compaction failure cannot turn a committed append into a failed append.
-
-        *counter += 1;
-        let live_len = self.live.read().unwrap().len() as u64;
-        let threshold = live_len.saturating_mul(4).max(64);
-        if *counter >= threshold {
-            if self.compact_locked().is_ok() {
-                *counter = 0;
-            }
-        }
-        Ok(())
-    }
-
-    #[cfg(test)]
-    /// Rewrite the snapshot from the current in-memory live set and
-    /// truncate the log. Atomic: the new snapshot goes to a tmp file
-    /// first, then rename, then the log is truncated.
-    pub fn compact(&self) -> PersistResult<()> {
-        let mut counter = self.log_records_since_snapshot.lock().unwrap();
-        self.compact_locked()?;
-        *counter = 0;
-        Ok(())
-    }
-
-    fn check_io_state(&self) -> PersistResult<()> {
-        if self.io_uncertain.load(std::sync::atomic::Ordering::SeqCst) {
-            return Err(PersistError::Manifest(
-                "manifest durability is uncertain; reopen required".into(),
-            ));
-        }
-        Ok(())
-    }
-
-    fn compact_locked(&self) -> PersistResult<()> {
-        self.check_io_state()?;
-        let live = self.live.read().unwrap().clone();
-        write_snapshot_atomic(&self.snapshot_path(), &live)?;
-        // Truncate log.
-        let log_path = self.log_path();
-        let f = OpenOptions::new()
-            .write(true)
-            .truncate(true)
-            .open(&log_path)?;
-        f.sync_all()?;
-        if let Ok(dir) = File::open(&self.disk_path) {
-            let _ = dir.sync_all();
-        }
-        Ok(())
-    }
-}
-
-fn apply_record(live: &mut Vec<PartEntry>, rec: Record) {
-    match rec {
-        Record::Add(entry) => {
-            if !live.iter().any(|e| e.part_id == entry.part_id) {
-                live.push(entry);
-            }
-        }
-        Record::Delete(part_id) => {
-            live.retain(|e| e.part_id != part_id);
-        }
-    }
-}
-
-fn write_snapshot_atomic(path: &Path, live: &[PartEntry]) -> PersistResult<()> {
-    let tmp_path = path.with_extension("tmp");
-    {
-        let mut f = OpenOptions::new()
-            .create(true)
-            .write(true)
-            .truncate(true)
-            .open(&tmp_path)?;
-        let mut crc = crc32fast::Hasher::new();
-        for entry in live {
-            let mut buf = [0u8; RECORD_SIZE];
-            encode_record(Record::Add(*entry), &mut buf);
-            f.write_all(&buf)?;
-            crc.update(&buf);
-        }
-        let crc_val = crc.finalize();
-        f.write_all(&crc_val.to_le_bytes())?;
-        f.write_all(&[0u8; 4])?;
-        f.sync_all()?;
-    }
-    fs::rename(&tmp_path, path)?;
-    if let Some(parent) = path.parent() {
-        if let Ok(dir) = File::open(parent) {
-            let _ = dir.sync_all();
-        }
-    }
-    Ok(())
-}
-
-fn read_snapshot(path: &Path) -> PersistResult<Vec<PartEntry>> {
-    let mut f = File::open(path)?;
-    let mut buf = Vec::new();
-    f.read_to_end(&mut buf)?;
-    if buf.len() < 8 {
-        return Ok(Vec::new());
-    }
-    let body_len = buf.len() - 8;
-    if body_len % RECORD_SIZE != 0 {
-        return Err(PersistError::Manifest(format!(
-            "snapshot body misaligned: {} bytes",
-            body_len
-        )));
-    }
-    let crc_expected = u32::from_le_bytes(buf[body_len..body_len + 4].try_into().unwrap());
-    let crc_actual = crc32fast::hash(&buf[..body_len]);
-    if crc_expected != crc_actual {
-        return Err(PersistError::Manifest(format!(
-            "snapshot CRC mismatch: expected {:08x}, got {:08x}",
-            crc_expected, crc_actual
-        )));
-    }
-    let mut out = Vec::with_capacity(body_len / RECORD_SIZE);
-    for chunk in buf[..body_len].chunks_exact(RECORD_SIZE) {
-        let arr: [u8; RECORD_SIZE] = chunk.try_into().unwrap();
-        match decode_record(&arr)? {
-            Record::Add(entry) => out.push(entry),
-            Record::Delete(_) => {
-                return Err(PersistError::Manifest(
-                    "snapshot contained a DELETE record".into(),
-                ));
-            }
-        }
-    }
-    Ok(out)
-}
-
-fn read_log(path: &Path) -> PersistResult<Vec<Record>> {
-    let mut f = File::open(path)?;
-    let len = f.seek(SeekFrom::End(0))?;
-    f.seek(SeekFrom::Start(0))?;
-    if len == 0 {
-        return Ok(Vec::new());
-    }
-    if len % RECORD_SIZE as u64 != 0 {
-        // Tolerate trailing torn write — just truncate to the last
-        // record boundary. Standard log-recovery practice.
-        let good = (len / RECORD_SIZE as u64) * RECORD_SIZE as u64;
-        let mut body = vec![0u8; good as usize];
-        f.read_exact(&mut body)?;
-        return decode_log_body(&body);
-    }
-    let mut body = vec![0u8; len as usize];
-    f.read_exact(&mut body)?;
-    decode_log_body(&body)
-}
-
-fn decode_log_body(body: &[u8]) -> PersistResult<Vec<Record>> {
-    let mut out = Vec::with_capacity(body.len() / RECORD_SIZE);
-    for chunk in body.chunks_exact(RECORD_SIZE) {
-        let arr: [u8; RECORD_SIZE] = chunk.try_into().unwrap();
-        out.push(decode_record(&arr)?);
-    }
-    Ok(out)
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use tempfile::TempDir;
-
-    fn entry(part_id: u64, min_ts: u64, max_ts: u64) -> PartEntry {
-        PartEntry {
-            part_id,
-            min_ts,
-            max_ts,
-            size_bytes: 1024,
-        }
-    }
-
-    #[test]
-    fn failed_log_open_does_not_publish_add_or_delete() {
-        let tmp = TempDir::new().unwrap();
-        let manifest = Manifest::init(tmp.path()).unwrap();
-        manifest.append_add(entry(1, 0, 10)).unwrap();
-        let saved = tmp.path().join("saved-log");
-        std::fs::rename(manifest.log_path(), &saved).unwrap();
-        std::fs::create_dir(manifest.log_path()).unwrap();
-        assert!(manifest.append_add(entry(2, 10, 20)).is_err());
-        assert!(manifest.append_delete(1).is_err());
-        assert_eq!(
-            manifest
-                .live_parts()
-                .iter()
-                .map(|e| e.part_id)
-                .collect::<Vec<_>>(),
-            vec![1]
-        );
-        std::fs::remove_dir(manifest.log_path()).unwrap();
-        std::fs::rename(saved, manifest.log_path()).unwrap();
-        let reopened = Manifest::open_or_init(tmp.path()).unwrap();
-        assert_eq!(reopened.live_parts().len(), 1);
-        assert_eq!(reopened.live_parts()[0].part_id, 1);
-    }
-
-    #[cfg(target_os = "linux")]
-    #[test]
-    fn ambiguous_write_blocks_further_publication_and_compaction() {
-        let tmp = TempDir::new().unwrap();
-        let manifest = Manifest::init(tmp.path()).unwrap();
-        let saved = tmp.path().join("saved-log");
-        std::fs::rename(manifest.log_path(), &saved).unwrap();
-        std::os::unix::fs::symlink("/dev/full", manifest.log_path()).unwrap();
-        assert!(manifest.append_add(entry(1, 0, 10)).is_err());
-        assert!(manifest.live_parts().is_empty());
-        std::fs::remove_file(manifest.log_path()).unwrap();
-        std::fs::rename(saved, manifest.log_path()).unwrap();
-        assert!(manifest.append_add(entry(2, 10, 20)).is_err());
-        assert!(manifest.compact().is_err());
-        let reopened = Manifest::open_or_init(tmp.path()).unwrap();
-        reopened.append_add(entry(2, 10, 20)).unwrap();
-        assert_eq!(reopened.live_parts().len(), 1);
-    }
-
-    #[test]
-    fn concurrent_compaction_preserves_committed_appends_on_reopen() {
-        let tmp = TempDir::new().unwrap();
-        let manifest = Arc::new(Manifest::init(tmp.path()).unwrap());
-        std::thread::scope(|scope| {
-            for worker in 0..3 {
-                let manifest = manifest.clone();
-                scope.spawn(move || {
-                    for index in 1..=24 {
-                        let id = worker * 24 + index;
-                        manifest.append_add(entry(id, id, id + 1)).unwrap();
-                    }
-                });
-            }
-            let manifest = manifest.clone();
-            scope.spawn(move || {
-                for _ in 0..12 {
-                    manifest.compact().unwrap();
-                }
-            });
-        });
-        assert_eq!(manifest.live_parts().len(), 72);
-        let reopened = Manifest::open_or_init(tmp.path()).unwrap();
-        assert_eq!(
-            reopened
-                .live_parts()
-                .iter()
-                .map(|e| e.part_id)
-                .collect::<Vec<_>>(),
-            (1..=72).collect::<Vec<_>>()
-        );
-    }
-
-    #[test]
-    fn append_and_reload_round_trip() {
-        let tmp = TempDir::new().unwrap();
-        let m = Manifest::init(tmp.path()).unwrap();
-        m.append_add(entry(1, 100, 200)).unwrap();
-        m.append_add(entry(2, 200, 300)).unwrap();
-        m.append_add(entry(3, 300, 400)).unwrap();
-        m.append_delete(2).unwrap();
-
-        // Drop and re-open — should see parts {1, 3}.
-        drop(m);
-        let m2 = Manifest::open_or_init(tmp.path()).unwrap();
-        let live = m2.live_parts();
-        assert_eq!(live.len(), 2);
-        assert_eq!(live[0].part_id, 1);
-        assert_eq!(live[1].part_id, 3);
-    }
-
-    #[test]
-    fn compact_rewrites_snapshot_and_truncates_log() {
-        let tmp = TempDir::new().unwrap();
-        let m = Manifest::init(tmp.path()).unwrap();
-        for i in 1..=10 {
-            m.append_add(entry(i, i * 100, i * 100 + 50)).unwrap();
-        }
-        m.compact().unwrap();
-
-        // Log file should be empty after compaction.
-        let log_meta = std::fs::metadata(m.log_path()).unwrap();
-        assert_eq!(log_meta.len(), 0);
-
-        let m2 = Manifest::open_or_init(tmp.path()).unwrap();
-        let live = m2.live_parts();
-        assert_eq!(live.len(), 10);
-        for (i, e) in live.iter().enumerate() {
-            assert_eq!(e.part_id, i as u64 + 1);
-        }
-    }
-
-    #[test]
-    fn live_parts_overlapping_filters_correctly() {
-        let tmp = TempDir::new().unwrap();
-        let m = Manifest::init(tmp.path()).unwrap();
-        m.append_add(entry(1, 100, 200)).unwrap();
-        m.append_add(entry(2, 300, 400)).unwrap();
-        m.append_add(entry(3, 500, 600)).unwrap();
-
-        let hits = m.live_parts_overlapping(150, 350);
-        let ids: Vec<u64> = hits.iter().map(|e| e.part_id).collect();
-        assert_eq!(ids, vec![1, 2]);
-    }
-}
diff --git a/data_plane/src/storage_engines/sketch_db/persistence/metadata.rs b/data_plane/src/storage_engines/sketch_db/persistence/metadata.rs
deleted file mode 100644
index 99df5ed24..000000000
--- a/data_plane/src/storage_engines/sketch_db/persistence/metadata.rs
+++ /dev/null
@@ -1,1039 +0,0 @@
-//! Per-sid metadata sidecar for the durable warm-sketch tier.
-//!
-//! ## Why this exists
-//!
-//! On-disk parts (`part.rs`) store, per entry, only: the `sid` (as
-//! `agg_id`), the label *values* (`KeyByLabelValues`), the
-//! `sketch_type_name`, the encoding tag, the time bounds, and the
-//! opaque sketch bytes. They do NOT carry the pieces of
-//! [`SummarySeriesMetadata`](crate::storage_engines::sketch_db::index::SummarySeriesMetadata)
-//! that the QUERY path needs to find and serve a series:
-//!
-//! * `metric_name` — the analyzer's
-//!   [`instances_matching`](crate::storage_engines::sketch_db::index::SketchStore::instances_matching)
-//!   filters on it.
-//! * `group_by_keys` (label KEYS, not values) — needed both by
-//!   `instances_matching` AND by the disk-union read path
-//!   (`sid_group_by_keys` → `rebuild_label_map`), which zips the sorted
-//!   keys against the stored value vector to reconstruct the label map.
-//! * `capability` / `agg_kind` — the sketch reducer's
-//!   `require_capability` gate.
-//!
-//! Without these, a `SketchStore` that is freshly reopened after a
-//! restart recovers the parts manifest + part cache but registers NO
-//! sids in its in-memory `instances` map (registration only ever happens
-//! on the live ingest path, when a fresh DataPoint arrives). So
-//! `instances_matching` enumerates nothing for the recovered metrics and
-//! `query_range`'s disk-union early-returns on the missing
-//! `sid_group_by_keys` → the query returns "No result" cluster-wide even
-//! though the data is durable on disk.
-//!
-//! This sidecar closes that gap: the flusher upserts a compact,
-//! self-describing record per flushed sid into `sid_metadata.json`, and
-//! recovery replays it to re-register every disk-resident sid as a
-//! queryable instance.
-//!
-//! ## Format
-//!
-//! A versioned JSON object containing descriptors and series bindings, written
-//! atomically (tmp + rename) on every upsert. JSON (not the custom
-//! binary part format) because the record count equals live sid
-//! cardinality (small) and the schema is human-inspectable for
-//! diagnosis. The record stores serializable PRIMITIVES — the
-//! `Capability` / `AccuracyBound` are DERIVED on load from `agg_kind`
-//! exactly as the ingest path derives them, so this module needs no
-//! serde on the control-plane `Capability` / `SketchAlgorithm` enums.
-
-use std::collections::HashMap;
-use std::fs::{self, File, OpenOptions};
-use std::io::Write;
-use std::path::{Path, PathBuf};
-
-use serde::{Deserialize, Serialize};
-
-use crate::storage_engines::sketch_db::data::{
-    AccuracyBound, AggKind, Capability, SketchAlgorithm, SketchConfig,
-};
-use crate::storage_engines::types::AggregationType;
-
-use super::{PersistError, PersistResult};
-
-/// File name of the sid-metadata sidecar under the persistence dir.
-pub const SERIES_ID_METADATA_FILE: &str = "sid_metadata.json";
-
-/// Serializable mirror of [`SketchConfig`]. Kept local (rather than
-/// deriving serde on the control-plane `SketchConfig`) so the sidecar
-/// schema is owned by the persistence layer and changes here can't
-/// silently shift the on-disk format from an unrelated edit.
-#[derive(Debug, Clone, Serialize, Deserialize, PartialEq)]
-#[serde(tag = "type", rename_all = "snake_case")]
-enum SketchConfigRec {
-    UnivMon {
-        heap_size: u32,
-        sketch_rows: u32,
-        sketch_cols: u32,
-        layers: u8,
-    },
-    DdSketch {
-        relative_accuracy: f64,
-    },
-    Kll {
-        k: u32,
-    },
-    Hll {
-        precision: u32,
-    },
-    CountSketch {
-        rows: i32,
-        cols: i32,
-    },
-    CountMin {
-        rows: i32,
-        cols: i32,
-    },
-}
-
-impl From<&SketchConfig> for SketchConfigRec {
-    fn from(c: &SketchConfig) -> Self {
-        match c {
-            SketchConfig::DDSketch { relative_accuracy } => SketchConfigRec::DdSketch {
-                relative_accuracy: *relative_accuracy,
-            },
-            SketchConfig::Kll { k } => SketchConfigRec::Kll { k: *k },
-            SketchConfig::UnivMon {
-                heap_size,
-                sketch_rows,
-                sketch_cols,
-                layers,
-            } => SketchConfigRec::UnivMon {
-                heap_size: *heap_size,
-                sketch_rows: *sketch_rows,
-                sketch_cols: *sketch_cols,
-                layers: *layers,
-            },
-            SketchConfig::Hll { precision } => SketchConfigRec::Hll {
-                precision: *precision,
-            },
-            SketchConfig::CountSketch { rows, cols } => SketchConfigRec::CountSketch {
-                rows: *rows,
-                cols: *cols,
-            },
-            SketchConfig::CountMin { rows, cols } => SketchConfigRec::CountMin {
-                rows: *rows,
-                cols: *cols,
-            },
-        }
-    }
-}
-
-impl From<&SketchConfigRec> for SketchConfig {
-    fn from(c: &SketchConfigRec) -> Self {
-        match c {
-            SketchConfigRec::DdSketch { relative_accuracy } => SketchConfig::DDSketch {
-                relative_accuracy: *relative_accuracy,
-            },
-            SketchConfigRec::Kll { k } => SketchConfig::Kll { k: *k },
-            SketchConfigRec::UnivMon {
-                heap_size,
-                sketch_rows,
-                sketch_cols,
-                layers,
-            } => SketchConfig::UnivMon {
-                heap_size: *heap_size,
-                sketch_rows: *sketch_rows,
-                sketch_cols: *sketch_cols,
-                layers: *layers,
-            },
-            SketchConfigRec::Hll { precision } => SketchConfig::Hll {
-                precision: *precision,
-            },
-            SketchConfigRec::CountSketch { rows, cols } => SketchConfig::CountSketch {
-                rows: *rows,
-                cols: *cols,
-            },
-            SketchConfigRec::CountMin { rows, cols } => SketchConfig::CountMin {
-                rows: *rows,
-                cols: *cols,
-            },
-        }
-    }
-}
-
-/// Stable string form of a [`SketchAlgorithm`] for the sidecar. Mirrors
-/// `sketch_algorithm_canonical` but is owned by the persistence layer so the
-/// on-disk vocabulary is stable independent of any upstream rename.
-fn sketch_algorithm_to_str(k: SketchAlgorithm) -> &'static str {
-    match k {
-        SketchAlgorithm::DDSketch => "DDSketch",
-        SketchAlgorithm::Kll => "Kll",
-        SketchAlgorithm::Hll => "Hll",
-        SketchAlgorithm::UnivMon => "UnivMon",
-        SketchAlgorithm::CountSketch => "CountSketch",
-        SketchAlgorithm::Cms => "CountMin",
-        SketchAlgorithm::CmsWithHeap => "CmsWithHeap",
-        SketchAlgorithm::CountSketchWithHeap => "CountSketchWithHeap",
-        SketchAlgorithm::Kmv => "Kmv",
-        SketchAlgorithm::Theta => "Theta",
-    }
-}
-
-fn sketch_algorithm_from_str(s: &str) -> Option<SketchAlgorithm> {
-    Some(match s {
-        "DDSketch" => SketchAlgorithm::DDSketch,
-        "Kll" => SketchAlgorithm::Kll,
-        "Hll" => SketchAlgorithm::Hll,
-        "UnivMon" => SketchAlgorithm::UnivMon,
-        "CountSketch" => SketchAlgorithm::CountSketch,
-        "CountMin" => SketchAlgorithm::Cms,
-        "CmsWithHeap" => SketchAlgorithm::CmsWithHeap,
-        "CountSketchWithHeap" => SketchAlgorithm::CountSketchWithHeap,
-        "Kmv" => SketchAlgorithm::Kmv,
-        "Theta" => SketchAlgorithm::Theta,
-        // `Any` was never a valid stored implementation. Reject legacy
-        // sidecars that contain it instead of inventing an algorithm.
-        "Any" => return None,
-        _ => return None,
-    })
-}
-
-/// Serializable mirror of the two [`AggKind`] branches.
-#[derive(Debug, Clone, Serialize, Deserialize, PartialEq)]
-#[serde(tag = "kind", rename_all = "snake_case")]
-enum AggKindRec {
-    Sketch {
-        sketch_kind: String,
-        config: SketchConfigRec,
-        spatial_filter_canonical: String,
-    },
-    ExactAgg {
-        agg_type: AggregationType,
-        parameters_canonical: String,
-        spatial_filter_canonical: String,
-    },
-}
-
-impl From<&AggKind> for AggKindRec {
-    fn from(a: &AggKind) -> Self {
-        match a {
-            AggKind::Sketch {
-                algorithm: kind,
-                config,
-                spatial_filter_canonical,
-            } => AggKindRec::Sketch {
-                sketch_kind: sketch_algorithm_to_str(kind.clone()).to_string(),
-                config: config.into(),
-                spatial_filter_canonical: spatial_filter_canonical.clone(),
-            },
-            AggKind::ExactAgg {
-                agg_type,
-                parameters_canonical,
-                spatial_filter_canonical,
-            } => AggKindRec::ExactAgg {
-                agg_type: *agg_type,
-                parameters_canonical: parameters_canonical.clone(),
-                spatial_filter_canonical: spatial_filter_canonical.clone(),
-            },
-        }
-    }
-}
-
-impl AggKindRec {
-    /// Rebuild the structured [`AggKind`]. Returns `None` if a sketch
-    /// kind string is unrecognized (forward-compat: a newer writer added
-    /// a kind this reader doesn't know — skip the sid rather than panic).
-    fn to_agg_kind(&self) -> Option<AggKind> {
-        Some(match self {
-            AggKindRec::Sketch {
-                sketch_kind,
-                config,
-                spatial_filter_canonical,
-            } => AggKind::Sketch {
-                algorithm: sketch_algorithm_from_str(sketch_kind)?,
-                config: config.into(),
-                spatial_filter_canonical: spatial_filter_canonical.clone(),
-            },
-            AggKindRec::ExactAgg {
-                agg_type,
-                parameters_canonical,
-                spatial_filter_canonical,
-            } => AggKind::ExactAgg {
-                agg_type: *agg_type,
-                parameters_canonical: parameters_canonical.clone(),
-                spatial_filter_canonical: spatial_filter_canonical.clone(),
-            },
-        })
-    }
-
-    fn without_population_filter(&self) -> Self {
-        let mut operator = self.clone();
-        match &mut operator {
-            Self::Sketch {
-                spatial_filter_canonical,
-                ..
-            }
-            | Self::ExactAgg {
-                spatial_filter_canonical,
-                ..
-            } => spatial_filter_canonical.clear(),
-        }
-        operator
-    }
-
-    fn with_population_filter(&self, filter: &str) -> Self {
-        let mut kind = self.clone();
-        match &mut kind {
-            Self::Sketch {
-                spatial_filter_canonical,
-                ..
-            }
-            | Self::ExactAgg {
-                spatial_filter_canonical,
-                ..
-            } => *spatial_filter_canonical = filter.to_string(),
-        }
-        kind
-    }
-}
-
-/// One durable sid-metadata row. The query-critical fields
-/// (`metric_name`, `group_by_keys`, `agg_kind`) are stored explicitly;
-/// `capability` and `accuracy` are DERIVED from `agg_kind` on load, the
-/// same way the ingest path derives them, so the record stays minimal.
-#[derive(Debug, Clone, Serialize, Deserialize, PartialEq)]
-pub struct StoredOutputMetadataRecord {
-    #[serde(default)]
-    pub stored_output_reference: Option<asap_types::sds::StoredOutputReference>,
-    pub storage_handle: u64,
-    /// Authoritative identity and provenance, absent on legacy sidecars.
-    #[serde(default)]
-    pub stored_output_id: Option<asap_types::sds::StoredOutputId>,
-    #[serde(default)]
-    pub summary_definition_id: Option<asap_types::sds::SummaryDefinitionId>,
-    #[serde(default)]
-    pub catalog_generation: Option<std::sync::Arc<asap_types::sds::CatalogGeneration>>,
-    pub metric_name: String,
-    /// Label KEY set, sorted (a `Vec` so the JSON stays compact; the
-    /// store side rebuilds the `BTreeSet`).
-    pub group_by_keys: Vec<String>,
-    agg_kind: AggKindRec,
-    pub first_seen_unix_ms: i64,
-    #[serde(default)]
-    pub retired_at_ms: Option<u64>,
-    #[serde(default)]
-    pub expires_at_ms: Option<u64>,
-    #[serde(default)]
-    pub removed: bool,
-    /// No further publication may change a window ending at or before this bound.
-    #[serde(default)]
-    pub completed_through_ms: Option<u64>,
-    #[serde(default, skip_serializing_if = "Option::is_none")]
-    pub pending_immutable: Option<super::immutable_output::ImmutableOutputReservation>,
-    #[serde(default, skip_serializing_if = "Option::is_none")]
-    pub last_immutable: Option<super::immutable_output::ImmutableOutputReservation>,
-}
-
-impl StoredOutputMetadataRecord {
-    /// Build a record from the live store-side fields. `agg_kind` is the
-    /// structured `AggKind`; `capability`/`accuracy` are intentionally
-    /// NOT stored (re-derived on load).
-    pub fn new(
-        sid: u64,
-        metric_name: String,
-        group_by_keys: Vec<String>,
-        agg_kind: &AggKind,
-        first_seen_unix_ms: i64,
-    ) -> Self {
-        Self {
-            storage_handle: sid,
-            stored_output_reference: None,
-            stored_output_id: None,
-            summary_definition_id: None,
-            catalog_generation: None,
-            metric_name,
-            group_by_keys,
-            agg_kind: agg_kind.into(),
-            first_seen_unix_ms,
-            retired_at_ms: None,
-            expires_at_ms: None,
-            removed: false,
-            completed_through_ms: None,
-            pending_immutable: None,
-            last_immutable: None,
-        }
-    }
-
-    pub(super) fn same_kind(&self, other: &Self) -> bool {
-        self.agg_kind == other.agg_kind
-    }
-
-    /// Reconstruct the structured [`AggKind`], or `None` for an
-    /// unrecognized sketch kind.
-    pub fn agg_kind(&self) -> Option<AggKind> {
-        self.agg_kind.to_agg_kind()
-    }
-
-    /// Derive the warm-tier [`Capability`] from `agg_kind`, mirroring the
-    /// ingest path (`otel.rs`) and `ingest_precompute_with_series_id`. Returns
-    /// `None` only when `agg_kind` itself fails to reconstruct.
-    pub fn capability(&self) -> Option<Capability> {
-        let agg_kind = self.agg_kind()?;
-        Some(match agg_kind {
-            AggKind::Sketch {
-                algorithm: kind, ..
-            } => match kind {
-                SketchAlgorithm::DDSketch | SketchAlgorithm::Kll => {
-                    Capability::QuantileApprox(Some(kind))
-                }
-                SketchAlgorithm::Hll | SketchAlgorithm::UnivMon => Capability::CardinalityApprox,
-                SketchAlgorithm::CountSketch | SketchAlgorithm::Cms => {
-                    Capability::FrequencyEstimate(Some(kind))
-                }
-                SketchAlgorithm::CmsWithHeap | SketchAlgorithm::CountSketchWithHeap => {
-                    Capability::FrequencyTopk(Some(kind))
-                }
-                SketchAlgorithm::Kmv | SketchAlgorithm::Theta => Capability::CardinalityApprox,
-            },
-            AggKind::ExactAgg { agg_type, .. } => Capability::ExactAgg(agg_type),
-        })
-    }
-
-    /// Derive the [`AccuracyBound`] — `Some` for sketch-backed sids,
-    /// `None` for exact-agg sids (mirrors the ingest registration).
-    pub fn accuracy(&self) -> Option<AccuracyBound> {
-        match self.agg_kind()? {
-            AggKind::Sketch { config, .. } => Some(AccuracyBound::from_config(&config)),
-            AggKind::ExactAgg { .. } => None,
-        }
-    }
-}
-
-#[derive(Debug, Clone, Serialize, Deserialize, PartialEq)]
-struct DataDescriptorRec {
-    metric_name: String,
-    population_filter_canonical: String,
-    group_by_keys: Vec<String>,
-}
-
-#[derive(Debug, Clone, Serialize, Deserialize, PartialEq)]
-struct StoredOutputBindingRecord {
-    #[serde(default)]
-    stored_output_reference: Option<asap_types::sds::StoredOutputReference>,
-    storage_handle: u64,
-    #[serde(default)]
-    stored_output_id: Option<asap_types::sds::StoredOutputId>,
-    #[serde(default)]
-    summary_definition_id: Option<asap_types::sds::SummaryDefinitionId>,
-    #[serde(default)]
-    catalog_generation_sha256: Option<String>,
-    summary_descriptor_id: String,
-    data_descriptor_id: String,
-    first_seen_unix_ms: i64,
-    #[serde(default)]
-    retired_at_ms: Option<u64>,
-    #[serde(default)]
-    expires_at_ms: Option<u64>,
-    #[serde(default)]
-    removed: bool,
-    #[serde(default)]
-    completed_through_ms: Option<u64>,
-    #[serde(default, skip_serializing_if = "Option::is_none")]
-    pending_immutable: Option<super::immutable_output::ImmutableOutputReservation>,
-    #[serde(default, skip_serializing_if = "Option::is_none")]
-    last_immutable: Option<super::immutable_output::ImmutableOutputReservation>,
-}
-
-/// Version-5 normalized sidecar with authoritative catalog provenance. Descriptors appear once and SeriesId bindings hold
-/// foreign keys, mirroring the in-memory SDS registry.
-#[derive(Debug, Clone, Serialize, Deserialize, PartialEq)]
-struct SdsSidecar {
-    schema_version: u32,
-    #[serde(default)]
-    catalog_generations: HashMap<String, std::sync::Arc<asap_types::sds::CatalogGeneration>>,
-    summary_descriptors: HashMap<String, AggKindRec>,
-    data_descriptors: HashMap<String, DataDescriptorRec>,
-    bindings: HashMap<String, StoredOutputBindingRecord>,
-}
-
-impl SdsSidecar {
-    fn from_records(records: impl IntoIterator<Item = StoredOutputMetadataRecord>) -> Self {
-        use crate::storage_engines::sketch_db::sds::{data_descriptor_id, summary_descriptor_id};
-
-        let mut sidecar = Self {
-            schema_version: 5,
-            catalog_generations: HashMap::new(),
-            summary_descriptors: HashMap::new(),
-            data_descriptors: HashMap::new(),
-            bindings: HashMap::new(),
-        };
-        for record in records {
-            let Some(kind) = record.agg_kind() else {
-                continue;
-            };
-            let summary_id = summary_descriptor_id(&kind).canonical().to_string();
-            let filter = kind.spatial_filter_canonical().to_string();
-            let data_id = data_descriptor_id(
-                &record.metric_name,
-                &filter,
-                record.group_by_keys.iter().map(String::as_str),
-            )
-            .canonical()
-            .to_string();
-            sidecar
-                .summary_descriptors
-                .entry(summary_id.clone())
-                .or_insert_with(|| record.agg_kind.without_population_filter());
-            sidecar
-                .data_descriptors
-                .entry(data_id.clone())
-                .or_insert_with(|| DataDescriptorRec {
-                    metric_name: record.metric_name,
-                    population_filter_canonical: filter,
-                    group_by_keys: record.group_by_keys,
-                });
-            let generation_sha256 = record.catalog_generation.map(|generation| {
-                let digest = generation.snapshot_sha256.clone();
-                sidecar
-                    .catalog_generations
-                    .entry(digest.clone())
-                    .or_insert(generation);
-                digest
-            });
-            sidecar.bindings.insert(
-                record.storage_handle.to_string(),
-                StoredOutputBindingRecord {
-                    storage_handle: record.storage_handle,
-                    stored_output_reference: record.stored_output_reference,
-                    stored_output_id: record.stored_output_id,
-                    summary_definition_id: record.summary_definition_id,
-                    catalog_generation_sha256: generation_sha256,
-                    summary_descriptor_id: summary_id,
-                    data_descriptor_id: data_id,
-                    first_seen_unix_ms: record.first_seen_unix_ms,
-                    retired_at_ms: record.retired_at_ms,
-                    expires_at_ms: record.expires_at_ms,
-                    removed: record.removed,
-                    completed_through_ms: record.completed_through_ms,
-                    pending_immutable: record.pending_immutable,
-                    last_immutable: record.last_immutable,
-                },
-            );
-        }
-        sidecar
-    }
-
-    fn into_records(self) -> PersistResult<Vec<StoredOutputMetadataRecord>> {
-        self.bindings
-            .into_values()
-            .map(|binding| {
-                let operator = self
-                    .summary_descriptors
-                    .get(&binding.summary_descriptor_id)
-                    .ok_or_else(|| {
-                        PersistError::Format(format!(
-                            "SeriesId {} references missing summary descriptor {}",
-                            binding.storage_handle, binding.summary_descriptor_id
-                        ))
-                    })?;
-                let data = self
-                    .data_descriptors
-                    .get(&binding.data_descriptor_id)
-                    .ok_or_else(|| {
-                        PersistError::Format(format!(
-                            "SeriesId {} references missing data descriptor {}",
-                            binding.storage_handle, binding.data_descriptor_id
-                        ))
-                    })?;
-                Ok(StoredOutputMetadataRecord {
-                    storage_handle: binding.storage_handle,
-                    stored_output_reference: binding.stored_output_reference.clone(),
-                    stored_output_id: binding.stored_output_id,
-                    summary_definition_id: binding.summary_definition_id,
-                    catalog_generation: binding
-                        .catalog_generation_sha256
-                        .as_ref()
-                        .map(|digest| {
-                            self.catalog_generations
-                                .get(digest)
-                                .cloned()
-                                .ok_or_else(|| {
-                                    PersistError::Format(format!(
-                                        "SeriesId {} references missing catalog generation",
-                                        binding.storage_handle
-                                    ))
-                                })
-                        })
-                        .transpose()?,
-                    metric_name: data.metric_name.clone(),
-                    group_by_keys: data.group_by_keys.clone(),
-                    agg_kind: operator.with_population_filter(&data.population_filter_canonical),
-                    first_seen_unix_ms: binding.first_seen_unix_ms,
-                    retired_at_ms: binding.retired_at_ms,
-                    expires_at_ms: binding.expires_at_ms,
-                    removed: binding.removed,
-                    completed_through_ms: binding.completed_through_ms,
-                    pending_immutable: binding.pending_immutable,
-                    last_immutable: binding.last_immutable,
-                })
-            })
-            .collect()
-    }
-}
-
-/// File-backed sid-metadata sidecar. The whole map is rewritten on every
-/// upsert (atomic tmp + rename). Live sid cardinality is small, so a full
-/// rewrite per flush tick is cheap and keeps the on-disk file always
-/// consistent with no log-replay machinery.
-#[derive(Debug)]
-pub struct StoredOutputMetadataFile {
-    path: PathBuf,
-    writer: std::sync::Mutex<()>,
-}
-
-impl StoredOutputMetadataFile {
-    /// Open (or lazily create on first write) the sidecar at
-    /// `<disk_path>/sid_metadata.json`.
-    pub fn new(disk_path: &Path) -> Self {
-        Self {
-            path: disk_path.join(SERIES_ID_METADATA_FILE),
-            writer: std::sync::Mutex::new(()),
-        }
-    }
-
-    /// Definitions are durable before any output may refer to this generation.
-    pub(crate) fn persist_catalog(
-        &self,
-        catalog: &asap_types::summary_catalog::SummaryCatalog,
-    ) -> PersistResult<()> {
-        let reference = catalog
-            .reference()
-            .map_err(|e| PersistError::Format(e.to_string()))?;
-        let _writer = self
-            .writer
-            .lock()
-            .map_err(|_| PersistError::Internal("SID metadata writer poisoned".into()))?;
-        let path = self.path.with_file_name(format!(
-            "sds-definitions-{}.json",
-            reference.snapshot_sha256
-        ));
-        if path.exists() {
-            let existing = self.load_catalog(&reference)?;
-            if existing != *catalog {
-                return Err(PersistError::Format(
-                    "immutable SDS definitions changed".into(),
-                ));
-            }
-            return Ok(());
-        }
-        let bytes =
-            serde_json::to_vec(catalog).map_err(|e| PersistError::Serialize(e.to_string()))?;
-        Self::write_atomic_at(&path, &bytes)
-    }
-
-    pub(crate) fn load_catalog(
-        &self,
-        generation: &asap_types::sds::CatalogGeneration,
-    ) -> PersistResult<asap_types::summary_catalog::SummaryCatalog> {
-        if generation.snapshot_sha256.len() != 64
-            || !generation
-                .snapshot_sha256
-                .bytes()
-                .all(|b| b.is_ascii_digit() || (b'a'..=b'f').contains(&b))
-        {
-            return Err(PersistError::Format("invalid SDS generation digest".into()));
-        }
-        let path = self.path.with_file_name(format!(
-            "sds-definitions-{}.json",
-            generation.snapshot_sha256
-        ));
-        let catalog: asap_types::summary_catalog::SummaryCatalog =
-            serde_json::from_slice(&fs::read(path)?)
-                .map_err(|e| PersistError::Format(e.to_string()))?;
-        if catalog
-            .reference()
-            .map_err(|e| PersistError::Format(e.to_string()))?
-            != *generation
-        {
-            return Err(PersistError::Format(
-                "persisted SDS definitions differ from generation".into(),
-            ));
-        }
-        Ok(catalog)
-    }
-
-    /// One bounded generation checkpoint closes raw producers across restart.
-    /// Catalog activation with another generation does not inherit this seal.
-    pub(crate) fn persist_finite_closure(
-        &self,
-        generation: &asap_types::sds::CatalogGeneration,
-    ) -> PersistResult<()> {
-        let _writer = self
-            .writer
-            .lock()
-            .map_err(|_| PersistError::Internal("SID metadata writer poisoned".into()))?;
-        let bytes = serde_json::to_vec(generation)
-            .map_err(|error| PersistError::Serialize(error.to_string()))?;
-        Self::write_atomic_at(
-            &self.path.with_file_name("finite_input_generation.json"),
-            &bytes,
-        )
-    }
-
-    pub(crate) fn load_finite_closure(
-        &self,
-    ) -> PersistResult<Option<asap_types::sds::CatalogGeneration>> {
-        match fs::read(self.path.with_file_name("finite_input_generation.json")) {
-            Ok(bytes) => serde_json::from_slice(&bytes).map(Some).map_err(|error| {
-                PersistError::Format(format!("invalid finite input checkpoint: {error}"))
-            }),
-            Err(error) if error.kind() == std::io::ErrorKind::NotFound => Ok(None),
-            Err(error) => Err(error.into()),
-        }
-    }
-
-    pub fn path(&self) -> &Path {
-        &self.path
-    }
-
-    /// Load current-format durable records. A missing file denotes a fresh store;
-    /// malformed or unsupported persisted metadata is an error.
-    pub fn load(&self) -> PersistResult<Vec<StoredOutputMetadataRecord>> {
-        self.load_strict()
-    }
-
-    /// Upsert a batch of records, merging with whatever is already on
-    /// disk (last write wins per sid). Atomic via tmp + rename + dir
-    /// fsync, matching the manifest's durability discipline.
-    pub fn upsert_all(&self, records: &[StoredOutputMetadataRecord]) -> PersistResult<()> {
-        let _writer = self.writer.lock().map_err(|_| {
-            PersistError::Io(std::io::Error::other("summary metadata writer poisoned"))
-        })?;
-        if records.is_empty() {
-            return Ok(());
-        }
-        let mut map: HashMap<String, StoredOutputMetadataRecord> = self
-            .load_strict()?
-            .into_iter()
-            .map(|r| (r.storage_handle.to_string(), r))
-            .collect();
-        let mut changed = false;
-        for r in records {
-            let key = r.storage_handle.to_string();
-            let mut next = r.clone();
-            if let Some(existing) = map.get(&key) {
-                // Lifecycle is monotone for a SeriesId. An older flush snapshot
-                // must not resurrect a retired or removed persisted instance.
-                next.pending_immutable = existing.pending_immutable.clone();
-                next.last_immutable = existing.last_immutable.clone();
-                next.removed |= existing.removed;
-                next.completed_through_ms =
-                    existing.completed_through_ms.max(next.completed_through_ms);
-                next.retired_at_ms = existing.retired_at_ms.or(next.retired_at_ms);
-                next.expires_at_ms = match (existing.expires_at_ms, next.expires_at_ms) {
-                    (Some(a), Some(b)) => Some(a.min(b)),
-                    (a, b) => a.or(b),
-                };
-            }
-            if map.get(&key) != Some(&next) {
-                map.insert(key, next);
-                changed = true;
-            }
-        }
-        if !changed {
-            return Ok(());
-        }
-        let sidecar = SdsSidecar::from_records(map.into_values());
-        let json = serde_json::to_string(&sidecar)
-            .map_err(|e| PersistError::Serialize(format!("sid metadata: {e}")))?;
-        self.write_atomic(json.as_bytes())
-    }
-
-    pub fn load_strict(&self) -> PersistResult<Vec<StoredOutputMetadataRecord>> {
-        let bytes = match fs::read(&self.path) {
-            Ok(bytes) => bytes,
-            Err(error) if error.kind() == std::io::ErrorKind::NotFound => return Ok(Vec::new()),
-            Err(error) => return Err(error.into()),
-        };
-        let value: serde_json::Value = serde_json::from_slice(&bytes)
-            .map_err(|error| PersistError::Format(format!("invalid SID metadata: {error}")))?;
-        if value
-            .get("schema_version")
-            .and_then(serde_json::Value::as_u64)
-            != Some(5)
-        {
-            return Err(PersistError::Format(
-                "unsupported SID metadata version".into(),
-            ));
-        }
-        let sidecar: SdsSidecar = serde_json::from_value(value)
-            .map_err(|error| PersistError::Format(error.to_string()))?;
-        sidecar.into_records()
-    }
-
-    pub(super) fn transaction<T>(
-        &self,
-        operation: impl FnOnce(
-            &mut HashMap<String, StoredOutputMetadataRecord>,
-            &Self,
-        ) -> PersistResult<T>,
-    ) -> PersistResult<T> {
-        let _writer = self
-            .writer
-            .lock()
-            .map_err(|_| PersistError::Internal("SID metadata writer poisoned".into()))?;
-        let mut records = self
-            .load_strict()?
-            .into_iter()
-            .map(|r| (r.storage_handle.to_string(), r))
-            .collect();
-        operation(&mut records, self)
-    }
-    pub(super) fn write_records(
-        &self,
-        records: &HashMap<String, StoredOutputMetadataRecord>,
-    ) -> PersistResult<()> {
-        let sidecar = SdsSidecar::from_records(records.values().cloned());
-        let bytes =
-            serde_json::to_vec(&sidecar).map_err(|e| PersistError::Serialize(e.to_string()))?;
-        self.write_atomic(&bytes)
-    }
-
-    fn write_atomic(&self, bytes: &[u8]) -> PersistResult<()> {
-        Self::write_atomic_at(&self.path, bytes)
-    }
-
-    fn write_atomic_at(path: &Path, bytes: &[u8]) -> PersistResult<()> {
-        if let Some(parent) = path.parent() {
-            fs::create_dir_all(parent)?;
-        }
-        let tmp = path.with_extension("json.tmp");
-        {
-            let mut f = OpenOptions::new()
-                .create(true)
-                .write(true)
-                .truncate(true)
-                .open(&tmp)?;
-            f.write_all(bytes)?;
-            f.sync_all()?;
-        }
-        fs::rename(&tmp, path)?;
-        if let Some(parent) = path.parent() {
-            File::open(parent)?.sync_all()?;
-        }
-        Ok(())
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use tempfile::TempDir;
-
-    fn sketch_meta(sid: u64) -> StoredOutputMetadataRecord {
-        StoredOutputMetadataRecord::new(
-            sid,
-            "http_latency".into(),
-            vec!["host".into(), "zone".into()],
-            &AggKind::Sketch {
-                algorithm: SketchAlgorithm::Kll,
-                config: SketchConfig::Kll { k: 200 },
-                spatial_filter_canonical: String::new(),
-            },
-            1234,
-        )
-    }
-
-    fn exact_meta(sid: u64) -> StoredOutputMetadataRecord {
-        StoredOutputMetadataRecord::new(
-            sid,
-            "http_requests_total".into(),
-            vec!["zone".into()],
-            &AggKind::ExactAgg {
-                agg_type: AggregationType::Sum,
-                parameters_canonical: String::new(),
-                spatial_filter_canonical: String::new(),
-            },
-            5678,
-        )
-    }
-
-    #[test]
-    fn load_on_missing_file_is_empty() {
-        let tmp = TempDir::new().unwrap();
-        let s = StoredOutputMetadataFile::new(tmp.path());
-        assert!(s.load().unwrap().is_empty());
-    }
-
-    // Restart must validate the immutable semantic document, not just its filename.
-    #[test]
-    fn persisted_definitions_roundtrip_and_reject_tampering() {
-        let directory = tempfile::tempdir().unwrap();
-        let store = StoredOutputMetadataFile::new(directory.path());
-        let catalog = asap_types::summary_catalog::SummaryCatalog::build(7, 2, []).unwrap();
-        store.persist_catalog(&catalog).unwrap();
-        let generation = catalog.reference().unwrap();
-        assert_eq!(store.load_catalog(&generation).unwrap(), catalog);
-        let path = store.path.with_file_name(format!(
-            "sds-definitions-{}.json",
-            generation.snapshot_sha256
-        ));
-        let mut altered = serde_json::to_value(&catalog).unwrap();
-        altered["plan_version"] = serde_json::json!(3);
-        std::fs::write(&path, serde_json::to_vec(&altered).unwrap()).unwrap();
-        assert!(store.load_catalog(&generation).is_err());
-        assert!(store.persist_catalog(&catalog).is_err());
-    }
-
-    #[test]
-    fn authoritative_bindings_share_one_persisted_catalog_generation() {
-        let directory = tempfile::tempdir().unwrap();
-        let store = StoredOutputMetadataFile::new(directory.path());
-        let generation = std::sync::Arc::new(asap_types::sds::CatalogGeneration {
-            schema_version: 1,
-            plan_id: 7,
-            plan_version: 2,
-            snapshot_sha256: "catalog".into(),
-        });
-        let mut first = sketch_meta(1);
-        first.stored_output_id = Some(asap_types::PolicyFingerprint(7).into());
-        first.catalog_generation = Some(std::sync::Arc::clone(&generation));
-        let mut second = first.clone();
-        second.storage_handle = 2;
-        store.upsert_all(&[first, second]).unwrap();
-        let json: serde_json::Value =
-            serde_json::from_slice(&std::fs::read(store.path()).unwrap()).unwrap();
-        assert_eq!(json["catalog_generations"].as_object().unwrap().len(), 1);
-        let records = store.load().unwrap();
-        assert_eq!(records.len(), 2);
-        assert!(std::sync::Arc::ptr_eq(
-            records[0].catalog_generation.as_ref().unwrap(),
-            records[1].catalog_generation.as_ref().unwrap()
-        ));
-        assert_eq!(
-            records[0].stored_output_id,
-            Some(asap_types::PolicyFingerprint(7).into())
-        );
-    }
-
-    #[test]
-    fn upsert_then_load_round_trips() {
-        let tmp = TempDir::new().unwrap();
-        let s = StoredOutputMetadataFile::new(tmp.path());
-        s.upsert_all(&[sketch_meta(1), exact_meta(2)]).unwrap();
-
-        let mut got = s.load().unwrap();
-        got.sort_by_key(|r| r.storage_handle);
-        assert_eq!(got.len(), 2);
-        assert_eq!(got[0], sketch_meta(1));
-        assert_eq!(got[1], exact_meta(2));
-
-        let persisted: serde_json::Value =
-            serde_json::from_slice(&std::fs::read(s.path()).unwrap()).unwrap();
-        assert_eq!(persisted["schema_version"], 5);
-        assert_eq!(
-            persisted["summary_descriptors"].as_object().unwrap().len(),
-            2
-        );
-        assert_eq!(persisted["data_descriptors"].as_object().unwrap().len(), 2);
-        assert_eq!(persisted["bindings"].as_object().unwrap().len(), 2);
-    }
-
-    #[test]
-    fn equivalent_sids_persist_one_copy_of_each_descriptor() {
-        let tmp = TempDir::new().unwrap();
-        let store = StoredOutputMetadataFile::new(tmp.path());
-        let mut second = sketch_meta(2);
-        second.first_seen_unix_ms = 9999;
-        store.upsert_all(&[sketch_meta(1), second]).unwrap();
-
-        let persisted: serde_json::Value =
-            serde_json::from_slice(&std::fs::read(store.path()).unwrap()).unwrap();
-        assert_eq!(
-            persisted["summary_descriptors"].as_object().unwrap().len(),
-            1
-        );
-        assert_eq!(persisted["data_descriptors"].as_object().unwrap().len(), 1);
-        assert_eq!(persisted["bindings"].as_object().unwrap().len(), 2);
-        assert_eq!(store.load().unwrap().len(), 2);
-    }
-
-    #[test]
-    fn broken_descriptor_reference_does_not_partially_recover() {
-        let tmp = TempDir::new().unwrap();
-        let store = StoredOutputMetadataFile::new(tmp.path());
-        store.upsert_all(&[sketch_meta(1), exact_meta(2)]).unwrap();
-
-        let mut persisted: serde_json::Value =
-            serde_json::from_slice(&std::fs::read(store.path()).unwrap()).unwrap();
-        let missing_id = persisted["bindings"]["1"]["summary_descriptor_id"]
-            .as_str()
-            .unwrap()
-            .to_string();
-        persisted["summary_descriptors"]
-            .as_object_mut()
-            .unwrap()
-            .remove(&missing_id);
-        std::fs::write(store.path(), serde_json::to_vec(&persisted).unwrap()).unwrap();
-
-        assert!(store.load().is_err());
-    }
-
-    #[test]
-    fn unsupported_sidecars_are_rejected_without_overwriting() {
-        let tmp = TempDir::new().unwrap();
-        let store = StoredOutputMetadataFile::new(tmp.path());
-        let flat = serde_json::to_value(HashMap::from([("1", sketch_meta(1))])).unwrap();
-        let mut cases = vec![flat];
-        for version in [1, 2, 3, 4, 6, 999] {
-            cases.push(serde_json::json!({"schema_version": version}));
-        }
-        for value in cases {
-            let bytes = serde_json::to_vec(&value).unwrap();
-            std::fs::write(store.path(), &bytes).unwrap();
-            assert!(store.load().is_err());
-            assert!(store.upsert_all(&[exact_meta(2)]).is_err());
-            assert_eq!(std::fs::read(store.path()).unwrap(), bytes);
-        }
-    }
-
-    #[test]
-    fn upsert_merges_and_overwrites_per_sid() {
-        let tmp = TempDir::new().unwrap();
-        let s = StoredOutputMetadataFile::new(tmp.path());
-        s.upsert_all(&[sketch_meta(1)]).unwrap();
-        // New sid + updated metric for sid 1.
-        let mut updated = sketch_meta(1);
-        updated.metric_name = "http_latency_v2".into();
-        s.upsert_all(&[updated.clone(), exact_meta(2)]).unwrap();
-
-        let mut got = s.load().unwrap();
-        got.sort_by_key(|r| r.storage_handle);
-        assert_eq!(got.len(), 2);
-        assert_eq!(got[0].metric_name, "http_latency_v2");
-        assert_eq!(got[1], exact_meta(2));
-    }
-
-    #[test]
-    fn derives_capability_and_accuracy_from_agg_kind() {
-        let kll = sketch_meta(1);
-        assert!(matches!(
-            kll.capability(),
-            Some(Capability::QuantileApprox(Some(SketchAlgorithm::Kll)))
-        ));
-        assert!(kll.accuracy().is_some());
-
-        let sum = exact_meta(2);
-        assert!(matches!(
-            sum.capability(),
-            Some(Capability::ExactAgg(AggregationType::Sum))
-        ));
-        assert!(sum.accuracy().is_none());
-    }
-
-    #[test]
-    fn unparsable_file_is_rejected() {
-        let tmp = TempDir::new().unwrap();
-        let s = StoredOutputMetadataFile::new(tmp.path());
-        std::fs::write(s.path(), b"{not json").unwrap();
-        assert!(s.load().is_err());
-    }
-}
diff --git a/data_plane/src/storage_engines/sketch_db/persistence/mod.rs b/data_plane/src/storage_engines/sketch_db/persistence/mod.rs
deleted file mode 100644
index 9627f08d2..000000000
--- a/data_plane/src/storage_engines/sketch_db/persistence/mod.rs
+++ /dev/null
@@ -1,61 +0,0 @@
-//! Persistence layer for `SketchStorePerKey`.
-//!
-//! See `docs/design_docs/future-storage-and-compression.md` for the design scope.
-//!
-//! ## Structure
-//!
-//! * [`config`] — [`SketchStorePersistenceConfig`]
-//! * [`part`] — on-disk part format (`meta.bin` + `data.bin` + `index.bin`),
-//!   writer and reader.
-//! * [`manifest`] — append-only log + periodic binary snapshot of live parts.
-//! * [`flusher`] — background `std::thread` that walks sealed epochs and
-//!   turns each tick's candidates into a single on-disk part.
-//! * [`cache`] — moka-backed Tier-2 cache of decoded parts, keyed on
-//!   `PartId`, bounded by bytes.
-//! * [`recovery`] — startup: load snapshot, replay log, verify CRCs, sweep
-//!   orphan part dirs.
-//!
-//! The submodule is intentionally decoupled from `SketchStorePerKey`
-//! via the [`EpochSource`] trait — the flusher knows nothing about the
-//! store's internal types and can be unit-tested against a fake source.
-
-pub mod config;
-pub mod manifest;
-pub mod metadata;
-pub mod part;
-pub mod source;
-
-pub mod cache;
-pub mod flusher;
-pub mod immutable_output;
-pub mod recovery;
-
-pub use config::SketchStorePersistenceConfig;
-pub use manifest::{Manifest, PartEntry};
-pub use metadata::{StoredOutputMetadataFile, StoredOutputMetadataRecord};
-pub use part::{PartId, PartReader, PartWriter, SnapshotEntry};
-pub use source::{EpochSource, SealedEpochRef};
-
-/// Convenience result alias used across the persistence layer.
-pub type PersistResult<T> = Result<T, PersistError>;
-
-#[derive(Debug, thiserror::Error)]
-pub enum PersistError {
-    #[error("I/O error: {0}")]
-    Io(#[from] std::io::Error),
-
-    #[error("part format error: {0}")]
-    Format(String),
-
-    #[error("manifest corruption: {0}")]
-    Manifest(String),
-
-    #[error("unsupported accumulator type for persistence: {0}")]
-    UnsupportedAccumulator(String),
-
-    #[error("serialization error: {0}")]
-    Serialize(String),
-
-    #[error("internal error: {0}")]
-    Internal(String),
-}
diff --git a/data_plane/src/storage_engines/sketch_db/persistence/part.rs b/data_plane/src/storage_engines/sketch_db/persistence/part.rs
deleted file mode 100644
index c760668cb..000000000
--- a/data_plane/src/storage_engines/sketch_db/persistence/part.rs
+++ /dev/null
@@ -1,733 +0,0 @@
-//! On-disk part format: `meta.bin` + `data.bin` + `index.bin`.
-//!
-//! A *part* is one flush tick's bundle of sealed-epoch entries, stored
-//! in `<disk_path>/parts/<part_id_zero_padded>/`. See the design doc
-//! section "Disk layout" for the full format.
-//!
-//! ## v1 format
-//!
-//! Custom little-endian binary throughout. 8-byte alignment on anything
-//! the reader needs to cast directly. CRC32 (crc32fast) trailer on each
-//! file. Written via `fallocate` when available, sync'd file-by-file,
-//! directory fsync after all three files are durable.
-//!
-//! File shapes (v1):
-//!
-//! ```text
-//! meta.bin (fixed 64-byte header + a variable-size trailer we ignore)
-//!   u32 MAGIC_META
-//!   u16 VERSION = 1
-//!   u16 _flags                     (reserved, zero)
-//!   u64 part_id
-//!   u64 min_ts
-//!   u64 max_ts
-//!   u32 num_entries
-//!   u32 _reserved
-//!   u64 data_len
-//!   u64 index_len
-//!   u64 created_unix_ms
-//!   u32 crc32_of_header            (covers all preceding 60 bytes)
-//!   u32 _pad
-//!
-//! data.bin (opaque byte blob; entries concatenated, each 8-byte
-//! aligned; the reader never scans it linearly, it only seeks via index
-//! offsets)
-//!   repeat num_entries:
-//!     [label_len: u32]
-//!     [payload_len: u32]
-//!     [label bytes: label_len bytes, bincode-serialized Option<KeyByLabelValues>]
-//!     [pad to 8-byte align of payload]
-//!     [type_name_len: u16]
-//!     [pad to 8-byte align of type_name (small)]
-//!     [type_name bytes]
-//!     [pad to 8-byte align]
-//!     [payload bytes: payload_len bytes]
-//!     [tail pad to 8-byte align]
-//!   u32 crc32_of_body
-//!   u32 _pad
-//!
-//! index.bin (sorted by (agg_id is same for whole part in v1 — one
-//! part mixes epochs but one sealed epoch is one agg_id; for now we
-//! store agg_id per entry for forward-compat, start_ts))
-//!   repeat num_entries:
-//!     [agg_id: u64]
-//!     [start_ts: u64]
-//!     [end_ts: u64]
-//!     [data_offset: u64]
-//!   u32 crc32_of_body
-//!   u32 _pad
-//! ```
-//!
-//! The data encoding is intentionally simple (length-prefixed fields,
-//! 8-byte alignment) and skips a bunch of the micro-optimizations in
-//! the design doc. v1 priorities are correctness, round-trip, and
-//! passing tests — not beating Prometheus TSDB.
-
-use std::fs::{self, File, OpenOptions};
-use std::io::{BufWriter, Read, Write};
-use std::path::{Path, PathBuf};
-use std::sync::Arc;
-use std::time::{SystemTime, UNIX_EPOCH};
-
-use memmap2::Mmap;
-
-use super::source::EpochSnapshot;
-use super::{PersistError, PersistResult};
-
-pub type PartId = u64;
-
-pub(crate) const MAGIC_META: u32 = 0x4D_50_41_52; // "MPAR"
-pub(crate) const PART_FORMAT_VERSION: u16 = 1;
-pub(crate) const META_HEADER_SIZE: usize = 64;
-pub(crate) const INDEX_ENTRY_SIZE: usize = 32;
-
-/// Zero-padded directory name for a part.
-pub fn part_dir_name(part_id: PartId) -> String {
-    format!("{:016x}", part_id)
-}
-
-/// Full path for a part directory under a given parts root.
-pub fn part_dir_path(parts_root: &Path, part_id: PartId) -> PathBuf {
-    parts_root.join(part_dir_name(part_id))
-}
-
-/// Encoding-tag namespace for the per-entry `encoding` byte stored in
-/// `data.bin` (the byte that v1 left as a reserved pad). Lets the disk
-/// read-back path reconstruct the `SketchEncoding` so the
-/// delta-stitching carry-in survives the in-mem/on-disk boundary.
-///
-/// `0` is reserved for "unknown / treat as Full" so parts written by
-/// the original v1 writer (which always wrote `0` into the pad) decode
-/// as Full — the safe default for a carry-in base.
-pub mod encoding_tag {
-    pub const UNKNOWN: u8 = 0;
-    pub const PROTO_FULL: u8 = 1;
-    pub const PROTO_DELTA: u8 = 2;
-    pub const MSGPACK_FULL: u8 = 3;
-    pub const MSGPACK_DELTA: u8 = 4;
-    pub const NATIVE_BATCH_V1: u8 = 5;
-}
-
-/// One entry inside a decoded part. The `start_ts`/`end_ts`/`label`
-/// fields are resolved by the reader; the sketch payload stays as
-/// bytes so the query path can decide whether to decode lazily.
-#[derive(Debug, Clone)]
-pub struct SnapshotEntry {
-    pub agg_id: u64,
-    pub start_ts: u64,
-    pub end_ts: u64,
-    pub label: Option<crate::storage_engines::types::KeyByLabelValues>,
-    pub sketch_type_name: String,
-    /// Wire-encoding tag — see [`encoding_tag`]. `0` for parts written
-    /// before encoding round-tripping landed (decode as Full).
-    pub encoding_tag: u8,
-    pub sketch_bytes: Vec<u8>,
-}
-
-/// Write one [`EpochSnapshot`] (or many, concatenated) into a fresh
-/// part directory. Consumes snapshots in order and produces the final
-/// `(data_len, index_len)` for the manifest record. Streams data
-/// through a `BufWriter` with a running CRC.
-pub struct PartWriter;
-
-impl PartWriter {
-    /// Build a new part directory from a list of epoch snapshots. The
-    /// snapshots may come from multiple agg-ids (one flush tick bundles
-    /// candidates from whichever aggs needed eviction).
-    ///
-    /// Returns `(min_ts, max_ts, num_entries, data_len, index_len)`.
-    pub fn write_part(
-        part_dir: &Path,
-        part_id: PartId,
-        snapshots: &[EpochSnapshot],
-    ) -> PersistResult<PartWriteReport> {
-        fs::create_dir_all(part_dir)?;
-
-        // ---- Build in-memory entry plan (offsets + index entries) ----
-        let mut entries_plan: Vec<PlannedEntry> = Vec::new();
-        let mut data_len: u64 = 0;
-        let mut min_ts: u64 = u64::MAX;
-        let mut max_ts: u64 = 0;
-
-        for snap in snapshots {
-            for e in &snap.entries {
-                let label_bytes = match &e.label {
-                    Some(k) => k.serialize_to_bytes(),
-                    None => Vec::new(),
-                };
-                let type_name_bytes = e.sketch_type_name.as_bytes().to_vec();
-                // Layout inside data.bin per entry:
-                //   u32 label_len
-                //   u32 payload_len
-                //   u16 type_name_len
-                //   u16 _pad
-                //   u32 _pad
-                //   label_bytes + pad-to-8
-                //   type_name_bytes + pad-to-8
-                //   payload_bytes + pad-to-8
-                let header_size = 16; // 4+4+2+2+4
-                let label_padded = align_up(label_bytes.len(), 8);
-                let type_padded = align_up(type_name_bytes.len(), 8);
-                let payload_padded = align_up(e.sketch_bytes.len(), 8);
-                let entry_size = header_size + label_padded + type_padded + payload_padded;
-
-                let data_offset = data_len;
-                entries_plan.push(PlannedEntry {
-                    agg_id: snap.agg_id,
-                    start_ts: e.start_ts,
-                    end_ts: e.end_ts,
-                    data_offset,
-                    label_bytes,
-                    type_name_bytes,
-                    encoding_tag: e.encoding_tag,
-                    sketch_bytes: e.sketch_bytes.clone(),
-                });
-                data_len += entry_size as u64;
-                min_ts = min_ts.min(e.start_ts);
-                max_ts = max_ts.max(e.end_ts);
-            }
-        }
-
-        if entries_plan.is_empty() {
-            return Err(PersistError::Internal(
-                "PartWriter::write_part called with zero entries".to_string(),
-            ));
-        }
-
-        let num_entries = entries_plan.len() as u32;
-        let index_len = num_entries as u64 * INDEX_ENTRY_SIZE as u64 + 8; // + crc trailer
-
-        // ---- Write data.bin with streaming CRC ----
-        let data_path = part_dir.join("data.bin");
-        let mut data_file = BufWriter::new(
-            OpenOptions::new()
-                .create_new(true)
-                .write(true)
-                .open(&data_path)?,
-        );
-        let mut data_crc = crc32fast::Hasher::new();
-        for pe in &entries_plan {
-            write_u32(&mut data_file, &mut data_crc, pe.label_bytes.len() as u32)?;
-            write_u32(&mut data_file, &mut data_crc, pe.sketch_bytes.len() as u32)?;
-            write_u16(
-                &mut data_file,
-                &mut data_crc,
-                pe.type_name_bytes.len() as u16,
-            )?;
-            // Repurposed v1 pad u16: low byte carries the encoding tag,
-            // high byte stays zero. v1 parts wrote 0 here → decode as
-            // `encoding_tag::UNKNOWN` (treat as Full), so old parts
-            // remain readable.
-            write_u16(&mut data_file, &mut data_crc, pe.encoding_tag as u16)?;
-            write_u32(&mut data_file, &mut data_crc, 0)?; // _pad
-            write_padded(&mut data_file, &mut data_crc, &pe.label_bytes, 8)?;
-            write_padded(&mut data_file, &mut data_crc, &pe.type_name_bytes, 8)?;
-            write_padded(&mut data_file, &mut data_crc, &pe.sketch_bytes, 8)?;
-        }
-        let data_crc_val = data_crc.finalize();
-        data_file.write_all(&data_crc_val.to_le_bytes())?;
-        data_file.write_all(&[0u8; 4])?; // pad
-        data_file.flush()?;
-        let data_file = data_file
-            .into_inner()
-            .map_err(|e| PersistError::Io(e.into_error()))?;
-        data_file.sync_all()?;
-        drop(data_file);
-
-        // ---- Write index.bin ----
-        let index_path = part_dir.join("index.bin");
-        let mut index_file = BufWriter::new(
-            OpenOptions::new()
-                .create_new(true)
-                .write(true)
-                .open(&index_path)?,
-        );
-        let mut index_crc = crc32fast::Hasher::new();
-        for pe in &entries_plan {
-            write_u64(&mut index_file, &mut index_crc, pe.agg_id)?;
-            write_u64(&mut index_file, &mut index_crc, pe.start_ts)?;
-            write_u64(&mut index_file, &mut index_crc, pe.end_ts)?;
-            write_u64(&mut index_file, &mut index_crc, pe.data_offset)?;
-        }
-        let index_crc_val = index_crc.finalize();
-        index_file.write_all(&index_crc_val.to_le_bytes())?;
-        index_file.write_all(&[0u8; 4])?;
-        index_file.flush()?;
-        let index_file = index_file
-            .into_inner()
-            .map_err(|e| PersistError::Io(e.into_error()))?;
-        index_file.sync_all()?;
-        drop(index_file);
-
-        // ---- Write meta.bin (64 bytes, CRC'd) ----
-        let meta_path = part_dir.join("meta.bin");
-        let created_ms = SystemTime::now()
-            .duration_since(UNIX_EPOCH)
-            .map(|d| d.as_millis() as u64)
-            .unwrap_or(0);
-
-        // 64-byte header. Layout:
-        //   [0..4]   u32 magic
-        //   [4..6]   u16 version
-        //   [6..8]   u16 flags
-        //   [8..16]  u64 part_id
-        //   [16..24] u64 min_ts
-        //   [24..32] u64 max_ts
-        //   [32..36] u32 num_entries
-        //   [36..40] u32 reserved
-        //   [40..48] u64 data_len
-        //   [48..56] u64 index_len
-        //   [56..60] u32 created_unix_secs (seconds granularity; diagnostic)
-        //   [60..64] u32 crc32 of [0..60]
-        let mut header = [0u8; META_HEADER_SIZE];
-        let mut cursor = 0usize;
-        write_u32_into(&mut header, &mut cursor, MAGIC_META);
-        write_u16_into(&mut header, &mut cursor, PART_FORMAT_VERSION);
-        write_u16_into(&mut header, &mut cursor, 0); // flags
-        write_u64_into(&mut header, &mut cursor, part_id);
-        write_u64_into(&mut header, &mut cursor, min_ts);
-        write_u64_into(&mut header, &mut cursor, max_ts);
-        write_u32_into(&mut header, &mut cursor, num_entries);
-        write_u32_into(&mut header, &mut cursor, 0); // reserved
-        write_u64_into(&mut header, &mut cursor, data_len);
-        write_u64_into(&mut header, &mut cursor, index_len);
-        let created_secs: u32 = (created_ms / 1000).min(u32::MAX as u64) as u32;
-        write_u32_into(&mut header, &mut cursor, created_secs);
-        let meta_crc = crc32fast::hash(&header[..60]);
-        header[60..64].copy_from_slice(&meta_crc.to_le_bytes());
-
-        {
-            let mut meta_file = OpenOptions::new()
-                .create_new(true)
-                .write(true)
-                .open(&meta_path)?;
-            meta_file.write_all(&header)?;
-            meta_file.sync_all()?;
-        }
-
-        // fsync the directory so the files are durably linked.
-        if let Ok(dir) = File::open(part_dir) {
-            let _ = dir.sync_all();
-        }
-
-        Ok(PartWriteReport {
-            part_id,
-            min_ts,
-            max_ts,
-            num_entries,
-            data_len,
-            index_len,
-        })
-    }
-}
-
-/// What [`PartWriter::write_part`] reports back.
-#[derive(Debug, Clone)]
-pub struct PartWriteReport {
-    pub part_id: PartId,
-    pub min_ts: u64,
-    pub max_ts: u64,
-    pub num_entries: u32,
-    pub data_len: u64,
-    pub index_len: u64,
-}
-
-struct PlannedEntry {
-    agg_id: u64,
-    start_ts: u64,
-    end_ts: u64,
-    data_offset: u64,
-    label_bytes: Vec<u8>,
-    type_name_bytes: Vec<u8>,
-    encoding_tag: u8,
-    sketch_bytes: Vec<u8>,
-}
-
-// ----- small write helpers with running CRC -----
-
-fn write_u16<W: Write>(w: &mut W, h: &mut crc32fast::Hasher, v: u16) -> std::io::Result<()> {
-    let b = v.to_le_bytes();
-    w.write_all(&b)?;
-    h.update(&b);
-    Ok(())
-}
-
-fn write_u32<W: Write>(w: &mut W, h: &mut crc32fast::Hasher, v: u32) -> std::io::Result<()> {
-    let b = v.to_le_bytes();
-    w.write_all(&b)?;
-    h.update(&b);
-    Ok(())
-}
-
-fn write_u64<W: Write>(w: &mut W, h: &mut crc32fast::Hasher, v: u64) -> std::io::Result<()> {
-    let b = v.to_le_bytes();
-    w.write_all(&b)?;
-    h.update(&b);
-    Ok(())
-}
-
-fn write_padded<W: Write>(
-    w: &mut W,
-    h: &mut crc32fast::Hasher,
-    bytes: &[u8],
-    align: usize,
-) -> std::io::Result<()> {
-    w.write_all(bytes)?;
-    h.update(bytes);
-    let padded = align_up(bytes.len(), align);
-    let pad_len = padded - bytes.len();
-    if pad_len > 0 {
-        let pad = [0u8; 8];
-        w.write_all(&pad[..pad_len])?;
-        h.update(&pad[..pad_len]);
-    }
-    Ok(())
-}
-
-fn align_up(n: usize, align: usize) -> usize {
-    (n + align - 1) & !(align - 1)
-}
-
-fn write_u16_into(buf: &mut [u8], cursor: &mut usize, v: u16) {
-    buf[*cursor..*cursor + 2].copy_from_slice(&v.to_le_bytes());
-    *cursor += 2;
-}
-
-fn write_u32_into(buf: &mut [u8], cursor: &mut usize, v: u32) {
-    buf[*cursor..*cursor + 4].copy_from_slice(&v.to_le_bytes());
-    *cursor += 4;
-}
-
-fn write_u64_into(buf: &mut [u8], cursor: &mut usize, v: u64) {
-    buf[*cursor..*cursor + 8].copy_from_slice(&v.to_le_bytes());
-    *cursor += 8;
-}
-
-// =================================================================
-// Reader
-// =================================================================
-
-/// Decoded metadata header of a part (from `meta.bin`).
-#[derive(Debug, Clone)]
-pub struct PartMeta {
-    pub part_id: PartId,
-    pub min_ts: u64,
-    pub max_ts: u64,
-    pub num_entries: u32,
-    pub data_len: u64,
-    pub index_len: u64,
-    pub created_unix_ms: u64,
-}
-
-/// One resolved index record. `sketch_bytes` and the label are lazy —
-/// they live inside `data.bin` and are resolved on demand via
-/// [`PartReader::load_entry`].
-#[derive(Debug, Clone, Copy)]
-pub struct IndexRecord {
-    pub agg_id: u64,
-    pub start_ts: u64,
-    pub end_ts: u64,
-    pub data_offset: u64,
-}
-
-/// mmap-backed reader for a single part. Cheap to construct (three
-/// mmaps + one header parse), safe to share across threads via `Arc`.
-pub struct PartReader {
-    pub meta: PartMeta,
-    pub part_dir: PathBuf,
-    data_mmap: Arc<Mmap>,
-    index_mmap: Arc<Mmap>,
-}
-
-impl std::fmt::Debug for PartReader {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        f.debug_struct("PartReader")
-            .field("meta", &self.meta)
-            .field("part_dir", &self.part_dir)
-            .field("data_mmap_len", &self.data_mmap.len())
-            .field("index_mmap_len", &self.index_mmap.len())
-            .finish()
-    }
-}
-
-impl PartReader {
-    pub fn open(part_dir: &Path) -> PersistResult<Self> {
-        let meta = Self::read_meta(part_dir)?;
-
-        let data_mmap = map_file(&part_dir.join("data.bin"))?;
-        let index_mmap = map_file(&part_dir.join("index.bin"))?;
-
-        // Sanity-check CRCs up front so we catch tampered files.
-        let idx_payload_len = meta.num_entries as usize * INDEX_ENTRY_SIZE;
-        if index_mmap.len() < idx_payload_len + 8 {
-            return Err(PersistError::Format(format!(
-                "index.bin too short for {} entries (have {} bytes)",
-                meta.num_entries,
-                index_mmap.len()
-            )));
-        }
-        let idx_expected = u32::from_le_bytes(
-            index_mmap[idx_payload_len..idx_payload_len + 4]
-                .try_into()
-                .unwrap(),
-        );
-        let idx_actual = crc32fast::hash(&index_mmap[..idx_payload_len]);
-        if idx_expected != idx_actual {
-            return Err(PersistError::Format(format!(
-                "index.bin CRC mismatch: expected {:08x}, got {:08x}",
-                idx_expected, idx_actual
-            )));
-        }
-
-        Ok(Self {
-            meta,
-            part_dir: part_dir.to_path_buf(),
-            data_mmap: Arc::new(data_mmap),
-            index_mmap: Arc::new(index_mmap),
-        })
-    }
-
-    /// Read and verify just the meta.bin header (cheap — 64 bytes).
-    pub fn read_meta(part_dir: &Path) -> PersistResult<PartMeta> {
-        let mut f = File::open(part_dir.join("meta.bin"))?;
-        let mut buf = [0u8; META_HEADER_SIZE];
-        f.read_exact(&mut buf)?;
-
-        let magic = u32::from_le_bytes(buf[0..4].try_into().unwrap());
-        if magic != MAGIC_META {
-            return Err(PersistError::Format(format!(
-                "meta.bin bad magic: {:08x}",
-                magic
-            )));
-        }
-        let version = u16::from_le_bytes(buf[4..6].try_into().unwrap());
-        if version != PART_FORMAT_VERSION {
-            return Err(PersistError::Format(format!(
-                "meta.bin unsupported version: {}",
-                version
-            )));
-        }
-        // 6..8 flags (ignored)
-        let part_id = u64::from_le_bytes(buf[8..16].try_into().unwrap());
-        let min_ts = u64::from_le_bytes(buf[16..24].try_into().unwrap());
-        let max_ts = u64::from_le_bytes(buf[24..32].try_into().unwrap());
-        let num_entries = u32::from_le_bytes(buf[32..36].try_into().unwrap());
-        // 36..40 reserved
-        let data_len = u64::from_le_bytes(buf[40..48].try_into().unwrap());
-        let index_len = u64::from_le_bytes(buf[48..56].try_into().unwrap());
-        let created_unix_secs = u32::from_le_bytes(buf[56..60].try_into().unwrap()) as u64;
-        let created_unix_ms = created_unix_secs * 1000;
-        let crc_expected = u32::from_le_bytes(buf[60..64].try_into().unwrap());
-        let crc_actual = crc32fast::hash(&buf[..60]);
-        if crc_expected != crc_actual {
-            return Err(PersistError::Format(format!(
-                "meta.bin CRC mismatch: expected {:08x}, got {:08x}",
-                crc_expected, crc_actual
-            )));
-        }
-
-        Ok(PartMeta {
-            part_id,
-            min_ts,
-            max_ts,
-            num_entries,
-            data_len,
-            index_len,
-            created_unix_ms,
-        })
-    }
-
-    /// Return all index records. Small (32 B × num_entries) — cheap to
-    /// materialize.
-    pub fn index_records(&self) -> Vec<IndexRecord> {
-        let n = self.meta.num_entries as usize;
-        let mut out = Vec::with_capacity(n);
-        for i in 0..n {
-            let off = i * INDEX_ENTRY_SIZE;
-            let agg_id = u64::from_le_bytes(self.index_mmap[off..off + 8].try_into().unwrap());
-            let start_ts =
-                u64::from_le_bytes(self.index_mmap[off + 8..off + 16].try_into().unwrap());
-            let end_ts =
-                u64::from_le_bytes(self.index_mmap[off + 16..off + 24].try_into().unwrap());
-            let data_offset =
-                u64::from_le_bytes(self.index_mmap[off + 24..off + 32].try_into().unwrap());
-            out.push(IndexRecord {
-                agg_id,
-                start_ts,
-                end_ts,
-                data_offset,
-            });
-        }
-        out
-    }
-
-    /// Resolve a single index record into a [`SnapshotEntry`] by reading
-    /// the corresponding slice of `data.bin`. Decodes the inline label
-    /// and copies the sketch payload out.
-    pub fn load_entry(&self, rec: &IndexRecord) -> PersistResult<SnapshotEntry> {
-        let off = rec.data_offset as usize;
-        if off + 16 > self.data_mmap.len() {
-            return Err(PersistError::Format(
-                "data.bin offset out of range".to_string(),
-            ));
-        }
-        let label_len =
-            u32::from_le_bytes(self.data_mmap[off..off + 4].try_into().unwrap()) as usize;
-        let payload_len =
-            u32::from_le_bytes(self.data_mmap[off + 4..off + 8].try_into().unwrap()) as usize;
-        let type_name_len =
-            u16::from_le_bytes(self.data_mmap[off + 8..off + 10].try_into().unwrap()) as usize;
-        // 10..12 repurposed pad: low byte = encoding tag; 12..16 pad.
-        let encoding_tag = self.data_mmap[off + 10];
-        let mut cursor = off + 16;
-        let label_padded = align_up(label_len, 8);
-        let label_bytes = &self.data_mmap[cursor..cursor + label_len];
-        let label = if label_len == 0 {
-            None
-        } else {
-            Some(
-                crate::storage_engines::types::KeyByLabelValues::deserialize_from_bytes(
-                    label_bytes,
-                )
-                .map_err(|e| PersistError::Format(format!("label decode: {}", e)))?,
-            )
-        };
-        cursor += label_padded;
-        let type_padded = align_up(type_name_len, 8);
-        let type_name = std::str::from_utf8(&self.data_mmap[cursor..cursor + type_name_len])
-            .map_err(|e| PersistError::Format(format!("type_name utf8: {}", e)))?
-            .to_string();
-        cursor += type_padded;
-        let sketch_bytes = self.data_mmap[cursor..cursor + payload_len].to_vec();
-
-        Ok(SnapshotEntry {
-            agg_id: rec.agg_id,
-            start_ts: rec.start_ts,
-            end_ts: rec.end_ts,
-            label,
-            sketch_type_name: type_name,
-            encoding_tag,
-            sketch_bytes,
-        })
-    }
-}
-
-fn map_file(path: &Path) -> PersistResult<Mmap> {
-    let f = File::open(path)?;
-    // Safety: we never mutate the underlying file while the mmap is
-    // alive; the parts directory is owned by this process's flusher.
-    let mmap = unsafe { Mmap::map(&f) }?;
-    Ok(mmap)
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use crate::storage_engines::sketch_db::index::persistence::source::EpochSnapshotEntry;
-    use crate::storage_engines::types::KeyByLabelValues;
-    use tempfile::TempDir;
-
-    fn make_snapshot() -> EpochSnapshot {
-        EpochSnapshot {
-            agg_id: 42,
-            epoch_id: 7,
-            min_ts: 1_000,
-            max_ts: 2_000,
-            approx_bytes: 128,
-            entries: vec![
-                EpochSnapshotEntry {
-                    start_ts: 1_000,
-                    end_ts: 1_500,
-                    label: Some(KeyByLabelValues::new_with_labels(vec![
-                        "svc".into(),
-                        "api".into(),
-                    ])),
-                    sketch_type_name: "SumAccumulator".into(),
-                    encoding_tag: encoding_tag::PROTO_FULL,
-                    sketch_bytes: b"opaque-sketch-1".to_vec(),
-                },
-                EpochSnapshotEntry {
-                    start_ts: 1_500,
-                    end_ts: 2_000,
-                    label: None,
-                    sketch_type_name: "DatasketchesKLLAccumulator".into(),
-                    encoding_tag: encoding_tag::MSGPACK_DELTA,
-                    sketch_bytes: b"opaque-sketch-2-more-bytes".to_vec(),
-                },
-            ],
-        }
-    }
-
-    #[test]
-    fn part_round_trip_writes_and_reads_back() {
-        let tmp = TempDir::new().unwrap();
-        let part_dir = tmp.path().join("0000000000000001");
-        let snap = make_snapshot();
-        let report =
-            PartWriter::write_part(&part_dir, 1, std::slice::from_ref(&snap)).expect("write_part");
-
-        assert_eq!(report.part_id, 1);
-        assert_eq!(report.num_entries, 2);
-        assert_eq!(report.min_ts, 1_000);
-        assert_eq!(report.max_ts, 2_000);
-        assert!(report.data_len > 0);
-        assert!(report.index_len > 0);
-
-        let reader = PartReader::open(&part_dir).expect("PartReader::open");
-        assert_eq!(reader.meta.part_id, 1);
-        assert_eq!(reader.meta.num_entries, 2);
-        assert_eq!(reader.meta.min_ts, 1_000);
-        assert_eq!(reader.meta.max_ts, 2_000);
-
-        let recs = reader.index_records();
-        assert_eq!(recs.len(), 2);
-        assert_eq!(recs[0].agg_id, 42);
-        assert_eq!(recs[0].start_ts, 1_000);
-        assert_eq!(recs[0].end_ts, 1_500);
-
-        let e0 = reader.load_entry(&recs[0]).expect("load_entry 0");
-        assert_eq!(e0.sketch_type_name, "SumAccumulator");
-        assert_eq!(e0.encoding_tag, encoding_tag::PROTO_FULL);
-        assert_eq!(e0.sketch_bytes, b"opaque-sketch-1");
-        assert_eq!(
-            e0.label.as_ref().unwrap().labels,
-            vec!["svc".to_string(), "api".to_string()]
-        );
-
-        let e1 = reader.load_entry(&recs[1]).expect("load_entry 1");
-        assert!(e1.label.is_none());
-        assert_eq!(e1.sketch_type_name, "DatasketchesKLLAccumulator");
-        assert_eq!(e1.encoding_tag, encoding_tag::MSGPACK_DELTA);
-        assert_eq!(e1.sketch_bytes, b"opaque-sketch-2-more-bytes");
-    }
-
-    #[test]
-    fn part_reader_rejects_corrupted_meta() {
-        let tmp = TempDir::new().unwrap();
-        let part_dir = tmp.path().join("0000000000000002");
-        PartWriter::write_part(&part_dir, 2, &[make_snapshot()]).unwrap();
-
-        // Flip a byte inside the header (but not in the CRC field).
-        let meta_path = part_dir.join("meta.bin");
-        let mut bytes = std::fs::read(&meta_path).unwrap();
-        bytes[10] ^= 0xFF;
-        std::fs::write(&meta_path, &bytes).unwrap();
-
-        let err = PartReader::open(&part_dir).unwrap_err();
-        match err {
-            PersistError::Format(msg) => assert!(msg.contains("CRC mismatch")),
-            other => panic!("expected Format error, got {:?}", other),
-        }
-    }
-
-    #[test]
-    fn part_writer_rejects_empty_snapshot_set() {
-        let tmp = TempDir::new().unwrap();
-        let part_dir = tmp.path().join("empty");
-        let err = PartWriter::write_part(&part_dir, 99, &[]).unwrap_err();
-        match err {
-            PersistError::Internal(msg) => assert!(msg.contains("zero entries")),
-            other => panic!("expected Internal, got {:?}", other),
-        }
-    }
-}
diff --git a/data_plane/src/storage_engines/sketch_db/persistence/recovery.rs b/data_plane/src/storage_engines/sketch_db/persistence/recovery.rs
deleted file mode 100644
index ebf09525c..000000000
--- a/data_plane/src/storage_engines/sketch_db/persistence/recovery.rs
+++ /dev/null
@@ -1,215 +0,0 @@
-//! Startup recovery: load the parts manifest, verify every referenced
-//! part directory, and sweep orphan directories from
-//! crashes-in-flight.
-
-use std::collections::HashSet;
-use std::fs;
-use std::path::Path;
-
-use tracing::{info, warn};
-
-use super::flusher::parts_root;
-use super::manifest::Manifest;
-use super::part::{PartId, PartReader};
-use super::PersistResult;
-
-/// Result of a recovery pass.
-#[derive(Debug, Default)]
-pub struct RecoveryReport {
-    pub live_parts: usize,
-    pub corrupt_parts_removed: usize,
-    pub orphan_parts_removed: usize,
-}
-
-/// Open the manifest at `disk_path`, replay its log, validate every
-/// referenced part, and sweep orphan part directories not in the
-/// manifest.
-pub fn recover(disk_path: &Path) -> PersistResult<(Manifest, RecoveryReport)> {
-    fs::create_dir_all(disk_path)?;
-    let parts_root = parts_root(disk_path);
-    fs::create_dir_all(&parts_root)?;
-
-    let manifest = Manifest::open_or_init(disk_path)?;
-    let mut report = RecoveryReport::default();
-
-    // Validate every live part by reading its meta.bin header.
-    let mut to_drop: Vec<PartId> = Vec::new();
-    let pending: HashSet<PartId> = super::metadata::StoredOutputMetadataFile::new(disk_path)
-        .load_strict()?
-        .into_iter()
-        .filter_map(|record| record.pending_immutable.map(|pending| pending.part_id))
-        .collect();
-    let mut referenced = pending.clone();
-    for entry in manifest.live_parts() {
-        referenced.insert(entry.part_id);
-        let part_dir = super::part::part_dir_path(&parts_root, entry.part_id);
-        match PartReader::read_meta(&part_dir) {
-            Ok(meta) if meta.part_id == entry.part_id => {
-                // Meta header checks out; don't also bother reading
-                // data/index here — the query path will catch any
-                // deeper corruption and surface it.
-            }
-            Ok(meta) => {
-                warn!(
-                    "recovery: part_id mismatch in meta.bin at {:?}: header says {}, manifest says {}",
-                    part_dir, meta.part_id, entry.part_id
-                );
-                to_drop.push(entry.part_id);
-            }
-            Err(e) => {
-                warn!(
-                    "recovery: unreadable part {} at {:?}: {}; dropping from manifest",
-                    entry.part_id, part_dir, e
-                );
-                to_drop.push(entry.part_id);
-            }
-        }
-    }
-
-    if to_drop.iter().any(|part_id| pending.contains(part_id)) {
-        return Err(super::PersistError::Format(
-            "corrupt reserved immutable part".into(),
-        ));
-    }
-    for part_id in to_drop {
-        manifest.append_delete(part_id)?;
-        let dir = super::part::part_dir_path(&parts_root, part_id);
-        let _ = fs::remove_dir_all(&dir);
-        report.corrupt_parts_removed += 1;
-    }
-
-    // Sweep orphans: any directory under parts/ whose parsed ID is not
-    // in `referenced` is a leftover from a mid-flush crash.
-    if parts_root.is_dir() {
-        for entry in fs::read_dir(&parts_root)? {
-            let entry = entry?;
-            let name = match entry.file_name().to_str() {
-                Some(s) => s.to_string(),
-                None => continue,
-            };
-            let part_id = match u64::from_str_radix(&name, 16) {
-                Ok(id) => id,
-                Err(_) => continue,
-            };
-            if !referenced.contains(&part_id) {
-                let path = entry.path();
-                if let Err(e) = fs::remove_dir_all(&path) {
-                    warn!(
-                        "recovery: failed to remove orphan part dir {:?}: {}",
-                        path, e
-                    );
-                } else {
-                    report.orphan_parts_removed += 1;
-                }
-            }
-        }
-    }
-
-    // Refresh manifest's in-memory view after dropping corrupt entries.
-    let manifest = if report.corrupt_parts_removed > 0 {
-        // Re-open so the in-memory snapshot is consistent with the
-        // disk after our appends.
-        Manifest::open_or_init(disk_path)?
-    } else {
-        manifest
-    };
-
-    report.live_parts = manifest.live_parts().len();
-
-    info!(
-        "persistence recovery: live={} corrupt_removed={} orphans_removed={}",
-        report.live_parts, report.corrupt_parts_removed, report.orphan_parts_removed
-    );
-
-    Ok((manifest, report))
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use crate::storage_engines::sketch_db::index::persistence::part::{part_dir_path, PartWriter};
-    use crate::storage_engines::sketch_db::index::persistence::source::{
-        EpochSnapshot, EpochSnapshotEntry,
-    };
-    use crate::storage_engines::types::KeyByLabelValues;
-    use tempfile::TempDir;
-
-    fn dummy_snapshot() -> EpochSnapshot {
-        EpochSnapshot {
-            agg_id: 1,
-            epoch_id: 1,
-            min_ts: 100,
-            max_ts: 200,
-            approx_bytes: 64,
-            entries: vec![EpochSnapshotEntry {
-                start_ts: 100,
-                end_ts: 200,
-                label: Some(KeyByLabelValues::new_with_labels(vec!["x".into()])),
-                sketch_type_name: "SumAccumulator".into(),
-                encoding_tag: 0,
-                sketch_bytes: b"payload".to_vec(),
-            }],
-        }
-    }
-
-    #[test]
-    fn recover_initializes_empty_dir() {
-        let tmp = TempDir::new().unwrap();
-        let (m, report) = recover(tmp.path()).unwrap();
-        assert_eq!(m.live_parts().len(), 0);
-        assert_eq!(report.live_parts, 0);
-        assert_eq!(report.corrupt_parts_removed, 0);
-        assert_eq!(report.orphan_parts_removed, 0);
-    }
-
-    #[test]
-    fn recover_sweeps_orphan_part_dir() {
-        let tmp = TempDir::new().unwrap();
-        // First: init an empty manifest so the directory exists.
-        let _ = recover(tmp.path()).unwrap();
-
-        // Now write a part on disk but do NOT reference it in the
-        // manifest — simulates a crash between segment fsync and log
-        // append.
-        let parts_root = parts_root(tmp.path());
-        std::fs::create_dir_all(&parts_root).unwrap();
-        let orphan_dir = part_dir_path(&parts_root, 999);
-        PartWriter::write_part(&orphan_dir, 999, &[dummy_snapshot()]).unwrap();
-        assert!(orphan_dir.exists());
-
-        let (_, report) = recover(tmp.path()).unwrap();
-        assert_eq!(report.orphan_parts_removed, 1);
-        assert!(!orphan_dir.exists());
-    }
-
-    #[test]
-    fn recover_drops_corrupt_part_and_cleans_directory() {
-        let tmp = TempDir::new().unwrap();
-        // Init and write a legit part, then register it in the manifest.
-        let (manifest, _) = recover(tmp.path()).unwrap();
-        let parts_root = parts_root(tmp.path());
-        let part_dir = part_dir_path(&parts_root, 42);
-        let report_write = PartWriter::write_part(&part_dir, 42, &[dummy_snapshot()]).unwrap();
-        manifest
-            .append_add(
-                crate::storage_engines::sketch_db::index::persistence::manifest::PartEntry {
-                    part_id: 42,
-                    min_ts: report_write.min_ts,
-                    max_ts: report_write.max_ts,
-                    size_bytes: report_write.data_len + report_write.index_len,
-                },
-            )
-            .unwrap();
-        drop(manifest);
-
-        // Corrupt meta.bin.
-        let mut bytes = std::fs::read(part_dir.join("meta.bin")).unwrap();
-        bytes[5] ^= 0xFF;
-        std::fs::write(part_dir.join("meta.bin"), &bytes).unwrap();
-
-        let (m, report) = recover(tmp.path()).unwrap();
-        assert_eq!(report.corrupt_parts_removed, 1);
-        assert_eq!(m.live_parts().len(), 0);
-        assert!(!part_dir.exists());
-    }
-}
diff --git a/data_plane/src/storage_engines/sketch_db/persistence/source.rs b/data_plane/src/storage_engines/sketch_db/persistence/source.rs
deleted file mode 100644
index 6a384fb0d..000000000
--- a/data_plane/src/storage_engines/sketch_db/persistence/source.rs
+++ /dev/null
@@ -1,151 +0,0 @@
-//! The trait the flusher uses to enumerate, snapshot, and evict sealed
-//! epochs. Decouples `flusher.rs` from `SketchStorePerKey` so the
-//! flusher can be unit-tested against a fake source.
-
-use crate::storage_engines::types::KeyByLabelValues;
-
-use super::PersistResult;
-
-/// A compact reference to a sealed epoch held in memory. Returned by
-/// [`EpochSource::list_sealed_epochs`] in oldest-first global order (by
-/// `end_ts`), interleaved round-robin across agg-ids when the flusher
-/// walks them.
-#[derive(Debug, Clone, Copy, PartialEq, Eq)]
-pub struct SealedEpochRef {
-    pub agg_id: u64,
-    pub epoch_id: u64,
-    /// `max_end` of the epoch's timestamp range. Used for oldest-first
-    /// ordering and for the `hot_window_ms` trigger.
-    pub end_ts: u64,
-    /// Approximate memory footprint of the epoch's sketches. Drives the
-    /// memory-pressure trigger; the flusher subtracts this when evicting.
-    pub approx_bytes: usize,
-}
-
-/// A fully-resolved, self-contained copy of one sealed epoch. Produced by
-/// [`EpochSource::snapshot_sealed_epoch`] under a brief per-agg read lock,
-/// then serialized on the flusher's thread with no store locks held.
-///
-/// The `entries` are ready to write to disk: labels are already resolved
-/// to `Option<KeyByLabelValues>` (no intern-table lookup needed) and the
-/// sketch bytes are opaque to the persistence layer — the writer carries
-/// whatever format the SketchStore put in. (The legacy Arroyo/MessagePack
-/// path that consumed these bytes lives in deleted modules; the
-/// production read-back path will land with the SketchStore-backed
-/// refactor — `snapshot_sealed_epoch` returns `Ok(None)` until then.)
-#[derive(Debug, Clone)]
-pub struct EpochSnapshot {
-    pub agg_id: u64,
-    pub epoch_id: u64,
-    pub min_ts: u64,
-    pub max_ts: u64,
-    pub entries: Vec<EpochSnapshotEntry>,
-    /// Sum of `approx_memory_bytes` across entries (v1: a coarse
-    /// per-type heuristic; see `per_key.rs::estimate_epoch_bytes`).
-    pub approx_bytes: usize,
-}
-
-impl EpochSnapshot {
-    pub fn len(&self) -> usize {
-        self.entries.len()
-    }
-
-    pub fn is_empty(&self) -> bool {
-        self.entries.is_empty()
-    }
-}
-
-/// One resolved entry inside an [`EpochSnapshot`]. Matches the shape
-/// the on-disk part writer expects.
-#[derive(Debug, Clone)]
-pub struct EpochSnapshotEntry {
-    pub start_ts: u64,
-    pub end_ts: u64,
-    /// Optional label set, already resolved from the per-agg intern table.
-    pub label: Option<KeyByLabelValues>,
-    /// `AggregateCore::type_name()` of the underlying sketch — recorded
-    /// so a future read-back path can dispatch to the right
-    /// deserializer once the SketchStore-backed snapshot lands.
-    pub sketch_type_name: String,
-    /// Wire-encoding tag for sketch payloads — see
-    /// [`encoding_tag`](crate::storage_engines::sketch_db::index::persistence::part::encoding_tag).
-    /// Carries the `SketchEncoding` (Full vs Delta) of the payload so
-    /// the disk read-back path can preserve the delta-stitching
-    /// carry-in semantics across the in-mem/on-disk boundary. `0`
-    /// (the default) means "unknown / treat as Full" — exact-agg
-    /// payloads use `0`.
-    pub encoding_tag: u8,
-    /// Serialized sketch payload (opaque to the persistence layer).
-    pub sketch_bytes: Vec<u8>,
-}
-
-/// Trait the flusher uses to discover, snapshot, and evict sealed
-/// epochs. Implemented by `SketchStorePerKey`; a test fake lives in
-/// `flusher.rs`'s unit tests.
-///
-/// Implementors guarantee that:
-///
-/// * [`list_sealed_epochs`] returns an approximate global oldest-first
-///   view. Approximate is fine: the flusher re-checks each epoch's
-///   existence when calling [`snapshot_sealed_epoch`].
-/// * [`snapshot_sealed_epoch`] is safe to call concurrently with
-///   inserts. It clones the epoch's `Arc` out under a read lock and
-///   drops the lock before returning, so no lock is held across
-///   downstream serialization / I/O.
-/// * [`evict_sealed_epoch`] is idempotent — calling it on an
-///   already-evicted (agg_id, epoch_id) is a no-op.
-/// * [`approx_memory_bytes`] is cheap (atomic load) and is kept in sync
-///   with what the flusher has evicted.
-pub trait EpochSource: Send + Sync {
-    /// Explicit durability demand from a completed source, independent of the hot tier.
-    fn flush_before_ms(&self) -> Option<u64> {
-        None
-    }
-
-    fn list_sealed_epochs(&self) -> Vec<SealedEpochRef>;
-
-    /// Time-driven seal: roll every un-sealed `current_epoch` window
-    /// whose END is at or before `cutoff_end` into a sealed epoch so the
-    /// flusher can make it durable. Called by the flusher each tick with
-    /// `cutoff_end = now - hot_window` BEFORE [`list_sealed_epochs`].
-    ///
-    /// The count-driven seal cadence (`seal_window_count`) only fires once
-    /// `current_epoch` reaches N distinct windows; a slow/stalled series
-    /// never reaches it, leaving aged windows un-sealed — and the flusher
-    /// only flushes SEALED epochs, so those windows are never made durable
-    /// (the live `parts/`-stays-empty bug). This hook closes that gap.
-    ///
-    /// Default impl is a no-op so existing/test sources need not implement
-    /// it. Returns the number of distinct windows newly sealed.
-    fn seal_aged_epochs(&self, _cutoff_end: u64) -> usize {
-        0
-    }
-
-    fn snapshot_sealed_epoch(
-        &self,
-        agg_id: u64,
-        epoch_id: u64,
-    ) -> PersistResult<Option<EpochSnapshot>>;
-
-    fn evict_sealed_epoch(&self, agg_id: u64, epoch_id: u64);
-
-    fn approx_memory_bytes(&self) -> usize;
-
-    /// Persistable instance metadata for `sid` — the pieces of the store's
-    /// `SummarySeriesMetadata` the QUERY path needs but the on-disk part
-    /// format does NOT carry (metric name, group-by KEYS, structured
-    /// `AggKind`). Called by the flusher right before it makes a part
-    /// durable so recovery can re-register the sid as a queryable instance
-    /// after a restart (otherwise `instances_matching` enumerates nothing
-    /// for disk-only series → "No result" cluster-wide).
-    ///
-    /// Returns `None` when the sid is unknown to the source (e.g. a test
-    /// fake, or a sid whose instance metadata was evicted). Default impl
-    /// returns `None` so existing/test sources need not implement it.
-    fn instance_metadata_for_persist(
-        &self,
-        _sid: u64,
-    ) -> Option<super::metadata::StoredOutputMetadataRecord> {
-        None
-    }
-}
diff --git a/data_plane/src/storage_engines/sketch_db/query/asap_tier_result.rs b/data_plane/src/storage_engines/sketch_db/query/asap_tier_result.rs
deleted file mode 100644
index 12aeeef19..000000000
--- a/data_plane/src/storage_engines/sketch_db/query/asap_tier_result.rs
+++ /dev/null
@@ -1,29 +0,0 @@
-//! Per-series, per-window scalar results produced by summary execution and
-//! adapted by the query engine into `QueryResult`.
-
-use std::collections::BTreeMap;
-
-/// Per-series, per-window scalar results.
-///
-/// `coverage` is the actual `(min_window_start_ms, max_window_end_ms)`
-/// the answer covered. `None` when nothing was observed for the
-/// requested window (defensive default). The caller (`ASAPQueryEngine`)
-/// compares `coverage` against the requested `[t0, t1]` and, on a
-/// partial hit (`cov_lo > t0 || cov_hi < t1`), falls over to archive for
-/// the missing range and stitches the two answers.
-#[derive(Debug, Clone, Default)]
-pub struct ASAPTierResult {
-    /// `(label_values, samples)` where `samples` is
-    /// `(window_end_unix_ms, value)`.
-    pub series: Vec<(BTreeMap<String, String>, Vec<(i64, f64)>)>,
-    /// Effective coverage `(min_window_start_ms, max_window_end_ms)`.
-    /// Set whenever at least one window was observed; left `None` when
-    /// `series` is empty.
-    pub coverage: Option<(u64, u64)>,
-}
-
-impl ASAPTierResult {
-    pub fn is_empty(&self) -> bool {
-        self.series.iter().all(|(_, s)| s.is_empty())
-    }
-}
diff --git a/data_plane/src/storage_engines/sketch_db/query/decoders.rs b/data_plane/src/storage_engines/sketch_db/query/decoders.rs
deleted file mode 100644
index d208cb57d..000000000
--- a/data_plane/src/storage_engines/sketch_db/query/decoders.rs
+++ /dev/null
@@ -1,2 +0,0 @@
-//! Storage uses the Planner-owned state implementation.
-pub use asap_physical_operators::stored_state::decoders::*;
diff --git a/data_plane/src/storage_engines/sketch_db/query/delta_apply.rs b/data_plane/src/storage_engines/sketch_db/query/delta_apply.rs
deleted file mode 100644
index 09869df2e..000000000
--- a/data_plane/src/storage_engines/sketch_db/query/delta_apply.rs
+++ /dev/null
@@ -1,19 +0,0 @@
-//! Storage uses the Planner-owned state implementation.
-pub use asap_physical_operators::stored_state::delta_apply::*;
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use asap_physical_operators::stored_state::{SketchEncoding, SketchSampleState};
-
-    #[test]
-    fn native_batches_are_not_legacy_sketch_frames() {
-        let state = SketchSampleState {
-            bytes: vec![],
-            encoding: SketchEncoding::NativeBatchV1,
-        };
-        let samples = [(1000, &state)];
-        assert!(cumulative_summary_state(&samples, DeltaSketchKind::Kll { k: 200 }).is_err());
-        assert!(per_window_summary_states(&samples, DeltaSketchKind::Kll { k: 200 }).is_err());
-    }
-}
diff --git a/data_plane/src/storage_engines/sketch_db/query/mod.rs b/data_plane/src/storage_engines/sketch_db/query/mod.rs
deleted file mode 100644
index 5b4f64493..000000000
--- a/data_plane/src/storage_engines/sketch_db/query/mod.rs
+++ /dev/null
@@ -1,13 +0,0 @@
-//! Sketch query state decoding, composition, and result types.
-//!
-//! [`ASAPTierResult`] carries timestamped scalar samples from summary execution
-//! to the query engine. Query planning and execution live outside this module.
-
-pub mod asap_tier_result;
-pub mod decoders;
-pub mod delta_apply;
-pub mod timeline;
-pub mod timeline_dispatch;
-pub mod window_merger;
-
-pub use asap_tier_result::ASAPTierResult;
diff --git a/data_plane/src/storage_engines/sketch_db/query/timeline.rs b/data_plane/src/storage_engines/sketch_db/query/timeline.rs
deleted file mode 100644
index 0c8c4d035..000000000
--- a/data_plane/src/storage_engines/sketch_db/query/timeline.rs
+++ /dev/null
@@ -1,472 +0,0 @@
-//! Build a metric timeline from sid metadata.
-//!
-//! Group instances by `(agg_kind, group_by_keys)`, then fold first-seen and
-//! retirement timestamps. A group stays active if any member is active. Sort
-//! groups by start time and clip each segment to the next start, retirement,
-//! and requested time range.
-//!
-//! `TimelineSegment.agg_id` carries a deterministic hash of the metric and
-//! content signature, rather than an individual sid.
-
-use std::collections::{BTreeMap, BTreeSet};
-
-use xxhash_rust::xxh64::xxh64;
-
-use crate::storage_engines::sketch_db::data::{AggKind, SketchAlgorithm, SketchConfig};
-use crate::storage_engines::sketch_db::index::{SketchStore, SummarySeriesMetadata};
-use crate::storage_engines::sketch_db::lifecycle::AggStatus;
-
-/// A single `(agg_id, clipped_range)` segment returned by
-/// [`timeline_for_metric`]. Ranges are half-open: inclusive
-/// `start_ms`, exclusive `end_ms`. Segments are guaranteed
-/// non-overlapping and ordered by `start_ms` by construction.
-///
-/// `agg_id` is content-derived: a xxh64 hash of the agg-signature
-/// `(metric_name, agg_kind, group_by_keys)`. Two sids with the same
-/// signature fold into the same segment, so this id identifies a
-/// signature group rather than a single sid.
-#[derive(Debug, Clone, PartialEq, Eq)]
-pub struct TimelineSegment {
-    pub agg_id: u64,
-    pub start_ms: u64,
-    pub end_ms: u64,
-    /// Lifecycle state of the underlying signature group at the
-    /// moment the timeline was computed. The query path uses this to
-    /// decide whether to read from the sketch (`Active`/`Retired`) or
-    /// surface a coverage hole (`Expired`).
-    pub status: AggStatus,
-    /// Whether data is expected to be present for this segment.
-    /// Distinct from `status` — a `Retired` signature still has its
-    /// data but a segment that falls entirely past expiry is `Purged`
-    /// even if `status` is still `Retired` at the moment of the call.
-    pub coverage: TimelineCoverage,
-}
-
-/// Coarse classification of whether a [`TimelineSegment`]'s data is
-/// expected to be readable from the sketch store. See §7.3 of the
-/// design doc.
-#[derive(Debug, Clone, Copy, PartialEq, Eq)]
-pub enum TimelineCoverage {
-    /// Data is (or was) written by the live ingest path and the
-    /// signature has not been expired. Query engine reads the
-    /// sketch store.
-    Sketch,
-    /// The signature has expired and its data was purged (or is
-    /// eligible for purge). Query engine falls back to the archive
-    /// engine for this segment per §7.3.
-    Purged,
-}
-
-/// Produce the per-metric timeline of `TimelineSegment`s entirely from
-/// the sid catalog, with no `SchemaRegistry` lookup. See module-level
-/// doc for the algorithm.
-///
-/// O(N log N + N) where N = instances matching `metric`. Production
-/// scales: dozens of metrics × tens of sids each → microseconds. The
-/// HTTP `/api/v1/db/timeline` endpoint calls this once per request.
-pub fn timeline_for_metric(
-    store: &SketchStore,
-    metric: &str,
-    t1_ms: u64,
-    t2_ms: u64,
-) -> Vec<TimelineSegment> {
-    if t1_ms > t2_ms {
-        return Vec::new();
-    }
-
-    // 1. Snapshot all instances matching `metric` from the sid
-    //    catalog. `list_by_status(Active)` would miss retired+
-    //    expired sids; we want them all. Iterate the full catalog
-    //    once.
-    let all = store.snapshot_instances();
-
-    // 2. Group by content signature.
-    let mut groups: BTreeMap<SignatureKey, AggSignatureGroup> = BTreeMap::new();
-    for meta in all.into_iter().filter(|m| m.metric_name == metric) {
-        let key = signature_key(&meta);
-        groups.entry(key).or_default().fold_in(&meta);
-    }
-
-    // 3 + 4. Sort groups by start, compute per-group `own_end`, clip
-    //        to query range, build segments.
-    let mut entries: Vec<AggSignatureGroup> = groups.into_values().collect();
-    entries.sort_by_key(|g| (g.start_ms, g.signature_id));
-
-    let mut segments = Vec::with_capacity(entries.len());
-    for (i, group) in entries.iter().enumerate() {
-        let successor_start = entries.get(i + 1).map(|n| n.start_ms);
-        let own_end = match (successor_start, group.retired_at_ms) {
-            (Some(s), Some(r)) => s.min(r),
-            (Some(s), None) => s,
-            (None, Some(r)) => r,
-            (None, None) => u64::MAX,
-        };
-        let clipped_start = group.start_ms.max(t1_ms);
-        let clipped_end = own_end.min(t2_ms.saturating_add(1));
-        if clipped_start >= clipped_end {
-            continue;
-        }
-        segments.push(TimelineSegment {
-            agg_id: group.signature_id,
-            start_ms: clipped_start,
-            end_ms: clipped_end,
-            status: group.status,
-            coverage: match group.status {
-                AggStatus::Expired => TimelineCoverage::Purged,
-                _ => TimelineCoverage::Sketch,
-            },
-        });
-    }
-    segments
-}
-
-/// Per-(agg_kind, group_by_keys) content signature. Two sids with the
-/// same signature represent the same agg-config; they differ only in
-/// their attrs values.
-#[derive(Debug, Clone, PartialEq, Eq, PartialOrd, Ord)]
-struct SignatureKey {
-    /// Stable encoded form of the (agg_kind, group_by_keys) tuple.
-    encoded: Vec<u8>,
-}
-
-fn signature_key(meta: &SummarySeriesMetadata) -> SignatureKey {
-    let mut buf: Vec<u8> = Vec::new();
-    buf.extend_from_slice(meta.metric_name.as_bytes());
-    buf.push(0);
-    encode_agg_kind(&meta.agg_kind, &mut buf);
-    buf.push(0);
-    for k in &meta.group_by_keys {
-        buf.extend_from_slice(k.as_bytes());
-        buf.push(b',');
-    }
-    SignatureKey { encoded: buf }
-}
-
-/// Per-group fold of all sids sharing one signature.
-#[derive(Debug)]
-struct AggSignatureGroup {
-    signature_id: u64,
-    /// Earliest `first_seen_unix_ms` across all sids in the group.
-    start_ms: u64,
-    /// `Some(min)` iff every sid is retired; `None` if any sid is
-    /// still Active.
-    retired_at_ms: Option<u64>,
-    /// Folded lifecycle status — Active if any sid is Active; else
-    /// Retired if all retired and no sid is expired; else Expired.
-    status: AggStatus,
-}
-
-impl Default for AggSignatureGroup {
-    fn default() -> Self {
-        Self {
-            signature_id: 0,
-            start_ms: u64::MAX,
-            retired_at_ms: Some(u64::MAX),
-            status: AggStatus::Expired, // upgraded by `fold_in`
-        }
-    }
-}
-
-impl AggSignatureGroup {
-    fn fold_in(&mut self, meta: &SummarySeriesMetadata) {
-        // Stable signature id: xxh64 over the same canonical encoding
-        // `signature_key` uses. Computed lazily on first fold-in;
-        // every sid in the group produces the same hash.
-        if self.signature_id == 0 {
-            let key = signature_key(meta);
-            self.signature_id = xxh64(&key.encoded, 0).max(1);
-        }
-        let seen = meta.first_seen_unix_ms.max(0) as u64;
-        if seen < self.start_ms {
-            self.start_ms = seen;
-        }
-        // Retire fold: keep Some(min) only if EVERY sid is retired.
-        match (self.retired_at_ms, meta.retired_at_ms) {
-            (Some(prev), Some(r)) => self.retired_at_ms = Some(prev.min(r)),
-            _ => self.retired_at_ms = None,
-        }
-        // Status fold: Active wins over Retired wins over Expired.
-        let s = meta.status();
-        self.status = match (self.status, s) {
-            (_, AggStatus::Active) | (AggStatus::Active, _) => AggStatus::Active,
-            (_, AggStatus::Retired) | (AggStatus::Retired, _) => AggStatus::Retired,
-            _ => AggStatus::Expired,
-        };
-    }
-}
-
-fn encode_agg_kind(agg_kind: &AggKind, buf: &mut Vec<u8>) {
-    match agg_kind {
-        AggKind::Sketch {
-            algorithm: kind,
-            config,
-            spatial_filter_canonical,
-        } => {
-            buf.push(b'S');
-            buf.push(sketch_algorithm_byte(kind.clone()));
-            encode_sketch_config(config, buf);
-            buf.push(b'F');
-            buf.extend_from_slice(spatial_filter_canonical.as_bytes());
-        }
-        AggKind::ExactAgg {
-            agg_type,
-            parameters_canonical,
-            spatial_filter_canonical,
-        } => {
-            buf.push(b'P');
-            buf.extend_from_slice(agg_type.as_str().as_bytes());
-            buf.push(b';');
-            buf.extend_from_slice(parameters_canonical.as_bytes());
-            buf.push(b'F');
-            buf.extend_from_slice(spatial_filter_canonical.as_bytes());
-        }
-    }
-}
-
-fn sketch_algorithm_byte(k: SketchAlgorithm) -> u8 {
-    match k {
-        SketchAlgorithm::DDSketch => 1,
-        SketchAlgorithm::Kll => 2,
-        SketchAlgorithm::Hll => 3,
-        SketchAlgorithm::CountSketch => 4,
-        SketchAlgorithm::Cms => 5,
-        SketchAlgorithm::CmsWithHeap => 6,
-        SketchAlgorithm::CountSketchWithHeap => 7,
-        SketchAlgorithm::Kmv => 8,
-        SketchAlgorithm::Theta => 9,
-        SketchAlgorithm::UnivMon => 10,
-    }
-}
-
-fn encode_sketch_config(cfg: &SketchConfig, buf: &mut Vec<u8>) {
-    match cfg {
-        SketchConfig::UnivMon {
-            heap_size,
-            sketch_rows,
-            sketch_cols,
-            layers,
-        } => {
-            buf.push(b'U');
-            buf.extend_from_slice(&heap_size.to_le_bytes());
-            buf.extend_from_slice(&sketch_rows.to_le_bytes());
-            buf.extend_from_slice(&sketch_cols.to_le_bytes());
-            buf.push(*layers);
-        }
-        SketchConfig::DDSketch { relative_accuracy } => {
-            buf.push(b'D');
-            buf.extend_from_slice(&relative_accuracy.to_le_bytes());
-        }
-        SketchConfig::Kll { k } => {
-            buf.push(b'K');
-            buf.extend_from_slice(&k.to_le_bytes());
-        }
-        SketchConfig::Hll { precision } => {
-            buf.push(b'H');
-            buf.extend_from_slice(&precision.to_le_bytes());
-        }
-        SketchConfig::CountSketch { rows, cols } => {
-            buf.push(b'S');
-            buf.extend_from_slice(&rows.to_le_bytes());
-            buf.extend_from_slice(&cols.to_le_bytes());
-        }
-        SketchConfig::CountMin { rows, cols } => {
-            buf.push(b'M');
-            buf.extend_from_slice(&rows.to_le_bytes());
-            buf.extend_from_slice(&cols.to_le_bytes());
-        }
-    }
-}
-
-// Silence unused-import warning on `BTreeSet` if the fold paths above
-// stop using it directly (kept for forward-compat with richer signature
-// encoding).
-const _: fn() = || {
-    let _set: BTreeSet<String> = BTreeSet::new();
-    let _ = _set;
-};
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use crate::storage_engines::sketch_db::data::{AggregationType, Capability};
-
-    fn meta(
-        sid: u64,
-        metric: &str,
-        agg_kind: AggKind,
-        first_seen: i64,
-        retired: Option<u64>,
-        expires: Option<u64>,
-    ) -> SummarySeriesMetadata {
-        SummarySeriesMetadata {
-            storage_handle: sid,
-            metric_name: metric.into(),
-            group_by_keys: BTreeSet::new(),
-            capability: Some(Capability::QuantileApprox(Some(SketchAlgorithm::DDSketch))),
-            agg_kind,
-            accuracy: None,
-            first_seen_unix_ms: first_seen,
-            retired_at_ms: retired,
-            expires_at_ms: expires,
-            policy_fp: asap_types::PolicyFingerprint::UNSET,
-        }
-    }
-
-    fn precompute(agg_type: AggregationType) -> AggKind {
-        AggKind::ExactAgg {
-            agg_type,
-            parameters_canonical: String::new(),
-            spatial_filter_canonical: String::new(),
-        }
-    }
-
-    #[test]
-    fn empty_store_yields_empty_timeline() {
-        let store = SketchStore::new();
-        let segs = timeline_for_metric(&store, "m", 0, 1000);
-        assert!(segs.is_empty());
-    }
-
-    #[test]
-    fn t1_greater_than_t2_yields_empty() {
-        let store = SketchStore::new();
-        store.register(meta(
-            1,
-            "m",
-            precompute(AggregationType::Sum),
-            100,
-            None,
-            None,
-        ));
-        let segs = timeline_for_metric(&store, "m", 1000, 500);
-        assert!(segs.is_empty());
-    }
-
-    #[test]
-    fn single_active_signature_produces_one_segment_clipped_to_range() {
-        let store = SketchStore::new();
-        store.register(meta(
-            1,
-            "m",
-            precompute(AggregationType::Sum),
-            100,
-            None,
-            None,
-        ));
-        let segs = timeline_for_metric(&store, "m", 50, 500);
-        assert_eq!(segs.len(), 1);
-        assert_eq!(segs[0].start_ms, 100, "clipped to instance's first_seen");
-        assert_eq!(segs[0].end_ms, 501, "open-ended → t2 inclusive");
-        assert_eq!(segs[0].status, AggStatus::Active);
-        assert_eq!(segs[0].coverage, TimelineCoverage::Sketch);
-    }
-
-    #[test]
-    fn two_signatures_in_sequence_produce_two_segments() {
-        let store = SketchStore::new();
-        // sig_a (Sum) active from 100; sig_b (Increase) active from 500.
-        store.register(meta(
-            1,
-            "m",
-            precompute(AggregationType::Sum),
-            100,
-            Some(500),
-            None,
-        ));
-        store.register(meta(
-            2,
-            "m",
-            precompute(AggregationType::Increase),
-            500,
-            None,
-            None,
-        ));
-        let segs = timeline_for_metric(&store, "m", 0, 1000);
-        assert_eq!(segs.len(), 2);
-        // First segment: sig_a, [100, 500)
-        assert_eq!(segs[0].start_ms, 100);
-        assert_eq!(segs[0].end_ms, 500);
-        assert_eq!(segs[0].status, AggStatus::Retired);
-        // Second segment: sig_b, [500, 1001)
-        assert_eq!(segs[1].start_ms, 500);
-        assert_eq!(segs[1].end_ms, 1001);
-        assert_eq!(segs[1].status, AggStatus::Active);
-    }
-
-    #[test]
-    fn multiple_sids_same_signature_fold_into_one_segment() {
-        let store = SketchStore::new();
-        // Three sids of the same config, with different first_seen
-        // (because their data points arrived at different times).
-        store.register(meta(
-            1,
-            "m",
-            precompute(AggregationType::Sum),
-            200,
-            None,
-            None,
-        ));
-        store.register(meta(
-            2,
-            "m",
-            precompute(AggregationType::Sum),
-            300,
-            None,
-            None,
-        ));
-        store.register(meta(
-            3,
-            "m",
-            precompute(AggregationType::Sum),
-            150,
-            None,
-            None,
-        ));
-        let segs = timeline_for_metric(&store, "m", 0, 1000);
-        assert_eq!(segs.len(), 1, "all 3 sids fold into one segment");
-        assert_eq!(segs[0].start_ms, 150, "earliest first_seen wins");
-        assert_eq!(segs[0].status, AggStatus::Active);
-    }
-
-    #[test]
-    fn distinct_metrics_are_isolated() {
-        let store = SketchStore::new();
-        store.register(meta(
-            1,
-            "cpu",
-            precompute(AggregationType::Sum),
-            100,
-            None,
-            None,
-        ));
-        store.register(meta(
-            2,
-            "mem",
-            precompute(AggregationType::Sum),
-            200,
-            None,
-            None,
-        ));
-        let cpu = timeline_for_metric(&store, "cpu", 0, 1000);
-        let mem = timeline_for_metric(&store, "mem", 0, 1000);
-        assert_eq!(cpu.len(), 1);
-        assert_eq!(mem.len(), 1);
-        assert_ne!(cpu[0].agg_id, mem[0].agg_id);
-    }
-
-    #[test]
-    fn signature_id_is_deterministic() {
-        let store_a = SketchStore::new();
-        let store_b = SketchStore::new();
-        let m_a = meta(1, "m", precompute(AggregationType::Sum), 100, None, None);
-        let m_b = meta(42, "m", precompute(AggregationType::Sum), 100, None, None);
-        store_a.register(m_a);
-        store_b.register(m_b);
-        let a = timeline_for_metric(&store_a, "m", 0, 1000);
-        let b = timeline_for_metric(&store_b, "m", 0, 1000);
-        assert_eq!(
-            a[0].agg_id, b[0].agg_id,
-            "signature id depends on content, not on the specific sid"
-        );
-    }
-}
diff --git a/data_plane/src/storage_engines/sketch_db/query/timeline_dispatch.rs b/data_plane/src/storage_engines/sketch_db/query/timeline_dispatch.rs
deleted file mode 100644
index 56c68f9dd..000000000
--- a/data_plane/src/storage_engines/sketch_db/query/timeline_dispatch.rs
+++ /dev/null
@@ -1,352 +0,0 @@
-//! Cross-schema result combination for the §7 schema-timeline query
-//! dispatch ([`summary-storage.md`](../../../../docs/design_docs/summary-storage.md)).
-//!
-//! When a metric-range query spans a reconfigure boundary, the
-//! `SchemaRegistry::timeline_for_metric` call returns multiple
-//! [`TimelineSegment`]s each owned by a distinct `agg_id`. The query
-//! engine evaluates the statistic **per segment** against its owning
-//! aggregation's precompute, then hands the per-segment scalars to
-//! [`combine_statistic`] here to stitch them into a single answer.
-//!
-//! ## What this module is — and is not
-//!
-//! This is a pure combiner over already-evaluated scalar results. It
-//! does NOT:
-//! * touch the store or accumulators,
-//! * know how per-segment evaluation works (the engine does that),
-//! * decide fallback policy for `Purged` segments (the caller does
-//!   that before calling here).
-//!
-//! The query engine wires this primitive into
-//! `ASAPQueryEngine::try_handle_query_promql_via_timeline`, which
-//! runs the per-segment evaluation loop and feeds the scalars back
-//! through `combine_statistic`.
-//!
-//! ## Statistic combinability
-//!
-//! See §7.3 of the design doc. Summarised:
-//!
-//! | Statistic | Combinable across sketch types? |
-//! |---|---|
-//! | `Count`, `Sum`      | Yes — sum. |
-//! | `Min`, `Max`        | Yes — pointwise min / max. |
-//! | `Cardinality` (HLL) | Yes in principle (HLL OR merge on the sketch itself), but at the **scalar** level — which is what this module receives — distinct counts from different HLL parameterisations cannot be OR-merged. Treated as **non-combinable** here. |
-//! | `Increase`, `Rate`  | Non-combinable at the scalar level — they depend on endpoint samples; stitching needs the raw counters, not their deltas. |
-//! | `Quantile`, `Topk`  | Non-combinable at the scalar level — stitching requires merging the underlying KLL / CMS sketches, which may differ in parameters across schemas. |
-//!
-//! Non-combinable statistics return [`CombinedResult::Partial`]
-//! carrying whatever combinable prefix we could compute plus the
-//! list of segments that couldn't contribute. The caller decides
-//! how to render that (warning, fall-through to exact DB, or
-//! error).
-
-use asap_types::Statistic;
-
-use crate::storage_engines::sketch_db::TimelineSegment;
-
-/// Result of combining per-segment scalars for a single statistic.
-///
-/// `Full(value)` means every segment contributed and the combination
-/// is semantically equivalent to a single-schema evaluation over the
-/// entire range. `Partial` surfaces the failure mode explicitly so
-/// the user knows they are looking at a schema-change artifact.
-#[derive(Debug, Clone, PartialEq)]
-pub enum CombinedResult {
-    /// All segments combined cleanly. Value is the stitched result.
-    Full(f64),
-    /// The statistic isn't combinable across schema boundaries, or
-    /// the caller flagged one or more segments as uncomputable
-    /// (e.g. a `TimelineCoverage::Purged` segment whose data no
-    /// longer lives in the sketch store).
-    ///
-    /// `covered` is the combined result over the segments we could
-    /// evaluate; `missing` lists the segments we couldn't. Note that
-    /// `covered` may be meaningless for the user (e.g. a Quantile
-    /// over only part of the range is not "the p99 of the range"),
-    /// so it's up to the caller to decide whether to display it.
-    Partial {
-        covered: Option<f64>,
-        missing: Vec<TimelineSegment>,
-    },
-}
-
-/// Input to [`combine_statistic`]: one per-segment scalar plus the
-/// segment it came from (for provenance in the `Partial` case).
-#[derive(Debug, Clone, PartialEq)]
-pub struct SegmentValue {
-    pub segment: TimelineSegment,
-    pub value: f64,
-}
-
-/// Combine per-segment scalars for a single statistic across a
-/// multi-schema timeline.
-///
-/// Contract:
-///
-/// * `segments` is the output of the engine's per-segment evaluator,
-///   one `SegmentValue` per [`TimelineSegment`] returned by
-///   `timeline_for_metric`. An empty input means no schema covers the
-///   query range; returns `Full(0.0)` for `Count` / `Sum` (zero is
-///   the identity), and `Partial { covered: None, missing: [] }` for
-///   everything else (no sensible default).
-/// * `unresolved` is the list of segments the engine could not
-///   evaluate (e.g. `Purged` coverage, or a capability miss). They
-///   are folded directly into the `Partial` output's `missing` list.
-pub fn combine_statistic(
-    statistic: Statistic,
-    segments: &[SegmentValue],
-    unresolved: &[TimelineSegment],
-) -> CombinedResult {
-    // Fast path: nothing to combine and nothing missing.
-    if segments.is_empty() && unresolved.is_empty() {
-        return match statistic {
-            Statistic::Count | Statistic::Sum => CombinedResult::Full(0.0),
-            _ => CombinedResult::Partial {
-                covered: None,
-                missing: Vec::new(),
-            },
-        };
-    }
-
-    // If the caller handed us any unresolved segments, the result is
-    // Partial regardless of the statistic. We still compute the
-    // best-effort `covered` so callers that want to show it can.
-    let has_unresolved = !unresolved.is_empty();
-
-    let covered = match statistic {
-        Statistic::Count | Statistic::Sum => {
-            // Additive: zero identity, so even with zero segments
-            // the value is 0.0.
-            Some(segments.iter().map(|s| s.value).sum::<f64>())
-        }
-        Statistic::Min => segments
-            .iter()
-            .map(|s| s.value)
-            .fold(None, |acc, v| Some(acc.map_or(v, |a: f64| a.min(v)))),
-        Statistic::Max => segments
-            .iter()
-            .map(|s| s.value)
-            .fold(None, |acc, v| Some(acc.map_or(v, |a: f64| a.max(v)))),
-        // Non-combinable at the scalar level — see module doc.
-        Statistic::Cardinality
-        | Statistic::FrequencyL2
-        | Statistic::FrequencyEntropy
-        | Statistic::Increase
-        | Statistic::Rate
-        | Statistic::Quantile
-        | Statistic::Topk => None,
-    };
-
-    let combinable = matches!(
-        statistic,
-        Statistic::Count | Statistic::Sum | Statistic::Min | Statistic::Max
-    );
-
-    if combinable && !has_unresolved {
-        // `covered` is always `Some` for combinable statistics with
-        // at least one input (Count/Sum guarantee it even at zero).
-        match covered {
-            Some(v) => CombinedResult::Full(v),
-            None => CombinedResult::Partial {
-                covered: None,
-                missing: Vec::new(),
-            },
-        }
-    } else {
-        CombinedResult::Partial {
-            covered,
-            missing: unresolved.to_vec(),
-        }
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use crate::storage_engines::sketch_db::{AggStatus, TimelineCoverage};
-
-    fn seg(agg_id: u64, start: u64, end: u64, status: AggStatus) -> TimelineSegment {
-        TimelineSegment {
-            agg_id,
-            start_ms: start,
-            end_ms: end,
-            status,
-            coverage: match status {
-                AggStatus::Expired => TimelineCoverage::Purged,
-                _ => TimelineCoverage::Sketch,
-            },
-        }
-    }
-
-    fn sv(agg_id: u64, start: u64, end: u64, status: AggStatus, v: f64) -> SegmentValue {
-        SegmentValue {
-            segment: seg(agg_id, start, end, status),
-            value: v,
-        }
-    }
-
-    #[test]
-    fn sum_is_additive_across_segments() {
-        let vs = vec![
-            sv(1, 0, 100, AggStatus::Retired, 10.0),
-            sv(2, 100, 200, AggStatus::Active, 15.0),
-        ];
-        assert_eq!(
-            combine_statistic(Statistic::Sum, &vs, &[]),
-            CombinedResult::Full(25.0),
-        );
-    }
-
-    #[test]
-    fn count_is_additive_across_segments() {
-        let vs = vec![
-            sv(1, 0, 100, AggStatus::Retired, 7.0),
-            sv(2, 100, 200, AggStatus::Active, 3.0),
-        ];
-        assert_eq!(
-            combine_statistic(Statistic::Count, &vs, &[]),
-            CombinedResult::Full(10.0),
-        );
-    }
-
-    #[test]
-    fn min_takes_pointwise_min() {
-        let vs = vec![
-            sv(1, 0, 100, AggStatus::Retired, 5.0),
-            sv(2, 100, 200, AggStatus::Active, 2.5),
-        ];
-        assert_eq!(
-            combine_statistic(Statistic::Min, &vs, &[]),
-            CombinedResult::Full(2.5),
-        );
-    }
-
-    #[test]
-    fn max_takes_pointwise_max() {
-        let vs = vec![
-            sv(1, 0, 100, AggStatus::Retired, 5.0),
-            sv(2, 100, 200, AggStatus::Active, 9.25),
-        ];
-        assert_eq!(
-            combine_statistic(Statistic::Max, &vs, &[]),
-            CombinedResult::Full(9.25),
-        );
-    }
-
-    #[test]
-    fn quantile_across_schemas_is_partial() {
-        let vs = vec![
-            sv(1, 0, 100, AggStatus::Retired, 0.95),
-            sv(2, 100, 200, AggStatus::Active, 0.97),
-        ];
-        match combine_statistic(Statistic::Quantile, &vs, &[]) {
-            CombinedResult::Partial { covered, missing } => {
-                assert!(covered.is_none());
-                assert!(missing.is_empty());
-            }
-            other => panic!("expected Partial, got {other:?}"),
-        }
-    }
-
-    #[test]
-    fn topk_across_schemas_is_partial() {
-        let vs = vec![sv(1, 0, 100, AggStatus::Retired, 42.0)];
-        assert!(matches!(
-            combine_statistic(Statistic::Topk, &vs, &[]),
-            CombinedResult::Partial { .. }
-        ));
-    }
-
-    #[test]
-    fn cardinality_across_schemas_is_partial() {
-        let vs = vec![
-            sv(1, 0, 100, AggStatus::Retired, 1_000.0),
-            sv(2, 100, 200, AggStatus::Active, 1_500.0),
-        ];
-        assert!(matches!(
-            combine_statistic(Statistic::Cardinality, &vs, &[]),
-            CombinedResult::Partial { .. }
-        ));
-    }
-
-    #[test]
-    fn additive_with_unresolved_segment_is_partial_with_covered_set() {
-        let vs = vec![sv(1, 0, 100, AggStatus::Retired, 10.0)];
-        let missing = vec![seg(2, 100, 200, AggStatus::Expired)];
-        match combine_statistic(Statistic::Sum, &vs, &missing) {
-            CombinedResult::Partial {
-                covered,
-                missing: m,
-            } => {
-                assert_eq!(covered, Some(10.0));
-                assert_eq!(m.len(), 1);
-                assert_eq!(m[0].agg_id, 2);
-            }
-            other => panic!("expected Partial with covered=Some(10.0), got {other:?}"),
-        }
-    }
-
-    #[test]
-    fn empty_input_yields_additive_zero_for_count_and_sum() {
-        assert_eq!(
-            combine_statistic(Statistic::Count, &[], &[]),
-            CombinedResult::Full(0.0),
-        );
-        assert_eq!(
-            combine_statistic(Statistic::Sum, &[], &[]),
-            CombinedResult::Full(0.0),
-        );
-    }
-
-    #[test]
-    fn empty_input_yields_partial_none_for_non_additive() {
-        // Min / Max / Quantile / Topk / Cardinality / Increase / Rate
-        // all lack an identity element, so an empty range produces
-        // Partial { covered: None } rather than a misleading 0.0.
-        for stat in [
-            Statistic::Min,
-            Statistic::Max,
-            Statistic::Quantile,
-            Statistic::Topk,
-            Statistic::Cardinality,
-            Statistic::Increase,
-            Statistic::Rate,
-        ] {
-            match combine_statistic(stat, &[], &[]) {
-                CombinedResult::Partial { covered, missing } => {
-                    assert!(
-                        covered.is_none() && missing.is_empty(),
-                        "{stat:?} should yield empty Partial",
-                    );
-                }
-                other => panic!("{stat:?} should be Partial on empty input, got {other:?}"),
-            }
-        }
-    }
-
-    #[test]
-    fn single_segment_additive_returns_that_value() {
-        let vs = vec![sv(1, 0, 100, AggStatus::Active, 42.0)];
-        assert_eq!(
-            combine_statistic(Statistic::Sum, &vs, &[]),
-            CombinedResult::Full(42.0),
-        );
-    }
-
-    #[test]
-    fn unresolved_only_no_segments_returns_partial_with_no_covered() {
-        let missing = vec![seg(1, 0, 100, AggStatus::Expired)];
-        match combine_statistic(Statistic::Sum, &[], &missing) {
-            CombinedResult::Partial {
-                covered,
-                missing: m,
-            } => {
-                // Sum over zero segments is 0.0 (identity), so covered is
-                // Some(0.0); the missing list still surfaces the gap.
-                assert_eq!(covered, Some(0.0));
-                assert_eq!(m.len(), 1);
-            }
-            other => panic!("expected Partial, got {other:?}"),
-        }
-    }
-}
diff --git a/data_plane/src/storage_engines/sketch_db/query/window_merger.rs b/data_plane/src/storage_engines/sketch_db/query/window_merger.rs
deleted file mode 100644
index 5df9853d2..000000000
--- a/data_plane/src/storage_engines/sketch_db/query/window_merger.rs
+++ /dev/null
@@ -1,408 +0,0 @@
-//! Window merging strategies for range queries
-//!
-//! This module provides the `WindowMerger` trait and implementations for
-//! merging buckets in a sliding window. The abstraction allows swapping
-//! merge strategies:
-//!
-//! - `NaiveMerger`: Re-merge all buckets each step (current implementation)
-//! - `IncrementalMerger`: Add/subtract for subtractable accumulators (future)
-//! - `SwagMerger`: Two-stack queue for non-subtractable accumulators (future)
-
-use crate::storage_engines::types::{AggregateCore, AggregationType};
-
-/// Trait for merging buckets in a sliding window
-///
-/// This abstraction allows swapping merge strategies:
-/// - NaiveMerger: Re-merge all buckets each step (current implementation)
-/// - IncrementalMerger: Add/subtract for subtractable accumulators (future)
-/// - SwagMerger: Two-stack queue for non-subtractable accumulators (future)
-pub trait WindowMerger: Send + Sync {
-    /// Initialize with the first window's buckets
-    fn initialize(&mut self, buckets: Vec<Box<dyn AggregateCore>>);
-
-    /// Slide the window: remove `remove_count` old buckets, add new buckets
-    fn slide(&mut self, remove_count: usize, new_buckets: Vec<Box<dyn AggregateCore>>);
-
-    /// Get the current merged result
-    fn get_merged(&self) -> Result<Box<dyn AggregateCore>, String>;
-
-    /// Check if the window has been initialized
-    fn is_initialized(&self) -> bool;
-}
-
-/// Naive implementation that re-merges all buckets each time
-///
-/// This is the simplest implementation with O(n) merge per step.
-/// It's suitable for small windows or when optimization isn't critical.
-pub struct NaiveMerger {
-    buckets: Vec<Box<dyn AggregateCore>>,
-}
-
-impl NaiveMerger {
-    pub fn new() -> Self {
-        Self {
-            buckets: Vec::new(),
-        }
-    }
-
-    fn merge_all(&self) -> Result<Box<dyn AggregateCore>, String> {
-        if self.buckets.is_empty() {
-            return Err("No buckets to merge".to_string());
-        }
-
-        let mut result = self.buckets[0].clone_boxed_core();
-        for bucket in &self.buckets[1..] {
-            result = result
-                .merge_with(bucket.as_ref())
-                .map_err(|e| format!("Merge failed: {}", e))?;
-        }
-        Ok(result)
-    }
-}
-
-impl Default for NaiveMerger {
-    fn default() -> Self {
-        Self::new()
-    }
-}
-
-impl WindowMerger for NaiveMerger {
-    fn initialize(&mut self, buckets: Vec<Box<dyn AggregateCore>>) {
-        self.buckets = buckets;
-    }
-
-    fn slide(&mut self, remove_count: usize, new_buckets: Vec<Box<dyn AggregateCore>>) {
-        // Remove old buckets from front
-        self.buckets.drain(0..remove_count.min(self.buckets.len()));
-        // Add new buckets to back
-        self.buckets.extend(new_buckets);
-    }
-
-    fn get_merged(&self) -> Result<Box<dyn AggregateCore>, String> {
-        self.merge_all()
-    }
-
-    fn is_initialized(&self) -> bool {
-        !self.buckets.is_empty()
-    }
-}
-
-/// Factory function to create appropriate merger based on accumulator type
-///
-/// For now, always returns NaiveMerger. Future implementations could return
-/// optimized mergers based on the accumulator type:
-/// - IncrementalMerger for subtractable accumulators (Sum, CountMinSketch)
-/// - SwagMerger for non-subtractable accumulators (KLL, MinMax)
-#[allow(dead_code)]
-pub fn create_window_merger(_accumulator_type: AggregationType) -> Box<dyn WindowMerger> {
-    // Future implementation:
-    // match accumulator_type {
-    //     "SumAccumulator" | "CountMinSketchAccumulator" => Box::new(IncrementalMerger::new()),
-    //     "DatasketchesKLLAccumulator" | "MinMaxAccumulator" => Box::new(SwagMerger::new()),
-    //     _ => Box::new(NaiveMerger::new()),
-    // }
-    Box::new(NaiveMerger::new())
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use crate::storage_engines::types::{KeyByLabelValues, SerializableToSink};
-    use serde_json::Value;
-    use std::any::Any;
-
-    /// Mock accumulator for testing - simply sums values
-    #[derive(Clone, Debug)]
-    struct MockSumAccumulator {
-        value: f64,
-    }
-
-    impl MockSumAccumulator {
-        fn new(value: f64) -> Self {
-            Self { value }
-        }
-    }
-
-    impl SerializableToSink for MockSumAccumulator {
-        fn serialize_to_json(&self) -> Value {
-            serde_json::json!({"value": self.value})
-        }
-
-        fn serialize_to_bytes(&self) -> Vec<u8> {
-            self.value.to_le_bytes().to_vec()
-        }
-    }
-
-    impl AggregateCore for MockSumAccumulator {
-        fn clone_boxed_core(&self) -> Box<dyn AggregateCore> {
-            Box::new(self.clone())
-        }
-
-        fn type_name(&self) -> &'static str {
-            "MockSumAccumulator"
-        }
-
-        fn as_any(&self) -> &dyn Any {
-            self
-        }
-
-        fn as_any_mut(&mut self) -> &mut dyn std::any::Any {
-            self
-        }
-
-        fn merge_with(
-            &self,
-            other: &dyn AggregateCore,
-        ) -> Result<Box<dyn AggregateCore>, Box<dyn std::error::Error + Send + Sync>> {
-            if let Some(other_mock) = other.as_any().downcast_ref::<MockSumAccumulator>() {
-                Ok(Box::new(MockSumAccumulator::new(
-                    self.value + other_mock.value,
-                )))
-            } else {
-                Err("Cannot merge with different accumulator type".into())
-            }
-        }
-
-        fn get_accumulator_type(&self) -> AggregationType {
-            AggregationType::Sum
-        }
-
-        fn get_keys(&self) -> Option<Vec<KeyByLabelValues>> {
-            None
-        }
-
-        fn query_statistic(
-            &self,
-            _statistic: asap_types::Statistic,
-            _key: &Option<KeyByLabelValues>,
-            _query_kwargs: &std::collections::HashMap<String, String>,
-        ) -> Result<f64, Box<dyn std::error::Error + Send + Sync>> {
-            Err("MockSumAccumulator does not support query_statistic".into())
-        }
-    }
-
-    // Basic structure tests
-
-    #[test]
-    fn test_naive_merger_creation() {
-        let merger = NaiveMerger::new();
-        assert!(!merger.is_initialized());
-    }
-
-    #[test]
-    fn test_naive_merger_empty_merge_error() {
-        let merger = NaiveMerger::new();
-        let result = merger.get_merged();
-        assert!(result.is_err());
-        assert_eq!(result.err().unwrap(), "No buckets to merge");
-    }
-
-    #[test]
-    fn test_create_window_merger() {
-        let merger = create_window_merger(AggregationType::Sum);
-        assert!(!merger.is_initialized());
-    }
-
-    // Tests with MockSumAccumulator
-
-    #[test]
-    fn test_naive_merger_initialize() {
-        let mut merger = NaiveMerger::new();
-        assert!(!merger.is_initialized());
-
-        let buckets: Vec<Box<dyn AggregateCore>> = vec![
-            Box::new(MockSumAccumulator::new(10.0)),
-            Box::new(MockSumAccumulator::new(20.0)),
-        ];
-        merger.initialize(buckets);
-
-        assert!(merger.is_initialized());
-    }
-
-    #[test]
-    fn test_naive_merger_get_merged_single_bucket() {
-        let mut merger = NaiveMerger::new();
-        let buckets: Vec<Box<dyn AggregateCore>> = vec![Box::new(MockSumAccumulator::new(42.0))];
-        merger.initialize(buckets);
-
-        let result = merger.get_merged();
-        assert!(result.is_ok());
-
-        let merged = result.unwrap();
-        let mock = merged
-            .as_any()
-            .downcast_ref::<MockSumAccumulator>()
-            .unwrap();
-        assert_eq!(mock.value, 42.0);
-    }
-
-    #[test]
-    fn test_naive_merger_get_merged_multiple_buckets() {
-        let mut merger = NaiveMerger::new();
-        let buckets: Vec<Box<dyn AggregateCore>> = vec![
-            Box::new(MockSumAccumulator::new(10.0)),
-            Box::new(MockSumAccumulator::new(20.0)),
-            Box::new(MockSumAccumulator::new(30.0)),
-        ];
-        merger.initialize(buckets);
-
-        let result = merger.get_merged();
-        assert!(result.is_ok());
-
-        let merged = result.unwrap();
-        let mock = merged
-            .as_any()
-            .downcast_ref::<MockSumAccumulator>()
-            .unwrap();
-        assert_eq!(mock.value, 60.0); // 10 + 20 + 30
-    }
-
-    #[test]
-    fn test_naive_merger_slide_removes_old_buckets() {
-        let mut merger = NaiveMerger::new();
-        // Initialize with [10, 20, 30]
-        let buckets: Vec<Box<dyn AggregateCore>> = vec![
-            Box::new(MockSumAccumulator::new(10.0)),
-            Box::new(MockSumAccumulator::new(20.0)),
-            Box::new(MockSumAccumulator::new(30.0)),
-        ];
-        merger.initialize(buckets);
-
-        // Slide: remove 1 old, add [40]
-        // Result should be [20, 30, 40]
-        let new_buckets: Vec<Box<dyn AggregateCore>> =
-            vec![Box::new(MockSumAccumulator::new(40.0))];
-        merger.slide(1, new_buckets);
-
-        let result = merger.get_merged();
-        assert!(result.is_ok());
-
-        let merged = result.unwrap();
-        let mock = merged
-            .as_any()
-            .downcast_ref::<MockSumAccumulator>()
-            .unwrap();
-        assert_eq!(mock.value, 90.0); // 20 + 30 + 40
-    }
-
-    #[test]
-    fn test_naive_merger_slide_removes_multiple_buckets() {
-        let mut merger = NaiveMerger::new();
-        // Initialize with [10, 20, 30, 40]
-        let buckets: Vec<Box<dyn AggregateCore>> = vec![
-            Box::new(MockSumAccumulator::new(10.0)),
-            Box::new(MockSumAccumulator::new(20.0)),
-            Box::new(MockSumAccumulator::new(30.0)),
-            Box::new(MockSumAccumulator::new(40.0)),
-        ];
-        merger.initialize(buckets);
-
-        // Slide: remove 2 old, add [50, 60]
-        // Result should be [30, 40, 50, 60]
-        let new_buckets: Vec<Box<dyn AggregateCore>> = vec![
-            Box::new(MockSumAccumulator::new(50.0)),
-            Box::new(MockSumAccumulator::new(60.0)),
-        ];
-        merger.slide(2, new_buckets);
-
-        let result = merger.get_merged();
-        assert!(result.is_ok());
-
-        let merged = result.unwrap();
-        let mock = merged
-            .as_any()
-            .downcast_ref::<MockSumAccumulator>()
-            .unwrap();
-        assert_eq!(mock.value, 180.0); // 30 + 40 + 50 + 60
-    }
-
-    #[test]
-    fn test_naive_merger_slide_with_empty_new_buckets() {
-        let mut merger = NaiveMerger::new();
-        let buckets: Vec<Box<dyn AggregateCore>> = vec![
-            Box::new(MockSumAccumulator::new(10.0)),
-            Box::new(MockSumAccumulator::new(20.0)),
-            Box::new(MockSumAccumulator::new(30.0)),
-        ];
-        merger.initialize(buckets);
-
-        // Slide: remove 1 old, add nothing
-        // Result should be [20, 30]
-        merger.slide(1, vec![]);
-
-        let result = merger.get_merged();
-        assert!(result.is_ok());
-
-        let merged = result.unwrap();
-        let mock = merged
-            .as_any()
-            .downcast_ref::<MockSumAccumulator>()
-            .unwrap();
-        assert_eq!(mock.value, 50.0); // 20 + 30
-    }
-
-    #[test]
-    fn test_naive_merger_slide_remove_more_than_exists() {
-        let mut merger = NaiveMerger::new();
-        let buckets: Vec<Box<dyn AggregateCore>> = vec![
-            Box::new(MockSumAccumulator::new(10.0)),
-            Box::new(MockSumAccumulator::new(20.0)),
-        ];
-        merger.initialize(buckets);
-
-        // Slide: try to remove 5 (more than exists), add [30]
-        // Should only remove what exists, result should be [30]
-        let new_buckets: Vec<Box<dyn AggregateCore>> =
-            vec![Box::new(MockSumAccumulator::new(30.0))];
-        merger.slide(5, new_buckets);
-
-        let result = merger.get_merged();
-        assert!(result.is_ok());
-
-        let merged = result.unwrap();
-        let mock = merged
-            .as_any()
-            .downcast_ref::<MockSumAccumulator>()
-            .unwrap();
-        assert_eq!(mock.value, 30.0);
-    }
-
-    #[test]
-    fn test_naive_merger_simulates_sliding_window() {
-        let mut merger = NaiveMerger::new();
-
-        // Simulate a sliding window of size 3 with step 1
-        // Window 1: [10, 20, 30] = 60
-        let buckets: Vec<Box<dyn AggregateCore>> = vec![
-            Box::new(MockSumAccumulator::new(10.0)),
-            Box::new(MockSumAccumulator::new(20.0)),
-            Box::new(MockSumAccumulator::new(30.0)),
-        ];
-        merger.initialize(buckets);
-
-        let result1 = merger.get_merged().unwrap();
-        let mock1 = result1
-            .as_any()
-            .downcast_ref::<MockSumAccumulator>()
-            .unwrap();
-        assert_eq!(mock1.value, 60.0);
-
-        // Window 2: [20, 30, 40] = 90
-        merger.slide(1, vec![Box::new(MockSumAccumulator::new(40.0))]);
-        let result2 = merger.get_merged().unwrap();
-        let mock2 = result2
-            .as_any()
-            .downcast_ref::<MockSumAccumulator>()
-            .unwrap();
-        assert_eq!(mock2.value, 90.0);
-
-        // Window 3: [30, 40, 50] = 120
-        merger.slide(1, vec![Box::new(MockSumAccumulator::new(50.0))]);
-        let result3 = merger.get_merged().unwrap();
-        let mock3 = result3
-            .as_any()
-            .downcast_ref::<MockSumAccumulator>()
-            .unwrap();
-        assert_eq!(mock3.value, 120.0);
-    }
-}
diff --git a/data_plane/src/storage_engines/sketch_db/sds.rs b/data_plane/src/storage_engines/sketch_db/sds.rs
deleted file mode 100644
index 58ea8eb62..000000000
--- a/data_plane/src/storage_engines/sketch_db/sds.rs
+++ /dev/null
@@ -1,530 +0,0 @@
-//! Backend-owned physical representation of Self-Describing Summaries.
-//!
-//! Planner output is bound into these descriptors at the physical-plan edge.
-//! Descriptors are content-interned and shared by every materialized instance;
-//! pane-local state remains in `SketchStore`.
-
-use std::collections::HashMap;
-use std::sync::{Arc, RwLock, Weak};
-
-use super::data::{AggKind, SketchConfig};
-use super::index::SummarySeriesMetadata;
-#[cfg(test)]
-use crate::storage_engines::types::AggregationType;
-pub use asap_types::sds::{
-    DataDescriptor, DataDescriptorId, FidelityGuarantee, SummaryDescriptor, SummaryDescriptorId,
-    SummaryOperator,
-};
-
-// Legacy records lack some state-shape dimensions (heap/Hydra/subtype). Do not
-// let these projections masquerade as an authoritative Configured descriptor.
-fn legacy_summary(kind: &AggKind) -> SummaryDescriptor {
-    let fidelity = match kind {
-        AggKind::ExactAgg { .. } => FidelityGuarantee::Exact,
-        AggKind::Sketch { config, .. } => match config {
-            SketchConfig::Kll { k } => FidelityGuarantee::KllRankError {
-                k: *k,
-                model: "asap.kll.normalized-rank.v1".into(),
-            },
-            SketchConfig::DDSketch { relative_accuracy } => {
-                FidelityGuarantee::DdSketchRelativeError {
-                    alpha: *relative_accuracy,
-                }
-            }
-            SketchConfig::Hll { precision } => FidelityGuarantee::HllCardinalityError {
-                precision: *precision,
-                model: "asap.hll.relative-cardinality.v1".into(),
-            },
-            SketchConfig::CountMin { rows, cols } if *rows > 0 && *cols > 0 => {
-                FidelityGuarantee::CmsFrequencyError {
-                    width: *cols as u32,
-                    depth: *rows as u32,
-                    model: "asap.cms.point-frequency.v1".into(),
-                }
-            }
-            SketchConfig::CountSketch { rows, cols } if *rows > 0 && *cols > 0 => {
-                FidelityGuarantee::CountSketchFrequencyError {
-                    width: *cols as u32,
-                    depth: *rows as u32,
-                    model: "asap.count-sketch.point-frequency.v1".into(),
-                }
-            }
-            _ => FidelityGuarantee::Unknown {
-                reason: "Legacy configuration has invalid dimensions".into(),
-            },
-        },
-    };
-    SummaryDescriptor::new(
-        SummaryOperator::LegacyPartial {
-            operator_canonical: kind.operator_canonical_string(),
-        },
-        fidelity,
-        1,
-    )
-    .unwrap_or_else(|_| {
-        SummaryDescriptor::new(
-            SummaryOperator::LegacyPartial {
-                operator_canonical: kind.operator_canonical_string(),
-            },
-            FidelityGuarantee::Unknown {
-                reason: "Legacy configuration has invalid fidelity parameters".into(),
-            },
-            1,
-        )
-        .expect("unknown legacy descriptor has valid version and reason")
-    })
-}
-
-// A valid deployment reference does not authorize bytes in another state format.
-fn operator_matches(summary: &SummaryDescriptor, actual: &AggKind) -> bool {
-    match &summary.operator {
-        SummaryOperator::Configured {
-            aggregation_type,
-            aggregation_sub_type,
-            parameters,
-            ..
-        } => {
-            let config = asap_types::PrecomputeMaterialization::new(
-                *aggregation_type,
-                aggregation_sub_type.clone(),
-                parameters.clone().into_iter().collect(),
-                asap_types::KeyByLabelNames::empty(),
-                asap_types::KeyByLabelNames::empty(),
-                asap_types::KeyByLabelNames::empty(),
-                String::new(),
-                1,
-                1,
-                asap_types::WindowKind::Tumbling,
-                String::new(),
-                String::new(),
-                None,
-                None,
-                None,
-            );
-            super::data::agg_kind_for_config(&config).operator_canonical_string()
-                == actual.operator_canonical_string()
-        }
-        SummaryOperator::ExactAgg {
-            agg_type,
-            parameters_canonical,
-        } => matches!(actual,
-            AggKind::ExactAgg { agg_type: actual, parameters_canonical: parameters, .. } if actual == agg_type && parameters == parameters_canonical),
-        SummaryOperator::LegacyPartial { operator_canonical } => {
-            actual.operator_canonical_string() == *operator_canonical
-        }
-        // Bound runtime plans carry the complete Configured state contract.
-        SummaryOperator::Sketch { .. } => false,
-    }
-}
-
-/// Runtime foreign-key binding from one SeriesId to shared descriptors. Every pane
-/// row stored under the SeriesId is a Summary Instance: `(binding, interval,
-/// group-values, state)`. Descriptor references are normalized here instead of
-/// copied into every pane row.
-#[derive(Debug, Clone)]
-pub struct SdsBinding {
-    pub stored_output_reference: Option<asap_types::sds::StoredOutputReference>,
-    pub metadata: Arc<SummarySeriesMetadata>,
-    pub summary_descriptor: Arc<SummaryDescriptor>,
-    pub data_descriptor: Arc<DataDescriptor>,
-    /// Immutable provenance of this physical series lifetime, shared with
-    /// the catalog snapshot used when the descriptors were bound.
-    pub catalog_generation: Option<Arc<asap_types::sds::CatalogGeneration>>,
-}
-
-impl std::ops::Deref for SdsBinding {
-    type Target = SummarySeriesMetadata;
-
-    fn deref(&self) -> &Self::Target {
-        &self.metadata
-    }
-}
-
-/// Content-addressed descriptor registry owned by one SummaryStore.
-#[derive(Default)]
-pub struct SummaryDescriptorRegistry {
-    // Weak values let descriptors disappear with their last SeriesId binding. The
-    // registry must not turn retired materializations into a permanent leak.
-    summaries: RwLock<HashMap<SummaryDescriptorId, Weak<SummaryDescriptor>>>,
-    data: RwLock<HashMap<DataDescriptorId, Weak<DataDescriptor>>>,
-    authoritative_catalog: RwLock<
-        Option<(
-            Arc<asap_types::summary_catalog::SummaryCatalog>,
-            Arc<asap_types::sds::CatalogGeneration>,
-            std::collections::BTreeMap<
-                asap_types::sds::StoredOutputId,
-                asap_types::sds::StoredOutputReference,
-            >,
-        )>,
-    >,
-}
-
-impl SummaryDescriptorRegistry {
-    #[cfg(test)]
-    pub fn install_catalog(
-        &self,
-        catalog: Arc<asap_types::summary_catalog::SummaryCatalog>,
-    ) -> Result<(), asap_types::summary_catalog::SummaryCatalogError> {
-        let outputs = catalog
-            .outputs
-            .keys()
-            .map(|id| (*id, catalog.output_reference(*id).unwrap()))
-            .collect();
-        self.install_catalog_with_outputs(catalog, outputs)
-    }
-
-    pub fn install_catalog_with_outputs(
-        &self,
-        catalog: Arc<asap_types::summary_catalog::SummaryCatalog>,
-        outputs: std::collections::BTreeMap<
-            asap_types::sds::StoredOutputId,
-            asap_types::sds::StoredOutputReference,
-        >,
-    ) -> Result<(), asap_types::summary_catalog::SummaryCatalogError> {
-        catalog.validate()?;
-        if outputs.len() != catalog.outputs.len()
-            || outputs
-                .iter()
-                .any(|(id, output)| catalog.output_reference(*id).ok().as_ref() != Some(output))
-        {
-            return Err(
-                asap_types::summary_catalog::SummaryCatalogError::Descriptor(
-                    "installed output bindings disagree with semantic definitions".into(),
-                ),
-            );
-        }
-        let reference = catalog.reference()?;
-        let generation = Arc::new(asap_types::sds::CatalogGeneration {
-            schema_version: reference.schema_version,
-            plan_id: reference.plan_id,
-            plan_version: reference.plan_version,
-            snapshot_sha256: reference.snapshot_sha256,
-        });
-        *self.authoritative_catalog.write().unwrap() = Some((catalog, generation, outputs));
-        Ok(())
-    }
-
-    pub fn authoritative_catalog(
-        &self,
-    ) -> Option<Arc<asap_types::summary_catalog::SummaryCatalog>> {
-        self.authoritative_catalog
-            .read()
-            .unwrap()
-            .as_ref()
-            .map(|(catalog, _, _)| Arc::clone(catalog))
-    }
-
-    pub fn authoritative_snapshot(
-        &self,
-    ) -> Option<(
-        Arc<asap_types::summary_catalog::SummaryCatalog>,
-        Arc<asap_types::sds::CatalogGeneration>,
-    )> {
-        self.authoritative_catalog
-            .read()
-            .unwrap()
-            .as_ref()
-            .map(|(catalog, generation, _)| (Arc::clone(catalog), Arc::clone(generation)))
-    }
-
-    pub fn stored_output_reference(
-        &self,
-        definition: asap_types::sds::StoredOutputId,
-    ) -> Option<asap_types::sds::StoredOutputReference> {
-        let installed = self.authoritative_catalog.read().unwrap();
-        match installed.as_ref() {
-            Some((_, _, outputs)) => outputs.get(&definition).cloned(),
-            None => (!definition.fingerprint().is_unset())
-                .then(|| asap_types::sds::StoredOutputReference::for_output(definition)),
-        }
-    }
-
-    pub fn bind(&self, metadata: SummarySeriesMetadata) -> Result<SdsBinding, String> {
-        let authoritative = self.authoritative_catalog.read().unwrap().clone();
-        let stored_output_reference = match &authoritative {
-            Some((_, _, outputs)) => Some(
-                outputs
-                    .get(&metadata.policy_fp.into())
-                    .cloned()
-                    .ok_or("definition has no selected stored output")?,
-            ),
-            None => (!metadata.policy_fp.is_unset()).then(|| {
-                asap_types::sds::StoredOutputReference::for_output(metadata.policy_fp.into())
-            }),
-        };
-        let configured = if let Some((catalog, _, _)) = authoritative.as_ref() {
-            if metadata.policy_fp.is_unset() {
-                return Err(
-                    "materialization identity is required by the installed SummaryCatalog".into(),
-                );
-            }
-            let materialization = asap_types::sds::StoredOutputId::from(metadata.policy_fp);
-            let identity = catalog.outputs.get(&materialization).ok_or_else(|| {
-                format!(
-                    "materialization {} is absent from the installed SummaryCatalog",
-                    materialization.as_u64()
-                )
-            })?;
-            let summary = &catalog.summary_descriptors[&identity.summary_descriptor_id];
-            if !operator_matches(summary, &metadata.agg_kind) {
-                return Err("stored output state format differs from installed definition".into());
-            }
-            Some((
-                summary.clone(),
-                catalog.data_descriptors[&identity.data_descriptor_id].clone(),
-            ))
-        } else {
-            None
-        };
-        let summary = configured
-            .as_ref()
-            .map(|(summary, _)| summary.clone())
-            .unwrap_or_else(|| legacy_summary(&metadata.agg_kind));
-        let summary_id = summary.id().clone();
-        let summary_descriptor = {
-            let mut summaries = self.summaries.write().unwrap();
-            if let Some(existing) = summaries.get(&summary_id).and_then(Weak::upgrade) {
-                existing
-            } else {
-                let descriptor = Arc::new(summary);
-                summaries.insert(summary_id, Arc::downgrade(&descriptor));
-                descriptor
-            }
-        };
-
-        let data_descriptor_value = configured.map(|(_, data)| data).unwrap_or_else(|| {
-            DataDescriptor::new(
-                metadata.metric_name.clone(),
-                metadata.agg_kind.spatial_filter_canonical(),
-                metadata.group_by_keys.iter().cloned(),
-            )
-        });
-        let data_id = data_descriptor_value.id().clone();
-        let data_descriptor = {
-            let mut data_registry = self.data.write().unwrap();
-            if let Some(existing) = data_registry.get(&data_id).and_then(Weak::upgrade) {
-                existing
-            } else {
-                let descriptor = Arc::new(data_descriptor_value);
-                data_registry.insert(descriptor.id.clone(), Arc::downgrade(&descriptor));
-                descriptor
-            }
-        };
-
-        Ok(SdsBinding {
-            stored_output_reference,
-            metadata: Arc::new(metadata),
-            summary_descriptor,
-            data_descriptor,
-            catalog_generation: authoritative.map(|(_, generation, _)| generation),
-        })
-    }
-
-    pub fn summary_count(&self) -> usize {
-        self.summaries
-            .read()
-            .unwrap()
-            .values()
-            .filter(|descriptor| descriptor.strong_count() > 0)
-            .count()
-    }
-
-    pub fn data_count(&self) -> usize {
-        self.data
-            .read()
-            .unwrap()
-            .values()
-            .filter(|descriptor| descriptor.strong_count() > 0)
-            .count()
-    }
-
-    /// Remove dead weak entries after SeriesId retirement. Live snapshots remain
-    /// valid and are collected by a later prune once their handles are gone.
-    pub fn prune(&self) {
-        self.summaries
-            .write()
-            .unwrap()
-            .retain(|_, descriptor| descriptor.strong_count() > 0);
-        self.data
-            .write()
-            .unwrap()
-            .retain(|_, descriptor| descriptor.strong_count() > 0);
-    }
-
-    pub fn approx_resident_bytes(&self) -> usize {
-        let summaries = self.summaries.read().unwrap();
-        let mut total = summaries.capacity()
-            * (std::mem::size_of::<SummaryDescriptorId>()
-                + std::mem::size_of::<Weak<SummaryDescriptor>>());
-        for descriptor in summaries.values().filter_map(Weak::upgrade) {
-            total += std::mem::size_of::<SummaryDescriptor>() + descriptor.id.canonical().len();
-            total += serde_json::to_string(&descriptor.operator).map_or(0, |value| value.len());
-        }
-        drop(summaries);
-
-        let data = self.data.read().unwrap();
-        total += data.capacity()
-            * (std::mem::size_of::<DataDescriptorId>()
-                + std::mem::size_of::<Weak<DataDescriptor>>());
-        for descriptor in data.values().filter_map(Weak::upgrade) {
-            total += std::mem::size_of::<DataDescriptor>() + descriptor.id.canonical().len();
-            total += serde_json::to_string(&descriptor.source).map_or(0, |value| value.len());
-            total +=
-                serde_json::to_string(&descriptor.value_projection).map_or(0, |value| value.len());
-            total += descriptor.population_filter_canonical.len();
-            total += descriptor
-                .group_by_keys
-                .iter()
-                .map(|key| std::mem::size_of::<String>() + key.len())
-                .sum::<usize>();
-        }
-        total
-    }
-}
-
-pub(crate) fn summary_descriptor_id(kind: &AggKind) -> SummaryDescriptorId {
-    legacy_summary(kind).id
-}
-
-pub(crate) fn data_descriptor_id<'a>(
-    metric: &str,
-    filter: &str,
-    group_by: impl Iterator<Item = &'a str>,
-) -> DataDescriptorId {
-    DataDescriptor::new(metric, filter, group_by.map(str::to_string)).id
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use std::collections::BTreeSet;
-
-    fn metadata(
-        sid: u64,
-        metric: &str,
-        filter: &str,
-        agg_type: AggregationType,
-        policy: u64,
-    ) -> SummarySeriesMetadata {
-        SummarySeriesMetadata {
-            storage_handle: sid,
-            metric_name: metric.into(),
-            group_by_keys: BTreeSet::from(["job".into()]),
-            capability: None,
-            agg_kind: AggKind::ExactAgg {
-                agg_type,
-                parameters_canonical: "pane=5000;".into(),
-                spatial_filter_canonical: filter.into(),
-            },
-            accuracy: None,
-            first_seen_unix_ms: 0,
-            retired_at_ms: None,
-            expires_at_ms: None,
-            policy_fp: asap_types::PolicyFingerprint(policy),
-        }
-    }
-
-    #[test]
-    fn equivalent_materializations_share_both_descriptors() {
-        let registry = SummaryDescriptorRegistry::default();
-        let a = registry
-            .bind(metadata(1, "cpu", r#"{zone="a"}"#, AggregationType::Sum, 7))
-            .unwrap();
-        let b = registry
-            .bind(metadata(2, "cpu", r#"{zone="a"}"#, AggregationType::Sum, 8))
-            .unwrap();
-
-        assert!(Arc::ptr_eq(&a.summary_descriptor, &b.summary_descriptor));
-        assert!(Arc::ptr_eq(&a.data_descriptor, &b.data_descriptor));
-        assert_eq!((registry.summary_count(), registry.data_count()), (1, 1));
-    }
-
-    #[test]
-    fn population_changes_only_the_data_descriptor() {
-        let registry = SummaryDescriptorRegistry::default();
-        let a = registry
-            .bind(metadata(1, "cpu", r#"{zone="a"}"#, AggregationType::Sum, 7))
-            .unwrap();
-        let b = registry
-            .bind(metadata(2, "cpu", r#"{zone="b"}"#, AggregationType::Sum, 7))
-            .unwrap();
-
-        assert!(Arc::ptr_eq(&a.summary_descriptor, &b.summary_descriptor));
-        assert!(!Arc::ptr_eq(&a.data_descriptor, &b.data_descriptor));
-        assert_eq!((registry.summary_count(), registry.data_count()), (1, 2));
-    }
-
-    #[test]
-    fn operator_changes_only_the_summary_descriptor() {
-        let registry = SummaryDescriptorRegistry::default();
-        let a = registry
-            .bind(metadata(1, "cpu", "", AggregationType::Sum, 7))
-            .unwrap();
-        let b = registry
-            .bind(metadata(2, "cpu", "", AggregationType::Max, 7))
-            .unwrap();
-
-        assert!(!Arc::ptr_eq(&a.summary_descriptor, &b.summary_descriptor));
-        assert!(Arc::ptr_eq(&a.data_descriptor, &b.data_descriptor));
-        assert_eq!((registry.summary_count(), registry.data_count()), (2, 1));
-    }
-
-    #[test]
-    fn registry_does_not_retain_descriptors_after_bindings_are_dropped() {
-        let registry = SummaryDescriptorRegistry::default();
-        let binding = registry
-            .bind(metadata(1, "cpu", "", AggregationType::Sum, 7))
-            .unwrap();
-        assert_eq!((registry.summary_count(), registry.data_count()), (1, 1));
-
-        drop(binding);
-        registry.prune();
-        assert_eq!((registry.summary_count(), registry.data_count()), (0, 0));
-    }
-
-    #[test]
-    fn configured_materializations_bind_only_to_authoritative_catalog_descriptors() {
-        use asap_types::summary_catalog::SummaryCatalog;
-
-        let summary = SummaryDescriptor::new(
-            SummaryOperator::ExactAgg {
-                agg_type: AggregationType::Sum,
-                parameters_canonical: "pane=5000;".into(),
-            },
-            FidelityGuarantee::Exact,
-            1,
-        )
-        .unwrap();
-        let data = DataDescriptor::new("cpu", r#"{zone="a"}"#, ["job".into()]);
-        let catalog = SummaryCatalog::build(
-            7,
-            1,
-            [(
-                asap_types::PolicyFingerprint(7),
-                summary.clone(),
-                data.clone(),
-            )],
-        )
-        .unwrap();
-        let registry = SummaryDescriptorRegistry::default();
-        registry.install_catalog(Arc::new(catalog)).unwrap();
-
-        assert!(
-            registry
-                .bind(metadata(1, "wrong-local-copy", "", AggregationType::Max, 7))
-                .is_err(),
-            "an output ID must not authorize a different state family"
-        );
-        let binding = registry
-            .bind(metadata(1, "cpu", "", AggregationType::Sum, 7))
-            .unwrap();
-        assert_eq!(binding.summary_descriptor.as_ref(), &summary);
-        assert_eq!(binding.data_descriptor.as_ref(), &data);
-        assert!(registry
-            .bind(metadata(2, "cpu", "", AggregationType::Sum, 8))
-            .is_err());
-        assert!(registry
-            .bind(metadata(3, "cpu", "", AggregationType::Sum, 0))
-            .is_err());
-    }
-}
diff --git a/data_plane/src/storage_engines/traits.rs b/data_plane/src/storage_engines/traits.rs
deleted file mode 100644
index 00af9eb06..000000000
--- a/data_plane/src/storage_engines/traits.rs
+++ /dev/null
@@ -1,12 +0,0 @@
-use crate::storage_engines::types::{AggregateCore, KeyByLabelValues};
-use std::collections::HashMap;
-use std::sync::Arc;
-
-/// A bucket with its timestamp range: ((start_timestamp, end_timestamp), aggregate)
-pub type TimestampedBucket = ((u64, u64), Arc<dyn AggregateCore>);
-
-/// Map from key to timestamped buckets (sparse - only contains buckets that exist)
-pub type TimestampedBucketsMap = HashMap<Option<KeyByLabelValues>, Vec<TimestampedBucket>>;
-
-/// Shared result type for fallible storage operations.
-pub type StoreResult<T> = Result<T, Box<dyn std::error::Error + Send + Sync>>;
diff --git a/data_plane/src/storage_engines/types/enums.rs b/data_plane/src/storage_engines/types/enums.rs
deleted file mode 100644
index 8a8e27e9c..000000000
--- a/data_plane/src/storage_engines/types/enums.rs
+++ /dev/null
@@ -1,16 +0,0 @@
-pub use asap_types::enums::{CleanupPolicy, QueryLanguage, WindowKind};
-pub use asap_types::AggregationType;
-
-#[derive(clap::ValueEnum, Clone, Debug, PartialEq)]
-pub enum QueryProtocol {
-    #[value(alias = "PROMETHEUS_HTTP")]
-    PrometheusHttp,
-}
-
-#[derive(clap::ValueEnum, Clone, Debug, Copy, PartialEq)]
-pub enum LockStrategy {
-    #[value(name = "global")]
-    Global,
-    #[value(name = "per-key")]
-    PerKey,
-}
diff --git a/data_plane/src/storage_engines/types/hot_reload_config.rs b/data_plane/src/storage_engines/types/hot_reload_config.rs
deleted file mode 100644
index 47d0ddb29..000000000
--- a/data_plane/src/storage_engines/types/hot_reload_config.rs
+++ /dev/null
@@ -1,1080 +0,0 @@
-//! Generation-consistent physical plan installation and execution views.
-//!
-//! Production consumers obtain the installed precompute program through the
-//! active physical plan. Plan publication installs query and precompute bindings
-//! together; a runtime lookup view cannot independently redefine computation.
-
-use std::collections::BTreeMap;
-use std::sync::Arc;
-
-use arc_swap::ArcSwap;
-
-use crate::storage_engines::types::InstalledPrecomputePlan;
-
-/// One immutable, generation-consistent runtime snapshot. Every execution
-/// subsystem must project its view from the same `Arc<RuntimePhysicalPlan>`.
-#[derive(Debug, Clone)]
-pub struct RuntimePhysicalPlan {
-    /// Authoritative generation and lifecycle identity shared by every plan
-    /// projection in this immutable snapshot.
-    pub envelope: asap_types::precompute_plan::PlanEnvelope,
-    /// Present for authoritative installations; legacy bootstrap has no catalog.
-    pub summary_catalog: Option<Arc<control_plane::physical::summary_catalog::SummaryCatalog>>,
-    pub precompute_plan: asap_types::precompute_plan::PrecomputePlan,
-    pub transmission_plan: asap_types::producer_plan::TransmissionPlan,
-    pub installed_precompute_plan: Arc<InstalledPrecomputePlan>,
-    pub query_plan: Arc<asap_types::query_plan::QueryPlan>,
-    /// Immutable readout-boundary programs for this snapshot. This holds plan
-    /// metadata only; data, coverage and readiness are resolved on every run.
-    pub readout_programs: Arc<PreparedReadoutPrograms>,
-    pub storage_routing: Arc<crate::storage_engines::types::BackendStorageRouting>,
-}
-
-type ReadoutRoots =
-    BTreeMap<asap_types::query_plan::QueryNodeId, Arc<asap_types::query_plan::QueryPlanEntry>>;
-
-#[derive(Debug, Default)]
-struct ReadoutProgramRegistry {
-    query_plan: Option<Arc<asap_types::query_plan::QueryPlan>>,
-    entries: std::collections::HashMap<asap_types::QueryLanguage, BTreeMap<String, ReadoutRoots>>,
-}
-
-#[derive(Debug, Default)]
-pub struct PreparedReadoutPrograms {
-    registry: std::sync::Mutex<ReadoutProgramRegistry>,
-}
-
-impl RuntimePhysicalPlan {
-    /// Prepare an already-selected readout boundary once for this immutable
-    /// deployment snapshot. No rows, state, results or readiness are retained.
-    pub(crate) fn readout_program(
-        &self,
-        entry: &asap_types::query_plan::QueryPlanEntry,
-        root: asap_types::query_plan::QueryNodeId,
-    ) -> Result<Arc<asap_types::query_plan::QueryPlanEntry>, String> {
-        let mut programs = self
-            .readout_programs
-            .registry
-            .lock()
-            .map_err(|_| "readout program registry poisoned".to_string())?;
-        // Cloning a snapshot and replacing its QueryPlan must not preserve
-        // bindings from the previous immutable plan, even with identical names.
-        if programs
-            .query_plan
-            .as_ref()
-            .is_none_or(|installed| !Arc::ptr_eq(installed, &self.query_plan))
-        {
-            programs.entries.clear();
-            programs.query_plan = Some(Arc::clone(&self.query_plan));
-        }
-        if let Some(program) = programs
-            .entries
-            .get(&entry.language)
-            .and_then(|queries| queries.get(&entry.canonical_query))
-            .and_then(|roots| roots.get(&root))
-        {
-            return Ok(Arc::clone(program));
-        }
-        let reachable = entry
-            .topological_order_from(root)
-            .map_err(|error| error.to_string())?;
-        let mut program = entry.clone();
-        program.root = root;
-        program.nodes = reachable
-            .into_iter()
-            .map(|id| (id, entry.nodes[&id].clone()))
-            .collect();
-        let windows: std::collections::BTreeSet<_> = program
-            .materialization_bindings()
-            .iter()
-            .map(|binding| binding.readout_lookback_ms)
-            .collect();
-        if windows.len() != 1 || windows.contains(&None) || windows.contains(&Some(0)) {
-            return Err("bound subtree requires one explicit positive window".into());
-        }
-        program.instant.lookback_ms = windows
-            .first()
-            .copied()
-            .flatten()
-            .expect("explicit semantic lookback checked");
-        program.instant.full_history = false;
-        program.instant.cumulative_readout = true;
-        let program = Arc::new(program);
-        programs
-            .entries
-            .entry(entry.language)
-            .or_default()
-            .entry(entry.canonical_query.clone())
-            .or_default()
-            .insert(root, Arc::clone(&program));
-        Ok(program)
-    }
-
-    pub fn plan_id(&self) -> u64 {
-        self.envelope.plan_id
-    }
-    pub fn plan_version(&self) -> u64 {
-        self.envelope.plan_version
-    }
-    pub fn activation_unix_ms(&self) -> u64 {
-        self.envelope.activation_unix_ms
-    }
-    pub fn expiry_unix_ms(&self) -> Option<u64> {
-        self.envelope.expiry_unix_ms
-    }
-
-    fn materialization_fingerprints(
-        &self,
-    ) -> impl Iterator<Item = asap_types::PolicyFingerprint> + '_ {
-        self.precompute_plan
-            .materializations
-            .iter()
-            .map(asap_types::PrecomputeMaterialization::policy_fingerprint)
-    }
-}
-
-#[derive(Clone)]
-pub struct ActivePhysicalPlanHandle {
-    inner: Arc<ArcSwap<RuntimePhysicalPlan>>,
-    readiness: Arc<std::sync::Mutex<MaterializationReadinessState>>,
-}
-
-#[derive(Debug, Clone, Copy, PartialEq, Eq, serde::Serialize)]
-#[serde(rename_all = "snake_case")]
-pub enum MaterializationPhase {
-    Materializing,
-    Ready,
-    Serving,
-}
-
-#[derive(Debug, Clone, PartialEq, Eq, serde::Serialize)]
-pub struct MaterializationStatus {
-    pub plan_id: u64,
-    pub plan_version: u64,
-    pub materialization: u64,
-    pub phase: MaterializationPhase,
-    pub coverage_start_unix_ms: Option<u64>,
-    pub coverage_end_unix_ms: Option<u64>,
-}
-
-struct MaterializationReadinessState {
-    plan_id: u64,
-    plan_version: u64,
-    statuses: BTreeMap<asap_types::PolicyFingerprint, MaterializationStatus>,
-}
-
-impl MaterializationReadinessState {
-    fn for_plan(plan: &RuntimePhysicalPlan) -> Self {
-        let plan_id = plan.plan_id();
-        let plan_version = plan.plan_version();
-        let statuses = plan
-            .materialization_fingerprints()
-            .map(|materialization| {
-                (
-                    materialization,
-                    MaterializationStatus {
-                        plan_id,
-                        plan_version,
-                        materialization: materialization.0,
-                        phase: MaterializationPhase::Materializing,
-                        coverage_start_unix_ms: None,
-                        coverage_end_unix_ms: None,
-                    },
-                )
-            })
-            .collect();
-        Self {
-            plan_id,
-            plan_version,
-            statuses,
-        }
-    }
-
-    fn update(
-        &mut self,
-        plan_id: u64,
-        plan_version: u64,
-        materializations: &[asap_types::PolicyFingerprint],
-        phase: MaterializationPhase,
-        coverage: Option<(u64, u64)>,
-    ) -> bool {
-        if self.plan_id != plan_id || self.plan_version != plan_version {
-            return false;
-        }
-        if materializations
-            .iter()
-            .any(|materialization| !self.statuses.contains_key(materialization))
-        {
-            return false;
-        }
-        for materialization in materializations {
-            let status = self
-                .statuses
-                .get_mut(materialization)
-                .expect("materializations were validated above");
-            if phase != MaterializationPhase::Materializing
-                || status.phase == MaterializationPhase::Materializing
-            {
-                status.phase = phase;
-            }
-            if let Some((start, end)) = coverage {
-                status.coverage_start_unix_ms = Some(
-                    status
-                        .coverage_start_unix_ms
-                        .map_or(start, |current| current.min(start)),
-                );
-                status.coverage_end_unix_ms = Some(
-                    status
-                        .coverage_end_unix_ms
-                        .map_or(end, |current| current.max(end)),
-                );
-            }
-        }
-        true
-    }
-}
-
-#[derive(Debug, Clone, Copy, PartialEq, Eq, serde::Serialize)]
-#[serde(rename_all = "snake_case")]
-pub enum PhysicalPlanPhase {
-    Staged,
-    Active,
-    Draining,
-    Retired,
-}
-
-#[derive(Debug, Clone, serde::Serialize)]
-pub struct PhysicalPlanStatus {
-    pub plan_id: u64,
-    pub plan_version: u64,
-    pub phase: PhysicalPlanPhase,
-    pub activation_unix_ms: u64,
-    pub expiry_unix_ms: Option<u64>,
-}
-
-#[derive(Debug, thiserror::Error, PartialEq, Eq)]
-pub enum PhysicalPlanLifecycleError {
-    #[error("plan {plan_id}/{plan_version} is already staged or active")]
-    Duplicate { plan_id: u64, plan_version: u64 },
-    #[error("plan {plan_id}/{plan_version} is not staged")]
-    NotStaged { plan_id: u64, plan_version: u64 },
-    #[error("plan activation {activation} is later than now {now}")]
-    ActivationNotReached { activation: u64, now: u64 },
-    #[error("plan expired at {expiry}; now is {now}")]
-    Expired { expiry: u64, now: u64 },
-    #[error(
-        "plan version {incoming} is not newer than active version {active} for plan {plan_id}"
-    )]
-    StaleVersion {
-        plan_id: u64,
-        incoming: u64,
-        active: u64,
-    },
-    #[error("plan activation preparation failed: {0}")]
-    Prepare(String),
-}
-
-#[derive(Clone)]
-pub struct PhysicalPlanLifecycle {
-    active: ActivePhysicalPlanHandle,
-    state: Arc<std::sync::Mutex<PhysicalPlanLifecycleState>>,
-}
-
-struct PhysicalPlanLifecycleState {
-    staged: BTreeMap<(u64, u64), RuntimePhysicalPlan>,
-    statuses: BTreeMap<(u64, u64), PhysicalPlanStatus>,
-}
-
-impl PhysicalPlanLifecycle {
-    pub fn new(active: ActivePhysicalPlanHandle) -> Self {
-        let snapshot = active.active_snapshot();
-        let mut statuses = BTreeMap::new();
-        if snapshot.plan_id() != 0 {
-            statuses.insert(
-                (snapshot.plan_id(), snapshot.plan_version()),
-                status_for(&snapshot, PhysicalPlanPhase::Active),
-            );
-        }
-        Self {
-            active,
-            state: Arc::new(std::sync::Mutex::new(PhysicalPlanLifecycleState {
-                staged: BTreeMap::new(),
-                statuses,
-            })),
-        }
-    }
-
-    pub fn stage(
-        &self,
-        plan: RuntimePhysicalPlan,
-        now: u64,
-    ) -> Result<(), PhysicalPlanLifecycleError> {
-        let key = (plan.plan_id(), plan.plan_version());
-        if let Some(expiry) = plan.expiry_unix_ms() {
-            if expiry <= now {
-                return Err(PhysicalPlanLifecycleError::Expired { expiry, now });
-            }
-        }
-        let active = self.active.active_snapshot();
-        if active.plan_id() != 0 && key.1 <= active.plan_version() {
-            return Err(PhysicalPlanLifecycleError::StaleVersion {
-                plan_id: key.0,
-                incoming: key.1,
-                active: active.plan_version(),
-            });
-        }
-        let mut state = self
-            .state
-            .lock()
-            .expect("physical-plan lifecycle lock poisoned");
-        if state.staged.contains_key(&key)
-            || state.statuses.values().any(|status| {
-                status.plan_version == key.1 && !matches!(status.phase, PhysicalPlanPhase::Retired)
-            })
-        {
-            return Err(PhysicalPlanLifecycleError::Duplicate {
-                plan_id: key.0,
-                plan_version: key.1,
-            });
-        }
-        state
-            .statuses
-            .insert(key, status_for(&plan, PhysicalPlanPhase::Staged));
-        state.staged.insert(key, plan);
-        Ok(())
-    }
-
-    /// Roll back a failed publication without touching active readers or state.
-    pub(crate) fn discard_staged(
-        &self,
-        plan_id: u64,
-        plan_version: u64,
-    ) -> Result<(), PhysicalPlanLifecycleError> {
-        let key = (plan_id, plan_version);
-        let mut state = self
-            .state
-            .lock()
-            .expect("physical-plan lifecycle lock poisoned");
-        if state.staged.remove(&key).is_none() {
-            return Err(PhysicalPlanLifecycleError::NotStaged {
-                plan_id,
-                plan_version,
-            });
-        }
-        state.statuses.remove(&key);
-        Ok(())
-    }
-
-    pub fn activate(
-        &self,
-        plan_id: u64,
-        plan_version: u64,
-        now: u64,
-    ) -> Result<Arc<RuntimePhysicalPlan>, PhysicalPlanLifecycleError> {
-        self.activate_with_prepare(plan_id, plan_version, now, |_| Ok::<(), String>(()))
-    }
-
-    /// Run generation-scoped preparation before publishing a staged plan.
-    /// A failed preparation leaves both the active and staged generations
-    /// unchanged, so callers can fix the dependency and retry activation.
-    pub fn activate_with_prepare<E>(
-        &self,
-        plan_id: u64,
-        plan_version: u64,
-        now: u64,
-        prepare: impl FnOnce(&RuntimePhysicalPlan) -> Result<(), E>,
-    ) -> Result<Arc<RuntimePhysicalPlan>, PhysicalPlanLifecycleError>
-    where
-        E: std::fmt::Display,
-    {
-        let key = (plan_id, plan_version);
-        let mut state = self
-            .state
-            .lock()
-            .expect("physical-plan lifecycle lock poisoned");
-        let plan = state
-            .staged
-            .get(&key)
-            .ok_or(PhysicalPlanLifecycleError::NotStaged {
-                plan_id,
-                plan_version,
-            })?;
-        if now < plan.activation_unix_ms() {
-            return Err(PhysicalPlanLifecycleError::ActivationNotReached {
-                activation: plan.activation_unix_ms(),
-                now,
-            });
-        }
-        if let Some(expiry) = plan.expiry_unix_ms() {
-            if now >= expiry {
-                return Err(PhysicalPlanLifecycleError::Expired { expiry, now });
-            }
-        }
-        let current = self.active.active_snapshot();
-        if current.plan_id() != 0 && plan.plan_version() <= current.plan_version() {
-            return Err(PhysicalPlanLifecycleError::StaleVersion {
-                plan_id,
-                incoming: plan_version,
-                active: current.plan_version(),
-            });
-        }
-        prepare(plan).map_err(|error| PhysicalPlanLifecycleError::Prepare(error.to_string()))?;
-        let plan = state.staged.remove(&key).expect("staged plan disappeared");
-        let old = self.active.swap(plan.clone());
-        if old.plan_id() != 0 {
-            if let Some(status) = state.statuses.get_mut(&(old.plan_id(), old.plan_version())) {
-                status.phase = PhysicalPlanPhase::Draining;
-            }
-        }
-        state
-            .statuses
-            .insert(key, status_for(&plan, PhysicalPlanPhase::Active));
-        Ok(old)
-    }
-
-    pub fn statuses(&self) -> Vec<PhysicalPlanStatus> {
-        self.state
-            .lock()
-            .expect("physical-plan lifecycle lock poisoned")
-            .statuses
-            .values()
-            .cloned()
-            .collect()
-    }
-
-    /// Mark a superseded generation retired after all readers of the old
-    /// immutable snapshot have drained.
-    pub(crate) fn mark_drained_plan_retired(&self, plan_id: u64, plan_version: u64) {
-        if let Some(status) = self
-            .state
-            .lock()
-            .expect("physical-plan lifecycle lock poisoned")
-            .statuses
-            .get_mut(&(plan_id, plan_version))
-        {
-            if status.phase == PhysicalPlanPhase::Draining {
-                status.phase = PhysicalPlanPhase::Retired;
-            }
-        }
-    }
-}
-
-fn status_for(plan: &RuntimePhysicalPlan, phase: PhysicalPlanPhase) -> PhysicalPlanStatus {
-    PhysicalPlanStatus {
-        plan_id: plan.plan_id(),
-        plan_version: plan.plan_version(),
-        phase,
-        activation_unix_ms: plan.activation_unix_ms(),
-        expiry_unix_ms: plan.expiry_unix_ms(),
-    }
-}
-
-impl ActivePhysicalPlanHandle {
-    pub fn new(initial: RuntimePhysicalPlan) -> Self {
-        let readiness = MaterializationReadinessState::for_plan(&initial);
-        Self {
-            inner: Arc::new(ArcSwap::new(Arc::new(initial))),
-            readiness: Arc::new(std::sync::Mutex::new(readiness)),
-        }
-    }
-
-    pub fn active_snapshot(&self) -> Arc<RuntimePhysicalPlan> {
-        self.inner.load_full()
-    }
-
-    pub fn swap(&self, next: RuntimePhysicalPlan) -> Arc<RuntimePhysicalPlan> {
-        let next_readiness = MaterializationReadinessState::for_plan(&next);
-        let old = self.inner.swap(Arc::new(next));
-        *self
-            .readiness
-            .lock()
-            .expect("materialization readiness lock poisoned") = next_readiness;
-        old
-    }
-
-    pub(crate) fn materialization_statuses(&self) -> Vec<MaterializationStatus> {
-        self.readiness
-            .lock()
-            .expect("materialization readiness lock poisoned")
-            .statuses
-            .values()
-            .cloned()
-            .collect()
-    }
-
-    pub fn mark_materializing(
-        &self,
-        plan_id: u64,
-        plan_version: u64,
-        materializations: &[asap_types::PolicyFingerprint],
-        coverage: Option<(u64, u64)>,
-    ) -> bool {
-        self.update_materializations(
-            plan_id,
-            plan_version,
-            materializations,
-            MaterializationPhase::Materializing,
-            coverage,
-        )
-    }
-
-    pub fn mark_ready(
-        &self,
-        plan_id: u64,
-        plan_version: u64,
-        materializations: &[asap_types::PolicyFingerprint],
-        coverage: (u64, u64),
-    ) -> bool {
-        self.update_materializations(
-            plan_id,
-            plan_version,
-            materializations,
-            MaterializationPhase::Ready,
-            Some(coverage),
-        )
-    }
-
-    pub fn mark_serving(
-        &self,
-        plan_id: u64,
-        plan_version: u64,
-        materializations: &[asap_types::PolicyFingerprint],
-        coverage: (u64, u64),
-    ) -> bool {
-        self.update_materializations(
-            plan_id,
-            plan_version,
-            materializations,
-            MaterializationPhase::Serving,
-            Some(coverage),
-        )
-    }
-
-    fn update_materializations(
-        &self,
-        plan_id: u64,
-        plan_version: u64,
-        materializations: &[asap_types::PolicyFingerprint],
-        phase: MaterializationPhase,
-        coverage: Option<(u64, u64)>,
-    ) -> bool {
-        self.readiness
-            .lock()
-            .expect("materialization readiness lock poisoned")
-            .update(plan_id, plan_version, materializations, phase, coverage)
-    }
-}
-
-impl std::fmt::Debug for ActivePhysicalPlanHandle {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        let snapshot = self.active_snapshot();
-        f.debug_struct("ActivePhysicalPlanHandle")
-            .field("plan_id", &snapshot.plan_id())
-            .field("query_count", &snapshot.query_plan.entries.len())
-            .field(
-                "materializations",
-                &snapshot.precompute_plan.materializations.len(),
-            )
-            .finish()
-    }
-}
-
-/// Precompute projection of the authoritative active physical plan.
-#[derive(Clone)]
-pub struct InstalledPrecomputePlanHandle {
-    source: InstalledPrecomputePlanSource,
-}
-
-#[derive(Clone)]
-enum InstalledPrecomputePlanSource {
-    Active(ActivePhysicalPlanHandle),
-    #[cfg(test)]
-    Fixture(Arc<ArcSwap<InstalledPrecomputePlan>>),
-}
-
-impl InstalledPrecomputePlanHandle {
-    #[cfg(test)]
-    pub fn new(initial: InstalledPrecomputePlan) -> Self {
-        Self::from_arc(Arc::new(initial))
-    }
-
-    #[cfg(test)]
-    pub fn from_arc(initial: Arc<InstalledPrecomputePlan>) -> Self {
-        Self {
-            source: InstalledPrecomputePlanSource::Fixture(Arc::new(ArcSwap::new(initial))),
-        }
-    }
-
-    pub fn from_active_physical_plan(active: ActivePhysicalPlanHandle) -> Self {
-        Self {
-            source: InstalledPrecomputePlanSource::Active(active),
-        }
-    }
-
-    pub fn snapshot(&self) -> Arc<InstalledPrecomputePlan> {
-        match &self.source {
-            InstalledPrecomputePlanSource::Active(active) => {
-                active.active_snapshot().installed_precompute_plan.clone()
-            }
-            #[cfg(test)]
-            InstalledPrecomputePlanSource::Fixture(view) => view.load_full(),
-        }
-    }
-
-    pub fn active_physical_plan_snapshot(&self) -> Option<Arc<RuntimePhysicalPlan>> {
-        match &self.source {
-            InstalledPrecomputePlanSource::Active(active) => Some(active.active_snapshot()),
-            #[cfg(test)]
-            InstalledPrecomputePlanSource::Fixture(_) => None,
-        }
-    }
-
-    #[cfg(test)]
-    pub fn swap(&self, new: InstalledPrecomputePlan) -> Arc<InstalledPrecomputePlan> {
-        match &self.source {
-            InstalledPrecomputePlanSource::Fixture(view) => view.swap(Arc::new(new)),
-            InstalledPrecomputePlanSource::Active(_) => panic!("activate a complete physical plan"),
-        }
-    }
-}
-
-impl std::fmt::Debug for InstalledPrecomputePlanHandle {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        let snap = self.snapshot();
-        f.debug_struct("InstalledPrecomputePlanHandle")
-            .field("num_agg_configs", &snap.materializations_by_output.len())
-            .finish()
-    }
-}
-
-// Compatibility imports; new callers use the domain names above.
-#[deprecated(note = "Use ActivePhysicalPlanHandle")]
-pub use ActivePhysicalPlanHandle as HotReloadActivePhysicalPlan;
-#[deprecated(note = "Use RuntimePhysicalPlan")]
-pub use RuntimePhysicalPlan as ActivePhysicalPlan;
-
-impl InstalledPrecomputePlanHandle {
-    #[deprecated(note = "Use from_active_physical_plan")]
-    pub fn from_active(active: ActivePhysicalPlanHandle) -> Self {
-        Self::from_active_physical_plan(active)
-    }
-    #[deprecated(note = "Use active_physical_plan_snapshot")]
-    pub fn physical_plan_snapshot(&self) -> Option<Arc<RuntimePhysicalPlan>> {
-        self.active_physical_plan_snapshot()
-    }
-}
-impl PhysicalPlanLifecycle {
-    #[deprecated(note = "Use mark_drained_plan_retired")]
-    pub fn retire_drained(&self, plan_id: u64, plan_version: u64) {
-        self.mark_drained_plan_retired(plan_id, plan_version)
-    }
-}
-
-impl ActivePhysicalPlanHandle {
-    #[deprecated(note = "Use active_snapshot")]
-    pub fn snapshot(&self) -> Arc<RuntimePhysicalPlan> {
-        self.active_snapshot()
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use crate::storage_engines::types::PrecomputeMaterialization;
-    use asap_types::enums::WindowKind;
-    use asap_types::AggregationType;
-    use asap_types::KeyByLabelNames;
-    use std::collections::HashMap;
-    use std::thread;
-
-    fn physical_plan(
-        plan_id: u64,
-        plan_version: u64,
-        activation_unix_ms: u64,
-        expiry_unix_ms: Option<u64>,
-    ) -> RuntimePhysicalPlan {
-        let envelope = asap_types::precompute_plan::PlanEnvelope {
-            plan_id,
-            plan_version,
-            generated_at_unix_ms: activation_unix_ms,
-            activation_unix_ms,
-            expiry_unix_ms,
-            backend_compat: "asap-query-backend.v1".into(),
-            planner_revision: control_plane::physical::compiler::PLANNER_REVISION.into(),
-            capability_snapshot_id: "test".into(),
-        };
-        RuntimePhysicalPlan {
-            readout_programs: Default::default(),
-            envelope: envelope.clone(),
-            summary_catalog: None,
-            precompute_plan: asap_types::precompute_plan::PrecomputePlan {
-                summary_catalog: None,
-                envelope: envelope.clone(),
-                ingest: asap_types::precompute_plan::IngestContract {
-                    dataset_identity: None,
-                    protocol: asap_types::precompute_plan::IngestProtocol::ModifiedOtlpMetricsV1,
-                    endpoint_path: "/v1/metrics".into(),
-                    timestamp_unit: asap_types::precompute_plan::TimestampUnit::UnixNanoseconds,
-                    require_plan_identity: true,
-                    require_stored_output_identity: true,
-                    require_registered_producer: true,
-                },
-                schemas: Vec::new(),
-                producers: Vec::new(),
-                executable_dags: Default::default(),
-                materializations: Vec::new(),
-            },
-            transmission_plan: asap_types::producer_plan::TransmissionPlan {
-                summary_catalog: None,
-                envelope: asap_types::precompute_plan::PlanEnvelope {
-                    plan_id,
-                    plan_version,
-                    generated_at_unix_ms: activation_unix_ms,
-                    activation_unix_ms,
-                    expiry_unix_ms,
-                    backend_compat: "asap-query-backend.v1".into(),
-                    planner_revision: control_plane::physical::compiler::PLANNER_REVISION.into(),
-                    capability_snapshot_id: "test".into(),
-                },
-                frame_identity: asap_types::producer_plan::FrameIdentityContract {
-                    identity_version: 1,
-                    sequence_scope:
-                        asap_types::producer_plan::SequenceScope::MaterializationSeriesProducerEpoch,
-                    require_checkpoint_for_full: true,
-                    require_base_checkpoint_for_delta: true,
-                },
-                rules: Vec::new(),
-            },
-            installed_precompute_plan: Arc::new(InstalledPrecomputePlan::new(HashMap::new())),
-            query_plan: Arc::new(asap_types::query_plan::QueryPlan {
-                plan_id,
-                plan_version,
-                clickhouse_context: None,
-                selected_dags: Default::default(),
-                entries: Default::default(),
-            }),
-            storage_routing: Arc::new(crate::storage_engines::types::BackendStorageRouting::empty()),
-        }
-    }
-
-    #[test]
-    fn readout_programs_follow_replaced_query_plan_bindings() {
-        use asap_types::query_plan::*;
-        let entry = |id: u64| QueryPlanEntry {
-            language: asap_types::QueryLanguage::PromQl,
-            query_id: "sum_over_time(m[1m])".into(),
-            canonical_query: "sum_over_time(m[1m])".into(),
-            fixed_evaluation: None,
-            root: QueryNodeId(1),
-            nodes: BTreeMap::from([
-                (
-                    QueryNodeId(0),
-                    QueryPlanNode::ReadMaterialization {
-                        binding: MaterializationBinding {
-                            materialization: asap_types::PolicyFingerprint(id).into(),
-                            stored_output_reference:
-                                asap_types::sds::StoredOutputReference::for_output(
-                                    asap_types::PolicyFingerprint(id).into(),
-                                ),
-                            output_grouping: PhysicalGrouping::PerEntity,
-                            item_labels: vec![],
-                            window_ms: 5000,
-                            pane_origin_ms: Some(0),
-                            readout_lookback_ms: Some(60000),
-                            full_window_slide_ms: None,
-                        },
-                    },
-                ),
-                (
-                    QueryNodeId(1),
-                    QueryPlanNode::ExactReadout {
-                        input: QueryNodeId(0),
-                        readout: ExactReadout::Sum,
-                    },
-                ),
-            ]),
-            instant: InstantExecution {
-                lookback_ms: 60000,
-                full_history: false,
-                cumulative_readout: true,
-            },
-            fallback: FallbackPolicy::ExactBackend,
-        };
-        let mut original = physical_plan(1, 1, 0, None);
-        let first_entry = entry(1);
-        Arc::make_mut(&mut original.query_plan)
-            .entries
-            .insert(first_entry.canonical_query.clone(), first_entry.clone());
-        let first = original
-            .readout_program(&first_entry, first_entry.root)
-            .unwrap();
-        let mut successor = original.clone();
-        let second_entry = entry(2);
-        Arc::make_mut(&mut successor.query_plan)
-            .entries
-            .insert(second_entry.canonical_query.clone(), second_entry.clone());
-        let second = successor
-            .readout_program(&second_entry, second_entry.root)
-            .unwrap();
-        assert_eq!(
-            first.materialization_bindings()[0].materialization,
-            asap_types::PolicyFingerprint(1).into()
-        );
-        assert_eq!(
-            second.materialization_bindings()[0].materialization,
-            asap_types::PolicyFingerprint(2).into()
-        );
-    }
-
-    fn dummy_agg(id: u64) -> PrecomputeMaterialization {
-        PrecomputeMaterialization::new(
-            AggregationType::Sum,
-            String::new(),
-            HashMap::new(),
-            KeyByLabelNames::empty(),
-            KeyByLabelNames::empty(),
-            KeyByLabelNames::empty(),
-            String::new(),
-            60,
-            60,
-            WindowKind::Tumbling,
-            String::new(),
-            format!("metric_{id}"),
-            None,
-            None,
-            None,
-        )
-    }
-
-    /// Build a InstalledPrecomputePlan from a list of marker `id`s. After PR 5
-    /// the map key IS the policy fingerprint, derived from
-    /// `metric_{id}`. We return both the config and the
-    /// dummy-id→fingerprint mapping so the assertions below can look
-    /// up entries.
-    fn cfg_with_ids(ids: &[u64]) -> (InstalledPrecomputePlan, std::collections::HashMap<u64, u64>) {
-        let mut map = HashMap::new();
-        let mut id_to_fp = std::collections::HashMap::new();
-        for &id in ids {
-            let cfg = dummy_agg(id);
-            let fp = cfg.policy_fp_u64();
-            id_to_fp.insert(id, fp);
-            map.insert(fp, cfg);
-        }
-        (InstalledPrecomputePlan::from_raw_ids(map), id_to_fp)
-    }
-
-    #[test]
-    fn snapshot_reflects_initial_config() {
-        let (cfg, id_to_fp) = cfg_with_ids(&[1, 2, 3]);
-        let hr = InstalledPrecomputePlanHandle::new(cfg);
-        let snap = hr.snapshot();
-        assert_eq!(snap.materializations_by_output.len(), 3);
-        assert!(snap
-            .materializations_by_output
-            .contains_key(&asap_types::sds::StoredOutputId(id_to_fp[&2])));
-    }
-
-    #[test]
-    fn swap_replaces_config_atomically() {
-        let (cfg1, id_to_fp1) = cfg_with_ids(&[1, 2]);
-        let (cfg2, id_to_fp2) = cfg_with_ids(&[3, 4, 5]);
-        let hr = InstalledPrecomputePlanHandle::new(cfg1);
-        let old = hr.swap(cfg2);
-        // Old snapshot still reflects pre-swap contents.
-        assert_eq!(old.materializations_by_output.len(), 2);
-        assert!(old
-            .materializations_by_output
-            .contains_key(&asap_types::sds::StoredOutputId(id_to_fp1[&1])));
-        // New snapshot reflects post-swap contents.
-        let new_snap = hr.snapshot();
-        assert_eq!(new_snap.materializations_by_output.len(), 3);
-        assert!(new_snap
-            .materializations_by_output
-            .contains_key(&asap_types::sds::StoredOutputId(id_to_fp2[&5])));
-        assert!(!new_snap
-            .materializations_by_output
-            .contains_key(&asap_types::sds::StoredOutputId(id_to_fp1[&1])));
-    }
-
-    #[test]
-    fn clones_share_underlying_swap() {
-        let (cfg1, _) = cfg_with_ids(&[1]);
-        let (cfg2, id_to_fp2) = cfg_with_ids(&[2, 3]);
-        let hr = InstalledPrecomputePlanHandle::new(cfg1);
-        let hr_clone = hr.clone();
-        hr.swap(cfg2);
-        // The clone sees the swap because both handles share the
-        // same ArcSwap inside.
-        let snap = hr_clone.snapshot();
-        assert_eq!(snap.materializations_by_output.len(), 2);
-        assert!(snap
-            .materializations_by_output
-            .contains_key(&asap_types::sds::StoredOutputId(id_to_fp2[&3])));
-    }
-
-    #[test]
-    fn concurrent_readers_see_consistent_snapshot() {
-        let (cfg1, _) = cfg_with_ids(&[1, 2]);
-        let hr = InstalledPrecomputePlanHandle::new(cfg1);
-        let hr_writer = hr.clone();
-        let writer = thread::spawn(move || {
-            for i in 0..50 {
-                let (c, _) = cfg_with_ids(&[i, i + 1, i + 2]);
-                hr_writer.swap(c);
-            }
-        });
-        let hr_reader = hr.clone();
-        let reader = thread::spawn(move || {
-            for _ in 0..200 {
-                let snap = hr_reader.snapshot();
-                // Under race, the snapshot must be internally
-                // consistent — either 2 entries (original) or 3
-                // (post-swap). Never a torn state.
-                let n = snap.materializations_by_output.len();
-                assert!(n == 2 || n == 3, "torn snapshot: {n} entries");
-            }
-        });
-        writer.join().unwrap();
-        reader.join().unwrap();
-    }
-
-    #[test]
-    fn physical_plan_stages_activates_drains_and_retires() {
-        let active = ActivePhysicalPlanHandle::new(physical_plan(7, 1, 100, None));
-        let lifecycle = PhysicalPlanLifecycle::new(active.clone());
-        lifecycle
-            .stage(physical_plan(7, 2, 200, Some(500)), 150)
-            .unwrap();
-
-        assert_eq!(active.active_snapshot().plan_version(), 1);
-        assert!(matches!(
-            lifecycle.activate(7, 2, 199),
-            Err(PhysicalPlanLifecycleError::ActivationNotReached { .. })
-        ));
-        let old = lifecycle.activate(7, 2, 200).unwrap();
-        assert_eq!(old.plan_version(), 1);
-        assert_eq!(active.active_snapshot().plan_version(), 2);
-
-        let statuses = lifecycle.statuses();
-        assert_eq!(statuses.len(), 2);
-        assert_eq!(statuses[0].phase, PhysicalPlanPhase::Draining);
-        assert_eq!(statuses[1].phase, PhysicalPlanPhase::Active);
-        lifecycle.mark_drained_plan_retired(7, 1);
-        assert_eq!(lifecycle.statuses()[0].phase, PhysicalPlanPhase::Retired);
-    }
-
-    #[test]
-    fn failed_activation_preparation_keeps_active_and_staged_generations() {
-        let active = ActivePhysicalPlanHandle::new(physical_plan(7, 1, 100, None));
-        let held_reader = active.active_snapshot();
-        let lifecycle = PhysicalPlanLifecycle::new(active.clone());
-        lifecycle
-            .stage(physical_plan(7, 2, 200, None), 150)
-            .unwrap();
-
-        let error = lifecycle
-            .activate_with_prepare(7, 2, 200, |_| Err("catalog rejected"))
-            .unwrap_err();
-        assert_eq!(
-            error,
-            PhysicalPlanLifecycleError::Prepare("catalog rejected".into())
-        );
-        assert_eq!(active.active_snapshot().plan_version(), 1);
-        assert_eq!(held_reader.plan_version(), 1);
-        assert!(lifecycle.statuses().iter().any(|status| {
-            status.plan_version == 2 && status.phase == PhysicalPlanPhase::Staged
-        }));
-
-        lifecycle
-            .activate_with_prepare(7, 2, 200, |_| Ok::<(), String>(()))
-            .unwrap();
-        assert_eq!(active.active_snapshot().plan_version(), 2);
-    }
-
-    // Failed publication releases only its staging slot; active readers remain valid.
-    #[test]
-    fn discard_staged_allows_retry_and_never_discards_active() {
-        let active = ActivePhysicalPlanHandle::new(physical_plan(7, 1, 100, None));
-        let held_reader = active.active_snapshot();
-        let lifecycle = PhysicalPlanLifecycle::new(active.clone());
-        lifecycle
-            .stage(physical_plan(7, 2, 200, None), 150)
-            .unwrap();
-        lifecycle.discard_staged(7, 2).unwrap();
-        lifecycle
-            .stage(physical_plan(7, 2, 300, None), 250)
-            .unwrap();
-        lifecycle.activate(7, 2, 300).unwrap();
-        assert!(lifecycle.discard_staged(7, 2).is_err());
-        assert_eq!(active.active_snapshot().plan_version(), 2);
-        assert_eq!(held_reader.plan_version(), 1);
-    }
-
-    #[test]
-    fn materialization_readiness_is_generation_scoped_and_monotonic() {
-        let active = ActivePhysicalPlanHandle::new(physical_plan(7, 1, 100, None));
-        let fingerprint = asap_types::PolicyFingerprint(41);
-        active.readiness.lock().unwrap().statuses.insert(
-            fingerprint,
-            MaterializationStatus {
-                plan_id: 7,
-                plan_version: 1,
-                materialization: fingerprint.0,
-                phase: MaterializationPhase::Materializing,
-                coverage_start_unix_ms: None,
-                coverage_end_unix_ms: None,
-            },
-        );
-
-        assert!(active.mark_ready(7, 1, &[fingerprint], (100, 200)));
-        assert!(active.mark_serving(7, 1, &[fingerprint], (100, 300)));
-        assert!(active.mark_materializing(7, 1, &[fingerprint], Some((200, 250))));
-        let status = active.materialization_statuses().pop().unwrap();
-        assert_eq!(status.phase, MaterializationPhase::Serving);
-        assert_eq!(status.coverage_start_unix_ms, Some(100));
-        assert_eq!(status.coverage_end_unix_ms, Some(300));
-
-        assert!(!active.mark_ready(7, 2, &[fingerprint], (100, 400)));
-        assert_eq!(
-            active.materialization_statuses()[0].coverage_end_unix_ms,
-            Some(300)
-        );
-    }
-
-    #[test]
-    fn physical_plan_rejects_stale_and_expired_generations() {
-        let active = ActivePhysicalPlanHandle::new(physical_plan(7, 2, 100, None));
-        let lifecycle = PhysicalPlanLifecycle::new(active);
-        assert!(matches!(
-            lifecycle.stage(physical_plan(7, 1, 100, None), 150),
-            Err(PhysicalPlanLifecycleError::StaleVersion { .. })
-        ));
-        assert!(matches!(
-            lifecycle.stage(physical_plan(8, 1, 100, Some(150)), 150),
-            Err(PhysicalPlanLifecycleError::Expired { .. })
-        ));
-    }
-
-    #[test]
-    fn activation_rechecks_version_and_cannot_downgrade_across_plan_ids() {
-        let active = ActivePhysicalPlanHandle::new(physical_plan(7, 1, 100, None));
-        let lifecycle = PhysicalPlanLifecycle::new(active.clone());
-        lifecycle
-            .stage(physical_plan(8, 3, 100, None), 100)
-            .unwrap();
-        lifecycle
-            .stage(physical_plan(9, 2, 100, None), 100)
-            .unwrap();
-        lifecycle.activate(8, 3, 100).unwrap();
-
-        assert!(matches!(
-            lifecycle.activate(9, 2, 100),
-            Err(PhysicalPlanLifecycleError::StaleVersion {
-                incoming: 2,
-                active: 3,
-                ..
-            })
-        ));
-        assert_eq!(active.active_snapshot().plan_version(), 3);
-    }
-}
diff --git a/data_plane/src/storage_engines/types/installed_precompute_plan.rs b/data_plane/src/storage_engines/types/installed_precompute_plan.rs
deleted file mode 100644
index 1ec253024..000000000
--- a/data_plane/src/storage_engines/types/installed_precompute_plan.rs
+++ /dev/null
@@ -1,185 +0,0 @@
-//! Internal execution indexes derived exclusively from a validated DAG plan.
-use anyhow::Result;
-use std::collections::HashMap;
-use std::ops::Index;
-
-use super::storage_backend::StorageBackend;
-use asap_types::sds::StoredOutputId;
-use asap_types::{PolicyRegistry, PrecomputeMaterialization};
-
-#[derive(Debug, Clone)]
-pub struct InstalledPrecomputePlan {
-    pub(crate) partitioning: crate::precompute_engine::partitioning::DagPartitioning,
-    pub(crate) raw_programs:
-        HashMap<u64, std::sync::Arc<crate::precompute_engine::raw_dag::RawDagProgram>>,
-    pub(crate) precompute_plan: Option<asap_types::precompute_plan::PrecomputePlan>,
-    pub(crate) materializations_by_output: HashMap<StoredOutputId, PrecomputeMaterialization>,
-    pub(crate) storage_backend: StorageBackend,
-}
-
-impl InstalledPrecomputePlan {
-    fn derived_view(materializations: HashMap<StoredOutputId, PrecomputeMaterialization>) -> Self {
-        Self {
-            partitioning: Default::default(),
-            raw_programs: HashMap::new(),
-            precompute_plan: None,
-            materializations_by_output: materializations,
-            storage_backend: StorageBackend::default(),
-        }
-    }
-
-    /// Production construction always validates the executable DAG and bindings.
-    pub fn from_precompute_plan(plan: asap_types::precompute_plan::PrecomputePlan) -> Result<Self> {
-        let materializations = plan.runtime_materializations()?;
-        let mut programs = HashMap::new();
-        for config in materializations.values().filter(|config| {
-            config.derived_input.is_none()
-                && plan.ingest.protocol
-                    == asap_types::precompute_plan::IngestProtocol::PrometheusRemoteWriteV1
-        }) {
-            let program =
-                crate::precompute_engine::raw_dag::RawDagProgram::from_plan(&plan, config)
-                    .map_err(anyhow::Error::msg)?;
-            programs.insert(config.policy_fp_u64(), std::sync::Arc::new(program));
-        }
-        let mut view = Self::derived_view(materializations);
-        view.partitioning =
-            crate::precompute_engine::partitioning::DagPartitioning::from_plan(&plan);
-        view.precompute_plan = Some(plan);
-        view.raw_programs = programs;
-        Ok(view)
-    }
-
-    // Isolated kernel/storage fixtures can omit a physical installation. This
-    // constructor is absent from the production library and binary.
-    #[cfg(test)]
-    pub fn new(materializations: HashMap<StoredOutputId, PrecomputeMaterialization>) -> Self {
-        Self::derived_view(materializations)
-    }
-
-    /// Fixtures hold raw output ids, so say that once here rather than
-    /// wrapping every literal. Production construction goes through
-    /// `from_precompute_plan`, which takes the ids from the plan itself.
-    #[cfg(test)]
-    pub fn from_raw_ids(materializations: HashMap<u64, PrecomputeMaterialization>) -> Self {
-        Self::new(
-            materializations
-                .into_iter()
-                .map(|(id, value)| (StoredOutputId(id), value))
-                .collect(),
-        )
-    }
-
-    #[cfg(test)]
-    pub fn with_storage_backend(
-        materializations: HashMap<StoredOutputId, PrecomputeMaterialization>,
-        storage_backend: StorageBackend,
-    ) -> Self {
-        let mut view = Self::derived_view(materializations);
-        view.storage_backend = storage_backend;
-        view
-    }
-
-    pub fn stored_output_reference(
-        &self,
-        definition: asap_types::sds::StoredOutputId,
-    ) -> Option<asap_types::sds::StoredOutputReference> {
-        let selected = self.precompute_plan.as_ref().and_then(|plan| {
-            plan.schemas
-                .iter()
-                .find(|schema| schema.materialization == definition)
-                .map(|schema| schema.stored_output_reference.clone())
-        });
-        #[cfg(test)]
-        let selected = selected.or_else(|| {
-            let materializations = self
-                .materializations_by_output
-                .values()
-                .cloned()
-                .collect::<Vec<_>>();
-            asap_types::summary_catalog::SummaryCatalog::from_materializations(
-                0,
-                0,
-                &materializations,
-            )
-            .ok()?
-            .output_reference(definition)
-            .ok()
-        });
-        selected
-    }
-
-    pub fn plan(&self) -> &asap_types::precompute_plan::PrecomputePlan {
-        self.precompute_plan
-            .as_ref()
-            .expect("installed plan has an authoritative source")
-    }
-
-    pub fn storage_backend(&self) -> StorageBackend {
-        self.storage_backend
-    }
-
-    pub fn get_aggregation_config(
-        &self,
-        output: StoredOutputId,
-    ) -> Option<&PrecomputeMaterialization> {
-        self.materializations_by_output.get(&output)
-    }
-
-    pub fn materializations(&self) -> &HashMap<StoredOutputId, PrecomputeMaterialization> {
-        &self.materializations_by_output
-    }
-
-    pub fn contains(&self, output: StoredOutputId) -> bool {
-        self.materializations_by_output.contains_key(&output)
-    }
-
-    pub fn policy_registry(&self) -> PolicyRegistry {
-        PolicyRegistry::from_configs(self.materializations_by_output.values().cloned())
-    }
-}
-
-impl Index<StoredOutputId> for InstalledPrecomputePlan {
-    type Output = PrecomputeMaterialization;
-    fn index(&self, output: StoredOutputId) -> &Self::Output {
-        &self.materializations_by_output[&output]
-    }
-}
-
-impl Default for InstalledPrecomputePlan {
-    fn default() -> Self {
-        use control_plane::physical::compiler::{
-            PlanEnvelope, PrecomputePlan, BACKEND_COMPAT, PLANNER_REVISION,
-        };
-        let envelope = PlanEnvelope {
-            plan_id: 0,
-            plan_version: 0,
-            generated_at_unix_ms: 0,
-            activation_unix_ms: 0,
-            expiry_unix_ms: None,
-            backend_compat: BACKEND_COMPAT.into(),
-            planner_revision: PLANNER_REVISION.into(),
-            capability_snapshot_id: "empty-installation".into(),
-        };
-        Self::from_precompute_plan(
-            PrecomputePlan::build(envelope, vec![], &[]).expect("valid empty plan"),
-        )
-        .expect("valid empty installation")
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    // Flat lists cannot enter through the authoritative physical-plan document.
-    #[test]
-    fn rejects_flat_aggregation_documents() {
-        for text in [r#"{"aggregation_configs":{}}"#, "aggregations: []"] {
-            assert!(
-                serde_yaml::from_str::<asap_types::plan_publication::PhysicalPlanInstallRequest>(
-                    text
-                )
-                .is_err()
-            );
-        }
-    }
-}
diff --git a/data_plane/src/storage_engines/types/mod.rs b/data_plane/src/storage_engines/types/mod.rs
deleted file mode 100644
index f126e0db2..000000000
--- a/data_plane/src/storage_engines/types/mod.rs
+++ /dev/null
@@ -1,33 +0,0 @@
-//! Data types used by the storage layer (and consumed cross-module
-//! by `drivers/`, `precompute_engine/`, `query_engines/`).
-//!
-//! Renamed from `stores/schema/` in the 2026-05 reorg to avoid the
-//! name-clash with `stores/sketch_db/schema/` (per-`agg_id` schema
-//! lifecycle, a different concern). Tiny `pub use asap_types::X`
-//! shim files were dropped; import directly from `asap_types`.
-
-pub mod enums;
-pub mod hot_reload_config;
-pub mod installed_precompute_plan;
-pub mod precomputed_output;
-pub mod storage_backend;
-
-pub use enums::*;
-pub use hot_reload_config::*;
-pub use installed_precompute_plan::*;
-pub use precomputed_output::*;
-pub use storage_backend::*;
-
-// Cross-module re-export of asap_types data types so callers can
-// write `crate::storage_engines::types::PrecomputeMaterialization` instead of
-// reaching across crates.
-pub use asap_types::aggregation_config::*;
-
-// Re-export the query-side routing surface so existing call sites
-// like `crate::storage_engines::types::BackendStorageRouting` keep compiling.
-pub use crate::query_engines::routing::{
-    classify_query_shape, BackendStorageRouting, HotReloadBackendStorageRouting,
-    QueryOperatorShape, RoutingTarget,
-};
-
-pub use asap_physical_operators::{traits::*, KeyByLabelValues, Measurement};
diff --git a/data_plane/src/storage_engines/types/precomputed_output.rs b/data_plane/src/storage_engines/types/precomputed_output.rs
deleted file mode 100644
index 8644f37da..000000000
--- a/data_plane/src/storage_engines/types/precomputed_output.rs
+++ /dev/null
@@ -1,203 +0,0 @@
-use asap_types::PolicyFingerprint;
-use serde::{Deserialize, Serialize};
-use std::collections::BTreeMap;
-
-use crate::storage_engines::types::KeyByLabelValues;
-
-/// Provenance tag stamped on every `PrecomputedOutput`: did this
-/// window come from live ingest or was it materialised by a backfill
-/// job?
-///
-/// `Native` is the default (records without the field deserialise as
-/// `Native` via `#[serde(default)]`), so the tag is forward-compatible
-/// with older on-disk formats.
-///
-/// Read-side consumers (HTTP listing of backfilled windows, coverage
-/// UI, audit logs) belong to the backfill subsystem under
-/// [`crate::storage_engines::sketch_db::backfill`]; today this field is
-/// written but no production read site branches on it yet. Recording
-/// it eagerly means a window written before the read-side consumer
-/// lands still carries its `job_id` — readers can recover history,
-/// not just future.
-#[derive(Debug, Clone, Default, Serialize, Deserialize, PartialEq, Eq)]
-pub enum Origin {
-    /// Emitted by the live ingest pipeline (the
-    /// `PrecomputeEngine` workers closing a window). The common case.
-    #[default]
-    Native,
-    /// Materialised by a backfill job. The tag carries the `job_id`
-    /// so operators can trace back to the specific REFRESH run that
-    /// produced this window (`GET /api/v1/db/backfill/jobs/:id`).
-    Backfilled { job_id: u64 },
-}
-
-/// Proof of which accepted input revision a window includes.
-#[derive(Debug, Clone)]
-pub struct SummaryInputRevision {
-    pub generation: std::sync::Arc<asap_types::sds::CatalogGeneration>,
-    pub revision: u64,
-    pub first_revision: u64,
-}
-
-#[derive(Debug, Clone, Serialize, Deserialize)]
-pub struct PrecomputedOutput {
-    /// Physical lifetime chosen before execution; never re-resolve a queued
-    /// fragment against a newer logical-series mapping.
-    #[serde(skip)]
-    pub storage_handle: Option<u64>,
-    #[serde(skip)]
-    pub stored_output_reference: Option<asap_types::sds::StoredOutputReference>,
-    #[serde(skip)]
-    pub catalog_generation: Option<std::sync::Arc<asap_types::sds::CatalogGeneration>>,
-    #[serde(skip)]
-    pub input_revision: Option<std::sync::Arc<SummaryInputRevision>>,
-    pub start_timestamp: u64,
-    pub end_timestamp: u64,
-    pub key: Option<KeyByLabelValues>,
-    /// Full source-series population identity for per-entity SDS instances.
-    /// Grouping-only summaries leave this absent and use `key`.
-    #[serde(default)]
-    pub population_labels: Option<BTreeMap<String, String>>,
-    /// Provenance tag. `#[serde(default)]` on read means records
-    /// without the field deserialise as `Native`, preserving
-    /// forward-compat with older on-disk payloads.
-    #[serde(default)]
-    pub origin: Origin,
-    /// Content-addressed policy identity. The data plane's only handle
-    /// on which source `PrecomputeMaterialization` produced this output.
-    /// `#[serde(default)]` on read preserves forward-compat with
-    /// PR-3 / PR-4-era records that may not have carried the field;
-    /// sinks treat `PolicyFingerprint::UNSET` as "skip this output"
-    /// (matches the raw-mode fast path where no source config exists).
-    #[serde(default)]
-    pub policy_fp: PolicyFingerprint,
-}
-
-impl PrecomputedOutput {
-    /// Construct a `Native` precompute.
-    ///
-    /// `policy_fp` is the content-addressed handle on the source
-    /// [`asap_types::PrecomputeMaterialization`]; sinks use it to look up the
-    /// config via `PolicyRegistry::get(policy_fp)`. Construction sites
-    /// that lack a source config (raw-mode fast-path) pass
-    /// [`PolicyFingerprint::UNSET`]; sinks then skip the output.
-    pub fn new(
-        start_timestamp: u64,
-        end_timestamp: u64,
-        key: Option<KeyByLabelValues>,
-        policy_fp: PolicyFingerprint,
-    ) -> Self {
-        Self {
-            storage_handle: None,
-            stored_output_reference: None,
-            catalog_generation: None,
-            input_revision: None,
-            start_timestamp,
-            end_timestamp,
-            key,
-            population_labels: None,
-            origin: Origin::Native,
-            policy_fp,
-        }
-    }
-
-    pub fn with_population_labels(mut self, labels: Option<BTreeMap<String, String>>) -> Self {
-        self.population_labels = labels;
-        self
-    }
-
-    /// Construct a `Backfilled { job_id }` precompute. Called by
-    /// [`crate::storage_engines::sketch_db::backfill::processor::BackfillWindowProcessor`]
-    /// so each backfilled window carries its provenance back to the
-    /// originating `BackfillJob`.
-    pub fn new_backfilled(
-        start_timestamp: u64,
-        end_timestamp: u64,
-        key: Option<KeyByLabelValues>,
-        job_id: u64,
-        policy_fp: PolicyFingerprint,
-    ) -> Self {
-        Self {
-            storage_handle: None,
-            stored_output_reference: None,
-            catalog_generation: None,
-            input_revision: None,
-            start_timestamp,
-            end_timestamp,
-            key,
-            population_labels: None,
-            origin: Origin::Backfilled { job_id },
-            policy_fp,
-        }
-    }
-}
-
-// ─── Origin tag tests ─────────────────────────────────────────────
-
-#[cfg(test)]
-mod origin_tests {
-    use super::*;
-
-    #[test]
-    fn default_origin_is_native() {
-        assert_eq!(Origin::default(), Origin::Native);
-    }
-
-    #[test]
-    fn new_constructor_produces_native_origin() {
-        let out = PrecomputedOutput::new(0, 100, None, PolicyFingerprint(1));
-        assert_eq!(out.origin, Origin::Native);
-    }
-
-    #[test]
-    fn new_backfilled_constructor_carries_job_id() {
-        let out = PrecomputedOutput::new_backfilled(0, 100, None, 42, PolicyFingerprint(1));
-        assert_eq!(out.origin, Origin::Backfilled { job_id: 42 });
-    }
-
-    #[test]
-    fn serde_roundtrip_preserves_native() {
-        let out = PrecomputedOutput::new(10, 20, None, PolicyFingerprint(7));
-        let json = serde_json::to_string(&out).unwrap();
-        let back: PrecomputedOutput = serde_json::from_str(&json).unwrap();
-        assert_eq!(back.origin, Origin::Native);
-        assert_eq!(back.policy_fp, PolicyFingerprint(7));
-    }
-
-    #[test]
-    fn serde_roundtrip_preserves_backfilled_job_id() {
-        let out = PrecomputedOutput::new_backfilled(10, 20, None, 99, PolicyFingerprint(7));
-        let json = serde_json::to_string(&out).unwrap();
-        let back: PrecomputedOutput = serde_json::from_str(&json).unwrap();
-        assert_eq!(back.origin, Origin::Backfilled { job_id: 99 });
-        assert_eq!(back.policy_fp, PolicyFingerprint(7));
-    }
-
-    /// Forward-compat guard: pre-this-PR records lack the `policy_fp`
-    /// field and may still carry the retired `aggregation_id` field;
-    /// `#[serde(default)]` on `policy_fp` + serde's
-    /// ignore-unknown-fields default means such records deserialise
-    /// with `policy_fp = UNSET`. Sinks treat that as "skip" — same
-    /// behaviour as the raw-mode path that never had a source config.
-    #[test]
-    fn old_serialized_record_without_policy_fp_deserialises_as_unset() {
-        let old_json = r#"{
-            "start_timestamp": 100,
-            "end_timestamp": 200,
-            "key": null,
-            "aggregation_id": 3
-        }"#;
-        let out: PrecomputedOutput = serde_json::from_str(old_json).unwrap();
-        assert_eq!(out.origin, Origin::Native);
-        assert!(out.policy_fp.is_unset());
-    }
-
-    #[test]
-    fn origin_variants_are_not_equal() {
-        assert_ne!(Origin::Native, Origin::Backfilled { job_id: 1 });
-        assert_ne!(
-            Origin::Backfilled { job_id: 1 },
-            Origin::Backfilled { job_id: 2 }
-        );
-    }
-}
diff --git a/data_plane/src/storage_engines/types/storage_backend.rs b/data_plane/src/storage_engines/types/storage_backend.rs
deleted file mode 100644
index 6d9618890..000000000
--- a/data_plane/src/storage_engines/types/storage_backend.rs
+++ /dev/null
@@ -1,4 +0,0 @@
-//! Compatibility re-export for the backend-owned storage vocabulary shared by
-//! control-plane emission and data-plane routing.
-
-pub use asap_types::storage_backend::*;
diff --git a/data_plane/src/tests/accumulator_fixture.rs b/data_plane/src/tests/accumulator_fixture.rs
deleted file mode 100644
index e8346cba4..000000000
--- a/data_plane/src/tests/accumulator_fixture.rs
+++ /dev/null
@@ -1,265 +0,0 @@
-//! Config fixtures for backend integration tests; production binds Planner payloads.
-use asap_physical_operators::factory::*;
-use asap_physical_operators::{AggregateCore, AggregationType};
-use asap_types::{accumulator_spec::cms_params, PrecomputeMaterialization};
-use planner_types::post_asap::{ExactKind, SketchAlgorithm, SketchParams, SummaryFamilyType};
-#[cfg(test)]
-/// Return `true` if `config` produces a keyed (MultipleSubpopulation) updater,
-/// without allocating an updater object.
-///
-/// **Contract:** this must agree with every concrete `AccumulatorUpdater::is_keyed()`
-/// implementation. When a new accumulator type is added, update both here and
-/// in the corresponding struct.
-pub fn config_is_keyed(config: &PrecomputeMaterialization) -> bool {
-    config
-        .accumulator_spec()
-        .expect("valid fixture")
-        .grouping
-        .is_some()
-}
-
-/// Top-k ranking quantity, selected by `weight_mode` or its alias `topk_weight`.
-///
-/// * `value` / `sum`: sum values per key (default).
-/// * `count` / `frequency` / `freq`: count occurrences per key.
-#[cfg(test)]
-fn topk_weight_param(config: &PrecomputeMaterialization) -> TopkWeight {
-    match config.sample_update_rule() {
-        asap_types::SampleUpdateRule::Count => TopkWeight::Count,
-        asap_types::SampleUpdateRule::Value { .. }
-        | asap_types::SampleUpdateRule::CounterDelta { .. } => TopkWeight::Value,
-    }
-}
-
-// ---------------------------------------------------------------------------
-// Factory function
-// ---------------------------------------------------------------------------
-
-/// Read the KLL `k` out of `SketchParams::Kll`. `accumulator_spec()`
-/// always builds a `SketchKind` whose `SketchAlgorithm::Kll` is paired with
-/// `SketchParams::Kll`, so the
-/// other arm is unreachable from a `spec` this module builds itself.
-#[cfg(test)]
-fn kll_k(params: &SketchParams) -> u16 {
-    match params {
-        // Lossless: `accumulator_spec()` only ever stores a value that
-        // already fit in `u16` (via `kll_k_param`'s own `u16::try_from`
-        // fallback) widened to `u32`.
-        SketchParams::Kll { k } => *k as u16,
-        other => unreachable!(
-            "accumulator_spec() paired SketchAlgorithm::Kll with non-Kll params: {other:?}"
-        ),
-    }
-}
-
-/// Read `(rows = depth, columns = width)` out of `SketchParams::Cms` or `::CountSketch`
-/// — same shape, different variant per bare-sketch identity.
-fn cms_dims(params: &SketchParams) -> (usize, usize) {
-    match params {
-        SketchParams::Cms { width, depth } | SketchParams::CountSketch { width, depth } => {
-            (*depth as usize, *width as usize)
-        }
-        other => unreachable!(
-            "accumulator_spec() paired SketchAlgorithm::Cms/CountSketch with unexpected params: {other:?}"
-        ),
-    }
-}
-
-/// Read `(rows = depth, columns = width, heap_size)` out of `SketchParams::CmsWithHeap`
-/// or `::CountSketchWithHeap`.
-fn cms_heap_dims(params: &SketchParams) -> (usize, usize, usize) {
-    match params {
-        SketchParams::CmsWithHeap {
-            width,
-            depth,
-            heap_size,
-        }
-        | SketchParams::CountSketchWithHeap {
-            width,
-            depth,
-            heap_size,
-        } => (*depth as usize, *width as usize, *heap_size as usize),
-        other => unreachable!(
-            "accumulator_spec() paired a WithHeap SketchAlgorithm with unexpected params: {other:?}"
-        ),
-    }
-}
-
-/// Read the DDSketch relative-accuracy `alpha` out of `SketchParams::DDSketch`.
-#[cfg(test)]
-fn ddsketch_alpha(params: &SketchParams) -> f64 {
-    match params {
-        SketchParams::DDSketch { alpha } => *alpha,
-        other => unreachable!(
-            "accumulator_spec() paired SketchAlgorithm::DDSketch with non-DDSketch params: {other:?}"
-        ),
-    }
-}
-
-/// Construct isolated payload fixtures for kernel/storage unit tests.
-/// Production execution requires a validated Planner DAG program.
-#[cfg(test)]
-pub fn create_fixture_accumulator(
-    config: &PrecomputeMaterialization,
-) -> Box<dyn AccumulatorUpdater> {
-    let spec = config
-        .accumulator_spec()
-        .expect("invalid isolated kernel fixture");
-
-    let keyed = spec.grouping.is_some();
-
-    match (&spec.family, keyed) {
-        (SummaryFamilyType::ExactAggregate(ExactKind::Sum | ExactKind::Count, _), false) => {
-            Box::new(SumAccumulatorUpdater::new())
-        }
-        (SummaryFamilyType::ExactAggregate(ExactKind::Sum, _), true) => {
-            Box::new(KeyedSumCountAccumulatorUpdater::for_family(ExactKind::Sum))
-        }
-        (SummaryFamilyType::ExactAggregate(ExactKind::Count, _), true) => Box::new(
-            KeyedSumCountAccumulatorUpdater::for_family(ExactKind::Count),
-        ),
-
-        // Direction comes off the family itself now. It used to be read
-        // back out of `aggregation_sub_type` because Planner had one
-        // `MinMax` accumulator for both directions, which meant a config
-        // whose sub_type was lost or misspelled silently built the wrong
-        // extremum.
-        (SummaryFamilyType::ExactAggregate(ExactKind::Min, _), false) => {
-            Box::new(MinAccumulatorUpdater::new())
-        }
-        (SummaryFamilyType::ExactAggregate(ExactKind::Min, _), true) => {
-            Box::new(KeyedMinStateUpdater::new())
-        }
-        (SummaryFamilyType::ExactAggregate(ExactKind::Max, _), false) => {
-            Box::new(MaxAccumulatorUpdater::new())
-        }
-        (SummaryFamilyType::ExactAggregate(ExactKind::Max, _), true) => {
-            Box::new(KeyedMaxStateUpdater::new())
-        }
-
-        (SummaryFamilyType::ExactAggregate(ExactKind::Increase | ExactKind::Rate, _), false) => {
-            Box::new(IncreaseAccumulatorUpdater::new())
-        }
-        (SummaryFamilyType::ExactAggregate(ExactKind::Increase | ExactKind::Rate, _), true) => {
-            Box::new(KeyedCounterStateUpdater::new())
-        }
-
-        (SummaryFamilyType::Sketch(kind, _), false)
-            if kind.algorithm() == &SketchAlgorithm::Kll =>
-        {
-            Box::new(KllAccumulatorUpdater::new(kll_k(kind.params())))
-        }
-        // HydraKLL: `k` comes off the typed params like the unkeyed case,
-        // but the `(row, col)` tiling grid has no `SketchParams::Kll`
-        // field to live in (see `asap_types::accumulator_spec`'s module
-        // doc) — read it the same way bare CMS does, via `cms_params`.
-        (SummaryFamilyType::Sketch(kind, _), true) if kind.algorithm() == &SketchAlgorithm::Kll => {
-            let (row_num, col_num) = cms_params(config);
-            Box::new(HydraKllAccumulatorUpdater::new(
-                row_num,
-                col_num,
-                kll_k(kind.params()),
-            ))
-        }
-
-        // Bare CMS: point-frequency only, min-of-rows estimator. `keyed=false`
-        // can't actually arise here today (no `AggregationType` resolves to
-        // bare Cms unkeyed — see accumulator_spec.rs), matched anyway as a
-        // safe default.
-        (SummaryFamilyType::Sketch(kind, _), _) if kind.algorithm() == &SketchAlgorithm::Cms => {
-            let (row_num, col_num) = cms_dims(kind.params());
-            Box::new(CmsAccumulatorUpdater::new(row_num, col_num))
-        }
-
-        // CountSketch uses the median-of-signed-rows estimator.
-        (SummaryFamilyType::Sketch(kind, _), _)
-            if kind.algorithm() == &SketchAlgorithm::CountSketch =>
-        {
-            let (row_num, col_num) = cms_dims(kind.params());
-            Box::new(CountSketchAccumulatorUpdater::new(row_num, col_num))
-        }
-
-        // Heap-bearing top-k variant (raw-input ingest path): route to the
-        // real `CmsHeapAccumulatorUpdater` so the per-policy top-k heap is
-        // BUILT (heap-less CMS could not answer `topk(...)` — recall 0).
-        // Keyed by the configured group-by `aggregated_labels` (e.g. `host`),
-        // ranked by Σ value per key by default (`weight_mode: value`), or Σ
-        // count for genuine frequency-top-k (`weight_mode: count`). The OTLP
-        // modified-sketch path builds the heap agent-side and uses
-        // `SketchEnvelope` ingest, not this raw arm.
-        (SummaryFamilyType::Sketch(kind, _), _)
-            if kind.algorithm() == &SketchAlgorithm::CmsWithHeap =>
-        {
-            let (row_num, col_num, heap_size) = cms_heap_dims(kind.params());
-            Box::new(CmsHeapAccumulatorUpdater::new(
-                row_num,
-                col_num,
-                heap_size,
-                topk_weight_param(config),
-            ))
-        }
-
-        // Heap-bearing CountSketch retains CountSketch estimation semantics.
-        (SummaryFamilyType::Sketch(kind, _), _)
-            if kind.algorithm() == &SketchAlgorithm::CountSketchWithHeap =>
-        {
-            let (row_num, col_num, heap_size) = cms_heap_dims(kind.params());
-            Box::new(CountSketchWithHeapAccumulatorUpdater::new(
-                row_num,
-                col_num,
-                heap_size,
-                topk_weight_param(config),
-            ))
-        }
-
-        (SummaryFamilyType::Sketch(kind, _), _)
-            if kind.algorithm() == &SketchAlgorithm::DDSketch =>
-        {
-            Box::new(DDSketchAccumulatorUpdater::new(ddsketch_alpha(
-                kind.params(),
-            )))
-        }
-
-        (SummaryFamilyType::Sketch(kind, _), false)
-            if kind.algorithm() == &SketchAlgorithm::UnivMon =>
-        {
-            let SketchParams::UnivMon {
-                heap_size,
-                sketch_rows,
-                sketch_cols,
-                layers,
-            } = kind.params()
-            else {
-                unreachable!("validated UnivMon family parameters")
-            };
-            asap_physical_operators::factory::create_planner_accumulator(
-                &spec.family,
-                &planner_types::post_asap::SummaryUpdate::column(
-                    planner_types::pre_asap::ColumnRef::SampleValue,
-                ),
-                &Default::default(),
-            )
-            .unwrap()
-        }
-
-        (SummaryFamilyType::Sketch(kind, _), false)
-            if kind.algorithm() == &SketchAlgorithm::Hll =>
-        {
-            let SketchParams::Hll { precision } = kind.params() else {
-                unreachable!("validated HLL family parameters")
-            };
-            asap_physical_operators::factory::create_planner_accumulator(
-                &spec.family,
-                &planner_types::post_asap::SummaryUpdate::column(
-                    planner_types::pre_asap::ColumnRef::SampleValue,
-                ),
-                &Default::default(),
-            )
-            .unwrap()
-        }
-
-        (other_family, keyed) => {
-            panic!("unsupported isolated kernel fixture {other_family:?}, keyed={keyed}")
-        }
-    }
-}
diff --git a/data_plane/src/tests/accuracy_empirical_validation_tests.rs b/data_plane/src/tests/accuracy_empirical_validation_tests.rs
deleted file mode 100644
index 21cd2b115..000000000
--- a/data_plane/src/tests/accuracy_empirical_validation_tests.rs
+++ /dev/null
@@ -1,264 +0,0 @@
-//! Paper-artifact checks on the `AccuracyProfile` derivation:
-//!
-//! 1. **Published-constant parity.** For each sketch family, the
-//!    numerical bound at a canonical parameter matches the
-//!    published constant to ≥ 6 decimal places. Regression guard
-//!    against typos in the formula or citation drift.
-//! 2. **Monotonicity across parameter sweeps.** Larger capacity
-//!    parameters (more CMS columns, more HLL bits, larger KLL
-//!    k, tighter DDSketch α) must monotonically tighten the
-//!    theoretical bound. Any non-monotone step would indicate a
-//!    broken formula.
-//!
-//! ### What this test is *not*
-//!
-//! Live "measure sketch error, compare to bound" runs don't
-//! live here — the `asap_sketchlib` git dep the backend pulls
-//! exposes a different API from the
-//! [`sketch-bench`](https://github.com/ProjectASAP/sketch-bench)
-//! workspace's path dep, and bridging the two inside a unit
-//! test pulls in a lot of version-coupling we don't want.
-//! Empirical sweeps are produced by `sketchlib bench
-//! --metrics accuracy` runs in sketch-bench and compared
-//! against `derive` externally; the test
-//! below pins the *theoretical* side that those comparisons
-//! are made against.
-
-#[cfg(test)]
-use std::collections::HashMap;
-
-use asap_types::aggregation_config::PrecomputeMaterialization;
-use asap_types::enums::WindowKind;
-use asap_types::AggregationType;
-use asap_types::KeyByLabelNames;
-use serde_json::{json, Value};
-
-use crate::storage_engines::sketch_db::accuracy::{derive, AccuracyKind};
-
-fn cfg(agg_type: AggregationType, params: HashMap<String, Value>) -> PrecomputeMaterialization {
-    PrecomputeMaterialization::new(
-        agg_type,
-        String::new(),
-        params,
-        KeyByLabelNames::empty(),
-        KeyByLabelNames::empty(),
-        KeyByLabelNames::empty(),
-        String::new(),
-        60,
-        60,
-        WindowKind::Tumbling,
-        String::new(),
-        "m".to_string(),
-        None,
-        None,
-        None,
-    )
-}
-
-// -------- published-constant parity ----------
-
-#[test]
-fn hll_p14_matches_flajolet_1_04_over_sqrt_m() {
-    // Flajolet et al. 2007: std-err = 1.04 / √m, m = 2^p.
-    // For p = 14 → ε = 1.04 / 128 = 0.008125.
-    let mut params = HashMap::new();
-    params.insert("precision".to_string(), json!(14u64));
-    let p = derive(&cfg(AggregationType::HLL, params));
-    assert_eq!(p.kind, AccuracyKind::RelativeCardinality);
-    assert!((p.epsilon - 0.008125).abs() < 1e-9);
-}
-
-#[test]
-fn cms_3x1000_matches_cormode_muthukrishnan_e_over_w() {
-    // Cormode-Muthukrishnan 2005: ε = e/w, δ = exp(-d).
-    // For (w=1000, d=3): ε = e/1000 ≈ 2.71828e-3, δ = exp(-3).
-    let mut params = HashMap::new();
-    params.insert("d".to_string(), json!(3u64));
-    params.insert("w".to_string(), json!(1000u64));
-    let p = derive(&cfg(AggregationType::CountMinSketch, params));
-    assert_eq!(p.kind, AccuracyKind::AdditiveFrequency);
-    assert!((p.epsilon - std::f64::consts::E / 1000.0).abs() < 1e-12);
-    assert!((p.delta.unwrap() - (-3.0_f64).exp()).abs() < 1e-12);
-}
-
-#[test]
-fn count_sketch_4x10000_matches_charikar_one_over_sqrt_w() {
-    // Charikar-Chen-Farach-Colton 2002: ε = 1/√w for signed
-    // counter sketch.
-    let mut params = HashMap::new();
-    params.insert("d".to_string(), json!(4u64));
-    params.insert("w".to_string(), json!(10_000u64));
-    let p = derive(&cfg(AggregationType::CountSketch, params));
-    assert_eq!(p.kind, AccuracyKind::AdditiveFrequency);
-    assert!((p.epsilon - 0.01).abs() < 1e-12);
-}
-
-#[test]
-fn kll_k200_matches_karnin_lang_liberty_2_296() {
-    // Planner uses the DataSketches empirical 99th-percentile KLL rank-error fit.
-    let mut params = HashMap::new();
-    params.insert("K".to_string(), json!(200u64));
-    let p = derive(&cfg(AggregationType::DatasketchesKLL, params));
-    assert_eq!(p.kind, AccuracyKind::RankQuantile);
-    assert!((p.epsilon - 2.296 / 200.0_f64.powf(0.9723)).abs() < 1e-12);
-    assert!((p.delta.unwrap() - 0.01).abs() < 1e-12);
-}
-
-#[test]
-fn ddsketch_alpha_passes_through_verbatim() {
-    // Masson-Rim-Lee VLDB 2019: α is the published relative
-    // quantile-error guarantee and is deterministic.
-    for alpha in [0.005_f64, 0.01, 0.02, 0.05] {
-        let mut params = HashMap::new();
-        params.insert("alpha".to_string(), json!(alpha));
-        let p = derive(&cfg(AggregationType::DDSketch, params));
-        assert_eq!(p.kind, AccuracyKind::RelativeQuantile);
-        assert_eq!(p.epsilon, alpha);
-        assert_eq!(p.delta, Some(0.0));
-    }
-}
-
-#[test]
-fn cms_with_heap_top_k_combines_cms_and_retention_bounds() {
-    // (w=1000, d=3, heap=50): CMS bound e/w ≈ 2.72e-3, heap
-    // bound 1/50 = 0.02. Heap dominates → ε = 0.02.
-    let mut params = HashMap::new();
-    params.insert("d".to_string(), json!(3u64));
-    params.insert("w".to_string(), json!(1000u64));
-    params.insert("heap_size".to_string(), json!(50u64));
-    let p = derive(&cfg(AggregationType::CountMinSketchWithHeap, params));
-    assert_eq!(p.kind, AccuracyKind::TopK);
-    assert!((p.epsilon - 0.02).abs() < 1e-12);
-    assert!((p.delta.unwrap() - (-3.0_f64).exp()).abs() < 1e-12);
-}
-
-// -------- monotonicity ----------
-
-#[test]
-fn hll_epsilon_shrinks_monotonically_with_precision() {
-    let mut last = f64::INFINITY;
-    for p in [8u64, 10, 12, 14, 16] {
-        let mut params = HashMap::new();
-        params.insert("precision".to_string(), json!(p));
-        let eps = derive(&cfg(AggregationType::HLL, params)).epsilon;
-        assert!(
-            eps < last,
-            "HLL ε should tighten as precision grows: p={p} ε={eps} previous={last}"
-        );
-        last = eps;
-    }
-}
-
-#[test]
-fn cms_epsilon_shrinks_monotonically_with_width() {
-    let mut last = f64::INFINITY;
-    for w in [100u64, 500, 2000, 10_000, 100_000] {
-        let mut params = HashMap::new();
-        params.insert("d".to_string(), json!(4u64));
-        params.insert("w".to_string(), json!(w));
-        let eps = derive(&cfg(AggregationType::CountMinSketch, params)).epsilon;
-        assert!(eps < last, "CMS ε at w={w}: {eps} should be < {last}");
-        last = eps;
-    }
-}
-
-#[test]
-fn cms_delta_shrinks_monotonically_with_depth() {
-    let mut last = f64::INFINITY;
-    for d in [2u64, 3, 4, 5, 6, 8] {
-        let mut params = HashMap::new();
-        params.insert("d".to_string(), json!(d));
-        params.insert("w".to_string(), json!(1000u64));
-        let delta = derive(&cfg(AggregationType::CountMinSketch, params))
-            .delta
-            .unwrap();
-        assert!(delta < last, "CMS δ at d={d}: {delta} should be < {last}");
-        last = delta;
-    }
-}
-
-#[test]
-fn countsketch_epsilon_shrinks_monotonically_with_width() {
-    let mut last = f64::INFINITY;
-    for w in [100u64, 500, 2000, 10_000, 100_000] {
-        let mut params = HashMap::new();
-        params.insert("d".to_string(), json!(4u64));
-        params.insert("w".to_string(), json!(w));
-        let eps = derive(&cfg(AggregationType::CountSketch, params)).epsilon;
-        assert!(
-            eps < last,
-            "CountSketch ε at w={w}: {eps} should be < {last}"
-        );
-        last = eps;
-    }
-}
-
-#[test]
-fn kll_epsilon_shrinks_monotonically_with_k() {
-    let mut last = f64::INFINITY;
-    for k in [50u64, 100, 200, 500, 1000] {
-        let mut params = HashMap::new();
-        params.insert("K".to_string(), json!(k));
-        let eps = derive(&cfg(AggregationType::DatasketchesKLL, params)).epsilon;
-        assert!(eps < last, "KLL ε at k={k}: {eps} should be < {last}");
-        last = eps;
-    }
-}
-
-#[test]
-fn ddsketch_epsilon_tracks_alpha_monotonically() {
-    // Tighter α → smaller ε (same value).
-    let mut last = f64::INFINITY;
-    for alpha in [0.05f64, 0.02, 0.01, 0.005, 0.001] {
-        let mut params = HashMap::new();
-        params.insert("alpha".to_string(), json!(alpha));
-        let eps = derive(&cfg(AggregationType::DDSketch, params)).epsilon;
-        assert!(
-            eps < last,
-            "DDSketch ε at α={alpha}: {eps} should be < {last}"
-        );
-        last = eps;
-    }
-}
-
-#[test]
-fn cms_with_heap_epsilon_shrinks_monotonically_with_heap_size_when_heap_dominates() {
-    // Hold CMS params fixed so the CMS contribution e/w stays
-    // constant; as heap_size grows, the heap bound 1/heap
-    // shrinks, so ε tightens until it meets the CMS floor.
-    // Use a wide CMS (w=1_000_000) so the CMS floor is tiny
-    // and the heap bound dominates the entire sweep range.
-    let mut last = f64::INFINITY;
-    for heap in [10u64, 100, 1000, 10_000, 100_000] {
-        let mut params = HashMap::new();
-        params.insert("d".to_string(), json!(5u64));
-        params.insert("w".to_string(), json!(1_000_000u64));
-        params.insert("heap_size".to_string(), json!(heap));
-        let eps = derive(&cfg(AggregationType::CountMinSketchWithHeap, params)).epsilon;
-        assert!(
-            eps < last,
-            "CMS-with-heap ε at heap={heap}: {eps} should be < {last}"
-        );
-        last = eps;
-    }
-}
-
-// -------- cross-family spot-check ----------
-
-#[test]
-fn relative_ordering_of_bounds_matches_published_intuition() {
-    // Published intuition: for the same width, CountSketch gives
-    // a smaller ε than CountMin when w is large enough that
-    // 1/√w < e/w (i.e. w > e² ≈ 7.39). Cross-check the
-    // `countsketch_oxide_matches_cms_oxide` sanity in
-    // sketch-bench.
-    let mut params = HashMap::new();
-    params.insert("d".to_string(), json!(4u64));
-    params.insert("w".to_string(), json!(10_000u64));
-    let cms = derive(&cfg(AggregationType::CountMinSketch, params.clone()));
-    let cs = derive(&cfg(AggregationType::CountSketch, params));
-    // CMS at w=10_000: e/10_000 ≈ 0.000272
-    // CountSketch at w=10_000: 1/√10_000 = 0.01
-    // So cms.epsilon < cs.epsilon at this width.
-    assert!(cms.epsilon < cs.epsilon);
-}
diff --git a/data_plane/src/tests/accuracy_in_promql_response_tests.rs b/data_plane/src/tests/accuracy_in_promql_response_tests.rs
deleted file mode 100644
index b14320c56..000000000
--- a/data_plane/src/tests/accuracy_in_promql_response_tests.rs
+++ /dev/null
@@ -1,180 +0,0 @@
-//! Verify the §6.4 accuracy envelope lands on the Prometheus
-//! HTTP response as an ASAP-extension `accuracy` field plus a
-//! human-readable `infos` mirror, in the A+C schema agreed in
-//! the design discussion.
-//!
-//! * **A** — top-level `accuracy: { epsilon, delta, kind, per_segment }`
-//! * **C** — `infos: ["accuracy: ε=..., δ=..., kind=..."]`
-//!
-//! Standard PromQL clients ignore both fields; Grafana 11+
-//! renders `infos` inline; custom panels read `accuracy`.
-
-#[cfg(test)]
-use crate::drivers::query::adapters::PrometheusResponse;
-use crate::storage_engines::sketch_db::{
-    AccuracyEnvelope, AccuracyKind, AccuracyProfile, PerSegmentAccuracy,
-};
-use serde_json::Value;
-
-fn hll_profile() -> AccuracyProfile {
-    AccuracyProfile {
-        epsilon: 0.008125,
-        delta: None,
-        kind: AccuracyKind::RelativeCardinality,
-    }
-}
-
-#[test]
-fn prometheus_response_carries_accuracy_top_level_and_infos_mirror() {
-    let envelope = AccuracyEnvelope::single(hll_profile());
-    let resp = PrometheusResponse::success(serde_json::json!({
-        "resultType": "vector",
-        "result": [],
-    }))
-    .with_accuracy(envelope.clone());
-
-    let json: Value = serde_json::to_value(&resp).unwrap();
-
-    // A: structured accuracy top-level.
-    let accuracy = &json["accuracy"];
-    assert!(!accuracy.is_null(), "accuracy field should be present");
-    assert_eq!(accuracy["epsilon"], 0.008125);
-    assert!(accuracy["delta"].is_null());
-    assert_eq!(accuracy["kind"], "relative_cardinality");
-    assert!(
-        accuracy
-            .get("per_segment")
-            .map(|v| v.as_array().unwrap().is_empty())
-            .unwrap_or(true),
-        "per_segment must be absent / empty for single-schema queries"
-    );
-
-    // C: infos mirror.
-    let infos = json["infos"].as_array().expect("infos should be an array");
-    assert_eq!(infos.len(), 1);
-    let line = infos[0].as_str().unwrap();
-    assert!(
-        line.contains("ε=0.008125")
-            && line.contains("δ=unknown")
-            && line.contains("relative_cardinality"),
-        "infos summary must include ε, δ, kind: got {line}"
-    );
-}
-
-#[test]
-fn prometheus_response_without_accuracy_skips_both_fields() {
-    let resp = PrometheusResponse::success(serde_json::json!({
-        "resultType": "vector",
-        "result": [],
-    }));
-    let json = serde_json::to_string(&resp).unwrap();
-    // Both top-level extensions must be absent so the wire shape
-    // stays byte-identical to standard Prometheus when accuracy
-    // isn't populated (e.g. fallback-only responses).
-    assert!(
-        !json.contains("\"accuracy\""),
-        "accuracy must be omitted: {json}"
-    );
-    assert!(!json.contains("\"infos\""), "infos must be omitted: {json}");
-}
-
-#[test]
-fn prometheus_response_per_segment_contains_all_segments_with_worst_case_top() {
-    let segments = vec![
-        PerSegmentAccuracy {
-            agg_id: 1,
-            range_ms: [1_000, 2_000],
-            profile: AccuracyProfile {
-                epsilon: 0.01,
-                delta: Some(0.0),
-                kind: AccuracyKind::RelativeQuantile,
-            },
-        },
-        PerSegmentAccuracy {
-            agg_id: 2,
-            range_ms: [2_000, 3_000],
-            profile: AccuracyProfile {
-                epsilon: 0.05,
-                delta: Some(0.01),
-                kind: AccuracyKind::RankQuantile,
-            },
-        },
-    ];
-    let envelope = AccuracyEnvelope::from_segments(segments).unwrap();
-    // Worst-case envelope = (max ε=0.05, max δ=0.01, first
-    // non-Exact kind wins for `kind`).
-    assert_eq!(envelope.profile.epsilon, 0.05);
-    assert_eq!(envelope.profile.delta, Some(0.01));
-    assert_eq!(envelope.profile.kind, AccuracyKind::RelativeQuantile);
-
-    let resp = PrometheusResponse::success(serde_json::json!({
-        "resultType": "vector",
-        "result": [],
-    }))
-    .with_accuracy(envelope);
-    let json: Value = serde_json::to_value(&resp).unwrap();
-
-    assert_eq!(json["accuracy"]["epsilon"], 0.05);
-    let per_seg = json["accuracy"]["per_segment"].as_array().unwrap();
-    assert_eq!(per_seg.len(), 2);
-    assert_eq!(per_seg[0]["agg_id"], 1);
-    assert_eq!(per_seg[0]["range_ms"], serde_json::json!([1_000, 2_000]));
-    assert_eq!(per_seg[1]["agg_id"], 2);
-
-    // `infos` summary flags the multi-segment shape.
-    let infos = json["infos"].as_array().unwrap();
-    assert!(infos[0]
-        .as_str()
-        .unwrap()
-        .contains("schema-timeline segments"));
-}
-
-#[test]
-fn accuracy_coexists_with_warnings_without_interference() {
-    // The wire contract: `warnings` stays for partial-result
-    // advisories, `accuracy` is orthogonal. Both must coexist.
-    let envelope = AccuracyEnvelope::single(hll_profile());
-    let resp = PrometheusResponse::success_with_warnings(
-        serde_json::json!({
-            "resultType": "vector",
-            "result": [],
-        }),
-        vec!["partial: 2 schemas".to_string()],
-    )
-    .with_accuracy(envelope);
-    let json: Value = serde_json::to_value(&resp).unwrap();
-    assert_eq!(
-        json["warnings"].as_array().unwrap()[0].as_str().unwrap(),
-        "partial: 2 schemas"
-    );
-    assert_eq!(json["accuracy"]["kind"], "relative_cardinality");
-    assert_eq!(
-        json["infos"].as_array().unwrap().len(),
-        1,
-        "infos should carry only the accuracy summary, not the warning"
-    );
-}
-
-#[test]
-fn promql_standard_client_can_decode_response_ignoring_extensions() {
-    // A minimal "standard Prometheus" response decoder — just
-    // the fields the upstream API defines. It must parse our
-    // extended response without error (unknown fields
-    // ignored). This locks down the "zero-risk extension" claim.
-    let envelope = AccuracyEnvelope::single(hll_profile());
-    let resp = PrometheusResponse::success(serde_json::json!({
-        "resultType": "vector",
-        "result": [],
-    }))
-    .with_accuracy(envelope);
-    let wire = serde_json::to_string(&resp).unwrap();
-
-    #[derive(serde::Deserialize)]
-    struct StandardPromResponse {
-        status: String,
-        #[serde(default)]
-        _data: Option<serde_json::Value>,
-    }
-    let standard: StandardPromResponse = serde_json::from_str(&wire).unwrap();
-    assert_eq!(standard.status, "success");
-}
diff --git a/data_plane/src/tests/mod.rs b/data_plane/src/tests/mod.rs
deleted file mode 100644
index e016a48f2..000000000
--- a/data_plane/src/tests/mod.rs
+++ /dev/null
@@ -1,9 +0,0 @@
-pub mod accuracy_empirical_validation_tests;
-pub mod accuracy_in_promql_response_tests;
-pub mod prometheus_forwarding_tests;
-pub mod trait_design_tests;
-
-#[cfg(test)]
-pub mod test_utilities;
-
-pub mod accumulator_fixture;
diff --git a/data_plane/src/tests/prometheus_forwarding_tests.rs b/data_plane/src/tests/prometheus_forwarding_tests.rs
deleted file mode 100644
index bfbe765ff..000000000
--- a/data_plane/src/tests/prometheus_forwarding_tests.rs
+++ /dev/null
@@ -1,315 +0,0 @@
-use crate::drivers::query::adapters::AdapterConfig;
-use crate::drivers::query::servers::http::{HttpServer, HttpServerConfig};
-use crate::query_engines::{ASAPQueryEngine, QueryForwardingPolicy};
-#[cfg(test)]
-use crate::storage_engines::types::{InstalledPrecomputePlan, QueryLanguage};
-use reqwest::Client;
-use serde_json::Value;
-use std::sync::{
-    atomic::{AtomicUsize, Ordering},
-    Arc,
-};
-use tokio::net::TcpListener;
-use tokio::time::{sleep, Duration};
-
-/// Mock Prometheus server for testing
-async fn start_mock_prometheus_server() -> Result<u16, Box<dyn std::error::Error>> {
-    use axum::{extract::Query, response::Json, routing::get, Router};
-    use serde_json::json;
-    use std::collections::HashMap;
-
-    async fn mock_query_handler(Query(params): Query<HashMap<String, String>>) -> Json<Value> {
-        let query = params.get("query").unwrap_or(&"".to_string()).clone();
-
-        // Simulate different types of queries
-        if query.contains("unsupported_metric") {
-            Json(json!({
-                "status": "success",
-                "data": {
-                    "resultType": "vector",
-                    "result": [
-                        {
-                            "metric": {"__name__": "unsupported_metric"},
-                            "value": [1672531200, "42.0"]
-                        }
-                    ]
-                }
-            }))
-        } else if query.contains("error_query") {
-            Json(json!({
-                "status": "error",
-                "errorType": "bad_data",
-                "error": "invalid query syntax"
-            }))
-        } else {
-            Json(json!({
-                "status": "success",
-                "data": {
-                    "resultType": "vector",
-                    "result": []
-                }
-            }))
-        }
-    }
-
-    let app = Router::new().route("/api/v1/query", get(mock_query_handler));
-
-    let listener = TcpListener::bind("127.0.0.1:0").await?;
-    let port = listener.local_addr()?.port();
-
-    tokio::spawn(async move {
-        axum::serve(listener, app).await.unwrap();
-    });
-
-    // Give the server time to start
-    sleep(Duration::from_millis(100)).await;
-    Ok(port)
-}
-
-async fn start_counting_prometheus_server(
-    calls: Arc<AtomicUsize>,
-) -> Result<u16, Box<dyn std::error::Error>> {
-    use axum::{routing::get, Router};
-    let app = Router::new()
-        .route(
-            "/api/v1/query",
-            get({
-                let calls = calls.clone();
-                move || async move {
-                    calls.fetch_add(1, Ordering::SeqCst);
-                    axum::Json(serde_json::json!({"status":"success","data":{"resultType":"vector","result":[]}}))
-                }
-            }),
-        )
-        .route(
-            "/api/v1/query_range",
-            get({
-                let calls = calls.clone();
-                move || async move {
-                    calls.fetch_add(1, Ordering::SeqCst);
-                    axum::Json(serde_json::json!({"status":"success","data":{"resultType":"matrix","result":[]}}))
-                }
-            }),
-        );
-    let listener = TcpListener::bind("127.0.0.1:0").await?;
-    let port = listener.local_addr()?.port();
-    tokio::spawn(async move {
-        axum::serve(listener, app).await.unwrap();
-    });
-    sleep(Duration::from_millis(100)).await;
-    Ok(port)
-}
-
-async fn setup_test_server(prometheus_port: u16) -> (HttpServer, u16) {
-    let config = HttpServerConfig {
-        port: 0, // Use random port
-        handle_http_requests: true,
-        adapter_config: AdapterConfig::prometheus_promql(
-            format!("http://127.0.0.1:{prometheus_port}"),
-            true,
-        ),
-    };
-
-    let installed_precompute_plan = Arc::new(InstalledPrecomputePlan::default());
-    let query_engine = Arc::new(ASAPQueryEngine::new(15000));
-
-    let idx = std::sync::Arc::new(crate::storage_engines::sketch_db::index::SketchStore::new());
-    let server = HttpServer::new(config, query_engine, idx);
-    let actual_port = server
-        .start_test_server()
-        .await
-        .expect("Failed to start test server");
-
-    (server, actual_port)
-}
-
-#[tokio::test]
-async fn test_prometheus_forwarding_instant_query() {
-    // Start mock Prometheus server
-    let prometheus_port = start_mock_prometheus_server().await.unwrap();
-
-    // Start our HTTP server with forwarding enabled
-    let (_server, server_port) = setup_test_server(prometheus_port).await;
-
-    let client = Client::new();
-
-    // Test forwarding of unsupported query
-    let response = client
-        .get(format!("http://127.0.0.1:{server_port}/api/v1/query"))
-        .query(&[("query", "unsupported_metric")])
-        .send()
-        .await
-        .expect("Failed to send request");
-
-    assert_eq!(response.status(), reqwest::StatusCode::OK);
-
-    let json_response: Value = response.json().await.expect("Failed to parse JSON");
-    assert_eq!(json_response["status"], "success");
-    assert_eq!(json_response["data"]["resultType"], "vector");
-
-    // Verify the forwarded response contains the expected data
-    let result = &json_response["data"]["result"][0];
-    assert_eq!(result["metric"]["__name__"], "unsupported_metric");
-    assert_eq!(result["value"][1], "42.0");
-}
-
-#[tokio::test]
-async fn test_prometheus_forwarding_error_handling() {
-    // Start mock Prometheus server
-    let prometheus_port = start_mock_prometheus_server().await.unwrap();
-
-    // Start our HTTP server with forwarding enabled
-    let (_server, server_port) = setup_test_server(prometheus_port).await;
-
-    let client = Client::new();
-
-    // Test forwarding of query that causes error in Prometheus
-    let response = client
-        .get(format!("http://127.0.0.1:{server_port}/api/v1/query"))
-        .query(&[("query", "error_query")])
-        .send()
-        .await
-        .expect("Failed to send request");
-
-    assert_eq!(response.status(), reqwest::StatusCode::OK);
-
-    let json_response: Value = response.json().await.expect("Failed to parse JSON");
-    assert_eq!(json_response["status"], "error");
-    assert_eq!(json_response["errorType"], "bad_data");
-    assert_eq!(json_response["error"], "invalid query syntax");
-}
-
-#[tokio::test]
-async fn test_forwarding_disabled() {
-    let config = HttpServerConfig {
-        port: 0,
-        handle_http_requests: true,
-        adapter_config: AdapterConfig::prometheus_promql(
-            "http://127.0.0.1:19093".to_string(),
-            false, // Forwarding disabled
-        ),
-    };
-
-    let installed_precompute_plan = Arc::new(InstalledPrecomputePlan::default());
-    let query_engine = Arc::new(ASAPQueryEngine::new(15000));
-
-    let idx = std::sync::Arc::new(crate::storage_engines::sketch_db::index::SketchStore::new());
-    let server = HttpServer::new(config, query_engine, idx);
-    let server_port = server
-        .start_test_server()
-        .await
-        .expect("Failed to start test server");
-
-    let client = Client::new();
-
-    // Test that unsupported query returns error when forwarding is disabled
-    let response = client
-        .get(format!("http://127.0.0.1:{server_port}/api/v1/query"))
-        .query(&[(
-            "query",
-            "definitely_unsupported_complex_query{invalid=syntax}",
-        )])
-        .send()
-        .await
-        .expect("Failed to send request");
-
-    assert_eq!(response.status(), reqwest::StatusCode::OK);
-
-    let response_json: serde_json::Value = response.json().await.expect("Failed to parse JSON");
-    println!("Response JSON: {response_json}");
-
-    // Should return an error response when forwarding is disabled
-    assert_eq!(response_json["status"], "error");
-}
-
-#[tokio::test]
-async fn disable_query_forwarding_makes_zero_instant_or_range_requests() {
-    let calls = Arc::new(AtomicUsize::new(0));
-    let prometheus_port = start_counting_prometheus_server(calls.clone())
-        .await
-        .unwrap();
-    let config = HttpServerConfig {
-        port: 0,
-        handle_http_requests: true,
-        adapter_config: AdapterConfig::prometheus_promql(
-            format!("http://127.0.0.1:{prometheus_port}"),
-            true,
-        )
-        .with_query_forwarding_policy(QueryForwardingPolicy::Disabled),
-    };
-    let query_engine = Arc::new(ASAPQueryEngine::new(15000));
-    let idx = Arc::new(crate::storage_engines::sketch_db::index::SketchStore::new());
-    let server = HttpServer::new(config, query_engine, idx);
-    let server_port = server.start_test_server().await.unwrap();
-    let client = Client::new();
-
-    let instant = client
-        .get(format!("http://127.0.0.1:{server_port}/api/v1/query"))
-        .query(&[("query", "rate(unsupported_metric[5m])")])
-        .send()
-        .await
-        .unwrap();
-    assert!(instant.status().is_success());
-
-    let range = client
-        .get(format!("http://127.0.0.1:{server_port}/api/v1/query_range"))
-        .query(&[
-            ("query", "rate(unsupported_metric[5m])"),
-            ("start", "100"),
-            ("end", "200"),
-            ("step", "15"),
-        ])
-        .send()
-        .await
-        .unwrap();
-    assert!(range.status().is_success() || range.status().is_client_error());
-    assert_eq!(calls.load(Ordering::SeqCst), 0);
-}
-
-#[tokio::test]
-async fn test_prometheus_server_unreachable() {
-    // Use an unreachable port for Prometheus
-    let config = HttpServerConfig {
-        port: 0,
-        handle_http_requests: true,
-        adapter_config: AdapterConfig::prometheus_promql(
-            "http://127.0.0.1:99999".to_string(), // Unreachable port
-            true,
-        ),
-    };
-
-    let installed_precompute_plan = Arc::new(InstalledPrecomputePlan::default());
-    let query_engine = Arc::new(ASAPQueryEngine::new(15000));
-
-    let idx = std::sync::Arc::new(crate::storage_engines::sketch_db::index::SketchStore::new());
-    let server = HttpServer::new(config, query_engine, idx);
-    let server_port = server
-        .start_test_server()
-        .await
-        .expect("Failed to start test server");
-
-    let client = Client::new();
-
-    // Test that unreachable Prometheus server returns error when forwarding fails
-    let response = client
-        .get(format!("http://127.0.0.1:{server_port}/api/v1/query"))
-        .query(&[(
-            "query",
-            "definitely_unsupported_complex_query{invalid=syntax}",
-        )])
-        .send()
-        .await
-        .expect("Failed to send request");
-
-    // Should return 500 or similar error status when Prometheus is unreachable
-    let status = response.status();
-    println!("Response status: {status:?}");
-    let response_json: serde_json::Value = response.json().await.expect("Failed to parse JSON");
-    println!("Response JSON: {response_json}");
-
-    // When Prometheus is unreachable, should return 500 status or error response
-    assert!(
-        status.is_server_error()
-            || (status == reqwest::StatusCode::OK && response_json["status"] == "error")
-    );
-}
diff --git a/data_plane/src/tests/test_utilities/engine_factories.rs b/data_plane/src/tests/test_utilities/engine_factories.rs
deleted file mode 100644
index 62a7621ec..000000000
--- a/data_plane/src/tests/test_utilities/engine_factories.rs
+++ /dev/null
@@ -1,692 +0,0 @@
-//! Engine factory helpers for integration tests
-//!
-//! Provides reusable construction helpers for ASAPQueryEngine + SketchStore
-//! populated with various accumulator types. Unlike TestConfigBuilder which
-//! hardcodes "SumAccumulator", these helpers build PrecomputeMaterialization with
-//! the correct aggregation_type string.
-
-use crate::drivers::ingest::series_resolver::SeriesIdResolver;
-use crate::query_engines::asap_query_engine::engine::ASAPQueryEngine;
-use crate::query_engines::query_result::InstantVectorElement;
-use crate::storage_engines::types::{
-    AggregationType, InstalledPrecomputePlan, KeyByLabelValues, PrecomputeMaterialization,
-    PrecomputedOutput, QueryLanguage, WindowKind,
-};
-use crate::AggregateCore;
-use asap_types::KeyByLabelNames;
-use std::collections::HashMap;
-
-/// Helper for test factories — wraps the closure-mint call with a
-/// fresh resolver and forwards to `SketchStore::ingest_precompute_for_agg_config`.
-/// Each factory gets its own resolver instance; tests are isolated so
-/// the `next_sid = 1, 2, ...` counter doesn't bleed between fixtures.
-fn ingest_with_fresh_resolver(
-    summary_store: &crate::storage_engines::sketch_db::index::SketchStore,
-    resolver: &std::sync::Arc<SeriesIdResolver>,
-    agg_cfg: &PrecomputeMaterialization,
-    output: &PrecomputedOutput,
-    accumulator: &dyn AggregateCore,
-) -> Option<u64> {
-    let resolver = resolver.clone();
-    summary_store.ingest_precompute_for_agg_config(
-        |m, fp, ak| resolver.resolve(m, fp, ak),
-        agg_cfg,
-        output,
-        accumulator,
-    )
-}
-use std::sync::Arc;
-
-/// Data to insert into a store: (label_values, accumulator)
-pub type AccumulatorData = Vec<(Option<Vec<String>>, Box<dyn AggregateCore>)>;
-
-/// Creates a ASAPQueryEngine with a single aggregation populated with given data.
-///
-/// # Arguments
-/// * `metric` - Metric name
-/// * `aggregation_type` - Accumulator type string (e.g. "SumAccumulator", "DatasketchesKLLAccumulator")
-/// * `grouping_labels` - Label names for GROUP BY
-/// * `data` - Vec of (label_values, accumulator) pairs to insert
-/// * `promql_query` - The PromQL query string
-pub fn create_engine_single_pop(
-    metric: &str,
-    aggregation_type: AggregationType,
-    grouping_labels: Vec<&str>,
-    data: AccumulatorData,
-    promql_query: &str,
-) -> ASAPQueryEngine {
-    create_engine_single_pop_with_aggregated(
-        metric,
-        aggregation_type,
-        grouping_labels,
-        vec![],
-        data,
-        promql_query,
-    )
-}
-
-/// Creates a ASAPQueryEngine with aggregated labels (sub-key labels within the accumulator).
-///
-/// Use for self-keyed multi-population accumulators (Multiple* types) where
-/// `aggregated_labels` are the labels that key the accumulator internally
-/// (e.g. "endpoint" within a MultipleIncrease accumulator).
-pub fn create_engine_single_pop_with_aggregated(
-    metric: &str,
-    aggregation_type: AggregationType,
-    grouping_labels: Vec<&str>,
-    aggregated_labels: Vec<&str>,
-    data: AccumulatorData,
-    promql_query: &str,
-) -> ASAPQueryEngine {
-    let grouping_label_strings: Vec<String> =
-        grouping_labels.iter().map(|s| s.to_string()).collect();
-    let aggregated_label_strings: Vec<String> =
-        aggregated_labels.iter().map(|s| s.to_string()).collect();
-    let all_schema_labels: Vec<String> = grouping_label_strings
-        .iter()
-        .chain(aggregated_label_strings.iter())
-        .cloned()
-        .collect();
-
-    let mut materializations_by_output = HashMap::new();
-    let agg_config = PrecomputeMaterialization {
-        stored_output_id: None,
-        semantic_fragment: None,
-        population_key_encoding: Default::default(),
-        aggregation_type,
-        aggregation_sub_type: String::new(),
-        parameters: HashMap::new(),
-        grouping_labels: KeyByLabelNames::new(grouping_label_strings.clone()).into(),
-        aggregated_labels: KeyByLabelNames::new(aggregated_label_strings),
-        rollup_labels: KeyByLabelNames::empty(),
-        original_yaml: String::new(),
-        window_size: 1,
-        slide_interval: 1,
-        window_type: WindowKind::Tumbling,
-        window_layout: asap_types::WindowMaterializationLayout::Pane { pane_secs: 1 },
-        pane_origin_ms: None,
-        spatial_filter: String::new(),
-        spatial_filter_normalized: String::new(),
-        metric: metric.to_string(),
-        num_aggregates_to_retain: None,
-        table_name: None,
-        value_projection: None,
-        table_population: None,
-        derived_input: None,
-        table_timestamp_column: None,
-        partitioning: None,
-        value_source_column: None,
-    };
-    let agg_id = agg_config.policy_fp_u64();
-    materializations_by_output.insert(agg_id, agg_config);
-
-    let installed_precompute_plan = Arc::new(InstalledPrecomputePlan {
-        partitioning: Default::default(),
-        raw_programs: Default::default(),
-        precompute_plan: None,
-        materializations_by_output: materializations_by_output
-            .into_iter()
-            .map(|(id, cfg)| (asap_types::sds::StoredOutputId(id), cfg))
-            .collect(),
-        storage_backend: Default::default(),
-    });
-
-    let summary_store =
-        std::sync::Arc::new(crate::storage_engines::sketch_db::index::SketchStore::new());
-    let resolver = std::sync::Arc::new(SeriesIdResolver::new());
-
-    // Insert data into SketchStore via the canonical helper (M2.3.6e).
-    let agg_cfg = installed_precompute_plan
-        .get_aggregation_config(asap_types::sds::StoredOutputId(agg_id))
-        .cloned()
-        .expect("agg config must be in installed_precompute_plan");
-    let timestamp = 1_000_000_u64;
-    for (label_values_opt, acc) in data {
-        let key = label_values_opt.map(|labels| KeyByLabelValues { labels });
-        let output = PrecomputedOutput::new(
-            timestamp,
-            timestamp,
-            key,
-            asap_types::PolicyFingerprint(agg_id),
-        );
-        ingest_with_fresh_resolver(&summary_store, &resolver, &agg_cfg, &output, acc.as_ref());
-    }
-
-    ASAPQueryEngine::new(1).with_sketch_index(summary_store)
-}
-
-/// Build a test engine with separate value and key aggregations. Each input
-/// carries its own accumulator type, labels, and samples.
-#[allow(clippy::too_many_arguments)]
-#[allow(dead_code)]
-pub fn create_engine_dual_input(
-    metric: &str,
-    value_agg_type: AggregationType,
-    key_agg_type: AggregationType,
-    grouping_labels: Vec<&str>,
-    aggregated_labels: Vec<&str>,
-    value_data: AccumulatorData,
-    keys_data: AccumulatorData,
-    promql_query: &str,
-) -> ASAPQueryEngine {
-    let grouping_label_strings: Vec<String> =
-        grouping_labels.iter().map(|s| s.to_string()).collect();
-    let aggregated_label_strings: Vec<String> =
-        aggregated_labels.iter().map(|s| s.to_string()).collect();
-    let all_labels: Vec<String> = grouping_label_strings
-        .iter()
-        .chain(aggregated_label_strings.iter())
-        .cloned()
-        .collect();
-
-    let mut materializations_by_output = HashMap::new();
-
-    // Value aggregation
-    let value_agg_config = PrecomputeMaterialization {
-        stored_output_id: None,
-        semantic_fragment: None,
-        population_key_encoding: Default::default(),
-        aggregation_type: value_agg_type,
-        aggregation_sub_type: String::new(),
-        parameters: HashMap::new(),
-        grouping_labels: KeyByLabelNames::new(grouping_label_strings.clone()).into(),
-        aggregated_labels: KeyByLabelNames::empty(),
-        rollup_labels: KeyByLabelNames::empty(),
-        original_yaml: String::new(),
-        window_size: 1,
-        slide_interval: 1,
-        window_type: WindowKind::Tumbling,
-        window_layout: asap_types::WindowMaterializationLayout::Pane { pane_secs: 1 },
-        pane_origin_ms: None,
-        spatial_filter: String::new(),
-        spatial_filter_normalized: String::new(),
-        metric: metric.to_string(),
-        num_aggregates_to_retain: None,
-        table_name: None,
-        value_projection: None,
-        table_population: None,
-        derived_input: None,
-        table_timestamp_column: None,
-        partitioning: None,
-        value_source_column: None,
-    };
-    let value_id = value_agg_config.policy_fp_u64();
-    materializations_by_output.insert(value_id, value_agg_config);
-
-    // Keys aggregation
-    let keys_agg_config = PrecomputeMaterialization {
-        stored_output_id: None,
-        semantic_fragment: None,
-        population_key_encoding: Default::default(),
-        aggregation_type: key_agg_type,
-        aggregation_sub_type: String::new(),
-        parameters: HashMap::new(),
-        grouping_labels: KeyByLabelNames::new(grouping_label_strings.clone()).into(),
-        aggregated_labels: KeyByLabelNames::new(aggregated_label_strings),
-        rollup_labels: KeyByLabelNames::empty(),
-        original_yaml: String::new(),
-        window_size: 1,
-        slide_interval: 1,
-        window_type: WindowKind::Tumbling,
-        window_layout: asap_types::WindowMaterializationLayout::Pane { pane_secs: 1 },
-        pane_origin_ms: None,
-        spatial_filter: String::new(),
-        spatial_filter_normalized: String::new(),
-        metric: metric.to_string(),
-        num_aggregates_to_retain: None,
-        table_name: None,
-        value_projection: None,
-        table_population: None,
-        derived_input: None,
-        table_timestamp_column: None,
-        partitioning: None,
-        value_source_column: None,
-    };
-    let keys_id = keys_agg_config.policy_fp_u64();
-    materializations_by_output.insert(keys_id, keys_agg_config);
-
-    let installed_precompute_plan = Arc::new(InstalledPrecomputePlan {
-        partitioning: Default::default(),
-        raw_programs: Default::default(),
-        precompute_plan: None,
-        materializations_by_output: materializations_by_output
-            .into_iter()
-            .map(|(id, cfg)| (asap_types::sds::StoredOutputId(id), cfg))
-            .collect(),
-        storage_backend: Default::default(),
-    });
-
-    let summary_store =
-        std::sync::Arc::new(crate::storage_engines::sketch_db::index::SketchStore::new());
-    let resolver = std::sync::Arc::new(SeriesIdResolver::new());
-
-    let agg_cfg_1 = installed_precompute_plan
-        .get_aggregation_config(asap_types::sds::StoredOutputId(value_id))
-        .cloned()
-        .expect("value agg config");
-    let agg_cfg_2 = installed_precompute_plan
-        .get_aggregation_config(asap_types::sds::StoredOutputId(keys_id))
-        .cloned()
-        .expect("keys agg config");
-    let timestamp = 1_000_000_u64;
-    for (label_values_opt, acc) in value_data {
-        let key = label_values_opt.map(|labels| KeyByLabelValues { labels });
-        let output = PrecomputedOutput::new(
-            timestamp,
-            timestamp,
-            key,
-            asap_types::PolicyFingerprint(value_id),
-        );
-        ingest_with_fresh_resolver(&summary_store, &resolver, &agg_cfg_1, &output, acc.as_ref());
-    }
-    for (label_values_opt, acc) in keys_data {
-        let key = label_values_opt.map(|labels| KeyByLabelValues { labels });
-        let output = PrecomputedOutput::new(
-            timestamp,
-            timestamp,
-            key,
-            asap_types::PolicyFingerprint(keys_id),
-        );
-        ingest_with_fresh_resolver(&summary_store, &resolver, &agg_cfg_2, &output, acc.as_ref());
-    }
-
-    ASAPQueryEngine::new(1).with_sketch_index(summary_store)
-}
-
-/// Creates a ASAPQueryEngine with two independent metrics, each with their own
-/// aggregation config and query_config.
-///
-/// agg_id=1 → metric_a, agg_id=2 → metric_b.
-/// Both are registered as separate query_configs in the inference config.
-#[allow(clippy::too_many_arguments)]
-pub fn create_engine_two_metrics(
-    metric_a: &str,
-    aggregation_type_a: AggregationType,
-    grouping_labels_a: Vec<&str>,
-    data_a: AccumulatorData,
-    query_a: &str,
-    metric_b: &str,
-    aggregation_type_b: AggregationType,
-    grouping_labels_b: Vec<&str>,
-    data_b: AccumulatorData,
-    query_b: &str,
-) -> ASAPQueryEngine {
-    let labels_a: Vec<String> = grouping_labels_a.iter().map(|s| s.to_string()).collect();
-    let labels_b: Vec<String> = grouping_labels_b.iter().map(|s| s.to_string()).collect();
-
-    let mut materializations_by_output = HashMap::new();
-
-    let agg_config_a = PrecomputeMaterialization {
-        stored_output_id: None,
-        semantic_fragment: None,
-        population_key_encoding: Default::default(),
-        aggregation_type: aggregation_type_a,
-        aggregation_sub_type: String::new(),
-        parameters: HashMap::new(),
-        grouping_labels: KeyByLabelNames::new(labels_a.clone()).into(),
-        aggregated_labels: KeyByLabelNames::empty(),
-        rollup_labels: KeyByLabelNames::empty(),
-        original_yaml: String::new(),
-        window_size: 1,
-        slide_interval: 1,
-        window_type: WindowKind::Tumbling,
-        window_layout: asap_types::WindowMaterializationLayout::Pane { pane_secs: 1 },
-        pane_origin_ms: None,
-        spatial_filter: String::new(),
-        spatial_filter_normalized: String::new(),
-        metric: metric_a.to_string(),
-        num_aggregates_to_retain: None,
-        table_name: None,
-        value_projection: None,
-        table_population: None,
-        derived_input: None,
-        table_timestamp_column: None,
-        partitioning: None,
-        value_source_column: None,
-    };
-    let id_a = agg_config_a.policy_fp_u64();
-    materializations_by_output.insert(id_a, agg_config_a);
-
-    let agg_config_b = PrecomputeMaterialization {
-        stored_output_id: None,
-        semantic_fragment: None,
-        population_key_encoding: Default::default(),
-        aggregation_type: aggregation_type_b,
-        aggregation_sub_type: String::new(),
-        parameters: HashMap::new(),
-        grouping_labels: KeyByLabelNames::new(labels_b.clone()).into(),
-        aggregated_labels: KeyByLabelNames::empty(),
-        rollup_labels: KeyByLabelNames::empty(),
-        original_yaml: String::new(),
-        window_size: 1,
-        slide_interval: 1,
-        window_type: WindowKind::Tumbling,
-        window_layout: asap_types::WindowMaterializationLayout::Pane { pane_secs: 1 },
-        pane_origin_ms: None,
-        spatial_filter: String::new(),
-        spatial_filter_normalized: String::new(),
-        metric: metric_b.to_string(),
-        num_aggregates_to_retain: None,
-        table_name: None,
-        value_projection: None,
-        table_population: None,
-        derived_input: None,
-        table_timestamp_column: None,
-        partitioning: None,
-        value_source_column: None,
-    };
-    let id_b = agg_config_b.policy_fp_u64();
-    materializations_by_output.insert(id_b, agg_config_b);
-
-    let installed_precompute_plan = Arc::new(InstalledPrecomputePlan {
-        partitioning: Default::default(),
-        raw_programs: Default::default(),
-        precompute_plan: None,
-        materializations_by_output: materializations_by_output
-            .into_iter()
-            .map(|(id, cfg)| (asap_types::sds::StoredOutputId(id), cfg))
-            .collect(),
-        storage_backend: Default::default(),
-    });
-
-    let summary_store =
-        std::sync::Arc::new(crate::storage_engines::sketch_db::index::SketchStore::new());
-    let resolver = std::sync::Arc::new(SeriesIdResolver::new());
-    let agg_cfg_1 = installed_precompute_plan
-        .get_aggregation_config(asap_types::sds::StoredOutputId(id_a))
-        .cloned()
-        .expect("agg a");
-    let agg_cfg_2 = installed_precompute_plan
-        .get_aggregation_config(asap_types::sds::StoredOutputId(id_b))
-        .cloned()
-        .expect("agg b");
-    let timestamp = 1_000_000_u64;
-    for (label_values_opt, acc) in data_a {
-        let key = label_values_opt.map(|labels| KeyByLabelValues { labels });
-        let output = PrecomputedOutput::new(
-            timestamp,
-            timestamp,
-            key,
-            asap_types::PolicyFingerprint(id_a),
-        );
-        ingest_with_fresh_resolver(&summary_store, &resolver, &agg_cfg_1, &output, acc.as_ref());
-    }
-    for (label_values_opt, acc) in data_b {
-        let key = label_values_opt.map(|labels| KeyByLabelValues { labels });
-        let output = PrecomputedOutput::new(
-            timestamp,
-            timestamp,
-            key,
-            asap_types::PolicyFingerprint(id_b),
-        );
-        ingest_with_fresh_resolver(&summary_store, &resolver, &agg_cfg_2, &output, acc.as_ref());
-    }
-    let _ = (query_a, query_b);
-    ASAPQueryEngine::new(1).with_sketch_index(summary_store)
-}
-
-/// Creates a ASAPQueryEngine with three independent metrics, each with their own
-/// aggregation config and query_config.
-///
-/// agg_id=1 → metric_a, agg_id=2 → metric_b, agg_id=3 → metric_c.
-#[allow(clippy::too_many_arguments)]
-pub fn create_engine_three_metrics(
-    metric_a: &str,
-    aggregation_type_a: AggregationType,
-    grouping_labels_a: Vec<&str>,
-    data_a: AccumulatorData,
-    query_a: &str,
-    metric_b: &str,
-    aggregation_type_b: AggregationType,
-    grouping_labels_b: Vec<&str>,
-    data_b: AccumulatorData,
-    query_b: &str,
-    metric_c: &str,
-    aggregation_type_c: AggregationType,
-    grouping_labels_c: Vec<&str>,
-    data_c: AccumulatorData,
-    query_c: &str,
-) -> ASAPQueryEngine {
-    let labels_a: Vec<String> = grouping_labels_a.iter().map(|s| s.to_string()).collect();
-    let labels_b: Vec<String> = grouping_labels_b.iter().map(|s| s.to_string()).collect();
-    let labels_c: Vec<String> = grouping_labels_c.iter().map(|s| s.to_string()).collect();
-
-    let mut materializations_by_output = HashMap::new();
-    let mut ids: Vec<u64> = Vec::new();
-
-    for (agg_type, labels, metric) in [
-        (aggregation_type_a, &labels_a, metric_a),
-        (aggregation_type_b, &labels_b, metric_b),
-        (aggregation_type_c, &labels_c, metric_c),
-    ] {
-        let cfg = PrecomputeMaterialization {
-            stored_output_id: None,
-            semantic_fragment: None,
-            population_key_encoding: Default::default(),
-            aggregation_type: agg_type,
-            aggregation_sub_type: String::new(),
-            parameters: HashMap::new(),
-            grouping_labels: KeyByLabelNames::new(labels.clone()).into(),
-            aggregated_labels: KeyByLabelNames::empty(),
-            rollup_labels: KeyByLabelNames::empty(),
-            original_yaml: String::new(),
-            window_size: 1,
-            slide_interval: 1,
-            window_type: WindowKind::Tumbling,
-            window_layout: asap_types::WindowMaterializationLayout::Pane { pane_secs: 1 },
-            pane_origin_ms: None,
-            spatial_filter: String::new(),
-            spatial_filter_normalized: String::new(),
-            metric: metric.to_string(),
-            num_aggregates_to_retain: None,
-            table_name: None,
-            value_projection: None,
-            table_population: None,
-            derived_input: None,
-            table_timestamp_column: None,
-            partitioning: None,
-            value_source_column: None,
-        };
-        let id = cfg.policy_fp_u64();
-        ids.push(id);
-        materializations_by_output.insert(id, cfg);
-    }
-
-    let installed_precompute_plan = Arc::new(InstalledPrecomputePlan {
-        partitioning: Default::default(),
-        raw_programs: Default::default(),
-        precompute_plan: None,
-        materializations_by_output: materializations_by_output
-            .into_iter()
-            .map(|(id, cfg)| (asap_types::sds::StoredOutputId(id), cfg))
-            .collect(),
-        storage_backend: Default::default(),
-    });
-
-    let summary_store =
-        std::sync::Arc::new(crate::storage_engines::sketch_db::index::SketchStore::new());
-    let resolver = std::sync::Arc::new(SeriesIdResolver::new());
-    let agg_cfgs: Vec<_> = ids
-        .iter()
-        .map(|id| {
-            installed_precompute_plan
-                .get_aggregation_config(asap_types::sds::StoredOutputId(*id))
-                .cloned()
-                .expect("agg present")
-        })
-        .collect();
-    let timestamp = 1_000_000_u64;
-    for (idx, data) in [(0, data_a), (1, data_b), (2, data_c)] {
-        let agg_cfg = &agg_cfgs[idx];
-        let agg_id = ids[idx];
-        for (label_values_opt, acc) in data {
-            let key = label_values_opt.map(|labels| KeyByLabelValues { labels });
-            let output = PrecomputedOutput::new(
-                timestamp,
-                timestamp,
-                key,
-                asap_types::PolicyFingerprint(agg_id),
-            );
-            ingest_with_fresh_resolver(&summary_store, &resolver, agg_cfg, &output, acc.as_ref());
-        }
-    }
-
-    let _ = (labels_a, labels_b, labels_c, query_a, query_b, query_c);
-    ASAPQueryEngine::new(1).with_sketch_index(summary_store)
-}
-
-/// Creates a single-pop engine with data at multiple timestamps for testing merge.
-#[allow(clippy::type_complexity)]
-pub fn create_engine_multi_timestamp(
-    metric: &str,
-    aggregation_type: AggregationType,
-    grouping_labels: Vec<&str>,
-    data: Vec<(u64, Option<Vec<String>>, Box<dyn AggregateCore>)>,
-    promql_query: &str,
-) -> ASAPQueryEngine {
-    let grouping_label_strings: Vec<String> =
-        grouping_labels.iter().map(|s| s.to_string()).collect();
-
-    let mut materializations_by_output = HashMap::new();
-    let agg_config = PrecomputeMaterialization {
-        stored_output_id: None,
-        semantic_fragment: None,
-        population_key_encoding: Default::default(),
-        aggregation_type,
-        aggregation_sub_type: String::new(),
-        parameters: HashMap::new(),
-        grouping_labels: KeyByLabelNames::new(grouping_label_strings.clone()).into(),
-        aggregated_labels: KeyByLabelNames::empty(),
-        rollup_labels: KeyByLabelNames::empty(),
-        original_yaml: String::new(),
-        window_size: 1,
-        slide_interval: 1,
-        window_type: WindowKind::Tumbling,
-        window_layout: asap_types::WindowMaterializationLayout::Pane { pane_secs: 1 },
-        pane_origin_ms: None,
-        spatial_filter: String::new(),
-        spatial_filter_normalized: String::new(),
-        metric: metric.to_string(),
-        num_aggregates_to_retain: None,
-        table_name: None,
-        value_projection: None,
-        table_population: None,
-        derived_input: None,
-        table_timestamp_column: None,
-        partitioning: None,
-        value_source_column: None,
-    };
-    let agg_id = agg_config.policy_fp_u64();
-    materializations_by_output.insert(agg_id, agg_config);
-
-    let installed_precompute_plan = Arc::new(InstalledPrecomputePlan {
-        partitioning: Default::default(),
-        raw_programs: Default::default(),
-        precompute_plan: None,
-        materializations_by_output: materializations_by_output
-            .into_iter()
-            .map(|(id, cfg)| (asap_types::sds::StoredOutputId(id), cfg))
-            .collect(),
-        storage_backend: Default::default(),
-    });
-
-    let summary_store =
-        std::sync::Arc::new(crate::storage_engines::sketch_db::index::SketchStore::new());
-    let resolver = std::sync::Arc::new(SeriesIdResolver::new());
-    let agg_cfg = installed_precompute_plan
-        .get_aggregation_config(asap_types::sds::StoredOutputId(agg_id))
-        .cloned()
-        .expect("agg");
-    for (timestamp, label_values_opt, acc) in data {
-        let key = label_values_opt.map(|labels| KeyByLabelValues { labels });
-        let output = PrecomputedOutput::new(
-            timestamp - 1000,
-            timestamp,
-            key,
-            asap_types::PolicyFingerprint(agg_id),
-        );
-        ingest_with_fresh_resolver(&summary_store, &resolver, &agg_cfg, &output, acc.as_ref());
-    }
-    ASAPQueryEngine::new(1).with_sketch_index(summary_store)
-}
-
-/// Creates a single-pop engine with data at multiple timestamps and configurable window.
-///
-/// Like `create_engine_multi_timestamp` but allows setting `window_size` and `window_type`
-/// on the PrecomputeMaterialization (needed for temporal queries like `sum_over_time(metric[5s])`).
-#[allow(clippy::too_many_arguments)]
-#[allow(clippy::type_complexity)]
-pub fn create_engine_multi_timestamp_with_window(
-    metric: &str,
-    aggregation_type: AggregationType,
-    grouping_labels: Vec<&str>,
-    data: Vec<(u64, Option<Vec<String>>, Box<dyn AggregateCore>)>,
-    promql_query: &str,
-    window_size: u64,
-    window_type: WindowKind,
-) -> ASAPQueryEngine {
-    let grouping_label_strings: Vec<String> =
-        grouping_labels.iter().map(|s| s.to_string()).collect();
-
-    let mut materializations_by_output = HashMap::new();
-    let agg_config = PrecomputeMaterialization {
-        stored_output_id: None,
-        semantic_fragment: None,
-        population_key_encoding: Default::default(),
-        aggregation_type,
-        aggregation_sub_type: String::new(),
-        parameters: HashMap::new(),
-        grouping_labels: KeyByLabelNames::new(grouping_label_strings.clone()).into(),
-        aggregated_labels: KeyByLabelNames::empty(),
-        rollup_labels: KeyByLabelNames::empty(),
-        original_yaml: String::new(),
-        window_size,
-        slide_interval: 1,
-        window_type,
-        window_layout: asap_types::WindowMaterializationLayout::Pane { pane_secs: 1 },
-        pane_origin_ms: None,
-        spatial_filter: String::new(),
-        spatial_filter_normalized: String::new(),
-        metric: metric.to_string(),
-        num_aggregates_to_retain: None,
-        table_name: None,
-        value_projection: None,
-        table_population: None,
-        derived_input: None,
-        table_timestamp_column: None,
-        partitioning: None,
-        value_source_column: None,
-    };
-    let agg_id = agg_config.policy_fp_u64();
-    materializations_by_output.insert(agg_id, agg_config);
-
-    let installed_precompute_plan = Arc::new(InstalledPrecomputePlan {
-        partitioning: Default::default(),
-        raw_programs: Default::default(),
-        precompute_plan: None,
-        materializations_by_output: materializations_by_output
-            .into_iter()
-            .map(|(id, cfg)| (asap_types::sds::StoredOutputId(id), cfg))
-            .collect(),
-        storage_backend: Default::default(),
-    });
-
-    let summary_store =
-        std::sync::Arc::new(crate::storage_engines::sketch_db::index::SketchStore::new());
-    let resolver = std::sync::Arc::new(SeriesIdResolver::new());
-    let agg_cfg = installed_precompute_plan
-        .get_aggregation_config(asap_types::sds::StoredOutputId(agg_id))
-        .cloned()
-        .expect("agg");
-    for (timestamp, label_values_opt, acc) in data {
-        let key = label_values_opt.map(|labels| KeyByLabelValues { labels });
-        let output = PrecomputedOutput::new(
-            timestamp - 1000,
-            timestamp,
-            key,
-            asap_types::PolicyFingerprint(agg_id),
-        );
-        ingest_with_fresh_resolver(&summary_store, &resolver, &agg_cfg, &output, acc.as_ref());
-    }
-    ASAPQueryEngine::new(1).with_sketch_index(summary_store)
-}
diff --git a/data_plane/src/tests/test_utilities/mod.rs b/data_plane/src/tests/test_utilities/mod.rs
deleted file mode 100644
index 824a72884..000000000
--- a/data_plane/src/tests/test_utilities/mod.rs
+++ /dev/null
@@ -1,8 +0,0 @@
-//! Engine-construction helpers shared by capability-miss and ASAP-tier tests.
-
-pub mod engine_factories;
-pub mod timing;
-
-pub use engine_factories::*;
-
-pub mod planning;
diff --git a/data_plane/src/tests/test_utilities/planning.rs b/data_plane/src/tests/test_utilities/planning.rs
deleted file mode 100644
index 4a30ba1f0..000000000
--- a/data_plane/src/tests/test_utilities/planning.rs
+++ /dev/null
@@ -1,50 +0,0 @@
-//! Synthetic complete quotes for deployment fixtures; never used in production.
-use control_plane::physical::compiler::{
-    BackendLocalPlanningInput, DeploymentPlanCompiler, BACKEND_REVISION, PLANNER_REVISION,
-};
-
-pub(crate) fn quoted_snapshot(
-    mut snapshot: BackendLocalPlanningInput,
-    metricsql: bool,
-) -> BackendLocalPlanningInput {
-    use control_plane::physical::workload_cost::{
-        enumerate_exact_and_materialized_candidates, manifest, WorkloadCostEvidence, WorkloadQuote,
-    };
-    let (request, environment) = snapshot
-        .clone()
-        .into_physical_compilation_request()
-        .unwrap();
-    let quotes = enumerate_exact_and_materialized_candidates(request)
-        .unwrap()
-        .into_iter()
-        .enumerate()
-        .filter_map(|(index, candidate)| {
-            let plan = if metricsql {
-                DeploymentPlanCompiler.compile_metricsql(candidate.clone(), environment.clone())
-            } else {
-                DeploymentPlanCompiler.compile_promql(candidate.clone(), environment.clone())
-            }
-            .ok()?;
-            let manifest = manifest(&plan, &candidate.queries).unwrap();
-            Some(WorkloadQuote {
-                unit_costs: manifest
-                    .components
-                    .keys()
-                    .map(|key| (key.clone(), if index == 0 { 1.0 } else { 1e12 }))
-                    .collect(),
-                manifest,
-                executable: true,
-            })
-        })
-        .collect();
-    snapshot.workload_cost_evidence = Some(WorkloadCostEvidence {
-        backend_revision: BACKEND_REVISION.into(),
-        planner_revision: PLANNER_REVISION.into(),
-        data_snapshot_id: "data-plane-unit-fixture".into(),
-        model_version: "test-only-unit-costs".into(),
-        observed_at_unix_ms: environment.observed_at_unix_ms,
-        valid_for_ms: environment.max_evidence_age_ms,
-        quotes,
-    });
-    snapshot
-}
diff --git a/data_plane/src/tests/test_utilities/timing.rs b/data_plane/src/tests/test_utilities/timing.rs
deleted file mode 100644
index 3b579ff4e..000000000
--- a/data_plane/src/tests/test_utilities/timing.rs
+++ /dev/null
@@ -1,64 +0,0 @@
-//! Wall-clock budgets for tests that wait on background progress.
-//!
-//! Several storage / maintenance tests wait for work that a *background*
-//! thread performs — the persistence flusher sealing and evicting epochs, the
-//! finite-input sealer draining an admitted revision. A fixed five-second
-//! budget is generous when the test owns the machine and far too tight when
-//! `cargo test` runs one test per core: on a 64-way runner the waiter and the
-//! background thread it is waiting on compete for the same CPUs, and the
-//! budget expires while the work is merely queued. That is what made the
-//! suite's flush / evict / restart tests fail under the default parallel run
-//! and pass on a serial re-run, which in turn kept the data-plane library
-//! tests out of the default CI gate.
-//!
-//! Scaling the budget with the test concurrency keeps both properties: a
-//! passing test still returns as soon as its condition holds (these are
-//! polling waits, not sleeps), and a genuinely stuck condition still fails —
-//! later, but deterministically.
-
-use std::time::Duration;
-
-/// Scale a wait budget by the concurrency the test binary is running at.
-///
-/// Override with `ASAP_TEST_TIMEOUT_SCALE=<n>` to pin a multiplier (useful on
-/// a loaded shared machine, or to re-tighten the budget while debugging a
-/// hang). Otherwise the multiplier is derived from `RUST_TEST_THREADS` when
-/// the harness was told a thread count, and from the machine's parallelism
-/// otherwise, capped so the worst case stays bounded.
-pub fn scaled(budget: Duration) -> Duration {
-    budget * scale()
-}
-
-fn scale() -> u32 {
-    if let Some(explicit) = std::env::var("ASAP_TEST_TIMEOUT_SCALE")
-        .ok()
-        .and_then(|value| value.trim().parse::<u32>().ok())
-    {
-        return explicit.max(1);
-    }
-    let threads = std::env::var("RUST_TEST_THREADS")
-        .ok()
-        .and_then(|value| value.trim().parse::<usize>().ok())
-        .or_else(|| std::thread::available_parallelism().ok().map(|n| n.get()))
-        .unwrap_or(1);
-    ((threads / 8) as u32).clamp(1, 8)
-}
-
-/// A deadline `budget` from now, scaled by [`scaled`].
-pub fn deadline(budget: Duration) -> std::time::Instant {
-    std::time::Instant::now() + scaled(budget)
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    #[test]
-    fn explicit_scale_overrides_the_derived_one() {
-        // The env var is process-global; assert the parsing contract on the
-        // pure helper instead of mutating it under a parallel harness.
-        assert!(scale() >= 1);
-        assert!(scaled(Duration::from_secs(5)) >= Duration::from_secs(5));
-        assert!(scaled(Duration::from_secs(5)) <= Duration::from_secs(40));
-    }
-}
diff --git a/data_plane/src/tests/trait_design_tests.rs b/data_plane/src/tests/trait_design_tests.rs
deleted file mode 100644
index f8f5d6f04..000000000
--- a/data_plane/src/tests/trait_design_tests.rs
+++ /dev/null
@@ -1,81 +0,0 @@
-#[cfg(test)]
-use crate::storage_engines::types::{
-    KeyByLabelValues, MultipleSubpopulationAggregate, SingleSubpopulationAggregate,
-};
-use asap_physical_operators::summary_kernels::{KeyedSumCountAccumulator, SumAccumulator};
-use asap_types::Statistic;
-
-#[test]
-fn test_single_subpopulation_interface() {
-    // Single accumulator - matches Python behavior exactly
-    let acc: Box<dyn SingleSubpopulationAggregate> = Box::new(SumAccumulator::with_sum(42.0));
-
-    // ✅ Query without key - this is the correct interface for Single accumulators
-    let result = acc.query(Statistic::Sum, None).unwrap();
-    assert_eq!(result, 42.0);
-}
-
-#[test]
-fn test_multiple_subpopulation_interface() {
-    // Multiple accumulator - matches Python behavior exactly
-    let mut multi_acc = KeyedSumCountAccumulator::new();
-
-    let mut key = KeyByLabelValues::new();
-    key.insert("web".to_string());
-    multi_acc.add_sum(key.clone(), 100.0);
-
-    let acc: Box<dyn MultipleSubpopulationAggregate> = Box::new(multi_acc);
-
-    // ✅ Query with key - this is the correct interface for Multiple accumulators
-    let result = acc.query(Statistic::Sum, &key, None).unwrap();
-    assert_eq!(result, 100.0);
-
-    // ✅ Get all keys
-    let keys = acc.get_keys().unwrap();
-    assert_eq!(keys.len(), 1);
-    assert_eq!(keys[0], key);
-}
-
-#[test]
-fn test_interface_prevents_misuse() {
-    // This test documents what WON'T compile - which is exactly what we want!
-
-    let single_acc: Box<dyn SingleSubpopulationAggregate> =
-        Box::new(SumAccumulator::with_sum(42.0));
-    let multi_acc: Box<dyn MultipleSubpopulationAggregate> =
-        Box::new(KeyedSumCountAccumulator::new());
-
-    // ✅ These work - correct usage
-    let _result1 = single_acc.query(Statistic::Sum, None);
-    let key = KeyByLabelValues::new();
-    let _result2 = multi_acc.query(Statistic::Sum, &key, None);
-
-    // ❌ These would be compile-time errors (commented out):
-    // let _result3 = single_acc.query(Statistic::Sum, &key);  // Too many args for Single
-    // let _result4 = multi_acc.query(Statistic::Sum);         // Too few args for Multiple
-
-    // This is exactly the type safety we wanted to achieve!
-}
-
-#[test]
-fn test_python_alignment() {
-    // Demonstrate that the Rust interface now matches Python exactly
-
-    // Python: sum_accumulator.query(Statistic.SUM)
-    // Rust:   sum_accumulator.query(Statistic::Sum)
-    let sum_acc: Box<dyn SingleSubpopulationAggregate> = Box::new(SumAccumulator::with_sum(42.0));
-    assert_eq!(sum_acc.query(Statistic::Sum, None).unwrap(), 42.0);
-
-    // Python: multiple_accumulator.query(Statistic.SUM, key)
-    // Rust:   multiple_accumulator.query(Statistic::Sum, &key)
-    let mut multi_acc = KeyedSumCountAccumulator::new();
-    let key = KeyByLabelValues::new();
-    multi_acc.add_sum(key.clone(), 100.0);
-    let multi_trait: Box<dyn MultipleSubpopulationAggregate> = Box::new(multi_acc);
-    assert_eq!(
-        multi_trait.query(Statistic::Sum, &key, None).unwrap(),
-        100.0
-    );
-
-    // Perfect alignment with Python behavior!
-}
diff --git a/data_plane/src/update_sampling/coordinator.rs b/data_plane/src/update_sampling/coordinator.rs
deleted file mode 100644
index 5b323e866..000000000
--- a/data_plane/src/update_sampling/coordinator.rs
+++ /dev/null
@@ -1,361 +0,0 @@
-//! The per-edge coordinated-sampling state machine.
-//!
-//! Historically this module also ran the Cormode–Muthukrishnan–Yi distributed
-//! functional-monitoring countdown (global-threshold alerting: register →
-//! grant `(slack, sample_p)` → countdown → report → alert). That alerting half
-//! is RETIRED as of the 2026-07 insert-time-GOS redesign
-//! (`ASAPCollector/docs/design-gos-unified-edge-telemetry.md` §11): "Alerting
-//! and any other query-time decision is made entirely at the backend against
-//! [the reconstructed sketch state]; the edge no longer makes alerting
-//! decisions itself." An edge/collector must never be the thing that fires an
-//! alert — that decision now belongs entirely to query-time reads of the
-//! backend's synced state, not to this streaming protocol.
-//!
-//! What's left, and what changed: `obsCount`/rate-tracking (feeding the
-//! coordinated-sampling `p_i` grant) is a genuinely separate concern from
-//! alerting and is PRESERVED — but it no longer piggybacks on the alerting
-//! trigger. The whole-sketch ε-floor `p_i = 1/(1 + ε²·rate_i)`
-//! ([`super::sampling_alloc::epsilon_sample_floor`]) is a PURE PER-EDGE
-//! function of that edge's own reported rate — it never depended on other
-//! edges' state or on a global estimate/τ, so retiring the countdown that used
-//! to gate reporting doesn't remove anything the sampling law needed. An edge
-//! now reports its rate on its own periodic cadence (see the Go edge's
-//! `Engine.Observe` — decoupled from any value/slack threshold), and the
-//! coordinator answers that ONE edge with its own fresh grant immediately —
-//! no more re-broadcasting to every registered edge on every report (that
-//! fan-out existed only because slack sizing depended on the full edge set).
-//!
-//! `MonitorConfig.tau` is no longer consulted here (alerting is gone); it
-//! stays in the struct only because it still rides the shared streaming-config
-//! `monitors:` schema alongside `epsilon`/`window_ms` — trimming it is a
-//! config-schema change, not a coordinator behavior change, and out of scope
-//! here.
-
-use std::collections::HashMap;
-
-use super::sampling_alloc::epsilon_sample_floor;
-
-/// Which readout of a series' sketch a monitor's rate is scoped to. Retained
-/// for identity/config-schema compatibility (a monitor is still keyed by
-/// `(agg_id, key)`, and `key` is only meaningful for `CmsPoint`) even though
-/// no functional-specific THRESHOLDING happens here anymore.
-pub use asap_types::MonitorFunctional as Functional;
-
-/// Static configuration for one monitor, sourced from the streaming-config
-/// `monitors:` section.
-#[derive(Clone, Debug, PartialEq)]
-pub struct MonitorConfig {
-    pub agg_id: u64,
-    pub key: Vec<u8>,
-    /// Accepted for wire compatibility; unused by sampling.
-    pub tau: f64,
-    /// The ε-floor tolerance feeding [`epsilon_sample_floor`].
-    pub epsilon: f64,
-    pub window_ms: u64,
-    pub functional: Functional,
-}
-
-impl Default for MonitorConfig {
-    fn default() -> Self {
-        Self {
-            agg_id: 0,
-            key: Vec::new(),
-            tau: 0.0,
-            epsilon: 0.05,
-            window_ms: 0,
-            functional: Functional::Sum,
-        }
-    }
-}
-
-/// An action the coordinator wants the transport to perform. `Alert` is gone —
-/// this coordinator no longer makes alerting decisions (see module docs).
-#[derive(Clone, Debug, PartialEq)]
-pub enum Action {
-    /// Grant the reporting edge its ε-floor sample probability, independently of
-    /// other edges. `local_slack` remains zero for wire compatibility.
-    Grant {
-        edge_id: String,
-        round: u64,
-        local_slack: f64,
-        window_start_ms: u64,
-        sample_p: f64,
-    },
-}
-
-#[derive(Clone, Debug, Default)]
-struct EdgeView {
-    /// Last `rate` (items/window) the edge reported; 0 = unknown ⇒ no
-    /// sampling for this edge. The only per-edge state left — there is no
-    /// more `known_value`/global estimate to track once alerting is gone.
-    rate: f64,
-}
-
-/// One monitor's coordinator state for the current epoch: which edges are
-/// registered and each one's last-reported rate.
-pub struct Monitor {
-    cfg: MonitorConfig,
-    window_start_ms: u64,
-    round: u64,
-    edges: HashMap<String, EdgeView>,
-}
-
-impl Monitor {
-    pub fn new(cfg: MonitorConfig) -> Self {
-        Self {
-            cfg,
-            window_start_ms: 0,
-            round: 0,
-            edges: HashMap::new(),
-        }
-    }
-
-    pub fn window_start_ms(&self) -> u64 {
-        self.window_start_ms
-    }
-    pub fn round(&self) -> u64 {
-        self.round
-    }
-    #[cfg(test)]
-    pub fn edge_count(&self) -> usize {
-        self.edges.len()
-    }
-
-    /// The coordinated-sampling grant this monitor would currently compute for
-    /// `edge_id`, or `None` if the edge hasn't reported a rate yet
-    /// (test/observability — e.g. the cross-language e2e harness polls this to
-    /// confirm a real grant reached an edge, without needing a callback hook
-    /// into `dispatch`).
-    pub fn sample_p_for_edge(&self, edge_id: &str) -> Option<f64> {
-        let edge = self.edges.get(edge_id)?;
-        if edge.rate <= 0.0 {
-            return None;
-        }
-        Some(epsilon_sample_floor(self.cfg.epsilon, edge.rate))
-    }
-
-    /// Ensure the monitor is on the epoch for `window_start`. Advancing resets
-    /// every edge's rate (a new window starts a fresh rate measurement).
-    /// Returns false if the timestamp is for a stale (already-closed) epoch,
-    /// in which case the caller should drop the event.
-    fn ensure_epoch(&mut self, window_start: u64) -> bool {
-        if window_start == self.window_start_ms {
-            return true;
-        }
-        if window_start > self.window_start_ms {
-            self.window_start_ms = window_start;
-            self.round = 0;
-            for e in self.edges.values_mut() {
-                *e = EdgeView::default();
-            }
-            return true;
-        }
-        false // stale epoch
-    }
-
-    /// Register or refresh an edge in its reported epoch. Registration returns no
-    /// grant: the edge remains unsampled (p=1) until its first rate report and
-    /// does not affect other edges' grants.
-    pub fn on_register(
-        &mut self,
-        edge_id: &str,
-        epoch_window_ms: u64,
-        window_start_ms: u64,
-    ) -> Vec<Action> {
-        // Alignment guard: a mismatched window size would silently corrupt
-        // epoch bookkeeping. Refuse the registration (no grants) and let the
-        // caller log/close the stream.
-        if epoch_window_ms != self.cfg.window_ms {
-            return Vec::new();
-        }
-        if !self.ensure_epoch(window_start_ms) {
-            return Vec::new();
-        }
-        self.edges.entry(edge_id.to_string()).or_default();
-        Vec::new()
-    }
-
-    /// Handle an edge's periodic rate report: record the rate and answer that
-    /// SAME edge with its freshly-computed coordinated-sampling grant.
-    /// Stale-epoch and unknown-edge reports are dropped.
-    pub fn on_report(&mut self, edge_id: &str, window_start_ms: u64, rate: f64) -> Vec<Action> {
-        if window_start_ms != self.window_start_ms {
-            // Could be a future epoch we haven't advanced to yet — advance on
-            // strictly-greater, drop on stale.
-            if window_start_ms > self.window_start_ms {
-                if !self.ensure_epoch(window_start_ms) {
-                    return Vec::new();
-                }
-            } else {
-                return Vec::new();
-            }
-        }
-        let Some(edge) = self.edges.get_mut(edge_id) else {
-            return Vec::new(); // unknown edge — registration precedes reports
-        };
-        // Ignore non-positive = unknown; keeps the last known-good rate.
-        if rate > 0.0 {
-            edge.rate = rate;
-        }
-        self.round += 1;
-        let p = if edge.rate > 0.0 {
-            epsilon_sample_floor(self.cfg.epsilon, edge.rate)
-        } else {
-            1.0
-        };
-        vec![Action::Grant {
-            edge_id: edge_id.to_string(),
-            round: self.round,
-            local_slack: 0.0,
-            window_start_ms: self.window_start_ms,
-            sample_p: p,
-        }]
-    }
-
-    /// An edge left (stream closed). Just drops it from membership — there is
-    /// no mass/estimate to fold anywhere anymore.
-    pub fn on_leave(&mut self, edge_id: &str) {
-        self.edges.remove(edge_id);
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    fn cfg(epsilon: f64) -> MonitorConfig {
-        MonitorConfig {
-            agg_id: 1,
-            key: Vec::new(),
-            tau: 0.0,
-            epsilon,
-            window_ms: 60_000,
-            ..Default::default()
-        }
-    }
-
-    fn grant_for<'a>(actions: &'a [Action], edge: &str) -> Option<&'a Action> {
-        actions
-            .iter()
-            .find(|a| matches!(a, Action::Grant { edge_id, .. } if edge_id == edge))
-    }
-
-    fn sample_p_in(actions: &[Action], edge: &str) -> f64 {
-        match grant_for(actions, edge) {
-            Some(Action::Grant { sample_p, .. }) => *sample_p,
-            _ => panic!("no grant for {edge}"),
-        }
-    }
-
-    #[test]
-    fn registration_grants_nothing() {
-        // Registration leaves grants unchanged; the new edge remains unsampled
-        // until its first rate report.
-        let mut m = Monitor::new(cfg(0.05));
-        let a = m.on_register("e1", 60_000, 0);
-        assert!(a.is_empty());
-        assert_eq!(m.edge_count(), 1);
-        assert_eq!(m.round(), 0);
-    }
-
-    #[test]
-    fn alignment_guard_rejects_mismatched_window() {
-        let mut m = Monitor::new(cfg(0.05));
-        let a = m.on_register("e1", 30_000, 0); // wrong window size
-        assert!(a.is_empty());
-        assert_eq!(m.edge_count(), 0);
-    }
-
-    #[test]
-    fn report_grants_only_the_reporting_edge() {
-        // A rate report grants only the reporting edge; sampling is per-edge.
-        let mut m = Monitor::new(cfg(0.05));
-        m.on_register("e1", 60_000, 0);
-        m.on_register("e2", 60_000, 0);
-        let a = m.on_report("e1", 0, 100_000.0);
-        assert_eq!(a.len(), 1, "report should grant only the reporting edge");
-        assert!(grant_for(&a, "e1").is_some());
-        assert!(grant_for(&a, "e2").is_none());
-    }
-
-    #[test]
-    fn sample_p_matches_epsilon_floor_of_reported_rate() {
-        let mut m = Monitor::new(cfg(0.05));
-        m.on_register("e1", 60_000, 0);
-        let a = m.on_report("e1", 0, 100_000.0);
-        let want = epsilon_sample_floor(0.05, 100_000.0);
-        assert!((sample_p_in(&a, "e1") - want).abs() < 1e-12);
-    }
-
-    #[test]
-    fn single_edge_is_sampled_like_any_other() {
-        // A lone high-rate edge is sampled by the same law as a larger edge set;
-        // the ε-floor is independent of edge count.
-        let mut m = Monitor::new(cfg(0.05));
-        m.on_register("e1", 60_000, 0);
-        let a = m.on_report("e1", 0, 100_000.0);
-        let p = sample_p_in(&a, "e1");
-        assert!(
-            p < 1.0,
-            "a lone high-rate edge should still be sampled, got p={p}"
-        );
-    }
-
-    #[test]
-    fn unknown_rate_yields_unsampled_grant() {
-        let mut m = Monitor::new(cfg(0.05));
-        m.on_register("e1", 60_000, 0);
-        let a = m.on_report("e1", 0, 0.0); // rate unknown/non-positive
-        assert_eq!(sample_p_in(&a, "e1"), 1.0);
-    }
-
-    #[test]
-    fn report_before_register_is_dropped() {
-        let mut m = Monitor::new(cfg(0.05));
-        let a = m.on_report("e1", 0, 100_000.0);
-        assert!(a.is_empty(), "unregistered edge's report must be dropped");
-    }
-
-    #[test]
-    fn stale_epoch_report_dropped() {
-        let mut m = Monitor::new(cfg(0.05));
-        m.on_register("e1", 60_000, 120_000); // epoch starts at 120_000
-        assert_eq!(m.window_start_ms(), 120_000);
-        let a = m.on_report("e1", 60_000, 100_000.0); // previous epoch
-        assert!(a.is_empty());
-    }
-
-    #[test]
-    fn epoch_advance_resets_rate() {
-        let mut m = Monitor::new(cfg(0.05));
-        m.on_register("e1", 60_000, 0);
-        m.on_report("e1", 0, 100_000.0);
-        // A report for the next epoch advances and resets the rate: an
-        // unknown (0) rate on the fresh epoch yields an unsampled grant.
-        let a = m.on_report("e1", 60_000, 0.0);
-        assert_eq!(m.window_start_ms(), 60_000);
-        assert_eq!(sample_p_in(&a, "e1"), 1.0);
-    }
-
-    #[test]
-    fn leave_drops_membership() {
-        let mut m = Monitor::new(cfg(0.05));
-        m.on_register("e1", 60_000, 0);
-        m.on_register("e2", 60_000, 0);
-        assert_eq!(m.edge_count(), 2);
-        m.on_leave("e2");
-        assert_eq!(m.edge_count(), 1);
-    }
-
-    #[test]
-    fn rate_stays_last_known_good_on_non_positive_report() {
-        let mut m = Monitor::new(cfg(0.05));
-        m.on_register("e1", 60_000, 0);
-        m.on_report("e1", 0, 100_000.0);
-        // A subsequent non-positive rate report doesn't clobber the last
-        // known-good rate.
-        let a = m.on_report("e1", 0, 0.0);
-        let want = epsilon_sample_floor(0.05, 100_000.0);
-        assert!((sample_p_in(&a, "e1") - want).abs() < 1e-12);
-    }
-}
diff --git a/data_plane/src/update_sampling/epoch.rs b/data_plane/src/update_sampling/epoch.rs
deleted file mode 100644
index 9ebcef4e3..000000000
--- a/data_plane/src/update_sampling/epoch.rs
+++ /dev/null
@@ -1,36 +0,0 @@
-//! Tumbling-epoch alignment. The coordinator's monitoring epoch must use the
-//! IDENTICAL formula the edge runtime uses for its window start
-//! (`(t / window) * window`, see asap-precompute-go window.go `initWindow`) so
-//! both sides agree on the epoch id without negotiation.
-
-/// Align a timestamp (ms) down to its tumbling-window start for the given
-/// window size (ms). A zero window size yields 0 (treated as "unwindowed").
-#[inline]
-pub fn align(t_ms: u64, window_ms: u64) -> u64 {
-    if window_ms == 0 {
-        0
-    } else {
-        (t_ms / window_ms) * window_ms
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::align;
-
-    #[test]
-    fn aligns_to_window_start() {
-        assert_eq!(align(0, 60_000), 0);
-        assert_eq!(align(59_999, 60_000), 0);
-        assert_eq!(align(60_000, 60_000), 60_000);
-        assert_eq!(align(125_000, 60_000), 120_000);
-    }
-
-    #[test]
-    fn matches_go_formula() {
-        // Mirrors Go (refMs / size) * size for a representative timestamp.
-        let t = 1_700_000_123_456u64;
-        let w = 60_000u64;
-        assert_eq!(align(t, w), (t / w) * w);
-    }
-}
diff --git a/data_plane/src/update_sampling/mod.rs b/data_plane/src/update_sampling/mod.rs
deleted file mode 100644
index 2e7263d92..000000000
--- a/data_plane/src/update_sampling/mod.rs
+++ /dev/null
@@ -1,19 +0,0 @@
-//! Backend coordination of per-edge update sampling.
-//!
-//! Edges periodically report observation rates and receive a whole-sketch
-//! ε-floor grant, `p_i = 1/(1+ε²·rate_i)`. Each grant depends only on that
-//! edge's rate. Alert decisions belong to query-time reads of backend state.
-//!
-//! * [`coordinator`] maintains edge sampling state.
-//! * [`epoch`] aligns tumbling epochs.
-//! * [`server`] implements the bidirectional monitor service.
-//! * [`sampling_alloc`] defines the sampling law and eligible sketch families.
-
-pub mod coordinator;
-pub mod epoch;
-pub mod sampling_alloc;
-pub mod server;
-
-pub use coordinator::{Action, Functional, Monitor, MonitorConfig};
-pub use sampling_alloc::epsilon_sample_floor;
-pub use server::{MonitorCoordinator, MonitorServiceImpl};
diff --git a/data_plane/src/update_sampling/sampling_alloc.rs b/data_plane/src/update_sampling/sampling_alloc.rs
deleted file mode 100644
index ecfb6968f..000000000
--- a/data_plane/src/update_sampling/sampling_alloc.rs
+++ /dev/null
@@ -1,82 +0,0 @@
-//! Coordinated update-sampling: the per-edge sampling-probability `p_i` law.
-//!
-//! For a SKETCH-based warm tier the law is a single, closed form — the
-//! **whole-sketch ε-floor**
-//!
-//! ```text
-//!   p_i = 1 / (1 + ε²·rate_i)
-//! ```
-//!
-//! and that is all this module provides ([`epsilon_sample_floor`]).
-//!
-//! Why one law (and not a per-key `√(f_i/rate_i)` allocation): the sampling
-//! protects the warm sketch's accuracy, and a sketch's point/L2 estimate error
-//! is bounded by the sketch NORM (‖f‖, the rate spread over buckets —
-//! NitroSketch), never by a single key's `f(x)`. So the only accuracy a per-edge
-//! `p_i` buys is "keep this edge's L2/mass contribution within ε":
-//! `ε_s = √((1−p)/(p·rate)) ≤ ε`, which solves to the floor above. The
-//! `√(f_i/rate_i)` KKT allocation (minimise `Σ rate_i·p_i` s.t.
-//! `Σ f_i·(1−p_i)/p_i ≤ V`) only holds when a key is EXACT-counted OUTSIDE the
-//! sketch — and sampling a single exact counter is pointless — so it is not a
-//! valid sketch-sampling regime and has been retired.
-//!
-//! **Which sketches:** the law applies to any additive/linear sketch whose
-//! estimate is unbiased (after a 1/p rescale) under update-sampling, and whose
-//! error is norm-bounded: **Count-Min (L1), Count-Sketch (L2), DDSketch
-//! (additive bucket counts, per-item d=1)**. It does NOT apply to **KLL** —
-//! non-linear random compaction, so dropping or weighting an insert breaks the
-//! rank guarantee — nor to **HLL / cardinality**: update-sampling systematically
-//! under-counts distinct items (you measure the sample's cardinality, not the
-//! full set) and is not 1/p-correctable. KLL and HLL therefore emit every update
-//! (matches the edge gating in precompute.applyGrantedSampleP and design §3.1).
-
-/// The whole-sketch coordinated-sampling probability for an edge with the given
-/// per-window `rate` (items/window): `p = 1/(1 + ε²·rate)`.
-///
-/// Derivation — never sample so hard that the per-edge sampling noise
-/// `ε_s = √((1−p)/(p·rate))` exceeds the CDM threshold tolerance `ε`:
-///
-/// ```text
-///   ε²·p·rate ≥ 1 − p   ⇒   p·(ε²·rate + 1) ≥ 1   ⇒   p ≥ 1/(1 + ε²·rate)
-/// ```
-///
-/// With `rate ≤ 0` or `epsilon ≤ 0` the result is 1.0 (no sampling). The value is
-/// always in `(0,1]` and grows toward 1 as the edge's rate falls (a low-`N` edge
-/// can't absorb sampling noise within the band).
-pub fn epsilon_sample_floor(epsilon: f64, rate: f64) -> f64 {
-    if rate <= 0.0 || epsilon <= 0.0 {
-        return 1.0;
-    }
-    1.0 / (1.0 + epsilon * epsilon * rate)
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    #[test]
-    fn epsilon_floor_monotone_and_bounded() {
-        // Floor in (0,1], rises toward 1 as rate falls.
-        let eps = 0.05;
-        let hot = epsilon_sample_floor(eps, 100000.0);
-        let quiet = epsilon_sample_floor(eps, 1000.0);
-        assert!(hot > 0.0 && hot <= 1.0);
-        assert!(quiet > 0.0 && quiet <= 1.0);
-        assert!(quiet > hot, "lower-rate edge needs a higher floor");
-        // Closed form: p = 1/(1 + ε²·rate).
-        assert!((hot - 1.0 / (1.0 + eps * eps * 100000.0)).abs() < 1e-12);
-        // Degenerate inputs ⇒ no sampling.
-        assert_eq!(epsilon_sample_floor(eps, 0.0), 1.0);
-        assert_eq!(epsilon_sample_floor(0.0, 1000.0), 1.0);
-    }
-
-    #[test]
-    fn floor_keeps_sampling_noise_within_epsilon() {
-        // The floored p keeps ε_s = √((1−p)/(p·rate)) ≤ ε.
-        let eps = 0.05;
-        let rate = 100000.0;
-        let p = epsilon_sample_floor(eps, rate);
-        let eps_s = ((1.0 - p) / (p * rate)).sqrt();
-        assert!(eps_s <= eps + 1e-9, "ε_s {eps_s} should be ≤ ε {eps}");
-    }
-}
diff --git a/data_plane/src/update_sampling/server.rs b/data_plane/src/update_sampling/server.rs
deleted file mode 100644
index c05025458..000000000
--- a/data_plane/src/update_sampling/server.rs
+++ /dev/null
@@ -1,411 +0,0 @@
-//! tonic bidi-streaming `MonitorService` server. Each edge opens one
-//! `Monitor` stream and multiplexes all of its monitors over it. The server
-//! reads `EdgeToCoord` (register / report) messages, drives the per-monitor
-//! [`Monitor`] state machine, and pushes the resulting `CoordToEdge`
-//! (coordinated-sampling grant) back to the addressed edge's stream.
-//! Global-threshold alerting is retired (see `coordinator` module docs) — this
-//! server never fires one.
-
-use std::collections::HashMap;
-use std::pin::Pin;
-use std::sync::Arc;
-
-use tokio::sync::{mpsc, Mutex};
-use tokio_stream::wrappers::ReceiverStream;
-use tokio_stream::{Stream, StreamExt};
-use tonic::{Request, Response, Status, Streaming};
-use tracing::{debug, info, warn};
-
-use asap_otel_proto::monitor::v1::{
-    coord_to_edge, edge_to_coord,
-    monitor_service_server::{MonitorService, MonitorServiceServer},
-    CoordToEdge, EdgeToCoord, SlackGrant,
-};
-
-use super::coordinator::{Action, Monitor, MonitorConfig};
-
-type MonKey = (u64, Vec<u8>);
-type EdgeTx = mpsc::Sender<Result<CoordToEdge, Status>>;
-
-/// Shared coordinator state behind the gRPC service. One per data-plane process.
-pub struct MonitorCoordinator {
-    /// Live per-monitor scalar state machines, created lazily from `cfgs`.
-    monitors: Mutex<HashMap<MonKey, Monitor>>,
-    /// Monitor specs (ε, window) from the streaming-config `monitors:`
-    /// section. Behind an `RwLock` so the control plane's hot-reload
-    /// (`reconfigure`) can add/update/remove monitors on a live coordinator
-    /// without a process restart. Held only for brief, non-`await` critical
-    /// sections, so a `std` lock is safe in async code.
-    cfgs: std::sync::RwLock<HashMap<MonKey, MonitorConfig>>,
-    /// Outbound stream sender per connected edge.
-    edges: Mutex<HashMap<String, EdgeTx>>,
-}
-
-impl MonitorCoordinator {
-    pub fn new(cfgs: Vec<MonitorConfig>) -> Arc<Self> {
-        let cfgs = cfgs
-            .into_iter()
-            .map(|c| ((c.agg_id, c.key.clone()), c))
-            .collect();
-        Arc::new(Self {
-            monitors: Mutex::new(HashMap::new()),
-            cfgs: std::sync::RwLock::new(cfgs),
-            edges: Mutex::new(HashMap::new()),
-        })
-    }
-
-    #[cfg(test)]
-    /// Number of configured monitors (test/observability).
-    pub fn monitor_count(&self) -> usize {
-        self.cfgs.read().unwrap().len()
-    }
-
-    /// The coordinated-sampling grant currently computed for `edge_id` under
-    /// monitor `(agg_id, key)`, or `None` if the monitor doesn't exist yet or
-    /// that edge hasn't reported a rate (test/observability — see
-    /// `Monitor::sample_p_for_edge`).
-    pub async fn granted_sample_p(&self, agg_id: u64, key: &[u8], edge_id: &str) -> Option<f64> {
-        let monitors = self.monitors.lock().await;
-        monitors
-            .get(&(agg_id, key.to_vec()))?
-            .sample_p_for_edge(edge_id)
-    }
-
-    /// Hot-reload the monitor set from a freshly-pushed streaming-config.
-    ///
-    /// The coordinator originally read `monitors:` only at boot; a monitor the
-    /// control plane published *after* start (via the `/api/v1/streaming-config`
-    /// hot-reload POST) never reached it, so every edge registering for that
-    /// monitor was rejected as "unconfigured". This applies the new spec list to
-    /// the live coordinator:
-    ///   * **added** specs become matchable immediately (the next register
-    ///     lazily builds the `Monitor`);
-    ///   * **changed** specs (different τ/ε/window for an existing key) drop the
-    ///     stale live `Monitor` so the next register rebuilds it under the new
-    ///     spec — the edge re-registers every epoch, so this self-heals within
-    ///     one window;
-    ///   * **removed** specs drop both the spec and any live state.
-    /// Unchanged monitors keep their in-flight per-edge rate state untouched.
-    ///
-    /// Returns `(added, changed, removed)` counts for observability. Idempotent:
-    /// re-applying the same specs is a no-op that returns `(0, 0, 0)`.
-    pub async fn reconfigure(&self, specs: Vec<MonitorConfig>) -> (usize, usize, usize) {
-        let new_cfgs: HashMap<MonKey, MonitorConfig> = specs
-            .into_iter()
-            .map(|c| ((c.agg_id, c.key.clone()), c))
-            .collect();
-
-        // Diff against the current specs to find keys to evict from live state
-        // (removed, or changed so the live Monitor's τ is stale).
-        let (added, changed, removed, evict): (usize, usize, usize, Vec<MonKey>) = {
-            let old = self.cfgs.read().unwrap();
-            let mut added = 0;
-            let mut changed = 0;
-            let mut evict = Vec::new();
-            for (k, c) in new_cfgs.iter() {
-                match old.get(k) {
-                    None => added += 1,
-                    Some(prev) if prev != c => {
-                        changed += 1;
-                        evict.push(k.clone());
-                    }
-                    Some(_) => {}
-                }
-            }
-            let mut removed = 0;
-            for k in old.keys() {
-                if !new_cfgs.contains_key(k) {
-                    removed += 1;
-                    evict.push(k.clone());
-                }
-            }
-            (added, changed, removed, evict)
-        };
-
-        if added == 0 && changed == 0 && removed == 0 {
-            return (0, 0, 0);
-        }
-
-        // Swap the spec map first so any register racing the eviction below sees
-        // the new spec (and rebuilds correctly), then drop stale live state.
-        *self.cfgs.write().unwrap() = new_cfgs;
-        if !evict.is_empty() {
-            let mut monitors = self.monitors.lock().await;
-            for k in &evict {
-                monitors.remove(k);
-            }
-        }
-        (added, changed, removed)
-    }
-
-    /// Apply a register and return the resulting actions, or None if no monitor
-    /// is configured for (agg_id, key).
-    async fn apply_register(
-        &self,
-        agg_id: u64,
-        key: Vec<u8>,
-        edge_id: &str,
-        epoch_window_ms: u64,
-        window_start_ms: u64,
-    ) -> Option<Vec<Action>> {
-        let mk = (agg_id, key.clone());
-        let cfg = {
-            let cfgs = self.cfgs.read().unwrap();
-            match cfgs.get(&mk) {
-                Some(c) => c.clone(),
-                None => {
-                    warn!(
-                        agg_id,
-                        req_key = ?key,
-                        req_key_len = key.len(),
-                        configured = ?cfgs.keys().map(|(a, k)| format!("{a}/len{}", k.len())).collect::<Vec<_>>(),
-                        "apply_register MISS — (agg_id,key) not in cfgs"
-                    );
-                    return None;
-                }
-            }
-        };
-        let mut monitors = self.monitors.lock().await;
-        let mon = monitors.entry(mk).or_insert_with(|| Monitor::new(cfg));
-        Some(mon.on_register(edge_id, epoch_window_ms, window_start_ms))
-    }
-
-    async fn apply_report(
-        &self,
-        agg_id: u64,
-        key: Vec<u8>,
-        edge_id: &str,
-        window_start_ms: u64,
-        rate: f64,
-    ) -> Option<Vec<Action>> {
-        let mk = (agg_id, key);
-        let mut monitors = self.monitors.lock().await;
-        let mon = monitors.get_mut(&mk)?;
-        Some(mon.on_report(edge_id, window_start_ms, rate))
-    }
-
-    /// Dispatch coordinator actions: grants to the addressed edge's stream.
-    /// No alert path — this coordinator no longer makes alerting decisions
-    /// (see `coordinator` module docs).
-    async fn dispatch(&self, agg_id: u64, key: &[u8], actions: Vec<Action>) {
-        for action in actions {
-            let Action::Grant {
-                edge_id,
-                round,
-                local_slack,
-                window_start_ms,
-                sample_p,
-            } = action;
-            let msg = CoordToEdge {
-                msg: Some(coord_to_edge::Msg::Grant(SlackGrant {
-                    agg_id,
-                    key: key.to_vec(),
-                    round,
-                    local_slack,
-                    window_start_ms,
-                    sample_p,
-                })),
-            };
-            let tx = {
-                let edges = self.edges.lock().await;
-                edges.get(&edge_id).cloned()
-            };
-            if let Some(tx) = tx {
-                if tx.send(Ok(msg)).await.is_err() {
-                    debug!(edge = %edge_id, "grant send failed (edge gone)");
-                }
-            }
-        }
-    }
-
-    /// Handle one inbound envelope from an edge stream. Records the edge's
-    /// sender on first register so grants can be routed back to it.
-    async fn handle_msg(
-        self: &Arc<Self>,
-        env: EdgeToCoord,
-        tx: &EdgeTx,
-        my_edge_id: &mut Option<String>,
-    ) {
-        match env.msg {
-            Some(edge_to_coord::Msg::Reg(reg)) => {
-                if my_edge_id.is_none() {
-                    *my_edge_id = Some(reg.edge_id.clone());
-                    self.edges
-                        .lock()
-                        .await
-                        .insert(reg.edge_id.clone(), tx.clone());
-                }
-                match self
-                    .apply_register(
-                        reg.agg_id,
-                        reg.key.clone(),
-                        &reg.edge_id,
-                        reg.epoch_window_ms,
-                        reg.window_start_ms,
-                    )
-                    .await
-                {
-                    Some(actions) => self.dispatch(reg.agg_id, &reg.key, actions).await,
-                    None => warn!(
-                        agg_id = reg.agg_id,
-                        "register for unconfigured monitor — ignored"
-                    ),
-                }
-            }
-            Some(edge_to_coord::Msg::Report(rep)) => {
-                // A rate report: reply to this edge alone with its freshly
-                // computed coordinated-sampling grant (rep.local_value / seq
-                // are no longer consulted — no countdown left to feed them
-                // into; they still ride the wire message for compatibility).
-                if let Some(actions) = self
-                    .apply_report(
-                        rep.agg_id,
-                        rep.key.clone(),
-                        &rep.edge_id,
-                        rep.window_start_ms,
-                        rep.rate,
-                    )
-                    .await
-                {
-                    self.dispatch(rep.agg_id, &rep.key, actions).await;
-                }
-            }
-            None => {}
-        }
-    }
-
-    /// An edge stream closed: drop its sender and its membership in every
-    /// monitor it was part of. No re-grant fan-out needed — each edge's grant
-    /// is independent, so one edge leaving never perturbs another's.
-    async fn handle_disconnect(&self, edge_id: &str) {
-        self.edges.lock().await.remove(edge_id);
-        let mut monitors = self.monitors.lock().await;
-        for mon in monitors.values_mut() {
-            mon.on_leave(edge_id);
-        }
-    }
-}
-
-/// The tonic service wrapper.
-pub struct MonitorServiceImpl {
-    coord: Arc<MonitorCoordinator>,
-}
-
-impl MonitorServiceImpl {
-    pub fn new(coord: Arc<MonitorCoordinator>) -> Self {
-        Self { coord }
-    }
-
-    /// Wrap into a tonic server service ready for `Server::add_service`.
-    pub fn into_server(self) -> MonitorServiceServer<Self> {
-        MonitorServiceServer::new(self)
-    }
-}
-
-#[tonic::async_trait]
-impl MonitorService for MonitorServiceImpl {
-    type MonitorStream = Pin<Box<dyn Stream<Item = Result<CoordToEdge, Status>> + Send + 'static>>;
-
-    async fn monitor(
-        &self,
-        request: Request<Streaming<EdgeToCoord>>,
-    ) -> Result<Response<Self::MonitorStream>, Status> {
-        let mut inbound = request.into_inner();
-        let (tx, rx) = mpsc::channel::<Result<CoordToEdge, Status>>(64);
-        let coord = self.coord.clone();
-
-        tokio::spawn(async move {
-            let mut my_edge_id: Option<String> = None;
-            while let Some(item) = inbound.next().await {
-                match item {
-                    Ok(env) => coord.handle_msg(env, &tx, &mut my_edge_id).await,
-                    Err(status) => {
-                        debug!(?status, "monitor stream recv error");
-                        break;
-                    }
-                }
-            }
-            if let Some(edge_id) = my_edge_id {
-                info!(edge = %edge_id, "monitor stream closed");
-                coord.handle_disconnect(&edge_id).await;
-            }
-        });
-
-        Ok(Response::new(Box::pin(ReceiverStream::new(rx))))
-    }
-}
-
-#[cfg(test)]
-mod reconfigure_tests {
-    use super::MonitorCoordinator;
-    use crate::update_sampling::coordinator::MonitorConfig;
-
-    fn cfg(agg_id: u64, key: &str, tau: f64) -> MonitorConfig {
-        MonitorConfig {
-            agg_id,
-            key: key.as_bytes().to_vec(),
-            tau,
-            epsilon: 0.2,
-            window_ms: 15_000,
-            ..Default::default()
-        }
-    }
-
-    #[tokio::test]
-    async fn reconfigure_adds_changes_and_removes_specs() {
-        // Boot with one sum monitor.
-        let coord = MonitorCoordinator::new(vec![cfg(1, "", 100.0)]);
-        assert_eq!(coord.monitor_count(), 1);
-
-        // Add a cms_point monitor (agg 2, key s0) and change agg 1's τ; agg 1's
-        // key "" stays but τ differs -> counts as a change. Nothing removed.
-        let (added, changed, removed) = coord
-            .reconfigure(vec![cfg(1, "", 200.0), cfg(2, "s0", 5000.0)])
-            .await;
-        assert_eq!((added, changed, removed), (1, 1, 0));
-        assert_eq!(coord.monitor_count(), 2);
-
-        // Idempotent: same specs -> no-op.
-        assert_eq!(
-            coord
-                .reconfigure(vec![cfg(1, "", 200.0), cfg(2, "s0", 5000.0)])
-                .await,
-            (0, 0, 0)
-        );
-
-        // Drop agg 1, keep agg 2 unchanged.
-        let (added, changed, removed) = coord.reconfigure(vec![cfg(2, "s0", 5000.0)]).await;
-        assert_eq!((added, changed, removed), (0, 0, 1));
-        assert_eq!(coord.monitor_count(), 1);
-    }
-
-    #[tokio::test]
-    async fn reconfigure_evicts_live_state_for_changed_monitor() {
-        let coord = MonitorCoordinator::new(vec![cfg(7, "s0", 5000.0)]);
-        // A register materializes live Monitor state for (7, s0).
-        let actions = coord
-            .apply_register(7, b"s0".to_vec(), "edge-a", 15_000, 15_000)
-            .await;
-        assert!(
-            actions.is_some(),
-            "register for a configured monitor succeeds"
-        );
-        assert_eq!(coord.monitors.lock().await.len(), 1);
-
-        // Changing the spec (new τ) must drop the stale live state so the next
-        // register rebuilds the Monitor under the new τ.
-        let (_, changed, _) = coord.reconfigure(vec![cfg(7, "s0", 9000.0)]).await;
-        assert_eq!(changed, 1);
-        assert_eq!(
-            coord.monitors.lock().await.len(),
-            0,
-            "changed monitor's live state evicted"
-        );
-
-        // An unconfigured key is still rejected after reconfigure.
-        assert!(coord
-            .apply_register(7, b"other".to_vec(), "edge-a", 15_000, 15_000)
-            .await
-            .is_none());
-    }
-}
diff --git a/data_plane/src/utils/http.rs b/data_plane/src/utils/http.rs
deleted file mode 100644
index 26db630f1..000000000
--- a/data_plane/src/utils/http.rs
+++ /dev/null
@@ -1,276 +0,0 @@
-use asap_types::KeyByLabelNames;
-use serde_json::{json, Value};
-use std::collections::HashMap;
-
-use crate::query_engines::QueryResult;
-
-/// Convert QueryResult to Prometheus-compatible format (for instant queries only)
-///
-/// Returns an error if passed a Matrix result - use `convert_range_result_to_prometheus` for that.
-pub fn convert_query_result_to_prometheus(
-    result: &QueryResult,
-    query_output_labels: &KeyByLabelNames,
-) -> Result<Value, &'static str> {
-    match result {
-        QueryResult::Vector(instant_vector) => {
-            let mut prometheus_results = Vec::new();
-            let timestamp = instant_vector.timestamp as f64 / 1000.0;
-
-            for element in &instant_vector.values {
-                // Build metric labels object. Per-element override
-                // (`element.label_keys_override`) wins when the
-                // adapter knows the keys at materialization time —
-                // e.g. ASAP-tier `topk(...)` synthesizes an `"item"`
-                // key that's not in the query's group-by clause, so
-                // the outer `query_output_labels` doesn't carry it.
-                // Falls back to the query-scoped key list for everyone
-                // else. Mirrors the matrix branch in
-                // `convert_range_result_to_prometheus`.
-                let mut metric_map: HashMap<&String, &String> = HashMap::new();
-                let effective_keys: &[String] = element
-                    .label_keys_override
-                    .as_deref()
-                    .unwrap_or(&query_output_labels.labels);
-                for (key, label) in effective_keys
-                    .iter()
-                    .zip(element.labels.labels.iter())
-                {
-                    metric_map.insert(key, label);
-                }
-
-                let prometheus_result = json!({
-                    "metric": metric_map,
-                    "value": [timestamp, element.value.to_string()]
-                });
-                prometheus_results.push(prometheus_result);
-            }
-            Ok(json!({
-                "resultType": "vector",
-                "result": prometheus_results
-            }))
-        }
-        QueryResult::Matrix(_) => {
-            Err("convert_query_result_to_prometheus called with Matrix result; use convert_range_result_to_prometheus instead")
-        }
-    }
-}
-
-/// Convert range query result to Prometheus matrix format (for range queries only)
-///
-/// Returns an error if passed a Vector result - use `convert_query_result_to_prometheus` for that.
-pub fn convert_range_result_to_prometheus(
-    result: &QueryResult,
-    label_names: &KeyByLabelNames,
-) -> Result<Value, &'static str> {
-    match result {
-        QueryResult::Matrix(matrix) => {
-            let results: Vec<Value> = matrix
-                .values
-                .iter()
-                .map(|element| {
-                    // Build metric labels object. Per-element override
-                    // (`element.label_keys_override`) wins when the
-                    // adapter knows the keys at materialization time —
-                    // e.g. ASAP-tier `topk` synthesizes an `"item"` key
-                    // that's not in the query's group-by clause, so the
-                    // outer `label_names` doesn't carry it. Falls back
-                    // to the query-scoped key list for everyone else.
-                    let mut metric = serde_json::Map::new();
-                    let effective_keys: &[String] = element
-                        .label_keys_override
-                        .as_deref()
-                        .unwrap_or(&label_names.labels);
-                    for (i, label_name) in effective_keys.iter().enumerate() {
-                        if i < element.labels.labels.len() {
-                            metric.insert(
-                                label_name.clone(),
-                                Value::String(element.labels.labels[i].clone()),
-                            );
-                        }
-                    }
-
-                    // Build values array: [[timestamp, "value"], ...]
-                    let values: Vec<Value> = element
-                        .samples
-                        .iter()
-                        .map(|sample| {
-                            json!([
-                                sample.timestamp as f64 / 1000.0, // Convert ms to seconds
-                                sample.value.to_string()
-                            ])
-                        })
-                        .collect();
-
-                    json!({
-                        "metric": metric,
-                        "values": values
-                    })
-                })
-                .collect();
-
-            Ok(json!({
-                "resultType": "matrix",
-                "result": results
-            }))
-        }
-        QueryResult::Vector(_) => {
-            Err("convert_range_result_to_prometheus called with Vector result; use convert_query_result_to_prometheus instead")
-        }
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use crate::query_engines::query_result::{InstantVectorElement, RangeVectorElement};
-    use crate::storage_engines::types::KeyByLabelValues;
-
-    fn create_test_labels() -> KeyByLabelValues {
-        KeyByLabelValues::new_with_labels(vec!["host1".to_string(), "job1".to_string()])
-    }
-
-    fn create_test_label_names() -> KeyByLabelNames {
-        KeyByLabelNames::new(vec!["instance".to_string(), "job".to_string()])
-    }
-
-    // Tests for convert_query_result_to_prometheus
-
-    #[test]
-    fn test_convert_instant_vector_to_prometheus() {
-        let labels = create_test_labels();
-        let label_names = create_test_label_names();
-        let element = InstantVectorElement::new(labels, 42.0);
-        let result = QueryResult::vector(vec![element], 1000);
-
-        let prometheus_data = convert_query_result_to_prometheus(&result, &label_names);
-
-        assert!(prometheus_data.is_ok());
-        let data = prometheus_data.unwrap();
-
-        assert_eq!(data["resultType"], "vector");
-        assert_eq!(data["result"].as_array().unwrap().len(), 1);
-
-        let first_result = &data["result"][0];
-        assert_eq!(first_result["metric"]["instance"], "host1");
-        assert_eq!(first_result["metric"]["job"], "job1");
-        // Timestamp is converted from ms to seconds: 1000ms -> 1.0s
-        assert_eq!(first_result["value"][0], 1.0);
-        assert_eq!(first_result["value"][1], "42");
-    }
-
-    #[test]
-    fn test_convert_instant_vector_empty() {
-        let label_names = create_test_label_names();
-        let result = QueryResult::vector(vec![], 1000);
-
-        let prometheus_data = convert_query_result_to_prometheus(&result, &label_names);
-
-        assert!(prometheus_data.is_ok());
-        let data = prometheus_data.unwrap();
-        assert_eq!(data["resultType"], "vector");
-        assert!(data["result"].as_array().unwrap().is_empty());
-    }
-
-    #[test]
-    fn test_convert_instant_vector_rejects_matrix() {
-        let label_names = create_test_label_names();
-        let labels = create_test_labels();
-        let element = RangeVectorElement::new(labels);
-        let result = QueryResult::matrix(vec![element]);
-
-        let prometheus_data = convert_query_result_to_prometheus(&result, &label_names);
-
-        assert!(prometheus_data.is_err());
-        assert!(prometheus_data.err().unwrap().contains("Matrix"));
-    }
-
-    // Tests for convert_range_result_to_prometheus
-
-    #[test]
-    fn test_convert_range_vector_to_prometheus() {
-        let labels = create_test_labels();
-        let label_names = create_test_label_names();
-
-        let mut element = RangeVectorElement::new(labels);
-        element.add_sample(1000, 10.0);
-        element.add_sample(2000, 20.0);
-        element.add_sample(3000, 30.0);
-
-        let result = QueryResult::matrix(vec![element]);
-
-        let prometheus_data = convert_range_result_to_prometheus(&result, &label_names);
-
-        assert!(prometheus_data.is_ok());
-        let data = prometheus_data.unwrap();
-
-        assert_eq!(data["resultType"], "matrix");
-        assert_eq!(data["result"].as_array().unwrap().len(), 1);
-
-        let first_result = &data["result"][0];
-        assert_eq!(first_result["metric"]["instance"], "host1");
-        assert_eq!(first_result["metric"]["job"], "job1");
-
-        let values = first_result["values"].as_array().unwrap();
-        assert_eq!(values.len(), 3);
-
-        // Check timestamps converted from ms to seconds
-        assert_eq!(values[0][0], 1.0); // 1000ms -> 1.0s
-        assert_eq!(values[0][1], "10");
-        assert_eq!(values[1][0], 2.0); // 2000ms -> 2.0s
-        assert_eq!(values[1][1], "20");
-        assert_eq!(values[2][0], 3.0); // 3000ms -> 3.0s
-        assert_eq!(values[2][1], "30");
-    }
-
-    #[test]
-    fn test_convert_range_vector_empty_samples() {
-        let labels = create_test_labels();
-        let label_names = create_test_label_names();
-        let element = RangeVectorElement::new(labels);
-        let result = QueryResult::matrix(vec![element]);
-
-        let prometheus_data = convert_range_result_to_prometheus(&result, &label_names);
-
-        assert!(prometheus_data.is_ok());
-        let data = prometheus_data.unwrap();
-
-        assert_eq!(data["resultType"], "matrix");
-        let first_result = &data["result"][0];
-        assert!(first_result["values"].as_array().unwrap().is_empty());
-    }
-
-    #[test]
-    fn test_convert_range_vector_multiple_series() {
-        let labels1 = KeyByLabelValues::new_with_labels(vec!["host1".to_string()]);
-        let labels2 = KeyByLabelValues::new_with_labels(vec!["host2".to_string()]);
-        let label_names = KeyByLabelNames::new(vec!["instance".to_string()]);
-
-        let mut element1 = RangeVectorElement::new(labels1);
-        element1.add_sample(1000, 10.0);
-
-        let mut element2 = RangeVectorElement::new(labels2);
-        element2.add_sample(1000, 100.0);
-
-        let result = QueryResult::matrix(vec![element1, element2]);
-
-        let prometheus_data = convert_range_result_to_prometheus(&result, &label_names);
-
-        assert!(prometheus_data.is_ok());
-        let data = prometheus_data.unwrap();
-
-        assert_eq!(data["result"].as_array().unwrap().len(), 2);
-    }
-
-    #[test]
-    fn test_convert_range_vector_rejects_vector() {
-        let label_names = create_test_label_names();
-        let labels = create_test_labels();
-        let element = InstantVectorElement::new(labels, 42.0);
-        let result = QueryResult::vector(vec![element], 1000);
-
-        let prometheus_data = convert_range_result_to_prometheus(&result, &label_names);
-
-        assert!(prometheus_data.is_err());
-        assert!(prometheus_data.err().unwrap().contains("Vector"));
-    }
-}
diff --git a/data_plane/src/utils/mod.rs b/data_plane/src/utils/mod.rs
deleted file mode 100644
index 18e84ff2b..000000000
--- a/data_plane/src/utils/mod.rs
+++ /dev/null
@@ -1,3 +0,0 @@
-pub mod http;
-
-pub use http::*;
diff --git a/data_plane/tests/all_sketches_process_oracle_e2e.rs b/data_plane/tests/all_sketches_process_oracle_e2e.rs
deleted file mode 100644
index 4340e6154..000000000
--- a/data_plane/tests/all_sketches_process_oracle_e2e.rs
+++ /dev/null
@@ -1,544 +0,0 @@
-//! Production-process E2E oracle matrix for every supported sketch family.
-//!
-//! Each test starts the real `data_plane` binary, installs a streaming policy,
-//! posts modified OTLP over HTTP, and queries the public Prometheus endpoint.
-//! Sketch implementations are used only to encode raw fixtures. Expected
-//! answers are independently computed from those raw fixtures.
-
-use std::collections::{HashMap, HashSet};
-use std::net::TcpListener;
-use std::process::{Child, Command, Stdio};
-use std::time::{Duration, SystemTime, UNIX_EPOCH};
-
-use asap_otel_proto::tonic::collector::metrics::v1::ExportMetricsServiceRequest;
-use asap_otel_proto::tonic::common::v1::{any_value, AnyValue, KeyValue};
-use asap_otel_proto::tonic::metrics::v1::{
-    metric::Data, CountMinSketch as OtelCountMinSketch, CountMinSketchDataPoint,
-    CountMinSketchEncoding, CountSketch as OtelCountSketch, CountSketchDataPoint,
-    CountSketchEncoding, HllSketch as OtelHllSketch, HllSketchDataPoint, HllSketchEncoding,
-    KllSketch as OtelKllSketch, KllSketchDataPoint, KllSketchEncoding, Metric, ResourceMetrics,
-    ScopeMetrics,
-};
-use asap_sketchlib::proto::sketchlib::{
-    sketch_envelope, HllVariant as ProtoHllVariant, HyperLogLogState, KllState, SketchEnvelope,
-};
-use asap_sketchlib::{CountMinSketch, CountSketch, HllSketch, HllVariant, MessagePackCodec};
-use prost::Message;
-use serde_json::Value;
-
-const SERVICE: &str = "oracle-e2e";
-#[path = "support/physical_fixture.rs"]
-mod physical_fixture;
-// These parameters satisfy the production query path's LIVE_ACCURACY
-// (`epsilon = 0.01`). ASAPPlanner validates an observed `SketchKind`
-// against that accuracy before committing it, so the fixture must use the
-// same contract as a real control-plane-generated materialization.
-const K: u32 = 269;
-const HLL_PRECISION: u32 = 14;
-const CMS_ROWS: usize = 5;
-const CMS_COLS: usize = 2048;
-// ASAPPlanner's CountSketch guarantee is L2-based: epsilon=sqrt(3/width),
-// with an odd Hoeffding-median depth. The current runtime's packed sign hash
-// limits this width to five rows. The fixture installs these parameters explicitly.
-const COUNT_SKETCH_ROWS: usize = 5;
-const COUNT_SKETCH_COLS: usize = 32_768;
-
-struct ChildGuard(Child);
-
-impl Drop for ChildGuard {
-    fn drop(&mut self) {
-        let _ = self.0.kill();
-        let _ = self.0.wait();
-    }
-}
-
-struct Backend {
-    evaluation_ms: std::sync::atomic::AtomicU64,
-    artifact: data_plane::drivers::query::servers::http::PhysicalPlanInstallRequest,
-    _child: ChildGuard,
-    client: reqwest::Client,
-    query_base: String,
-    otlp_url: String,
-    _output_dir: tempfile::TempDir,
-}
-
-fn unused_port() -> u16 {
-    TcpListener::bind("127.0.0.1:0")
-        .expect("reserve loopback port")
-        .local_addr()
-        .expect("read loopback address")
-        .port()
-}
-
-fn now_ns() -> u64 {
-    SystemTime::now()
-        .duration_since(UNIX_EPOCH)
-        .expect("system clock before UNIX epoch")
-        .as_secs()
-        * 1_000_000_000
-}
-
-fn labels() -> Vec<KeyValue> {
-    vec![KeyValue {
-        key: "service".into(),
-        value: Some(AnyValue {
-            value: Some(any_value::Value::StringValue(SERVICE.into())),
-        }),
-    }]
-}
-
-fn envelope(metric: &str, data: Data) -> ExportMetricsServiceRequest {
-    ExportMetricsServiceRequest {
-        resource_metrics: vec![ResourceMetrics {
-            resource: None,
-            scope_metrics: vec![ScopeMetrics {
-                scope: None,
-                metrics: vec![Metric {
-                    name: metric.into(),
-                    description: String::new(),
-                    unit: String::new(),
-                    metadata: Vec::new(),
-                    data: Some(data),
-                }],
-                schema_url: String::new(),
-            }],
-            schema_url: String::new(),
-        }],
-    }
-}
-
-async fn start_backend(materialization: &asap_types::PrecomputeMaterialization) -> Backend {
-    let query_port = unused_port();
-    let otlp_http_port = unused_port();
-    let otlp_grpc_port = unused_port();
-    let output_dir = tempfile::tempdir().expect("create data-plane output directory");
-    let mut physical = tempfile::NamedTempFile::new().unwrap();
-    let mut install =
-        physical_fixture::artifact_from_materializations(vec![materialization.clone()]);
-    for rule in &mut install.transmission_plan.rules {
-        if matches!(
-            install
-                .precompute_plan
-                .schemas
-                .iter()
-                .find(|s| s.materialization == rule.materialization)
-                .unwrap()
-                .family,
-            control_plane::physical::compiler::StateFamilyContract::Sketch {
-                algorithm: planner_types::post_asap::SketchAlgorithm::Cms
-                    | planner_types::post_asap::SketchAlgorithm::CountSketch,
-                ..
-            }
-        ) {
-            rule.encoding = control_plane::physical::compiler::StateEncoding::SketchCoreMsgpackV1;
-        }
-    }
-    serde_json::to_writer(&mut physical, &install).unwrap();
-
-    let mut command = Command::new(env!("CARGO_BIN_EXE_data_plane"));
-    command
-        .arg("--physical-plan")
-        .arg(physical.path())
-        .arg("--http-port")
-        .arg(query_port.to_string())
-        .arg("--output-dir")
-        .arg(output_dir.path())
-        .arg("--enable-otel-ingest")
-        .arg("--otel-http-port")
-        .arg(otlp_http_port.to_string())
-        .arg("--otel-grpc-port")
-        .arg(otlp_grpc_port.to_string())
-        .arg("--precompute-allowed-lateness-ms")
-        .arg("0")
-        .arg("--precompute-flush-interval-ms")
-        .arg("100")
-        .stdout(Stdio::null())
-        .stderr(Stdio::null());
-    let child = command.spawn().expect("start production data-plane binary");
-    let mut child = ChildGuard(child);
-    let client = reqwest::Client::new();
-    let query_base = format!("http://127.0.0.1:{query_port}");
-    let health = format!("{query_base}/api/v1/health");
-    for _ in 0..100 {
-        if let Some(status) = child.0.try_wait().expect("inspect data-plane process") {
-            panic!("data-plane exited before readiness: {status}");
-        }
-        if client
-            .get(&health)
-            .send()
-            .await
-            .is_ok_and(|response| response.status().is_success())
-        {
-            return Backend {
-                artifact: install,
-                evaluation_ms: std::sync::atomic::AtomicU64::new(0),
-                _child: child,
-                client,
-                query_base,
-                otlp_url: format!("http://127.0.0.1:{otlp_http_port}/v1/metrics"),
-                _output_dir: output_dir,
-            };
-        }
-        tokio::time::sleep(Duration::from_millis(50)).await;
-    }
-    panic!("data-plane did not become ready at {health}");
-}
-
-async fn post(backend: &Backend, mut request: ExportMetricsServiceRequest) {
-    let data = request.resource_metrics[0].scope_metrics[0].metrics[0]
-        .data
-        .as_ref()
-        .unwrap();
-    let ns = match data {
-        Data::Kllsketch(s) => s.data_points[0].time_unix_nano,
-        Data::Hllsketch(s) => s.data_points[0].time_unix_nano,
-        Data::Countminsketch(s) => s.data_points[0].time_unix_nano,
-        Data::Countsketch(s) => s.data_points[0].time_unix_nano,
-        _ => unreachable!(),
-    };
-    backend
-        .evaluation_ms
-        .store(ns / 1_000_000, std::sync::atomic::Ordering::Relaxed);
-    physical_fixture::stamp(&mut request, &backend.artifact);
-    let response = backend
-        .client
-        .post(&backend.otlp_url)
-        .header("content-type", "application/x-protobuf")
-        .body(request.encode_to_vec())
-        .send()
-        .await
-        .expect("post modified OTLP");
-    let status = response.status();
-    let body = response.text().await.unwrap();
-    assert!(status.is_success(), "OTLP {status}: {body}");
-}
-
-async fn query(backend: &Backend, promql: &str) -> Value {
-    let mut response = Value::Null;
-    for _ in 0..50 {
-        response = backend
-            .client
-            .get(format!("{}/api/v1/query", backend.query_base))
-            .query(&[("query", promql)])
-            .query(&[(
-                "time",
-                (backend
-                    .evaluation_ms
-                    .load(std::sync::atomic::Ordering::Relaxed) as f64
-                    / 1000.0)
-                    .to_string(),
-            )])
-            .send()
-            .await
-            .expect("query production backend")
-            .json()
-            .await
-            .expect("decode Prometheus JSON");
-        if response["data"]["result"]
-            .as_array()
-            .is_some_and(|result| !result.is_empty())
-        {
-            break;
-        }
-        tokio::time::sleep(Duration::from_millis(100)).await;
-    }
-    assert!(
-        response["infos"]
-            .as_array()
-            .is_some_and(|infos| infos.iter().any(|info| info
-                .as_str()
-                .is_some_and(|text| text.contains("data_source: asap_query")))),
-        "query was not proven to execute in ASAPQuery: {response}"
-    );
-    assert_eq!(response["status"], "success", "PromQL response: {response}");
-    response
-}
-
-fn scalar_values(response: &Value) -> Vec<(HashMap<String, String>, f64)> {
-    response["data"]["result"]
-        .as_array()
-        .expect("Prometheus result array")
-        .iter()
-        .map(|series| {
-            let labels = series["metric"]
-                .as_object()
-                .expect("metric labels")
-                .iter()
-                .map(|(key, value)| {
-                    (
-                        key.clone(),
-                        value.as_str().expect("string label").to_string(),
-                    )
-                })
-                .collect();
-            let value = series["value"][1]
-                .as_str()
-                .expect("string sample value")
-                .parse()
-                .expect("numeric sample value");
-            (labels, value)
-        })
-        .collect()
-}
-
-fn config(metric: &str, kind: &str, parameters: &str) -> asap_types::PrecomputeMaterialization {
-    physical_fixture::materialization(
-        metric,
-        kind.parse().unwrap(),
-        serde_yaml::from_str(parameters).unwrap(),
-    )
-}
-
-fn kll_export(metric: &str, timestamp_ns: u64, raw: &[f64]) -> ExportMetricsServiceRequest {
-    let state = KllState {
-        k: K,
-        m: 8,
-        num_levels: 0,
-        levels: Vec::new(),
-        items: raw.to_vec(),
-        coin: None,
-        offset: 0.0,
-        value_scale: 0,
-        residuals: Vec::new(),
-    };
-    envelope(
-        metric,
-        Data::Kllsketch(OtelKllSketch {
-            data_points: vec![KllSketchDataPoint {
-                attributes: labels(),
-                start_time_unix_nano: timestamp_ns.saturating_sub(1_000_000_000),
-                time_unix_nano: timestamp_ns,
-                sketch: SketchEnvelope {
-                    format_version: 1,
-                    sketch_state: Some(sketch_envelope::SketchState::Kll(state)),
-                    ..Default::default()
-                }
-                .encode_to_vec(),
-                encoding: KllSketchEncoding::Proto as i32,
-                flags: 0,
-                series_id: 0,
-            }],
-            aggregation_temporality: 0,
-            k: K,
-        }),
-    )
-}
-
-fn hll_export(metric: &str, timestamp_ns: u64, raw: &[&str]) -> ExportMetricsServiceRequest {
-    let mut sketch = HllSketch::new(HllVariant::Regular, HLL_PRECISION);
-    for value in raw {
-        sketch.update(value.as_bytes());
-    }
-    let state = HyperLogLogState {
-        variant: ProtoHllVariant::Regular as i32,
-        precision: HLL_PRECISION,
-        registers: sketch.registers,
-        hip_kxq0: 0.0,
-        hip_kxq1: 0.0,
-        hip_est: 0.0,
-        registers_sparse: None,
-    };
-    envelope(
-        metric,
-        Data::Hllsketch(OtelHllSketch {
-            data_points: vec![HllSketchDataPoint {
-                attributes: labels(),
-                start_time_unix_nano: timestamp_ns.saturating_sub(1_000_000_000),
-                time_unix_nano: timestamp_ns,
-                sketch: state.encode_to_vec(),
-                encoding: HllSketchEncoding::Proto as i32,
-                flags: 0,
-                series_id: 0,
-            }],
-            aggregation_temporality: 0,
-            precision: HLL_PRECISION,
-        }),
-    )
-}
-
-fn cms_export(metric: &str, timestamp_ns: u64, raw: &[&str]) -> ExportMetricsServiceRequest {
-    let mut sketch = CountMinSketch::new(CMS_ROWS, CMS_COLS);
-    for key in raw {
-        sketch.update(key, 1.0);
-    }
-    envelope(
-        metric,
-        Data::Countminsketch(OtelCountMinSketch {
-            data_points: vec![CountMinSketchDataPoint {
-                attributes: labels(),
-                start_time_unix_nano: timestamp_ns.saturating_sub(1_000_000_000),
-                time_unix_nano: timestamp_ns,
-                sketch: sketch.to_msgpack().expect("encode CMS-with-heap"),
-                encoding: CountMinSketchEncoding::Msgpack as i32,
-                flags: 0,
-                series_id: 0,
-            }],
-            aggregation_temporality: 0,
-            rows: CMS_ROWS as i32,
-            cols: CMS_COLS as i32,
-        }),
-    )
-}
-
-fn count_sketch_export(
-    metric: &str,
-    timestamp_ns: u64,
-    raw: &[&str],
-) -> ExportMetricsServiceRequest {
-    let mut sketch = CountSketch::new(COUNT_SKETCH_ROWS, COUNT_SKETCH_COLS);
-    for key in raw {
-        sketch.update(key, 1.0);
-    }
-    envelope(
-        metric,
-        Data::Countsketch(OtelCountSketch {
-            data_points: vec![CountSketchDataPoint {
-                attributes: labels(),
-                start_time_unix_nano: timestamp_ns.saturating_sub(1_000_000_000),
-                time_unix_nano: timestamp_ns,
-                sketch: sketch.to_msgpack().expect("encode CountSketch-with-heap"),
-                encoding: CountSketchEncoding::Msgpack as i32,
-                flags: 0,
-                series_id: 0,
-            }],
-            aggregation_temporality: 0,
-            rows: COUNT_SKETCH_ROWS as i32,
-            cols: COUNT_SKETCH_COLS as i32,
-        }),
-    )
-}
-
-fn exact_quantile(raw: &[f64], q: f64) -> f64 {
-    let mut sorted = raw.to_vec();
-    sorted.sort_by(f64::total_cmp);
-    let rank = q * (sorted.len() - 1) as f64;
-    let low = rank.floor() as usize;
-    let high = rank.ceil() as usize;
-    sorted[low] + (sorted[high] - sorted[low]) * (rank - low as f64)
-}
-
-fn assert_frequency_total_oracle(response: &Value, raw: &[&str]) {
-    let samples = scalar_values(response);
-    assert_eq!(samples.len(), 1, "expected one grouped frequency total");
-    assert_eq!(
-        samples[0].0.get("service").map(String::as_str),
-        Some(SERVICE)
-    );
-    assert_eq!(samples[0].1.round() as usize, raw.len());
-}
-
-fn assert_frequency_point_oracle(response: &Value, raw: &[&str], item: &str) {
-    let samples = scalar_values(response);
-    assert_eq!(samples.len(), 1, "expected one grouped frequency estimate");
-    assert_eq!(
-        samples[0].0.get("service").map(String::as_str),
-        Some(SERVICE)
-    );
-    let expected = raw.iter().filter(|value| **value == item).count();
-    assert_eq!(samples[0].1.round() as usize, expected);
-}
-
-#[tokio::test]
-async fn production_kll_matches_raw_quantile_oracle() {
-    let metric = "oracle_kll_latency";
-    let backend = start_backend(&config(metric, "DatasketchesKLL", &format!("      k: {K}"))).await;
-    let raw: Vec<f64> = (1..=101).map(f64::from).collect();
-    let timestamp = now_ns().saturating_sub(2_000_000_000);
-    post(&backend, kll_export(metric, timestamp, &raw)).await;
-    post(
-        &backend,
-        kll_export(metric, timestamp + 1_000_000_000, &raw),
-    )
-    .await;
-    let response = query(&backend, &format!("quantile_over_time(0.5, {metric}[2s])")).await;
-    let samples = scalar_values(&response);
-    assert_eq!(
-        samples[0].0.get("service").map(String::as_str),
-        Some(SERVICE)
-    );
-    let actual = samples[0].1;
-    assert_eq!(actual, exact_quantile(&raw, 0.5));
-}
-
-#[tokio::test]
-async fn production_hll_matches_raw_distinct_oracle() {
-    let metric = "oracle_hll_users";
-    let backend = start_backend(&config(
-        metric,
-        "HLL",
-        &format!("      precision: {HLL_PRECISION}"),
-    ))
-    .await;
-    let owned: Vec<String> = (0..2_000).map(|i| format!("user-{i}")).collect();
-    let mut raw: Vec<&str> = owned.iter().map(String::as_str).collect();
-    raw.extend(owned.iter().take(500).map(String::as_str));
-    let exact = raw.iter().copied().collect::<HashSet<_>>().len() as f64;
-    let timestamp = now_ns().saturating_sub(2_000_000_000);
-    post(&backend, hll_export(metric, timestamp, &raw)).await;
-    post(
-        &backend,
-        hll_export(metric, timestamp + 1_000_000_000, &raw),
-    )
-    .await;
-    let response = query(&backend, &format!("count({metric})")).await;
-    let actual = scalar_values(&response)[0].1;
-    let relative_error = (actual - exact).abs() / exact;
-    assert!(
-        relative_error <= 0.10,
-        "HLL differs from exact distinct oracle: exact={exact}, actual={actual}, error={relative_error}"
-    );
-}
-
-fn frequency_fixture() -> Vec<&'static str> {
-    let mut raw = Vec::new();
-    for (key, count) in [("alpha", 100), ("beta", 50), ("gamma", 200), ("delta", 75)] {
-        raw.extend(std::iter::repeat_n(key, count));
-    }
-    raw
-}
-
-#[tokio::test]
-async fn production_cms_matches_raw_frequency_oracle() {
-    let metric = "oracle_cms_frequency";
-    let params = format!("      w: {CMS_COLS}\n      d: {CMS_ROWS}");
-    let backend = start_backend(&config(metric, "CountMinSketch", &params)).await;
-    let raw = frequency_fixture();
-    let timestamp = now_ns().saturating_sub(2_000_000_000);
-    post(&backend, cms_export(metric, timestamp, &raw)).await;
-    post(
-        &backend,
-        cms_export(metric, timestamp + 1_000_000_000, &raw),
-    )
-    .await;
-    let response = query(&backend, &format!("count_over_time({metric}[2s])")).await;
-    let mut merged_raw = raw.clone();
-    merged_raw.extend_from_slice(&raw);
-    assert_frequency_total_oracle(&response, &merged_raw);
-}
-
-#[tokio::test]
-async fn production_count_sketch_matches_raw_frequency_oracle() {
-    let metric = "oracle_count_sketch_frequency";
-    let params = format!("      w: {COUNT_SKETCH_COLS}\n      d: {COUNT_SKETCH_ROWS}");
-    // Planner's CountSketch confidence model requires more rows than the
-    // current packed-hash runtime can execute at this width. Keep the default
-    // production SLA untouched and declare the weaker contract explicitly
-    // for this isolated algorithm-oracle process.
-    let backend = start_backend(&config(metric, "CountSketch", &params)).await;
-    let raw = frequency_fixture();
-    let timestamp = now_ns().saturating_sub(2_000_000_000);
-    post(&backend, count_sketch_export(metric, timestamp, &raw)).await;
-    post(
-        &backend,
-        count_sketch_export(metric, timestamp + 1_000_000_000, &raw),
-    )
-    .await;
-    let response = query(
-        &backend,
-        &format!("count_over_time({metric}{{item=\"alpha\"}}[2s])"),
-    )
-    .await;
-    let mut merged_raw = raw.clone();
-    merged_raw.extend_from_slice(&raw);
-    assert_frequency_point_oracle(&response, &merged_raw, "alpha");
-}
diff --git a/data_plane/tests/asapquery_compatibility_process_e2e.rs b/data_plane/tests/asapquery_compatibility_process_e2e.rs
deleted file mode 100644
index b18ad599a..000000000
--- a/data_plane/tests/asapquery_compatibility_process_e2e.rs
+++ /dev/null
@@ -1,1919 +0,0 @@
-//! Black-box acceptance test for the collector-free ASAPQuery profile.
-//!
-//! Starts the production binary from a canonical workload snapshot, ingests
-//! only Prometheus Remote Write v1, exercises safe warm families and per-series fallback
-//! through instant and range APIs, and verifies exact fallback request parity.
-
-use std::collections::HashMap;
-use std::net::TcpListener;
-use std::process::{Child, Command, Stdio};
-use std::sync::Arc;
-use std::time::Duration;
-
-use axum::{extract::Query, http::HeaderMap, routing::get, Json, Router};
-use data_plane::drivers::ingest::prometheus_remote_write::{
-    Label, Sample, TimeSeries, WriteRequest,
-};
-use prost::Message;
-use serde_json::Value;
-use tokio::sync::Mutex;
-
-#[path = "support/erp_planning_process.rs"]
-mod erp_planning_process;
-
-#[path = "support/distinct_planning_process.rs"]
-mod distinct_planning_process;
-#[path = "support/durable_summary_process.rs"]
-mod durable_summary_process;
-#[path = "support/immutable_maintenance_process.rs"]
-mod immutable_maintenance_process;
-#[path = "support/revisable_maintenance_process.rs"]
-mod revisable_maintenance_process;
-
-#[path = "support/current_series_process.rs"]
-mod current_series_process;
-
-#[path = "support/issue_701_702_process.rs"]
-mod issue_701_702_process;
-
-// Test-only quotes preserve the fixture's local candidate without a production bypass.
-fn quote_snapshot_for_test(
-    snapshot: control_plane::physical::compiler::BackendLocalPlanningInput,
-) -> control_plane::physical::compiler::BackendLocalPlanningInput {
-    quote_snapshot_for_frontend_test(snapshot, false)
-}
-
-fn quote_snapshot_for_frontend_test(
-    mut snapshot: control_plane::physical::compiler::BackendLocalPlanningInput,
-    metricsql: bool,
-) -> control_plane::physical::compiler::BackendLocalPlanningInput {
-    use control_plane::physical::{
-        compiler::{DeploymentPlanCompiler, BACKEND_REVISION, PLANNER_REVISION},
-        workload_cost::{self, WorkloadCostEvidence, WorkloadQuote},
-    };
-    let (request, environment) = snapshot
-        .clone()
-        .into_physical_compilation_request()
-        .unwrap();
-    let mut preferred = true;
-    let quotes = workload_cost::enumerate_exact_and_materialized_candidates(request)
-        .unwrap()
-        .into_iter()
-        .filter_map(|candidate| {
-            let plan = if metricsql {
-                DeploymentPlanCompiler.compile_metricsql(candidate.clone(), environment.clone())
-            } else {
-                DeploymentPlanCompiler.compile_promql(candidate.clone(), environment.clone())
-            }
-            .ok()?;
-            let unit_cost = if preferred { 1.0 } else { 1e12 };
-            preferred = false;
-            let manifest = workload_cost::manifest(&plan, &candidate.queries).unwrap();
-            Some(WorkloadQuote {
-                unit_costs: manifest
-                    .components
-                    .keys()
-                    .map(|key| (key.clone(), unit_cost))
-                    .collect(),
-                manifest,
-                executable: true,
-            })
-        })
-        .collect();
-    snapshot.workload_cost_evidence = Some(WorkloadCostEvidence {
-        backend_revision: BACKEND_REVISION.into(),
-        planner_revision: PLANNER_REVISION.into(),
-        data_snapshot_id: "process-fixture".into(),
-        model_version: "test-only-unit-costs".into(),
-        observed_at_unix_ms: environment.observed_at_unix_ms,
-        valid_for_ms: environment.max_evidence_age_ms,
-        quotes,
-    });
-    snapshot
-}
-
-/// Uncertified candidates must route through the installed exact endpoint unchanged.
-async fn assert_uncertified_exact_process(fixture: Value, queries: &[&str]) {
-    use control_plane::physical::compiler::BackendLocalPlanningInput;
-    use control_plane::query_plan::QueryPlanNode;
-    let snapshot: BackendLocalPlanningInput = serde_json::from_value(fixture).unwrap();
-    let priced = quote_snapshot_for_test(snapshot);
-    let plan = priced.clone().compile_promql().unwrap();
-    assert!(
-        plan.precompute_plan.materializations.is_empty(),
-        "{plan:#?}"
-    );
-    for entry in plan.query_plan.entries.values() {
-        assert!(
-            entry.nodes.values().any(|node| matches!(
-                node,
-                QueryPlanNode::ExactFallback { .. } | QueryPlanNode::ExternalExact { .. }
-            )),
-            "{entry:#?}"
-        );
-        assert!(
-            !entry
-                .nodes
-                .values()
-                .any(|node| matches!(node, QueryPlanNode::SummaryEstimate { .. })),
-            "{entry:#?}"
-        );
-    }
-    let received = Arc::new(Mutex::new(Vec::<HashMap<String, String>>::new()));
-    let requests = received.clone();
-    let exact_response = serde_json::json!({
-        "status": "success", "data": {"resultType": "vector", "result": [
-            {"metric": {"instance": "a"}, "value": [12345, "17"]}
-        ]}
-    });
-    let expected = exact_response.clone();
-    let listener = tokio::net::TcpListener::bind("127.0.0.1:0").await.unwrap();
-    let fallback_url = format!("http://{}", listener.local_addr().unwrap());
-    let fallback = tokio::spawn(async move {
-        axum::serve(
-            listener,
-            Router::new()
-                .route("/-/healthy", get(|| async { "healthy" }))
-                .route(
-                    "/api/v1/query",
-                    get(move |Query(params): Query<HashMap<String, String>>| {
-                        let requests = requests.clone();
-                        let response = exact_response.clone();
-                        async move {
-                            requests.lock().await.push(params);
-                            Json(response)
-                        }
-                    }),
-                ),
-        )
-        .await
-        .unwrap();
-    });
-    let output = tempfile::tempdir().unwrap();
-    let path = output.path().join("planning.json");
-    std::fs::write(&path, serde_json::to_vec(&priced).unwrap()).unwrap();
-    let port = unused_port();
-    let mut child = ChildGuard(
-        Command::new(env!("CARGO_BIN_EXE_data_plane"))
-            .args(["--profile", "asapquery", "--planning-snapshot"])
-            .arg(path)
-            .args([
-                "--prometheus-server",
-                &fallback_url,
-                "--forward-unsupported-queries",
-                "--http-port",
-                &port.to_string(),
-                "--output-dir",
-            ])
-            .arg(output.path())
-            .stdout(Stdio::null())
-            .stderr(Stdio::inherit())
-            .spawn()
-            .unwrap(),
-    );
-    let client = reqwest::Client::new();
-    let backend = format!("http://127.0.0.1:{port}");
-    wait_until_ready(&client, &format!("{backend}/api/v1/health"), &mut child.0).await;
-    for query in queries {
-        let response = client
-            .get(format!("{backend}/api/v1/query"))
-            .query(&[("query", *query), ("time", "12345")])
-            .send()
-            .await
-            .unwrap();
-        assert!(
-            response.status().is_success(),
-            "{}",
-            response.text().await.unwrap()
-        );
-        assert_eq!(response.json::<Value>().await.unwrap(), expected);
-    }
-    let received = received.lock().await;
-    assert_eq!(received.len(), queries.len());
-    for (request, query) in received.iter().zip(queries) {
-        assert_eq!(request.get("query").unwrap(), query);
-        assert_eq!(request.get("time").unwrap(), "12345");
-    }
-    fallback.abort();
-}
-
-struct ChildGuard(Child);
-
-impl Drop for ChildGuard {
-    fn drop(&mut self) {
-        let _ = self.0.kill();
-        let _ = self.0.wait();
-    }
-}
-
-fn unused_port() -> u16 {
-    let listener = TcpListener::bind("127.0.0.1:0").expect("reserve loopback port");
-    listener.local_addr().expect("read loopback address").port()
-}
-
-async fn wait_until_ready(client: &reqwest::Client, url: &str, child: &mut Child) {
-    for _ in 0..120 {
-        if let Some(status) = child.try_wait().expect("inspect backend process") {
-            panic!("backend exited before readiness: {status}");
-        }
-        if client
-            .get(url)
-            .send()
-            .await
-            .is_ok_and(|response| response.status().is_success())
-        {
-            return;
-        }
-        tokio::time::sleep(Duration::from_millis(50)).await;
-    }
-    panic!("backend did not become ready at {url}");
-}
-
-fn series(metric: &str, samples: &[(i64, f64)]) -> TimeSeries {
-    series_with_labels(metric, &[], samples)
-}
-
-fn series_with_labels(metric: &str, labels: &[(&str, &str)], samples: &[(i64, f64)]) -> TimeSeries {
-    let mut wire_labels = vec![Label {
-        name: "__name__".into(),
-        value: metric.into(),
-    }];
-    wire_labels.extend(labels.iter().map(|(name, value)| Label {
-        name: (*name).into(),
-        value: (*value).into(),
-    }));
-    TimeSeries {
-        labels: wire_labels,
-        samples: samples
-            .iter()
-            .map(|(timestamp, value)| Sample {
-                value: *value,
-                timestamp: *timestamp,
-            })
-            .collect(),
-        exemplars: Vec::new(),
-        histograms: Vec::new(),
-    }
-}
-
-async fn remote_write(client: &reqwest::Client, base: &str, request: &WriteRequest) -> u16 {
-    let body = snap::raw::Encoder::new()
-        .compress_vec(&request.encode_to_vec())
-        .expect("snappy encode");
-    let response = client
-        .post(format!("{base}/api/v1/write"))
-        .header("content-encoding", "snappy")
-        .header("content-type", "application/x-protobuf")
-        .header("x-prometheus-remote-write-version", "0.1.0")
-        .body(body)
-        .send()
-        .await
-        .expect("send Remote Write");
-    let status = response.status().as_u16();
-    if status >= 400 {
-        eprintln!(
-            "Remote Write {status}: {}",
-            response.text().await.unwrap_or_default()
-        );
-    }
-    status
-}
-
-async fn drain_precompute(client: &reqwest::Client, backend: &str) {
-    let response = client
-        .post(format!("{backend}/api/v1/precompute/drain"))
-        .send()
-        .await
-        .unwrap();
-    assert!(
-        response.status().is_success(),
-        "drain failed: {}",
-        response.text().await.unwrap()
-    );
-}
-
-fn first_value(response: &Value, field: &str) -> Option<f64> {
-    let samples = response["data"]["result"]
-        .as_array()?
-        .first()?
-        .get(field)?
-        .as_array()?;
-    let value = if field == "value" {
-        samples.get(1)?
-    } else {
-        samples.last()?.as_array()?.get(1)?
-    };
-    value.as_str()?.parse().ok()
-}
-
-fn is_warm(response: &Value) -> bool {
-    response["infos"].as_array().is_some_and(|infos| {
-        infos.iter().any(|info| {
-            info.as_str()
-                .is_some_and(|line| line == "data_source: asap_query")
-        })
-    })
-}
-
-// Confidence-sized KLL parameters must reach the real accumulator and answer
-// raw samples through the installed QueryPlan, without native fallback.
-// Uncertified ERP maxima have separate exact-routing process coverage.
-#[tokio::test]
-async fn certified_kll_state_to_query_oracle() {
-    use control_plane::physical::compiler::{BackendLocalPlanningInput, DeploymentPlanCompiler};
-    const QUERY: &str = "quantile_over_time(0.9, erp_latency[5s])";
-    let mut fixture: Value = serde_json::from_str(include_str!(
-        "../../docs/examples/asapquery-compatibility-demo-snapshot.json"
-    ))
-    .unwrap();
-    let mut entry = fixture["query_workload"]["repeating_queries"][3].clone();
-    entry["query"] = QUERY.into();
-    entry["requirements"]["accuracy"] = serde_json::json!({"explicit": {"Epsilon": 0.06}});
-    fixture["query_workload"]["repeating_queries"] = serde_json::json!([entry]);
-    // This collector fixture exports KLL state only. An empty ERP artifact
-    // keeps runtime capability filtering while requiring theoretical sizing.
-    fixture["implementation"]["erp"] = serde_json::json!({
-        "distribution": {"workload": {"external": {"dataset": "kll-process-fixture"}}},
-        "artifact": {"schema_version": 1, "producer_version": "test", "records": []},
-        "implementation": "lib", "error_metric": "max_rank_err",
-        "min_trials": 10, "expected_updates": 1000.0, "expected_queries": 10.0,
-        "expected_merges": 0.0, "retention_seconds": 60.0, "cpu_weight": 1.0,
-        "byte_second_weight": 1e-9, "mode": "hybrid",
-        "runtime": {"allowed_algorithms": ["Kll"], "max_memory_bytes": null}
-    });
-    let snapshot: BackendLocalPlanningInput = serde_json::from_value(fixture).unwrap();
-    let window_model = snapshot.physical_inputs.window_cost_model.clone();
-    let (mut request, mut environment) = snapshot.into_physical_compilation_request().unwrap();
-    request.allow_mixed_summary_and_exact_execution = false;
-    request.queries[0].group_by_labels = vec!["service".into()];
-    let lifecycle_entry = &mut request
-        .query_workload
-        .as_mut()
-        .unwrap()
-        .repeating_queries
-        .as_mut()
-        .unwrap()[0];
-    lifecycle_entry.time_selection.scope = planner_types::workload::QueryTimeScope::Unknown;
-    environment.target =
-        control_plane::physical::compiler::PhysicalDeploymentTarget::DistributedCollectors;
-    environment.target_collector_ids = vec!["erp-collector".into()];
-    control_plane::physical::compiler::prepare_window_implementations(
-        &mut request.queries[0],
-        &window_model,
-        environment.target,
-        request.query_retention_margin_ms,
-    )
-    .unwrap();
-    let plan = DeploymentPlanCompiler
-        .compile_promql(request, environment)
-        .unwrap();
-    assert_eq!(plan.precompute_plan.materializations.len(), 1);
-    let k = plan.precompute_plan.materializations[0].parameters["k"]
-        .as_u64()
-        .unwrap() as u32;
-    let guarantee = asap_aware_mapping::DefaultAccuracyModel::sketch_guarantee(
-        &planner_types::post_asap::SketchAlgorithm::Kll,
-        &planner_types::post_asap::SketchParams::Kll { k },
-        &planner_types::post_asap::SketchQuery::Quantile { q: 0.9 },
-    )
-    .unwrap();
-    assert!(asap_aware_mapping::AccuracyModel::satisfies(
-        &asap_aware_mapping::DefaultAccuracyModel,
-        &guarantee,
-        &planner_types::types::AccuracyTarget::EpsilonDelta {
-            epsilon: 0.06,
-            delta: 0.01
-        }
-    ));
-    let collector = serde_json::to_value(&plan.collector_plans[0]).unwrap();
-    let install = data_plane::drivers::query::servers::http::PhysicalPlanInstallRequest {
-        summary_catalog: plan.summary_catalog,
-        collector_plans: plan.collector_plans,
-        precompute_plan: plan.precompute_plan,
-        transmission_plan: plan.transmission_plan,
-        query_plan: plan.query_plan,
-        storage_routing: None,
-        adaptation_evidence: vec![],
-    };
-    let output = tempfile::tempdir().unwrap();
-    let mut artifact_file = tempfile::NamedTempFile::new().unwrap();
-    serde_json::to_writer(&mut artifact_file, &install).unwrap();
-    let port = unused_port();
-    let otlp_port = unused_port();
-    let grpc_port = unused_port();
-    let mut child = ChildGuard(
-        Command::new(env!("CARGO_BIN_EXE_data_plane"))
-            .args(["--physical-plan"])
-            .arg(artifact_file.path())
-            .args(["--http-port", &port.to_string(), "--output-dir"])
-            .arg(output.path())
-            .args([
-                "--enable-otel-ingest",
-                "--otel-http-port",
-                &otlp_port.to_string(),
-                "--otel-grpc-port",
-                &grpc_port.to_string(),
-            ])
-            .args([
-                "--precompute-allowed-lateness-ms",
-                "0",
-                "--precompute-flush-interval-ms",
-                "25",
-            ])
-            .stdout(Stdio::null())
-            .stderr(Stdio::inherit())
-            .spawn()
-            .unwrap(),
-    );
-    let client = reqwest::Client::new();
-    let backend = format!("http://127.0.0.1:{port}");
-    wait_until_ready(&client, &format!("{backend}/api/v1/health"), &mut child.0).await;
-    let now = std::time::SystemTime::now()
-        .duration_since(std::time::UNIX_EPOCH)
-        .unwrap()
-        .as_millis() as i64;
-    let base = now - now.rem_euclid(5000) - 20000;
-    // The oracle evaluates rank error, not relative error of the value.
-    let raw: Vec<f64> = (0..1000)
-        .map(|i| ((i * 7919 + 17) % 1009) as f64 / 1009.0)
-        .collect();
-    for (sequence, end, values) in [
-        (1, base + 5000, raw.as_slice()),
-        (2, base + 15000, &[0.5][..]),
-    ] {
-        let payload = erp_collector_kll_export(&collector, end as u64, values, sequence);
-        client
-            .post(format!("http://127.0.0.1:{otlp_port}/v1/metrics"))
-            .header("content-type", "application/x-protobuf")
-            .body(payload)
-            .send()
-            .await
-            .unwrap()
-            .error_for_status()
-            .unwrap();
-    }
-    let response = tokio::time::timeout(Duration::from_secs(30), async {
-        loop {
-            let response: Value = client
-                .get(format!("{backend}/api/v1/query"))
-                .query(&[
-                    ("query", QUERY.to_string()),
-                    ("time", ((base + 5000) as f64 / 1000.0).to_string()),
-                ])
-                .send()
-                .await
-                .unwrap()
-                .json()
-                .await
-                .unwrap();
-            if response["status"] == "success" && is_warm(&response) {
-                break response;
-            }
-            tokio::time::sleep(Duration::from_millis(50)).await;
-        }
-    })
-    .await
-    .expect("certified KLL plan must answer without exact fallback");
-    let estimate = first_value(&response, "value").expect("numeric estimate");
-    let rank = raw.iter().filter(|v| **v <= estimate).count() as f64 / raw.len() as f64;
-    assert!(
-        (rank - 0.9).abs() <= 0.06,
-        "rank={rank}, response={response}"
-    );
-}
-
-fn erp_collector_kll_export(plan: &Value, end_ms: u64, raw: &[f64], sequence: u64) -> Vec<u8> {
-    use asap_otel_proto::tonic::{
-        collector::metrics::v1::ExportMetricsServiceRequest,
-        common::v1::{any_value, AnyValue, KeyValue},
-        metrics::v1::{
-            metric::Data, KllSketch, KllSketchDataPoint, KllSketchEncoding, Metric,
-            ResourceMetrics, ScopeMetrics,
-        },
-    };
-    use asap_sketchlib::proto::sketchlib::{sketch_envelope, SketchEnvelope};
-    let decoded: asap_types::producer_plan::CollectorPlan =
-        serde_json::from_value(plan.clone()).unwrap();
-    assert_eq!(decoded.materializations.len(), 1);
-    let k = decoded.materializations[0].parameters["k"]
-        .as_u64()
-        .unwrap()
-        .try_into()
-        .unwrap();
-    let mut sketch = asap_sketchlib::sketches::kll::KLL::<f64>::init_kll_with_seed(k, 123);
-    for value in raw {
-        sketch.update(value);
-    }
-    let wire = SketchEnvelope::decode(asap_sketch_codec::encode_kll(&sketch).as_slice()).unwrap();
-    let Some(sketch_envelope::SketchState::Kll(state)) = wire.sketch_state else {
-        panic!("KLL state required")
-    };
-    assert_eq!(state.k, k as u32);
-    let kv = |key: &str, value: String| KeyValue {
-        key: key.into(),
-        value: Some(AnyValue {
-            value: Some(any_value::Value::StringValue(value)),
-        }),
-    };
-    let materialization = plan["materializations"][0]["materialization"]
-        .as_u64()
-        .unwrap();
-    let mut attributes = vec![kv("service", "erp".into())];
-    for (key, value) in [
-        ("identity_version", "1".into()),
-        ("plan_id", plan["envelope"]["plan_id"].to_string()),
-        ("plan_version", plan["envelope"]["plan_version"].to_string()),
-        (
-            "backend_compat",
-            control_plane::physical::compiler::BACKEND_COMPAT.into(),
-        ),
-        ("materialization", materialization.to_string()),
-        (
-            "series_identity",
-            data_plane::drivers::ingest::canonical_attrs_fingerprint(&[("service", "erp")]),
-        ),
-        (
-            "schema_id",
-            format!(
-                "{}:summary-state:v1:{materialization}",
-                control_plane::physical::compiler::BACKEND_COMPAT
-            ),
-        ),
-        ("producer_id", "erp-collector".into()),
-        ("producer_epoch", "erp-test".into()),
-        ("sequence", sequence.to_string()),
-        ("kind", "full".into()),
-        ("encoding", "sketchlib_protobuf_v1".into()),
-        ("checkpoint_id", format!("checkpoint-{sequence}")),
-    ] {
-        attributes.push(kv(&format!("asap.frame.{key}"), value));
-    }
-    ExportMetricsServiceRequest {
-        resource_metrics: vec![ResourceMetrics {
-            resource: None,
-            schema_url: String::new(),
-            scope_metrics: vec![ScopeMetrics {
-                scope: None,
-                schema_url: String::new(),
-                metrics: vec![Metric {
-                    name: "erp_latency".into(),
-                    description: String::new(),
-                    unit: String::new(),
-                    metadata: vec![],
-                    data: Some(Data::Kllsketch(KllSketch {
-                        k: k as u32,
-                        aggregation_temporality: 0,
-                        data_points: vec![KllSketchDataPoint {
-                            attributes,
-                            start_time_unix_nano: (end_ms - 5000) * 1_000_000,
-                            time_unix_nano: end_ms * 1_000_000,
-                            sketch: SketchEnvelope {
-                                format_version: 1,
-                                sketch_state: Some(sketch_envelope::SketchState::Kll(state)),
-                                ..Default::default()
-                            }
-                            .encode_to_vec(),
-                            encoding: KllSketchEncoding::Proto as i32,
-                            flags: 0,
-                            series_id: 0,
-                        }],
-                    })),
-                }],
-            }],
-        }],
-    }
-    .encode_to_vec()
-}
-
-// Both heap implementations must execute registered temporal counts through
-// an installed QueryPlan, retaining all three ranked identities and values.
-#[tokio::test]
-async fn registered_temporal_topk_cms_heap() {
-    registered_temporal_topk(planner_types::post_asap::SketchAlgorithm::CmsWithHeap).await;
-}
-
-#[tokio::test]
-async fn registered_temporal_topk_count_sketch_heap() {
-    registered_temporal_topk(planner_types::post_asap::SketchAlgorithm::CountSketchWithHeap).await;
-}
-
-async fn registered_temporal_topk(algorithm: planner_types::post_asap::SketchAlgorithm) {
-    use control_plane::physical::compiler::{BackendLocalPlanningInput, DeploymentPlanCompiler};
-    use planner_types::post_asap::{CompositionOperator, SketchQuery, SummaryFamilyType};
-    const QUERY: &str = "topk(3, count_over_time(top_endpoint_qps[5s]))";
-    struct Evidence;
-    impl asap_aware_mapping::AccuracyEvidenceProvider for Evidence {
-        fn propagation_stats(
-            &self,
-            op: &CompositionOperator,
-            _: &SummaryFamilyType,
-            _: Option<&SketchQuery>,
-        ) -> asap_aware_mapping::PropagationStats {
-            if matches!(op, CompositionOperator::TopKSelection) {
-                asap_aware_mapping::PropagationStats {
-                    topk_selected_lower_bound: Some(95.0),
-                    topk_excluded_upper_bound: Some(80.0),
-                    topk_interval_failure_probability: Some(0.001),
-                    ..Default::default()
-                }
-            } else {
-                Default::default()
-            }
-        }
-    }
-    let mut fixture: Value = serde_json::from_str(include_str!(
-        "../../docs/examples/asapquery-compatibility-demo-snapshot.json"
-    ))
-    .unwrap();
-    let mut entry = fixture["query_workload"]["repeating_queries"][5].clone();
-    entry["query"] = QUERY.into();
-    entry["requirements"]["accuracy"] =
-        serde_json::json!({"explicit": {"EpsilonDelta": {"epsilon": 0.05, "delta": 0.05}}});
-    fixture["query_workload"]["repeating_queries"] = serde_json::json!([entry]);
-    fixture["implementation"]["topk_evidence"] = serde_json::json!({
-        QUERY: {
-            "selected_lower_bound": 95.0, "excluded_upper_bound": 80.0,
-            "interval_failure_probability": 0.001, "observed_at_unix_ms": 9500,
-            "source": "deterministic-count-ranking-fixture"
-        }
-    });
-    let snapshot: BackendLocalPlanningInput = serde_json::from_value(fixture).unwrap();
-    let (mut request, environment) = snapshot.into_physical_compilation_request().unwrap();
-    let query = &mut request.queries[0];
-    let expr = control_plane::query_parser::parse_query_expr_canonical(
-        QUERY,
-        query.accuracy_target.clone(),
-    )
-    .unwrap();
-    // This test installs collector heap state. Backend-only exact temporal
-    // readouts are legal in production but outside this fixture's input contract.
-    struct HeapFixtureModel(
-        control_plane::physical::post_asap::cost_model::ForcedFamilyCostModel,
-        planner_types::post_asap::SketchAlgorithm,
-    );
-    impl asap_aware_mapping::CostModel for HeapFixtureModel {
-        fn rank_candidates(
-            &self,
-            intent: &planner_types::pre_asap::AggIntent,
-            candidates: &[planner_types::post_asap::SketchAlgorithm],
-        ) -> Vec<planner_types::post_asap::SketchAlgorithm> {
-            self.0.rank_candidates(intent, candidates)
-        }
-        fn size_params(
-            &self,
-            kind: planner_types::post_asap::SketchAlgorithm,
-            intent: &planner_types::pre_asap::AggIntent,
-            eps: f64,
-            delta: f64,
-        ) -> planner_types::post_asap::SketchParams {
-            self.0.size_params(kind, intent, eps, delta)
-        }
-        fn candidate_cost(
-            &self,
-            candidate: &asap_aware_mapping::ReplacementSubDAG,
-            target: &asap_aware_mapping::TargetSubDAG<'_>,
-        ) -> Option<asap_aware_mapping::cost_model::Cost> {
-            self.0.candidate_cost(candidate, target)
-        }
-        fn summary_support_evidence(
-            &self,
-            summary: &planner_types::post_asap::SummaryNode,
-        ) -> Option<bool> {
-            if matches!(
-                summary.expr,
-                planner_types::post_asap::SummaryExpr::ValueOperation {
-                    operation: planner_types::post_asap::ValueOperation::Limit { .. },
-                    ..
-                }
-            ) {
-                return Some(false);
-            }
-            let dag = planner_types::post_asap::compile_executable_dag(&std::rc::Rc::new(
-                summary.clone(),
-            ))
-            .ok()?;
-            if dag.nodes.iter().any(|node| matches!(&node.payload,
-                planner_types::post_asap::ExecutableOperatorPayload::SummaryAgg { family: SummaryFamilyType::Sketch(kind, _), .. } if kind.algorithm() != &self.1)) {
-                return Some(false);
-            }
-            self.0.summary_support_evidence(summary)
-        }
-    }
-    let model = HeapFixtureModel(
-        control_plane::physical::post_asap::cost_model::ForcedFamilyCostModel::new(
-            query.accuracy_target.clone(),
-            algorithm.clone(),
-        ),
-        algorithm.clone(),
-    );
-    query.selected_plan_root = control_plane::planner_selection::select_query_with_models(
-        &expr,
-        &model,
-        &asap_aware_mapping::DefaultAccuracyModel,
-        &Evidence,
-    )
-    .unwrap();
-    let plan = DeploymentPlanCompiler
-        .compile_promql(request, environment)
-        .unwrap();
-    assert_eq!(plan.precompute_plan.materializations.len(), 1);
-    use data_plane::storage_engines::types::AggregationType;
-    let expected_type = match algorithm {
-        planner_types::post_asap::SketchAlgorithm::CmsWithHeap => {
-            AggregationType::CountMinSketchWithHeap
-        }
-        planner_types::post_asap::SketchAlgorithm::CountSketchWithHeap => {
-            AggregationType::CountSketchWithHeap
-        }
-        _ => panic!("fixture requires a heap implementation"),
-    };
-    assert_eq!(
-        plan.precompute_plan.materializations[0].aggregation_type,
-        expected_type
-    );
-    assert_eq!(
-        plan.precompute_plan.materializations[0].parameters["weight_mode"],
-        "count"
-    );
-    let artifact = data_plane::drivers::query::servers::http::PhysicalPlanInstallRequest {
-        summary_catalog: plan.summary_catalog,
-        collector_plans: plan.collector_plans,
-        precompute_plan: plan.precompute_plan,
-        transmission_plan: plan.transmission_plan,
-        query_plan: plan.query_plan,
-        storage_routing: None,
-        adaptation_evidence: vec![],
-    };
-    let output = tempfile::tempdir().unwrap();
-    let mut artifact_file = tempfile::NamedTempFile::new().unwrap();
-    serde_json::to_writer(&mut artifact_file, &artifact).unwrap();
-    let port = unused_port();
-    let fallback = tokio::net::TcpListener::bind("127.0.0.1:0").await.unwrap();
-    let fallback_url = format!("http://{}", fallback.local_addr().unwrap());
-    let fallback_task = tokio::spawn(async move {
-        axum::serve(fallback, Router::new()
-            .route("/-/healthy", get(|| async { "healthy" }))
-            .route("/api/v1/query", get(|| async { Json(serde_json::json!({
-                "status": "error", "errorType": "execution", "error": "fixture exact backend unavailable"
-            })) }))).await.unwrap();
-    });
-    let mut child = ChildGuard(
-        Command::new(env!("CARGO_BIN_EXE_data_plane"))
-            .args(["--profile", "asapquery", "--physical-plan"])
-            .arg(artifact_file.path())
-            .args([
-                "--forward-unsupported-queries",
-                "--prometheus-server",
-                &fallback_url,
-            ])
-            .args(["--http-port", &port.to_string(), "--output-dir"])
-            .arg(output.path())
-            .args([
-                "--precompute-allowed-lateness-ms",
-                "0",
-                "--precompute-flush-interval-ms",
-                "25",
-            ])
-            .stdout(Stdio::null())
-            .stderr(Stdio::inherit())
-            .spawn()
-            .unwrap(),
-    );
-    let client = reqwest::Client::new();
-    let backend = format!("http://127.0.0.1:{port}");
-    wait_until_ready(&client, &format!("{backend}/api/v1/health"), &mut child.0).await;
-    let now = std::time::SystemTime::now()
-        .duration_since(std::time::UNIX_EPOCH)
-        .unwrap()
-        .as_millis() as i64;
-    let base = now - now.rem_euclid(5000) - 20000;
-    let counts = [
-        ("alpha", 100),
-        ("beta", 50),
-        ("gamma", 200),
-        ("delta", 75),
-        ("epsilon", 10),
-        ("zeta", 150),
-    ];
-    let samples = WriteRequest {
-        timeseries: counts
-            .iter()
-            .map(|(item, count)| {
-                // Non-unit values distinguish count updates from accidental weighted sums.
-                let points = (0..2)
-                    .flat_map(|window| {
-                        (0..*count).map(move |i| (base + window * 5000 + 10 + i * 20, 17.0))
-                    })
-                    .collect::<Vec<_>>();
-                series_with_labels("top_endpoint_qps", &[("endpoint", item)], &points)
-            })
-            .collect(),
-    };
-    assert_eq!(remote_write(&client, &backend, &samples).await, 204);
-    let watermark = WriteRequest {
-        timeseries: vec![series_with_labels(
-            "top_endpoint_qps",
-            &[("endpoint", "gamma")],
-            &[(base + 10500, 17.0)],
-        )],
-    };
-    assert_eq!(remote_write(&client, &backend, &watermark).await, 204);
-    assert_eq!(remote_write(&client, &backend, &samples).await, 204);
-    drain_precompute(&client, &backend).await;
-    let timestamp = (base + 5000) as f64 / 1000.0;
-    let instant = tokio::time::timeout(Duration::from_secs(30), async {
-        loop {
-            let response: Value = client
-                .get(format!("{backend}/api/v1/query"))
-                .query(&[
-                    ("query", QUERY.to_string()),
-                    ("time", timestamp.to_string()),
-                ])
-                .send()
-                .await
-                .unwrap()
-                .json()
-                .await
-                .unwrap();
-            if response["status"] == "success" && is_warm(&response) {
-                break response;
-            }
-            tokio::time::sleep(Duration::from_millis(50)).await;
-        }
-    })
-    .await
-    .expect("registered TopK must become warm within 30s");
-    let expected = [("gamma", 200.0), ("zeta", 150.0), ("alpha", 100.0)];
-    let assert_ranks = |response: &Value, range: bool| {
-        assert_eq!(response["status"], "success", "{response}");
-        assert!(is_warm(response), "{response}");
-        let rows = response["data"]["result"].as_array().unwrap();
-        assert_eq!(rows.len(), 3, "{response}");
-        for (item, count) in expected {
-            let row = rows
-                .iter()
-                .find(|row| {
-                    row["metric"]["item"].as_str()
-                        == Some(format!("top_endpoint_qps{{endpoint=\"{item}\"}}").as_str())
-                })
-                .unwrap_or_else(|| panic!("missing {item}: {response}"));
-            let points = if range {
-                let points = row["values"].as_array().unwrap();
-                assert_eq!(points.len(), 2);
-                points.clone()
-            } else {
-                vec![row["value"].clone()]
-            };
-            for (index, point) in points.iter().enumerate() {
-                assert_eq!(point[0].as_f64(), Some(timestamp + index as f64 * 5.0));
-                assert_eq!(
-                    point[1].as_str().unwrap().parse::<f64>().unwrap(),
-                    count,
-                    "{response}"
-                );
-            }
-        }
-    };
-    assert_ranks(&instant, false);
-    let range: Value = client
-        .get(format!("{backend}/api/v1/query_range"))
-        .query(&[
-            ("query", QUERY.to_string()),
-            ("start", timestamp.to_string()),
-            ("end", (timestamp + 5.0).to_string()),
-            ("step", "5".into()),
-        ])
-        .send()
-        .await
-        .unwrap()
-        .json()
-        .await
-        .unwrap();
-    assert_ranks(&range, true);
-    let unregistered: Value = client
-        .get(format!("{backend}/api/v1/query"))
-        .query(&[("query", "topk(3, top_endpoint_qps)")])
-        .send()
-        .await
-        .unwrap()
-        .json()
-        .await
-        .unwrap();
-    assert_eq!(
-        unregistered["status"], "error",
-        "unregistered query must not replan: {unregistered}"
-    );
-    assert_eq!(unregistered["error"], "fixture exact backend unavailable");
-    fallback_task.abort();
-}
-
-// Three registered consumers must observe one raw SUM/count producer, including
-// uneven instance sample counts and Remote Write retries.
-#[tokio::test]
-async fn shared_exact_dashboard_executes_selected_workload() {
-    run_shared_dashboard(false).await;
-}
-
-// A selected 5s pane serves advancing 10s lookbacks through the production HTTP path.
-#[tokio::test]
-async fn repeated_dashboard_executes_multiple_selected_panes() {
-    run_shared_dashboard(true).await;
-}
-
-async fn run_shared_dashboard(multi_pane: bool) {
-    let fallback_listener = tokio::net::TcpListener::bind("127.0.0.1:0").await.unwrap();
-    let fallback_address = fallback_listener.local_addr().unwrap();
-    tokio::spawn(async move {
-        axum::serve(fallback_listener, Router::new()
-            .route("/-/healthy", get(|| async { "healthy" }))
-            .route("/api/v1/query", get(|| async { Json(serde_json::json!({"status":"success","data":{"resultType":"vector","result":[]}})) })))
-            .await.unwrap();
-    });
-    let output_dir = tempfile::tempdir().unwrap();
-    let mut snapshot: Value = serde_json::from_str(include_str!(
-        "../../docs/examples/asapquery-compatibility-demo-snapshot.json"
-    ))
-    .unwrap();
-    let sum = if multi_pane {
-        "sum by (service) (sum_over_time(asap_demo_gauge[10s]))"
-    } else {
-        "sum by (service) (sum_over_time(asap_demo_gauge[5s]))"
-    };
-    let count = if multi_pane {
-        "sum by (service) (count_over_time(asap_demo_gauge[10s]))"
-    } else {
-        "sum by (service) (count_over_time(asap_demo_gauge[5s]))"
-    };
-    let mean = format!("{sum} / {count}");
-    let mut entry = snapshot["query_workload"]["repeating_queries"][2].clone();
-    snapshot["query_workload"]["repeating_queries"] = Value::Array(
-        [sum, count, mean.as_str()]
-            .into_iter()
-            .map(|query| {
-                entry["query"] = query.into();
-                entry.clone()
-            })
-            .collect(),
-    );
-    let mut typed: control_plane::physical::compiler::BackendLocalPlanningInput =
-        serde_json::from_value(snapshot.clone()).unwrap();
-    if multi_pane {
-        for entry in typed.query_workload.repeating_queries.as_mut().unwrap() {
-            entry.demand = planner_types::workload::RepeatedDemand::FixedIntervalAt {
-                interval: planner_types::workload::RepetitionInterval(5_000),
-                evaluation_phase: planner_types::workload::TimestampMs(0),
-            };
-        }
-    }
-    let (request, environment) = typed.clone().into_physical_compilation_request().unwrap();
-    let candidates =
-        control_plane::physical::workload_cost::enumerate_exact_and_materialized_candidates(
-            request,
-        )
-        .unwrap();
-    let quotes = candidates
-        .into_iter()
-        .enumerate()
-        .map(|(index, candidate)| {
-            let plan = control_plane::physical::compiler::DeploymentPlanCompiler
-                .compile_promql(candidate.clone(), environment.clone())
-                .unwrap();
-            let manifest =
-                control_plane::physical::workload_cost::manifest(&plan, &candidate.queries)
-                    .unwrap();
-            let unit_costs = manifest
-                .components
-                .keys()
-                .map(|key| (key.clone(), if index == 0 { 1.0 } else { 1000.0 }))
-                .collect();
-            control_plane::physical::workload_cost::WorkloadQuote {
-                manifest,
-                executable: true,
-                unit_costs,
-            }
-        })
-        .collect();
-    typed.workload_cost_evidence = Some(
-        control_plane::physical::workload_cost::WorkloadCostEvidence {
-            backend_revision: control_plane::physical::compiler::BACKEND_REVISION.into(),
-            planner_revision: control_plane::physical::compiler::PLANNER_REVISION.into(),
-            data_snapshot_id: "process-fixture-v1".into(),
-            model_version: "test-only-unit-costs".into(),
-            observed_at_unix_ms: environment.observed_at_unix_ms,
-            valid_for_ms: environment.max_evidence_age_ms,
-            quotes,
-        },
-    );
-    snapshot = serde_json::to_value(&typed).unwrap();
-    let plan = typed.compile_promql().unwrap();
-    assert!(plan.cost_comparison.is_some());
-    assert_eq!(plan.precompute_plan.materializations.len(), 2);
-    let families = plan
-        .precompute_plan
-        .materializations
-        .iter()
-        .map(|m| m.aggregation_type.as_str())
-        .collect::<std::collections::BTreeSet<_>>();
-    assert_eq!(families, std::collections::BTreeSet::from(["Sum", "Count"]));
-    assert_eq!(plan.query_plan.entries.len(), 3);
-    assert!(plan
-        .precompute_plan
-        .executable_dags
-        .values()
-        .all(|installed| installed.document.schema_version
-            == asap_types::executable_plan::PRECOMPUTE_DAG_SCHEMA_VERSION));
-    if multi_pane {
-        assert!(plan.lifecycle_estimates[0]
-            .window_realization_id
-            .contains("pane"));
-        for entry in plan.query_plan.entries.values() {
-            assert_eq!(entry.instant.lookback_ms, 10_000);
-            assert_eq!(entry.materialization_bindings()[0].window_ms, 5_000);
-        }
-    }
-    let snapshot_path = output_dir.path().join("snapshot.json");
-    std::fs::write(&snapshot_path, serde_json::to_vec(&snapshot).unwrap()).unwrap();
-    let port = unused_port();
-    let child = Command::new(env!("CARGO_BIN_EXE_data_plane"))
-        .args(["--profile", "asapquery", "--planning-snapshot"])
-        .arg(&snapshot_path)
-        .args([
-            "--forward-unsupported-queries",
-            "--prometheus-server",
-            &format!("http://{fallback_address}"),
-        ])
-        .args(["--http-port", &port.to_string(), "--output-dir"])
-        .arg(output_dir.path())
-        .args([
-            "--precompute-allowed-lateness-ms",
-            "0",
-            "--precompute-flush-interval-ms",
-            "25",
-        ])
-        .stdout(Stdio::null())
-        .stderr(Stdio::inherit())
-        .spawn()
-        .unwrap();
-    let mut child = ChildGuard(child);
-    let client = reqwest::Client::new();
-    let backend = format!("http://127.0.0.1:{port}");
-    wait_until_ready(&client, &format!("{backend}/api/v1/health"), &mut child.0).await;
-    let now = std::time::SystemTime::now()
-        .duration_since(std::time::UNIX_EPOCH)
-        .unwrap()
-        .as_millis() as i64;
-    let base = now - now.rem_euclid(5000) - 20000;
-    let labeled = |service: &str, instance: &str, samples: &[(i64, f64)]| {
-        let mut item = series("asap_demo_gauge", samples);
-        item.labels.extend([
-            Label {
-                name: "service".into(),
-                value: service.into(),
-            },
-            Label {
-                name: "instance".into(),
-                value: instance.into(),
-            },
-        ]);
-        item
-    };
-    let request = WriteRequest {
-        timeseries: vec![
-            if multi_pane {
-                labeled(
-                    "api",
-                    "a",
-                    &[(base, 10000.0), (base + 500, 10.0), (base + 5000, 6.0)],
-                )
-            } else {
-                labeled("api", "a", &[(base + 500, 10.0)])
-            },
-            labeled(
-                "api",
-                "b",
-                &[(base + 600, 2.0), (base + 1700, 4.0), (base + 2900, 8.0)],
-            ),
-            labeled("worker", "c", &[(base + 700, 9.0), (base + 1900, 15.0)]),
-        ],
-    };
-    assert_eq!(remote_write(&client, &backend, &request).await, 204);
-    assert_eq!(remote_write(&client, &backend, &request).await, 204);
-    let advance = WriteRequest {
-        timeseries: vec![
-            labeled("api", "a", &[(base + 5500, 100.0)]),
-            labeled("api", "b", &[(base + 5500, 100.0)]),
-            labeled("worker", "c", &[(base + 5500, 100.0)]),
-        ],
-    };
-    assert_eq!(remote_write(&client, &backend, &advance).await, 204);
-    let final_advance = WriteRequest {
-        timeseries: vec![
-            if multi_pane {
-                labeled("api", "a", &[(base + 10000, 7.0), (base + 10500, 1000.0)])
-            } else {
-                labeled("api", "a", &[(base + 10500, 1000.0)])
-            },
-            labeled("api", "b", &[(base + 10500, 1000.0)]),
-            labeled("worker", "c", &[(base + 10500, 1000.0)]),
-        ],
-    };
-    assert_eq!(remote_write(&client, &backend, &final_advance).await, 204);
-    if multi_pane {
-        let close_third = WriteRequest {
-            timeseries: vec![
-                labeled("api", "a", &[(base + 15500, 9999.0)]),
-                labeled("api", "b", &[(base + 15500, 9999.0)]),
-                labeled("worker", "c", &[(base + 15500, 9999.0)]),
-            ],
-        };
-        assert_eq!(remote_write(&client, &backend, &close_third).await, 204);
-    }
-    drain_precompute(&client, &backend).await;
-    let evaluation = base + if multi_pane { 10000 } else { 5000 };
-    for (query, expected) in [
-        (
-            sum,
-            if multi_pane {
-                [237.0, 124.0]
-            } else {
-                [24.0, 24.0]
-            },
-        ),
-        (count, if multi_pane { [8.0, 3.0] } else { [4.0, 2.0] }),
-        (
-            mean.as_str(),
-            if multi_pane {
-                [237.0 / 8.0, 124.0 / 3.0]
-            } else {
-                [6.0, 12.0]
-            },
-        ),
-    ] {
-        let result = wait_for_warm_instant(
-            &client,
-            &backend,
-            query,
-            evaluation as f64 / 1000.0,
-            &output_dir.path().join("query_engine.log"),
-        )
-        .await;
-        let rows = result["data"]["result"].as_array().unwrap();
-        assert_eq!(rows.len(), 2, "{query}: {result}");
-        for row in rows {
-            let service = row["metric"]["service"].as_str().unwrap();
-            assert_eq!(row["metric"].as_object().unwrap().len(), 1);
-            let value: f64 = row["value"][1].as_str().unwrap().parse().unwrap();
-            assert_eq!(
-                value,
-                expected[usize::from(service == "worker")],
-                "{query}: {result}"
-            );
-            assert_eq!(
-                row["value"][0].as_f64().unwrap(),
-                evaluation as f64 / 1000.0
-            );
-        }
-    }
-    let result: Value = client
-        .get(format!("{backend}/api/v1/query_range"))
-        .query(&[
-            ("query", mean.clone()),
-            ("start", (evaluation as f64 / 1000.0).to_string()),
-            ("end", ((evaluation + 5000) as f64 / 1000.0).to_string()),
-            ("step", "5".into()),
-        ])
-        .send()
-        .await
-        .unwrap()
-        .json()
-        .await
-        .unwrap();
-    assert!(is_warm(&result), "{result}");
-    for row in result["data"]["result"].as_array().unwrap() {
-        let values = row["values"].as_array().unwrap();
-        assert_eq!(values.len(), 2, "{result}");
-        assert_eq!(
-            values[1][1],
-            if multi_pane {
-                if row["metric"]["service"] == "api" {
-                    "441.4"
-                } else {
-                    "550"
-                }
-            } else {
-                "100"
-            },
-            "{result}"
-        );
-    }
-    // Unaligned intervals cannot be answered by whole tumbling states.
-    let result: Value = client
-        .get(format!("{backend}/api/v1/query"))
-        .query(&[
-            ("query", mean),
-            ("time", ((evaluation + 1) as f64 / 1000.0).to_string()),
-        ])
-        .send()
-        .await
-        .unwrap()
-        .json()
-        .await
-        .unwrap();
-    assert!(
-        !is_warm(&result),
-        "partial interval was incorrectly warm: {result}"
-    );
-}
-
-async fn wait_for_warm_instant(
-    client: &reqwest::Client,
-    base: &str,
-    query: &str,
-    evaluation_seconds: f64,
-    log_path: &std::path::Path,
-) -> Value {
-    let mut last = Value::Null;
-    for _ in 0..80 {
-        last = client
-            .get(format!("{base}/api/v1/query"))
-            .query(&[
-                ("query", query.to_string()),
-                ("time", evaluation_seconds.to_string()),
-            ])
-            .send()
-            .await
-            .expect("instant query")
-            .json()
-            .await
-            .expect("instant JSON");
-        if is_warm(&last) && first_value(&last, "value").is_some() {
-            return last;
-        }
-        tokio::time::sleep(Duration::from_millis(50)).await;
-    }
-    let log = std::fs::read_to_string(log_path)
-        .unwrap_or_else(|error| format!("log unavailable: {error}"));
-    panic!("query never became warm: {query}: {last}\nbackend log:\n{log}");
-}
-
-async fn wait_for_warm_range(
-    client: &reqwest::Client,
-    base: &str,
-    query: &str,
-    start_seconds: f64,
-    end_seconds: f64,
-    step_seconds: u64,
-    log_path: &std::path::Path,
-) -> Value {
-    let mut last = Value::Null;
-    for _ in 0..80 {
-        last = client
-            .get(format!("{base}/api/v1/query_range"))
-            .query(&[
-                ("query", query.to_string()),
-                ("start", start_seconds.to_string()),
-                ("end", end_seconds.to_string()),
-                ("step", step_seconds.to_string()),
-            ])
-            .send()
-            .await
-            .expect("range query")
-            .json()
-            .await
-            .expect("range JSON");
-        if is_warm(&last)
-            && last["data"]["result"]
-                .as_array()
-                .is_some_and(|result| !result.is_empty())
-        {
-            return last;
-        }
-        tokio::time::sleep(Duration::from_millis(50)).await;
-    }
-    let log = std::fs::read_to_string(log_path)
-        .unwrap_or_else(|error| format!("log unavailable: {error}"));
-    panic!("range query never became warm: {query}: {last}\nbackend log:\n{log}");
-}
-
-#[tokio::test]
-async fn collector_free_profile_serves_complete_matrix_and_falls_back_exactly() {
-    let fallback_calls = Arc::new(Mutex::new(Vec::<(
-        String,
-        HashMap<String, String>,
-        HeaderMap,
-    )>::new()));
-    let instant_calls = Arc::clone(&fallback_calls);
-    let range_calls = Arc::clone(&fallback_calls);
-    let fallback_app = Router::new()
-        .route("/-/healthy", get(|| async { "Prometheus is Healthy." }))
-        .route(
-            "/api/v1/query",
-            get(
-                move |Query(params): Query<HashMap<String, String>>, headers: HeaderMap| {
-                    let calls = Arc::clone(&instant_calls);
-                    async move {
-                        calls
-                            .lock()
-                            .await
-                            .push(("instant".into(), params.clone(), headers));
-                        let timestamp = params
-                            .get("time")
-                            .and_then(|value| value.parse::<f64>().ok())
-                            .unwrap_or_default();
-                        Json(serde_json::json!({
-                            "status": "success",
-                            "data": {"resultType": "vector", "result": [{
-                                "metric": {"fallback": "true"},
-                                "value": [timestamp, "42"]
-                            }]}
-                        }))
-                    }
-                },
-            ),
-        )
-        .route(
-            "/api/v1/query_range",
-            get(
-                move |Query(params): Query<HashMap<String, String>>, headers: HeaderMap| {
-                    let calls = Arc::clone(&range_calls);
-                    async move {
-                        calls
-                            .lock()
-                            .await
-                            .push(("range".into(), params.clone(), headers));
-                        let start = params
-                            .get("start")
-                            .and_then(|value| value.parse::<f64>().ok())
-                            .unwrap_or_default();
-                        let end = params
-                            .get("end")
-                            .and_then(|value| value.parse::<f64>().ok())
-                            .unwrap_or_default();
-                        Json(serde_json::json!({
-                            "status": "success",
-                            "data": {"resultType": "matrix", "result": [{
-                                "metric": {"fallback": "true"},
-                                "values": [[start, "42"], [end, "43"]]
-                            }]}
-                        }))
-                    }
-                },
-            ),
-        );
-    let fallback_listener = tokio::net::TcpListener::bind("127.0.0.1:0")
-        .await
-        .expect("bind fallback");
-    let fallback_address = fallback_listener.local_addr().expect("fallback address");
-    tokio::spawn(async move {
-        axum::serve(fallback_listener, fallback_app)
-            .await
-            .expect("serve fallback")
-    });
-
-    let backend_port = unused_port();
-    let output_dir = tempfile::tempdir().expect("backend output directory");
-    let mut fixture: control_plane::physical::compiler::BackendLocalPlanningInput =
-        serde_json::from_str(include_str!(
-            "../../docs/examples/asapquery-compatibility-demo-snapshot.json"
-        ))
-        .unwrap();
-    // These range checks read older evaluations after finite drain.
-    fixture.physical_inputs.query_retention_margin_ms = 60_000;
-    let priced = quote_snapshot_for_test(fixture);
-    let snapshot = output_dir.path().join("snapshot.json");
-    std::fs::write(&snapshot, serde_json::to_vec(&priced).unwrap()).unwrap();
-    let child = Command::new(env!("CARGO_BIN_EXE_data_plane"))
-        .arg("--profile")
-        .arg("asapquery")
-        .arg("--planning-snapshot")
-        .arg(&snapshot)
-        .arg("--prometheus-server")
-        .arg(format!("http://{fallback_address}"))
-        .arg("--forward-unsupported-queries")
-        .arg("--http-port")
-        .arg(backend_port.to_string())
-        .arg("--output-dir")
-        .arg(output_dir.path())
-        .arg("--precompute-allowed-lateness-ms")
-        .arg("0")
-        .arg("--precompute-flush-interval-ms")
-        .arg("25")
-        .stdout(Stdio::null())
-        .stderr(Stdio::inherit())
-        .spawn()
-        .expect("start production backend");
-    let mut child = ChildGuard(child);
-    let client = reqwest::Client::new();
-    let backend = format!("http://127.0.0.1:{backend_port}");
-    wait_until_ready(&client, &format!("{backend}/api/v1/health"), &mut child.0).await;
-
-    let now_ms = std::time::SystemTime::now()
-        .duration_since(std::time::UNIX_EPOCH)
-        .expect("system time")
-        .as_millis() as i64;
-    let base = now_ms - now_ms.rem_euclid(5_000) - 20_000;
-    let request = WriteRequest {
-        timeseries: vec![
-            series(
-                "asap_demo_counter_total",
-                &[
-                    (base + 500, 10.0),
-                    (base + 1_700, 20.0),
-                    (base + 2_900, 3.0),
-                    (base + 4_200, 13.0),
-                    (base + 5_400, 13.0),
-                    (base + 6_600, 21.0),
-                    (base + 8_100, 2.0),
-                    (base + 9_400, 12.0),
-                ],
-            ),
-            series_with_labels(
-                "asap_demo_counter_total",
-                &[("instance", "independent")],
-                &[
-                    (base + 500, 50.0),
-                    (base + 1_700, 60.0),
-                    (base + 2_900, 5.0),
-                    (base + 4_200, 15.0),
-                    // Keep both queried windows populated; missing counter
-                    // panes deliberately use exact fallback.
-                    (base + 5_500, 20.0),
-                    (base + 6_700, 30.0),
-                    (base + 7_900, 5.0),
-                    (base + 9_200, 15.0),
-                ],
-            ),
-            series_with_labels(
-                "asap_demo_gauge",
-                &[("job", "api")],
-                &[
-                    (base + 500, 1.0),
-                    (base + 1_700, 2.0),
-                    (base + 2_900, 3.0),
-                    (base + 4_200, 4.0),
-                    (base + 5_400, 5.0),
-                    (base + 6_600, 6.0),
-                    (base + 8_100, 7.0),
-                    (base + 9_400, 8.0),
-                ],
-            ),
-            series_with_labels(
-                "asap_demo_gauge",
-                &[("job", "worker")],
-                &[(base + 700, 100.0), (base + 3_100, 100.0)],
-            ),
-            series_with_labels(
-                "asap_demo_gauge",
-                &[("job", "cron")],
-                &[
-                    (base + 900, 10.0),
-                    (base + 2_100, 10.0),
-                    (base + 3_700, 10.0),
-                ],
-            ),
-            series(
-                "asap_demo_latency_ms",
-                &[
-                    (base + 500, 10.0),
-                    (base + 1_700, 20.0),
-                    (base + 2_900, 30.0),
-                    (base + 4_200, 40.0),
-                    (base + 5_400, 15.0),
-                    (base + 6_600, 25.0),
-                    (base + 8_100, 35.0),
-                    (base + 9_400, 45.0),
-                ],
-            ),
-        ],
-    };
-    assert_eq!(remote_write(&client, &backend, &request).await, 204);
-    let watermark_advance = WriteRequest {
-        timeseries: vec![
-            series("asap_demo_counter_total", &[(base + 10_500, 15.0)]),
-            series_with_labels(
-                "asap_demo_gauge",
-                &[("job", "api")],
-                &[(base + 10_500, 9.0)],
-            ),
-            series("asap_demo_latency_ms", &[(base + 10_500, 55.0)]),
-        ],
-    };
-    assert_eq!(
-        remote_write(&client, &backend, &watermark_advance).await,
-        204
-    );
-    // A normal Prometheus retry must be accepted without changing sketches.
-    assert_eq!(remote_write(&client, &backend, &request).await, 204);
-    drain_precompute(&client, &backend).await;
-    let corrupt = client
-        .post(format!("{backend}/api/v1/write"))
-        .header("content-encoding", "snappy")
-        .header("content-type", "application/x-protobuf")
-        .body(vec![1, 2, 3])
-        .send()
-        .await
-        .expect("send corrupt request");
-    assert_eq!(corrupt.status().as_u16(), 400);
-
-    let first_eval = (base + 5_000) as f64 / 1_000.0;
-    let second_eval = (base + 10_000) as f64 / 1_000.0;
-    let backend_log = output_dir.path().join("query_engine.log");
-    // Reset-aware counter panes align with the installed workload phase and
-    // must serve both instant and range requests through the warm path.
-    for query in [
-        "rate(asap_demo_counter_total[5s])",
-        "increase(asap_demo_counter_total[5s])",
-    ] {
-        let instant =
-            wait_for_warm_instant(&client, &backend, query, first_eval, &backend_log).await;
-        assert_eq!(instant["status"], "success", "{query}: {instant}");
-        assert!(is_warm(&instant), "{query}: {instant}");
-        let range = wait_for_warm_range(
-            &client,
-            &backend,
-            query,
-            first_eval,
-            second_eval,
-            5,
-            &backend_log,
-        )
-        .await;
-        assert_eq!(range["status"], "success", "{query}: {range}");
-        assert!(is_warm(&range), "{query}: {range}");
-    }
-    // Per-series quantile now has a population-isolated producer.
-    let quantile_query = "quantile_over_time(0.5, asap_demo_latency_ms[5s])";
-    let quantile =
-        wait_for_warm_instant(&client, &backend, quantile_query, first_eval, &backend_log).await;
-    assert!(is_warm(&quantile));
-    let quantile_range = wait_for_warm_range(
-        &client,
-        &backend,
-        quantile_query,
-        first_eval,
-        second_eval,
-        5,
-        &backend_log,
-    )
-    .await;
-    assert!(is_warm(&quantile_range));
-    let sum = wait_for_warm_instant(
-        &client,
-        &backend,
-        "sum(sum_over_time(asap_demo_gauge[5s]))",
-        first_eval,
-        &backend_log,
-    )
-    .await;
-    let topk_sum = wait_for_warm_instant(
-        &client,
-        &backend,
-        "topk(1, sum_over_time(asap_demo_gauge[5s]))",
-        first_eval,
-        &backend_log,
-    )
-    .await;
-    let topk_count = wait_for_warm_instant(
-        &client,
-        &backend,
-        "topk(1, count_over_time(asap_demo_gauge[5s]))",
-        first_eval,
-        &backend_log,
-    )
-    .await;
-    assert_eq!(
-        first_value(&topk_sum, "value"),
-        Some(200.0),
-        "value-weighted Top-K must select worker: {topk_sum}"
-    );
-    assert_eq!(
-        first_value(&topk_count, "value"),
-        Some(4.0),
-        "count-weighted Top-K must select api: {topk_count}"
-    );
-    assert_eq!(topk_sum["data"]["result"].as_array().map(Vec::len), Some(1));
-    assert_eq!(
-        topk_count["data"]["result"].as_array().map(Vec::len),
-        Some(1)
-    );
-    assert_eq!(
-        topk_sum["data"]["result"][0]["metric"],
-        serde_json::json!({"job": "worker"})
-    );
-    assert_eq!(
-        topk_count["data"]["result"][0]["metric"],
-        serde_json::json!({"job": "api"})
-    );
-    assert!((first_value(&sum, "value").expect("sum value") - 240.0).abs() < 1e-9);
-
-    for query in [
-        "sum(sum_over_time(asap_demo_gauge[5s]))",
-        "topk(1, sum_over_time(asap_demo_gauge[5s]))",
-        "topk(1, count_over_time(asap_demo_gauge[5s]))",
-    ] {
-        let first_instant =
-            wait_for_warm_instant(&client, &backend, query, first_eval, &backend_log).await;
-        let second_instant =
-            wait_for_warm_instant(&client, &backend, query, second_eval, &backend_log).await;
-        let response: Value = client
-            .get(format!("{backend}/api/v1/query_range"))
-            .query(&[
-                ("query", query.to_string()),
-                ("start", first_eval.to_string()),
-                ("end", second_eval.to_string()),
-                ("step", "5".into()),
-            ])
-            .send()
-            .await
-            .expect("range query")
-            .json()
-            .await
-            .expect("range JSON");
-        assert_eq!(response["status"], "success", "{query}: {response}");
-        assert!(
-            is_warm(&response),
-            "{query} did not use warm tier: {response}"
-        );
-        // Compare the complete vector at each step, including changing Top-K
-        // membership. Sorting labels makes response ordering irrelevant.
-        for (timestamp, instant) in [(first_eval, &first_instant), (second_eval, &second_instant)] {
-            let mut expected = instant["data"]["result"]
-                .as_array()
-                .expect("instant vector")
-                .iter()
-                .map(|series| {
-                    (
-                        serde_json::to_string(&series["metric"]).unwrap(),
-                        series["value"][1].as_str().unwrap().parse::<f64>().unwrap(),
-                    )
-                })
-                .collect::<Vec<_>>();
-            let mut actual = response["data"]["result"]
-                .as_array()
-                .expect("range matrix")
-                .iter()
-                .flat_map(|series| {
-                    series["values"]
-                        .as_array()
-                        .unwrap()
-                        .iter()
-                        .filter(move |point| point[0].as_f64() == Some(timestamp))
-                        .map(move |point| {
-                            (
-                                serde_json::to_string(&series["metric"]).unwrap(),
-                                point[1].as_str().unwrap().parse::<f64>().unwrap(),
-                            )
-                        })
-                })
-                .collect::<Vec<_>>();
-            expected.sort_by(|a, b| a.0.cmp(&b.0));
-            actual.sort_by(|a, b| a.0.cmp(&b.0));
-            assert_eq!(
-                actual, expected,
-                "complete range/instant vector differs for {query} at {timestamp}"
-            );
-        }
-        if query.starts_with("topk(") {
-            let mut ranked_points = response["data"]["result"]
-                .as_array()
-                .unwrap_or_else(|| panic!("missing Top-K range result for {query}: {response}"))
-                .iter()
-                .flat_map(|series| {
-                    series["values"]
-                        .as_array()
-                        .into_iter()
-                        .flatten()
-                        .map(|point| {
-                            (
-                                point[0].as_f64().expect("Top-K timestamp"),
-                                point[1]
-                                    .as_str()
-                                    .expect("Top-K value")
-                                    .parse::<f64>()
-                                    .expect("numeric Top-K value"),
-                            )
-                        })
-                })
-                .collect::<Vec<_>>();
-            ranked_points.sort_by(|left, right| left.0.total_cmp(&right.0));
-            let expected = if query.contains("sum_over_time") {
-                vec![(first_eval, 200.0), (second_eval, 26.0)]
-            } else {
-                vec![(first_eval, 4.0), (second_eval, 4.0)]
-            };
-            assert_eq!(
-                ranked_points, expected,
-                "wrong Top-K windows for {query}: {response}"
-            );
-            continue;
-        }
-        let values = response["data"]["result"][0]["values"]
-            .as_array()
-            .unwrap_or_else(|| panic!("missing range values for {query}: {response}"));
-        assert_eq!(values.len(), 2, "wrong step count for {query}: {response}");
-        assert_eq!(values[0][0], first_eval);
-        assert_eq!(values[1][0], second_eval);
-    }
-
-    // Readiness polling may briefly reach the exact fallback before a newly
-    // closed warm window is visible. Every planned query above was required
-    // to converge to its declared warm or exact tier; isolate further fallback assertions.
-    fallback_calls.lock().await.clear();
-
-    let fallback_instant: Value = client
-        .get(format!("{backend}/api/v1/query"))
-        .header("authorization", "Bearer demo")
-        .header("x-scope-orgid", "tenant-demo")
-        .query(&[
-            ("query", "max(asap_unplanned)"),
-            ("time", &first_eval.to_string()),
-            ("timeout", "7s"),
-        ])
-        .send()
-        .await
-        .expect("fallback instant")
-        .json()
-        .await
-        .expect("fallback instant JSON");
-    assert_eq!(
-        fallback_instant["data"]["result"][0]["metric"]["fallback"],
-        "true"
-    );
-    let fallback_range: Value = client
-        .get(format!("{backend}/api/v1/query_range"))
-        .header("authorization", "Bearer demo")
-        .header("x-scope-orgid", "tenant-demo")
-        .query(&[
-            ("query", "max(asap_unplanned)"),
-            ("start", &first_eval.to_string()),
-            ("end", &second_eval.to_string()),
-            ("step", "5"),
-            ("timeout", "9s"),
-        ])
-        .send()
-        .await
-        .expect("fallback range")
-        .json()
-        .await
-        .expect("fallback range JSON");
-    assert_eq!(
-        fallback_range["data"]["result"][0]["metric"]["fallback"],
-        "true"
-    );
-
-    // These complete expressions are NOT registered in this snapshot.
-    // This tests routing fallback, not absence of operator support: registered
-    // exact arithmetic is covered by shared_exact_dashboard_executes_selected_workload.
-    // Never partially warm an unregistered expression using a registered child.
-    let fallback_matrix = [
-        // ASAPQuery #700; backend #503.
-        "avg_over_time(asap_demo_gauge[5s])",
-        "count(asap_demo_gauge)",
-        "avg(asap_demo_gauge)",
-        // ASAPQuery #629/#700; backend #432.
-        "topk(5, asap_demo_gauge)",
-        // ASAPQuery #256/#572/#577/#644; Planner #343, backend #504.
-        "rate(asap_demo_counter_total[5s]) + rate(asap_demo_counter_total[5s])",
-        "rate(asap_demo_counter_total[5s]) / 2",
-        // ASAPQuery #466/#640; backend #473.
-        "sum_over_time(asap_demo_gauge[10s])",
-    ];
-    for query in fallback_matrix {
-        let response: Value = client
-            .get(format!("{backend}/api/v1/query"))
-            .query(&[
-                ("query", query.to_string()),
-                ("time", first_eval.to_string()),
-            ])
-            .send()
-            .await
-            .unwrap_or_else(|error| panic!("fallback request failed for {query}: {error}"))
-            .json()
-            .await
-            .unwrap_or_else(|error| panic!("fallback JSON failed for {query}: {error}"));
-        assert_eq!(
-            response["data"]["result"][0]["metric"]["fallback"], "true",
-            "unregistered matrix row must fall back atomically: {query}: {response}"
-        );
-    }
-
-    let calls = fallback_calls.lock().await;
-    assert_eq!(
-        calls.len(),
-        2 + fallback_matrix.len(),
-        "planned queries unexpectedly fell back: {calls:?}"
-    );
-    assert_eq!(calls[0].0, "instant");
-    assert_eq!(calls[0].1["query"], "max(asap_unplanned)");
-    assert_eq!(calls[0].1["time"], first_eval.to_string());
-    assert_eq!(calls[0].1["timeout"], "7s");
-    assert_eq!(calls[0].2["authorization"], "Bearer demo");
-    assert_eq!(calls[0].2["x-scope-orgid"], "tenant-demo");
-    assert_eq!(calls[1].0, "range");
-    assert_eq!(calls[1].1["start"], first_eval.to_string());
-    assert_eq!(calls[1].1["end"], second_eval.to_string());
-    assert_eq!(calls[1].1["step"], "5");
-    assert_eq!(calls[1].1["timeout"], "9s");
-    drop(calls);
-
-    let status: Value = client
-        .get(format!("{backend}/api/v1/physical-plan/status"))
-        .send()
-        .await
-        .expect("physical status")
-        .json()
-        .await
-        .expect("physical status JSON");
-    assert_eq!(status["status"], "success");
-    let materializations = status["materializations"]
-        .as_array()
-        .expect("materialization statuses");
-    let planned_snapshot: control_plane::physical::compiler::BackendLocalPlanningInput =
-        serde_json::from_str(&std::fs::read_to_string(&snapshot).unwrap()).unwrap();
-    let planned = planned_snapshot.compile_promql().unwrap();
-    // Every selected state must be serving; the Planner may share or separate
-    // physical populations, so compare identities rather than a frozen count.
-    let expected = planned
-        .precompute_plan
-        .materializations
-        .iter()
-        .map(|config| config.policy_fp_u64())
-        .collect::<std::collections::BTreeSet<_>>();
-    let actual = materializations
-        .iter()
-        .map(|entry| entry["materialization"].as_u64().unwrap())
-        .collect::<std::collections::BTreeSet<_>>();
-    assert_eq!(actual, expected, "{materializations:?}");
-    for entry in materializations {
-        assert_eq!(entry["phase"], "serving", "{entry}");
-        assert!(
-            entry["coverage_start_unix_ms"].as_u64().is_some(),
-            "{entry}"
-        );
-        assert!(entry["coverage_end_unix_ms"].as_u64().is_some(), "{entry}");
-    }
-
-    // A producer definition that disagrees with the authoritative catalog must
-    // be rejected before staging, leaving the serving generation unchanged.
-    let mut invalid = planned;
-    invalid.precompute_plan.materializations[0].slide_interval += 1;
-    let artifact = serde_json::json!({"summary_catalog": invalid.summary_catalog,
-        "collector_plans": invalid.collector_plans, "precompute_plan": invalid.precompute_plan,
-        "transmission_plan": invalid.transmission_plan,
-        "query_plan": invalid.query_plan, "storage_routing": null, "adaptation_evidence": []});
-    let built = data_plane::drivers::query::servers::http::validate_and_build_runtime_plan(
-        serde_json::from_value(artifact.clone()).unwrap(),
-        std::sync::Arc::new(data_plane::storage_engines::types::BackendStorageRouting::empty()),
-    );
-    assert!(matches!(built, Err(error) if error.contains("catalog validation")));
-    // HTTP may reject at an earlier successor authorization boundary;
-    // either way it must leave the installed generation unchanged.
-    let rejected = client
-        .post(format!("{backend}/api/v1/physical-plan"))
-        .json(&artifact)
-        .send()
-        .await
-        .unwrap();
-    assert_eq!(rejected.status().as_u16(), 422);
-    let after: Value = client
-        .get(format!("{backend}/api/v1/physical-plan/status"))
-        .send()
-        .await
-        .unwrap()
-        .json()
-        .await
-        .unwrap();
-    assert_eq!(
-        after["plans"], status["plans"],
-        "rejected artifact changed active generation"
-    );
-
-    let metrics = client
-        .get(format!("{backend}/metrics"))
-        .send()
-        .await
-        .expect("metrics request")
-        .text()
-        .await
-        .expect("metrics body");
-    assert!(metrics.contains("asap_remote_write_requests_total 4"));
-    let samples = |request: &WriteRequest| {
-        request
-            .timeseries
-            .iter()
-            .map(|series| series.samples.len())
-            .sum::<usize>()
-    };
-    assert!(metrics.contains(&format!(
-        "asap_remote_write_samples_total {}",
-        samples(&request) + samples(&watermark_advance)
-    )));
-    assert!(metrics.contains(&format!(
-        "asap_remote_write_duplicates_total {}",
-        samples(&request)
-    )));
-    assert!(metrics.contains("asap_remote_write_rejected_requests_total 1"));
-}
-
-#[path = "support/univmon_erp_process.rs"]
-mod univmon_erp_process;
diff --git a/data_plane/tests/clickhouse_differential_e2e.rs b/data_plane/tests/clickhouse_differential_e2e.rs
deleted file mode 100644
index b9a6523d4..000000000
--- a/data_plane/tests/clickhouse_differential_e2e.rs
+++ /dev/null
@@ -1,814 +0,0 @@
-//! Optional real-ClickHouse protocol and Grafana smoke coverage.
-//!
-//! Set `CLICKHOUSE_URL` (for example `http://127.0.0.1:8123`) to run it.
-
-#[path = "support/empty_physical_plan.rs"]
-mod empty_physical_plan;
-
-use std::{
-    collections::HashMap,
-    net::TcpListener,
-    process::{Child, Command, Stdio},
-    sync::Arc,
-    time::Duration,
-};
-
-use data_plane::query_engines::asap_clickhouse_query_engine::{
-    ClickHouseHttpFallback, ClickHouseHttpServer,
-};
-
-struct ChildGuard(Child);
-
-impl Drop for ChildGuard {
-    fn drop(&mut self) {
-        let _ = self.0.kill();
-        let _ = self.0.wait();
-    }
-}
-
-fn unused_port() -> u16 {
-    TcpListener::bind("127.0.0.1:0")
-        .unwrap()
-        .local_addr()
-        .unwrap()
-        .port()
-}
-
-async fn wait_http(client: &reqwest::Client, url: &str, child: &mut Child) {
-    for _ in 0..200 {
-        assert!(
-            child.try_wait().unwrap().is_none(),
-            "data plane exited early"
-        );
-        if client
-            .get(url)
-            .send()
-            .await
-            .is_ok_and(|response| response.status().is_success())
-        {
-            return;
-        }
-        tokio::time::sleep(Duration::from_millis(50)).await;
-    }
-    panic!("data plane did not become ready at {url}");
-}
-
-async fn spawn_backend(
-    clickhouse_url: &str,
-    user: Option<&str>,
-    password: Option<&str>,
-    output: &std::path::Path,
-    bootstrap: &std::path::Path,
-    api_port: u16,
-    sql_port: u16,
-) -> ChildGuard {
-    let client = reqwest::Client::new();
-    let mut command = Command::new(env!("CARGO_BIN_EXE_data_plane"));
-    command
-        .arg("--physical-plan")
-        .arg(bootstrap)
-        .arg("--http-port")
-        .arg(api_port.to_string())
-        .arg("--clickhouse-http-port")
-        .arg(sql_port.to_string())
-        .arg("--clickhouse-url")
-        .arg(clickhouse_url)
-        .arg("--clickhouse-backfill-table")
-        .arg("deployment_default_not_the_job_table")
-        .arg("--clickhouse-backfill-database")
-        .arg("default")
-        .arg("--clickhouse-backfill-value-column")
-        .arg("wrong_value")
-        .arg("--enable-backfill-worker")
-        .arg("--precompute-allowed-lateness-ms")
-        .arg("0")
-        .arg("--precompute-flush-interval-ms")
-        .arg("50")
-        .arg("--persistence-delete-older-than-secs")
-        .arg("0")
-        .arg("--output-dir")
-        .arg(output)
-        .stdout(Stdio::inherit())
-        .stderr(Stdio::inherit())
-        .env("RUST_LOG", "data_plane=info");
-    if let Some(user) = user {
-        command.arg("--clickhouse-user").arg(user);
-    }
-    if let Some(password) = password {
-        command.arg("--clickhouse-password").arg(password);
-    }
-    let mut process = ChildGuard(command.spawn().unwrap());
-    wait_http(
-        &client,
-        &format!("http://127.0.0.1:{api_port}/api/v1/health"),
-        &mut process.0,
-    )
-    .await;
-    wait_http(
-        &client,
-        &format!("http://127.0.0.1:{sql_port}/ping"),
-        &mut process.0,
-    )
-    .await;
-
-    process
-}
-
-fn mixed_workload(sql: &str) -> control_plane::clickhouse::ClickHouseSqlAutomaticWorkload {
-    use control_plane::physical::compiler::{PlanEnvelope, BACKEND_COMPAT, PLANNER_REVISION};
-    use planner_types::pre_asap::{Column, DataType, Schema};
-    let envelope = PlanEnvelope {
-        plan_id: 72,
-        plan_version: 1,
-        generated_at_unix_ms: 0,
-        activation_unix_ms: 0,
-        expiry_unix_ms: None,
-        backend_compat: BACKEND_COMPAT.into(),
-        planner_revision: PLANNER_REVISION.into(),
-        capability_snapshot_id: "clickhouse-mixed-process-e2e".into(),
-    };
-    let schema = |time: &str, value: &str| {
-        Schema::with_time_index(
-            vec![
-                Column::new(time, DataType::Timestamp, false),
-                Column::new(value, DataType::Float64, false),
-                Column::new("metric", DataType::Utf8, false),
-            ],
-            0,
-            vec![],
-        )
-    };
-    control_plane::clickhouse::ClickHouseSqlAutomaticWorkload {
-        envelope,
-        tables: HashMap::from([
-            ("telemetry".into(), schema("timestamp_ms", "value")),
-            (
-                "divisors".into(),
-                Schema::with_time_index(
-                    vec![
-                        Column::new("timestamp", DataType::Int64, false),
-                        Column::new("divisor", DataType::Float64, false),
-                    ],
-                    0,
-                    vec![],
-                ),
-            ),
-        ]),
-        accuracy: planner_types::types::AccuracyTarget::Exact,
-        queries: vec![control_plane::clickhouse::ClickHouseSqlWorkloadEntry {
-            sql: sql.into(),
-            start_ms: 0,
-            end_ms: 2_000,
-            cumulative: true,
-        }],
-    }
-}
-
-#[tokio::test]
-async fn exact_proxy_matches_clickhouse_for_sql_and_grafana_smoke_queries() {
-    let Ok(clickhouse_url) = std::env::var("CLICKHOUSE_URL") else {
-        eprintln!("skipping real ClickHouse E2E because CLICKHOUSE_URL is unset");
-        return;
-    };
-
-    let listener = tokio::net::TcpListener::bind("127.0.0.1:0").await.unwrap();
-    let address = listener.local_addr().unwrap();
-    let fallback = Arc::new(ClickHouseHttpFallback::new(
-        clickhouse_url.clone(),
-        "default".into(),
-    ));
-    let app = ClickHouseHttpServer::router(fallback);
-    let server = tokio::spawn(async move { axum::serve(listener, app).await });
-
-    let client = reqwest::Client::new();
-    let proxy_url = format!("http://{address}/");
-    let queries = [
-        "SELECT number, number * 2 AS doubled FROM numbers(10) ORDER BY number FORMAT JSONEachRow",
-        "SELECT version() FORMAT TabSeparated",
-        "SELECT name FROM system.databases ORDER BY name FORMAT JSONEachRow",
-        "SELECT database, name FROM system.tables ORDER BY database, name FORMAT JSONEachRow",
-    ];
-
-    for sql in queries {
-        let exact = client
-            .get(&clickhouse_url)
-            .query(&[("query", sql)])
-            .send()
-            .await
-            .unwrap();
-        let proxied = client
-            .get(&proxy_url)
-            .query(&[("query", sql)])
-            .send()
-            .await
-            .unwrap();
-        assert_eq!(proxied.status(), exact.status(), "status for {sql}");
-        assert_eq!(
-            proxied.bytes().await.unwrap(),
-            exact.bytes().await.unwrap(),
-            "body for {sql}"
-        );
-    }
-
-    server.abort();
-}
-
-#[tokio::test]
-async fn compiled_publication_executes_mixed_dag_in_data_plane_process() {
-    for aggregate in ["sum(value)", "count(*)", "max(value)"] {
-        run_mixed_aggregate(aggregate).await;
-    }
-}
-
-async fn run_mixed_aggregate(aggregate: &str) {
-    let Ok(clickhouse_url) = std::env::var("CLICKHOUSE_URL") else {
-        eprintln!("skipping mixed process E2E because CLICKHOUSE_URL is unset");
-        return;
-    };
-    let user = std::env::var("CLICKHOUSE_USER").ok();
-    let password = std::env::var("CLICKHOUSE_PASSWORD").ok();
-    let client = reqwest::Client::new();
-    eprintln!("checking mixed aggregate {aggregate}");
-    let sql = format!("SELECT sums.timestamp, sums.total / divisors.divisor AS ratio FROM (SELECT 2000 AS timestamp, {aggregate} AS total FROM telemetry WHERE metric = 'requests' AND timestamp_ms >= 0 AND timestamp_ms < 2000) AS sums INNER JOIN divisors ON sums.timestamp = divisors.timestamp");
-    let grouped = aggregate == "max(value)";
-    let sql = if grouped {
-        "SELECT labels, max(value) AS value FROM telemetry WHERE metric = 'requests' AND timestamp_ms > 1999 - 2000 AND timestamp_ms <= 1999 GROUP BY labels ORDER BY labels".to_string()
-    } else {
-        sql
-    };
-    let format = if grouped { "JSON" } else { "TabSeparated" };
-    let value_type = if aggregate == "count(*)" {
-        "Nullable(Float64)"
-    } else {
-        "Float64"
-    };
-    let create_telemetry = format!("CREATE TABLE default.telemetry(metric String, labels Map(String,String), timestamp_ms Int64, value {value_type}, wrong_value Float64) ENGINE=Memory");
-    for statement in [
-        "DROP TABLE IF EXISTS default.telemetry",
-        "DROP TABLE IF EXISTS default.divisors",
-        create_telemetry.as_str(),
-        "CREATE TABLE default.divisors(timestamp Int64, divisor Float64) ENGINE=Memory",
-        "INSERT INTO default.telemetry VALUES ('requests',map('member','a'),0,2,10000),('requests',map('member','b'),1100,3,10000),('errors',map('member','c'),1100,99999,10000),('requests',map('member','a'),2000,88888,10000)",
-        "INSERT INTO default.divisors VALUES (2000,10)",
-    ] {
-        let mut request = client.post(&clickhouse_url).body(statement.to_owned());
-        if let Some(user) = &user {
-            request = request.basic_auth(user, password.as_ref());
-        }
-        let response = request.send().await.unwrap();
-        assert!(response.status().is_success(), "ClickHouse setup: {statement}");
-    }
-    if aggregate == "count(*)" {
-        let mut request = client.post(&clickhouse_url).body(
-            "INSERT INTO default.telemetry VALUES ('requests',map('member','nullable'),1200,NULL,10000)",
-        );
-        if let Some(user) = &user {
-            request = request.basic_auth(user, password.as_ref());
-        }
-        assert!(request.send().await.unwrap().status().is_success());
-    }
-    let mut exact_request = client
-        .post(&clickhouse_url)
-        .body(format!("{sql} FORMAT {format}"));
-    if let Some(user) = &user {
-        exact_request = exact_request.basic_auth(user, password.as_ref());
-    }
-    let exact = exact_request.send().await.unwrap().bytes().await.unwrap();
-
-    let mut workload = mixed_workload(&sql);
-    if grouped {
-        use planner_types::pre_asap::{Column, DataType};
-        workload
-            .tables
-            .get_mut("telemetry")
-            .unwrap()
-            .columns
-            .push(Column::new(
-                "labels",
-                DataType::Map {
-                    key: Box::new(DataType::Utf8),
-                    value: Box::new(DataType::Utf8),
-                    value_nullable: false,
-                },
-                false,
-            ));
-    }
-
-    workload.tables.get_mut("telemetry").unwrap().columns[1].nullable = aggregate == "count(*)";
-    if aggregate == "count(*)" {
-        let mut nullable_count = mixed_workload(&sql.replace("count(*)", "count(value)"));
-        nullable_count.tables.get_mut("telemetry").unwrap().columns[1].nullable = true;
-        let result =
-            control_plane::clickhouse::compile_automatic_clickhouse_workload(&nullable_count).await;
-        assert!(
-            result.is_err(),
-            "nullable count(value) requires explicit null exclusion"
-        );
-    }
-    let (publication, selection_trace) =
-        control_plane::clickhouse::compile_automatic_clickhouse_workload(&workload)
-            .await
-            .unwrap();
-    if let Ok(path) = std::env::var("CLICKHOUSE_PLANNING_ARTIFACT") {
-        std::fs::write(
-            path,
-            serde_json::to_vec_pretty(&serde_json::json!({
-                "publication": &publication, "selection_trace": &selection_trace,
-            }))
-            .unwrap(),
-        )
-        .unwrap();
-    }
-    assert_eq!(publication.precompute_plan.materializations.len(), 1);
-    let config = publication.precompute_plan.materializations[0].clone();
-    if aggregate == "count(*)" {
-        assert_eq!(
-            config.effective_value_projection(),
-            &asap_types::sds::ValueProjectionIdentity::Constant {
-                value: planner_types::pre_asap::ScalarValue::Int64(1),
-            }
-        );
-    }
-    let entry = publication.query_plan.entries.values().next().unwrap();
-    assert_eq!(
-        entry.nodes.values().any(|node| matches!(
-            node,
-            asap_types::query_plan::QueryPlanNode::ExternalExact { .. }
-        )),
-        !grouped
-    );
-    assert!(entry.nodes.values().any(|node| matches!(
-        node,
-        asap_types::query_plan::QueryPlanNode::ReadMaterialization { .. }
-    )));
-    let install = publication.install_request(None, Vec::new()).unwrap();
-
-    let api_port = unused_port();
-    let sql_port = unused_port();
-    let output = tempfile::tempdir().unwrap();
-    let mut bootstrap = tempfile::NamedTempFile::new().unwrap();
-    serde_json::to_writer(&mut bootstrap, &empty_physical_plan::empty()).unwrap();
-    let _process = spawn_backend(
-        &clickhouse_url,
-        user.as_deref(),
-        password.as_deref(),
-        output.path(),
-        bootstrap.path(),
-        api_port,
-        sql_port,
-    )
-    .await;
-
-    let response = client
-        .post(format!("http://127.0.0.1:{api_port}/api/v1/physical-plan"))
-        .json(&install)
-        .send()
-        .await
-        .unwrap();
-    let status = response.status();
-    let body = response.text().await.unwrap();
-    assert!(status.is_success(), "stage publication: {body}");
-    let response = client
-        .post(format!(
-            "http://127.0.0.1:{api_port}/api/v1/physical-plan/activate"
-        ))
-        .json(&serde_json::json!({"plan_id": 72, "plan_version": 1}))
-        .send()
-        .await
-        .unwrap();
-    assert!(response.status().is_success(), "activate publication");
-
-    let response = client
-        .post(format!("http://127.0.0.1:{api_port}/api/v1/db/backfill"))
-        .json(&serde_json::json!({
-            "agg_id": config.policy_fp_u64(),
-            "start_ms": 0,
-            "end_ms": 2000,
-            "source": {"ClickHouse": {"database": "default", "table": "telemetry"}},
-            "windows_total": 1
-        }))
-        .send()
-        .await
-        .unwrap();
-    let status = response.status();
-    let body = response.text().await.unwrap();
-    assert!(status.is_success(), "queue backfill: {body}");
-    let mut backfill_complete = false;
-    for _ in 0..200 {
-        let jobs: serde_json::Value = client
-            .get(format!(
-                "http://127.0.0.1:{api_port}/api/v1/db/backfill/jobs"
-            ))
-            .send()
-            .await
-            .unwrap()
-            .json()
-            .await
-            .unwrap();
-        if jobs["jobs"][0]["status"] == "complete" {
-            backfill_complete = true;
-            break;
-        }
-        assert_ne!(jobs["jobs"][0]["status"], "failed", "{jobs}");
-        tokio::time::sleep(Duration::from_millis(25)).await;
-    }
-    assert!(
-        backfill_complete,
-        "backfill did not complete before timeout"
-    );
-
-    let mut mutate = client.post(&clickhouse_url).body(
-        "ALTER TABLE default.telemetry DELETE WHERE metric = 'requests' AND timestamp_ms = 0 SETTINGS mutations_sync = 2",
-    );
-    if let Some(user) = &user {
-        mutate = mutate.basic_auth(user, password.as_ref());
-    }
-    let response = mutate.send().await.unwrap();
-    let status = response.status();
-    let body = response.text().await.unwrap();
-    assert!(status.is_success(), "ClickHouse mutation: {body}");
-
-    let mut mutated_request = client
-        .post(&clickhouse_url)
-        .body(format!("{sql} FORMAT {format}"));
-    if let Some(user) = &user {
-        mutated_request = mutated_request.basic_auth(user, password.as_ref());
-    }
-    let mutated = mutated_request.send().await.unwrap().bytes().await.unwrap();
-    assert_ne!(
-        mutated, exact,
-        "mutation guard must change the full exact result"
-    );
-
-    let mut mixed = client
-        .get(format!("http://127.0.0.1:{sql_port}/"))
-        .query(&[("query", sql.as_str()), ("default_format", format)]);
-    if let Some(user) = &user {
-        mixed = mixed.header("x-clickhouse-user", user);
-    }
-    if let Some(password) = &password {
-        mixed = mixed.header("x-clickhouse-key", password);
-    }
-    let response = mixed.send().await.unwrap();
-    let status = response.status();
-    let execution = response
-        .headers()
-        .get("x-asap-execution")
-        .and_then(|value| value.to_str().ok())
-        .unwrap_or("missing")
-        .to_owned();
-    let failure_reason = response
-        .headers()
-        .get("x-asap-failure-reason")
-        .and_then(|value| value.to_str().ok())
-        .unwrap_or("missing")
-        .to_owned();
-    let actual = response.bytes().await.unwrap();
-    assert!(status.is_success(), "mixed listener returned {status}");
-    assert_eq!(
-        execution,
-        if grouped { "warm" } else { "hybrid" },
-        "failure reason: {failure_reason}"
-    );
-    if grouped {
-        let actual: serde_json::Value = serde_json::from_slice(&actual).unwrap();
-        let exact: serde_json::Value = serde_json::from_slice(&exact).unwrap();
-        assert_eq!(actual["meta"], exact["meta"]);
-        let actual_rows = actual["data"].as_array().unwrap();
-        let exact_rows = exact["data"].as_array().unwrap();
-        assert_eq!(actual_rows.len(), exact_rows.len());
-        for (actual, exact) in actual_rows.iter().zip(exact_rows) {
-            assert_eq!(actual["labels"], exact["labels"]);
-            assert_eq!(
-                actual["value"].as_f64().unwrap().to_bits(),
-                exact["value"].as_f64().unwrap().to_bits()
-            );
-        }
-        assert_eq!(actual["data"].as_array().unwrap().len(), 2);
-    } else {
-        assert_eq!(
-            actual, exact,
-            "compiled mixed result must equal pre-mutation exact baseline"
-        );
-    }
-}
-
-// Real process coverage for publication, source backfill, template reuse and fallback.
-#[tokio::test]
-async fn moving_windows_match_clickhouse_after_automatic_publication() {
-    use control_plane::clickhouse::ClickHouseSqlWorkloadEntry;
-    let Ok(clickhouse_url) = std::env::var("CLICKHOUSE_URL") else {
-        eprintln!("skipping moving-window process E2E because CLICKHOUSE_URL is unset");
-        return;
-    };
-    let user = std::env::var("CLICKHOUSE_USER").ok();
-    let password = std::env::var("CLICKHOUSE_PASSWORD").ok();
-    let client = reqwest::Client::new();
-    let native = |sql: String| {
-        let mut request = client.post(&clickhouse_url).body(sql);
-        if let Some(user) = &user {
-            request = request.basic_auth(user, password.as_ref());
-        }
-        async move {
-            let response = request.send().await.unwrap();
-            let status = response.status();
-            let body = response.bytes().await.unwrap();
-            assert!(status.is_success(), "native ClickHouse: {status} {body:?}");
-            body
-        }
-    };
-    native("DROP TABLE IF EXISTS default.moving_telemetry".into()).await;
-    native("CREATE TABLE default.moving_telemetry(metric String, timestamp_ms Int64, value Float64) ENGINE=Memory".into()).await;
-    native("INSERT INTO default.moving_telemetry VALUES ('requests',0,2),('requests',1000,3),('requests',2000,5),('requests',3000,7),('requests',4000,11),('requests',5000,13),('requests',6000,17),('requests',7000,19),('requests',8000,999)".into()).await;
-    let sql = |start, end| {
-        format!("SELECT sum(value) AS value FROM moving_telemetry WHERE metric = 'requests' AND timestamp_ms >= {start} AND timestamp_ms < {end}")
-    };
-    let mut workload = mixed_workload(&sql(0, 2000));
-    let schema = workload.tables.remove("telemetry").unwrap();
-    workload.tables.insert("moving_telemetry".into(), schema);
-    workload.queries.push(ClickHouseSqlWorkloadEntry {
-        sql: sql(2000, 4000),
-        start_ms: 2000,
-        end_ms: 4000,
-        cumulative: true,
-    });
-    let (publication, _) =
-        control_plane::clickhouse::compile_automatic_clickhouse_workload(&workload)
-            .await
-            .unwrap();
-    assert_eq!(publication.query_plan.entries.len(), 2);
-    assert_eq!(publication.precompute_plan.materializations.len(), 2);
-    let api_port = unused_port();
-    let sql_port = unused_port();
-    let output = tempfile::tempdir().unwrap();
-    let mut bootstrap = tempfile::NamedTempFile::new().unwrap();
-    serde_json::to_writer(&mut bootstrap, &empty_physical_plan::empty()).unwrap();
-    let _process = spawn_backend(
-        &clickhouse_url,
-        user.as_deref(),
-        password.as_deref(),
-        output.path(),
-        bootstrap.path(),
-        api_port,
-        sql_port,
-    )
-    .await;
-    let api = format!("http://127.0.0.1:{api_port}");
-    let install = publication.install_request(None, Vec::new()).unwrap();
-    client
-        .post(format!("{api}/api/v1/physical-plan"))
-        .json(&install)
-        .send()
-        .await
-        .unwrap()
-        .error_for_status()
-        .unwrap();
-    client
-        .post(format!("{api}/api/v1/physical-plan/activate"))
-        .json(&serde_json::json!({"plan_id": 72, "plan_version": 1}))
-        .send()
-        .await
-        .unwrap()
-        .error_for_status()
-        .unwrap();
-    for config in &publication.precompute_plan.materializations {
-        let start = config.pane_origin_ms.unwrap();
-        client
-            .post(format!("{api}/api/v1/db/backfill"))
-            .json(&serde_json::json!({
-                "agg_id": config.policy_fp_u64(), "start_ms": start, "end_ms": 6000,
-                "source": {"ClickHouse": {"database": "default", "table": "moving_telemetry"}},
-                "windows_total": (6000 - start) / 2000,
-            }))
-            .send()
-            .await
-            .unwrap()
-            .error_for_status()
-            .unwrap();
-    }
-    let mut complete = false;
-    for _ in 0..400 {
-        let jobs: serde_json::Value = client
-            .get(format!("{api}/api/v1/db/backfill/jobs"))
-            .send()
-            .await
-            .unwrap()
-            .json()
-            .await
-            .unwrap();
-        let jobs = jobs["jobs"].as_array().unwrap();
-        assert!(
-            jobs.iter().all(|job| job["status"] != "failed"),
-            "backfill failed: {jobs:?}"
-        );
-        if jobs.len() == 2 && jobs.iter().all(|job| job["status"] == "complete") {
-            complete = true;
-            break;
-        }
-        tokio::time::sleep(Duration::from_millis(25)).await;
-    }
-    assert!(complete, "moving-window backfill timed out");
-    for (query, expected, route) in [
-        (sql(0, 2000), 5.0, "warm"),
-        (sql(2000, 4000), 12.0, "warm"),
-        (sql(4000, 6000), 24.0, "warm"),
-        ("SELECT sum(value) AS value FROM moving_telemetry WHERE metric = 'requests' AND timestamp_ms > 5999 - 2000 AND timestamp_ms <= 5999".into(), 24.0, "warm"),
-        (sql(6000, 8000), 36.0, "exact_fallback"),
-    ] {
-        let exact = native(format!("{query} FORMAT TabSeparated")).await;
-        let mut request = client.get(format!("http://127.0.0.1:{sql_port}/"))
-            .query(&[("query", query.as_str()), ("default_format", "TabSeparated")]);
-        if let Some(user) = &user { request = request.header("x-clickhouse-user", user); }
-        if let Some(password) = &password { request = request.header("x-clickhouse-key", password); }
-        let response = request.send().await.unwrap().error_for_status().unwrap();
-        assert_eq!(response.headers()["x-asap-execution"], route, "{query}");
-        let actual = response.bytes().await.unwrap();
-        let number = |bytes: &[u8]| std::str::from_utf8(bytes).unwrap().trim().parse::<f64>().unwrap();
-        assert_eq!(number(&exact), expected, "native boundary oracle: {query}");
-        assert_eq!(number(&actual), expected, "ASAP: {query}");
-        eprintln!("moving-window verified: route={route}, value={expected}, query={query}");
-    }
-    native("DROP TABLE default.moving_telemetry".into()).await;
-}
-
-#[tokio::test]
-async fn collection_sql_executes_local_elements_after_typed_exact_leaf() {
-    use asap_types::query_plan::QueryPlanNode;
-    use planner_types::{
-        post_asap::ValueOperation,
-        pre_asap::{Column, DataType, QueryExpr, Schema},
-    };
-    let Ok(clickhouse_url) = std::env::var("CLICKHOUSE_URL") else {
-        eprintln!("skipping collection process E2E because CLICKHOUSE_URL is unset");
-        return;
-    };
-    let user = std::env::var("CLICKHOUSE_USER").ok();
-    let password = std::env::var("CLICKHOUSE_PASSWORD").ok();
-    let client = reqwest::Client::new();
-    let table = format!("asap_collection_elements_{}", std::process::id());
-    for sql in [
-        format!("CREATE TABLE default.{table}(timestamp Int64, samples Array(Float64), nullable_samples Array(Nullable(Float64)), tuples Array(Tuple(ts Int64, value Nullable(Float64))), position Nullable(Int64)) ENGINE=Memory"),
-        format!("INSERT INTO default.{table} VALUES (100,[10,20],[10,20],[(1,5.5)],-1),(200,[3.5],[3.5],[(1,NULL)],9),(300,[],[],[],1),(400,[7.5],[NULL],[(1,3.5)],1),(500,[1],[1],[(1,9.5)],NULL),(2000,[999],[999],[(1,999)],1)"),
-    ] {
-        let mut request = client.post(&clickhouse_url).body(sql);
-        if let Some(user) = &user { request = request.basic_auth(user, password.as_ref()); }
-        let response = request.send().await.unwrap();
-        let status = response.status();
-        let body = response.text().await.unwrap();
-        assert!(status.is_success(), "native collection fixture: {body}");
-    }
-    let sql = format!("SELECT arrayElement(samples, position) AS result, arrayElement(nullable_samples, position) AS nullable_result, tupleElement(arrayElement(tuples, 1), 'value') AS tuple_result FROM {table} WHERE timestamp >= 0 AND timestamp < 2000 ORDER BY result NULLS FIRST");
-    let mut workload = mixed_workload(&sql);
-    workload.tables = HashMap::from([(
-        table.clone(),
-        Schema::with_time_index(
-            vec![
-                Column::new("timestamp", DataType::Int64, false),
-                Column::new(
-                    "samples",
-                    DataType::List {
-                        element: Box::new(Column::new("item", DataType::Float64, false)),
-                    },
-                    false,
-                ),
-                Column::new(
-                    "nullable_samples",
-                    DataType::List {
-                        element: Box::new(Column::new("item", DataType::Float64, true)),
-                    },
-                    false,
-                ),
-                Column::new(
-                    "tuples",
-                    DataType::List {
-                        element: Box::new(Column::new(
-                            "item",
-                            DataType::Struct {
-                                fields: vec![
-                                    Column::new("ts", DataType::Int64, false),
-                                    Column::new("value", DataType::Float64, true),
-                                ],
-                            },
-                            false,
-                        )),
-                    },
-                    false,
-                ),
-                Column::new("position", DataType::Int64, true),
-            ],
-            0,
-            vec![],
-        ),
-    )]);
-    let (publication, trace) =
-        control_plane::clickhouse::compile_automatic_clickhouse_workload(&workload)
-            .await
-            .unwrap();
-    assert!(publication.precompute_plan.materializations.is_empty());
-    let entry = publication.query_plan.entries.values().next().unwrap();
-    assert!(entry
-        .nodes
-        .values()
-        .any(|node| matches!(node, QueryPlanNode::ExternalExact { .. })));
-    for function in ["asap_element_access", "asap_struct_field"] {
-        assert!(entry.nodes.values().any(|node| {
-            let QueryPlanNode::Relational { operation, .. } = node else { return false; };
-            let ValueOperation::Project { cols, .. } = serde_json::from_value(operation.clone()).unwrap() else { return false; };
-            cols.iter().any(|column| matches!(&column.expr, QueryExpr::FunctionCall { name, .. } if name == function))
-        }), "Planner-selected DAG must preserve local {function} evaluation");
-    }
-    eprintln!(
-        "collection Planner selection: {}",
-        serde_json::to_string(&trace).unwrap()
-    );
-    let install = publication.install_request(None, Vec::new()).unwrap();
-    let api_port = unused_port();
-    let sql_port = unused_port();
-    let output = tempfile::tempdir().unwrap();
-    let mut bootstrap = tempfile::NamedTempFile::new().unwrap();
-    serde_json::to_writer(&mut bootstrap, &empty_physical_plan::empty()).unwrap();
-    let _process = spawn_backend(
-        &clickhouse_url,
-        user.as_deref(),
-        password.as_deref(),
-        output.path(),
-        bootstrap.path(),
-        api_port,
-        sql_port,
-    )
-    .await;
-    let response = client
-        .post(format!("http://127.0.0.1:{api_port}/api/v1/physical-plan"))
-        .json(&install)
-        .send()
-        .await
-        .unwrap();
-    let status = response.status();
-    let body = response.text().await.unwrap();
-    assert!(status.is_success(), "stage collection publication: {body}");
-    let response = client
-        .post(format!(
-            "http://127.0.0.1:{api_port}/api/v1/physical-plan/activate"
-        ))
-        .json(&serde_json::json!({"plan_id":72,"plan_version":1}))
-        .send()
-        .await
-        .unwrap();
-    assert!(response.status().is_success());
-    let mut native = client
-        .post(&clickhouse_url)
-        .body(format!("{sql} FORMAT JSON"));
-    if let Some(user) = &user {
-        native = native.basic_auth(user, password.as_ref());
-    }
-    let expected: serde_json::Value = native.send().await.unwrap().json().await.unwrap();
-    let mut actual_request = client
-        .get(format!("http://127.0.0.1:{sql_port}/"))
-        .query(&[("query", sql.as_str()), ("default_format", "JSON")]);
-    if let Some(user) = &user {
-        actual_request = actual_request.basic_auth(user, password.as_ref());
-    }
-    let response = actual_request.send().await.unwrap();
-    assert!(response.status().is_success());
-    assert_eq!(
-        response.headers().get("x-asap-execution").unwrap(),
-        "exact_fallback"
-    );
-    assert_eq!(
-        response.headers().get("x-asap-execution-detail").unwrap(),
-        "external_dag"
-    );
-    let actual: serde_json::Value = response.json().await.unwrap();
-    for field in ["meta", "rows"] {
-        assert_eq!(actual[field], expected[field], "{field}");
-    }
-    let actual_rows = actual["data"].as_array().unwrap();
-    let expected_rows = expected["data"].as_array().unwrap();
-    assert_eq!(actual_rows.len(), expected_rows.len());
-    for (actual, expected) in actual_rows.iter().zip(expected_rows) {
-        for field in ["result", "nullable_result", "tuple_result"] {
-            if expected[field].is_null() {
-                assert!(actual[field].is_null());
-            } else {
-                // The declared result columns are Float64; JSON 20 and 20.0 encode
-                // the same value despite different serde_json Number variants.
-                assert_eq!(
-                    actual[field].as_f64().unwrap().to_bits(),
-                    expected[field].as_f64().unwrap().to_bits(),
-                    "{field}"
-                );
-            }
-        }
-    }
-    assert_eq!(
-        actual["data"],
-        serde_json::json!([{ "result":null, "nullable_result":null, "tuple_result":9.5 },{ "result":0.0, "nullable_result":null, "tuple_result":null },{ "result":0.0, "nullable_result":null, "tuple_result":null },{ "result":7.5, "nullable_result":null, "tuple_result":3.5 },{ "result":20.0, "nullable_result":20.0, "tuple_result":5.5 }])
-    );
-    let mut cleanup = client
-        .post(&clickhouse_url)
-        .body(format!("DROP TABLE default.{table}"));
-    if let Some(user) = &user {
-        cleanup = cleanup.basic_auth(user, password.as_ref());
-    }
-    assert!(cleanup.send().await.unwrap().status().is_success());
-}
diff --git a/data_plane/tests/clickhouse_q05_process_e2e.rs b/data_plane/tests/clickhouse_q05_process_e2e.rs
deleted file mode 100644
index 57d0fa9dd..000000000
--- a/data_plane/tests/clickhouse_q05_process_e2e.rs
+++ /dev/null
@@ -1,467 +0,0 @@
-//! Optional OS-process E2E for a q05-class bounded SQL max query.
-//! Run with `CLICKHOUSE_URL=http://127.0.0.1:8123 cargo test -p data_plane --test clickhouse_q05_process_e2e`.
-
-#[path = "support/empty_physical_plan.rs"]
-mod empty_physical_plan;
-
-use control_plane::physical::compiler::{PlanEnvelope, BACKEND_COMPAT, PLANNER_REVISION};
-use planner_types::pre_asap::{Column, DataType, Schema};
-use std::io::Read;
-use std::{collections::HashMap, process::Stdio, time::Duration};
-
-fn process_snapshot(pid: u32) -> serde_json::Value {
-    let stat = std::fs::read_to_string(format!("/proc/{pid}/stat")).unwrap();
-    let fields: Vec<_> = stat.split_whitespace().collect();
-    let status = std::fs::read_to_string(format!("/proc/{pid}/status")).unwrap();
-    let field = |name: &str| {
-        status
-            .lines()
-            .find(|line| line.starts_with(name))
-            .map(str::to_owned)
-    };
-    serde_json::json!({
-        "pid": pid,
-        "cpu_ticks": fields[13].parse::<u64>().unwrap() + fields[14].parse::<u64>().unwrap(),
-        "rss_pages": fields[23].parse::<u64>().unwrap(),
-        "vm_rss": field("VmRSS:"),
-        "vm_hwm": field("VmHWM:"),
-    })
-}
-
-fn directory_bytes(path: &std::path::Path) -> u64 {
-    std::fs::read_dir(path)
-        .into_iter()
-        .flatten()
-        .flatten()
-        .map(|entry| {
-            let path = entry.path();
-            if path.is_dir() {
-                directory_bytes(&path)
-            } else {
-                entry.metadata().map(|meta| meta.len()).unwrap_or(0)
-            }
-        })
-        .sum()
-}
-
-fn free_port() -> u16 {
-    std::net::TcpListener::bind("127.0.0.1:0")
-        .unwrap()
-        .local_addr()
-        .unwrap()
-        .port()
-}
-
-fn clickhouse_auth(request: reqwest::RequestBuilder) -> reqwest::RequestBuilder {
-    match std::env::var("CLICKHOUSE_USER") {
-        Ok(user) => request.basic_auth(user, std::env::var("CLICKHOUSE_PASSWORD").ok()),
-        Err(_) => request,
-    }
-}
-
-struct Child(std::process::Child);
-impl Drop for Child {
-    fn drop(&mut self) {
-        let _ = self.0.kill();
-        let _ = self.0.wait();
-    }
-}
-
-#[tokio::test]
-async fn q05_sql_is_planned_backfilled_and_served_warm_by_backend_process() {
-    let Ok(clickhouse) = std::env::var("CLICKHOUSE_URL") else {
-        eprintln!("skipping q05 process E2E because CLICKHOUSE_URL is unset");
-        return;
-    };
-    let client = reqwest::Client::new();
-    let end_ms = std::env::var("CLICKHOUSE_BENCH_END_MS")
-        .ok()
-        .map(|value| value.parse::<u64>().expect("valid benchmark end timestamp"))
-        .unwrap_or_else(|| {
-            std::time::SystemTime::now()
-                .duration_since(std::time::UNIX_EPOCH)
-                .unwrap()
-                .as_millis() as u64
-        });
-    let start_ms = end_ms - 43_200_000;
-    let input_path = std::env::var("CLICKHOUSE_BENCH_INPUT").ok();
-    let metric = std::env::var("CLICKHOUSE_BENCH_METRIC")
-        .unwrap_or_else(|_| "cache_refresh_lag_seconds".into());
-    let clickhouse_pid = std::env::var("CLICKHOUSE_PID")
-        .ok()
-        .and_then(|value| value.parse::<u32>().ok());
-    let clickhouse_initial = clickhouse_pid.map(process_snapshot);
-    let experiment_started = std::time::Instant::now();
-    let setup = [
-        "CREATE DATABASE IF NOT EXISTS asap_q05_e2e".to_string(),
-        "DROP TABLE IF EXISTS asap_q05_e2e.q05_samples".to_string(),
-        "CREATE TABLE asap_q05_e2e.q05_samples(metric String, labels String, ts_ms Int64, value Float64) ENGINE=MergeTree ORDER BY ts_ms".to_string(),
-    ];
-    for sql in setup {
-        let response = clickhouse_auth(client.post(&clickhouse))
-            .body(sql)
-            .send()
-            .await
-            .unwrap();
-        assert!(
-            response.status().is_success(),
-            "{}",
-            response.text().await.unwrap()
-        );
-    }
-    let rows = if let Some(path) = &input_path {
-        std::fs::read_to_string(path).expect("read benchmark JSONEachRow input")
-    } else {
-        [start_ms + 1_000, start_ms + 2_000]
-            .into_iter()
-            .zip([7.0, 11.0])
-            .map(|(ts_ms, value)| serde_json::json!({"metric": metric, "labels": metric, "ts_ms": ts_ms, "value": value}).to_string())
-            .collect::<Vec<_>>()
-            .join("\n")
-    };
-    let mut series = std::collections::BTreeSet::new();
-    let mut input_samples = 0_u64;
-    for line in rows.lines().filter(|line| !line.is_empty()) {
-        let row: serde_json::Value = serde_json::from_str(line).unwrap();
-        assert_eq!(row["metric"].as_str(), Some(metric.as_str()));
-        series.insert(row["labels"].as_str().unwrap().to_owned());
-        input_samples += 1;
-    }
-    assert_eq!(
-        series.len(),
-        1,
-        "scalar max probe requires one original series"
-    );
-    let inserted = clickhouse_auth(client.post(&clickhouse))
-        .body(format!(
-            "INSERT INTO asap_q05_e2e.q05_samples FORMAT JSONEachRow\n{rows}"
-        ))
-        .send()
-        .await
-        .unwrap();
-    assert!(
-        inserted.status().is_success(),
-        "{}",
-        inserted.text().await.unwrap()
-    );
-    drop(rows);
-    let source_load_elapsed_ns = experiment_started.elapsed().as_nanos();
-    let clickhouse_post_load = clickhouse_pid.map(process_snapshot);
-
-    let aggregate = std::env::var("CLICKHOUSE_BENCH_AGGREGATE").unwrap_or_else(|_| "max".into());
-    assert!(matches!(aggregate.as_str(), "max" | "sum"));
-    let sql = format!(
-        "SELECT {aggregate}(value) AS value FROM q05_samples WHERE ts_ms>={start_ms} AND ts_ms<{end_ms}"
-    );
-    let envelope = PlanEnvelope {
-        plan_id: 73,
-        plan_version: 1,
-        generated_at_unix_ms: 0,
-        activation_unix_ms: 0,
-        expiry_unix_ms: None,
-        backend_compat: BACKEND_COMPAT.into(),
-        planner_revision: PLANNER_REVISION.into(),
-        capability_snapshot_id: "test".into(),
-    };
-    let schema = Schema::with_time_index(
-        vec![
-            Column::new("metric", DataType::Utf8, false),
-            Column::new("labels", DataType::Utf8, false),
-            Column::new("ts_ms", DataType::Timestamp, false),
-            Column::new("value", DataType::Float64, false),
-        ],
-        2,
-        vec![],
-    );
-    let (compiled, selection_trace) =
-        control_plane::clickhouse::compile_automatic_clickhouse_workload(
-            &control_plane::clickhouse::ClickHouseSqlAutomaticWorkload {
-                envelope,
-                tables: HashMap::from([("q05_samples".into(), schema)]),
-                accuracy: planner_types::types::AccuracyTarget::Exact,
-                queries: vec![control_plane::clickhouse::ClickHouseSqlWorkloadEntry {
-                    sql: sql.clone(),
-                    start_ms,
-                    end_ms,
-                    cumulative: true,
-                }],
-            },
-        )
-        .await
-        .unwrap();
-
-    assert_eq!(compiled.precompute_plan.materializations.len(), 1);
-    let config = compiled.precompute_plan.materializations[0].clone();
-    let planning =
-        serde_json::json!({"selection_trace": selection_trace, "publication": &compiled});
-    let http_port = free_port();
-    let mut sql_port = free_port();
-    while sql_port == http_port {
-        sql_port = free_port();
-    }
-    let mut physical = tempfile::NamedTempFile::new().unwrap();
-    serde_json::to_writer(&mut physical, &empty_physical_plan::empty()).unwrap();
-    let physical_path = physical.path().to_str().unwrap();
-    let output_dir = tempfile::tempdir().unwrap();
-    let output_dir_arg = output_dir.path().to_str().unwrap().to_owned();
-    let mut command = std::process::Command::new(env!("CARGO_BIN_EXE_data_plane"));
-    command.args([
-        "--http-port",
-        &http_port.to_string(),
-        "--physical-plan",
-        physical_path,
-        "--clickhouse-http-port",
-        &sql_port.to_string(),
-        "--clickhouse-url",
-        &clickhouse,
-        "--clickhouse-database",
-        "asap_q05_e2e",
-        "--clickhouse-backfill-table",
-        "q05_samples",
-        "--clickhouse-backfill-database",
-        "asap_q05_e2e",
-        "--clickhouse-backfill-timestamp-column",
-        "ts_ms",
-        "--enable-backfill-worker",
-        "--output-dir",
-        &output_dir_arg,
-    ]);
-    if let Ok(user) = std::env::var("CLICKHOUSE_USER") {
-        command.args(["--clickhouse-user", &user]);
-    }
-    if let Ok(password) = std::env::var("CLICKHOUSE_PASSWORD") {
-        command.args(["--clickhouse-password", &password]);
-    }
-    let mut child = Child(
-        command
-            .stdout(Stdio::null())
-            .stderr(Stdio::piped())
-            .spawn()
-            .unwrap(),
-    );
-    let base = format!("http://127.0.0.1:{http_port}");
-    let mut ready = false;
-    for _ in 0..100 {
-        if client.get(format!("{base}/health")).send().await.is_ok() {
-            ready = true;
-            break;
-        }
-        if let Some(status) = child.0.try_wait().unwrap() {
-            let mut stderr = String::new();
-            child
-                .0
-                .stderr
-                .as_mut()
-                .unwrap()
-                .read_to_string(&mut stderr)
-                .unwrap();
-            panic!("backend exited before ready ({status}): {stderr}");
-        }
-        tokio::time::sleep(Duration::from_millis(50)).await;
-    }
-    assert!(ready, "backend did not become ready before poll deadline");
-    let install = data_plane::drivers::query::servers::http::PhysicalPlanInstallRequest {
-        summary_catalog: compiled.summary_catalog,
-        collector_plans: compiled.collector_plans,
-        precompute_plan: compiled.precompute_plan,
-        transmission_plan: compiled.transmission_plan,
-        query_plan: compiled.query_plan,
-        storage_routing: None,
-        adaptation_evidence: vec![],
-    };
-    let response = client
-        .post(format!("{base}/api/v1/physical-plan"))
-        .json(&install)
-        .send()
-        .await
-        .unwrap();
-    assert!(
-        response.status().is_success(),
-        "{}",
-        response.text().await.unwrap()
-    );
-    let response = client
-        .post(format!("{base}/api/v1/physical-plan/activate"))
-        .json(&serde_json::json!({"plan_id":73,"plan_version":1}))
-        .send()
-        .await
-        .unwrap();
-    assert!(
-        response.status().is_success(),
-        "{}",
-        response.text().await.unwrap()
-    );
-    let agg_id = config.policy_fp_u64();
-    let backfill_started = std::time::Instant::now();
-    let backend_pre_backfill = process_snapshot(child.0.id());
-    let clickhouse_pre_backfill = clickhouse_pid.map(process_snapshot);
-    let response: serde_json::Value = client
-        .post(format!("{base}/api/v1/db/backfill"))
-        .json(
-            &serde_json::json!({"agg_id":agg_id,"start_ms":start_ms,"end_ms":end_ms,
-            "source":{"ClickHouse":{"database":"asap_q05_e2e","table":"q05_samples"}},"windows_total":1}),
-        )
-        .send()
-        .await
-        .unwrap()
-        .json()
-        .await
-        .unwrap();
-    let job = response["job_id"]
-        .as_u64()
-        .unwrap_or_else(|| panic!("backfill was not accepted: {response}"));
-    let mut backfill_complete = false;
-    let mut last_backfill_status = serde_json::Value::Null;
-    for _ in 0..300 {
-        let status: serde_json::Value = client
-            .get(format!("{base}/api/v1/db/backfill/jobs/{job}"))
-            .send()
-            .await
-            .unwrap()
-            .json()
-            .await
-            .unwrap();
-        last_backfill_status = status.clone();
-        match status["job"]["status"].as_str() {
-            Some("complete") => {
-                backfill_complete = true;
-                break;
-            }
-            Some("failed") => panic!("backfill failed: {status}"),
-            _ => tokio::time::sleep(Duration::from_millis(100)).await,
-        }
-    }
-    assert!(
-        backfill_complete,
-        "backfill did not complete before poll deadline: {last_backfill_status}"
-    );
-    let build_elapsed_ns = experiment_started.elapsed().as_nanos();
-    let backfill_elapsed_ns = backfill_started.elapsed().as_nanos();
-    let post_build = process_snapshot(child.0.id());
-    let clickhouse_post_build = clickhouse_pid.map(process_snapshot);
-    let first_warm_started = std::time::Instant::now();
-    let warm = client
-        .post(format!("http://127.0.0.1:{sql_port}/"))
-        .body(sql.clone())
-        .send()
-        .await
-        .unwrap();
-    assert_eq!(
-        warm.headers()["x-asap-execution"],
-        "warm",
-        "fallback headers: {:?}",
-        warm.headers()
-    );
-    let warm_value: f64 = warm.text().await.unwrap().trim().parse().unwrap();
-    let first_warm_ns = first_warm_started.elapsed().as_nanos();
-    let first_exact_started = std::time::Instant::now();
-    let exact_value: f64 = clickhouse_auth(client.post(&clickhouse))
-        .body(format!("SELECT {aggregate}(value) FROM asap_q05_e2e.q05_samples WHERE ts_ms>={start_ms} AND ts_ms<{end_ms} FORMAT TabSeparated"))
-        .send().await.unwrap().text().await.unwrap().trim().parse().unwrap();
-    let first_exact_ns = first_exact_started.elapsed().as_nanos();
-    assert_eq!(warm_value, exact_value);
-
-    if let Ok(output) = std::env::var("CLICKHOUSE_BENCH_OUTPUT") {
-        let exact_sql = format!("SELECT {aggregate}(value) FROM asap_q05_e2e.q05_samples WHERE ts_ms>={start_ms} AND ts_ms<{end_ms} FORMAT TabSeparated");
-        for _ in 0..10 {
-            let _ = client
-                .post(format!("http://127.0.0.1:{sql_port}/"))
-                .body(sql.clone())
-                .send()
-                .await
-                .unwrap()
-                .bytes()
-                .await
-                .unwrap();
-            let _ = clickhouse_auth(client.post(&clickhouse))
-                .body(exact_sql.clone())
-                .send()
-                .await
-                .unwrap()
-                .bytes()
-                .await
-                .unwrap();
-        }
-        let pre_query = process_snapshot(child.0.id());
-        let clickhouse_pre_query = clickhouse_pid.map(process_snapshot);
-        let query_started = std::time::Instant::now();
-        let mut requests = Vec::new();
-        let iterations = std::env::var("CLICKHOUSE_BENCH_REPETITIONS")
-            .ok()
-            .map(|value| value.parse::<usize>().expect("valid repeat count"))
-            .unwrap_or(100);
-        assert!(iterations > 0);
-        for iteration in 0..iterations {
-            for route in if iteration % 2 == 0 {
-                ["warm", "exact"]
-            } else {
-                ["exact", "warm"]
-            } {
-                let backend_before = process_snapshot(child.0.id());
-                let clickhouse_before = clickhouse_pid.map(process_snapshot);
-                let started = std::time::Instant::now();
-                let response = if route == "warm" {
-                    client
-                        .post(format!("http://127.0.0.1:{sql_port}/"))
-                        .body(sql.clone())
-                        .send()
-                        .await
-                        .unwrap()
-                } else {
-                    clickhouse_auth(client.post(&clickhouse))
-                        .body(exact_sql.clone())
-                        .send()
-                        .await
-                        .unwrap()
-                };
-                let status = response.status().as_u16();
-                let execution = response
-                    .headers()
-                    .get("x-asap-execution")
-                    .and_then(|value| value.to_str().ok())
-                    .map(str::to_owned);
-                let body = response.text().await.unwrap();
-                let elapsed_ns = started.elapsed().as_nanos();
-                assert_eq!(status, 200, "{route} request failed: {body}");
-                assert_eq!(body.trim().parse::<f64>().unwrap(), exact_value);
-                if route == "warm" {
-                    assert_eq!(execution.as_deref(), Some("warm"));
-                }
-                let backend_after = process_snapshot(child.0.id());
-                let clickhouse_after = clickhouse_pid.map(process_snapshot);
-                requests.push(serde_json::json!({"iteration":iteration,"route":route,"elapsed_ns":elapsed_ns,"status":status,"execution":execution,"body":body,
-                    "backend_before":backend_before,"backend_after":backend_after,
-                    "clickhouse_before":clickhouse_before,"clickhouse_after":clickhouse_after}));
-            }
-        }
-        let query_elapsed_ns = query_started.elapsed().as_nanos();
-        let post_query = process_snapshot(child.0.id());
-        let clickhouse_post_query = clickhouse_pid.map(process_snapshot);
-        let clickhouse_storage_bytes = std::env::var("CLICKHOUSE_STORAGE")
-            .ok()
-            .map(|path| directory_bytes(std::path::Path::new(&path)));
-        let table_stats = clickhouse_auth(client.post(&clickhouse))
-            .body("SELECT sum(rows) AS rows, sum(bytes_on_disk) AS bytes_on_disk, sum(data_compressed_bytes) AS compressed_bytes FROM system.parts WHERE active AND database='asap_q05_e2e' AND table='q05_samples' FORMAT JSONEachRow")
-            .send().await.unwrap().text().await.unwrap();
-        let table_stats: serde_json::Value = serde_json::from_str(&table_stats).unwrap();
-        let artifact = serde_json::json!({
-            "schema_version": 1,
-            "git_head": std::process::Command::new("git").args(["rev-parse", "HEAD"]).output().ok().and_then(|value| String::from_utf8(value.stdout).ok()).map(|value| value.trim().to_owned()),
-            "clock_ticks_per_second": std::process::Command::new("getconf").arg("CLK_TCK").output().ok().and_then(|value| String::from_utf8(value.stdout).ok()).and_then(|value| value.trim().parse::<u64>().ok()),
-            "query": sql,
-            "input": {"path":input_path,"metric":metric,"samples":input_samples,"series":series,"start_ms":start_ms,"end_ms":end_ms},
-            "planning_scope": "Real Planner selects the DAG and automatic control-plane binding constructs the catalog; fixed-window layout is not cost-optimized",
-            "planning": planning,
-            "classification_required": "warm",
-            "build_phase": {"elapsed_ns":build_elapsed_ns,"backend":post_build,"backend_output_bytes":directory_bytes(output_dir.path()),"clickhouse_before":clickhouse_initial,"clickhouse_after":clickhouse_post_build},
-            "source_load_phase": {"elapsed_ns":source_load_elapsed_ns,"clickhouse_before":clickhouse_initial,"clickhouse_after":clickhouse_post_load},
-            "backfill_phase": {"elapsed_ns":backfill_elapsed_ns,"backend_before":backend_pre_backfill,"backend_after":post_build,"clickhouse_before":clickhouse_pre_backfill,"clickhouse_after":clickhouse_post_build},
-            "first_query": {"warm_elapsed_ns":first_warm_ns,"exact_elapsed_ns":first_exact_ns},
-            "query_phase": {"elapsed_ns":query_elapsed_ns,"backend_before":pre_query,"backend_after":post_query,"backend_output_bytes":directory_bytes(output_dir.path()),"clickhouse_before":clickhouse_pre_query,"clickhouse_after":clickhouse_post_query,"clickhouse_storage_bytes":clickhouse_storage_bytes},
-            "clickhouse_table": table_stats,
-            "requests": requests,
-            "limitations": ["bounded single-series aggregate sensitivity; not full original o11y workload coverage", "CPU uses Linux scheduler ticks", "RSS is whole-process", "ClickHouse server is externally managed"],
-        });
-        std::fs::write(output, serde_json::to_vec_pretty(&artifact).unwrap()).unwrap();
-    }
-}
diff --git a/data_plane/tests/component_process_e2e.rs b/data_plane/tests/component_process_e2e.rs
deleted file mode 100644
index 8a6d59269..000000000
--- a/data_plane/tests/component_process_e2e.rs
+++ /dev/null
@@ -1,214 +0,0 @@
-//! Black-box component E2E for the production data-plane binary.
-//!
-//! The child process loads its real file configuration, accepts a modified
-//! OTLP DDSketch over HTTP, routes it through the precompute workers into the
-//! SketchStore, and answers a PromQL query from that stored sketch.
-
-#[path = "support/physical_fixture.rs"]
-mod physical_fixture;
-
-use std::net::TcpListener;
-use std::process::{Child, Command, Stdio};
-use std::time::Duration;
-
-use asap_otel_proto::tonic::collector::metrics::v1::ExportMetricsServiceRequest;
-use asap_otel_proto::tonic::common::v1::{any_value, AnyValue, KeyValue};
-use asap_otel_proto::tonic::metrics::v1::{
-    metric::Data, DdSketch, DdSketchDataPoint, DdSketchEncoding, Metric, ResourceMetrics,
-    ScopeMetrics,
-};
-use asap_sketchlib::proto::sketchlib::{sketch_envelope, DdSketchState, SketchEnvelope};
-use prost::Message;
-
-struct ChildGuard(Child);
-
-impl Drop for ChildGuard {
-    fn drop(&mut self) {
-        let _ = self.0.kill();
-        let _ = self.0.wait();
-    }
-}
-
-fn unused_port() -> u16 {
-    let listener = TcpListener::bind("127.0.0.1:0").expect("reserve loopback port");
-    let port = listener.local_addr().expect("read loopback address").port();
-    drop(listener);
-    port
-}
-
-fn ddsketch_export(metric: &str, timestamp_ns: u64, counts: Vec<u64>) -> Vec<u8> {
-    let alpha = 0.01;
-    let state = DdSketchState {
-        alpha,
-        store_counts: counts,
-        store_offset: -1,
-        ..Default::default()
-    };
-    let point = DdSketchDataPoint {
-        attributes: vec![KeyValue {
-            key: "service".into(),
-            value: Some(AnyValue {
-                value: Some(any_value::Value::StringValue("process-e2e".into())),
-            }),
-        }],
-        start_time_unix_nano: timestamp_ns.saturating_sub(1_000_000_000),
-        time_unix_nano: timestamp_ns,
-        sketch: SketchEnvelope {
-            format_version: 1,
-            sketch_state: Some(sketch_envelope::SketchState::Ddsketch(state)),
-            ..Default::default()
-        }
-        .encode_to_vec(),
-        encoding: DdSketchEncoding::DdsketchEncodingProto as i32,
-        exemplars: Vec::new(),
-        flags: 0,
-        series_id: 0,
-    };
-    ExportMetricsServiceRequest {
-        resource_metrics: vec![ResourceMetrics {
-            resource: None,
-            scope_metrics: vec![ScopeMetrics {
-                scope: None,
-                metrics: vec![Metric {
-                    name: metric.into(),
-                    description: String::new(),
-                    unit: String::new(),
-                    metadata: Vec::new(),
-                    data: Some(Data::Ddsketch(DdSketch {
-                        data_points: vec![point],
-                        aggregation_temporality: 0,
-                        relative_accuracy: alpha,
-                    })),
-                }],
-                schema_url: String::new(),
-            }],
-            schema_url: String::new(),
-        }],
-    }
-    .encode_to_vec()
-}
-
-fn first_scalar(response: &serde_json::Value) -> Option<f64> {
-    response["data"]["result"]
-        .as_array()?
-        .first()?
-        .get("value")?
-        .as_array()?
-        .get(1)?
-        .as_str()?
-        .parse()
-        .ok()
-}
-
-async fn wait_until_ready(client: &reqwest::Client, url: &str, child: &mut Child) {
-    for _ in 0..100 {
-        if let Some(status) = child.try_wait().expect("inspect data-plane process") {
-            panic!("data-plane exited before readiness: {status}");
-        }
-        if client
-            .get(url)
-            .send()
-            .await
-            .is_ok_and(|response| response.status().is_success())
-        {
-            return;
-        }
-        tokio::time::sleep(Duration::from_millis(50)).await;
-    }
-    panic!("data-plane did not become ready at {url}");
-}
-
-#[tokio::test]
-async fn production_binary_ingests_ddsketch_and_answers_promql() {
-    let query_port = unused_port();
-    let otlp_http_port = unused_port();
-    let otlp_grpc_port = unused_port();
-    let output_dir = tempfile::tempdir().expect("create log directory");
-    let install =
-        physical_fixture::artifact_from_materializations(vec![physical_fixture::materialization(
-            "component_process_e2e_latency_ms",
-            asap_types::AggregationType::DDSketch,
-            [("relative_accuracy".into(), serde_json::json!(0.01))].into(),
-        )]);
-    let mut physical = tempfile::NamedTempFile::new().unwrap();
-    serde_json::to_writer(&mut physical, &install).unwrap();
-
-    let child = Command::new(env!("CARGO_BIN_EXE_data_plane"))
-        .arg("--physical-plan")
-        .arg(physical.path())
-        .arg("--http-port")
-        .arg(query_port.to_string())
-        .arg("--output-dir")
-        .arg(output_dir.path())
-        .arg("--enable-otel-ingest")
-        .arg("--otel-http-port")
-        .arg(otlp_http_port.to_string())
-        .arg("--otel-grpc-port")
-        .arg(otlp_grpc_port.to_string())
-        .arg("--precompute-allowed-lateness-ms")
-        .arg("0")
-        .arg("--precompute-flush-interval-ms")
-        .arg("100")
-        .stdout(Stdio::null())
-        .stderr(Stdio::null())
-        .spawn()
-        .expect("start production data-plane binary");
-    let mut child = ChildGuard(child);
-
-    let client = reqwest::Client::new();
-    let base = format!("http://127.0.0.1:{query_port}");
-    wait_until_ready(&client, &format!("{base}/api/v1/health"), &mut child.0).await;
-
-    let now_ns = std::time::SystemTime::now()
-        .duration_since(std::time::UNIX_EPOCH)
-        .expect("system clock")
-        .as_secs()
-        * 1_000_000_000;
-    // Supply every pane in the queried ten-second interval.
-    for seconds_ago in (1..=10).rev() {
-        let body = ddsketch_export(
-            "component_process_e2e_latency_ms",
-            now_ns - seconds_ago * 1_000_000_000,
-            vec![5, 10, 15, 20],
-        );
-        let response = client
-            .post(format!("http://127.0.0.1:{otlp_http_port}/v1/metrics"))
-            .header("content-type", "application/x-protobuf")
-            .body({
-                let mut request = ExportMetricsServiceRequest::decode(body.as_slice()).unwrap();
-                physical_fixture::stamp(&mut request, &install);
-                request.encode_to_vec()
-            })
-            .send()
-            .await
-            .expect("POST modified OTLP to production receiver");
-        let status = response.status();
-        let body = response.text().await.unwrap();
-        assert!(status.is_success(), "OTLP {status}: {body}");
-    }
-
-    let query = "quantile_over_time(0.99, component_process_e2e_latency_ms[10s])";
-    for _ in 0..50 {
-        let response: serde_json::Value = client
-            .get(format!("{base}/api/v1/query"))
-            .query(&[
-                ("query", query.to_string()),
-                ("time", (now_ns / 1_000_000_000 - 1).to_string()),
-            ])
-            .send()
-            .await
-            .expect("query production data plane")
-            .json()
-            .await
-            .expect("decode PromQL response");
-        if let Some(value) = first_scalar(&response) {
-            assert!(
-                value.is_finite() && value > 0.0,
-                "invalid quantile: {value}"
-            );
-            return;
-        }
-        tokio::time::sleep(Duration::from_millis(100)).await;
-    }
-    panic!("production data plane never served the ingested DDSketch");
-}
diff --git a/data_plane/tests/disable_query_forwarding_process_e2e.rs b/data_plane/tests/disable_query_forwarding_process_e2e.rs
deleted file mode 100644
index 2cc1e9cf7..000000000
--- a/data_plane/tests/disable_query_forwarding_process_e2e.rs
+++ /dev/null
@@ -1,134 +0,0 @@
-//! The production CLI's no-forwarding mode keeps query traffic inside the backend.
-
-#[path = "support/empty_physical_plan.rs"]
-mod empty_physical_plan;
-
-use std::net::TcpListener;
-use std::process::{Child, Command, Stdio};
-use std::sync::{
-    atomic::{AtomicUsize, Ordering},
-    Arc,
-};
-use std::time::Duration;
-
-use axum::{routing::get, Router};
-
-struct ChildGuard(Child);
-
-impl Drop for ChildGuard {
-    fn drop(&mut self) {
-        let _ = self.0.kill();
-        let _ = self.0.wait();
-    }
-}
-
-fn unused_port() -> u16 {
-    TcpListener::bind("127.0.0.1:0")
-        .unwrap()
-        .local_addr()
-        .unwrap()
-        .port()
-}
-
-#[tokio::test]
-async fn cli_mode_blocks_instant_and_range_forwarding() {
-    let calls = Arc::new(AtomicUsize::new(0));
-    let count = calls.clone();
-    let listener = tokio::net::TcpListener::bind("127.0.0.1:0").await.unwrap();
-    let upstream = format!("http://{}", listener.local_addr().unwrap());
-    let capture = tokio::spawn(async move {
-        axum::serve(
-            listener,
-            Router::new()
-                .route(
-                    "/api/v1/query",
-                    get({
-                        let count = count.clone();
-                        move || async move {
-                            count.fetch_add(1, Ordering::SeqCst);
-                            "unexpected instant query"
-                        }
-                    }),
-                )
-                .route(
-                    "/api/v1/query_range",
-                    get(move || async move {
-                        count.fetch_add(1, Ordering::SeqCst);
-                        "unexpected range query"
-                    }),
-                ),
-        )
-        .await
-        .unwrap();
-    });
-
-    let mut config = tempfile::NamedTempFile::new().unwrap();
-    serde_json::to_writer(&mut config, &empty_physical_plan::empty()).unwrap();
-    let output = tempfile::tempdir().unwrap();
-    let port = unused_port();
-    let mut child = ChildGuard(
-        Command::new(env!("CARGO_BIN_EXE_data_plane"))
-            .arg("--physical-plan")
-            .arg(config.path())
-            .args([
-                "--disable-query-forwarding",
-                "--prometheus-server",
-                &upstream,
-            ])
-            .args(["--http-port", &port.to_string()])
-            .arg("--output-dir")
-            .arg(output.path())
-            .stdout(Stdio::null())
-            .stderr(Stdio::null())
-            .spawn()
-            .unwrap(),
-    );
-    let client = reqwest::Client::new();
-    let base = format!("http://127.0.0.1:{port}");
-    let mut ready = false;
-    for _ in 0..100 {
-        if let Ok(response) = client.get(format!("{base}/api/v1/health")).send().await {
-            if response.status().is_success() {
-                ready = true;
-                break;
-            }
-        }
-        assert!(
-            child.0.try_wait().unwrap().is_none(),
-            "backend exited before ready"
-        );
-        tokio::time::sleep(Duration::from_millis(50)).await;
-    }
-    assert!(ready, "backend did not become ready");
-
-    let instant = client
-        .get(format!("{base}/api/v1/query"))
-        .query(&[("query", "rate(unplanned_metric[5m])")])
-        .send()
-        .await
-        .unwrap();
-    assert_eq!(instant.status(), reqwest::StatusCode::OK);
-    assert_eq!(
-        instant.json::<serde_json::Value>().await.unwrap()["status"],
-        "error"
-    );
-
-    let range = client
-        .get(format!("{base}/api/v1/query_range"))
-        .query(&[
-            ("query", "rate(unplanned_metric[5m])"),
-            ("start", "100"),
-            ("end", "200"),
-            ("step", "15"),
-        ])
-        .send()
-        .await
-        .unwrap();
-    assert_eq!(range.status(), reqwest::StatusCode::OK);
-    assert_eq!(
-        range.json::<serde_json::Value>().await.unwrap()["status"],
-        "error"
-    );
-    assert_eq!(calls.load(Ordering::SeqCst), 0);
-    capture.abort();
-}
diff --git a/data_plane/tests/e2e_controller_plans_and_backend_serves.rs b/data_plane/tests/e2e_controller_plans_and_backend_serves.rs
deleted file mode 100644
index ecc9d51aa..000000000
--- a/data_plane/tests/e2e_controller_plans_and_backend_serves.rs
+++ /dev/null
@@ -1,1988 +0,0 @@
-//! End-to-end test of the gateway-less data path:
-//!
-//!   fake-exporter (test harness)
-//!     ─OTLP sketches─►
-//!   asap-otel agent (test harness — sketches built locally)
-//!     ─OTLP/HTTP /v1/metrics─►
-//!   asapquery-backend (in-process: OtlpReceiver + PrecomputeEngine + HttpServer)
-//!     ─PromQL /api/v1/query─►
-//!   query answer
-//!
-//! The control plane drives the plan: a PromQL query and an accuracy target
-//! go through `BackendLocalPlanningInput::planning_request` →
-//! `DeploymentPlanCompiler::compile`, and the resulting materializations are
-//! projected into a physical-plan artifact with QueryPlan/SummaryCatalog
-//! bindings, then staged and activated before ingest.
-//!
-//! Quantile fixtures use Planner-selected materializations. CMS wire fixtures
-//! explicitly declare the imported payload family; they do not assert that a
-//! total-count query selects CMS. HLL and CountSketch production oracle tests
-//! live in `all_sketches_process_oracle_e2e`.
-//!
-//! Queries are registered with the grouping the producer's attribute set
-//! carries (`sum by (service) (...)`), because the population key the backend
-//! materializes under has to match the attributes on the wire. Readout uses the
-//! inner form: the stored summaries are already per-service, so the result
-//! carries the label without the outer aggregation.
-//!
-//! Out of scope (per the task spec): Thanos / Gorilla / MinIO cold
-//! path; the gateway tier (retired in #241/#243/#377); the real
-//! `fake-exporter` and `asap-otel` binaries (the test harness plays
-//! both roles in-process).
-//!
-//! Covered:
-//!  * Test 1 — controller emits a streaming-config JSON for a single
-//!    DDSketch-quantile workload; the backend's parser accepts it and
-//!    the GET endpoint reflects the registered aggregation.
-//!  * Test 2 — same shape with `group_by_labels: ["zone"]`; verifies
-//!    #245's grouping plumb survives the round-trip into the backend's
-//!    `PrecomputeMaterialization.grouping_labels`.
-//!  * Test 3 — full controller-to-query roundtrip: harness simulates
-//!    the agent (builds DDSketch state with `asap_sketchlib`, encodes
-//!    as a modified-OTLP `DdSketchDataPoint`), POSTs sketches to the
-//!    backend's OTLP receiver, waits for window close, queries via
-//!    PromQL, asserts the response is well-formed for the planned
-//!    metric.
-
-use asap_types::PrecomputeMaterialization;
-use std::sync::Arc;
-use std::time::Duration;
-#[path = "support/physical_fixture.rs"]
-mod physical_fixture;
-
-type FixturePlans = std::sync::Mutex<
-    std::collections::BTreeMap<
-        u16,
-        Arc<data_plane::drivers::query::servers::http::PhysicalPlanInstallRequest>,
-    >,
->;
-static FIXTURE_PLANS: std::sync::OnceLock<FixturePlans> = std::sync::OnceLock::new();
-static FIXTURE_TIMES: std::sync::OnceLock<std::sync::Mutex<std::collections::BTreeMap<u16, u64>>> =
-    std::sync::OnceLock::new();
-fn evaluation_time(stack: &FullStack) -> String {
-    let ns = FIXTURE_TIMES.get().unwrap().lock().unwrap()[&stack.otlp_http_port];
-    (ns as f64 / 1e9).to_string()
-}
-
-fn phase_aligned_now_ns() -> u64 {
-    let now = std::time::SystemTime::now()
-        .duration_since(std::time::UNIX_EPOCH)
-        .expect("system time before UNIX epoch")
-        .as_nanos() as u64;
-    now - now % 5_000_000_000 + 3_000_000_000
-}
-
-async fn post_full_config(
-    client: &reqwest::Client,
-    stack: &FullStack,
-    materializations: &[PrecomputeMaterialization],
-) {
-    let mut configs = materializations.to_vec();
-    // The transport payloads below carry one-second states, so pin the
-    // physical layout to match them.
-    for config in &mut configs {
-        config.window_size = 1;
-        config.slide_interval = 1;
-        config.window_layout = asap_types::WindowMaterializationLayout::Pane { pane_secs: 1 };
-    }
-    let mut artifact = physical_fixture::artifact_from_materializations(configs.clone());
-    if configs
-        .iter()
-        .any(|c| c.metric == "http_requests_total_latency_ms")
-    {
-        for rule in &mut artifact.transmission_plan.rules {
-            rule.mode = asap_types::producer_plan::TransmissionMode::Delta;
-            rule.full_checkpoint_every_ms = Some(rule.emit_every_ms);
-            rule.runtime_policy.delta = Some(asap_types::producer_plan::DeltaPolicy {
-                absolute_threshold: 0.0,
-                gos: None,
-            });
-        }
-    }
-    for entry in artifact
-        .query_plan
-        .entries
-        .values_mut()
-        .filter(|e| e.canonical_query.starts_with("count("))
-    {
-        entry.instant.lookback_ms = 1000;
-        for node in entry.nodes.values_mut() {
-            if let asap_types::query_plan::QueryPlanNode::ReadMaterialization { binding } = node {
-                binding.readout_lookback_ms = Some(1000);
-            }
-        }
-    }
-    let plan = Arc::new(artifact);
-    let response = client
-        .post(format!(
-            "http://127.0.0.1:{}/api/v1/physical-plan",
-            stack.backend_port
-        ))
-        .json(&*plan)
-        .send()
-        .await
-        .unwrap();
-    let status = response.status();
-    let body = response.text().await.unwrap();
-    assert!(status.is_success(), "physical plan install: {body}");
-    let response = client
-        .post(format!(
-            "http://127.0.0.1:{}/api/v1/physical-plan/activate",
-            stack.backend_port
-        ))
-        .json(&serde_json::json!({"plan_id": 1, "plan_version": 1}))
-        .send()
-        .await
-        .unwrap();
-    let status = response.status();
-    let body = response.text().await.unwrap();
-    assert!(status.is_success(), "physical plan activation: {body}");
-    FIXTURE_PLANS
-        .get_or_init(Default::default)
-        .lock()
-        .unwrap()
-        .insert(stack.otlp_http_port, plan);
-}
-
-use control_plane::types::WorkloadCharacteristics;
-use data_plane::storage_engines::types::InstalledPrecomputePlanHandle;
-use serde_json::Value as JsonValue;
-
-use asap_otel_proto::tonic::collector::metrics::v1::ExportMetricsServiceRequest;
-use asap_otel_proto::tonic::common::v1::{any_value, AnyValue, KeyValue};
-use asap_otel_proto::tonic::metrics::v1::{
-    metric::Data, CountMinSketch, CountMinSketchDataPoint, CountMinSketchEncoding, CountSketch,
-    CountSketchDataPoint, CountSketchEncoding, DdSketch, DdSketchDataPoint, DdSketchEncoding,
-    Metric, ResourceMetrics, ScopeMetrics,
-};
-use asap_sketchlib::proto::sketchlib::{
-    sketch_envelope, CountMinState, CountSketchState, CounterType, DdSketchState, SketchEnvelope,
-};
-use prost::Message;
-
-// ── Helpers ─────────────────────────────────────────────────────────────────
-
-/// Compile `query` through the same physical planner the production
-/// `compile-and-publish` path runs, and return the materializations the
-/// backend installs for it.
-///
-/// The planner owns the summary decision: these tests declare an accuracy
-/// target and read back whichever family and parameters Planner committed to,
-/// rather than pinning a family. Family selection itself is covered by the
-/// control-plane compiler tests.
-fn plan_materializations(query: &str, accuracy: JsonValue) -> Vec<PrecomputeMaterialization> {
-    use control_plane::physical::compiler::{BackendLocalPlanningInput, DeploymentPlanCompiler};
-
-    let mut fixture: JsonValue = serde_json::from_str(include_str!(
-        "../../docs/examples/asapquery-compatibility-demo-snapshot.json"
-    ))
-    .expect("compatibility demo snapshot parses");
-    // Entry 3 carries an explicit accuracy target, so it is the right template
-    // for a single-query workload; the query text and target are overridden per
-    // test below.
-    let mut entry = fixture["query_workload"]["repeating_queries"][3].clone();
-    entry["query"] = query.into();
-    entry["requirements"]["accuracy"] = accuracy;
-    fixture["query_workload"]["repeating_queries"] = serde_json::json!([entry]);
-    // TopK admission needs a membership certificate; supplying it for every
-    // query is harmless because non-TopK plans never read it.
-    fixture["implementation"]["topk_evidence"] = serde_json::json!({
-        query: {
-            "selected_lower_bound": 101.0,
-            "excluded_upper_bound": 100.0,
-            "interval_failure_probability": 0.001,
-            "observed_at_unix_ms": 9500,
-            "source": "self-contained-e2e-fixture"
-        }
-    });
-
-    let snapshot: BackendLocalPlanningInput =
-        serde_json::from_value(fixture).expect("snapshot deserializes");
-    let (request, environment) = snapshot
-        .into_physical_compilation_request()
-        .expect("snapshot yields a planning request");
-    let plan = DeploymentPlanCompiler
-        .compile_promql(request, environment)
-        .expect("physical compilation succeeds");
-    plan.precompute_plan.materializations
-}
-
-/// Wire fixtures provide CMS bytes directly. Total-count planning can select
-/// an exact accumulator, so it must not be used to infer this payload's format.
-fn imported_cms_materializations(metric: &str) -> Vec<PrecomputeMaterialization> {
-    vec![PrecomputeMaterialization::new(
-        asap_types::AggregationType::CountMinSketch,
-        String::new(),
-        std::collections::HashMap::from([
-            ("w".into(), serde_json::json!(512)),
-            ("d".into(), serde_json::json!(5)),
-        ]),
-        asap_types::KeyByLabelNames::new(vec!["service".into()]),
-        asap_types::KeyByLabelNames::empty(),
-        asap_types::KeyByLabelNames::empty(),
-        String::new(),
-        5,
-        5,
-        asap_types::enums::WindowKind::Tumbling,
-        String::new(),
-        metric.into(),
-        Some(12),
-        None,
-        None,
-    )]
-}
-
-/// Epsilon-delta accuracy target in the shape `QueryRequirements` expects.
-fn epsilon_delta(epsilon: f64, delta: f64) -> JsonValue {
-    serde_json::json!({ "explicit": { "EpsilonDelta": { "epsilon": epsilon, "delta": delta } } })
-}
-
-/// Suppress the `WorkloadCharacteristics` unused warning — kept around
-/// in case future tests need to pass per-workload resource caps.
-#[allow(dead_code)]
-fn _wc_anchor() -> WorkloadCharacteristics {
-    WorkloadCharacteristics::default()
-}
-
-/// Full test stack: PrecomputeEngine + SketchStoreSink + OtlpReceiver +
-/// HttpServer, all sharing the same `SketchStore` and
-/// `InstalledPrecomputePlanHandle` so a controller-posted streaming-config
-/// is visible to the engine's accumulator routing, the engine's window
-/// outputs land in `SketchStore`, and the query engine reads from the
-/// same store.
-///
-/// Mirrors the wiring in `data_plane/src/main.rs`.
-struct FullStack {
-    backend_port: u16,
-    otlp_http_port: u16,
-}
-
-async fn start_full_stack(otlp_http_port: u16, otlp_grpc_port: u16) -> FullStack {
-    let _ = tracing_subscriber::fmt()
-        .with_env_filter(
-            tracing_subscriber::EnvFilter::try_from_default_env().unwrap_or_else(|_| "warn".into()),
-        )
-        .with_test_writer()
-        .try_init();
-    use data_plane::drivers::ingest::series_resolver::SeriesIdResolver;
-    use data_plane::drivers::ingest::{OtlpReceiver, OtlpReceiverConfig};
-    use data_plane::drivers::query::adapters::config::AdapterConfig;
-    use data_plane::drivers::query::servers::{HttpServer, HttpServerConfig};
-    use data_plane::precompute_engine::config::{LateDataPolicy, PrecomputeEngineConfig};
-    use data_plane::precompute_engine::output_sink::SketchStoreSink;
-    use data_plane::precompute_engine::PrecomputeEngine;
-    use data_plane::query_engines::asap_query_engine::engine::ASAPQueryEngine;
-    use data_plane::storage_engines::sketch_db::index::SketchStore;
-
-    let sketch_index = Arc::new(SketchStore::new());
-    let active = data_plane::storage_engines::types::HotReloadActivePhysicalPlan::new(
-        physical_fixture::bootstrap(),
-    );
-    let hot_reload = InstalledPrecomputePlanHandle::from_active_physical_plan(active.clone());
-    let series_resolver = Arc::new(SeriesIdResolver::new());
-
-    // SketchStoreSink writes precompute output back into SketchStore so
-    // the query engine can find it.
-    let sink = Arc::new(SketchStoreSink::new(
-        sketch_index.clone(),
-        hot_reload.clone(),
-        series_resolver.clone(),
-    ));
-
-    let engine_cfg = PrecomputeEngineConfig {
-        num_workers: 2,
-        allowed_lateness_ms: 0,
-        max_buffer_per_series: 10_000,
-        flush_interval_ms: 100,
-        channel_buffer_size: 10_000,
-        pass_raw_samples: false,
-        raw_mode_aggregation_id: 0,
-        late_data_policy: LateDataPolicy::Drop,
-        wall_clock_idle_grace_period_ms: 5_000,
-        wall_clock_max_open_grace_period_ms: 0,
-        schema_persist_path: None,
-    };
-    let engine = PrecomputeEngine::new(
-        engine_cfg,
-        hot_reload.clone(),
-        sink,
-        series_resolver.clone(),
-        sketch_index.clone(),
-    );
-    let ingest_state = engine.ingest_state();
-    tokio::spawn(async move {
-        let _ = engine.run().await;
-    });
-
-    // OTLP receiver wired to the engine's ingest state.
-    let otlp_receiver = OtlpReceiver::with_ingest_state(
-        OtlpReceiverConfig {
-            grpc_port: otlp_grpc_port,
-            http_port: otlp_http_port,
-        },
-        ingest_state,
-    );
-    tokio::spawn(async move {
-        let _ = otlp_receiver.run().await;
-    });
-
-    // HTTP query server sharing the same SketchStore + hot-reload handle.
-    let adapter_config =
-        AdapterConfig::prometheus_promql("http://127.0.0.1:9999".to_string(), false);
-    let http_config = HttpServerConfig {
-        port: 0,
-        handle_http_requests: true,
-        adapter_config,
-    };
-    let query_engine = Arc::new(
-        ASAPQueryEngine::new(15_000)
-            // CRITICAL: without this the engine's `sketch_index` is
-            // None and every fast path that reads sid → SketchInstance
-            // metadata is silently skipped. Sketches DO land in
-            // `sketch_index` via OTLP ingest (the engine's
-            // `precompute_engine` shares the Arc), but the query
-            // path can't see them without this binding.
-            .with_sketch_index(sketch_index.clone())
-            .with_active_physical_plan(active.clone()),
-    );
-    let server = HttpServer::new(http_config, query_engine, sketch_index)
-        .with_hot_reload_config(hot_reload.clone())
-        .with_active_physical_plan(active);
-    let backend_port = server
-        .start_test_server()
-        .await
-        .expect("start_test_server must succeed");
-
-    // Wait for everything to bind.
-    tokio::time::sleep(Duration::from_millis(500)).await;
-
-    FullStack {
-        backend_port,
-        otlp_http_port,
-    }
-}
-
-/// Build a `DdSketchState` proto from raw values. The DataPoint-level
-/// scalars (count/sum/min/max) were dropped from the wire format
-/// (ProjectASAP/sketchlib-go#243 / asap_sketchlib#57).
-fn build_dd_sketch_state(alpha: f64, store_counts: Vec<u64>, store_offset: i32) -> DdSketchState {
-    DdSketchState {
-        alpha,
-        store_counts,
-        store_offset,
-        ..Default::default()
-    }
-}
-
-fn encode_dd_full_state(state: DdSketchState) -> Vec<u8> {
-    SketchEnvelope {
-        format_version: 1,
-        sketch_state: Some(sketch_envelope::SketchState::Ddsketch(state)),
-        ..Default::default()
-    }
-    .encode_to_vec()
-}
-
-/// Build an OTLP `ExportMetricsServiceRequest` wrapping a single DDSketch
-/// data point.
-fn build_dd_sketch_export(
-    metric_name: &str,
-    attrs: &[(&str, &str)],
-    time_unix_nano: u64,
-    sketch_bytes: Vec<u8>,
-    alpha: f64,
-) -> ExportMetricsServiceRequest {
-    let attributes = attrs
-        .iter()
-        .map(|(k, v)| KeyValue {
-            key: k.to_string(),
-            value: Some(AnyValue {
-                value: Some(any_value::Value::StringValue(v.to_string())),
-            }),
-        })
-        .collect();
-    // start_time = time - 1s so the stored window `(start, end)` is
-    // narrow and falls entirely within any reasonable PromQL lookback.
-    // A `start_time_unix_nano: 0` (Unix epoch) would make the window
-    // start in 1970, outside any current-time-relative lookback the
-    // SketchStore range-query expects (`w.0 >= start && w.1 <= end`
-    // in `MutableEpoch::range_query_into` — a window starting at 0
-    // is rejected against `start = now - lookback_ms`).
-    let start_t_ns = time_unix_nano.saturating_sub(1_000_000_000);
-    let dp = DdSketchDataPoint {
-        attributes,
-        start_time_unix_nano: start_t_ns,
-        time_unix_nano,
-        sketch: sketch_bytes,
-        encoding: DdSketchEncoding::DdsketchEncodingProto as i32,
-        exemplars: Vec::new(),
-        flags: 0,
-        series_id: 0,
-    };
-    ExportMetricsServiceRequest {
-        resource_metrics: vec![ResourceMetrics {
-            resource: None,
-            scope_metrics: vec![ScopeMetrics {
-                scope: None,
-                metrics: vec![Metric {
-                    name: metric_name.to_string(),
-                    description: String::new(),
-                    unit: String::new(),
-                    metadata: Vec::new(),
-                    data: Some(Data::Ddsketch(DdSketch {
-                        data_points: vec![dp],
-                        aggregation_temporality: 0,
-                        relative_accuracy: alpha,
-                    })),
-                }],
-                schema_url: String::new(),
-            }],
-            schema_url: String::new(),
-        }],
-    }
-}
-
-/// Build a `CountSketchState` proto from a signed matrix in row-major
-/// order. Currently orphaned — Tests 6 + 9 (CountSketch coverage) use
-/// the heap-bearing msgpack helper instead. Retained for future
-/// non-heap CountSketch coverage; delete if no caller materialises.
-#[allow(dead_code)]
-fn build_count_sketch_state(rows: u32, cols: u32, counts_int: Vec<i64>) -> CountSketchState {
-    assert_eq!(
-        counts_int.len() as u32,
-        rows * cols,
-        "counts_int length must equal rows * cols"
-    );
-    CountSketchState {
-        rows,
-        cols,
-        counter_type: CounterType::Int64 as i32,
-        counts_int,
-        counts_float: Vec::new(),
-        l2: Vec::new(),
-        topk: None,
-    }
-}
-
-/// Build an OTLP `ExportMetricsServiceRequest` wrapping a single
-/// CountSketch DP (heap-less proto encoding). Sibling helper to
-/// `build_count_sketch_state`; both are retained for future
-/// non-heap coverage despite being orphaned today.
-#[allow(dead_code)]
-fn build_count_sketch_export(
-    metric_name: &str,
-    attrs: &[(&str, &str)],
-    time_unix_nano: u64,
-    sketch_bytes: Vec<u8>,
-) -> ExportMetricsServiceRequest {
-    let attributes = attrs
-        .iter()
-        .map(|(k, v)| KeyValue {
-            key: k.to_string(),
-            value: Some(AnyValue {
-                value: Some(any_value::Value::StringValue(v.to_string())),
-            }),
-        })
-        .collect();
-    let start_t_ns = time_unix_nano.saturating_sub(1_000_000_000);
-    let dp = CountSketchDataPoint {
-        attributes,
-        start_time_unix_nano: start_t_ns,
-        time_unix_nano,
-        sketch: sketch_bytes,
-        encoding: CountSketchEncoding::Proto as i32,
-        flags: 0,
-        series_id: 0,
-    };
-    ExportMetricsServiceRequest {
-        resource_metrics: vec![ResourceMetrics {
-            resource: None,
-            scope_metrics: vec![ScopeMetrics {
-                scope: None,
-                metrics: vec![Metric {
-                    name: metric_name.to_string(),
-                    description: String::new(),
-                    unit: String::new(),
-                    metadata: Vec::new(),
-                    data: Some(Data::Countsketch(CountSketch {
-                        data_points: vec![dp],
-                        aggregation_temporality: 0,
-                        rows: 0,
-                        cols: 0,
-                    })),
-                }],
-                schema_url: String::new(),
-            }],
-            schema_url: String::new(),
-        }],
-    }
-}
-
-/// Build a `CountMinState` proto from a non-negative matrix in row-major order.
-fn build_count_min_state(rows: u32, cols: u32, counts_int: Vec<i64>) -> CountMinState {
-    assert_eq!(
-        counts_int.len() as u32,
-        rows * cols,
-        "counts_int length must equal rows * cols"
-    );
-    CountMinState {
-        rows,
-        cols,
-        counter_type: CounterType::Int64 as i32,
-        counts_int,
-        counts_float: Vec::new(),
-        sum_counts: Vec::new(),
-        sum2_counts: Vec::new(),
-        l1: Vec::new(),
-        l2: Vec::new(),
-    }
-}
-
-/// Build an OTLP `ExportMetricsServiceRequest` wrapping a single
-/// CountMinSketch DP. `wire_rows`/`wire_cols` MUST match the
-/// policy's `parameters.{d, w}` so `derive_sketch_policy_fp`'s
-/// content match binds the sid to the registered policy.
-fn build_count_min_export(
-    metric_name: &str,
-    attrs: &[(&str, &str)],
-    time_unix_nano: u64,
-    sketch_bytes: Vec<u8>,
-    wire_rows: i32,
-    wire_cols: i32,
-) -> ExportMetricsServiceRequest {
-    let attributes = attrs
-        .iter()
-        .map(|(k, v)| KeyValue {
-            key: k.to_string(),
-            value: Some(AnyValue {
-                value: Some(any_value::Value::StringValue(v.to_string())),
-            }),
-        })
-        .collect();
-    let start_t_ns = time_unix_nano.saturating_sub(1_000_000_000);
-    let dp = CountMinSketchDataPoint {
-        attributes,
-        start_time_unix_nano: start_t_ns,
-        time_unix_nano,
-        sketch: sketch_bytes,
-        encoding: CountMinSketchEncoding::Proto as i32,
-        flags: 0,
-        series_id: 0,
-    };
-    ExportMetricsServiceRequest {
-        resource_metrics: vec![ResourceMetrics {
-            resource: None,
-            scope_metrics: vec![ScopeMetrics {
-                scope: None,
-                metrics: vec![Metric {
-                    name: metric_name.to_string(),
-                    description: String::new(),
-                    unit: String::new(),
-                    metadata: Vec::new(),
-                    data: Some(Data::Countminsketch(CountMinSketch {
-                        data_points: vec![dp],
-                        aggregation_temporality: 0,
-                        rows: wire_rows,
-                        cols: wire_cols,
-                    })),
-                }],
-                schema_url: String::new(),
-            }],
-            schema_url: String::new(),
-        }],
-    }
-}
-
-/// POST a protobuf-encoded `ExportMetricsServiceRequest` to the OTLP HTTP
-/// receiver on `localhost:port/v1/metrics`. Panics with the unexpected
-/// status code on non-2xx.
-async fn post_otlp_http(client: &reqwest::Client, port: u16, mut req: ExportMetricsServiceRequest) {
-    let data = req.resource_metrics[0].scope_metrics[0].metrics[0]
-        .data
-        .as_ref()
-        .unwrap();
-    let ns = match data {
-        Data::Ddsketch(s) => s.data_points[0].time_unix_nano,
-        Data::Kllsketch(s) => s.data_points[0].time_unix_nano,
-        Data::Hllsketch(s) => s.data_points[0].time_unix_nano,
-        Data::Countminsketch(s) => s.data_points[0].time_unix_nano,
-        Data::Countsketch(s) => s.data_points[0].time_unix_nano,
-        _ => unreachable!(),
-    };
-    FIXTURE_TIMES
-        .get_or_init(Default::default)
-        .lock()
-        .unwrap()
-        .entry(port)
-        .or_insert(ns);
-    let plan = FIXTURE_PLANS.get().unwrap().lock().unwrap()[&port].clone();
-    physical_fixture::stamp(&mut req, &plan);
-    let body = req.encode_to_vec();
-    let resp = client
-        .post(format!("http://127.0.0.1:{port}/v1/metrics"))
-        .header("Content-Type", "application/x-protobuf")
-        .body(body)
-        .send()
-        .await
-        .expect("OTLP HTTP send failed");
-    let status = resp.status();
-    let body = resp.text().await.unwrap();
-    assert!(status.is_success(), "OTLP {status}: {body}");
-}
-
-// ── Test 1 — single DDSketch-quantile workload, no grouping ─────────────────
-//
-// HTTP integration contract: the controller emits a streaming-config JSON for a
-// workload that resolves to DDSketch. The backend's parser accepts it
-// (POST returns 2xx) and the registered aggregation surfaces on the
-// GET endpoint with the expected metric / sketch family.
-
-#[tokio::test(flavor = "multi_thread", worker_threads = 2)]
-async fn controller_streaming_config_round_trips_through_backend_http() {
-    let stack = start_full_stack(19_597, 19_598).await;
-    let client = reqwest::Client::new();
-
-    let materializations = plan_materializations(
-        "sum by (service) (quantile_over_time(0.99, http_latency_ms[1s]))",
-        epsilon_delta(0.01, 0.01),
-    );
-
-    // One query planned, so one materialization, carrying the content fields
-    // the backend keys identity from.
-    assert_eq!(
-        materializations.len(),
-        1,
-        "expected exactly one materialization: {materializations:#?}"
-    );
-    let agg = &materializations[0];
-    assert_eq!(agg.metric, "http_latency_ms");
-    assert!(agg.window_size > 0, "window size must be > 0: {agg:#?}");
-
-    post_full_config(&client, &stack, &materializations).await;
-}
-
-// ── Test 2 — cross-host grouping (sum by zone) ──────────────────────────────
-//
-// Verifies #245's grouping plumb survives the controller → backend
-// round-trip. The workload carries `group_by_labels: ["zone"]`; the
-// emitted JSON must surface `["zone"]` in `labels.grouping`, the
-// backend's parser must materialise it into `PrecomputeMaterialization.
-// grouping_labels`, and the active-config snapshot must reflect that.
-
-#[tokio::test(flavor = "multi_thread", worker_threads = 2)]
-async fn controller_plans_with_grouping_and_backend_parses_grouping_labels() {
-    let stack = start_full_stack(19_599, 19_600).await;
-    let client = reqwest::Client::new();
-
-    let materializations = plan_materializations(
-        "sum by (zone) (quantile_over_time(0.99, http_latency_ms[1s]))",
-        epsilon_delta(0.01, 0.01),
-    );
-
-    // The planner must thread the query's grouping into the materialization
-    // the backend keys its per-population state by.
-    let agg = &materializations[0];
-    assert!(
-        agg.grouping_labels
-            .names()
-            .iter()
-            .any(|name| name == "zone"),
-        "planner must carry the query grouping into the materialization: {agg:#?}"
-    );
-
-    post_full_config(&client, &stack, &materializations).await;
-
-    // The backend accepted the plan, so the grouping the planner derived is
-    // the population key the producer's attribute set has to match. Assert it
-    // on the materialization the install carried rather than on a snapshot
-    // endpoint that reports only plan phase.
-    assert!(
-        materializations[0]
-            .grouping_labels
-            .names()
-            .iter()
-            .any(|name| name == "zone"),
-        "installed materialization must key by `zone`: {:#?}",
-        materializations[0]
-    );
-}
-
-// ── Test 3 — controller plan + OTLP sketch ingest (wire-format anchor) ─────
-//
-// The whole gateway-less data path, end-to-end in-process — up to and
-// including the OTLP sketch wire format:
-//
-//   1. Controller plans a DDSketch-quantile workload and POSTs the
-//      streaming-config JSON to /api/v1/streaming-config.
-//   2. Test harness (acting as the agent) builds a DDSketch state with
-//      `asap_sketchlib::proto::sketchlib::DdSketchState`, encodes it
-//      as a modified-OTLP `DdSketchDataPoint`, and POSTs it via OTLP
-//      HTTP /v1/metrics. Asserts the receiver returns 2xx.
-//   3. Harness sends a watermark-advance DP (timestamped past the
-//      window end) so the precompute engine flushes the closed window
-//      to `SketchStoreSink` → `SketchStore`. Asserts the receiver
-//      returns 2xx.
-//   4. Strict-success: harness queries `/api/v1/query` and asserts
-//      `status == "success"`. The modern `execute()` trait-dispatch
-//      path (post-#280, with PR #273's union of `instances_matching`
-//      into ASAP-tier sid resolution) reaches the sketch-backed sid
-//      and the reducer returns the quantile.
-//
-// What this Test 3 anchors:
-//   * Controller-emitted streaming-config + content fields are
-//     parseable AND accepted at /api/v1/streaming-config (already
-//     covered by Tests 1+2, re-exercised here to verify it doesn't
-//     break when the engine + OTLP receiver are also running).
-//   * Modified-OTLP `DdSketchDataPoint` wire encoding + the backend's
-//     OTLP HTTP receiver accept the payload (no 4xx/5xx).
-//   * The full stack (PrecomputeEngine + SketchStoreSink + OtlpReceiver
-//     + HttpServer all sharing SketchStore + InstalledPrecomputePlanHandle)
-//     comes up and stays up under POST + query traffic.
-//   * The OTLP-ingested sketch lands in `SketchStore` keyed by the
-//     right `PolicyFingerprint` (or via the `instances_matching`
-//     fallback) AND the query engine's modern trait-dispatch path
-//     resolves the metric against the stored sketch and returns the
-//     quantile.
-
-#[tokio::test(flavor = "multi_thread", worker_threads = 4)]
-async fn controller_plan_to_query_full_roundtrip_ddsketch() {
-    let stack = start_full_stack(19_561, 19_562).await;
-    let client = reqwest::Client::new();
-
-    // ── 1. Controller plans + POSTs the streaming-config ───────────────
-    //
-    // Small window (1s) so the watermark-advance step below closes the
-    // window quickly and the test doesn't have to wait long.
-    //
-    // `group_by_labels: ["service"]` is critical: the OTLP DP we send
-    // below carries `service` as an attribute (required to avoid the
-    // receiver's "invalid wire shape" drop). The backend's
-    // `derive_sketch_policy_fp` matches policies on
-    // `(metric, sketch_algorithm, config, group_by_keys)` — so the
-    // streaming-config's grouping MUST include "service" or the
-    // fingerprint won't match and the registered sid stays orphaned
-    // from any policy.
-    let materializations = plan_materializations(
-        "sum by (service) (quantile_over_time(0.99, http_latency_ms[1s]))",
-        epsilon_delta(0.01, 0.01),
-    );
-    post_full_config(&client, &stack, &materializations).await;
-
-    // ── 2. Build a DDSketch state with a known distribution ────────────
-    //
-    // 50 samples drawn from a fixed distribution. The exact bucket-
-    // count math (DDSketch index = ceil(log_gamma(value))) doesn't
-    // matter for this test — we want to verify the wire round-trip,
-    // not the quantile readout accuracy. Pick a simple count vector
-    // used by the production modified-OTLP process E2E, so it is known
-    // to be representable.
-    let alpha = 0.01;
-    let store_counts = vec![5u64, 10, 15, 20];
-    let dd_state = build_dd_sketch_state(alpha, store_counts, -1);
-    let sketch_bytes = encode_dd_full_state(dd_state);
-
-    // ── 3. POST the sketch DP via OTLP HTTP ────────────────────────────
-    //
-    // Use wall-clock-relative timestamps so the PromQL query at default
-    // evaluation time (also wall-clock) sees the data inside its `[1s]`
-    // lookback window. The sketch lands at `now - 3s` so it's well
-    // inside a 1-second window that closed `now - 2s`; the watermark
-    // advance is at `now - 1s` so the engine sees the window-end
-    // boundary cross.
-    let now_ns = phase_aligned_now_ns();
-    let sketch_t_ns = now_ns.saturating_sub(3_000_000_000);
-    let watermark_t_ns = now_ns.saturating_sub(1_000_000_000);
-
-    // The OTLP DP MUST carry at least one attribute (or a known sid).
-    // With both empty/zero, the receiver hits the "invalid wire shape"
-    // branch in `route_modified_otlp_sketches_to_precompute` (per the
-    // comment block at otel.rs:926 — `(sid=0, no attrs)` is dropped).
-    // The agent normally tags DPs with the workload's `aggregate_by`
-    // values; mirror that here with a `service` attribute.
-    let req = build_dd_sketch_export(
-        "http_latency_ms",
-        &[("service", "e2e-test")],
-        sketch_t_ns,
-        sketch_bytes,
-        alpha,
-    );
-    post_otlp_http(&client, stack.otlp_http_port, req).await;
-
-    // ── 4. Send a watermark-advance DP past the window end ─────────────
-    //
-    // Window is 1s; the sketch landed at `now - 3s` and falls in some
-    // 1-second tumbling window W. This DP at `now - 1s` is at least
-    // 2 seconds past the start of W, so it moves the engine's
-    // watermark past W's close boundary and triggers the flush.
-    let watermark_state = build_dd_sketch_state(alpha, Vec::new(), 0);
-    let watermark_req = build_dd_sketch_export(
-        "http_latency_ms",
-        &[("service", "e2e-test")],
-        watermark_t_ns,
-        encode_dd_full_state(watermark_state),
-        alpha,
-    );
-    post_otlp_http(&client, stack.otlp_http_port, watermark_req).await;
-
-    // Wait long enough for the periodic flush + sink write.
-    tokio::time::sleep(Duration::from_millis(800)).await;
-
-    // ── 5. Query via PromQL ────────────────────────────────────────────
-    let query_url = format!("http://127.0.0.1:{}/api/v1/query", stack.backend_port);
-    let response: JsonValue = client
-        .get(&query_url)
-        .query(&[("time", evaluation_time(&stack))])
-        .query(&[("query", "quantile_over_time(0.99, http_latency_ms[1s])")])
-        .send()
-        .await
-        .expect("PromQL query failed to send")
-        .json()
-        .await
-        .expect("PromQL response was not JSON");
-
-    // ── 6. Strict-success check on the query response. ────────────────
-    //
-    // Investigation done in the wake of #249's L5-walk fix surfaced
-    // several constraints on the OTLP wire shape:
-    //
-    //   * The OTLP DP MUST carry at least one attribute (or known
-    //     sid). With both empty, the receiver hits the
-    //     "invalid wire shape" drop in
-    //     `route_modified_otlp_sketches_to_precompute` (otel.rs:926
-    //     comment block — `(sid=0, no attrs)` is dropped). Test
-    //     attaches `service="e2e-test"` to the DP.
-    //
-    //   * The sketch's group_by_keys (derived from `dp.attrs.keys()`)
-    //     MUST exactly match the streaming-config policy's
-    //     `grouping_labels` for `find_policy_by_content` to bind
-    //     `policy_fp`. The match is **strict** at ingest
-    //     (asap_tier_analysis.rs:525) but **subset** at query time
-    //     (asap_tier_analysis.rs:587) — that asymmetry is intentional
-    //     (ingest needs uniqueness; queries can re-aggregate down).
-    //     Test uses `group_by_labels: ["service"]` to align.
-    //
-    //   * The stored window `(start, end)` from
-    //     `(dp.start_time_unix_nano, dp.time_unix_nano) / 1e6` must
-    //     fall entirely within the PromQL query's lookback range —
-    //     `MutableEpoch::range_query_into` accepts only windows where
-    //     `w.0 >= start && w.1 <= end`. `start_time_unix_nano: 0`
-    //     would peg the window start in 1970 and the modern
-    //     trait-dispatch path's `query_range` would skip it. Test
-    //     uses `start_t_ns = time_unix_nano - 1s` (see
-    //     `build_dd_sketch_export`).
-    assert!(
-        response.get("status").is_some(),
-        "PromQL response missing `status` field — HTTP layer is unhealthy\n{}",
-        serde_json::to_string_pretty(&response).unwrap_or_default()
-    );
-    let status = response["status"].as_str().unwrap_or("(missing)");
-    assert_eq!(
-        status,
-        "success",
-        "PromQL quantile_over_time query against a DDSketch-backed sid \
-         did not succeed via the modern execute() trait-dispatch path. \
-         Response:\n{}",
-        serde_json::to_string_pretty(&response).unwrap_or_default()
-    );
-}
-
-// ── Test 4 — full roundtrip with KLL ────────────────────────────────────────
-//
-// Same shape as Test 3 but the workload pins KLL via
-// `sketch_type_override: Some(SketchType::KLL)`. The OTLP DP carries
-// a `KllSketchDataPoint` with `KllState`; the engine's reducer must
-// dispatch to the KLL quantile readout. Verifies the trait-dispatch
-// fallback handles the KLL family identically to DDSketch.
-
-#[tokio::test(flavor = "multi_thread", worker_threads = 4)]
-async fn controller_plan_to_query_full_roundtrip_kll() {
-    let stack = start_full_stack(19_563, 19_564).await;
-    let client = reqwest::Client::new();
-
-    let materializations = plan_materializations(
-        "sum by (service) (quantile_over_time(0.5, request_size_bytes[1s]))",
-        epsilon_delta(0.05, 0.05),
-    );
-    post_full_config(&client, &stack, &materializations).await;
-
-    let alpha = materializations[0].parameters["alpha"]
-        .as_f64()
-        .expect("planner sized a relative-accuracy quantile summary");
-    let dd_state = build_dd_sketch_state(alpha, vec![5u64, 10, 15, 20], -1);
-    let sketch_bytes = encode_dd_full_state(dd_state);
-
-    let now_ns = phase_aligned_now_ns();
-    let sketch_t_ns = now_ns.saturating_sub(3_000_000_000);
-    let watermark_t_ns = now_ns.saturating_sub(1_000_000_000);
-
-    let req = build_dd_sketch_export(
-        "request_size_bytes",
-        &[("service", "e2e-test")],
-        sketch_t_ns,
-        sketch_bytes,
-        alpha,
-    );
-    post_otlp_http(&client, stack.otlp_http_port, req).await;
-
-    let watermark_state = build_dd_sketch_state(alpha, Vec::new(), 0);
-    let watermark_req = build_dd_sketch_export(
-        "request_size_bytes",
-        &[("service", "e2e-test")],
-        watermark_t_ns,
-        encode_dd_full_state(watermark_state),
-        alpha,
-    );
-    post_otlp_http(&client, stack.otlp_http_port, watermark_req).await;
-
-    tokio::time::sleep(Duration::from_millis(800)).await;
-
-    let response: JsonValue = client
-        .get(format!(
-            "http://127.0.0.1:{}/api/v1/query",
-            stack.backend_port
-        ))
-        .query(&[("query", "quantile_over_time(0.5, request_size_bytes[1s])")])
-        .query(&[("time", evaluation_time(&stack))])
-        .send()
-        .await
-        .expect("query failed")
-        .json()
-        .await
-        .expect("response not JSON");
-
-    let status = response["status"].as_str().unwrap_or("(missing)");
-    assert_eq!(
-        status,
-        "success",
-        "KLL quantile query did not succeed:\n{}",
-        serde_json::to_string_pretty(&response).unwrap_or_default()
-    );
-}
-
-// An imported CMS state remains readable through its installed count binding.
-
-#[tokio::test(flavor = "multi_thread", worker_threads = 4)]
-async fn imported_cms_state_serves_count_query() {
-    let stack = start_full_stack(19_565, 19_566).await;
-    let client = reqwest::Client::new();
-
-    let materializations = imported_cms_materializations("unique_users_per_min");
-    post_full_config(&client, &stack, &materializations).await;
-
-    let (w, d) = extract_w_d(&materializations[0]);
-    let cells = (w as usize) * (d as usize);
-    let mut counts = vec![0i64; cells];
-    // A few non-zero cells so the readout is non-trivial.
-    counts[0] = 5;
-    counts[w as usize] = 7;
-    counts[cells - 1] = 4;
-    let cms_state = build_count_min_state(d, w, counts.clone());
-    let sketch_bytes = cms_state.encode_to_vec();
-
-    let now_ns = phase_aligned_now_ns();
-    let sketch_t_ns = now_ns.saturating_sub(3_000_000_000);
-    let watermark_t_ns = now_ns.saturating_sub(1_000_000_000);
-
-    let req = build_count_min_export(
-        "unique_users_per_min",
-        &[("service", "e2e-test")],
-        sketch_t_ns,
-        sketch_bytes,
-        d as i32,
-        w as i32,
-    );
-    post_otlp_http(&client, stack.otlp_http_port, req).await;
-
-    let watermark_state = build_count_min_state(d, w, vec![0i64; cells]);
-    let watermark_req = build_count_min_export(
-        "unique_users_per_min",
-        &[("service", "e2e-test")],
-        watermark_t_ns,
-        watermark_state.encode_to_vec(),
-        d as i32,
-        w as i32,
-    );
-    post_otlp_http(&client, stack.otlp_http_port, watermark_req).await;
-
-    tokio::time::sleep(Duration::from_millis(800)).await;
-
-    // PromQL `count(metric)` lowers to `AggFunc::CountDistinct` →
-    // `AggIntent::Cardinality` → `Capability::CardinalityApprox`,
-    // which is what the HLL policy provides. No range selector
-    // needed — instant-vector cardinality is what HLL answers.
-    let response: JsonValue = client
-        .get(format!(
-            "http://127.0.0.1:{}/api/v1/query",
-            stack.backend_port
-        ))
-        .query(&[("query", "count_over_time(unique_users_per_min[1s])")])
-        .query(&[("time", evaluation_time(&stack))])
-        .send()
-        .await
-        .expect("query failed")
-        .json()
-        .await
-        .expect("response not JSON");
-
-    let status = response["status"].as_str().unwrap_or("(missing)");
-    assert_eq!(
-        status,
-        "success",
-        "Imported CMS count query did not succeed:\n{}",
-        serde_json::to_string_pretty(&response).unwrap_or_default()
-    );
-}
-
-// CMS transport binds the configured dimensions for the endpoint metric.
-
-#[tokio::test(flavor = "multi_thread", worker_threads = 4)]
-async fn imported_cms_top_endpoint_wire_roundtrip() {
-    let stack = start_full_stack(19_567, 19_568).await;
-    let client = reqwest::Client::new();
-
-    let materializations = imported_cms_materializations("top_endpoint_qps");
-    post_full_config(&client, &stack, &materializations).await;
-
-    // Use the planner-picked `(w, d)` so the OTLP DP's wire-level
-    // `rows`/`cols` line up with the policy's `parameters.{d, w}` —
-    // dimension mismatches prevent physical-policy binding.
-    let (w, d) = extract_w_d(&materializations[0]);
-    let rows = d as usize;
-    let cols = w as usize;
-    let wire_rows = d as i32;
-    let wire_cols = w as i32;
-
-    let cells = rows * cols;
-    let mut counts = vec![0i64; cells];
-    counts[0] = 100;
-    counts[cols] = 50;
-    counts[cells - 1] = 200;
-    let sketch_bytes = build_count_min_state(d, w, counts.clone()).encode_to_vec();
-
-    let now_ns = phase_aligned_now_ns();
-    let sketch_t_ns = now_ns.saturating_sub(3_000_000_000);
-    let watermark_t_ns = now_ns.saturating_sub(1_000_000_000);
-
-    let req = build_count_min_export(
-        "top_endpoint_qps",
-        &[("service", "e2e-test")],
-        sketch_t_ns,
-        sketch_bytes.clone(),
-        wire_rows,
-        wire_cols,
-    );
-    post_otlp_http(&client, stack.otlp_http_port, req).await;
-
-    let watermark_req = build_count_min_export(
-        "top_endpoint_qps",
-        &[("service", "e2e-test")],
-        watermark_t_ns,
-        build_count_min_state(d, w, vec![0i64; cells]).encode_to_vec(),
-        wire_rows,
-        wire_cols,
-    );
-    post_otlp_http(&client, stack.otlp_http_port, watermark_req).await;
-
-    tokio::time::sleep(Duration::from_millis(800)).await;
-
-    let response: JsonValue = client
-        .get(format!(
-            "http://127.0.0.1:{}/api/v1/query",
-            stack.backend_port
-        ))
-        .query(&[("query", "count_over_time(top_endpoint_qps[1s])")])
-        .query(&[("time", evaluation_time(&stack))])
-        .send()
-        .await
-        .expect("query failed")
-        .json()
-        .await
-        .expect("response not JSON");
-    let status = response["status"].as_str().unwrap_or("(missing)");
-    assert_eq!(
-        status,
-        "success",
-        "count_over_time(...) against heap-bearing CountSketch must succeed \
-         end-to-end. Response:\n{}",
-        serde_json::to_string_pretty(&response).unwrap_or_default()
-    );
-    let result = &response["data"]["result"];
-    let arr = result
-        .as_array()
-        .expect("result must be an array of vector elements");
-    assert!(
-        !arr.is_empty(),
-        "count_over_time must return at least one series. Response:\n{}",
-        serde_json::to_string_pretty(&response).unwrap_or_default()
-    );
-}
-
-// ── Test 7 — wire-format roundtrip with CountMinSketch (frequency) ──────────
-//
-// CountMinSketch backs frequency estimation — non-negative point
-// counts with one-sided over-estimation. Workload pins CMS via
-// `sketch_type_override: Some(SketchType::CountMinSketch)`. The OTLP
-// DP carries a `CountMinSketchDataPoint` with `CountMinState`.
-//
-// **Strict-success on `count_over_time(metric[1s])`** — PromQL's
-// per-series sample-count idiom maps to `FrequencyEstimate(Any)`
-// (see analyzer's `walk_call_to_op` for `count_over_time`), which
-// `is_satisfied_by` accepts against `FrequencyEstimate(CountMin)`.
-// The reducer's `decode_frequency_total` reads row-0 of the CMS
-// matrix and returns the per-window total count.
-
-#[tokio::test(flavor = "multi_thread", worker_threads = 4)]
-async fn imported_cms_frequency_wire_roundtrip() {
-    let stack = start_full_stack(19_569, 19_570).await;
-    let client = reqwest::Client::new();
-
-    let materializations = imported_cms_materializations("endpoint_request_freq");
-    post_full_config(&client, &stack, &materializations).await;
-
-    // Use planner-picked `(w, d)` so the wire DP's `rows`/`cols`
-    // match the policy's `parameters.{d, w}` — the policy_fp content
-    // match keys on these values (see `derive_sketch_policy_fp`).
-    let (w, d) = extract_w_d(&materializations[0]);
-    let rows = d;
-    let cols = w;
-    let counts: Vec<i64> = (0..(rows * cols) as i64).map(|i| (i % 11).abs()).collect();
-    let cms_state = build_count_min_state(rows, cols, counts);
-    let sketch_bytes = cms_state.encode_to_vec();
-
-    let now_ns = phase_aligned_now_ns();
-    let sketch_t_ns = now_ns.saturating_sub(3_000_000_000);
-    let watermark_t_ns = now_ns.saturating_sub(1_000_000_000);
-
-    let req = build_count_min_export(
-        "endpoint_request_freq",
-        &[("service", "e2e-test")],
-        sketch_t_ns,
-        sketch_bytes,
-        rows as i32,
-        cols as i32,
-    );
-    post_otlp_http(&client, stack.otlp_http_port, req).await;
-
-    let watermark_state = build_count_min_state(rows, cols, vec![0i64; (rows * cols) as usize]);
-    let watermark_req = build_count_min_export(
-        "endpoint_request_freq",
-        &[("service", "e2e-test")],
-        watermark_t_ns,
-        watermark_state.encode_to_vec(),
-        rows as i32,
-        cols as i32,
-    );
-    post_otlp_http(&client, stack.otlp_http_port, watermark_req).await;
-
-    tokio::time::sleep(Duration::from_millis(800)).await;
-
-    let response: JsonValue = client
-        .get(format!(
-            "http://127.0.0.1:{}/api/v1/query",
-            stack.backend_port
-        ))
-        .query(&[("query", "count_over_time(endpoint_request_freq[1s])")])
-        .query(&[("time", evaluation_time(&stack))])
-        .send()
-        .await
-        .expect("query failed")
-        .json()
-        .await
-        .expect("response not JSON");
-    let status = response["status"].as_str().unwrap_or("(missing)");
-    assert_eq!(
-        status,
-        "success",
-        "count_over_time(...) against heap-less CMS must succeed end-to-end. Response:\n{}",
-        serde_json::to_string_pretty(&response).unwrap_or_default()
-    );
-    let result = &response["data"]["result"];
-    let arr = result
-        .as_array()
-        .expect("result must be an array of vector elements");
-    assert!(
-        !arr.is_empty(),
-        "count_over_time must return at least one series. Response:\n{}",
-        serde_json::to_string_pretty(&response).unwrap_or_default()
-    );
-}
-
-// ── Heap-bearing fixtures ───────────────────────────────────────────────────
-//
-// The msgpack envelope `CountMinSketchWithHeap::serialize_msgpack`
-// produces (an outer `{sketch, topk_heap, heap_size}` wrapper, see
-// asap_sketchlib's `CountMinSketchWithHeapSerialized`) is the SHARED
-// wire shape used by both `CmsWithHeap` and `CountSketchWithHeap` —
-// the heap is the distinguishing payload, and the data_plane reducer
-// dispatches both variants through `decode_cms_with_heap_from_msgpack`
-// (see `sketch_reducer.rs` at the FrequencyTopk dispatch site).
-//
-// On the ingest side, `sketch_algorithm_for` peeks at incoming
-// CountMin / CountSketch DPs with `encoding=MSGPACK`; if the bytes
-// round-trip through the heap envelope AND the heap is non-empty,
-// the sid is auto-promoted to the corresponding `*WithHeap` variant
-// so the ASAP-tier reducer can answer `topk(...)` from the heap.
-
-/// Extract the planner-picked `(w, d)` from a streaming-config aggregation
-/// for CMS / CountSketch policies. Returns `(w as cols, d as rows)`.
-/// The DP's wire-level `rows`/`cols` MUST match these for
-/// `find_policy_by_content` to bind the sid to the policy_fp (the
-/// content match probes `parameters.w` and `parameters.d`).
-/// Sketch width/depth the planner sized this materialization to. The test
-/// payloads are built against these, never against pinned constants.
-fn extract_w_d(agg: &PrecomputeMaterialization) -> (u32, u32) {
-    let w = agg.parameters["w"]
-        .as_u64()
-        .expect("materialization must carry parameters.w") as u32;
-    let d = agg.parameters["d"]
-        .as_u64()
-        .expect("materialization must carry parameters.d") as u32;
-    (w, d)
-}
-
-// Heap TopK serving acceptance lives in asapquery_compatibility_process_e2e:
-// registered_temporal_topk_{cms_heap,count_sketch_heap} install the selected
-// physical QueryPlan and verify raw count updates through the production binary.
-
-// ── Test 10 — range-query warm-tier fallback (CMS + count_over_time) ────────
-//
-// `/api/v1/query_range` previously had no warm-tier fallback —
-// when the legacy `handle_range_query_promql` returned `None` (which
-// it does for sketch-backed sids), the handler immediately fell
-// through to `format_unsupported_query_response` ("No result for
-// query"). This PR adds an `execute_range_promql_modern` modern
-// path that mirrors PR #253's `process_via_simple_engine` fallback
-// for instant queries.
-//
-// Same wire setup as Test 7 (heap-less CMS, `endpoint_request_freq`
-// with `AggType::Frequency`), but the query goes through
-// `/api/v1/query_range?query=count_over_time(metric[1s])` instead
-// of the instant endpoint. The result `resultType` is `matrix`
-// (Prometheus spec for range queries).
-
-#[tokio::test(flavor = "multi_thread", worker_threads = 4)]
-async fn imported_cms_state_serves_range_query() {
-    let stack = start_full_stack(19_575, 19_576).await;
-    let client = reqwest::Client::new();
-
-    let materializations = imported_cms_materializations("endpoint_request_freq");
-    post_full_config(&client, &stack, &materializations).await;
-
-    let (w, d) = extract_w_d(&materializations[0]);
-    let rows = d;
-    let cols = w;
-    let counts: Vec<i64> = (0..(rows * cols) as i64).map(|i| (i % 11).abs()).collect();
-    let cms_state = build_count_min_state(rows, cols, counts);
-    let sketch_bytes = cms_state.encode_to_vec();
-
-    let now_ns = phase_aligned_now_ns();
-    let sketch_t_ns = now_ns.saturating_sub(3_000_000_000);
-    let watermark_t_ns = sketch_t_ns + 5_000_000_000;
-
-    let req = build_count_min_export(
-        "endpoint_request_freq",
-        &[("service", "e2e-test")],
-        sketch_t_ns,
-        sketch_bytes,
-        rows as i32,
-        cols as i32,
-    );
-    post_otlp_http(&client, stack.otlp_http_port, req).await;
-
-    let watermark_state = build_count_min_state(rows, cols, vec![0i64; (rows * cols) as usize]);
-    let watermark_req = build_count_min_export(
-        "endpoint_request_freq",
-        &[("service", "e2e-test")],
-        watermark_t_ns,
-        watermark_state.encode_to_vec(),
-        rows as i32,
-        cols as i32,
-    );
-    post_otlp_http(&client, stack.otlp_http_port, watermark_req).await;
-
-    tokio::time::sleep(Duration::from_millis(800)).await;
-
-    // Query range covering the watermark + sketch windows. Prometheus's
-    // /api/v1/query_range expects epoch-second floats for start/end/step.
-    let start_secs: f64 = evaluation_time(&stack).parse().unwrap();
-    let end_secs = start_secs + 5.0;
-    let step_secs = 5.0;
-    let response: JsonValue = client
-        .get(format!(
-            "http://127.0.0.1:{}/api/v1/query_range",
-            stack.backend_port
-        ))
-        .query(&[
-            ("query", "count_over_time(endpoint_request_freq[1s])"),
-            ("start", &format!("{start_secs}")),
-            ("end", &format!("{end_secs}")),
-            ("step", &format!("{step_secs}")),
-        ])
-        .send()
-        .await
-        .expect("range query failed")
-        .json()
-        .await
-        .expect("response not JSON");
-    let status = response["status"].as_str().unwrap_or("(missing)");
-    assert_eq!(
-        status,
-        "success",
-        "count_over_time(...) range-query against heap-less CMS must succeed \
-         end-to-end via the modern execute_range_promql_modern fallback. \
-         Response:\n{}",
-        serde_json::to_string_pretty(&response).unwrap_or_default()
-    );
-    assert_eq!(
-        response["data"]["resultType"],
-        "matrix",
-        "range-query result must carry resultType=matrix per the Prometheus \
-         /api/v1/query_range wire spec. Response:\n{}",
-        serde_json::to_string_pretty(&response).unwrap_or_default()
-    );
-    let result = &response["data"]["result"];
-    let arr = result
-        .as_array()
-        .expect("data.result must be an array of matrix elements");
-    assert!(
-        !arr.is_empty(),
-        "matrix result must contain at least one series. Response:\n{}",
-        serde_json::to_string_pretty(&response).unwrap_or_default()
-    );
-}
-
-// ── Test 12 — DDSketch DELTA + sub-window FULL ingest→query roundtrip ───────
-//
-// Reproduces the live "No result" bug for
-// `quantile_over_time(0.99, http_requests_total_latency_ms[3m])` when the
-// edge runs with `delta_transmission: true` + a sub-window emit cadence.
-//
-// This is the gap the existing UNIT tests (which insert `SketchSampleState`
-// rows directly) cannot see: they hand the reducer ready-made
-// `SketchSampleState{bytes, encoding}` rows whose `bytes` are already the
-// shape the reducer's `decode_full`/`apply_delta_bytes` expects. The LIVE
-// path instead writes whatever the EDGE emits on the wire, and the edge's
-// DDSketch PROTO_DELTA frame is a `DdSketchDelta` bucket-delta proto — NOT
-// a `SketchEnvelope{DdSketchState}` full state. The ingest delta-apply path
-// decodes the former; the query-side reducer decodes the latter. The two
-// disagree, so the query reconstructs nothing.
-//
-// Wire shape faithfully mirrors the edge:
-//   * metric name is the SUFFIXED `http_requests_total_latency_ms_ddsketch`
-//     (the edge's `asapedgeprocessor` appends `_<family>`); the QUERY asks
-//     for the unsuffixed `http_requests_total_latency_ms`.
-//   * window 1 frames: [PROTO full, PROTO_DELTA, PROTO_DELTA]
-//   * windows 2..=3 frames: [PROTO_DELTA-from-empty, PROTO_DELTA, PROTO_DELTA]
-//   * all sub-window frames of one window share the SAME
-//     (start_time_unix_nano, time_unix_nano) = (window_start, window_end).
-//   * a PROTO_DELTA payload is a `DdSketchDelta{buckets:[{index,d_count}]}`
-//     proto, exactly what `DdSketch::compute_delta(&empty)` produces under
-//     the per-window-reset (delta-against-empty) contract.
-//
-// The query must reconstruct each window's distribution and answer the
-// p99 to within DDSketch's α. It currently FAILS (empty / "No result").
-
-/// Build a real `DdSketch` over `values` at relative accuracy `alpha`.
-fn dd_over_values(alpha: f64, values: &[f64]) -> asap_sketchlib::DdSketch {
-    let mut sk = asap_sketchlib::DdSketch::new(alpha);
-    for &v in values {
-        sk.update(v);
-    }
-    sk
-}
-
-/// Encode a `DdSketch` as a FULL `SketchEnvelope{DdSketchState}` frame —
-/// the PROTO (full-state) wire shape. This is what the reducer's
-/// `decode_full` and the ingest full-decode path both expect for a
-/// non-delta frame.
-fn encode_dd_full_envelope(sk: &asap_sketchlib::DdSketch) -> Vec<u8> {
-    use asap_sketchlib::proto::sketchlib::{sketch_envelope, DdSketchState, SketchEnvelope};
-    let state = DdSketchState {
-        alpha: sk.alpha,
-        store_counts: sk.store_counts.clone(),
-        store_offset: sk.store_offset,
-        ..Default::default()
-    };
-    SketchEnvelope {
-        sketch_state: Some(sketch_envelope::SketchState::Ddsketch(state)),
-        ..Default::default()
-    }
-    .encode_to_vec()
-}
-
-/// Encode a `DdSketch` as a `DdSketchDelta` bucket-delta proto — the
-/// PROTO_DELTA wire shape the edge emits under the per-window-reset
-/// (delta-against-empty) contract, where the prior snapshot is the empty
-/// sketch so the "delta" IS this window's own full bucket store expressed
-/// as bucket increments (`compute_delta(&empty)`). Bucket index = the
-/// absolute DDSketch index = `store_offset + i`.
-fn encode_dd_delta_against_empty(sk: &asap_sketchlib::DdSketch) -> Vec<u8> {
-    use asap_otel_proto::sketchlib::v1::{DdSketchBucketDelta, DdSketchDelta as PbDelta};
-    let buckets = sk
-        .store_counts
-        .iter()
-        .enumerate()
-        .filter(|(_, &c)| c != 0)
-        .map(|(i, &c)| DdSketchBucketDelta {
-            index: sk.store_offset + i as i32,
-            d_count: c,
-        })
-        .collect();
-    PbDelta { buckets }.encode_to_vec()
-}
-
-/// Build an OTLP `ExportMetricsServiceRequest` carrying ONE DDSketch DP
-/// with the caller's explicit `(start_time_unix_nano, time_unix_nano)`
-/// window and explicit `encoding` (PROTO=1 full / PROTO_DELTA=2). Unlike
-/// `build_dd_sketch_export` this does NOT derive start_time from end_time
-/// — the per-window-reset repro needs every sub-window frame of one window
-/// to share the exact same (window_start, window_end) pair.
-#[allow(clippy::too_many_arguments)]
-fn build_dd_sketch_export_windowed(
-    metric_name: &str,
-    attrs: &[(&str, &str)],
-    start_time_unix_nano: u64,
-    time_unix_nano: u64,
-    sketch_bytes: Vec<u8>,
-    alpha: f64,
-    encoding: i32,
-) -> ExportMetricsServiceRequest {
-    let attributes = attrs
-        .iter()
-        .map(|(k, v)| KeyValue {
-            key: k.to_string(),
-            value: Some(AnyValue {
-                value: Some(any_value::Value::StringValue(v.to_string())),
-            }),
-        })
-        .collect();
-    let dp = DdSketchDataPoint {
-        attributes,
-        start_time_unix_nano,
-        time_unix_nano,
-        sketch: sketch_bytes,
-        encoding,
-        exemplars: Vec::new(),
-        flags: 0,
-        series_id: 0,
-    };
-    ExportMetricsServiceRequest {
-        resource_metrics: vec![ResourceMetrics {
-            resource: None,
-            scope_metrics: vec![ScopeMetrics {
-                scope: None,
-                metrics: vec![Metric {
-                    name: metric_name.to_string(),
-                    description: String::new(),
-                    unit: String::new(),
-                    metadata: Vec::new(),
-                    data: Some(Data::Ddsketch(DdSketch {
-                        data_points: vec![dp],
-                        aggregation_temporality: 0,
-                        relative_accuracy: alpha,
-                    })),
-                }],
-                schema_url: String::new(),
-            }],
-            schema_url: String::new(),
-        }],
-    }
-}
-
-#[tokio::test(flavor = "multi_thread", worker_threads = 4)]
-async fn controller_plan_to_query_ddsketch_delta_subwindow_roundtrip() {
-    const ENCODING_PROTO: i32 = 1;
-    const ENCODING_PROTO_DELTA: i32 = 2;
-    let suffixed_metric = "http_requests_total_latency_ms_ddsketch";
-    let bare_metric = "http_requests_total_latency_ms";
-    let alpha = 0.01;
-
-    let stack = start_full_stack(19_581, 19_582).await;
-    let client = reqwest::Client::new();
-
-    // ── 1. Controller plans + POSTs the streaming-config for the BARE
-    //       metric (what the controller + query analyzer speak). 1s window
-    //       so distinct window_end timestamps fall on distinct seconds.
-    let materializations = plan_materializations(
-        &format!("sum by (service) (quantile_over_time(0.99, {bare_metric}[1s]))"),
-        epsilon_delta(alpha, alpha),
-    );
-    post_full_config(&client, &stack, &materializations).await;
-
-    // ── 2. Three windows of known distributions. Each window is split into
-    //       three sub-window emits whose increments together cover the
-    //       window's full distribution.
-    //         window 1: 1..=30      (p99 ≈ 30)
-    //         window 2: 100..=130   (p99 ≈ 130)
-    //         window 3: 1000..=1030 (p99 ≈ 1030)
-    let window_dists: [Vec<f64>; 3] = [
-        (1..=30).map(|v| v as f64).collect(),
-        (100..=130).map(|v| v as f64).collect(),
-        (1000..=1030).map(|v| v as f64).collect(),
-    ];
-
-    // Three contiguous retained windows; evaluate explicitly at the last
-    // window end with a three-second lookback, independent of wall-clock drift.
-    let now_ns = phase_aligned_now_ns();
-    let sec: u64 = 1_000_000_000;
-
-    for (w_idx, dist) in window_dists.iter().enumerate() {
-        // window_end at now - (150 - w_idx) s; window_start = window_end - 1s.
-        let window_end_ns = now_ns.saturating_sub((150 - w_idx as u64) * sec);
-        let window_start_ns = window_end_ns.saturating_sub(sec);
-
-        // Split this window's distribution into three sub-window increments.
-        let third = dist.len() / 3;
-        let sub: [&[f64]; 3] = [&dist[..third], &dist[third..2 * third], &dist[2 * third..]];
-
-        for (f_idx, frame_vals) in sub.iter().enumerate() {
-            let sk = dd_over_values(alpha, frame_vals);
-            // Each window starts a fresh full checkpoint, followed by two
-            // increments referring to that checkpoint.
-            let (bytes, encoding) = if f_idx == 0 {
-                (encode_dd_full_envelope(&sk), ENCODING_PROTO)
-            } else {
-                (encode_dd_delta_against_empty(&sk), ENCODING_PROTO_DELTA)
-            };
-            let req = build_dd_sketch_export_windowed(
-                suffixed_metric,
-                &[("service", "e2e-test")],
-                window_start_ns,
-                window_end_ns,
-                bytes,
-                alpha,
-                encoding,
-            );
-            post_otlp_http(&client, stack.otlp_http_port, req).await;
-        }
-    }
-
-    FIXTURE_TIMES
-        .get()
-        .unwrap()
-        .lock()
-        .unwrap()
-        .insert(stack.otlp_http_port, now_ns - 148 * sec);
-    // Give the receiver time to land every frame in the SketchStore.
-    tokio::time::sleep(Duration::from_millis(500)).await;
-
-    // ── 3. Query the BARE metric over the three ingested seconds.
-    let query_url = format!("http://127.0.0.1:{}/api/v1/query", stack.backend_port);
-    let response: JsonValue = client
-        .get(&query_url)
-        .query(&[("time", evaluation_time(&stack))])
-        .query(&[(
-            "query",
-            format!("quantile_over_time(0.99, {bare_metric}[3s])").as_str(),
-        )])
-        .send()
-        .await
-        .expect("PromQL query failed to send")
-        .json()
-        .await
-        .expect("PromQL response was not JSON");
-
-    // ── 4. Assertions: success + a non-empty reconstructed p99.
-    let status = response["status"].as_str().unwrap_or("(missing)");
-    assert_eq!(
-        status,
-        "success",
-        "quantile_over_time over a DDSketch DELTA+sub-window stream did not \
-         succeed (the live `No result` bug). Response:\n{}",
-        serde_json::to_string_pretty(&response).unwrap_or_default()
-    );
-    let result = &response["data"]["result"];
-    let arr = result
-        .as_array()
-        .expect("result must be an array of series");
-    assert!(
-        !arr.is_empty(),
-        "quantile_over_time returned an EMPTY result vector — the delta+sub-window \
-         DDSketch path reconstructed nothing. Response:\n{}",
-        serde_json::to_string_pretty(&response).unwrap_or_default()
-    );
-
-    // cumulative_evaluate rolls the [3s] range into ONE union over all three
-    // windows (1..=30 ∪ 100..=130 ∪ 1000..=1030 = 1..=1030, 93 samples).
-    // Its p99 ≈ 1020. Pull the scalar out of the (instant or range) shape
-    // and assert it lands near that within a generous DDSketch-α envelope.
-    let value =
-        extract_first_scalar(result).expect("could not extract a scalar from the query result");
-    // Truth: p99 of the unioned distribution.
-    let mut all: Vec<f64> = Vec::new();
-    for d in &window_dists {
-        all.extend_from_slice(d);
-    }
-    let truth = dd_over_values(alpha, &all)
-        .quantile(0.99)
-        .expect("truth p99");
-    let rel = (value - truth).abs() / truth.max(1e-9);
-    assert!(
-        rel < 0.10,
-        "reconstructed p99 {value} too far from truth {truth} (rel {rel}); \
-         the delta+sub-window reconstruction is wrong"
-    );
-}
-
-/// Pull the first scalar value out of a PromQL `data.result` array,
-/// handling both instant-vector (`value: [ts, "v"]`) and range-matrix
-/// (`values: [[ts, "v"], …]`) shapes.
-fn extract_first_scalar(result: &JsonValue) -> Option<f64> {
-    let arr = result.as_array()?;
-    let first = arr.first()?;
-    if let Some(v) = first.get("value").and_then(|v| v.as_array()) {
-        return v
-            .get(1)
-            .and_then(|s| s.as_str())
-            .and_then(|s| s.parse().ok());
-    }
-    if let Some(vals) = first.get("values").and_then(|v| v.as_array()) {
-        let last = vals.last()?.as_array()?;
-        return last
-            .get(1)
-            .and_then(|s| s.as_str())
-            .and_then(|s| s.parse().ok());
-    }
-    None
-}
-
-// ── Test — shadow-mode `SummaryExecutor` comparison is inert ────────────────
-//
-// `data_plane/docs/l4node-plan-executor-design.md`'s "Rollout" section:
-// enabling `ASAP_SHADOW_SUMMARY_EXECUTOR` computes the new path alongside
-// the old and logs a diff, but must NEVER change what's served. This test
-// is the regression safety net for that claim — same shape as Test 3
-// (`controller_plan_to_query_full_roundtrip_ddsketch`), but with shadow
-// mode on for the duration, asserting the served response still succeeds
-// with the SAME quantile value the flag-off test expects (~p99 of
-// `[5,10,15,20]` bucket counts).
-
-/// RAII guard for `ASAP_SHADOW_SUMMARY_EXECUTOR`. `std::env::set_var`/
-/// `remove_var` mutate process-global state and `cargo test` runs tests
-/// in the same process across threads by default, so every test touching
-/// this var must serialize against the others (mirrors
-/// `control_plane/src/main.rs`'s `EnvVarGuard` pattern for
-/// `USE_TYPED_STAGE_SPLIT`, same reason).
-#[allow(dead_code)] // held for its lock-lifetime/Drop side effect, never read
-struct ShadowEnvGuard(std::sync::MutexGuard<'static, ()>);
-
-impl ShadowEnvGuard {
-    fn enable() -> Self {
-        static LOCK: std::sync::Mutex<()> = std::sync::Mutex::new(());
-        let guard = LOCK.lock().unwrap_or_else(|poisoned| poisoned.into_inner());
-        std::env::set_var("ASAP_SHADOW_SUMMARY_EXECUTOR", "1");
-        Self(guard)
-    }
-}
-
-impl Drop for ShadowEnvGuard {
-    fn drop(&mut self) {
-        std::env::remove_var("ASAP_SHADOW_SUMMARY_EXECUTOR");
-    }
-}
-
-#[tokio::test(flavor = "multi_thread", worker_threads = 4)]
-async fn shadow_mode_does_not_change_served_ddsketch_quantile() {
-    let _shadow = ShadowEnvGuard::enable();
-
-    let stack = start_full_stack(19_591, 19_592).await;
-    let client = reqwest::Client::new();
-
-    let materializations = plan_materializations(
-        "sum by (service) (quantile_over_time(0.99, http_latency_ms[1s]))",
-        epsilon_delta(0.01, 0.01),
-    );
-    post_full_config(&client, &stack, &materializations).await;
-
-    // Same fixture data as `controller_plan_to_query_full_roundtrip_ddsketch`
-    // — this test isn't checking quantile accuracy (that's Test 3's job),
-    // it's checking that turning shadow mode on doesn't change whether/what
-    // this query serves.
-    let alpha = 0.01;
-    let store_counts = vec![5u64, 10, 15, 20];
-    let dd_state = build_dd_sketch_state(alpha, store_counts, -1);
-    let sketch_bytes = encode_dd_full_state(dd_state);
-
-    let now_ns = phase_aligned_now_ns();
-    let sketch_t_ns = now_ns.saturating_sub(3_000_000_000);
-    let watermark_t_ns = now_ns.saturating_sub(1_000_000_000);
-
-    let req = build_dd_sketch_export(
-        "http_latency_ms",
-        &[("service", "e2e-test")],
-        sketch_t_ns,
-        sketch_bytes,
-        alpha,
-    );
-    post_otlp_http(&client, stack.otlp_http_port, req).await;
-
-    let watermark_state = build_dd_sketch_state(alpha, Vec::new(), 0);
-    let watermark_req = build_dd_sketch_export(
-        "http_latency_ms",
-        &[("service", "e2e-test")],
-        watermark_t_ns,
-        encode_dd_full_state(watermark_state),
-        alpha,
-    );
-    post_otlp_http(&client, stack.otlp_http_port, watermark_req).await;
-
-    tokio::time::sleep(Duration::from_millis(800)).await;
-
-    let query_url = format!("http://127.0.0.1:{}/api/v1/query", stack.backend_port);
-    let response: JsonValue = client
-        .get(&query_url)
-        .query(&[("time", evaluation_time(&stack))])
-        .query(&[("query", "quantile_over_time(0.99, http_latency_ms[1s])")])
-        .send()
-        .await
-        .expect("PromQL query failed to send")
-        .json()
-        .await
-        .expect("PromQL response was not JSON");
-
-    assert_eq!(
-        response["status"].as_str().unwrap_or("(missing)"),
-        "success",
-        "shadow mode must not change whether this query succeeds. Response:\n{}",
-        serde_json::to_string_pretty(&response).unwrap_or_default()
-    );
-
-    // Same accuracy contract as the flag-off test: p99 of [5,10,15,20]
-    // DDSketch bucket counts should land in a plausible range (not
-    // asserting exact equality with Test 3's own run -- different process,
-    // different wall-clock timestamps -- but the same fixture must
-    // produce the same class of answer regardless of the shadow flag).
-    let value = response["data"]["result"]
-        .as_array()
-        .and_then(|r| extract_first_scalar(&JsonValue::Array(r.clone())))
-        .expect("expected a scalar quantile result");
-    assert!(
-        value.is_finite() && value > 0.0,
-        "shadow mode must not corrupt the served quantile value, got {value}"
-    );
-}
-
-// ── Test — the live serving cutover actually answers from SummaryExecutor ───
-//
-// Phase 2 of the rollout (see the plan's "What 'safe to serve' means,
-// precisely" section): with `ASAP_SUMMARY_EXECUTOR_LIVE` set, an
-// unambiguous single-series query must be answered by `SummaryExecutor`
-// directly (`engine.rs` skips the legacy `SketchReducer` call for it
-// entirely), not merely shadow-compared. Same fixture as
-// `shadow_mode_does_not_change_served_ddsketch_quantile` -- this test's
-// job is proving the cutover serves a correct answer via the NEW code
-// path, not re-checking quantile accuracy.
-
-/// RAII guard for `ASAP_SUMMARY_EXECUTOR_LIVE`. Own lock, own var --
-/// mirrors `ShadowEnvGuard` exactly (same reason: `std::env::set_var`/
-/// `remove_var` mutate process-global state and `cargo test` runs tests
-/// in the same process across threads by default).
-#[allow(dead_code)]
-struct LiveServeEnvGuard(std::sync::MutexGuard<'static, ()>);
-
-impl LiveServeEnvGuard {
-    fn enable() -> Self {
-        static LOCK: std::sync::Mutex<()> = std::sync::Mutex::new(());
-        let guard = LOCK.lock().unwrap_or_else(|poisoned| poisoned.into_inner());
-        std::env::set_var("ASAP_SUMMARY_EXECUTOR_LIVE", "1");
-        Self(guard)
-    }
-}
-
-impl Drop for LiveServeEnvGuard {
-    fn drop(&mut self) {
-        std::env::remove_var("ASAP_SUMMARY_EXECUTOR_LIVE");
-    }
-}
-
-#[tokio::test(flavor = "multi_thread", worker_threads = 4)]
-async fn live_serve_actually_answers_ddsketch_quantile() {
-    let _live = LiveServeEnvGuard::enable();
-
-    let stack = start_full_stack(19_593, 19_594).await;
-    let client = reqwest::Client::new();
-
-    let materializations = plan_materializations(
-        "sum by (service) (quantile_over_time(0.99, http_latency_ms[1s]))",
-        epsilon_delta(0.01, 0.01),
-    );
-    post_full_config(&client, &stack, &materializations).await;
-
-    let alpha = 0.01;
-    let store_counts = vec![5u64, 10, 15, 20];
-    let dd_state = build_dd_sketch_state(alpha, store_counts, -1);
-    let sketch_bytes = encode_dd_full_state(dd_state);
-
-    let now_ns = phase_aligned_now_ns();
-    let sketch_t_ns = now_ns.saturating_sub(3_000_000_000);
-    let watermark_t_ns = now_ns.saturating_sub(1_000_000_000);
-
-    let req = build_dd_sketch_export(
-        "http_latency_ms",
-        &[("service", "e2e-test")],
-        sketch_t_ns,
-        sketch_bytes,
-        alpha,
-    );
-    post_otlp_http(&client, stack.otlp_http_port, req).await;
-
-    let watermark_state = build_dd_sketch_state(alpha, Vec::new(), 0);
-    let watermark_req = build_dd_sketch_export(
-        "http_latency_ms",
-        &[("service", "e2e-test")],
-        watermark_t_ns,
-        encode_dd_full_state(watermark_state),
-        alpha,
-    );
-    post_otlp_http(&client, stack.otlp_http_port, watermark_req).await;
-
-    tokio::time::sleep(Duration::from_millis(800)).await;
-
-    let query_url = format!("http://127.0.0.1:{}/api/v1/query", stack.backend_port);
-    let response: JsonValue = client
-        .get(&query_url)
-        .query(&[("time", evaluation_time(&stack))])
-        .query(&[("query", "quantile_over_time(0.99, http_latency_ms[1s])")])
-        .send()
-        .await
-        .expect("PromQL query failed to send")
-        .json()
-        .await
-        .expect("PromQL response was not JSON");
-
-    assert_eq!(
-        response["status"].as_str().unwrap_or("(missing)"),
-        "success",
-        "live-serve must answer this unambiguous single-series quantile. Response:\n{}",
-        serde_json::to_string_pretty(&response).unwrap_or_default()
-    );
-
-    let value = response["data"]["result"]
-        .as_array()
-        .and_then(|r| extract_first_scalar(&JsonValue::Array(r.clone())))
-        .expect("expected a scalar quantile result");
-    assert!(
-        value.is_finite() && value > 0.0,
-        "live-serve must produce a correct served quantile value, got {value}"
-    );
-}
-
-// Live serving keeps the two imported CMS series available.
-#[tokio::test(flavor = "multi_thread", worker_threads = 4)]
-async fn live_serve_cms_reads_independent_series() {
-    let _live = LiveServeEnvGuard::enable();
-
-    let stack = start_full_stack(19_595, 19_596).await;
-    let client = reqwest::Client::new();
-
-    let materializations = imported_cms_materializations("unique_users_per_min");
-    post_full_config(&client, &stack, &materializations).await;
-
-    let (w, d) = extract_w_d(&materializations[0]);
-    let cells = (w as usize) * (d as usize);
-
-    let now_ns = phase_aligned_now_ns();
-    let sketch_t_ns = now_ns.saturating_sub(3_000_000_000);
-    let watermark_t_ns = now_ns.saturating_sub(1_000_000_000);
-
-    // Two distinct services with disjoint non-zero cells — two separate sids
-    // the readout resolves together, the shape ASAPController#163 describes.
-    for (service, cell) in [("svc-a", 0usize), ("svc-b", w as usize)] {
-        let mut counts = vec![0i64; cells];
-        counts[cell] = 6;
-        let cms_state = build_count_min_state(d, w, counts);
-        let req = build_count_min_export(
-            "unique_users_per_min",
-            &[("service", service)],
-            sketch_t_ns,
-            cms_state.encode_to_vec(),
-            d as i32,
-            w as i32,
-        );
-        post_otlp_http(&client, stack.otlp_http_port, req).await;
-
-        let watermark_state = build_count_min_state(d, w, vec![0i64; cells]);
-        let watermark_req = build_count_min_export(
-            "unique_users_per_min",
-            &[("service", service)],
-            watermark_t_ns,
-            watermark_state.encode_to_vec(),
-            d as i32,
-            w as i32,
-        );
-        post_otlp_http(&client, stack.otlp_http_port, watermark_req).await;
-    }
-
-    tokio::time::sleep(Duration::from_millis(800)).await;
-
-    let response: JsonValue = client
-        .get(format!(
-            "http://127.0.0.1:{}/api/v1/query",
-            stack.backend_port
-        ))
-        .query(&[("query", "count_over_time(unique_users_per_min[1s])")])
-        .query(&[("time", evaluation_time(&stack))])
-        .send()
-        .await
-        .expect("query failed")
-        .json()
-        .await
-        .expect("response not JSON");
-
-    assert_eq!(
-        response["status"].as_str().unwrap_or("(missing)"),
-        "success",
-        "the global-merge shape must succeed with live-serve on. Response:\n{}",
-        serde_json::to_string_pretty(&response).unwrap_or_default()
-    );
-
-    let value = response["data"]["result"]
-        .as_array()
-        .and_then(|r| extract_first_scalar(&JsonValue::Array(r.clone())))
-        .expect("expected a scalar cardinality result");
-    // Each service set exactly ONE distinct non-zero register, and the two
-    // are disjoint -- a correct cross-sid merge estimates ~2, whereas
-    // serving only one sid's state would estimate ~1. The assertion is
-    // loose (HLL at precision 10 is approximate) but still distinguishes
-    // "merged both" from "dropped one."
-    assert!(
-        value.is_finite() && value >= 1.5,
-        "expected the MERGED cardinality across both services (~2), got {value} -- \
-         a value near 1 means only one sid's registers were counted"
-    );
-}
-
-#[test]
-fn probe_queryplan() {
-    use control_plane::physical::compiler::{BackendLocalPlanningInput, DeploymentPlanCompiler};
-    for q in [
-        "sum by (service) (quantile_over_time(0.99, http_latency_ms[1s]))",
-        "quantile_over_time(0.99, http_latency_ms[1s])",
-    ] {
-        let mut fixture: JsonValue = serde_json::from_str(include_str!(
-            "../../docs/examples/asapquery-compatibility-demo-snapshot.json"
-        ))
-        .unwrap();
-        let mut entry = fixture["query_workload"]["repeating_queries"][3].clone();
-        entry["query"] = q.into();
-        entry["requirements"]["accuracy"] = epsilon_delta(0.01, 0.01);
-        fixture["query_workload"]["repeating_queries"] = serde_json::json!([entry]);
-        let snap: BackendLocalPlanningInput = serde_json::from_value(fixture).unwrap();
-        let (req, env) = snap.into_physical_compilation_request().unwrap();
-        let plan = DeploymentPlanCompiler.compile_promql(req, env).unwrap();
-        eprintln!("PROBE {q}");
-        for (id, e) in plan.query_plan.entries.iter() {
-            eprintln!(
-                "   entry {id:?} canonical={:?} nodes={}",
-                e.canonical_query,
-                e.nodes.len()
-            );
-        }
-        eprintln!(
-            "   grouping={:?}",
-            plan.precompute_plan.materializations[0]
-                .grouping_labels
-                .names()
-        );
-    }
-}
diff --git a/data_plane/tests/edge_sketch_codec.rs b/data_plane/tests/edge_sketch_codec.rs
deleted file mode 100644
index 03f4e40f1..000000000
--- a/data_plane/tests/edge_sketch_codec.rs
+++ /dev/null
@@ -1,75 +0,0 @@
-//! Portable edge sketch envelopes reconstruct through the neutral codec and
-//! remain readable by the backend's query accumulators.
-
-use asap_sketch_codec::{encode_ddsketch, reconstruct_ddsketch};
-use asap_sketchlib::proto::sketchlib::sketch_envelope::SketchState;
-use data_plane::storage_engines::types::AggregateCore;
-
-#[test]
-fn ddsketch_full_envelope_round_trips_without_collector_runtime() {
-    let mut source = asap_sketchlib::DdSketch::new(0.01);
-    for value in 1..=200 {
-        source.update(value as f64);
-    }
-    let bytes = asap_sketch_codec::encode_ddsketch(&source);
-    assert!(matches!(
-        asap_sketch_codec::envelope_state(&bytes).unwrap(),
-        Some(SketchState::Ddsketch(_))
-    ));
-    let (decoded, _) = reconstruct_ddsketch(&bytes).unwrap();
-    assert_eq!(decoded.total_count(), 200);
-    assert_eq!(encode_ddsketch(&decoded), bytes);
-}
-
-#[test]
-fn ddsketch_bare_state_is_rejected_and_envelope_supports_query_readout() {
-    let mut source = asap_sketchlib::DdSketch::new(0.01);
-    for value in 1..=100 {
-        source.update(value as f64);
-    }
-    let envelope = asap_sketch_codec::encode_ddsketch(&source);
-    let Some(SketchState::Ddsketch(state)) = asap_sketch_codec::envelope_state(&envelope).unwrap()
-    else {
-        panic!("DDSketch state required")
-    };
-    let bare = prost::Message::encode_to_vec(&state);
-    assert!(asap_sketch_codec::reconstruct_ddsketch(&bare).is_err());
-    let (decoded, _) = asap_sketch_codec::reconstruct_ddsketch(&envelope).unwrap();
-    let accumulator = asap_physical_operators::summary_kernels::DDSketchAccumulator {
-        inner: decoded,
-        sample_p: 1.0,
-    };
-    let median = accumulator
-        .query_statistic(
-            asap_types::Statistic::Quantile,
-            &None,
-            &[("quantile".to_string(), "0.5".to_string())]
-                .into_iter()
-                .collect(),
-        )
-        .unwrap();
-    assert!((median - 50.0).abs() / 50.0 < 0.05);
-}
-
-#[test]
-fn kll_envelope_keeps_level_layout_for_backend_readout() {
-    let mut source = asap_sketchlib::sketches::kll::KLL::<f64>::init_kll_with_seed(200, 7);
-    for value in 1..=50 {
-        source.update(&(value as f64));
-    }
-    let bytes = asap_sketch_codec::encode_kll(&source);
-    let state = asap_sketch_codec::kll_state(&bytes).unwrap();
-    assert_eq!(state.k, 200);
-    assert_eq!(state.items.len(), 50);
-    let snapshot_bytes = bytes;
-    let accumulator = asap_physical_operators::summary_kernels::DatasketchesKLLAccumulator::from_sketchlib_proto_bytes(&snapshot_bytes).unwrap();
-    assert!(accumulator.get_quantile(0.5).is_finite());
-}
-
-#[test]
-fn a_different_sketch_family_cannot_be_decoded_as_ddsketch() {
-    let mut kll = asap_sketchlib::sketches::kll::KLL::<f64>::init_kll_with_seed(200, 7);
-    kll.update(&42.0);
-    let bytes = asap_sketch_codec::encode_kll(&kll);
-    assert!(asap_sketch_codec::reconstruct_ddsketch(&bytes).is_err());
-}
diff --git a/data_plane/tests/monitor_grpc.rs b/data_plane/tests/monitor_grpc.rs
deleted file mode 100644
index b8901f014..000000000
--- a/data_plane/tests/monitor_grpc.rs
+++ /dev/null
@@ -1,200 +0,0 @@
-//! End-to-end transport test for the coordinated-sampling coordinator: a real
-//! tonic `MonitorService` server on a loopback port, driven by a real
-//! `MonitorServiceClient` over a bidi stream. Validates that registration +
-//! rate reports flow over gRPC and the coordinator ships back a computed
-//! `SlackGrant.sample_p`.
-//!
-//! Global-threshold alerting is retired (see `data_plane::monitor` module
-//! docs) — there is no more alert path to test here. The scripted "edge" here
-//! sends a fixed report sequence rather than re-implementing the Go engine's
-//! reportEveryN cadence (which is unit-tested on its own); the point of this
-//! test is the wire path: server ⇄ coordinator ⇄ dispatch ⇄ grant.
-
-use std::sync::{Arc, Mutex};
-use std::time::Duration;
-
-use tokio::sync::mpsc;
-use tokio_stream::wrappers::{ReceiverStream, TcpListenerStream};
-use tokio_stream::StreamExt;
-use tonic::transport::Server;
-
-use asap_otel_proto::monitor::v1::{
-    edge_to_coord, monitor_service_client::MonitorServiceClient, EdgeToCoord, MonitorRegister,
-    MonitorReport,
-};
-use data_plane::update_sampling::{MonitorConfig, MonitorCoordinator, MonitorServiceImpl};
-
-async fn start_server(cfgs: Vec<MonitorConfig>) -> String {
-    let coord = MonitorCoordinator::new(cfgs);
-    let svc = MonitorServiceImpl::new(coord).into_server();
-
-    let listener = tokio::net::TcpListener::bind("127.0.0.1:0").await.unwrap();
-    let addr = listener.local_addr().unwrap();
-    tokio::spawn(async move {
-        Server::builder()
-            .add_service(svc)
-            .serve_with_incoming(TcpListenerStream::new(listener))
-            .await
-            .unwrap();
-    });
-    tokio::time::sleep(Duration::from_millis(150)).await;
-    format!("http://{addr}")
-}
-
-fn register_edge(edge_id: &str) -> EdgeToCoord {
-    EdgeToCoord {
-        msg: Some(edge_to_coord::Msg::Reg(MonitorRegister {
-            edge_id: edge_id.into(),
-            agg_id: 1,
-            key: vec![],
-            epoch_window_ms: 60_000,
-            window_start_ms: 0,
-        })),
-    }
-}
-
-fn report_edge(edge_id: &str, seq: u64, rate: f64) -> EdgeToCoord {
-    EdgeToCoord {
-        msg: Some(edge_to_coord::Msg::Report(MonitorReport {
-            edge_id: edge_id.into(),
-            agg_id: 1,
-            key: vec![],
-            window_start_ms: 0,
-            local_value: 0.0, // vestigial (alerting retired) — unused by the coordinator
-            round: 0,
-            seq,
-            rate,
-        })),
-    }
-}
-
-fn sum_cfg(epsilon: f64) -> MonitorConfig {
-    MonitorConfig {
-        agg_id: 1,
-        key: vec![],
-        tau: 0.0, // vestigial (alerting retired)
-        epsilon,
-        window_ms: 60_000,
-        ..Default::default()
-    }
-}
-
-async fn connect_edge(url: &str) -> (mpsc::Sender<EdgeToCoord>, Arc<Mutex<Vec<f64>>>) {
-    use asap_otel_proto::monitor::v1::coord_to_edge;
-
-    let mut client = MonitorServiceClient::connect(url.to_string())
-        .await
-        .unwrap();
-    let (tx, rx) = mpsc::channel(32);
-    let mut inbound = client
-        .monitor(ReceiverStream::new(rx))
-        .await
-        .unwrap()
-        .into_inner();
-    let ps = Arc::new(Mutex::new(Vec::<f64>::new()));
-    let psc = ps.clone();
-    tokio::spawn(async move {
-        while let Some(Ok(env)) = inbound.next().await {
-            if let Some(coord_to_edge::Msg::Grant(g)) = env.msg {
-                psc.lock().unwrap().push(g.sample_p);
-            }
-        }
-    });
-    (tx, ps)
-}
-
-/// A single edge reporting a real rate gets a real (< 1.0) sample_p grant —
-/// the retired countdown special-cased "<2 edges ⇒ p=1" purely for its
-/// alert-fire safety proof; the ε-floor sampling law never depended on edge
-/// count, so a lone edge is sampled exactly like any other now.
-#[tokio::test]
-async fn single_edge_gets_sampled_over_grpc() {
-    let url = start_server(vec![sum_cfg(0.05)]).await;
-    let (tx, p) = connect_edge(&url).await;
-
-    tx.send(register_edge("e1")).await.unwrap();
-    tokio::time::sleep(Duration::from_millis(40)).await;
-    tx.send(report_edge("e1", 1, 100_000.0)).await.unwrap();
-    tokio::time::sleep(Duration::from_millis(150)).await;
-
-    let got = *p.lock().unwrap().last().expect("edge received a grant");
-    assert!(
-        got > 0.0 && got < 1.0,
-        "expected a real sampling grant, got {got}"
-    );
-}
-
-/// Live multi-edge coupling: two edges open real gRPC streams, report SKEWED
-/// rates, and the coordinator ships back differentiated `SlackGrant.sample_p`
-/// over the wire — the hot edge sampled harder (smaller p) than the quiet one,
-/// both at/above the ε-derived coupling floor.
-#[tokio::test]
-async fn two_edges_get_differentiated_sample_p_over_grpc() {
-    let url = start_server(vec![sum_cfg(0.05)]).await;
-    let (tx_hot, p_hot) = connect_edge(&url).await;
-    let (tx_quiet, p_quiet) = connect_edge(&url).await;
-
-    tx_hot.send(register_edge("e1")).await.unwrap();
-    tx_quiet.send(register_edge("e2")).await.unwrap();
-    tokio::time::sleep(Duration::from_millis(60)).await;
-
-    // e1 hot (100k items/win), e2 quiet (1k/win).
-    for seq in 1..=4 {
-        tx_hot
-            .send(report_edge("e1", seq, 100_000.0))
-            .await
-            .unwrap();
-        tx_quiet
-            .send(report_edge("e2", seq, 1_000.0))
-            .await
-            .unwrap();
-        tokio::time::sleep(Duration::from_millis(40)).await;
-    }
-    tokio::time::sleep(Duration::from_millis(250)).await;
-
-    let hot = *p_hot
-        .lock()
-        .unwrap()
-        .last()
-        .expect("hot edge received a grant");
-    let quiet = *p_quiet
-        .lock()
-        .unwrap()
-        .last()
-        .expect("quiet edge received a grant");
-    println!("LIVE coupling over gRPC: hot(e1,rate=100k) sample_p={hot} | quiet(e2,rate=1k) sample_p={quiet}");
-
-    assert!(
-        hot < quiet,
-        "hot edge sample_p {hot} should be < quiet edge sample_p {quiet}"
-    );
-    assert!(hot > 0.0 && hot <= 1.0, "hot p out of range: {hot}");
-    assert!(quiet > 0.0 && quiet <= 1.0, "quiet p out of range: {quiet}");
-}
-
-/// A report answers ONLY the reporting edge — unlike the retired countdown
-/// (which re-broadcast to every edge on any report, since slack sizing
-/// depended on the full edge set), a quiet edge that never reports should
-/// never receive a grant it didn't ask for.
-#[tokio::test]
-async fn report_grants_only_the_reporting_edge_over_grpc() {
-    let url = start_server(vec![sum_cfg(0.05)]).await;
-    let (tx_a, p_a) = connect_edge(&url).await;
-    let (tx_b, p_b) = connect_edge(&url).await;
-
-    tx_a.send(register_edge("e1")).await.unwrap();
-    tx_b.send(register_edge("e2")).await.unwrap();
-    tokio::time::sleep(Duration::from_millis(60)).await;
-
-    tx_a.send(report_edge("e1", 1, 50_000.0)).await.unwrap();
-    tokio::time::sleep(Duration::from_millis(150)).await;
-
-    assert!(
-        !p_a.lock().unwrap().is_empty(),
-        "e1 should have received its own grant"
-    );
-    assert!(
-        p_b.lock().unwrap().is_empty(),
-        "e2 must not receive a grant it never reported for"
-    );
-}
diff --git a/data_plane/tests/monitor_process_e2e.rs b/data_plane/tests/monitor_process_e2e.rs
deleted file mode 100644
index 920d44281..000000000
--- a/data_plane/tests/monitor_process_e2e.rs
+++ /dev/null
@@ -1,151 +0,0 @@
-//! Process-level E2E for the production monitor coordinator.
-//!
-//! Two simulated edges connect to the monitor listener hosted by the real
-//! data-plane executable, register, report different rates, and receive
-//! differentiated sampling grants over bidirectional gRPC streams.
-
-#[path = "support/empty_physical_plan.rs"]
-mod empty_physical_plan;
-
-use std::net::TcpListener;
-use std::process::{Child, Command, Stdio};
-use std::time::Duration;
-
-use asap_otel_proto::monitor::v1::{
-    coord_to_edge, edge_to_coord, monitor_service_client::MonitorServiceClient, EdgeToCoord,
-    MonitorRegister, MonitorReport,
-};
-use tokio::sync::mpsc;
-use tokio_stream::wrappers::ReceiverStream;
-use tokio_stream::StreamExt;
-
-struct ChildGuard(Child);
-
-impl Drop for ChildGuard {
-    fn drop(&mut self) {
-        let _ = self.0.kill();
-        let _ = self.0.wait();
-    }
-}
-
-fn unused_port() -> u16 {
-    let listener = TcpListener::bind("127.0.0.1:0").expect("reserve loopback port");
-    listener.local_addr().expect("loopback address").port()
-}
-
-async fn connect_edge(
-    port: u16,
-    edge_id: &str,
-) -> (
-    mpsc::Sender<EdgeToCoord>,
-    tonic::Streaming<asap_otel_proto::monitor::v1::CoordToEdge>,
-) {
-    let endpoint = format!("http://127.0.0.1:{port}");
-    let mut connected = None;
-    for _ in 0..100 {
-        match MonitorServiceClient::connect(endpoint.clone()).await {
-            Ok(client) => {
-                connected = Some(client);
-                break;
-            }
-            Err(_) => tokio::time::sleep(Duration::from_millis(50)).await,
-        }
-    }
-    let mut client = connected.unwrap_or_else(|| {
-        panic!("edge could not connect to production monitor endpoint {endpoint}")
-    });
-    let (tx, rx) = mpsc::channel(16);
-    let inbound = client
-        .monitor(ReceiverStream::new(rx))
-        .await
-        .expect("open monitor stream")
-        .into_inner();
-    tx.send(EdgeToCoord {
-        msg: Some(edge_to_coord::Msg::Reg(MonitorRegister {
-            edge_id: edge_id.into(),
-            agg_id: 1,
-            key: Vec::new(),
-            epoch_window_ms: 60_000,
-            window_start_ms: 0,
-        })),
-    })
-    .await
-    .expect("register edge");
-    (tx, inbound)
-}
-
-async fn report_and_receive(
-    tx: &mpsc::Sender<EdgeToCoord>,
-    inbound: &mut tonic::Streaming<asap_otel_proto::monitor::v1::CoordToEdge>,
-    edge_id: &str,
-    rate: f64,
-) -> f64 {
-    tx.send(EdgeToCoord {
-        msg: Some(edge_to_coord::Msg::Report(MonitorReport {
-            edge_id: edge_id.into(),
-            agg_id: 1,
-            key: Vec::new(),
-            window_start_ms: 0,
-            local_value: 0.0,
-            round: 0,
-            seq: 1,
-            rate,
-        })),
-    })
-    .await
-    .expect("send monitor report");
-
-    let message = tokio::time::timeout(Duration::from_secs(5), inbound.next())
-        .await
-        .expect("timed out waiting for sampling grant")
-        .expect("monitor stream ended")
-        .expect("receive sampling grant");
-    match message.msg.expect("coordinator response payload") {
-        coord_to_edge::Msg::Grant(grant) => grant.sample_p,
-        other => panic!("expected sampling grant, got {other:?}"),
-    }
-}
-
-#[tokio::test]
-async fn production_coordinator_differentiates_edge_sampling_grants() {
-    let query_port = unused_port();
-    let monitor_port = unused_port();
-    let output_dir = tempfile::tempdir().expect("create output directory");
-    let mut config = tempfile::NamedTempFile::new().expect("create monitor config");
-    std::io::Write::write_all(
-        &mut config,
-        b"- agg_id: 1\n  key: ''\n  tau: 5000.0\n  epsilon: 0.05\n  window_ms: 60000\n",
-    )
-    .unwrap();
-    let mut physical = tempfile::NamedTempFile::new().unwrap();
-    serde_json::to_writer(&mut physical, &empty_physical_plan::empty()).unwrap();
-
-    let child = Command::new(env!("CARGO_BIN_EXE_data_plane"))
-        .arg("--physical-plan")
-        .arg(physical.path())
-        .arg("--monitor-specs")
-        .arg(config.path())
-        .arg("--http-port")
-        .arg(query_port.to_string())
-        .arg("--output-dir")
-        .arg(output_dir.path())
-        .arg("--enable-monitor-coordinator")
-        .arg("--monitor-grpc-port")
-        .arg(monitor_port.to_string())
-        .stdout(Stdio::null())
-        .stderr(Stdio::null())
-        .spawn()
-        .expect("start production data-plane binary");
-    let _child = ChildGuard(child);
-
-    let (hot_tx, mut hot_inbound) = connect_edge(monitor_port, "hot-edge").await;
-    let (quiet_tx, mut quiet_inbound) = connect_edge(monitor_port, "quiet-edge").await;
-    tokio::time::sleep(Duration::from_millis(50)).await;
-
-    let (hot, quiet) = tokio::join!(
-        report_and_receive(&hot_tx, &mut hot_inbound, "hot-edge", 100_000.0),
-        report_and_receive(&quiet_tx, &mut quiet_inbound, "quiet-edge", 1_000.0),
-    );
-    assert!(hot > 0.0 && hot < quiet, "hot={hot}, quiet={quiet}");
-    assert!(quiet <= 1.0, "quiet grant out of range: {quiet}");
-}
diff --git a/data_plane/tests/o11y_remote_write_wire.rs b/data_plane/tests/o11y_remote_write_wire.rs
deleted file mode 100644
index 88a146b5f..000000000
--- a/data_plane/tests/o11y_remote_write_wire.rs
+++ /dev/null
@@ -1,29 +0,0 @@
-//! Validate the replay adapter's wire format with the production decoding libraries.
-use data_plane::drivers::ingest::prometheus_remote_write::WriteRequest;
-use prost::Message;
-
-// The Python adapter encodes x{job="a"} 2 at 1.234 OpenMetrics seconds.
-#[test]
-fn replay_wire_preserves_labels_value_and_millisecond_timestamp() {
-    let hex =
-        "29a00a270a0d0a085f5f6e616d655f5f1201780a080a036a6f62120161120c09000000000000004010d209";
-    let bytes: Vec<_> = (0..hex.len())
-        .step_by(2)
-        .map(|i| u8::from_str_radix(&hex[i..i + 2], 16).unwrap())
-        .collect();
-    let protobuf = snap::raw::Decoder::new().decompress_vec(&bytes).unwrap();
-    let write = WriteRequest::decode(protobuf.as_slice()).unwrap();
-    assert_eq!(write.timeseries.len(), 1);
-    let series = &write.timeseries[0];
-    assert_eq!(
-        series
-            .labels
-            .iter()
-            .map(|l| (l.name.as_str(), l.value.as_str()))
-            .collect::<Vec<_>>(),
-        vec![("__name__", "x"), ("job", "a")]
-    );
-    assert_eq!(series.samples.len(), 1);
-    assert_eq!(series.samples[0].value, 2.0);
-    assert_eq!(series.samples[0].timestamp, 1234);
-}
diff --git a/data_plane/tests/promql_differential_process_e2e.rs b/data_plane/tests/promql_differential_process_e2e.rs
deleted file mode 100644
index a3c6359c5..000000000
--- a/data_plane/tests/promql_differential_process_e2e.rs
+++ /dev/null
@@ -1,523 +0,0 @@
-//! Black-box PromQL differential E2E for the production data-plane process.
-//!
-//! A deterministic raw-value fixture is summarized into the same modified
-//! OTLP DDSketch shape emitted by the collector runtime. The production
-//! backend ingests that sketch, and its public instant/range PromQL responses
-//! are compared with an independent exact quantile oracle over the raw values.
-
-#[path = "support/physical_fixture.rs"]
-mod physical_fixture;
-
-use std::net::TcpListener;
-use std::process::{Child, Command, Stdio};
-use std::time::Duration;
-
-use asap_otel_proto::tonic::collector::metrics::v1::ExportMetricsServiceRequest;
-use asap_otel_proto::tonic::common::v1::{any_value, AnyValue, KeyValue};
-use asap_otel_proto::tonic::metrics::v1::{
-    metric::Data, DdSketch, DdSketchDataPoint, DdSketchEncoding, Metric, ResourceMetrics,
-    ScopeMetrics,
-};
-use asap_sketchlib::proto::sketchlib::{sketch_envelope, DdSketchState, SketchEnvelope};
-use prost::Message;
-use serde_json::Value;
-
-const METRIC: &str = "differential_e2e_latency_ms";
-const SERVICE: &str = "checkout";
-const ALPHA: f64 = 0.01;
-// Median keeps this stable DDSketch oracle focused on the sketch's documented
-// relative-error contract. Small-sample p99 semantics are a separate product
-// gap tracked by issue #492; this test does not claim to cover them.
-const QUANTILE: f64 = 0.5;
-
-struct ChildGuard(Child);
-
-impl Drop for ChildGuard {
-    fn drop(&mut self) {
-        let _ = self.0.kill();
-        let _ = self.0.wait();
-    }
-}
-
-fn unused_port() -> u16 {
-    let listener = TcpListener::bind("127.0.0.1:0").expect("reserve loopback port");
-    listener.local_addr().expect("read loopback address").port()
-}
-
-fn exact_quantile(values: &[f64], quantile: f64) -> f64 {
-    assert!(!values.is_empty());
-    assert!((0.0..=1.0).contains(&quantile));
-    let mut sorted = values.to_vec();
-    sorted.sort_by(f64::total_cmp);
-    let rank = quantile * (sorted.len() - 1) as f64;
-    let lower = rank.floor() as usize;
-    let upper = rank.ceil() as usize;
-    if lower == upper {
-        sorted[lower]
-    } else {
-        let fraction = rank - lower as f64;
-        sorted[lower] + (sorted[upper] - sorted[lower]) * fraction
-    }
-}
-
-fn ddsketch_export(metric: &str, timestamp_ns: u64, values: &[f64]) -> Vec<u8> {
-    let mut sketch = asap_sketchlib::DdSketch::new(ALPHA);
-    for value in values {
-        sketch.update(*value);
-    }
-    let state = DdSketchState {
-        alpha: sketch.wire_alpha(),
-        store_counts: sketch.store_counts,
-        store_offset: sketch.store_offset,
-        ..Default::default()
-    };
-    let point = DdSketchDataPoint {
-        attributes: vec![KeyValue {
-            key: "service".into(),
-            value: Some(AnyValue {
-                value: Some(any_value::Value::StringValue(SERVICE.into())),
-            }),
-        }],
-        start_time_unix_nano: timestamp_ns.saturating_sub(1_000_000_000),
-        time_unix_nano: timestamp_ns,
-        sketch: SketchEnvelope {
-            format_version: 1,
-            sketch_state: Some(sketch_envelope::SketchState::Ddsketch(state)),
-            ..Default::default()
-        }
-        .encode_to_vec(),
-        encoding: DdSketchEncoding::DdsketchEncodingProto as i32,
-        exemplars: Vec::new(),
-        flags: 0,
-        series_id: 0,
-    };
-    ExportMetricsServiceRequest {
-        resource_metrics: vec![ResourceMetrics {
-            resource: None,
-            scope_metrics: vec![ScopeMetrics {
-                scope: None,
-                metrics: vec![Metric {
-                    name: metric.into(),
-                    description: String::new(),
-                    unit: String::new(),
-                    metadata: Vec::new(),
-                    data: Some(Data::Ddsketch(DdSketch {
-                        data_points: vec![point],
-                        aggregation_temporality: 0,
-                        relative_accuracy: ALPHA,
-                    })),
-                }],
-                schema_url: String::new(),
-            }],
-            schema_url: String::new(),
-        }],
-    }
-    .encode_to_vec()
-}
-
-fn first_instant(response: &Value) -> Option<(&Value, f64, f64)> {
-    let series = response["data"]["result"].as_array()?.first()?;
-    let sample = series["value"].as_array()?;
-    Some((
-        &series["metric"],
-        sample.first()?.as_f64()?,
-        sample.get(1)?.as_str()?.parse().ok()?,
-    ))
-}
-
-fn first_range_values(response: &Value) -> Option<(&Value, Vec<(f64, f64)>)> {
-    let series = response["data"]["result"].as_array()?.first()?;
-    let values = series["values"]
-        .as_array()?
-        .iter()
-        .map(|sample| {
-            let pair = sample.as_array()?;
-            Some((
-                pair.first()?.as_f64()?,
-                pair.get(1)?.as_str()?.parse().ok()?,
-            ))
-        })
-        .collect::<Option<Vec<_>>>()?;
-    Some((&series["metric"], values))
-}
-
-fn assert_approx(reference: f64, actual: f64, context: &str) {
-    let relative_error = (actual - reference).abs() / reference.abs().max(f64::EPSILON);
-    assert!(
-        relative_error <= ALPHA * 1.05,
-        "{context}: reference={reference}, actual={actual}, relative_error={relative_error}, \
-         allowed={}",
-        ALPHA * 1.05
-    );
-}
-
-async fn wait_until_ready(client: &reqwest::Client, url: &str, child: &mut Child) {
-    for _ in 0..100 {
-        if let Some(status) = child.try_wait().expect("inspect data-plane process") {
-            panic!("data-plane exited before readiness: {status}");
-        }
-        if client
-            .get(url)
-            .send()
-            .await
-            .is_ok_and(|response| response.status().is_success())
-        {
-            return;
-        }
-        tokio::time::sleep(Duration::from_millis(50)).await;
-    }
-    panic!("data-plane did not become ready at {url}");
-}
-
-async fn get_json(client: &reqwest::Client, url: &str, params: &[(&str, String)]) -> Value {
-    client
-        .get(url)
-        .query(params)
-        .send()
-        .await
-        .expect("send PromQL request")
-        .json()
-        .await
-        .expect("decode PromQL response")
-}
-
-#[tokio::test]
-async fn production_backend_matches_raw_oracle_and_range_endpoint() {
-    let query_port = unused_port();
-    let otlp_http_port = unused_port();
-    let otlp_grpc_port = unused_port();
-    let output_dir = tempfile::tempdir().expect("create log directory");
-    let install = physical_fixture::artifact_from_materializations(vec![ddsketch_config()]);
-    let mut physical = tempfile::NamedTempFile::new().unwrap();
-    serde_json::to_writer(&mut physical, &install).unwrap();
-
-    let child = Command::new(env!("CARGO_BIN_EXE_data_plane"))
-        .arg("--physical-plan")
-        .arg(physical.path())
-        .arg("--http-port")
-        .arg(query_port.to_string())
-        .arg("--output-dir")
-        .arg(output_dir.path())
-        .arg("--enable-otel-ingest")
-        .arg("--otel-http-port")
-        .arg(otlp_http_port.to_string())
-        .arg("--otel-grpc-port")
-        .arg(otlp_grpc_port.to_string())
-        .arg("--precompute-allowed-lateness-ms")
-        .arg("0")
-        .arg("--precompute-flush-interval-ms")
-        .arg("100")
-        .stdout(Stdio::null())
-        .stderr(Stdio::null())
-        .spawn()
-        .expect("start production data-plane binary");
-    let mut child = ChildGuard(child);
-
-    let client = reqwest::Client::new();
-    let query_base = format!("http://127.0.0.1:{query_port}");
-    wait_until_ready(
-        &client,
-        &format!("{query_base}/api/v1/health"),
-        &mut child.0,
-    )
-    .await;
-
-    let raw_values = [10.0, 12.0, 15.0, 20.0, 30.0, 45.0, 60.0, 80.0, 100.0];
-    let reference = exact_quantile(&raw_values, QUANTILE);
-    let now = std::time::SystemTime::now()
-        .duration_since(std::time::UNIX_EPOCH)
-        .expect("system clock");
-    // Twenty-one complete panes cover every ten-second window in the
-    // instant/range comparison. Repeating the distribution preserves its quantile.
-    let sample_ns = (now - Duration::from_secs(2)).as_secs() * 1_000_000_000;
-    for seconds_ago in (0..=20).rev() {
-        let body = ddsketch_export(METRIC, sample_ns - seconds_ago * 1_000_000_000, &raw_values);
-        client
-            .post(format!("http://127.0.0.1:{otlp_http_port}/v1/metrics"))
-            .header("content-type", "application/x-protobuf")
-            .body({
-                let mut request = ExportMetricsServiceRequest::decode(body.as_slice()).unwrap();
-                physical_fixture::stamp(&mut request, &install);
-                request.encode_to_vec()
-            })
-            .send()
-            .await
-            .expect("POST modified OTLP")
-            .error_for_status()
-            .expect("backend accepted modified OTLP");
-    }
-
-    let query = format!("quantile_over_time({QUANTILE}, {METRIC}[10s])");
-    let instant_url = format!("{query_base}/api/v1/query");
-    let mut instant = Value::Null;
-    for _ in 0..50 {
-        instant = get_json(
-            &client,
-            &instant_url,
-            &[
-                ("query", query.clone()),
-                ("time", (sample_ns / 1_000_000_000).to_string()),
-            ],
-        )
-        .await;
-        if first_instant(&instant).is_some() {
-            break;
-        }
-        tokio::time::sleep(Duration::from_millis(100)).await;
-    }
-    assert_eq!(instant["status"], "success", "instant response: {instant}");
-    assert_eq!(instant["data"]["resultType"], "vector");
-    let (instant_labels, instant_timestamp, instant_value) =
-        first_instant(&instant).unwrap_or_else(|| panic!("empty instant response: {instant}"));
-    assert_eq!(instant_labels["service"], SERVICE);
-    assert_approx(reference, instant_value, "instant query versus raw oracle");
-    assert!(
-        instant["infos"]
-            .as_array()
-            .is_some_and(|infos| infos.iter().any(|info| info
-                .as_str()
-                .is_some_and(|s| s.contains("data_source: asap_query")))),
-        "query was not proven to come from ASAPQuery: {instant}"
-    );
-
-    let range_url = format!("{query_base}/api/v1/query_range");
-    let range = get_json(
-        &client,
-        &range_url,
-        &[
-            ("query", query.clone()),
-            ("start", (instant_timestamp - 10.0).to_string()),
-            ("end", instant_timestamp.to_string()),
-            ("step", "1".into()),
-        ],
-    )
-    .await;
-    assert_eq!(range["status"], "success", "range response: {range}");
-    assert_eq!(range["data"]["resultType"], "matrix");
-    let (range_labels, range_values) =
-        first_range_values(&range).unwrap_or_else(|| panic!("empty range response: {range}"));
-    assert_eq!(range_labels, instant_labels);
-    assert!(
-        !range_values.is_empty(),
-        "range response had no values: {range}"
-    );
-    for (_, value) in &range_values {
-        assert_approx(reference, *value, "range query versus raw oracle");
-    }
-    assert_approx(
-        instant_value,
-        range_values.last().expect("last range value").1,
-        "instant/range endpoint consistency",
-    );
-
-    for (start, end, step, expected_error) in [
-        ("10", "10", "1", "start must be before end"),
-        ("10", "11", "0", "step must be positive"),
-    ] {
-        let invalid = get_json(
-            &client,
-            &range_url,
-            &[
-                ("query", query.clone()),
-                ("start", start.into()),
-                ("end", end.into()),
-                ("step", step.into()),
-            ],
-        )
-        .await;
-        assert_eq!(invalid["status"], "error", "invalid range: {invalid}");
-        assert!(
-            invalid["error"]
-                .as_str()
-                .is_some_and(|error| error.contains(expected_error)),
-            "unexpected validation response: {invalid}"
-        );
-    }
-}
-
-fn ddsketch_config() -> asap_types::PrecomputeMaterialization {
-    use asap_types::{AggregationType, KeyByLabelNames, PrecomputeMaterialization, WindowKind};
-    PrecomputeMaterialization::new(
-        AggregationType::DDSketch,
-        String::new(),
-        std::collections::HashMap::from([("relative_accuracy".into(), serde_json::json!(ALPHA))]),
-        KeyByLabelNames::new(vec!["service".into()]),
-        KeyByLabelNames::empty(),
-        KeyByLabelNames::empty(),
-        String::new(),
-        1,
-        1,
-        WindowKind::Tumbling,
-        String::new(),
-        METRIC.into(),
-        None,
-        None,
-        None,
-    )
-}
-
-// A real process must range-read the bound output, never a semantic substitute.
-#[tokio::test(flavor = "multi_thread", worker_threads = 2)]
-async fn bound_sds_keeps_hot_and_rebuild_outputs_and_groups_isolated() {
-    use asap_types::query_plan::QueryPlanNode;
-    use asap_types::sds::StoredOutputId;
-    let mut hot = ddsketch_config();
-    hot.stored_output_id = Some(StoredOutputId(1001));
-    let mut rebuild = hot.clone();
-    rebuild.stored_output_id = Some(StoredOutputId(1002));
-    let mut install = physical_fixture::artifact_from_materializations(vec![hot, rebuild]);
-    assert_eq!(install.summary_catalog.definitions.len(), 1);
-    assert_eq!(install.summary_catalog.outputs.len(), 2);
-    for entry in install.query_plan.entries.values_mut() {
-        let output = if entry.canonical_query.contains("0.99") {
-            1002
-        } else {
-            1001
-        };
-        for node in entry.nodes.values_mut() {
-            if let QueryPlanNode::ReadMaterialization { binding } = node {
-                binding.materialization = StoredOutputId(output);
-            }
-        }
-    }
-    install
-        .query_plan
-        .bind_catalog(&install.summary_catalog)
-        .unwrap();
-    let query_port = unused_port();
-    let otlp_http_port = unused_port();
-    let directory = tempfile::tempdir().unwrap();
-    let plan = directory.path().join("plan.json");
-    std::fs::write(&plan, serde_json::to_vec(&install).unwrap()).unwrap();
-    let mut child = ChildGuard(
-        Command::new(env!("CARGO_BIN_EXE_data_plane"))
-            .arg("--physical-plan")
-            .arg(&plan)
-            .arg("--http-port")
-            .arg(query_port.to_string())
-            .arg("--output-dir")
-            .arg(directory.path())
-            .arg("--enable-otel-ingest")
-            .arg("--otel-http-port")
-            .arg(otlp_http_port.to_string())
-            .arg("--otel-grpc-port")
-            .arg(unused_port().to_string())
-            .stdout(Stdio::null())
-            .stderr(Stdio::inherit())
-            .spawn()
-            .unwrap(),
-    );
-    let client = reqwest::Client::new();
-    let base = format!("http://127.0.0.1:{query_port}");
-    wait_until_ready(&client, &format!("{base}/api/v1/health"), &mut child.0).await;
-    let end = std::time::SystemTime::now()
-        .duration_since(std::time::UNIX_EPOCH)
-        .unwrap()
-        .as_secs()
-        - 2;
-    let send = |output: u64, second: u64, value: f64, service: &'static str| {
-        let mut stamp_plan = install.clone();
-        stamp_plan
-            .precompute_plan
-            .schemas
-            .retain(|s| s.materialization == StoredOutputId(output));
-        let client = client.clone();
-        async move {
-            let bytes = ddsketch_export(METRIC, second * 1_000_000_000, &[value; 32]);
-            let mut message = ExportMetricsServiceRequest::decode(bytes.as_slice()).unwrap();
-            let Some(Data::Ddsketch(sketch)) =
-                &mut message.resource_metrics[0].scope_metrics[0].metrics[0].data
-            else {
-                panic!("fixture")
-            };
-            sketch.data_points[0].attributes[0].value = Some(AnyValue {
-                value: Some(any_value::Value::StringValue(service.into())),
-            });
-            physical_fixture::stamp(&mut message, &stamp_plan);
-            let response = client
-                .post(format!("http://127.0.0.1:{otlp_http_port}/v1/metrics"))
-                .header("content-type", "application/x-protobuf")
-                .body(message.encode_to_vec())
-                .send()
-                .await
-                .unwrap();
-            let status = response.status();
-            assert!(
-                status.is_success(),
-                "output {output}: {status}: {}",
-                response.text().await.unwrap()
-            );
-        }
-    };
-    let query = |quantile: &str, range: &str| {
-        let expression = format!("quantile_over_time({quantile}, {METRIC}[{range}])");
-        let client = client.clone();
-        let base = base.clone();
-        async move {
-            get_json(
-                &client,
-                &format!("{base}/api/v1/query"),
-                &[("query", expression), ("time", end.to_string())],
-            )
-            .await
-        }
-    };
-    for second in end - 2..=end {
-        send(1002, second, 100.0, SERVICE).await;
-    }
-    let mut rebuilt = Value::Null;
-    for _ in 0..50 {
-        rebuilt = query("0.99", "3s").await;
-        if first_instant(&rebuilt).is_some() {
-            break;
-        }
-        tokio::time::sleep(Duration::from_millis(20)).await;
-    }
-    assert_approx(
-        100.0,
-        first_instant(&rebuilt).expect("bound rebuild result").2,
-        "rebuild",
-    );
-    assert!(
-        first_instant(&query("0.5", "3s").await).is_none(),
-        "hot must not substitute rebuild state"
-    );
-    send(1001, end - 2, 1.0, SERVICE).await;
-    send(1001, end, 1.0, SERVICE).await;
-    assert!(
-        first_instant(&query("0.5", "3s").await).is_none(),
-        "missing middle pane must not be an empty input"
-    );
-    send(1001, end - 1, 1.0, SERVICE).await;
-    for second in end - 2..=end {
-        send(1001, second, 200.0, "payments").await;
-    }
-    let mut answer = Value::Null;
-    for _ in 0..50 {
-        answer = query("0.5", "3s").await;
-        if answer["data"]["result"]
-            .as_array()
-            .is_some_and(|r| r.len() == 2)
-        {
-            break;
-        }
-        tokio::time::sleep(Duration::from_millis(20)).await;
-    }
-    let rows = answer["data"]["result"]
-        .as_array()
-        .unwrap_or_else(|| panic!("{answer}"));
-    assert_eq!(rows.len(), 2, "{answer}");
-    for row in rows {
-        let expected = if row["metric"]["service"] == SERVICE {
-            1.0
-        } else {
-            assert_eq!(row["metric"]["service"], "payments");
-            200.0
-        };
-        assert_approx(
-            expected,
-            row["value"][1].as_str().unwrap().parse().unwrap(),
-            "isolated group",
-        );
-    }
-}
diff --git a/data_plane/tests/server.rs b/data_plane/tests/server.rs
new file mode 100644
index 000000000..60823445b
--- /dev/null
+++ b/data_plane/tests/server.rs
@@ -0,0 +1,114 @@
+use std::sync::atomic::Ordering;
+use std::sync::Arc;
+
+use axum::body::{Body, Bytes};
+use axum::extract::RawQuery;
+use axum::http::{header, Method, Request, StatusCode};
+use axum::routing::get;
+use axum::Router;
+use data_plane::remote_write::{encode, Label, Sample, TimeSeries, WriteRequest};
+use data_plane::{router, DataPlane, EXECUTION_HEADER};
+use http_body_util::BodyExt;
+use tower::ServiceExt;
+
+/// A stand-in Prometheus that echoes the method, query string and body it
+/// received, so tests can check what was forwarded.
+async fn fake_prometheus() -> String {
+    async fn echo(method: Method, RawQuery(query): RawQuery, body: Bytes) -> String {
+        format!(
+            "{method} {} {}",
+            query.unwrap_or_default(),
+            String::from_utf8_lossy(&body)
+        )
+    }
+    let app = Router::new()
+        .route("/api/v1/query", get(echo).post(echo))
+        .route("/api/v1/query_range", get(echo).post(echo));
+    let listener = tokio::net::TcpListener::bind("127.0.0.1:0").await.unwrap();
+    let url = format!("http://{}", listener.local_addr().unwrap());
+    tokio::spawn(async move { axum::serve(listener, app).await.unwrap() });
+    url
+}
+
+async fn send(app: &Router, request: Request<Body>) -> (StatusCode, Option<String>, String) {
+    let response = app.clone().oneshot(request).await.unwrap();
+    let status = response.status();
+    let execution = response
+        .headers()
+        .get(EXECUTION_HEADER)
+        .map(|v| v.to_str().unwrap().to_string());
+    let body = response.into_body().collect().await.unwrap().to_bytes();
+    (status, execution, String::from_utf8(body.to_vec()).unwrap())
+}
+
+/// Instant and range queries, by GET or form POST, reach Prometheus
+/// unchanged, and the response says it was forwarded.
+#[tokio::test]
+async fn forwards_queries_to_prometheus() {
+    let state = Arc::new(DataPlane::new(vec![], fake_prometheus().await));
+    let app = router(state);
+    let (status, execution, body) = send(
+        &app,
+        Request::get("/api/v1/query?query=up&time=10")
+            .body(Body::empty())
+            .unwrap(),
+    )
+    .await;
+    assert_eq!(status, StatusCode::OK);
+    assert_eq!(execution.as_deref(), Some("forwarded"));
+    assert_eq!(body, "GET query=up&time=10 ");
+    let (_, execution, body) = send(
+        &app,
+        Request::post("/api/v1/query_range")
+            .header(header::CONTENT_TYPE, "application/x-www-form-urlencoded")
+            .body(Body::from("query=up&start=0&end=60&step=15"))
+            .unwrap(),
+    )
+    .await;
+    assert_eq!(execution.as_deref(), Some("forwarded"));
+    assert_eq!(body, "POST  query=up&start=0&end=60&step=15");
+}
+
+/// Valid Remote Write requests are accepted and counted; malformed ones are
+/// rejected with 400.
+#[tokio::test]
+async fn accepts_remote_write() {
+    let state = Arc::new(DataPlane::new(vec![], "http://unused".into()));
+    let app = router(state.clone());
+    let request = WriteRequest {
+        timeseries: vec![TimeSeries {
+            labels: vec![Label {
+                name: "__name__".into(),
+                value: "http_requests_total".into(),
+            }],
+            samples: vec![
+                Sample {
+                    value: 1.0,
+                    timestamp: 1_000,
+                },
+                Sample {
+                    value: 2.0,
+                    timestamp: 16_000,
+                },
+            ],
+        }],
+    };
+    let (status, _, _) = send(
+        &app,
+        Request::post("/api/v1/write")
+            .body(Body::from(encode(&request)))
+            .unwrap(),
+    )
+    .await;
+    assert_eq!(status, StatusCode::NO_CONTENT);
+    assert_eq!(state.samples.load(Ordering::Relaxed), 2);
+    let (status, _, _) = send(
+        &app,
+        Request::post("/api/v1/write")
+            .body(Body::from("not snappy"))
+            .unwrap(),
+    )
+    .await;
+    assert_eq!(status, StatusCode::BAD_REQUEST);
+    assert_eq!(state.samples.load(Ordering::Relaxed), 2);
+}
diff --git a/data_plane/tests/support/current_series_process.rs b/data_plane/tests/support/current_series_process.rs
deleted file mode 100644
index 86bb390b5..000000000
--- a/data_plane/tests/support/current_series_process.rs
+++ /dev/null
@@ -1,398 +0,0 @@
-use super::*;
-use control_plane::physical::{
-    compiler::{
-        BackendLocalPlanningInput, DeploymentPlanCompiler, BACKEND_REVISION, PLANNER_REVISION,
-    },
-    workload_cost::{self, WorkloadCostEvidence, WorkloadQuote},
-};
-
-/// Remote Write updates one current population; quantiles and different TopK limits share it.
-#[tokio::test]
-async fn current_series_quantiles_topk_share_and_replace_values() {
-    let calls = Arc::new(std::sync::atomic::AtomicU64::new(0));
-    let observed = calls.clone();
-    let listener = tokio::net::TcpListener::bind("127.0.0.1:0").await.unwrap();
-    let fallback = format!("http://{}", listener.local_addr().unwrap());
-    let task = tokio::spawn(async move {
-        axum::serve(listener,Router::new()
-        .route("/-/healthy",get(||async {"healthy"}))
-        .route("/api/v1/query",get(move || {let observed=observed.clone();async move {
-            observed.fetch_add(1,std::sync::atomic::Ordering::Relaxed);
-            Json(serde_json::json!({"status":"success","data":{"resultType":"vector","result":[{"metric":{"fallback":"true"},"value":[0,"999"]}]}}))
-        }}))).await.unwrap();
-    });
-    let native = std::env::var("ASAP_CURRENT_SERIES_PROMETHEUS_URL").ok();
-    let fallback = native.clone().unwrap_or(fallback);
-    let mut snapshot: BackendLocalPlanningInput = serde_json::from_str(include_str!(
-        "../../../docs/examples/asapquery-planning-snapshot.json"
-    ))
-    .unwrap();
-    // Exercise a short declared horizon; native differential mode keeps its five-minute contract.
-    let horizon_ms: i64 = if native.is_some() { 300_000 } else { 5_000 };
-    let scrape_ms = horizon_ms / 5;
-    snapshot.physical_inputs.scrape_interval_ms = scrape_ms as u64;
-    snapshot.data_workload.data_ingestion_interval = planner_types::workload::Evidence {
-        value: Some(planner_types::workload::DurationMs(horizon_ms as u64)),
-        ..Default::default()
-    };
-    let template = snapshot.query_workload.repeating_queries.as_ref().unwrap()[0].clone();
-    let mut queries = vec![];
-    for q in [0.5, 0.9, 0.95, 0.99] {
-        queries.push(format!("quantile({q}, a)"));
-        queries.push(format!("quantile by (job) ({q}, a)"));
-    }
-    for k in [1, 2, 3] {
-        queries.push(format!("topk({k}, a)"));
-        queries.push(format!("topk by (job) ({k}, a)"));
-    }
-    for operation in ["sum", "count", "avg"] {
-        queries.push(format!("{operation}(a)"));
-        queries.push(format!("{operation} by (job) (a)"));
-    }
-    snapshot.query_workload.repeating_queries = Some(
-        queries
-            .iter()
-            .map(|q| {
-                let mut e = template.clone();
-                e.query = planner_types::workload::Query(q.clone());
-                e
-            })
-            .collect(),
-    );
-    let (request, env) = snapshot
-        .clone()
-        .into_physical_compilation_request()
-        .unwrap();
-    let candidates = workload_cost::enumerate_exact_and_materialized_candidates(request).unwrap();
-    let quotes = candidates
-        .into_iter()
-        .filter_map(|candidate| {
-            let plan = DeploymentPlanCompiler
-                .compile_promql(candidate.clone(), env.clone())
-                .ok()?;
-            let warm = candidate.queries.iter().all(|query| {
-                matches!(
-                    &query.selected_plan_root.expr,
-                    planner_types::post_asap::SummaryExpr::ValueOperation {
-                        operation: planner_types::post_asap::ValueOperation::ReadPopulation { .. },
-                        ..
-                    }
-                )
-            });
-            let manifest = workload_cost::manifest(&plan, &candidate.queries).unwrap();
-            Some(WorkloadQuote {
-                unit_costs: manifest
-                    .components
-                    .keys()
-                    .map(|key| (key.clone(), if warm { 1. } else { 1e12 }))
-                    .collect(),
-                manifest,
-                executable: true,
-            })
-        })
-        .collect();
-    snapshot.workload_cost_evidence = Some(WorkloadCostEvidence {
-        backend_revision: BACKEND_REVISION.into(),
-        planner_revision: PLANNER_REVISION.into(),
-        data_snapshot_id: "current-series-process-test".into(),
-        model_version: "synthetic-test-only".into(),
-        observed_at_unix_ms: env.observed_at_unix_ms,
-        valid_for_ms: env.max_evidence_age_ms,
-        quotes,
-    });
-    let planned = snapshot.clone().compile_promql().unwrap();
-    for entry in planned.query_plan.entries.values() {
-        for node in entry.nodes.values() {
-            if let asap_types::query_plan::QueryPlanNode::Logical {
-                operator:
-                    asap_types::query_plan::query_time::QueryTimeOperator::CurrentSeries {
-                        population,
-                        ..
-                    },
-                ..
-            } = node
-            {
-                assert_eq!(population.lookback_ms, horizon_ms as u64);
-            }
-        }
-    }
-    assert!(
-        planned
-            .query_plan
-            .entries
-            .values()
-            .all(|e| serde_json::to_string(e).unwrap().contains("current_series")),
-        "non-current entries: {:?}",
-        planned
-            .query_plan
-            .entries
-            .values()
-            .filter(|e| !serde_json::to_string(e).unwrap().contains("current_series"))
-            .map(|e| (&e.canonical_query, &e.nodes))
-            .collect::<Vec<_>>()
-    );
-    let output = tempfile::tempdir().unwrap();
-    let path = output.path().join("snapshot.json");
-    std::fs::write(&path, serde_json::to_vec(&snapshot).unwrap()).unwrap();
-    let port = unused_port();
-    let mut child = ChildGuard(
-        Command::new(env!("CARGO_BIN_EXE_data_plane"))
-            .args([
-                "--profile",
-                "asapquery",
-                "--forward-unsupported-queries",
-                "--planning-snapshot",
-            ])
-            .arg(&path)
-            .args([
-                "--prometheus-server",
-                &fallback,
-                "--http-port",
-                &port.to_string(),
-                "--output-dir",
-            ])
-            .arg(output.path())
-            .stdout(Stdio::null())
-            .stderr(Stdio::inherit())
-            .spawn()
-            .unwrap(),
-    );
-    let client = reqwest::Client::new();
-    let base = format!("http://127.0.0.1:{port}");
-    wait_until_ready(&client, &format!("{base}/api/v1/health"), &mut child.0).await;
-    let end = std::time::SystemTime::now()
-        .duration_since(std::time::UNIX_EPOCH)
-        .unwrap()
-        .as_millis() as i64;
-    let times: Vec<_> = (0..=5).map(|i| end - horizon_ms + i * scrape_ms).collect();
-    let wire = WriteRequest {
-        timeseries: [
-            ("x", "api", 1.),
-            ("y", "api", 9.),
-            ("z", "api", 5.),
-            ("w", "db", 50.),
-        ]
-        .into_iter()
-        .map(|(pod, job, value)| {
-            series_with_labels(
-                "a",
-                &[("pod", pod), ("job", job)],
-                &times.iter().map(|t| (*t, value)).collect::<Vec<_>>(),
-            )
-        })
-        .collect(),
-    };
-    if let Some(url) = &native {
-        assert_eq!(remote_write(&client, url, &wire).await, 204);
-    }
-    assert_eq!(remote_write(&client, &base, &wire).await, 204);
-    async fn query(client: &reqwest::Client, base: &str, q: &str, at: i64) -> Value {
-        client
-            .get(format!("{base}/api/v1/query"))
-            .query(&[
-                ("query", q.to_string()),
-                ("time", format!("{:.3}", at as f64 / 1000.)),
-            ])
-            .send()
-            .await
-            .unwrap()
-            .json()
-            .await
-            .unwrap()
-    }
-    async fn compare_native(
-        client: &reqwest::Client,
-        native: &Option<String>,
-        q: &str,
-        at: i64,
-        actual: &Value,
-    ) {
-        if let Some(url) = native {
-            let expected = query(client, url, q, at).await;
-            let normalize = |body: &Value| {
-                let mut rows: Vec<_> = body["data"]["result"]
-                    .as_array()
-                    .unwrap()
-                    .iter()
-                    .map(|row| {
-                        (
-                            serde_json::to_string(&row["metric"]).unwrap(),
-                            row["value"][1].as_str().unwrap().parse::<f64>().unwrap(),
-                        )
-                    })
-                    .collect();
-                rows.sort_by(|a, b| a.0.cmp(&b.0));
-                rows
-            };
-            let a = normalize(actual);
-            let b = normalize(&expected);
-            assert_eq!(a.len(), b.len(), "{q}: {actual} vs {expected}");
-            for (a, b) in a.iter().zip(&b) {
-                assert_eq!(a.0, b.0);
-                assert!((a.1 - b.1).abs() < 1e-8, "{q}: {a:?} vs {b:?}");
-            }
-        }
-    }
-    for (q, global, grouped) in [
-        (0.5, 7., 5.),
-        (0.9, 37.7, 8.2),
-        (0.95, 43.85, 8.6),
-        (0.99, 48.77, 8.92),
-    ] {
-        for (text, expected) in [
-            (format!("quantile({q}, a)"), global),
-            (format!("quantile by (job) ({q}, a)"), grouped),
-        ] {
-            let body = query(&client, &base, &text, end).await;
-            assert!(is_warm(&body), "{text}: {body}");
-            compare_native(&client, &native, &text, end, &body).await;
-            let value = body["data"]["result"][0]["value"][1]
-                .as_str()
-                .unwrap()
-                .parse::<f64>()
-                .unwrap();
-            assert!((value - expected).abs() < 1e-8, "{text}: {body}");
-        }
-    }
-    for k in [1, 2, 3] {
-        let global = query(&client, &base, &format!("topk({k}, a)"), end).await;
-        assert!(is_warm(&global), "{global}");
-        compare_native(&client, &native, &format!("topk({k}, a)"), end, &global).await;
-        assert_eq!(global["data"]["result"].as_array().unwrap().len(), k);
-        let body = query(&client, &base, &format!("topk by (job) ({k}, a)"), end).await;
-        assert!(is_warm(&body), "{body}");
-        compare_native(
-            &client,
-            &native,
-            &format!("topk by (job) ({k}, a)"),
-            end,
-            &body,
-        )
-        .await;
-        assert_eq!(
-            body["data"]["result"].as_array().unwrap().len(),
-            k + 1,
-            "{body}"
-        );
-    }
-    for operation in ["sum", "count", "avg"] {
-        for text in [
-            format!("{operation}(a)"),
-            format!("{operation} by (job) (a)"),
-        ] {
-            let body = query(&client, &base, &text, end).await;
-            assert!(is_warm(&body), "{text}: {body}");
-            compare_native(&client, &native, &text, end, &body).await;
-        }
-    }
-    let metrics = client
-        .get(format!("{base}/metrics"))
-        .send()
-        .await
-        .unwrap()
-        .text()
-        .await
-        .unwrap();
-    assert!(
-        metrics.contains("asap_current_series_populations 2\n"),
-        "{metrics}"
-    );
-    assert!(
-        metrics.contains("asap_current_series_cache_builds_total 3\n"),
-        "{metrics}"
-    );
-    assert_eq!(calls.load(std::sync::atomic::Ordering::Relaxed), 0);
-    // A decreasing value and a stale marker must promote a formerly excluded series.
-    for (pod, value, offset, expected) in [
-        ("y", -5., 1000, "z"),
-        (
-            "z",
-            f64::from_bits(data_plane::drivers::ingest::prometheus_remote_write::STALE_NAN_BITS),
-            2000,
-            "x",
-        ),
-    ] {
-        let update = WriteRequest {
-            timeseries: vec![series_with_labels(
-                "a",
-                &[("pod", pod), ("job", "api")],
-                &[(end + offset, value)],
-            )],
-        };
-        if let Some(url) = &native {
-            assert_eq!(remote_write(&client, url, &update).await, 204);
-        }
-        assert_eq!(remote_write(&client, &base, &update).await, 204);
-        let body = query(&client, &base, "topk by (job) (1, a)", end + offset).await;
-        assert!(is_warm(&body), "{body}");
-        assert_eq!(
-            body["data"]["result"][0]["metric"]["pod"], expected,
-            "{body}"
-        );
-        compare_native(
-            &client,
-            &native,
-            "topk by (job) (1, a)",
-            end + offset,
-            &body,
-        )
-        .await;
-        for operation in ["sum", "count", "avg"] {
-            for text in [
-                format!("{operation}(a)"),
-                format!("{operation} by (job) (a)"),
-            ] {
-                let body = query(&client, &base, &text, end + offset).await;
-                assert!(is_warm(&body), "{text}: {body}");
-                compare_native(&client, &native, &text, end + offset, &body).await;
-            }
-        }
-        let body = query(&client, &base, "quantile by (job) (0.5, a)", end + offset).await;
-        assert!(is_warm(&body), "{body}");
-        compare_native(
-            &client,
-            &native,
-            "quantile by (job) (0.5, a)",
-            end + offset,
-            &body,
-        )
-        .await;
-    }
-    // Historical reads cannot use a state already updated beyond their evaluation time.
-    let body = query(&client, &base, "quantile(0.5, a)", end).await;
-    assert!(!is_warm(&body), "historical read must fall back: {body}");
-    if native.is_none() {
-        assert_eq!(
-            body["data"]["result"][0]["metric"]["fallback"], "true",
-            "{body}"
-        );
-    }
-    // Keep one series fresh while all members last seen at `end` hit the exact
-    // left lookback boundary. Native Prometheus 3.5 must agree for every readout.
-    let updates: Vec<_> = (scrape_ms.max(3_000)..=horizon_ms)
-        .step_by(scrape_ms as usize)
-        .map(|offset| (end + offset, 9.0))
-        .collect();
-    let wire = WriteRequest {
-        timeseries: vec![series_with_labels(
-            "a",
-            &[("pod", "y"), ("job", "api")],
-            &updates,
-        )],
-    };
-    if let Some(url) = &native {
-        assert_eq!(remote_write(&client, url, &wire).await, 204);
-    }
-    assert_eq!(remote_write(&client, &base, &wire).await, 204);
-    for text in &queries {
-        let body = query(&client, &base, text, end + horizon_ms).await;
-        assert!(is_warm(&body), "{text}: {body}");
-        assert_eq!(
-            body["data"]["result"].as_array().unwrap().len(),
-            1,
-            "{text}: {body}"
-        );
-        compare_native(&client, &native, text, end + horizon_ms, &body).await;
-    }
-    task.abort();
-}
diff --git a/data_plane/tests/support/distinct_planning_process.rs b/data_plane/tests/support/distinct_planning_process.rs
deleted file mode 100644
index 72bb3dd74..000000000
--- a/data_plane/tests/support/distinct_planning_process.rs
+++ /dev/null
@@ -1,16 +0,0 @@
-use super::*;
-
-/// Modeled HLL error without a confidence certificate cannot replace exact execution.
-#[tokio::test]
-async fn uncertified_distinct_uses_exact_process() {
-    const QUERY: &str = "distinct_over_time(distinct_values{job=\"api\"}[5s])";
-    let mut fixture: Value = serde_json::from_str(include_str!(
-        "../../../docs/examples/asapquery-compatibility-demo-snapshot.json"
-    ))
-    .unwrap();
-    let mut entry = fixture["query_workload"]["repeating_queries"][3].clone();
-    entry["query"] = QUERY.into();
-    entry["requirements"]["accuracy"] = serde_json::json!({"explicit": {"Epsilon": 0.05}});
-    fixture["query_workload"]["repeating_queries"] = serde_json::json!([entry]);
-    assert_uncertified_exact_process(fixture, &[QUERY]).await;
-}
diff --git a/data_plane/tests/support/durable_summary_process.rs b/data_plane/tests/support/durable_summary_process.rs
deleted file mode 100644
index 604157b99..000000000
--- a/data_plane/tests/support/durable_summary_process.rs
+++ /dev/null
@@ -1,226 +0,0 @@
-//! Authoritative catalog identity survives a real production process restart.
-use super::*;
-
-#[tokio::test(flavor = "multi_thread", worker_threads = 2)]
-async fn persisted_summary_restarts_without_live_reregistration() {
-    let mut fixture: Value = serde_json::from_str(include_str!(
-        "../../../docs/examples/asapquery-compatibility-demo-snapshot.json"
-    ))
-    .unwrap();
-    let query = fixture["query_workload"]["repeating_queries"][2]["query"]
-        .as_str()
-        .unwrap()
-        .to_owned();
-    fixture["query_workload"]["repeating_queries"] =
-        serde_json::json!([fixture["query_workload"]["repeating_queries"][2].clone()]);
-    // This restart fixture persists one complete five-second population.
-    fixture["query_workload"]["repeating_queries"][0]["demand"]["fixed_interval_at"]["interval"] =
-        serde_json::json!(5000);
-    let snapshot: control_plane::physical::compiler::BackendLocalPlanningInput =
-        serde_json::from_value(fixture).unwrap();
-    let plan = quote_snapshot_for_test(snapshot.clone())
-        .compile_promql()
-        .unwrap();
-    let install = data_plane::drivers::query::servers::http::PhysicalPlanInstallRequest {
-        summary_catalog: plan.summary_catalog,
-        collector_plans: plan.collector_plans,
-        precompute_plan: plan.precompute_plan,
-        transmission_plan: plan.transmission_plan,
-        query_plan: plan.query_plan,
-        storage_routing: None,
-        adaptation_evidence: vec![],
-    };
-    let directory = tempfile::tempdir().unwrap();
-    let artifact = directory.path().join("plan.json");
-    let disk = directory.path().join("disk");
-    std::fs::create_dir_all(&disk).unwrap();
-    std::fs::write(&artifact, serde_json::to_vec(&install).unwrap()).unwrap();
-    let spawn = |port: u16| {
-        ChildGuard(
-            Command::new(env!("CARGO_BIN_EXE_data_plane"))
-                .arg("--physical-plan")
-                .arg(&artifact)
-                .arg("--http-port")
-                .arg(port.to_string())
-                .arg("--output-dir")
-                .arg(directory.path())
-                .arg("--enable-remote-write")
-                .arg("--persistence-enabled")
-                .arg("--persistence-dir")
-                .arg(&disk)
-                .args([
-                    "--persistence-memory-limit-mb",
-                    "1",
-                    "--persistence-hot-window-secs",
-                    "1",
-                    "--persistence-delete-older-than-secs",
-                    "0",
-                    "--persistence-seal-window-count",
-                    "1",
-                    "--persistence-flush-interval-ms",
-                    "10",
-                    "--precompute-allowed-lateness-ms",
-                    "0",
-                    "--precompute-flush-interval-ms",
-                    "25",
-                ])
-                .stdout(Stdio::null())
-                .stderr(Stdio::inherit())
-                .spawn()
-                .unwrap(),
-        )
-    };
-    let client = reqwest::Client::new();
-    let port = unused_port();
-    let base = format!("http://127.0.0.1:{port}");
-    let mut first = spawn(port);
-    wait_until_ready(&client, &format!("{base}/api/v1/health"), &mut first.0).await;
-    assert_eq!(
-        remote_write(
-            &client,
-            &base,
-            &WriteRequest {
-                timeseries: vec![series(
-                    "asap_demo_gauge",
-                    &[
-                        (1000, 1.0),
-                        (2000, 2.0),
-                        (3000, 3.0),
-                        (4000, 4.0),
-                        (5000, 5.0)
-                    ]
-                )],
-            }
-        )
-        .await,
-        204
-    );
-    drain_precompute(&client, &base).await;
-    let before: Value = client
-        .get(format!("{base}/api/v1/query"))
-        .query(&[("query", query.as_str()), ("time", "5")])
-        .send()
-        .await
-        .unwrap()
-        .json()
-        .await
-        .unwrap();
-    assert!(is_warm(&before), "{before}");
-    let sidecar = disk.join("sketch_index/sid_metadata.json");
-    for _ in 0..500 {
-        let manifest_path = disk.join("sketch_index");
-        if sidecar.exists()
-            && manifest_path.join("parts_manifest.log").exists()
-            && data_plane::storage_engines::sketch_db::index::persistence::Manifest::open_or_init(
-                &manifest_path,
-            )
-            .is_ok_and(|manifest| manifest.live_parts().iter().any(|part| part.max_ts >= 5000))
-        {
-            break;
-        }
-        tokio::time::sleep(Duration::from_millis(20)).await;
-    }
-    if !sidecar.exists() {
-        let retained = directory.keep();
-        panic!(
-            "missing flushed metadata; retained process artifacts at {}",
-            retained.display()
-        );
-    }
-    let metadata: Value = serde_json::from_slice(&std::fs::read(&sidecar).unwrap()).unwrap();
-    assert!(metadata["bindings"]
-        .as_object()
-        .unwrap()
-        .values()
-        .all(|binding| !binding["stored_output_id"].is_null()
-            && binding["summary_definition_id"]
-                .as_str()
-                .is_some_and(|id| id.starts_with("sds-v1:"))
-            && !binding["catalog_generation_sha256"].is_null()));
-    drop(first);
-    let port = unused_port();
-    let base = format!("http://127.0.0.1:{port}");
-    let mut second = spawn(port);
-    wait_until_ready(&client, &format!("{base}/api/v1/health"), &mut second.0).await;
-    // No Remote Write, register call, or installation endpoint after restart.
-    let after: Value = client
-        .get(format!("{base}/api/v1/query"))
-        .query(&[("query", query.as_str()), ("time", "5")])
-        .send()
-        .await
-        .unwrap()
-        .json()
-        .await
-        .unwrap();
-    assert!(is_warm(&after), "{after}");
-    assert_eq!(after["data"]["result"], before["data"]["result"]);
-    assert_eq!(after["data"]["result"][0]["value"][1], "15");
-    drop(second);
-
-    // Equal semantics do not grant a new plan version access to old disk state.
-    let mut next_snapshot = snapshot;
-    next_snapshot.environment.plan_version += 1;
-    let next = quote_snapshot_for_test(next_snapshot)
-        .compile_promql()
-        .unwrap();
-    assert_eq!(
-        install.summary_catalog.definitions,
-        next.summary_catalog.definitions
-    );
-    let next_install = data_plane::drivers::query::servers::http::PhysicalPlanInstallRequest {
-        summary_catalog: next.summary_catalog,
-        collector_plans: next.collector_plans,
-        precompute_plan: next.precompute_plan,
-        transmission_plan: next.transmission_plan,
-        query_plan: next.query_plan,
-        storage_routing: None,
-        adaptation_evidence: vec![],
-    };
-    std::fs::write(&artifact, serde_json::to_vec(&next_install).unwrap()).unwrap();
-    let port = unused_port();
-    let base = format!("http://127.0.0.1:{port}");
-    let mut third = spawn(port);
-    wait_until_ready(&client, &format!("{base}/api/v1/health"), &mut third.0).await;
-    let cold: Value = client
-        .get(format!("{base}/api/v1/query"))
-        .query(&[("query", query.as_str()), ("time", "5")])
-        .send()
-        .await
-        .unwrap()
-        .json()
-        .await
-        .unwrap();
-    assert!(!is_warm(&cold), "new version adopted old state: {cold}");
-    assert_eq!(
-        remote_write(
-            &client,
-            &base,
-            &WriteRequest {
-                timeseries: vec![series(
-                    "asap_demo_gauge",
-                    &[
-                        (1000, 2.0),
-                        (2000, 4.0),
-                        (3000, 6.0),
-                        (4000, 8.0),
-                        (5000, 10.0)
-                    ]
-                )],
-            }
-        )
-        .await,
-        204
-    );
-    drain_precompute(&client, &base).await;
-    let rebuilt: Value = client
-        .get(format!("{base}/api/v1/query"))
-        .query(&[("query", query.as_str()), ("time", "5")])
-        .send()
-        .await
-        .unwrap()
-        .json()
-        .await
-        .unwrap();
-    assert!(is_warm(&rebuilt), "{rebuilt}");
-    assert_eq!(rebuilt["data"]["result"][0]["value"][1], "30");
-}
diff --git a/data_plane/tests/support/empty_physical_plan.rs b/data_plane/tests/support/empty_physical_plan.rs
deleted file mode 100644
index 0e453d85b..000000000
--- a/data_plane/tests/support/empty_physical_plan.rs
+++ /dev/null
@@ -1,31 +0,0 @@
-//! Empty authoritative installation for tests that publish a workload later.
-pub fn empty() -> asap_types::plan_publication::PhysicalPlanInstallRequest {
-    use control_plane::physical::compiler::*;
-    let envelope = PlanEnvelope {
-        plan_id: 0,
-        plan_version: 0,
-        generated_at_unix_ms: 0,
-        activation_unix_ms: 0,
-        expiry_unix_ms: None,
-        backend_compat: BACKEND_COMPAT.into(),
-        planner_revision: PLANNER_REVISION.into(),
-        capability_snapshot_id: "empty-bootstrap".into(),
-    };
-    let catalog =
-        control_plane::physical::summary_catalog::SummaryCatalog::from_materializations(0, 0, &[])
-            .unwrap();
-    let mut precompute_plan = PrecomputePlan::build(envelope.clone(), vec![], &[]).unwrap();
-    precompute_plan.summary_catalog = Some(catalog.reference().unwrap());
-    let mut transmission_plan =
-        build_transmission_plan(envelope, &precompute_plan, &Default::default()).unwrap();
-    transmission_plan.summary_catalog = precompute_plan.summary_catalog.clone();
-    asap_types::plan_publication::PhysicalPlanInstallRequest {
-        summary_catalog: catalog,
-        precompute_plan,
-        transmission_plan,
-        query_plan: asap_types::query_plan::QueryPlan::empty(),
-        collector_plans: vec![],
-        storage_routing: None,
-        adaptation_evidence: vec![],
-    }
-}
diff --git a/data_plane/tests/support/erp_planning_process.rs b/data_plane/tests/support/erp_planning_process.rs
deleted file mode 100644
index 1f1bb9db7..000000000
--- a/data_plane/tests/support/erp_planning_process.rs
+++ /dev/null
@@ -1,96 +0,0 @@
-use super::*;
-use control_plane::physical::erp::ErpShapeObserver;
-
-fn measured_profiles(raw: &[f64]) -> Value {
-    let mut records = Vec::new();
-    for k in [32, 128] {
-        let mut error = 0.0f64;
-        let mut bytes = 0usize;
-        for seed in 0..10 {
-            let mut sketch = asap_sketchlib::KllSketch::with_seed(k, seed);
-            for value in raw {
-                sketch.update(*value);
-            }
-            bytes = bytes.max(sketch.sketch_bytes().len());
-            for q in 1..100 {
-                let q = q as f64 / 100.0;
-                let estimate = sketch.quantile(q);
-                let lower = raw.iter().filter(|v| **v < estimate).count() as f64 / raw.len() as f64;
-                let upper =
-                    raw.iter().filter(|v| **v <= estimate).count() as f64 / raw.len() as f64;
-                error = error.max((lower - q).max(q - upper).max(0.0));
-            }
-        }
-        records.push(serde_json::json!({
-            "id": format!("process-test-k{k}"), "sketch": "kll-percall", "implementation": "lib",
-            "parameters": {"k": k}, "trials": 10,
-            "distribution": {"erp_shape": {"family": "zipf", "parameters": {"exponent": 1.0},
-                "cardinality": 16, "benchmark_events": raw.len()}},
-            "error_metrics": {"max_rank_err": error},
-            "resources": {"memory_bytes": bytes, "update_cpu_seconds": 0.0,
-                "query_cpu_seconds": 0.0, "merge_cpu_seconds": 0.0}
-        }));
-    }
-    // This correctness fixture measures error and retained serialized state.
-    // CPU is not the objective or a performance claim in this process test.
-    serde_json::json!({"schema_version": 1,
-        "producer_version": "process-test-measured-error-and-serialized-state-cpu-not-measured",
-        "records": records})
-}
-
-#[tokio::test]
-async fn measured_error_without_confidence_uses_exact_process() {
-    const QUERY: &str = "quantile_over_time(0.9, erp_latency[5s])";
-    let training: Vec<f64> = (1..=16)
-        .flat_map(|value| std::iter::repeat_n(value as f64, 512 / value))
-        .collect();
-    let raw: Vec<f64> = (1..=16)
-        .rev()
-        .flat_map(|value| std::iter::repeat_n(value as f64, 256 / value))
-        .collect();
-    let mut observer = ErpShapeObserver::new(16).unwrap();
-    for (index, value) in raw.iter().enumerate() {
-        observer.observe(&value.to_string(), index / 100).unwrap();
-    }
-    let observation = observer.snapshot().unwrap();
-    let artifact = measured_profiles(&training);
-    for only_large in [false, true] {
-        let mut evidence = artifact.clone();
-        if only_large {
-            evidence["records"]
-                .as_array_mut()
-                .unwrap()
-                .retain(|row| row["parameters"]["k"] == 128);
-        }
-        let mut fixture: Value = serde_json::from_str(include_str!(
-            "../../../docs/examples/asapquery-compatibility-demo-snapshot.json"
-        ))
-        .unwrap();
-        let mut entry = fixture["query_workload"]["repeating_queries"][3].clone();
-        entry["query"] = QUERY.into();
-        entry["requirements"]["accuracy"] = serde_json::json!({"explicit": {"Epsilon": 0.2}});
-        fixture["query_workload"]["repeating_queries"] = serde_json::json!([entry]);
-        fixture["implementation"]["erp"] = serde_json::json!({
-            "distribution": {"workload": {"external": {"dataset": "held-out-process-stream"}}},
-            "artifact": evidence, "implementation": "lib", "error_metric": "max_rank_err",
-            "min_trials": 10, "expected_updates": raw.len(), "expected_queries": 10.0,
-            "expected_merges": 0.0, "retention_seconds": 60.0, "cpu_weight": 0.0,
-            "byte_second_weight": 1e-9, "mode": "hybrid", "observed_shape": observation.observation,
-            "shape_match": {"minimum_benchmark_events": 1000, "max_log2_cardinality_distance": 0.0,
-                "max_parameter_distance": 0.1, "max_goodness_of_fit": 0.1,
-                "minimum_confidence": 0.8, "minimum_confidence_margin": 0.05},
-            "runtime": {"allowed_algorithms": ["Kll"], "max_memory_bytes": null}
-        });
-        let policy: control_plane::physical::erp::ErpPlanningInput =
-            serde_json::from_value(fixture["implementation"]["erp"].clone()).unwrap();
-        assert!(matches!(
-            policy.select(
-                planner_types::post_asap::SketchAlgorithm::Kll,
-                0.2,
-                planner_types::post_asap::SketchParams::Kll { k: 128 }
-            ),
-            control_plane::physical::erp::ErpParameterDecision::Empirical { .. }
-        ));
-        assert_uncertified_exact_process(fixture, &[QUERY]).await;
-    }
-}
diff --git a/data_plane/tests/support/immutable_maintenance_process.rs b/data_plane/tests/support/immutable_maintenance_process.rs
deleted file mode 100644
index 1aa1fefc5..000000000
--- a/data_plane/tests/support/immutable_maintenance_process.rs
+++ /dev/null
@@ -1,358 +0,0 @@
-//! Real selected DAG, finite source completion, and durable derived output.
-use super::*;
-
-#[tokio::test(flavor = "multi_thread", worker_threads = 2)]
-async fn single_source_maintenance_is_automatic_and_durable() {
-    run_maintenance_process(false, false).await;
-}
-
-#[tokio::test(flavor = "multi_thread", worker_threads = 2)]
-async fn two_source_maintenance_is_automatic_and_durable() {
-    run_maintenance_process(true, false).await;
-}
-
-#[tokio::test(flavor = "multi_thread", worker_threads = 2)]
-async fn complete_group_maintenance_is_automatic_and_durable() {
-    run_maintenance_process(true, true).await;
-}
-
-async fn run_maintenance_process(multi_source: bool, distinct_groups: bool) {
-    let query = if multi_source {
-        "quantile(0.9, sum_over_time(immutable_value[1m]) + sum_over_time(immutable_other[1m]))"
-    } else {
-        "quantile(0.9, sum_over_time(immutable_value[1m]))"
-    };
-    let base_expected = if multi_source { 20.0 } else { 10.0 };
-    let mut fixture: Value = serde_json::from_str(include_str!(
-        "../../../docs/examples/asapquery-compatibility-demo-snapshot.json"
-    ))
-    .unwrap();
-    let mut entry = fixture["query_workload"]["repeating_queries"][3].clone();
-    entry["query"] = query.into();
-    entry["demand"]["fixed_interval_at"]["interval"] = 60_000.into();
-    entry["demand"]["fixed_interval_at"]["evaluation_phase"] = 0.into();
-    fixture["query_workload"]["repeating_queries"] = serde_json::json!([entry]);
-    let snapshot: control_plane::physical::compiler::BackendLocalPlanningInput =
-        serde_json::from_value(fixture.clone()).unwrap();
-    let plan = quote_snapshot_for_test(snapshot).compile_promql().unwrap();
-    assert_eq!(
-        plan.precompute_plan.materializations.len(),
-        if multi_source { 3 } else { 2 }
-    );
-    let source = plan
-        .precompute_plan
-        .materializations
-        .iter()
-        .find(|m| m.derived_input.is_none())
-        .unwrap();
-    let derived = plan
-        .precompute_plan
-        .materializations
-        .iter()
-        .find(|m| m.derived_input.is_some())
-        .unwrap();
-    assert_eq!(source.window_size, 60);
-    assert_eq!(derived.window_size, 60);
-    assert_eq!(source.pane_origin_ms, Some(0));
-    assert_eq!(derived.pane_origin_ms, Some(0));
-    assert_eq!(
-        derived.derived_input.as_ref().unwrap().inputs,
-        plan.precompute_plan
-            .materializations
-            .iter()
-            .filter(|m| m.derived_input.is_none())
-            .map(|m| m.policy_fingerprint().into())
-            .collect()
-    );
-    // The production cost model may choose DDSketch or KLL. Preserve that
-    // choice and use its actual value contract for this singleton oracle.
-    let max_relative_error = match derived.aggregation_type {
-        asap_types::AggregationType::DDSketch => derived.parameters["alpha"].as_f64().unwrap(),
-        asap_types::AggregationType::DatasketchesKLL => 0.0,
-        ref other => panic!("singleton quantile oracle missing for {other:?}"),
-    };
-    eprintln!(
-        "IMMUTABLE_SELECTED {}",
-        serde_json::json!({
-            "catalog":plan.summary_catalog,"precompute":plan.precompute_plan,
-            "query":plan.query_plan,"lifecycle":plan.lifecycle_estimates
-        })
-    );
-    let install = data_plane::drivers::query::servers::http::PhysicalPlanInstallRequest {
-        summary_catalog: plan.summary_catalog,
-        collector_plans: plan.collector_plans,
-        precompute_plan: plan.precompute_plan,
-        transmission_plan: plan.transmission_plan,
-        query_plan: plan.query_plan,
-        storage_routing: None,
-        adaptation_evidence: vec![],
-    };
-    // Complete canonical populations are supported; missing source/group sets
-    // must fail closed before publishing any global output.
-    for (count, missing_source) in [(1, true), (2, true), (1, false), (2, false)] {
-        let expected = if distinct_groups && count == 2 {
-            38.0
-        } else {
-            base_expected
-        };
-        if missing_source && !multi_source {
-            continue;
-        }
-        eprintln!("IMMUTABLE_CASE count={count} missing_source_or_group={missing_source}");
-        let mut directory = tempfile::tempdir().unwrap();
-        eprintln!("IMMUTABLE_PROCESS_ARTIFACT {}", directory.path().display());
-        directory.disable_cleanup(true);
-        let artifact = directory.path().join("plan.json");
-        let disk = directory.path().join("disk");
-        std::fs::create_dir_all(&disk).unwrap();
-        std::fs::write(&artifact, serde_json::to_vec(&install).unwrap()).unwrap();
-        let spawn = |port: u16| {
-            ChildGuard(
-                Command::new(env!("CARGO_BIN_EXE_data_plane"))
-                    .arg("--physical-plan")
-                    .arg(&artifact)
-                    .args(["--http-port", &port.to_string(), "--output-dir"])
-                    .arg(directory.path())
-                    .arg("--enable-remote-write")
-                    .arg("--persistence-enabled")
-                    .arg("--persistence-dir")
-                    .arg(&disk)
-                    .args([
-                        "--persistence-memory-limit-mb",
-                        "1",
-                        "--persistence-hot-window-secs",
-                        "1",
-                        "--persistence-delete-older-than-secs",
-                        "0",
-                        "--persistence-seal-window-count",
-                        "1",
-                        "--persistence-flush-interval-ms",
-                        "10",
-                        "--precompute-allowed-lateness-ms",
-                        "0",
-                        "--precompute-flush-interval-ms",
-                        "25",
-                    ])
-                    .stdout(Stdio::null())
-                    .stderr(Stdio::inherit())
-                    .spawn()
-                    .unwrap(),
-            )
-        };
-        let client = reqwest::Client::new();
-        let port = unused_port();
-        let backend = format!("http://127.0.0.1:{port}");
-        let mut first = spawn(port);
-        wait_until_ready(&client, &format!("{backend}/api/v1/health"), &mut first.0).await;
-        let mut series: Vec<_> = (0..count)
-            .map(|i| {
-                series_with_labels(
-                    "immutable_value",
-                    &[
-                        ("instance", if i == 0 { "a" } else { "b" }),
-                        ("job", "worker"),
-                    ],
-                    &[
-                        (1_000, if distinct_groups && i == 1 { 4.0 } else { 2.0 }),
-                        (2_000, if distinct_groups && i == 1 { 6.0 } else { 3.0 }),
-                        (60_000, if distinct_groups && i == 1 { 10.0 } else { 5.0 }),
-                    ],
-                )
-            })
-            .collect();
-        if multi_source && (!missing_source || count == 2) {
-            for i in 0..if missing_source { 1 } else { count } {
-                series.push(series_with_labels(
-                    "immutable_other",
-                    &[
-                        ("instance", if i == 0 { "a" } else { "b" }),
-                        ("job", "worker"),
-                    ],
-                    &[
-                        (1_000, if distinct_groups && i == 1 { 4.0 } else { 2.0 }),
-                        (2_000, if distinct_groups && i == 1 { 6.0 } else { 3.0 }),
-                        (60_000, if distinct_groups && i == 1 { 10.0 } else { 5.0 }),
-                    ],
-                ));
-            }
-        }
-        assert_eq!(
-            remote_write(&client, &backend, &WriteRequest { timeseries: series }).await,
-            204
-        );
-        let drain = client
-            .post(format!("{backend}/api/v1/precompute/drain"))
-            .send()
-            .await
-            .unwrap();
-        if !missing_source {
-            assert!(
-                drain.status().is_success(),
-                "{}",
-                drain.text().await.unwrap()
-            );
-        }
-        let response: Value = client
-            .get(format!("{backend}/api/v1/query"))
-            .query(&[("query", query), ("time", "60")])
-            .send()
-            .await
-            .unwrap()
-            .json()
-            .await
-            .unwrap();
-        if missing_source {
-            assert!(
-                !is_warm(&response),
-                "incomplete source group set was incorrectly admitted: {response}"
-            );
-            continue;
-        }
-        assert!(is_warm(&response), "{response}");
-        assert_eq!(
-            response["data"]["result"].as_array().map(Vec::len),
-            Some(1),
-            "{response}"
-        );
-        assert_eq!(
-            response["data"]["result"][0]["metric"],
-            serde_json::json!({})
-        );
-        let estimate = response["data"]["result"][0]["value"][1]
-            .as_str()
-            .unwrap()
-            .parse::<f64>()
-            .unwrap();
-        assert!(
-            estimate.is_finite() && (estimate - expected).abs() / expected <= max_relative_error,
-            "selected population quantile exceeded its value contract: {response}"
-        );
-        let part_ids = || {
-            let mut ids = std::fs::read_dir(disk.join("sketch_index/parts"))
-                .unwrap()
-                .map(|entry| entry.unwrap().file_name())
-                .collect::<Vec<_>>();
-            ids.sort();
-            ids
-        };
-        let before_retry_parts = part_ids();
-        let repeated = client
-            .post(format!("{backend}/api/v1/precompute/drain"))
-            .send()
-            .await
-            .unwrap();
-        assert!(
-            repeated.status().is_success(),
-            "{}",
-            repeated.text().await.unwrap()
-        );
-        assert_eq!(
-            part_ids(),
-            before_retry_parts,
-            "repeated completion published extra parts"
-        );
-        drop(first);
-        let port = unused_port();
-        let backend = format!("http://127.0.0.1:{port}");
-        let mut restarted = spawn(port);
-        wait_until_ready(
-            &client,
-            &format!("{backend}/api/v1/health"),
-            &mut restarted.0,
-        )
-        .await;
-        let after: Value = client
-            .get(format!("{backend}/api/v1/query"))
-            .query(&[("query", query), ("time", "60")])
-            .send()
-            .await
-            .unwrap()
-            .json()
-            .await
-            .unwrap();
-        assert!(is_warm(&after), "{after}");
-        assert_eq!(after["data"]["result"], response["data"]["result"]);
-        assert_eq!(
-            part_ids(),
-            before_retry_parts,
-            "restart published extra immutable parts"
-        );
-        assert_ne!(
-            remote_write(
-                &client,
-                &backend,
-                &WriteRequest {
-                    timeseries: vec![series_with_labels(
-                        "immutable_value",
-                        &[("instance", "new")],
-                        &[(61_000, 1.0)]
-                    )]
-                }
-            )
-            .await,
-            204,
-            "closed generation accepted a new physical population after restart"
-        );
-        drop(restarted);
-        // Reopening admission in a new generation must not expose the prior
-        // singleton-derived output while new source populations can arrive.
-        let mut next_fixture = fixture.clone();
-        next_fixture["environment"]["plan_version"] = 2.into();
-        let next = quote_snapshot_for_test(
-            serde_json::from_value::<control_plane::physical::compiler::BackendLocalPlanningInput>(
-                next_fixture,
-            )
-            .unwrap(),
-        )
-        .compile_promql()
-        .unwrap();
-        let next_install = data_plane::drivers::query::servers::http::PhysicalPlanInstallRequest {
-            summary_catalog: next.summary_catalog,
-            collector_plans: next.collector_plans,
-            precompute_plan: next.precompute_plan,
-            transmission_plan: next.transmission_plan,
-            query_plan: next.query_plan,
-            storage_routing: None,
-            adaptation_evidence: vec![],
-        };
-        std::fs::write(&artifact, serde_json::to_vec(&next_install).unwrap()).unwrap();
-        let port = unused_port();
-        let backend = format!("http://127.0.0.1:{port}");
-        let mut next_generation = spawn(port);
-        wait_until_ready(
-            &client,
-            &format!("{backend}/api/v1/health"),
-            &mut next_generation.0,
-        )
-        .await;
-        let stale: Value = client
-            .get(format!("{backend}/api/v1/query"))
-            .query(&[("query", query), ("time", "60")])
-            .send()
-            .await
-            .unwrap()
-            .json()
-            .await
-            .unwrap();
-        assert!(
-            !is_warm(&stale),
-            "new generation reused old singleton output: {stale}"
-        );
-        assert_eq!(
-            remote_write(
-                &client,
-                &backend,
-                &WriteRequest {
-                    timeseries: vec![series_with_labels(
-                        "immutable_value",
-                        &[("instance", "next"), ("job", "worker")],
-                        &[(1_000, 17.0)]
-                    )]
-                }
-            )
-            .await,
-            204,
-            "new generation must reopen raw admission"
-        );
-    }
-}
diff --git a/data_plane/tests/support/issue_701_702_process.rs b/data_plane/tests/support/issue_701_702_process.rs
deleted file mode 100644
index 533b0d4c4..000000000
--- a/data_plane/tests/support/issue_701_702_process.rs
+++ /dev/null
@@ -1,502 +0,0 @@
-//! Issue workloads execute their selected Planner DAG on the production HTTP path.
-use super::*;
-use control_plane::physical::{
-    compiler::{
-        BackendLocalPlanningInput, DeploymentPlanCompiler, BACKEND_REVISION, PLANNER_REVISION,
-    },
-    workload_cost::{self, WorkloadCostEvidence, WorkloadQuote},
-};
-
-// This fixture backfills fifteen minutes across many maintained populations.
-// Its readiness budget covers ingestion, not a query latency benchmark.
-async fn wait_for_issue_warm_instant(
-    client: &reqwest::Client,
-    base: &str,
-    query: &str,
-    at: f64,
-    log_path: &std::path::Path,
-) -> Value {
-    let deadline = tokio::time::Instant::now() + Duration::from_secs(90);
-    loop {
-        let result: Value = client
-            .get(format!("{base}/api/v1/query"))
-            .query(&[("query", query.to_string()), ("time", at.to_string())])
-            .send()
-            .await
-            .unwrap()
-            .json()
-            .await
-            .unwrap();
-        if is_warm(&result) && first_value(&result, "value").is_some() {
-            return result;
-        }
-        assert!(
-            tokio::time::Instant::now() < deadline,
-            "{query} did not become warm: {result}; log: {}",
-            std::fs::read_to_string(log_path).unwrap_or_default()
-        );
-        tokio::time::sleep(Duration::from_millis(100)).await;
-    }
-}
-
-fn queries() -> Vec<(String, u64, u64)> {
-    let mut queries = vec![];
-    for q in [0.5, 0.55, 0.6, 0.65, 0.7, 0.75, 0.9, 0.95, 0.99, 0.999] {
-        queries.push((
-            format!("quantile_over_time({q}, issue701_data[15m])"),
-            900,
-            60,
-        ));
-        queries.push((
-            format!("quantile_over_time({q}, issue701_data[5m])"),
-            300,
-            if q == 0.9 { 30 } else { 10 },
-        ));
-        queries.push((format!("quantile by(job)({q}, issue701_data)"), 1, 1));
-    }
-    for operation in ["sum", "count", "avg", "min", "max"] {
-        queries.push((format!("{operation}_over_time(issue701_data[5m])"), 300, 30));
-    }
-    for operation in ["sum", "count", "avg"] {
-        queries.push((format!("{operation}(issue701_data)"), 1, 1));
-        queries.push((format!("{operation} by(job)(issue701_data)"), 1, 1));
-    }
-    for operation in ["sum", "count"] {
-        queries.push((
-            format!("topk(5, {operation}_over_time(issue701_data[5m]))"),
-            300,
-            30,
-        ));
-    }
-    queries.push((
-        "sum by(job)(sum_over_time(issue701_data[5m]))".into(),
-        300,
-        30,
-    ));
-    queries
-}
-
-// A single mixed workload covers moving windows, current series, minimum/average,
-// without uncertified ratios. Optional native URL adds a real Prometheus differential oracle.
-#[tokio::test(flavor = "multi_thread", worker_threads = 2)]
-async fn issue_workloads_execute_warm_at_successive_evaluations() {
-    run_warm_workload(queries()).await;
-}
-
-async fn run_warm_workload(queries: Vec<(String, u64, u64)>) {
-    let native = std::env::var("ASAP_CURRENT_SERIES_PROMETHEUS_URL").ok();
-    if let Some(url) = &native {
-        let info: Value = reqwest::get(format!("{url}/api/v1/status/buildinfo"))
-            .await
-            .unwrap()
-            .json()
-            .await
-            .unwrap();
-        let version = info["data"]["version"]
-            .as_str()
-            .expect("Prometheus version");
-        assert!(
-            version.starts_with("3."),
-            "boundary-aligned oracle requires Prometheus 3.x left-open ranges, found {version}"
-        );
-    }
-
-    let listener = tokio::net::TcpListener::bind("127.0.0.1:0").await.unwrap();
-    let mock_url = format!("http://{}", listener.local_addr().unwrap());
-    let _mock = tokio::spawn(async move {
-        axum::serve(
-            listener,
-            Router::new().route("/-/healthy", get(|| async { "healthy" })),
-        )
-        .await
-        .unwrap();
-    });
-    let mut fixture: Value = serde_json::from_str(include_str!(
-        "../../../docs/examples/asapquery-planning-snapshot.json"
-    ))
-    .unwrap();
-    fixture["implementation"]["scrape_interval_ms"] = 1000.into();
-    fixture["data_workload"]["data_ingestion_interval"]["value"] = 1000.into();
-    fixture["implementation"]["horizon_seconds"] = 3600.into();
-    let template = fixture["query_workload"]["repeating_queries"][0].clone();
-    fixture["query_workload"]["repeating_queries"] = queries
-        .iter()
-        .map(|(query, _lookback, cadence)| {
-            let mut entry = template.clone();
-            entry["query"] = query.clone().into();
-            entry["demand"]["fixed_interval_at"]["interval"] = (cadence * 1000).into();
-            if !query.contains("quantile") {
-                entry["requirements"]["accuracy"] = serde_json::json!({"explicit":"Exact"});
-            }
-            entry
-        })
-        .collect();
-    let mut snapshot: BackendLocalPlanningInput = serde_json::from_value(fixture).unwrap();
-    let (request, environment) = snapshot
-        .clone()
-        .into_physical_compilation_request()
-        .unwrap();
-    let candidates = workload_cost::enumerate_exact_and_materialized_candidates(request).unwrap();
-    let fully_warm = |plan: &control_plane::physical::compiler::CompiledPhysicalPlan| {
-        plan.query_plan.entries.values().all(|entry| entry.nodes.values().all(|node| !matches!(node,
-            control_plane::query_plan::QueryPlanNode::ExactFallback { .. }
-            | control_plane::query_plan::QueryPlanNode::ExternalExact { .. }
-            | control_plane::query_plan::QueryPlanNode::Logical {
-                operator: control_plane::query_plan::query_time::QueryTimeOperator::ExactSubquery { .. }
-                    | control_plane::query_plan::query_time::QueryTimeOperator::CandidateExactSubquery { .. }, ..
-            }
-        )))
-    };
-    let mut errors = vec![];
-    let mut found = false;
-    let quotes = candidates
-        .into_iter()
-        .filter_map(|candidate| {
-            let plan = match DeploymentPlanCompiler
-                .compile_promql(candidate.clone(), environment.clone())
-            {
-                Ok(plan) => plan,
-                Err(error) => {
-                    errors.push(error.to_string());
-                    return None;
-                }
-            };
-            let warm = fully_warm(&plan);
-
-            found |= warm;
-            let manifest = workload_cost::manifest(&plan, &candidate.queries).unwrap();
-            Some(WorkloadQuote {
-                unit_costs: manifest
-                    .components
-                    .keys()
-                    .map(|key| (key.clone(), if warm { 1.0 } else { 1e12 }))
-                    .collect(),
-                manifest,
-                executable: true,
-            })
-        })
-        .collect();
-    assert!(found, "no complete warm candidate: {errors:?}");
-    snapshot.workload_cost_evidence = Some(WorkloadCostEvidence {
-        backend_revision: BACKEND_REVISION.into(),
-        planner_revision: PLANNER_REVISION.into(),
-        data_snapshot_id: "issue-701-702-process".into(),
-        model_version: "synthetic-correctness-quotes".into(),
-        observed_at_unix_ms: environment.observed_at_unix_ms,
-        valid_for_ms: environment.max_evidence_age_ms,
-        quotes,
-    });
-    let plan = snapshot.clone().compile_promql().unwrap();
-    assert!(fully_warm(&plan));
-    let output = tempfile::tempdir().unwrap();
-    let path = output.path().join("snapshot.json");
-    std::fs::write(&path, serde_json::to_vec(&snapshot).unwrap()).unwrap();
-    let port = unused_port();
-    let mut command = Command::new(env!("CARGO_BIN_EXE_data_plane"));
-    command
-        .args(["--profile", "asapquery", "--planning-snapshot"])
-        .arg(&path)
-        .args(["--http-port", &port.to_string(), "--output-dir"])
-        .arg(output.path())
-        .args([
-            "--precompute-allowed-lateness-ms",
-            "0",
-            "--precompute-flush-interval-ms",
-            "25",
-        ])
-        .stdout(Stdio::null())
-        .stderr(Stdio::inherit());
-    command.args([
-        "--prometheus-server",
-        native.as_deref().unwrap_or(&mock_url),
-        "--forward-unsupported-queries",
-    ]);
-    let mut child = ChildGuard(command.spawn().unwrap());
-    let client = reqwest::Client::new();
-    let backend = format!("http://127.0.0.1:{port}");
-    wait_until_ready(&client, &format!("{backend}/api/v1/health"), &mut child.0).await;
-    let now = std::time::SystemTime::now()
-        .duration_since(std::time::UNIX_EPOCH)
-        .unwrap()
-        .as_millis() as i64;
-    let origin = now - now.rem_euclid(900_000) - 1_800_000;
-    for (start, end) in [(1, 901), (902, 961)] {
-        let wire = WriteRequest {
-            timeseries: [("a", "api", 1.0), ("b", "api", 2.0), ("c", "db", 3.0)]
-                .into_iter()
-                .map(|(pod, job, factor)| {
-                    let samples: Vec<_> = (start..=end)
-                        .map(|i| (origin + i * 1000, factor * (1 + i % 31) as f64))
-                        .collect();
-                    series_with_labels("issue701_data", &[("pod", pod), ("job", job)], &samples)
-                })
-                .collect(),
-        };
-        if let Some(url) = &native {
-            assert_eq!(remote_write(&client, url, &wire).await, 204);
-        }
-        assert_eq!(remote_write(&client, &backend, &wire).await, 204);
-        for (query, _, _) in &queries {
-            // Temporal reads trail the source watermark by one sample; current
-            // populations are queried at the latest input, without historical replay.
-            let evaluation = if query.contains('[') { end - 1 } else { end };
-            let at = (origin + evaluation * 1000) as f64 / 1000.0;
-            let actual = wait_for_issue_warm_instant(
-                &client,
-                &backend,
-                query,
-                at,
-                &output.path().join("query_engine.log"),
-            )
-            .await;
-            assert!(is_warm(&actual), "{query}: {actual}");
-            assert!(
-                actual["infos"]
-                    .as_array()
-                    .unwrap()
-                    .iter()
-                    .any(|info| info == "execution: asap"),
-                "{query}: {actual}"
-            );
-            if let Some(url) = &native {
-                let expected: Value = client
-                    .get(format!("{url}/api/v1/query"))
-                    .query(&[("query", query.clone()), ("time", at.to_string())])
-                    .send()
-                    .await
-                    .unwrap()
-                    .json()
-                    .await
-                    .unwrap();
-                let rows = |body: &Value| -> std::collections::BTreeMap<String, f64> {
-                    body["data"]["result"]
-                        .as_array()
-                        .unwrap()
-                        .iter()
-                        .map(|row| {
-                            (
-                                serde_json::to_string(&row["metric"]).unwrap(),
-                                row["value"][1].as_str().unwrap().parse().unwrap(),
-                            )
-                        })
-                        .collect()
-                };
-                let (actual, expected) = (rows(&actual), rows(&expected));
-                assert_eq!(
-                    actual.keys().collect::<Vec<_>>(),
-                    expected.keys().collect::<Vec<_>>(),
-                    "{query}"
-                );
-                for (labels, truth) in expected {
-                    let tolerance = if query.contains("quantile") {
-                        0.01 * truth.abs()
-                    } else {
-                        1e-9 * truth.abs().max(1.0)
-                    };
-                    assert!(
-                        (actual[&labels] - truth).abs() <= tolerance,
-                        "{query}: {} vs {truth}",
-                        actual[&labels]
-                    );
-                }
-            }
-        }
-    }
-}
-
-// Each supported #702 query must independently compile and execute without an exact service.
-#[tokio::test(flavor = "multi_thread", worker_threads = 2)]
-async fn issue_702_individual_queries_execute_without_fallback() {
-    for query in [
-        "quantile by (job) (0.9, issue701_data)",
-        "sum by (job) (issue701_data)",
-        "sum(issue701_data)",
-        "avg_over_time(issue701_data[5m])",
-        "count by (job) (issue701_data)",
-        "count(issue701_data)",
-        "avg by (job) (issue701_data)",
-        "sum by (job) (sum_over_time(issue701_data[5m]))",
-    ] {
-        eprintln!("Checking acceleration: {query}");
-        let temporal = query.contains('[');
-        run_warm_workload(vec![(
-            query.into(),
-            if temporal { 300 } else { 1 },
-            if temporal { 30 } else { 1 },
-        )])
-        .await;
-    }
-}
-
-// Rank-error guarantees do not certify division; keep this limitation explicit in CI.
-#[test]
-fn issue_701_702_uncertified_ratios_require_exact_fallback() {
-    for query in [
-        "quantile_over_time(0.9, issue701_data[5m]) / quantile_over_time(0.5, issue701_data[5m])",
-        "avg_over_time(issue701_data[5m]) / quantile_over_time(0.5, issue701_data[5m])",
-    ] {
-        let mut fixture: Value = serde_json::from_str(include_str!(
-            "../../../docs/examples/asapquery-planning-snapshot.json"
-        ))
-        .unwrap();
-        fixture["query_workload"]["repeating_queries"][0]["query"] = query.into();
-        fixture["data_workload"]["data_ingestion_interval"]["value"] = 1000.into();
-        let snapshot: BackendLocalPlanningInput = serde_json::from_value(fixture).unwrap();
-        let (request, environment) = snapshot.into_physical_compilation_request().unwrap();
-        let candidates =
-            workload_cost::enumerate_exact_and_materialized_candidates(request).unwrap();
-        assert!(!candidates.is_empty());
-        for candidate in candidates {
-            let plan = DeploymentPlanCompiler
-                .compile_promql(candidate, environment.clone())
-                .unwrap();
-            assert!(plan.precompute_plan.materializations.is_empty(), "{query}");
-            assert!(
-                plan.query_plan.entries.values().all(|entry| matches!(
-                    entry.nodes.get(&entry.root),
-                    Some(control_plane::query_plan::QueryPlanNode::ExactFallback { .. })
-                )),
-                "{query}"
-            );
-        }
-    }
-}
-
-// Finite input can overflow sum; the installed average must fall back while zero stays warm.
-#[tokio::test]
-async fn temporal_average_overflow_falls_back_after_state_is_warm() {
-    let native = std::env::var("ASAP_CURRENT_SERIES_PROMETHEUS_URL").ok();
-    let listener = tokio::net::TcpListener::bind("127.0.0.1:0").await.unwrap();
-    let mock_url = format!("http://{}", listener.local_addr().unwrap());
-    let mock = tokio::spawn(async move {
-        axum::serve(listener, Router::new()
-            .route("/-/healthy", get(|| async { "healthy" }))
-            .route("/api/v1/query", get(|| async { Json(serde_json::json!({"status":"success", "data":{"resultType":"vector", "result":[{"metric":{},"value":[0,"1e308"]}]}})) })))
-            .await.unwrap();
-    });
-    let mut fixture: Value = serde_json::from_str(include_str!(
-        "../../../docs/examples/asapquery-planning-snapshot.json"
-    ))
-    .unwrap();
-    fixture["implementation"]["scrape_interval_ms"] = 1000.into();
-    let template = fixture["query_workload"]["repeating_queries"][0].clone();
-    fixture["query_workload"]["repeating_queries"] = ["avg", "sum", "count"]
-        .map(|op| {
-            let mut entry = template.clone();
-            entry["query"] = format!("{op}_over_time(average_overflow[5s])").into();
-            entry["demand"]["fixed_interval_at"]["interval"] = 1000.into();
-            entry["requirements"]["accuracy"] = serde_json::json!({"explicit":"Exact"});
-            entry
-        })
-        .to_vec()
-        .into();
-    let snapshot = quote_snapshot_for_test(serde_json::from_value(fixture).unwrap());
-    let plan = snapshot.clone().compile_promql().unwrap();
-    assert!(plan
-        .query_plan
-        .entries
-        .values()
-        .flat_map(|entry| entry.nodes.values())
-        .any(|node| matches!(
-            node,
-            control_plane::query_plan::QueryPlanNode::Logical {
-                operator: control_plane::query_plan::query_time::QueryTimeOperator::Binary {
-                    operation: control_plane::query_plan::query_time::BinaryOperation::FiniteDiv,
-                    ..
-                },
-                ..
-            }
-        )));
-    let output = tempfile::tempdir().unwrap();
-    let path = output.path().join("snapshot.json");
-    std::fs::write(&path, serde_json::to_vec(&snapshot).unwrap()).unwrap();
-    let port = unused_port();
-    let mut command = Command::new(env!("CARGO_BIN_EXE_data_plane"));
-    command
-        .args(["--profile", "asapquery", "--planning-snapshot"])
-        .arg(&path)
-        .args(["--http-port", &port.to_string(), "--output-dir"])
-        .arg(output.path())
-        .args([
-            "--precompute-allowed-lateness-ms",
-            "0",
-            "--precompute-flush-interval-ms",
-            "25",
-            "--prometheus-server",
-            native.as_deref().unwrap_or(&mock_url),
-            "--forward-unsupported-queries",
-        ])
-        .stdout(Stdio::null())
-        .stderr(Stdio::inherit());
-    let mut child = ChildGuard(command.spawn().unwrap());
-    let client = reqwest::Client::new();
-    let backend = format!("http://127.0.0.1:{port}");
-    wait_until_ready(&client, &format!("{backend}/api/v1/health"), &mut child.0).await;
-    let now = std::time::SystemTime::now()
-        .duration_since(std::time::UNIX_EPOCH)
-        .unwrap()
-        .as_millis() as i64;
-    let origin = now - now.rem_euclid(1000) - 60_000;
-    for (start, end, value) in [(1, 6, 0.0), (7, 12, 1e308)] {
-        let samples: Vec<_> = (start..=end).map(|i| (origin + i * 1000, value)).collect();
-        let wire = WriteRequest {
-            timeseries: vec![series_with_labels("average_overflow", &[], &samples)],
-        };
-        if let Some(url) = &native {
-            assert_eq!(remote_write(&client, url, &wire).await, 204);
-        }
-        assert_eq!(remote_write(&client, &backend, &wire).await, 204);
-        let at = (origin + (end - 1) * 1000) as f64 / 1000.0;
-        for op in ["sum", "count"] {
-            wait_for_issue_warm_instant(
-                &client,
-                &backend,
-                &format!("{op}_over_time(average_overflow[5s])"),
-                at,
-                &output.path().join("query_engine.log"),
-            )
-            .await;
-        }
-        let query = "avg_over_time(average_overflow[5s])";
-        if value == 0.0 {
-            let result = wait_for_issue_warm_instant(
-                &client,
-                &backend,
-                query,
-                at,
-                &output.path().join("query_engine.log"),
-            )
-            .await;
-            assert_eq!(first_value(&result, "value"), Some(0.0));
-        } else {
-            let params = [("query", query.to_string()), ("time", at.to_string())];
-            let actual: Value = client
-                .get(format!("{backend}/api/v1/query"))
-                .query(&params)
-                .send()
-                .await
-                .unwrap()
-                .json()
-                .await
-                .unwrap();
-            assert!(
-                !is_warm(&actual),
-                "overflowed average must fall back: {actual}"
-            );
-            assert_eq!(first_value(&actual, "value"), Some(1e308), "{actual}");
-            if let Some(url) = &native {
-                let expected: Value = client
-                    .get(format!("{url}/api/v1/query"))
-                    .query(&params)
-                    .send()
-                    .await
-                    .unwrap()
-                    .json()
-                    .await
-                    .unwrap();
-                assert_eq!(actual["data"], expected["data"]);
-            }
-        }
-    }
-    mock.abort();
-}
diff --git a/data_plane/tests/support/physical_fixture.rs b/data_plane/tests/support/physical_fixture.rs
deleted file mode 100644
index 1b9b03823..000000000
--- a/data_plane/tests/support/physical_fixture.rs
+++ /dev/null
@@ -1,350 +0,0 @@
-//! Explicit query bindings for transport/decoder fixtures. These tests supply
-//! accumulator states; planner selection is covered separately by ERP/process tests.
-
-use control_plane::{physical::compiler::*, query_plan::*};
-use data_plane::{
-    drivers::query::servers::http::PhysicalPlanInstallRequest,
-    storage_engines::types::{ActivePhysicalPlan, BackendStorageRouting, InstalledPrecomputePlan},
-};
-use std::{collections::BTreeMap, sync::Arc};
-
-/// Imported-state fixtures bind explicit storage metadata, never a flat runtime config.
-#[allow(dead_code)]
-pub fn materialization(
-    metric: &str,
-    family: asap_types::AggregationType,
-    parameters: std::collections::HashMap<String, serde_json::Value>,
-) -> asap_types::PrecomputeMaterialization {
-    asap_types::PrecomputeMaterialization::new(
-        family,
-        String::new(),
-        parameters,
-        asap_types::KeyByLabelNames::new(vec!["service".into()]),
-        asap_types::KeyByLabelNames::empty(),
-        asap_types::KeyByLabelNames::empty(),
-        String::new(),
-        1,
-        1,
-        asap_types::enums::WindowKind::Tumbling,
-        String::new(),
-        metric.into(),
-        None,
-        None,
-        None,
-    )
-}
-
-pub fn artifact(config: &InstalledPrecomputePlan) -> PhysicalPlanInstallRequest {
-    artifact_from_materializations(config.materializations().values().cloned().collect())
-}
-
-/// Same as [`artifact`], but from materializations the planner produced
-/// directly — no legacy `InstalledPrecomputePlan` document in between.
-pub fn artifact_from_materializations(
-    mut configs: Vec<asap_types::PrecomputeMaterialization>,
-) -> PhysicalPlanInstallRequest {
-    let envelope = PlanEnvelope {
-        plan_id: 1,
-        plan_version: 1,
-        generated_at_unix_ms: 0,
-        activation_unix_ms: 0,
-        expiry_unix_ms: None,
-        backend_compat: BACKEND_COMPAT.into(),
-        planner_revision: PLANNER_REVISION.into(),
-        capability_snapshot_id: "transport-fixture".into(),
-    };
-    // Installed physical plans always carry an explicit pane phase. Inputs that
-    // predate that contract bind to the Unix epoch grid before deriving catalog
-    // identities and bindings.
-    for config in &mut configs {
-        config.pane_origin_ms.get_or_insert(0);
-        // These fixtures import synthetic states and replace the producer's
-        // window layout. They do not install the original Planner DAG, so
-        // describe the supplied source/configuration instead of claiming its
-        // persisted-output closure. Derived inputs require the real DAG.
-        assert!(
-            config.derived_input.is_none(),
-            "use the Planner plan for derived inputs"
-        );
-        config.semantic_fragment = None;
-    }
-    let catalog = control_plane::physical::summary_catalog::SummaryCatalog::from_materializations(
-        1, 1, &configs,
-    )
-    .unwrap();
-    let mut precompute =
-        PrecomputePlan::build(envelope.clone(), configs, &["fixture".into()]).unwrap();
-    precompute.bind_catalog(&catalog).unwrap();
-    let mut transmission = control_plane::physical::compiler::build_transmission_plan(
-        envelope,
-        &precompute,
-        &BTreeMap::new(),
-    )
-    .unwrap();
-    transmission.summary_catalog = Some(catalog.reference().unwrap());
-    let mut query_plan = QueryPlan {
-        plan_id: 1,
-        plan_version: 1,
-        clickhouse_context: None,
-        selected_dags: Default::default(),
-        entries: BTreeMap::new(),
-    };
-    for config in &precompute.materializations {
-        use data_plane::storage_engines::types::AggregationType;
-        let metric = &config.metric;
-        let mut queries = Vec::new();
-        match config.aggregation_type {
-            AggregationType::DatasketchesKLL | AggregationType::DDSketch => {
-                for (window, ms) in [
-                    ("1s", 1_000),
-                    ("2s", 2_000),
-                    ("3s", 3_000),
-                    ("10s", 10_000),
-                    ("3m", 180_000),
-                ] {
-                    for q in [0.5, 0.99] {
-                        queries.push((
-                            format!("quantile_over_time({q}, {metric}[{window}])"),
-                            QueryReadout::Quantile { q },
-                            ms,
-                            PhysicalGrouping::PerEntity,
-                        ));
-                    }
-                }
-            }
-            AggregationType::HLL => queries.push((
-                format!("count({metric})"),
-                QueryReadout::Cardinality,
-                2_000,
-                PhysicalGrouping::Reduce(vec![]),
-            )),
-            _ => {
-                for seconds in [1, 2, 10] {
-                    for value in [None, Some("alpha".to_string())] {
-                        let filter = value
-                            .as_ref()
-                            .map(|v| format!("{{item=\"{v}\"}}"))
-                            .unwrap_or_default();
-                        queries.push((
-                            format!("count_over_time({metric}{filter}[{seconds}s])"),
-                            QueryReadout::PointCount {
-                                key: if value.is_some() {
-                                    planner_types::pre_asap::ColumnRef::Named("item".into())
-                                } else {
-                                    planner_types::pre_asap::ColumnRef::SampleValue
-                                },
-                                value,
-                            },
-                            seconds * 1000,
-                            PhysicalGrouping::PerEntity,
-                        ));
-                    }
-                }
-            }
-        }
-        for (query, readout, lookback_ms, output_grouping) in queries {
-            let canonical = canonical_promql(&query).unwrap();
-            query_plan.entries.insert(
-                canonical.clone(),
-                QueryPlanEntry {
-                    language: asap_types::query_plan::QueryLanguage::PromQl,
-                    query_id: canonical.clone(),
-                    canonical_query: canonical,
-                    fixed_evaluation: None,
-                    root: QueryNodeId(1),
-                    nodes: BTreeMap::from([
-                        (
-                            QueryNodeId(0),
-                            QueryPlanNode::ReadMaterialization {
-                                binding: MaterializationBinding {
-                                    full_window_slide_ms: None,
-                                    materialization: config.policy_fingerprint().into(),
-                                    stored_output_reference:
-                                        asap_types::sds::StoredOutputReference::for_output(
-                                            config.policy_fingerprint().into(),
-                                        ),
-                                    output_grouping,
-                                    item_labels: config.aggregated_labels.labels.clone(),
-                                    window_ms: config.slide_interval * 1000,
-                                    pane_origin_ms: config.pane_origin_ms,
-                                    readout_lookback_ms: Some(lookback_ms),
-                                },
-                            },
-                        ),
-                        (
-                            QueryNodeId(1),
-                            QueryPlanNode::SummaryEstimate {
-                                input: QueryNodeId(0),
-                                query: readout,
-                            },
-                        ),
-                    ]),
-                    instant: InstantExecution {
-                        lookback_ms,
-                        full_history: false,
-                        cumulative_readout: true,
-                    },
-                    fallback: FallbackPolicy::Reject,
-                },
-            );
-        }
-    }
-    query_plan.bind_catalog(&catalog).unwrap();
-    PhysicalPlanInstallRequest {
-        summary_catalog: catalog,
-        collector_plans: vec![],
-        precompute_plan: precompute,
-        transmission_plan: transmission,
-        query_plan,
-        storage_routing: None,
-        adaptation_evidence: vec![],
-    }
-}
-
-#[allow(dead_code)]
-pub fn bootstrap() -> ActivePhysicalPlan {
-    let mut plan = data_plane::drivers::query::servers::http::build_active_physical_plan(
-        artifact(&InstalledPrecomputePlan::default()),
-        Arc::new(BackendStorageRouting::empty()),
-    )
-    .unwrap();
-    plan.envelope.plan_id = 0;
-    plan.envelope.plan_version = 0;
-    plan.precompute_plan.envelope = plan.envelope.clone();
-    plan.transmission_plan.envelope = plan.envelope.clone();
-    plan.summary_catalog = None;
-    plan
-}
-
-pub fn stamp(
-    request: &mut asap_otel_proto::tonic::collector::metrics::v1::ExportMetricsServiceRequest,
-    plan: &PhysicalPlanInstallRequest,
-) {
-    use asap_otel_proto::tonic::{
-        common::v1::{any_value, AnyValue, KeyValue},
-        metrics::v1::{
-            metric::Data, CountMinSketchEncoding, CountSketchEncoding, DdSketchEncoding,
-            HllSketchEncoding, KllSketchEncoding,
-        },
-    };
-    for metric in request
-        .resource_metrics
-        .iter_mut()
-        .flat_map(|r| &mut r.scope_metrics)
-        .flat_map(|s| &mut s.metrics)
-    {
-        let schema = plan.precompute_plan.schemas.iter().find(|s| matches!(&s.source,
-            planner_types::pre_asap::Source::TimeSeries { metric: name }
-                if name == &metric.name || metric.name.strip_suffix("_ddsketch") == Some(name.as_str()))).unwrap();
-        let add = |attrs: &mut Vec<KeyValue>, proto: bool, delta: bool| {
-            let labels: Vec<_> = attrs
-                .iter()
-                .filter_map(|a| match a.value.as_ref()?.value.as_ref()? {
-                    any_value::Value::StringValue(v) => Some((a.key.as_str(), v.as_str())),
-                    _ => None,
-                })
-                .collect();
-            let identity = data_plane::drivers::ingest::canonical_attrs_fingerprint(&labels);
-            // Sequences belong to one producer stream, not the parallel test suite.
-            static STREAMS: std::sync::OnceLock<std::sync::Mutex<BTreeMap<String, (u64, String)>>> =
-                std::sync::OnceLock::new();
-            let mut streams = STREAMS.get_or_init(Default::default).lock().unwrap();
-            let key = format!("{plan:p}:{}:{identity}", schema.materialization.0);
-            let (sequence, checkpoint) = streams.entry(key).or_default();
-            *sequence += 1;
-            if !delta {
-                *checkpoint = format!("fixture-{sequence}");
-            }
-            assert!(!checkpoint.is_empty(), "delta requires a full checkpoint");
-            for (key, value) in [
-                ("identity_version", "1".into()),
-                ("plan_id", "1".into()),
-                ("plan_version", "1".into()),
-                ("backend_compat", BACKEND_COMPAT.into()),
-                (
-                    "materialization",
-                    schema.materialization.as_u64().to_string(),
-                ),
-                ("schema_id", schema.schema_id.clone()),
-                ("producer_id", "fixture".into()),
-                ("producer_epoch", "fixture".into()),
-                ("sequence", sequence.to_string()),
-                ("series_identity", identity),
-                ("kind", if delta { "delta" } else { "full" }.into()),
-                (
-                    if delta {
-                        "base_checkpoint_id"
-                    } else {
-                        "checkpoint_id"
-                    },
-                    checkpoint.clone(),
-                ),
-                (
-                    "encoding",
-                    if proto {
-                        "sketchlib_protobuf_v1"
-                    } else {
-                        "sketch_core_msgpack_v1"
-                    }
-                    .into(),
-                ),
-            ] {
-                attrs.push(KeyValue {
-                    key: format!("asap.frame.{key}"),
-                    value: Some(AnyValue {
-                        value: Some(any_value::Value::StringValue(value)),
-                    }),
-                });
-            }
-        };
-        match metric.data.as_mut().unwrap() {
-            Data::Ddsketch(s) => {
-                for p in &mut s.data_points {
-                    add(
-                        &mut p.attributes,
-                        p.encoding == DdSketchEncoding::DdsketchEncodingProto as i32
-                            || p.encoding == 2,
-                        p.encoding == 2,
-                    );
-                }
-            }
-            Data::Kllsketch(s) => {
-                for p in &mut s.data_points {
-                    add(
-                        &mut p.attributes,
-                        p.encoding == KllSketchEncoding::Proto as i32,
-                        false,
-                    );
-                }
-            }
-            Data::Hllsketch(s) => {
-                for p in &mut s.data_points {
-                    add(
-                        &mut p.attributes,
-                        p.encoding == HllSketchEncoding::Proto as i32,
-                        false,
-                    );
-                }
-            }
-            Data::Countminsketch(s) => {
-                for p in &mut s.data_points {
-                    add(
-                        &mut p.attributes,
-                        p.encoding != CountMinSketchEncoding::Msgpack as i32,
-                        false,
-                    );
-                }
-            }
-            Data::Countsketch(s) => {
-                for p in &mut s.data_points {
-                    add(
-                        &mut p.attributes,
-                        p.encoding != CountSketchEncoding::Msgpack as i32,
-                        false,
-                    );
-                }
-            }
-            _ => panic!("sketch fixture required"),
-        }
-    }
-}
diff --git a/data_plane/tests/support/revisable_maintenance_process.rs b/data_plane/tests/support/revisable_maintenance_process.rs
deleted file mode 100644
index eac0f8ca9..000000000
--- a/data_plane/tests/support/revisable_maintenance_process.rs
+++ /dev/null
@@ -1,205 +0,0 @@
-//! Black-box Remote Write -> selected DAG -> revision checkpoint -> bound query.
-use super::*;
-
-/// Late input replaces both base and derived results, survives same-version
-/// restart, and cannot leak a valid prefix from an expired mixed request.
-#[tokio::test(flavor = "multi_thread", worker_threads = 2)]
-async fn continuous_revisions_replace_results_and_recover() {
-    run_revisions(false).await;
-}
-
-/// The same input snapshot feeds both arithmetic branches before building the
-/// persisted sketch; revising A preserves the unchanged B contribution.
-#[tokio::test(flavor = "multi_thread", worker_threads = 2)]
-async fn continuous_revisions_keep_two_source_dag_consistent() {
-    run_revisions(true).await;
-}
-
-async fn run_revisions(multi_source: bool) {
-    let query = if multi_source {
-        "quantile(0.9, sum_over_time(revisable_value[1m]) + sum_over_time(revisable_other[1m]))"
-    } else {
-        "quantile(0.9, sum_over_time(revisable_value[1m]))"
-    };
-    let mut fixture: Value = serde_json::from_str(include_str!(
-        "../../../docs/examples/asapquery-compatibility-demo-snapshot.json"
-    ))
-    .unwrap();
-    let mut entry = fixture["query_workload"]["repeating_queries"][3].clone();
-    entry["query"] = query.into();
-    entry["demand"]["fixed_interval_at"]["interval"] = 60_000.into();
-    entry["demand"]["fixed_interval_at"]["evaluation_phase"] = 0.into();
-    fixture["query_workload"]["repeating_queries"] = serde_json::json!([entry]);
-    let compile = |fixture: Value| {
-        let plan = quote_snapshot_for_test(serde_json::from_value(fixture).unwrap())
-            .compile_promql()
-            .unwrap();
-        assert!(plan
-            .precompute_plan
-            .materializations
-            .iter()
-            .any(|m| m.derived_input.is_some()));
-        data_plane::drivers::query::servers::http::PhysicalPlanInstallRequest {
-            summary_catalog: plan.summary_catalog,
-            collector_plans: plan.collector_plans,
-            precompute_plan: plan.precompute_plan,
-            transmission_plan: plan.transmission_plan,
-            query_plan: plan.query_plan,
-            storage_routing: None,
-            adaptation_evidence: vec![],
-        }
-    };
-    let directory = tempfile::tempdir().unwrap();
-    let artifact = directory.path().join("plan.json");
-    let installed = compile(fixture.clone());
-    let derived = installed
-        .precompute_plan
-        .materializations
-        .iter()
-        .find(|m| m.derived_input.is_some())
-        .unwrap();
-    let relative_error = match derived.aggregation_type {
-        asap_types::AggregationType::DDSketch => derived.parameters["alpha"].as_f64().unwrap(),
-        asap_types::AggregationType::DatasketchesKLL => 0.0,
-        ref other => panic!("singleton revision oracle missing for {other:?}"),
-    };
-    std::fs::write(&artifact, serde_json::to_vec(&installed).unwrap()).unwrap();
-    let spawn = |port: u16| {
-        ChildGuard(
-            Command::new(env!("CARGO_BIN_EXE_data_plane"))
-                .arg("--physical-plan")
-                .arg(&artifact)
-                .arg("--http-port")
-                .arg(port.to_string())
-                .arg("--output-dir")
-                .arg(directory.path())
-                .arg("--enable-remote-write")
-                .arg("--remote-write-revision-dir")
-                .arg(directory.path().join("revisions"))
-                .args([
-                    "--remote-write-correction-horizon-ms",
-                    "300000",
-                    "--remote-write-revision-freshness-ms",
-                    "60000",
-                ])
-                .stdout(Stdio::null())
-                .stderr(Stdio::inherit())
-                .spawn()
-                .unwrap(),
-        )
-    };
-    let client = reqwest::Client::new();
-    let port = unused_port();
-    let backend = format!("http://127.0.0.1:{port}");
-    let mut child = spawn(port);
-    wait_until_ready(&client, &format!("{backend}/api/v1/health"), &mut child.0).await;
-    let now = std::time::SystemTime::now()
-        .duration_since(std::time::UNIX_EPOCH)
-        .unwrap()
-        .as_millis() as i64;
-    let start = (now / 60_000 - 1) * 60_000;
-    let end = start + 60_000;
-    let request = |samples: &[(i64, f64)]| {
-        let mut timeseries = vec![series_with_labels(
-            "revisable_value",
-            &[("instance", "a"), ("job", "worker")],
-            samples,
-        )];
-        if multi_source {
-            timeseries.push(series_with_labels(
-                "revisable_other",
-                &[("instance", "a"), ("job", "worker")],
-                &[(start + 1000, 10.)],
-            ));
-        }
-        WriteRequest { timeseries }
-    };
-    let read = |base: String| {
-        let client = client.clone();
-        async move {
-            client
-                .get(format!("{base}/api/v1/query"))
-                .query(&[
-                    ("query", query.to_string()),
-                    ("time", (end / 1000).to_string()),
-                ])
-                .send()
-                .await
-                .unwrap()
-                .json::<Value>()
-                .await
-                .unwrap()
-        }
-    };
-    let assert_value = |response: &Value, expected: f64| {
-        let expected = expected + if multi_source { 10. } else { 0. };
-        assert!(is_warm(response), "{response}");
-        let value = response["data"]["result"][0]["value"][1]
-            .as_str()
-            .unwrap()
-            .parse::<f64>()
-            .unwrap();
-        assert!(
-            (value - expected).abs() <= expected * relative_error + 1e-12,
-            "expected {expected}, got {response}"
-        );
-    };
-    assert_eq!(
-        remote_write(
-            &client,
-            &backend,
-            &request(&[(start + 1000, 2.), (start + 2000, 3.)])
-        )
-        .await,
-        204
-    );
-    assert_value(&read(backend.clone()).await, 5.);
-    assert_eq!(
-        remote_write(&client, &backend, &request(&[(start + 1500, 4.)])).await,
-        204
-    );
-    assert_value(&read(backend.clone()).await, 9.);
-    // A retry must not double count accepted input.
-    assert_eq!(
-        remote_write(&client, &backend, &request(&[(start + 1500, 4.)])).await,
-        204
-    );
-    assert_value(&read(backend.clone()).await, 9.);
-    assert_eq!(
-        remote_write(
-            &client,
-            &backend,
-            &request(&[(start + 3000, 7.), (start - 600_000, 99.)])
-        )
-        .await,
-        400
-    );
-    assert_value(&read(backend.clone()).await, 9.);
-    drop(child);
-    let port = unused_port();
-    let backend = format!("http://127.0.0.1:{port}");
-    let mut child = spawn(port);
-    wait_until_ready(&client, &format!("{backend}/api/v1/health"), &mut child.0).await;
-    assert_value(&read(backend.clone()).await, 9.);
-    assert_eq!(
-        remote_write(&client, &backend, &request(&[(start + 3000, 7.)])).await,
-        204
-    );
-    assert_value(&read(backend.clone()).await, 16.);
-    drop(child);
-    fixture["environment"]["plan_version"] = 2.into();
-    std::fs::write(&artifact, serde_json::to_vec(&compile(fixture)).unwrap()).unwrap();
-    let port = unused_port();
-    let backend = format!("http://127.0.0.1:{port}");
-    let mut child = spawn(port);
-    wait_until_ready(&client, &format!("{backend}/api/v1/health"), &mut child.0).await;
-    assert!(
-        !is_warm(&read(backend.clone()).await),
-        "new plan version reused prior revision"
-    );
-    assert_eq!(
-        remote_write(&client, &backend, &request(&[(start + 1000, 11.)])).await,
-        204
-    );
-    assert_value(&read(backend.clone()).await, 11.);
-}
diff --git a/data_plane/tests/support/univmon_erp_process.rs b/data_plane/tests/support/univmon_erp_process.rs
deleted file mode 100644
index 52a43ae79..000000000
--- a/data_plane/tests/support/univmon_erp_process.rs
+++ /dev/null
@@ -1,141 +0,0 @@
-use super::*;
-use asap_physical_operators::summary_kernels::univmon::UnivMonAccumulator;
-use control_plane::physical::erp::ErpShapeObserver;
-use data_plane::storage_engines::types::{AggregateCore, SerializableToSink};
-
-fn values(offset: usize) -> Vec<f64> {
-    (1..=128)
-        .flat_map(|key| std::iter::repeat_n((key + offset) as f64, 256 / key))
-        .collect()
-}
-
-fn truth(raw: &[f64]) -> [f64; 3] {
-    let mut counts = std::collections::HashMap::<u64, usize>::new();
-    for value in raw {
-        *counts.entry(value.to_bits()).or_default() += 1;
-    }
-    let l2 = counts
-        .values()
-        .map(|n| (*n as f64).powi(2))
-        .sum::<f64>()
-        .sqrt();
-    let entropy = counts
-        .values()
-        .map(|n| {
-            let p = *n as f64 / raw.len() as f64;
-            -p * p.log2()
-        })
-        .sum();
-    [counts.len() as f64, l2, entropy]
-}
-
-fn measured_artifact() -> Value {
-    let mut records = Vec::new();
-    for (heap, cols) in [(8, 128), (128, 1024)] {
-        let mut errors = [0.0f64; 3];
-        let mut bytes = 0;
-        // Independent key populations exercise fixed implementation hashes.
-        // These are empirical trials, not a claimed tail-probability bound.
-        for trial in 0..10 {
-            let raw = values(trial * 1000);
-            let exact = truth(&raw);
-            let mut panes = [
-                UnivMonAccumulator::new(heap, 5, cols, 4).unwrap(),
-                UnivMonAccumulator::new(heap, 5, cols, 4).unwrap(),
-            ];
-            for (i, value) in raw.iter().enumerate() {
-                panes[i % 2].insert_sample(*value).unwrap();
-            }
-            let other = panes[1].clone();
-            panes[0].merge_in_place(&other).unwrap();
-            bytes = bytes.max(panes[0].serialize_to_bytes().len());
-            for (i, stat) in [
-                asap_types::Statistic::Cardinality,
-                asap_types::Statistic::FrequencyL2,
-                asap_types::Statistic::FrequencyEntropy,
-            ]
-            .into_iter()
-            .enumerate()
-            {
-                let estimate = panes[0]
-                    .query_statistic(stat, &None, &Default::default())
-                    .unwrap();
-                assert!(estimate.is_finite());
-                let error = (estimate - exact[i]).abs() / if i == 2 { 1.0 } else { exact[i] };
-                errors[i] = errors[i].max(error);
-            }
-        }
-        records.push(serde_json::json!({
-            "id": format!("univmon-unit-frequency-h{heap}-c{cols}"),
-            "sketch": "univmon", "implementation": "asap-sketchlib-univmon-standard-v1",
-            "parameters": {"heap_size": heap, "sketch_rows": 5, "sketch_cols": cols, "layers": 4},
-            "trials": 10,
-            "distribution": {"erp_shape": {"family": "zipf", "parameters": {"exponent": 1.0}, "cardinality": 128, "benchmark_events": values(0).len()}},
-            "error_metrics": {
-                "max_cardinality_relative_error": errors[0],
-                "max_frequency_l2_relative_error": errors[1],
-                "max_frequency_entropy_absolute_bits_error": errors[2]
-            },
-            "resources": {"memory_bytes": bytes, "update_cpu_seconds": 0.0, "query_cpu_seconds": 0.0, "merge_cpu_seconds": 0.0}
-        }));
-    }
-    serde_json::json!({"schema_version": 1, "producer_version": "backend-univmon-standard-unit-frequency-two-pane-error-fixture-cpu-not-measured", "records": records})
-}
-
-#[tokio::test]
-async fn measured_univmon_without_confidence_uses_exact_process() {
-    let artifact = measured_artifact();
-    eprintln!("UNIVMON_MEASURED {artifact}");
-    let raw = values(100_000);
-    let mut observer = ErpShapeObserver::new(128).unwrap();
-    for (i, value) in raw.iter().enumerate() {
-        observer.observe(&value.to_string(), i / 100).unwrap();
-    }
-    let observation = observer.snapshot().unwrap();
-    let queries = [
-        "distinct_over_time(erp_frequency[5s])",
-        "l2_over_time(erp_frequency[5s])",
-        "entropy_over_time(erp_frequency[5s])",
-    ];
-    let mut fixture: Value = serde_json::from_str(include_str!(
-        "../../../docs/examples/asapquery-compatibility-demo-snapshot.json"
-    ))
-    .unwrap();
-    let template = fixture["query_workload"]["repeating_queries"][3].clone();
-    fixture["query_workload"]["repeating_queries"] = queries
-        .iter()
-        .map(|query| {
-            let mut entry = template.clone();
-            entry["query"] = (*query).into();
-            // ERP evidence is calibrated for one complete five-second population.
-            entry["demand"]["fixed_interval_at"]["interval"] = serde_json::json!(5000);
-            entry["requirements"]["accuracy"] = serde_json::json!({"explicit": {"Epsilon": 0.2}});
-            entry
-        })
-        .collect::<Vec<_>>()
-        .into();
-    fixture["implementation"]["erp"] = serde_json::json!({
-        "distribution": {"workload": {"external": {"dataset": "held-out-frequency-population"}}},
-        "artifact": artifact, "implementation": null, "error_metric": "readout_specific",
-        "min_trials": 10, "expected_updates": raw.len(), "expected_queries": 10.0,
-        "expected_merges": 1.0, "retention_seconds": 60.0, "cpu_weight": 0.0,
-        "byte_second_weight": 1e-9, "mode": "hybrid", "observed_shape": observation.observation,
-        "shape_match": {"minimum_benchmark_events": 1000, "max_log2_cardinality_distance": 0.0,
-            "max_parameter_distance": 0.2, "max_goodness_of_fit": 0.2,
-            "minimum_confidence": 0.7, "minimum_confidence_margin": 0.05},
-        "runtime": {"allowed_algorithms": ["Hll", "Kll", "UnivMon"], "max_memory_bytes": null}
-    });
-    // Measured maxima across ten populations are not a failure-probability proof.
-    assert_uncertified_exact_process(fixture.clone(), &queries).await;
-    // Removing one readout's measurements cannot authorize the other readouts.
-    for row in fixture["implementation"]["erp"]["artifact"]["records"]
-        .as_array_mut()
-        .unwrap()
-    {
-        row["error_metrics"]
-            .as_object_mut()
-            .unwrap()
-            .remove("max_frequency_entropy_absolute_bits_error");
-    }
-    assert_uncertified_exact_process(fixture, &queries).await;
-}
diff --git a/demos/asapquery/prometheus.yml b/demos/asapquery/prometheus.yml
deleted file mode 100644
index 7977c8725..000000000
--- a/demos/asapquery/prometheus.yml
+++ /dev/null
@@ -1,16 +0,0 @@
-global:
-  scrape_interval: 1s
-  evaluation_interval: 1s
-
-scrape_configs:
-  - job_name: asapquery-demo-source
-    honor_labels: true
-    static_configs:
-      - targets: ["127.0.0.1:19092"]
-
-remote_write:
-  - url: http://127.0.0.1:19091/api/v1/write
-    queue_config:
-      min_shards: 1
-      max_shards: 1
-      batch_send_deadline: 1s
diff --git a/demos/asapquery/run.sh b/demos/asapquery/run.sh
deleted file mode 100755
index 955469955..000000000
--- a/demos/asapquery/run.sh
+++ /dev/null
@@ -1,172 +0,0 @@
-#!/usr/bin/env bash
-
-set -Eeuo pipefail
-
-SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
-REPO_DIR="$(cd "${SCRIPT_DIR}/../.." && pwd)"
-PROM_IMAGE="${ASAPQUERY_PROMETHEUS_IMAGE:-prom/prometheus:v2.55.1}"
-PUSH_IMAGE="${ASAPQUERY_PUSHGATEWAY_IMAGE:-prom/pushgateway:v1.9.0}"
-RUN_ID="asapquery-demo-$$"
-PROM_CONTAINER="${RUN_ID}-prometheus"
-PUSH_CONTAINER="${RUN_ID}-pushgateway"
-EVIDENCE_DIR="${ASAPQUERY_DEMO_EVIDENCE_DIR:-${REPO_DIR}/target/asapquery-demo-evidence}"
-BACKEND_PID=""
-: "${ASAPQUERY_PLANNING_SNAPSHOT:?Set ASAPQUERY_PLANNING_SNAPSHOT to a snapshot with complete workload cost evidence}"
-
-cleanup() {
-    if [[ -n "${BACKEND_PID}" ]]; then
-        kill "${BACKEND_PID}" 2>/dev/null || true
-        wait "${BACKEND_PID}" 2>/dev/null || true
-    fi
-    docker rm -f "${PROM_CONTAINER}" "${PUSH_CONTAINER}" >/dev/null 2>&1 || true
-}
-trap cleanup EXIT
-
-for command in cargo curl docker python3; do
-    command -v "${command}" >/dev/null 2>&1 || {
-        echo "missing required command: ${command}" >&2
-        exit 1
-    }
-done
-docker info >/dev/null
-mkdir -p "${EVIDENCE_DIR}"
-
-echo "Building the production backend..."
-cargo build --locked -p data_plane --bin data_plane
-
-docker run -d --rm --name "${PUSH_CONTAINER}" --network host \
-    "${PUSH_IMAGE}" --web.listen-address=:19092 >/dev/null
-docker run -d --rm --name "${PROM_CONTAINER}" --network host \
-    -v "${SCRIPT_DIR}/prometheus.yml:/etc/prometheus/prometheus.yml:ro" \
-    "${PROM_IMAGE}" \
-    --config.file=/etc/prometheus/prometheus.yml \
-    --storage.tsdb.path=/prometheus \
-    --web.listen-address=:19090 >/dev/null
-
-for _ in $(seq 1 120); do
-    if curl -fsS http://127.0.0.1:19090/-/healthy >/dev/null; then
-        break
-    fi
-    sleep 0.25
-done
-curl -fsS http://127.0.0.1:19090/-/healthy >/dev/null
-
-"${REPO_DIR}/target/debug/data_plane" \
-    --profile asapquery \
-    --planning-snapshot "${ASAPQUERY_PLANNING_SNAPSHOT}" \
-    --prometheus-server http://127.0.0.1:19090 \
-    --forward-unsupported-queries \
-    --http-port 19091 \
-    --precompute-allowed-lateness-ms 0 \
-    --precompute-flush-interval-ms 100 \
-    --output-dir "${EVIDENCE_DIR}/backend" &
-BACKEND_PID=$!
-
-for _ in $(seq 1 120); do
-    if curl -fsS http://127.0.0.1:19091/api/v1/health >/dev/null; then
-        break
-    fi
-    sleep 0.25
-done
-curl -fsS http://127.0.0.1:19091/api/v1/health >/dev/null
-
-echo "Publishing raw metrics through Prometheus for complete 5s windows..."
-counter=10
-for sample in $(seq 1 18); do
-    if [[ "${sample}" == "7" ]]; then
-        counter=2
-    else
-        counter=$((counter + sample))
-    fi
-    latency=$((10 + (sample % 6) * 10))
-    curl -fsS --data-binary @- \
-        http://127.0.0.1:19092/metrics/job/asapquery-demo <<EOF >/dev/null
-# TYPE asap_demo_counter_total counter
-asap_demo_counter_total ${counter}
-# TYPE asap_demo_gauge gauge
-asap_demo_gauge ${sample}
-# TYPE asap_demo_latency_ms gauge
-asap_demo_latency_ms ${latency}
-EOF
-    sleep 1
-done
-sleep 2
-
-query_backend() {
-    local query=$1
-    local output=$2
-    shift 2
-    curl -fsS --get http://127.0.0.1:19091/api/v1/query \
-        --data-urlencode "query=${query}" "$@" >"${output}"
-}
-
-assert_warm_response() {
-    python3 - "$1" <<'PY'
-import json
-import sys
-
-with open(sys.argv[1], encoding="utf-8") as source:
-    response = json.load(source)
-assert response.get("status") == "success", response
-assert response.get("data", {}).get("result"), response
-assert "data_source: asap_query" in response.get("infos", []), response
-PY
-}
-
-end=$(( $(date +%s) / 5 * 5 - 5 ))
-start=$((end - 5))
-for query in \
-    'rate(asap_demo_counter_total[5s])' \
-    'increase(asap_demo_counter_total[5s])' \
-    'sum_over_time(asap_demo_gauge[5s])' \
-    'quantile_over_time(0.5, asap_demo_latency_ms[5s])'; do
-    slug="$(printf '%s' "${query}" | tr -cs '[:alnum:]' '_')"
-    query_backend "${query}" "${EVIDENCE_DIR}/${slug}-instant.json" \
-        --data-urlencode "time=${end}"
-    assert_warm_response "${EVIDENCE_DIR}/${slug}-instant.json"
-
-    curl -fsS --get http://127.0.0.1:19091/api/v1/query_range \
-        --data-urlencode "query=${query}" \
-        --data-urlencode "start=${start}" \
-        --data-urlencode "end=${end}" \
-        --data-urlencode 'step=5' >"${EVIDENCE_DIR}/${slug}-range.json"
-    assert_warm_response "${EVIDENCE_DIR}/${slug}-range.json"
-done
-
-fallback_query='max(asap_demo_gauge)'
-query_backend "${fallback_query}" "${EVIDENCE_DIR}/fallback-backend.json" \
-    --data-urlencode "time=${end}" --data-urlencode 'timeout=7s'
-curl -fsS --get http://127.0.0.1:19090/api/v1/query \
-    --data-urlencode "query=${fallback_query}" \
-    --data-urlencode "time=${end}" --data-urlencode 'timeout=7s' \
-    >"${EVIDENCE_DIR}/fallback-direct.json"
-python3 - "${EVIDENCE_DIR}/fallback-backend.json" \
-    "${EVIDENCE_DIR}/fallback-direct.json" <<'PY'
-import json
-import sys
-
-with open(sys.argv[1], encoding="utf-8") as source:
-    backend = json.load(source)
-with open(sys.argv[2], encoding="utf-8") as source:
-    direct = json.load(source)
-assert backend.get("data") == direct.get("data"), (backend, direct)
-PY
-
-curl -fsS http://127.0.0.1:19091/api/v1/physical-plan/status \
-    >"${EVIDENCE_DIR}/physical-plan-status.json"
-curl -fsS http://127.0.0.1:19091/metrics >"${EVIDENCE_DIR}/backend.metrics"
-python3 - "${EVIDENCE_DIR}/physical-plan-status.json" <<'PY'
-import json
-import sys
-
-with open(sys.argv[1], encoding="utf-8") as source:
-    status = json.load(source)
-assert status.get("status") == "success", status
-materializations = status.get("materializations", [])
-assert len(materializations) == 3, materializations
-assert all(item.get("phase") == "serving" for item in materializations), materializations
-PY
-grep -q '^asap_remote_write_samples_total [1-9]' "${EVIDENCE_DIR}/backend.metrics"
-
-echo "PASS: Prometheus Remote Write -> PrecomputePlan -> QueryPlan DAG -> warm result"
-echo "Evidence: ${EVIDENCE_DIR}"
diff --git a/docs/01-getting-started/architecture.md b/docs/01-getting-started/architecture.md
deleted file mode 100644
index df3a62c70..000000000
--- a/docs/01-getting-started/architecture.md
+++ /dev/null
@@ -1,117 +0,0 @@
-# ASAP system architecture
-
-> Status: active
-
-This page describes the distributed Collector profile. The implemented
-[ASAPQuery compatibility profile](../design_docs/asapquery-compatibility-profile.md)
-is a smaller, collector-free mode that ingests raw samples only through
-Prometheus Remote Write.
-
-## TL;DR
-
-ASAP separates logical planning, physical control, edge summary maintenance,
-and backend query execution. ASAPQuery-backend contains the physical control
-plane and data plane; it consumes ASAPPlanner decisions and coordinates with
-ASAPCollector.
-
-```text
-Query workload
-      |
-      v
-ASAPPlanner -- selected logical workload plan
-      |
-      v
-ASAPQuery control plane
-      | physical compile
-      +---------------------------+
-      |                           |
-      v                           v
-CollectorPlan              SummaryCatalog + execution plans
-      |                           |
-      v                           v
-ASAPCollector -- summary state --> ASAPQuery data plane
-                                      |
-PromQL client ------------------------+
-                                      |
-                         summary readout or exact fallback
-```
-
-## Planning path
-
-The workload is planned as a whole so common state can be shared. ASAPPlanner
-owns logical parsing, summary alternatives, accuracy reasoning, and selection.
-The ASAPQuery control plane owns deployment capabilities, physical placement,
-windows, transmission, matching runtime plans, and activation.
-
-See the [control-plane physical-planning design](https://github.com/ProjectASAP/ASAPCollector/blob/main/docs/design_docs/control-plane/physical-planning.md).
-
-## Ingestion path
-
-ASAPCollector applies CollectorPlan, maintains summaries from observed OTLP
-metrics, and transmits raw observations, full state, or deltas as directed. The
-data plane accepts a payload only when it matches the active SummaryCatalog,
-PrecomputePlan, and TransmissionPlan, then
-stores it under the declared materialization and logical window.
-
-The distributed Collector profile does not treat legacy Telegraf, OTAP, Kafka,
-Prometheus Remote Write, or in-backend raw precomputation paths as its MVP
-architecture. The separate ASAPQuery compatibility profile intentionally uses
-Prometheus Remote Write and backend-local precompute without changing this
-profile's primary OTel path.
-
-## Query path
-
-A PromQL request enters through a protocol server and adapter. The data plane
-uses QueryPlan bindings resolved through SummaryCatalog to locate a compatible
-readout and checks plan identity,
-coverage, freshness, and state compatibility before execution. If the selected
-logical plan requires exact execution, the request is sent to the configured
-exact backend.
-
-See [plan-aware query execution](https://github.com/ProjectASAP/ASAPCollector/blob/main/docs/design_docs/asapquery-backend/query-query-engine.md).
-
-## State and identity
-
-The three levels are related but must not be collapsed:
-
-- a **plan identity** versions one deployed physical decision;
-- a **materialization identity** is the stable descriptor/fingerprint for the
-  maintained summary semantics: bound source/filter, summarized value,
-  reduction and retained grouping keys, aggregation family/algorithm and
-  parameters, accuracy contract, window semantics, and compatible state schema;
-  and
-- a **summary series identity (`sid`)** identifies one canonical materialized
-  metric series under that descriptor, including the canonical metric and the
-  concrete retained label values. A raw materialization may likewise allocate
-  a distinct SID for its raw sample series.
-
-For example, “DDSketch over `request_duration_seconds`, grouped by `service`,
-alpha 0.01, one-minute panes” is one materialization definition. Its
-`service=checkout` and `service=payments` outputs are two materialized series
-and therefore have different SIDs. Changing alpha or retained grouping keys
-creates a different materialization definition and cannot reuse either SID.
-
-Conflating them can cause incompatible state reuse. The storage and identity
-contracts are described in [summary storage](https://github.com/ProjectASAP/ASAPCollector/blob/main/docs/design_docs/asapquery-backend/query-summary-store-engine.md)
-and [series identity](https://github.com/ProjectASAP/ASAPCollector/blob/main/docs/design_docs/cross-cutting/summary-series-id.md).
-
-## Component failure behavior
-
-- Planner or physical-compilation failures prevent a new plan from staging.
-- Partial plan application leaves the previous valid plan authoritative.
-- Incompatible or gapped payloads are rejected by ingestion.
-- Missing or stale state prevents summary readout.
-- Exact fallback errors are returned as errors, not empty results.
-
-The system fails closed at every boundary where a plausible but incorrect
-answer could otherwise be produced.
-
-## Backend-local inspection and completion
-
-The [E2E physical-DAG walkthrough](../evaluation/e2e-physical-dag.md) traces
-Planner/ERP inputs through shared SDS descriptors, PrecomputePlan, physical
-instances and QueryPlan. Remote-write queue admission is not durable raw-data
-commit. Finite drain and typed producer-watermark completion are different
-protocols; the sample stream does not supply an authoritative watermark.
-See [maintenance replay](../developer_docs/precomputation-replay.md) for the
-current durable and continuous boundaries.
diff --git a/docs/01-getting-started/local-setup.md b/docs/01-getting-started/local-setup.md
deleted file mode 100644
index b8ecd3030..000000000
--- a/docs/01-getting-started/local-setup.md
+++ /dev/null
@@ -1,74 +0,0 @@
-# Local Setup
-
-This guide covers development environment setup for ASAP.
-
-## Pre-commit Hooks
-
-Pre-commit hooks ensure code quality before committing.
-
-### Installation
-
-```bash
-pip3 install pre-commit
-
-# Install hooks (run from repo root)
-cd /path/to/ASAPQuery-backend
-pre-commit install
-```
-
-### What the Hooks Do
-
-The pre-commit configuration (`.pre-commit-config.yaml`) runs:
-
-**Rust:**
-- `rustfmt` - Format Rust code
-- `cargo check` - Check Rust code compiles
-- `cargo clippy` - Lint Rust code (all warnings as errors)
-
-**Python:**
-- `black` - Format Python code
-- `isort` - Sort Python imports
-- `flake8` - Lint Python code
-- `mypy` - Type check Python code (in components that have it configured)
-
-**General:**
-- Remove trailing whitespace
-- Ensure files end with newline
-- Validate YAML files
-- Check for large files
-
-### Running Hooks
-
-**Automatic** (on git commit):
-```bash
-git add myfile.rs
-git commit -m "Fix bug"
-# Pre-commit hooks run automatically
-```
-
-**Manual** (run on all files):
-```bash
-pre-commit run --all-files
-```
-
-**Manual** (run on staged files):
-```bash
-pre-commit run
-```
-
-### Common Hook Failures
-
-**Issue**: `black` or `rustfmt` fails
-
-**Solution**: The hook auto-fixes formatting. Just re-stage and commit:
-```bash
-git add <file>
-git commit
-```
-**Issue**: `clippy` warnings
-
-**Solution**: Fix warnings
-
-**Issue**: `cargo fmt` checks failed
-
-**Solution**: Run `cargo fmt --`
diff --git a/docs/01-getting-started/overview.md b/docs/01-getting-started/overview.md
deleted file mode 100644
index 31f013c89..000000000
--- a/docs/01-getting-started/overview.md
+++ /dev/null
@@ -1,55 +0,0 @@
-# ASAP overview
-
-This page describes the distributed Collector profile. For the smaller mode
-that runs without ASAPCollector and ingests raw samples from Prometheus, see the
-[ASAPQuery compatibility profile](../design_docs/asapquery-compatibility-profile.md).
-
-## TL;DR
-
-ASAP is a summary-based metrics pipeline. ASAPCollector maintains selected
-summaries near the source, and ASAPQuery-backend answers planned PromQL queries
-from those summaries. An exact backend remains available for query shapes or
-time ranges that cannot be served correctly from maintained state.
-
-## Why summaries
-
-Exact metrics systems retain raw samples and repeatedly scan them for queries.
-For selected recurring workloads, ASAP maintains compact reusable state as
-samples arrive. This can reduce query work, transmission, and storage while
-meeting a declared accuracy and freshness contract.
-
-Summaries may be exact accumulators or approximate structures such as DDSketch,
-KLL, HLL, Count-Min Sketch, or CountSketch. The term “summary” is broader than
-“sketch” and includes both exact and approximate maintained state.
-
-## Components
-
-- **ASAPPlanner** chooses a valid logical plan for the complete query workload.
-- **ASAPQuery control plane** compiles that selection into matching collector
-  and backend plans and coordinates activation.
-- **ASAPCollector** observes metrics, maintains the requested summaries, and
-  transmits raw, full-summary, or delta-summary payloads.
-- **ASAPQuery data plane** validates and stores those payloads, executes planned
-  readouts, and exposes Prometheus-compatible query responses.
-- **Exact backend** serves the explicit fallback path and provides the MVP
-  correctness baseline.
-
-## Correctness contract
-
-A summary-backed answer is valid only when:
-
-- it comes from the active plan and matching materialization;
-- its labels and logical time range match the request;
-- required windows are complete and fresh;
-- its summary semantics satisfy the requested accuracy; and
-- every required producer and delta sequence is compatible.
-
-Otherwise the request fails or follows the configured exact route. Missing or
-stale state is never treated as a zero-valued answer.
-
-## MVP claim
-
-The MVP is not merely that the components start. One reproducible paired run
-must show functional correctness, bounded query error, fresh results, lower
-query latency for claimed accelerated classes, and lower collector and total
-resource cost than the raw exact baseline.
diff --git a/docs/03-how-to-guides/manual-e2e-tests.md b/docs/03-how-to-guides/manual-e2e-tests.md
deleted file mode 100644
index 40e340505..000000000
--- a/docs/03-how-to-guides/manual-e2e-tests.md
+++ /dev/null
@@ -1,128 +0,0 @@
-# Manual end-to-end tests
-
-Run every component suite and the final repository-wide warm-path test from
-the repository root:
-
-```bash
-./scripts/e2e.sh
-```
-
-The command runs tests serially because several transport tests temporarily
-change process environment or still use fixed loopback ports. It covers:
-
-1. shared type and protobuf wire contracts;
-2. the real control-plane binary: HTTP workload planning, configuration
-   delivery to a simulated collector over the production OpAMP WebSocket, and
-   runtime feedback ingestion over the production gRPC listener;
-3. data-plane ingest adapters, query routing, storage, lifecycle, persistence,
-   exact-backend forwarding with controlled peers, and a real data-plane
-   process that accepts modified OTLP, stores a DDSketch, and returns its
-   quantile through the public PromQL endpoint;
-4. the monitor coordinator hosted by a real data-plane process, with two edge
-   clients exchanging reports and differentiated grants over bidirectional
-   gRPC;
-5. the final production-process path: typed physical-plan compilation,
-   catalog and execution-plan installation, collector capability and applied ACK
-   over OpAMP, modified-OTLP ingest, SketchStore policy routing, and PromQL
-   query readout of that same plan.
-
-The component suites can also be run separately:
-
-```bash
-./scripts/e2e.sh contracts
-./scripts/e2e.sh control-plane
-./scripts/e2e.sh data-plane
-./scripts/e2e.sh differential
-./scripts/e2e.sh sketch-oracles
-./scripts/e2e.sh monitor
-```
-
-`differential` starts the production data-plane process, derives a modified
-OTLP DDSketch from a deterministic raw-value fixture, and compares public
-instant and range PromQL results with an independent exact quantile oracle.
-It also verifies labels, ASAP-local execution, instant/range endpoint
-consistency, and range parameter validation. It does not claim Prometheus
-range-step resampling semantics, which are tracked by issue #487. It does not
-require Docker or a Prometheus process.
-
-To run every sketch family through a production data-plane child process and
-compare its public result with an oracle computed independently from the raw
-fixture, run:
-
-```bash
-./scripts/e2e.sh sketch-oracles
-```
-
-This covers DDSketch and KLL against exact raw quantiles, HLL against an exact
-raw distinct set, and CountSketch/CMS top-k against exact raw frequency maps.
-The sketch library is used only to encode modified-OTLP fixtures, never to
-compute expected answers. Each scenario is a real, non-ignored test. The
-command currently exits non-zero on the product gaps tracked by backend issues
-#489 and #491 and planner issue #340; that failure is intentional evidence,
-not an expected-pass or smoke assertion.
-
-The complete sketch/query differential inventory is exercised with:
-
-```bash
-./scripts/e2e.sh differential-all
-```
-
-It runs all production-process raw-oracle comparisons and the whole-path
-in-process scenario matrix even when the oracle suite finds a regression, then
-returns non-zero if either suite failed. The matrix covers DDSketch and KLL quantiles, HLL
-cardinality, CountSketch and Count-Min count queries, heap-backed top-k, an
-instant/range query pair, grouping, delta/sub-window ingest, and shadow/live
-serving. It exits non-zero for every real product regression; no scenario is
-ignored or converted into an expected pass.
-
-| Sketch / path | Public query shape | Oracle / invariant |
-| --- | --- | --- |
-| DDSketch | `quantile_over_time(0.5, ...[10s])`, instant + range | exact raw-value median and endpoint consistency |
-| DDSketch | `quantile_over_time(0.99, ...[30s])` | strict small-sample p99 regression tracked by #492 |
-| DDSketch delta | `quantile_over_time(0.99, ...[3m])` | reconstructed multi-window distribution |
-| KLL | `quantile_over_time(0.5, ...[10s])` | exact raw-value median (fixture retained below K) |
-| HLL | `count(metric)` | exact raw distinct set within a declared 10% bound |
-| CountSketch | `topk(3, metric)` | exact raw frequency map and item identities |
-| Count-Min Sketch | `topk(3, metric)` | exact raw frequency map and item identities |
-| PromQL range validation | equal start/end and zero step | Prometheus-compatible explicit errors |
-
-To exercise every currently checked-in sketch/query combination, including scenarios tracking
-known product regressions, run:
-
-```bash
-./scripts/e2e.sh whole-matrix
-```
-
-Unlike ignored tests, a failing matrix scenario exits non-zero. This target is
-diagnostic and is not part of the default `all` acceptance command until those
-known query/planner regressions are fixed.
-
-Use `ASAP_E2E_NOCAPTURE=1` to display Rust test output. Build artifacts and
-the Go compilation cache are kept below `target/` by default so a full system
-disk does not make Go use the home-directory cache. Rust incremental builds
-are disabled by default to limit disk usage; set `ASAP_E2E_CARGO_INCREMENTAL=1`
-to retain that cache when space is available.
-
-## Full external system
-
-The backend repository does not contain the producer and collector-agent
-binaries. To run the actual multi-node system with those processes, use the
-explicit target below. It delegates to the sibling ASAPCollector checkout and
-can build images, use SSH, and start containers on the configured nodes:
-
-```bash
-ASAP_COLLECTOR_DIR=../ASAPCollector ./scripts/e2e.sh system
-```
-
-The local `all` target never performs those external operations.
-
-## Test hygiene
-
-Tests marked `#[ignore]` are not counted as passing coverage. The repository
-does not retain ignored tests for retired or unsupported contracts; those
-belong in issue tracking. List suites and verify that no Rust E2E is hidden
-behind `#[ignore]` with:
-
-```bash
-./scripts/e2e.sh list
-```
diff --git a/docs/README.md b/docs/README.md
deleted file mode 100644
index b461bf4bd..000000000
--- a/docs/README.md
+++ /dev/null
@@ -1,44 +0,0 @@
-# ASAPQuery-backend documentation
-
-## Testing
-
-- [E2E physical-DAG walkthrough for Milind](evaluation/e2e-physical-dag.md)
-
-- [Manual component and whole-system E2E tests](03-how-to-guides/manual-e2e-tests.md)
-- [ASAPQuery vs. AutoSketch evaluation plan](evaluation/autosketch-comparison.md)
-
-## Canonical system design
-
-The end-to-end architecture and shared contracts are maintained centrally in
-[ASAPCollector design docs](https://github.com/ProjectASAP/ASAPCollector/tree/main/docs/design_docs).
-That documentation owns collection, transmission, backend ingest/storage/query,
-SID, physical plans, workload inputs, and runtime feedback.
-
-This repository keeps code-owned implementation guidance, user-facing backend
-operation material, and a scoped
-[ASAPPlanner integration proposal](design_docs/asapplanner-integration.md)
-covering architecture boundaries, workflow, and high-level migration without
-duplicating the canonical cross-component contracts.
-
-## Getting started
-
-- [Overview](01-getting-started/overview.md)
-- [Local setup](01-getting-started/local-setup.md)
-- [Architecture orientation](01-getting-started/architecture.md)
-
-## Backend implementation
-
-- [ASAPQuery compatibility profile](design_docs/asapquery-compatibility-profile.md)
-  - [Run the compatibility profile](user_guide/asapquery-profile.md)
-- [Developer guide](developer_docs/README.md)
-- [Summary store engine](developer_docs/summary-store-engine/implementation.md)
-- [Query engine](developer_docs/query-engine/query-engine.md)
-- [Ingest engine](developer_docs/ingest-engine/ingest-engine.md)
-- [Summary series ID resolver](developer_docs/summary-series-id/resolver.md)
-- [Control plane](developer_docs/control-plane/physical-compiler.md)
-
-## User guide
-
-- [User guide index](user_guide/README.md)
-- [Run and verify the backend](user_guide/running-and-verifying.md)
-- [Querying ASAP](user_guide/querying-asap.md)
diff --git a/docs/design_docs/README.md b/docs/design_docs/README.md
deleted file mode 100644
index 6570d0bec..000000000
--- a/docs/design_docs/README.md
+++ /dev/null
@@ -1,32 +0,0 @@
-# Design documents
-
-These documents are for architects and developers. The integration proposal and
-SDS model below define the target Planner-to-runtime boundary. Acceptance
-requirements and migration gates distinguish target behavior from completed
-integration.
-
-- [Planner/backend glossary](planner-backend-glossary.md) defines the terms used
-  by the following three designs.
-- [Binding Planner Physical DAGs to deployment plans](asapplanner-integration.md)
-  defines how backend source/state bindings and operational policy instantiate
-  Planner-provided precomputation and query computation.
-- [Summary definitions table and SDS](summary-catalog-sds-architecture.md) owns definition
-  and instance identity, version-scoped state references, read eligibility and
-  committed-state metadata.
-- [QueryPlan DAG execution](query-dag-execution.md) explains how the query
-  engine evaluates installed query sub-DAGs and reads bound stored summaries.
-- [Architecture migration delivery plan](asapplanner-migration-plan.md) defines
-  common-library extraction, removal of ASAPCollector dependencies, the two-plan
-  rollout, and backend acceptance/retirement gates.
-- [Accepted-input completeness](continuous-summary-completeness.md) describes
-  the backend's bounded admission, publication and recovery behavior.
-
-Existing [Collector system contracts](https://github.com/ProjectASAP/ASAPCollector/tree/main/docs/design_docs)
-remain the cross-component baseline. Current backend implementation guides live
-under [developer docs](../developer_docs/README.md).
-
-Other designs and profiles:
-
-- [ASAPQuery compatibility profile](asapquery-compatibility-profile.md)
-- [Shape-aware ERP](shape-aware-erp-v1.md)
-- [Empirical observability execution plan](empirical-o11y-execution-plan.md)
diff --git a/docs/design_docs/asapplanner-integration.md b/docs/design_docs/asapplanner-integration.md
deleted file mode 100644
index 6d5332ad1..000000000
--- a/docs/design_docs/asapplanner-integration.md
+++ /dev/null
@@ -1,292 +0,0 @@
-# Binding Planner Physical DAGs to Backend Deployment Plans
-
-Status: target design. Audience: developers implementing deployment compilation
-and the precompute/query engines. This document defines required behavior, not
-completed backend integration.
-
-## 1. Problem and goals
-
-Precompute and query execution must agree on what state is produced, where it
-is stored and which query inputs may consume it. A full logical DAG embedded in
-PrecomputePlan obscures these boundaries. Reconstructing computation independently
-in the backend also duplicates Planner's lowering and permits operator or
-materialization decisions to diverge.
-
-The backend will consume Planner-compiled Physical DAGs and bind their typed
-boundaries into one coherent deployment plan. PrecomputePlan and QueryPlan reuse
-those DAGs and the shared executor; they do not define another computation IR.
-
-Goals:
-
-- Preserve Planner's selected operators, sharing and materialization boundaries.
-- Bind every physical input/output to an explicit source, stored output or result.
-- Install matching producer and consumer contracts atomically.
-- Execute through the shared physical library while keeping storage, scheduling,
-  readiness and serving backend-owned.
-
-Non-goals are backend operator lowering, a second maintenance-selection model,
-CollectorPlan/TransmissionPlan compilation, distributed activation and new
-transport protocols. Backend integration must not depend on ASAPCollector.
-
-## 2. Architecture and ownership
-
-The authoritative boundary is [Physical Planning, Summary Maintenance, and
-Deployment at e9390031](https://github.com/ProjectASAP/ASAPPlanner/blob/e9390031fcecd7bc0d611127eddc5c6603a281e5/docs/design_docs/physical-planning-and-deployment.md).
-
-```text
-ASAPPlanner
-  Logical Post-ASAP candidates + legal Summary Maintenance Lifecycles
-      ↓ Physical Plan Compiler
-  Supported physical candidates + typed input/output boundaries
-      ↓
-Backend
-  Feasibility and cost selection over workload candidates
-      ↓
-  Deployment Plan Compiler + sources/store + operational policy
-      ↓
-  PrecomputePlan + QueryPlan + summary definitions
-      ↓ atomic installation
-  Deployment engines → shared physical executor
-```
-
-| Owner | Decisions |
-| --- | --- |
-| Planner logical and maintenance candidate construction | Computation semantics, guarantees, window/retention/reuse requirements |
-| Planner Physical Plan Compiler | Concrete operators, schemas, dependencies, roots, sharing and materialization frontiers |
-| Backend candidate selection | Deployable workload candidate, using capabilities and scoped cost inputs; shared work is costed once within that candidate |
-| Backend Deployment Plan Compiler | Concrete source/state bindings, stored-output identities, placement, scheduling and installation version |
-| Backend engines | Resolve inputs, drive execution, publish results, check actual readiness and apply installed fallback policy |
-| Shared physical library | Operator execution, per-run sharing, backpressure, cancellation and resource contracts |
-| SummaryStore | Committed definitions and stored records, lookup, recovery and reclamation |
-
-The Deployment Plan Compiler binds a realization satisfying Planner requirements;
-it does not repair an unsupported candidate or repeat lifecycle planning. For
-example, Planner may require retention of at least ten minutes, the compiler
-may bind a permitted fifteen-minute retention configuration, and the runtime
-actually retains and reclaims records. If the requirement specifies an exact
-policy rather than a minimum, the binding must preserve that policy.
-
-**Build, merge and readout are reusable operators, not deployment-phase classes.**
-Planner may place a build in a query DAG or a readout before a persisted scalar
-output. Backend execution respects the selected graph boundaries.
-
-Planner exposes supported, semantically legal physical candidates for the workload.
-Backend evaluates deployment feasibility and compares their scoped costs, then
-selects a candidate and binds its deployment. Binding failures exclude candidates;
-missing costs must not silently become zero. Backend may evaluate binding while
-pricing candidates, but cannot change their operators, windows or boundaries.
-The current validation uses synthetic costs. Online resource collection and
-feedback-driven replanning are deferred.
-
-A maintenance lifecycle is a contract associated with computation, not another
-operator IR. A deployment plan is an operational wrapper around Physical DAGs,
-not another lowering stage.
-
-## 3. Deployment plan structure
-
-One installed version contains:
-
-| Part | Content |
-| --- | --- |
-| Summary definitions | Persisted semantic definitions referenced by stored outputs |
-| PrecomputePlan | Planner-provided maintenance Physical DAGs, input/output bindings, schedules and retention/publication policy |
-| QueryPlan | Planner-provided query Physical DAGs, input bindings, query associations and explicit fallback policy |
-
-A physical graph may be embedded or referenced within the bundle; either way,
-its operator vocabulary and computation remain Planner-owned. The backend does
-not copy it into a second set of Build/Merge/Estimate node variants.
-
-Two concrete decisions govern these bindings:
-
-| Design question | Decision and example |
-| --- | --- |
-| What identifies the source dataset? | Tenant A's and tenant B's `KLL(latency)` have different definitions. Moving tenant A's dataset to another endpoint preserves its definition. See [source identity examples](summary-catalog-sds-architecture.md#source-identity). |
-| Can a new plan version reuse old state immediately? | Version 43 populates its own state even if version 42 has the same definition. Same-version restart can recover eligible records. See [recovery examples](summary-catalog-sds-architecture.md#recovery-and-plan-version-changes). |
-
-Bindings attach only to declared physical boundaries:
-
-```text
-physical input slot → concrete raw source or stored-output reference
-physical output     → persisted output or query result
-```
-
-Backend resolves a stable logical dataset identity before requesting Planner
-semantic definitions. Physical source bindings must realize that identity; changing
-an endpoint or replica does not change it. Binding a different dataset requires a
-new semantic definition, not reuse of a matching field name.
-
-The compiler assigns each persisted output a `stored_output_id` within the plan
-version. Its writer and all readers refer to the same definition and compatible
-format. A `StoredOutputReference` is a binding, not a separately managed catalog
-object. [SDS](summary-catalog-sds-architecture.md) defines the storage contract.
-
-Logical-to-physical provenance comes from Planner and remains available for
-inspection. It does not drive backend semantic-node classification or re-lowering.
-There is no backend `MaintenanceInput`/`QueryInput` decision in this target model.
-
-Source, filter, grouping and window describe input-data semantics; they are not
-an exhaustive computation schema. The DAG also preserves value expressions,
-upstream transformations, operation parameters and typed output semantics.
-[Summary-definition completeness](summary-catalog-sds-architecture.md#3-summarydefinition-what-does-this-state-mean)
-defines what storage compatibility must preserve. The example below abbreviates
-these contracts rather than replacing them with a fixed field list.
-
-## 4. Worked example: shared KLL state
-
-Suppose p50 and p99 use KLL with `k=200` over aligned five-minute windows. Planner
-selects one-minute panes and compiles:
-
-```text
-Maintenance Physical DAG             Query Physical DAG
-
-raw-pane input                       compatible-pane input
-      ↓                                      ↓
-NativeKllBuild(k=200)                 NativeKllMerge(k=200)
-      ↓                                  ┌───┴───┐
-kll-state output                         ↓       ↓
-                                     p50 readout p99 readout
-```
-
-The raw input must contain the complete set of input samples for the one-minute pane. The query input
-requires compatible panes covering the requested aligned five-minute interval.
-These are Planner contracts, not a backend decision to cut the logical graph.
-
-The backend adds operational bindings. This YAML illustrates ownership and is
-not a proposed Rust or wire schema:
-
-```yaml
-precompute:
-  dag: planner.maintenance_dag
-  inputs: {raw-pane: latency_source}
-  outputs: {kll-state: stored_output.latency-panes}
-
-query:
-  dag: planner.query_dag
-  inputs: {compatible-pane: stored_output.latency-panes}
-  outputs: {p50: query_p50, p99: query_p99}
-```
-
-SDS defines semantic identity, format, coverage and version validation. The
-installed bundle also binds the selected maintenance schedule, retention and
-unavailability policy; those fields are omitted here to show the shared-output
-connection clearly. DAG references resolve within the installed bundle, not to
-live Planner objects.
-
-For `(12:00, 12:05]`, the query engine resolves five one-minute records for the
-requested group, validates their format, coverage and revision compatibility,
-and supplies them to the query DAG. Merge runs once for its two consumers within
-that run. Separate query runs do not implicitly share mutable execution state.
-
-Each maintained pane contributes once. Replacing a pane snapshot does not add
-the same input samples again to a query merge. Missing, overlapping or incomplete panes
-cannot be treated as the requested complete range.
-
-A delayed build keeps its original coverage interval; publication time does not
-change query semantics. If required state is missing, the installed fallback or
-unavailability policy applies. The backend must not substitute older state or
-change the maintained window to make a read succeed.
-
-## 5. Deployment compilation contract
-
-Inputs are selected Physical DAGs and boundaries, the selected lifecycle,
-query associations, source/store capabilities and installation context.
-Compilation opens no readers and does not establish future state readiness.
-
-For each selected physical candidate, the compiler:
-
-1. Verifies that the backend runtime can supply every input and fulfill the selected
-   maintenance requirements without changing their semantics.
-2. Binds raw inputs and assigns identities to persisted physical outputs.
-3. Connects stored-state inputs to those outputs, with matching definitions,
-   grouping, coverage rules, revision scope and supported format.
-4. Binds schedules and retention that satisfy the selected lifecycle, then
-   packages the provided DAGs and bindings into precompute/query plans.
-5. Validates the complete bundle before it can be staged.
-
-Backend feasibility includes persisting the selected output type. Planner may
-produce scalar/result frontiers as well as sketches; this does not imply the
-backend supports all of them. An unsupported output is rejected or excluded
-during Backend candidate selection, never silently replaced with another
-frontier.
-
-A query-only candidate can build state during a query; a precompute candidate
-can finalize values before persisting them. The backend follows the selected
-Physical DAGs rather than enforcing build-only/estimate-only phase rules.
-
-## 6. Installation and execution contracts
-
-| Contract | Requirement |
-| --- | --- |
-| Preserve computation | Binding does not change physical operators, ordered edges, roots or sharing. |
-| Bind completely | Every required boundary resolves to one compatible input/output contract. |
-| Install atomically | Definitions and both plans become active as one version; failed staging leaves the previous version active. |
-| Distinguish readiness | Installation authorizes a plan; actual state coverage and readiness are checked when resolving inputs. |
-| Execute once per run | Shared physical producers are driven by the shared runtime, not duplicated by separate backend traversals. |
-| Publish consistently | Stored metadata and payload become visible together under the authorized output binding. |
-| Fail explicitly | Unsupported bindings or unreadable state follow rejection, fallback or unavailability policy without changing computation. |
-
-The precompute engine schedules work, resolves bounded inputs, invokes the shared
-executor and commits output. The query engine resolves request-specific inputs,
-invokes the same executor and adapts results. Both propagate cancellation and
-resource limits. Neither interprets logical Post-ASAP nodes at runtime.
-
-Cleanup respects retention and active readers/dependent producers. Storage lookup
-uses installed references; it does not search for a substitute summary at
-serving time. See SDS for record eligibility and recovery requirements.
-
-Initial recovery is limited to the same installed plan version. A new version
-populates its own state, even when definitions match the previous version. During
-warm-up it uses its installed fallback or unavailability policy. Cross-version
-state adoption is deferred; equal definitions do not authorize it. See the
-[SDS recovery contract](summary-catalog-sds-architecture.md#recovery-and-plan-version-changes).
-
-## 7. Design choices and tradeoffs
-
-Re-lowering logical nodes in the backend would duplicate physical selection and
-allow deployment and Planner graphs to drift. Consuming Physical DAGs avoids that
-second compiler, at the cost of requiring an explicit capability/replanning
-boundary when the backend cannot realize a candidate.
-
-Keeping one full logical DAG under PrecomputePlan would require runtime phase
-filtering and obscure which inputs are stored. Separate Planner-provided physical
-subgraphs make execution ownership explicit without inventing separate operator
-systems for precompute and queries.
-
-A separate catalog Materialization object would repeat fields already owned by
-definitions, boundary bindings and stored records. Two stored object types and
-plan-local references are sufficient for the selected scope.
-
-## 8. Validation and acceptance
-
-Tests must establish:
-
-1. Deployment binding preserves Planner's operators, boundaries and shared
-   dependencies; unsupported bindings fail before activation.
-2. The KLL example summarizes each pane’s input samples once and serves both readouts with
-   one merge per shared run. Missing/overlapping panes and incompatible revisions
-   fail read eligibility.
-3. A supported query-only build and precomputed readout/result follow their
-   selected phases. Unsupported persisted types are rejected explicitly.
-4. Multiple queries can reference one producer, and one query can consume multiple
-   compatible outputs. Derived maintenance checks its source completeness.
-5. Compilation, installation and runtime agree on identity, schema and version.
-   Staging failure, restart and version switching preserve consistency.
-6. The complete path runs without an ASAPCollector checkout or process.
-
-These are acceptance requirements, not claims of completed deployment tests.
-The [migration plan](asapplanner-migration-plan.md) defines delivery gates.
-
-## 9. Scope and follow-up work
-
-Backend work binds and operates Planner computation. It does not add an execution
-IR, alter the Planner API's ownership, or introduce another maintenance model.
-Distributed activation, Collector and transmission plans, and new checkpoint
-protocols remain separate work. Changes to physical algorithms or materialization
-frontiers belong in Planner and its shared physical library.
-
-A future unregistered-query path may ask Planner to search available SDS
-definitions and rewrite the query over reusable state. Backend then resolves
-authorized outputs and binds the selected Physical DAG normally. This is
-planning before execution, not substitute-summary search inside an installed
-reader. See [SDS semantic discovery](summary-catalog-sds-architecture.md#7-future-discovering-sds-for-an-unregistered-query).
-It remains outside the initial deployment rollout.
diff --git a/docs/design_docs/asapplanner-migration-plan.md b/docs/design_docs/asapplanner-migration-plan.md
deleted file mode 100644
index 78b909e68..000000000
--- a/docs/design_docs/asapplanner-migration-plan.md
+++ /dev/null
@@ -1,188 +0,0 @@
-# Migration to Planner Physical DAG Deployment
-
-Status: delivery plan for the [target design](asapplanner-integration.md).
-Audience: backend implementers. This plan does not introduce a second operator
-IR or backend lowering path.
-
-## 1. Outcome
-
-PrecomputePlan and QueryPlan carry Planner-compiled Physical DAGs and backend
-boundary bindings. Both engines execute through the shared physical library.
-The backend owns storage, scheduling, installation and serving; Planner owns
-operator selection and materialization frontiers.
-
-The migration also removes the backend dependency on ASAPCollector. Distributed
-activation, CollectorPlan/TransmissionPlan compilation and new transport
-protocols are outside this delivery.
-
-## 2. Migration boundaries
-
-```text
-Before
-  full logical DAG + backend semantic-node bindings
-      → backend-specific computation and phase interpretation
-
-After
-  Planner-provided maintenance/query Physical DAGs
-      → backend input/output bindings and operational policy
-      → shared physical execution
-```
-
-The runtime accepts the new deployment artifact. Obsolete plan schemas are
-rejected before activation rather than interpreted through a parallel logical-DAG
-executor. Producers and fixtures move together.
-
-Plan-format migration is separate from stored payload compatibility. Supported
-historical payloads retain versioned decoders and fixtures; this does not require
-retaining obsolete plan readers. Do not change sketch byte formats as a side
-effect of moving execution code.
-
-## 3. Delivery stages
-
-| Stage | Work | Exit condition |
-| --- | --- | --- |
-| Inventory | Record current supported computation, state formats and deployment behavior. | Each supported path has a fixture or an explicit unsupported result. |
-| Shared dependencies | Adopt shared operator/runtime and codec contracts; remove Collector dependencies. | Backend builds and tests without ASAPCollector. |
-| Deployment binding | Consume Planner Physical DAGs; bind their typed boundaries and lifecycle. | No backend logical lowering or frontier selection remains in the new path. |
-| Execution and installation | Drive both kinds of DAG through the shared executor and install one coherent bundle. | Identity, resource, failure and readiness tests pass. |
-| Retirement | Switch publications and remove superseded computation paths. | Full-path and recovery tests pass; obsolete plans are rejected. |
-
-### 3.1 Inventory and shared dependencies
-
-Capture fixtures for full/delta decoding, reconstruction, maintenance and
-readout, completion, restart, staging, activation and fallback. Record revision
-and schema provenance. Use semantic checks when randomized bytes are unstable.
-Fixtures may originate from Collector but must run independently of it.
-
-Reuse `asap-physical-operators`, `asap_sketch_codec` and sketch-library APIs for
-neutral execution and encoding work. Storage adapters, scheduling and publication
-remain backend-owned. Remove reconstruct-serialize-decode detours and duplicate
-family execution paths when replacing them, with parity evidence.
-
-Inspect manifests, lockfiles, build scripts and tests for direct or transitive
-Collector dependencies, including `asap-precompute-rs` and Collector patches.
-
-### 3.2 Deployment binding
-
-Adopt the Planner-owned semantic-description export and versioned canonicalization
-contract for SDS definitions, independent of internal executable IR serialization.
-Persist only the semantic dependency closure needed to interpret each output before records
-can reference semantic fingerprints. Definitions derived from incomplete legacy
-metadata must be reconstructed from authoritative plans or rejected for rebuild;
-do not infer missing expressions from source and grouping alone.
-
-Supply stable logical dataset identities to Planner before semantic export, and
-validate that concrete source bindings realize those identities. Different datasets
-must not acquire equal definitions merely because expressions use the same names.
-
-Planner exposes physical workload candidates. Backend evaluates binding feasibility
-and scoped costs before selecting a deployment; it does not rewrite candidate DAGs.
-The initial tests inject synthetic costs. Online measurements and feedback-driven
-replanning remain deferred.
-
-Consume the selected Physical DAGs, physical boundary identities, query
-associations and maintenance requirements. Replace semantic-node classification
-with mappings from declared input/output boundaries to deployment resources.
-
-- Bind raw slots to readers satisfying source, filter, grouping, window, schema and boundedness requirements.
-- Assign version-scoped stored-output identities to persisted physical outputs.
-- Bind stored inputs to matching outputs and validate grouping, format, coverage
-  and revision requirements.
-- Package the original physical computation with schedules, retention, result
-  routing and publication policy.
-
-The old `Materialization`, `MaintenanceInput`, `Query` and `QueryInput` semantic
-classification is not a target contract. Logical provenance is diagnostic data
-from Planner, not an instruction to rebuild operators or split a graph.
-
-No build/readout phase whitelist is introduced. Follow the selected physical
-candidate. If the backend cannot persist a selected scalar or result output,
-report that capability limitation instead of moving operators across a boundary.
-
-A new plan schema version expresses this boundary. Do not reinterpret an old
-field under an unchanged version. Normalize supported legacy stored identities
-during migration with an explicit mapping; preserve payload identity and reject
-unresolved/conflicting mappings.
-
-### 3.3 Installation and execution
-
-Validate definitions and boundary bindings against the supplied Physical DAGs.
-Verify all stored-output references, schemas, encodings, partitions and versions,
-then perform deployment resource and capability checks.
-
-Stage definitions and both plans as one snapshot. Failed staging leaves the
-active version unchanged. Activation does not establish state readiness; runtime
-input resolution checks actual committed state and applies the installed fallback
-or unavailability policy.
-
-Precompute and query engines resolve inputs and drive the shared executor. They
-must not retain a second node traversal that recomputes shared producers. Plan
-visualizations show the supplied DAGs connected by deployed stored-output bindings.
-
-### 3.4 Retirement
-
-Migrate publishers and consumers together with pinned dependencies and matching
-rollback artifacts. Remove obsolete plan adapters, full-logical-DAG execution
-and duplicated operators after the new path passes its gates.
-
-Storage payload readers remain governed by the supported format policy. Initial
-recovery supports the same installed plan version. New versions populate
-their own state and use their installed fallback/unavailability policy during
-warm-up. Cross-version state adoption is deferred independently of binary rollback.
-
-## 4. Acceptance evidence
-
-Record tested revisions, supported families/output types and fixture results.
-Acceptance includes:
-
-- Planner computation and boundaries are preserved through installation.
-- One producer serves multiple queries without duplicate maintenance; one query
-  can consume multiple compatible outputs.
-- Shared producers execute once per run; separate runs remain isolated.
-- Supported query-time construction and precomputed finalized outputs follow the
-  selected phases; unsupported output bindings fail explicitly.
-- Missing, overlapping, incomplete or incompatible state fails eligibility.
-- Dataset identity changes alter definitions; endpoint/replica changes do not.
-- Query branches preserve the whole-query revision fence during publication.
-- Same-version recovery validates bindings and completeness; new-version reads
-  never silently adopt old state and follow warm-up failure policy.
-- Staging failure, cancellation, resource limits, restart and version switching
-  preserve documented behavior.
-- Obsolete plans are rejected and backend builds/tests do not require Collector.
-
-Trace a query from Planner candidate construction through Backend selection, deployment
-binding, state publication and query execution. Verify exact operations against
-independent results and sketches against their supported guarantees. The design
-is not accepted solely because example schemas parse or unit tests pass.
-
-## 5. Bound-query SDS implementation across the PR stack
-
-The SDS contract separates semantic identity from deployed-output identity.
-The bound-query path locates state by plan version, output and group, then
-selects its time range and validates semantics, format, revision and coverage.
-Ad-hoc discovery is deferred.
-
-| Implementation owner | Required change | Regression/acceptance gate |
-| --- | --- | --- |
-| Planner shared types and physical integration (#462) | Export a versioned canonical semantic description for a selected persisted output; exclude placement and temporary node IDs. | Different input expressions differ; renumbering preserves identity; state definitions exclude downstream readout parameters. |
-| Backend plan/schema and SDS identity foundation (#749) | Separate semantic definitions from deployed-output bindings; remove the requirement that stored-output ID equals definition ID; version the changed plan contract. | Same-version hot/rebuild outputs can share one definition without aliasing; tampered definitions and mismatched bindings fail installation. |
-| Planner semantic integration (#749); shared execution integration (#774) | #749 consumes the shared semantic export and propagates dataset-bound definitions from selected outputs. #774 integrates the shared physical executor. | No backend expression normalization or synthetic semantic fingerprint from incomplete config fields. |
-| Precompute/storage integration (#763) | Persist definitions and output-scoped records; authorize writes against installed bindings and recover them consistently. | Restart retains semantic descriptions; wrong-output writes fail; replacement metadata and payload remain consistent. |
-| Query integration (#765) | Resolve the installed deployed output and validate definition, revision, format and coverage before invoking shared execution. | A hot-bound query never reads rebuild state; stale, missing or incompatible records take the explicit failure route. |
-| Acceptance PRs (#728, #742, #775) | Update fixtures and process tests for the new contract; validate individual queries and ensembles using synthetic costs. | End-to-end producer → persisted definition/record → recovery → bound read, with negative identity and coverage cases. |
-
-These are implementation responsibilities and acceptance gates. PR ordering
-must follow actual dependency commits, not an outdated stack list.
-A semantic definition cannot be replaced by a policy fingerprint containing
-physical layout or cadence. Conversely, relaxing an output-reference validator
-without changing storage keys and authorization is insufficient and unsafe.
-
-The implementation must preserve supported payload decoders independently of
-plan-schema retirement. Keep implementation guides accurate to the code until
-each stage lands; then update the APIs, persistence descriptions and test evidence
-in the same implementation PR.
-
-The open shared-library integration PR is #774, replacing the already merged
-#770. The active order after #749 is #774 → #763 → #765 → #761 → #728
-→ #742 → #775. Real-evidence work in #776, #777, #778 and #759 is deferred;
-old #770 base metadata is not part of this chain.
diff --git a/docs/design_docs/asapquery-compatibility-profile.md b/docs/design_docs/asapquery-compatibility-profile.md
deleted file mode 100644
index e911510fd..000000000
--- a/docs/design_docs/asapquery-compatibility-profile.md
+++ /dev/null
@@ -1,452 +0,0 @@
-# ASAPQuery compatibility profile
-
-> Status: implemented; wider maintenance capabilities retain separate admission gates
->
-> Reference: [ProjectASAP/ASAPQuery at `9fb051a`](https://github.com/ProjectASAP/ASAPQuery/tree/9fb051aa798361fca8e3012835412cb6fa338a0c)
->
-> Scope: a deliberately smaller target operating profile of ASAPQuery-backend that
-> accepts raw Prometheus Remote Write samples and does not depend on
-> ASAPCollector.
-
-## Goal
-
-ASAPQuery-backend has a broader architecture than ASAPQuery: it can coordinate
-external collectors, accept materialized summaries over modified OTLP, use
-multiple storage tiers, and compile distributed physical plans. This profile
-does not remove those capabilities. It defines the target configuration required
-for ASAPQuery-compatible behavior and gives that configuration an independent
-end-to-end acceptance target. Selecting `--profile asapquery` is now a strict,
-startup-validated subset of the broader runtime.
-
-The user-visible goal is the same drop-in shape as ASAPQuery:
-
-```text
-Prometheus ── remote_write raw samples ──► ASAPQuery-backend
-     ▲                                      │
-     │ exact fallback                       │ in-process summaries
-     │                                      ▼
-Grafana / PromQL client ── query ──► accelerated query endpoint
-```
-
-Prometheus remains the exact raw-data system. It sends a copy of ingested
-samples to ASAPQuery-backend through Prometheus Remote Write. The backend builds
-planned summaries from those raw samples and serves supported PromQL from the
-summaries. Unsupported, not-yet-ready, stale, or unsafe queries are forwarded
-to Prometheus.
-
-The reference behavior is anchored by ASAPQuery's
-[top-level architecture](https://github.com/ProjectASAP/ASAPQuery/blob/9fb051aa798361fca8e3012835412cb6fa338a0c/README.md),
-[Remote Write decoder](https://github.com/ProjectASAP/ASAPQuery/blob/9fb051aa798361fca8e3012835412cb6fa338a0c/asap-query-engine/src/drivers/ingest/prometheus_remote_write.rs),
-[query tracker](https://github.com/ProjectASAP/ASAPQuery/blob/9fb051aa798361fca8e3012835412cb6fa338a0c/asap-query-engine/src/query_tracker/tracker.rs),
-and
-[precompute design](https://github.com/ProjectASAP/ASAPQuery/blob/9fb051aa798361fca8e3012835412cb6fa338a0c/asap-query-engine/src/precompute_engine/precompute_engine_design_doc.md).
-The goal is behavioral compatibility, not copying its historical planner or
-internal types.
-
-## Profile boundary
-
-### Required in this profile
-
-- Prometheus Remote Write v1 ingestion at `POST /api/v1/write`;
-- Snappy decompression and protobuf `WriteRequest` decoding;
-- raw scalar sample, stale-marker, and label canonicalization;
-- in-process streaming precompute with windowing and lateness handling;
-- an in-process summary store sufficient for the accelerated query path;
-- Prometheus-compatible instant and range query endpoints;
-- startup-supplied `QueryWorkload` and `DataWorkload` snapshots and canonical
-  ASAPPlanner invocation;
-- backend-only physical compilation and atomic plan activation;
-- summary-backed execution with explicit Prometheus fallback; and
-- one self-contained compatibility demo and end-to-end test.
-
-### Excluded from the MVP profile
-
-- ASAPCollector discovery, configuration, or plan publication;
-- `CollectorPlan`, `SDKPlan`, OpAMP, or collector activation evidence;
-- OTLP or modified-OTLP ingestion;
-- prebuilt summary ingestion from external producers;
-- source sampling, GOS, sparse delta transmission, and frame ACK protocols;
-- VictoriaMetrics Remote Write, Kafka, CSV, JSON, or other ingest connectors in
-  the MVP;
-- SQL, ClickHouse, and Elasticsearch query protocols in the MVP;
-- S3, Thanos, Gorilla, or other durable/cold tiers; and
-- distributed placement or multi-producer summary merging.
-
-Excluded features may continue to exist in the larger product. They must be
-disabled and must not be startup dependencies when this profile is selected.
-
-## Target architecture
-
-```text
-Runtime data path
-
-Prometheus ── remote_write ──► raw receiver ──► precompute ──► SummaryStore
-
-PromQL client ──► Prometheus API ──► query router
-                                      ├──► summary readout ◄── SummaryStore
-                                      └──► exact fallback ──► Prometheus
-
-Planning path
-
-configured QueryWorkload + DataWorkload
-                    │
-                    ▼
-               ASAPPlanner
-     Post-ASAP candidates + selection
-                    │
-                    ▼
-      backend-only physical compiler
-        │          │          │
-        ▼          ▼          ▼
- PrecomputePlan SummaryCatalog QueryPlan DAG
-        │          │          │
-        ▼          ▼          ▼
-   precompute    catalog   SID-bound executor
-```
-
-The plan has no collector projection. One compile produces an atomic
-`PhysicalPlan` containing one `SummaryCatalog` plus sibling backend-local
-`PrecomputePlan` and `QueryPlan` sections from the same selected Post-ASAP candidate.
-`PrecomputePlan` directly is the runtime precompute contract; there is no second
-streaming-config semantic model or lossy conversion step. All sections share
-plan and materialization identities.
-One immutable version installs the precompute configuration, store catalog, and
-inactive query routes atomically. Materialization readiness is runtime state:
-each route becomes eligible for summary serving only after its required windows
-have complete and fresh coverage.
-
-## Component responsibilities
-
-### ASAPPlanner
-
-ASAPPlanner consumes the complete query workload and associated data workload.
-It owns query semantics, workload-wide sharing, abstract summary candidates,
-accuracy reasoning, logical window/lifecycle choices, selection, and exact
-fallback decisions.
-
-The compatibility profile consumes canonical types and behavior from the pinned
-ASAPPlanner revision. It must not restore ASAPQuery's historical planner as a
-second planner or copy Planner optimizer, intent-algebra, or sketch-capability
-rules into ASAPQuery-backend.
-
-### ASAPQuery-backend control plane
-
-For the first MVP, operators provide immutable `QueryWorkload` and
-`DataWorkload` snapshots at startup. The control plane:
-
-1. validates and loads both configured workload snapshots;
-2. invokes ASAPPlanner with the complete `QueryWorkload` and associated
-   `DataWorkload`;
-3. enumerates only backend-local implementations for Planner candidates;
-4. returns implementation-cost evidence needed for selection;
-5. compiles the selected candidate into a matching SummaryCatalog, PrecomputePlan,
-   and QueryPlan; and
-6. stages and atomically activates those views.
-
-It does not enumerate SDK or Collector placements in this profile. A Planner
-candidate that has no backend-local SummaryStore materialization and readout
-implementation is unavailable; the control plane must not assign it an
-optimistic zero cost.
-
-Online query observation, data-workload estimation from Remote Write, and
-replanning may be added later. If enabled, the data-plane query endpoint emits
-bounded canonical observations and the control plane aggregates them; the
-request path never owns planning. These capabilities are not startup or MVP
-dependencies.
-
-### Raw ingest and precompute
-
-The Remote Write adapter owns only wire decoding and validation:
-
-```text
-HTTP body
-  -> verify request limits and content encoding
-  -> Snappy decode
-  -> protobuf WriteRequest decode
-  -> validate __name__, labels, timestamps, and sample encodings
-  -> recognize the Prometheus stale-NaN marker before ordinary numeric checks
-  -> canonical series key
-  -> route raw samples to the active PrecomputePlan
-```
-
-The precompute engine owns series routing, bounded buffering, watermark and
-lateness behavior, window assignment, selected accumulator updates, and writes
-to SummaryStore. The decoder must not choose an aggregation family.
-
-The current ASAPQuery-backend streaming precompute engine is the destination,
-but the ASAPQuery history is a required bug-fix migration source. Before the
-compatibility profile is complete, relevant ASAPQuery precompute fixes must be
-audited commit by commit and either migrated with regression tests or recorded
-as inapplicable because the affected feature was intentionally retired. The
-known audit set includes idle/trailing-window closure, active-ingest wall-clock
-safety, move-out at pane eviction, millisecond windows, value-column routing,
-CMS-with-heap parameter parsing, and accumulator-family routing.
-
-Restoring Remote Write must add an adapter to the current engine; it must not
-restore or fork the historical ASAPQuery engine. In particular, retired
-`SetAggregator` and `DeltaSetAggregator` paths are not restored merely because
-their historical patches touched precompute code. Compatibility tests preserve
-both migrated ASAPQuery fixes and newer backend fixes, and expose any remaining
-semantic mismatch rather than weakening the expected results.
-
-The exact Prometheus stale-NaN bit pattern is recognized, deduplicated and
-counted, then excluded from numeric aggregation. It is not currently propagated
-as a worker lifecycle event. Other non-finite values, native histograms and
-exemplars are rejected. Only Remote Write v1 is supported.
-
-Within the configured in-memory deduplication horizon, an identical canonical
-series/timestamp/value is a duplicate; a conflicting value is rejected. The
-receiver validates the batch and reserves all bounded worker-queue capacity
-before exposing messages. A `204` acknowledges that queue admission and
-in-memory dedup bookkeeping, not completed accumulator mutation or durable
-commit. There is no durable raw-sample WAL or receiver dedup recovery after a
-process restart. Summary persistence is a separate later stage.
-
-Invalid batches fail before enqueueing. Queue/dedup capacity exhaustion returns
-a retryable `503`; body/decoded size limits return `413`. The dedup horizon must
-cover configured lateness and expected retry duration, but it does not provide
-crash-safe exactly-once delivery. Prometheus remains the raw-data authority.
-
-Remote Write carries neither a producer-partition roster nor an authoritative
-watermark. Finite `POST /api/v1/precompute/drain` closes the input generation;
-it is not continuous completion. Existing typed `SummaryWatermarkBarrier` and
-coordinator APIs need registered producer/partition identity and publication
-ordering before they can establish continuous closure. There is no public HTTP
-barrier endpoint in this profile.
-
-### SummaryStore
-
-The MVP may use the existing in-process summary store. It stores only state
-produced by the active backend-local PrecomputePlan and indexes it by
-materialization, canonical label values, and logical window. It tracks enough
-coverage and watermark state to distinguish ready, missing, incomplete, and
-stale ranges.
-
-Persistent/cold storage is an extension of ASAPQuery-backend, not a dependency
-of this compatibility profile. A process restart may lose the warm summary
-cache only if query routing falls back to Prometheus until the new plan has
-rebuilt complete coverage. Recovery creates a new backend-local producer/runtime
-epoch. Pre-crash partial windows remain incomplete and must never be combined
-with post-restart samples; they can be served only after explicit Prometheus
-backfill, otherwise the first eligible result is a complete post-restart window.
-
-### Query path
-
-The public MVP query surface is:
-
-```text
-GET or POST /api/v1/query
-GET or POST /api/v1/query_range
-```
-
-For each request, the Prometheus adapter preserves query semantics and response
-shape. Semantic preservation includes `query`, `time`, `start`, `end`, `step`,
-and `timeout`, plus configured tenant and authorization context; it does not
-require byte-for-byte reproduction of the incoming HTTP request. Routing has two
-successful outcomes:
-
-1. execute the active QueryPlan DAG, whose materialization bindings were
-   resolved through SummaryCatalog, when compatible summary state has
-   complete and fresh coverage; or
-2. forward a semantically equivalent request to the configured Prometheus
-   endpoint.
-
-A parse failure, store miss, unsupported expression, inactive plan, incomplete
-window, stale coverage, or insufficient accuracy is not an empty successful
-summary result. It follows the explicit fallback route or returns an error if
-fallback is unavailable.
-
-The first compatibility level is intentionally explicit rather than claiming
-all PromQL. It supports raw scalar samples, canonical label grouping, tumbling
-window sum, Prometheus `rate` and `increase` over counters, one sketch-backed
-quantile operation, and instant and range evaluation of those planned
-summaries. Selectors or expressions outside that set exercise the exact
-Prometheus fallback path. Expanding the accelerated surface requires a versioned
-compatibility-level change and conformance tests.
-
-## Planning and activation lifecycle
-
-Startup is fallback-safe:
-
-```text
-start backend
-  -> verify Prometheus fallback health
-  -> load configured QueryWorkload and DataWorkload snapshots
-  -> run Planner candidate search and selection
-  -> compile one PhysicalPlan (SummaryCatalog + PrecomputePlan + QueryPlan)
-  -> atomically install precompute + catalog + inactive routes under one version
-  -> accept Remote Write and forward every query to Prometheus
-  -> enter Materializing state
-  -> wait for complete summary coverage
-  -> mark each ready materialization Serving
-```
-
-The lifecycle is `Compiled -> Installed -> Materializing -> Ready -> Serving`.
-Installation is the atomic configuration boundary; readiness is evidence about
-runtime data coverage. Plan replacement builds a new immutable snapshot.
-Precompute, store metadata, and query routing must never observe a mixture of
-old and new aggregation parameters. Until the new plan is installed and warm,
-the previous compatible route or Prometheus remains authoritative.
-
-The first MVP plans once from the startup snapshots. Runtime observation and
-repeated replanning are optional, but any later implementation must preserve the
-same atomic cutover and warmup rules.
-
-## Relationship to the broader backend
-
-| Concern | ASAPQuery compatibility profile | Broader ASAPQuery-backend |
-| --- | --- | --- |
-| Ingest source | Prometheus Remote Write raw samples | Collector materializations over modified OTLP and other explicit profiles |
-| Summary construction | Backend-local only | Collector or backend placement |
-| Physical outputs | SummaryCatalog + PrecomputePlan + QueryPlan | SummaryCatalog/CollectorPlan/PrecomputePlan/TransmissionPlan/QueryPlan views as applicable |
-| Query protocol | Prometheus HTTP / PromQL | Additional protocols may be supported |
-| Exact fallback | Upstream Prometheus | Prometheus or another compiled storage/query route |
-| Storage required for MVP | In-process warm summary state | Warm, durable, archive, and remote tiers |
-| Sampling and delta | Disabled | Optional physical mechanisms |
-
-The compatibility profile is a restricted runtime configuration. Every enabled
-component belongs to ASAPQuery-backend; broader distributed features remain
-available only outside this profile.
-
-The profile is also not a literal subset of historical ASAPQuery internals. It
-preserves the relevant external behavior while adding the current canonical
-ASAPPlanner types, versioned physical compilation, readiness evidence, and
-stronger activation and retry contracts.
-
-## Implementation status
-
-| Area | Implemented contract | Executable evidence |
-| --- | --- | --- |
-| Startup/profile | Collector-free startup, excluded-component validation, fallback health gate | `data_plane` profile tests and production-process E2E |
-| Physical planning | Canonical workload snapshot to one atomic SummaryCatalog/PrecomputePlan/QueryPlan bundle | `compatibility_demo_snapshot_compiles_the_complete_query_matrix` |
-| Remote Write | Strict v1 decoding, stale-marker exclusion, limits, bounded in-memory deduplication and backpressure | receiver unit tests plus process E2E replay/corrupt-batch assertions |
-| Precompute/store | Raw samples use the planned family; first catch-up batches close all complete windows; sketch and exact payloads share canonical SID semantics | worker/store tests and four-family process matrix |
-| Query execution | QueryPlan-only serving-time lookup, node-level materialization binding, generic DAG traversal, exact fallback | instant/range process matrix and fallback request capture |
-| Atomic activation | Versioned stage/activate snapshot and materialization readiness state | physical-plan endpoint tests and `/physical-plan/status` assertions |
-| Real deployment | Prometheus remote_write with no Collector | `./scripts/e2e.sh asapquery-demo` |
-
-## Implemented phases
-
-### Phase A: profile and startup contract
-
-Add an explicit `asapquery` profile with startup validation. It permits only
-Prometheus fallback, Remote Write ingestion, PromQL HTTP serving, backend-local
-precompute, the warm summary store, and configured `QueryWorkload` and
-`DataWorkload` inputs. An excluded connector or required Collector endpoint is
-a configuration error.
-
-Acceptance: the backend starts with no ASAPCollector or OTLP endpoint and all
-queries initially reach Prometheus.
-
-### Phase B: Remote Write ingestion
-
-Implement the v1 receiver, strict resource limits, canonical label and stale
-marker handling, bounded deduplication/retry behavior, visible backpressure, and
-routing into the existing raw-sample precompute input.
-
-Acceptance: valid Snappy/protobuf batches produce the same canonical samples and
-stale-marker recognition as a reference decoder; replayed whole or partial batches
-converge without double-counting; corrupt, oversized, conflicting, and
-overloaded requests cannot leave untracked mutations while returning success.
-
-### Phase C: backend-only planning
-
-Load the configured query and data workload snapshots, call the pinned
-ASAPPlanner, enumerate backend-local implementations, and compile one atomic
-PhysicalPlan with SummaryCatalog, PrecomputePlan, and QueryPlan. Do not create or
-wait for CollectorPlan.
-
-Acceptance: captured Planner input, selected Post-ASAP candidate,
-SummaryCatalog, PrecomputePlan, and QueryPlan are deterministic golden artifacts
-with matching plan/materialization/window/family/parameter identities.
-
-### Phase D: atomic activation and warmup
-
-Install the precompute configuration, store catalog, and inactive query routes
-atomically under one plan version. Track readiness separately for each
-materialization and keep its queries on Prometheus until all required windows
-are complete and fresh.
-
-Acceptance: injected failure at every installation boundary exposes either the
-old complete configuration or the new complete configuration, never a mixed
-one. An installed-but-materializing plan remains on fallback and cannot be
-mistaken for a serving route.
-
-### Phase E: PromQL serving and fallback
-
-Serve the declared compatibility-level instant and range queries from planned
-summaries. Forward every unsupported or unsafe request to Prometheus with
-semantically equivalent parameters and configured request context, and preserve
-Prometheus response types, labels, timestamps, warnings, and errors.
-
-Acceptance: accelerated results satisfy their declared error bound against
-Prometheus, exact operations match Prometheus semantics, and fallback responses
-are equivalent to direct Prometheus calls.
-
-### Phase F: compatibility demo
-
-`./scripts/e2e.sh asapquery-demo` runs Prometheus with `remote_write` configured
-to the backend, starts the backend with fixed workload snapshots, sends their
-corresponding repeating queries
-through the backend, wait for planning and warmup, and capture route decisions
-and resource measurements.
-
-Acceptance evidence includes:
-
-- Remote Write requests, samples, rejected requests, duplicates, and bytes;
-- configured workload snapshots and the exact Planner input/output artifacts;
-- active plan/materialization identities and activation time;
-- summary versus fallback query counts;
-- window coverage and end-to-end freshness;
-- result error against direct Prometheus; and
-- query latency, backend CPU, and backend memory before and after activation.
-
-The E2E query matrix includes all of the following through the backend and
-compares each result with a direct request to the same Prometheus instance:
-
-| PromQL case | Instant `/api/v1/query` | Range `/api/v1/query_range` |
-| --- | --- | --- |
-| `rate(counter[window])` | Required | Required, including every returned step |
-| `increase(counter[window])` | Required | Required, including every returned step |
-| planned sum | Required | Required |
-| planned sketch-backed quantile | Required | Required |
-| unsupported expression | Exact fallback required | Exact fallback required |
-
-The counter fixture includes monotonic input, at least one counter reset,
-irregular sample spacing, and samples near window boundaries. The assertions
-cover values, labels, timestamps, result type, and range-step count. A test that
-only proves that the endpoint returns HTTP success does not satisfy this matrix.
-
-## Post-MVP compatibility extensions
-
-The first query extension should be a SQL endpoint because ASAPQuery exposed SQL
-as an additional query surface. It must translate SQL into canonical Planner
-query semantics and reuse the same catalog-backed QueryPlan readiness, summary store, and
-exact-fallback rules; it must not introduce a second planner or separately
-configured materializations. Its supported SQL subset and fallback target need
-their own versioned compatibility contract and conformance cases.
-
-CSV and JSON ingestion can follow as convenience adapters. Each adapter is
-limited to parsing and validation before emitting the same canonical raw-sample
-records as Remote Write. It must not choose aggregation families or bypass the
-active PrecomputePlan. These adapters remain optional and cannot become startup
-dependencies of the Remote Write profile.
-
-## MVP completion criterion
-
-The executable completion command is:
-
-```bash
-./scripts/e2e.sh asapquery-demo
-```
-
-It starts Prometheus and ASAPQuery-backend without ASAPCollector, ingests only
-through Prometheus Remote Write, plans from the configured workloads, activates a
-backend-local summary, serves both the declared sum and sketch-backed quantile
-compatibility cases plus Prometheus `rate` and `increase` through both instant
-and range endpoints from complete summary windows, and transparently falls back
-for an unsupported query. The run must fail if ingestion, planning, activation,
-coverage, accuracy, counter-reset handling, range-step equivalence, or fallback
-evidence is missing.
-
-Starting the components or exposing `/api/v1/write` alone is not completion.
diff --git a/docs/design_docs/continuous-summary-completeness.md b/docs/design_docs/continuous-summary-completeness.md
deleted file mode 100644
index 2d0eeb0e8..000000000
--- a/docs/design_docs/continuous-summary-completeness.md
+++ /dev/null
@@ -1,45 +0,0 @@
-# Summary publication completeness for accepted input
-
-## Continuous local Remote Write
-
-With bounded revisions enabled, SummaryStore durably captures each accepted input
-revision before running the precompute Physical DAG. Replaying retained input
-replaces a window result; it never adds the full replacement to its previous state.
-Outputs commit independently. The checkpoint retains both input admission revisions
-and output snapshots, so same-version recovery can finish a partial publication
-without changing already committed sketch bytes.
-
-An installed query pins the latest snapshot with compatible revisions, complete
-coverage for its required windows and acceptable freshness. All branches and range
-evaluation points share that view. If A:r2 is ready while B:r2 is pending, A+B can
-continue reading fresh r1. Publication and reclamation cannot change an already
-pinned query. A new plan version has separate history and must warm independently.
-
-The correction horizon uses Backend admission time and applies to the whole input
-request, including previously unseen series. A request containing an expired or
-future sample is rejected before durable admission or deduplication changes. A
-periodic capture evaluates newly elapsed windows without pretending to prove that
-upstream sources will never send late data. Resource and cancellation errors stop
-execution; they are not capability misses or exact-fallback triggers.
-
-This first implementation serially rebuilds bounded retained input, stores
-checkpoints through atomic replacement and fsync, and enforces a single local
-writer. It does not add distributed watermark coordination or incremental replay
-optimization. Configuration and execution examples are in
-[Precompute DAG execution](precompute-dag-execution.md#continuous-local-input-revision-snapshots).
-
-## Queued finite and other ingestion paths
-
-The SummaryStore owns an in-memory admission inventory keyed by catalog generation, summary definition, group population and physical time window. Remote Write reserves every worker queue slot before admitting any coordinates, then sends the same immutable input revision with the queued work. Queue rejection leaves neither messages nor admission records behind.
-
-Workers carry the first and last consumed input revisions through materialized source and maintenance DAG outputs. State writes validate the generation and consumed revisions before modifying SummaryStore; a later output cannot acknowledge an earlier missing update. Corrections within one admitted coordinate are combined before publication. Dropped admitted input leaves the coordinate incomplete. Accepted raw-sample throughput counts once per request, without materialization fanout; materialized-output throughput counts new successful store publications, without receipt retries.
-
-A query rejects overlapping admitted but unpublished input. The whole QueryPlan DAG is fenced by the store revision, so branches cannot combine different publication snapshots. Both direct sketch writes (including OTLP) and exact-state writes (including SQL backfill) participate in the mutation fence; in-flight writes cannot certify a read snapshot. Finite absence proof also requires that every state mutation was admitted. For these paths, the fence is global: unrelated updates can cause conservative exact fallback. This conservative fence is not used to select the pinned continuous-input snapshots described above.
-
-Finite drain closes input, waits for all workers and certifies that every accepted coordinate published. Only this closed-input proof can establish that a known series has no samples in a retained window. Missing state, unknown series, unknown time coverage and incomplete coordinates never imply an empty result. Live Remote Write provides no source watermark, so the backend does not infer global event-time completeness from the fastest series.
-
-Admission metadata has bounded coordinate, pending-revision and byte budgets. Completed receipts expire with configured materialization retention; pending work and the published prefixes of pending admissions remain protected. Already admitted slow-worker outputs can finish behind another worker's maintenance replay frontier. Unsolicited expired input and expired untagged replay remain rejected.
-
-The queued-path admission inventory is not durable and does not establish exactly-once execution across crashes. Startup installs the authoritative catalog before persistence recovery, and current-version persisted series metadata preserves summary definition identity and catalog provenance. Recovery requires the same catalog generation and rejects unsupported persisted metadata formats. A changed catalog generation starts cold and requires fresh state; cross-generation adoption is not supported. General multi-input maintenance transforms and durable producer watermarks remain separate work.
-
-Durable SID bindings also preserve retirement and expiry timestamps and a removal tombstone. Lifecycle changes publish through the same serialized metadata writer as the flusher before changing in-memory visibility. A stale flush snapshot cannot clear those fields. Recovery leaves removed and expired instances unregistered and preserves a still-retired instance's expiry deadline. Tombstones remain until durable state is explicitly reclaimed; this change does not claim automatic tombstone garbage collection or cross-generation reactivation.
diff --git a/docs/design_docs/disable-query-forwarding-decisions.md b/docs/design_docs/disable-query-forwarding-decisions.md
deleted file mode 100644
index 5faf2493a..000000000
--- a/docs/design_docs/disable-query-forwarding-decisions.md
+++ /dev/null
@@ -1,25 +0,0 @@
-# Disable query forwarding: decisions
-
-Q: What does the mode prohibit?
-A: No Prometheus, VictoriaMetrics, ClickHouse, or exact-subquery query requests. Health and runtime metadata remain allowed.
-
-Q: How is it enabled?
-A: CLI-only `--disable-query-forwarding`.
-
-Q: What conflicts are errors?
-A: Combining it with `--forward-unsupported-queries`, `--profile asapquery`, `--victoriametrics-http-port`, or `--clickhouse-http-port` is a startup error.
-
-Q: What happens when a plan needs an external exact subquery?
-A: Fail closed with the normal protocol-specific unsupported/capability-miss response; never return an empty or partial result.
-
-Q: How is the behavior represented in code?
-A: A shared forwarding-policy enum gates adapter fallback and planned exact subqueries.
-
-Q: What is the default?
-A: No flag means existing forwarding behavior is unchanged.
-
-Q: How is it tested?
-A: A production-process request-capture test covers instant and range paths; CLI validation tests cover conflicting settings.
-
-Q: What observability is required?
-A: Startup INFO announces the mode; blocked HTTP fallbacks and planned exact subqueries emit DEBUG logs and increment a backend/path-labeled counter. Existing protocol response shapes remain unchanged.
diff --git a/docs/design_docs/empirical-o11y-execution-plan.md b/docs/design_docs/empirical-o11y-execution-plan.md
deleted file mode 100644
index 00e98b746..000000000
--- a/docs/design_docs/empirical-o11y-execution-plan.md
+++ /dev/null
@@ -1,67 +0,0 @@
-# Offline evidence and o11y planning evaluation
-
-This is the historical offline-evidence milestone plan. The current prototype
-adds actual backend-only data-plane execution using the supplied OpenMetrics
-dataset, as described in the [current evaluation guide](../user_guide/o11y-replay.md).
-Benchmark production and execution tooling now belong to ASAPQuery-backend;
-planner-only coverage and synthetic cached-result timing are not its acceptance criteria.
-
-Audience: developers reproducing issue #322 and the planner/control-plane evaluation.
-
-## Scope
-
-Use offline sketch-bench CPU, elapsed time, state/memory, disk (when measured),
-and errors against offline ground truth. No runtime ground truth, posterior
-feedback, or self-estimated accuracy is required. Offline accuracy observations
-do not establish formal guarantees on unseen distributions.
-
-## Execution and ownership
-
-1. Pin isolated planner and control-plane worktrees from fetched main branches.
-   Preserve existing worktrees, including unresolved cost-model changes.
-2. Evidence agent: implement the versioned artifact, validation, compatibility
-   matching, public cost-model integration, and fallback/decision tests.
-3. Benchmark agent: run actual sketch-bench algorithms on uniform and Zipf
-   inputs, preserve raw output, export artifacts with source and environment
-   provenance, and document reproducible commands.
-4. Replay agent: run the existing o11y PromQL corpus through the backend parser,
-   its ASAPPlanner call, and the backend typed binder (not a planner-only entry),
-   export binding/fallback coverage and planning latency, and separately identify
-   supplemental sketch workloads.
-5. Integration owner: connect compatible evidence to the downstream control
-   plane, validate dependency compatibility, review other agents' changes, run
-   integration checks, and report evidence-supported comparisons.
-
-Steps 2–4 run concurrently after agreeing the artifact contract. Integration
-uses their completed interfaces and measurements. Query-pattern changes are
-limited to demonstrated blockers with regression coverage; unsupported query
-semantics remain explicit in the report.
-
-## Acceptance
-
-- Versioned schema and example; explicit units, algorithm/configuration,
-  dataset/distribution, environment, collection/validity times, sample count,
-  dispersion, and benchmark/model provenance.
-- At least two actual sketch algorithms measured offline on uniform and skewed
-  inputs. CPU is distinct from elapsed time; serialization size is distinct
-  from heap memory and disk I/O. Unmeasured fields stay unavailable.
-- Matching evidence affects a public planning cost/ranking/lifecycle boundary.
-  Tests cover changed decisions, missing/stale/mismatched evidence, invalid
-  values, and unchanged accuracy guarantees.
-- The planner and control-plane evaluation preserve exact fallbacks and expose
-  unsupported shapes, measured provenance, and limits on benefit estimates.
-- Reproducible measurement and replay commands, raw machine-readable results,
-  and a concise report distinguish actual measurements from modeled totals.
-
-## Comparison rules
-
-Compare equivalent tasks, data, parameters, windows, horizons, and evaluation
-cadences. Whole-plan estimates include build/update/readout, retained windows,
-sharing, and raw residual work where evidence exists. Missing raw baseline or
-physical evidence means an unavailable whole-plan speedup, not zero cost.
-Microbenchmark algorithm comparisons are labeled separately. Disk usage and
-network savings require their own measurements or explicit models.
-
-Repeated-query break-even can be computed only when compatible exact baseline,
-sketch build/maintenance, and readout measurements are present. It is an offline
-estimate and does not establish deployed end-to-end latency improvement.
diff --git a/docs/design_docs/physical-operators.md b/docs/design_docs/physical-operators.md
deleted file mode 100644
index c403684da..000000000
--- a/docs/design_docs/physical-operators.md
+++ /dev/null
@@ -1,85 +0,0 @@
-# Consuming Planner physical operators
-
-## Ownership and contract
-
-The shared physical operator library lives in ASAPPlanner, alongside post-ASAP
-IR and physical lowering. Its canonical architecture and acceptance contract are
-in [the Planner design](https://github.com/ProjectASAP/ASAPPlanner/blob/feat/shared-physical-operators/docs/design_docs/physical-planning-and-deployment.md).
-
-ASAPQuery-backend depends on `asap-physical-operators`, `asap_sketch_codec` and
-Planner IR at the same immutable revision. It does not own a second copy of the
-runtime or mathematical kernels. A new IR operation and its implementation can
-be changed and tested together in Planner.
-
-The query and precompute integration PRs both use the independent ASAP DAG runtime. Deployment code binds input
-sources, storage, ingestion windows, publication and protocol outputs. Execution
-phase belongs to the physical node's data state, not the operator payload.
-Computation has the same semantics during precomputation and query execution.
-
-Candidate pruning uses a general semi-join with explicit matching keys, followed
-by grouped Sort and grouped Limit. The completeness certificate belongs to the
-pruning step; sorting exact scores does not prove completeness. There is no
-`MembershipFilter` physical operator or compatibility dispatch.
-
-## Acceptance
-
-Planner validates operation, expression, family and parameter support when it
-compiles the physical DAG. Backend validates deployment input and storage
-contracts before execution. It must not reject a supported computation because
-its adapter discarded a type, predicate or join key. An implicit external fallback is not an implementation.
-Planner tests cover shared producers, phase assignment, typed batches and
-composed candidate pruning. Backend tests cover source binding, installed plan
-validation, storage compatibility and query responses.
-
-The migration does not supply a local raw Scan. That deployment capability
-remains deferred. Library tests supplied with raw batches are not evidence that
-the backend can execute arbitrary raw-only installed plans.
-
-## Stack integration
-
-Planner PR #462 owns the library and depends on Planner #461, including its
-composed candidate-pruning API. Backend #774 consumes the pinned library;
-#763 integrates precomputation DAG execution and #765 integrates query DAG execution.
-The remaining backend stack builds on those integrations. #728 checks candidate
-structure, #742 checks selection with synthetic costs, and #775 checks installed
-plans against data-plane results. Production evidence and performance validation
-remain separate from these correctness tests.
-
-The library also owns stored-summary decoding, delta reconstruction and
-family-specific readout kernels. Deployment adapters select compatible panes
-and translate inputs and outputs; they do not copy those computations.
-
-The shared `physical_planner::compile` API validates concrete operators and typed
-input contracts before opening sources. Deployment resolves those inputs and
-instantiates the compiled DAG. `CompiledPhysicalDag::from_operators` supports
-adapters that already have a concrete physical fragment. Unsupported deployment
-input frontiers are reported to Planner as feasibility evidence, before selection.
-
-## Deployment retention and execution evidence
-
-The backend `DeploymentPlanCompiler` binds declared historical query delay to
-retention; it does not change a logical selector's lookback. Current-series
-populations retain bounded versions only when the deployment requests historical
-coverage. Their current and retained versions share the population memory budget.
-Changed inputs require a new output revision; an older common snapshot remains
-eligible while it satisfies freshness. Missing or evicted state fails explicitly.
-Candidate costing includes version residency, copying and retirement.
-
-Every installed range evaluation uses the shared DAG execution path and reports
-its actual local-summary and external-exact work. The differential and benefit
-runners require successful local execution evidence as well as matching values.
-Routing to the ASAP endpoint alone is insufficient.
-Selected Filter, Sort, Limit and semi-join fragments are compiled by Planner and persisted
-with typed input contracts. Complete query candidates include Planner readouts
-that turn accumulator state into values; internal shared and stored edges retain
-their state types. Runtime binds protocol vectors to these contracts;
-renamed or multiple join keys retain their original types and positions. External
-Prometheus bindings fetch the selected authoritative subquery without rewriting
-its labels from the candidate side. The native join performs the comparison.
-
-Physical execution errors retain their original cause. Memory exhaustion and
-cancellation terminate both instant and range requests; routing does not try a
-second engine or exact fallback. All range steps and nested physical executions share one request budget and
-cancellation signal, while retaining separate execution state. Tracked inputs,
-workspace and results count against that budget; estimates are not a hard RSS
-limit. See [query execution contracts](query-dag-execution.md#6-request-consistency).
diff --git a/docs/design_docs/planner-backend-glossary.md b/docs/design_docs/planner-backend-glossary.md
deleted file mode 100644
index 3d86abf29..000000000
--- a/docs/design_docs/planner-backend-glossary.md
+++ /dev/null
@@ -1,82 +0,0 @@
-# Planner/backend design glossary
-
-For developers reading the [integration](asapplanner-integration.md),
-[SDS](summary-catalog-sds-architecture.md), and
-[migration](asapplanner-migration-plan.md) designs. Definitions describe the
-proposed boundary; they do not imply that every proposed field already exists
-in the serialized API.
-
-## Computation and execution
-
-| Term | Meaning |
-| --- | --- |
-| Selected post-ASAP DAG | The Planner-produced logical computation underlying the physical candidate selected by Backend, including summary producers, shared dependencies and query readouts. |
-| Physical DAG | Planner-owned concrete operators, typed input boundaries, dependencies and roots; no storage identities or placement. |
-| Physical candidate | A Planner-produced physical realization of a workload; Backend checks deployment feasibility and selects using scoped costs. |
-| Deployment plan | System instantiation of physical computation with concrete source/state bindings and operational policy. |
-| Summary producer | An operation or subgraph that builds summary state. Multiple queries may share its stored output. |
-| `SummaryMaintenanceLifecyclePlan` | Planner result associating a post-ASAP root with selected maintenance requirements for its unique reachable summary producers, plus workload and costing context. |
-| Selected deployment guarantee and schedule/retention | The selected `SummaryMaintenanceLifecycleGuarantee` for one producer, together with its concrete scheduling and retention binding. Planner supplies the selected lifecycle requirements; backend scheduling and retention must realize them without changing their semantics. |
-| Maintenance | Work that constructs, refreshes or derives stored summary state, including batch rebuilds and incremental updates. |
-| `PrecomputePlan` | Planner maintenance Physical DAGs plus backend input/output bindings, scheduling and publication policy. |
-| `QueryPlan` | Planner query Physical DAGs plus backend input bindings, query/result associations and fallback policy. |
-| Readout / `SummaryEstimate` | Operation that obtains a query value from summary state, such as p99 from KLL. |
-| Derived summary state | Stored summary state computed from existing summary states. Earlier discussion calls this a “derived materialization”; it does not require a separate catalog object. |
-| Exact computation around summaries | Part of the selected query computed exactly around summary operations, such as supported filtering or arithmetic after readout. It does not make the whole approximate result exact. |
-| Exact fallback | Configured execution of the original query through an exact route when the summary plan cannot serve it. |
-
-For example, merging five compatible one-minute KLL summaries and storing the
-five-minute result produces derived summary state in a separate destination
-stored output. Merging them only to answer a query is a query-time operation. Both require
-compatible grouping, coverage and accuracy.
-
-## State and identity
-
-The storage contract has two stored objects: `SummaryDefinition` and
-`StoredSummary`. `StoredOutputReference` belongs to installed boundary bindings,
-not a third storage table. Metadata and payload form one logical stored record.
-Migration of existing types and fields is covered in the
-[migration plan](asapplanner-migration-plan.md).
-
-| Term | Meaning |
-| --- | --- |
-| `summary_definitions` | Logical table inside `SummaryStore`: semantic fingerprint → persisted canonical semantic description. The compiler supplies a snapshot for validation and registration during installation. |
-| `stored_summaries` | Logical table inside the same store: `(plan_version, stored_output_id, group_key, window)` → `StoredSummary`. |
-| SDS (Self-Describing Summary) | The description and metadata needed to interpret and validate stored summary state. It is not a separate execution engine or payload store. |
-| `SummaryDefinition` | Immutable, versioned Planner-defined semantic description of the persisted output and only its necessary dependencies; not an executable plan. |
-| `stored_output_id` | Compiler-assigned binding ID for a persisted PrecomputePlan DAG output within one plan version. Writers and shared readers use it to name the same output; it is not a memory slot or independent catalog object. |
-| `StoredOutputReference` | Plan reference identifying a stored output and summary definition within the enclosing plan version. Reader configuration selects the required state instances and constrains format and coverage. |
-| `StoredSummary` | One committed record containing instance metadata and payload, such as one service's completed five-minute KLL snapshot. |
-| `SummaryStore` | Persistence authority for summary definitions and concrete stored results; Planner defines semantics and deployment installs them. The current implementation is `SketchStore`; no separate metadata or payload service is required. |
-| `plan_version` | Version shared by an installed plan bundle and its catalog bindings. Creating or updating state instances does not itself change this version. |
-| Schema / encoding | Schema describes the state structure; encoding describes how that structure is represented as bytes. |
-| Semantic discovery | Future Planner search for legal query rewrites over persisted definitions; distinct from fingerprint equality and record lookup. |
-| Deployment resolution | Backend selection of authorized stored outputs realizing a selected definition. |
-| Logical dataset identity | Stable semantic source identity supplied before Planner definition export; distinguishes datasets independently of endpoints or replicas. |
-| Definition ID | Fingerprint of a versioned canonical semantic description; different input expressions must remain distinguishable. |
-| Provenance | Mapping from physical plan operations back to the selected Planner computation. |
-
-A materialization boundary is a Planner-selected physical output consumed
-through typed inputs. Backend binding assigns its storage identity without
-reclassifying logical nodes or changing that boundary.
-
-## Time, selection and validation
-
-| Term | Meaning |
-| --- | --- |
-| Logical range | Input interval required by the computation. In the example, `range: 5m` means `(T - 5m, T]` at evaluation time `T`. |
-| Pane | Physical time partition of stored state. Several compatible panes may serve one logical range; pane size need not equal that range. |
-| Refresh cadence | How often the producer is scheduled to build or refresh state. |
-| Retention | How long state remains available; distinct from its input range and refresh cadence. |
-| Readiness | Whether the required state is available with valid format and sufficient coverage/completeness for a read. Plan installation alone does not establish readiness. |
-| Backend capability | Declaration of supported implementation combinations: algorithm/parameters, maintenance mode, input kind, window behavior and format. |
-| Physical cost evidence | Scoped measurements or estimates used to compare executable candidates; includes workload and implementation context. |
-| Compiler contract | Required inputs, outputs, validation rules and guarantees, including matching writer/reader definitions, formats, partitions and plan versions. |
-
-## Compilation ownership
-
-The [canonical Planner design at e9390031](https://github.com/ProjectASAP/ASAPPlanner/blob/e9390031fcecd7bc0d611127eddc5c6603a281e5/docs/design_docs/physical-planning-and-deployment.md)
-defines physical lowering and frontier selection as Planner responsibilities.
-The backend Deployment Plan Compiler binds declared physical inputs and outputs;
-it does not reinterpret the logical DAG. Operator kind alone does not determine
-maintenance versus query placement.
diff --git a/docs/design_docs/precompute-dag-execution.md b/docs/design_docs/precompute-dag-execution.md
deleted file mode 100644
index f7c1610e7..000000000
--- a/docs/design_docs/precompute-dag-execution.md
+++ /dev/null
@@ -1,563 +0,0 @@
-# Precompute DAG execution
-
-Audience: backend designers and developers.
-
-This document specifies the precompute engine design: how it receives a
-Planner-provided physical candidate selected by Backend, runs its DAGs over
-data partitions, and publishes the
-stored outputs consumed by query plans. The [plan split](asapplanner-integration.md)
-and [SDS contract](summary-catalog-sds-architecture.md) define the compiler and
-storage contracts used here.
-
-## 1. Intuition: compute once, reuse across queries, amortize the cost
-
-Precompute performs shared work ahead of query execution and stores its selected
-outputs. Later queries reuse those outputs repeatedly, amortizing the cost of
-constructing and maintaining them across the queries they serve. The purpose is
-to reduce both total resource cost and query latency: repeated queries avoid
-repeating expensive input scans and computation, while the work left on the
-query path is a stored-state read and the remaining query operators.
-
-For example, repeated p50 and p99 requests for request latency by service over
-the same five-minute range can share one Planner-selected KLL producer.
-Precompute builds the KLL state once per service and scheduled window. Every
-compatible request then reads that stored state and applies its percentile
-readout, rather than scanning the samples and rebuilding the summary for each
-request. Reuse applies both to repeated executions of a query and to different
-queries that share the selected output.
-
-Over a workload, the resource cost is the cost of construction, maintenance and
-storage plus the reads and remaining query computation. Reuse must save enough
-repeated work to offset those costs; this is what makes precomputation worthwhile.
-Once the required output is ready, query latency excludes its construction work.
-“Compute once” refers to a particular output, population and window: subsequent
-windows still require construction or updates under the selected schedule.
-
-The physical compiler splits the selected DAG at its stored outputs:
-
-```mermaid
-flowchart LR
-  subgraph P[PrecomputePlan]
-    I[Read latency samples] --> G[Group by service]
-    G --> K[Build KLL state]
-    K --> W[Write latency-kll]
-  end
-  W --> S[SummaryStore]
-  subgraph Q[QueryPlans]
-    R[Read latency-kll] --> P50[Estimate p50]
-    R --> P99[Estimate p99]
-  end
-  S --> R
-```
-
-These labels describe the computation, not a separate backend operator language.
-The executable nodes preserve Planner operator semantics and their provenance;
-the compiler adds concrete source and storage bindings.
-
-A worker runs the **whole precompute subgraph for its assigned data partition**.
-For this example, one worker handles `service=api` and another can handle
-`service=worker`. Both execute the same graph. Each worker runs its nodes
-sequentially in dependency order; workers process independent partitions
-concurrently. A worker is an execution task, not necessarily a dedicated OS
-thread.
-
-Only outputs selected for persistence become stored summaries. Intermediate
-values remain in worker memory unless the plan explicitly stores them. A single
-precompute subgraph can have several stored outputs, and several query plans
-can read the same output.
-
-## 2. Inputs and outputs
-
-The physical compiler receives the selected post-ASAP DAG and the selected
-deployment guarantee and schedule/retention. It emits one coherent plan version
-containing definition rows, a PrecomputePlan, and matching QueryPlans.
-
-| Input to the precompute engine | Purpose |
-| --- | --- |
-| `PrecomputePlan` | Defines the precompute subgraph, node IDs, operator parameters, dependency edges, input bindings and stored-output bindings. Carries the selected deployment guarantee and schedule/retention. |
-| Definition rows | Describe the input, Planner family, parameters, grouping and time semantics of each selected stored output. Installed in `SummaryStore.summary_definitions`. |
-| Source data | Raw samples or rows, or explicitly referenced committed summary state. The plan determines which input type each node accepts. |
-| Execution triggers | Input arrival, scheduled evaluation endpoints, and input-completion signals, according to the selected maintenance mode. |
-| `PrecomputeEngineConfig` | Supplies worker count, queue capacity and operational settings such as flush polling interval. These settings cannot change computation, logical windows or the selected schedule/retention. |
-
-The engine produces committed `StoredSummary` records for the selected outputs.
-It also reports completion or failure for scheduled work and drain requests.
-Installing a plan does not imply that its output records are ready.
-
-A QueryPlan consumes these records through a `StoredOutputReference`. That
-reference names a stored output and definition within the installed plan
-version; population and window selection identify the records to read.
-
-## 3. Install the plan once
-
-The backend derives an immutable `InstalledPrecomputePlan` from the supplied
-PrecomputePlan. This runtime representation avoids validating the graph and
-binding operators again for every input batch.
-
-Installation performs four steps:
-
-1. Validate the graph and operator input/output types, including ordered edge
-   roles for operators with multiple inputs. Validate source, definition and
-   stored-output bindings together with the matching QueryPlans.
-2. Bind supported runtime operators and compile a dependency execution order.
-   Preserve Planner families and parameters: Rate and Increase remain distinct,
-   and grouping does not create a separate backend family.
-3. Derive a partitioning rule that keeps all required dependencies and
-   reductions local to a worker, as described below. Check that execution can
-   satisfy the selected deployment guarantee and schedule/retention.
-4. Build node and source-routing indexes, register the validated definition
-   rows, and activate the coherent plan version for routing and execution.
-
-Unsupported operators, incompatible bindings, cycles and unsatisfied deployment
-requirements fail installation before the plan becomes active.
-
-| Object | Lifetime and contents |
-| --- | --- |
-| `PrecomputePlan` | Compiler-supplied computation and bindings for one plan version. |
-| `InstalledPrecomputePlan` | Backend-derived execution order, immutable operator programs, bindings, routing indexes and validated partitioning rule. Shared by the router and workers. |
-| Worker execution state | Mutable node state, input ordering buffers, windows and intermediate results for that worker's assigned partitions. |
-
-`InstalledPrecomputePlan` is internal runtime data, not another serialized
-configuration or independently installable plan. All execution lookup tables
-come from the validated DAG and its bindings. There is no separately maintained
-aggregation list. Operator fusion is permitted only when it preserves the DAG's
-semantics and physical-to-semantic provenance.
-
-## 4. Route data so each worker can execute the whole subgraph
-
-Partitioning is a property of the entire precompute subgraph. All inputs that a
-node must combine must reach the same worker. The router applies the installed
-partitioning rule to canonical input labels and assigns that partition to a
-worker for the lifetime of the active execution state.
-
-| Computation | Required data placement |
-| --- | --- |
-| KLL or Sum grouped by service | Keep all inputs for one service together. |
-| Per-series Rate | Keep each series together and preserve its sample-time semantics. |
-| Per-series Rate followed by Sum by service | Partition by service; keep separate Rate state for each series within the worker, then reduce locally. |
-| Global Sum | Place all inputs on one worker in the simple execution model. |
-
-For Rate followed by Sum, distributing individual series independently could
-put two series of the same service on different workers. Neither worker could
-then compute the complete service result. Partitioning by service satisfies
-both the per-series state requirement and the downstream reduction.
-
-The simple design uses one validated partitioning rule for the installed
-precompute subgraph. If independent partitions cannot be established, use one
-worker when the deployment requirements permit it; otherwise reject the plan.
-There is no implicit shuffle or cross-worker partial-result merge. A hot
-partition therefore remains limited by its owning worker.
-
-Partition ownership is separate from stored-output identity. Hashing a stored
-output ID does not establish that its input dependencies are local. Multiple
-stored outputs can share one data partition and one worker.
-
-```mermaid
-flowchart TD
-  I[Bound input data] --> R[Route by validated data partition]
-  P[InstalledPrecomputePlan] -. shared program .-> A
-  P -. shared program .-> B
-  R --> A[Worker 0: entire subgraph for service api]
-  R --> B[Worker 1: entire subgraph for service worker]
-  A --> S[SummaryStore]
-  B --> S
-```
-
-Worker queues are bounded. Admission applies backpressure when a destination
-queue is full; an atomic input batch must reserve its required queue capacity
-before being acknowledged. Sequential queue consumption does not itself sort
-event timestamps. Input ordering, allowed lateness and counter-reset handling
-must follow the bound operators' time semantics.
-
-## 5. Execute ready work inside the owning worker
-
-Each worker holds the same installed program and separate mutable state. An
-input batch updates only the state for its assigned data partition. A scheduled
-evaluation identifies the logical window whose outputs are due. Nodes run when
-the inputs required for that evaluation are available.
-
-The following diagram expands the KLL example for one scheduled window. The
-router assigns partition work; each worker reads only its bound partition and
-executes every required node of the same installed precompute subgraph. Dashed
-arrows denote shared immutable program access; solid arrows denote work or data.
-
-```mermaid
-flowchart TB
-  D[Selected Planner DAG] --> C[Physical compiler: split at stored outputs]
-  C --> P[PrecomputePlan: Read -> Group -> KLL -> Write]
-  C --> QP[QueryPlans: Read stored KLL -> Estimate]
-  P --> IP[InstalledPrecomputePlan: shared immutable program]
-  T[Scheduled window and source partitions] --> R[Route by service]
-
-  subgraph W0[Worker 0: service=api]
-    direction TB
-    A0[Read partition input] --> A1[Group by service]
-    A1 --> A2[Build KLL: private state]
-    A2 --> A3[Write latency-kll for api and window]
-  end
-  subgraph W1[Worker 1: service=worker]
-    direction TB
-    B0[Read partition input] --> B1[Group by service]
-    B1 --> B2[Build KLL: private state]
-    B2 --> B3[Write latency-kll for worker and window]
-  end
-
-  IP -. same program .-> A0
-  IP -. same program .-> B0
-  R -->|api partition| A0
-  R -->|worker partition| B0
-  A3 --> S[SummaryStore: separate committed population/window records]
-  B3 --> S
-  S --> QR[Query engine: bound stored-state read]
-  QP -. query program .-> QR
-  QR --> E[Estimate p50 or p99 on each query]
-```
-
-Worker 0 and Worker 1 can run concurrently. Within each worker the arrows
-establish dependency order: KLL construction follows its input computation,
-and publication follows completion of the required state. Neither worker owns
-an exclusive operator stage; both execute Read, Group, KLL and Write. They share
-the program but not mutable KLL state. The two records use the same plan version,
-stored-output ID and definition, with different population keys. Query execution
-starts from the committed output rather than running this precompute path again.
-
-The selected maintenance mode determines how state is constructed. An
-incremental operator updates its window state as input arrives. A batch operator
-reads the bound range and builds its result at the scheduled endpoint. The
-runtime cannot replace one mode with another merely because both produce the
-same family of summary.
-
-Within one evaluation, the worker follows this workflow:
-
-### Shared physical operator execution
-
-The shared library lives in ASAPPlanner alongside post-ASAP IR. Backend pins
-that library and IR to the same revision.
-Installed precompute DAGs execute through its `PhysicalDag` runtime. The backend supplies
-storage frontiers, declared edge order, window completeness and durable commit
-keys. It does not own a second dependency walker.
-
-For completed-window DAGs, SummaryAgg uses the native summary builder,
-SummaryMerge uses the native state merge, finalization uses native typed readout,
-and Binary lowers aligned rows to native Project using the Planner binary contract, including checked division. Batch conversion
-preserves the installed population and timestamp bindings. Native calls receive
-the surrounding execution context, so they share its memory budget and
-cancellation. The scheduler accepts the caller's run context rather than creating
-an independent budget. Physical cancellation and memory errors retain their
-error types through maintenance execution. A failed worker stops processing
-input and publishing outputs, and closes admission; the failing drain reports
-the original failure and shutdown
-does not flush more state. Recovery requires restarting the failed execution.
-Query execution uses the same library's operations.
-
-Raw ingestion retains per-window accumulator state through shared-library
-updaters; worker routing and window completion remain backend responsibilities.
-Storage publication occurs only after successful DAG execution. It is separate
-from the library's request-local caching of intermediate results.
-
-```text
-execute(partition, evaluation_window, bound_inputs):
-    check input identities and required completeness
-    create one intermediate-result map for this evaluation
-    for node in installed dependency order:
-        if this evaluation does not require node: continue
-        obtain inputs in their declared edge-role order
-        if a required input is incomplete: keep dependent work pending
-        otherwise:
-            execute node using this partition's node state
-            retain its result for every downstream consumer
-    publish completed selected outputs with their stored-output bindings
-```
-
-A shared upstream node is evaluated once for the same partition, window and
-input revision, even when several downstream sinks consume it. Its result stays
-available until those consumers finish. A later input revision or evaluation
-window requires fresh evaluation; the cache is not keyed only by node ID across
-unrelated work.
-
-Readiness belongs to dependencies, not merely to elapsed wall-clock time. For a
-node consuming several sources, all required sources must satisfy the bound
-window and population-completion rules. A flush timer cannot make missing input
-complete. On a finite input run, admission closes and completion barriers follow
-all accepted input; workers then finish eligible downstream work and acknowledge
-drain only after the required output commits finish.
-
-A derived summary reads explicitly referenced committed source records and
-checks their coverage before executing downstream operators. That read is a
-frontier: the worker does not repeat the source records' upstream computation.
-Derived work follows the same partition ownership and worker execution model.
-
-For the initial deployment, derived graphs use one owning worker and execute
-serially. Cross-worker shuffle and parallel grouped maintenance are outside this
-scope. Independent raw-input partitions may still execute on separate workers.
-
-### Continuous local input: revision snapshots
-
-The first continuous-input deployment receives Remote Write directly in Backend.
-A window may be revised under the maintenance lifecycle of the physical candidate
-selected by Backend from Planner-provided candidates. Each evaluation consumes a
-fixed input revision; its dependent outputs must describe
-compatible snapshots. Later input can produce a new revision of the same stored
-output without installing a new plan version.
-
-```text
-Window W, input revision r1: values [2, 3]     -> Sum(W, r1) = 5
-Late input creates revision r2: values [2, 3, 4] -> Sum(W, r2) = 9
-```
-
-Publishing r1 does not assert that no more events for W can arrive. A downstream
-recomputation must replace or version the previous result according to the
-selected contract; adding the complete r2 result to r1 would count old input
-twice. Queries cannot combine dependent outputs from incompatible revisions.
-An external producer/partition completion protocol is not required for this
-initial local-input design.
-
-The query selects the latest compatible input snapshot that satisfies its
-selected freshness requirement. Physical record versions need not have identical
-counters: an unchanged output may remain valid for a newer snapshot. An output
-whose dependencies changed cannot be carried forward until its replacement is
-ready. For two affected outputs:
-
-| Available records | Query needs A | Query needs A and B |
-| --- | --- | --- |
-| A:r1, B:r1 | Read r1 | Read r1 |
-| A:r1/r2, B:r1; B:r2 pending | Read r2 | Read r1 if fresh enough |
-| A:r1/r2, B:r1/r2 | Read r2 | Read r2 |
-| Only common r1 exceeds freshness | A may use r2 | No eligible snapshot |
-
-Independent publication is permitted. Query eligibility is checked for the
-whole required read set before execution, and that read set stays pinned for
-the query. Concurrent publication or retention cannot switch one branch to a
-different snapshot. An unavailable snapshot follows the installed QueryPlan's
-availability policy; cancellation and resource errors remain execution failures.
-
-### Bounded corrections and recovery
-
-Deployment requirements include a finite correction horizon. Planner enumerates
-legal summary maintenance lifecycle choices and compiles them into physical
-candidates. A candidate supporting corrections must retain enough input to
-recompute affected windows. Backend selects a feasible physical candidate, binds
-its inputs and stored outputs, and enforces its retention and correction
-requirements. Here, maintenance describes the lifecycle; the executable graph is
-the precompute Physical DAG, following Planner’s terminology. The deduplication cache lifetime,
-flush timer, and maximum observed event timestamp are not substitutes for this
-contract.
-
-Admission validates the complete Remote Write request against the retained
-correction range before enqueuing any of it. An out-of-range write is rejected
-explicitly, including an unseen series in an old window. A rejected batch must
-not advance the input revision, update deduplication state, or partially modify
-stored results. Keeping output bytes alone does not establish that the inputs
-needed for a correction remain available.
-
-A successful input snapshot identifies a durable, fixed set of accepted input.
-Source capture must exclude later admissions and retain dependency membership,
-including all contributing populations. Derived execution may overlap later
-admission, but must use the captured snapshot rather than rereading mutable live
-state. Every affected sink is evaluated against that same snapshot; shared
-ancestors execute once for the selected sinks.
-
-Recovery restores the installed generation, input revision, retained correction
-boundary, and committed result versions before accepting input or serving reads.
-A partially published newer revision does not invalidate an older compatible
-snapshot that remains fresh enough. Retrying the same input snapshot must not
-add a full recomputed result to its prior version or publish it twice. Starting
-a new plan version does not implicitly inherit this revision history.
-
-| Acceptance case | Required behavior |
-| --- | --- |
-| Late value 4 joins values 2 and 3 | r2 reads 9, never 14; r1 remains 5 while eligible |
-| A:r2 commits and B:r2 fails | A+B reads compatible r1 if fresh; never A:r2 with affected B:r1 |
-| A changes but B's dependency set does not | Unchanged B may serve the newer compatible snapshot |
-| Old common revision exceeds freshness | The query cannot serve it as an eligible summary hit |
-| One sample in a batch exceeds the correction range | Reject the complete batch before any admission |
-| Crash between sibling publications | Recover committed versions and resume without duplicate publication |
-| Restart with the same plan version | Preserve the correction boundary and revision eligibility |
-| Install a new plan version | Require its own input/history and warm-up |
-
-The local Remote Write implementation captures and checkpoints accepted input
-before execution. Installation first verifies that each selected raw producer has
-a supported native recovery codec; unsupported storage formats fail before input
-admission. It publishes each stored output independently, using Planner's native
-typed state codec. A query pins one compatible snapshot before preparing
-its inputs; the same snapshot supplies every branch and every range-query step.
-The store exposes committed records through an immutable read view, never through
-the additive producer-write path.
-
-This initial realization serially replays bounded retained input through the
-selected operators. It deliberately trades update cost for simple correction
-semantics; it is not an incremental-update optimization. Input retention covers
-the larger of the correction horizon, installed query lookback and configured
-output retention, plus overlapping windows and query freshness. The correction
-horizon bounds sample age against Backend's admission clock. Whole requests with
-an older or future-dated sample are rejected before durable admission.
-
-A periodic capture closes newly elapsed windows even without a later sample. It
-only describes locally accepted input as of that capture; it does not claim that
-all upstream events have arrived. A late event inside the horizon creates another
-revision. A failed capture stops execution; pending durable input can be retried
-or recovered without replacing already committed randomized sketch bytes.
-
-Enable this path with `--remote-write-revision-dir`. Deployment configuration sets
-`--remote-write-correction-horizon-ms`, `--remote-write-revision-freshness-ms` and
-`--remote-write-revision-max-bytes`. The last separately bounds serialized
-checkpoint size and operator workspace; exceeding it returns an explicit resource error. The checkpoint is
-one atomically replaced, fsynced file per plan version, protected by a single-writer
-lock. Both raw input history and eligible output history are bounded. The existing
-finite-input path remains available when continuous revisions are not configured;
-its drain barrier cannot seal a continuous input.
-
-Process E2E tests exercise one- and two-source Planner-generated DAGs through HTTP
-Remote Write, derived summary construction, bound queries, late corrections,
-retries, whole-batch rejection, same-version restart and new-version warm-up.
-Storage regression tests cover partial publication, fresh common-snapshot
-selection, pinned readers, recovery and explicit memory/cancellation failures.
-Cross-worker shuffle and cross-producer completion protocols remain outside this
-local-input realization.
-
-## 6. Publish the selected DAG outputs
-
-One `SummaryStore` owns two logical tables:
-
-| Table | Record contents |
-| --- | --- |
-| `summary_definitions` | `SummaryDefinition`: canonical input, Planner family, parameters, grouping and time semantics. Shared across compatible records. |
-| `stored_summaries` | `StoredSummary`: record key, definition ID, actual format and coverage, and payload. |
-
-The compiler assigns a `stored_output_id` to each output selected for
-persistence. The precompute writer and query readers carry the same
-`StoredOutputReference`. The reference is a plan binding, not a third catalog
-object.
-
-A concrete stored record has the key:
-
-```text
-(plan_id, plan_version, stored_output_id, population_key, window)
-```
-
-`population_key` preserves canonical label names and values. `window` identifies
-the intended time partition and its boundary convention; actual coverage is
-validated separately. Worker IDs and transient runtime handles are not record
-identities. A store may use a local numeric row handle for indexing or wire
-compression; that handle cannot select another output, definition or plan
-version. The writer supplies a `StoredSummaryKey` and the reader supplies the
-same selected `StoredOutputReference` within its installed plan version.
-Durable metadata retains this binding so recovery validates it before exposing
-payloads. V1 does not implicitly reuse records from another plan version.
-The durable binding format is version 5; earlier SID metadata is rejected rather
-than inferred to refer to a selected output.
-
-Before publication, validate that the output matches its bound definition,
-format, population and window. Payload and identifying metadata become visible
-as one committed record. A reader must not observe metadata pointing to an
-uncommitted payload. Repeating the publication of the same completed result must
-not add that result twice; conflicting writes must not silently overwrite a
-record under the same key. Any permitted replacement follows the selected
-update policy and preserves coherent reads.
-
-Sibling outputs may commit independently. A query needing several outputs must
-wait for the required set at compatible revisions; it cannot read a partially
-published evaluation during a quiet interval between commits. Publication
-receipts and the query-wide revision fence must cover all dependent branches.
-
-QueryPlan and derived precompute readers perform indexed lookup using the
-installed reference and requested population/window. They check definition,
-format, plan version and coverage before consuming a record. Missing or
-incomplete state remains unavailable; query fallback is governed by QueryPlan.
-
-## 7. Worked example: one KLL producer, two percentile readers
-
-Use the latency example with this selected deployment:
-
-- Plan version `42`; group input by `service`.
-- Build KLL with `k=200` over `(T - 5m, T]`.
-- Rebuild from data at rest every minute, aligned to the Unix epoch.
-- Retain completed summaries for ten minutes.
-- Store output `latency-kll`, defined by `def-api-latency-kll`.
-
-The following YAML illustrates the bindings and stored record, not a Rust wire
-schema:
-
-```yaml
-plan_version: 42
-writer_reference:
-  stored_output_id: latency-kll
-  definition_id: def-api-latency-kll
-reader_references:
-  p50: {stored_output_id: latency-kll, definition_id: def-api-latency-kll}
-  p99: {stored_output_id: latency-kll, definition_id: def-api-latency-kll}
-
-summary_definitions:
-  def-api-latency-kll:
-    input: {metric: request_latency_seconds, value: sample_value}
-    family: {kind: Sketch, algorithm: KLL, parameters: {k: 200}}
-    group_by: [service]
-    time_semantics: {range: 5m, bounds: "(start, end]"}
-    output_type: kll_state
-
-stored_summaries:
-  - key:
-      plan_version: 42
-      stored_output_id: latency-kll
-      population_key: {service: api}
-      window: {start_exclusive: '12:00', end_inclusive: '12:05'}
-    definition_id: def-api-latency-kll
-    format: {schema: kll-v1, encoding: kll-binary-v1}
-    coverage: {start_exclusive: '12:00', end_inclusive: '12:05'}
-    payload: <encoded KLL state>
-```
-
-At the `12:05` evaluation endpoint:
-
-1. The schedule triggers construction for `(12:00, 12:05]`. The bound source
-   supplies the required data and completion evidence for that range.
-2. Routing sends `service=api` data to its owning worker. That worker executes
-   the read, grouping and KLL construction nodes for the partition. Another
-   worker can execute the same graph for `service=worker` concurrently.
-3. The first worker commits the record illustrated above. The other worker
-   commits a separate record with `population_key: {service: worker}`.
-4. Both percentile QueryPlans select the `service=api` record for endpoint
-   `12:05`. They read the same KLL state and apply their different estimates.
-
-At `12:06`, the same graph builds new records for `(12:01, 12:06]`. The definition,
-stored-output ID and plan version stay the same; the window part of the key
-changes. Ten-minute retention controls how long completed records remain
-available, not how much input each KLL summarizes. Building a percentile result
-at query time does not create another stored output.
-
-## 8. Plan changes, recovery and validation
-
-Routing, operator bindings and output references belong to one coherent plan
-version. Accepted work retains that version until completion. Activation drains
-or isolates incompatible old worker state before new work uses a different
-partition assignment. Changing worker count requires coordinated reassignment;
-changing a hash modulus while state is active is insufficient.
-
-A newly activated version is cold until its own stored outputs are available.
-Queries must not substitute the previous version's payload to hide that gap.
-Continuous warm service across activation requires an explicit readiness or
-state-migration protocol; atomic plan publication alone does not provide it.
-
-Recovery validates persisted record identities, definitions, formats and
-coverage before exposing them to readers. A matching definition alone does not
-authorize reuse across plan versions. Runtime caches and routing indexes are
-rebuilt from the installed plan. Input replay and durable operator-state
-checkpointing require an explicit source/update contract; record publication
-alone does not guarantee exactly-once ingestion.
-
-Acceptance checks follow the workflow:
-
-| Check | Required observation |
-| --- | --- |
-| Planner-to-runtime binding | Node semantics, edge roles, families and stored-output references agree; invalid plans fail installation. |
-| One worker versus several | Identical results for grouped Sum, per-series Rate and Rate followed by service reduction, including counter resets and window boundaries. |
-| Partition locality | Every dependency needed for a partition stays with its owner; a rule splitting a required reduction is rejected. |
-| Shared computation | A common upstream node runs once per evaluation/input revision across its consumers, including multiple stored sinks. |
-| Readiness and backpressure | Incomplete inputs do not produce readable complete records; admission and drain honor queued work and commits. |
-| Store and query integration | Writer and reader use the same composite identity; format, coverage and version mismatches fail validation. |
-| Restart and activation | Committed records recover coherently; retries do not duplicate completed publication; old and new plan state do not mix. |
-
-The simple execution model does not require node-level parallel scheduling,
-cross-worker shuffle, or separate metadata and payload services. Its unit of
-parallel work is a complete precompute subgraph over an independent data
-partition.
diff --git a/docs/design_docs/query-dag-execution.md b/docs/design_docs/query-dag-execution.md
deleted file mode 100644
index 37d7909a5..000000000
--- a/docs/design_docs/query-dag-execution.md
+++ /dev/null
@@ -1,320 +0,0 @@
-# Query DAG Execution
-
-## 1. Overview
-
-ASAP uses one physical-operator library and one DAG runtime for both
-precomputation and query execution.
-
-```mermaid
-flowchart LR
-    L["Logical Post-ASAP DAG"] -->|Candidate generation| M["Summary Maintenance Lifecycle"]
-    M -->|Physical Plan Compiler| P["Physical DAG candidates"]
-    P -->|Backend selection and Deployment Plan Compiler| D["Deployment Plan / DAG"]
-    D --> Pre["PrecomputePlan"]
-    D --> Query["QueryPlan"]
-    Pre --> Runtime["Shared physical operators and DAG runtime"]
-    Query --> Runtime
-```
-
-This follows [Planner #462's architecture](https://github.com/ProjectASAP/ASAPPlanner/blob/feat/shared-physical-operators/docs/design_docs/physical-planning-and-deployment.md):
-
-| Layer | Responsibility |
-| --- | --- |
-| Logical Post-ASAP DAG | Computation semantics |
-| Summary Maintenance Lifecycle | Build, retention, reuse, and window strategy |
-| Physical DAG(s) | Supported physical candidates, executable operators, and typed boundaries |
-| Deployment Plan / DAG | Selected candidate, concrete bindings, and operational lifecycle |
-
-ASAPPlanner owns the first three layers. Backend selects a feasible physical
-candidate using deployment statistics, resource limits and costs, then binds it
-into `PrecomputePlan` and `QueryPlan`. It preserves the candidate's operators,
-dependencies, sharing and materialization frontier.
-
-The lifecycle is a planning contract, not another computation IR. “Maintenance”
-here names Planner's lifecycle concept; input reception is ingestion and execution
-before a request is precomputation. Executing a bound Physical DAG introduces
-neither an **Execution DAG** abstraction nor another planning layer.
-
-## 2. Ownership
-
-### ASAPPlanner
-
-ASAPPlanner owns the post-ASAP IR, logical and physical operator implementations,
-`asap-physical-operators`, `physical_planner`, `CompiledPhysicalDag`, and the
-independent DAG runtime. A change to an IR operation and its execution
-implementation can therefore be reviewed in one Planner PR.
-
-The runtime owns generic execution behavior:
-
-- dependency scheduling;
-- shared-producer execution;
-- bounded buffering;
-- cancellation;
-- per-run reuse of intermediate outputs;
-- operator workspace accounting.
-
-A producer with multiple consumers executes once per DAG run, while each
-consumer independently receives its output.
-
-### Backend
-
-Backend owns deployment-specific concerns:
-
-- source binding and window selection;
-- catalog and storage access;
-- revision and coverage admission;
-- summary publication;
-- protocol conversion;
-- query and precomputation bindings.
-
-It does not duplicate Planner operators or maintain a second DAG runtime.
-JSON, Arrow, SQL, and PromQL are boundary representations; they do not determine
-the internal representation of every ASAP summary.
-
-See the [shared library design](https://github.com/ProjectASAP/ASAPPlanner/blob/feat/shared-physical-operators/docs/design_docs/physical-planning-and-deployment.md)
-for the broader architecture and DataFusion comparison.
-
-## 3. Compilation and execution
-
-```text
-Planner: Logical Post-ASAP DAG + lifecycle candidate
-                    ↓ Physical Plan Compiler
-         supported Physical DAG candidates
-                    ↓ Backend selection and Deployment Plan Compiler
-         Deployment Plan / DAG (PrecomputePlan + QueryPlan)
-                    ↓ execute bound Physical DAGs through shared runtime
-         stored outputs / query results
-```
-
-### 3.1 Compile
-
-ASAPPlanner compiles semantically legal computation and lifecycle candidates
-into supported Physical DAG candidates with typed input/output boundaries.
-Compilation does not require live storage readers. `CompiledPhysicalDag` is a
-Rust implementation type for physical compilation, not a separate architectural
-layer or an intermediate Execution DAG.
-
-### 3.2 Bind
-
-Backend checks candidate feasibility and costs, selects a physical candidate,
-and binds its inputs in the Deployment Plan / DAG. At request time, those binding
-rules resolve concrete eligible records and readers. Conceptually:
-
-```text
-Summary-state input → eligible SummaryStore records
-Vector input        → labeled values and a PromQL window
-Relation input      → typed SQL/storage relation
-```
-
-Admission and binding validate types, state formats, grouping, windows,
-revisions, and coverage. They do not repeat operator lowering.
-
-### 3.3 Execute
-
-The shared runtime executes the bound Physical DAG. Execution does not lower
-operators again or make new placement decisions.
-
-```mermaid
-flowchart LR
-    A["Input"] --> B["Shared producer"]
-    B --> C["Consumer A"] --> E["Root 1"]
-    B --> D["Consumer B"] --> F["Root 2"]
-```
-
-The shared producer executes once. Multiple roots share upstream computation,
-cancellation, and the enclosing memory budget.
-
-## 4. Precomputation and query execution
-
-Ingestion means accepting input data. Precomputation means executing a selected
-DAG before a query request, including work triggered by ingestion or scheduled
-window processing.
-
-Operator type does not determine execution phase. The selected plan determines
-whether an operation executes during precomputation or at query time.
-
-For example, partial precomputation can use:
-
-```text
-Precomputation: raw data → BuildKLL → SummaryStore
-Query:         SummaryStore → ReadKLL → Quantile(0.99) → result
-```
-
-The same operator library executes both DAGs.
-
-| Mode | Pre-request work | Request-time work |
-| --- | --- | --- |
-| No precomputation | None | All required computation |
-| Partial precomputation | Store intermediate values or states | Complete the remaining DAG |
-| Full precomputation | Complete all data-dependent computation | Retrieve the prepared result |
-
-These definitions are independent of the algorithm. Reading stored KLL state
-and computing its quantile at query time is partial precomputation.
-Build, merge, and readout are reusable operators rather than phase-specific operators.
-
-## 5. Query execution
-
-An installed query brings together these contracts:
-
-```text
-Installed query
-  ├── QueryPlanEntry: nodes, dependencies and root
-  ├── selected Query Physical DAG
-  ├── deployment bindings and source references
-  ├── window contract
-  └── catalog generation
-```
-
-This is an architectural view, not the serialized field layout of
-`QueryPlanEntry`; some contracts live in its enclosing plan or bound runtime graph.
-
-At request time:
-
-```mermaid
-flowchart LR
-    Request["Query request"] --> Entry["Installed query"]
-    Entry --> Validate["Admit sources and pin eligible snapshot"]
-    Validate --> Bind["Bind inputs within request budget"]
-    Bind --> Execute["Execute DAG"]
-    Execute --> Convert["Protocol conversion"] --> Result["Query result"]
-```
-
-SQL relation nodes and PromQL vector operations use the same Planner physical
-DAG representation. SQL adapters bind relations and convert results at the
-protocol boundary. PromQL adapters bind labeled vectors and windows. Common
-arithmetic, aggregation, sorting, limiting, joins, and temporal computation
-belong in the shared physical-operator library.
-
-## 6. Request consistency
-
-One installed query request owns one cancellation signal and one resource
-budget. A request over continuous local inputs also pins one eligible input
-snapshot. Range steps have separate DAG execution state but share these controls.
-
-```text
-range request
-  ├─ pin eligible snapshot
-  ├─ prepare inputs                 ┐
-  ├─ execute t1 → retain result      ├─ shared budget
-  ├─ execute t2 → retain result      │  and cancellation
-  └─ return accumulated result      ┘
-```
-
-Tracked memory includes pinned SDS/current-series state, prepared inputs,
-operator workspace, and retained results. JSON decoding and SQL encoding use
-conservative workspace estimates; accounting is not a hard process RSS limit.
-
-Resource exhaustion or cancellation terminates the request without exact
-fallback, even if a revision changes concurrently.
-
-### Snapshot compatibility
-
-All local inputs used by one query must admit a common eligible revision in the
-selected catalog generation. A newer partially published revision does not
-invalidate an older complete revision that still satisfies freshness and coverage.
-
-External exact adapters expose evaluation time but not a source snapshot token.
-The current admission rule therefore rejects a candidate combining local
-SDS/current-series inputs with external exact inputs, including candidate pruning.
-The rule is checked at installation and before source access.
-
-```text
-local SDS @ r1        external exact @ unknown revision
-      \                     /
-       \------ operation ---/
-                │
-                ▼
-             rejected
-```
-
-Equal timestamps are insufficient to establish equal revisions. Whole-query
-external exact execution remains a separate deployment choice; a resource or
-cancellation failure in a local DAG cannot trigger that choice.
-
-## 7. Operator and plan acceptance
-
-A local DAG is accepted only if every reachable operation has a compatible
-implementation:
-
-```text
-operation
-  ├── implementation exists
-  ├── input/output types match
-  ├── parameters are supported
-  ├── grouping semantics are supported
-  └── required state format is available
-```
-
-Deployment additionally validates source bindings, stored-state formats,
-grouping, windows, revisions, coverage, and approximation evidence where required.
-An operator implementation establishes execution support, not deployment feasibility.
-
-Unsupported operations are rejected explicitly. Routing them to an external
-source does not make them locally supported. The [Planner library contract](physical-operators.md)
-owns operator support; Backend does not maintain a second operator matrix.
-
-## 8. Candidate pruning
-
-Candidate pruning is ordinary DAG composition:
-
-```mermaid
-flowchart LR
-    Summary["Candidate summary"] --> Keys["Candidate keys"]
-    Keys --> Join["SemiJoin(keys)"]
-    Values["Authoritative values"] --> Join
-    Join --> Sort["Sort(score)"] --> Limit["Limit per group"]
-```
-
-This path needs no dedicated `MembershipFilter` or grouped TopK operator.
-Its correctness rules are:
-
-- grouped Limit is distinct from global Limit;
-- candidate completeness comes from the pruning certificate;
-- exact scoring cannot recover a candidate omitted by pruning;
-- missing authoritative values invalidate certified pruning;
-- local candidate and scoring inputs must use the same pinned snapshot.
-
-Best-effort pruning remains explicitly approximate.
-
-## 9. Runtime and cancellation
-
-Planner's native context is not `Send`, so each request executes through one
-dedicated worker invocation. The worker owns thread-local execution context for
-that request. Async callers signal cancellation, which remote waits and native
-polling observe.
-
-When execution finishes, the worker clears the context before the thread is
-reused. Cancellation is cooperative at polling boundaries; it does not preempt
-an individual synchronous kernel.
-
-## 10. Testing and acceptance
-
-| Layer | Required coverage |
-| --- | --- |
-| Planner library | Shared-producer diamonds, multiple consumers, bounded buffering/backpressure, cancellation, memory accounting, both execution phases, typed expressions, joins, grouped Sort/Limit, and window computation |
-| Backend | Installed source bindings, revision and coverage admission, stored-state reconstruction, end-to-end query results, and rejection of unsupported plans |
-| Request contracts | Shared budgets across range steps and nested execution, terminal resource/cancellation errors, snapshot pinning, and rejection of mixed local/external inputs before reads |
-
-Results are compared against exact computation or the declared approximation
-guarantee. These acceptance requirements do not imply that every deployment or
-operator combination has been tested.
-
-## 11. Scope
-
-This design establishes the common execution path:
-
-```text
-Logical Post-ASAP DAG + Summary Maintenance Lifecycle
-    → Physical DAG candidates
-    → Deployment Plan / DAG
-    → execute bound Physical DAGs
-    → query/precomputation output
-```
-
-Local raw Scan and universal support for every Planner aggregate or extension
-remain outside this migration. Fallback routing does not establish local support;
-tests supplied with already-decoded batches do not prove raw-source integration.
-
-ASAPPlanner #462 owns `physical_planner`, native physical operators, and DAG
-execution. Backend's `DeploymentPlanCompiler` owns state identities, window
-contracts, source bindings, and deployment of the resulting DAG.
diff --git a/docs/design_docs/shape-aware-erp-v1.md b/docs/design_docs/shape-aware-erp-v1.md
deleted file mode 100644
index 5d04d99af..000000000
--- a/docs/design_docs/shape-aware-erp-v1.md
+++ /dev/null
@@ -1,77 +0,0 @@
-# Shape-aware ERP v1
-
-The backend obtains an observed shape from the live runtime-samples feedback
-path and asks ASAPPlanner for the nearest compatible benchmark profile. A
-runtime record carries `erp_observed_shape.observation` using Planner's shared
-`ErpShapeObservation`: cardinality, observed event count, candidate fits and an
-optional dataset fingerprint. The wrapper also reports burst ratio. The planning request
-selects the ring via `observed_shape_source`.
-
-The observer retains both uniform and fitted Zipf hypotheses, with total-variation
-distance against the observed rank masses and a sample-count-adjusted fit score.
-The score is a heuristic fit quality, not a statistical confidence interval or
-sketch-error guarantee. Unnamed and mixed distributions are not forced into one
-family. Planner jointly matches admissible hypotheses against ERP records.
-Custom data first matches its fingerprint when available, otherwise it can use
-the same bounded shape matching as synthetic data.
-
-Key count, key length and occupied interval count are bounded. Sparse interval
-IDs do not allocate a dense vector. Any overflow or cap violation permanently
-invalidates that observation window; callers must start a fresh observer rather
-than publishing a biased partial snapshot. Profiles with too few benchmark
-events, poor fit, ambiguous confidence, or excessive cardinality/parameter
-distance are misses.
-
-On a hit, empirical parameters and measured atomic costs are used. On a miss,
-malformed evidence, or drift, Hybrid mode retains the theoretical parameters;
-if the runtime cannot deploy them or they exceed its memory limit, compilation
-chooses exact execution. Empirical-only mode fails closed.
-
-For a pane width `p`, query window `w`, query executions `q`, updates `u`,
-retained panes `r`, and shared materializations `m`, Planner composes:
-
-```text
-updates = u * m
-merges  = q * (ceil(w / p) - 1)
-queries = q
-state   = r * m
-CPU     = updates*Cupdate + merges*Cmerge + queries*Cquery
-```
-
-This separates machine-specific atomic measurement from workload-specific
-window planning and makes tumbling, sliding/pane, retention, and sharing costs
-auditable.
-
-### Observation payload migration
-
-Runtime producers must replace the old single `shape` object with an
-`observation` containing `cardinality`, `observed_events`, `fits`, and optional
-`empirical_fingerprint`. Each fit supplies `family`, `parameters`,
-`goodness_of_fit`, and `confidence`; shape-match policy must also supply the fit
-quality and confidence thresholds. Old payloads are rejected rather than given
-invented confidence. Publish a new observation after upgrading the producer.
-
-The bounded observer models ranked key frequencies. Its output does not describe
-the numeric spacing of KLL sample values and must not be advertised as a general
-numeric-distribution observation. Equal frequencies produce the canonical
-uniform fit only: Zipf exponent zero describes the same distribution and must
-not create a false ambiguity. Near-uniform, genuinely distinct fits still pass
-through the normal ambiguity policy.
-
-### Population isolation in backend-local execution
-
-A temporal scalar summary has one state per source series when its selected
-`SummaryAgg` uses `Reduction::PerEntity`. An explicit reduction with no grouping
-keys has one pooled population. These are different materializations even when
-source, sketch parameters, and the visible grouping-key list are identical.
-
-The compiler records shared `PopulationPartitioning` metadata in the runtime
-configuration and DataDescriptor. Both identities include the partitioning;
-installation checks it against the bound Planner DAG. Raw ingestion uses the
-full source labels for per-entity routing and the configured grouping for pooled
-routing. Memory estimates count per-entity states against source cardinality.
-Legacy configurations without this metadata retain their existing routing rules.
-
-This is a source-isolation contract, not permission to skip a maintenance update
-expression. Only already-supported scalar update expressions pass the compiler's
-per-entity admission check; other subDAG updates still require a real evaluator.
diff --git a/docs/design_docs/summary-catalog-sds-architecture.md b/docs/design_docs/summary-catalog-sds-architecture.md
deleted file mode 100644
index 02e6e2966..000000000
--- a/docs/design_docs/summary-catalog-sds-architecture.md
+++ /dev/null
@@ -1,514 +0,0 @@
-# Self-Describing Summary: Semantic Definitions and Stored Results
-
-Status: target design. Ad-hoc discovery is a future extension, not implemented
-behavior claimed by this document.
-
-## 1. Why SDS?
-
-Stored summary bytes are not enough to determine what they mean.
-
-For example:
-
-```text
-KLL(latency)
-```
-
-and
-
-```text
-KLL(log(latency))
-```
-
-may have the same source, grouping, window, and sketch format, but they cannot
-be used interchangeably to answer queries.
-
-SDS therefore separates:
-
-```text
-SummaryDefinition = what a summary means
-StoredSummary     = one concrete result of that definition
-```
-
-This supports two use cases:
-
-1. **Bound queries:** an installed QueryPlan reads the specific SDS output
-   selected during planning.
-2. **Future ad-hoc queries:** Planner can search existing SummaryDefinitions and
-   determine whether an SDS can legally support a new query.
-
-SDS describes stored computation. It does not plan queries, execute operators,
-or choose materialization boundaries.
-
-## 2. Architecture
-
-```text
-                 Planner
-                    │
-       canonical semantic description
-                    ▼
-            SummaryDefinition
-                    ▲
-                    │ definition_id
-              StoredSummary
-       group + window + payload
-                    ▲
-                    │ stored_output_id
-          installed plan binding
-             /             \
-    PrecomputePlan       QueryPlan
-       writes              reads
-```
-
-| Component | Responsibility |
-| --- | --- |
-| Planner | Defines computation semantics and decides whether an SDS can support a query |
-| Deployment compiler | Binds Planner-selected physical outputs to deployed stored outputs |
-| SummaryStore | Persists definitions and concrete summary results |
-| Shared executor | Executes Planner-provided Physical DAGs |
-
-The store knows **what exists**. Planner decides **what can be used**.
-
-## 3. SummaryDefinition: what does this state mean?
-
-A SummaryDefinition is a canonical semantic description of a persisted result.
-
-It contains enough information to distinguish computations such as:
-
-```text
-KLL(latency)
-
-vs.
-
-Project(log(latency))
-        ↓
-KLL
-```
-
-It therefore includes relevant:
-
-- source and filter semantics;
-- value expressions and transformations;
-- grouping and time semantics;
-- summary algorithm and parameters;
-- types and operation semantics.
-
-Conceptually:
-
-```yaml
-summary_definition:
-  id: <semantic-fingerprint>
-  semantic_format_version: <version>
-  semantics: <canonical-typed-description>
-  output: <described-output>
-```
-
-The description reuses Planner-defined semantics, but it is **not an executable
-plan** and does not need to serialize Planner's complete internal IR. It contains
-only the semantic dependencies needed to distinguish and interpret the output.
-Definitions and their required dependencies are persisted so recovery does not
-require a live Planner process.
-
-Physical placement, encoding, scheduling, retention, readiness, and plan version
-are not part of semantic identity. Identity uses a versioned canonical semantic
-encoding, not display strings or temporary node IDs. Its encoding and compatibility
-rules must be established before persistence; internal Planner refactoring alone
-must not force state migration. Unknown semantic versions fail validation.
-
-### Source identity
-
-**Design question 1: What identifies the source data in a SummaryDefinition?**
-
-Two deployments both compute `KLL(latency)`. One reads tenant A's dataset and
-one reads tenant B's. Should they have the same definition ID?
-
-**Decision:** no. Backend supplies a stable logical dataset identity to Planner
-before semantic definitions are exported. Dataset identity is part of semantics;
-endpoint, replica and storage location are deployment bindings.
-
-```text
-Same expression, different datasets:
-
-  tenant-A/requests → KLL(latency) → definition D_A
-  tenant-B/requests → KLL(latency) → definition D_B
-
-  D_A ≠ D_B
-
-Same dataset, different endpoints:
-
-  tenant-A/requests ── bound to endpoint east ── definition D_A
-  tenant-A/requests ── bound to endpoint west ── definition D_A
-
-  Relocation preserves D_A when the logical dataset is unchanged.
-```
-
-| Change | Definition identity | Binding requirement |
-| --- | --- | --- |
-| Tenant A's dataset → tenant B's dataset | Changes | Bind the newly identified dataset |
-| Endpoint east → endpoint west for the same dataset | Unchanged | Verify the endpoint realizes the same dataset |
-| `latency` → `log(latency)` in the same dataset | Changes | Preserve the new input expression |
-
-The authority resolving a source preserves dataset identity across relocation and
-assigns a different identity when the logical dataset changes. Installation checks
-that the concrete source realizes the identity in the definition. Equal definitions
-do not grant cross-tenant or cross-deployment authorization. Future discovery must
-match dataset identity as well as expression semantics.
-
-### Definition boundary
-
-The definition stops at the persisted output.
-
-```text
-KLL(latency) ──persist──> state
-                            ├── p50
-                            └── p99
-```
-
-p50 and p99 can therefore share one KLL SummaryDefinition.
-
-If p99 itself is persisted:
-
-```text
-KLL(latency) → p99 ──persist──> value
-```
-
-then the readout becomes part of that definition.
-
-## 4. StoredSummary: one concrete result
-
-A StoredSummary instantiates a definition for a particular group and time range.
-The examples illustrate the contract, not a finalized wire schema.
-
-```yaml
-stored_summary:
-  key:
-    plan_version: 42
-    stored_output_id: latency-kll
-    group_key: {service: api}
-    window: {start_exclusive: '12:00', end_inclusive: '12:01'}
-  definition_id: <KLL-latency-definition>
-  revision: <input-revision>
-  coverage: complete
-  format: {schema: kll-v1, encoding: kll-binary-v1}
-  payload: <bytes>
-```
-
-The record answers:
-
-> Which concrete state is this, what data does it cover, and can it be read?
-
-The SummaryDefinition answers:
-
-> What does this state mean?
-
-SummaryStore persists both:
-
-```text
-summary_definitions
-    definition_id → SummaryDefinition
-
-stored_summaries
-    plan version + deployed output + group + window → StoredSummary
-```
-
-Metadata and payload become visible together. Completeness is established from
-the producer's input contract, not inferred from interval endpoints alone.
-A replacement snapshot replaces a record's revision; readers must not mix its
-old metadata with new bytes or count both snapshots as separate inputs.
-
-## 5. Semantic identity vs. deployed-output identity
-
-SDS uses two identities because they answer different questions:
-
-```text
-definition_id
-    = What does this state mean?
-
-stored_output_id
-    = Which authorized deployed output does this state belong to?
-```
-
-For example, within the same plan version:
-
-```text
-Definition D = KLL(latency, k=200)
-
-                 D
-              /     \
-           hot      rebuild
-```
-
-Both outputs have identical semantics, but hot may be the active serving output
-while rebuild is still being validated. Even adding plan version to definition
-ID would not distinguish these two outputs.
-
-Therefore:
-
-```text
-definition_id = D
-stored_output_id = hot
-```
-
-must not silently read:
-
-```text
-definition_id = D
-stored_output_id = rebuild
-```
-
-Equal semantics do not imply interchangeable deployed state.
-
-StoredOutputReference binds the two within the enclosing plan version:
-
-```yaml
-reference:
-  stored_output_id: hot
-  definition_id: D
-```
-
-It is a plan binding, not another stored object or Materialization catalog.
-
-## 6. Reading a bound SDS
-
-An installed `QueryPlan` selects a deployed output and its expected semantics:
-
-```yaml
-reference:
-  stored_output_id: latency-kll
-  definition_id: D1
-```
-
-The query supplies a concrete group and requested time range. Within the installed
-plan's namespace, `SummaryStore` locates state by:
-
-```text
-(plan_version, stored_output_id, group_key)
-    → records ordered/indexed by window
-```
-
-For `(42, latency-kll, service=api)`, a query for `(12:00, 12:05]` performs a
-range lookup over the available panes. `definition_id` does not select another
-producer when this output is absent.
-
-```text
-plan version + stored output + group + window → locate concrete state
-expected definition + revision + format + coverage → validate that state
-```
-
-This requires efficient prefix and window-range lookup; the design does not
-prescribe a physical index such as a hash table or B-tree. The installed plan
-also supplies any enclosing deployment namespace; equal plan-version numbers
-in different deployments do not authorize cross-deployment reads.
-
-The runtime checks two things.
-
-**Semantic compatibility**
-
-The record must have the definition selected by Planner. For a binding expecting
-KLL over latency:
-
-```text
-KLL(latency)      ✓
-KLL(log(latency)) ✗
-```
-
-**Instance eligibility**
-
-The concrete record must be committed and have the required:
-
-```text
-authorized output / plan version
-group
-window / coverage
-revision
-schema / encoding
-completeness
-```
-
-For example, a five-minute query may consume five compatible one-minute KLL panes:
-
-```text
-(12:00, 12:01] ─┐
-(12:01, 12:02]  │
-(12:02, 12:03]  ├─→ KLL Merge → p99
-(12:03, 12:04]  │
-(12:04, 12:05] ─┘
-```
-
-The runtime verifies complete non-overlapping coverage and compatible revisions.
-It does not decide whether KLL merging is semantically legal; Planner already
-made that decision. Missing or invalid state follows the installed fallback or
-unavailability policy. Plan installation alone does not establish readiness.
-
-### Consistent reads
-
-Per-record metadata/payload atomicity is necessary but insufficient. For continuous
-local Remote Write, the query pins the latest compatible input snapshot satisfying
-freshness and coverage for every required output. If A:r2 is published while B:r2
-is pending, A+B may still read fresh A:r1 and B:r1. Every branch and range-query
-step uses that pinned read view; concurrent publication cannot replace one input.
-Resource exhaustion, cancellation and corrupt recovery state are execution errors,
-not reasons to reinterpret state or choose an exact fallback.
-
-Other ingestion paths retain the conservative whole-query store-revision fence:
-a publication invalidating that fence prevents the result from being served.
-The [publication completeness contract](continuous-summary-completeness.md)
-distinguishes these mechanisms and keeps accepted-input snapshots separate from
-claims of source event-time completeness.
-
-### Recovery and plan-version changes
-
-**Design question 2: Must the initial rollout reuse stored state across plan versions?**
-
-Version 42 already stores `KLL(latency)`. Version 43 changes only the scheduling
-policy and keeps the same semantic definition. Can version 43 read version 42's
-records immediately?
-
-**Decision:** no. Initial recovery supports the same installed plan version.
-Each new version populates its own output namespace. Cross-version state adoption
-is deferred, even when definitions match.
-
-```text
-Existing deployment:
-  version 42 → output latency-kll → definition D → ready records
-
-Restart version 42:
-  recover version-42 records
-      → validate bindings and required completeness proof
-      → serve eligible state
-
-Install version 43 (same definition D, changed schedule):
-  version 43 → output latency-kll → definition D → no ready records yet
-      → populate version-43 state
-      → fallback or unavailable while warming up
-      → serve version-43 state when eligible
-
-  Equal D does not authorize reading version-42 records from version 43.
-```
-
-| Event | Initial-rollout behavior |
-| --- | --- |
-| Restart the same installed version | Recover compatible records and revalidate eligibility |
-| Install a new version with equal definitions | Populate new-version state; no automatic adoption |
-| Query before new-version state is ready | Apply the installed fallback or unavailability policy |
-| Old-version query already in flight | Keep its installed version; cleanup respects active readers |
-
-This choice incurs rebuild work and a warm-up interval. Persisting definitions
-and payloads does not itself make admission metadata durable or establish
-exactly-once processing across crashes. Missing completeness proof cannot be
-interpreted as complete input after restart. Cross-version adoption requires a
-separate compatibility and authorization design; binary rollback does not itself
-authorize it.
-
-## 7. Future: discovering SDS for an unregistered query
-
-The same definitions can later support queries not known when the SDS was created.
-
-Suppose the store already contains:
-
-```text
-D1 = KLL(latency)
-D2 = KLL(log(latency))
-```
-
-and a new query arrives:
-
-```text
-p99(latency)
-```
-
-Planner can search available definitions:
-
-```text
-New query
-   +
-available SummaryDefinitions
-        │
-        ▼
-Planner semantic matching
-        │
-        ▼
-Can existing SDS support this computation?
-        │
-        ▼
-KLL(latency) → Quantile(0.99)
-        │
-        ▼
-Physical DAG
-        │
-        ▼
-bind to an authorized, eligible stored_output_id
-        │
-        ▼
-QueryPlan
-```
-
-Importantly:
-
-```text
-KLL(latency) ≠ p99(latency)
-```
-
-The SDS is **not equivalent** to the query. It is reusable because Planner knows
-a legal computation, subject to the query's accuracy and input requirements:
-
-```text
-KLL(latency)
-      ↓
-Quantile(0.99)
-```
-
-Likewise, p99(log(latency)) may reuse KLL(log(latency)), but cannot directly
-substitute KLL(latency). Any transformation requires a supported Planner rewrite
-with justified domain, numeric and accuracy semantics.
-
-### Who decides reuse?
-
-```text
-SummaryStore:
-    What SDS definitions and instances exist?
-
-Planner:
-    Can they legally support all or part of this query?
-
-Deployment compiler:
-    Which authorized deployed output realizes the selected definition?
-
-Runtime:
-    Are the required concrete records currently eligible?
-```
-
-SummaryStore therefore does not implement a semantic decision engine such as:
-
-```text
-find_compatible(query)
-```
-
-Semantic compatibility, mergeability, grouping, window composition, accuracy,
-and the computation over reused state remain Planner decisions. Backend capability and
-availability evidence can inform selection; a definition alone does not guarantee
-an executable deployment. Availability must be checked again at execution time.
-This extension does not require another catalog service or a new operator IR.
-
-## 8. Key invariants
-
-1. A SummaryDefinition describes semantics, not execution or deployment.
-2. Different meanings must not share a definition ID; equivalence requires
-   Planner's versioned normalization rather than a store heuristic.
-3. Equal definition IDs do not make different deployed outputs interchangeable.
-4. A writer cannot publish state with a definition different from its installed binding.
-5. Runtime reads require both semantic compatibility and eligible concrete state.
-6. Bound QueryPlans directly resolve their selected outputs; they do not search for substitute outputs.
-7. Ad-hoc SDS discovery happens through Planner and produces a new bound QueryPlan.
-8. SummaryStore reports available state; it never decides query rewrite legality.
-
-```text
-Planner        → what can compute the query
-Deployment     → which output to use
-SummaryStore   → what state actually exists
-Executor       → run the selected computation
-```
-
-The [deployment design](asapplanner-integration.md) defines compilation and
-execution ownership. The [migration plan](asapplanner-migration-plan.md) defines
-implementation and acceptance gates. This document does not claim that semantic
-fingerprinting or ad-hoc discovery has been implemented.
diff --git a/docs/developer_docs/README.md b/docs/developer_docs/README.md
deleted file mode 100644
index cc35304e9..000000000
--- a/docs/developer_docs/README.md
+++ /dev/null
@@ -1,38 +0,0 @@
-# ASAPQuery-backend developer documents
-
-These pages are grouped by code component. Canonical system behavior and
-cross-repository interfaces live in
-[ASAPCollector/docs](https://github.com/ProjectASAP/ASAPCollector/tree/main/docs).
-
-## Summary store engine
-
-- [Storage implementation and SID internals](summary-store-engine/implementation.md)
-
-## Query engine
-
-- [Routing, readout, and query-engine implementation](query-engine/query-engine.md)
-- [ClickHouse SQL support](query-engine/clickhouse-sql-support.md)
-- [Catalog-backed physical-plan runtime](query-engine/catalog-physical-plan-runtime.md)
-- [Extension points](query-engine/extension-points.md)
-- [VictoriaMetrics and MetricsQL support](query-engine/victoriametrics-metricsql-support.md)
-
-## Ingest engine
-
-- [OTLP ingest-engine implementation](ingest-engine/ingest-engine.md)
-
-## Summary series ID
-
-- [Resolver guide](summary-series-id/resolver.md)
-
-## Control plane
-
-- [Physical compiler](control-plane/physical-compiler.md)
-- [Planning terminology and architecture](control-plane/planning-terminology.md)
-- [Architecture naming review (中文)](control-plane/architecture-naming-review.zh.md)
-- [Plan publication](control-plane/plan-publication.md)
-- [Workload inputs](control-plane/workload-inputs.md)
-- [Runtime accuracy feedback](control-plane/runtime-accuracy-feedback.md)
-
-## Cross-component
-
-- [Adding a summary family](cross-component-adding-summary-family.md)
diff --git a/docs/developer_docs/control-plane/accuracy-metadata.md b/docs/developer_docs/control-plane/accuracy-metadata.md
deleted file mode 100644
index aaa3b58de..000000000
--- a/docs/developer_docs/control-plane/accuracy-metadata.md
+++ /dev/null
@@ -1,31 +0,0 @@
-# Accuracy metadata
-
-The control plane and data plane adapt sketch parameters to ASAPPlanner's
-`DefaultAccuracyModel::sketch_guarantee`. The backend workspace's
-`asap_types::accuracy` module only projects that guarantee into the existing
-`epsilon`, `delta`, and `kind` response fields; it does not own family formulas.
-
-CMS, HLL, KLL (including HydraKLL), and DDSketch use this shared adapter.
-Parameter aliases and defaults remain at the source boundary. The installed
-`AggregationConfig` and its fingerprinted wire fields are unchanged.
-`AccumulatorSpec` is not used for accuracy extraction because its construction
-normalization differs (for example, KLL's integer range and DDSketch's accepted
-aliases and validation).
-
-Compared with the previous metadata:
-
-- CMS failure probability now follows Planner's `exp(-depth)` convention.
-- KLL uses Planner's DataSketches empirical 99th-percentile rank-error fit.
-- HLL's epsilon is relative standard error, and its failure probability is
-  unknown: JSON contains `"delta": null`, and the text summary says `δ=unknown`.
-  Clients must not interpret null as zero. Numeric delta values remain numbers.
-
-GOS still adds its staleness allowance to approximate epsilon without changing
-failure probability. Exact aggregates are unaffected. CountSketch and heap
-retention remain backend-specific; CMS-with-heap uses the shared CMS guarantee
-before applying the retention allowance. An accuracy envelope containing a
-segment with unknown confidence also reports unknown confidence.
-
-The legacy `/api/v1/plan` response no longer includes the disconnected
-`plan_summary` estimate. Its `transmission_costs` remain available. Removing the
-summary planner does not implement resource-budget-aware placement in v2.
diff --git a/docs/developer_docs/control-plane/architecture-naming-review.zh.md b/docs/developer_docs/control-plane/architecture-naming-review.zh.md
deleted file mode 100644
index 5cedf4e26..000000000
--- a/docs/developer_docs/control-plane/architecture-naming-review.zh.md
+++ /dev/null
@@ -1,219 +0,0 @@
-# ASAPQuery-backend 架构与命名审查
-
-审查基线：GitHub `main`，`b1a58ca810d7b7347f2cc5f30924db56532bbb6b`，2026-09-13。关联 Issue：[#709](https://github.com/ProjectASAP/ASAPQuery-backend/issues/709)。面向维护规划、共享契约、安装及执行代码的开发者。
-
-结论：#709 应从“术语替换表”改为“组件边界和数据语义对齐”。优先澄清逻辑候选、物理候选、报价对象、部署状态和存储身份，再决定具体命名。不能因为几个对象都包含计划字段，就把它们合成一个类型；也不能因为都叫 `SummaryNode`，就认为它们只表示近似查询。
-
-本文件保留实施前的架构审查与决策依据。当前实现及迁移规则见 [Planning terminology and architecture](planning-terminology.md)。其中明确列出此次命名迁移与保留为后续工作的结构调整。
-
-**追加实施：删除扁平 workload，统一 canonical 模型**
-
-[注册模型](../../../control_plane/src/registered_workload.rs)、[输入转换](../../../control_plane/src/pipeline.rs) 和 [注册存储](../../../control_plane/src/store/workload.rs) 已改为直接使用 ASAPPlanner 的 `QueryWorkload` 及内嵌 `DataWorkload`。`LegacyMetricWorkload` 与旧 `types::QueryWorkload` 别名删除。`RegisteredWorkload` 只组合 canonical workload 与部署选项，不保存第二份扁平查询字段或 `ParsedQuery`。
-
-| 原字段 / 对象 | canonical 或部署归属 | 重复判断与迁移含义 |
-|---|---|---|
-| `metric_name`、过滤条件、聚合、quantiles | `QueryWorkload` 中的完整查询表达式 | 旧字段是表达式的重复投影；现在按需解析，不独立存储 |
-| `exact_required` | 从 canonical 表达式推导当前 stage 编译能力 | 不再独立存储，也不替代用户的 accuracy requirement |
-| `accuracy` / `accuracy_sla` | entry 的 `requirements.accuracy` | 删除可变标量镜像；入口兼容旧 SLA，显式 `EpsilonDelta` 完整保留 |
-| `latency_sla` | `requirements.response_latency` | 查询响应要求，不是数据到达频率 |
-| `repeat_every` / `shape` | batch entry 或 repeating entry 的 demand | 明确一次执行与固定周期；毫秒转换检查溢出，不推导数据到达模式 |
-| `time_window` | 查询 range 与一致的 `time_selection.lookback` | 不把执行周期、历史时间点和 lookback 混成一个窗口 |
-| `series_count`、每系列采样速率 | `DataWorkload.input_cardinality`、`ingestion_rate` | 本单 metric 适配器约定 cardinality 为活跃 series；10 series × 5 Hz = 50 samples/s |
-| 分布、来源与证据时效 | `DataWorkload.distribution` / `Evidence<T>` | 存储时保留；未知或过期证据不可退回已知默认值 |
-| sketch pin、保留标签、wire bytes、memory cap | `DeploymentOptions` | 是部署约束，不属于查询语义或数据到达事实 |
-| `distinct_keys_per_window` | 部署侧每次 flush 的 item 基数估计 | 与 series cardinality 不是同一总体，不合并 |
-| `WorkloadCharacteristics` | 兼容输入 DTO / 临时成本投影 | 不再与查询模型一起重复存储；重规划从 canonical evidence 获取有效值 |
-| `QueryId` / deployment model | 注册元数据 | 保留标识和路由提示，不伪称已经执行额外约束 |
-
-迁移包含有意的入口行为变化：字段式 quantile 生成显式 0.99 分位查询，frequency 生成时间范围内的 item count；不再给已有查询硬塞 `quantile`。查询与显式 metric/window/aggregation/filter 冲突时返回错误，要求调用者修改查询表达式。旧 `group_by_labels` 中用于 collector 保留的标签放在部署选项，不改写查询 GROUP BY。
-
-单 metric 注册接口拒绝不能无损投影的多 selector、非等值过滤、offset/@、子查询、`without`、历史 time selection、未支持的 cadence 以及未实施的 dollars 约束。更完整的查询继续走已有完整编译接口。数据到达模式与查询周期独立；Batch 表示静态数据，持续 ingestion rate 为零。公开 canonical 构造器也验证这些边界，不能绕过入口校验后静默降级。
-
-测试覆盖 canonical 查询与精度/周期/数据证据的存储往返、aggregate sample rate、过期/未知证据、cadence 范围检查及不支持的投影。英文流程架构图见 [Planning terminology and architecture](planning-terminology.md)。下文中提出临时命名 `LegacyMetricWorkload` 的内容保留为审查历史，已被本节的实际删除方案取代。
-
-**本 PR 的最终落地与迁移方式**
-
-下表记录最终采用的名称；后文保留审查时的备选与理由。实施基线为 `cb3153a8`（#710），继续复用 Planner 的精度类型；随后合并 `47d4332f`（#711）与 `ca944a6a`（#712、#713、#717），保留主分支的窗口规划、storage routing 和接口清理。
-
-| 所属边界 / 源码 | 原名称 → 最终名称 |
-|---|---|
-| [编译输入与编译器](../../../control_plane/src/physical/compiler.rs) | `BackendLocalPlanningSnapshot` → `BackendLocalPlanningInput`；`BackendLocalImplementation` → `BackendLocalPhysicalInputs`；`PlanningQuery` → `QueryCompilationInput`；`PlanningRequest` → `PhysicalCompilationRequest`；`PhysicalCompiler` → `DeploymentPlanCompiler`；`PhysicalPlan` → `CompiledPhysicalPlan` |
-| 同上：查询语义 | `post_asap` → `selected_plan_root`；`source` → `legacy_query_source`；`window_secs` → `query_lookback_seconds`；`group_by` → `group_by_labels`；`accuracy` → `accuracy_target`；`lifecycle` → `summary_lifecycle_inputs`；`runtime_policy` → `materialization_runtime_policy` |
-| 同上：候选与证据 | `logical_selection` → `planner_selection_trace`；`materialization_policy` → `enabled_materialization_keys`；`evidence` → `topk_membership_evidence_by_query_id`；`hybrid_execution` → `allow_mixed_summary_and_exact_execution`；`synthesized_window_queries` 删除：编译器来源标记改为每个候选的 `derived` / `cohort_only`，不接受序列化输入 |
-| 同上：窗口与成本 | `WindowImplementationCandidate` → `WindowRealizationCandidate`；`ImplementationCostEvidence` → `WindowRealizationCostQuote`；`LifecycleCostEvidence` → `LifecycleUnitCosts`；`LifecyclePlanningInput` → `SummaryLifecyclePlanningInputs`；`window_implementations` → `window_realization_candidates` |
-| 同上：外层配置 | `snapshot_version` → `schema_version`；`implementation` → `physical_inputs`；外部窗口候选与默认窗口字段随 #712 删除，改用 `window_cost_model`；编译器在逻辑选择后按 cadence / phase 生成候选；`max_retained_summary_bytes` → `retained_summary_memory_budget_bytes` |
-| 同上：部署与保留 | `DeploymentEnvironment` → `PhysicalDeploymentContext`；`collector_ids` → `target_collector_ids`；`query_staleness_margin_ms` → `query_retention_margin_ms` |
-| [候选定价与选择](../../../control_plane/src/physical/workload_cost.rs) | `CostDemand` → `CostComponentDemand`；`unit` → `pricing_basis`；`multiplicity` → `occurrences_per_horizon`；`AlternativeCost` → `CandidatePlanEvaluation`；`WorkloadCostComparison` → `CandidatePlanSelectionReport`；`alternative_id` → `candidate_id`；`physical_alternative_id` → `physical_candidate_id`；`alternatives` → `candidate_evaluations` |
-| 同上：方法 | `with_exact_alternative` → `enumerate_exact_and_materialized_candidates`；`bind_alternative` → `compile_candidate_for_pricing`；`prepare_manifests` → `compile_candidates_for_pricing`；`select` → `select_lowest_cost_candidate`；`select_metricsql` → `select_lowest_cost_metricsql_candidate` |
-| [诊断状态](../../../control_plane/src/physical/workload_cost/status.rs) | `status` 使用 `CandidateEvaluationStatus`；覆盖范围使用 `CandidateSearchScope`；兼容未知字符串与原缺省值。原 `PhysicalQueryFrontend` 移到共享编译入口并命名为 `QueryFrontend`，替代内部布尔参数 |
-| [共享运行时算子](../../../crates/asap_types/src/query_plan/residual.rs) | `query_plan::logical::LogicalOperator` → `query_plan::residual::ResidualQueryOperator`；backend 对应模块迁移到 `residual`，保留旧模块导出 |
-| [运行时计划与句柄](../../../data_plane/src/storage_engines/types/hot_reload_config.rs) | `ActivePhysicalPlan` → `RuntimePhysicalPlan`；`HotReloadActivePhysicalPlan` → `ActivePhysicalPlanHandle`；`HotReloadStreamingConfig` → `StreamingConfigHandle`；`runtime_config` → `streaming_config`；active handle 的 `snapshot` → `active_snapshot`；`from_active` → `from_active_physical_plan`；`retire_drained` → `mark_drained_plan_retired` |
-| [存储元数据](../../../data_plane/src/storage_engines/sketch_db/index/mod.rs) | `SketchInstanceMetadata` → `SummarySeriesMetadata`；`sketch_index` 字段与变量 → `summary_store`；保留 `SketchStore` 类型 |
-| 其余调用边界 | `types::QueryWorkload` / `LegacyMetricWorkload` 删除，统一到 Planner `QueryWorkload` + `DataWorkload`；`ClickHouseSqlWorkload.sds` → `summary_catalog`；`aggregation_configs` → `materializations_by_policy_fingerprint`；`aggregation_id_for_key/value` → `key_policy_fingerprint/value_policy_fingerprint`；`data_plane::monitor` → `update_sampling` |
-
-主分支集成补充：共享 pane 保留 cadence、phase 与 evaluation alignment；发布的 storage routing 从选中物理计划生成；`types_v2` 已删除，定义合入 `types`。随后合入 #715（`e25d53b1`），保留未使用的 auto/Pareto 规划、rollback/diff HTTP 接口及辅助模块删除；canonical 注册与重规划仍走保留入口。这些上游删除的接口不提供旧字段兼容。下文涉及旧窗口模板和 query 级来源集合的建议仅属历史审查。
-
-迁移规则：**保留字段的 Rust 名称更新，输出 wire 名称保持原样**；反序列化接受新名称作为 alias。旧公共类型导入及主要入口提供 deprecated 转发，但 Rust struct literal 的旧字段拼写无法通过类型别名兼容，源码消费者需要按表迁移。`None` / 空候选集合、浮点频次、报价身份、候选排序、严格小于的选择规则及计划生命周期均保持原义。
-
-`erp` 保留并明确为 Error–Resource Profile；`WorkloadQuote.executable` 保留，因为它不代表安装或部署已经通过验证。双模式 streaming handle 的读写行为只补充说明；拆分写 API、删除 legacy 路径、统一 SQL 定价以及 typed ID / 时间单位迁移留作独立工作。英文流程图与边界说明见 [Planning terminology and architecture](planning-terminology.md)。
-
-**一、组件职责与当前真实路径**
-
-| 组件 | 实际职责 / 输入输出 | 命名判断 |
-|---|---|---|
-| 外部 ASAPPlanner | 解析与语义 IR，合法 summary/exact 候选，精度推理，逻辑选择；backend 提供具体成本和能力约束 | Planner 的语义选择与 backend 的物理候选比较是不同层次，不是两个重复 planner |
-| `control_plane::planner_selection` | 适配 Planner 的选择调用、精度及证据；输出语义 DAG 与诊断 trace | `selection` 必须说明是 logical 还是 physical；trace 不是决定执行行为的配置 |
-| `physical::compiler` | 输入规范化、窗口候选校验、调用逻辑选择，以及绑定具体物理实现，生成多个一致的计划投影 | `DeploymentPlanCompiler` 比 `PhysicalCompiler` 清楚；整个模块当前职责仍比单纯 lowering 更宽 |
-| `physical::workload_cost` | 枚举工作负载级候选、编译、生成报价清单、核验报价、选择最低成本可行候选 | manifest、quote、evaluation、selection report 不应相互替代 |
-| `physical::erp` | Error–Resource Profile 的部署适配、分布匹配、经验参数与资源估计 | `empirical_runtime_profile` 是错误展开；输入还包含策略与观测，不只一个 profile |
-| `control_plane::clickhouse` | SQL frontend、逻辑选择、物理绑定；支持已有 catalog 输入与自动生成 materialization 两条路径 | `ClickHouseSqlWorkload.sds` 实际是 `SummaryCatalog`；SQL 当前没有走同一套 `workload_cost::select` 整计划报价流程 |
-| `asap_types` | 跨组件共享的 catalog、SDS、生产/传输/预计算/查询/发布契约与验证逻辑 | 是共享契约的实际定义方；`control_plane` 中若仅 re-export，不是重复类型 |
-| `physical::publication` + backend client + OpAMP | 从编译结果构造发布制品，安装请求、collector 发布与应用确认、backend 激活 | publication 是制品或发布过程；install request 是命令；不是 active runtime 对象 |
-| data-plane HTTP 安装 + `PhysicalPlanLifecycle` | 验证跨计划一致性，stage、activate、drain、retire | `ActivePhysicalPlan` 被用于 staged map，名称把类型和生命周期阶段混在一起 |
-| OTLP / Remote Write drivers + `SeriesIdResolver` | 协议接入、生产者/世代/帧校验、分配并解析物理 series 身份 | `collector_id` 是特定生产者身份；不能把所有 producer 无条件改叫 collector |
-| `PrecomputeEngine` + workers + maintenance runtime | 按安装的 materialization 更新状态；派生维护消费已完成的源状态 | `PrecomputeEngineConfig` 是 worker/队列等引擎设置，`StreamingConfig` 是 materialization 的运行时视图，不是重复配置 |
-| `SketchStore` + backfill / persistence | 保存 sketch 和精确聚合状态；SID 索引、覆盖与完整性、恢复和历史填充 | `SketchStore` 已比名称更广；领域表述宜用 summary store。全仓类型迁移可独立进行 |
-| query engines / routing / summary execution | 用同一计划快照执行已安装 DAG、读取指定状态、执行精确子树或回退 | 生产路径不能在读请求里重新选择 materialization；legacy helper 应标明边界 |
-| `control_plane::monitor` / `replan` | 旧工作负载路径上的指标抓取、违规/过期触发重规划与发布 | 与运行时 ERP 观测不是同一条自动闭环，不应画成一个通用 feedback planner |
-| `data_plane::monitor` | 给边缘生产者协调 update-sampling grant | `monitor` 太宽，与 CP 的指标/SLA monitor 不同；建议模块领域名 `update_sampling` |
-| `asap_otel_proto` | OTLP 等生成协议类型 | 保持协议边界；不能把协议 DTO 当成语义 catalog |
-| `tools` / `scripts` / demos | 校准、离线证据、回放、评测与操作工具；有 JSON 消费者 | 序列化迁移必须审计这些调用方；它们不是运行时执行组件 |
-
-英文流程架构图见 [Planning terminology and architecture](planning-terminology.md)。下文表格的“当前名称”指审查基线上的名称，右栏是迁移建议。
-
-**二、不要把系统画成一条所有入口都相同的流水线**
-
-PromQL / MetricsQL 的主要计划路径是：
-
-`工作负载与证据 → Planner 语义选择 → 工作负载级物理候选 → 编译结果与 manifest → provider quote → 最低成本可行候选 → publication → runtime generation`
-
-这里有三个不同范围的选择：语义 DAG 的选择、单个窗口物理实现的选择、整个工作负载物理候选的成本比较。它们并非重复实现。`with_exact_alternative` 的有界枚举也不保证找到所有未枚举实现的全局最优值。相同成本时，当前严格 `<` 比较保留先出现的候选。[编译器][C1]、[候选与定价][C2]
-
-`prepare_manifests()` 编译后丢弃 plan，仅返回 manifests 和诊断行；部署选择阶段重新编译候选，再与证据中的 manifest 做完整相等比较。这是“发现/采集成本”和“使用成本部署”两个阶段，不应因为函数都做 compile 就直接删除其中一个。[C2]
-
-ClickHouse 的自动路径直接从 SQL 选择与绑定构建 `PhysicalPlanPublication`；已有 catalog 路径接收 `sds + precompute_plan + transmission_plan`。它们与 PromQL 共用安装及运行时契约，但不能画成已经共用相同的整计划报价选择过程。建议两个请求对象分别叫 `ClickHouseCompilationInput`、`ClickHouseBindingInput`，或保留现名并明确 automatic / catalog-bound 区别。[C3]
-
-旧 flat workload → `CollectionPlan` / stage emission 路径仍有实际调用；`PhysicalPlanner`、`PlanNode`、`PostAsapPlan` 等旧模块也留在公开模块树中。不要据名字推断它们都与当前 `PhysicalPlan` 等价，也不要据旧模块存在就断定它们全部处于主路径。[C4]
-
-**三、#709 中应该修正或收紧的映射**
-
-| 当前值 / 提议 | 实际语义 | 建议 |
-|---|---|---|
-| `erp` → `empirical_runtime_profile` | ERP = **Error–Resource Profile**；`ErpPlanningInput` 还含观测、匹配策略、mode、权重和能力 | 保留 `erp` 并写明定义，或字段 `error_resource_planning_input`；不要使用错误全称 |
-| `PlanningQuery` → `SelectedQueryInput` | 对象先构造，再被 `select_workload_roots_with_trace(&mut queries, ...)` 更新；并非整个生命周期都已 selected | 倾向 `QueryCompilationInput`，不用类型名承诺当前代码没有保证的阶段 |
-| `post_asap` → `selected_summary_plan_root` | Planner 选择的语义 DAG 根，也可装 `KeepPreAsap` exact 根 | `selected_plan_root` / `selected_logical_root`；不要暗示必定 materialized 或 approximate |
-| `materialization_candidate_keys()` → `optional_materialization_ids()` | 编译前枚举用的候选 key，与 catalog 中的 `SummaryDefinitionId` 不是一类身份 | `eligible_materialization_keys()`；保留 key 与已绑定 ID 的区别 |
-| `materialization_policy` → `enabled_optional_materializations` | `Option<BTreeSet<String>>`：`None` 启用全部 eligible，`Some(empty)` 不启用任何可选项 | `enabled_materialization_keys`，保留并明确三态语义；不要默认成普通空集合 |
-| `materialization_leaf_contract` → 候选 keys | 函数实际上返回原始 source 的 metric、可选 window、filter contract | `raw_materialization_input_contract`；真正枚举 keys 的函数另行命名 |
-| 所有 `leaf` 改为 materialization | DAG 结构叶节点、物化候选、执行中的 exact subtree 是不同对象 | 按消费点改；真正的图论 leaf 可保留，不能机械替换 Planner 术语 |
-| `CostDemand.unit` → `cost_unit` | 值为 `horizon` / `query_evaluation`，表达报价的工作量基准，并非 CPU 秒、字节或货币单位 | `pricing_basis` / `demand_basis`；可定义 `PricingBasis` 枚举 |
-| `multiplicity` → `occurrences_per_horizon` | 基准工作在 horizon 内的乘数；允许按频率得到浮点估计 | 支持；不可顺手改为整数。总成本是 quote × occurrences |
-| `LifecycleCostEvidence` → `LifecycleCostRates` | 同时包含 build/read/retirement 单次成本和 maintenance/retention rate | `LifecycleCostModel` / `LifecycleUnitCosts`，不应全称 rates |
-| `WorkloadQuote.executable` → `deployable` | provider 对匹配 manifest 的执行可行性声明；还需 compiler、证据、安装与发布验证 | 保留 `executable` 或用 `provider_feasible`；不要暗示已通过端到端部署检查 |
-| `synthesized_window_queries` → `queries_with_derived_window_candidates` | 编译器生成报价的 query ID 集合，决定能否做共享 pane 重定价 | `compiler_priced_window_query_ids`；derived 已用于“由 summary 派生 summary”，易混淆 |
-| `collector_ids` → `eligible_collector_ids` | 分布式模式下，每个 ID 都生成 `CollectorPlan` | `target_collector_ids`；代码没有在这些 eligible collector 中再选子集 |
-| `query_staleness_margin_ms` → `max_query_staleness_ms` | 为滞后的查询增加保留状态量；自身不实现请求拒绝规则 | `query_retention_margin_ms`，或保留现名并说明用途；避免暗示已有 admission enforcement |
-| `BackendLocalImplementation` → `BackendLocalPlanningInputs` | 外层也是 planning input；内层含成本、窗口候选、证据、ERP 与保留约束 | 外层 `BackendLocalPlanningInput`，内层倾向 `BackendLocalPhysicalInputs`；不为这些分类额外创建一组 wrapper |
-| `ActivePhysicalPlan` 保持不动，只改 handle | 同一类型也用于 staged 计划和 draining 的旧快照 | 类型倾向 `RuntimePhysicalPlan`；handle 用 `ActivePhysicalPlanHandle`，phase 由 lifecycle 管理 |
-| `build_active_physical_plan` → `validate_and_build_active_physical_plan` | 校验与构建，但不执行 activation | `validate_and_build_runtime_plan`；否则名字仍把构建和激活混淆 |
-| 泛化的 `snapshot()` → `active_snapshot()` | active-plan handle 与独立 streaming-config handle 的快照含义不同 | 只在能保证 active 语义的 handle 上使用；不可全仓替换 |
-| `runtime_policy` → `materialization_runtime_policy` | `RuntimeRulePolicy` 具体控制 sampling、delta、GOS 与 adaptation | 可接受；跨组件说明是 producer/update/transmission policy，不能与候选选择策略混淆 |
-
-依据：[编译输入与选择 C1][C1]、[候选与定价 C2][C2]、[ERP C5][C5]、[候选 key C6][C6]、[pane 重定价 C7][C7]、[运行时生命周期 C8][C8]。
-
-以下映射方向正确，可以作为同一轮小范围迁移：
-
-| 当前名称 | 建议名称 / 约束 |
-|---|---|
-| `PlanningRequest` | `PhysicalCompilationRequest`；包含 workload 上下文，不是单 query |
-| `PhysicalCompiler` | `DeploymentPlanCompiler` |
-| `PhysicalPlan` | `CompiledPhysicalPlan`；候选和获选结果可继续复用此类型，无须新增 `SelectedPhysicalPlan` wrapper |
-| `logical_selection` | `planner_selection_trace`；说明只做诊断 |
-| `window_implementations` | `window_realization_candidates`；对象 `WindowImplementationCandidate` 也应相应命名 |
-| `ImplementationCostEvidence` | `WindowRealizationCostQuote`；保留 model、时效与 workload scope |
-| `window_candidates` | `window_realization_candidates_by_query`；注明 key 为注册查询文本，不是 query ID |
-| `window_implementation_id` | 默认模板处用 `default_window_realization_id`，已选估计项用 `window_realization_id`，不能全仓统一加 default |
-| `PlanningQuery.window_secs` | `query_lookback_seconds`；不可连带重命名其他类型的所有 window 字段 |
-| `PlanningQuery.source` | `legacy_query_source` 可接受，但该值也写入 workload cost manifest，不能借改名删除或改变其报价身份 |
-| `group_by` / `accuracy` | 在相应输入上用 `group_by_labels` / `accuracy_target`；输出精度结果不能改叫 target |
-| `lifecycle` / `LifecyclePlanningInput` | `summary_lifecycle_inputs` / `SummaryLifecyclePlanningInputs` |
-| `PlanningRequest.evidence` | `topk_membership_evidence_by_query_id`；输入 map 的 `topk_evidence` 是按查询文本，不应加 by_query_id |
-| `hybrid_execution` | `allow_mixed_summary_and_exact_execution`；是允许编译的模式，不是本次请求必然采用混合执行 |
-| `bind_alternative` / `prepare_manifests` | `compile_candidate_for_pricing` / `compile_candidates_for_pricing`；后者返回清单及诊断，不返回编译 plans |
-| `with_exact_alternative` | `enumerate_exact_and_materialized_candidates`；保留有界搜索与枚举顺序 |
-| `AlternativeCost` | `CandidatePlanEvaluation` 可接受，但必须允许尚未定价或编译失败；更中性的 `CandidatePlanDiagnostic` 也符合现有全阶段用途 |
-| `WorkloadCostComparison` | `CandidatePlanSelectionReport` |
-| `select` / `select_metricsql` | 可用 `select_lowest_cost_candidate` / `select_lowest_cost_metricsql_candidate`；文档写明 feasible 与枚举范围 |
-| `metricsql: bool` | PromQL/MetricQL 路径使用 `QueryFrontend`；先审计已有 `PhysicalQueryFrontend`，不要再建第三份枚举；SQL 并未因此自动适配此入口 |
-| `CostDemand` | `CostComponentDemand` |
-| `publication()` | `to_publication_artifact()`，或沿用 `publication()`；它构造并校验制品，不执行 HTTP 发布 |
-| `compile_transmission_plan` | `build_transmission_plan`；从 precompute 和 runtime policies 构造，不一定要把全部参数编码进长函数名 |
-| `DeploymentEnvironment` | `PhysicalDeploymentContext`；target、capability、time、generation 都是上下文 |
-| `max_retained_summary_bytes` | `retained_summary_memory_budget_bytes`，保留旧缺省值、别名与具体计量定义 |
-| `ActivePhysicalPlan.runtime_config` | `streaming_config`，准确表达持有的配置类型 |
-| `aggregation_configs` | `materializations_by_policy_fingerprint`；目前 key 是 `u64` 形式 fingerprint，改名不等于已经升级 typed key |
-| `get_all_aggregation_configs()` | `materializations()`；明确当前仍返回 map |
-| `from_active()` | `from_active_physical_plan()` |
-| `retire_drained()` | `mark_drained_plan_retired()`；它标记 lifecycle status，不执行存储 GC |
-
-**四、全仓中 #709 漏掉的歧义与重复**
-
-| 对象 | 判断 | 最小处理 |
-|---|---|---|
-| backend `types::QueryWorkload` 与 Planner `workload::QueryWorkload` | **同名不同义**：前者是单 metric 的 flat legacy 意图；后者是 canonical 工作负载 | legacy 侧叫 `LegacyMetricWorkload` 或导入时显式 alias |
-| `PlanNode` / `CollectionPlan` / `PhysicalPlan` / `QueryPlan` | **不同层级**：旧 annotated stage tree、旧采集方案、完整物理 bundle、工作负载的查询执行条目集合 | 优先给旧类型/模块加 legacy 或 stage 语义；保留新契约的区别 |
-| `QueryPlan` 与 `QueryPlanEntry` | 前者实际上是按 canonical identity 查找的一组查询执行计划 | 可将前者描述为 query execution catalog；若做 API 迁移再考虑 `QueryExecutionCatalog` / `QueryExecutionPlan`，#709 不必强行扩展 |
-| `query_plan::logical::LogicalOperator` | **阶段误导**：内容是已安装的 residual 运行时算子，包括 exact subquery、scan、aggregate | `ResidualQueryOperator`，模块 `residual`；对应 `prepare_logical` 按实际职责命名 |
-| `ClickHouseSqlWorkload.sds` | **层级混淆**：保存整个 `SummaryCatalog`，不是单个 Self-Describing Summary | `summary_catalog` |
-| `AggregationConfig` 与 `PrecomputeMaterialization` | **同一个类型的兼容别名**，不是两种配置对象 | 新代码用 `PrecomputeMaterialization`；保留旧 alias 过渡，不复制定义 |
-| `AggregationIdInfo.aggregation_id_for_key/value` | **历史身份名**：注释明确已是 policy fingerprint 的 u64 | 使用 `key_policy_fingerprint` / `value_policy_fingerprint`；typed ID 迁移单独评估 |
-| `SummaryDefinitionId` 与 `PolicyFingerprint` | **合理的语义 wrapper**：前者是 catalog 中的定义引用，后者是兼容内容 fingerprint | 跨 catalog API 优先前者；不能把它与 SID 或 descriptor ID 合并 |
-| `SketchInstanceMetadata` | **instance 的粒度错误**：按 SID 管理长期 series 元数据；真正 SDS instance 另外包含具体时间范围 | `SummarySeriesMetadata`，避免与 `SummaryInstance` 混为一个窗口对象 |
-| `SketchStore` / `sketch_index` | **名称比职责窄**：对象还保存 exact accumulator、持久化、生命周期及状态读取 | 文档统一称 summary store；`sketch_index` 变量可先改 `summary_store`，全面类型迁移另行处理 |
-| `SummaryCatalog` / `sketch_catalog` / SQL catalog / `PolicyRegistry` | **不是重复 catalog**：已安装定义、算法候选/默认参数、源表 schema、运行时 config 派生 lookup | 分别明确 `summary catalog`、`sketch capabilities`、`source schema catalog`、`materialization lookup` |
-| `PrecomputePlan.materializations` 与 `StreamingConfig.aggregation_configs` | **合理投影**：安装验证后构建的运行时 map，不是两个应独立编辑的配置真源 | 文档声明 runtime config 来源；保证同一世代，不因字段重复删除验证 |
-| `PhysicalPlan` / Publication / InstallRequest / Runtime plan | **合理边界重复**：编译诊断、共享发布制品、带 routing/evidence 的安装命令、持有 Arc 的运行时对象 | 继续使用边界构造和交叉验证；无需一个承载全部阶段的大对象 |
-| `HotReloadStreamingConfig.inner` 与 `.active` | **真实双来源**：active 模式读 active plan，`swap` 仍写 inner，写入不成为 snapshot 的结果 | 先将模式写清；若拆为 legacy 可写句柄与 active 只读视图，必须独立定义 API 行为与测试 |
-| `summary_exec` / `summary_executor` | 通用执行接口/调度与具体 store-backed 实现，名称近似但不是可直接去重的函数集合 | 更明确的 module docs；若迁移可用 `summary_execution` / `store_summary_reader`，保持执行语义边界 |
-| `control_plane::monitor` 与 `data_plane::monitor` | **同名不同功能**：指标/违规监控 vs 更新采样分配 | 用职责名区分，不将它们都当作 ERP 实时反馈 |
-| `summary_catalog` / `sds` / `canonical` 中的 re-export | **兼容入口，不是重复实现** | 建立 canonical import 路径后逐步减少旧入口；不要复制 shared DTO |
-
-依据：[旧 workload C4][C4]、[共享 materialization C9][C9]、[SDS C10][C10]、[catalog C11][C11]、[runtime config C12][C12]、[存储元数据 C13][C13]、[residual operators C14][C14]、[shared publication C15][C15]。
-
-**五、必须保留的身份、时间和生命周期区别**
-
-`plan_id / plan_version` 标识部署决定与世代；`CatalogGeneration` 额外携带 catalog 的摘要。`SummaryDescriptorId` 表达算法/状态语义，`DataDescriptorId` 表达输入 population；`SummaryDefinitionId` 绑定这些定义与物理布局。SID 表达具体物理 series 生命周期，而 `SummaryInstance` 表达具体时间范围和 group 的状态，并携带物理引用、来源与完整性。不能因为底层有些都用 u64，就全部命名为 `id` 或 `materialization_id`。[SDS][C10]、[Catalog][C11]、[存储元数据][C13]
-
-`window` 至少有 query lookback、evaluation interval、stored pane duration、slide、origin、retention、producer emission cadence 等含义。`PrecomputeMaterialization::stored_window_ms()` 对 FullWindow 与 pane layout 的处理不同，不能全仓把 `window_size` 替换成 `query_lookback_seconds`。改名应保留各字段当前单位；单位转换属于额外行为变更。[C9]
-
-生命周期至少有三条轴：计划 `Staged / Active / Draining / Retired`，materialization `Materializing / Ready / Serving`，以及具体实例的 completeness。一个计划已 Active，并不表示其每个查询范围都已完整；读路径仍需校验状态。`retire_drained` 只是状态标记，不表示已经回收所有持久化数据。[计划生命周期][C8]、[SDS][C10]
-
-`snapshot` 对 immutable catalog 和 `Arc` 读取是合适术语，不应一律删除。对于 `BackendLocalPlanningSnapshot`，代码主要将其消费为输入，改成 input 合理；但要同时决定 `snapshot_version` 的 schema 名称和兼容策略。
-
-**六、迁移与验收建议**
-
-1. 先写下字段语义、所属阶段、key 范围和单位；修正 ERP、成本基准、runtime/staged、target collectors 等会误导实现的名称。把 #709 正文与补充评论合并为一份不冲突的映射。
-2. 做内部函数/局部变量改名，优先保持数据结构和算法原样。不要为每个生命周期步骤引入一个新 wrapper。`physical` 的旧路径隔离、hot-reload handle 拆分和 shared schema 版本升级分别处理。
-3. 公共 Rust 字段改名不能靠 type alias 或 forwarding method 保持兼容。先识别实际外部消费者；crate 根文档也声明部分 public module 仅供 workspace 内使用，因此不需要不加区分地给每个 public symbol 建长期兼容层。
-4. 保留 wire 输出时，用 `serde(rename = "old_name")` 固定旧名称，视需要接受新名 alias。仅 `alias = "old_name"` 无法保护旧消费者读取新输出。还需检查手工 JSON/YAML 生成、Python 校准与回放工具、CLI 输出和已有 fixture。
-5. 名称变化可能影响身份：catalog digest 对序列化内容求 SHA-256，编译计划也存在对序列化 materialization 求 hash 的路径。验收应检查 plan/materialization/catalog identity、component keys、manifest 匹配不变，不只是能够 deserialize。
-6. 枚举 `status` 与 `search_scope` 时保留原 wire 表达，或明确版本迁移。现有 status 含 `bind_failed`、`bound`、`evidence_missing`、`rejected`、`evidence_invalid`、`unselected`、`selected`，且 `status` 缺省为空字符串。typed scope 还应保留“bounded inventory 不承诺未枚举最优”的解释信息。
-7. 运行既有 compiler、cost selection、publication、安装 lifecycle、query execution 与 backend process E2E。针对实际 wire/identity 变动补兼容断言：双向读写、缺省行为、None/empty 集合、同成本选择顺序、staged 不生效、旧读者 drain。纯局部改名无需逐字段补镜像测试。
-
-额外维护问题：`docs/developer_docs/data-structure-ownership-audit.md` 仍说多个 wire DTO 在 control_plane、尚待搬迁，但当前已经在 `asap_types`；`PrecomputeEngine` 注释还称 Remote Write 已删除，而 driver 与启动代码中已存在。命名 PR 应同步修正相关陈旧说明，否则新的词汇表仍会被旧架构描述覆盖。
-
-[C1]: https://github.com/ProjectASAP/ASAPQuery-backend/blob/b1a58ca810d7b7347f2cc5f30924db56532bbb6b/control_plane/src/physical/compiler.rs
-[C2]: https://github.com/ProjectASAP/ASAPQuery-backend/blob/b1a58ca810d7b7347f2cc5f30924db56532bbb6b/control_plane/src/physical/workload_cost.rs
-[C3]: https://github.com/ProjectASAP/ASAPQuery-backend/blob/b1a58ca810d7b7347f2cc5f30924db56532bbb6b/control_plane/src/clickhouse.rs
-[C4]: https://github.com/ProjectASAP/ASAPQuery-backend/blob/b1a58ca810d7b7347f2cc5f30924db56532bbb6b/control_plane/src/types.rs#L266
-[C5]: https://github.com/ProjectASAP/ASAPQuery-backend/blob/b1a58ca810d7b7347f2cc5f30924db56532bbb6b/control_plane/src/physical/erp.rs
-[C6]: https://github.com/ProjectASAP/ASAPQuery-backend/blob/b1a58ca810d7b7347f2cc5f30924db56532bbb6b/control_plane/src/query_plan/logical.rs#L1105
-[C7]: https://github.com/ProjectASAP/ASAPQuery-backend/blob/b1a58ca810d7b7347f2cc5f30924db56532bbb6b/control_plane/src/physical/pane_reuse.rs
-[C8]: https://github.com/ProjectASAP/ASAPQuery-backend/blob/b1a58ca810d7b7347f2cc5f30924db56532bbb6b/data_plane/src/storage_engines/types/hot_reload_config.rs
-[C9]: https://github.com/ProjectASAP/ASAPQuery-backend/blob/b1a58ca810d7b7347f2cc5f30924db56532bbb6b/crates/asap_types/src/aggregation_config.rs
-[C10]: https://github.com/ProjectASAP/ASAPQuery-backend/blob/b1a58ca810d7b7347f2cc5f30924db56532bbb6b/crates/asap_types/src/sds.rs
-[C11]: https://github.com/ProjectASAP/ASAPQuery-backend/blob/b1a58ca810d7b7347f2cc5f30924db56532bbb6b/crates/asap_types/src/summary_catalog.rs
-[C12]: https://github.com/ProjectASAP/ASAPQuery-backend/blob/b1a58ca810d7b7347f2cc5f30924db56532bbb6b/data_plane/src/storage_engines/types/streaming_config.rs
-[C13]: https://github.com/ProjectASAP/ASAPQuery-backend/blob/b1a58ca810d7b7347f2cc5f30924db56532bbb6b/data_plane/src/storage_engines/sketch_db/index/mod.rs#L209
-[C14]: https://github.com/ProjectASAP/ASAPQuery-backend/blob/b1a58ca810d7b7347f2cc5f30924db56532bbb6b/crates/asap_types/src/query_plan/logical.rs
-[C15]: https://github.com/ProjectASAP/ASAPQuery-backend/blob/b1a58ca810d7b7347f2cc5f30924db56532bbb6b/crates/asap_types/src/plan_publication.rs
diff --git a/docs/developer_docs/control-plane/physical-compiler.md b/docs/developer_docs/control-plane/physical-compiler.md
deleted file mode 100644
index dc086a377..000000000
--- a/docs/developer_docs/control-plane/physical-compiler.md
+++ /dev/null
@@ -1,399 +0,0 @@
-# Developing the Planner adapter and physical compiler
-
-> Interface status: implemented MVP API in
-> `control_plane::physical::compiler`.
-
-## Dataset-bound planning input
-
-Planning snapshots use version 3 and require an explicit identity:
-
-```json
-{
-  "snapshot_version": 3,
-  "environment": {
-    "dataset_identity": {"namespace": "tenant-a", "dataset": "requests"}
-  }
-}
-```
-
-This is an excerpt; the normal workload, capabilities and policy fields remain
-required. All input source names in this deployment resolve within that logical
-dataset. The source authority must supply the identity; the compiler does not
-infer a tenant from a metric name or endpoint. Separate datasets require separate
-bindings rather than multiplexing indistinguishable inputs through this channel.
-
-Planner exports dataset-bound semantic fragments (version 2). The precompute
-input contract carries the same identity and validates it against stored-output
-semantics. Catalog schema 6 marks the changed contract; old planning snapshots
-and catalog schemas fail validation. Changing an endpoint or replica for the same
-dataset does not change the semantic definition. Dataset identity participates
-in workload cost manifests so quotes cannot cross dataset scopes.
-
-## Current implementation boundary
-
-The compiler consumes pinned ASAPPlanner types, with the resolved revision
-exposed as `physical::compiler::PLANNER_REVISION`, and selects
-from Planner's legal candidate space with backend-owned cost and evidence
-inputs, and emits one `CompiledPhysicalPlan`. The plan contains one SummaryCatalog plus
-CollectorPlan, PrecomputePlan, TransmissionPlan, and QueryPlan projections
-compiled from the same decision
-for every target collector. Legacy
-`StageAllocator`/`ThreeStageEmitter` paths remain for older publication flows;
-they are not a second semantic planner.
-
-ASAPPlanner owns semantics and physical candidate construction, including summary
-families, precomputation update lifecycles and physical boundaries. Backend evaluates
-candidate feasibility and complete workload-scoped costs, then selects and binds
-the deployment without changing its computation.
-Missing or stale implementation evidence makes the candidate unavailable; the
-compiler never invents a framework or assigns it an optimistic zero cost.
-
-## 1. Code architecture
-
-The planning and deployment boundary is:
-
-```text
-Query workload + accuracy requirements
-                 ↓
-ASAPPlanner: supported, semantically legal physical candidates
-                 ↓
-Backend: feasibility checks + workload-scoped candidate costs
-                 ↓
-DeploymentPlanCompiler: select and bind a physical candidate
-                 ↓
-CompiledPhysicalPlan
-    CollectorPlan + PrecomputePlan + TransmissionPlan + QueryPlan
-                 ↓
-Publication and execution
-```
-
-Planner owns computation, operator choices, sharing and materialization
-boundaries. Backend supplies deployment capabilities and evidence, selects among
-admitted physical candidates, and binds the chosen graph to concrete inputs and
-stored outputs. It does not reinterpret summary operations into another logical
-plan. All published projections share the same catalog and identities.
-
-Runtime publication is documented in
-[Runtime plan publication](plan-publication.md).
-
-## 2. Public interfaces and definitions
-
-### Planning request
-
-`PhysicalCompilationRequest` is backend-owned request context around Planner's canonical
-per-query IR:
-
-```rust
-pub struct PhysicalCompilationRequest {
-    pub queries: Vec<QueryCompilationInput>,
-    pub topk_membership_evidence_by_query_id: HashMap<String, TopKMembershipEvidence>,
-    pub planner_revision: String,
-}
-```
-
-Input definitions:
-
-| Field | Definition |
-| --- | --- |
-| `queries` | Selected Planner DAG roots, query identities, source metadata, grouping labels, accuracy targets, lifecycle inputs, and executor-feasible `window_realization_candidates`. |
-| `topk_membership_evidence_by_query_id` | Optional typed TopK membership certificates keyed by query ID. |
-| `planner_revision` | Immutable Planner build/revision used for reproducibility. |
-
-TopK evidence is accepted only when its selected lower bound is strictly above
-the excluded upper bound, its failure probability is valid, its source is
-non-empty, and its observation is fresh under `PhysicalDeploymentContext`.
-
-```rust
-pub struct TopKMembershipEvidence {
-    pub selected_lower_bound: f64,
-    pub excluded_upper_bound: f64,
-    pub interval_failure_probability: f64,
-    pub observed_at_unix_ms: u64,
-    pub source: String,
-}
-```
-
-Why this interface exists: it prevents adapters, protocols, and physical
-planning from each implementing their own query-to-summary mapping.
-
-Snapshot and HTTP adapters provide the same `WindowCostModel`. After logical
-selection, one generator enumerates layouts allowed by each state's precomputation
-requirements and deployment target, then derives or matches layout-specific costs.
-See [repeated window planning](../planning/repeated-dashboard-panes.md) for inputs,
-migration and cadence examples.
-
-Each internally generated `WindowRealizationCandidate` carries a backend-owned implementation
-identity, its Planner `SummaryWindowFramework`, concrete window/pane/state
-layout, and versioned workload-specific CPU, peak-memory, network, storage,
-scan, and calibrated weighted-cost evidence. The compiler collapses several
-physical realizations of one framework to the cheapest complete one before
-calling Planner, then resolves Planner's result back to that retained concrete
-identity. Physical identities never enter post-ASAP IR.
-
-### Physical compiler
-
-```rust
-impl DeploymentPlanCompiler {
-    pub fn compile_promql(
-        &self,
-        request: PhysicalCompilationRequest,
-        environment: PhysicalDeploymentContext,
-    ) -> Result<CompiledPhysicalPlan, CompileError>;
-}
-```
-
-```rust
-pub struct PhysicalDeploymentContext {
-    pub target_collector_ids: Vec<String>,
-    pub capability_snapshot_id: String,
-    pub observed_at_unix_ms: u64,
-    pub max_evidence_age_ms: u64,
-    pub plan_version: u64,
-    pub activation_unix_ms: u64,
-    pub expiry_unix_ms: Option<u64>,
-    pub backend_compat: String,
-}
-
-pub struct CompiledPhysicalPlan {
-    pub envelope: PlanEnvelope,
-    pub summary_catalog: SummaryCatalog,
-    pub collector_plans: Vec<CollectorPlan>, // complete per-target projections
-    pub precompute_plan: PrecomputePlan,      // backend streaming materializations
-    pub transmission_plan: TransmissionPlan,  // producer/frame wire contract
-    pub query_plan: QueryPlan,                // node-ID physical serving DAG
-}
-```
-
-Supporting public types:
-
-| Type | Definition |
-| --- | --- |
-| `PhysicalDeploymentContext` | Target collector IDs, capability snapshot identity, planning time, and evidence freshness policy. |
-| `PlanEnvelope` | Shared deterministic `plan_id`, generation time, capability snapshot, and Planner revision. |
-| `CollectorPlan` | Serializable execution projection consumed by ASAPCollector. |
-| `PrecomputePlan` | Authoritative materialization, ingest, state-schema, and producer contract consumed directly by the backend runtime. |
-| `TransmissionPlan` | Exact per-producer mode, encoding, cadence, destination, checkpoint policy, and frame identity contract. |
-| `SummaryCatalog` | Authoritative immutable descriptor and materialization-identity snapshot. |
-| `QueryPlan` | Canonical-query keyed executable DAG with exact materialization bindings and fallback policy. |
-
-Current MVP limits are explicit: time-series sources and supported summary
-materializations are accepted; table sources and unexecutable selected families
-return `CompileError`. Versioned stage/activate/drain/retire lifecycle is part
-of publication; richer topology placement remains follow-up work.
-
-`TransmissionRule.runtime_policy` is the single physical contract for sampling,
-delta gating, and GOS. Sampling is typed by its implemented estimator; GOS is a
-CountSketch delta policy, not a summary family. Unsupported family/policy
-combinations fail compilation. Delta rules declare a periodic full-checkpoint
-cadence and accept both deltas and their recovery full frames.
-
-Runtime feedback cannot mutate an active rule. `authorize_successor` accepts
-only the next `plan_version`, requires fresh evidence for the exact
-plan/materialization/schema/producer tuple, and bounds each permitted knob by
-the active rule's guardrails. Family, parameters, grouping, window, schema,
-encoding, destination, mode, and checkpoint semantics stay fixed; changing
-them requires ordinary recompilation and staged activation.
-The atomic physical-plan publication carries the evidence records alongside
-the successor; the backend performs this authorization before staging it, so a
-caller cannot bypass guardrails by posting a changed rule directly.
-
-Output definitions:
-
-| Output | Definition |
-| --- | --- |
-| `envelope` | Shared plan/version/activation/compatibility identity. |
-| `collector_plans` | One plan per targeted collector, following ASAPCollector's public CollectorPlan schema. |
-| `precompute_plan` | Materializations plus `/v1/metrics` ingest semantics, typed state schemas/encodings, and allowed producers; it is installed directly and contains no query-string jobs. |
-| `transmission_plan` | One rule per producer/materialization/schema binding plus the mandatory frame identity and sequencing scope. |
-| `summary_catalog` | Canonical descriptors and stable materialization identities shared by every execution plan. |
-| `query_plan` | Canonical query identity, explicit fallback policy, node-ID DAG, and exact per-node materialization bindings. |
-
-### QueryPlan execution boundary
-
-`QueryPlan` is physical and executable; it is not a serialized copy of
-post-ASAP IR. Each `ReadMaterialization` node binds one policy fingerprint,
-metric, family/parameters, stored SID grouping layout, output reduction, and
-window. The data plane resolves only that fingerprint through the
-`policy_fp -> SID` reverse index and verifies SID metadata exactly. It never
-scans the catalog for a serving-time candidate.
-
-The compiler walks the entire executable post-ASAP DAG recursively. Every
-`SummaryAgg` leaf reached through `SummaryEstimate` and `SummaryMerge` is bound
-to an exact physical materialization before the query is published. If any
-family or operator on that path is unsupported, the query entry is emitted as
-`ExactFallback`; the compiler does not provision otherwise-unused warm state
-for a query that cannot be executed end to end.
-
-Graph traversal is separate from node definitions and store semantics.
-Activation validates roots, edges, bindings, reachability, and cycles.
-The shared physical DAG runtime creates one producer per reachable node and
-shares its outputs with bounded buffering within the request,
-so a shared node in a diamond DAG performs one store/operator execution. Only an
-eligible availability failure follows the entry's explicit fallback route.
-Resource exhaustion and cancellation terminate execution without fallback.
-
-### What the compiler puts in CollectorPlan
-
-Each targeted Collector receives a complete executable projection of the
-physical decision. It is not a Planner DAG and not a pointer requiring the
-Collector to recover missing semantics.
-
-| CollectorPlan section | Required content | Consuming ASAPCollector component |
-| --- | --- | --- |
-| envelope | Schema version, kind, shared plan ID/version, generation/activation/expiry, backend compatibility, Planner revision, candidate/query traceability | OpAMP receiver and plan validator |
-| target | Collector instance UID, edge assignment, capability snapshot hash | Control-plane agent and capability validator |
-| materialization reference | Content fingerprint describing maintained semantics plus logical-node traceability | Plan applier and materialization registry |
-| input | Source metric, canonical matchers, and whether the summarized input is sample value or a named label | OTLP/OTAP metric adapter and observation router |
-| summary | Raw, exact-aggregation, or sketch kind; concrete algorithm; typed parameters; requested accuracy | Precompute factory and accumulator/sketch implementation |
-| reduction/grouping | Per-entity or reduction semantics, retained/excluded labels, and independent or shared grouping layout | Series-key builder and aggregation state manager |
-| window | Kind, size, slide/anchor, allowed lateness, flush behavior | Window manager |
-| placement | Collector stage and local shard assignment | Processor topology/runtime |
-| transmission | Raw/full/delta mode, encoding and schema version, emission cadence, checkpoint interval and sequence scope | Envelope encoder and delta sender |
-| output/lifecycle | Backend endpoint reference, unsupported behavior, drain/retirement policy | Exporter, plan lifecycle manager, and application reporter |
-
-For a Collector-side DDSketch materialization, the relevant projection is
-conceptually:
-
-```yaml
-materializations:
-  - id: mat:sha256:98f1...
-    input:
-      metric: request_duration_seconds
-      matchers: [{label: region, op: eq, value: us-east}]
-      value: sample_value
-    summary:
-      family: sketch
-      algorithm: ddsketch
-      parameters: {alpha: 0.01}
-      accuracy: {kind: epsilon, epsilon: 0.01}
-    reduction: {kind: reduce, by: [service], without: false}
-    grouping: {kind: per_subpopulation_instance}
-    window: {kind: tumbling, size: 1m, slide: 1m, allowed_lateness: 10s}
-    placement: {stage: collector, shards: 1}
-    transmission:
-      mode: delta
-      encoding: ddsketch-v1
-      schema_version: 1
-      emit_every: 10s
-      full_checkpoint_every: 1m
-      sequence_scope: materialization_window_producer
-    output: {endpoint_ref: asapquery-primary}
-```
-
-The materialization `id` above identifies the maintained summary definition.
-It is not the SID. During collection and ingest, each concrete canonical label
-set under that definition resolves to its own SID.
-
-### Catalog and query-serving output
-
-SummaryCatalog contains the canonical descriptor bindings. QueryPlan contains
-the consumer and query-serving projection of the same decision:
-
-| Output section | Required content | Consuming ASAPQuery-backend component |
-| --- | --- | --- |
-| SummaryCatalog | Canonical Summary and Data Descriptors plus stable materialization bindings | Catalog resolver and SummaryStore registry |
-| PrecomputePlan | Backend ingest/update placement, schemas, producers, windows, retention, and lifecycle | Ingest and precompute engines |
-| TransmissionPlan | Producer encoding, cadence, identity, sequencing, delta, and checkpoint rules | Collector transport and ingest validation |
-| QueryPlan | Materialization IDs, readout/operator DAG, grouping/window composition, guarantees, and explicit exact fallback | Query router and DAG executor |
-
-The backend declaration does not contain a pre-enumerated SID for every label
-value. It installs immutable metadata for the materialization; the ingest/SID
-resolver then binds each canonical materialized series to an SID and the store
-indexes its windows under that SID.
-
-### One decision, two component graphs
-
-```text
-CollectorPlan
-  -> plan validator
-  -> source matcher / collection router
-  -> windowed raw, exact-aggregation, or sketch state
-  -> full/delta encoder + SID dictionary
-  -> exporter
-
-SummaryCatalog + QueryPlan
-  -> plan installer
-  -> ingest validator / optional backend precompute
-  -> SID resolver + instance metadata
-  -> summary store
-  -> query route + readout / explicit exact fallback
-```
-
-Cross-plan validation proves that every Collector-produced materialization has
-one compatible backend ingest/storage declaration and that every planned query
-route references a declared materialization. A backend-only precompute has a
-PrecomputePlan producer but no Collector materialization; a raw pass-through has
-matching raw transmission and ingest/archive declarations.
-
-### Summary frame identity
-
-Until modified OTLP has dedicated identity fields, Collector attaches reserved
-data-point attributes under `asap.frame.*`: identity version, plan ID/version,
-backend compatibility, materialization and schema IDs, producer ID/epoch,
-canonical series identity, sequence, full/delta kind, encoding, and
-checkpoint/base IDs. Window start/end
-remain the typed data-point timestamps. The backend removes reserved attributes
-before building the series label key and rejects the complete request before
-writing any frame when one identity, schema, encoding, materialization, or
-payload does not match the active TransmissionPlan. HTTP 2xx / gRPC OK is the
-delivery acknowledgement. Retrying the same full frame is idempotent because
-the identity selects the same SID, label set, and window replacement; no second
-application-level ACK or transport WAL is part of this contract. Receiver
-lineage is scoped by plan/version, materialization, concrete series, producer,
-and producer epoch; sequence/checkpoint continuity crosses logical windows,
-while every frame still identifies its own window. Grouped frames retain labels;
-the singleton ungrouped series uses `<global>` as its identity. Exact retries
-are ignored idempotently; a missing base or sequence gap leaves the lineage
-incomplete until a newer full checkpoint arrives. Lineage receipts are not a
-second durable transport log: after backend restart the receiver safely rejects
-deltas until the producer supplies a new full checkpoint.
-
-The compiler error must identify an unsupported capability, invalid placement,
-window incompatibility, identity conflict, or invalid selected guarantee. It
-must not silently substitute another logical summary.
-
-Why this interface exists: one compile guarantees that producer and consumer
-receive the same family, parameters, grouping, window, and materialization
-identity.
-
-## 3. Adding and verifying functionality
-
-### Add a deployment topology
-
-1. Add a public `PhysicalDeploymentTarget` variant and its required target fields.
-2. Teach `DeploymentPlanCompiler::compile_promql` how selected operators can be placed on it.
-3. Reject plans requiring an unavailable stage/capability.
-4. Verify the output contains one complete CollectorPlan for every producer and
-   one SummaryCatalog and matching QueryPlan referencing all produced materializations.
-
-Interpretation: a successful bundle means both runtime views are complete and
-cross-consistent; it does not mean they have been activated.
-
-### Add a transmission mode
-
-1. Extend public `TransmissionPolicy` and capability declarations.
-2. Define representation, sequencing, checkpoint, and fallback requirements.
-3. Emit the same compatibility identity into producer and consumer plans.
-4. Verify unsupported endpoint combinations return a compile error.
-
-For delta, verify duplicate, missing, reordered, and recovery-checkpoint cases.
-
-### Add a window implementation
-
-1. Use an existing Planner-owned `SummaryWindowFramework`; new abstract
-   frameworks must first be added to Planner.
-2. Advertise an executor-feasible concrete implementation with complete,
-   fresh `DataWorkload` evidence.
-3. Prove its panes and state layout implement the framework and cover the
-   selected query-time range.
-4. Retain the concrete implementation identity in the physical plan and
-   materialization identity, never in Planner IR.
-5. Verify missing evidence and incompatible executor semantics fail closed.
-
-### Required output checks
-
-- deterministic inputs produce deterministic plan/materialization identities;
-- shared logical producers remain shared materializations;
-- every referenced materialization has a producer and backend declaration;
-- all query IDs remain traceable; and
-- unsupported inputs return structured errors, never partial bundles.
diff --git a/docs/developer_docs/control-plane/plan-publication.md b/docs/developer_docs/control-plane/plan-publication.md
deleted file mode 100644
index dfae73481..000000000
--- a/docs/developer_docs/control-plane/plan-publication.md
+++ /dev/null
@@ -1,98 +0,0 @@
-# MVP physical-plan publication
-
-This page describes the implemented MVP contract. The control plane compiles
-ASAPPlanner's selected post-ASAP IR once and projects that decision into one
-authoritative `SummaryCatalog`, matching Precompute, Transmission, and Query
-plans, plus one target-specific `CollectorPlan` per Collector.
-
-## API
-
-`POST /api/v1/physical-plan/compile-and-publish` accepts:
-
-- `queries`: query ID, PromQL, metric, window seconds, grouping labels, a
-  typed `AccuracyTarget`, and lifecycle evidence (evaluation interval,
-  ingestion rate/freshness, optimization horizon, and primitive state costs),
-  plus `window_cost_model` and `evaluation_phase_ms` with versioned,
-  workload-scoped physical cost evidence;
-- `collector_ids`: the required OpAMP agent IDs;
-- `capability_snapshot_id` and the exact `planner_revision`;
-- `plan_version`, activation/optional expiry timestamps, and the exact backend
-  compatibility identity;
-- optional per-query TopK evidence, with `max_evidence_age_ms`; and
-- `apply_timeout_ms` (default 10000).
-
-Unknown JSON fields, empty target/query sets, zero windows/timeouts, stale
-evidence, and a Planner revision mismatch are rejected. The response is only
-successful only after every target has applied the exact generated
-`(plan_id, plan_version)` and the backend activates that generation.
-
-The physical compiler passes normalized recurrence, data-arrival evidence,
-runtime capabilities, and complete implementation costs to ASAPPlanner's
-summary-maintenance lifecycle and abstract-window selection. It retains the
-concrete implementation identity corresponding to Planner's selected
-framework and copies both decisions into each Collector materialization.
-Missing, stale, or incomplete implementation evidence fails closed. For the
-current tumbling-window Collector runtime the executable commitment is
-`continuously_maintained / incremental / per_update / summary_state`; missing
-or stale lifecycle evidence, a non-tumbling selected framework, mismatched pane
-width, and any unexecutable lifecycle fail closed.
-
-## Installation order and failure semantics
-
-```text
-validate request and compile one bundle
-              |
-              v
-preflight every Collector capability
-              |
-              v
-POST one atomic SummaryCatalog + PrecomputePlan + TransmissionPlan + QueryPlan bundle (stage)
-              |
-              v
-publish target-specific CollectorPlans over OpAMP
-              |
-              v
-require exact (agent_id, plan_id, plan_version, APPLIED) from every target
-              |
-              v
-wait until activation and atomically activate backend snapshot
-```
-
-Preflight happens before staging. Publication repeats capability validation to
-close disconnect races. A missing backend endpoint, backend non-2xx, Collector
-disconnect, timeout, malformed report, wrong identity/version, incompatible
-schema, or `FAILED` status fails the request. A failed rollout leaves the
-previous active generation untouched; a staged generation never serves before
-explicit activation.
-
-## OpAMP custom capability
-
-The exact capability and message types shared with ASAPCollector are:
-
-| Field | Value |
-| --- | --- |
-| capability | `io.projectasap.collector-plan.v1` |
-| server-to-agent message type | `collector_plan` |
-| agent-to-server message type | `plan_status` |
-| payload encoding | UTF-8 JSON |
-
-`collector_plan` is the serialized `physical::compiler::CollectorPlan`. A
-status payload is strict JSON:
-
-```json
-{"plan_id": 42, "plan_version": 3, "status": "APPLIED", "error": null}
-```
-
-`status` is exactly `APPLIED` or `FAILED`. Transport/config acknowledgements
-are not accepted as semantic plan evidence. Reports are scoped to the agent ID
-of the WebSocket connection, preventing one Collector from acknowledging
-another Collector's plan.
-
-## Backend wire contract
-
-The authoritative SummaryCatalog snapshot is embedded with the typed PrecomputePlan,
-TransmissionPlan, CollectorPlans, and QueryPlan in `POST /api/v1/physical-plan`.
-The backend validates all shared
-identities, fingerprints, schemas, parameters, producers, and lifecycle fields
-before returning `staged`; `POST /api/v1/physical-plan/activate` performs the
-single immutable-snapshot swap.
diff --git a/docs/developer_docs/control-plane/planning-terminology.md b/docs/developer_docs/control-plane/planning-terminology.md
deleted file mode 100644
index b2076814b..000000000
--- a/docs/developer_docs/control-plane/planning-terminology.md
+++ /dev/null
@@ -1,178 +0,0 @@
-# Planning terminology and architecture
-
-Audience: developers changing planning inputs, pricing, publication, or runtime
-plan consumers. The [Chinese architecture review](architecture-naming-review.zh.md)
-records the reasoning and the original-to-proposed naming checklist for #709.
-
-```mermaid
-flowchart TB
-    subgraph CP[Control plane]
-        DTO["JSON / YAML compatibility input"]
-        NORMALIZE["Analyzer<br/>Validate and normalize once"]
-        WORKLOAD["ASAPPlanner QueryWorkload<br/>Query + requirements + recurrence + time selection"]
-        DATA["ASAPPlanner DataWorkload<br/>Arrival + rate + cardinality + evidence freshness"]
-        OPTIONS["DeploymentOptions<br/>Sketch constraint + retained labels + wire size + memory cap"]
-        REGISTRY["WorkloadStore<br/>Canonical workload + deployment options per metric and role"]
-        METRIC["Metric deployment planning and replanning<br/>Derive query metadata and fresh cost inputs"]
-        DTO --> NORMALIZE --> WORKLOAD
-        DATA --> WORKLOAD
-        WORKLOAD --> REGISTRY
-        OPTIONS --> REGISTRY
-        REGISTRY --> METRIC
-        INPUT["BackendLocalPlanningInput<br/>Workload demand + physical inputs + deployment context"]
-        LOGICAL["ASAPPlanner + selection adapter<br/>Legal semantic DAG selection"]
-        REQUEST["PhysicalCompilationRequest<br/>QueryCompilationInput + enabled materialization keys"]
-        WINDOWS["Generate window candidates<br/>Cadence + evaluation phase + WindowCostModel"]
-        COMPILE["DeploymentPlanCompiler<br/>Compile concrete candidate plans"]
-        MANIFEST["WorkloadCostManifest<br/>Component implementations and pricing basis"]
-        QUOTE["WorkloadQuote<br/>Provider feasibility and component prices"]
-        EVALUATE["CandidatePlanEvaluation<br/>Select the lowest-cost feasible enumerated candidate"]
-        SQL["ClickHouse SQL selection and binding<br/>Separate compilation path"]
-        PUBLICATION["PhysicalPlanPublication<br/>PhysicalPlanInstallRequest"]
-        WORKLOAD --> INPUT
-        INPUT --> LOGICAL --> REQUEST --> WINDOWS --> COMPILE --> MANIFEST
-        MANIFEST --> QUOTE --> EVALUATE --> PUBLICATION
-        SQL --> PUBLICATION
-    end
-    CONTRACT["Shared asap_types contracts<br/>SummaryCatalog + CollectorPlan + PrecomputePlan<br/>TransmissionPlan + QueryPlan + StorageRouting"]
-    subgraph DP[Data plane]
-        STAGE["Validate and stage RuntimePhysicalPlan"]
-        ACTIVE["Activate via ActivePhysicalPlanHandle<br/>One immutable generation for all readers"]
-        MAINTAIN["Ingest and precompute<br/>StreamingConfigHandle materialization view"]
-        QUERY["Execute installed query DAG<br/>Residual operators, bound reads, exact subqueries"]
-        STORE["Summary storage<br/>SummarySeriesMetadata + physical series state"]
-        STAGE --> ACTIVE
-        ACTIVE --> MAINTAIN --> STORE
-        ACTIVE --> QUERY --> STORE
-    end
-    PUBLICATION --> CONTRACT --> STAGE
-    PUBLICATION -->|OpAMP| COLLECTOR[ASAPCollector]
-    METRIC -->|Stage configuration via OpAMP| COLLECTOR
-    COLLECTOR -->|OTLP frames| MAINTAIN
-    RAW[Raw time-series samples] -->|Remote Write| MAINTAIN
-    QUERY -->|Exact execution or fallback| EXACT[Prometheus / VictoriaMetrics / ClickHouse]
-```
-
-SQL shares publication and runtime contracts; it does not currently use the
-time-series workload quote-selection path. Metric stage emission remains a
-separate deployment path, but its stored semantic input now uses the same Planner
-`QueryWorkload` and embedded `DataWorkload` types. `LegacyMetricWorkload` and its
-old `types::QueryWorkload` alias are deleted.
-
-## Domain boundaries
-
-| Value | Meaning |
-|---|---|
-| `QueryCompilationInput.selected_plan_root` | Selected semantic DAG root, including exact or mixed execution; not necessarily an approximate materialization |
-| `WindowRealizationCandidate` | One concrete window framework/layout choice, not a whole-workload candidate |
-| `PhysicalCompilationRequest.enabled_materialization_keys` | Optional candidate-key set: `None` enables all eligible keys; an empty set enables none |
-| `CompiledPhysicalPlan` | A complete compiled candidate; selection can attach a `CandidatePlanSelectionReport` to the same type |
-| `CostComponentDemand.pricing_basis` | Work priced per horizon or per query evaluation, not a currency/resource unit |
-| `occurrences_per_horizon` | Floating-point expected occurrences multiplying a component's unit quote |
-| `CandidatePlanEvaluation` | Diagnostic state throughout compilation and pricing, including failures and candidates awaiting quotes |
-| `LifecycleUnitCosts` | Both one-time costs and per-update/per-second costs; not exclusively rates |
-| `erp` | Error–Resource Profile planning inputs, including distribution evidence and matching policy |
-| `PhysicalDeploymentContext.target_collector_ids` | Every targeted collector receives a plan; this is not an eligibility pool |
-| `query_retention_margin_ms` | Extra retained history for lagging query evaluation; not a separate query-age rejection check |
-| `RuntimePhysicalPlan` | Immutable runtime representation, also used while staged and draining |
-| `ActivePhysicalPlanHandle` | Shared pointer to the currently active runtime generation |
-| `StreamingConfigHandle` | Legacy owned config or a view projected from the active runtime plan |
-| `SummarySeriesMetadata` | Metadata for a physical SID; distinct from a time-scoped SDS `SummaryInstance` |
-
-`SummaryDefinitionId`, `PolicyFingerprint`, descriptor IDs, physical SIDs,
-instance IDs, and catalog generations retain their distinct identities.
-Likewise, plan activation, materialization readiness, and instance completeness
-remain separate conditions. Retiring a drained plan marks lifecycle state; it
-does not perform storage garbage collection.
-
-## Compatibility transition
-
-New Rust names retain the previous JSON/YAML field names through explicit serde
-renames. New spellings are accepted as aliases where fields are deserialized.
-This preserves old consumers, exact manifest comparisons, and serialized
-identity inputs. Diagnostic enums retain their old string representations,
-including unknown strings and the missing-status default.
-
-Other old public type imports and selected method/function names remain deprecated
-forwarders. The flat workload type is removed without a compatibility alias. This does **not** preserve old Rust struct-literal field names;
-workspace callers migrate with the definitions. External Rust source consumers
-must update fields using the review's mapping before these compatibility
-imports are removed. No removal date is set until consumer migration is known.
-
-Wire names containing historical terms, such as `enumerated_local_masks`, are
-intentionally retained. New Rust set variables use candidate-key terminology.
-Candidate ordering, bounded coverage, strict-less-than tie handling, pricing,
-publication validation, and activation behavior are unchanged.
-
-## Scope of this migration
-
-The implementation clarifies planning/compiler types, candidate pricing and
-diagnostics, publication conversion, runtime generations, streaming views,
-series metadata, canonical workload registration, residual query operators, and the
-data-plane update-sampling module. Existing re-exports remain compatibility
-entrypoints rather than duplicate implementations.
-
-The review also identifies follow-up work that is intentionally separate:
-
-- Splitting the two `StreamingConfigHandle` modes and changing their write API.
-  Active-plan snapshots read the runtime plan; `swap` still affects only the
-  legacy backing slot. Plan activation changes authoritative active config.
-- Removing legacy stage planning/emission, or unifying SQL and time-series
-  candidate pricing.
-- Renaming the full `SketchStore` public type or redesigning `QueryPlan` as a
-  differently shaped execution catalog.
-- Changing window units, schema versions, identity encodings, or typed ID
-  ownership.
-
-These remain separate from the naming changes and the canonical workload migration.
-
-## Canonical workload registration
-
-`RegisteredWorkload` is a backend registration envelope, containing only the
-Planner `QueryWorkload` and `DeploymentOptions`. It does not store a parsed query
-or a second set of metric, accuracy, window, cadence or data-rate fields.
-`ParsedQuery` is an ephemeral adapter view; `WorkloadCharacteristics` is an input
-DTO and a transient cost projection. The cached planner obtains that projection
-from canonical evidence, and unavailable evidence skips rate-based cost selection.
-
-For this single-metric adapter, `input_cardinality` denotes active time series and
-`ingestion_rate` is the aggregate sample rate: 10 series at 5 Hz produces 50
-samples/s. Distinct item keys per flush remain a separate deployment estimate.
-Evidence provenance and freshness survive registry round trips. Unknown or stale
-facts do not become declared defaults. Batch data has `AtRest` arrival and no
-ongoing ingestion; repetition remains independent of arrival.
-
-Compatibility field-only inputs generate explicit queries: quantile uses
-`quantile_over_time(0.99, ...)`, cardinality uses `distinct_over_time(...)`, and
-frequency uses a temporal item count. Filter values are JSON-escaped before query
-parsing. Source and label identifiers must be accepted by the PromQL frontend.
-The old `group_by_labels` input also supplies collector retention labels; these
-are deployment options and do not introduce a query GROUP BY.
-
-The single-metric registration route accepts one query entry, one selector,
-equality filters, one-shot or fixed-interval demand, and supported real-time
-selection. It rejects conflicting query/field overrides, multi-selector input,
-regex or negative matching, offset/@, subqueries, `without`, unsupported cadence
-forms, historical time-selection metadata and unenforced dollar constraints.
-Cadences are checked before conversion to Planner milliseconds. The full query
-compilation APIs retain their broader query support.
-
-Both field-only and string requests bind from the registered canonical expression.
-Explicit typed accuracy, including epsilon and delta, remains authoritative;
-sketch choices remain physical constraints subject to legal binding. IDs and
-routing hints are retained as registration metadata.
-
-## Latest main integration
-
-Window candidates are generated after semantic DAG selection from cadence, evaluation
-phase and `WindowCostModel` quotes. Compiler provenance stays on each candidate
-(`derived` / `cohort_only`) and is not accepted from serialized input. The old
-external candidate/default-window fields and query-level provenance set are removed
-by upstream #712. Shared panes preserve cadence, phase and evaluation alignment.
-Publication includes storage routing derived from the selected physical plan (#713).
-The former `types_v2` definitions now live in `types` (#717). These upstream API
-removals also apply here; wire-name compatibility covers retained naming-only fields.
-
-Upstream #715 removes unused auto/Pareto planning and rollback/diff HTTP routes
-and their auxiliary modules. This integration retains those removals; canonical
-workload registration and replanning continue through the retained interfaces.
diff --git a/docs/developer_docs/control-plane/runtime-accuracy-feedback.md b/docs/developer_docs/control-plane/runtime-accuracy-feedback.md
deleted file mode 100644
index f619c4d84..000000000
--- a/docs/developer_docs/control-plane/runtime-accuracy-feedback.md
+++ /dev/null
@@ -1,25 +0,0 @@
-# Developing runtime accuracy feedback
-
-## Architecture
-
-Runtime samples and monitoring collect Collector/Backend application evidence,
-query accuracy/freshness/latency, and cost signals. The replanner validates and
-keys evidence to the exact plan/materialization/family/runtime versions before
-building a new workload/cost input.
-
-## Interfaces
-
-Feedback records need plan and materialization identity, SID lineage, family and
-parameters, query shape, labels/timestamps alignment summary, sample count,
-observed error/freshness/latency/resource values, collection time, and producer
-version. A violation event references the declared threshold and observed value.
-
-## Extension and verification
-
-New evidence requires a unit, aggregation rule, freshness rule, cardinality,
-privacy classification, and Planner consumer. Tests reject unattributed,
-stale, under-sampled, wrong-version, or incomparable evidence. Replanning tests
-verify a new plan version and fail-safe publication/rollback, not in-place
-mutation of an active SID.
-
-See [runtime feedback design](https://github.com/ProjectASAP/ASAPCollector/blob/main/docs/design_docs/control-plane/runtime-accuracy-feedback.md).
diff --git a/docs/developer_docs/control-plane/workload-inputs.md b/docs/developer_docs/control-plane/workload-inputs.md
deleted file mode 100644
index e51f7de82..000000000
--- a/docs/developer_docs/control-plane/workload-inputs.md
+++ /dev/null
@@ -1,24 +0,0 @@
-# Developing query and data workload inputs
-
-## Architecture
-
-The control-plane workload registry and analyzer normalize query registrations,
-runtime query demand, data statistics, deployment inventory, and planning
-horizon into ASAPPlanner input. Planner's workload model at commit `d31a566` is
-the semantic source; local code adapts transport and runtime evidence.
-
-## Interfaces
-
-An input snapshot includes query expression/normalized identity, recurrence,
-time scope, accuracy/freshness/latency requirements, data arrival/cardinality/
-distribution evidence, horizon, timestamp, and evidence version. Unknown fields
-remain explicit.
-
-## Extension and verification
-
-Adding an input requires provenance, freshness, tenant scope, serialization,
-and deterministic normalization. Tests cover one-time/recurring demand,
-historical/live data, unknown versus zero, stale evidence, duplicate
-registrations, and fixed-snapshot reproducibility.
-
-See [workload input design](https://github.com/ProjectASAP/ASAPCollector/blob/main/docs/design_docs/control-plane/workload-inputs.md).
diff --git a/docs/developer_docs/cross-component-adding-summary-family.md b/docs/developer_docs/cross-component-adding-summary-family.md
deleted file mode 100644
index 0f1e1b68d..000000000
--- a/docs/developer_docs/cross-component-adding-summary-family.md
+++ /dev/null
@@ -1,139 +0,0 @@
-# Adding a summary family
-
-> Interface status: cross-repository developer workflow. ASAPQuery-backend
-> implements runtime capabilities; ASAPPlanner and summary libraries own logical
-> semantics and algorithm guarantees.
-
-## 1. Code architecture
-
-```text
-ASAPPlanner public summary/readout types
-                  |
-                  v
-PhysicalCompiler capability match
-            /                 \
-CollectorPlan              SummaryCatalog + QueryPlan
-      |                           |
-ASAPCollector                 SummaryDecoder
-update + encode        ->     SummaryStore -> SummaryReader
-```
-
-A family is supported only when the same public semantic contract crosses all
-components. A decoder or enum variant by itself is not pipeline support.
-
-## 2. Public interfaces and definitions
-
-The following public structures must describe the same family/version:
-
-```rust
-pub struct SummaryCapability {
-    pub family: SummaryFamily,
-    pub algorithm: SummaryAlgorithm,
-    pub parameter_schema: ParameterSchema,
-    pub encodings: Vec<SummaryEncoding>,
-    pub operations: SummaryOperations,
-    pub readouts: Vec<ReadoutCapability>,
-    pub guarantee_kinds: Vec<GuaranteeKind>,
-}
-
-pub struct SummaryOperations {
-    pub update: bool,
-    pub merge: bool,
-    pub subtract: bool,
-    pub delete: bool,
-    pub full_state: bool,
-    pub delta_state: bool,
-}
-```
-
-```rust
-pub trait SummaryDecoder {
-    type Error;
-    fn decode(&self, request: OtlpMetricsRequest)
-        -> Result<Vec<ReceivedSummary>, Self::Error>;
-}
-
-pub trait SummaryStore {
-    type Error;
-    fn register(&self, contract: ValidatedMaterialization)
-        -> Result<MaterializationState, Self::Error>;
-    fn apply(&self, update: ValidatedSummary)
-        -> Result<StoreWriteResult, Self::Error>;
-}
-
-pub trait SummaryReader {
-    type Error;
-    fn read(
-        &self,
-        request: &QueryRequest,
-        route: &SummaryRoute,
-        catalog: &SummaryCatalog,
-        plan: &QueryPlan,
-    ) -> Result<SummaryReadout, Self::Error>;
-}
-```
-
-Definitions:
-
-| Interface | Input | Output |
-| --- | --- | --- |
-| Planner mapping | PromQL workload and constraints | Selected logical summary producer/readout and guarantee |
-| Capability | Family/algorithm/version | Supported parameters, encodings, operations, readouts, guarantees |
-| Decoder | OTLP request | Untrusted `ReceivedSummary` values |
-| Validator | Received summary + active plan | `ValidatedSummary` or structured error |
-| Store | Validated materialization/update | Lifecycle/write result |
-| Reader | Query + selected route + plan snapshot | Summary readout with coverage/guarantee |
-
-Why these interfaces exist: every stage can compare exact typed semantics and
-reject unsupported combinations instead of mapping a new family to a similar
-legacy one.
-
-## 3. Adding and verifying a family
-
-### Step 1: define logical semantics outside this repository
-
-Add the query mapping, readout, composability, and guarantee to ASAPPlanner.
-Add update/merge/encoding behavior and mathematical guarantee to the owning
-summary library. Record concrete PromQL examples.
-
-### Step 2: advertise runtime capability
-
-Add `SummaryCapability` values for collector and backend. Declare only the
-parameter ranges, encodings, operations, and readouts actually implemented.
-Verify the physical compiler rejects a candidate if either side lacks one
-required capability.
-
-### Step 3: ingest and store
-
-Implement decode to `ReceivedSummary`, validation to `ValidatedSummary`, and
-store application through public interfaces. Include family, algorithm,
-canonical parameters, encoding version, grouping, and window in compatibility
-identity.
-
-### Step 4: execute readout
-
-Implement `SummaryReader::read` for the Planner-selected readout. Preserve
-labels, timestamps, result type, logical coverage, and guarantee. Do not choose
-the family again from query text.
-
-### Step 5: interpret and verify output
-
-For a quantile family, an end-to-end example is:
-
-```promql
-quantile_over_time(0.95, request_duration_seconds[5m])
-```
-
-Verify:
-
-- output series align with exact results by labels and timestamps;
-- reported guarantee matches the selected parameterization;
-- errors satisfy the predeclared SLA over identical input;
-- full and delta state have equivalent query semantics when delta is claimed;
-- corrupt, mismatched, stale, gapped, or unsupported input returns a structured
-  failure and does not change queryable state; and
-- `QueryResponse.source`, plan/materialization IDs, coverage, and freshness
-  prove which implementation produced the answer.
-
-Unit tests for serialization are necessary but do not establish cross-repository
-support.
diff --git a/docs/developer_docs/data-structure-ownership-audit.md b/docs/developer_docs/data-structure-ownership-audit.md
deleted file mode 100644
index 807ca849c..000000000
--- a/docs/developer_docs/data-structure-ownership-audit.md
+++ /dev/null
@@ -1,37 +0,0 @@
-# Cross-component data-structure ownership audit
-
-Audience: developers changing the control-plane/data-plane boundary.
-
-This change makes two wire contracts shared without moving compiler or runtime
-behavior:
-
-- `control_plane::physical::publication::PhysicalPlanInstallRequest` is the
-  single typed install envelope. The control plane constructs it from a
-  validated `PhysicalPlanPublication`; the data plane deserializes and validates
-  the same type. Publication no longer serializes to dynamic JSON and inserts
-  runtime fields by name.
-- `asap_types::{AccuracyKind, AccuracyProfile}` owns the serialized accuracy
-  contract. Planner-parameter and installed-config derivation remain in their
-  owning components through small extension traits.
-
-The data-plane storage-routing classifier is now named `QueryOperatorShape`.
-It classifies operators such as `topk`, `rate`, and `quantile`; the control-plane
-`QueryShape` describes evaluation lifecycle (`one_shot`, `streaming`, or
-`periodic`). The distinct names prevent accidental cross-layer use.
-
-## Shared contracts and compatibility imports
-
-`QueryPlan`, `PrecomputePlan`, `TransmissionPlan`, `CollectorPlan`,
-`SummaryCatalog`, and the publication/install envelopes are now defined in
-`asap_types`. Control-plane modules retain compatibility re-exports; these are
-not independent DTO implementations. Selection and compilation stay in the
-control plane, while installation, ingestion, and query execution stay in the
-data plane. Shared contracts retain their validation methods.
-
-See [planning terminology](control-plane/planning-terminology.md) for the
-compiled-plan/runtime-plan distinction and the wire-preserving naming migration.
-
-Planner's `planner_types::workload::QueryLanguage` and backend
-`asap_types::QueryLanguage` also have different scopes. They should remain
-explicitly converted at compilation unless the Planner package adopts the
-backend wire enum; aliasing them locally would hide a semantic boundary.
diff --git a/docs/developer_docs/erp-process-validation.md b/docs/developer_docs/erp-process-validation.md
deleted file mode 100644
index 9950e1ea5..000000000
--- a/docs/developer_docs/erp-process-validation.md
+++ /dev/null
@@ -1,49 +0,0 @@
-# ERP-selected KLL process validation
-
-The process test in [erp_planning_process.rs](../../data_plane/tests/support/erp_planning_process.rs)
-checks observation → Planner selection → physical installation → raw ingestion →
-ASAP query execution. This is a correctness fixture, not an o11ybench performance
-result or a claim that empirical rank error is a probabilistic bound.
-
-The fixture measures the runtime KLL implementation at `k=32` and `k=128` using
-10 seeds and 99 quantiles. It records maximum observed tie-aware rank error and
-serialized retained state size. The observer fits a held-out stream; Planner
-selects parameters from the available measured profiles. The first run offers
-both profiles; the second offers only the larger profile. No preselected physical
-plan is supplied to the data-plane process.
-
-Both processes compile the startup planning snapshot and accept remote-write
-samples for two source series. Their value domains differ by 1000, making an
-accidental pooled result detectable. A health-only fallback server has no query
-handler. The test requires two labeled warm ASAP results, each within the declared
-rank-error target of 0.2.
-
-One verified run produced:
-
-| Available profiles | Selected k | Materialization ID | Returned values (a, b) |
-| --- | ---: | ---: | --- |
-| 32, 128 | 32 | 17085259479989488410 | 12, 1012 |
-| 128 | 128 | 81115169662305743 | 12, 1012 |
-
-The measured fixture errors were 0.03336 and 0.00496, respectively. The objective
-uses serialized-state byte-seconds; CPU terms are disabled because this fixture
-does not benchmark CPU. These measurements are test evidence, not a production
-ERP artifact distributed for unrelated workloads. The observer describes ranked
-key frequencies, not arbitrary numeric value spacing.
-
-Run:
-
-```sh
-cargo test -p data_plane --test asapquery_compatibility_process_e2e erp_planning_process -- --nocapture
-```
-
-`ERP_PLANNED` records candidate profiles, fitted observation, selected parameters,
-estimated costs, installed identity, and QueryPlan. `ERP_WARM` records the actual
-HTTP result and execution path. The evaluation workspace retains the captured
-run at `/mydata/erp-production-study/process-evidence.json`; this host-local path
-is not a repository fixture.
-
-Separate compiler and adapter tests cover ERP miss → theoretical sizing → exact
-fallback. This process test establishes two ERP hits; it does not claim a live
-online feedback service, general sketch-family accuracy calibration, or latency,
-CPU, and memory improvements over Prometheus.
diff --git a/docs/developer_docs/hll-cost-selected-victoriametrics-evaluation.md b/docs/developer_docs/hll-cost-selected-victoriametrics-evaluation.md
deleted file mode 100644
index 32319e8fa..000000000
--- a/docs/developer_docs/hll-cost-selected-victoriametrics-evaluation.md
+++ /dev/null
@@ -1,74 +0,0 @@
-# Cost-selected HLL evaluation against VictoriaMetrics
-
-A fresh evaluation of the control plane's selected HLL plan reduced query latency
-and CPU for one generated `distinct_over_time` workload. It did **not** reduce
-memory. This is a sensitivity experiment, not coverage of the original o11ybench
-queries.
-
-The input contains 1,440,040 samples: 40 series, one hour, 100 ms sampling. The
-query selects 28 held-out series:
-
-```promql
-distinct_over_time(data{label_0=~"g00000[3-9]"}[1h])
-```
-
-Calibration used separate hash populations and a predeclared HLL precision grid
-of 10, 12, and 14. The measured accuracy evidence admitted precision 12 for an
-empirical 5% relative-error target. This is not an epsilon-delta guarantee.
-Complete candidate CPU calibration included the backend and its external exact
-service. The ordinary control-plane compiler selected HLL precision 12 with an
-estimated cost of 14.478 CPU seconds versus 20.920 seconds for its exact
-alternative, for a demand of 60 query evaluations. The benchmark did not select
-the winner.
-
-An independent run installed that selected plan in fresh processes and compared
-it with a fresh native VictoriaMetrics v1.126.0 process:
-
-| Metric | ASAP backend + external VM | Native VM |
-| --- | ---: | ---: |
-| Median query latency | 13.174 ms | 62.564 ms |
-| Query CPU, 60 evaluations | 0.690 s | 13.790 s |
-| Full child-process lifecycle CPU (`wait4`) | 15.264 s | 16.735 s |
-| Query-phase RSS | 138.6 MB combined; 84.1 MB backend | 63.7 MB |
-| Observed process peak RSS | 182.2 MB backend; 72.1 MB external VM | 85.9 MB |
-| Result completeness | 28/28 series, 60/60 evaluations | Reference |
-| Maximum relative result error | 4.557% | Reference |
-
-All 60 selected-plan evaluations reported warm execution, without exact subtree
-RPCs. The latency improvement was 4.75×, query CPU about 20× lower, and combined
-finite-run lifecycle CPU 8.79% lower. Sum of separate process peaks is not a
-simultaneous deployment peak. SummaryStore reported 274,466 approximate resident
-bytes; that number is not a durable storage footprint.
-
-Both deployments used the same four CPU affinity cores in sequential quiet
-measurement windows. Result caches were disabled. Input visibility validation
-ran before workload queries and warmed data caches. All repetitions used the
-same evaluation timestamp; this does not measure moving windows, concurrent
-throughput, cold storage, or one hour of wall-clock residency. The ASAP
-configuration retained and ingested a complete external VM, whose CPU and memory
-are included above. Driver and separate correctness-oracle resources are
-excluded. The VM cache budget was 256 MiB, not a process RSS limit.
-
-## Reproduction artifacts
-
-The dataset is at
-`/mydata/univmon-benefit-study/datasets/100ms-1h-10g4m/`.
-The artifact root is `/mydata/univmon-benefit-study/`:
-
-- `distinct-revision-aligned-costed.json`: input to normal compiler selection.
-- `distinct-revision-aligned-selected.json`: selected plan, alternatives, costs,
-  catalog, and executable installation request.
-- `calibration-revision-aligned-cache-off/`: fresh candidate calibration.
-- `independent-cost-selected-cache-off/`: selected-plan independent execution.
-- `independent-native-cache-off/`: adjacent native baseline.
-- `HLL_SELECTED_RESULT.json`: machine-readable results and limitations.
-
-Export and runtime revision:
-`dd102e07fb274725edf9819ff202864878633d2d`.
-Planner revision: `7e7931b581f4941ad02e4c6d90d41f2e95b2d7fc`.
-Sketch library revision: `079ba44936bb74f7e0f4374936e8846266b35243`.
-The result artifact also records both executable digests and the input digest.
-Earlier measurements with mismatched candidate-export provenance remain in the
-artifact directory; they were not reused as cost quotes for this result.
-
-See [the calibration workflow](../../tools/o11y-execution/CALIBRATION.md).
diff --git a/docs/developer_docs/ingest-engine/ingest-engine.md b/docs/developer_docs/ingest-engine/ingest-engine.md
deleted file mode 100644
index ba64b903b..000000000
--- a/docs/developer_docs/ingest-engine/ingest-engine.md
+++ /dev/null
@@ -1,176 +0,0 @@
-# Developing OTLP summary ingestion
-
-> Interface status: target public API. OTLP decoding, SID resolution, and
-> summary handling exist; complete catalog and execution-plan validation is partial.
-
-## 1. Code architecture
-
-```text
-OTLP request
-    |
-    v
-SummaryDecoder -> SeriesIdentityResolver -> SummaryValidator
-                                              |
-                                              v
-                                      SummaryStateApplier
-                                              |
-                                              v
-                                         SummaryStore
-```
-
-Transport decoding is separate from semantic validation. No decoder is allowed
-to append directly to storage or choose a summary family.
-
-## 2. Public interfaces and definitions
-
-```rust
-pub trait SummaryDecoder {
-    type Error;
-    fn decode(&self, request: OtlpMetricsRequest)
-        -> Result<Vec<ReceivedSummary>, Self::Error>;
-}
-
-pub struct ReceivedSummary {
-    pub tenant: String,
-    pub resource: AttributeSet,
-    pub scope: InstrumentationScope,
-    pub metric_name: String,
-    pub attributes: AttributeSet,
-    pub source_timestamp: Timestamp,
-    pub envelope: SummaryEnvelope,
-}
-```
-
-`SummaryEnvelope` contains plan/materialization/producer/window identity,
-family/parameters/encoding, full-or-delta metadata, and payload bytes. Required
-identity cannot be inferred from metric-name suffixes.
-
-```rust
-pub struct SummaryEnvelope {
-    pub plan_id: String,
-    pub plan_version: u64,
-    pub materialization_id: String,
-    pub producer_id: String,
-    pub window: LogicalWindow,
-    pub family: SummaryFamily,
-    pub algorithm: SummaryAlgorithm,
-    pub parameters: SummaryParameters,
-    pub encoding: SummaryEncoding,
-    pub frame: SummaryFrame,
-    pub payload: Bytes,
-}
-
-pub enum SummaryFrame {
-    Full { checkpoint_id: String },
-    Delta {
-        base_checkpoint_id: String,
-        sequence: u64,
-    },
-}
-```
-
-```rust
-pub trait SeriesIdentityResolver {
-    type Error;
-    fn resolve(&self, key: CanonicalMaterializedSeriesKey)
-        -> Result<ResolvedSeries, Self::Error>;
-}
-```
-
-`SeriesId`, `SeriesIdNamespace`, `CanonicalMaterializedSeriesKey`, and `ResolvedSeries` have
-one public definition in
-[Summary storage and series identity](../summary-store-engine/implementation.md#sid-definition).
-
-```rust
-pub trait SummaryValidator {
-    type Error;
-    fn validate(
-        &self,
-        received: ReceivedSummary,
-        catalog: &SummaryCatalog,
-        precompute: &PrecomputePlan,
-        transmission: &TransmissionPlan,
-        series: ResolvedSeries,
-    ) -> Result<ValidatedSummary, Self::Error>;
-}
-
-pub trait SummaryStateApplier {
-    type Error;
-    fn apply(&self, summary: ValidatedSummary)
-        -> Result<IngestResult, Self::Error>;
-}
-
-pub struct ValidatedSummary {
-    pub received: ReceivedSummary,
-    pub series: ResolvedSeries,
-    pub materialization: ValidatedMaterialization,
-}
-
-pub struct ValidatedMaterialization {
-    pub plan_id: String,
-    pub plan_version: u64,
-    pub materialization_id: String,
-    pub compatibility_fingerprint: String,
-}
-
-pub struct IngestResult {
-    pub disposition: IngestDisposition,
-    pub plan_id: String,
-    pub materialization_id: String,
-    pub series_id: SeriesId,
-    pub window: LogicalWindow,
-    pub queryable_at: Option<Timestamp>,
-}
-
-pub enum IngestDisposition {
-    AppliedFull,
-    AppliedDelta,
-    Duplicate,
-    Rejected,
-    AwaitingCheckpoint,
-}
-```
-
-Supporting type definitions:
-
-| Type | Definition |
-| --- | --- |
-| `OtlpMetricsRequest` | Decoded public OTLP ExportMetricsServiceRequest. |
-| `AttributeSet` | Canonically typed OTel attributes with no identity-relevant loss. |
-| `InstrumentationScope` | OTel scope name/version/schema identifying the producer library. |
-| `LogicalWindow` | Start/end plus window identity used by plan, state, and query coverage. |
-| `SummaryEncoding` | Versioned state representation shared by collector/backend capabilities. |
-
-Why these interfaces exist: each stage can reject invalid data without changing
-queryable state, and `IngestResult` gives the MVP harness unambiguous evidence.
-
-## 3. Adding and verifying functionality
-
-### Add an OTLP summary encoding
-
-1. Extend public `SummaryEnvelope` encoding/version definitions.
-2. Implement `SummaryDecoder` without applying state.
-3. Add compatibility validation against SummaryCatalog, PrecomputePlan,
-   TransmissionPlan, and producer capabilities.
-4. Implement full/delta application through `SummaryStateApplier`.
-5. Verify corrupt bytes return an error and do not change storage.
-
-### Add a delta-capable family
-
-Define base/checkpoint, sequence scope, duplicate handling, gap behavior, and
-recovery full state. Verify `AppliedDelta`, `Duplicate`, and
-`AwaitingCheckpoint` are distinguishable outputs for reorder/gap tests.
-
-### Add series identity behavior
-
-Add canonical input fields to `CanonicalMaterializedSeriesKey`, never to `SeriesId.value`
-alone. Verify label-order independence, tenant isolation, cached-ID conflict
-recovery, and stable namespace reporting.
-
-### Interpret and verify output
-
-- `Applied*` means compatible state was committed.
-- `Duplicate` means idempotent replay with no second mutation.
-- `AwaitingCheckpoint` means a visible delta gap and non-queryable state.
-- `queryable_at` is populated only when coverage/readiness is satisfied.
-- Freshness uses `source_timestamp -> queryable_at`, not receive time.
diff --git a/docs/developer_docs/planning/repeated-dashboard-panes.md b/docs/developer_docs/planning/repeated-dashboard-panes.md
deleted file mode 100644
index 36827f25b..000000000
--- a/docs/developer_docs/planning/repeated-dashboard-panes.md
+++ /dev/null
@@ -1,86 +0,0 @@
-# Repeated dashboard window planning
-
-Snapshot and HTTP planning use one `window_cost_model` input with an
-`implementation_id`, an implementation-cost metadata template (`cost`), and
-optional measured `quotes`. HTTP queries also declare `evaluation_phase_ms`;
-snapshots obtain it from the canonical workload's `fixed_interval_at` demand.
-The former snapshot `window_candidates` and HTTP `window_implementations` inputs
-are removed. There are no compatibility aliases. The snapshot's former
-`window_implementation_id` and `implementation_cost` move under the model as
-`implementation_id` and `cost` respectively.
-
-After logical selection, the compiler collects each maintained state's window
-and executor constraints. It generates feasible layouts before pricing them.
-Raw states offer `Pane { gcd(W,E) }` and, when distinct and supported, complete
-windows advancing every E. A derived maintenance cohort and its sources offer
-only the full, nonoverlapping cohort supported by that executor. Queries keep
-their original W, E and evaluation phase regardless of storage representation.
-Each state selects only candidates meeting its own requirements.
-
-Measured quotes carry their workload fingerprint and exact window, slide and
-layout. They replace the corresponding generated quote, or offer another legal
-pane width, without bypassing capability checks. Serialization does not confer
-compiler provenance: incoming quotes are always measured/provider evidence.
-Unquoted layouts use supplied lifecycle unit costs multiplied by structural
-counts. Layout changes never inherit another layout's measured scalar cost.
-Workload-versus-exact deployment evidence is still required by snapshot version 3.
-
-Temporal requirements are derived from PromQL. A range selector supplies its
-own readout window; each rangeless source uses required
-`implementation.scrape_interval_ms` before enclosing offsets and subqueries
-are added. Branches, including concatenations, contribute their maximum history.
-For example, with a 5-second cadence, `sum(a offset 1h)` needs 3605 seconds,
-and `avg_over_time((sum(a))[6h:])` needs 21605 seconds. A ranged source keeps
-its explicit window even when it is shorter than the scrape cadence.
-
-This is the backend-local cadence-based planning contract, not Prometheus's
-[instant-selector lookback delta](https://prometheus.io/docs/prometheus/latest/querying/basics/#staleness)
-(which defaults to five minutes and governs selection of the latest non-stale sample). Scrape cadence does not configure
-that Prometheus setting or provide its staleness semantics.
-
-Non-null snapshot `time_selection.lookback` is rejected because it duplicates
-and can conflict with query semantics; omission and `null` are accepted.
-The backend stores window widths in seconds, so fractional-second ranges and
-offsets are rejected explicitly rather than rounded down.
-
-A subquery or positive offset extends only the furthest lookback: evaluated at
-`t`, `a[1m] offset 1h` selects `(t - 61m, t - 60m]`, not a continuous
-61-minute interval.
-
-## Cases
-
-All ranges below use PromQL's `(start,end]` convention. W is the lookback and E
-is the query evaluation interval, both in seconds. Origins are zero unless stated.
-
-| Case | Query demand | Storage and behavior |
-|---|---|---|
-| 1. E divides W | W=60, E=20 | 20s panes: at 60 read `(0,20]+(20,40]+(40,60]`; at 80 read `(20,40]+(40,60]+(60,80]`. Complete windows are a separately priced alternative. |
-| 2. E does not divide W | W=60, E=45 | 15s panes: at 90 read `(30,45]+(45,60]+(60,75]+(75,90]`. A 60s tumbling fallback cannot answer this boundary. |
-| 3. E equals W | W=60, E=60 | One 60s pane per read: `(0,60]`, then `(60,120]`. |
-| 4. E is a larger multiple | W=60, E=120 | 60s panes answer `(60,120]` and `(180,240]`. Query cadence stays 120s. Some continuously stored panes are unused. |
-| 5. E is larger, not a multiple | W=60, E=90 | 30s panes answer `(30,60]+(60,90]`, then `(120,150]+(150,180]`. Complete windows may alternatively skip the gaps. |
-| 6. Shifted demand | W=60, E=20, phase=5 | At 65 read `(5,25]+(25,45]+(45,65]`. Phase is part of the physical state identity. |
-| 7. Ad hoc off-grid read | W=60, 20s epoch panes, evaluation=67 | `(7,67]` cannot be tiled; serving returns a capability miss for exact fallback. It never rounds the requested interval. |
-| 8. Cross-query reuse | A: W=60/E=20; B: W=90/E=30 | Compare independent 20s/30s panes with one 10s producer. A merges 6 instead of 3 panes, B merges 9 instead of 3. Share only when the saved maintenance outweighs extra build, retention and read costs. |
-| 9. Pane larger than E | W=60, E=20, proposed pane=30 | Illegal: it answers at 60 but cannot tile `(20,80]`. Hierarchical rollups remain unsupported and are rejected. |
-| 10. Executor restrictions | Collector or derived cohort | Collectors exclude partial-window panes and unsupported sparse full-window schedules. Derived maintenance keeps its required full cohorts. Unsupported backend-local leaves or off-grid reads use exact fallback; an unsupported strict Collector plan is rejected. |
-| 11. Measured costs | 20s pane costs 8; complete window costs 12 | Select the cheaper feasible quote. Rewriting into a shared 10s producer cannot reuse the measured cost 8. Explicitly quoted selected producers are protected from automatic repricing. |
-
-Runtime layouts currently have whole-second precision. Fractional cadences are
-not rounded: automatic backend-local planning leaves them to exact execution.
-The integer cases above preserve E even when E exceeds W.
-
-## Serving and verification
-
-Bindings distinguish disjoint pane width from complete-window slide. Pane reads
-require both boundaries on the pane grid. Complete-window reads require exactly
-one window of width W, starting on its slide grid; the compiler converts the
-query's end phase to the corresponding start phase. Sketch overlap lookup is
-restricted to that window's end, so neighboring overlapping states are not merged.
-Missing/open panes and unaligned boundaries remain capability misses. Sparse
-series are not assumed to contain empty zero-valued panes without evidence.
-
-Tests cover the five cadence relations, shifted phases, runtime bucket assignment,
-raw-sample sums, off-grid misses, costed sharing, measured quotes and target
-capabilities. The process dashboard test derives 5s panes from a 5s cadence for
-10s lookbacks; it no longer injects a fabricated zero-cost candidate.
diff --git a/docs/developer_docs/planning/shared-window-panes.md b/docs/developer_docs/planning/shared-window-panes.md
deleted file mode 100644
index d2e0fe0b6..000000000
--- a/docs/developer_docs/planning/shared-window-panes.md
+++ /dev/null
@@ -1,38 +0,0 @@
-# Shared additive window panes
-
-The compiler generates and prices layouts from selected state requirements.
-See [window planning](repeated-dashboard-panes.md) for the input contract and all
-cadence examples.
-
-After individual layout selection, backend-local raw SUM producers may share a
-common-divisor pane. Compatibility preserves source, population predicate,
-projection, accumulator parameters, grouping, partitioning, runtime policy,
-accuracy and lifecycle unit-cost evidence. Evaluation intervals may differ;
-each consumer's reads are charged at its own interval. Origins must agree modulo
-the proposed common pane width.
-
-The optimizer compares the original producers with one producer at the common
-pane width, retained for the longest lookback. It recalculates build, maintenance,
-retention, retirement and read costs for the new layout. Only a finite, strictly
-cheaper group is installed. Derived maintenance inputs, explicitly quoted selected
-layouts, non-additive states and independently selected complete-window layouts
-are not rewritten. This is a bounded comparison of selected panes, not exhaustive
-search over all layouts or hierarchical rollups.
-
-The shared state's physical window is one pane. Logical readout windows remain
-on the QueryPlan bindings. For `sum_over_time(a[1m]) / sum_over_time(a[10m])`
-evaluated every minute, one 60s producer retains 11 published states, while its
-readouts merge one and ten panes. For separate 60s/20s and 90s/30s demands, a
-10s shared producer may win when maintenance is expensive; independent producers
-remain when the extra reads or pane creation cost more.
-
-Costs include published retained states and open worker accumulators. Complete
-windows have at most `ceil(W/E)` open states; their rate-model average update
-fanout is `W/E`, including sparse schedules. Pane producers have one active state.
-These are supplied unit costs and structural estimates, not measurements.
-
-If the entire compatibility group cannot share, the optimizer selects profitable
-phase-compatible pairs, ordered by savings, and retries the remaining members.
-An incompatible or expensive fine-cadence consumer therefore does not block reuse
-between other consumers. This deterministic greedy selection does not claim a
-globally optimal partition of all workload states.
diff --git a/docs/developer_docs/precomputation-replay.md b/docs/developer_docs/precomputation-replay.md
deleted file mode 100644
index c3d7668b0..000000000
--- a/docs/developer_docs/precomputation-replay.md
+++ /dev/null
@@ -1,44 +0,0 @@
-# Precomputation publication and recovery
-
-Ingestion accepts source data; precomputation executes the installed Physical
-DAG and publishes stored results. Planner defines computation and permitted
-update behavior. Backend binds inputs, enforces correction and retention limits,
-and persists results under the installed SDS identities.
-
-## Continuous local ingestion
-
-With `--remote-write-revision-dir`, Backend checkpoints accepted Remote Write
-input and evaluates the selected precomputation DAG against a fixed input
-revision. Late input within the correction horizon produces a replacement
-revision, not an additive replay of the complete result. Out-of-range requests
-are rejected before admission.
-
-Outputs can publish independently. Queries pin a common eligible snapshot across
-all required outputs and range steps. If one branch has r2 and another is still
-at r1, the query may read common r1 while it satisfies freshness. It must not mix
-incompatible revisions. Same-version recovery restores input history and committed
-outputs; a new plan version needs its own warm-up.
-
-See [continuous input and recovery](../design_docs/precompute-dag-execution.md#continuous-local-input-revision-snapshots)
-for configuration, publication rules and acceptance cases. This local-input path
-does not require an external producer/partition watermark protocol.
-
-## Finite input
-
-Without continuous revision configuration, `POST /api/v1/write` acknowledges
-queue admission; it does not prove durable publication or input completion.
-`POST /api/v1/precompute/drain` closes the finite receiver, waits for admitted
-work and durably publishes the required outputs before sealing completion.
-A failed drain must be retried; it cannot authorize derived output publication.
-The recovered same-generation checkpoint rejects further input after closure.
-Drain cannot seal a continuously revisable input.
-
-The finite output writer records input lineage and payload identity, writes a
-part, commits its manifest entry, then advances completion. Recovery resumes a
-matching durable pending publication before recomputing randomized state.
-Conflicting lineage cannot reuse equal bytes. Missing retained inputs or durable
-payload fail explicitly; in-memory retry receipts are not durable proof.
-
-See the [E2E walkthrough](../evaluation/e2e-physical-dag.md) for commands and
-installed artifacts. External producer watermark coordination is a separate
-input contract, not an inference from flush timers or observed timestamps.
diff --git a/docs/developer_docs/query-engine/catalog-physical-plan-runtime.md b/docs/developer_docs/query-engine/catalog-physical-plan-runtime.md
deleted file mode 100644
index 890ae627f..000000000
--- a/docs/developer_docs/query-engine/catalog-physical-plan-runtime.md
+++ /dev/null
@@ -1,54 +0,0 @@
-# Catalog-backed physical-plan installation
-
-`BackendPlan` and its standalone protobuf and installation endpoint have been
-removed. The backend now stages and atomically activates one physical-plan
-envelope containing the authoritative `SummaryCatalog` snapshot plus the
-`PrecomputePlan`, optional `CollectorPlan`, `TransmissionPlan`, and `QueryPlan`
-that reference installed stored outputs and their semantic definitions.
-
-Catalog schema 6 separates `StoredOutputId` (deployment routing) from
-`SummaryDefinitionId` (versioned semantic SHA-256). `StoredOutputReference`
-binds both. Planner exports the persisted output's typed semantic dependency
-closure; explicit raw summary configurations use a restricted typed description.
-Derived outputs require the complete Planner closure at installation.
-
-Writes must match the installed output's operator and format. Durable metadata
-records both identities and the immutable catalog snapshot. Recovery validates
-that snapshot before restoring authoritative state. Only the current metadata
-schema is accepted. Unsupported versions, flat-map sidecars, corrupt metadata,
-obsolete identity aliases, and untyped projection encodings are rejected. There
-is no automatic format migration or cross-version state-adoption path. Rebuild
-unsupported persisted state using the installed plan.
-
-See [SDS architecture](../../design_docs/summary-catalog-sds-architecture.md)
-for the contract and [migration gates](../../design_docs/asapplanner-migration-plan.md#5-bound-query-sds-implementation-across-the-pr-stack)
-for the downstream acceptance requirements. Ad-hoc discovery is not implemented.
-The HTTP lifecycle is exposed through `/api/v1/physical-plan`,
-`/api/v1/physical-plan/activate`, `/api/v1/physical-plan/discard`, and
-`/api/v1/physical-plan/status`.
-
-## Foundation scope (#749)
-
-This branch validates that maintenance and query plans belong to one installed
-catalog generation, retain the selected DAG provenance, and agree on writer/read
-bindings and physical windows. It removes the Collector runtime dependency.
-
-#749 establishes the SDS identity contract. Planner-generated definitions contain
-an explicit logical dataset/tenant identity and the canonical typed dependency
-closure of the persisted output. Endpoint relocation preserves this identity;
-a different dataset changes it even when the metric and expression are equal.
-The installed input binding must agree with the exported dataset identity.
-
-Semantic definition IDs and deployed output IDs are independent. Hot and rebuild
-outputs can share one definition, but an installed query reads only its selected
-output. Catalog schema 6 and planning snapshot schema 3 reject older metadata
-rather than inventing a missing semantic identity. Later runtime PRs consume this
-contract; they do not replace its identity model.
-
-Recovery at this stage is limited to the same installed catalog generation.
-Installing a new plan version never adopts previous-version state, even for an
-unchanged definition. New input must populate that version before it can serve
-accelerated results; the query follows its installed fallback/unavailability
-policy while cold. Fresh writes allocate a new physical series instead of using
-the previous generation's completed series, both after restart and during live
-activation. Cross-version adoption metadata is rejected.
diff --git a/docs/developer_docs/query-engine/clickhouse-sql-support.md b/docs/developer_docs/query-engine/clickhouse-sql-support.md
deleted file mode 100644
index 919bf94ab..000000000
--- a/docs/developer_docs/query-engine/clickhouse-sql-support.md
+++ /dev/null
@@ -1,175 +0,0 @@
-# ClickHouse SQL support
-
-Audience: developers extending the ClickHouse protocol adapter, SQL planning,
-or the shared physical-plan runtime.
-
-ASAPQuery exposes an optional ClickHouse-compatible HTTP listener. The listener
-accepts ClickHouse GET and raw POST queries, preserves ClickHouse response
-formats, and routes unsupported or unavailable accelerated plans to the exact
-ClickHouse endpoint.
-
-## Ownership and publication
-
-ClickHouse does not have a separate plan catalog or activation lifecycle. The
-control plane lowers SQL through ASAPPlanner, compiles the selected post-ASAP
-DAG into a language-tagged `QueryPlanEntry`, and publishes it in the same
-`PhysicalPlanInstallRequest` as the SummaryCatalog, PrecomputePlan,
-TransmissionPlan, and PromQL or MetricsQL entries.
-
-```text
-ASAPPlanner SQL frontend
-          |
-          v
-QueryPlanEntry { language: click_house_sql, DAG, fixed evaluation range }
-          |
-          v
-PhysicalPlanInstallRequest
-  SummaryCatalog + PrecomputePlan + TransmissionPlan + QueryPlan
-          |
-          v
-one stage / one activate / one ActivePhysicalPlan snapshot
-          |
-          +-- PromQL and MetricsQL lookup
-          `-- ClickHouse SQL lookup and typed table encoding
-```
-
-`QueryPlan::catalog_key` namespaces non-PromQL identities, so equivalent
-canonical identities from different languages cannot overwrite each other.
-Every SQL summary leaf uses the normal `MaterializationBinding`. Installation
-therefore validates the materialization ID, descriptor references, physical
-pane duration, and `pane_origin_ms` through the authoritative SummaryCatalog.
-Any invalid SQL entry rejects the complete candidate snapshot before
-activation; the active generation remains unchanged.
-
-SQL compilation also retains the selected Planner semantic DAG in
-`PrecomputePlan.executable_dags`. The compiler records materialization and query
-node bindings during lowering and assigns phases with the same placement builder
-as PromQL. Planner node IDs remain distinct from SummaryDefinitionId and
-QueryNodeId. This preserves the actual selected DAG across publication instead
-of reconstructing it from materialization configs later.
-
-The query listener snapshots `HotReloadActivePhysicalPlan` once per request.
-It uses the SQL parsing context and the matching `QueryPlanEntry` from that
-same snapshot, reads SummaryStore state, executes relational operators, and
-encodes the requested ClickHouse format. It does not replan, choose a different
-summary, or maintain a cloned executable catalog.
-
-## HTTP surfaces
-
-`POST /api/v1/clickhouse-plan/automatic/compile-and-publish` accepts a plan
-`envelope`, typed `tables`, `accuracy`, and `queries` (SQL plus fixed start/end
-milliseconds and cumulative-readout policy). It accepts no preselected family,
-materialization, or catalog. The control plane plans each query once and derives
-materializations only for supported SummaryAgg nodes in that selected DAG, then
-publishes the shared catalog and both execution plans through the normal atomic
-install/activate path.
-
-The initial automatic binder supports bounded, whole-second scalar reductions
-over a numeric value column — `Float64` or `Int64`, nullable or not — or a
-finite numeric literal, plus typed table predicates. The column's declared type
-and nullability travel with the materialization (`value_source_column`) because
-the ingest reader needs them: a nullable column is read with `IS NOT NULL`, so
-the summary skips NULL inputs exactly as the SQL aggregate it stands in for
-does, and an `Int64` column is widened explicitly with a guard that fails the
-read on a value beyond the exact `Float64` range rather than summarising a
-rounded one. Typing is a read concern, not an identity one, so it stays out of
-the policy fingerprint. Row counts use the shared typed constant `1` projection. It uses the query's fixed
-window as the materialization duration; this is not a cost-optimized pane/layout
-search. The initial fixed-window policy retains two windows (a completed window
-and the next active window); it does not certify arbitrary historical or moving
-window coverage. Empty, reversed, and out-of-range evaluation intervals are
-rejected before automatic planning. Grouped table projections, complex table
-types, and arbitrary boundary fragments remain unsupported here. Such inputs
-must not be presented as accelerated workload coverage.
-
-SQL `count(*)` now installs an exact row-count materialization through the same
-catalog and readout DAG as other summaries. The selected Count intent uses the
-existing physical SUM accumulator over typed constant `1`. It includes rows with a NULL value column.
-Planner rejects nullable `count(value)` until per-aggregate null exclusion is
-represented; it must not silently become row count. Non-numeric named sources
-are rejected: a string, boolean or timestamp column has no value semantics to
-summarise. Producer `Project` subtrees are also rejected until their
-computation is executed, rather than skipped while binding the original table.
-The real process test covers SUM and row count mixed with a ClickHouse exact
-branch, and deletes a source row after materialization to prove summary readout.
-
-The response includes `selection_trace` from the same Planner search: candidate
-strategy, rationale, ranking, selected flag, and estimated cost when available.
-The current SQL cost model uses relative ranking and may not report a numeric
-cost; those entries carry `null` and `not_reported_by_cost_model`, not zero.
-The selected DAG, exact branches, and installed materialization IDs remain in
-the publication. The real mixed process regression optionally writes both
-publication and trace to `CLICKHOUSE_PLANNING_ARTIFACT`.
-
-Physical backend conversion preserves the selected window duration instead of
-inheriting the legacy edge emitter's 5–60 second clamp. It also takes the query
-language explicitly so SQL half-open intervals cannot acquire PromQL's
-right-closed range flag merely because both ingest raw samples.
-
-The data-plane listener supports `/`, `/ping`, and standard ClickHouse query
-parameters. Configure it with:
-
-- `ASAP_CLICKHOUSE_HTTP_PORT`
-- `ASAP_CLICKHOUSE_URL`
-- `ASAP_CLICKHOUSE_DATABASE`
-
-The control plane exposes
-`POST /api/v1/clickhouse-plan/compile-and-publish`. That endpoint compiles a SQL
-workload and uses the ordinary physical-plan stage and activate endpoints. The
-data plane has no ClickHouse-specific stage or activate endpoints and no SQL
-plan token or startup sidecar bundle.
-
-## Execution and fallback
-
-The accelerated path supports the relational operations represented by the
-shared executable DAG, including summary readout, filter, project, arithmetic,
-sort, and limit. Results are encoded as `TabSeparated`, `JSONEachRow`, or
-`JSON` without converting through Prometheus result types.
-
-Catalog misses, SQL canonicalization failures, unsupported formats, incomplete
-pane coverage, and execution errors fail closed to exact ClickHouse. The proxy
-preserves the upstream status, safe headers, and response body.
-
-ClickHouse can also provide samples to the queued backfill service through the
-typed `ClickHouse { database, table }` source. Backfill populates the same
-SummaryStore instances used by other ingest sources; it does not introduce a
-second storage or catalog lifecycle.
-
-SQL materializations can carry a shared `TablePopulation` conjunction of typed
-column/literal comparisons. Its canonical identity is stored in the catalog and
-included in the materialization fingerprint together with table and value-column
-identity. These predicates do not use the PromQL label-filter normalizer. The
-reader takes its value projection and population from the installed materialization,
-binds literal values as ClickHouse parameters, and accepts either encoded series
-labels or a `Map(String,String)` label column. The requested database/table must
-match the deployment and installed source respectively.
-An absent or empty table population means every row in the table's time interval;
-the output metric name never becomes an implicit SQL predicate. Table sources
-reject legacy PromQL spatial filters.
-
-The installed `table_timestamp_column` names a Unix-millisecond column and is
-shared as `DataDescriptor.timestamp_column`. It enters both identities and is
-checked against the Planner source schema's `time_index`. Backfill uses this
-installed projection even when the deployment default names a different column.
-Legacy table definitions without a timestamp projection cannot be bound or
-backfilled; republish them with the explicit column. Time-series definitions
-retain their existing timestamp semantics and identity.
-SQL fingerprints now include the explicit table/value source, so existing SQL
-materializations must be republished and rebuilt; their old state is not reused
-under the new identity. Legacy PromQL fingerprints remain unchanged.
-
-SQL timestamp comparisons retain their exact integer-millisecond inclusivity.
-For example, `t <= 1999` and `t < 2000` identify the same half-open interval;
-`t <= 2000` does not. A source range differing from the installed fixed evaluation
-is rejected. Whole-second panes cannot yet cover an arbitrary inclusive boundary
-fragment; those queries require exact fallback until the compiler can compose
-boundary exact reads with summary interiors. Backfill still buffers a requested
-window and has not demonstrated bounded memory at large window/cardinality scale.
-
-## Verification
-
-Focused tests cover language-isolated lookup, atomic install rejection for an
-invalid SQL binding, SummaryStore readout through relational operators, typed
-encoding, incomplete-coverage fallback, exact proxy behavior, and the optional
-ClickHouse backfill reader. The differential integration test runs when
-`CLICKHOUSE_URL` points to a real ClickHouse server.
diff --git a/docs/developer_docs/query-engine/current-series-aggregations.md b/docs/developer_docs/query-engine/current-series-aggregations.md
deleted file mode 100644
index 77fda0b7f..000000000
--- a/docs/developer_docs/query-engine/current-series-aggregations.md
+++ /dev/null
@@ -1,92 +0,0 @@
-# Shared current-series quantiles and TopK
-
-Backend-local PromQL workload compilation can export a maintained current-value
-alternative for `quantile(q, metric)` and `topk(k, metric)`, including `by` and
-`without` grouping and selector label matchers. Parameters must be finite scalar
-literals. Selector offsets, `@`, nested input expressions and MetricsQL use the
-existing alternatives; they are not admitted by this implementation.
-
-ASAPPlanner owns this transformation through the opt-in `MaintainedPopulationStrategy`
-over canonical IR. It emits `MaintainPopulation` at maintenance time and
-`ReadPopulation` at read time, with source/filter/group identity, quantile
-consumers and the maximum requested k in its typed contract. Compatible producers
-are shared by Planner CSE. The backend consumes these nodes, binds resource and
-input-lag limits, and retains the Planner DAG in the installed plan. It does not
-recognize this optimization by reparsing the query text. Other deployments must
-opt in only when they can implement and price this maintenance contract.
-
-For example, put p50, p90, p95, p99 and Top1/Top5 in one workload. Matching source,
-selector and grouping contracts produce one `CurrentSeries` population with
-`quantiles: true` and `max_k: 5`. Each registered query keeps its own readout.
-Different sources, filters and groupings remain distinct. This state is exact:
-it retains each series' current value in a shared ordered population, rather than
-inserting all historical observations into a quantile sketch. Its memory grows
-with series cardinality, even when only Top1 is requested. Those excluded series
-are required to promote the correct replacement when a winner decreases or expires.
-
-Accepted Remote Write batches update the state atomically under its lock. A newer
-sample replaces the old value; stale markers remove the value. Older updates do
-not resurrect a newer stale marker. Per-group readout arrays are shared until that
-group changes. TopK-only populations cache just the largest registered k results;
-quantile consumers also share an ordered value array.
-
-Deployment uses complete workload quotes. The manifest deduplicates population
-build, update, residency and retirement components across consumers and prices
-individual readouts separately. Exporting a candidate does not establish a speedup.
-A native exact alternative remains available for cost selection and execution fallback.
-
-## Runtime coverage
-
-- This implementation serves current evaluations, using Prometheus' default
-  five-minute selector lookback. It requires a complete Remote Write feed for
-  each registered metric; the producer must not omit matching series.
-- It waits for five minutes of observed input coverage. Event-time gaps exceeding
-  the installed input-lag bound restart this warmup. The bound comes from the
-  declared sample interval plus staleness margin (60 seconds when unspecified).
-- Input lag, historical evaluations, reads before already-expired state, an
-  unobserved generation or exceeded resource bounds cause native fallback.
-- State is in memory. Restart and generation replacement require warmup again;
-  historical range queries continue to use native execution.
-- Populations divide the configured retained-summary memory budget and cap series
-  cardinality. Bounds include conservative space for labels, trees and caches.
-  The existing Remote Write adapter accepts finite sample values and stale markers.
-
-`/metrics` exposes `asap_current_series_populations` and
-`asap_current_series_cache_builds_total` to verify reuse. These describe the active
-in-memory population generation; they are not window-sketch materialization counts.
-
-## Validation
-
-Run the compiler regression and state tests, then the process acceptance test:
-
-```sh
-cargo +1.98.0 test --locked -p control_plane --lib current_series_quantiles_and_topk
-cargo +1.98.0 test --locked -p data_plane --lib current_series
-cargo +1.98.0 test --locked -p data_plane --test asapquery_compatibility_process_e2e current_series_quantiles_topk
-```
-
-For differential validation, set `ASAP_CURRENT_SERIES_PROMETHEUS_URL` to a **fresh**
-Prometheus instance with `--web.enable-remote-write-receiver`, then run the process
-test. It writes the same samples to both services and compares values and labels
-for quantiles and TopK, including value replacement and staleness. Test quotes are
-synthetic and must not be used as performance evidence.
-
-The Planner population IR also represents table-row multisets. They share the
-aggregate rule and readout vocabulary with current-series populations, but not
-the membership contract. The backend remote-write executor admits only the
-current-series variant; explicitly selected table-row state returns a capability
-error until a row-update/deletion executor is available. Existing SQL window
-summary compilation remains independent of this capability.
-
-The generalization is covered by six SQL frontend tests in Planner (quantiles,
-scalar readouts, TopK limits, grouping, filters and invalid value columns), backend
-capability rejection, and the current-series process test against Prometheus 3.5.
-The UnivMon process test also installs one shared materialization for distinct,
-frequency L2 and entropy with identical input/window/parameters, checks all three
-readouts against held-out raw values, and checks readout-specific missing-evidence
-fallback. This establishes sharing and correctness, not a measured speedup.
-
-Current-series lookback follows Prometheus 3.5: `(evaluation - 5m, evaluation]`.
-Expiration removes members at the lower boundary, and admission does not reinsert
-samples at that boundary. The process regression compares every shared readout
-with native Prometheus when only one series remains fresh.
diff --git a/docs/developer_docs/query-engine/extension-points.md b/docs/developer_docs/query-engine/extension-points.md
deleted file mode 100644
index 4a97486e2..000000000
--- a/docs/developer_docs/query-engine/extension-points.md
+++ /dev/null
@@ -1,107 +0,0 @@
-# Developing protocol and fallback extensions
-
-> Interface status: public extension boundary. Concrete trait names may migrate
-> toward the canonical interfaces below; private server helpers are not API.
-
-## 1. Code architecture
-
-```text
-network request -> ProtocolServer -> ProtocolAdapter -> QueryService
-                                                        |
-                                                ExactQueryClient
-```
-
-- `ProtocolServer` owns transport, authentication context, limits, timeout, and
-  cancellation.
-- `ProtocolAdapter` converts protocol-specific data to/from canonical query
-  structures.
-- `QueryService` performs plan-aware execution.
-- `ExactQueryClient` is called only for an explicit fallback route.
-
-## 2. Public interfaces and definitions
-
-```rust
-pub trait ProtocolAdapter: Send + Sync {
-    type Request;
-    type Response;
-    type Error;
-
-    fn decode(&self, request: Self::Request)
-        -> Result<QueryRequest, Self::Error>;
-
-    fn encode(&self, response: QueryResponse)
-        -> Result<Self::Response, Self::Error>;
-
-    fn encode_error(&self, error: QueryError) -> Self::Response;
-}
-```
-
-```rust
-pub trait ProtocolServer {
-    type Error;
-    async fn serve<S>(&self, service: Arc<S>) -> Result<(), Self::Error>
-    where
-        S: QueryService<Error = QueryError> + Send + Sync + 'static;
-}
-```
-
-```rust
-pub trait ExactQueryClient: Send + Sync {
-    type Error;
-    async fn execute_exact(&self, request: &QueryRequest)
-        -> Result<QueryResponse, Self::Error>;
-
-    fn capabilities(&self) -> ExactBackendCapabilities;
-}
-
-pub struct ExactBackendCapabilities {
-    pub backend_id: String,
-    pub query_languages: Vec<QueryLanguage>,
-    pub supports_instant: bool,
-    pub supports_range: bool,
-    pub maximum_range: Option<Duration>,
-}
-```
-
-`QueryRequest` and `QueryResponse` are defined in
-[Query routing and readout](query-engine.md). They preserve tenant,
-query language/expression, logical evaluation range, requested accuracy,
-result labels/timestamps/type, source, guarantee, and coverage.
-
-Why these interfaces exist: transport/protocol extensions cannot bypass
-catalog-backed QueryPlan routing or directly access summary storage, and fallback backends
-cannot silently reinterpret a request.
-
-## 3. Adding and verifying functionality
-
-### Add a protocol adapter
-
-1. Implement `ProtocolAdapter` for its request/response types.
-2. Map every supported evaluation-time/range and tenant field.
-3. Preserve Prometheus label/timestamp/result/error semantics where applicable.
-4. Verify decode→canonical→encode round trips for success and error cases.
-
-### Add a protocol server
-
-1. Implement `ProtocolServer` and inject only the public `QueryService`.
-2. Propagate cancellation, timeout, authentication, and request limits.
-3. Never call `SummaryStore` or an exact client directly.
-4. Verify cancelled requests stop downstream work and transport errors map
-   through `encode_error`.
-
-### Add an exact fallback backend
-
-1. Implement `ExactQueryClient` and declare `ExactBackendCapabilities`.
-2. Forward the canonical logical range and tenant unchanged.
-3. Return exact `QueryResponse` or a visible error.
-4. Verify unsupported capability and remote failure do not return an empty
-   successful result.
-
-### Interpret and verify output
-
-- Adapter output is canonical input, not a routing decision.
-- Server success means the response was transported, not that it was
-  summary-backed.
-- Inspect `QueryResponse.source` to distinguish summary and exact fallback.
-- End-to-end tests must include one supported request, one explicit fallback,
-  one malformed request, and one backend failure.
diff --git a/docs/developer_docs/query-engine/issue-701-code-review.md b/docs/developer_docs/query-engine/issue-701-code-review.md
deleted file mode 100644
index eac11bdac..000000000
--- a/docs/developer_docs/query-engine/issue-701-code-review.md
+++ /dev/null
@@ -1,117 +0,0 @@
-# Issues 701 and 702: Planner candidates and backend execution
-
-Audience: developers reviewing Planner PR 404 and backend PR 700. The issues used
-removed version-1 snapshots. Deployment now uses schema 2 with complete physical
-workload cost evidence; these fixes do not restore the unpriced deployment path.
-
-## Rule ownership
-
-ASAPPlanner constructs the candidate DAG and its accuracy contract. The backend
-lowers its typed operators, shares compatible physical state, prices complete
-alternatives, and enforces runtime population and coverage constraints.
-
-- `ExactKind::Min` distinguishes minimum from the legacy maximum family. The
-  compiler emits the matching accumulator subtype and minimum readout.
-- The temporal-average rule emits independently maintained sum and observation
-  count, exact finalization, and division. The backend can share their sum/count
-  producer without inventing an average rewrite.
-- Current-series rules emit `MaintainPopulation` and `ReadPopulation` for
-  quantile, TopK, sum, count, and average, globally or grouped. The backend keeps
-  each series' latest live value and handles replacement, stale markers, expiry,
-  and bounded resources. This is exact current-population state, not an
-  append-only temporal DDSketch. Counts include equal-valued distinct series.
-- Explicitly exact TopK over temporal aggregates can consume maintained exact
-  values. Existing approximate heap-sketch candidates retain their selection path.
-- Current-series alternatives can coexist with temporal materializations in the
-  same workload. Equivalent current-only alternatives are deduplicated so they do
-  not produce ambiguous cost quotes.
-
-## Sliding-window execution
-
-The semantic lookback and evaluation cadence generate distinct pane and
-full-window alternatives. Complete cost evidence chooses the physical layout.
-Full-window bindings retain the slide and validate the requested phase/range.
-Only the snapshot ending at the requested evaluation is read; overlapping full
-snapshots must not be merged or treated as required pending work for that read.
-Pane layouts retain their non-overlapping coverage checks and exclude the legacy
-index's preceding carry-in frame from the query population. The bound-read
-regression includes an out-of-range preceding population and verifies that its
-counts and values do not enter the result.
-
-Unsigned storage excludes pre-epoch window starts from admission and publication.
-Finite empty-window proofs use exact window identity for full-window layouts,
-retain the replay/retention floor, and never equate missing unclosed input with
-an empty population. Historical process checks explicitly declare their required
-staleness/retention margin.
-
-## Quantile expression guarantees
-
-Point quantiles with compatible population and accuracy requirements share state.
-Sharing alone does not make division preserve a component error bound.
-For numerator error `a` and denominator error `b < 1`, a sufficient relative
-ratio bound is `(a + b) / (1 - b)`. Independence is unnecessary for this
-algebraic bound; probabilistic failures still require joint accounting.
-
-Planner's checked relative-division candidate sizes DDSketch operands against the
-whole expression budget. A 1% ratio needs component accuracy slightly below
-`0.01 / 2.01`, approximately 0.4975%, including floating-point slack. Average /
-quantile uses the same composition rule with an exact numerator. Rank-only KLL
-certificates do not establish this relative-value guarantee.
-
-The compiler lowers the typed checked division. Runtime requires finite operands,
-a nonzero denominator, and a finite normal result. Unmet domain or coverage
-conditions route to exact execution. An ordinary division is not silently given
-a stronger guarantee.
-
-## Acceptance coverage
-
-Compiler regressions cover typed minimum, shared quantiles, average, and both
-ratio forms. Runtime regressions cover current-series membership, checked-division
-domain failures, storage-domain windows, pending full-window isolation, and finite
-empty-window evidence. The process workload combines the issue query families,
-ten quantiles, 15-minute and 5-minute windows, and consecutive evaluations while
-input remains open. `ASAP_CURRENT_SERIES_PROMETHEUS_URL` enables real Prometheus
-result comparison against Prometheus 3.x; the boundary-aligned fixture rejects a
-2.x oracle because that version includes the left boundary, unlike the installed
-PromQL window contract. See the [Prometheus migration guide](https://prometheus.io/docs/prometheus/3.5/migration/).
-Test quotes are synthetic correctness preferences, not measured performance or
-speedup evidence.
-
-The UnivMon integration fixture brackets one complete calibration population and
-uses the same window cadence for the producer observation. A partial sliding tail
-must not be asserted to match the complete calibration distribution.
-
-Validation on 2026-09-12:
-
-- Planner `cargo +1.98.0 test --workspace`: 1,097 passed.
-- Backend `cargo +1.98.0 test --workspace --lib`: 2,098 passed; the subsequent
-  focused pane-population regression also passed.
-- Compatibility process suite with a fresh Prometheus 3.5.0 remote-write oracle:
-  14 passed, 1 previously ignored Collector-schema integration. The mixed test
-  checks 46 queries at two successive evaluations and two zero-denominator
-  fallbacks; the current-series test also compares replacement/staleness updates.
-- Workspace/all-targets clippy passed with warnings denied; affected data-plane
-  checks were repeated after the final pane-read correction.
-
-These are correctness results. No measured performance win is claimed. The
-separately ignored Collector schema integration remains outside these fixes.
-
-## Review follow-up: lookback boundary and average overflow
-
-The exact lower lookback boundary now expires current-series members, matching
-Prometheus 3.5. A regression covers count, sum, average, quantile and TopK when
-all but one series reach that boundary.
-
-Temporal average no longer exports an unconditional sum/count logical rewrite.
-Planner marks the physical division with `checked_finite_division`; the compiler
-retains it as `FiniteDiv`. Nonfinite operands/results or a zero divisor trigger
-the original-query fallback. A zero or subnormal finite average remains eligible.
-The production HTTP test first waits for both sum and count state to become warm,
-then verifies that overflowing `1e308` samples return the native finite average.
-
-Validation on 2026-09-13: backend workspace library tests passed (2,102); the
-Prometheus 3.5 compatibility process suite passed 15 tests with the existing
-Collector-schema test ignored; workspace/all-targets clippy passed with warnings
-denied. Planner workspace unit/integration tests passed, and the workspace
-doctests passed on a separate run after a transient cached-crate lookup failure.
-The Planner's GitHub test and format/lint checks also passed.
diff --git a/docs/developer_docs/query-engine/query-engine.md b/docs/developer_docs/query-engine/query-engine.md
deleted file mode 100644
index 0254787f8..000000000
--- a/docs/developer_docs/query-engine/query-engine.md
+++ /dev/null
@@ -1,143 +0,0 @@
-# Developing query routing and summary readout
-
-> Interface status: target public API. Summary execution and fallback exist;
-> catalog-backed QueryPlan routing is replacing legacy local query-shape logic.
-
-## 1. Code architecture
-
-```text
-protocol request -> QueryAdapter -> QueryService
-                                      |
-                    SummaryCatalog + QueryPlan
-                              /              \
-                         SummaryReader    ExactQueryClient
-                              \              /
-                               QueryResponse
-```
-
-The adapter owns protocol conversion. `QueryService` owns plan-aware route
-selection. `SummaryReader` executes an already selected readout. The exact
-client executes only explicit fallback routes.
-
-## 2. Public interfaces and definitions
-
-```rust
-pub struct QueryRequest {
-    pub tenant: String,
-    pub language: QueryLanguage,
-    pub expression: String,
-    pub evaluation: EvaluationRange,
-    pub requested_accuracy: AccuracyRequirement,
-}
-
-pub struct EvaluationRange {
-    pub start: Timestamp,
-    pub end: Timestamp,
-    pub step: Option<Duration>,
-}
-```
-
-```rust
-pub trait QueryService {
-    type Error;
-    async fn execute(&self, request: QueryRequest)
-        -> Result<QueryResponse, Self::Error>;
-}
-
-pub trait SummaryReader {
-    type Error;
-    fn read(
-        &self,
-        request: &QueryRequest,
-        route: &SummaryRoute,
-        catalog: &SummaryCatalog,
-        plan: &QueryPlan,
-    ) -> Result<SummaryReadout, Self::Error>;
-}
-
-pub struct SummaryRoute {
-    pub query_id: String,
-    pub materialization_ids: Vec<String>,
-    pub readout: ReadoutSpec,
-    pub required_guarantee: AccuracyRequirement,
-}
-
-pub struct SummaryReadout {
-    pub result: PrometheusResult,
-    pub guarantee: ResultGuarantee,
-    pub coverage: LogicalCoverage,
-}
-
-pub trait ExactQueryClient {
-    type Error;
-    async fn execute_exact(&self, request: &QueryRequest)
-        -> Result<QueryResponse, Self::Error>;
-}
-```
-
-Supporting public type definitions:
-
-| Type | Definition |
-| --- | --- |
-| `QueryLanguage` | Language identifier; MVP value is PromQL. |
-| `AccuracyRequirement` | Exact, epsilon, or epsilon-delta constraint requested for the result. |
-| `ReadoutSpec` | Planner-selected operation and typed parameters applied to maintained state. |
-| `PrometheusResult` | Matrix/vector/scalar/string result with labels, timestamps, values, warnings, and errors. |
-| `ResultGuarantee` | Effective exact/approximate guarantee of the returned result. |
-| `LogicalCoverage` | Requested and actually covered time intervals plus readiness timestamp. |
-| `QueryError` | Typed parse, unsupported, inactive-plan, missing/stale/gapped state, or exact-backend failure. |
-
-```rust
-pub struct QueryResponse {
-    pub result: PrometheusResult,
-    pub source: QuerySource,
-    pub guarantee: ResultGuarantee,
-    pub coverage: LogicalCoverage,
-    pub plan_id: Option<String>,
-    pub materialization_ids: Vec<String>,
-}
-
-pub enum QuerySource {
-    Summary,
-    ExactFallback,
-}
-```
-
-Why these interfaces exist: protocol code cannot bypass plan/readiness checks,
-and callers can interpret whether an answer is summary-backed or exact with its
-coverage and guarantee.
-
-## 3. Adding and verifying functionality
-
-### Add a readout/operator
-
-1. Add the logical semantics and guarantee to ASAPPlanner.
-2. Extend public backend readout capability and QueryPlan node and catalog-binding types.
-3. Implement it through `SummaryReader`; do not parse and choose a family again.
-4. Return labels/timestamps/result type through `PrometheusResult`.
-5. Compare with the exact backend over identical series and logical range.
-
-### Add a protocol adapter
-
-Convert protocol inputs to `QueryRequest` and `QueryResponse` back to protocol
-output. Verify tenant, evaluation timestamps, labels, result type, errors, and
-accuracy metadata round-trip unchanged.
-
-### Add an exact backend
-
-Implement `ExactQueryClient`, preserving the complete `QueryRequest`. Verify
-remote failures remain errors and are not successful empty vectors.
-
-### Interpret and verify output
-
-- `QuerySource::Summary` requires active plan/materialization IDs and complete
-  coverage.
-- `QuerySource::ExactFallback` must satisfy exact semantics and carry no false
-  summary guarantee.
-- Missing/additional labels or timestamps are validation failures.
-- Partial/stale/gapped summary state must not return a successful complete
-  `QueryResponse`.
-- A plan swap during execution must not mix identities in one response.
-
-For maintained instant-vector quantiles and shared maximum-k TopK state, see
-[current-series aggregations](current-series-aggregations.md).
diff --git a/docs/developer_docs/query-engine/victoriametrics-metricsql-support.md b/docs/developer_docs/query-engine/victoriametrics-metricsql-support.md
deleted file mode 100644
index 91befe966..000000000
--- a/docs/developer_docs/query-engine/victoriametrics-metricsql-support.md
+++ /dev/null
@@ -1,92 +0,0 @@
-# VictoriaMetrics and MetricsQL query support
-
-This document is for backend developers extending the query surface.
-
-## Architecture
-
-VictoriaMetrics uses its Prometheus-compatible HTTP API, but its query language
-is MetricsQL. The protocol boundary is therefore independent while successful
-canonical bindings reuse the existing query runtime:
-
-```text
-VictoriaMetrics HTTP request
-        |
-MetricsQL binder
-        |-- PromQL-compatible subset --> canonical QueryExpr
-        |                                --> ASAPPlanner physical plan
-        |                                --> shared DAG executor
-        |                                --> SDS lookup --> SummaryStore
-        |                                --> VictoriaMetrics result adapter
-        |
-        `-- unsupported MetricsQL syntax --> VictoriaMetrics exact fallback
-```
-
-The VictoriaMetrics adapter accepts instant and range GET/POST requests at
-`/api/v1/query` and `/api/v1/query_range`. It preserves the Prometheus-compatible
-JSON result and error envelope used by VictoriaMetrics clients and Grafana.
-
-## Language boundary
-
-ASAPPlanner's independent MetricsQL frontend parses a MetricsQL AST and lowers
-it directly to the canonical query DAG. Selectors, matchers, range selectors,
-aggregates, grouping, binary expressions, and supported calls share the existing
-physical planner and DAG executor. `default_rollup(metric[range])` lowers to
-`LastOverTime` over `TimeRange`. An implicit `default_rollup(metric)` needs the
-runtime evaluation step, and `keep_metric_names` needs metric-name lineage that
-the canonical IR does not represent; both fail closed to the configured
-VictoriaMetrics backend with the original expression and parameters.
-
-This boundary adds no variants to SDS, QueryExpr, or the shared physical DAG.
-`QueryPlanEntry.language` records which frontend produced the canonical query
-identity. Native acceleration for additional MetricsQL syntax must be added in a
-MetricsQL-specific frontend and lowered to existing canonical operations only
-when the equivalence is defined.
-
-## Configuration
-
-Run an independent listener with `--victoriametrics-http-port` and select the
-exact backend with `--victoriametrics-url`. The ordinary Prometheus listener and
-its fallback remain unchanged.
-
-The listener also accepts VictoriaMetrics cluster paths
-`/select/{tenant}/prometheus/api/v1/query` and
-`/select/{tenant}/prometheus/api/v1/query_range`. The path tenant scopes the
-installed routing snapshot and is preserved in the exact fallback URL.
-
-The control plane lowers the MetricsQL AST to `QueryExpr`, invokes the shared
-ASAP-aware physical compiler, and publishes a language-tagged entry in the
-authoritative `QueryPlan`. `canonical_query` is the frontend's AST identity;
-the language tag prevents a MetricsQL request from resolving a PromQL entry.
-
-The backend stages and activates that `QueryPlan` atomically with the SDS
-catalog, precompute plan, and transmission plan. MetricsQL bindings therefore
-receive the same SummaryCatalog validation, including pane duration and pane
-origin, as PromQL bindings. The executor reads the installed entry directly;
-it does not clone the DAG into a compatibility view. A plan miss, incomplete
-coverage, validation failure, or execution failure routes the original request
-to VictoriaMetrics.
-
-## MetricsQL operator coverage
-
-| Construct | Canonical acceleration | Boundary behavior |
-| --- | --- | --- |
-| metric selectors and one matcher set | yes | AST lowers to a time-series scan |
-| explicit positive range selectors | yes | lowers to `TimeRange` |
-| `default_rollup` with explicit range; `last/first/avg/min/max/sum/count/stddev/stdvar_over_time`; `rate`, `irate`, `increase`, `changes`, `delta`, `idelta`, `deriv`, `resets`, `mad`, `present`, `absent`, and numeric `quantile_over_time` | yes | exact arity is required |
-| `sum`, `avg`, `min`, `max`, `count`, `stddev`, `stdvar`, `group`, numeric `quantile`, with `by`/`without` | yes | exact arity is required |
-| scalar unary and binary arithmetic/comparison/set operators without vector modifiers | yes | lowers to canonical binary nodes |
-| `keep_metric_names`, aggregate `limit`, implicit `default_rollup`, offsets, `@`, subquery/inherited steps, OR-delimited matcher groups, binary vector matching, `if`, `ifnot`, `default`, non-rollup functions, unsupported aggregates, malformed or extra arguments | no | typed frontend rejection, then exact VictoriaMetrics fallback |
-
-The vendored upstream parser currently has 21 known upstream-baseline failures
-and three parser-support compatibility failures in its broader internal suite.
-They cover WITH expansion, OR matcher/tokenization, filter pushdown, and
-simplifier behavior. Those constructs are outside the accelerated subset and
-remain in the fail-closed fallback denominator; they are not reported as
-accelerated queries.
-
-## Verification
-
-Focused tests cover request parsing, response compatibility, canonical binding,
-strict aggregate arity, language-tagged QueryPlan serialization and validation,
-atomic installation, tenant-prefixed fallback, upstream status/header
-preservation, and instant/range fallback.
diff --git a/docs/developer_docs/summary-series-id/resolver.md b/docs/developer_docs/summary-series-id/resolver.md
deleted file mode 100644
index 822b8e9dd..000000000
--- a/docs/developer_docs/summary-series-id/resolver.md
+++ /dev/null
@@ -1,39 +0,0 @@
-# Developing summary-series identity
-
-## Architecture
-
-The Backend is the SID authority. `drivers/ingest/series_resolver.rs` maps:
-
-```text
-(canonical metric, retained-attributes fingerprint,
- materialization/agg-kind canonical string) -> u64
-```
-
-The OTLP receiver handles attribute-bearing registration, ID-only lookup,
-assignment responses, and unknown-ID feedback. `SketchStore` owns the reverse
-metadata needed after resolution. Collector owns the assignment cache.
-
-## Contract
-
-SID identifies one stored summary/exact/raw materialization series, not
-necessarily one original input time series. SID zero is unassigned. A supplied
-ID never overrides conflicting labels/kind. Different family, parameters,
-filter, or retained label values require different SIDs; window/full/delta does
-not.
-
-`FilePersistence` WAL recovery can preserve assignments across Backend restart.
-Without it, unknown-ID feedback makes Collector evict and re-register.
-
-## Safe changes
-
-Canonicalization changes are cross-repository wire changes. Version them or
-prove old/new equivalence with shared vectors. When adding tenant/distributed
-namespaces, make namespace evidence explicit before allowing the same numeric
-value in multiple authorities.
-
-## Verification
-
-Test label-order stability, kind/config separation, concurrent idempotent
-resolve, conflict handling, ID-only unknown rejection, WAL replay/torn tail,
-Collector eviction/relearning, and query label reconstruction. See the
-[cross-repository design](https://github.com/ProjectASAP/ASAPCollector/blob/main/docs/design_docs/cross-cutting/summary-series-id.md).
diff --git a/docs/developer_docs/summary-store-engine/implementation.md b/docs/developer_docs/summary-store-engine/implementation.md
deleted file mode 100644
index ef0206cea..000000000
--- a/docs/developer_docs/summary-store-engine/implementation.md
+++ /dev/null
@@ -1,213 +0,0 @@
-# Developing summary storage and series identity
-
-> Interface status: target public API. Store/index and SID resolution exist;
-> plan/materialization lifecycle convergence is partial.
-
-## 1. Code architecture
-
-```text
-CanonicalMaterializedSeriesKey -> SeriesRegistry -> SeriesId
-              ^                                      |
-ValidatedMaterialization ----------------------------+
-             |
-             v
-         SummaryStore
-       write / coverage / read / retire
-```
-
-The series registry owns canonical **materialized-series** identity. Its key
-combines the materialization definition with the canonical metric and concrete
-retained label values. The summary store owns the windows and payload state
-under the resulting SID. Plan, materialization, and SID identities remain
-distinct but related.
-
-## 2. Public interfaces and definitions
-
-```rust
-pub struct SeriesId {
-    pub namespace: SeriesIdNamespace,
-    pub value: u64,
-}
-
-pub struct SeriesIdNamespace {
-    pub tenant: String,
-    pub version: String,
-}
-
-pub struct CanonicalMaterializedSeriesKey {
-    pub tenant: String,
-    pub materialization_fingerprint: String,
-    pub metric_name: String,
-    pub identifying_labels: BTreeMap<String, String>,
-}
-
-pub struct ResolvedSeries {
-    pub id: SeriesId,
-    pub canonical_key: CanonicalMaterializedSeriesKey,
-}
-
-pub trait SeriesRegistry: Send + Sync {
-    type Error;
-
-    fn resolve(&self, key: CanonicalMaterializedSeriesKey)
-        -> Result<ResolvedSeries, Self::Error>;
-
-    fn lookup(&self, id: &SeriesId)
-        -> Result<Option<ResolvedSeries>, Self::Error>;
-}
-```
-
-### SID definition
-
-The interfaces below are the target public namespace model. The current
-implementation uses a backend-allocated `u64` keyed by `(canonical metric,
-canonical stored labels, agg_kind_canonical)`. It therefore identifies a stored
-summary or exact-aggregate series. The same target model can identify a raw
-sample series under a distinct raw materialization kind, but current raw samples
-are served through the configured archive/pass-through path rather than a
-`SketchStore` raw payload variant. See the
-[cross-repository identity design](../summary-series-id/resolver.md).
-
-`SeriesId` (`sid`) is an opaque numeric identifier scoped by exactly one
-`SeriesIdNamespace`. The namespace contains the tenant/isolation domain and a
-version that changes whenever the authoritative registry is rebuilt without
-preserving its previous assignments.
-
-```text
-(SeriesIdNamespace, SeriesId.value) <-> CanonicalMaterializedSeriesKey
-```
-
-Within one namespace this mapping is one-to-one:
-
-- the same canonical key always resolves to the same SID;
-- two different canonical keys never resolve to the same SID; and
-- the same numeric value in two namespaces is not the same SID.
-
-`identifying_labels` is ordered by label name before lookup or hashing, so input
-label order does not affect identity. Summary family, parameters, aggregation
-group, window, materialization ID, and plan ID are excluded because they
-identify maintained state, not the source metric series.
-
-`SeriesRegistry::resolve` is idempotent. A sender-provided SID is only a lookup
-shortcut; it never overrides a conflicting canonical key.
-
-```rust
-pub struct MaterializationKey {
-    pub plan_id: String,
-    pub plan_version: u64,
-    pub materialization_id: String,
-    pub tenant: String,
-    pub group: MaterializationGroup,
-    pub window: LogicalWindow,
-}
-
-pub enum MaterializationState {
-    Staged,
-    Queryable,
-    Gapped,
-    Draining,
-    Expired,
-    Rejected,
-}
-```
-
-```rust
-pub trait SummaryStore: Send + Sync {
-    type Error;
-
-    fn register(&self, contract: ValidatedMaterialization)
-        -> Result<MaterializationState, Self::Error>;
-
-    fn apply(&self, update: ValidatedSummary)
-        -> Result<StoreWriteResult, Self::Error>;
-
-    fn coverage(&self, request: CoverageRequest)
-        -> Result<CoverageResult, Self::Error>;
-
-    fn read(&self, request: SummaryReadRequest)
-        -> Result<SummaryReadResult, Self::Error>;
-
-    fn retire(&self, materialization_id: &str, policy: RetirementPolicy)
-        -> Result<MaterializationState, Self::Error>;
-}
-
-pub struct CoverageRequest {
-    pub catalog: SummaryCatalog,
-    pub query_plan: QueryPlan,
-    pub materialization_ids: Vec<String>,
-    pub range: EvaluationRange,
-}
-
-pub struct SummaryReadRequest {
-    pub coverage: LogicalCoverage,
-    pub route: SummaryRoute,
-}
-
-pub struct SummaryReadResult {
-    pub states: Vec<SummaryState>,
-    pub coverage: LogicalCoverage,
-}
-
-pub struct RetirementPolicy {
-    pub drain_until: Timestamp,
-    pub retain_for_rollback_until: Option<Timestamp>,
-}
-```
-
-```rust
-pub struct StoreWriteResult {
-    pub key: MaterializationKey,
-    pub state: MaterializationState,
-    pub disposition: IngestDisposition,
-}
-
-pub enum CoverageResult {
-    Complete(LogicalCoverage),
-    Missing(Vec<LogicalWindow>),
-    Stale { newest_source_timestamp: Timestamp },
-    Gapped { producer: String, expected_sequence: u64 },
-    Incompatible { reason: String },
-}
-```
-
-Supporting types `ValidatedMaterialization`, `ValidatedSummary`, and
-`IngestDisposition` are defined by
-[OTLP summary ingestion](../ingest-engine/ingest-engine.md). `EvaluationRange`,
-`SummaryRoute`, and `LogicalCoverage` are defined by
-[Query routing and readout](../query-engine/query-engine.md).
-
-Why these interfaces exist: callers receive typed completeness/failure rather
-than interpreting an empty collection as “no data,” and storage cannot accept
-unvalidated summary bytes.
-
-## 3. Adding and verifying functionality
-
-### Add a summary family to storage
-
-1. Extend public materialization capability/contract types.
-2. Define canonical parameters and representation compatibility.
-3. Accept only `ValidatedSummary` through `SummaryStore::apply`.
-4. Implement merge/read behavior through public result types.
-5. Verify incompatible family/parameters/windows never merge.
-
-### Add a storage backend
-
-Implement `SummaryStore` with identical semantic outputs. Persistence or remote
-transport must not change coverage, lifecycle, identity, or error behavior.
-Verify restart restores metadata before returning `Complete` or `Queryable`.
-
-### Add SID persistence/distribution
-
-Implement `SeriesRegistry` while preserving deterministic canonical keys,
-tenant isolation, idempotent resolve, namespace versioning, and conflict
-detection. Verify cache loss/restart cannot bind an old SID to new labels.
-
-### Interpret and verify output
-
-- `Queryable` means the registered state may be considered for coverage; it is
-  not proof that every requested window is complete.
-- Only `CoverageResult::Complete` may proceed to summary readout.
-- `Missing`, `Stale`, `Gapped`, and `Incompatible` must remain distinguishable.
-- `StoreWriteResult` identifies exactly which plan/materialization/window was
-  changed.
-- Concurrent plan versions remain isolated through `MaterializationKey`.
diff --git a/docs/developer_docs/univmon-dependency.md b/docs/developer_docs/univmon-dependency.md
deleted file mode 100644
index ae0df030c..000000000
--- a/docs/developer_docs/univmon-dependency.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# UnivMon dependency checkout
-
-The UnivMon runtime requires asap_sketchlib commit
-`c0de315754f9a6c77dd7a25aca0b2b62f0aec276` from PR #139. CI checks
-out this exact revision. This dependency is not yet merged into sketchlib main.
-
-For local builds, use that revision in the sibling `asap_sketchlib` checkout
-referenced by the workspace Cargo patch and ASAPCollector's precompute crate.
-Both consumers must resolve to the same checkout so their state types agree.
-Use an isolated checkout when other work depends on a different revision.
-
-The dependency exposes the standard-update compatibility predicate. Restoring
-a terminal-mode UnivMon state into an ingest accumulator is rejected before
-mutation. After #139 merges, update the pin explicitly and rerun restore and
-real-process tests; do not silently substitute an unverified main revision.
diff --git a/docs/developer_docs/univmon-erp-process-validation.md b/docs/developer_docs/univmon-erp-process-validation.md
deleted file mode 100644
index 51e65f914..000000000
--- a/docs/developer_docs/univmon-erp-process-validation.md
+++ /dev/null
@@ -1,78 +0,0 @@
-# UnivMon readout evidence through production execution
-
-The backend ERP adapter now selects evidence by the logical readout. Sharing a
-UnivMon state does not give all of its readouts the same accuracy guarantee.
-
-| Readout | Artifact metric | Bound units |
-| --- | --- | --- |
-| Distinct | `max_cardinality_relative_error` | Relative distinct-count error |
-| Frequency L2 | `max_frequency_l2_relative_error` | Relative error of `sqrt(sum frequency(value)^2)` |
-| Frequency entropy | `max_frequency_entropy_absolute_bits_error` | Absolute Shannon entropy error, in bits |
-| Count | No empirical metric needed | Exact total unit weight |
-
-Sizing maps `AggIntent` to this contract; accuracy validation maps `SketchQuery`
-to the same contract. Matching artifact rows still pass implementation, runtime
-parameters, trial count and bounded shape checks. Missing readout evidence leaves
-that readout to theoretical sizing or exact fallback. It cannot borrow another
-readout's measurement. ERP v1 does not calibrate failure probability, so an
-explicit epsilon/delta requirement cannot use these observations as a confidence
-bound.
-
-The existing `error_metric` field remains available to generic ERP adapter
-callers. Production KLL and UnivMon readouts use their canonical typed metric
-mapping. The recognized UnivMon implementation tag is
-`asap-sketchlib-univmon-standard-v1`: standard unit-frequency updates over sample
-value identities. Terminal promotion updates and numeric-value L2 have different
-semantics and are not covered.
-
-## Reproduce the correctness fixture
-
-Run from the repository root:
-
-```sh
-cargo test -p data_plane --test asapquery_compatibility_process_e2e measured_readout_evidence -- --nocapture
-```
-
-The test measures two configurations using the real runtime accumulator, ten
-separate key populations, 128 distinct values and 1,338 unit updates per trial.
-Each trial merges two panes. The artifact records maximum observed error and
-serialized retained state size; CPU is not measured and its objective weight is
-zero. These are local correctness measurements, not a throughput, latency,
-resident-memory or general accuracy certification.
-
-| Configuration | Distinct relative error | L2 relative error | Entropy absolute bits error |
-| --- | ---: | ---: | ---: |
-| heap 8, columns 128, rows 5, layers 4 | 0.984375 | 0.0179301 | 0.545845 |
-| heap 128, columns 1024, rows 5, layers 4 | 0.0078125 | 0.00003754 | 0.003554 |
-
-The observer fits the held-out frequency population and the normal Planner
-chooses configurations. With a 0.2 bound in each readout's stated units:
-
-- Distinct selects HLL with precision 10 through its existing theoretical model.
-- Frequency L2 selects the smaller UnivMon configuration.
-- Entropy selects the larger UnivMon configuration.
-
-The resulting physical plan is installed in a real backend process. Remote
-write feeds held-out keys, the production drain endpoint completes finite replay,
-and all three queries execute through the warm ASAP path. The fallback service
-only implements health checks, so it cannot supply query results. Held-out errors
-were 2.054% for HLL distinct, 0.7304% for UnivMon L2, and approximately
-3.55e-15 bits for entropy. This demonstrates selection and execution, not speedup.
-
-Removing only the entropy metric from the artifact makes entropy fall back while
-preserving the L2 materialization. The test emits `UNIVMON_MEASURED`,
-`UNIVMON_PLANNED`, and `UNIVMON_WARM` JSON records containing the artifact, observed
-shape, selected parameters, installed DAG identities, lifecycle estimates and
-actual query results.
-
-The three queries need different physical configurations in this fixture; they
-do not demonstrate a single shared state. Planner may share compatible equal-
-parameter states. The finite replay barrier also does not establish continuous
-multi-worker population completeness, which is a separate publication contract.
-
-Finite runtime observations carry bounded empirical frequency counts and temporal
-interval counts through the shared metadata contract. The data plane does not
-classify distributions or depend on Planner fitting types; the control plane
-fits these counts before profile matching. Raw keys are absent from feedback.
-An accepted catalog activation establishes the observer generation. Delayed
-samples from another generation are ignored and cannot reset current counts.
diff --git a/docs/evaluation/autosketch-comparison.md b/docs/evaluation/autosketch-comparison.md
deleted file mode 100644
index 302a4d32c..000000000
--- a/docs/evaluation/autosketch-comparison.md
+++ /dev/null
@@ -1,302 +0,0 @@
-# ASAPQuery vs. AutoSketch evaluation plan
-
-Status: proposed experiments, not measured results. Audience: researchers and
-developers implementing the evaluation. Scope: ASAPPlanner configuration and
-ASAPQuery execution; ClickHouse is excluded.
-
-## 1. Claims and priorities
-
-The primary question is whether workload-aware planning pays off when multiple
-queries repeatedly read overlapping windows. Broader sketch support and
-competitive single-sketch sizing are separate supporting claims.
-
-| Priority | Hypothesis | Evidence needed |
-| --- | --- | --- |
-| E1: primary | For recurring, overlapping window queries, ASAPQuery reduces total execution cost at comparable accuracy and freshness. | End-to-end measurements plus materialization, pane, retention, and sharing ablations. |
-| E2: breadth | ASAP's supported candidate catalog serves a broader set of query/accuracy contracts than the evaluated AutoSketch implementation. | Audited support matrix, successful execution, and restricted-catalog ablations. |
-| E3: configuration | For one common sketch and fixed query/window, ASAPPlanner configuration quality is competitive with AutoSketch-style search. | Identical implementations and candidate grids, held-out accuracy, and distance from a finite-grid oracle. |
-
-These are hypotheses. Do not describe superiority or non-inferiority as
-established before collecting results. Negative results and unsupported cases
-remain in the report.
-
-## 2. Baseline scope and attribution
-
-AutoSketch is application-local, not merely a counter-size tuner: an application
-can contain multiple operators. Its objective weights stateful ALUs and register
-memory, subject to accuracy and hardware constraints. The published implementation
-maps reduce to CMS/Count Sketch and distinct to Bloom/Counting Bloom filters,
-and constructs sketch-like UDF states. It does not demonstrate KLL/DDSketch
-support; general windows and multi-application joint search are future work.
-See [AutoSketch, NSDI 2024, Sections 4–6](https://www.usenix.org/system/files/nsdi24-sun.pdf).
-
-Our baseline adapts Algorithm 4's LHS initialization, feasibility-directed neighbor
-search, pruning, and stopping to the common software runtime. Pin the
-[source revision](https://github.com/N2-Sys/AutoSketch) and document deviations,
-especially removing stage/page constraints and replacing hardware cost.
-Name it **AutoSketch-Adapted**, not native AutoSketch.
-
-The adaptation is a configuration baseline, not a reproduction of its whole P4
-compiler. Unsupported original operators do not prove a fundamental limitation
-of its search method. Likewise, a candidate listed in ASAP code does not prove
-that the chosen deployment can execute its queries correctly.
-
-Use the same ASAPQuery executor for both sets of configurations. This isolates
-planning from hardware/runtime differences. In E1, give the adapted baseline a
-legal fixed-window adapter; record its maintenance and merge costs. This adapter
-is evaluation infrastructure, not a claimed AutoSketch window feature.
-
-## 3. Shared experimental contract
-
-- Freeze code revisions for backend, Planner, sketch-bench, sketch library, and
-  AutoSketch adaptation. Record hardware, build flags, thread counts, and limits.
-- Use identical input streams, query schedules, sketch implementations, hash
-  seeds, candidate bounds, and accuracy/freshness requirements within each pair.
-- Separate calibration, development, and final test streams. Configuration and
-  ERP construction cannot inspect final-test answers.
-- Use independent data and sketch seeds: initially ten paired runs per cell.
-  Aggregate uncertainty across runs, not correlated queries within one run.
-  Increase replication if intervals are too wide to resolve the hypothesis.
-- Derive exact answers from the same events and window boundaries. Specify
-  right/left closure, lateness, empty windows, and missing keys before execution.
-- Query lookback is semantic and fixed. Optimize physical panes and retained
-  state, never silently shorten a requested window or relax freshness.
-- Hold ingestion and offered query schedules fixed. Count all offered queries,
-  errors, timeouts, fallbacks, and queueing; do not measure only completed fast
-  queries. Separate warm-up and steady state and also report startup costs.
-- Count all maintained panes, sidecars, indices, buffers, replicas, and fallback
-  resources. Report state bytes separately from process RSS.
-- Save installed plans and verify which materializations actually served each
-  query. An exact fallback can preserve correctness but is not a sketch hit.
-
-Use uniform and Zipf key frequencies (suggested exponents 0.8 and 1.2), plus one
-pinned representative trace if available. For quantiles add light-tailed and
-heavy-tailed values. Missing trace availability must not be hidden by claiming
-synthetic-only results generalize to production.
-
-## 4. E1 — recurring multi-query windows (main experiment)
-
-### Workload
-
-Begin with a common frequency-estimation task and one CMS implementation. Query
-the frequency of specified keys within each lookback. Define the task explicitly;
-do not assume an arbitrary `count_over_time` expression means a CMS point query.
-Validate the actual frontend expression and grouping before admitting a cell.
-
-| Dimension | Initial settings | Purpose |
-| --- | --- | --- |
-| Lookbacks | 1m, 5m, 15m, 1h | Overlapping historical coverage |
-| Execution periods | 1s, 10s, 60s, independently of lookback | Recurrence and materialization break-even |
-| Logical query count | 1, 4, 16, 64 | Scaling with consumers; vary keys/lookbacks rather than counting duplicate registrations |
-| Shareability | 0%, 50%, 100% of queries in compatible source/filter/grouping cohorts | Sharing benefit and negative control |
-| Cardinality | 1k, 100k keys | State pressure and collisions |
-| Ingest rate | 10k, 100k events/s initially | Maintenance pressure; reduce if the fixed hardware cannot sustain them |
-| Pane candidates | 1s, 5s, 10s, 30s, 60s where semantically and operationally legal | Update/retention/read trade-off |
-
-Do not execute the full Cartesian product initially. Establish one default cell,
-then vary recurrence, lookbacks, shareability, cardinality, and load individually.
-Follow with selected interactions. Also include staggered query phases and
-non-aligned lookbacks (e.g. 70s and 310s): perfectly aligned windows alone can
-overstate sharing benefits.
-
-For 1h lookback, ingest at least a full history before steady-state measurement;
-then measure at least 30 minutes and 30 evaluations of the slowest query.
-Accelerated replay is acceptable for correctness checks, not as a substitute
-for steady-state wall-clock CPU/latency measurements at the declared load.
-
-### Baselines and ablations
-
-| Baseline | Sketch configuration | Materialization | Pane / retention | Cross-query sharing |
-| --- | --- | --- | --- | --- |
-| Exact | None | Exact execution | Required exact history | Fixed exact backend |
-| AutoSketch-PerQuery | Adapted search | One continuously maintained state set per logical query | Fixed legal window adapter; minimum retention needed for the contract | Off |
-| ASAP-FixedLayout | ERP | Same always-materialize decision | Same layout as PerQuery | Off |
-| ASAP-NoSharing | ERP | Cost-driven exact/materialized choice | Planner-selected supported layout | Off |
-| ASAP-Full | ERP | Cost-driven | Planner-selected supported layout | On |
-
-PerQuery must keep state between executions; it must not rebuild on every read.
-Queries needing sliding windows get sufficient panes/history, not a single
-incorrect tumbling sketch. Tune the fixed adapter on development data and freeze
-it; do not deliberately pick an inefficient layout.
-
-First lock identical CMS parameters across E1 baselines. This removes sizing as
-a confounder. Then repeat key cells allowing each method to choose parameters;
-report actual query error after pane merges in both runs.
-
-Additional mechanism controls, enabled independently from Full:
-
-- **NoSharing:** forbid shared producer/state identities while preserving other
-  choices. Verify duplicate states are physically distinct in the executor.
-- **FixedPane:** pin a common legal pane width while preserving other choices.
-- **FixedRetention:** retain the longest required horizon for every state, while
-  preserving other choices. This isolates pruning of unnecessary retained panes.
-- **AlwaysMaterialize:** disable exact-vs-materialized cost choice. Exact mode's
-  data retention and execution cost must be included in the comparison.
-
-For a stronger layout control, add **AutoSketch-SharedPane**: the same selected
-parameters with a fixed, calibration-chosen shared-pane layout. This measures
-how much a simple sharing heuristic explains without recurrence-aware planning.
-It is our constructed control, not an original AutoSketch feature.
-
-### Measurements and interpretation
-
-Report total CPU-seconds, ingest/maintenance CPU, read/merge CPU, peak state
-memory, RSS, byte-seconds, query p50/p95/p99, achieved throughput, and deadline
-miss rate. Also report state count, updates, merges, exact-fallback share,
-planning time, and accuracy by query/window. Include Collector and exact-backend
-costs when used; keep placement fixed between baselines.
-
-The primary plot is CPU and memory versus query period, stratified by lookback
-and shareability, with accuracy/latency alongside. NoSharing versus Full isolates
-sharing; the independent controls isolate pane, retention, and materialization
-decisions. PerQuery versus Full alone is not sufficient for attribution.
-
-Support the headline only where Full reduces resources while meeting the same
-accuracy and service requirements. Show low-recurrence, non-overlapping, and
-single-query cases even when gains disappear or planning overhead dominates.
-
-## 5. E2 — query coverage and candidate-space breadth
-
-Audit both implementations at pinned revisions before benchmarking. Distinguish
-three support levels: frontend expression, legal planner mapping under the
-accuracy contract, and successful runtime execution in the chosen placement.
-
-| Query/contract family | ASAP candidates to verify, not assume | Evaluation |
-| --- | --- | --- |
-| Point frequency / keyed sums | CMS, Count Sketch where update and error semantics permit | Common-space comparison |
-| Ranked keys | Heap/sidecar variants where key recovery is supported | Count candidate enumeration and sidecar memory |
-| Quantiles with rank-error intent | KLL | Held-out rank oracle |
-| Quantiles with relative-value-error intent | DDSketch | Relative value oracle on its admitted domain |
-| Distinct/cardinality tasks | HLL where an end-to-end path exists | Exact distinct oracle; audit the other system's distinct semantics separately |
-
-For each task record: original AutoSketch support, adapted support, ASAP support,
-candidate identities, rejection reason, selected configuration, and actual
-accuracy. Distinct/deduplication and cardinality estimation are not automatically
-the same operator. Report unsupported cells as unsupported, not infinite latency
-or zero throughput.
-
-Run two complementary experiments:
-
-1. **Coverage:** fraction and list of preregistered task/accuracy contracts that
-   compile and execute correctly. Fix the task list before observing outcomes.
-2. **Candidate-set ablation:** compare ASAP-FullCatalog with
-   ASAP-CommonCatalog under identical planning/runtime. On common tasks, measure
-   whether extra eligible candidates improve the cost–accuracy frontier. On
-   additional tasks, report coverage and compare with exact execution.
-
-Do not count a singleton KLL task as evidence of superior selection among
-algorithms: it demonstrates coverage. Demonstrating selection requires at least
-two eligible candidates for the same contract. KLL rank error and DDSketch value
-error cannot be substituted without an explicit common output contract and
-validated accuracy mapping.
-
-If time permits, extend the adapted search to the additional software sketches.
-Call this **AutoSketch-Adapted-Extended**. It separates catalog engineering from
-search quality, without claiming that the original implementation supported them.
-
-## 6. E3 — fixed-window single-sketch configuration
-
-Fix one CMS query, a 5m window, one runtime/layout, and the same key workload.
-Start with width in {64, 128, 256, 512, 1024, 2048, 4096} and depth in
-{1, 2, 3, 4, 5, 6, 7, 8}: 56 configurations, filtered identically for runtime
-legality. The small space makes exhaustive measurement feasible.
-
-Compare theoretical sizing (when a matching contract exists), AutoSketch-Adapted,
-ASAP-ERP, and the finite-grid oracle. The oracle selects the cheapest feasible
-configuration using calibration evidence, then is evaluated on held-out data;
-it cannot choose retrospectively using test answers.
-
-Define normalized additive frequency error as `abs(estimate - exact) / N`, with
-N the number of events in that query window. Initially test epsilon in
-{0.005, 0.01, 0.02}; define feasibility as the maximum error over the declared
-key/window calibration set meeting epsilon. Report held-out per-query errors,
-run-level maxima, and violation rates. Empty windows must have a separate exact
-policy because N is zero. These empirical checks do not establish formal delta.
-
-Use two common objectives:
-
-- Minimum state memory subject to the same empirical accuracy constraint.
-- A shared software cost: `lambda_cpu * (Nu*tu + Nq*tq + Nm*tm)
-  + lambda_mem * B*T`, where operation counts, per-operation CPU, retained bytes,
-  and horizon have identical definitions. Fix weights before testing and show
-  a CPU–memory trade-off curve rather than only one favorable weighting.
-
-Run a shared-table comparison to isolate selection, then an actual calibration
-comparison to measure costs. Record LHS/search seeds, benchmark calls, cache
-hits, planning wall time, and all ERP construction costs. Report first-use and
-amortized costs over 1, 10, and 100 planning requests; permit baseline caching.
-
-Search adaptation requirements: implement initialization, neighbor direction,
-deduplication, resource/incumbent pruning, stopping, and explicit no-feasible
-outcomes. Freeze deviations from Algorithm 4 before results. Do not silently
-count a best-effort inaccurate configuration as feasible. ERP and search must
-consume the same kind of accuracy evidence, not different training datasets.
-
-### Operational definition of “not worse”
-
-Use paired runs and report feasible-selection rate, held-out accuracy, memory,
-CPU cost, planning cost, and gap to the grid oracle. Before final testing,
-preregister practical non-inferiority margins. Suggested starting margins are
-5% resource overhead and 2 percentage points lower run-level accuracy pass rate;
-these are proposed experimental tolerances, not established guarantees.
-
-Claim non-inferiority only if the appropriate paired 95% confidence bounds fall
-inside the frozen margins. Report infeasible selections separately rather than
-dropping them from cost ratios. If results are inconclusive, say so. Configuration
-quality and planning-time competitiveness are separate conclusions; building
-ERP may cost more initially even if subsequent selection is faster.
-
-## 7. Implementation gates and execution order
-
-This is an evaluation specification, not a list of already available runner
-flags. Implement and test each baseline switch before collecting measurements.
-
-1. Audit installed Planner/runtime capabilities and pin all revisions. Record
-   backend-local versus Collector deployment support separately.
-2. Implement the common CMS oracle/benchmark contract and CMS ERP accuracy
-   mapping. The ERP adapter alone is not proof that measured CMS parameters
-   survive workload selection and physical compilation.
-3. Implement AutoSketch-Adapted and the 56-point grid oracle; test initialization,
-   boundaries, pruning, deterministic seeds, and no-feasible outcomes. Run E3
-   as a calibration sanity check before the main experiment.
-4. Build the recurring-window harness and E1 controls. Validate complete-window
-   answers, no unintended fallback, and physical sharing/non-sharing identities.
-   Compare locked-parameter plans first; then enable sizing.
-5. Audit E2 and add executable coverage cells family by family. Do not publish
-   a catalog-count result without runtime evidence.
-6. Execute the frozen matrix, retain failures, and generate paired comparisons.
-
-Relevant starting points:
-
-- [ERP deployment contract](../../control_plane/docs/design-erp-deployment.md)
-- [Physical compiler](../../control_plane/src/physical/compiler.rs)
-- [Compatibility process tests](../../data_plane/tests/asapquery_compatibility_process_e2e.rs)
-- [Sketch process oracles](../../data_plane/tests/all_sketches_process_oracle_e2e.rs)
-- [ERP E2E follow-up PR #542](https://github.com/ProjectASAP/ASAPQuery-backend/pull/542)
-
-The #542 KLL process regression is a correctness prerequisite, not an AutoSketch
-comparison. Its empirical accuracy path is scoped to KLL rank error and
-epsilon-only requests; CMS mapping, the search adaptation, and workload ablation
-controls still need dedicated evaluation implementation. Do not assume that
-theoretical candidate support implies empirical ERP coverage for every family.
-
-## 8. Required artifacts and final presentation
-
-Each run records a manifest containing revisions, machine settings, data hashes,
-seeds, window/recurrence/grouping definitions, candidate grid, accuracy metric,
-cost weights, calibration budget, and baseline controls. Save profiles, selected
-plans, planner traces, exact answers, per-query results, raw resource time series,
-failures, and a script that regenerates every figure.
-
-Recommended paper order:
-
-1. E1: resource/latency versus recurrence and sharing, with mechanism ablations.
-2. E2: verified task coverage and common-catalog/full-catalog comparisons.
-3. E3: single-sketch configuration quality, oracle gaps, and calibration cost.
-
-The intended conclusion is that ASAP extends the decision scope beyond local
-sketch configuration to recurring-window workload planning, while retaining
-competitive configuration quality. Qualify each part by the actual workload,
-accuracy contract, deployment support, and measured uncertainty. No ClickHouse,
-native-switch speed comparison, or automatic drift-detection claim is required
-for this evaluation.
diff --git a/docs/evaluation/clickhouse-mixed-process-e2e-2026-09-10.md b/docs/evaluation/clickhouse-mixed-process-e2e-2026-09-10.md
deleted file mode 100644
index aedcecbb0..000000000
--- a/docs/evaluation/clickhouse-mixed-process-e2e-2026-09-10.md
+++ /dev/null
@@ -1,34 +0,0 @@
-# ClickHouse mixed process differential E2E (2026-09-10)
-
-This test closes the process-level gap left by the runtime differential in PR #596. It starts with SQL and a control-plane workload; it never edits a `QueryPlanEntry` fixture.
-
-## Path under test
-
-1. `control_plane::clickhouse::compile_clickhouse_workload` compiles the SQL into the shared QueryPlan DAG.
-2. The produced publication contains `ReadMaterialization`, `ExternalExact`, `RelationalJoin`, and a relational `Project` operation.
-3. The test starts the real `data_plane` binary with its production ClickHouse HTTP listener and real ClickHouse exact backend.
-4. It stages and activates the compiler-produced publication through `/api/v1/physical-plan`.
-5. It requests real ClickHouse backfill and waits for SummaryStore completion.
-6. It changes the summarized source rows from `2, 3` to `999, 999` after taking the exact baseline.
-7. It queries the production listener and requires `x-asap-execution: hybrid` plus byte-for-byte equality with the pre-mutation exact baseline (`2000\t0.5\n`).
-
-The source mutation is the fallback guard: a full exact fallback would return `2000\t199.8\n`, so it cannot satisfy the equality assertion.
-
-## Compiler gap fixed
-
-The relational compiler previously preserved direct exact table scans as `ExactFallback`, and ClickHouse workload compilation rejected every plan containing that node. Predicate-free table scan cuts are now lowered to typed `ExternalExact` requests with quoted identifiers, the planned relational schema, and bounded `from`/`to` parameters. Other exact cuts continue to fail closed.
-
-## Reproduction
-
-```sh
-CARGO_TARGET_DIR=/path/to/shared-target \
-  cargo test -p control_plane compiles_summary_joined_with_exact_table_into_mixed_dag
-
-CLICKHOUSE_URL=http://127.0.0.1:18123 \
-CLICKHOUSE_USER="$CLICKHOUSE_USER" \
-CLICKHOUSE_PASSWORD="$CLICKHOUSE_PASSWORD" \
-CARGO_TARGET_DIR=/path/to/shared-target \
-  cargo test -p data_plane --test clickhouse_differential_e2e -- --nocapture
-```
-
-Observed result: the compiler regression passed, and both real ClickHouse differential tests passed. Raw earlier investigation logs remain in `/tmp/asap-clickhouse-mixed-e2e-20260910/` on the test host.
diff --git a/docs/evaluation/clickhouse-mixed-runtime-differential-2026-09-10.md b/docs/evaluation/clickhouse-mixed-runtime-differential-2026-09-10.md
deleted file mode 100644
index 61f3e82e2..000000000
--- a/docs/evaluation/clickhouse-mixed-runtime-differential-2026-09-10.md
+++ /dev/null
@@ -1,91 +0,0 @@
-# ClickHouse mixed runtime differential — 2026-09-10
-
-Base: `origin/main` at `791f7d7b0feab3827e7e6f5100e65ef29aec68de`.
-The real ClickHouse server was `http://127.0.0.1:18123`; credentials came from
-the running test container and are not recorded in this artifact.
-
-## Result
-
-The mixed DAG produced the same `TabSeparated` result as the equivalent full
-ClickHouse query:
-
-```text
-1970-01-01T00:00:02	0.5
-```
-
-The mixed runtime test used these nodes in a shared `QueryPlanEntry` fixture:
-
-```text
-SummaryStore ReadMaterialization -> ExactReadout --+
-                                                    +-> RelationalJoin -> Project
-ClickHouse ExternalExact --------------------------+
-```
-
-The production startup path initially could not execute that graph.
-`main.rs` gave the HTTP server a `ClickHouseHttpFallback`, but did not give the
-same exact backend to `CatalogClickHouseAccelerator`. Every reachable
-`ExternalExact` node therefore returned `endpoint unavailable`, causing the
-whole request to fall back. The corrected startup wiring shares that backend
-with the accelerator. Production and the runtime differential now use the same
-constructor, which requires both the active physical-plan handle and exact
-backend. This is focused construction coverage for the missing wiring.
-
-The real backfill lifecycle test also exposed two fixture errors: the backfill
-materialization omitted the fixture's `pane_origin_ms`, and the readout fixture
-registered an additional empty series when it was meant to consume only
-backfilled state. Aligning the physical identity and avoiding the empty series
-makes the test exercise the persisted SummaryStore data.
-
-## Route matrix
-
-| Route | Evidence | Result |
-|---|---|---|
-| warm summary | `catalog_hit_executes_bound_summary_store_dag_and_encodes_typed_result` | pass; SummaryStore result `50.0` |
-| hybrid runtime | `real_clickhouse_runtime_differential_uses_production_mixed_constructor` | pass; real ExternalExact + local Join/Project equals full exact query |
-| incomplete coverage | `incomplete_summary_store_coverage_falls_back` | pass; explicit `IncompleteCoverage` |
-| full exact fallback | `clickhouse_differential_e2e` | pass; proxy bytes and status equal ClickHouse for four queries |
-| ClickHouse backfill to warm | `real_clickhouse_reader_enters_backfill_service_lifecycle` | pass; reader populates the same SummaryStore read by the SQL DAG |
-
-## Architecture audit
-
-- SQL compilation publishes language-tagged entries into the shared
-  `QueryPlan`, together with the authoritative `SummaryCatalog`,
-  `PrecomputePlan`, and `TransmissionPlan`.
-- Summary leaves use shared `MaterializationBinding` values. Installation
-  validates their catalog identity, pane duration, and pane origin before one
-  `ActivePhysicalPlan` snapshot becomes visible.
-- Runtime lookup snapshots that shared physical plan, reads the shared
-  `SketchStore`/SummaryStore, and executes `ExternalExact`, `RelationalJoin`,
-  and relational operations from the shared `QueryPlanNode` graph.
-- `ClickHouseSqlCatalog` is the ASAPPlanner table-schema input used for SQL
-  lowering and canonicalization. It is not a second executable-plan catalog.
-- No ClickHouse-specific stage, activate, token, or startup sidecar production
-  path remains. The only production startup defect found was the missing exact
-  backend injection fixed here.
-- ClickHouse-specific result and fallback enums stay at the protocol boundary;
-  they do not duplicate query-plan ownership or summary execution types.
-
-## Commands
-
-With `CLICKHOUSE_URL`, `CLICKHOUSE_USER`, and `CLICKHOUSE_PASSWORD` set:
-
-```bash
-cargo test -p data_plane \
-  query_engines::asap_clickhouse_query_engine::accelerator::tests -- --nocapture
-cargo test -p data_plane --test clickhouse_differential_e2e -- --nocapture
-cargo check -p data_plane --bin data_plane
-```
-
-All commands passed. Raw logs from this run are in
-`/tmp/asap-clickhouse-mixed-e2e-20260910/` on the evaluation host.
-
-## Scope limitation
-
-The real-ClickHouse mixed test is a runtime differential in the accelerator
-module. It builds a validated physical-plan fixture, replaces its query entry
-with a mixed `QueryPlanEntry`, and invokes `CatalogClickHouseAccelerator`; it
-does not compile that mixed plan through the control-plane endpoint, publish it
-over HTTP, or launch the `data_plane` binary. The production-wiring regression
-is covered by sharing the required constructor with `main.rs`, plus successful
-binary compilation. A full compile/publish/process differential remains
-follow-up work.
diff --git a/docs/evaluation/compiled-plan-inspection-example.svg b/docs/evaluation/compiled-plan-inspection-example.svg
deleted file mode 100644
index e27e742f5..000000000
--- a/docs/evaluation/compiled-plan-inspection-example.svg
+++ /dev/null
@@ -1,106 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN"
- "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<!-- Generated by graphviz version 2.43.0 (0)
- -->
-<!-- Title: compiled_physical_plan Pages: 1 -->
-<svg width="1489pt" height="363pt"
- viewBox="0.00 0.00 1489.00 363.00" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-<g id="graph0" class="graph" transform="scale(1 1) rotate(0) translate(4 359)">
-<title>compiled_physical_plan</title>
-<polygon fill="white" stroke="transparent" points="-4,4 -4,-359 1485,-359 1485,4 -4,4"/>
-<g id="clust1" class="cluster">
-<title>cluster_precompute</title>
-<polygon fill="none" stroke="black" points="8,-123 8,-347 1473,-347 1473,-123 8,-123"/>
-<text text-anchor="middle" x="740.5" y="-331.8" font-family="Times,serif" font-size="14.00">PrecomputePlan</text>
-</g>
-<g id="clust2" class="cluster">
-<title>cluster_precompute_dag_0</title>
-<polygon fill="none" stroke="black" points="55,-239 55,-316 1465,-316 1465,-239 55,-239"/>
-<text text-anchor="middle" x="760" y="-300.8" font-family="Times,serif" font-size="14.00">compat&#45;query&#45;0</text>
-</g>
-<g id="clust3" class="cluster">
-<title>cluster_query_0</title>
-<polygon fill="none" stroke="black" points="589,-8 589,-115 1441.9,-115 1441.9,-8 589,-8"/>
-<text text-anchor="middle" x="1015.45" y="-99.8" font-family="Times,serif" font-size="14.00">QueryPlan: quantile_over_time(0.99, m[1m])</text>
-</g>
-<!-- materialization_dbbce066175e12e0 -->
-<g id="node1" class="node">
-<title>materialization_dbbce066175e12e0</title>
-<polygon fill="none" stroke="black" points="252,-229 16,-229 16,-225 12,-225 12,-221 16,-221 16,-139 12,-139 12,-135 16,-135 16,-131 252,-131 252,-229"/>
-<polyline fill="none" stroke="black" points="16,-225 20,-225 20,-221 16,-221 "/>
-<polyline fill="none" stroke="black" points="16,-139 20,-139 20,-135 16,-135 "/>
-<text text-anchor="middle" x="134" y="-213.8" font-family="Helvetica,sans-Serif" font-size="14.00">materialization</text>
-<text text-anchor="middle" x="134" y="-198.8" font-family="Helvetica,sans-Serif" font-size="14.00">policy_fp:dbbce066175e12e0</text>
-<text text-anchor="middle" x="134" y="-183.8" font-family="Helvetica,sans-Serif" font-size="14.00">metric=m</text>
-<text text-anchor="middle" x="134" y="-168.8" font-family="Helvetica,sans-Serif" font-size="14.00">window_type=sliding</text>
-<text text-anchor="middle" x="134" y="-153.8" font-family="Helvetica,sans-Serif" font-size="14.00">window=60s / 10s</text>
-<text text-anchor="middle" x="134" y="-138.8" font-family="Helvetica,sans-Serif" font-size="14.00">layout=Pane { pane_secs: 10 }</text>
-</g>
-<!-- query_0_1 -->
-<g id="node6" class="node">
-<title>query_0_1</title>
-<polygon fill="none" stroke="black" points="820,-84 597,-84 597,-16 820,-16 820,-84"/>
-<text text-anchor="middle" x="708.5" y="-68.8" font-family="Helvetica,sans-Serif" font-size="14.00">ReadMaterialization</text>
-<text text-anchor="middle" x="708.5" y="-53.8" font-family="Helvetica,sans-Serif" font-size="14.00">policy_fp:dbbce066175e12e0</text>
-<text text-anchor="middle" x="708.5" y="-38.8" font-family="Helvetica,sans-Serif" font-size="14.00">window=10000ms</text>
-<text text-anchor="middle" x="708.5" y="-23.8" font-family="Helvetica,sans-Serif" font-size="14.00">lookback=Some(60000)</text>
-</g>
-<!-- materialization_dbbce066175e12e0&#45;&gt;query_0_1 -->
-<g id="edge3" class="edge">
-<title>materialization_dbbce066175e12e0&#45;&gt;query_0_1</title>
-<path fill="none" stroke="#666666" stroke-dasharray="5,2" d="M252.24,-153.38C349.81,-131.22 488.19,-99.8 586.73,-77.42"/>
-<polygon fill="#666666" stroke="#666666" points="587.76,-80.78 596.74,-75.15 586.21,-73.95 587.76,-80.78"/>
-<text text-anchor="middle" x="290" y="-151.8" font-family="Times,serif" font-size="14.00">reads</text>
-</g>
-<!-- precompute_0_0 -->
-<g id="node2" class="node">
-<title>precompute_0_0</title>
-<polygon fill="none" stroke="black" points="205,-285 63,-285 63,-247 205,-247 205,-285"/>
-<text text-anchor="middle" x="134" y="-269.8" font-family="Helvetica,sans-Serif" font-size="14.00">Fallback #0</text>
-<text text-anchor="middle" x="134" y="-254.8" font-family="Helvetica,sans-Serif" font-size="14.00">MaintenanceInput</text>
-</g>
-<!-- precompute_0_1 -->
-<g id="node3" class="node">
-<title>precompute_0_1</title>
-<polygon fill="none" stroke="black" points="1089,-285 328,-285 328,-247 1089,-247 1089,-285"/>
-<text text-anchor="middle" x="708.5" y="-269.8" font-family="Helvetica,sans-Serif" font-size="14.00">SummaryAgg #1</text>
-<text text-anchor="middle" x="708.5" y="-254.8" font-family="Helvetica,sans-Serif" font-size="14.00">Materialization { summary_definition: SummaryDefinitionId(PolicyFingerprint(15833777119011148512)) }</text>
-</g>
-<!-- precompute_0_0&#45;&gt;precompute_0_1 -->
-<g id="edge1" class="edge">
-<title>precompute_0_0&#45;&gt;precompute_0_1</title>
-<path fill="none" stroke="black" d="M205.2,-266C236.16,-266 275.17,-266 317.71,-266"/>
-<polygon fill="black" stroke="black" points="317.71,-269.5 327.71,-266 317.71,-262.5 317.71,-269.5"/>
-<text text-anchor="middle" x="290" y="-269.8" font-family="Times,serif" font-size="14.00">Input</text>
-</g>
-<!-- precompute_0_2 -->
-<g id="node4" class="node">
-<title>precompute_0_2</title>
-<polygon fill="none" stroke="black" points="1457,-285 1164,-285 1164,-247 1457,-247 1457,-285"/>
-<text text-anchor="middle" x="1310.5" y="-269.8" font-family="Helvetica,sans-Serif" font-size="14.00">SummaryEstimate #2</text>
-<text text-anchor="middle" x="1310.5" y="-254.8" font-family="Helvetica,sans-Serif" font-size="14.00">Query { query_node: QueryNodeId(0) }</text>
-</g>
-<!-- precompute_0_1&#45;&gt;precompute_0_2 -->
-<g id="edge2" class="edge">
-<title>precompute_0_1&#45;&gt;precompute_0_2</title>
-<path fill="none" stroke="black" d="M1089.06,-266C1111.48,-266 1133.26,-266 1153.85,-266"/>
-<polygon fill="black" stroke="black" points="1153.86,-269.5 1163.86,-266 1153.86,-262.5 1163.86,-269.5"/>
-<text text-anchor="middle" x="1126.5" y="-269.8" font-family="Times,serif" font-size="14.00">Input</text>
-</g>
-<!-- query_0_0 -->
-<g id="node5" class="node">
-<title>query_0_0</title>
-<polygon fill="none" stroke="black" points="1429.8,-37.92 1429.8,-62.08 1359.91,-79.16 1261.09,-79.16 1191.2,-62.08 1191.2,-37.92 1261.09,-20.84 1359.91,-20.84 1429.8,-37.92"/>
-<polygon fill="none" stroke="black" points="1433.79,-34.77 1433.79,-65.23 1360.39,-83.17 1260.61,-83.17 1187.21,-65.23 1187.21,-34.77 1260.61,-16.83 1360.39,-16.83 1433.79,-34.77"/>
-<text text-anchor="middle" x="1310.5" y="-53.8" font-family="Helvetica,sans-Serif" font-size="14.00">SummaryEstimate</text>
-<text text-anchor="middle" x="1310.5" y="-38.8" font-family="Helvetica,sans-Serif" font-size="14.00">Quantile { q: 0.99 }</text>
-</g>
-<!-- query_0_1&#45;&gt;query_0_0 -->
-<g id="edge4" class="edge">
-<title>query_0_1&#45;&gt;query_0_0</title>
-<path fill="none" stroke="black" d="M820.25,-50C920.95,-50 1069.74,-50 1176.78,-50"/>
-<polygon fill="black" stroke="black" points="1177,-53.5 1187,-50 1177,-46.5 1177,-53.5"/>
-</g>
-</g>
-</svg>
diff --git a/docs/evaluation/e2e-physical-dag.md b/docs/evaluation/e2e-physical-dag.md
deleted file mode 100644
index 8ea94b773..000000000
--- a/docs/evaluation/e2e-physical-dag.md
+++ /dev/null
@@ -1,268 +0,0 @@
-# E2E physical-DAG walkthrough for Milind
-
-This is a reproducible inspection path from workload inputs to installed state
-and query execution. Start with the checked-in demonstration, then replace its
-workload and samples with a dataset replay. The demo's declared costs are not
-measurements, and neither a compiled plan nor an HTTP success proves a benefit.
-
-Commands below run from the ASAPQuery-backend repository root. Use the repository
-Rust toolchain and dependency checkout setup; the workspace currently expects
-sibling ASAPCollector and asap_sketchlib checkouts as declared in Cargo.toml.
-Docker, curl, Python 3 and jq are needed for the interactive Prometheus demo.
-Record backend/Planner/sketch-library revisions and input hashes for a comparison.
-
-## a. Workload and ERP → post-ASAP candidates
-
-The input [demonstration snapshot](../examples/asapquery-compatibility-demo-snapshot.json)
-is a `BackendLocalPlanningSnapshot`. Its `query_workload` and `data_workload`
-use ASAPPlanner's shared types. `implementation` supplies backend capability,
-window and cost inputs; optional `implementation.erp` supplies ERP evidence.
-`environment.target` is `backend_local_remote_write` for this path.
-
-```bash
-mkdir -p target/physical-dag-inspection
-jq '{snapshot_version, query_workload, data_workload, implementation, environment}' \
-  docs/examples/asapquery-compatibility-demo-snapshot.json
-cargo run --locked -p control_plane --example calibration_candidates -- \
-  docs/examples/asapquery-compatibility-demo-snapshot.json \
-  > target/physical-dag-inspection/candidates.json
-jq '.candidates[] | {candidate_index, planner_selected_queries, unavailable_reason}' \
-  target/physical-dag-inspection/candidates.json
-```
-
-`calibration_candidates` exports bindable alternatives and their actual node/edge
-structure; it does **not** choose an evaluation winner. Unsupported candidates
-retain `unavailable_reason`. Some leaf metadata is explicitly Debug-encoded;
-this diagnostic forest is not an installable IR format.
-
-Planner owns query semantics, summary families, parameters and candidate
-selection. ERP can affect supported evidence-based choices, but supplying an
-artifact does not prove that it was eligible or used. Freshness, source/update
-semantics, parameters and accuracy constraints still apply. The checked-in demo
-is not an empirical-ERP benchmark. For deployment, use the priced snapshot workflow in [execution calibration](../../tools/o11y-execution/CALIBRATION.md).
-`compile_workload_artifact` requires complete workload quotes; do not relabel
-demo costs as measured evidence.
-
-For the existing observation → ERP-selected KLL → installed HTTP correctness
-fixture, see [ERP process validation](../developer_docs/erp-process-validation.md):
-
-```bash
-cargo test --locked -p data_plane --test asapquery_compatibility_process_e2e \
-  erp_planning_process -- --nocapture
-```
-
-Its `ERP_PLANNED` and `ERP_WARM` records expose the fitted observation, available
-profiles, selected parameters, installed identity and actual response. This is a
-separate correctness fixture, not measured evidence for the demo workload.
-
-## b. Selected SDS → control-plane execution plans
-
-Run the normal snapshot compiler, without selecting a candidate index or
-substituting a preferred sketch family:
-
-```bash
-cargo run --locked -p control_plane --example compile_workload_artifact -- \
-  "$ASAPQUERY_PLANNING_SNAPSHOT" \
-  --dot target/physical-dag-inspection/selected.dot \
-  > target/physical-dag-inspection/selected.json
-jq '{summary_catalog, precompute_plan, query_plan}' target/physical-dag-inspection/selected.json \
-  > target/physical-dag-inspection/physical-plan.json
-jq '{summary_catalog, precompute_plan, query_plan}' \
-  target/physical-dag-inspection/selected.json
-dot -Tsvg target/physical-dag-inspection/selected.dot \
-  -o target/physical-dag-inspection/selected.svg
-```
-
-`compile_workload_artifact` calls the same evidence-required snapshot compiler
-used by startup. Set `ASAPQUERY_PLANNING_SNAPSHOT` to a priced snapshot prepared
-using the [cost evidence workflow](../examples/workload-cost-evidence.md).
-The checked-in unquoted templates support candidate discovery only. The output
-includes the selected plan, logical selection trace and complete cost comparison.
-MetricsQL compilation requires quotes collected for that frontend.
-
-The compiler derives sibling plans from the selected post-ASAP DAG:
-
-| Artifact | What to inspect |
-| --- | --- |
-| `SummaryCatalog` | Source/filter/grouping `DataDescriptor`, accumulator/readout `SummaryDescriptor`, stable `SummaryDefinitionId`, physical layout and origin |
-| `PrecomputePlan` | Actual materializations, semantic window/slide, stored layout, ingest protocol, schemas, producer bindings and installed executable subDAGs |
-| `QueryPlan` | Query roots, exact dependencies, materialization bindings, readout operation and output grouping |
-| `TransmissionPlan` | Producer frame identity/encoding policy; a backend-local plan need not have external collector rules |
-
-These are the existing shared contracts, not separate optimizer or storage DTOs.
-FullWindow, Pane and HierarchicalRollup are explicit representations. A backend
-must not invent a pane width from a query interval. Layout, cadence and origin
-participate in identity, cost and coverage checks.
-
-## c. Samples → physical SID and SummaryInstanceId
-
-For the simplest live run:
-
-```bash
-export ASAPQUERY_PLANNING_SNAPSHOT=/absolute/path/priced-snapshot.json
-./scripts/e2e.sh asapquery-demo
-```
-
-The [demo runner](../../demos/asapquery/run.sh) starts pinned Prometheus and
-Pushgateway containers, starts the production backend with the snapshot, emits
-gauge/counter/latency samples (including a counter reset), compares queries and
-writes evidence under `target/asapquery-demo-evidence`. Its cleanup stops its own
-processes; inspect the saved output after it exits.
-
-For a separately managed Prometheus, configure:
-
-```yaml
-remote_write:
-  - url: http://127.0.0.1:9091/api/v1/write
-```
-
-Then keep the backend running for inspection:
-
-```bash
-cargo run --locked -p data_plane -- \
-  --profile asapquery \
-  --planning-snapshot "$ASAPQUERY_PLANNING_SNAPSHOT" \
-  --prometheus-server http://127.0.0.1:9090 \
-  --forward-unsupported-queries --http-port 9091 \
-  --output-dir target/physical-dag-inspection/runtime
-curl -fsS http://127.0.0.1:9091/api/v1/physical-plan/status | jq .
-curl -fsS http://127.0.0.1:9091/api/v1/summary-inventory | jq .
-```
-
-Run the curls from another terminal. An installed plan can precede ready
-instances. `SummaryDefinitionId` identifies reusable state semantics, while the
-resolver allocates a physical SID for a population/lifetime. Catalog-bound
-metadata exposes `SummaryInstanceId` and concrete window/group coordinates.
-Do not use a query-local node number or a plan definition ID as a physical SID.
-Persisted SID lifetimes and catalog generations matter on restart/reactivation.
-
-Remote Write v1 uses Snappy-compressed protobuf `WriteRequest`, not JSON posted
-to this URL. Accepted scalar samples enter bounded queues, workers update the
-selected accumulators, and the sink writes SketchStore. `204` means atomic
-bounded queue admission and in-memory dedup bookkeeping, **not** durable
-accumulator commit. There is no durable raw-sample WAL or recovered receiver
-dedup state. Native histograms and exemplars are rejected. Stale markers are
-recognized, deduplicated and counted, then excluded from numeric aggregation;
-this is not propagation of a lifecycle event to the worker.
-
-Legacy population routing works on main. Versioned canonical routing has an
-explicit configuration identity; its installation is still gated until the
-complete-population runtime/CP integration is accepted. Do not edit only the
-outer state's version or assume new routing has been activated by this guide.
-
-## d. Precompute subDAG and completion
-
-```bash
-jq '.precompute_plan | {materializations, executable_dags}' \
-  target/physical-dag-inspection/selected.json
-```
-
-Look for explicit ingestion-time operations and frontier bindings. Raw
-materializations receive samples; a derived materialization consumes its
-bound immutable input program and must not receive raw backfill/collector jobs.
-The runtime supports only its validated operator, schema, grouping and window
-subset. A traversable DAG does not prove every operator can execute.
-
-For finite replay only, after sending the entire dataset:
-
-```bash
-curl -fsS -X POST http://127.0.0.1:9091/api/v1/precompute/drain | jq .
-```
-
-This is a finite-input closure operation, not a timer or an ordinary flush for a
-live Prometheus deployment. It closes that receiver; later writes in the closed
-generation are rejected. Durable completion and retry/recovery are distinct
-from queue admission. See [precomputation and completion](../developer_docs/precomputation-replay.md).
-
-Prometheus `WriteRequest` has no authoritative event-time watermark or
-producer/partition roster. Worker maximum timestamps and inactivity therefore
-cannot prove continuous global completion. The existing typed
-`SummaryWatermarkBarrier` carries catalog generation, producer/partition/epoch,
-sequence and watermark; `MultiSourceCoordinator` validates its registered
-partition set. `OutputSink::advance_summary_watermark` is an internal Rust API,
-not a public HTTP barrier endpoint. External producer binding, durable ordering
-and continuous scheduling must be completed before claiming that live
-remote-write automatically supplies this proof.
-
-## e. QueryPlan → physical DAG → SID-bound readout
-
-```bash
-jq '.query_plan.entries' target/physical-dag-inspection/selected.json
-curl -sS -D target/physical-dag-inspection/query.headers --get \
-  http://127.0.0.1:9091/api/v1/query \
-  --data-urlencode 'query=sum(sum_over_time(asap_demo_gauge[5s]))' \
-  > target/physical-dag-inspection/query.json
-jq . target/physical-dag-inspection/query.json
-```
-
-Use a registered query and an evaluation time covered by the samples; absence
-of readiness should remain visible. A QueryPlan `ReadMaterialization` binds a
-summary definition/window/grouping. The store resolves compatible physical
-instances under the active catalog; it checks coverage and decodes actual state
-before the typed readout. Exact residual leaves can coexist with summary reads.
-
-Inspect both HTTP headers and JSON. A successful response is not automatically
-warm: check actual `infos`, `x-asap-execution`, errors, labels, timestamps and the
-exact-backend trace. An external-only installed DAG is not ASAP acceleration.
-An error or missing result must not carry a successful warm classification.
-Compare complete series/label sets; never normalize away output-label errors.
-
-The finite multi-source stack has real single-population process coverage.
-Wider canonical multi-group activation is separately under validation: a
-20/40-group `quantile(0.9, ...)` probe exposed a DDS rank/interpolation mismatch
-(PromQL mathematical reference 38). Do not use the pending activation as a passed accuracy or
-performance result. The actual selected family's semantics and error bound must
-pass before that scope is described as supported.
-
-## f. Dataset replay or a fake exporter
-
-For a scrape-based synthetic source, use the demo's Pushgateway emission loop
-and [Prometheus configuration](../../demos/asapquery/prometheus.yml). Prometheus
-performs normal scraping and remote-write encoding. Sending exposition text
-directly to `/api/v1/write` is not equivalent.
-
-For timestamp-preserving recorded input, use the existing replay tool:
-
-```bash
-cargo build --locked -p control_plane --example compile_workload_artifact
-cargo build --locked -p data_plane --bin data_plane
-python3 tools/o11y-execution/replay.py \
-  --metrics /path/metrics.txt --queries /path/queries.json \
-  --snapshot /path/costed-version3-snapshot.json \
-  --compiler target/debug/examples/compile_workload_artifact \
-  --data-plane target/debug/data_plane \
-  --exact-url http://127.0.0.1:9090 --output /path/new-run
-```
-
-These paths are operator-supplied inputs, not bundled datasets. Use a fresh,
-dedicated exact Prometheus with its remote-write receiver enabled; the tool
-sends the same validated samples to both sides. Preserve input generator
-revision/seed, file hashes, original query occurrences and evaluation times.
-See [replay requirements and output schema](../../tools/o11y-execution/README.md).
-Inspect `planning.json`, `installed.json`, `ingestion.json`, `queries.json` and,
-when comparing, `comparison.json`. A finished run is not proof of benefit.
-
-## Prometheus, VictoriaMetrics and ClickHouse boundaries
-
-| Backend | Drop-in surface and current boundary |
-| --- | --- |
-| Prometheus | Remote Write v1 samples plus PromQL instant/range HTTP; keep Prometheus as the exact fallback and raw-data authority. The strict `asapquery` profile has explicit startup exclusions. |
-| VictoriaMetrics | The broader backend has a MetricsQL compile/adapter path. `compile_workload_artifact SNAPSHOT.json --metricsql` uses it. This does not turn the strict Prometheus profile into a general VM replacement; counter boundary semantics and unsupported expressions must retain exact routing. |
-| ClickHouse | The broader backend has a SQL workload compiler and typed exact/relational execution. `compile_clickhouse_workload` reads its own `ClickHouseSqlAutomaticWorkload` JSON from stdin; it does not consume the Prometheus snapshot. List/Map/Tuple support does not imply arbitrary lambdas/counter SQL or full protocol compatibility. External-only DAG coverage is not summary acceleration. |
-
-Use the existing process suites to validate a specific supported protocol shape;
-`./scripts/e2e.sh asapquery` exercises production wire/worker/store/query paths
-with a mock exact upstream; it does not start a real Prometheus server.
-The focused production-path matrix can also run directly:
-
-```bash
-cargo test --locked -p data_plane --test asapquery_compatibility_process_e2e \
-  collector_free_profile_serves_complete_matrix_and_falls_back_exactly -- --exact
-```
-
-This focused test uses a mock exact upstream and removes its temporary artifacts
-on completion. It passed against clean backend, Collector and sketch-library
-checkouts; it is not evidence of a real Prometheus server deployment.
-`asapquery-demo` is the separate real-Prometheus/Pushgateway run. Report
-correctness, fallbacks, build/update cost, query latency and whole-deployment
-resources separately. Do not infer a cross-backend speedup from this walkthrough.
diff --git a/docs/evaluation/erp-cost-model-supplement/README.md b/docs/evaluation/erp-cost-model-supplement/README.md
deleted file mode 100644
index 9ad6c4c94..000000000
--- a/docs/evaluation/erp-cost-model-supplement/README.md
+++ /dev/null
@@ -1,58 +0,0 @@
-# Supplemental sketch cost-model diagnostic
-
-These are ASAPQuery-backend evaluation artifacts produced on 2026-09-10 by
-the sketch-bench `scripts/run_erp_v1_figure1.sh` runner at commit `013a70b`.
-They are stored here as supporting measurements for ERP. They are neither
-smoke-test output nor Figure 1.
-
-## Workload and query
-
-Each point inserts a one-million-event `i64` key stream into
-`sketch_oxide::frequency::CountMinSketch`, merges two identically configured
-sketches, and issues point-frequency queries against the observed keys. The
-accuracy pass compares every point-frequency estimate with exact counts.
-
-The 18 scenarios cross CMS rows `{3,5}`, columns `{256,1024,4096}`, and three
-input shapes:
-
-- uniform over 10,000 keys;
-- Zipf power law with `s=1.1` over 10,000 keys;
-- the same Zipf stream with two seeded random 100,000-row intervals receiving
-  50% additional resampled traffic (1.1M effective events).
-
-Seed is 42. Each cost point has 2 warmup runs and 7 measured runs. Accuracy has
-1 warmup and 1 deterministic measured pass. `BENCH_WARMUP_SECS=1`; compilation
-uses Cargo release mode with native CPU tuning. The raw artifact contains 72
-JSONL records: 54 atomic cost records and 18 accuracy records.
-
-## Models
-
-This diagnostic's simplified analytical model sees only algorithmic work: update/query proportional
-to CMS rows and merge proportional to rows times columns. One coefficient per
-operation is calibrated at the smallest steady uniform point. It has no
-distribution or burst input. It is not ASAPPlanner's analytical cost model and
-must not be reported as that baseline. The empirical model is the measured update,
-merge, and query CPU per operation stored in ERP.
-
-## Result
-
-Across 54 plotted atomic-operation points, analytical cost has 11.55% median
-absolute percentage error and 0.984 Spearman rank correlation with measured
-cost. The median errors are 6.25% for update, 73.21% for merge, and 3.93% for
-query. The merge result is the important v1 discrepancy: asymptotic counter
-count alone poorly predicts the fixed and cache-sensitive merge cost, which is
-then multiplied by every pane merge in a sliding-window plan.
-
-This diagnostic validates the narrower claim that an analytical model is a
-useful fallback and often preserves broad ordering, while measured atomic ERP
-costs materially improve quantitative window-cost estimates. It does not yet
-claim an end-to-end planner speedup or accuracy improvement over AutoSketch;
-those require the shared multi-query workload experiment.
-
-Artifacts:
-
-- `docs/evaluation/erp-cost-model-supplement/raw.jsonl`: immutable benchmark records with configs, workload, samples,
-  CPU/wall/memory, and accuracy;
-- `docs/evaluation/erp-cost-model-supplement/cost-model-points.csv`: every plotted analytical/measured point;
-- `docs/evaluation/erp-cost-model-supplement/cost-model-analytical-vs-empirical.png`: plotted diagnostic;
-- `docs/evaluation/erp-cost-model-supplement/summary.json`: aggregate result and execution provenance.
diff --git a/docs/evaluation/erp-cost-model-supplement/cost-model-analytical-vs-empirical.png b/docs/evaluation/erp-cost-model-supplement/cost-model-analytical-vs-empirical.png
deleted file mode 100644
index c80d784fa..000000000
Binary files a/docs/evaluation/erp-cost-model-supplement/cost-model-analytical-vs-empirical.png and /dev/null differ
diff --git a/docs/evaluation/erp-cost-model-supplement/cost-model-points.csv b/docs/evaluation/erp-cost-model-supplement/cost-model-points.csv
deleted file mode 100644
index 8c402cd42..000000000
--- a/docs/evaluation/erp-cost-model-supplement/cost-model-points.csv
+++ /dev/null
@@ -1,55 +0,0 @@
-distribution,zipf_s,burst,rows,cols,operation,measured_ns,analytical_ns,absolute_percentage_error
-uniform,,False,3,256,insert,90.62714285714287,90.62714285714287,0.0
-uniform,,False,3,256,query,99.03423982684494,99.03423982684492,1.434943585173045e-14
-uniform,,False,3,256,merge,3000.0,3000.0,0.0
-uniform,,False,3,1024,insert,89.21585714285713,90.62714285714287,1.5818776610820589
-uniform,,False,3,1024,query,98.85386588357655,99.03423982684492,0.18246523963039618
-uniform,,False,3,1024,merge,7000.0,12000.0,71.42857142857143
-uniform,,False,3,4096,insert,89.1167142857143,90.62714285714287,1.6948880841657143
-uniform,,False,3,4096,query,110.00883220822972,99.03423982684492,9.976101155779554
-uniform,,False,3,4096,merge,20571.428571428572,48000.0,133.33333333333331
-uniform,,False,5,256,insert,137.15085714285712,151.04523809523812,10.13072848528284
-uniform,,False,5,256,query,145.19054199553398,165.0570663780749,13.683070611549894
-uniform,,False,5,256,merge,4000.0,5000.0,25.0
-uniform,,False,5,1024,insert,134.46757142857143,151.04523809523812,12.32837515435658
-uniform,,False,5,1024,query,158.16878822722322,165.0570663780749,4.3550173381590715
-uniform,,False,5,1024,merge,11000.0,20000.0,81.81818181818183
-uniform,,False,5,4096,insert,135.23042857142858,151.04523809523812,11.694712270660428
-uniform,,False,5,4096,query,162.63088889265688,165.0570663780749,1.4918306737039275
-uniform,,False,5,4096,merge,482571.4285714285,80000.0,83.42214328004737
-zipf,1.1,False,3,256,insert,89.12585714285714,90.62714285714287,1.6844558497534146
-zipf,1.1,False,3,256,query,99.22348674834019,99.03423982684492,0.19072794929617212
-zipf,1.1,False,3,256,merge,2857.1428571428573,3000.0,4.999999999999993
-zipf,1.1,False,3,1024,insert,89.30385714285714,90.62714285714287,1.4817789025270256
-zipf,1.1,False,3,1024,query,99.28949829007418,99.03423982684492,0.2570850569548818
-zipf,1.1,False,3,1024,merge,6857.142857142857,12000.0,75.00000000000001
-zipf,1.1,False,3,4096,insert,90.94114285714285,90.62714285714287,0.34527826474891943
-zipf,1.1,False,3,4096,query,126.63696138146254,99.03423982684492,21.79673394994945
-zipf,1.1,False,3,4096,merge,156857.14285714287,48000.0,69.39890710382514
-zipf,1.1,False,5,256,insert,135.486,151.04523809523812,11.484019083328263
-zipf,1.1,False,5,256,query,145.6581569147653,165.0570663780749,13.318107186171002
-zipf,1.1,False,5,256,merge,3857.1428571428573,5000.0,29.629629629629623
-zipf,1.1,False,5,1024,insert,133.72157142857145,151.04523809523812,12.955027735312141
-zipf,1.1,False,5,1024,query,158.29708693923752,165.0570663780749,4.270438306569849
-zipf,1.1,False,5,1024,merge,11000.0,20000.0,81.81818181818183
-zipf,1.1,False,5,4096,insert,135.14014285714285,151.04523809523812,11.769334338286594
-zipf,1.1,False,5,4096,query,155.99903362408412,165.0570663780749,5.806467221981775
-zipf,1.1,False,5,4096,merge,134142.85714285716,80000.0,40.362087326943566
-zipf,1.1,True,3,256,insert,90.01896103896104,90.62714285714287,0.6756152383480707
-zipf,1.1,True,3,256,query,98.34666607740643,99.03423982684492,0.69913274833061
-zipf,1.1,True,3,256,merge,3428.571428571429,3000.0,12.500000000000009
-zipf,1.1,True,3,1024,insert,90.03558441558442,90.62714285714287,0.6570273802277377
-zipf,1.1,True,3,1024,query,99.6215774114028,99.03423982684492,0.5895686454876841
-zipf,1.1,True,3,1024,merge,6857.142857142857,12000.0,75.00000000000001
-zipf,1.1,True,3,4096,insert,88.52454545454546,90.62714285714287,2.3751575247308416
-zipf,1.1,True,3,4096,query,113.32951757180815,99.03423982684492,12.613905054263924
-zipf,1.1,True,3,4096,merge,21142.857142857145,48000.0,127.02702702702699
-zipf,1.1,True,5,256,insert,135.33480519480523,151.04523809523812,11.60856800866473
-zipf,1.1,True,5,256,query,146.44288996920943,165.0570663780749,12.71087753920946
-zipf,1.1,True,5,256,merge,3857.1428571428573,5000.0,29.629629629629623
-zipf,1.1,True,5,1024,insert,133.1848051948052,151.04523809523812,13.410263186036154
-zipf,1.1,True,5,1024,query,159.34171259767035,165.0570663780749,3.586853490671031
-zipf,1.1,True,5,1024,merge,10428.571428571428,20000.0,91.78082191780824
-zipf,1.1,True,5,4096,insert,137.12064935064936,151.04523809523812,10.154990375651119
-zipf,1.1,True,5,4096,query,164.53168131359095,165.0570663780749,0.31932151929000124
-zipf,1.1,True,5,4096,merge,498142.8571428571,80000.0,83.94034987094923
diff --git a/docs/evaluation/erp-cost-model-supplement/raw.jsonl b/docs/evaluation/erp-cost-model-supplement/raw.jsonl
deleted file mode 100644
index c71f664cc..000000000
--- a/docs/evaluation/erp-cost-model-supplement/raw.jsonl
+++ /dev/null
@@ -1,72 +0,0 @@
-{"schema_version":5,"sketch":"cms","algorithm":"cms","impl":"oxide","language":"rust","sketch_config":{"algorithm":"cms","params":{"cols":256,"rows":3}},"workload":{"synthetic":{"description":{"column_num":1,"column_label":["key"],"column_spec":[{"distribution":{"kind":"uniform","lower_bound":0.0,"upper_bound":10000.0,"seed":42},"special_rule":0,"data_type":"i64"}],"row_num":1000000}}},"mode":"bench","runs":7,"bench":{"metric":"throughput","operation":"insert","throughput_items_per_sec":{"mean":11034456.777802657,"stddev":70502.3325380656,"n":7,"samples":[11158617.063489405,11008592.49266393,10976324.047077805,10996715.819823693,11080311.17015144,11063549.03673053,10957087.81468181]},"cpu_time_ms":{"user_ms":{"mean":90.2027142857143,"stddev":1.1739832074729901,"n":7,"samples":[89.608,87.88,91.107,90.938,90.251,90.368,91.267]},"sys_ms":{"mean":0.4244285714285714,"stddev":1.1176482537219028,"n":7,"samples":[0.011,2.959,0.0,0.0,0.001,0.0,0.0]}},"wall_time_ms":{"mean":90.62837214285713,"stddev":0.5767903578445787,"n":7,"samples":[89.61684,90.838134,91.105182,90.936241,90.250173,90.386909,91.265126]},"rss_peak_kb":29156,"heap_allocated_kb":9387,"memory_bytes":6144},"source":"cli","timestamp":"2026-09-10T16:52:34.288626877Z"}
-{"schema_version":5,"sketch":"cms","algorithm":"cms","impl":"oxide","language":"rust","sketch_config":{"algorithm":"cms","params":{"cols":256,"rows":3}},"workload":{"synthetic":{"description":{"column_num":1,"column_label":["key"],"column_spec":[{"distribution":{"kind":"uniform","lower_bound":0.0,"upper_bound":10000.0,"seed":42},"special_rule":0,"data_type":"i64"}],"row_num":1000000}}},"mode":"bench","runs":7,"bench":{"metric":"throughput","operation":"query","throughput_items_per_sec":{"mean":10124019.12889764,"stddev":346963.263165832,"n":7,"samples":[10890636.230968613,9913819.169955576,9931324.888396738,10133724.630220389,9955915.207461363,10065242.904507013,9977470.870773792]},"cpu_time_ms":{"user_ms":{"mean":0.9912857142857142,"stddev":0.03242280208800732,"n":7,"samples":[0.92,1.011,1.009,0.989,1.006,0.996,1.008]},"sys_ms":{"mean":0.0,"stddev":0.0,"n":7,"samples":[0.0,0.0,0.0,0.0,0.0,0.0,0.0]}},"wall_time_ms":{"mean":0.9886908571428572,"stddev":0.032033662962725994,"n":7,"samples":[0.91822,1.008693,1.006915,0.986804,1.004428,0.993518,1.002258]},"rss_peak_kb":29156,"heap_allocated_kb":1162,"memory_bytes":6144},"source":"cli","timestamp":"2026-09-10T16:52:34.288630191Z"}
-{"schema_version":5,"sketch":"cms","algorithm":"cms","impl":"oxide","language":"rust","sketch_config":{"algorithm":"cms","params":{"cols":256,"rows":3}},"workload":{"synthetic":{"description":{"column_num":1,"column_label":["key"],"column_spec":[{"distribution":{"kind":"uniform","lower_bound":0.0,"upper_bound":10000.0,"seed":42},"special_rule":0,"data_type":"i64"}],"row_num":1000000}}},"mode":"bench","runs":7,"bench":{"metric":"throughput","operation":"merge","cpu_time_ms":{"user_ms":{"mean":0.003,"stddev":0.0005773502691896258,"n":7,"samples":[0.002,0.003,0.003,0.003,0.004,0.003,0.003]},"sys_ms":{"mean":0.0,"stddev":0.0,"n":7,"samples":[0.0,0.0,0.0,0.0,0.0,0.0,0.0]}},"wall_time_ms":{"mean":0.0019602857142857143,"stddev":0.0005640918111695749,"n":7,"samples":[0.001366,0.001715,0.002162,0.002008,0.003098,0.001752,0.001621]},"rss_peak_kb":29156,"heap_allocated_kb":506,"memory_bytes":6144,"merge_folds_per_sec":{"mean":540880.8224118407,"stddev":129451.55616518184,"n":7,"samples":[732064.4216691069,583090.3790087464,462534.6901017577,498007.96812749,322788.8960619755,570776.2557077626,616903.1462060456]},"merge_shards":2,"merge_supported":true},"source":"cli","timestamp":"2026-09-10T16:52:34.288636513Z"}
-{"schema_version":5,"sketch":"cms","algorithm":"cms","impl":"oxide","language":"rust","sketch_config":{"algorithm":"cms","params":{"cols":256,"rows":3}},"workload":{"synthetic":{"description":{"column_num":1,"column_label":["key"],"column_spec":[{"distribution":{"kind":"uniform","lower_bound":0.0,"upper_bound":10000.0,"seed":42},"special_rule":0,"data_type":"i64"}],"row_num":1000000}}},"mode":"bench","runs":1,"bench":{"metric":"accuracy","operation":"query","wall_time_ms":{"mean":0.976904,"stddev":0.0,"n":1,"samples":[0.976904]},"memory_bytes":6144,"accuracy":{"aae_all":3371.4813,"aae_top1":3213.0,"aae_top10":3565.3,"aae_top100":3395.67,"aae_top1000":3383.482,"accuracy_runs":1,"are_all":34.0592838646381,"are_top1":23.282608695652176,"are_top10":26.369981998928345,"are_top100":26.56647314413744,"are_top1000":28.74961573762893,"l1_err":33714813.0,"l2_err":340097.52640823484,"probes":10000.0,"probes_all":10000.0,"probes_top1":1.0,"probes_top10":10.0,"probes_top100":100.0,"probes_top1000":1000.0,"relative_error_mean":34.0592838646381,"relative_error_p99":49.18390804597701}},"source":"cli","timestamp":"2026-09-10T16:52:35.410310153Z"}
-{"schema_version":5,"sketch":"cms","algorithm":"cms","impl":"oxide","language":"rust","sketch_config":{"algorithm":"cms","params":{"cols":1024,"rows":3}},"workload":{"synthetic":{"description":{"column_num":1,"column_label":["key"],"column_spec":[{"distribution":{"kind":"uniform","lower_bound":0.0,"upper_bound":10000.0,"seed":42},"special_rule":0,"data_type":"i64"}],"row_num":1000000}}},"mode":"bench","runs":7,"bench":{"metric":"throughput","operation":"insert","throughput_items_per_sec":{"mean":11209985.349036273,"stddev":133989.2303420307,"n":7,"samples":[11276676.528872069,11128684.045130642,11082662.163618483,11027450.013782108,11258169.575188506,11405757.697201246,11290497.419460846]},"cpu_time_ms":{"user_ms":{"mean":89.21499999999999,"stddev":1.0644615227115157,"n":7,"samples":[88.677,89.835,90.232,90.685,88.827,87.677,88.572]},"sys_ms":{"mean":0.0008571428571428572,"stddev":0.0014638501094227996,"n":7,"samples":[0.004,0.0,0.001,0.0,0.0,0.0,0.001]}},"wall_time_ms":{"mean":89.21711114285714,"stddev":1.0667551481026296,"n":7,"samples":[88.67861,89.857884,90.231028,90.682796,88.824386,87.675017,88.570057]},"rss_peak_kb":28944,"heap_allocated_kb":9777,"memory_bytes":24576},"source":"cli","timestamp":"2026-09-10T16:52:37.794840734Z"}
-{"schema_version":5,"sketch":"cms","algorithm":"cms","impl":"oxide","language":"rust","sketch_config":{"algorithm":"cms","params":{"cols":1024,"rows":3}},"workload":{"synthetic":{"description":{"column_num":1,"column_label":["key"],"column_spec":[{"distribution":{"kind":"uniform","lower_bound":0.0,"upper_bound":10000.0,"seed":42},"special_rule":0,"data_type":"i64"}],"row_num":1000000}}},"mode":"bench","runs":7,"bench":{"metric":"throughput","operation":"query","throughput_items_per_sec":{"mean":10149112.53574139,"stddev":414209.29290118266,"n":7,"samples":[11072676.620264769,9963056.984700728,9961488.883974554,10156532.47855956,9918401.312402861,9983397.609774943,9988233.860512318]},"cpu_time_ms":{"user_ms":{"mean":0.9898571428571429,"stddev":0.03821617707825037,"n":7,"samples":[0.905,1.006,1.006,0.987,1.01,1.006,1.009]},"sys_ms":{"mean":0.0,"stddev":0.0,"n":7,"samples":[0.0,0.0,0.0,0.0,0.0,0.0,0.0]}},"wall_time_ms":{"mean":0.986622,"stddev":0.03757265169863135,"n":7,"samples":[0.903124,1.003708,1.003866,0.984588,1.008227,1.001663,1.001178]},"rss_peak_kb":28944,"heap_allocated_kb":1380,"memory_bytes":24576},"source":"cli","timestamp":"2026-09-10T16:52:37.794844761Z"}
-{"schema_version":5,"sketch":"cms","algorithm":"cms","impl":"oxide","language":"rust","sketch_config":{"algorithm":"cms","params":{"cols":1024,"rows":3}},"workload":{"synthetic":{"description":{"column_num":1,"column_label":["key"],"column_spec":[{"distribution":{"kind":"uniform","lower_bound":0.0,"upper_bound":10000.0,"seed":42},"special_rule":0,"data_type":"i64"}],"row_num":1000000}}},"mode":"bench","runs":7,"bench":{"metric":"throughput","operation":"merge","cpu_time_ms":{"user_ms":{"mean":0.007,"stddev":0.00223606797749979,"n":7,"samples":[0.006,0.006,0.006,0.012,0.006,0.006,0.007]},"sys_ms":{"mean":0.0,"stddev":0.0,"n":7,"samples":[0.0,0.0,0.0,0.0,0.0,0.0,0.0]}},"wall_time_ms":{"mean":0.005927714285714285,"stddev":0.002127076061505223,"n":7,"samples":[0.005301,0.005109,0.004866,0.010702,0.005247,0.004665,0.005604]},"rss_peak_kb":28944,"heap_allocated_kb":773,"memory_bytes":24576,"merge_folds_per_sec":{"mean":180959.44165394525,"stddev":40320.0050122087,"n":7,"samples":[188643.65214110547,195733.0201605011,205507.60378133992,93440.47841524948,190585.0962454736,214362.27224008573,178443.96859386153]},"merge_shards":2,"merge_supported":true},"source":"cli","timestamp":"2026-09-10T16:52:37.794851133Z"}
-{"schema_version":5,"sketch":"cms","algorithm":"cms","impl":"oxide","language":"rust","sketch_config":{"algorithm":"cms","params":{"cols":1024,"rows":3}},"workload":{"synthetic":{"description":{"column_num":1,"column_label":["key"],"column_spec":[{"distribution":{"kind":"uniform","lower_bound":0.0,"upper_bound":10000.0,"seed":42},"special_rule":0,"data_type":"i64"}],"row_num":1000000}}},"mode":"bench","runs":1,"bench":{"metric":"accuracy","operation":"query","wall_time_ms":{"mean":0.912142,"stddev":0.0,"n":1,"samples":[0.912142]},"memory_bytes":24576,"accuracy":{"aae_all":715.0551,"aae_top1":427.0,"aae_top10":763.9,"aae_top100":723.5,"aae_top1000":717.446,"accuracy_runs":1,"are_all":7.224615902269501,"are_top1":3.0942028985507246,"are_top10":5.649488360273088,"are_top100":5.662785736010643,"are_top1000":6.095552152720513,"l1_err":7150551.0,"l2_err":74523.52413164584,"probes":10000.0,"probes_all":10000.0,"probes_top1":1.0,"probes_top10":10.0,"probes_top100":100.0,"probes_top1000":1000.0,"relative_error_mean":7.224615902269501,"relative_error_p99":12.950495049504951}},"source":"cli","timestamp":"2026-09-10T16:52:38.914920513Z"}
-{"schema_version":5,"sketch":"cms","algorithm":"cms","impl":"oxide","language":"rust","sketch_config":{"algorithm":"cms","params":{"cols":4096,"rows":3}},"workload":{"synthetic":{"description":{"column_num":1,"column_label":["key"],"column_spec":[{"distribution":{"kind":"uniform","lower_bound":0.0,"upper_bound":10000.0,"seed":42},"special_rule":0,"data_type":"i64"}],"row_num":1000000}}},"mode":"bench","runs":7,"bench":{"metric":"throughput","operation":"insert","throughput_items_per_sec":{"mean":11221840.95271657,"stddev":84026.83764014296,"n":7,"samples":[11327260.154837755,11210454.67272378,11126960.353438549,11119044.05486452,11193556.254722493,11319805.433825826,11255805.744603066]},"cpu_time_ms":{"user_ms":{"mean":89.1167142857143,"stddev":0.6674872568785452,"n":7,"samples":[88.285,89.204,89.873,89.938,89.338,88.342,88.837]},"sys_ms":{"mean":0.0,"stddev":0.0,"n":7,"samples":[0.0,0.0,0.0,0.0,0.0,0.0,0.0]}},"wall_time_ms":{"mean":89.11621957142857,"stddev":0.6670511567106052,"n":7,"samples":[88.282602,89.202448,89.871804,89.935789,89.337113,88.340741,88.84304]},"rss_peak_kb":31104,"heap_allocated_kb":12003,"memory_bytes":98304},"source":"cli","timestamp":"2026-09-10T16:52:41.235591325Z"}
-{"schema_version":5,"sketch":"cms","algorithm":"cms","impl":"oxide","language":"rust","sketch_config":{"algorithm":"cms","params":{"cols":4096,"rows":3}},"workload":{"synthetic":{"description":{"column_num":1,"column_label":["key"],"column_spec":[{"distribution":{"kind":"uniform","lower_bound":0.0,"upper_bound":10000.0,"seed":42},"special_rule":0,"data_type":"i64"}],"row_num":1000000}}},"mode":"bench","runs":7,"bench":{"metric":"throughput","operation":"query","throughput_items_per_sec":{"mean":9954452.305682607,"stddev":447735.09228784544,"n":7,"samples":[10957307.04456227,9862818.063554028,9660361.027012302,9779147.727717234,9859113.271352375,9746940.191800289,9815478.813779755]},"cpu_time_ms":{"user_ms":{"mean":1.1018571428571429,"stddev":0.25703140441810385,"n":7,"samples":[0.914,1.016,1.037,1.025,1.016,1.028,1.677]},"sys_ms":{"mean":0.0,"stddev":0.0,"n":7,"samples":[0.0,0.0,0.0,0.0,0.0,0.0,0.0]}},"wall_time_ms":{"mean":1.006190857142857,"stddev":0.04190459774865034,"n":7,"samples":[0.912633,1.013909,1.035158,1.022584,1.01429,1.025963,1.018799]},"rss_peak_kb":31104,"heap_allocated_kb":2943,"memory_bytes":98304},"source":"cli","timestamp":"2026-09-10T16:52:41.235595415Z"}
-{"schema_version":5,"sketch":"cms","algorithm":"cms","impl":"oxide","language":"rust","sketch_config":{"algorithm":"cms","params":{"cols":4096,"rows":3}},"workload":{"synthetic":{"description":{"column_num":1,"column_label":["key"],"column_spec":[{"distribution":{"kind":"uniform","lower_bound":0.0,"upper_bound":10000.0,"seed":42},"special_rule":0,"data_type":"i64"}],"row_num":1000000}}},"mode":"bench","runs":7,"bench":{"metric":"throughput","operation":"merge","cpu_time_ms":{"user_ms":{"mean":0.020571428571428574,"stddev":0.0007867957924694443,"n":7,"samples":[0.021,0.02,0.021,0.021,0.021,0.021,0.019]},"sys_ms":{"mean":0.0,"stddev":0.0,"n":7,"samples":[0.0,0.0,0.0,0.0,0.0,0.0,0.0]}},"wall_time_ms":{"mean":0.019225285714285716,"stddev":0.000666582006529258,"n":7,"samples":[0.019347,0.018827,0.019845,0.019649,0.019524,0.01949,0.017895]},"rss_peak_kb":31104,"heap_allocated_kb":1196,"memory_bytes":98304,"merge_folds_per_sec":{"mean":52070.77367846653,"stddev":1883.0945449206245,"n":7,"samples":[51687.60014472528,53115.20688373081,50390.52658100277,50893.1752252023,51219.01249743905,51308.3632632119,55881.53115395362]},"merge_shards":2,"merge_supported":true},"source":"cli","timestamp":"2026-09-10T16:52:41.235604235Z"}
-{"schema_version":5,"sketch":"cms","algorithm":"cms","impl":"oxide","language":"rust","sketch_config":{"algorithm":"cms","params":{"cols":4096,"rows":3}},"workload":{"synthetic":{"description":{"column_num":1,"column_label":["key"],"column_spec":[{"distribution":{"kind":"uniform","lower_bound":0.0,"upper_bound":10000.0,"seed":42},"special_rule":0,"data_type":"i64"}],"row_num":1000000}}},"mode":"bench","runs":1,"bench":{"metric":"accuracy","operation":"query","wall_time_ms":{"mean":0.922766,"stddev":0.0,"n":1,"samples":[0.922766]},"memory_bytes":98304,"accuracy":{"aae_all":117.4759,"aae_top1":102.0,"aae_top10":131.3,"aae_top100":123.46,"aae_top1000":120.314,"accuracy_runs":1,"are_all":1.1874754622017727,"are_top1":0.7391304347826086,"are_top10":0.9761312010563834,"are_top100":0.9677289693697954,"are_top1000":1.0219753766556918,"l1_err":1174759.0,"l2_err":14885.860774573972,"probes":10000.0,"probes_all":10000.0,"probes_top1":1.0,"probes_top10":10.0,"probes_top100":100.0,"probes_top1000":1000.0,"relative_error_mean":1.1874754622017727,"relative_error_p99":3.7}},"source":"cli","timestamp":"2026-09-10T16:52:42.358970727Z"}
-{"schema_version":5,"sketch":"cms","algorithm":"cms","impl":"oxide","language":"rust","sketch_config":{"algorithm":"cms","params":{"cols":256,"rows":5}},"workload":{"synthetic":{"description":{"column_num":1,"column_label":["key"],"column_spec":[{"distribution":{"kind":"uniform","lower_bound":0.0,"upper_bound":10000.0,"seed":42},"special_rule":0,"data_type":"i64"}],"row_num":1000000}}},"mode":"bench","runs":7,"bench":{"metric":"throughput","operation":"insert","throughput_items_per_sec":{"mean":7291260.654704709,"stddev":28618.405161804454,"n":7,"samples":[7349381.914041276,7285189.8217767915,7276976.444812928,7295139.745915826,7298623.851771371,7263226.286040101,7270286.5185746625]},"cpu_time_ms":{"user_ms":{"mean":136.72671428571428,"stddev":1.191514402526705,"n":7,"samples":[136.067,134.306,137.413,137.079,137.014,137.66,137.548]},"sys_ms":{"mean":0.4241428571428572,"stddev":1.1186528249895689,"n":7,"samples":[0.0,2.961,0.008,0.0,0.0,0.0,0.0]}},"wall_time_ms":{"mean":137.15229685714286,"stddev":0.5359083031301255,"n":7,"samples":[136.065864,137.264783,137.419711,137.077566,137.01213,137.679863,137.546161]},"rss_peak_kb":28892,"heap_allocated_kb":9509,"memory_bytes":10240},"source":"cli","timestamp":"2026-09-10T16:52:45.471967879Z"}
-{"schema_version":5,"sketch":"cms","algorithm":"cms","impl":"oxide","language":"rust","sketch_config":{"algorithm":"cms","params":{"cols":256,"rows":5}},"workload":{"synthetic":{"description":{"column_num":1,"column_label":["key"],"column_spec":[{"distribution":{"kind":"uniform","lower_bound":0.0,"upper_bound":10000.0,"seed":42},"special_rule":0,"data_type":"i64"}],"row_num":1000000}}},"mode":"bench","runs":7,"bench":{"metric":"throughput","operation":"query","throughput_items_per_sec":{"mean":6902279.265532764,"stddev":217415.60278636543,"n":7,"samples":[7265958.041998691,6978094.366165732,6916184.147552639,6957460.69382581,6799945.600435196,6542027.950160214,6856284.058591061]},"cpu_time_ms":{"user_ms":{"mean":1.453142857142857,"stddev":0.04670270717145707,"n":7,"samples":[1.378,1.435,1.448,1.44,1.473,1.533,1.465]},"sys_ms":{"mean":0.0,"stddev":0.0,"n":7,"samples":[0.0,0.0,0.0,0.0,0.0,0.0,0.0]}},"wall_time_ms":{"mean":1.4500315714285714,"stddev":0.04577307533130922,"n":7,"samples":[1.376281,1.433056,1.445884,1.437306,1.4706,1.528578,1.458516]},"rss_peak_kb":28892,"heap_allocated_kb":1227,"memory_bytes":10240},"source":"cli","timestamp":"2026-09-10T16:52:45.471970807Z"}
-{"schema_version":5,"sketch":"cms","algorithm":"cms","impl":"oxide","language":"rust","sketch_config":{"algorithm":"cms","params":{"cols":256,"rows":5}},"workload":{"synthetic":{"description":{"column_num":1,"column_label":["key"],"column_spec":[{"distribution":{"kind":"uniform","lower_bound":0.0,"upper_bound":10000.0,"seed":42},"special_rule":0,"data_type":"i64"}],"row_num":1000000}}},"mode":"bench","runs":7,"bench":{"metric":"throughput","operation":"merge","cpu_time_ms":{"user_ms":{"mean":0.004,"stddev":0.001,"n":7,"samples":[0.004,0.004,0.003,0.003,0.006,0.004,0.004]},"sys_ms":{"mean":0.0,"stddev":0.0,"n":7,"samples":[0.0,0.0,0.0,0.0,0.0,0.0,0.0]}},"wall_time_ms":{"mean":0.0027797142857142855,"stddev":0.0008550566675735034,"n":7,"samples":[0.002665,0.002809,0.002147,0.002104,0.004608,0.002364,0.002761]},"rss_peak_kb":28892,"heap_allocated_kb":489,"memory_bytes":10240,"merge_folds_per_sec":{"mean":382071.1143519205,"stddev":87307.5275616925,"n":7,"samples":[375234.521575985,355998.57600569597,465766.1853749418,475285.1711026616,217013.8888888889,423011.8443316413,362187.6131836291]},"merge_shards":2,"merge_supported":true},"source":"cli","timestamp":"2026-09-10T16:52:45.471976890Z"}
-{"schema_version":5,"sketch":"cms","algorithm":"cms","impl":"oxide","language":"rust","sketch_config":{"algorithm":"cms","params":{"cols":256,"rows":5}},"workload":{"synthetic":{"description":{"column_num":1,"column_label":["key"],"column_spec":[{"distribution":{"kind":"uniform","lower_bound":0.0,"upper_bound":10000.0,"seed":42},"special_rule":0,"data_type":"i64"}],"row_num":1000000}}},"mode":"bench","runs":1,"bench":{"metric":"accuracy","operation":"query","wall_time_ms":{"mean":1.359781,"stddev":0.0,"n":1,"samples":[1.359781]},"memory_bytes":10240,"accuracy":{"aae_all":3185.4121,"aae_top1":3213.0,"aae_top10":3279.8,"aae_top100":3217.33,"aae_top1000":3195.669,"accuracy_runs":1,"are_all":32.18502685306129,"are_top1":23.282608695652176,"are_top10":24.246393420083443,"are_top100":25.174410844948262,"are_top1000":27.15314706895,"l1_err":31854121.0,"l2_err":320887.42748976627,"probes":10000.0,"probes_all":10000.0,"probes_top1":1.0,"probes_top10":10.0,"probes_top100":100.0,"probes_top1000":1000.0,"relative_error_mean":32.18502685306129,"relative_error_p99":45.724137931034484}},"source":"cli","timestamp":"2026-09-10T16:52:46.639028591Z"}
-{"schema_version":5,"sketch":"cms","algorithm":"cms","impl":"oxide","language":"rust","sketch_config":{"algorithm":"cms","params":{"cols":1024,"rows":5}},"workload":{"synthetic":{"description":{"column_num":1,"column_label":["key"],"column_spec":[{"distribution":{"kind":"uniform","lower_bound":0.0,"upper_bound":10000.0,"seed":42},"special_rule":0,"data_type":"i64"}],"row_num":1000000}}},"mode":"bench","runs":7,"bench":{"metric":"throughput","operation":"insert","throughput_items_per_sec":{"mean":7437009.715385367,"stddev":46315.107651578546,"n":7,"samples":[7457613.99829944,7413106.2740394985,7463234.112347452,7499721.704076866,7434479.430947697,7439012.686499674,7351899.801486942]},"cpu_time_ms":{"user_ms":{"mean":134.46757142857143,"stddev":0.8398410280409888,"n":7,"samples":[134.093,134.889,133.992,133.34,134.51,134.428,136.021]},"sys_ms":{"mean":0.0,"stddev":0.0,"n":7,"samples":[0.0,0.0,0.0,0.0,0.0,0.0,0.0]}},"wall_time_ms":{"mean":134.46713242857143,"stddev":0.8406101550627454,"n":7,"samples":[134.091145,134.896218,133.990169,133.338281,134.508409,134.426441,136.019264]},"rss_peak_kb":28988,"heap_allocated_kb":10204,"memory_bytes":40960},"source":"cli","timestamp":"2026-09-10T16:52:49.767539679Z"}
-{"schema_version":5,"sketch":"cms","algorithm":"cms","impl":"oxide","language":"rust","sketch_config":{"algorithm":"cms","params":{"cols":1024,"rows":5}},"workload":{"synthetic":{"description":{"column_num":1,"column_label":["key"],"column_spec":[{"distribution":{"kind":"uniform","lower_bound":0.0,"upper_bound":10000.0,"seed":42},"special_rule":0,"data_type":"i64"}],"row_num":1000000}}},"mode":"bench","runs":7,"bench":{"metric":"throughput","operation":"query","throughput_items_per_sec":{"mean":6717700.0702077355,"stddev":187812.22313846432,"n":7,"samples":[7103120.258667228,6590828.203472048,6717667.196018841,6594626.961736656,6725324.950888315,6749983.968788074,6542348.951882985]},"cpu_time_ms":{"user_ms":{"mean":1.5827142857142857,"stddev":0.26025930293056715,"n":7,"samples":[1.41,1.519,1.49,1.521,1.489,1.483,2.167]},"sys_ms":{"mean":0.0,"stddev":0.0,"n":7,"samples":[0.0,0.0,0.0,0.0,0.0,0.0,0.0]}},"wall_time_ms":{"mean":1.4895707142857142,"stddev":0.04032376570425223,"n":7,"samples":[1.407832,1.51726,1.488612,1.516386,1.486917,1.481485,1.528503]},"rss_peak_kb":28988,"heap_allocated_kb":1625,"memory_bytes":40960},"source":"cli","timestamp":"2026-09-10T16:52:49.767543813Z"}
-{"schema_version":5,"sketch":"cms","algorithm":"cms","impl":"oxide","language":"rust","sketch_config":{"algorithm":"cms","params":{"cols":1024,"rows":5}},"workload":{"synthetic":{"description":{"column_num":1,"column_label":["key"],"column_spec":[{"distribution":{"kind":"uniform","lower_bound":0.0,"upper_bound":10000.0,"seed":42},"special_rule":0,"data_type":"i64"}],"row_num":1000000}}},"mode":"bench","runs":7,"bench":{"metric":"throughput","operation":"merge","cpu_time_ms":{"user_ms":{"mean":0.011,"stddev":0.0005773502691896261,"n":7,"samples":[0.01,0.011,0.012,0.011,0.011,0.011,0.011]},"sys_ms":{"mean":0.0,"stddev":0.0,"n":7,"samples":[0.0,0.0,0.0,0.0,0.0,0.0,0.0]}},"wall_time_ms":{"mean":0.00988442857142857,"stddev":0.0002556096354097119,"n":7,"samples":[0.00947,0.009876,0.010278,0.009921,0.010088,0.009767,0.009791]},"rss_peak_kb":28988,"heap_allocated_kb":545,"memory_bytes":40960,"merge_folds_per_sec":{"mean":101227.36403655376,"stddev":2623.9998957601247,"n":7,"samples":[105596.62090813094,101255.5690562981,97295.19361743529,100796.29069650236,99127.67644726406,102385.58410975734,102134.61342048821]},"merge_shards":2,"merge_supported":true},"source":"cli","timestamp":"2026-09-10T16:52:49.767551718Z"}
-{"schema_version":5,"sketch":"cms","algorithm":"cms","impl":"oxide","language":"rust","sketch_config":{"algorithm":"cms","params":{"cols":1024,"rows":5}},"workload":{"synthetic":{"description":{"column_num":1,"column_label":["key"],"column_spec":[{"distribution":{"kind":"uniform","lower_bound":0.0,"upper_bound":10000.0,"seed":42},"special_rule":0,"data_type":"i64"}],"row_num":1000000}}},"mode":"bench","runs":1,"bench":{"metric":"accuracy","operation":"query","wall_time_ms":{"mean":1.33326,"stddev":0.0,"n":1,"samples":[1.33326]},"memory_bytes":40960,"accuracy":{"aae_all":626.0661,"aae_top1":427.0,"aae_top10":606.6,"aae_top100":622.58,"aae_top1000":633.201,"accuracy_runs":1,"are_all":6.325801596003122,"are_top1":3.0942028985507246,"are_top10":4.4829552966907436,"are_top100":4.8756856779403295,"are_top1000":5.3811297213292475,"l1_err":6260661.0,"l2_err":65143.95820795663,"probes":10000.0,"probes_all":10000.0,"probes_top1":1.0,"probes_top10":10.0,"probes_top100":100.0,"probes_top1000":1000.0,"relative_error_mean":6.325801596003122,"relative_error_p99":11.278481012658228}},"source":"cli","timestamp":"2026-09-10T16:52:50.938266712Z"}
-{"schema_version":5,"sketch":"cms","algorithm":"cms","impl":"oxide","language":"rust","sketch_config":{"algorithm":"cms","params":{"cols":4096,"rows":5}},"workload":{"synthetic":{"description":{"column_num":1,"column_label":["key"],"column_spec":[{"distribution":{"kind":"uniform","lower_bound":0.0,"upper_bound":10000.0,"seed":42},"special_rule":0,"data_type":"i64"}],"row_num":1000000}}},"mode":"bench","runs":7,"bench":{"metric":"throughput","operation":"insert","throughput_items_per_sec":{"mean":7395258.918645204,"stddev":60619.21966013636,"n":7,"samples":[7488406.78559285,7459477.989609215,7407878.438729763,7384296.14672437,7323709.988173819,7348135.981812188,7354907.099874225]},"cpu_time_ms":{"user_ms":{"mean":134.842,"stddev":1.825538733269345,"n":7,"samples":[133.538,131.345,134.993,135.425,136.545,136.091,135.957]},"sys_ms":{"mean":0.38842857142857135,"stddev":1.0263631354030043,"n":7,"samples":[0.003,2.716,0.0,0.0,0.0,0.0,0.0]}},"wall_time_ms":{"mean":135.22953285714283,"stddev":1.1049018927603944,"n":7,"samples":[133.539754,134.057638,134.991416,135.422521,136.542818,136.088935,135.963648]},"rss_peak_kb":29008,"heap_allocated_kb":14115,"memory_bytes":163840},"source":"cli","timestamp":"2026-09-10T16:52:54.143428486Z"}
-{"schema_version":5,"sketch":"cms","algorithm":"cms","impl":"oxide","language":"rust","sketch_config":{"algorithm":"cms","params":{"cols":4096,"rows":5}},"workload":{"synthetic":{"description":{"column_num":1,"column_label":["key"],"column_spec":[{"distribution":{"kind":"uniform","lower_bound":0.0,"upper_bound":10000.0,"seed":42},"special_rule":0,"data_type":"i64"}],"row_num":1000000}}},"mode":"bench","runs":7,"bench":{"metric":"throughput","operation":"query","throughput_items_per_sec":{"mean":6160063.248423963,"stddev":218435.62624469688,"n":7,"samples":[6603384.23442014,5920053.233118672,6140771.035211181,5994280.257778028,6104391.193805263,6194435.909888302,6163126.874746156]},"cpu_time_ms":{"user_ms":{"mean":1.6272857142857142,"stddev":0.057436092850269405,"n":7,"samples":[1.511,1.691,1.631,1.671,1.639,1.616,1.632]},"sys_ms":{"mean":0.0007142857142857142,"stddev":0.0018898223650461363,"n":7,"samples":[0.005,0.0,0.0,0.0,0.0,0.0,0.0]}},"wall_time_ms":{"mean":1.625048,"stddev":0.055575776137930244,"n":7,"samples":[1.514375,1.689174,1.62846,1.668257,1.638165,1.614352,1.622553]},"rss_peak_kb":29008,"heap_allocated_kb":4479,"memory_bytes":163840},"source":"cli","timestamp":"2026-09-10T16:52:54.143438145Z"}
-{"schema_version":5,"sketch":"cms","algorithm":"cms","impl":"oxide","language":"rust","sketch_config":{"algorithm":"cms","params":{"cols":4096,"rows":5}},"workload":{"synthetic":{"description":{"column_num":1,"column_label":["key"],"column_spec":[{"distribution":{"kind":"uniform","lower_bound":0.0,"upper_bound":10000.0,"seed":42},"special_rule":0,"data_type":"i64"}],"row_num":1000000}}},"mode":"bench","runs":7,"bench":{"metric":"throughput","operation":"merge","cpu_time_ms":{"user_ms":{"mean":0.15757142857142856,"stddev":0.19655182280411201,"n":7,"samples":[0.374,0.364,0.365,0.0,0.0,0.0,0.0]},"sys_ms":{"mean":0.32499999999999996,"stddev":0.4605529285543628,"n":7,"samples":[0.0,0.0,0.002,0.369,0.364,0.242,1.298]}},"wall_time_ms":{"mean":0.4816325714285714,"stddev":0.3627160012750366,"n":7,"samples":[0.373759,0.363277,0.36542,0.367614,0.363103,0.240984,1.297271]},"rss_peak_kb":29008,"heap_allocated_kb":1964,"memory_bytes":163840,"merge_folds_per_sec":{"mean":2651.3720660299728,"stddev":984.429762649067,"n":7,"samples":[2675.520857022841,2752.7203759114946,2736.577089376608,2720.244604394827,2754.0394874181707,4149.653089001759,770.8489590841081]},"merge_shards":2,"merge_supported":true},"source":"cli","timestamp":"2026-09-10T16:52:54.143444089Z"}
-{"schema_version":5,"sketch":"cms","algorithm":"cms","impl":"oxide","language":"rust","sketch_config":{"algorithm":"cms","params":{"cols":4096,"rows":5}},"workload":{"synthetic":{"description":{"column_num":1,"column_label":["key"],"column_spec":[{"distribution":{"kind":"uniform","lower_bound":0.0,"upper_bound":10000.0,"seed":42},"special_rule":0,"data_type":"i64"}],"row_num":1000000}}},"mode":"bench","runs":1,"bench":{"metric":"accuracy","operation":"query","wall_time_ms":{"mean":1.489263,"stddev":0.0,"n":1,"samples":[1.489263]},"memory_bytes":163840,"accuracy":{"aae_all":79.4599,"aae_top1":102.0,"aae_top10":100.8,"aae_top100":91.51,"aae_top1000":82.14,"accuracy_runs":1,"are_all":0.8028119381329706,"are_top1":0.7391304347826086,"are_top10":0.7485524282537298,"are_top100":0.7175660084495267,"are_top1000":0.6968688107595044,"l1_err":794599.0,"l2_err":10744.929269194841,"probes":10000.0,"probes_all":10000.0,"probes_top1":1.0,"probes_top10":10.0,"probes_top100":100.0,"probes_top1000":1000.0,"relative_error_mean":0.8028119381329706,"relative_error_p99":2.8333333333333335}},"source":"cli","timestamp":"2026-09-10T16:52:55.321788284Z"}
-{"schema_version":5,"sketch":"cms","algorithm":"cms","impl":"oxide","language":"rust","sketch_config":{"algorithm":"cms","params":{"cols":256,"rows":3}},"workload":{"synthetic":{"description":{"column_num":1,"column_label":["key"],"column_spec":[{"distribution":{"kind":"zipf","skewness":1.1,"population_size":10000,"seed":42},"special_rule":0,"data_type":"i64"}],"row_num":1000000}}},"mode":"bench","runs":7,"bench":{"metric":"throughput","operation":"insert","throughput_items_per_sec":{"mean":11221331.726849383,"stddev":112306.83382380931,"n":7,"samples":[11317874.851693397,11155656.266341293,11029763.419516081,11168660.11427438,11294764.100888945,11352073.760507934,11230529.574723653]},"cpu_time_ms":{"user_ms":{"mean":89.12585714285714,"stddev":0.8962636198075179,"n":7,"samples":[88.358,89.643,90.666,89.539,88.539,88.092,89.044]},"sys_ms":{"mean":0.0,"stddev":0.0,"n":7,"samples":[0.0,0.0,0.0,0.0,0.0,0.0,0.0]}},"wall_time_ms":{"mean":89.12367042857142,"stddev":0.8962328160924172,"n":7,"samples":[88.35581,89.640625,90.663776,89.536255,88.536599,88.089632,89.042996]},"rss_peak_kb":29116,"heap_allocated_kb":9386,"memory_bytes":6144},"source":"cli","timestamp":"2026-09-10T16:52:57.752650674Z"}
-{"schema_version":5,"sketch":"cms","algorithm":"cms","impl":"oxide","language":"rust","sketch_config":{"algorithm":"cms","params":{"cols":256,"rows":3}},"workload":{"synthetic":{"description":{"column_num":1,"column_label":["key"],"column_spec":[{"distribution":{"kind":"zipf","skewness":1.1,"population_size":10000,"seed":42},"special_rule":0,"data_type":"i64"}],"row_num":1000000}}},"mode":"bench","runs":7,"bench":{"metric":"throughput","operation":"query","throughput_items_per_sec":{"mean":10102336.008693865,"stddev":375766.7164917159,"n":7,"samples":[10908035.276771614,9719132.152970096,10012110.697181484,10125005.06503505,9964975.52873193,9990843.808975466,9996249.5311914]},"cpu_time_ms":{"user_ms":{"mean":0.9928571428571428,"stddev":0.03544210570977487,"n":7,"samples":[0.918,1.031,1.0,0.988,1.005,1.002,1.006]},"sys_ms":{"mean":0.0,"stddev":0.0,"n":7,"samples":[0.0,0.0,0.0,0.0,0.0,0.0,0.0]}},"wall_time_ms":{"mean":0.9904908571428571,"stddev":0.03501411670278415,"n":7,"samples":[0.916297,1.028384,0.998291,0.98716,1.003013,1.000416,0.999875]},"rss_peak_kb":29116,"heap_allocated_kb":1162,"memory_bytes":6144},"source":"cli","timestamp":"2026-09-10T16:52:57.752653657Z"}
-{"schema_version":5,"sketch":"cms","algorithm":"cms","impl":"oxide","language":"rust","sketch_config":{"algorithm":"cms","params":{"cols":256,"rows":3}},"workload":{"synthetic":{"description":{"column_num":1,"column_label":["key"],"column_spec":[{"distribution":{"kind":"zipf","skewness":1.1,"population_size":10000,"seed":42},"special_rule":0,"data_type":"i64"}],"row_num":1000000}}},"mode":"bench","runs":7,"bench":{"metric":"throughput","operation":"merge","cpu_time_ms":{"user_ms":{"mean":0.002857142857142857,"stddev":0.0006900655593423542,"n":7,"samples":[0.003,0.002,0.003,0.002,0.004,0.003,0.003]},"sys_ms":{"mean":0.0,"stddev":0.0,"n":7,"samples":[0.0,0.0,0.0,0.0,0.0,0.0,0.0]}},"wall_time_ms":{"mean":0.0017209999999999999,"stddev":0.0005173061633758742,"n":7,"samples":[0.001646,0.001471,0.001719,0.001205,0.002828,0.001663,0.001515]},"rss_peak_kb":29116,"heap_allocated_kb":506,"memory_bytes":6144,"merge_folds_per_sec":{"mean":616278.2655125321,"stddev":142634.24427162443,"n":7,"samples":[607533.4143377886,679809.6532970768,581733.5660267598,829875.5186721992,353606.78925035364,601322.9104028863,660066.0066006602]},"merge_shards":2,"merge_supported":true},"source":"cli","timestamp":"2026-09-10T16:52:57.752660646Z"}
-{"schema_version":5,"sketch":"cms","algorithm":"cms","impl":"oxide","language":"rust","sketch_config":{"algorithm":"cms","params":{"cols":256,"rows":3}},"workload":{"synthetic":{"description":{"column_num":1,"column_label":["key"],"column_spec":[{"distribution":{"kind":"zipf","skewness":1.1,"population_size":10000,"seed":42},"special_rule":0,"data_type":"i64"}],"row_num":1000000}}},"mode":"bench","runs":1,"bench":{"metric":"accuracy","operation":"query","wall_time_ms":{"mean":0.897985,"stddev":0.0,"n":1,"samples":[0.897985]},"memory_bytes":6144,"accuracy":{"aae_all":1170.855427713857,"aae_top1":4130.0,"aae_top10":1579.5,"aae_top100":1138.78,"aae_top1000":1164.759,"accuracy_runs":1,"are_all":106.29147961543174,"are_top1":0.027282335843572467,"are_top10":0.05533525886035837,"are_top100":0.5380680102292302,"are_top1000":7.321718240076896,"l1_err":11702700.0,"l2_err":129931.74868368392,"probes":9995.0,"probes_all":9995.0,"probes_top1":1.0,"probes_top10":10.0,"probes_top100":100.0,"probes_top1000":1000.0,"relative_error_mean":106.29147961543174,"relative_error_p99":544.4166666666666}},"source":"cli","timestamp":"2026-09-10T16:52:58.990726844Z"}
-{"schema_version":5,"sketch":"cms","algorithm":"cms","impl":"oxide","language":"rust","sketch_config":{"algorithm":"cms","params":{"cols":1024,"rows":3}},"workload":{"synthetic":{"description":{"column_num":1,"column_label":["key"],"column_spec":[{"distribution":{"kind":"zipf","skewness":1.1,"population_size":10000,"seed":42},"special_rule":0,"data_type":"i64"}],"row_num":1000000}}},"mode":"bench","runs":7,"bench":{"metric":"throughput","operation":"insert","throughput_items_per_sec":{"mean":11197906.682204407,"stddev":68048.72967637725,"n":7,"samples":[11315175.268104592,11240059.951332564,11222711.248123955,11138081.232276319,11198737.749952747,11145740.182809755,11124841.1428309]},"cpu_time_ms":{"user_ms":{"mean":88.88199999999999,"stddev":1.3643556476715835,"n":7,"samples":[88.378,86.02,89.102,89.783,89.298,89.702,89.891]},"sys_ms":{"mean":0.4218571428571429,"stddev":1.1143662516682487,"n":7,"samples":[0.0,2.949,0.004,0.0,0.0,0.0,0.0]}},"wall_time_ms":{"mean":89.30522342857142,"stddev":0.5410593223679766,"n":7,"samples":[88.37689,88.967497,89.105028,89.782071,89.295778,89.720376,89.888924]},"rss_peak_kb":29548,"heap_allocated_kb":9777,"memory_bytes":24576},"source":"cli","timestamp":"2026-09-10T16:53:01.425189676Z"}
-{"schema_version":5,"sketch":"cms","algorithm":"cms","impl":"oxide","language":"rust","sketch_config":{"algorithm":"cms","params":{"cols":1024,"rows":3}},"workload":{"synthetic":{"description":{"column_num":1,"column_label":["key"],"column_spec":[{"distribution":{"kind":"zipf","skewness":1.1,"population_size":10000,"seed":42},"special_rule":0,"data_type":"i64"}],"row_num":1000000}}},"mode":"bench","runs":7,"bench":{"metric":"throughput","operation":"query","throughput_items_per_sec":{"mean":10095358.218023775,"stddev":430728.5548837425,"n":7,"samples":[11027590.490785701,10005595.926085725,9922348.56381574,9669654.794775,9959415.010168668,10058772.618400661,10024130.122134924]},"cpu_time_ms":{"user_ms":{"mean":0.9938571428571428,"stddev":0.039943412353931285,"n":7,"samples":[0.908,1.001,1.009,1.035,1.005,0.995,1.004]},"sys_ms":{"mean":0.0,"stddev":0.0,"n":7,"samples":[0.0,0.0,0.0,0.0,0.0,0.0,0.0]}},"wall_time_ms":{"mean":0.9915141428571429,"stddev":0.039816270993270085,"n":7,"samples":[0.906363,0.998941,1.007322,1.033646,1.003573,0.99366,0.997094]},"rss_peak_kb":29548,"heap_allocated_kb":1380,"memory_bytes":24576},"source":"cli","timestamp":"2026-09-10T16:53:01.425193913Z"}
-{"schema_version":5,"sketch":"cms","algorithm":"cms","impl":"oxide","language":"rust","sketch_config":{"algorithm":"cms","params":{"cols":1024,"rows":3}},"workload":{"synthetic":{"description":{"column_num":1,"column_label":["key"],"column_spec":[{"distribution":{"kind":"zipf","skewness":1.1,"population_size":10000,"seed":42},"special_rule":0,"data_type":"i64"}],"row_num":1000000}}},"mode":"bench","runs":7,"bench":{"metric":"throughput","operation":"merge","cpu_time_ms":{"user_ms":{"mean":0.006857142857142857,"stddev":0.0024784787961282108,"n":7,"samples":[0.006,0.005,0.006,0.012,0.005,0.008,0.006]},"sys_ms":{"mean":0.0,"stddev":0.0,"n":7,"samples":[0.0,0.0,0.0,0.0,0.0,0.0,0.0]}},"wall_time_ms":{"mean":0.0059240000000000004,"stddev":0.0023919605626626316,"n":7,"samples":[0.005249,0.004037,0.004942,0.010939,0.004771,0.006952,0.004578]},"rss_peak_kb":29548,"heap_allocated_kb":784,"memory_bytes":24576,"merge_folds_per_sec":{"mean":186266.22807497997,"stddev":52324.94069248635,"n":7,"samples":[190512.47856734614,247708.6945751796,202347.22784297855,91416.03437242893,209599.6646405366,143843.49827387804,218435.998252512]},"merge_shards":2,"merge_supported":true},"source":"cli","timestamp":"2026-09-10T16:53:01.425199248Z"}
-{"schema_version":5,"sketch":"cms","algorithm":"cms","impl":"oxide","language":"rust","sketch_config":{"algorithm":"cms","params":{"cols":1024,"rows":3}},"workload":{"synthetic":{"description":{"column_num":1,"column_label":["key"],"column_spec":[{"distribution":{"kind":"zipf","skewness":1.1,"population_size":10000,"seed":42},"special_rule":0,"data_type":"i64"}],"row_num":1000000}}},"mode":"bench","runs":1,"bench":{"metric":"accuracy","operation":"query","wall_time_ms":{"mean":0.886307,"stddev":0.0,"n":1,"samples":[0.886307]},"memory_bytes":24576,"accuracy":{"aae_all":179.36948474237118,"aae_top1":587.0,"aae_top10":206.9,"aae_top100":175.01,"aae_top1000":179.203,"accuracy_runs":1,"are_all":16.114925988466428,"are_top1":0.0038776588717135685,"are_top10":0.00722561156147109,"are_top100":0.08191334262895658,"are_top1000":1.1205817432058054,"l1_err":1792798.0,"l2_err":22255.1141538299,"probes":9995.0,"probes_all":9995.0,"probes_top1":1.0,"probes_top10":10.0,"probes_top100":100.0,"probes_top1000":1000.0,"relative_error_mean":16.114925988466428,"relative_error_p99":97.0}},"source":"cli","timestamp":"2026-09-10T16:53:02.668604925Z"}
-{"schema_version":5,"sketch":"cms","algorithm":"cms","impl":"oxide","language":"rust","sketch_config":{"algorithm":"cms","params":{"cols":4096,"rows":3}},"workload":{"synthetic":{"description":{"column_num":1,"column_label":["key"],"column_spec":[{"distribution":{"kind":"zipf","skewness":1.1,"population_size":10000,"seed":42},"special_rule":0,"data_type":"i64"}],"row_num":1000000}}},"mode":"bench","runs":7,"bench":{"metric":"throughput","operation":"insert","throughput_items_per_sec":{"mean":11012685.868881213,"stddev":449738.1245847836,"n":7,"samples":[11189433.79081669,11121636.875397474,10126987.66564296,10701751.746199481,11376934.966345206,11346134.306801401,11225921.730965285]},"cpu_time_ms":{"user_ms":{"mean":89.79871428571428,"stddev":1.8828760548945365,"n":7,"samples":[89.367,89.917,90.744,93.445,87.899,88.138,89.081]},"sys_ms":{"mean":1.1424285714285713,"stddev":3.02258189065479,"n":7,"samples":[0.0,0.0,7.997,0.0,0.0,0.0,0.0]}},"wall_time_ms":{"mean":90.94085257142856,"stddev":3.9008026325005143,"n":7,"samples":[89.370027,89.914822,98.746047,93.442646,87.897136,88.135745,89.079545]},"rss_peak_kb":30956,"heap_allocated_kb":12003,"memory_bytes":98304},"source":"cli","timestamp":"2026-09-10T16:53:05.125276947Z"}
-{"schema_version":5,"sketch":"cms","algorithm":"cms","impl":"oxide","language":"rust","sketch_config":{"algorithm":"cms","params":{"cols":4096,"rows":3}},"workload":{"synthetic":{"description":{"column_num":1,"column_label":["key"],"column_spec":[{"distribution":{"kind":"zipf","skewness":1.1,"population_size":10000,"seed":42},"special_rule":0,"data_type":"i64"}],"row_num":1000000}}},"mode":"bench","runs":7,"bench":{"metric":"throughput","operation":"query","throughput_items_per_sec":{"mean":9208137.957297342,"stddev":341310.1811330118,"n":7,"samples":[9958829.531142889,8978362.102418903,9046182.140057888,9176324.989717374,9189097.749199688,9115533.343061434,8992635.845483214]},"cpu_time_ms":{"user_ms":{"mean":1.2670000000000001,"stddev":0.48553990567202615,"n":7,"samples":[1.005,1.115,1.106,1.091,1.089,1.098,2.365]},"sys_ms":{"mean":0.00014285714285714284,"stddev":0.0003779644730092273,"n":7,"samples":[0.0,0.0,0.0,0.0,0.0,0.001,0.0]}},"wall_time_ms":{"mean":1.0866589999999998,"stddev":0.037972021195436335,"n":7,"samples":[1.003632,1.113232,1.104886,1.089216,1.087702,1.09648,1.111465]},"rss_peak_kb":30956,"heap_allocated_kb":2943,"memory_bytes":98304},"source":"cli","timestamp":"2026-09-10T16:53:05.125286184Z"}
-{"schema_version":5,"sketch":"cms","algorithm":"cms","impl":"oxide","language":"rust","sketch_config":{"algorithm":"cms","params":{"cols":4096,"rows":3}},"workload":{"synthetic":{"description":{"column_num":1,"column_label":["key"],"column_spec":[{"distribution":{"kind":"zipf","skewness":1.1,"population_size":10000,"seed":42},"special_rule":0,"data_type":"i64"}],"row_num":1000000}}},"mode":"bench","runs":7,"bench":{"metric":"throughput","operation":"merge","cpu_time_ms":{"user_ms":{"mean":0.12885714285714286,"stddev":0.12055901538448376,"n":7,"samples":[0.221,0.227,0.225,0.229,0.0,0.0,0.0]},"sys_ms":{"mean":0.027999999999999997,"stddev":0.04135617648348713,"n":7,"samples":[0.0,0.0,0.0,0.0,0.079,0.095,0.022]}},"wall_time_ms":{"mean":0.1557742857142857,"stddev":0.08874901510010177,"n":7,"samples":[0.219705,0.225839,0.224372,0.22853,0.077871,0.093806,0.020297]},"rss_peak_kb":30956,"heap_allocated_kb":1196,"memory_bytes":98304,"merge_folds_per_sec":{"mean":12940.368994128794,"stddev":16396.579502841974,"n":7,"samples":[4551.557770647004,4427.933173632544,4456.884103185781,4375.793112501641,12841.751101180156,10660.29891478157,49268.36478297286]},"merge_shards":2,"merge_supported":true},"source":"cli","timestamp":"2026-09-10T16:53:05.125292425Z"}
-{"schema_version":5,"sketch":"cms","algorithm":"cms","impl":"oxide","language":"rust","sketch_config":{"algorithm":"cms","params":{"cols":4096,"rows":3}},"workload":{"synthetic":{"description":{"column_num":1,"column_label":["key"],"column_spec":[{"distribution":{"kind":"zipf","skewness":1.1,"population_size":10000,"seed":42},"special_rule":0,"data_type":"i64"}],"row_num":1000000}}},"mode":"bench","runs":1,"bench":{"metric":"accuracy","operation":"query","wall_time_ms":{"mean":0.922557,"stddev":0.0,"n":1,"samples":[0.922557]},"memory_bytes":98304,"accuracy":{"aae_all":20.4088044022011,"aae_top1":32.0,"aae_top10":21.4,"aae_top100":22.72,"aae_top1000":21.868,"accuracy_runs":1,"are_all":1.8267154482636818,"are_top1":0.00021138855859426607,"are_top10":0.0008656896026716304,"are_top100":0.009287455201896073,"are_top1000":0.13012354016444222,"l1_err":203986.0,"l2_err":3305.36079725043,"probes":9995.0,"probes_all":9995.0,"probes_top1":1.0,"probes_top10":10.0,"probes_top100":100.0,"probes_top1000":1000.0,"relative_error_mean":1.8267154482636818,"relative_error_p99":16.666666666666668}},"source":"cli","timestamp":"2026-09-10T16:53:06.369371520Z"}
-{"schema_version":5,"sketch":"cms","algorithm":"cms","impl":"oxide","language":"rust","sketch_config":{"algorithm":"cms","params":{"cols":256,"rows":5}},"workload":{"synthetic":{"description":{"column_num":1,"column_label":["key"],"column_spec":[{"distribution":{"kind":"zipf","skewness":1.1,"population_size":10000,"seed":42},"special_rule":0,"data_type":"i64"}],"row_num":1000000}}},"mode":"bench","runs":7,"bench":{"metric":"throughput","operation":"insert","throughput_items_per_sec":{"mean":7380674.740023801,"stddev":35925.83443802538,"n":7,"samples":[7389280.025648487,7299818.891493303,7399173.11428762,7395344.997133417,7388695.727037463,7392454.170147712,7399956.254418606]},"cpu_time_ms":{"user_ms":{"mean":134.91671428571428,"stddev":1.7816924270933803,"n":7,"samples":[135.31,136.99,135.139,135.204,135.344,135.275,131.155]},"sys_ms":{"mean":0.5692857142857143,"stddev":1.5057475125095081,"n":7,"samples":[0.0,0.001,0.0,0.0,0.0,0.0,3.984]}},"wall_time_ms":{"mean":135.49174385714284,"stddev":0.6654438400712713,"n":7,"samples":[135.331182,136.9897,135.150237,135.220196,135.341884,135.273074,135.135934]},"rss_peak_kb":29524,"heap_allocated_kb":9509,"memory_bytes":10240},"source":"cli","timestamp":"2026-09-10T16:53:09.595741003Z"}
-{"schema_version":5,"sketch":"cms","algorithm":"cms","impl":"oxide","language":"rust","sketch_config":{"algorithm":"cms","params":{"cols":256,"rows":5}},"workload":{"synthetic":{"description":{"column_num":1,"column_label":["key"],"column_spec":[{"distribution":{"kind":"zipf","skewness":1.1,"population_size":10000,"seed":42},"special_rule":0,"data_type":"i64"}],"row_num":1000000}}},"mode":"bench","runs":7,"bench":{"metric":"throughput","operation":"query","throughput_items_per_sec":{"mean":6879149.954128163,"stddev":149866.24256960556,"n":7,"samples":[7190109.516985779,6782230.35290669,6790985.7562555885,6797132.623312363,6958319.699807159,6830568.4167364305,6804703.312893126]},"cpu_time_ms":{"user_ms":{"mean":1.4564285714285712,"stddev":0.03135207139811317,"n":7,"samples":[1.392,1.475,1.474,1.473,1.438,1.468,1.475]},"sys_ms":{"mean":0.0,"stddev":0.0,"n":7,"samples":[0.0,0.0,0.0,0.0,0.0,0.0,0.0]}},"wall_time_ms":{"mean":1.4535152857142857,"stddev":0.03074956432056822,"n":7,"samples":[1.390104,1.473704,1.471804,1.470473,1.43641,1.463275,1.468837]},"rss_peak_kb":29524,"heap_allocated_kb":1227,"memory_bytes":10240},"source":"cli","timestamp":"2026-09-10T16:53:09.595744950Z"}
-{"schema_version":5,"sketch":"cms","algorithm":"cms","impl":"oxide","language":"rust","sketch_config":{"algorithm":"cms","params":{"cols":256,"rows":5}},"workload":{"synthetic":{"description":{"column_num":1,"column_label":["key"],"column_spec":[{"distribution":{"kind":"zipf","skewness":1.1,"population_size":10000,"seed":42},"special_rule":0,"data_type":"i64"}],"row_num":1000000}}},"mode":"bench","runs":7,"bench":{"metric":"throughput","operation":"merge","cpu_time_ms":{"user_ms":{"mean":0.003857142857142857,"stddev":0.0010690449676496977,"n":7,"samples":[0.004,0.003,0.004,0.004,0.006,0.003,0.003]},"sys_ms":{"mean":0.0,"stddev":0.0,"n":7,"samples":[0.0,0.0,0.0,0.0,0.0,0.0,0.0]}},"wall_time_ms":{"mean":0.002560285714285714,"stddev":0.0010195686529583176,"n":7,"samples":[0.002226,0.002022,0.002468,0.002797,0.004734,0.001813,0.001862]},"rss_peak_kb":29524,"heap_allocated_kb":489,"memory_bytes":10240,"merge_folds_per_sec":{"mean":429482.1726288033,"stddev":118674.72895177113,"n":7,"samples":[449236.29829290207,494559.84174085065,405186.3857374392,357525.92062924564,211237.85382340517,551571.9801434088,537056.9280343717]},"merge_shards":2,"merge_supported":true},"source":"cli","timestamp":"2026-09-10T16:53:09.595751522Z"}
-{"schema_version":5,"sketch":"cms","algorithm":"cms","impl":"oxide","language":"rust","sketch_config":{"algorithm":"cms","params":{"cols":256,"rows":5}},"workload":{"synthetic":{"description":{"column_num":1,"column_label":["key"],"column_spec":[{"distribution":{"kind":"zipf","skewness":1.1,"population_size":10000,"seed":42},"special_rule":0,"data_type":"i64"}],"row_num":1000000}}},"mode":"bench","runs":1,"bench":{"metric":"accuracy","operation":"query","wall_time_ms":{"mean":1.33499,"stddev":0.0,"n":1,"samples":[1.33499]},"memory_bytes":10240,"accuracy":{"aae_all":961.703751875938,"aae_top1":730.0,"aae_top10":913.2,"aae_top100":926.96,"aae_top1000":960.466,"accuracy_runs":1,"are_all":87.32813847623595,"are_top1":0.004822301492931695,"are_top10":0.04086368772652969,"are_top100":0.4556613344683499,"are_top1000":6.092175465200222,"l1_err":9612229.0,"l2_err":101328.60904502736,"probes":9995.0,"probes_all":9995.0,"probes_top1":1.0,"probes_top10":10.0,"probes_top100":100.0,"probes_top1000":1000.0,"relative_error_mean":87.32813847623595,"relative_error_p99":410.3333333333333}},"source":"cli","timestamp":"2026-09-10T16:53:10.885719065Z"}
-{"schema_version":5,"sketch":"cms","algorithm":"cms","impl":"oxide","language":"rust","sketch_config":{"algorithm":"cms","params":{"cols":1024,"rows":5}},"workload":{"synthetic":{"description":{"column_num":1,"column_label":["key"],"column_spec":[{"distribution":{"kind":"zipf","skewness":1.1,"population_size":10000,"seed":42},"special_rule":0,"data_type":"i64"}],"row_num":1000000}}},"mode":"bench","runs":7,"bench":{"metric":"throughput","operation":"insert","throughput_items_per_sec":{"mean":7477691.0399136115,"stddev":74861.87668075928,"n":7,"samples":[7379520.418398736,7521107.7821601685,7551643.461901121,7412572.378024528,7537086.668334021,7537192.559328728,7404714.011247982]},"cpu_time_ms":{"user_ms":{"mean":133.72157142857145,"stddev":1.323293474270772,"n":7,"samples":[135.507,132.961,132.424,134.908,132.68,132.655,134.916]},"sys_ms":{"mean":0.0,"stddev":0.0,"n":7,"samples":[0.0,0.0,0.0,0.0,0.0,0.0,0.0]}},"wall_time_ms":{"mean":133.74264242857143,"stddev":1.342730723452007,"n":7,"samples":[135.510161,132.959137,132.421506,134.905934,132.677259,132.675395,135.049105]},"rss_peak_kb":29492,"heap_allocated_kb":10204,"memory_bytes":40960},"source":"cli","timestamp":"2026-09-10T16:53:14.175527665Z"}
-{"schema_version":5,"sketch":"cms","algorithm":"cms","impl":"oxide","language":"rust","sketch_config":{"algorithm":"cms","params":{"cols":1024,"rows":5}},"workload":{"synthetic":{"description":{"column_num":1,"column_label":["key"],"column_spec":[{"distribution":{"kind":"zipf","skewness":1.1,"population_size":10000,"seed":42},"special_rule":0,"data_type":"i64"}],"row_num":1000000}}},"mode":"bench","runs":7,"bench":{"metric":"throughput","operation":"query","throughput_items_per_sec":{"mean":6758038.793730481,"stddev":273472.1434938603,"n":7,"samples":[7188149.729266737,6693606.283350836,6754660.851148089,6891468.50678184,6283112.85338188,6837049.0762630245,6658224.255920957]},"cpu_time_ms":{"user_ms":{"mean":1.5844285714285715,"stddev":0.2835429756626305,"n":7,"samples":[1.392,1.495,1.481,1.455,1.592,1.463,2.213]},"sys_ms":{"mean":0.0,"stddev":0.0,"n":7,"samples":[0.0,0.0,0.0,0.0,0.0,0.0,0.0]}},"wall_time_ms":{"mean":1.4810818571428572,"stddev":0.06069756401874398,"n":7,"samples":[1.390483,1.493216,1.479719,1.450344,1.590772,1.461888,1.501151]},"rss_peak_kb":29492,"heap_allocated_kb":1625,"memory_bytes":40960},"source":"cli","timestamp":"2026-09-10T16:53:14.175531654Z"}
-{"schema_version":5,"sketch":"cms","algorithm":"cms","impl":"oxide","language":"rust","sketch_config":{"algorithm":"cms","params":{"cols":1024,"rows":5}},"workload":{"synthetic":{"description":{"column_num":1,"column_label":["key"],"column_spec":[{"distribution":{"kind":"zipf","skewness":1.1,"population_size":10000,"seed":42},"special_rule":0,"data_type":"i64"}],"row_num":1000000}}},"mode":"bench","runs":7,"bench":{"metric":"throughput","operation":"merge","cpu_time_ms":{"user_ms":{"mean":0.011,"stddev":0.0005773502691896258,"n":7,"samples":[0.011,0.011,0.011,0.012,0.011,0.011,0.01]},"sys_ms":{"mean":0.0,"stddev":0.0,"n":7,"samples":[0.0,0.0,0.0,0.0,0.0,0.0,0.0]}},"wall_time_ms":{"mean":0.009737285714285714,"stddev":0.00019970287452923192,"n":7,"samples":[0.009626,0.009546,0.009568,0.009983,0.009909,0.009952,0.009577]},"rss_peak_kb":29492,"heap_allocated_kb":545,"memory_bytes":40960,"merge_folds_per_sec":{"mean":102734.86759155018,"stddev":2095.90811968104,"n":7,"samples":[103885.31061707874,104755.91870940708,104515.05016722408,100170.28949213662,100918.35704914725,100482.3151125402,104416.83199331732]},"merge_shards":2,"merge_supported":true},"source":"cli","timestamp":"2026-09-10T16:53:14.175538910Z"}
-{"schema_version":5,"sketch":"cms","algorithm":"cms","impl":"oxide","language":"rust","sketch_config":{"algorithm":"cms","params":{"cols":1024,"rows":5}},"workload":{"synthetic":{"description":{"column_num":1,"column_label":["key"],"column_spec":[{"distribution":{"kind":"zipf","skewness":1.1,"population_size":10000,"seed":42},"special_rule":0,"data_type":"i64"}],"row_num":1000000}}},"mode":"bench","runs":1,"bench":{"metric":"accuracy","operation":"query","wall_time_ms":{"mean":1.335898,"stddev":0.0,"n":1,"samples":[1.335898]},"memory_bytes":40960,"accuracy":{"aae_all":131.28044022011005,"aae_top1":107.0,"aae_top10":129.5,"aae_top100":121.3,"aae_top1000":131.51,"accuracy_runs":1,"are_all":11.839180815205902,"are_top1":0.0007068304927995773,"are_top10":0.00539855239542661,"are_top100":0.060365390984843746,"are_top1000":0.8257057623107967,"l1_err":1312148.0,"l2_err":14868.539201952557,"probes":9995.0,"probes_all":9995.0,"probes_top1":1.0,"probes_top10":10.0,"probes_top100":100.0,"probes_top1000":1000.0,"relative_error_mean":11.839180815205902,"relative_error_p99":65.0}},"source":"cli","timestamp":"2026-09-10T16:53:15.469460368Z"}
-{"schema_version":5,"sketch":"cms","algorithm":"cms","impl":"oxide","language":"rust","sketch_config":{"algorithm":"cms","params":{"cols":4096,"rows":5}},"workload":{"synthetic":{"description":{"column_num":1,"column_label":["key"],"column_spec":[{"distribution":{"kind":"zipf","skewness":1.1,"population_size":10000,"seed":42},"special_rule":0,"data_type":"i64"}],"row_num":1000000}}},"mode":"bench","runs":7,"bench":{"metric":"throughput","operation":"insert","throughput_items_per_sec":{"mean":7400355.240368792,"stddev":71781.48572241575,"n":7,"samples":[7502011.889548539,7412700.020313022,7470496.023006737,7415770.9688377,7338712.815310915,7362714.530358357,7300080.435206268]},"cpu_time_ms":{"user_ms":{"mean":135.14014285714285,"stddev":1.3101673466357233,"n":7,"samples":[133.3,134.898,133.862,134.849,136.265,135.821,136.986]},"sys_ms":{"mean":0.0,"stddev":0.0,"n":7,"samples":[0.0,0.0,0.0,0.0,0.0,0.0,0.0]}},"wall_time_ms":{"mean":135.13954214285712,"stddev":1.3103443354269557,"n":7,"samples":[133.297576,134.903611,133.85992,134.847746,136.263678,135.819472,136.984792]},"rss_peak_kb":29072,"heap_allocated_kb":14115,"memory_bytes":163840},"source":"cli","timestamp":"2026-09-10T16:53:18.735986708Z"}
-{"schema_version":5,"sketch":"cms","algorithm":"cms","impl":"oxide","language":"rust","sketch_config":{"algorithm":"cms","params":{"cols":4096,"rows":5}},"workload":{"synthetic":{"description":{"column_num":1,"column_label":["key"],"column_spec":[{"distribution":{"kind":"zipf","skewness":1.1,"population_size":10000,"seed":42},"special_rule":0,"data_type":"i64"}],"row_num":1000000}}},"mode":"bench","runs":7,"bench":{"metric":"throughput","operation":"query","throughput_items_per_sec":{"mean":6419570.2040726775,"stddev":198117.77648305218,"n":7,"samples":[6845988.880661982,6240533.058279523,6430510.278200795,6322216.058492042,6345507.989816713,6338984.405273883,6413250.757783806]},"cpu_time_ms":{"user_ms":{"mean":1.5601428571428573,"stddev":0.046149859412673425,"n":7,"samples":[1.461,1.603,1.556,1.582,1.577,1.578,1.564]},"sys_ms":{"mean":0.00028571428571428574,"stddev":0.0004879500364742666,"n":7,"samples":[0.001,0.0,0.0,0.0,0.0,0.001,0.0]}},"wall_time_ms":{"mean":1.5581742857142857,"stddev":0.04599992141918752,"n":7,"samples":[1.459979,1.601626,1.554309,1.580933,1.57513,1.576751,1.558492]},"rss_peak_kb":29072,"heap_allocated_kb":4479,"memory_bytes":163840},"source":"cli","timestamp":"2026-09-10T16:53:18.735990629Z"}
-{"schema_version":5,"sketch":"cms","algorithm":"cms","impl":"oxide","language":"rust","sketch_config":{"algorithm":"cms","params":{"cols":4096,"rows":5}},"workload":{"synthetic":{"description":{"column_num":1,"column_label":["key"],"column_spec":[{"distribution":{"kind":"zipf","skewness":1.1,"population_size":10000,"seed":42},"special_rule":0,"data_type":"i64"}],"row_num":1000000}}},"mode":"bench","runs":7,"bench":{"metric":"throughput","operation":"merge","cpu_time_ms":{"user_ms":{"mean":0.13414285714285715,"stddev":0.26804068632170286,"n":7,"samples":[0.032,0.034,0.033,0.032,0.033,0.033,0.742]},"sys_ms":{"mean":0.0,"stddev":0.0,"n":7,"samples":[0.0,0.0,0.0,0.0,0.0,0.0,0.0]}},"wall_time_ms":{"mean":0.1328717142857143,"stddev":0.26777112919351753,"n":7,"samples":[0.030642,0.032622,0.031832,0.031254,0.031805,0.031829,0.740118]},"rss_peak_kb":29072,"heap_allocated_kb":1964,"memory_bytes":163840,"merge_folds_per_sec":{"mean":27272.937235227168,"stddev":11446.574798500355,"n":7,"samples":[32634.945499641013,30654.159769480717,31414.928373963303,31995.904524220896,31441.597233139444,31417.88934619372,1351.135899951089]},"merge_shards":2,"merge_supported":true},"source":"cli","timestamp":"2026-09-10T16:53:18.735998549Z"}
-{"schema_version":5,"sketch":"cms","algorithm":"cms","impl":"oxide","language":"rust","sketch_config":{"algorithm":"cms","params":{"cols":4096,"rows":5}},"workload":{"synthetic":{"description":{"column_num":1,"column_label":["key"],"column_spec":[{"distribution":{"kind":"zipf","skewness":1.1,"population_size":10000,"seed":42},"special_rule":0,"data_type":"i64"}],"row_num":1000000}}},"mode":"bench","runs":1,"bench":{"metric":"accuracy","operation":"query","wall_time_ms":{"mean":1.391103,"stddev":0.0,"n":1,"samples":[1.391103]},"memory_bytes":163840,"accuracy":{"aae_all":10.843421710855427,"aae_top1":9.0,"aae_top10":13.9,"aae_top100":8.55,"aae_top1000":10.959,"accuracy_runs":1,"are_all":0.9749489427434335,"are_top1":0.00005945303210463734,"are_top10":0.0005081403143585506,"are_top100":0.003763281836965385,"are_top1000":0.06595115137745186,"l1_err":108380.0,"l2_err":1758.0631387979215,"probes":9995.0,"probes_all":9995.0,"probes_top1":1.0,"probes_top10":10.0,"probes_top100":100.0,"probes_top1000":1000.0,"relative_error_mean":0.9749489427434335,"relative_error_p99":8.142857142857142}},"source":"cli","timestamp":"2026-09-10T16:53:20.029361883Z"}
-{"schema_version":5,"sketch":"cms","algorithm":"cms","impl":"oxide","language":"rust","sketch_config":{"algorithm":"cms","params":{"cols":256,"rows":3}},"workload":{"synthetic":{"description":{"column_num":1,"column_label":["key"],"column_spec":[{"distribution":{"kind":"zipf","skewness":1.1,"population_size":10000,"seed":42},"special_rule":0,"data_type":"i64"}],"row_num":1100000},"burst":{"interval_rows":100000,"burst_intervals":2,"extra_fraction":0.5,"seed":42}}},"mode":"bench","runs":7,"bench":{"metric":"throughput","operation":"insert","throughput_items_per_sec":{"mean":11109564.795254366,"stddev":183301.69272957128,"n":7,"samples":[11108282.762791902,11296217.433865191,11210460.705093136,11114367.957721753,11061163.92263826,11237996.721242942,10738464.063427383]},"cpu_time_ms":{"user_ms":{"mean":99.02071428571429,"stddev":1.6599500709645574,"n":7,"samples":[99.018,97.38,98.124,98.972,99.374,97.857,102.42]},"sys_ms":{"mean":0.00014285714285714284,"stddev":0.0003779644730092273,"n":7,"samples":[0.0,0.0,0.0,0.0,0.0,0.001,0.0]}},"wall_time_ms":{"mean":99.03733214285715,"stddev":1.6655947788057974,"n":7,"samples":[99.025207,97.377729,98.12264,98.97099,99.447039,97.882214,102.435506]},"rss_peak_kb":34488,"heap_allocated_kb":12899,"memory_bytes":6144},"source":"cli","timestamp":"2026-09-10T16:53:22.608716312Z"}
-{"schema_version":5,"sketch":"cms","algorithm":"cms","impl":"oxide","language":"rust","sketch_config":{"algorithm":"cms","params":{"cols":256,"rows":3}},"workload":{"synthetic":{"description":{"column_num":1,"column_label":["key"],"column_spec":[{"distribution":{"kind":"zipf","skewness":1.1,"population_size":10000,"seed":42},"special_rule":0,"data_type":"i64"}],"row_num":1100000},"burst":{"interval_rows":100000,"burst_intervals":2,"extra_fraction":0.5,"seed":42}}},"mode":"bench","runs":7,"bench":{"metric":"throughput","operation":"query","throughput_items_per_sec":{"mean":10198713.44275533,"stddev":310172.1374273707,"n":7,"samples":[10894730.416735701,10110829.664638093,10019387.188416606,10043167.029071426,10057224.04516745,10136269.183612002,10129386.571646027]},"cpu_time_ms":{"user_ms":{"mean":0.9837142857142857,"stddev":0.02834733547569201,"n":7,"samples":[0.92,0.99,0.999,0.998,0.996,0.989,0.994]},"sys_ms":{"mean":0.0,"stddev":0.0,"n":7,"samples":[0.0,0.0,0.0,0.0,0.0,0.0,0.0]}},"wall_time_ms":{"mean":0.9807627142857143,"stddev":0.028279271146396764,"n":7,"samples":[0.917416,0.988544,0.997566,0.995204,0.993813,0.986063,0.986733]},"rss_peak_kb":34488,"heap_allocated_kb":1121,"memory_bytes":6144},"source":"cli","timestamp":"2026-09-10T16:53:22.608720037Z"}
-{"schema_version":5,"sketch":"cms","algorithm":"cms","impl":"oxide","language":"rust","sketch_config":{"algorithm":"cms","params":{"cols":256,"rows":3}},"workload":{"synthetic":{"description":{"column_num":1,"column_label":["key"],"column_spec":[{"distribution":{"kind":"zipf","skewness":1.1,"population_size":10000,"seed":42},"special_rule":0,"data_type":"i64"}],"row_num":1100000},"burst":{"interval_rows":100000,"burst_intervals":2,"extra_fraction":0.5,"seed":42}}},"mode":"bench","runs":7,"bench":{"metric":"throughput","operation":"merge","cpu_time_ms":{"user_ms":{"mean":0.003428571428571429,"stddev":0.0007867957924694432,"n":7,"samples":[0.003,0.003,0.004,0.003,0.005,0.003,0.003]},"sys_ms":{"mean":0.0,"stddev":0.0,"n":7,"samples":[0.0,0.0,0.0,0.0,0.0,0.0,0.0]}},"wall_time_ms":{"mean":0.00226,"stddev":0.0005249009430359217,"n":7,"samples":[0.002431,0.00207,0.002183,0.00192,0.003368,0.002004,0.001844]},"rss_peak_kb":34488,"heap_allocated_kb":465,"memory_bytes":6144,"merge_folds_per_sec":{"mean":458796.73377338605,"stddev":83152.42032163077,"n":7,"samples":[411353.3525298231,483091.7874396135,458085.2038479157,520833.3333333334,296912.11401425174,499001.996007984,542299.3492407809]},"merge_shards":2,"merge_supported":true},"source":"cli","timestamp":"2026-09-10T16:53:22.608727602Z"}
-{"schema_version":5,"sketch":"cms","algorithm":"cms","impl":"oxide","language":"rust","sketch_config":{"algorithm":"cms","params":{"cols":256,"rows":3}},"workload":{"synthetic":{"description":{"column_num":1,"column_label":["key"],"column_spec":[{"distribution":{"kind":"zipf","skewness":1.1,"population_size":10000,"seed":42},"special_rule":0,"data_type":"i64"}],"row_num":1100000},"burst":{"interval_rows":100000,"burst_intervals":2,"extra_fraction":0.5,"seed":42}}},"mode":"bench","runs":1,"bench":{"metric":"accuracy","operation":"query","wall_time_ms":{"mean":0.885905,"stddev":0.0,"n":1,"samples":[0.885905]},"memory_bytes":6144,"accuracy":{"aae_all":1287.9811905952977,"aae_top1":4566.0,"aae_top10":1739.6,"aae_top100":1255.6,"aae_top1000":1286.292,"accuracy_runs":1,"are_all":107.63778016105236,"are_top1":0.02740005520817081,"are_top10":0.05522516658019496,"are_top100":0.5393878891114248,"are_top1000":7.35543260419173,"l1_err":12873372.0,"l2_err":142943.0718363083,"probes":9995.0,"probes_all":9995.0,"probes_top1":1.0,"probes_top10":10.0,"probes_top100":100.0,"probes_top1000":1000.0,"relative_error_mean":107.63778016105236,"relative_error_p99":561.0}},"source":"cli","timestamp":"2026-09-10T16:53:23.868932670Z"}
-{"schema_version":5,"sketch":"cms","algorithm":"cms","impl":"oxide","language":"rust","sketch_config":{"algorithm":"cms","params":{"cols":1024,"rows":3}},"workload":{"synthetic":{"description":{"column_num":1,"column_label":["key"],"column_spec":[{"distribution":{"kind":"zipf","skewness":1.1,"population_size":10000,"seed":42},"special_rule":0,"data_type":"i64"}],"row_num":1100000},"burst":{"interval_rows":100000,"burst_intervals":2,"extra_fraction":0.5,"seed":42}}},"mode":"bench","runs":7,"bench":{"metric":"throughput","operation":"insert","throughput_items_per_sec":{"mean":11106896.144968944,"stddev":75861.42554273094,"n":7,"samples":[11207113.96622188,11011735.647148592,11167317.233960291,11143949.967798037,11139891.188783564,11047330.520040229,11030934.490830015]},"cpu_time_ms":{"user_ms":{"mean":99.039,"stddev":0.6748454143974981,"n":7,"samples":[98.154,99.895,98.503,98.703,98.744,99.553,99.721]},"sys_ms":{"mean":0.00014285714285714287,"stddev":0.0003779644730092273,"n":7,"samples":[0.0,0.0,0.0,0.0,0.001,0.0,0.0]}},"wall_time_ms":{"mean":99.041532,"stddev":0.6768314366970076,"n":7,"samples":[98.151942,99.893426,98.501724,98.708268,98.744232,99.571566,99.719566]},"rss_peak_kb":34500,"heap_allocated_kb":13302,"memory_bytes":24576},"source":"cli","timestamp":"2026-09-10T16:53:26.446404861Z"}
-{"schema_version":5,"sketch":"cms","algorithm":"cms","impl":"oxide","language":"rust","sketch_config":{"algorithm":"cms","params":{"cols":1024,"rows":3}},"workload":{"synthetic":{"description":{"column_num":1,"column_label":["key"],"column_spec":[{"distribution":{"kind":"zipf","skewness":1.1,"population_size":10000,"seed":42},"special_rule":0,"data_type":"i64"}],"row_num":1100000},"burst":{"interval_rows":100000,"burst_intervals":2,"extra_fraction":0.5,"seed":42}}},"mode":"bench","runs":7,"bench":{"metric":"throughput","operation":"query","throughput_items_per_sec":{"mean":10071663.537207736,"stddev":443061.7316341188,"n":7,"samples":[10991899.316621687,9692600.555275945,9717081.74501094,10065620.392675009,10021858.58099707,10165206.212827584,9847377.957045924]},"cpu_time_ms":{"user_ms":{"mean":0.9972857142857142,"stddev":0.0426486196951878,"n":7,"samples":[0.911,1.034,1.031,0.995,0.999,0.985,1.026]},"sys_ms":{"mean":0.0,"stddev":0.0,"n":7,"samples":[0.0,0.0,0.0,0.0,0.0,0.0,0.0]}},"wall_time_ms":{"mean":0.9939509999999999,"stddev":0.04147722649036862,"n":7,"samples":[0.909306,1.031199,1.028601,0.992984,0.99732,0.983256,1.014991]},"rss_peak_kb":34500,"heap_allocated_kb":1373,"memory_bytes":24576},"source":"cli","timestamp":"2026-09-10T16:53:26.446408546Z"}
-{"schema_version":5,"sketch":"cms","algorithm":"cms","impl":"oxide","language":"rust","sketch_config":{"algorithm":"cms","params":{"cols":1024,"rows":3}},"workload":{"synthetic":{"description":{"column_num":1,"column_label":["key"],"column_spec":[{"distribution":{"kind":"zipf","skewness":1.1,"population_size":10000,"seed":42},"special_rule":0,"data_type":"i64"}],"row_num":1100000},"burst":{"interval_rows":100000,"burst_intervals":2,"extra_fraction":0.5,"seed":42}}},"mode":"bench","runs":7,"bench":{"metric":"throughput","operation":"merge","cpu_time_ms":{"user_ms":{"mean":0.006857142857142857,"stddev":0.002410295378065479,"n":7,"samples":[0.007,0.007,0.006,0.012,0.005,0.006,0.005]},"sys_ms":{"mean":0.0,"stddev":0.0,"n":7,"samples":[0.0,0.0,0.0,0.0,0.0,0.0,0.0]}},"wall_time_ms":{"mean":0.005832428571428571,"stddev":0.0022247017670647346,"n":7,"samples":[0.005235,0.005497,0.004853,0.010799,0.00447,0.005382,0.004591]},"rss_peak_kb":34500,"heap_allocated_kb":757,"memory_bytes":24576,"merge_folds_per_sec":{"mean":185562.04304395578,"stddev":43971.43673614448,"n":7,"samples":[191021.96752626554,181917.40949608877,206058.108386565,92601.16677470137,223713.64653243846,185804.53363062057,217817.4689610107]},"merge_shards":2,"merge_supported":true},"source":"cli","timestamp":"2026-09-10T16:53:26.446415100Z"}
-{"schema_version":5,"sketch":"cms","algorithm":"cms","impl":"oxide","language":"rust","sketch_config":{"algorithm":"cms","params":{"cols":1024,"rows":3}},"workload":{"synthetic":{"description":{"column_num":1,"column_label":["key"],"column_spec":[{"distribution":{"kind":"zipf","skewness":1.1,"population_size":10000,"seed":42},"special_rule":0,"data_type":"i64"}],"row_num":1100000},"burst":{"interval_rows":100000,"burst_intervals":2,"extra_fraction":0.5,"seed":42}}},"mode":"bench","runs":1,"bench":{"metric":"accuracy","operation":"query","wall_time_ms":{"mean":0.897928,"stddev":0.0,"n":1,"samples":[0.897928]},"memory_bytes":24576,"accuracy":{"aae_all":197.27993996998498,"aae_top1":646.0,"aae_top10":227.7,"aae_top100":192.4,"aae_top1000":197.349,"accuracy_runs":1,"are_all":16.328112076942173,"are_top1":0.003876573732912471,"are_top10":0.007220914958722532,"are_top100":0.08184117914749495,"are_top1000":1.1240388161426853,"l1_err":1971813.0,"l2_err":24482.84572920395,"probes":9995.0,"probes_all":9995.0,"probes_top1":1.0,"probes_top10":10.0,"probes_top100":100.0,"probes_top1000":1000.0,"relative_error_mean":16.328112076942173,"relative_error_p99":98.25}},"source":"cli","timestamp":"2026-09-10T16:53:27.723756878Z"}
-{"schema_version":5,"sketch":"cms","algorithm":"cms","impl":"oxide","language":"rust","sketch_config":{"algorithm":"cms","params":{"cols":4096,"rows":3}},"workload":{"synthetic":{"description":{"column_num":1,"column_label":["key"],"column_spec":[{"distribution":{"kind":"zipf","skewness":1.1,"population_size":10000,"seed":42},"special_rule":0,"data_type":"i64"}],"row_num":1100000},"burst":{"interval_rows":100000,"burst_intervals":2,"extra_fraction":0.5,"seed":42}}},"mode":"bench","runs":7,"bench":{"metric":"throughput","operation":"insert","throughput_items_per_sec":{"mean":11296847.011023026,"stddev":106429.41434425229,"n":7,"samples":[11435332.353484752,11364273.608234975,11230475.524776384,11111335.582537021,11330492.916098574,11348895.929881485,11257123.162148]},"cpu_time_ms":{"user_ms":{"mean":96.82271428571428,"stddev":1.6034776491827314,"n":7,"samples":[96.194,96.772,97.949,98.999,97.085,96.928,93.832]},"sys_ms":{"mean":0.5542857142857143,"stddev":1.466061244091996,"n":7,"samples":[0.001,0.0,0.0,0.0,0.0,0.0,3.879]}},"wall_time_ms":{"mean":97.37974614285714,"stddev":0.9218702211503603,"n":7,"samples":[96.193094,96.794572,97.947767,98.998,97.083155,96.925728,97.715907]},"rss_peak_kb":34588,"heap_allocated_kb":15531,"memory_bytes":98304},"source":"cli","timestamp":"2026-09-10T16:53:30.289882221Z"}
-{"schema_version":5,"sketch":"cms","algorithm":"cms","impl":"oxide","language":"rust","sketch_config":{"algorithm":"cms","params":{"cols":4096,"rows":3}},"workload":{"synthetic":{"description":{"column_num":1,"column_label":["key"],"column_spec":[{"distribution":{"kind":"zipf","skewness":1.1,"population_size":10000,"seed":42},"special_rule":0,"data_type":"i64"}],"row_num":1100000},"burst":{"interval_rows":100000,"burst_intervals":2,"extra_fraction":0.5,"seed":42}}},"mode":"bench","runs":7,"bench":{"metric":"throughput","operation":"query","throughput_items_per_sec":{"mean":9960316.417512974,"stddev":371438.636446686,"n":7,"samples":[10783186.213057203,9863295.416306065,9846504.860203275,9691463.367335064,9891172.363698259,9740509.70298998,9906082.999000968]},"cpu_time_ms":{"user_ms":{"mean":0.8618571428571427,"stddev":0.38169159827074545,"n":7,"samples":[0.928,1.015,1.017,1.033,1.012,1.028,0.0]},"sys_ms":{"mean":0.27214285714285713,"stddev":0.7200223210825779,"n":7,"samples":[0.0,0.0,0.0,0.0,0.0,0.0,1.905]}},"wall_time_ms":{"mean":1.0046085714285715,"stddev":0.03524702731133101,"n":7,"samples":[0.926906,1.013353,1.015081,1.03132,1.010497,1.026127,1.008976]},"rss_peak_kb":34588,"heap_allocated_kb":2943,"memory_bytes":98304},"source":"cli","timestamp":"2026-09-10T16:53:30.289886176Z"}
-{"schema_version":5,"sketch":"cms","algorithm":"cms","impl":"oxide","language":"rust","sketch_config":{"algorithm":"cms","params":{"cols":4096,"rows":3}},"workload":{"synthetic":{"description":{"column_num":1,"column_label":["key"],"column_spec":[{"distribution":{"kind":"zipf","skewness":1.1,"population_size":10000,"seed":42},"special_rule":0,"data_type":"i64"}],"row_num":1100000},"burst":{"interval_rows":100000,"burst_intervals":2,"extra_fraction":0.5,"seed":42}}},"mode":"bench","runs":7,"bench":{"metric":"throughput","operation":"merge","cpu_time_ms":{"user_ms":{"mean":0.0,"stddev":0.0,"n":7,"samples":[0.0,0.0,0.0,0.0,0.0,0.0,0.0]},"sys_ms":{"mean":0.021142857142857144,"stddev":0.0006900655593423538,"n":7,"samples":[0.02,0.022,0.022,0.021,0.021,0.021,0.021]}},"wall_time_ms":{"mean":0.020024714285714285,"stddev":0.000586046276411035,"n":7,"samples":[0.019417,0.020656,0.020931,0.019965,0.020111,0.019586,0.019507]},"rss_peak_kb":34588,"heap_allocated_kb":1195,"memory_bytes":98304,"merge_folds_per_sec":{"mean":49974.51182185537,"stddev":1444.2078679291646,"n":7,"samples":[51501.26178091363,48412.083656080555,47776.02599015814,50087.65339343852,49724.03162448411,51056.87736138058,51263.64894653201]},"merge_shards":2,"merge_supported":true},"source":"cli","timestamp":"2026-09-10T16:53:30.289894562Z"}
-{"schema_version":5,"sketch":"cms","algorithm":"cms","impl":"oxide","language":"rust","sketch_config":{"algorithm":"cms","params":{"cols":4096,"rows":3}},"workload":{"synthetic":{"description":{"column_num":1,"column_label":["key"],"column_spec":[{"distribution":{"kind":"zipf","skewness":1.1,"population_size":10000,"seed":42},"special_rule":0,"data_type":"i64"}],"row_num":1100000},"burst":{"interval_rows":100000,"burst_intervals":2,"extra_fraction":0.5,"seed":42}}},"mode":"bench","runs":1,"bench":{"metric":"accuracy","operation":"query","wall_time_ms":{"mean":0.917535,"stddev":0.0,"n":1,"samples":[0.917535]},"memory_bytes":98304,"accuracy":{"aae_all":22.43151575787894,"aae_top1":40.0,"aae_top10":23.5,"aae_top100":25.11,"aae_top1000":23.917,"accuracy_runs":1,"are_all":1.8442558678708936,"are_top1":0.00024003552525773814,"are_top10":0.0008398321953926363,"are_top100":0.009440673134655657,"are_top1000":0.12839157040797114,"l1_err":224203.0,"l2_err":3632.2999600803896,"probes":9995.0,"probes_all":9995.0,"probes_top1":1.0,"probes_top10":10.0,"probes_top100":100.0,"probes_top1000":1000.0,"relative_error_mean":1.8442558678708936,"relative_error_p99":17.0}},"source":"cli","timestamp":"2026-09-10T16:53:31.549918477Z"}
-{"schema_version":5,"sketch":"cms","algorithm":"cms","impl":"oxide","language":"rust","sketch_config":{"algorithm":"cms","params":{"cols":256,"rows":5}},"workload":{"synthetic":{"description":{"column_num":1,"column_label":["key"],"column_spec":[{"distribution":{"kind":"zipf","skewness":1.1,"population_size":10000,"seed":42},"special_rule":0,"data_type":"i64"}],"row_num":1100000},"burst":{"interval_rows":100000,"burst_intervals":2,"extra_fraction":0.5,"seed":42}}},"mode":"bench","runs":7,"bench":{"metric":"throughput","operation":"insert","throughput_items_per_sec":{"mean":7383486.109206228,"stddev":54008.47906381863,"n":7,"samples":[7464431.998491805,7398758.781536352,7439780.220776155,7376329.960674102,7319242.37670465,7349209.291223148,7336650.135037382]},"cpu_time_ms":{"user_ms":{"mean":147.87685714285718,"stddev":1.7651387507852685,"n":7,"samples":[147.354,145.668,147.849,148.928,150.086,149.554,145.699]},"sys_ms":{"mean":0.9914285714285713,"stddev":1.717664873905157,"n":7,"samples":[0.0,2.95,0.0,0.005,0.0,0.0,3.985]}},"wall_time_ms":{"mean":148.987933,"stddev":1.0873022214352397,"n":7,"samples":[147.365533,148.673586,147.85383,149.12565,150.288779,149.675966,149.932187]},"rss_peak_kb":34220,"heap_allocated_kb":12992,"memory_bytes":10240},"source":"cli","timestamp":"2026-09-10T16:53:34.995439656Z"}
-{"schema_version":5,"sketch":"cms","algorithm":"cms","impl":"oxide","language":"rust","sketch_config":{"algorithm":"cms","params":{"cols":256,"rows":5}},"workload":{"synthetic":{"description":{"column_num":1,"column_label":["key"],"column_spec":[{"distribution":{"kind":"zipf","skewness":1.1,"population_size":10000,"seed":42},"special_rule":0,"data_type":"i64"}],"row_num":1100000},"burst":{"interval_rows":100000,"burst_intervals":2,"extra_fraction":0.5,"seed":42}}},"mode":"bench","runs":7,"bench":{"metric":"throughput","operation":"query","throughput_items_per_sec":{"mean":6845593.681534821,"stddev":183981.39460333783,"n":7,"samples":[7233083.305291114,6766632.7488777,6854317.4656512635,6681489.166561938,6760787.83639908,6740084.927093118,6882760.320869534]},"cpu_time_ms":{"user_ms":{"mean":1.4641428571428572,"stddev":0.03845095825172884,"n":7,"samples":[1.384,1.48,1.457,1.498,1.48,1.491,1.459]},"sys_ms":{"mean":0.00042857142857142855,"stddev":0.0011338934190276817,"n":7,"samples":[0.0,0.0,0.003,0.0,0.0,0.0,0.0]}},"wall_time_ms":{"mean":1.460935857142857,"stddev":0.037886833053311884,"n":7,"samples":[1.381845,1.477101,1.458205,1.495924,1.478378,1.482919,1.452179]},"rss_peak_kb":34220,"heap_allocated_kb":1185,"memory_bytes":10240},"source":"cli","timestamp":"2026-09-10T16:53:34.995450756Z"}
-{"schema_version":5,"sketch":"cms","algorithm":"cms","impl":"oxide","language":"rust","sketch_config":{"algorithm":"cms","params":{"cols":256,"rows":5}},"workload":{"synthetic":{"description":{"column_num":1,"column_label":["key"],"column_spec":[{"distribution":{"kind":"zipf","skewness":1.1,"population_size":10000,"seed":42},"special_rule":0,"data_type":"i64"}],"row_num":1100000},"burst":{"interval_rows":100000,"burst_intervals":2,"extra_fraction":0.5,"seed":42}}},"mode":"bench","runs":7,"bench":{"metric":"throughput","operation":"merge","cpu_time_ms":{"user_ms":{"mean":0.003857142857142857,"stddev":0.0010690449676496975,"n":7,"samples":[0.004,0.003,0.003,0.004,0.006,0.003,0.004]},"sys_ms":{"mean":0.0,"stddev":0.0,"n":7,"samples":[0.0,0.0,0.0,0.0,0.0,0.0,0.0]}},"wall_time_ms":{"mean":0.0026801428571428566,"stddev":0.0011860318192150143,"n":7,"samples":[0.002735,0.002278,0.001859,0.002026,0.005281,0.002521,0.002061]},"rss_peak_kb":34220,"heap_allocated_kb":384,"memory_bytes":10240,"merge_folds_per_sec":{"mean":415335.24711103266,"stddev":115812.91997607723,"n":7,"samples":[365630.7129798903,438981.56277436344,537923.6148466918,493583.4155972359,189358.0761219466,396667.9888932963,485201.358563804]},"merge_shards":2,"merge_supported":true},"source":"cli","timestamp":"2026-09-10T16:53:34.995457316Z"}
-{"schema_version":5,"sketch":"cms","algorithm":"cms","impl":"oxide","language":"rust","sketch_config":{"algorithm":"cms","params":{"cols":256,"rows":5}},"workload":{"synthetic":{"description":{"column_num":1,"column_label":["key"],"column_spec":[{"distribution":{"kind":"zipf","skewness":1.1,"population_size":10000,"seed":42},"special_rule":0,"data_type":"i64"}],"row_num":1100000},"burst":{"interval_rows":100000,"burst_intervals":2,"extra_fraction":0.5,"seed":42}}},"mode":"bench","runs":1,"bench":{"metric":"accuracy","operation":"query","wall_time_ms":{"mean":1.370683,"stddev":0.0,"n":1,"samples":[1.370683]},"memory_bytes":10240,"accuracy":{"aae_all":1058.0362181090545,"aae_top1":799.0,"aae_top10":1009.0,"aae_top100":1022.97,"aae_top1000":1059.095,"accuracy_runs":1,"are_all":88.47361306138484,"are_top1":0.004794709617023319,"are_top10":0.0409791802536477,"are_top100":0.4566022923559276,"are_top1000":6.099786178880546,"l1_err":10575072.0,"l2_err":111485.32669369543,"probes":9995.0,"probes_all":9995.0,"probes_top1":1.0,"probes_top10":10.0,"probes_top100":100.0,"probes_top1000":1000.0,"relative_error_mean":88.47361306138484,"relative_error_p99":420.3333333333333}},"source":"cli","timestamp":"2026-09-10T16:53:36.307133860Z"}
-{"schema_version":5,"sketch":"cms","algorithm":"cms","impl":"oxide","language":"rust","sketch_config":{"algorithm":"cms","params":{"cols":1024,"rows":5}},"workload":{"synthetic":{"description":{"column_num":1,"column_label":["key"],"column_spec":[{"distribution":{"kind":"zipf","skewness":1.1,"population_size":10000,"seed":42},"special_rule":0,"data_type":"i64"}],"row_num":1100000},"burst":{"interval_rows":100000,"burst_intervals":2,"extra_fraction":0.5,"seed":42}}},"mode":"bench","runs":7,"bench":{"metric":"throughput","operation":"insert","throughput_items_per_sec":{"mean":7508433.578172277,"stddev":33332.43563626659,"n":7,"samples":[7500513.427190712,7526942.502514187,7533491.626602816,7517075.720870477,7523494.574042034,7521010.0098352935,7436507.186150412]},"cpu_time_ms":{"user_ms":{"mean":146.5032857142857,"stddev":0.6567291969261275,"n":7,"samples":[146.659,146.144,146.016,146.336,146.188,146.259,147.921]},"sys_ms":{"mean":0.0,"stddev":0.0,"n":7,"samples":[0.0,0.0,0.0,0.0,0.0,0.0,0.0]}},"wall_time_ms":{"mean":146.50442057142854,"stddev":0.6548973586104625,"n":7,"samples":[146.656627,146.141677,146.014631,146.3335,146.208652,146.256952,147.918905]},"rss_peak_kb":34500,"heap_allocated_kb":13705,"memory_bytes":40960},"source":"cli","timestamp":"2026-09-10T16:53:39.742765341Z"}
-{"schema_version":5,"sketch":"cms","algorithm":"cms","impl":"oxide","language":"rust","sketch_config":{"algorithm":"cms","params":{"cols":1024,"rows":5}},"workload":{"synthetic":{"description":{"column_num":1,"column_label":["key"],"column_spec":[{"distribution":{"kind":"zipf","skewness":1.1,"population_size":10000,"seed":42},"special_rule":0,"data_type":"i64"}],"row_num":1100000},"burst":{"interval_rows":100000,"burst_intervals":2,"extra_fraction":0.5,"seed":42}}},"mode":"bench","runs":7,"bench":{"metric":"throughput","operation":"query","throughput_items_per_sec":{"mean":6712153.212350361,"stddev":310618.49533641315,"n":7,"samples":[7181471.731083163,6765057.244093689,6829200.966405388,6732498.534949043,6292111.348022691,6331026.208991641,6853706.45290691]},"cpu_time_ms":{"user_ms":{"mean":1.5955714285714286,"stddev":0.2621868653860303,"n":7,"samples":[1.393,1.479,1.466,1.486,1.595,1.581,2.169]},"sys_ms":{"mean":0.0,"stddev":0.0,"n":7,"samples":[0.0,0.0,0.0,0.0,0.0,0.0,0.0]}},"wall_time_ms":{"mean":1.491849142857143,"stddev":0.06962691307109292,"n":7,"samples":[1.391776,1.477445,1.463568,1.48459,1.588497,1.578733,1.458335]},"rss_peak_kb":34500,"heap_allocated_kb":1621,"memory_bytes":40960},"source":"cli","timestamp":"2026-09-10T16:53:39.742769668Z"}
-{"schema_version":5,"sketch":"cms","algorithm":"cms","impl":"oxide","language":"rust","sketch_config":{"algorithm":"cms","params":{"cols":1024,"rows":5}},"workload":{"synthetic":{"description":{"column_num":1,"column_label":["key"],"column_spec":[{"distribution":{"kind":"zipf","skewness":1.1,"population_size":10000,"seed":42},"special_rule":0,"data_type":"i64"}],"row_num":1100000},"burst":{"interval_rows":100000,"burst_intervals":2,"extra_fraction":0.5,"seed":42}}},"mode":"bench","runs":7,"bench":{"metric":"throughput","operation":"merge","cpu_time_ms":{"user_ms":{"mean":0.010428571428571428,"stddev":0.0005345224838248483,"n":7,"samples":[0.01,0.01,0.01,0.011,0.011,0.011,0.01]},"sys_ms":{"mean":0.0,"stddev":0.0,"n":7,"samples":[0.0,0.0,0.0,0.0,0.0,0.0,0.0]}},"wall_time_ms":{"mean":0.009351714285714286,"stddev":0.00040459185783771215,"n":7,"samples":[0.00889,0.009723,0.009099,0.009565,0.009837,0.009508,0.00884]},"rss_peak_kb":34500,"heap_allocated_kb":530,"memory_bytes":40960,"merge_folds_per_sec":{"mean":107105.52041473797,"stddev":4673.42809371946,"n":7,"samples":[112485.9392575928,102848.91494394734,109902.18705352236,104547.83063251436,101657.00925078784,105174.58981909971,113122.17194570135]},"merge_shards":2,"merge_supported":true},"source":"cli","timestamp":"2026-09-10T16:53:39.742777151Z"}
-{"schema_version":5,"sketch":"cms","algorithm":"cms","impl":"oxide","language":"rust","sketch_config":{"algorithm":"cms","params":{"cols":1024,"rows":5}},"workload":{"synthetic":{"description":{"column_num":1,"column_label":["key"],"column_spec":[{"distribution":{"kind":"zipf","skewness":1.1,"population_size":10000,"seed":42},"special_rule":0,"data_type":"i64"}],"row_num":1100000},"burst":{"interval_rows":100000,"burst_intervals":2,"extra_fraction":0.5,"seed":42}}},"mode":"bench","runs":1,"bench":{"metric":"accuracy","operation":"query","wall_time_ms":{"mean":1.350175,"stddev":0.0,"n":1,"samples":[1.350175]},"memory_bytes":40960,"accuracy":{"aae_all":144.41590795397698,"aae_top1":117.0,"aae_top10":142.5,"aae_top100":133.54,"aae_top1000":144.28,"accuracy_runs":1,"are_all":11.99213961441129,"are_top1":0.0007021039113788841,"are_top10":0.005382466365397876,"are_top100":0.060324603642105325,"are_top1000":0.8201822917264796,"l1_err":1443437.0,"l2_err":16358.906106460787,"probes":9995.0,"probes_all":9995.0,"probes_top1":1.0,"probes_top10":10.0,"probes_top100":100.0,"probes_top1000":1000.0,"relative_error_mean":11.99213961441129,"relative_error_p99":67.33333333333333}},"source":"cli","timestamp":"2026-09-10T16:53:41.053625226Z"}
-{"schema_version":5,"sketch":"cms","algorithm":"cms","impl":"oxide","language":"rust","sketch_config":{"algorithm":"cms","params":{"cols":4096,"rows":5}},"workload":{"synthetic":{"description":{"column_num":1,"column_label":["key"],"column_spec":[{"distribution":{"kind":"zipf","skewness":1.1,"population_size":10000,"seed":42},"special_rule":0,"data_type":"i64"}],"row_num":1100000},"burst":{"interval_rows":100000,"burst_intervals":2,"extra_fraction":0.5,"seed":42}}},"mode":"bench","runs":7,"bench":{"metric":"throughput","operation":"insert","throughput_items_per_sec":{"mean":7293385.034129428,"stddev":67649.87906856833,"n":7,"samples":[7421491.799599022,7328271.940179982,7280370.578804684,7249801.984840242,7219057.482217723,7306701.672233001,7247999.781031338]},"cpu_time_ms":{"user_ms":{"mean":150.25728571428573,"stddev":1.9632838743871304,"n":7,"samples":[148.214,150.073,147.106,151.73,152.368,150.542,151.768]},"sys_ms":{"mean":0.5754285714285713,"stddev":1.5044052930358514,"n":7,"samples":[0.006,0.032,3.987,0.0,0.003,0.0,0.0]}},"wall_time_ms":{"mean":150.832638,"stddev":1.3884091260658749,"n":7,"samples":[148.218179,150.1036,151.09121,151.728282,152.374462,150.546724,151.766009]},"rss_peak_kb":34408,"heap_allocated_kb":17643,"memory_bytes":163840},"source":"cli","timestamp":"2026-09-10T16:53:44.575102870Z"}
-{"schema_version":5,"sketch":"cms","algorithm":"cms","impl":"oxide","language":"rust","sketch_config":{"algorithm":"cms","params":{"cols":4096,"rows":5}},"workload":{"synthetic":{"description":{"column_num":1,"column_label":["key"],"column_spec":[{"distribution":{"kind":"zipf","skewness":1.1,"population_size":10000,"seed":42},"special_rule":0,"data_type":"i64"}],"row_num":1100000},"burst":{"interval_rows":100000,"burst_intervals":2,"extra_fraction":0.5,"seed":42}}},"mode":"bench","runs":7,"bench":{"metric":"throughput","operation":"query","throughput_items_per_sec":{"mean":6089036.248361226,"stddev":223973.00576082346,"n":7,"samples":[6590760.275024942,6008062.043835109,6023435.654400031,6048276.074907854,6028874.66032916,5941927.8360444065,5981917.193987081]},"cpu_time_ms":{"user_ms":{"mean":1.6462857142857144,"stddev":0.057612829259099003,"n":7,"samples":[1.518,1.665,1.661,1.655,1.66,1.684,1.681]},"sys_ms":{"mean":0.0,"stddev":0.0,"n":7,"samples":[0.0,0.0,0.0,0.0,0.0,0.0,0.0]}},"wall_time_ms":{"mean":1.6432631428571427,"stddev":0.056726451265197826,"n":7,"samples":[1.516517,1.663598,1.659352,1.652537,1.657855,1.682114,1.670869]},"rss_peak_kb":34408,"heap_allocated_kb":4479,"memory_bytes":163840},"source":"cli","timestamp":"2026-09-10T16:53:44.575111453Z"}
-{"schema_version":5,"sketch":"cms","algorithm":"cms","impl":"oxide","language":"rust","sketch_config":{"algorithm":"cms","params":{"cols":4096,"rows":5}},"workload":{"synthetic":{"description":{"column_num":1,"column_label":["key"],"column_spec":[{"distribution":{"kind":"zipf","skewness":1.1,"population_size":10000,"seed":42},"special_rule":0,"data_type":"i64"}],"row_num":1100000},"burst":{"interval_rows":100000,"burst_intervals":2,"extra_fraction":0.5,"seed":42}}},"mode":"bench","runs":7,"bench":{"metric":"throughput","operation":"merge","cpu_time_ms":{"user_ms":{"mean":0.21,"stddev":0.19644167921633465,"n":7,"samples":[0.369,0.365,0.369,0.367,0.0,0.0,0.0]},"sys_ms":{"mean":0.28814285714285715,"stddev":0.39273673479462406,"n":7,"samples":[0.0,0.0,0.0,0.002,0.758,0.362,0.895]}},"wall_time_ms":{"mean":0.4967714285714286,"stddev":0.22789870767503792,"n":7,"samples":[0.367716,0.363297,0.367442,0.367518,0.756954,0.360791,0.893682]},"rss_peak_kb":34408,"heap_allocated_kb":1963,"memory_bytes":163840,"merge_folds_per_sec":{"mean":2303.7528931929646,"stddev":742.8748897620095,"n":7,"samples":[2719.490041227469,2752.568834865138,2721.5179538539414,2720.955164100806,1321.0842402576643,2771.687763830029,1118.9662542157052]},"merge_shards":2,"merge_supported":true},"source":"cli","timestamp":"2026-09-10T16:53:44.575117358Z"}
-{"schema_version":5,"sketch":"cms","algorithm":"cms","impl":"oxide","language":"rust","sketch_config":{"algorithm":"cms","params":{"cols":4096,"rows":5}},"workload":{"synthetic":{"description":{"column_num":1,"column_label":["key"],"column_spec":[{"distribution":{"kind":"zipf","skewness":1.1,"population_size":10000,"seed":42},"special_rule":0,"data_type":"i64"}],"row_num":1100000},"burst":{"interval_rows":100000,"burst_intervals":2,"extra_fraction":0.5,"seed":42}}},"mode":"bench","runs":1,"bench":{"metric":"accuracy","operation":"query","wall_time_ms":{"mean":1.384195,"stddev":0.0,"n":1,"samples":[1.384195]},"memory_bytes":163840,"accuracy":{"aae_all":11.897348674337168,"aae_top1":9.0,"aae_top10":14.8,"aae_top100":9.56,"aae_top1000":11.952,"accuracy_runs":1,"are_all":0.9842093746299024,"are_top1":0.00005400799318299108,"are_top10":0.00048405131516117894,"are_top100":0.003895930656745295,"are_top1000":0.06494358473367953,"l1_err":118914.0,"l2_err":1930.3466010020065,"probes":9995.0,"probes_all":9995.0,"probes_top1":1.0,"probes_top10":10.0,"probes_top100":100.0,"probes_top1000":1000.0,"relative_error_mean":0.9842093746299024,"relative_error_p99":8.4}},"source":"cli","timestamp":"2026-09-10T16:53:45.891218394Z"}
diff --git a/docs/evaluation/erp-cost-model-supplement/summary.json b/docs/evaluation/erp-cost-model-supplement/summary.json
deleted file mode 100644
index fa5a28fef..000000000
--- a/docs/evaluation/erp-cost-model-supplement/summary.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "host": "localhost",
-  "records": 72,
-  "plotted_points": 54,
-  "median_absolute_percentage_error": 11.546293545996496,
-  "spearman_rank_correlation": 0.9835334476843911,
-  "commands": "scripts/run_erp_v1_figure1.sh"
-}
diff --git a/docs/examples/asapquery-compatibility-demo-snapshot.json b/docs/examples/asapquery-compatibility-demo-snapshot.json
deleted file mode 100644
index c24e976c4..000000000
--- a/docs/examples/asapquery-compatibility-demo-snapshot.json
+++ /dev/null
@@ -1,125 +0,0 @@
-{
-  "snapshot_version": 3,
-  "query_workload": {
-    "language": "promql",
-    "query_batch": null,
-    "repeating_queries": [
-      {
-        "query": "rate(asap_demo_counter_total[5s])",
-        "demand": { "fixed_interval_at": { "interval": 1000, "evaluation_phase": 0 } },
-        "requirements": { "accuracy": "implicit_exact", "response_latency": "unspecified" },
-        "predictability": { "predictable": { "known_at": null } },
-        "time_selection": { "scope": "real_time", "lookback": null, "as_of": null }
-      },
-      {
-        "query": "increase(asap_demo_counter_total[5s])",
-        "demand": { "fixed_interval_at": { "interval": 1000, "evaluation_phase": 0 } },
-        "requirements": { "accuracy": "implicit_exact", "response_latency": "unspecified" },
-        "predictability": { "predictable": { "known_at": null } },
-        "time_selection": { "scope": "real_time", "lookback": null, "as_of": null }
-      },
-      {
-        "query": "sum(sum_over_time(asap_demo_gauge[5s]))",
-        "demand": { "fixed_interval_at": { "interval": 1000, "evaluation_phase": 0 } },
-        "requirements": { "accuracy": "implicit_exact", "response_latency": "unspecified" },
-        "predictability": { "predictable": { "known_at": null } },
-        "time_selection": { "scope": "real_time", "lookback": null, "as_of": null }
-      },
-      {
-        "query": "quantile_over_time(0.5, asap_demo_latency_ms[5s])",
-        "demand": { "fixed_interval_at": { "interval": 1000, "evaluation_phase": 0 } },
-        "requirements": {
-          "accuracy": { "explicit": { "EpsilonDelta": { "epsilon": 0.01, "delta": 0.01 } } },
-          "response_latency": "unspecified"
-        },
-        "predictability": { "predictable": { "known_at": null } },
-        "time_selection": { "scope": "real_time", "lookback": null, "as_of": null }
-      },
-      {
-        "query": "topk(1, sum_over_time(asap_demo_gauge[5s]))",
-        "demand": { "fixed_interval_at": { "interval": 1000, "evaluation_phase": 0 } },
-        "requirements": {
-          "accuracy": { "explicit": { "EpsilonDelta": { "epsilon": 0.01, "delta": 0.01 } } },
-          "response_latency": "unspecified"
-        },
-        "predictability": { "predictable": { "known_at": null } },
-        "time_selection": { "scope": "real_time", "lookback": null, "as_of": null }
-      },
-      {
-        "query": "topk(1, count_over_time(asap_demo_gauge[5s]))",
-        "demand": { "fixed_interval_at": { "interval": 1000, "evaluation_phase": 0 } },
-        "requirements": {
-          "accuracy": { "explicit": { "EpsilonDelta": { "epsilon": 0.01, "delta": 0.01 } } },
-          "response_latency": "unspecified"
-        },
-        "predictability": { "predictable": { "known_at": null } },
-        "time_selection": { "scope": "real_time", "lookback": null, "as_of": null }
-      }
-    ]
-  },
-  "data_workload": {
-    "arrival": "continuously_ingesting",
-    "data_ingestion_interval": { "value": 5000, "source": "declared", "observed_at_ms": null, "valid_for_ms": null },
-    "ingestion_volume": { "value": null, "source": "unknown", "observed_at_ms": null, "valid_for_ms": null },
-    "ingestion_rate": { "value": 100.0, "source": "declared", "observed_at_ms": null, "valid_for_ms": null },
-    "input_cardinality": { "value": null, "source": "unknown", "observed_at_ms": null, "valid_for_ms": null },
-    "distribution": { "value": null, "source": "unknown", "observed_at_ms": null, "valid_for_ms": null }
-  },
-  "implementation": {
-    "lifecycle_costs": {
-      "build": 10.0,
-      "maintenance_per_update": 0.001,
-      "read": 0.1,
-      "retention_per_second": 0.001,
-      "retirement": 1.0
-    },
-    "evidence_observed_at_unix_ms": 9500,
-    "evidence_valid_for_ms": 60000,
-    "horizon_seconds": 300.0,
-    "window_cost_model": {
-      "implementation_id": "backend-tumbling-v1",
-      "cost": {
-        "model_version": "compat-cost-v1",
-        "workload_fingerprint": "asapquery-compatibility-demo",
-        "observed_at_unix_ms": 9500,
-        "valid_for_ms": 60000,
-        "horizon_seconds": 300.0,
-        "cpu_cost": 1.0,
-        "peak_memory_bytes": 4096,
-        "network_bytes": 0,
-        "storage_bytes": 2048,
-        "source_scan_bytes": 0,
-        "weighted_cost": 1.0
-      }
-    },
-    "scrape_interval_ms": 5000,
-    "topk_evidence": {
-      "topk(1, sum_over_time(asap_demo_gauge[5s]))": {
-        "selected_lower_bound": 101.0,
-        "excluded_upper_bound": 100.0,
-        "interval_failure_probability": 0.005,
-        "observed_at_unix_ms": 9500,
-        "source": "compatibility-fixture"
-      },
-      "topk(1, count_over_time(asap_demo_gauge[5s]))": {
-        "selected_lower_bound": 101.0,
-        "excluded_upper_bound": 100.0,
-        "interval_failure_probability": 0.005,
-        "observed_at_unix_ms": 9500,
-        "source": "compatibility-fixture"
-      }
-    }
-  },
-  "environment": {
-    "dataset_identity": {"namespace": "example", "dataset": "metrics"},
-    "target": "backend_local_remote_write",
-    "collector_ids": [],
-    "capability_snapshot_id": "asapquery-compatibility-demo-v1",
-    "observed_at_unix_ms": 10000,
-    "max_evidence_age_ms": 60000,
-    "plan_version": 1,
-    "activation_unix_ms": 10000,
-    "expiry_unix_ms": null,
-    "backend_compat": "asap-query-backend.v1"
-  }
-}
diff --git a/docs/examples/asapquery-planning-snapshot.json b/docs/examples/asapquery-planning-snapshot.json
deleted file mode 100644
index 736857c49..000000000
--- a/docs/examples/asapquery-planning-snapshot.json
+++ /dev/null
@@ -1,76 +0,0 @@
-{
-  "snapshot_version": 3,
-  "query_workload": {
-    "language": "promql",
-    "query_batch": null,
-    "repeating_queries": [
-      {
-        "query": "quantile_over_time(0.99, m[1m])",
-        "demand": { "fixed_interval_at": { "interval": 10000, "evaluation_phase": 0 } },
-        "requirements": {
-          "accuracy": {
-            "explicit": {
-              "EpsilonDelta": { "epsilon": 0.01, "delta": 0.01 }
-            }
-          },
-          "response_latency": "unspecified"
-        },
-        "predictability": { "predictable": { "known_at": null } },
-        "time_selection": {
-          "scope": "real_time",
-          "lookback": null,
-          "as_of": null
-        }
-      }
-    ]
-  },
-  "data_workload": {
-    "arrival": "continuously_ingesting",
-    "data_ingestion_interval": { "value": 5000, "source": "declared", "observed_at_ms": null, "valid_for_ms": null },
-    "ingestion_volume": { "value": null, "source": "unknown", "observed_at_ms": null, "valid_for_ms": null },
-    "ingestion_rate": { "value": 100.0, "source": "declared", "observed_at_ms": null, "valid_for_ms": null },
-    "input_cardinality": { "value": null, "source": "unknown", "observed_at_ms": null, "valid_for_ms": null },
-    "distribution": { "value": null, "source": "unknown", "observed_at_ms": null, "valid_for_ms": null }
-  },
-  "implementation": {
-    "lifecycle_costs": {
-      "build": 10.0,
-      "maintenance_per_update": 0.001,
-      "read": 0.1,
-      "retention_per_second": 0.001,
-      "retirement": 1.0
-    },
-    "evidence_observed_at_unix_ms": 9500,
-    "evidence_valid_for_ms": 60000,
-    "horizon_seconds": 300.0,
-    "window_cost_model": {
-      "implementation_id": "backend-tumbling-v1",
-      "cost": {
-        "model_version": "compat-cost-v1",
-        "workload_fingerprint": "replaced-with-canonical-promql",
-        "observed_at_unix_ms": 9500,
-        "valid_for_ms": 60000,
-        "horizon_seconds": 300.0,
-        "cpu_cost": 1.0,
-        "peak_memory_bytes": 1024,
-        "network_bytes": 0,
-        "storage_bytes": 512,
-        "source_scan_bytes": 0,
-        "weighted_cost": 1.0
-      }
-    },
-    "scrape_interval_ms": 5000
-  },
-  "environment": {
-    "dataset_identity": {"namespace": "example", "dataset": "metrics"},
-    "target": "backend_local_remote_write",
-    "collector_ids": [],
-    "capability_snapshot_id": "asapquery-local-v1",
-    "observed_at_unix_ms": 10000,
-    "max_evidence_age_ms": 60000,
-    "plan_version": 1,
-    "activation_unix_ms": 10000,
-    "expiry_unix_ms": null,
-    "backend_compat": "asap-query-backend.v1"
-  }
-}
diff --git a/docs/examples/workload-cost-evidence.md b/docs/examples/workload-cost-evidence.md
deleted file mode 100644
index fc5430d55..000000000
--- a/docs/examples/workload-cost-evidence.md
+++ /dev/null
@@ -1,97 +0,0 @@
-# Complete workload cost evidence
-
-Planning snapshots use one schema, `snapshot_version: 3`. Versions 1 and 2 are rejected; the environment must declare its logical dataset identity.
-Candidate discovery may omit `workload_cost_evidence`; compiling a deployable
-snapshot requires complete, valid quotes and selects by complete workload cost.
-There is no unquoted snapshot deployment path. The checked-in JSON examples are
-discovery templates, not ready-to-deploy plans.
-
-## Workflow
-
-1. Prepare the canonical workload, deployment capabilities and implementation
-   evidence as in `asapquery-planning-snapshot.json`. Set version 3.
-2. Obtain requirements without deploying:
-
-   ```sh
-   cargo run -p control_plane --example workload_cost_manifest -- snapshot.json
-   ```
-
-   For distributed deployment, POST the normal compile-and-publish request,
-   without quotes, to `/api/v1/physical-plan/cost-manifests`. This endpoint only
-   compiles; it does not stage, publish to Collectors, or activate a generation.
-   It returns manifests for the compilable candidates in this runtime profile.
-3. Have the deployment's cost/capability provider price each manifest. Attach a
-   `workload_cost_evidence` object to the snapshot or publication request:
-
-   ```json
-   {
-     "data_snapshot_id": "deployment-input-generation-42",
-     "model_version": "calibrated-provider-v1",
-     "observed_at_unix_ms": 1780000000000,
-     "valid_for_ms": 60000,
-     "quotes": [{
-       "manifest": "REPLACE with the complete returned manifest object",
-       "executable": true,
-       "unit_costs": { "REPLACE with every component ID": 1.0 }
-     }]
-   }
-   ```
-
-   This is a structural illustration, not runnable or calibrated evidence.
-   `unit_costs` must contain exactly the manifest's component keys. A quote
-   declares feasibility against the capability generation, including raw-data
-   access and the exact service when a candidate uses native fallback.
-4. Compile/start or publish. The backend selects the cheapest completely quoted,
-   feasible candidate. The live response includes `cost_comparison`; startup
-   logs the same report. Preserve it with the deployment's evidence records.
-
-## What is priced
-
-This is a flat coverage manifest over the existing physical projection, not
-another semantic DAG. Planner supplies the legal post-ASAP computations; costs
-can change which bound workload is committed, not rewrite its semantics.
-
-- Source ingestion once per source/location over the horizon. Exact fallback
-  includes every named input metric, including both sides of binary expressions;
-  repeated references to a metric share one upkeep component. Queries whose
-  sources cannot be fully enumerated are unavailable for complete costing.
-- Each shared state's build, update/merge, residency/spill and retirement once
-  per actual location, independent of the number of result consumers.
-- Each Collector transmission rule over the horizon.
-- Every reachable query operator, including reads, arithmetic, reductions and
-  complete engine-native fallback, multiplied by the query's recurrence.
-- Each result's output cost. Exact-service input upkeep/storage has a separate
-  horizon component and is not silently omitted from a raw alternative.
-
-All quotes use one provider model's common cost units. A horizon quote includes
-the complete stated partition's work, data volume/cardinality, maintained
-groups and retention. Do not reuse a global ingestion rate as a per-metric rate.
-Per-evaluation quotes exclude upkeep already charged in horizon components.
-Sunk infrastructure may explicitly cost zero under the provider's documented
-decision boundary; unknown costs may not.
-
-The manifest binds query requirements, demand, horizon, implementation details,
-Planner revision, plan identity/version and capability generation. Evidence also
-names its input generation, model and validity interval. A provider must refresh
-quotes when those data assumptions change; this API does not discover or
-authenticate telemetry itself. Freshness is evaluated at the supplied snapshot
-decision time for replay, and at server time for live requests.
-
-Missing, duplicate, negative, nonfinite, stale, mismatched or infeasible quotes
-make a candidate unavailable. If no completely quoted candidate remains, the
-decision fails closed. Tests use explicit synthetic unit costs, not production
-measurements.
-
-## Supported migration scope
-
-The default inventory compares the Planner-selected continuously maintained
-workload with its whole-workload exact fallback. `workload_cost::select` also
-accepts additional Planner-authorized, already-bindable forests. This does not
-claim exhaustive search over every lifecycle, engine or Planner algorithm.
-An exact alternative without an accessible native backend is unavailable even
-if its numeric quote would be cheap.
-
-This provider-priced binding boundary deliberately avoids inventing physical
-statistics to populate Planner's generic physical-formula provider. It completes
-cost selection for the supported execution profile; production calibration and
-additional provider implementations remain deployment work.
diff --git a/docs/offline-o11y-final-2026-09-08.md b/docs/offline-o11y-final-2026-09-08.md
deleted file mode 100644
index 64ddcf035..000000000
--- a/docs/offline-o11y-final-2026-09-08.md
+++ /dev/null
@@ -1,102 +0,0 @@
-# Historical Offline Sketch Evidence and o11y Report
-
-This report records the earlier offline experiment, not the backend-only
-prototype's execution results. Its synthetic exact-result cache experiment is
-out of the current prototype scope; its source tool is not part of the prototype.
-Current work uses user-provided OpenMetrics data and queries entering the backend,
-followed by ASAPPlanner and actual data-plane execution. No execution speedup or
-resource reduction is established by the historical results below.
-
-Audience: developers. This report covers the offline evidence path for #322,
-without real-time error feedback. The original dirty working directory was left unchanged.
-
-## Completed Integration
-
-- Versioned artifacts, JSON Schema, and a public CostModel provider match parameters, query semantics, distributions, environments, and validity intervals. Unknown measurements remain unavailable.
-- Actual CMS/CountSketch parameter sweeps measure offline error, separate construction/update/read/merge CPU, live heap allocations, serialized size, and allocated file blocks.
-- Fixed-snapshot point-frequency comparisons use explicit observed-error thresholds, formal parameter minima, CPU/retained byte-seconds weights, and an exact baseline on the same data.
-- The backend filters unsupported layouts before recommending and binding frequency configurations. When exact execution wins or evidence is insufficient, it preserves the original query without silently rounding selected parameters.
-- o11y planner/control-plane replay and exact fixed-snapshot reference measurements cover seven explicitly supported queries.
-
-For interfaces and reproduction instructions, see the [evidence contract](https://github.com/ProjectASAP/ASAPPlanner/blob/codex/empirical-o11y-322/docs/developer_docs/offline-sketch-evidence.md),
-[backend benchmark commands](../tools/empirical-bench/README.md), and [backend-entry replay guide](user_guide/o11y-replay.md).
-
-## Measured Results
-
-sketch-bench is pinned to revision `87f619e843fd2e4da784160d4e205a0d0d55f032`.
-The uniform and Zipf datasets each contain 20,000 i64 keys, with a key space of
-1,000, seed 42, and Zipf exponent 1.1. There are 18 sketch configurations and
-two exact baselines; CPU measurements use five trials after two warmups.
-Accuracy comes from one offline experiment per fixed dataset, not a guarantee
-across distributions or real-time ground truth. The comparison assumes one
-build, 1,000 queries, 300 seconds of retention, and no merges.
-
-| Scenario | Uniform / Zipf results |
-| --- | --- |
-| CPU-only, with a 1% or 5% observed mean relative-error limit | Both select exact execution; no sketch CPU benefit |
-| Generic comparator, with memory weighting | CMS 2720×5; retained heap decreases by 81.68%, while CPU increases by approximately 0.037 / 0.182 ms, respectively |
-| Backend-compatible configuration, with memory weighting | CMS 4096×5; retained heap decreases by approximately 72.4%, while CPU also increases |
-
-The memory-weighted objective is `CPU ns + 0.01 × retained byte-seconds`. These
-weights express an illustrative preference, not a conversion measured from
-hardware. Exact retained heap is 296,976 B; CMS 2720×5 uses 54,400 B, and
-4096×5 uses 81,920 B. Memory figures measure requested allocation bytes using
-a separate System allocator probe; CPU measurements use jemalloc. These memory
-figures are not process RSS. Serialized size and allocated file blocks do not
-establish disk-throughput benefits.
-
-See `results-sweep/MEASUREMENTS.md` in the [verified experiment archive](../tools/empirical-bench/ARTIFACTS.md).
-Earlier frequency measurements and control-plane replay in `results/` remain
-as the initial baseline. Final frequency comparisons and control-plane results
-use `results-sweep/`; costs from the two runs must not be mixed.
-
-## o11y Coverage and Limitations
-
-The replay reuses the repository's existing 27 PromQL fixtures. It does not run
-upstream LLM-agent scoring or use real scenario data.
-
-The supported evaluation entry point is now the backend's `offline_planner_replay`:
-queries enter its parser, call ASAPPlanner, and return through its typed binder.
-The standalone planner-only replay was removed. Its candidate/lifecycle counts
-below remain historical diagnostics, not backend support coverage.
-
-| Check | Result |
-| --- | --- |
-| Planner candidate coverage | 26/27 have exact summary candidates; 1/27 uses raw fallback; no sketch candidates |
-| Complete lifecycle costs in the original replay | Insufficient evidence; all 27/27 conservatively fall back to raw execution |
-| Control-plane exact/default/empirical binding | All three modes bind 27/27 successfully; each retains the original query in 5 root plans |
-| Seven exact reference queries | Raw execution and cached-result reads are measured on fixed synthetic gauge snapshots, using the public CostModel and actual selection flow |
-| Remaining 20 queries | No complete reference implementation; benefits remain unavailable |
-
-New fallbacks preserve the original IR for selector, sort, and comparison/filter
-roots, increasing successful binding from 24/27 to 27/27. Binding does not mean
-every plan is executable by the summary executor. Column updates in the new IR
-are supported; keyed/non-column updates and warm-tier BinaryOp remain explicitly rejected.
-
-The seven reference queries cover instant sums, window maxima, and sums of
-window averages: 300 series, three jobs, one finite gauge sample per minute,
-and 60 repeated reads of the same snapshot. The retained state is the complete
-exact query result, not a sliding window with advancing time. Measurements
-exclude network, disk, protocol serialization, and output-label materialization;
-memory figures count logical value bytes. Benefits from repeated reads cannot
-be extrapolated to production end-to-end speedups. Machine-readable results are
-available as `results/o11y-exact-snapshot.json` in that archive.
-
-Quantile measurements, real o11y traces, time drift, post-merge error, online
-update and retirement costs, and complete production benefits remain outside
-this coverage. Point-frequency error cannot be applied to quantiles or count_over_time.
-
-## Validation and Delivery
-
-- Planner mapping: 349 unit tests pass.
-- Devtools: 3 exact benchmark tests and 4 replay tests pass; the recommendation CLI is verified with six actual requests.
-- Benchmark export: 5 Python tests pass.
-- Backend: 633 control-plane and 973 data-plane library tests pass; 7 new integration tests pass.
-- Agents cross-reviewed the provider, measurement, and binding code; artifact text, JSON, source hashes, and provenance were checked successfully.
-
-The backend pins the published planner core commit
-`dfdf6b5c1f7d667394a4ea1f56fb3786af04228d`. Normal builds and final replay do not
-require local Cargo source patches. Core planner code, benchmark tools, and backend
-integration are reviewed in separate PRs. Full generated results are distributed
-as an experiment artifact, not embedded in the source diff. No PR is automatically
-merged and the issue is not automatically closed.
diff --git a/docs/user_guide/README.md b/docs/user_guide/README.md
deleted file mode 100644
index 1d32717bc..000000000
--- a/docs/user_guide/README.md
+++ /dev/null
@@ -1,14 +0,0 @@
-# ASAPQuery-backend user guide
-
-This guide is for operators and API users. It covers startup checks and the
-PromQL-compatible query surface, not private Rust interfaces.
-
-## Start here
-
-- [Run and verify the backend](running-and-verifying.md) — build prerequisites,
-  component startup, health checks, and troubleshooting.
-- [Querying ASAP](../../docs/user_guide/querying-asap.md) — supported
-  query behavior, accuracy, freshness, fallback, and errors.
-
-For the complete multi-node demonstration, use
-[ASAPCollector's MVP demo runbook](https://github.com/ProjectASAP/ASAPCollector/blob/main/docs/user_guide/mvp-demo-runbook.md).
diff --git a/docs/user_guide/asapquery-profile.md b/docs/user_guide/asapquery-profile.md
deleted file mode 100644
index 8a9a2a0d6..000000000
--- a/docs/user_guide/asapquery-profile.md
+++ /dev/null
@@ -1,157 +0,0 @@
-# Run the ASAPQuery compatibility profile
-
-The `asapquery` runtime profile runs without ASAPCollector. It accepts
-Prometheus Remote Write v1 and sends unsupported or not-yet-ready PromQL to the
-same Prometheus server as an exact fallback.
-
-For a complete, self-checking run with a real Prometheus server:
-
-```bash
-./scripts/e2e.sh asapquery-demo
-```
-
-The command builds the production backend, starts pinned Prometheus and
-Pushgateway containers, drives raw samples (including a counter reset), checks
-all declared instant and range warm queries, compares an unplanned query with a
-direct Prometheus fallback response, and writes status/results/metrics under
-`target/asapquery-demo-evidence`. It requires Docker, `curl`, and Python 3.
-
-For the hermetic production-process conformance suite (no Docker):
-
-```bash
-./scripts/e2e.sh asapquery
-```
-
-Start Prometheus first, configure it to write to the backend, and keep its
-normal local storage enabled:
-
-```yaml
-remote_write:
-  - url: http://127.0.0.1:9091/api/v1/write
-```
-
-Then start the backend:
-
-```bash
-cargo run -p data_plane -- \
-  --profile asapquery \
-  --planning-snapshot /etc/asapquery/workload.json \
-  --prometheus-server http://127.0.0.1:9090 \
-  --forward-unsupported-queries \
-  --http-port 9091 \
-  --output-dir /tmp/asapquery-backend
-```
-
-The profile checks Prometheus's `/-/healthy` endpoint before opening its public
-listener. It rejects OTLP ingest, monitor coordination, persistence, backfill,
-schema eviction, archive routing flags, and the legacy `--streaming-config`
-bootstrap. Remote Write and PromQL share the
-backend listener:
-
-- `POST /api/v1/write`
-- `GET` or `POST /api/v1/query`
-- `GET` or `POST /api/v1/query_range`
-
-Prometheus should use the standard Remote Write v1 headers
-`Content-Encoding: snappy`, `Content-Type: application/x-protobuf`, and
-`X-Prometheus-Remote-Write-Version: 0.1.0`. The receiver validates the entire
-batch before enqueueing it. Invalid batches return `400` or `413`; exhausted
-deduplication or worker-queue capacity returns retryable `503`; accepted batches
-return `204`.
-
-`204` acknowledges bounded queue admission, not a durable accumulator or raw-WAL
-commit. Deduplication is in memory and is not recovered on restart. Stale markers
-are counted/deduplicated and excluded from numeric aggregation; they are not
-forwarded as lifecycle events. Native histograms and exemplars are rejected.
-For plan/SID inspection and finite-replay boundaries, use the
-[E2E physical-DAG walkthrough](../evaluation/e2e-physical-dag.md).
-
-The deduplication horizon must cover allowed lateness plus the deployment's
-maximum expected Prometheus retry interval. Configure those assumptions with
-`--precompute-allowed-lateness-ms`,
-`--remote-write-expected-retry-interval-ms`, and
-`--remote-write-dedup-horizon-ms`. Startup fails when the horizon is too short.
-
-Receiver evidence is exported from `/metrics` as
-`asap_remote_write_requests_total`, `asap_remote_write_samples_total`,
-`asap_remote_write_stale_markers_total`,
-`asap_remote_write_duplicates_total`,
-`asap_remote_write_rejected_requests_total`, and
-`asap_remote_write_bytes_total`.
-
-`workload.json` is a versioned `BackendLocalPlanningSnapshot`. Its
-`query_workload` and `data_workload` fields deserialize directly into the
-canonical ASAPPlanner types; `implementation` contains only backend-owned
-cost/window evidence, and `environment.target` must be
-`backend_local_remote_write`. Startup validates the workload, calls the pinned
-ASAPPlanner, compiles matching SummaryCatalog/PrecomputePlan/QueryPlan views, and
-installs the resulting immutable snapshot before accepting traffic. It does
-not create or wait for a CollectorPlan.
-
-Supply data evidence only in the top-level `data_workload`; nesting it inside
-`query_workload` is no longer accepted. `data_ingestion_interval` declares the
-instant-selector horizon in milliseconds. Snapshot planning checks its freshness
-at `environment.observed_at_unix_ms`; HTTP physical planning checks it at the
-current planning time and requires the same top-level data evidence.
-Current-series plans retain this horizon for membership expiry, and their input
-lag allowance never exceeds it. Missing cadence in a legacy snapshot is derived
-from its explicit scrape interval; expired or invalid supplied evidence is rejected.
-
-`implementation.max_retained_summary_bytes` limits the estimated total encoded
-summary footprint across every retained pane and partition. It defaults to 2
-GiB for older snapshots and is clamped to `--persistence-memory-limit-mb` at
-startup. Candidates that exceed the effective budget are marked unavailable
-before any physical plan is installed.
-
-A complete canonical input is checked in at
-`docs/examples/asapquery-planning-snapshot.json`.
-
-For reproducibility/debugging, `--physical-plan` remains an alternative to
-`--planning-snapshot`; exactly one is required. `physical-plan.json` is the
-JSON representation accepted by
-`POST /api/v1/physical-plan`: a `SummaryCatalog`, `PrecomputePlan`,
-`TransmissionPlan`, and authoritative `QueryPlan` DAG with one shared plan
-identity and version. For this profile, the precompute ingest contract must be
-`prometheus_remote_write_v1` at `/api/v1/write`; raw writes are rejected if a
-different plan is active. Startup validates all fingerprints, schemas, query
-bindings, lifecycle fields, and transmission rules before constructing the
-single active snapshot. Runtime replacement uses `POST /api/v1/physical-plan`
-to stage the complete successor and `POST /api/v1/physical-plan/activate` for
-the atomic cutover. The old partial `/backend-plan` endpoint has been removed;
-the `/streaming-config` compatibility endpoint is not attached in this profile.
-
-Query serving uses only the installed `QueryPlan` DAG. A query absent from that
-DAG is a capability miss and goes to the exact Prometheus fallback; the backend
-does not search materialization candidates while serving.
-
-Per-series window queries also retain exact fallback when the raw producer cannot
-preserve every source label. For example, bare `sum_over_time(m[1m])` must return
-one value per series; a pooled accumulator cannot replace those rows. Explicit
-additive reductions such as `sum(sum_over_time(m[1m]))` and grouped variants can
-still use warm state. The demo uses this explicit global sum and forwards its
-bare quantile query to Prometheus.
-
-Counter `rate` and `increase` queries currently use the exact Prometheus
-fallback in this raw-ingest profile. The backend does not install pooled counter
-state because independent series can reset or arrive at the same timestamp.
-Other supported queries in the workload can still use warm summaries. Previously
-generated artifacts containing raw counter state are rejected; regenerate them
-from their workload snapshots.
-
-Activation and warm readiness are deliberately separate. A newly activated
-generation exposes each materialization as `materializing`; the QueryPlan path
-promotes it through `ready` to `serving` only after its closed-window coverage
-fully spans the requested interval. Missing, partial, stale, or generation-raced
-coverage is a capability miss, never a partial warm success. Inspect the
-per-materialization state and observed coverage through
-`GET /api/v1/physical-plan/status`.
-
-Snapshot schema version `2` accepts fixed-interval repeating PromQL queries
-with `implementation.scrape_interval_ms` and fresh ingestion-rate evidence.
-Range selectors derive their own lookback; each rangeless source uses the
-scrape interval for backend-local planning. This default window is distinct
-from Prometheus's instant-selector lookback delta and does not configure it.
-Omit `time_selection.lookback` or set it to `null`. Ranges and offsets must be
-whole seconds; unsupported fractional durations fail startup instead of
-silently shortening the window. Unsupported snapshot semantics fail startup
-rather than silently inventing cost or placement evidence.
diff --git a/docs/user_guide/o11y-replay.md b/docs/user_guide/o11y-replay.md
deleted file mode 100644
index 957b9c36b..000000000
--- a/docs/user_guide/o11y-replay.md
+++ /dev/null
@@ -1,86 +0,0 @@
-# Offline o11y evaluation through the backend
-
-For developers evaluating the actual control-plane planning integration.
-The canonical path is:
-
-`PromQL corpus -> ASAPQuery-backend parser -> ASAPPlanner -> backend typed binder/fallback`
-
-There is no standalone planner-only `o11y_replay` command. Run the backend's
-`offline_planner_replay` example through its reproducibility wrapper instead.
-
-## Run the control-plane replay
-
-From an ASAPQuery-backend checkout, with its normal sibling dependencies available:
-
-```sh
-python3 tools/run-offline-planner-replay.py \
-  --queries /path/to/ASAPPlanner/crates/frontend-promql/tests/observability/data/o11y_bench_promql.txt \
-  --evidence /path/to/planner-evidence.json \
-  --context /path/to/context.json \
-  --output /tmp/control-plane-o11y.json
-```
-
-The backend uses its pinned planner dependency; a planner source checkout is
-only needed here to locate the vendored query fixture. Omit evidence and context
-together to run exact/default modes only. Supplying both adds empirical mode.
-An optional `--planner /path/to/ASAPPlanner` enables a local source override for
-development; it is not the default evaluation path.
-
-The [backend guide](../../control_plane/docs/offline-sketch-evidence.md)
-documents the actual parser/binder and evidence assumptions.
-The [benchmark driver](../../tools/empirical-bench/README.md)
-and [artifact instructions](../../tools/empirical-bench/ARTIFACTS.md)
-also live in the backend repository.
-
-## Interpret coverage conservatively
-
-- A parse failure is not a planner or backend execution result.
-- A bound plan means the backend accepted a plan returned through its planner integration.
-- `root_raw_fallback` means the complete original query remains selected; this is not summary acceleration.
-- `raw_subtrees` includes source scans underneath summaries and cannot be counted as root fallback.
-- `planning_elapsed_ns` measures the parser/binder path, not query execution.
-- Binding does not establish deployable placement, successful data-plane execution, or resource savings.
-
-The recorded final evaluation bound all 27 fixtures in exact/default/empirical
-modes; each mode retained five raw root fallbacks. Earlier standalone planner
-candidate counts are historical diagnostics, not backend support coverage.
-No collectors, storage services, query servers or upstream agent scoring run.
-Point-frequency error measurements do not establish error bounds for these
-PromQL queries.
-
-## Backend-only execution prototype
-
-The target is real data-plane execution, not just binding coverage:
-OpenMetrics data and o11y queries enter ASAPQuery-backend; the backend calls
-ASAPPlanner and executes either a valid ASAP plan or a local exact baseline.
-No ASAPCollector or Prometheus process is required by the intended standalone
-prototype. The implementation and its current limitations belong to
-[backend PR #524](https://github.com/ProjectASAP/ASAPQuery-backend/pull/524).
-
-The supplied dataset is `/mydata/metrics.txt`, an OpenMetrics file with 305,026
-samples across 106 series. Preserve it read-only. The backend adapter owns
-timestamp conversion and Remote Write encoding; OpenMetrics text cannot be
-posted directly to `/api/v1/write`. The currently pinned upstream task corpus
-has 28 query occurrences (24 unique queries); do not equate that corpus with the
-older 27-query fixture used for the historical binding report.
-
-Acceptance requires matching exact/ASAP query results before reporting latency
-or resource reductions, with identical data, labels and evaluation times.
-Report construction/ingestion costs separately from steady-state queries.
-Unsupported queries and exact fallbacks are not accelerated successes.
-Do not substitute the earlier synthetic result-cache experiment for this test.
-
-## Optional backend diagnostic
-
-The small `offline_recommend` diagnostic also lives in ASAPQuery-backend.
-It compares measured fixed-snapshot frequency scenarios, not PromQL execution:
-
-```sh
-cargo run -p control_plane --example offline_recommend -- \
-  /path/to/comparison-evidence.json /path/to/request.json
-```
-
-All benchmark producers and execution tools live in the backend repository.
-These evaluation documents are maintained in ASAPQuery-backend. The public
-evidence and resource contracts are reviewed separately in
-[ASAPPlanner #357](https://github.com/ProjectASAP/ASAPPlanner/pull/357).
diff --git a/docs/user_guide/querying-asap.md b/docs/user_guide/querying-asap.md
deleted file mode 100644
index db05eb9c0..000000000
--- a/docs/user_guide/querying-asap.md
+++ /dev/null
@@ -1,83 +0,0 @@
-# Querying ASAP
-
-## TL;DR
-
-Send PromQL through the Prometheus-compatible API as you would to an exact
-backend. ASAPQuery answers a request from planned summary state when that state
-is compatible, complete, and fresh. Otherwise it uses the configured exact
-fallback when the active plan permits it, or returns an explicit error.
-
-## Query behavior
-
-A request has one of three outcomes:
-
-1. **Summary-backed result:** the active plan contains a matching readout and
-   all required state is ready.
-2. **Exact result:** the active plan routes the query to the configured
-   Prometheus/VictoriaMetrics-compatible fallback.
-3. **Error:** neither route can produce a correct answer.
-
-The data plane never turns missing or stale state into a zero-valued result.
-
-## PromQL examples
-
-ASAP's MVP workload includes aggregation within a series over time:
-
-```promql
-quantile_over_time(0.95, request_duration_seconds[5m])
-```
-
-aggregation across label groups:
-
-```promql
-sum by (region) (http_requests_total)
-```
-
-and aggregation across both time and label groups:
-
-```promql
-sum by (region) (rate(http_requests_total[5m]))
-```
-
-These examples do not promise that every deployment accelerates each query.
-The submitted workload, selected Planner result, available summaries, and
-active SummaryCatalog and QueryPlan together determine the route.
-
-## Accuracy
-
-Some maintained summaries are exact; others have a declared approximation
-guarantee. The query response must correspond to the guarantee selected for
-that query. ASAPQuery does not silently substitute a less accurate summary.
-
-For validation, compare results with the exact backend over identical samples,
-labels, timestamps, and logical query ranges. Missing or additional series are
-errors, not values to ignore.
-
-## Freshness
-
-A summary-backed result is served only when its state:
-
-- belongs to the active plan and current run;
-- covers the requested logical interval;
-- has passed its watermark and allowed-lateness rules; and
-- has no missing delta or producer state.
-
-A completed window from an earlier plan is not a fresh answer for the current
-plan merely because its metric labels match.
-
-## Fallback and errors
-
-Fallback is explicit plan behavior. Unsupported operators, unavailable summary
-coverage, or exact accuracy requirements may be routed to the exact backend.
-Fallback transport and query failures remain visible; they are not returned as
-successful empty vectors.
-
-Operational errors should identify the failed boundary where possible, such as
-unsupported query shape, inactive plan, stale window, missing delta sequence,
-incompatible materialization, or exact-backend failure.
-
-## Related documentation
-
-- [Data-plane design](https://github.com/ProjectASAP/ASAPCollector/blob/main/docs/design_docs/asapquery-backend/query-query-engine.md)
-- [Summary storage](https://github.com/ProjectASAP/ASAPCollector/blob/main/docs/design_docs/asapquery-backend/query-summary-store-engine.md)
-- [ASAPCollector MVP demo runbook](https://github.com/ProjectASAP/ASAPCollector/blob/main/docs/user_guide/mvp-demo-runbook.md)
diff --git a/docs/user_guide/running-and-verifying.md b/docs/user_guide/running-and-verifying.md
deleted file mode 100644
index 12710eaac..000000000
--- a/docs/user_guide/running-and-verifying.md
+++ /dev/null
@@ -1,96 +0,0 @@
-# Run and verify the backend
-
-## Prerequisites
-
-Clone `ASAPCollector`, `ASAPQuery-backend`, and `asap_sketchlib` as sibling
-directories. Install the Rust toolchain required by the workspace, then build:
-
-```bash
-cargo build --workspace
-```
-
-For a fully configured system, prefer the ASAPCollector deployment harness. The
-commands below are useful for component development and diagnostics.
-
-## Inspect runtime options
-
-```bash
-cargo run -p data_plane -- --help
-```
-
-The data plane requires a streaming configuration file. A minimal development
-launch follows this shape:
-
-```bash
-cargo run -p data_plane -- \
-  --streaming-config PATH_TO_STREAMING_CONFIG \
-  --http-port 8088 \
-  --enable-otel-ingest \
-  --otel-grpc-port 4317 \
-  --otel-http-port 4318
-```
-
-Use a checked-in or controller-emitted streaming configuration appropriate to
-your workload; do not invent aggregation identities by hand for production.
-
-Run the control plane with its defaults:
-
-```bash
-cargo run -p control_plane
-```
-
-Important default listeners are:
-
-| Component | Endpoint | Purpose |
-| --- | --- | --- |
-| Control plane | `http://localhost:8080` | Planning and configuration API |
-| Control plane | `ws://localhost:4320/v1/opamp` | Collector OpAMP connection |
-| Data plane | `http://localhost:8088` | PromQL-compatible query and diagnostics |
-| Data plane | `localhost:4317` | OTLP gRPC ingest when enabled |
-| Data plane | `localhost:4318/v1/metrics` | OTLP HTTP ingest when enabled |
-
-Deployment configuration can override these values.
-
-## Verify readiness
-
-Check data-plane health:
-
-```bash
-curl -fsS http://localhost:8088/api/v1/health
-```
-
-Inspect installed runtime state when diagnosing plan or routing problems:
-
-```bash
-curl -fsS http://localhost:8088/api/v1/streaming-config
-curl -fsS http://localhost:8088/api/v1/physical-plan/status
-curl -fsS http://localhost:8088/api/v1/summary-inventory
-curl -fsS http://localhost:8088/api/v1/storage_routing
-```
-
-Run an instant query:
-
-```bash
-curl -fsS --get http://localhost:8088/api/v1/query \
-  --data-urlencode 'query=up'
-```
-
-A ready result has `status: success` and the expected `infos` annotations for
-data source and accuracy. Health alone does not prove that plans, summary data,
-or exact fallback are available.
-
-## Troubleshooting
-
-| Symptom | Check |
-| --- | --- |
-| Build cannot resolve a path dependency | Verify the three sibling repository names and locations |
-| Data plane exits immediately | Supply `--streaming-config` and check YAML errors and port conflicts |
-| OTLP connection is refused | Start with `--enable-otel-ingest` and verify ports 4317/4318 |
-| Query returns no compatible summary | Inspect the SummaryCatalog, PrecomputePlan, QueryPlan, storage routing, metric labels, and window |
-| Unsupported query fails | Configure an exact backend or use a supported planned query |
-| Result comes from an unexpected tier | Inspect `infos` provenance and the installed storage routing table |
-| Results are stale | Check collector export, OTLP ingest, active-window state, and source timestamps |
-
-Capture component commits, effective configuration, relevant logs, diagnostic
-endpoint output, and one complete query response when reporting a problem.
-Remove credentials and environment secrets first.
diff --git a/examples/planner-layering-example1.json b/examples/planner-layering-example1.json
new file mode 100644
index 000000000..70266971f
--- /dev/null
+++ b/examples/planner-layering-example1.json
@@ -0,0 +1,95 @@
+{
+  "query_workload": {
+    "language": "promql",
+    "query_batch": null,
+    "repeating_queries": [
+      {
+        "query": "sum by (job) (rate(http_requests_total[1m]))",
+        "demand": {
+          "fixed_interval": 10000
+        },
+        "requirements": {
+          "accuracy": {
+            "explicit": "Exact"
+          },
+          "response_latency": "unspecified"
+        },
+        "predictability": {
+          "predictable": {
+            "known_at": null
+          }
+        },
+        "time_selection": {
+          "scope": "real_time",
+          "lookback": 60000,
+          "as_of": null
+        }
+      },
+      {
+        "query": "topk by (job) (10, sum_over_time(http_requests_total[1m]))",
+        "demand": {
+          "fixed_interval": 10000
+        },
+        "requirements": {
+          "accuracy": {
+            "explicit": {
+              "EpsilonDelta": {
+                "epsilon": 0.01,
+                "delta": 0.001
+              }
+            }
+          },
+          "response_latency": {
+            "explicit_max_ms": 100.0
+          }
+        },
+        "predictability": {
+          "predictable": {
+            "known_at": null
+          }
+        },
+        "time_selection": {
+          "scope": "real_time",
+          "lookback": 60000,
+          "as_of": null
+        }
+      }
+    ]
+  },
+  "data_workload": {
+    "arrival": "continuously_ingesting",
+    "data_ingestion_interval": {
+      "value": 15000,
+      "source": "declared",
+      "observed_at_ms": null,
+      "valid_for_ms": null
+    },
+    "ingestion_volume": {
+      "value": null,
+      "source": "unknown",
+      "observed_at_ms": null,
+      "valid_for_ms": null
+    },
+    "ingestion_rate": {
+      "value": 66666.66666666667,
+      "source": "declared",
+      "observed_at_ms": null,
+      "valid_for_ms": null
+    },
+    "input_cardinality": {
+      "value": 1000000,
+      "source": "declared",
+      "observed_at_ms": null,
+      "valid_for_ms": null
+    },
+    "distribution": {
+      "value": "zipf",
+      "source": "declared",
+      "observed_at_ms": null,
+      "valid_for_ms": null
+    },
+    "metric_types": {
+      "http_requests_total": "counter"
+    }
+  }
+}
\ No newline at end of file
diff --git a/pyproject.toml b/pyproject.toml
deleted file mode 100644
index 4cf7ca5f0..000000000
--- a/pyproject.toml
+++ /dev/null
@@ -1,18 +0,0 @@
-[tool.black]
-line-length = 88
-target-version = ['py38', 'py39', 'py310', 'py311']
-include = '\.pyi?$'
-exclude = '''
-/(
-    \.eggs
-  | \.git
-  | \.hg
-  | \.mypy_cache
-  | \.tox
-  | \.venv
-  | _build
-  | buck-out
-  | build
-  | dist
-)/
-'''
diff --git a/scripts/ci/README.md b/scripts/ci/README.md
index 8c2d90e1b..ff84de5f5 100644
--- a/scripts/ci/README.md
+++ b/scripts/ci/README.md
@@ -15,7 +15,9 @@ MVP CI uses `--locked` and runs the workspace checks, Clippy, unit tests, and
 process E2E tests. Only a successful run for the current update PR head can
 trigger the merge workflow; it also verifies the repository, branch, base, and
 that main has not advanced since that run and only the two Cargo files changed. Branch protection remains in force.
-Failed updates stay open and main retains its last verified version. Fix an
+Failed updates stay open and main retains its last verified version.
+While `asap-plan-selection` and `asap-executor` exist only in the Planner's
+#509 stack, the pin is a stack revision and updates to Planner main fail CI. Fix an
 upstream incompatibility separately, or let the next upstream update refresh the
 PR. An automation failure is visible in Actions; check token permissions there.
 
diff --git a/scripts/ci/test_sync_planner.py b/scripts/ci/test_sync_planner.py
index cf06f4276..bca82901f 100644
--- a/scripts/ci/test_sync_planner.py
+++ b/scripts/ci/test_sync_planner.py
@@ -12,7 +12,7 @@ class PlannerSyncTests(unittest.TestCase):
     revision = "a" * 40
     manifest = ''.join(
         f'{name} = {{ git = "https://github.com/ProjectASAP/ASAPPlanner", rev = "{"b" * 40}" }}\n'
-        for name in ['planner-types', 'asap-aware-mapping', 'asap-frontend-promql', 'asap-frontend-sql']
+        for name in ['planner-types', 'asap-frontend-promql', 'asap-plan-selection', 'asap-executor']
     )
 
     def run_sync(self, manifest, revision=None, cargo_status=0):
@@ -39,8 +39,8 @@ def test_updates_all_dependencies_and_lock_resolution(self):
         self.assertEqual(updated.count(f'rev = "{self.revision}"'), 4)
         self.assertTrue(updated.endswith(other))
         self.assertEqual((root / 'cargo-args').read_text().splitlines(), [
-            'update', '-p', 'asap-types@0.1.0', '-p', 'asap-aware-mapping',
-            '-p', 'asap-frontend-promql', '-p', 'asap-frontend-sql', '--precise', self.revision])
+            'update', '-p', 'asap-types@0.1.0', '-p', 'asap-frontend-promql',
+            '-p', 'asap-plan-selection', '-p', 'asap-executor', '--precise', self.revision])
 
     def test_invalid_revision_does_not_mutate_manifest(self):
         """An upstream lookup failure cannot produce a malformed pin."""
diff --git a/scripts/e2e.sh b/scripts/e2e.sh
deleted file mode 100755
index 6cdba1a58..000000000
--- a/scripts/e2e.sh
+++ /dev/null
@@ -1,221 +0,0 @@
-#!/usr/bin/env bash
-# Manual end-to-end test runner for ASAPQuery-backend.
-#
-# The default "all" target stays local to this repository.  "system" is an
-# explicit opt-in because it delegates to ASAPCollector's multi-node harness
-# and may build images, start containers, and use SSH.
-
-set -Eeuo pipefail
-
-SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
-REPO_DIR="$(cd "${SCRIPT_DIR}/.." && pwd)"
-TARGET="${1:-all}"
-CURRENT_STAGE="startup"
-STARTED_AT="$(date +%s)"
-
-export CARGO_TARGET_DIR="${ASAP_E2E_CARGO_TARGET_DIR:-${REPO_DIR}/target/e2e}"
-export GOCACHE="${ASAP_E2E_GO_CACHE:-${REPO_DIR}/target/e2e-go-cache}"
-export CARGO_INCREMENTAL="${ASAP_E2E_CARGO_INCREMENTAL:-0}"
-
-usage() {
-    cat <<'EOF'
-Usage: ./scripts/e2e.sh [target]
-
-Targets:
-  all             Run every local component suite
-  contracts       Shared Rust type/protobuf wire contracts
-  control-plane   Planner HTTP, OpAMP, publication, and runtime feedback
-  data-plane      Query, routing, storage, ingest adapter, and lifecycle tests
-  asapquery       Collector-free Remote Write -> QueryPlan process conformance
-  asapquery-demo  Run the real Prometheus compatibility demo (requires Docker)
-  differential    Production DDSketch PromQL vs deterministic raw-value oracle
-  sketch-oracles  Every sketch via production binary + independent raw oracle
-  monitor         Real monitor gRPC transport tests
-  whole-matrix    All sketch families and query shapes (diagnostic)
-  differential-all Production sketch oracles plus the in-process query matrix
-  system          Delegate to ASAPCollector's real multi-node system harness
-  list            Print the suites and audit Rust E2E ignore markers
-
-Useful environment variables:
-  ASAP_COLLECTOR_DIR          Sibling ASAPCollector checkout (system target)
-  ASAP_E2E_CARGO_TARGET_DIR   Rust build directory
-  ASAP_E2E_GO_CACHE           Go build cache directory
-  ASAP_E2E_CARGO_INCREMENTAL  Set to 1 to retain Rust incremental artifacts
-  ASAP_E2E_NOCAPTURE=1        Pass --nocapture to Rust test binaries
-EOF
-}
-
-say() {
-    printf '\n==> %s\n' "$*"
-}
-
-die() {
-    printf '\nERROR [%s]: %s\n' "${CURRENT_STAGE}" "$*" >&2
-    exit 1
-}
-
-on_error() {
-    local code=$?
-    printf '\nFAILED [%s] (exit %s)\n' "${CURRENT_STAGE}" "${code}" >&2
-    exit "${code}"
-}
-trap on_error ERR
-
-need() {
-    command -v "$1" >/dev/null 2>&1 || die "required command not found: $1"
-}
-
-rust_test() {
-    local package=$1
-    shift
-    local test_args=(--test-threads=1)
-    if [[ "${ASAP_E2E_NOCAPTURE:-0}" == "1" ]]; then
-        test_args+=(--nocapture)
-    fi
-    cargo test --locked -p "${package}" "$@" -- "${test_args[@]}"
-}
-
-contracts() {
-    CURRENT_STAGE="contracts/asap_types"
-    say "contracts: shared policy and routing types"
-    rust_test asap_types
-
-    # The physical library's independent tests run in the ASAPPlanner workspace.
-    # Backend type/control-plane/data-plane tests cover its deployment bindings.
-
-    CURRENT_STAGE="contracts/asap_otel_proto"
-    say "contracts: modified OTLP and monitor protobuf compatibility"
-    rust_test asap_otel_proto --tests
-}
-
-control_plane() {
-    CURRENT_STAGE="control-plane"
-    say "control-plane: HTTP planning, OpAMP, publication, and feedback"
-    rust_test control_plane
-}
-
-data_plane() {
-    CURRENT_STAGE="data-plane/library"
-    say "data-plane: HTTP query/routing, storage, lifecycle, and fallback"
-    rust_test data_plane --lib
-
-    CURRENT_STAGE="data-plane/edge-runtime-wire"
-    say "data-plane: edge runtime sketch envelope -> backend accumulator"
-    rust_test data_plane --test edge_sketch_codec
-
-    CURRENT_STAGE="data-plane/production-process"
-    say "data-plane: production binary -> modified OTLP -> SketchStore -> PromQL"
-    rust_test data_plane --test component_process_e2e
-
-    differential
-}
-
-asapquery() {
-    CURRENT_STAGE="asapquery/physical-compile"
-    say "asapquery: canonical workload -> backend-local atomic PhysicalPlan"
-    rust_test control_plane compatibility_demo_snapshot_compiles_the_complete_query_matrix
-
-    CURRENT_STAGE="asapquery/production-process"
-    say "asapquery: Remote Write -> precompute/store -> QueryPlan DAG -> fallback"
-    rust_test data_plane --test asapquery_compatibility_process_e2e
-}
-
-asapquery_demo() {
-    CURRENT_STAGE="asapquery/real-prometheus-demo"
-    say "asapquery: real Prometheus Remote Write compatibility demo"
-    "${REPO_DIR}/demos/asapquery/run.sh"
-}
-
-differential() {
-    CURRENT_STAGE="data-plane/promql-differential"
-    say "data-plane: production DDSketch PromQL -> raw oracle + range endpoint consistency"
-    rust_test data_plane --test promql_differential_process_e2e
-}
-
-sketch_oracles() {
-    differential
-    CURRENT_STAGE="data-plane/all-sketch-production-oracles"
-    say "data-plane: production KLL/HLL/CountSketch/CMS -> independent raw-data oracles"
-    rust_test data_plane --test all_sketches_process_oracle_e2e
-}
-
-monitor() {
-    CURRENT_STAGE="monitor-grpc"
-    say "monitor: real bidirectional gRPC server/client"
-    rust_test data_plane --test monitor_grpc
-
-    CURRENT_STAGE="monitor-production-process"
-    say "monitor: production coordinator process -> two edge streams -> sampling grants"
-    rust_test data_plane --test monitor_process_e2e
-}
-
-
-
-whole_matrix() {
-    CURRENT_STAGE="whole/sketch-query-matrix"
-    say "whole repository diagnostic: every sketch and query scenario"
-    rust_test data_plane --test e2e_controller_plans_and_backend_serves
-}
-
-differential_all() {
-    local status=0
-    sketch_oracles || status=$?
-    whole_matrix || status=$?
-    return "${status}"
-}
-
-list_suites() {
-    usage
-    printf '\nRust E2E tests marked #[ignore] (expected: none):\n'
-    local ignored
-    if ignored="$(git -C "${REPO_DIR}" grep -n -E '^[[:space:]]*#[[:space:]]*\[[[:space:]]*ignore' -- '*.rs')"; then
-        printf '%s\n' "${ignored}"
-        die "ignored Rust tests found; convert them to executable E2E/unit tests or remove stale coverage"
-    fi
-    printf 'none\n'
-}
-
-system_e2e() {
-    CURRENT_STAGE="external-system"
-    need docker
-    local collector_dir="${ASAP_COLLECTOR_DIR:-${REPO_DIR}/../ASAPCollector}"
-    local runner="${collector_dir}/deploy/mvp-multinode/scripts/run_demo.sh"
-    [[ -f "${runner}" ]] || die "ASAPCollector system runner not found: ${runner}"
-    say "external system: delegating to ASAPCollector multi-node harness"
-    printf 'This target may build images, start remote containers, and use SSH.\n'
-    BACKEND="${REPO_DIR}" bash "${runner}" all
-}
-
-main() {
-    cd "${REPO_DIR}"
-    case "${TARGET}" in
-        all)
-            need cargo
-            need rg
-            contracts
-            control_plane
-            data_plane
-            monitor
-            ;;
-        contracts) need cargo; contracts ;;
-        control-plane) need cargo; control_plane ;;
-        data-plane) need cargo; data_plane ;;
-        asapquery) need cargo; asapquery ;;
-        asapquery-demo) need cargo; asapquery_demo ;;
-        differential) need cargo; differential ;;
-        sketch-oracles) need cargo; sketch_oracles ;;
-        monitor) need cargo; monitor ;;
-        whole-matrix) need cargo; whole_matrix ;;
-        differential-all) need cargo; differential_all ;;
-        system) system_e2e ;;
-        list) list_suites; exit 0 ;;
-        -h|--help|help) usage; exit 0 ;;
-        *) usage >&2; die "unknown target: ${TARGET}" ;;
-    esac
-
-    local elapsed=$(( $(date +%s) - STARTED_AT ))
-    CURRENT_STAGE="complete"
-    printf '\nPASS: %s E2E target completed in %ss\n' "${TARGET}" "${elapsed}"
-}
-
-main "$@"
diff --git a/scripts/sync-asapplanner-main.sh b/scripts/sync-asapplanner-main.sh
index 2c2a2d974..834724b4d 100755
--- a/scripts/sync-asapplanner-main.sh
+++ b/scripts/sync-asapplanner-main.sh
@@ -27,9 +27,9 @@ PY
 
 cargo update \
   -p asap-types@0.1.0 \
-  -p asap-aware-mapping \
   -p asap-frontend-promql \
-  -p asap-frontend-sql \
+  -p asap-plan-selection \
+  -p asap-executor \
   --precise "$planner_rev"
 
 echo "synchronized ASAPPlanner dependencies to $planner_rev"
diff --git a/tools/autosketch-comparison/.gitignore b/tools/autosketch-comparison/.gitignore
deleted file mode 100644
index c18dd8d83..000000000
--- a/tools/autosketch-comparison/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-__pycache__/
diff --git a/tools/autosketch-comparison/README.md b/tools/autosketch-comparison/README.md
deleted file mode 100644
index 77bed7dad..000000000
--- a/tools/autosketch-comparison/README.md
+++ /dev/null
@@ -1,167 +0,0 @@
-# AutoSketch comparison: first executable slice
-
-This runner starts E3 of the [evaluation plan (PR #545)](https://github.com/ProjectASAP/ASAPQuery-backend/pull/545).
-It is a memory-constrained frequency/membership **shared-calibration-table selection experiment**, not a full
-ASAPPlanner, recurring-window, or native AutoSketch benchmark.
-
-## What runs
-
-- Actual `asap_sketchlib::CountMinSketch`, `CountSketch`, and packed-bit `Bloom`
-  implementations. No sketch implementation is duplicated in the backend.
-- `--query frequency` admits CMS and Count Sketch; `--query membership` admits
-  Bloom. Incompatible families are filtered before measurement because their
-  result semantics and error metrics are not interchangeable.
-- Up to 56 configurations per family: widths 64 through 4096 in powers of two,
-  depths 1 through 8. All methods see the same budget- and legality-filtered grid.
-  Portable Count Sketch requires `depth * (log2(width) + 1) <= 64`; CMS supports
-  larger hash layouts automatically.
-- `--memory-budget-bytes` is a hard cap on the selected sketch's f64 counter or
-  packed-bit payload, applied **before calibration and selection**. It is not an RSS cap or
-  a multi-window total-memory constraint. Object/allocator headers and transient
-  query scratch space are excluded. No populated key sidecar is used by these
-  point-frequency updates. Objective remains minimum sketch payload bytes.
-- `--sketches cms,count-sketch,bloom` registers all families by default, after
-  which `--query` removes incompatible candidates. Each legal family gets
-  an independent search frontier; the cheapest feasible result wins globally.
-  Use `--sketches cms` or `--sketches count-sketch` for family ablations.
-- Frequency uses an exact oracle across all declared keys and maximum
-  `abs(estimate - truth) / events`. Membership checks zero false negatives and
-  measures FPP over a disjoint absent-key set.
-- A software AutoSketch-style LHS/neighbor search, the real ASAPPlanner
-  `ErpArtifact::select`, and an independently enumerated finite-grid oracle.
-- Separate calibration/test data seeds per run. Selection occurs before test
-  data generation. The CMS hash function is fixed by the library; varying data
-  seeds is **not** independent sketch-hash replication.
-- Uniform or truncated Zipf event generation representing one complete window
-  snapshot. No event-time/window machinery or query frontend runs yet.
-
-## Run
-
-The repository's normal Rust dependencies, including the sibling ASAPCollector
-and sketch-library checkout, are required. No new dependencies are introduced.
-
-```sh
-cargo test -p data_plane --example autosketch_comparison
-cargo run --release -p data_plane --example autosketch_comparison -- \
-  --output /tmp/cms-uniform.json --backend-revision "$(git rev-parse HEAD)" \
-  --events 10000 --cardinality 1000 --runs 10 --seed 42 --epsilon 0.01 \
-  --query frequency --sketches cms,count-sketch,bloom --memory-budget-bytes 4096
-cargo run --release -p data_plane --example autosketch_comparison -- \
-  --output /tmp/cms-zipf.json --backend-revision "$(git rev-parse HEAD)" \
-  --events 10000 --cardinality 1000 --runs 10 --seed 42 --epsilon 0.01 --zipf 1.2 \
-  --query frequency --sketches cms,count-sketch,bloom --memory-budget-bytes 4096
-
-# Membership configuration using measured false-positive rate
-cargo run --release -p data_plane --example autosketch_comparison -- \
-  --output /tmp/bloom.json --backend-revision "$(git rev-parse HEAD)" \
-  --query membership --sketches bloom --epsilon 0.01 --memory-budget-bytes 4096
-```
-
-Use new output paths: the runner refuses to overwrite artifacts. A failed run
-may leave an empty file, not a successful report. The JSON records arguments,
-source revision, Cargo.lock, build debug-assertion status, calibration rows,
-ERP artifacts, visited configurations, selections, and held-out outcomes.
-Debug runs are smoke evaluations, not publishable performance measurements.
-
-Summarize without excluding failures:
-
-```sh
-python3 -m unittest discover -s tools/autosketch-comparison -p 'test_*.py'
-python3 tools/autosketch-comparison/summarize.py /tmp/cms-uniform.json /tmp/cms-zipf.json
-```
-
-See [initial smoke results](smoke-results.md) for the first executed runs,
-including held-out accuracy failures.
-
-## Repeated-window execution slice
-
-`repeated_window_comparison` measures the systems distinction that the
-single-window selector cannot: four recurring `{1m, 5m, 15m, 1h}` frequency
-queries over one-minute panes. It uses one fixed, identical
-`asap_sketchlib::CountMinSketch` configuration for all sketch methods:
-
-- `autosketch_per_query`: the natural query-local deployment, one retained pane
-  collection per query;
-- `asap_no_sharing`: deliberately the same physical layout, to keep sketch
-  configuration separate from sharing benefits;
-- `asap_full_shared`: one retained pane collection shared across all windows;
-- `exact_raw`: retained raw keys and exact scans.
-
-```sh
-cargo test -p data_plane --example repeated_window_comparison
-cargo run --release -p data_plane --example repeated_window_comparison -- \
-  --output /tmp/repeated-window.json --backend-revision "$(git rev-parse HEAD)" \
-  --panes 120 --events-per-pane 5000 --cardinality 1000 \
-  --width 256 --depth 4 --trials 7 --query-repetitions 10
-```
-
-This is a deterministic standalone execution experiment, not a claim that the
-AutoSketch paper implements window sharing, nor an end-to-end Planner/control-
-plane benchmark. Methods execute sequentially, so compare medians and structural
-counts; do not interpret wall time as isolated CPU time. See
-[executed results](repeated-window-results.md).
-The report links the checked-in per-trial raw JSON and generated SVG figure;
-`plot_repeated_window.py` regenerates the figure using only Python's standard
-library. Smoke results remain development evidence and are not used as the
-formal repeated-window performance result.
-
-The next real-data stage uses an official Google ClusterData 2019
-`instance_usage` Parquet shard. See the [dataset manifest and evaluation
-plan](google-cluster-data-2019-plan.md) for the downloaded object, exact schema
-mapping, workload, exclusions, metrics, and staged expansion policy.
-The [executed real-data report](google-cluster-data-2019-results.md) records the
-frequency configuration sweep and repeated-window comparison without treating
-the Exact loss or failed configurations as successes.
-
-## Adaptation boundary
-
-The reference is [AutoSketch Algorithm 4 and Section 5.2](https://www.usenix.org/system/files/nsdi24-sun.pdf).
-Seven initial points per family have distinct width and depth coordinates. Feasible paths
-decrease width/depth; infeasible paths increase them. Paths stop at a feasibility
-crossing. Evaluations are cached, and out-of-grid neighbors are excluded.
-Infeasible branches costing at least the feasible incumbent are pruned.
-Illegal/over-budget seeds and neighbors are discarded. Each family also gets its
-smallest legal in-budget point, so tight budgets cannot accidentally eliminate
-the entire family through LHS filtering. A budget admitting no legal configuration
-produces explicit `no_feasible_configuration` outcomes.
-
-Sketch selection considers every query-compatible registered family and performs
-parameter search within each. It is a software adaptation, not the
-paper's separate sampled family-preselection phase. CMS and Count Sketch use
-the same empirical absolute additive-error metric on nonnegative updates; this
-does not equate their theoretical L1/L2 guarantees. Bloom uses empirical FPP and
-is never compared to frequency sketches as if their errors were equivalent. No
-P4 code is generated.
-
-Differences from the hardware algorithm are intentional and must be retained in
-results: there is no stage dimension, ALU budget, or 16-KiB page alignment;
-neighbors halve/double width or change depth by one. Incumbent pruning is
-conservative: a costly feasible node can still lead to a cheaper neighbor. The
-runner reports no feasible configuration explicitly, never best effort as a
-success. This heuristic is not claimed to find every non-monotone feasible
-region or the global optimum.
-
-## How to interpret results
-
-The complete calibration grid is built once per run and shared. ERP therefore
-should match the grid oracle; that is a contract check, not a research result
-showing superior optimization. Search's visited count measures table evaluations,
-not saved real benchmark time in this version. Selection wall time excludes
-calibration; total grid calibration time is reported separately. Update/query
-timings are wall-clock observations, not CPU time. The memory-only ERP records
-use zero CPU fields explicitly as unused placeholders, not measured free work.
-
-The `asapplanner_erp_selector` label does not mean measured CMS parameters have
-passed full workload selection, physical compilation, or serving. CMS empirical
-accuracy-contract integration is still needed. There is no theoretical-sizing
-baseline yet because its confidence contract must be defined separately.
-
-## Next gates
-
-1. Lazy real benchmark callbacks and fair first-use/amortized accounting; multiple
-   accuracy seeds/windows per profile and stronger search regression fixtures.
-2. CMS ERP accuracy mapping through full Planner and backend execution.
-3. Connect the standalone recurring-window runner to generated Planner physical
-   identities and independently scheduled query periods.
-4. Catalog coverage and sketch-family ablations. No performance or breadth claim
-   is established by this starter runner.
diff --git a/tools/autosketch-comparison/data/google-cluster-2019/replay-metadata.json b/tools/autosketch-comparison/data/google-cluster-2019/replay-metadata.json
deleted file mode 100644
index 61d58310b..000000000
--- a/tools/autosketch-comparison/data/google-cluster-2019/replay-metadata.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "input": "/mydata/datasets/google-cluster-data-2019/cell-a/instance_usage-000000000000.parquet.gz",
-  "rows": 626337,
-  "keys": 44806,
-  "pane_seconds": 300,
-  "minimum_start_time_us": 300000000,
-  "maximum_start_time_us": 2678998000000,
-  "panes_including_gaps": 8929,
-  "nonempty_panes": 8929,
-  "mapping": "collection IDs sorted numerically and replaced by dense zero-based IDs"
-}
diff --git a/tools/autosketch-comparison/data/google-cluster-2019/results-w1024-probe.json b/tools/autosketch-comparison/data/google-cluster-2019/results-w1024-probe.json
deleted file mode 100644
index 22e545e4e..000000000
--- a/tools/autosketch-comparison/data/google-cluster-2019/results-w1024-probe.json
+++ /dev/null
@@ -1,78 +0,0 @@
-{
-  "adaptation": "AutoSketch is deployed independently per recurring query; ASAP-NoSharing intentionally has the same physical plan and isolates configuration; ASAP-Full shares one minute panes",
-  "args": {
-    "backend_revision": "37120510d73f40e5a202b2cdff14f4abeb7e55bf",
-    "cardinality": 44806,
-    "depth": 4,
-    "events_per_pane": 2000,
-    "input_tsv": "/mydata/google-cluster-asap-eval-20260910/replay.tsv",
-    "output": "/mydata/google-cluster-asap-eval-20260910/results-w1024-probe.json",
-    "pane_seconds": 300,
-    "panes": 8929,
-    "query_repetitions": 1,
-    "seed": 42,
-    "trials": 1,
-    "width": 1024,
-    "window_panes": [
-      1,
-      3,
-      12,
-      72,
-      288
-    ]
-  },
-  "memory_metric": "logical retained payload; CMS counters or raw usize keys; excludes allocator overhead",
-  "pane_seconds": 300,
-  "schema_version": 1,
-  "timing_metric": "wall seconds; methods execute sequentially and are not CPU profiles",
-  "trials": [
-    {
-      "methods": [
-        {
-          "logical_payload_bytes": 12320768,
-          "maintenance_updates": 3131685,
-          "max_normalized_additive_error": 0.011494252873563218,
-          "method": "autosketch_per_query",
-          "query_wall_seconds": 2.248304373,
-          "retained_sketches": 376,
-          "update_wall_seconds": 1.128088841
-        },
-        {
-          "logical_payload_bytes": 12320768,
-          "maintenance_updates": 3131685,
-          "max_normalized_additive_error": 0.011494252873563218,
-          "method": "asap_no_sharing",
-          "query_wall_seconds": 2.258788342,
-          "retained_sketches": 376,
-          "update_wall_seconds": 1.124384829
-        },
-        {
-          "logical_payload_bytes": 9437184,
-          "maintenance_updates": 626337,
-          "max_normalized_additive_error": 0.011494252873563218,
-          "method": "asap_full_shared",
-          "query_wall_seconds": 2.693884006,
-          "retained_sketches": 288,
-          "update_wall_seconds": 0.226303776
-        },
-        {
-          "logical_payload_bytes": 169336,
-          "maintenance_updates": 626337,
-          "max_normalized_additive_error": 0.0,
-          "method": "exact_raw",
-          "query_wall_seconds": 0.000128856,
-          "retained_sketches": 0,
-          "update_wall_seconds": 0.000058855
-        }
-      ],
-      "trial": 0
-    }
-  ],
-  "windows_minutes": [
-    5,
-    15,
-    60,
-    360,
-    1440
-  ]
-}
\ No newline at end of file
diff --git a/tools/autosketch-comparison/data/google-cluster-2019/results-w2048.json b/tools/autosketch-comparison/data/google-cluster-2019/results-w2048.json
deleted file mode 100644
index 50ca992fd..000000000
--- a/tools/autosketch-comparison/data/google-cluster-2019/results-w2048.json
+++ /dev/null
@@ -1,160 +0,0 @@
-{
-  "adaptation": "AutoSketch is deployed independently per recurring query; ASAP-NoSharing intentionally has the same physical plan and isolates configuration; ASAP-Full shares one minute panes",
-  "args": {
-    "backend_revision": "37120510d73f40e5a202b2cdff14f4abeb7e55bf",
-    "cardinality": 44806,
-    "depth": 4,
-    "events_per_pane": 2000,
-    "input_tsv": "/mydata/google-cluster-asap-eval-20260910/replay.tsv",
-    "output": "/mydata/google-cluster-asap-eval-20260910/results-w2048.json",
-    "pane_seconds": 300,
-    "panes": 8929,
-    "query_repetitions": 3,
-    "seed": 42,
-    "trials": 3,
-    "width": 2048,
-    "window_panes": [
-      1,
-      3,
-      12,
-      72,
-      288
-    ]
-  },
-  "memory_metric": "logical retained payload; CMS counters or raw usize keys; excludes allocator overhead",
-  "pane_seconds": 300,
-  "schema_version": 1,
-  "timing_metric": "wall seconds; methods execute sequentially and are not CPU profiles",
-  "trials": [
-    {
-      "methods": [
-        {
-          "logical_payload_bytes": 24641536,
-          "maintenance_updates": 3131685,
-          "max_normalized_additive_error": 0.004132231404958678,
-          "method": "autosketch_per_query",
-          "query_wall_seconds": 7.060997337,
-          "retained_sketches": 376,
-          "update_wall_seconds": 1.212771973
-        },
-        {
-          "logical_payload_bytes": 24641536,
-          "maintenance_updates": 3131685,
-          "max_normalized_additive_error": 0.004132231404958678,
-          "method": "asap_no_sharing",
-          "query_wall_seconds": 7.048597892,
-          "retained_sketches": 376,
-          "update_wall_seconds": 1.194317737
-        },
-        {
-          "logical_payload_bytes": 18874368,
-          "maintenance_updates": 626337,
-          "max_normalized_additive_error": 0.004132231404958678,
-          "method": "asap_full_shared",
-          "query_wall_seconds": 7.087256831,
-          "retained_sketches": 288,
-          "update_wall_seconds": 0.248947274
-        },
-        {
-          "logical_payload_bytes": 169336,
-          "maintenance_updates": 626337,
-          "max_normalized_additive_error": 0.0,
-          "method": "exact_raw",
-          "query_wall_seconds": 0.000286221,
-          "retained_sketches": 0,
-          "update_wall_seconds": 0.000062256
-        }
-      ],
-      "trial": 0
-    },
-    {
-      "methods": [
-        {
-          "logical_payload_bytes": 24641536,
-          "maintenance_updates": 3131685,
-          "max_normalized_additive_error": 0.004132231404958678,
-          "method": "autosketch_per_query",
-          "query_wall_seconds": 7.034130256,
-          "retained_sketches": 376,
-          "update_wall_seconds": 1.200107682
-        },
-        {
-          "logical_payload_bytes": 24641536,
-          "maintenance_updates": 3131685,
-          "max_normalized_additive_error": 0.004132231404958678,
-          "method": "asap_no_sharing",
-          "query_wall_seconds": 7.26607854,
-          "retained_sketches": 376,
-          "update_wall_seconds": 1.198786886
-        },
-        {
-          "logical_payload_bytes": 18874368,
-          "maintenance_updates": 626337,
-          "max_normalized_additive_error": 0.004132231404958678,
-          "method": "asap_full_shared",
-          "query_wall_seconds": 7.102669248,
-          "retained_sketches": 288,
-          "update_wall_seconds": 0.261935763
-        },
-        {
-          "logical_payload_bytes": 169336,
-          "maintenance_updates": 626337,
-          "max_normalized_additive_error": 0.0,
-          "method": "exact_raw",
-          "query_wall_seconds": 0.000284592,
-          "retained_sketches": 0,
-          "update_wall_seconds": 0.000063334
-        }
-      ],
-      "trial": 1
-    },
-    {
-      "methods": [
-        {
-          "logical_payload_bytes": 24641536,
-          "maintenance_updates": 3131685,
-          "max_normalized_additive_error": 0.004132231404958678,
-          "method": "autosketch_per_query",
-          "query_wall_seconds": 7.103703638,
-          "retained_sketches": 376,
-          "update_wall_seconds": 1.2165413919999999
-        },
-        {
-          "logical_payload_bytes": 24641536,
-          "maintenance_updates": 3131685,
-          "max_normalized_additive_error": 0.004132231404958678,
-          "method": "asap_no_sharing",
-          "query_wall_seconds": 7.855370794,
-          "retained_sketches": 376,
-          "update_wall_seconds": 1.208197261
-        },
-        {
-          "logical_payload_bytes": 18874368,
-          "maintenance_updates": 626337,
-          "max_normalized_additive_error": 0.004132231404958678,
-          "method": "asap_full_shared",
-          "query_wall_seconds": 9.743320684,
-          "retained_sketches": 288,
-          "update_wall_seconds": 0.258411308
-        },
-        {
-          "logical_payload_bytes": 169336,
-          "maintenance_updates": 626337,
-          "max_normalized_additive_error": 0.0,
-          "method": "exact_raw",
-          "query_wall_seconds": 0.000437491,
-          "retained_sketches": 0,
-          "update_wall_seconds": 0.000099425
-        }
-      ],
-      "trial": 2
-    }
-  ],
-  "windows_minutes": [
-    5,
-    15,
-    60,
-    360,
-    1440
-  ]
-}
\ No newline at end of file
diff --git a/tools/autosketch-comparison/data/google-cluster-2019/results-w256.json b/tools/autosketch-comparison/data/google-cluster-2019/results-w256.json
deleted file mode 100644
index 5814137ef..000000000
--- a/tools/autosketch-comparison/data/google-cluster-2019/results-w256.json
+++ /dev/null
@@ -1,160 +0,0 @@
-{
-  "adaptation": "AutoSketch is deployed independently per recurring query; ASAP-NoSharing intentionally has the same physical plan and isolates configuration; ASAP-Full shares one minute panes",
-  "args": {
-    "backend_revision": "37120510d73f40e5a202b2cdff14f4abeb7e55bf",
-    "cardinality": 44806,
-    "depth": 4,
-    "events_per_pane": 2000,
-    "input_tsv": "/mydata/google-cluster-asap-eval-20260910/replay.tsv",
-    "output": "/mydata/google-cluster-asap-eval-20260910/results-w256.json",
-    "pane_seconds": 300,
-    "panes": 8929,
-    "query_repetitions": 3,
-    "seed": 42,
-    "trials": 3,
-    "width": 256,
-    "window_panes": [
-      1,
-      3,
-      12,
-      72,
-      288
-    ]
-  },
-  "memory_metric": "logical retained payload; CMS counters or raw usize keys; excludes allocator overhead",
-  "pane_seconds": 300,
-  "schema_version": 1,
-  "timing_metric": "wall seconds; methods execute sequentially and are not CPU profiles",
-  "trials": [
-    {
-      "methods": [
-        {
-          "logical_payload_bytes": 3080192,
-          "maintenance_updates": 3131685,
-          "max_normalized_additive_error": 0.011494252873563218,
-          "method": "autosketch_per_query",
-          "query_wall_seconds": 6.730288648,
-          "retained_sketches": 376,
-          "update_wall_seconds": 1.079394527
-        },
-        {
-          "logical_payload_bytes": 3080192,
-          "maintenance_updates": 3131685,
-          "max_normalized_additive_error": 0.011494252873563218,
-          "method": "asap_no_sharing",
-          "query_wall_seconds": 6.721295625,
-          "retained_sketches": 376,
-          "update_wall_seconds": 1.08312948
-        },
-        {
-          "logical_payload_bytes": 2359296,
-          "maintenance_updates": 626337,
-          "max_normalized_additive_error": 0.011494252873563218,
-          "method": "asap_full_shared",
-          "query_wall_seconds": 6.715673332,
-          "retained_sketches": 288,
-          "update_wall_seconds": 0.217204958
-        },
-        {
-          "logical_payload_bytes": 169336,
-          "maintenance_updates": 626337,
-          "max_normalized_additive_error": 0.0,
-          "method": "exact_raw",
-          "query_wall_seconds": 0.00030232,
-          "retained_sketches": 0,
-          "update_wall_seconds": 0.000057776
-        }
-      ],
-      "trial": 0
-    },
-    {
-      "methods": [
-        {
-          "logical_payload_bytes": 3080192,
-          "maintenance_updates": 3131685,
-          "max_normalized_additive_error": 0.011494252873563218,
-          "method": "autosketch_per_query",
-          "query_wall_seconds": 6.714486171,
-          "retained_sketches": 376,
-          "update_wall_seconds": 1.080262839
-        },
-        {
-          "logical_payload_bytes": 3080192,
-          "maintenance_updates": 3131685,
-          "max_normalized_additive_error": 0.011494252873563218,
-          "method": "asap_no_sharing",
-          "query_wall_seconds": 6.706765113,
-          "retained_sketches": 376,
-          "update_wall_seconds": 1.078079812
-        },
-        {
-          "logical_payload_bytes": 2359296,
-          "maintenance_updates": 626337,
-          "max_normalized_additive_error": 0.011494252873563218,
-          "method": "asap_full_shared",
-          "query_wall_seconds": 6.716763378,
-          "retained_sketches": 288,
-          "update_wall_seconds": 0.215893698
-        },
-        {
-          "logical_payload_bytes": 169336,
-          "maintenance_updates": 626337,
-          "max_normalized_additive_error": 0.0,
-          "method": "exact_raw",
-          "query_wall_seconds": 0.000282012,
-          "retained_sketches": 0,
-          "update_wall_seconds": 0.000056425
-        }
-      ],
-      "trial": 1
-    },
-    {
-      "methods": [
-        {
-          "logical_payload_bytes": 3080192,
-          "maintenance_updates": 3131685,
-          "max_normalized_additive_error": 0.011494252873563218,
-          "method": "autosketch_per_query",
-          "query_wall_seconds": 6.723760437,
-          "retained_sketches": 376,
-          "update_wall_seconds": 1.077614055
-        },
-        {
-          "logical_payload_bytes": 3080192,
-          "maintenance_updates": 3131685,
-          "max_normalized_additive_error": 0.011494252873563218,
-          "method": "asap_no_sharing",
-          "query_wall_seconds": 6.720946545,
-          "retained_sketches": 376,
-          "update_wall_seconds": 1.079808675
-        },
-        {
-          "logical_payload_bytes": 2359296,
-          "maintenance_updates": 626337,
-          "max_normalized_additive_error": 0.011494252873563218,
-          "method": "asap_full_shared",
-          "query_wall_seconds": 6.713714126,
-          "retained_sketches": 288,
-          "update_wall_seconds": 0.216501828
-        },
-        {
-          "logical_payload_bytes": 169336,
-          "maintenance_updates": 626337,
-          "max_normalized_additive_error": 0.0,
-          "method": "exact_raw",
-          "query_wall_seconds": 0.000280613,
-          "retained_sketches": 0,
-          "update_wall_seconds": 0.000058384
-        }
-      ],
-      "trial": 2
-    }
-  ],
-  "windows_minutes": [
-    5,
-    15,
-    60,
-    360,
-    1440
-  ]
-}
\ No newline at end of file
diff --git a/tools/autosketch-comparison/data/google-cluster-2019/results-w4096.json b/tools/autosketch-comparison/data/google-cluster-2019/results-w4096.json
deleted file mode 100644
index d5ac2e697..000000000
--- a/tools/autosketch-comparison/data/google-cluster-2019/results-w4096.json
+++ /dev/null
@@ -1,160 +0,0 @@
-{
-  "adaptation": "AutoSketch is deployed independently per recurring query; ASAP-NoSharing intentionally has the same physical plan and isolates configuration; ASAP-Full shares one minute panes",
-  "args": {
-    "backend_revision": "37120510d73f40e5a202b2cdff14f4abeb7e55bf",
-    "cardinality": 44806,
-    "depth": 4,
-    "events_per_pane": 2000,
-    "input_tsv": "/mydata/google-cluster-asap-eval-20260910/replay.tsv",
-    "output": "/mydata/google-cluster-asap-eval-20260910/results.json",
-    "pane_seconds": 300,
-    "panes": 8929,
-    "query_repetitions": 3,
-    "seed": 42,
-    "trials": 3,
-    "width": 4096,
-    "window_panes": [
-      1,
-      3,
-      12,
-      72,
-      288
-    ]
-  },
-  "memory_metric": "logical retained payload; CMS counters or raw usize keys; excludes allocator overhead",
-  "pane_seconds": 300,
-  "schema_version": 1,
-  "timing_metric": "wall seconds; methods execute sequentially and are not CPU profiles",
-  "trials": [
-    {
-      "methods": [
-        {
-          "logical_payload_bytes": 49283072,
-          "maintenance_updates": 3131685,
-          "max_normalized_additive_error": 0.0,
-          "method": "autosketch_per_query",
-          "query_wall_seconds": 9.226436487,
-          "retained_sketches": 376,
-          "update_wall_seconds": 1.528203135
-        },
-        {
-          "logical_payload_bytes": 49283072,
-          "maintenance_updates": 3131685,
-          "max_normalized_additive_error": 0.0,
-          "method": "asap_no_sharing",
-          "query_wall_seconds": 8.384480373,
-          "retained_sketches": 376,
-          "update_wall_seconds": 1.485337605
-        },
-        {
-          "logical_payload_bytes": 37748736,
-          "maintenance_updates": 626337,
-          "max_normalized_additive_error": 0.0,
-          "method": "asap_full_shared",
-          "query_wall_seconds": 8.391696081,
-          "retained_sketches": 288,
-          "update_wall_seconds": 0.379189734
-        },
-        {
-          "logical_payload_bytes": 169336,
-          "maintenance_updates": 626337,
-          "max_normalized_additive_error": 0.0,
-          "method": "exact_raw",
-          "query_wall_seconds": 0.000290003,
-          "retained_sketches": 0,
-          "update_wall_seconds": 0.000073994
-        }
-      ],
-      "trial": 0
-    },
-    {
-      "methods": [
-        {
-          "logical_payload_bytes": 49283072,
-          "maintenance_updates": 3131685,
-          "max_normalized_additive_error": 0.0,
-          "method": "autosketch_per_query",
-          "query_wall_seconds": 8.570148709,
-          "retained_sketches": 376,
-          "update_wall_seconds": 1.457177562
-        },
-        {
-          "logical_payload_bytes": 49283072,
-          "maintenance_updates": 3131685,
-          "max_normalized_additive_error": 0.0,
-          "method": "asap_no_sharing",
-          "query_wall_seconds": 8.32997522,
-          "retained_sketches": 376,
-          "update_wall_seconds": 1.444992692
-        },
-        {
-          "logical_payload_bytes": 37748736,
-          "maintenance_updates": 626337,
-          "max_normalized_additive_error": 0.0,
-          "method": "asap_full_shared",
-          "query_wall_seconds": 8.378514439,
-          "retained_sketches": 288,
-          "update_wall_seconds": 0.359005841
-        },
-        {
-          "logical_payload_bytes": 169336,
-          "maintenance_updates": 626337,
-          "max_normalized_additive_error": 0.0,
-          "method": "exact_raw",
-          "query_wall_seconds": 0.000283178,
-          "retained_sketches": 0,
-          "update_wall_seconds": 0.000070507
-        }
-      ],
-      "trial": 1
-    },
-    {
-      "methods": [
-        {
-          "logical_payload_bytes": 49283072,
-          "maintenance_updates": 3131685,
-          "max_normalized_additive_error": 0.0,
-          "method": "autosketch_per_query",
-          "query_wall_seconds": 8.498134977,
-          "retained_sketches": 376,
-          "update_wall_seconds": 1.4712625240000001
-        },
-        {
-          "logical_payload_bytes": 49283072,
-          "maintenance_updates": 3131685,
-          "max_normalized_additive_error": 0.0,
-          "method": "asap_no_sharing",
-          "query_wall_seconds": 8.310046057,
-          "retained_sketches": 376,
-          "update_wall_seconds": 1.544226058
-        },
-        {
-          "logical_payload_bytes": 37748736,
-          "maintenance_updates": 626337,
-          "max_normalized_additive_error": 0.0,
-          "method": "asap_full_shared",
-          "query_wall_seconds": 9.280793329,
-          "retained_sketches": 288,
-          "update_wall_seconds": 0.378306468
-        },
-        {
-          "logical_payload_bytes": 169336,
-          "maintenance_updates": 626337,
-          "max_normalized_additive_error": 0.0,
-          "method": "exact_raw",
-          "query_wall_seconds": 0.000490559,
-          "retained_sketches": 0,
-          "update_wall_seconds": 0.000103228
-        }
-      ],
-      "trial": 2
-    }
-  ],
-  "windows_minutes": [
-    5,
-    15,
-    60,
-    360,
-    1440
-  ]
-}
\ No newline at end of file
diff --git a/tools/autosketch-comparison/data/google-cluster-2019/results-w512.json b/tools/autosketch-comparison/data/google-cluster-2019/results-w512.json
deleted file mode 100644
index b647004d1..000000000
--- a/tools/autosketch-comparison/data/google-cluster-2019/results-w512.json
+++ /dev/null
@@ -1,160 +0,0 @@
-{
-  "adaptation": "AutoSketch is deployed independently per recurring query; ASAP-NoSharing intentionally has the same physical plan and isolates configuration; ASAP-Full shares one minute panes",
-  "args": {
-    "backend_revision": "37120510d73f40e5a202b2cdff14f4abeb7e55bf",
-    "cardinality": 44806,
-    "depth": 4,
-    "events_per_pane": 2000,
-    "input_tsv": "/mydata/google-cluster-asap-eval-20260910/replay.tsv",
-    "output": "/mydata/google-cluster-asap-eval-20260910/results-w512.json",
-    "pane_seconds": 300,
-    "panes": 8929,
-    "query_repetitions": 3,
-    "seed": 42,
-    "trials": 3,
-    "width": 512,
-    "window_panes": [
-      1,
-      3,
-      12,
-      72,
-      288
-    ]
-  },
-  "memory_metric": "logical retained payload; CMS counters or raw usize keys; excludes allocator overhead",
-  "pane_seconds": 300,
-  "schema_version": 1,
-  "timing_metric": "wall seconds; methods execute sequentially and are not CPU profiles",
-  "trials": [
-    {
-      "methods": [
-        {
-          "logical_payload_bytes": 6160384,
-          "maintenance_updates": 3131685,
-          "max_normalized_additive_error": 0.011494252873563218,
-          "method": "autosketch_per_query",
-          "query_wall_seconds": 6.750151935,
-          "retained_sketches": 376,
-          "update_wall_seconds": 1.094979448
-        },
-        {
-          "logical_payload_bytes": 6160384,
-          "maintenance_updates": 3131685,
-          "max_normalized_additive_error": 0.011494252873563218,
-          "method": "asap_no_sharing",
-          "query_wall_seconds": 6.716843169,
-          "retained_sketches": 376,
-          "update_wall_seconds": 1.095765872
-        },
-        {
-          "logical_payload_bytes": 4718592,
-          "maintenance_updates": 626337,
-          "max_normalized_additive_error": 0.011494252873563218,
-          "method": "asap_full_shared",
-          "query_wall_seconds": 6.712194438,
-          "retained_sketches": 288,
-          "update_wall_seconds": 0.219179352
-        },
-        {
-          "logical_payload_bytes": 169336,
-          "maintenance_updates": 626337,
-          "max_normalized_additive_error": 0.0,
-          "method": "exact_raw",
-          "query_wall_seconds": 0.000282396,
-          "retained_sketches": 0,
-          "update_wall_seconds": 0.000056838
-        }
-      ],
-      "trial": 0
-    },
-    {
-      "methods": [
-        {
-          "logical_payload_bytes": 6160384,
-          "maintenance_updates": 3131685,
-          "max_normalized_additive_error": 0.011494252873563218,
-          "method": "autosketch_per_query",
-          "query_wall_seconds": 6.734816142,
-          "retained_sketches": 376,
-          "update_wall_seconds": 1.0914098
-        },
-        {
-          "logical_payload_bytes": 6160384,
-          "maintenance_updates": 3131685,
-          "max_normalized_additive_error": 0.011494252873563218,
-          "method": "asap_no_sharing",
-          "query_wall_seconds": 6.726978409,
-          "retained_sketches": 376,
-          "update_wall_seconds": 1.095562997
-        },
-        {
-          "logical_payload_bytes": 4718592,
-          "maintenance_updates": 626337,
-          "max_normalized_additive_error": 0.011494252873563218,
-          "method": "asap_full_shared",
-          "query_wall_seconds": 6.721719787,
-          "retained_sketches": 288,
-          "update_wall_seconds": 0.220349528
-        },
-        {
-          "logical_payload_bytes": 169336,
-          "maintenance_updates": 626337,
-          "max_normalized_additive_error": 0.0,
-          "method": "exact_raw",
-          "query_wall_seconds": 0.000283802,
-          "retained_sketches": 0,
-          "update_wall_seconds": 0.000055037
-        }
-      ],
-      "trial": 1
-    },
-    {
-      "methods": [
-        {
-          "logical_payload_bytes": 6160384,
-          "maintenance_updates": 3131685,
-          "max_normalized_additive_error": 0.011494252873563218,
-          "method": "autosketch_per_query",
-          "query_wall_seconds": 6.750511579,
-          "retained_sketches": 376,
-          "update_wall_seconds": 1.0935931
-        },
-        {
-          "logical_payload_bytes": 6160384,
-          "maintenance_updates": 3131685,
-          "max_normalized_additive_error": 0.011494252873563218,
-          "method": "asap_no_sharing",
-          "query_wall_seconds": 6.733913576,
-          "retained_sketches": 376,
-          "update_wall_seconds": 1.095666359
-        },
-        {
-          "logical_payload_bytes": 4718592,
-          "maintenance_updates": 626337,
-          "max_normalized_additive_error": 0.011494252873563218,
-          "method": "asap_full_shared",
-          "query_wall_seconds": 6.720221883,
-          "retained_sketches": 288,
-          "update_wall_seconds": 0.219790208
-        },
-        {
-          "logical_payload_bytes": 169336,
-          "maintenance_updates": 626337,
-          "max_normalized_additive_error": 0.0,
-          "method": "exact_raw",
-          "query_wall_seconds": 0.000282268,
-          "retained_sketches": 0,
-          "update_wall_seconds": 0.000055871
-        }
-      ],
-      "trial": 2
-    }
-  ],
-  "windows_minutes": [
-    5,
-    15,
-    60,
-    360,
-    1440
-  ]
-}
\ No newline at end of file
diff --git a/tools/autosketch-comparison/data/google-cluster-2019/results-w64.json b/tools/autosketch-comparison/data/google-cluster-2019/results-w64.json
deleted file mode 100644
index 3bf993d09..000000000
--- a/tools/autosketch-comparison/data/google-cluster-2019/results-w64.json
+++ /dev/null
@@ -1,160 +0,0 @@
-{
-  "adaptation": "AutoSketch is deployed independently per recurring query; ASAP-NoSharing intentionally has the same physical plan and isolates configuration; ASAP-Full shares one minute panes",
-  "args": {
-    "backend_revision": "37120510d73f40e5a202b2cdff14f4abeb7e55bf",
-    "cardinality": 44806,
-    "depth": 4,
-    "events_per_pane": 2000,
-    "input_tsv": "/mydata/google-cluster-asap-eval-20260910/replay.tsv",
-    "output": "/mydata/google-cluster-asap-eval-20260910/results-w64.json",
-    "pane_seconds": 300,
-    "panes": 8929,
-    "query_repetitions": 3,
-    "seed": 42,
-    "trials": 3,
-    "width": 64,
-    "window_panes": [
-      1,
-      3,
-      12,
-      72,
-      288
-    ]
-  },
-  "memory_metric": "logical retained payload; CMS counters or raw usize keys; excludes allocator overhead",
-  "pane_seconds": 300,
-  "schema_version": 1,
-  "timing_metric": "wall seconds; methods execute sequentially and are not CPU profiles",
-  "trials": [
-    {
-      "methods": [
-        {
-          "logical_payload_bytes": 770048,
-          "maintenance_updates": 3131685,
-          "max_normalized_additive_error": 0.04597701149425287,
-          "method": "autosketch_per_query",
-          "query_wall_seconds": 6.706461675,
-          "retained_sketches": 376,
-          "update_wall_seconds": 1.078036532
-        },
-        {
-          "logical_payload_bytes": 770048,
-          "maintenance_updates": 3131685,
-          "max_normalized_additive_error": 0.04597701149425287,
-          "method": "asap_no_sharing",
-          "query_wall_seconds": 6.690385494,
-          "retained_sketches": 376,
-          "update_wall_seconds": 1.074918546
-        },
-        {
-          "logical_payload_bytes": 589824,
-          "maintenance_updates": 626337,
-          "max_normalized_additive_error": 0.04597701149425287,
-          "method": "asap_full_shared",
-          "query_wall_seconds": 6.693881851,
-          "retained_sketches": 288,
-          "update_wall_seconds": 0.214590912
-        },
-        {
-          "logical_payload_bytes": 169336,
-          "maintenance_updates": 626337,
-          "max_normalized_additive_error": 0.0,
-          "method": "exact_raw",
-          "query_wall_seconds": 0.000308799,
-          "retained_sketches": 0,
-          "update_wall_seconds": 0.000068152
-        }
-      ],
-      "trial": 0
-    },
-    {
-      "methods": [
-        {
-          "logical_payload_bytes": 770048,
-          "maintenance_updates": 3131685,
-          "max_normalized_additive_error": 0.04597701149425287,
-          "method": "autosketch_per_query",
-          "query_wall_seconds": 6.677568102,
-          "retained_sketches": 376,
-          "update_wall_seconds": 1.081383857
-        },
-        {
-          "logical_payload_bytes": 770048,
-          "maintenance_updates": 3131685,
-          "max_normalized_additive_error": 0.04597701149425287,
-          "method": "asap_no_sharing",
-          "query_wall_seconds": 6.639471593,
-          "retained_sketches": 376,
-          "update_wall_seconds": 1.0728848069999999
-        },
-        {
-          "logical_payload_bytes": 589824,
-          "maintenance_updates": 626337,
-          "max_normalized_additive_error": 0.04597701149425287,
-          "method": "asap_full_shared",
-          "query_wall_seconds": 6.704844207,
-          "retained_sketches": 288,
-          "update_wall_seconds": 0.21500787
-        },
-        {
-          "logical_payload_bytes": 169336,
-          "maintenance_updates": 626337,
-          "max_normalized_additive_error": 0.0,
-          "method": "exact_raw",
-          "query_wall_seconds": 0.000231411,
-          "retained_sketches": 0,
-          "update_wall_seconds": 0.000055828
-        }
-      ],
-      "trial": 1
-    },
-    {
-      "methods": [
-        {
-          "logical_payload_bytes": 770048,
-          "maintenance_updates": 3131685,
-          "max_normalized_additive_error": 0.04597701149425287,
-          "method": "autosketch_per_query",
-          "query_wall_seconds": 6.737456261,
-          "retained_sketches": 376,
-          "update_wall_seconds": 1.076295538
-        },
-        {
-          "logical_payload_bytes": 770048,
-          "maintenance_updates": 3131685,
-          "max_normalized_additive_error": 0.04597701149425287,
-          "method": "asap_no_sharing",
-          "query_wall_seconds": 6.708551351,
-          "retained_sketches": 376,
-          "update_wall_seconds": 1.07571229
-        },
-        {
-          "logical_payload_bytes": 589824,
-          "maintenance_updates": 626337,
-          "max_normalized_additive_error": 0.04597701149425287,
-          "method": "asap_full_shared",
-          "query_wall_seconds": 6.690079207,
-          "retained_sketches": 288,
-          "update_wall_seconds": 0.214702419
-        },
-        {
-          "logical_payload_bytes": 169336,
-          "maintenance_updates": 626337,
-          "max_normalized_additive_error": 0.0,
-          "method": "exact_raw",
-          "query_wall_seconds": 0.000270086,
-          "retained_sketches": 0,
-          "update_wall_seconds": 0.000058877
-        }
-      ],
-      "trial": 2
-    }
-  ],
-  "windows_minutes": [
-    5,
-    15,
-    60,
-    360,
-    1440
-  ]
-}
\ No newline at end of file
diff --git a/tools/autosketch-comparison/data/repeated-window.json b/tools/autosketch-comparison/data/repeated-window.json
deleted file mode 100644
index 66a91fdbf..000000000
--- a/tools/autosketch-comparison/data/repeated-window.json
+++ /dev/null
@@ -1,314 +0,0 @@
-{
-  "adaptation": "AutoSketch is deployed independently per recurring query; ASAP-NoSharing intentionally has the same physical plan and isolates configuration; ASAP-Full shares one minute panes",
-  "args": {
-    "backend_revision": "15f8ea14bef2ea6f771a01bc78b55f13a0cdf636",
-    "cardinality": 1000,
-    "depth": 4,
-    "events_per_pane": 5000,
-    "output": "tools/autosketch-comparison/data/repeated-window.json",
-    "panes": 120,
-    "query_repetitions": 10,
-    "seed": 42,
-    "trials": 7,
-    "width": 256
-  },
-  "memory_metric": "logical retained payload; CMS counters or raw usize keys; excludes allocator overhead",
-  "pane_seconds": 60,
-  "schema_version": 1,
-  "timing_metric": "wall seconds; methods execute sequentially and are not CPU profiles",
-  "trials": [
-    {
-      "methods": [
-        {
-          "logical_payload_bytes": 663552,
-          "maintenance_updates": 2400000,
-          "max_normalized_additive_error": 0.00612,
-          "method": "autosketch_per_query",
-          "query_wall_seconds": 0.116541489,
-          "retained_sketches": 81,
-          "update_wall_seconds": 0.763556067
-        },
-        {
-          "logical_payload_bytes": 663552,
-          "maintenance_updates": 2400000,
-          "max_normalized_additive_error": 0.00612,
-          "method": "asap_no_sharing",
-          "query_wall_seconds": 0.114310783,
-          "retained_sketches": 81,
-          "update_wall_seconds": 0.761835799
-        },
-        {
-          "logical_payload_bytes": 491520,
-          "maintenance_updates": 600000,
-          "max_normalized_additive_error": 0.00612,
-          "method": "asap_full_shared",
-          "query_wall_seconds": 0.116440607,
-          "retained_sketches": 60,
-          "update_wall_seconds": 0.19063566
-        },
-        {
-          "logical_payload_bytes": 2400000,
-          "maintenance_updates": 600000,
-          "max_normalized_additive_error": 0.0,
-          "method": "exact_raw",
-          "query_wall_seconds": 0.002605528,
-          "retained_sketches": 0,
-          "update_wall_seconds": 0.001658294
-        }
-      ],
-      "trial": 0
-    },
-    {
-      "methods": [
-        {
-          "logical_payload_bytes": 663552,
-          "maintenance_updates": 2400000,
-          "max_normalized_additive_error": 0.0066,
-          "method": "autosketch_per_query",
-          "query_wall_seconds": 0.116271734,
-          "retained_sketches": 81,
-          "update_wall_seconds": 0.758991336
-        },
-        {
-          "logical_payload_bytes": 663552,
-          "maintenance_updates": 2400000,
-          "max_normalized_additive_error": 0.0066,
-          "method": "asap_no_sharing",
-          "query_wall_seconds": 0.118070527,
-          "retained_sketches": 81,
-          "update_wall_seconds": 0.764968892
-        },
-        {
-          "logical_payload_bytes": 491520,
-          "maintenance_updates": 600000,
-          "max_normalized_additive_error": 0.0066,
-          "method": "asap_full_shared",
-          "query_wall_seconds": 0.117275259,
-          "retained_sketches": 60,
-          "update_wall_seconds": 0.191041486
-        },
-        {
-          "logical_payload_bytes": 2400000,
-          "maintenance_updates": 600000,
-          "max_normalized_additive_error": 0.0,
-          "method": "exact_raw",
-          "query_wall_seconds": 0.002610715,
-          "retained_sketches": 0,
-          "update_wall_seconds": 0.00139954
-        }
-      ],
-      "trial": 1
-    },
-    {
-      "methods": [
-        {
-          "logical_payload_bytes": 663552,
-          "maintenance_updates": 2400000,
-          "max_normalized_additive_error": 0.006,
-          "method": "autosketch_per_query",
-          "query_wall_seconds": 0.117028687,
-          "retained_sketches": 81,
-          "update_wall_seconds": 0.761769582
-        },
-        {
-          "logical_payload_bytes": 663552,
-          "maintenance_updates": 2400000,
-          "max_normalized_additive_error": 0.006,
-          "method": "asap_no_sharing",
-          "query_wall_seconds": 0.117269848,
-          "retained_sketches": 81,
-          "update_wall_seconds": 0.761791903
-        },
-        {
-          "logical_payload_bytes": 491520,
-          "maintenance_updates": 600000,
-          "max_normalized_additive_error": 0.006,
-          "method": "asap_full_shared",
-          "query_wall_seconds": 0.115845261,
-          "retained_sketches": 60,
-          "update_wall_seconds": 0.190240827
-        },
-        {
-          "logical_payload_bytes": 2400000,
-          "maintenance_updates": 600000,
-          "max_normalized_additive_error": 0.0,
-          "method": "exact_raw",
-          "query_wall_seconds": 0.002593822,
-          "retained_sketches": 0,
-          "update_wall_seconds": 0.000902276
-        }
-      ],
-      "trial": 2
-    },
-    {
-      "methods": [
-        {
-          "logical_payload_bytes": 663552,
-          "maintenance_updates": 2400000,
-          "max_normalized_additive_error": 0.005946666666666667,
-          "method": "autosketch_per_query",
-          "query_wall_seconds": 0.115874966,
-          "retained_sketches": 81,
-          "update_wall_seconds": 0.762746911
-        },
-        {
-          "logical_payload_bytes": 663552,
-          "maintenance_updates": 2400000,
-          "max_normalized_additive_error": 0.005946666666666667,
-          "method": "asap_no_sharing",
-          "query_wall_seconds": 0.1156525,
-          "retained_sketches": 81,
-          "update_wall_seconds": 0.762262659
-        },
-        {
-          "logical_payload_bytes": 491520,
-          "maintenance_updates": 600000,
-          "max_normalized_additive_error": 0.005946666666666667,
-          "method": "asap_full_shared",
-          "query_wall_seconds": 0.116185526,
-          "retained_sketches": 60,
-          "update_wall_seconds": 0.190499106
-        },
-        {
-          "logical_payload_bytes": 2400000,
-          "maintenance_updates": 600000,
-          "max_normalized_additive_error": 0.0,
-          "method": "exact_raw",
-          "query_wall_seconds": 0.002611348,
-          "retained_sketches": 0,
-          "update_wall_seconds": 0.001648391
-        }
-      ],
-      "trial": 3
-    },
-    {
-      "methods": [
-        {
-          "logical_payload_bytes": 663552,
-          "maintenance_updates": 2400000,
-          "max_normalized_additive_error": 0.006,
-          "method": "autosketch_per_query",
-          "query_wall_seconds": 0.11613356,
-          "retained_sketches": 81,
-          "update_wall_seconds": 0.763589044
-        },
-        {
-          "logical_payload_bytes": 663552,
-          "maintenance_updates": 2400000,
-          "max_normalized_additive_error": 0.006,
-          "method": "asap_no_sharing",
-          "query_wall_seconds": 0.114564001,
-          "retained_sketches": 81,
-          "update_wall_seconds": 0.762113407
-        },
-        {
-          "logical_payload_bytes": 491520,
-          "maintenance_updates": 600000,
-          "max_normalized_additive_error": 0.006,
-          "method": "asap_full_shared",
-          "query_wall_seconds": 0.115735868,
-          "retained_sketches": 60,
-          "update_wall_seconds": 0.188501743
-        },
-        {
-          "logical_payload_bytes": 2400000,
-          "maintenance_updates": 600000,
-          "max_normalized_additive_error": 0.0,
-          "method": "exact_raw",
-          "query_wall_seconds": 0.002603281,
-          "retained_sketches": 0,
-          "update_wall_seconds": 0.000453798
-        }
-      ],
-      "trial": 4
-    },
-    {
-      "methods": [
-        {
-          "logical_payload_bytes": 663552,
-          "maintenance_updates": 2400000,
-          "max_normalized_additive_error": 0.006,
-          "method": "autosketch_per_query",
-          "query_wall_seconds": 0.11610113,
-          "retained_sketches": 81,
-          "update_wall_seconds": 0.763703266
-        },
-        {
-          "logical_payload_bytes": 663552,
-          "maintenance_updates": 2400000,
-          "max_normalized_additive_error": 0.006,
-          "method": "asap_no_sharing",
-          "query_wall_seconds": 0.115521738,
-          "retained_sketches": 81,
-          "update_wall_seconds": 0.761344621
-        },
-        {
-          "logical_payload_bytes": 491520,
-          "maintenance_updates": 600000,
-          "max_normalized_additive_error": 0.006,
-          "method": "asap_full_shared",
-          "query_wall_seconds": 0.1128791,
-          "retained_sketches": 60,
-          "update_wall_seconds": 0.186971998
-        },
-        {
-          "logical_payload_bytes": 2400000,
-          "maintenance_updates": 600000,
-          "max_normalized_additive_error": 0.0,
-          "method": "exact_raw",
-          "query_wall_seconds": 0.002586222,
-          "retained_sketches": 0,
-          "update_wall_seconds": 0.000455313
-        }
-      ],
-      "trial": 5
-    },
-    {
-      "methods": [
-        {
-          "logical_payload_bytes": 663552,
-          "maintenance_updates": 2400000,
-          "max_normalized_additive_error": 0.006,
-          "method": "autosketch_per_query",
-          "query_wall_seconds": 0.116594545,
-          "retained_sketches": 81,
-          "update_wall_seconds": 0.762174289
-        },
-        {
-          "logical_payload_bytes": 663552,
-          "maintenance_updates": 2400000,
-          "max_normalized_additive_error": 0.006,
-          "method": "asap_no_sharing",
-          "query_wall_seconds": 0.115508314,
-          "retained_sketches": 81,
-          "update_wall_seconds": 0.765003885
-        },
-        {
-          "logical_payload_bytes": 491520,
-          "maintenance_updates": 600000,
-          "max_normalized_additive_error": 0.006,
-          "method": "asap_full_shared",
-          "query_wall_seconds": 0.116187106,
-          "retained_sketches": 60,
-          "update_wall_seconds": 0.190553564
-        },
-        {
-          "logical_payload_bytes": 2400000,
-          "maintenance_updates": 600000,
-          "max_normalized_additive_error": 0.0,
-          "method": "exact_raw",
-          "query_wall_seconds": 0.002593656,
-          "retained_sketches": 0,
-          "update_wall_seconds": 0.000469882
-        }
-      ],
-      "trial": 6
-    }
-  ],
-  "windows_minutes": [
-    1,
-    5,
-    15,
-    60
-  ]
-}
\ No newline at end of file
diff --git a/tools/autosketch-comparison/download_google_cluster_data_2019.sh b/tools/autosketch-comparison/download_google_cluster_data_2019.sh
deleted file mode 100755
index 21024f354..000000000
--- a/tools/autosketch-comparison/download_google_cluster_data_2019.sh
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/usr/bin/env bash
-set -euo pipefail
-
-destination=${1:-/mydata/datasets/google-cluster-data-2019}
-mkdir -p "${destination}/cell-a"
-
-curl --location --fail --show-error \
-  --output "${destination}/cell-a/instance_usage-000000000000.parquet.gz" \
-  https://storage.googleapis.com/clusterdata_2019_a/instance_usage-000000000000.parquet.gz
-curl --location --fail --show-error \
-  --output "${destination}/instance_usage.schema.json" \
-  https://storage.googleapis.com/clusterdata_2019_schema/instance_usage.schema.json
-
-cd "${destination}"
-sha256sum --check <<'CHECKSUMS'
-c70b806cb89f110a4235f40285957f0244edf49f28c2a83803646a911d0d6fb6  cell-a/instance_usage-000000000000.parquet.gz
-82c1ffb74988c2b7a7b60a134840bb234f588949950bfab762dac8863a72b559  instance_usage.schema.json
-CHECKSUMS
diff --git a/tools/autosketch-comparison/figures/google-cluster-2019-w2048.svg b/tools/autosketch-comparison/figures/google-cluster-2019-w2048.svg
deleted file mode 100644
index 938386ae2..000000000
--- a/tools/autosketch-comparison/figures/google-cluster-2019-w2048.svg
+++ /dev/null
@@ -1,77 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="1080" height="600" viewBox="0 0 1080 600">
-<rect width="100%" height="100%" fill="white"/>
-<style>text{font-family:system-ui,sans-serif;fill:#253047}.title{font-size:19px;font-weight:700}.axis{font-size:11px}.value{font-size:11px;font-weight:600}</style>
-<text x="540" y="30" text-anchor="middle" class="title">Repeated-window comparison — median of 3 executed release trials</text>
-<text x="55" y="65" class="title">Update wall time (s)</text>
-<line x1="55" y1="235" x2="510" y2="235" stroke="#526075"/>
-<rect x="67" y="100.0" width="78" height="135.0" rx="3" fill="#7086a3"/>
-<text x="106.0" y="95.0" text-anchor="middle" class="value">1.2128</text>
-<text x="106.0" y="253" text-anchor="middle" class="axis">AutoSketch</text>
-<text x="106.0" y="266" text-anchor="middle" class="axis">PerQuery</text>
-<rect x="179" y="101.6" width="78" height="133.4" rx="3" fill="#91a4ba"/>
-<text x="218.0" y="96.6" text-anchor="middle" class="value">1.1988</text>
-<text x="218.0" y="253" text-anchor="middle" class="axis">ASAP</text>
-<text x="218.0" y="266" text-anchor="middle" class="axis">NoSharing</text>
-<rect x="291" y="206.2" width="78" height="28.8" rx="3" fill="#e47732"/>
-<text x="330.0" y="201.2" text-anchor="middle" class="value">0.2584</text>
-<text x="330.0" y="253" text-anchor="middle" class="axis">ASAP</text>
-<text x="330.0" y="266" text-anchor="middle" class="axis">Full</text>
-<rect x="403" y="235.0" width="78" height="0.0" rx="3" fill="#6b9d72"/>
-<text x="442.0" y="230.0" text-anchor="middle" class="value">0.0001</text>
-<text x="442.0" y="253" text-anchor="middle" class="axis">Exact</text>
-<text x="442.0" y="266" text-anchor="middle" class="axis">Raw</text>
-<text x="585" y="65" class="title">Query wall time (s)</text>
-<line x1="585" y1="235" x2="1040" y2="235" stroke="#526075"/>
-<rect x="597" y="103.8" width="78" height="131.2" rx="3" fill="#7086a3"/>
-<text x="636.0" y="98.8" text-anchor="middle" class="value">7.0610</text>
-<text x="636.0" y="253" text-anchor="middle" class="axis">AutoSketch</text>
-<text x="636.0" y="266" text-anchor="middle" class="axis">PerQuery</text>
-<rect x="709" y="100.0" width="78" height="135.0" rx="3" fill="#91a4ba"/>
-<text x="748.0" y="95.0" text-anchor="middle" class="value">7.2661</text>
-<text x="748.0" y="253" text-anchor="middle" class="axis">ASAP</text>
-<text x="748.0" y="266" text-anchor="middle" class="axis">NoSharing</text>
-<rect x="821" y="103.0" width="78" height="132.0" rx="3" fill="#e47732"/>
-<text x="860.0" y="98.0" text-anchor="middle" class="value">7.1027</text>
-<text x="860.0" y="253" text-anchor="middle" class="axis">ASAP</text>
-<text x="860.0" y="266" text-anchor="middle" class="axis">Full</text>
-<rect x="933" y="235.0" width="78" height="0.0" rx="3" fill="#6b9d72"/>
-<text x="972.0" y="230.0" text-anchor="middle" class="value">0.0003</text>
-<text x="972.0" y="253" text-anchor="middle" class="axis">Exact</text>
-<text x="972.0" y="266" text-anchor="middle" class="axis">Raw</text>
-<text x="55" y="330" class="title">Logical retained memory (MiB)</text>
-<line x1="55" y1="500" x2="510" y2="500" stroke="#526075"/>
-<rect x="67" y="365.0" width="78" height="135.0" rx="3" fill="#7086a3"/>
-<text x="106.0" y="360.0" text-anchor="middle" class="value">24</text>
-<text x="106.0" y="518" text-anchor="middle" class="axis">AutoSketch</text>
-<text x="106.0" y="531" text-anchor="middle" class="axis">PerQuery</text>
-<rect x="179" y="365.0" width="78" height="135.0" rx="3" fill="#91a4ba"/>
-<text x="218.0" y="360.0" text-anchor="middle" class="value">24</text>
-<text x="218.0" y="518" text-anchor="middle" class="axis">ASAP</text>
-<text x="218.0" y="531" text-anchor="middle" class="axis">NoSharing</text>
-<rect x="291" y="396.6" width="78" height="103.4" rx="3" fill="#e47732"/>
-<text x="330.0" y="391.6" text-anchor="middle" class="value">18</text>
-<text x="330.0" y="518" text-anchor="middle" class="axis">ASAP</text>
-<text x="330.0" y="531" text-anchor="middle" class="axis">Full</text>
-<rect x="403" y="499.1" width="78" height="0.9" rx="3" fill="#6b9d72"/>
-<text x="442.0" y="494.1" text-anchor="middle" class="value">0.1615</text>
-<text x="442.0" y="518" text-anchor="middle" class="axis">Exact</text>
-<text x="442.0" y="531" text-anchor="middle" class="axis">Raw</text>
-<text x="585" y="330" class="title">Max normalized error</text>
-<line x1="585" y1="500" x2="1040" y2="500" stroke="#526075"/>
-<rect x="597" y="365.0" width="78" height="135.0" rx="3" fill="#7086a3"/>
-<text x="636.0" y="360.0" text-anchor="middle" class="value">0.0041</text>
-<text x="636.0" y="518" text-anchor="middle" class="axis">AutoSketch</text>
-<text x="636.0" y="531" text-anchor="middle" class="axis">PerQuery</text>
-<rect x="709" y="365.0" width="78" height="135.0" rx="3" fill="#91a4ba"/>
-<text x="748.0" y="360.0" text-anchor="middle" class="value">0.0041</text>
-<text x="748.0" y="518" text-anchor="middle" class="axis">ASAP</text>
-<text x="748.0" y="531" text-anchor="middle" class="axis">NoSharing</text>
-<rect x="821" y="365.0" width="78" height="135.0" rx="3" fill="#e47732"/>
-<text x="860.0" y="360.0" text-anchor="middle" class="value">0.0041</text>
-<text x="860.0" y="518" text-anchor="middle" class="axis">ASAP</text>
-<text x="860.0" y="531" text-anchor="middle" class="axis">Full</text>
-<rect x="933" y="500.0" width="78" height="0.0" rx="3" fill="#6b9d72"/>
-<text x="972.0" y="495.0" text-anchor="middle" class="value">0.0000</text>
-<text x="972.0" y="518" text-anchor="middle" class="axis">Exact</text>
-<text x="972.0" y="531" text-anchor="middle" class="axis">Raw</text>
-</svg>
diff --git a/tools/autosketch-comparison/figures/repeated-window.svg b/tools/autosketch-comparison/figures/repeated-window.svg
deleted file mode 100644
index 5a866c895..000000000
--- a/tools/autosketch-comparison/figures/repeated-window.svg
+++ /dev/null
@@ -1,77 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="1080" height="600" viewBox="0 0 1080 600">
-<rect width="100%" height="100%" fill="white"/>
-<style>text{font-family:system-ui,sans-serif;fill:#253047}.title{font-size:19px;font-weight:700}.axis{font-size:11px}.value{font-size:11px;font-weight:600}</style>
-<text x="540" y="30" text-anchor="middle" class="title">Repeated-window comparison — median of 7 executed release trials</text>
-<text x="55" y="65" class="title">Update wall time (s)</text>
-<line x1="55" y1="235" x2="510" y2="235" stroke="#526075"/>
-<rect x="67" y="100.0" width="78" height="135.0" rx="3" fill="#7086a3"/>
-<text x="106.0" y="95.0" text-anchor="middle" class="value">0.7627</text>
-<text x="106.0" y="253" text-anchor="middle" class="axis">AutoSketch</text>
-<text x="106.0" y="266" text-anchor="middle" class="axis">PerQuery</text>
-<rect x="179" y="100.1" width="78" height="134.9" rx="3" fill="#91a4ba"/>
-<text x="218.0" y="95.1" text-anchor="middle" class="value">0.7621</text>
-<text x="218.0" y="253" text-anchor="middle" class="axis">ASAP</text>
-<text x="218.0" y="266" text-anchor="middle" class="axis">NoSharing</text>
-<rect x="291" y="201.3" width="78" height="33.7" rx="3" fill="#e47732"/>
-<text x="330.0" y="196.3" text-anchor="middle" class="value">0.1905</text>
-<text x="330.0" y="253" text-anchor="middle" class="axis">ASAP</text>
-<text x="330.0" y="266" text-anchor="middle" class="axis">Full</text>
-<rect x="403" y="234.8" width="78" height="0.2" rx="3" fill="#6b9d72"/>
-<text x="442.0" y="229.8" text-anchor="middle" class="value">0.0009</text>
-<text x="442.0" y="253" text-anchor="middle" class="axis">Exact</text>
-<text x="442.0" y="266" text-anchor="middle" class="axis">Raw</text>
-<text x="585" y="65" class="title">Query wall time (s)</text>
-<line x1="585" y1="235" x2="1040" y2="235" stroke="#526075"/>
-<rect x="597" y="100.0" width="78" height="135.0" rx="3" fill="#7086a3"/>
-<text x="636.0" y="95.0" text-anchor="middle" class="value">0.1163</text>
-<text x="636.0" y="253" text-anchor="middle" class="axis">AutoSketch</text>
-<text x="636.0" y="266" text-anchor="middle" class="axis">PerQuery</text>
-<rect x="709" y="100.9" width="78" height="134.1" rx="3" fill="#91a4ba"/>
-<text x="748.0" y="95.9" text-anchor="middle" class="value">0.1155</text>
-<text x="748.0" y="253" text-anchor="middle" class="axis">ASAP</text>
-<text x="748.0" y="266" text-anchor="middle" class="axis">NoSharing</text>
-<rect x="821" y="100.1" width="78" height="134.9" rx="3" fill="#e47732"/>
-<text x="860.0" y="95.1" text-anchor="middle" class="value">0.1162</text>
-<text x="860.0" y="253" text-anchor="middle" class="axis">ASAP</text>
-<text x="860.0" y="266" text-anchor="middle" class="axis">Full</text>
-<rect x="933" y="232.0" width="78" height="3.0" rx="3" fill="#6b9d72"/>
-<text x="972.0" y="227.0" text-anchor="middle" class="value">0.0026</text>
-<text x="972.0" y="253" text-anchor="middle" class="axis">Exact</text>
-<text x="972.0" y="266" text-anchor="middle" class="axis">Raw</text>
-<text x="55" y="330" class="title">Logical retained memory (MiB)</text>
-<line x1="55" y1="500" x2="510" y2="500" stroke="#526075"/>
-<rect x="67" y="462.7" width="78" height="37.3" rx="3" fill="#7086a3"/>
-<text x="106.0" y="457.7" text-anchor="middle" class="value">0.6328</text>
-<text x="106.0" y="518" text-anchor="middle" class="axis">AutoSketch</text>
-<text x="106.0" y="531" text-anchor="middle" class="axis">PerQuery</text>
-<rect x="179" y="462.7" width="78" height="37.3" rx="3" fill="#91a4ba"/>
-<text x="218.0" y="457.7" text-anchor="middle" class="value">0.6328</text>
-<text x="218.0" y="518" text-anchor="middle" class="axis">ASAP</text>
-<text x="218.0" y="531" text-anchor="middle" class="axis">NoSharing</text>
-<rect x="291" y="472.4" width="78" height="27.6" rx="3" fill="#e47732"/>
-<text x="330.0" y="467.4" text-anchor="middle" class="value">0.4688</text>
-<text x="330.0" y="518" text-anchor="middle" class="axis">ASAP</text>
-<text x="330.0" y="531" text-anchor="middle" class="axis">Full</text>
-<rect x="403" y="365.0" width="78" height="135.0" rx="3" fill="#6b9d72"/>
-<text x="442.0" y="360.0" text-anchor="middle" class="value">2.2888</text>
-<text x="442.0" y="518" text-anchor="middle" class="axis">Exact</text>
-<text x="442.0" y="531" text-anchor="middle" class="axis">Raw</text>
-<text x="585" y="330" class="title">Max normalized error</text>
-<line x1="585" y1="500" x2="1040" y2="500" stroke="#526075"/>
-<rect x="597" y="365.0" width="78" height="135.0" rx="3" fill="#7086a3"/>
-<text x="636.0" y="360.0" text-anchor="middle" class="value">0.0060</text>
-<text x="636.0" y="518" text-anchor="middle" class="axis">AutoSketch</text>
-<text x="636.0" y="531" text-anchor="middle" class="axis">PerQuery</text>
-<rect x="709" y="365.0" width="78" height="135.0" rx="3" fill="#91a4ba"/>
-<text x="748.0" y="360.0" text-anchor="middle" class="value">0.0060</text>
-<text x="748.0" y="518" text-anchor="middle" class="axis">ASAP</text>
-<text x="748.0" y="531" text-anchor="middle" class="axis">NoSharing</text>
-<rect x="821" y="365.0" width="78" height="135.0" rx="3" fill="#e47732"/>
-<text x="860.0" y="360.0" text-anchor="middle" class="value">0.0060</text>
-<text x="860.0" y="518" text-anchor="middle" class="axis">ASAP</text>
-<text x="860.0" y="531" text-anchor="middle" class="axis">Full</text>
-<rect x="933" y="500.0" width="78" height="0.0" rx="3" fill="#6b9d72"/>
-<text x="972.0" y="495.0" text-anchor="middle" class="value">0.0000</text>
-<text x="972.0" y="518" text-anchor="middle" class="axis">Exact</text>
-<text x="972.0" y="531" text-anchor="middle" class="axis">Raw</text>
-</svg>
diff --git a/tools/autosketch-comparison/google-cluster-data-2019-plan.md b/tools/autosketch-comparison/google-cluster-data-2019-plan.md
deleted file mode 100644
index 9ab4611e5..000000000
--- a/tools/autosketch-comparison/google-cluster-data-2019-plan.md
+++ /dev/null
@@ -1,105 +0,0 @@
-# Google ClusterData 2019 evaluation plan
-
-The first frequency/window experiment has now been executed. See the
-[real-data results](google-cluster-data-2019-results.md), including failed
-configuration points, raw JSON, and the Exact result.
-
-## Status and reproducibility
-
-The first official data shard has been downloaded and verified at
-`/mydata/datasets/google-cluster-data-2019`. It is not committed because it is a
-36.2 MB third-party binary. The checked-in [manifest](google-cluster-data-2019.json)
-records its immutable GCS generation, byte size, SHA-256 digest, Parquet metadata,
-and observed cardinalities. Run:
-
-```sh
-tools/autosketch-comparison/download_google_cluster_data_2019.sh
-```
-
-to reproduce the download and checksum verification. The source dataset is
-licensed CC-BY-4.0. The official trace documentation describes eight Borg cells
-covering May 2019 and about 2.4 TiB compressed in total. Downloading the complete
-corpus is neither necessary for the first experiment nor possible with the
-currently available 98 GiB workspace capacity.
-
-## Included data
-
-The initial corpus is one complete official Parquet object:
-
-- cell: `a`;
-- table: `instance_usage`;
-- object: `instance_usage-000000000000.parquet.gz`;
-- size: 36,204,879 bytes;
-- rows: 626,337 in two row groups;
-- trace-time coverage: start timestamps 300,000,000 through 2,678,998,000,000;
-- identities: 44,806 collection IDs, 16,126 instance indexes, and 9,990 machine
-  IDs.
-
-Despite the `.gz` suffix, this particular official object is directly readable
-Apache Parquet, not a gzip stream. The official `instance_usage` schema is also
-downloaded. Its 21 physical columns cover interval timestamps and instance,
-collection, allocation, and machine identities; average, maximum, and randomly
-sampled CPU/memory usage; assigned/page-cache memory; CPI/MAI; sample rate; and
-coarse/tail CPU distributions. Usage records normally represent non-overlapping
-five-minute measurement windows, although lifecycle boundaries can shorten them.
-
-The first experiment deliberately excludes `collection_events`,
-`instance_events`, `machine_events`, and `machine_attributes`: none is needed to
-construct usage-window aggregates, and joining them would confound the initial
-sketch/window comparison. It also excludes the other shards and cells. Results
-must therefore be labeled **cell-a/shard-0**, not “the full Google trace.”
-
-## Data mapping
-
-Rows are ordered by `(start_time, collection_id, instance_index)` before replay.
-Trace timestamps are relative microseconds and are converted to event-time
-seconds. Null metric values are dropped for that metric only; identity/timestamp
-nulls are rejected. No synthetic reshuffling is used in the primary run.
-
-The dataset drives three query classes:
-
-| Query class | Key/value mapping | Sketch candidates | Accuracy oracle |
-|---|---|---|---|
-| Frequency/top-k | key=`collection_id` or `machine_id`, update=one usage record | CMS, Count Sketch | exact per-window counts/top-k |
-| Quantile | value=`average_usage.cpus`, `maximum_usage.cpus`, or `average_usage.memory` | KLL, DDSketch where semantics permit | exact sorted values per window |
-| Membership | key=`(collection_id, instance_index)` active in a window | Bloom | exact set; FPR on absent IDs and zero false negatives |
-
-`sample_rate` is a measurement frequency, not a row-sampling probability, so it
-is retained as a possible grouping/filter field and is not used as an inverse
-probability weight. Normalized CPU and memory values remain in their published
-units.
-
-## Workload and comparisons
-
-The primary repeated workload issues 5m, 15m, 1h, 6h, and 24h queries. Each
-query fires at its window slide (5m for the first three, 30m for 6h, and 1h for
-24h) after the window has complete coverage. A second workload replays a fixed
-query set every five minutes to isolate recurrence. For every class and error
-target, all methods receive identical rows, event-time boundaries, candidate
-families, configurations, and hard total-memory budgets.
-
-Comparisons are:
-
-1. AutoSketch-adapted per query versus ASAP-NoSharing, isolating family and
-   parameter selection.
-2. ASAP-NoSharing versus ASAP-Full, isolating pane reuse across recurring
-   windows.
-3. Grid oracle and Exact, establishing configuration regret and accuracy.
-4. Empirical ERP versus theoretical sizing, plus Hybrid profile-miss and
-   distribution-drift fallbacks.
-
-For each method, report held-out error/FPR, top-k precision and recall where
-applicable, retained payload and peak RSS, sketch updates, merges, maintenance
-CPU, query latency (median/p95/p99), planning/calibration cost, and fallback
-rate. Trials split by time rather than randomly: earlier complete windows train
-ERP, later windows evaluate it. Report both first-use cost and amortized cost.
-
-## Expansion gates
-
-The shard is expanded only after the pipeline passes answer-equivalence and
-window-boundary tests. Expansion order is additional `instance_usage` Parquet
-shards from cell `a`, then the same deterministic shard IDs from other cells.
-Every expansion updates the manifest with object generations, hashes, rows,
-time range, and cardinalities. Cross-cell evaluation is reported separately to
-test whether an ERP learned on one distribution transfers or correctly triggers
-Hybrid fallback.
diff --git a/tools/autosketch-comparison/google-cluster-data-2019-results.md b/tools/autosketch-comparison/google-cluster-data-2019-results.md
deleted file mode 100644
index b41d9befc..000000000
--- a/tools/autosketch-comparison/google-cluster-data-2019-results.md
+++ /dev/null
@@ -1,85 +0,0 @@
-# Google ClusterData 2019 executed results
-
-These results come from actual release executions over the downloaded official
-cell-a `instance_usage-000000000000.parquet.gz` object. They are neither smoke
-tests nor synthetic data. The scope is **cell-a/shard-0**, not the full trace.
-
-![Google trace method comparison at the selected CMS point](figures/google-cluster-2019-w2048.svg)
-
-## Data and query workload
-
-- Input: all 626,337 usage rows in the shard, containing 44,806 collection IDs.
-- Replay: rows sorted by `(start_time, dense_collection_id)` into all 8,929
-  consecutive native five-minute panes. Collection IDs are sorted and mapped to
-  dense integers; events are not sampled or shuffled.
-- Queries: frequency of every one of the 44,806 collection IDs over the latest
-  5m, 15m, 1h, 6h, and 24h complete windows.
-- Recurrence: every trial executes the five queries three times after replay,
-  producing 15 range queries and 672,090 point estimates per method.
-- Sketch: real `asap_sketchlib::CountMinSketch`, depth 4. The configuration
-  sweep uses widths 64, 256, 512, 1024, 2048, and 4096.
-- Accuracy contract: maximum point error divided by the number of events in its
-  window must be at most 0.01. Exact arrays are the oracle.
-- Timings: sequential wall-clock observations in an optimized release build;
-  values are medians of three executions of the same trace except the explicitly
-  labeled width-1024 one-run probe.
-
-The checked-in [replay metadata](data/google-cluster-2019/replay-metadata.json)
-and [per-configuration raw JSON](data/google-cluster-2019/) contain the inputs
-and every measured row. The third-party Parquet remains outside Git and is
-recovered with the checksum-verifying downloader.
-
-## Empirical sizing result
-
-| CMS width x depth | Max normalized error | Meets 1% target | ASAP-Full logical memory |
-|---|---:|:---:|---:|
-| 64 x 4 | 0.04598 | no | 0.56 MiB |
-| 256 x 4 | 0.01149 | no | 2.25 MiB |
-| 512 x 4 | 0.01149 | no | 4.50 MiB |
-| 1024 x 4 | 0.01149 | no | 9.00 MiB |
-| **2048 x 4** | **0.00413** | **yes** | **18.00 MiB** |
-| 4096 x 4 | 0 | yes, overconfigured | 36.00 MiB |
-
-On this finite candidate sweep, 2048 x 4 is the smallest measured feasible
-configuration. Choosing 4096 x 4 solely for zero observed error doubles retained
-memory without being required by the 1% contract. Conversely, widths 256 through
-1024 all miss because a collision in the sparse 5m window contributes more than
-1%; larger windows alone would hide that failure.
-
-## Method comparison at 2048 x 4
-
-| Method | Update wall time | Query wall time | Updates | Retained state | Logical bytes | Max error |
-|---|---:|---:|---:|---:|---:|---:|
-| AutoSketch-PerQuery | 1.2128 s | 7.0610 s | 3,131,685 | 376 sketches | 24,641,536 | 0.00413 |
-| ASAP-NoSharing | 1.1988 s | 7.2661 s | 3,131,685 | 376 sketches | 24,641,536 | 0.00413 |
-| ASAP-Full | 0.2584 s | 7.1027 s | 626,337 | 288 sketches | 18,874,368 | 0.00413 |
-| Exact-Raw | 0.000063 s | 0.000286 s | 626,337 appends | 21,167 keys | 169,336 | 0 |
-
-ASAP-Full performs 5x fewer CMS updates than the five query-local deployments,
-uses 23.4% less CMS payload, and has a 4.69x median update-time speedup. Its query
-time is approximately unchanged because this runner evaluates the same retained
-panes for each method.
-
-The exact baseline decisively wins both memory and latency on this particular
-latest-24h slice: only 21,167 usage records fall in that interval, while a CMS is
-allocated for every pane, including sparse panes. The runner also sums estimates
-across panes rather than using a native merged-CMS query path. Therefore this
-result supports sharing's maintenance benefit but **does not support a claim that
-sketching beats exact execution on this workload**. A planner should select exact
-for this sparse regime or account for sparse-pane representation and merge cost.
-
-## Reproduce
-
-```sh
-python3 tools/autosketch-comparison/prepare_google_cluster_trace.py \
-  /mydata/datasets/google-cluster-data-2019/cell-a/instance_usage-000000000000.parquet.gz \
-  /mydata/google-cluster-asap-eval/replay.tsv \
-  --metadata /mydata/google-cluster-asap-eval/replay-metadata.json
-
-cargo run --release -p data_plane --example repeated_window_comparison -- \
-  --output /mydata/google-cluster-asap-eval/results-w2048.json \
-  --backend-revision "$(git rev-parse HEAD)" \
-  --input-tsv /mydata/google-cluster-asap-eval/replay.tsv \
-  --pane-seconds 300 --window-panes 1,3,12,72,288 \
-  --width 2048 --depth 4 --trials 3 --query-repetitions 3
-```
diff --git a/tools/autosketch-comparison/google-cluster-data-2019.json b/tools/autosketch-comparison/google-cluster-data-2019.json
deleted file mode 100644
index 7150bbe01..000000000
--- a/tools/autosketch-comparison/google-cluster-data-2019.json
+++ /dev/null
@@ -1,27 +0,0 @@
-{
-  "dataset": "Google ClusterData 2019",
-  "license": "CC-BY-4.0",
-  "cell": "a",
-  "table": "instance_usage",
-  "object": "instance_usage-000000000000.parquet.gz",
-  "source_url": "https://storage.googleapis.com/clusterdata_2019_a/instance_usage-000000000000.parquet.gz",
-  "gcs_generation": "1682721397229175",
-  "downloaded_bytes": 36204879,
-  "sha256": "c70b806cb89f110a4235f40285957f0244edf49f28c2a83803646a911d0d6fb6",
-  "format": "Apache Parquet (the official object name ends in .gz but its content is not gzip-wrapped)",
-  "rows": 626337,
-  "row_groups": 2,
-  "columns": 21,
-  "start_time_min": 300000000,
-  "start_time_max": 2678998000000,
-  "end_time_min": 600000000,
-  "end_time_max": 2679000000000,
-  "distinct_collection_ids": 44806,
-  "distinct_instance_indexes": 16126,
-  "distinct_machine_ids": 9990,
-  "schema": {
-    "source_url": "https://storage.googleapis.com/clusterdata_2019_schema/instance_usage.schema.json",
-    "downloaded_bytes": 2193,
-    "sha256": "82c1ffb74988c2b7a7b60a134840bb234f588949950bfab762dac8863a72b559"
-  }
-}
diff --git a/tools/autosketch-comparison/plot_repeated_window.py b/tools/autosketch-comparison/plot_repeated_window.py
deleted file mode 100755
index 98fe5dce8..000000000
--- a/tools/autosketch-comparison/plot_repeated_window.py
+++ /dev/null
@@ -1,55 +0,0 @@
-#!/usr/bin/env python3
-"""Render repeated-window raw results as a dependency-free SVG."""
-import argparse
-import html
-import json
-import statistics
-
-
-def main():
-    parser = argparse.ArgumentParser()
-    parser.add_argument("input")
-    parser.add_argument("output")
-    args = parser.parse_args()
-    with open(args.input, encoding="utf-8") as source:
-        report = json.load(source)
-    grouped = {}
-    for trial in report["trials"]:
-        for row in trial["methods"]:
-            grouped.setdefault(row["method"], []).append(row)
-    order = ["autosketch_per_query", "asap_no_sharing", "asap_full_shared", "exact_raw"]
-    labels = ["AutoSketch / PerQuery", "ASAP / NoSharing", "ASAP / Full", "Exact / Raw"]
-    colors = ["#7086a3", "#91a4ba", "#e47732", "#6b9d72"]
-    panels = [
-        ("Update wall time (s)", "update_wall_seconds", 1.0),
-        ("Query wall time (s)", "query_wall_seconds", 1.0),
-        ("Logical retained memory (MiB)", "logical_payload_bytes", 1 / 1048576),
-        ("Max normalized error", "max_normalized_additive_error", 1.0),
-    ]
-    parts = ['<svg xmlns="http://www.w3.org/2000/svg" width="1080" height="600" viewBox="0 0 1080 600">',
-             '<rect width="100%" height="100%" fill="white"/>',
-             '<style>text{font-family:system-ui,sans-serif;fill:#253047}.title{font-size:19px;font-weight:700}.axis{font-size:11px}.value{font-size:11px;font-weight:600}</style>',
-             f'<text x="540" y="30" text-anchor="middle" class="title">Repeated-window comparison — median of {len(report["trials"])} executed release trials</text>']
-    for panel, (title, field, scale) in enumerate(panels):
-        x0, y0 = 55 + (panel % 2) * 530, 65 + (panel // 2) * 265
-        chart_h, chart_w = 170, 455
-        values = [statistics.median(row[field] for row in grouped[name]) * scale for name in order]
-        maximum = max(values) or 1
-        parts += [f'<text x="{x0}" y="{y0}" class="title">{html.escape(title)}</text>',
-                  f'<line x1="{x0}" y1="{y0+chart_h}" x2="{x0+chart_w}" y2="{y0+chart_h}" stroke="#526075"/>']
-        for index, value in enumerate(values):
-            x, bar_width = x0 + 12 + index * 112, 78
-            bar_height = value / maximum * (chart_h - 35)
-            y = y0 + chart_h - bar_height
-            shown = f"{value:.4f}" if value < 10 else f"{value:,.0f}"
-            parts += [f'<rect x="{x}" y="{y:.1f}" width="{bar_width}" height="{bar_height:.1f}" rx="3" fill="{colors[index]}"/>',
-                      f'<text x="{x+bar_width/2}" y="{y-5:.1f}" text-anchor="middle" class="value">{shown}</text>',
-                      f'<text x="{x+bar_width/2}" y="{y0+chart_h+18}" text-anchor="middle" class="axis">{html.escape(labels[index].split(" / ")[0])}</text>',
-                      f'<text x="{x+bar_width/2}" y="{y0+chart_h+31}" text-anchor="middle" class="axis">{html.escape(labels[index].split(" / ")[1])}</text>']
-    parts.append('</svg>')
-    with open(args.output, "w", encoding="utf-8") as target:
-        target.write("\n".join(parts) + "\n")
-
-
-if __name__ == "__main__":
-    main()
diff --git a/tools/autosketch-comparison/prepare_google_cluster_trace.py b/tools/autosketch-comparison/prepare_google_cluster_trace.py
deleted file mode 100755
index f10e37f8e..000000000
--- a/tools/autosketch-comparison/prepare_google_cluster_trace.py
+++ /dev/null
@@ -1,51 +0,0 @@
-#!/usr/bin/env python3
-"""Convert official instance_usage Parquet to deterministic pane/key replay TSV."""
-import argparse
-import json
-import pathlib
-
-import pyarrow.parquet as pq
-
-
-def main():
-    parser = argparse.ArgumentParser()
-    parser.add_argument("input")
-    parser.add_argument("output")
-    parser.add_argument("--metadata", required=True)
-    parser.add_argument("--pane-seconds", type=int, default=300)
-    args = parser.parse_args()
-    if args.pane_seconds <= 0:
-        parser.error("pane seconds must be positive")
-    table = pq.read_table(args.input, columns=["start_time", "collection_id"])
-    if table["start_time"].null_count or table["collection_id"].null_count:
-        raise ValueError("identity/timestamp nulls are not allowed")
-    start = table["start_time"].to_pylist()
-    collections = table["collection_id"].to_pylist()
-    minimum = min(start)
-    pane_us = args.pane_seconds * 1_000_000
-    identities = {value: index for index, value in enumerate(sorted(set(collections)))}
-    rows = sorted(((timestamp - minimum) // pane_us, identities[key])
-                  for timestamp, key in zip(start, collections))
-    output = pathlib.Path(args.output)
-    output.parent.mkdir(parents=True, exist_ok=True)
-    with output.open("x", encoding="utf-8") as target:
-        for pane, key in rows:
-            target.write(f"{pane}\t{key}\n")
-    metadata = {
-        "input": str(pathlib.Path(args.input).resolve()),
-        "rows": len(rows),
-        "keys": len(identities),
-        "pane_seconds": args.pane_seconds,
-        "minimum_start_time_us": minimum,
-        "maximum_start_time_us": max(start),
-        "panes_including_gaps": rows[-1][0] + 1,
-        "nonempty_panes": len(set(pane for pane, _ in rows)),
-        "mapping": "collection IDs sorted numerically and replaced by dense zero-based IDs",
-    }
-    with pathlib.Path(args.metadata).open("x", encoding="utf-8") as target:
-        json.dump(metadata, target, indent=2)
-        target.write("\n")
-
-
-if __name__ == "__main__":
-    main()
diff --git a/tools/autosketch-comparison/repeated-window-results.md b/tools/autosketch-comparison/repeated-window-results.md
deleted file mode 100644
index 94c4ac3f8..000000000
--- a/tools/autosketch-comparison/repeated-window-results.md
+++ /dev/null
@@ -1,76 +0,0 @@
-# Repeated-window performance results
-
-These are executed release-benchmark results, not smoke-test results. The
-checked-in [raw JSON](data/repeated-window.json) contains all seven trials and
-records backend revision `15f8ea14bef2ea6f771a01bc78b55f13a0cdf636`.
-
-![Repeated-window update, query, memory, and error results](figures/repeated-window.svg)
-
-## Workload, data, and queries
-
-- **Data:** 120 consecutive one-minute panes. Each pane contains 5,000 positive
-  frequency updates, for 600,000 events per trial. Keys are integers sampled
-  uniformly from `[0, 1000)` by the checked-in SplitMix64 generator. Seven trials
-  use seeds `42` through `48`. There is no ingestion, network, or disk I/O.
-- **Queries:** four latest-complete-window frequency workloads with ranges 1m,
-  5m, 15m, and 60m. A query asks for the frequencies of all 1,000 declared keys.
-  Each trial executes the complete set of four queries ten times after ingestion,
-  so each method answers 40 range queries and performs 40,000 point estimates.
-- **Sketch:** every approximate method uses the real
-  `asap_sketchlib::CountMinSketch` with identical `width=256, depth=4`. A pane
-  payload is `256 * 4 * 8 = 8,192` counter bytes. Parameters are fixed here so
-  this experiment isolates window sharing rather than configuration quality.
-- **AutoSketch-PerQuery:** maintains independent pane collections with retention
-  1, 5, 15, and 60, which is the natural deployment for a query-local optimizer.
-- **ASAP-NoSharing:** intentionally uses the same physical state as PerQuery. It
-  is the control separating planner configuration from sharing.
-- **ASAP-Full:** updates one set of one-minute panes, retains the last 60, and
-  reuses them for all four window queries.
-- **Exact-Raw:** retains the raw integer keys for the latest 60 panes and scans
-  them to construct exact frequency arrays.
-
-`update_wall_seconds` covers state construction and event updates.
-`query_wall_seconds` covers all ten repetitions of all four queries.
-Logical memory includes CMS counter payload or retained `usize` keys, excluding
-allocator/object overhead. Methods run sequentially; reported values are medians,
-not isolated CPU profiles.
-
-Regenerate the figure using only the Python standard library:
-
-```sh
-python3 tools/autosketch-comparison/plot_repeated_window.py \
-  tools/autosketch-comparison/data/repeated-window.json \
-  tools/autosketch-comparison/figures/repeated-window.svg
-```
-
-## Results
-
-| Method | Update wall time | Query wall time | Counter updates | Retained state | Logical bytes | Max normalized error |
-|---|---:|---:|---:|---:|---:|---:|
-| AutoSketch-PerQuery | 0.7627 s | 0.1163 s | 2,400,000 | 81 sketches | 663,552 | 0.0066 |
-| ASAP-NoSharing | 0.7621 s | 0.1155 s | 2,400,000 | 81 sketches | 663,552 | 0.0066 |
-| ASAP-Full | 0.1905 s | 0.1162 s | 600,000 | 60 sketches | 491,520 | 0.0066 |
-| Exact raw | 0.0009 s | 0.0026 s | 600,000 appends | 300,000 keys | 2,400,000 | 0 |
-
-ASAP-Full performs 4x fewer sketch updates than the query-local layouts and
-uses 25.9% fewer logical sketch bytes, while returning the same estimates and
-error. The measured update wall-time speedup is 4.00x. ASAP-NoSharing and
-AutoSketch-PerQuery intentionally converge: this is the control showing that
-the result comes from cross-window sharing, not a different sketch.
-
-The exact baseline is faster for this in-memory synthetic point-query kernel but
-retains 4.88x the logical bytes of ASAP-Full. It omits parsing, grouping, network,
-and storage-engine costs, so it is not a database latency result. Likewise, this
-runner evaluates the latest complete windows rather than launching the backend
-or Planner.
-
-## Backend E2E calibration observation
-
-A separate real Prometheus/backend run over `/mydata/metrics.txt` successfully
-discovered nine candidates, calibrated all nine, and selected one materialization
-shared by two queries. Its three evaluation trials correctly served all 40
-occurrences through external-exact fallback: the input covers 24h minus 30s,
-while the selected 24h query requires complete 30-second pane coverage. The
-runtime rejected the missing earliest pane with `counter SDS requires full-pane
-query coverage`. This is a useful fail-closed test, not a warm-path performance
-measurement, and is therefore not mixed into the table above.
diff --git a/tools/autosketch-comparison/smoke-results.md b/tools/autosketch-comparison/smoke-results.md
deleted file mode 100644
index c877c2b1c..000000000
--- a/tools/autosketch-comparison/smoke-results.md
+++ /dev/null
@@ -1,99 +0,0 @@
-# First fixed-CMS smoke evaluation
-
-## Release baseline after Bloom integration (`d62a37b`)
-
-These runs use the query-semantics filter, a 4 KiB per-sketch payload budget,
-10,000 events, cardinality 1,000, ten independent calibration/held-out seed
-pairs, and an error target of 0.01.
-
-| Workload | AutoSketch / ERP / oracle selection | Held-out pass | Mean payload |
-| --- | --- | ---: | ---: |
-| Frequency, uniform | Count Sketch, all 10 runs | 7/10 | 972.8 B |
-| Frequency, Zipf(1.2) | CMS, all 10 runs | 8/10 | 3123.2 B |
-| Membership, uniform | Bloom 2048 × 4, all 10 runs | 10/10 | 1024 B |
-
-For every run, adapted AutoSketch, same-table ERP, and the grid oracle selected
-the same configuration. This is a selection-contract check, not a superiority
-result. The frequency held-out failures show that one calibration window is not
-enough evidence for a robust accuracy claim and motivate multi-window
-calibration plus Hybrid fallback.
-
-The production repeated-dashboard gate initially exposed two runtime defects:
-worker policy lookup confused materialization IDs with policy fingerprints, and
-right-closed panes were anchored independently to each group's first sample
-instead of the global PromQL time grid. After fixing both, the single-pane and
-shared multi-pane process E2E tests pass.
-
-## Follow-up: hard budget and family selection
-
-Revision `3a74574118d4bd75b4c6ec174318bcc21b492675` adds a counter-payload memory
-cap and CMS/Count Sketch selection. These are also debug smoke runs, not a
-performance comparison. All three methods share the filtered candidate grid.
-
-| Input / candidates | Budget | Runs | Selected family (all methods) | Held-out passes (each method) |
-| --- | --- | --- | --- | --- |
-| Uniform / CMS + Count Sketch | 4096 B | 10 | Count Sketch, 10/10 | 7/10 |
-| Zipf(1.2) / CMS + Count Sketch | 4096 B | 10 | CMS, 10/10 | 8/10 |
-| Uniform / CMS + Count Sketch | 511 B | 1 | None; no candidate measured | N/A |
-| Zipf(1.2) / Count Sketch only | 4096 B | 2 | None; calibration accuracy infeasible | N/A |
-
-The 4-KiB runs choose the same configuration as the grid oracle in every run.
-Uniform's mean selected counter payload is 972.8 B; Zipf's is 3123.2 B. Worst
-held-out errors are 0.0104 and 0.0108 respectively, exceeding epsilon 0.01 in
-the failed runs. These failures remain visible: broader candidates and a memory
-cap do not fix calibration generalization.
-
-Local artifacts: `/tmp/asap-family-budget4096.json`,
-`/tmp/asap-family-zipf-budget4096.json`, `/tmp/asap-family-budget511.json`, and
-`/tmp/asap-cs-only-budget4096.json`. Reproduce with the README commands (without
-`--release`) and the indicated budget/family/run settings. Ten Rust tests and
-two Python tests pass, including budget boundaries, family choice in either
-direction, Count Sketch hash limits and exact single-key checks.
-
-## Original CMS-only run
-
-Runner revision: `a0680e3d21cf2fc72717d0a6982b71b939107b5a`.
-These are debug-build correctness/exploration runs, not performance results or
-a non-inferiority claim. The whole Planner, query frontend, window execution,
-and recurring-query system are not exercised.
-
-Each distribution uses 10 paired runs, 10,000 events/window, 1,000 declared keys,
-epsilon 0.01, and the same 56-point grid. Calibration seeds are 42, 44, ..., 60;
-held-out seeds are 43, 45, ..., 61. CMS hash behavior is fixed. Each ERP row has
-one calibration accuracy observation, not a confidence guarantee.
-
-| Distribution | Calibration feasible (each method) | Held-out passes (each method) | Mean selected counter bytes | Worst held-out error | Mean adapted-search table evaluations |
-| --- | --- | --- | --- | --- | --- |
-| Uniform | 10/10 | 8/10 | 3072 | 0.0118 | 45.5/56 |
-| Zipf, exponent 1.2 | 10/10 | 8/10 | 3123.2 | 0.0108 | 43.9/56 |
-
-AutoSketch-Adapted, ASAPPlanner ERP selector, and grid oracle selected identical
-configurations in all 20 runs. ERP matching the oracle is expected because both
-select over the complete common table. This does not measure savings from
-avoiding calibration, nor demonstrate superiority of either search method.
-
-Both distributions have two held-out accuracy failures for every method. Keep
-them in the evaluation. A feasible calibration point is not automatically a
-robust deployment configuration. Next steps need a preregistered multi-window
-calibration policy and fresh final-test seeds; do not tune against these test
-answers and continue calling them held out.
-
-## Reproduction and artifacts
-
-Use the README commands without `--release`, at the runner revision above.
-The local raw artifacts are `/tmp/asap-cms-uniform-first.json` and
-`/tmp/asap-cms-zipf-first.json`. They include all per-configuration measurements,
-search visits, profiles, selected states, outcomes, arguments, and Cargo.lock.
-These are local artifacts, not durable hosted downloads. Re-execution should
-reproduce deterministic choices/errors with the pinned dependencies; timings
-and therefore complete file hashes will differ.
-
-Original artifact SHA-256:
-
-- Uniform: `0cdf4c39b730b6a35c1339770498b16093a93e9b67b4281a8e8dc34734e3536e`
-- Zipf: `4689f795b3140af0c6bea59192ad24d83b9921e6182305fd0c6c8142c621497a`
-
-Validation: 7 Rust runner tests and 2 Python summarizer tests passed. Test cases
-cover LHS coordinates, search bounds/cache, all/no-feasible outcomes, deterministic
-data, actual CMS/exact parity for a single key, ERP/oracle equivalence, descriptor
-mismatch, and preserving failed/infeasible outcomes in summaries.
diff --git a/tools/autosketch-comparison/summarize.py b/tools/autosketch-comparison/summarize.py
deleted file mode 100644
index 52258bfc5..000000000
--- a/tools/autosketch-comparison/summarize.py
+++ /dev/null
@@ -1,55 +0,0 @@
-#!/usr/bin/env python3
-"""Summarize starter-runner JSON without discarding infeasible/test failures."""
-
-import argparse
-import json
-from collections import Counter
-from pathlib import Path
-from statistics import mean
-
-
-def summarize(report):
-    if report["schema_version"] != 1 or not report["runs"]:
-        raise ValueError("expected nonempty version-1 report")
-    rows = []
-    for method in ("autosketch_adapted", "asapplanner_erp_selector", "grid_oracle"):
-        outcomes = [next(o for o in run["outcomes"] if o["method"] == method)
-                    for run in report["runs"]]
-        selected = [o for o in outcomes if o["selected"] is not None]
-        errors = [o["held_out"]["error"] for o in selected]
-        rows.append({
-            "method": method,
-            "runs": len(outcomes),
-            "calibration_feasible": len(selected),
-            "selected_families": dict(Counter(o["selected"].get("family", "cms") for o in selected)),
-            "held_out_pass": sum(o["held_out_pass"] is True for o in outcomes),
-            "held_out_fail": sum(o["held_out_pass"] is False for o in outcomes),
-            "no_feasible_configuration": len(outcomes) - len(selected),
-            "mean_selected_payload_bytes": mean(o["held_out"]["payload_bytes"]
-                                                for o in selected) if selected else None,
-            "max_held_out_error": max(errors) if errors else None,
-        })
-    return {
-        "backend_revision": report["args"]["backend_revision"],
-        "debug_assertions": report["debug_assertions"],
-        "events": report["args"]["events"],
-        "cardinality": report["args"]["cardinality"],
-        "zipf": report["args"]["zipf"],
-        "epsilon": report["args"]["epsilon"],
-        "query": report["args"].get("query", "frequency"),
-        "memory_budget_bytes": report["args"].get("memory_budget_bytes"),
-        "sketches": report["args"].get("sketches", ["cms"]),
-        "mean_search_table_evaluations": mean(len(r["search"]["visited"])
-                                             for r in report["runs"]),
-        "mean_full_grid_calibration_seconds": mean(r["calibration_wall_seconds"]
-                                                   for r in report["runs"]),
-        "outcomes": rows,
-        "interpretation": "Shared-table smoke evaluation, not a system performance claim."
-    }
-
-
-if __name__ == "__main__":
-    parser = argparse.ArgumentParser(description=__doc__)
-    parser.add_argument("reports", nargs="+", type=Path)
-    args = parser.parse_args()
-    print(json.dumps([summarize(json.loads(path.read_text())) for path in args.reports], indent=2))
diff --git a/tools/autosketch-comparison/test_summarize.py b/tools/autosketch-comparison/test_summarize.py
deleted file mode 100644
index ac5e8ea60..000000000
--- a/tools/autosketch-comparison/test_summarize.py
+++ /dev/null
@@ -1,32 +0,0 @@
-import unittest
-from summarize import summarize
-
-
-class SummaryTests(unittest.TestCase):
-    def test_failures_and_infeasible_are_separate(self):
-        def outcome(method, selected, passed):
-            return {"method": method, "selected": {} if selected else None,
-                    "held_out_pass": passed,
-                    "held_out": {"payload_bytes": 512,
-                                 "error": 0.02} if selected else None}
-        report = {"schema_version": 1, "debug_assertions": True,
-                  "args": {"backend_revision": "test", "events": 100,
-                           "cardinality": 10, "zipf": 0, "epsilon": 0.01},
-                  "runs": [{"search": {"visited": [1]}, "calibration_wall_seconds": 1,
-                            "outcomes": [outcome("autosketch_adapted", False, None),
-                                         outcome("asapplanner_erp_selector", True, False),
-                                         outcome("grid_oracle", True, False)]}]}
-        rows = summarize(report)["outcomes"]
-        self.assertEqual(rows[0]["no_feasible_configuration"], 1)
-        self.assertEqual(rows[0]["held_out_fail"], 0)
-        self.assertIsNone(rows[0]["mean_selected_payload_bytes"])
-        self.assertEqual(rows[1]["held_out_fail"], 1)
-        self.assertEqual(rows[1]["held_out_pass"], 0)
-
-    def test_empty_report_rejected(self):
-        with self.assertRaises(ValueError):
-            summarize({"schema_version": 1, "runs": []})
-
-
-if __name__ == "__main__":
-    unittest.main()
diff --git a/tools/clickhouse-benefit/README.md b/tools/clickhouse-benefit/README.md
deleted file mode 100644
index ac3c6c05d..000000000
--- a/tools/clickhouse-benefit/README.md
+++ /dev/null
@@ -1,103 +0,0 @@
-# ClickHouse warm-path benefit probe
-
-This developer probe measures one bounded SQL `max` query through the production
-ClickHouse listener and directly against the same ClickHouse table. It compiles
-and installs a shared `QueryPlan`, backfills its selected materialization, checks
-the warm result against ClickHouse, performs ten warmups, then alternates 100
-warm and 100 exact requests. The JSON artifact retains every latency and the
-backend/ClickHouse process counters around the query phase.
-
-```sh
-mkdir -p /path/to/results
-CLICKHOUSE_URL=http://127.0.0.1:8123 \
-CLICKHOUSE_USER=bench CLICKHOUSE_PASSWORD=bench \
-CLICKHOUSE_PID="$(pidof clickhouse-server)" \
-CLICKHOUSE_BENCH_OUTPUT=/path/to/results/q05-warm.json \
-cargo test -p data_plane --test clickhouse_q05_process_e2e -- --nocapture
-```
-
-`CLICKHOUSE_PID` is optional. CPU is reported in Linux scheduler ticks and RSS
-is whole-process RSS. `CLICKHOUSE_STORAGE` may name a readable data directory;
-its recursive logical size is recorded. Build time covers database setup, plan
-compilation/installation, backend startup, and backfill. It does not isolate
-these components. The probe uses a dedicated table and drops that table at the
-start of each run.
-
-This probe is deliberately narrow. It does not represent the 27-query corpus,
-does not exercise a hybrid DAG, and does not establish end-to-end workload
-benefit. Run release binaries on an otherwise idle, dedicated ClickHouse process
-for publishable measurements.
-
-## Replay a real series
-
-`extract_series.py` selects one exact series from an existing OpenMetrics trace,
-retains its values and timestamps, and records the input hash. The probe requires
-one series because its SQL output is a scalar. It cannot stand in for grouped
-multi-series execution.
-
-```sh
-python3 tools/clickhouse-benefit/extract_series.py /path/to/data.prom \
-  /path/to/series.jsonl \
-  --series 'service_cache_refresh_lag_seconds{job="user-service",instance="user-service:8082"}'
-CLICKHOUSE_BENCH_INPUT=/path/to/series.jsonl \
-CLICKHOUSE_BENCH_METRIC=service_cache_refresh_lag_seconds \
-CLICKHOUSE_BENCH_END_MS=1788891296001 \
-CLICKHOUSE_BENCH_REPETITIONS=1000 \
-CLICKHOUSE_BENCH_OUTPUT=/path/to/results/real-series.json \
-CLICKHOUSE_URL=http://127.0.0.1:8123 \
-cargo test --release -p data_plane --test clickhouse_q05_process_e2e -- --nocapture
-```
-
-The end timestamp is exclusive. For millisecond samples, adding one millisecond
-to a PromQL evaluation timestamp expresses its `(t-12h, t]` window as the SQL
-`[t-12h+1ms, t+1ms)` range. Both routes use that identical range. The complete
-selected series is loaded into a dedicated MergeTree table; state backfill reads
-the requested 12-hour window. Every measured response must equal the baseline,
-and every accelerated response must retain `warm` provenance.
-
-This measures runtime reuse of a **predeclared MinMax catalog**. Planner selects
-the query DAG against that catalog, but the harness supplies the materialization
-and pane size. It does not measure automatic materialization candidate selection,
-estimated costs, or the original SQL corpus's metric-filter binding. Those remain
-separate acceptance requirements. The source trace's own generation provenance
-must accompany the extraction record; a scaled/interpolated trace is not native
-one-second source data.
-
-`summarize.py ARTIFACT.json` reports latency and coarse per-route process CPU
-deltas. The first-query measurements are taken after state construction; they
-are not cold filesystem-cache measurements. Process CPU includes background
-work, and RSS/high-water marks cover the whole process. Input loading and
-backfill happen before the repeated-query phase, and their costs remain in the
-separate build-phase record.
-The reported serial service rate is the reciprocal mean request latency, not a
-concurrent throughput test. `CLICKHOUSE_BENCH_REPETITIONS` defaults to 100 per
-route; longer runs reduce the relative scheduler-tick quantization error.
-
-## Reproduce the matched-budget trials
-
-`run_matched_trial.sh` gives both services two CPUs (cores 60–61) and 4 GiB.
-It restarts the named evaluation ClickHouse container, runs an already-built
-probe in a separate container, and records Docker limits and binary hashes.
-The backend container also contains the HTTP test driver. Host PID/network
-namespaces let the probe sample both process counters and reach the exact
-backend; only the build tree, checkout, selected input, and result directory
-are mounted. The ClickHouse image is pinned by digest inside the script.
-
-Build first, then set `TEST_BINARY` to the executable path printed by Cargo:
-
-```sh
-export CARGO_TARGET_DIR=/dev/shm/asap-clickhouse-release
-cargo +1.98.0 test --release -p data_plane --test clickhouse_q05_process_e2e --no-run
-export TEST_BINARY=/absolute/path/printed/by/cargo
-export RESULT_DIR=/mydata/clickhouse-o11y-main-results
-export CLICKHOUSE_BENCH_INPUT=$RESULT_DIR/fine-1s-24h-series.jsonl
-export CLICKHOUSE_BENCH_METRIC=service_cache_refresh_lag_seconds
-export CLICKHOUSE_BENCH_END_MS=1788891296001
-# Set CLICKHOUSE_USER and CLICKHOUSE_PASSWORD to the evaluation account.
-bash tools/clickhouse-benefit/run_matched_trial.sh repro-1
-```
-
-Use a new trial suffix for each run. The script preserves named containers and
-input/results; the probe replaces only its `asap_q05_e2e.q05_samples` table.
-The runtime image has no Git, so use the accompanying host revision and
-executable-hash files when the trace's `git_head` field is null.
diff --git a/tools/clickhouse-benefit/artifacts/automatic/fine-1s-matched-trialcontrolled-max-1-summary.json b/tools/clickhouse-benefit/artifacts/automatic/fine-1s-matched-trialcontrolled-max-1-summary.json
deleted file mode 100644
index b86978314..000000000
--- a/tools/clickhouse-benefit/artifacts/automatic/fine-1s-matched-trialcontrolled-max-1-summary.json
+++ /dev/null
@@ -1,164 +0,0 @@
-{
-  "artifact": "/mydata/clickhouse-automatic-benefit-study/fine-1s-matched-trialcontrolled-max-1.json",
-  "git_head": null,
-  "input": {
-    "end_ms": 1788891296001,
-    "metric": "service_cache_refresh_lag_seconds",
-    "path": "/mydata/clickhouse-o11y-main-results/fine-1s-24h-series.jsonl",
-    "samples": 86371,
-    "series": [
-      "service_cache_refresh_lag_seconds{job=\"user-service\",instance=\"user-service:8082\"}"
-    ],
-    "start_ms": 1788848096001
-  },
-  "planning_scope": "Real Planner selects the DAG and automatic control-plane binding constructs the catalog; fixed-window layout is not cost-optimized",
-  "routes": {
-    "warm": {
-      "requests": 1000,
-      "median_ms": 0.85268,
-      "p95_ms": 0.947403,
-      "serial_service_requests_per_second": 1190.33156519102,
-      "all_http_200": true,
-      "execution_modes": [
-        "warm"
-      ],
-      "backend_cpu_ms": 770.0,
-      "clickhouse_cpu_ms": 130.0
-    },
-    "exact": {
-      "requests": 1000,
-      "median_ms": 6.775694,
-      "p95_ms": 15.607599,
-      "serial_service_requests_per_second": 133.2508830524694,
-      "all_http_200": true,
-      "execution_modes": [
-        "None"
-      ],
-      "backend_cpu_ms": 0.0,
-      "clickhouse_cpu_ms": 8240.0
-    }
-  },
-  "latency_speedup": 7.946350330721959,
-  "first_query": {
-    "exact_elapsed_ns": 9086382,
-    "warm_elapsed_ns": 7444864
-  },
-  "build_phase": {
-    "backend": {
-      "cpu_ticks": 26,
-      "pid": 3317,
-      "rss_pages": 9554,
-      "vm_hwm": "VmHWM:\t   42172 kB",
-      "vm_rss": "VmRSS:\t   38216 kB"
-    },
-    "backend_output_bytes": 5795,
-    "clickhouse_after": {
-      "cpu_ticks": 635,
-      "pid": 2693,
-      "rss_pages": 199390,
-      "vm_hwm": "VmHWM:\t  834532 kB",
-      "vm_rss": "VmRSS:\t  797560 kB"
-    },
-    "clickhouse_before": {
-      "cpu_ticks": 584,
-      "pid": 2693,
-      "rss_pages": 190958,
-      "vm_hwm": "VmHWM:\t  794548 kB",
-      "vm_rss": "VmRSS:\t  763832 kB"
-    },
-    "elapsed_ns": 2078524302
-  },
-  "source_load_phase": {
-    "clickhouse_after": {
-      "cpu_ticks": 615,
-      "pid": 2693,
-      "rss_pages": 207345,
-      "vm_hwm": "VmHWM:\t  829380 kB",
-      "vm_rss": "VmRSS:\t  829380 kB"
-    },
-    "clickhouse_before": {
-      "cpu_ticks": 584,
-      "pid": 2693,
-      "rss_pages": 190958,
-      "vm_hwm": "VmHWM:\t  794548 kB",
-      "vm_rss": "VmRSS:\t  763832 kB"
-    },
-    "elapsed_ns": 600844868
-  },
-  "backfill_phase": {
-    "backend_after": {
-      "cpu_ticks": 26,
-      "pid": 3317,
-      "rss_pages": 9554,
-      "vm_hwm": "VmHWM:\t   42172 kB",
-      "vm_rss": "VmRSS:\t   38216 kB"
-    },
-    "backend_before": {
-      "cpu_ticks": 0,
-      "pid": 3317,
-      "rss_pages": 6557,
-      "vm_hwm": "VmHWM:\t   26228 kB",
-      "vm_rss": "VmRSS:\t   26228 kB"
-    },
-    "clickhouse_after": {
-      "cpu_ticks": 635,
-      "pid": 2693,
-      "rss_pages": 199390,
-      "vm_hwm": "VmHWM:\t  834532 kB",
-      "vm_rss": "VmRSS:\t  797560 kB"
-    },
-    "clickhouse_before": {
-      "cpu_ticks": 615,
-      "pid": 2693,
-      "rss_pages": 207345,
-      "vm_hwm": "VmHWM:\t  829380 kB",
-      "vm_rss": "VmRSS:\t  829380 kB"
-    },
-    "elapsed_ns": 1419429320
-  },
-  "query_phase": {
-    "backend_after": {
-      "cpu_ticks": 105,
-      "pid": 3317,
-      "rss_pages": 13857,
-      "vm_hwm": "VmHWM:\t   55428 kB",
-      "vm_rss": "VmRSS:\t   55428 kB"
-    },
-    "backend_before": {
-      "cpu_ticks": 28,
-      "pid": 3317,
-      "rss_pages": 13857,
-      "vm_hwm": "VmHWM:\t   55428 kB",
-      "vm_rss": "VmRSS:\t   55428 kB"
-    },
-    "backend_output_bytes": 5795,
-    "clickhouse_after": {
-      "cpu_ticks": 1488,
-      "pid": 2693,
-      "rss_pages": 204239,
-      "vm_hwm": "VmHWM:\t  844840 kB",
-      "vm_rss": "VmRSS:\t  816956 kB"
-    },
-    "clickhouse_before": {
-      "cpu_ticks": 648,
-      "pid": 2693,
-      "rss_pages": 201089,
-      "vm_hwm": "VmHWM:\t  834532 kB",
-      "vm_rss": "VmRSS:\t  804356 kB"
-    },
-    "clickhouse_storage_bytes": null,
-    "elapsed_ns": 8850136205
-  },
-  "clickhouse_table": {
-    "bytes_on_disk": 507146,
-    "compressed_bytes": 499358,
-    "rows": 86371
-  },
-  "limitations": [
-    "bounded single-series aggregate sensitivity; not full original o11y workload coverage",
-    "CPU uses Linux scheduler ticks",
-    "RSS is whole-process",
-    "ClickHouse server is externally managed",
-    "CPU counters include server background work and have scheduler-tick precision"
-  ]
-}
diff --git a/tools/clickhouse-benefit/artifacts/automatic/fine-1s-matched-trialcontrolled-max-1.backend-runtime.json b/tools/clickhouse-benefit/artifacts/automatic/fine-1s-matched-trialcontrolled-max-1.backend-runtime.json
deleted file mode 100644
index 99aeffea7..000000000
--- a/tools/clickhouse-benefit/artifacts/automatic/fine-1s-matched-trialcontrolled-max-1.backend-runtime.json
+++ /dev/null
@@ -1 +0,0 @@
-{"cpu_affinity":"60,61","nano_cpus":2000000000,"memory_limit_bytes":4294967296,"image":"sha256:fa394da808cc53f76d0344429421d6c422a6ee85fe7450135c0e3cff4df9bcbb"}
diff --git a/tools/clickhouse-benefit/artifacts/automatic/fine-1s-matched-trialcontrolled-max-1.clickhouse-runtime.json b/tools/clickhouse-benefit/artifacts/automatic/fine-1s-matched-trialcontrolled-max-1.clickhouse-runtime.json
deleted file mode 100644
index 99aeffea7..000000000
--- a/tools/clickhouse-benefit/artifacts/automatic/fine-1s-matched-trialcontrolled-max-1.clickhouse-runtime.json
+++ /dev/null
@@ -1 +0,0 @@
-{"cpu_affinity":"60,61","nano_cpus":2000000000,"memory_limit_bytes":4294967296,"image":"sha256:fa394da808cc53f76d0344429421d6c422a6ee85fe7450135c0e3cff4df9bcbb"}
diff --git a/tools/clickhouse-benefit/artifacts/automatic/fine-1s-matched-trialcontrolled-max-1.clickhouse-settings.tsv b/tools/clickhouse-benefit/artifacts/automatic/fine-1s-matched-trialcontrolled-max-1.clickhouse-settings.tsv
deleted file mode 100644
index 7aa34f2d5..000000000
--- a/tools/clickhouse-benefit/artifacts/automatic/fine-1s-matched-trialcontrolled-max-1.clickhouse-settings.tsv
+++ /dev/null
@@ -1,2 +0,0 @@
-max_threads	auto(2)
-use_query_cache	0
diff --git a/tools/clickhouse-benefit/artifacts/automatic/fine-1s-matched-trialcontrolled-max-1.executables.sha256 b/tools/clickhouse-benefit/artifacts/automatic/fine-1s-matched-trialcontrolled-max-1.executables.sha256
deleted file mode 100644
index 193ef8b1f..000000000
--- a/tools/clickhouse-benefit/artifacts/automatic/fine-1s-matched-trialcontrolled-max-1.executables.sha256
+++ /dev/null
@@ -1,2 +0,0 @@
-2a1a1c568994ff787c170e165681693be96d97b46a8d9b178fc836cd79dfcaf8  /dev/shm/asap-clickhouse-release/release/deps/clickhouse_q05_process_e2e-c20ee66394ae01e2
-dac9b1428be3f702e99980a15af8a3e524ebce31099cb4d5c82e5214cedc8a7d  /dev/shm/asap-clickhouse-release/release/data_plane
diff --git a/tools/clickhouse-benefit/artifacts/automatic/fine-1s-matched-trialcontrolled-max-1.source-checkout.txt b/tools/clickhouse-benefit/artifacts/automatic/fine-1s-matched-trialcontrolled-max-1.source-checkout.txt
deleted file mode 100644
index e9afe33b6..000000000
--- a/tools/clickhouse-benefit/artifacts/automatic/fine-1s-matched-trialcontrolled-max-1.source-checkout.txt
+++ /dev/null
@@ -1 +0,0 @@
-a5dd4b3cd757b67055ac5ca365a428f6b8b3bd69
diff --git a/tools/clickhouse-benefit/artifacts/automatic/fine-1s-matched-trialcontrolled-max-2-summary.json b/tools/clickhouse-benefit/artifacts/automatic/fine-1s-matched-trialcontrolled-max-2-summary.json
deleted file mode 100644
index 6f75ed745..000000000
--- a/tools/clickhouse-benefit/artifacts/automatic/fine-1s-matched-trialcontrolled-max-2-summary.json
+++ /dev/null
@@ -1,164 +0,0 @@
-{
-  "artifact": "/mydata/clickhouse-automatic-benefit-study/fine-1s-matched-trialcontrolled-max-2.json",
-  "git_head": null,
-  "input": {
-    "end_ms": 1788891296001,
-    "metric": "service_cache_refresh_lag_seconds",
-    "path": "/mydata/clickhouse-o11y-main-results/fine-1s-24h-series.jsonl",
-    "samples": 86371,
-    "series": [
-      "service_cache_refresh_lag_seconds{job=\"user-service\",instance=\"user-service:8082\"}"
-    ],
-    "start_ms": 1788848096001
-  },
-  "planning_scope": "Real Planner selects the DAG and automatic control-plane binding constructs the catalog; fixed-window layout is not cost-optimized",
-  "routes": {
-    "warm": {
-      "requests": 1000,
-      "median_ms": 0.8538295,
-      "p95_ms": 0.914374,
-      "serial_service_requests_per_second": 1194.1049218057829,
-      "all_http_200": true,
-      "execution_modes": [
-        "warm"
-      ],
-      "backend_cpu_ms": 770.0,
-      "clickhouse_cpu_ms": 50.0
-    },
-    "exact": {
-      "requests": 1000,
-      "median_ms": 6.7164684999999995,
-      "p95_ms": 14.64908,
-      "serial_service_requests_per_second": 133.68239673326647,
-      "all_http_200": true,
-      "execution_modes": [
-        "None"
-      ],
-      "backend_cpu_ms": 0.0,
-      "clickhouse_cpu_ms": 8360.0
-    }
-  },
-  "latency_speedup": 7.8662877073233,
-  "first_query": {
-    "exact_elapsed_ns": 5258459,
-    "warm_elapsed_ns": 7469621
-  },
-  "build_phase": {
-    "backend": {
-      "cpu_ticks": 30,
-      "pid": 4259,
-      "rss_pages": 9243,
-      "vm_hwm": "VmHWM:\t   41772 kB",
-      "vm_rss": "VmRSS:\t   36972 kB"
-    },
-    "backend_output_bytes": 5795,
-    "clickhouse_after": {
-      "cpu_ticks": 758,
-      "pid": 3589,
-      "rss_pages": 211698,
-      "vm_hwm": "VmHWM:\t  866604 kB",
-      "vm_rss": "VmRSS:\t  846792 kB"
-    },
-    "clickhouse_before": {
-      "cpu_ticks": 717,
-      "pid": 3589,
-      "rss_pages": 198466,
-      "vm_hwm": "VmHWM:\t  804668 kB",
-      "vm_rss": "VmRSS:\t  793864 kB"
-    },
-    "elapsed_ns": 2028679777
-  },
-  "source_load_phase": {
-    "clickhouse_after": {
-      "cpu_ticks": 740,
-      "pid": 3589,
-      "rss_pages": 216651,
-      "vm_hwm": "VmHWM:\t  866604 kB",
-      "vm_rss": "VmRSS:\t  866604 kB"
-    },
-    "clickhouse_before": {
-      "cpu_ticks": 717,
-      "pid": 3589,
-      "rss_pages": 198466,
-      "vm_hwm": "VmHWM:\t  804668 kB",
-      "vm_rss": "VmRSS:\t  793864 kB"
-    },
-    "elapsed_ns": 549677466
-  },
-  "backfill_phase": {
-    "backend_after": {
-      "cpu_ticks": 30,
-      "pid": 4259,
-      "rss_pages": 9243,
-      "vm_hwm": "VmHWM:\t   41772 kB",
-      "vm_rss": "VmRSS:\t   36972 kB"
-    },
-    "backend_before": {
-      "cpu_ticks": 0,
-      "pid": 4259,
-      "rss_pages": 6825,
-      "vm_hwm": "VmHWM:\t   27300 kB",
-      "vm_rss": "VmRSS:\t   27300 kB"
-    },
-    "clickhouse_after": {
-      "cpu_ticks": 758,
-      "pid": 3589,
-      "rss_pages": 211698,
-      "vm_hwm": "VmHWM:\t  866604 kB",
-      "vm_rss": "VmRSS:\t  846792 kB"
-    },
-    "clickhouse_before": {
-      "cpu_ticks": 741,
-      "pid": 3589,
-      "rss_pages": 214825,
-      "vm_hwm": "VmHWM:\t  866604 kB",
-      "vm_rss": "VmRSS:\t  859300 kB"
-    },
-    "elapsed_ns": 1420511502
-  },
-  "query_phase": {
-    "backend_after": {
-      "cpu_ticks": 108,
-      "pid": 4259,
-      "rss_pages": 12911,
-      "vm_hwm": "VmHWM:\t   51644 kB",
-      "vm_rss": "VmRSS:\t   51644 kB"
-    },
-    "backend_before": {
-      "cpu_ticks": 31,
-      "pid": 4259,
-      "rss_pages": 12911,
-      "vm_hwm": "VmHWM:\t   51644 kB",
-      "vm_rss": "VmRSS:\t   51644 kB"
-    },
-    "backend_output_bytes": 5795,
-    "clickhouse_after": {
-      "cpu_ticks": 1617,
-      "pid": 3589,
-      "rss_pages": 208774,
-      "vm_hwm": "VmHWM:\t  881544 kB",
-      "vm_rss": "VmRSS:\t  835096 kB"
-    },
-    "clickhouse_before": {
-      "cpu_ticks": 771,
-      "pid": 3589,
-      "rss_pages": 213578,
-      "vm_hwm": "VmHWM:\t  866604 kB",
-      "vm_rss": "VmRSS:\t  854312 kB"
-    },
-    "clickhouse_storage_bytes": null,
-    "elapsed_ns": 8824909933
-  },
-  "clickhouse_table": {
-    "bytes_on_disk": 507146,
-    "compressed_bytes": 499358,
-    "rows": 86371
-  },
-  "limitations": [
-    "bounded single-series aggregate sensitivity; not full original o11y workload coverage",
-    "CPU uses Linux scheduler ticks",
-    "RSS is whole-process",
-    "ClickHouse server is externally managed",
-    "CPU counters include server background work and have scheduler-tick precision"
-  ]
-}
diff --git a/tools/clickhouse-benefit/artifacts/automatic/fine-1s-matched-trialcontrolled-max-2.backend-runtime.json b/tools/clickhouse-benefit/artifacts/automatic/fine-1s-matched-trialcontrolled-max-2.backend-runtime.json
deleted file mode 100644
index 99aeffea7..000000000
--- a/tools/clickhouse-benefit/artifacts/automatic/fine-1s-matched-trialcontrolled-max-2.backend-runtime.json
+++ /dev/null
@@ -1 +0,0 @@
-{"cpu_affinity":"60,61","nano_cpus":2000000000,"memory_limit_bytes":4294967296,"image":"sha256:fa394da808cc53f76d0344429421d6c422a6ee85fe7450135c0e3cff4df9bcbb"}
diff --git a/tools/clickhouse-benefit/artifacts/automatic/fine-1s-matched-trialcontrolled-max-2.clickhouse-runtime.json b/tools/clickhouse-benefit/artifacts/automatic/fine-1s-matched-trialcontrolled-max-2.clickhouse-runtime.json
deleted file mode 100644
index 99aeffea7..000000000
--- a/tools/clickhouse-benefit/artifacts/automatic/fine-1s-matched-trialcontrolled-max-2.clickhouse-runtime.json
+++ /dev/null
@@ -1 +0,0 @@
-{"cpu_affinity":"60,61","nano_cpus":2000000000,"memory_limit_bytes":4294967296,"image":"sha256:fa394da808cc53f76d0344429421d6c422a6ee85fe7450135c0e3cff4df9bcbb"}
diff --git a/tools/clickhouse-benefit/artifacts/automatic/fine-1s-matched-trialcontrolled-max-2.clickhouse-settings.tsv b/tools/clickhouse-benefit/artifacts/automatic/fine-1s-matched-trialcontrolled-max-2.clickhouse-settings.tsv
deleted file mode 100644
index 7aa34f2d5..000000000
--- a/tools/clickhouse-benefit/artifacts/automatic/fine-1s-matched-trialcontrolled-max-2.clickhouse-settings.tsv
+++ /dev/null
@@ -1,2 +0,0 @@
-max_threads	auto(2)
-use_query_cache	0
diff --git a/tools/clickhouse-benefit/artifacts/automatic/fine-1s-matched-trialcontrolled-max-2.executables.sha256 b/tools/clickhouse-benefit/artifacts/automatic/fine-1s-matched-trialcontrolled-max-2.executables.sha256
deleted file mode 100644
index 193ef8b1f..000000000
--- a/tools/clickhouse-benefit/artifacts/automatic/fine-1s-matched-trialcontrolled-max-2.executables.sha256
+++ /dev/null
@@ -1,2 +0,0 @@
-2a1a1c568994ff787c170e165681693be96d97b46a8d9b178fc836cd79dfcaf8  /dev/shm/asap-clickhouse-release/release/deps/clickhouse_q05_process_e2e-c20ee66394ae01e2
-dac9b1428be3f702e99980a15af8a3e524ebce31099cb4d5c82e5214cedc8a7d  /dev/shm/asap-clickhouse-release/release/data_plane
diff --git a/tools/clickhouse-benefit/artifacts/automatic/fine-1s-matched-trialcontrolled-max-2.source-checkout.txt b/tools/clickhouse-benefit/artifacts/automatic/fine-1s-matched-trialcontrolled-max-2.source-checkout.txt
deleted file mode 100644
index e9afe33b6..000000000
--- a/tools/clickhouse-benefit/artifacts/automatic/fine-1s-matched-trialcontrolled-max-2.source-checkout.txt
+++ /dev/null
@@ -1 +0,0 @@
-a5dd4b3cd757b67055ac5ca365a428f6b8b3bd69
diff --git a/tools/clickhouse-benefit/artifacts/automatic/fine-1s-matched-trialcontrolled-max-3-summary.json b/tools/clickhouse-benefit/artifacts/automatic/fine-1s-matched-trialcontrolled-max-3-summary.json
deleted file mode 100644
index 40e3ae3cc..000000000
--- a/tools/clickhouse-benefit/artifacts/automatic/fine-1s-matched-trialcontrolled-max-3-summary.json
+++ /dev/null
@@ -1,164 +0,0 @@
-{
-  "artifact": "/mydata/clickhouse-automatic-benefit-study/fine-1s-matched-trialcontrolled-max-3.json",
-  "git_head": null,
-  "input": {
-    "end_ms": 1788891296001,
-    "metric": "service_cache_refresh_lag_seconds",
-    "path": "/mydata/clickhouse-o11y-main-results/fine-1s-24h-series.jsonl",
-    "samples": 86371,
-    "series": [
-      "service_cache_refresh_lag_seconds{job=\"user-service\",instance=\"user-service:8082\"}"
-    ],
-    "start_ms": 1788848096001
-  },
-  "planning_scope": "Real Planner selects the DAG and automatic control-plane binding constructs the catalog; fixed-window layout is not cost-optimized",
-  "routes": {
-    "warm": {
-      "requests": 1000,
-      "median_ms": 0.854446,
-      "p95_ms": 0.943564,
-      "serial_service_requests_per_second": 1177.1869868424878,
-      "all_http_200": true,
-      "execution_modes": [
-        "warm"
-      ],
-      "backend_cpu_ms": 770.0,
-      "clickhouse_cpu_ms": 150.0
-    },
-    "exact": {
-      "requests": 1000,
-      "median_ms": 7.590913,
-      "p95_ms": 16.708811,
-      "serial_service_requests_per_second": 112.36784183132968,
-      "all_http_200": true,
-      "execution_modes": [
-        "None"
-      ],
-      "backend_cpu_ms": 10.0,
-      "clickhouse_cpu_ms": 12130.0
-    }
-  },
-  "latency_speedup": 8.88401724626249,
-  "first_query": {
-    "exact_elapsed_ns": 6165972,
-    "warm_elapsed_ns": 4058572
-  },
-  "build_phase": {
-    "backend": {
-      "cpu_ticks": 26,
-      "pid": 5095,
-      "rss_pages": 9076,
-      "vm_hwm": "VmHWM:\t   40740 kB",
-      "vm_rss": "VmRSS:\t   36304 kB"
-    },
-    "backend_output_bytes": 5795,
-    "clickhouse_after": {
-      "cpu_ticks": 662,
-      "pid": 4472,
-      "rss_pages": 207161,
-      "vm_hwm": "VmHWM:\t  855836 kB",
-      "vm_rss": "VmRSS:\t  828644 kB"
-    },
-    "clickhouse_before": {
-      "cpu_ticks": 613,
-      "pid": 4472,
-      "rss_pages": 196706,
-      "vm_hwm": "VmHWM:\t  793148 kB",
-      "vm_rss": "VmRSS:\t  786824 kB"
-    },
-    "elapsed_ns": 2059081468
-  },
-  "source_load_phase": {
-    "clickhouse_after": {
-      "cpu_ticks": 641,
-      "pid": 4472,
-      "rss_pages": 213959,
-      "vm_hwm": "VmHWM:\t  855836 kB",
-      "vm_rss": "VmRSS:\t  855836 kB"
-    },
-    "clickhouse_before": {
-      "cpu_ticks": 613,
-      "pid": 4472,
-      "rss_pages": 196706,
-      "vm_hwm": "VmHWM:\t  793148 kB",
-      "vm_rss": "VmRSS:\t  786824 kB"
-    },
-    "elapsed_ns": 580256117
-  },
-  "backfill_phase": {
-    "backend_after": {
-      "cpu_ticks": 26,
-      "pid": 5095,
-      "rss_pages": 9076,
-      "vm_hwm": "VmHWM:\t   40740 kB",
-      "vm_rss": "VmRSS:\t   36304 kB"
-    },
-    "backend_before": {
-      "cpu_ticks": 0,
-      "pid": 5095,
-      "rss_pages": 5912,
-      "vm_hwm": "VmHWM:\t   23648 kB",
-      "vm_rss": "VmRSS:\t   23648 kB"
-    },
-    "clickhouse_after": {
-      "cpu_ticks": 662,
-      "pid": 4472,
-      "rss_pages": 207161,
-      "vm_hwm": "VmHWM:\t  855836 kB",
-      "vm_rss": "VmRSS:\t  828644 kB"
-    },
-    "clickhouse_before": {
-      "cpu_ticks": 641,
-      "pid": 4472,
-      "rss_pages": 213959,
-      "vm_hwm": "VmHWM:\t  855836 kB",
-      "vm_rss": "VmRSS:\t  855836 kB"
-    },
-    "elapsed_ns": 1420822274
-  },
-  "query_phase": {
-    "backend_after": {
-      "cpu_ticks": 106,
-      "pid": 5095,
-      "rss_pages": 13156,
-      "vm_hwm": "VmHWM:\t   52624 kB",
-      "vm_rss": "VmRSS:\t   52624 kB"
-    },
-    "backend_before": {
-      "cpu_ticks": 28,
-      "pid": 5095,
-      "rss_pages": 13156,
-      "vm_hwm": "VmHWM:\t   52624 kB",
-      "vm_rss": "VmRSS:\t   52624 kB"
-    },
-    "backend_output_bytes": 5795,
-    "clickhouse_after": {
-      "cpu_ticks": 1907,
-      "pid": 4472,
-      "rss_pages": 217427,
-      "vm_hwm": "VmHWM:\t  977328 kB",
-      "vm_rss": "VmRSS:\t  869708 kB"
-    },
-    "clickhouse_before": {
-      "cpu_ticks": 671,
-      "pid": 4472,
-      "rss_pages": 207898,
-      "vm_hwm": "VmHWM:\t  855836 kB",
-      "vm_rss": "VmRSS:\t  831592 kB"
-    },
-    "clickhouse_storage_bytes": null,
-    "elapsed_ns": 10256904415
-  },
-  "clickhouse_table": {
-    "bytes_on_disk": 507146,
-    "compressed_bytes": 499358,
-    "rows": 86371
-  },
-  "limitations": [
-    "bounded single-series aggregate sensitivity; not full original o11y workload coverage",
-    "CPU uses Linux scheduler ticks",
-    "RSS is whole-process",
-    "ClickHouse server is externally managed",
-    "CPU counters include server background work and have scheduler-tick precision"
-  ]
-}
diff --git a/tools/clickhouse-benefit/artifacts/automatic/fine-1s-matched-trialcontrolled-max-3.backend-runtime.json b/tools/clickhouse-benefit/artifacts/automatic/fine-1s-matched-trialcontrolled-max-3.backend-runtime.json
deleted file mode 100644
index 99aeffea7..000000000
--- a/tools/clickhouse-benefit/artifacts/automatic/fine-1s-matched-trialcontrolled-max-3.backend-runtime.json
+++ /dev/null
@@ -1 +0,0 @@
-{"cpu_affinity":"60,61","nano_cpus":2000000000,"memory_limit_bytes":4294967296,"image":"sha256:fa394da808cc53f76d0344429421d6c422a6ee85fe7450135c0e3cff4df9bcbb"}
diff --git a/tools/clickhouse-benefit/artifacts/automatic/fine-1s-matched-trialcontrolled-max-3.clickhouse-runtime.json b/tools/clickhouse-benefit/artifacts/automatic/fine-1s-matched-trialcontrolled-max-3.clickhouse-runtime.json
deleted file mode 100644
index 99aeffea7..000000000
--- a/tools/clickhouse-benefit/artifacts/automatic/fine-1s-matched-trialcontrolled-max-3.clickhouse-runtime.json
+++ /dev/null
@@ -1 +0,0 @@
-{"cpu_affinity":"60,61","nano_cpus":2000000000,"memory_limit_bytes":4294967296,"image":"sha256:fa394da808cc53f76d0344429421d6c422a6ee85fe7450135c0e3cff4df9bcbb"}
diff --git a/tools/clickhouse-benefit/artifacts/automatic/fine-1s-matched-trialcontrolled-max-3.clickhouse-settings.tsv b/tools/clickhouse-benefit/artifacts/automatic/fine-1s-matched-trialcontrolled-max-3.clickhouse-settings.tsv
deleted file mode 100644
index 7aa34f2d5..000000000
--- a/tools/clickhouse-benefit/artifacts/automatic/fine-1s-matched-trialcontrolled-max-3.clickhouse-settings.tsv
+++ /dev/null
@@ -1,2 +0,0 @@
-max_threads	auto(2)
-use_query_cache	0
diff --git a/tools/clickhouse-benefit/artifacts/automatic/fine-1s-matched-trialcontrolled-max-3.executables.sha256 b/tools/clickhouse-benefit/artifacts/automatic/fine-1s-matched-trialcontrolled-max-3.executables.sha256
deleted file mode 100644
index 193ef8b1f..000000000
--- a/tools/clickhouse-benefit/artifacts/automatic/fine-1s-matched-trialcontrolled-max-3.executables.sha256
+++ /dev/null
@@ -1,2 +0,0 @@
-2a1a1c568994ff787c170e165681693be96d97b46a8d9b178fc836cd79dfcaf8  /dev/shm/asap-clickhouse-release/release/deps/clickhouse_q05_process_e2e-c20ee66394ae01e2
-dac9b1428be3f702e99980a15af8a3e524ebce31099cb4d5c82e5214cedc8a7d  /dev/shm/asap-clickhouse-release/release/data_plane
diff --git a/tools/clickhouse-benefit/artifacts/automatic/fine-1s-matched-trialcontrolled-max-3.source-checkout.txt b/tools/clickhouse-benefit/artifacts/automatic/fine-1s-matched-trialcontrolled-max-3.source-checkout.txt
deleted file mode 100644
index e9afe33b6..000000000
--- a/tools/clickhouse-benefit/artifacts/automatic/fine-1s-matched-trialcontrolled-max-3.source-checkout.txt
+++ /dev/null
@@ -1 +0,0 @@
-a5dd4b3cd757b67055ac5ca365a428f6b8b3bd69
diff --git a/tools/clickhouse-benefit/artifacts/automatic/fine-1s-matched-trialcontrolled-sum-1-summary.json b/tools/clickhouse-benefit/artifacts/automatic/fine-1s-matched-trialcontrolled-sum-1-summary.json
deleted file mode 100644
index ab8211646..000000000
--- a/tools/clickhouse-benefit/artifacts/automatic/fine-1s-matched-trialcontrolled-sum-1-summary.json
+++ /dev/null
@@ -1,164 +0,0 @@
-{
-  "artifact": "/mydata/clickhouse-automatic-benefit-study/fine-1s-matched-trialcontrolled-sum-1.json",
-  "git_head": null,
-  "input": {
-    "end_ms": 1788891296001,
-    "metric": "service_cache_refresh_lag_seconds",
-    "path": "/mydata/clickhouse-o11y-main-results/fine-1s-24h-series.jsonl",
-    "samples": 86371,
-    "series": [
-      "service_cache_refresh_lag_seconds{job=\"user-service\",instance=\"user-service:8082\"}"
-    ],
-    "start_ms": 1788848096001
-  },
-  "planning_scope": "Real Planner selects the DAG and automatic control-plane binding constructs the catalog; fixed-window layout is not cost-optimized",
-  "routes": {
-    "warm": {
-      "requests": 1000,
-      "median_ms": 0.8606505,
-      "p95_ms": 1.098009,
-      "serial_service_requests_per_second": 1124.3672725772078,
-      "all_http_200": true,
-      "execution_modes": [
-        "warm"
-      ],
-      "backend_cpu_ms": 810.0,
-      "clickhouse_cpu_ms": 100.0
-    },
-    "exact": {
-      "requests": 1000,
-      "median_ms": 6.8911245,
-      "p95_ms": 15.357338,
-      "serial_service_requests_per_second": 127.26332816558143,
-      "all_http_200": true,
-      "execution_modes": [
-        "None"
-      ],
-      "backend_cpu_ms": 0.0,
-      "clickhouse_cpu_ms": 9600.0
-    }
-  },
-  "latency_speedup": 8.006879099007088,
-  "first_query": {
-    "exact_elapsed_ns": 11073046,
-    "warm_elapsed_ns": 7462164
-  },
-  "build_phase": {
-    "backend": {
-      "cpu_ticks": 31,
-      "pid": 606,
-      "rss_pages": 9240,
-      "vm_hwm": "VmHWM:\t   41760 kB",
-      "vm_rss": "VmRSS:\t   36960 kB"
-    },
-    "backend_output_bytes": 5795,
-    "clickhouse_after": {
-      "cpu_ticks": 564,
-      "pid": 4193881,
-      "rss_pages": 205101,
-      "vm_hwm": "VmHWM:\t  844444 kB",
-      "vm_rss": "VmRSS:\t  820404 kB"
-    },
-    "clickhouse_before": {
-      "cpu_ticks": 514,
-      "pid": 4193881,
-      "rss_pages": 191081,
-      "vm_hwm": "VmHWM:\t  780064 kB",
-      "vm_rss": "VmRSS:\t  764324 kB"
-    },
-    "elapsed_ns": 2052333532
-  },
-  "source_load_phase": {
-    "clickhouse_after": {
-      "cpu_ticks": 546,
-      "pid": 4193881,
-      "rss_pages": 211111,
-      "vm_hwm": "VmHWM:\t  844444 kB",
-      "vm_rss": "VmRSS:\t  844444 kB"
-    },
-    "clickhouse_before": {
-      "cpu_ticks": 514,
-      "pid": 4193881,
-      "rss_pages": 191081,
-      "vm_hwm": "VmHWM:\t  780064 kB",
-      "vm_rss": "VmRSS:\t  764324 kB"
-    },
-    "elapsed_ns": 572166269
-  },
-  "backfill_phase": {
-    "backend_after": {
-      "cpu_ticks": 31,
-      "pid": 606,
-      "rss_pages": 9240,
-      "vm_hwm": "VmHWM:\t   41760 kB",
-      "vm_rss": "VmRSS:\t   36960 kB"
-    },
-    "backend_before": {
-      "cpu_ticks": 1,
-      "pid": 606,
-      "rss_pages": 5917,
-      "vm_hwm": "VmHWM:\t   23668 kB",
-      "vm_rss": "VmRSS:\t   23668 kB"
-    },
-    "clickhouse_after": {
-      "cpu_ticks": 564,
-      "pid": 4193881,
-      "rss_pages": 205101,
-      "vm_hwm": "VmHWM:\t  844444 kB",
-      "vm_rss": "VmRSS:\t  820404 kB"
-    },
-    "clickhouse_before": {
-      "cpu_ticks": 546,
-      "pid": 4193881,
-      "rss_pages": 211111,
-      "vm_hwm": "VmHWM:\t  844444 kB",
-      "vm_rss": "VmRSS:\t  844444 kB"
-    },
-    "elapsed_ns": 1421970926
-  },
-  "query_phase": {
-    "backend_after": {
-      "cpu_ticks": 113,
-      "pid": 606,
-      "rss_pages": 12938,
-      "vm_hwm": "VmHWM:\t   51752 kB",
-      "vm_rss": "VmRSS:\t   51752 kB"
-    },
-    "backend_before": {
-      "cpu_ticks": 32,
-      "pid": 606,
-      "rss_pages": 12938,
-      "vm_hwm": "VmHWM:\t   51752 kB",
-      "vm_rss": "VmRSS:\t   51752 kB"
-    },
-    "backend_output_bytes": 5795,
-    "clickhouse_after": {
-      "cpu_ticks": 1554,
-      "pid": 4193881,
-      "rss_pages": 204146,
-      "vm_hwm": "VmHWM:\t  956748 kB",
-      "vm_rss": "VmRSS:\t  816584 kB"
-    },
-    "clickhouse_before": {
-      "cpu_ticks": 580,
-      "pid": 4193881,
-      "rss_pages": 206861,
-      "vm_hwm": "VmHWM:\t  844444 kB",
-      "vm_rss": "VmRSS:\t  827444 kB"
-    },
-    "clickhouse_storage_bytes": null,
-    "elapsed_ns": 9270179610
-  },
-  "clickhouse_table": {
-    "bytes_on_disk": 507146,
-    "compressed_bytes": 499358,
-    "rows": 86371
-  },
-  "limitations": [
-    "bounded single-series aggregate sensitivity; not full original o11y workload coverage",
-    "CPU uses Linux scheduler ticks",
-    "RSS is whole-process",
-    "ClickHouse server is externally managed",
-    "CPU counters include server background work and have scheduler-tick precision"
-  ]
-}
diff --git a/tools/clickhouse-benefit/artifacts/automatic/fine-1s-matched-trialcontrolled-sum-1.backend-runtime.json b/tools/clickhouse-benefit/artifacts/automatic/fine-1s-matched-trialcontrolled-sum-1.backend-runtime.json
deleted file mode 100644
index 99aeffea7..000000000
--- a/tools/clickhouse-benefit/artifacts/automatic/fine-1s-matched-trialcontrolled-sum-1.backend-runtime.json
+++ /dev/null
@@ -1 +0,0 @@
-{"cpu_affinity":"60,61","nano_cpus":2000000000,"memory_limit_bytes":4294967296,"image":"sha256:fa394da808cc53f76d0344429421d6c422a6ee85fe7450135c0e3cff4df9bcbb"}
diff --git a/tools/clickhouse-benefit/artifacts/automatic/fine-1s-matched-trialcontrolled-sum-1.clickhouse-runtime.json b/tools/clickhouse-benefit/artifacts/automatic/fine-1s-matched-trialcontrolled-sum-1.clickhouse-runtime.json
deleted file mode 100644
index 99aeffea7..000000000
--- a/tools/clickhouse-benefit/artifacts/automatic/fine-1s-matched-trialcontrolled-sum-1.clickhouse-runtime.json
+++ /dev/null
@@ -1 +0,0 @@
-{"cpu_affinity":"60,61","nano_cpus":2000000000,"memory_limit_bytes":4294967296,"image":"sha256:fa394da808cc53f76d0344429421d6c422a6ee85fe7450135c0e3cff4df9bcbb"}
diff --git a/tools/clickhouse-benefit/artifacts/automatic/fine-1s-matched-trialcontrolled-sum-1.clickhouse-settings.tsv b/tools/clickhouse-benefit/artifacts/automatic/fine-1s-matched-trialcontrolled-sum-1.clickhouse-settings.tsv
deleted file mode 100644
index 7aa34f2d5..000000000
--- a/tools/clickhouse-benefit/artifacts/automatic/fine-1s-matched-trialcontrolled-sum-1.clickhouse-settings.tsv
+++ /dev/null
@@ -1,2 +0,0 @@
-max_threads	auto(2)
-use_query_cache	0
diff --git a/tools/clickhouse-benefit/artifacts/automatic/fine-1s-matched-trialcontrolled-sum-1.executables.sha256 b/tools/clickhouse-benefit/artifacts/automatic/fine-1s-matched-trialcontrolled-sum-1.executables.sha256
deleted file mode 100644
index 193ef8b1f..000000000
--- a/tools/clickhouse-benefit/artifacts/automatic/fine-1s-matched-trialcontrolled-sum-1.executables.sha256
+++ /dev/null
@@ -1,2 +0,0 @@
-2a1a1c568994ff787c170e165681693be96d97b46a8d9b178fc836cd79dfcaf8  /dev/shm/asap-clickhouse-release/release/deps/clickhouse_q05_process_e2e-c20ee66394ae01e2
-dac9b1428be3f702e99980a15af8a3e524ebce31099cb4d5c82e5214cedc8a7d  /dev/shm/asap-clickhouse-release/release/data_plane
diff --git a/tools/clickhouse-benefit/artifacts/automatic/fine-1s-matched-trialcontrolled-sum-1.source-checkout.txt b/tools/clickhouse-benefit/artifacts/automatic/fine-1s-matched-trialcontrolled-sum-1.source-checkout.txt
deleted file mode 100644
index e9afe33b6..000000000
--- a/tools/clickhouse-benefit/artifacts/automatic/fine-1s-matched-trialcontrolled-sum-1.source-checkout.txt
+++ /dev/null
@@ -1 +0,0 @@
-a5dd4b3cd757b67055ac5ca365a428f6b8b3bd69
diff --git a/tools/clickhouse-benefit/artifacts/automatic/fine-1s-matched-trialcontrolled-sum-2-summary.json b/tools/clickhouse-benefit/artifacts/automatic/fine-1s-matched-trialcontrolled-sum-2-summary.json
deleted file mode 100644
index bd5bca7f8..000000000
--- a/tools/clickhouse-benefit/artifacts/automatic/fine-1s-matched-trialcontrolled-sum-2-summary.json
+++ /dev/null
@@ -1,164 +0,0 @@
-{
-  "artifact": "/mydata/clickhouse-automatic-benefit-study/fine-1s-matched-trialcontrolled-sum-2.json",
-  "git_head": null,
-  "input": {
-    "end_ms": 1788891296001,
-    "metric": "service_cache_refresh_lag_seconds",
-    "path": "/mydata/clickhouse-o11y-main-results/fine-1s-24h-series.jsonl",
-    "samples": 86371,
-    "series": [
-      "service_cache_refresh_lag_seconds{job=\"user-service\",instance=\"user-service:8082\"}"
-    ],
-    "start_ms": 1788848096001
-  },
-  "planning_scope": "Real Planner selects the DAG and automatic control-plane binding constructs the catalog; fixed-window layout is not cost-optimized",
-  "routes": {
-    "warm": {
-      "requests": 1000,
-      "median_ms": 0.8539585000000001,
-      "p95_ms": 0.925258,
-      "serial_service_requests_per_second": 1178.2060510954382,
-      "all_http_200": true,
-      "execution_modes": [
-        "warm"
-      ],
-      "backend_cpu_ms": 770.0,
-      "clickhouse_cpu_ms": 140.0
-    },
-    "exact": {
-      "requests": 1000,
-      "median_ms": 6.670814,
-      "p95_ms": 14.947635,
-      "serial_service_requests_per_second": 131.33290859123719,
-      "all_http_200": true,
-      "execution_modes": [
-        "None"
-      ],
-      "backend_cpu_ms": 0.0,
-      "clickhouse_cpu_ms": 8360.0
-    }
-  },
-  "latency_speedup": 7.811637216562631,
-  "first_query": {
-    "exact_elapsed_ns": 6100366,
-    "warm_elapsed_ns": 7512927
-  },
-  "build_phase": {
-    "backend": {
-      "cpu_ticks": 23,
-      "pid": 1574,
-      "rss_pages": 9441,
-      "vm_hwm": "VmHWM:\t   42532 kB",
-      "vm_rss": "VmRSS:\t   37764 kB"
-    },
-    "backend_output_bytes": 5795,
-    "clickhouse_after": {
-      "cpu_ticks": 570,
-      "pid": 913,
-      "rss_pages": 208818,
-      "vm_hwm": "VmHWM:\t  844804 kB",
-      "vm_rss": "VmRSS:\t  835272 kB"
-    },
-    "clickhouse_before": {
-      "cpu_ticks": 526,
-      "pid": 913,
-      "rss_pages": 192807,
-      "vm_hwm": "VmHWM:\t  785372 kB",
-      "vm_rss": "VmRSS:\t  771228 kB"
-    },
-    "elapsed_ns": 1958081076
-  },
-  "source_load_phase": {
-    "clickhouse_after": {
-      "cpu_ticks": 553,
-      "pid": 913,
-      "rss_pages": 211201,
-      "vm_hwm": "VmHWM:\t  844804 kB",
-      "vm_rss": "VmRSS:\t  844804 kB"
-    },
-    "clickhouse_before": {
-      "cpu_ticks": 526,
-      "pid": 913,
-      "rss_pages": 192807,
-      "vm_hwm": "VmHWM:\t  785372 kB",
-      "vm_rss": "VmRSS:\t  771228 kB"
-    },
-    "elapsed_ns": 581441143
-  },
-  "backfill_phase": {
-    "backend_after": {
-      "cpu_ticks": 23,
-      "pid": 1574,
-      "rss_pages": 9441,
-      "vm_hwm": "VmHWM:\t   42532 kB",
-      "vm_rss": "VmRSS:\t   37764 kB"
-    },
-    "backend_before": {
-      "cpu_ticks": 1,
-      "pid": 1574,
-      "rss_pages": 6393,
-      "vm_hwm": "VmHWM:\t   25572 kB",
-      "vm_rss": "VmRSS:\t   25572 kB"
-    },
-    "clickhouse_after": {
-      "cpu_ticks": 570,
-      "pid": 913,
-      "rss_pages": 208818,
-      "vm_hwm": "VmHWM:\t  844804 kB",
-      "vm_rss": "VmRSS:\t  835272 kB"
-    },
-    "clickhouse_before": {
-      "cpu_ticks": 554,
-      "pid": 913,
-      "rss_pages": 211201,
-      "vm_hwm": "VmHWM:\t  844804 kB",
-      "vm_rss": "VmRSS:\t  844804 kB"
-    },
-    "elapsed_ns": 1318013326
-  },
-  "query_phase": {
-    "backend_after": {
-      "cpu_ticks": 103,
-      "pid": 1574,
-      "rss_pages": 14061,
-      "vm_hwm": "VmHWM:\t   56244 kB",
-      "vm_rss": "VmRSS:\t   56244 kB"
-    },
-    "backend_before": {
-      "cpu_ticks": 26,
-      "pid": 1574,
-      "rss_pages": 14061,
-      "vm_hwm": "VmHWM:\t   56244 kB",
-      "vm_rss": "VmRSS:\t   56244 kB"
-    },
-    "backend_output_bytes": 5795,
-    "clickhouse_after": {
-      "cpu_ticks": 1437,
-      "pid": 913,
-      "rss_pages": 199569,
-      "vm_hwm": "VmHWM:\t  844804 kB",
-      "vm_rss": "VmRSS:\t  798276 kB"
-    },
-    "clickhouse_before": {
-      "cpu_ticks": 582,
-      "pid": 913,
-      "rss_pages": 208731,
-      "vm_hwm": "VmHWM:\t  844804 kB",
-      "vm_rss": "VmRSS:\t  834924 kB"
-    },
-    "clickhouse_storage_bytes": null,
-    "elapsed_ns": 8977135160
-  },
-  "clickhouse_table": {
-    "bytes_on_disk": 507146,
-    "compressed_bytes": 499358,
-    "rows": 86371
-  },
-  "limitations": [
-    "bounded single-series aggregate sensitivity; not full original o11y workload coverage",
-    "CPU uses Linux scheduler ticks",
-    "RSS is whole-process",
-    "ClickHouse server is externally managed",
-    "CPU counters include server background work and have scheduler-tick precision"
-  ]
-}
diff --git a/tools/clickhouse-benefit/artifacts/automatic/fine-1s-matched-trialcontrolled-sum-2.backend-runtime.json b/tools/clickhouse-benefit/artifacts/automatic/fine-1s-matched-trialcontrolled-sum-2.backend-runtime.json
deleted file mode 100644
index 99aeffea7..000000000
--- a/tools/clickhouse-benefit/artifacts/automatic/fine-1s-matched-trialcontrolled-sum-2.backend-runtime.json
+++ /dev/null
@@ -1 +0,0 @@
-{"cpu_affinity":"60,61","nano_cpus":2000000000,"memory_limit_bytes":4294967296,"image":"sha256:fa394da808cc53f76d0344429421d6c422a6ee85fe7450135c0e3cff4df9bcbb"}
diff --git a/tools/clickhouse-benefit/artifacts/automatic/fine-1s-matched-trialcontrolled-sum-2.clickhouse-runtime.json b/tools/clickhouse-benefit/artifacts/automatic/fine-1s-matched-trialcontrolled-sum-2.clickhouse-runtime.json
deleted file mode 100644
index 99aeffea7..000000000
--- a/tools/clickhouse-benefit/artifacts/automatic/fine-1s-matched-trialcontrolled-sum-2.clickhouse-runtime.json
+++ /dev/null
@@ -1 +0,0 @@
-{"cpu_affinity":"60,61","nano_cpus":2000000000,"memory_limit_bytes":4294967296,"image":"sha256:fa394da808cc53f76d0344429421d6c422a6ee85fe7450135c0e3cff4df9bcbb"}
diff --git a/tools/clickhouse-benefit/artifacts/automatic/fine-1s-matched-trialcontrolled-sum-2.clickhouse-settings.tsv b/tools/clickhouse-benefit/artifacts/automatic/fine-1s-matched-trialcontrolled-sum-2.clickhouse-settings.tsv
deleted file mode 100644
index 7aa34f2d5..000000000
--- a/tools/clickhouse-benefit/artifacts/automatic/fine-1s-matched-trialcontrolled-sum-2.clickhouse-settings.tsv
+++ /dev/null
@@ -1,2 +0,0 @@
-max_threads	auto(2)
-use_query_cache	0
diff --git a/tools/clickhouse-benefit/artifacts/automatic/fine-1s-matched-trialcontrolled-sum-2.executables.sha256 b/tools/clickhouse-benefit/artifacts/automatic/fine-1s-matched-trialcontrolled-sum-2.executables.sha256
deleted file mode 100644
index 193ef8b1f..000000000
--- a/tools/clickhouse-benefit/artifacts/automatic/fine-1s-matched-trialcontrolled-sum-2.executables.sha256
+++ /dev/null
@@ -1,2 +0,0 @@
-2a1a1c568994ff787c170e165681693be96d97b46a8d9b178fc836cd79dfcaf8  /dev/shm/asap-clickhouse-release/release/deps/clickhouse_q05_process_e2e-c20ee66394ae01e2
-dac9b1428be3f702e99980a15af8a3e524ebce31099cb4d5c82e5214cedc8a7d  /dev/shm/asap-clickhouse-release/release/data_plane
diff --git a/tools/clickhouse-benefit/artifacts/automatic/fine-1s-matched-trialcontrolled-sum-2.source-checkout.txt b/tools/clickhouse-benefit/artifacts/automatic/fine-1s-matched-trialcontrolled-sum-2.source-checkout.txt
deleted file mode 100644
index e9afe33b6..000000000
--- a/tools/clickhouse-benefit/artifacts/automatic/fine-1s-matched-trialcontrolled-sum-2.source-checkout.txt
+++ /dev/null
@@ -1 +0,0 @@
-a5dd4b3cd757b67055ac5ca365a428f6b8b3bd69
diff --git a/tools/clickhouse-benefit/artifacts/automatic/fine-1s-matched-trialcontrolled-sum-3-summary.json b/tools/clickhouse-benefit/artifacts/automatic/fine-1s-matched-trialcontrolled-sum-3-summary.json
deleted file mode 100644
index 67be3077b..000000000
--- a/tools/clickhouse-benefit/artifacts/automatic/fine-1s-matched-trialcontrolled-sum-3-summary.json
+++ /dev/null
@@ -1,164 +0,0 @@
-{
-  "artifact": "/mydata/clickhouse-automatic-benefit-study/fine-1s-matched-trialcontrolled-sum-3.json",
-  "git_head": null,
-  "input": {
-    "end_ms": 1788891296001,
-    "metric": "service_cache_refresh_lag_seconds",
-    "path": "/mydata/clickhouse-o11y-main-results/fine-1s-24h-series.jsonl",
-    "samples": 86371,
-    "series": [
-      "service_cache_refresh_lag_seconds{job=\"user-service\",instance=\"user-service:8082\"}"
-    ],
-    "start_ms": 1788848096001
-  },
-  "planning_scope": "Real Planner selects the DAG and automatic control-plane binding constructs the catalog; fixed-window layout is not cost-optimized",
-  "routes": {
-    "warm": {
-      "requests": 1000,
-      "median_ms": 0.8532839999999999,
-      "p95_ms": 0.936681,
-      "serial_service_requests_per_second": 1188.9259315539932,
-      "all_http_200": true,
-      "execution_modes": [
-        "warm"
-      ],
-      "backend_cpu_ms": 750.0,
-      "clickhouse_cpu_ms": 120.0
-    },
-    "exact": {
-      "requests": 1000,
-      "median_ms": 4.702767,
-      "p95_ms": 15.371925,
-      "serial_service_requests_per_second": 136.28889310623663,
-      "all_http_200": true,
-      "execution_modes": [
-        "None"
-      ],
-      "backend_cpu_ms": 10.0,
-      "clickhouse_cpu_ms": 9460.0
-    }
-  },
-  "latency_speedup": 5.511373704417287,
-  "first_query": {
-    "exact_elapsed_ns": 9203775,
-    "warm_elapsed_ns": 7340392
-  },
-  "build_phase": {
-    "backend": {
-      "cpu_ticks": 26,
-      "pid": 2444,
-      "rss_pages": 9454,
-      "vm_hwm": "VmHWM:\t   42360 kB",
-      "vm_rss": "VmRSS:\t   37816 kB"
-    },
-    "backend_output_bytes": 5795,
-    "clickhouse_after": {
-      "cpu_ticks": 680,
-      "pid": 1834,
-      "rss_pages": 208311,
-      "vm_hwm": "VmHWM:\t  888156 kB",
-      "vm_rss": "VmRSS:\t  833244 kB"
-    },
-    "clickhouse_before": {
-      "cpu_ticks": 641,
-      "pid": 1834,
-      "rss_pages": 214459,
-      "vm_hwm": "VmHWM:\t  887996 kB",
-      "vm_rss": "VmRSS:\t  857836 kB"
-    },
-    "elapsed_ns": 1851402434
-  },
-  "source_load_phase": {
-    "clickhouse_after": {
-      "cpu_ticks": 661,
-      "pid": 1834,
-      "rss_pages": 222039,
-      "vm_hwm": "VmHWM:\t  888156 kB",
-      "vm_rss": "VmRSS:\t  888156 kB"
-    },
-    "clickhouse_before": {
-      "cpu_ticks": 641,
-      "pid": 1834,
-      "rss_pages": 214459,
-      "vm_hwm": "VmHWM:\t  887996 kB",
-      "vm_rss": "VmRSS:\t  857836 kB"
-    },
-    "elapsed_ns": 475146555
-  },
-  "backfill_phase": {
-    "backend_after": {
-      "cpu_ticks": 26,
-      "pid": 2444,
-      "rss_pages": 9454,
-      "vm_hwm": "VmHWM:\t   42360 kB",
-      "vm_rss": "VmRSS:\t   37816 kB"
-    },
-    "backend_before": {
-      "cpu_ticks": 1,
-      "pid": 2444,
-      "rss_pages": 7158,
-      "vm_hwm": "VmHWM:\t   28632 kB",
-      "vm_rss": "VmRSS:\t   28632 kB"
-    },
-    "clickhouse_after": {
-      "cpu_ticks": 680,
-      "pid": 1834,
-      "rss_pages": 208311,
-      "vm_hwm": "VmHWM:\t  888156 kB",
-      "vm_rss": "VmRSS:\t  833244 kB"
-    },
-    "clickhouse_before": {
-      "cpu_ticks": 662,
-      "pid": 1834,
-      "rss_pages": 216715,
-      "vm_hwm": "VmHWM:\t  888156 kB",
-      "vm_rss": "VmRSS:\t  866860 kB"
-    },
-    "elapsed_ns": 1318331602
-  },
-  "query_phase": {
-    "backend_after": {
-      "cpu_ticks": 104,
-      "pid": 2444,
-      "rss_pages": 13549,
-      "vm_hwm": "VmHWM:\t   54196 kB",
-      "vm_rss": "VmRSS:\t   54196 kB"
-    },
-    "backend_before": {
-      "cpu_ticks": 28,
-      "pid": 2444,
-      "rss_pages": 13549,
-      "vm_hwm": "VmHWM:\t   54196 kB",
-      "vm_rss": "VmRSS:\t   54196 kB"
-    },
-    "backend_output_bytes": 5795,
-    "clickhouse_after": {
-      "cpu_ticks": 1660,
-      "pid": 1834,
-      "rss_pages": 208511,
-      "vm_hwm": "VmHWM:\t  912208 kB",
-      "vm_rss": "VmRSS:\t  834044 kB"
-    },
-    "clickhouse_before": {
-      "cpu_ticks": 689,
-      "pid": 1834,
-      "rss_pages": 209894,
-      "vm_hwm": "VmHWM:\t  888156 kB",
-      "vm_rss": "VmRSS:\t  839576 kB"
-    },
-    "clickhouse_storage_bytes": null,
-    "elapsed_ns": 8685801242
-  },
-  "clickhouse_table": {
-    "bytes_on_disk": 507146,
-    "compressed_bytes": 499358,
-    "rows": 86371
-  },
-  "limitations": [
-    "bounded single-series aggregate sensitivity; not full original o11y workload coverage",
-    "CPU uses Linux scheduler ticks",
-    "RSS is whole-process",
-    "ClickHouse server is externally managed",
-    "CPU counters include server background work and have scheduler-tick precision"
-  ]
-}
diff --git a/tools/clickhouse-benefit/artifacts/automatic/fine-1s-matched-trialcontrolled-sum-3.backend-runtime.json b/tools/clickhouse-benefit/artifacts/automatic/fine-1s-matched-trialcontrolled-sum-3.backend-runtime.json
deleted file mode 100644
index 99aeffea7..000000000
--- a/tools/clickhouse-benefit/artifacts/automatic/fine-1s-matched-trialcontrolled-sum-3.backend-runtime.json
+++ /dev/null
@@ -1 +0,0 @@
-{"cpu_affinity":"60,61","nano_cpus":2000000000,"memory_limit_bytes":4294967296,"image":"sha256:fa394da808cc53f76d0344429421d6c422a6ee85fe7450135c0e3cff4df9bcbb"}
diff --git a/tools/clickhouse-benefit/artifacts/automatic/fine-1s-matched-trialcontrolled-sum-3.clickhouse-runtime.json b/tools/clickhouse-benefit/artifacts/automatic/fine-1s-matched-trialcontrolled-sum-3.clickhouse-runtime.json
deleted file mode 100644
index 99aeffea7..000000000
--- a/tools/clickhouse-benefit/artifacts/automatic/fine-1s-matched-trialcontrolled-sum-3.clickhouse-runtime.json
+++ /dev/null
@@ -1 +0,0 @@
-{"cpu_affinity":"60,61","nano_cpus":2000000000,"memory_limit_bytes":4294967296,"image":"sha256:fa394da808cc53f76d0344429421d6c422a6ee85fe7450135c0e3cff4df9bcbb"}
diff --git a/tools/clickhouse-benefit/artifacts/automatic/fine-1s-matched-trialcontrolled-sum-3.clickhouse-settings.tsv b/tools/clickhouse-benefit/artifacts/automatic/fine-1s-matched-trialcontrolled-sum-3.clickhouse-settings.tsv
deleted file mode 100644
index 7aa34f2d5..000000000
--- a/tools/clickhouse-benefit/artifacts/automatic/fine-1s-matched-trialcontrolled-sum-3.clickhouse-settings.tsv
+++ /dev/null
@@ -1,2 +0,0 @@
-max_threads	auto(2)
-use_query_cache	0
diff --git a/tools/clickhouse-benefit/artifacts/automatic/fine-1s-matched-trialcontrolled-sum-3.executables.sha256 b/tools/clickhouse-benefit/artifacts/automatic/fine-1s-matched-trialcontrolled-sum-3.executables.sha256
deleted file mode 100644
index 193ef8b1f..000000000
--- a/tools/clickhouse-benefit/artifacts/automatic/fine-1s-matched-trialcontrolled-sum-3.executables.sha256
+++ /dev/null
@@ -1,2 +0,0 @@
-2a1a1c568994ff787c170e165681693be96d97b46a8d9b178fc836cd79dfcaf8  /dev/shm/asap-clickhouse-release/release/deps/clickhouse_q05_process_e2e-c20ee66394ae01e2
-dac9b1428be3f702e99980a15af8a3e524ebce31099cb4d5c82e5214cedc8a7d  /dev/shm/asap-clickhouse-release/release/data_plane
diff --git a/tools/clickhouse-benefit/artifacts/automatic/fine-1s-matched-trialcontrolled-sum-3.source-checkout.txt b/tools/clickhouse-benefit/artifacts/automatic/fine-1s-matched-trialcontrolled-sum-3.source-checkout.txt
deleted file mode 100644
index e9afe33b6..000000000
--- a/tools/clickhouse-benefit/artifacts/automatic/fine-1s-matched-trialcontrolled-sum-3.source-checkout.txt
+++ /dev/null
@@ -1 +0,0 @@
-a5dd4b3cd757b67055ac5ca365a428f6b8b3bd69
diff --git a/tools/clickhouse-benefit/artifacts/automatic/max-planning.json b/tools/clickhouse-benefit/artifacts/automatic/max-planning.json
deleted file mode 100644
index 9e052f122..000000000
--- a/tools/clickhouse-benefit/artifacts/automatic/max-planning.json
+++ /dev/null
@@ -1,733 +0,0 @@
-{
-  "publication": {
-    "collector_plans": [],
-    "precompute_plan": {
-      "envelope": {
-        "activation_unix_ms": 0,
-        "backend_compat": "asap-query-backend.v1",
-        "capability_snapshot_id": "test",
-        "expiry_unix_ms": null,
-        "generated_at_unix_ms": 0,
-        "plan_id": 73,
-        "plan_version": 1,
-        "planner_revision": "0deceda3e776216c5542d638d958b159f22e27ce"
-      },
-      "executable_dags": {
-        "SELECT max(value) AS value FROM q05_samples WHERE ts_ms>=1788848096001 AND ts_ms<1788891296001": {
-          "binding": {
-            "nodes": {
-              "0": {
-                "placement": "maintenance_input"
-              },
-              "1": {
-                "placement": "materialization",
-                "summary_definition": 11497701252531036795
-              },
-              "2": {
-                "placement": "query",
-                "query_node": 0
-              }
-            },
-            "precompute_sinks": [
-              1
-            ],
-            "query_plan_sink": 0,
-            "query_sink": 2
-          },
-          "document": {
-            "edges": [
-              {
-                "consumer": 1,
-                "data_state": {
-                  "primitive": "Raw",
-                  "timing": "MaintenanceTime"
-                },
-                "grouping": "NotApplicable",
-                "intermediate_schema": {
-                  "fields": [
-                    {
-                      "dtype": {
-                        "Plain": "utf8"
-                      },
-                      "name": "metric",
-                      "nullable": false
-                    },
-                    {
-                      "dtype": {
-                        "Plain": "utf8"
-                      },
-                      "name": "labels",
-                      "nullable": false
-                    },
-                    {
-                      "dtype": {
-                        "Plain": "timestamp"
-                      },
-                      "name": "ts_ms",
-                      "nullable": false
-                    },
-                    {
-                      "dtype": {
-                        "Plain": "float64"
-                      },
-                      "name": "value",
-                      "nullable": false
-                    }
-                  ],
-                  "time_index": 2
-                },
-                "producer": 0,
-                "role": "Input",
-                "window": "RequiresAlignedPanePhaseOrExactBoundaryResidual"
-              },
-              {
-                "consumer": 2,
-                "data_state": {
-                  "primitive": "SummaryState",
-                  "timing": "MaintenanceTime"
-                },
-                "grouping": "NotApplicable",
-                "intermediate_schema": {
-                  "fields": [
-                    {
-                      "dtype": {
-                        "ExactAggregate": [
-                          "MinMax",
-                          "MinMax"
-                        ]
-                      },
-                      "name": "max(q05_samples.value)",
-                      "nullable": false
-                    }
-                  ],
-                  "time_index": null
-                },
-                "producer": 1,
-                "role": "Input",
-                "window": "NotApplicable"
-              }
-            ],
-            "nodes": [
-              {
-                "guarantee": {
-                  "bound": {
-                    "op": "zero"
-                  },
-                  "failure_probability": {
-                    "op": "zero"
-                  },
-                  "metric": "absolute_value",
-                  "provenance": [
-                    {
-                      "kind": "exact",
-                      "reason": "KeepPreAsap"
-                    }
-                  ]
-                },
-                "id": 0,
-                "operator": "Fallback",
-                "output_schema": {
-                  "fields": [
-                    {
-                      "dtype": {
-                        "Plain": "utf8"
-                      },
-                      "name": "metric",
-                      "nullable": false
-                    },
-                    {
-                      "dtype": {
-                        "Plain": "utf8"
-                      },
-                      "name": "labels",
-                      "nullable": false
-                    },
-                    {
-                      "dtype": {
-                        "Plain": "timestamp"
-                      },
-                      "name": "ts_ms",
-                      "nullable": false
-                    },
-                    {
-                      "dtype": {
-                        "Plain": "float64"
-                      },
-                      "name": "value",
-                      "nullable": false
-                    }
-                  ],
-                  "time_index": 2
-                },
-                "output_state": {
-                  "primitive": "Raw",
-                  "timing": "MaintenanceTime"
-                },
-                "payload": {
-                  "expression": {
-                    "Scan": {
-                      "predicates": [
-                        {
-                          "BoolAnd": [
-                            {
-                              "Compare": {
-                                "left": {
-                                  "Column": 2
-                                },
-                                "op": "Ge",
-                                "right": {
-                                  "Literal": {
-                                    "Int64": 1788848096001
-                                  }
-                                }
-                              }
-                            },
-                            {
-                              "Compare": {
-                                "left": {
-                                  "Column": 2
-                                },
-                                "op": "Lt",
-                                "right": {
-                                  "Literal": {
-                                    "Int64": 1788891296001
-                                  }
-                                }
-                              }
-                            }
-                          ]
-                        }
-                      ],
-                      "schema": {
-                        "closed": true,
-                        "columns": [
-                          {
-                            "dtype": "utf8",
-                            "name": "metric",
-                            "nullable": false,
-                            "table": "q05_samples"
-                          },
-                          {
-                            "dtype": "utf8",
-                            "name": "labels",
-                            "nullable": false,
-                            "table": "q05_samples"
-                          },
-                          {
-                            "dtype": "timestamp",
-                            "name": "ts_ms",
-                            "nullable": false,
-                            "table": "q05_samples"
-                          },
-                          {
-                            "dtype": "float64",
-                            "name": "value",
-                            "nullable": false,
-                            "table": "q05_samples"
-                          }
-                        ],
-                        "time_index": 2,
-                        "unique_keys": []
-                      },
-                      "source": {
-                        "Table": {
-                          "table_ref": "q05_samples"
-                        }
-                      }
-                    }
-                  },
-                  "kind": "fallback"
-                }
-              },
-              {
-                "guarantee": {
-                  "bound": {
-                    "op": "zero"
-                  },
-                  "failure_probability": {
-                    "op": "zero"
-                  },
-                  "metric": "absolute_value",
-                  "provenance": [
-                    {
-                      "kind": "exact",
-                      "reason": "ExactAggregate(MinMax)"
-                    },
-                    {
-                      "guarantee": {
-                        "bound": {
-                          "op": "zero"
-                        },
-                        "failure_probability": {
-                          "op": "zero"
-                        },
-                        "metric": "absolute_value",
-                        "provenance": [
-                          {
-                            "kind": "exact",
-                            "reason": "KeepPreAsap"
-                          }
-                        ]
-                      },
-                      "input_index": 0,
-                      "kind": "child_guarantee"
-                    },
-                    {
-                      "kind": "composition_step",
-                      "operator": {
-                        "op": "exact_extremum"
-                      },
-                      "rule": "exact_input"
-                    }
-                  ]
-                },
-                "id": 1,
-                "operator": "SummaryAgg",
-                "output_schema": {
-                  "fields": [
-                    {
-                      "dtype": {
-                        "ExactAggregate": [
-                          "MinMax",
-                          "MinMax"
-                        ]
-                      },
-                      "name": "max(q05_samples.value)",
-                      "nullable": false
-                    }
-                  ],
-                  "time_index": null
-                },
-                "output_state": {
-                  "primitive": "SummaryState",
-                  "timing": "MaintenanceTime"
-                },
-                "payload": {
-                  "family": {
-                    "ExactAggregate": [
-                      "MinMax",
-                      "MinMax"
-                    ]
-                  },
-                  "grouping": "PerSubpopulationInstance",
-                  "input": {
-                    "item": null,
-                    "weight": {
-                      "Column": {
-                        "Qualified": {
-                          "name": "value",
-                          "table": "q05_samples"
-                        }
-                      }
-                    },
-                    "weight_domain": {
-                      "kind": "unknown_or_signed"
-                    }
-                  },
-                  "kind": "summary_agg",
-                  "reduction": {
-                    "Reduce": []
-                  }
-                }
-              },
-              {
-                "guarantee": {
-                  "bound": {
-                    "op": "zero"
-                  },
-                  "failure_probability": {
-                    "op": "zero"
-                  },
-                  "metric": "absolute_value",
-                  "provenance": [
-                    {
-                      "kind": "exact",
-                      "reason": "ExactAggregate(MinMax)"
-                    },
-                    {
-                      "guarantee": {
-                        "bound": {
-                          "op": "zero"
-                        },
-                        "failure_probability": {
-                          "op": "zero"
-                        },
-                        "metric": "absolute_value",
-                        "provenance": [
-                          {
-                            "kind": "exact",
-                            "reason": "KeepPreAsap"
-                          }
-                        ]
-                      },
-                      "input_index": 0,
-                      "kind": "child_guarantee"
-                    },
-                    {
-                      "kind": "composition_step",
-                      "operator": {
-                        "op": "exact_extremum"
-                      },
-                      "rule": "exact_input"
-                    }
-                  ]
-                },
-                "id": 2,
-                "operator": "Value",
-                "output_schema": {
-                  "fields": [
-                    {
-                      "dtype": {
-                        "Plain": "float64"
-                      },
-                      "name": "value",
-                      "nullable": false
-                    }
-                  ],
-                  "time_index": null
-                },
-                "output_state": {
-                  "primitive": "Raw",
-                  "timing": "ReadTime"
-                },
-                "payload": {
-                  "kind": "value",
-                  "operation": {
-                    "Project": {
-                      "cols": [
-                        {
-                          "alias": "value",
-                          "expr": {
-                            "Column": 0
-                          }
-                        }
-                      ],
-                      "qualifier": null
-                    }
-                  },
-                  "timing": "ReadTime"
-                }
-              }
-            ],
-            "query_id": "SELECT max(value) AS value FROM q05_samples WHERE ts_ms>=1788848096001 AND ts_ms<1788891296001",
-            "root": 2,
-            "schema_version": 1
-          }
-        }
-      },
-      "ingest": {
-        "endpoint_path": "/api/v1/write",
-        "protocol": "prometheus_remote_write_v1",
-        "require_plan_identity": false,
-        "require_registered_producer": false,
-        "require_summary_definition_identity": false,
-        "timestamp_unit": "unix_milliseconds"
-      },
-      "materializations": [
-        {
-          "aggregated_labels": {
-            "labels": []
-          },
-          "aggregation_sub_type": "max",
-          "aggregation_type": "MinMax",
-          "grouping_labels": {
-            "labels": []
-          },
-          "metric": "q05_samples.value",
-          "num_aggregates_to_retain": 2,
-          "original_yaml": "",
-          "pane_origin_ms": 1788848096001,
-          "parameters": {},
-          "partitioning": "grouped",
-          "rollup_labels": {
-            "labels": []
-          },
-          "slide_interval": 43200,
-          "spatial_filter": "",
-          "spatial_filter_normalized": "",
-          "table_name": "q05_samples",
-          "table_population": {
-            "predicates": []
-          },
-          "table_timestamp_column": "ts_ms",
-          "value_column": "value",
-          "window_layout": {
-            "kind": "pane",
-            "pane_secs": 43200
-          },
-          "window_size": 43200,
-          "window_type": "tumbling"
-        }
-      ],
-      "producers": [],
-      "schemas": [
-        {
-          "encodings": [
-            "exact_accumulator_v1"
-          ],
-          "family": {
-            "family": "exact",
-            "kind": "min_max"
-          },
-          "group_by": [],
-          "materialization": 11497701252531036795,
-          "schema_id": "asap-query-backend.v1:summary-state:v1:11497701252531036795",
-          "schema_version": 1,
-          "source": {
-            "Table": {
-              "table_ref": "q05_samples"
-            }
-          },
-          "value_column": {
-            "Named": "value"
-          },
-          "window": {
-            "kind": "tumbling",
-            "pane_origin_ms": 1788848096001,
-            "size_ms": 43200000,
-            "slide_ms": null
-          }
-        }
-      ],
-      "summary_catalog": {
-        "plan_id": 73,
-        "plan_version": 1,
-        "schema_version": 2,
-        "snapshot_sha256": "642bd91f4dd5c5bb54f59fe86705a01ec2691b825730a36a5ac878ee7dfa621b"
-      }
-    },
-    "query_plan": {
-      "clickhouse_context": {
-        "accuracy": "Exact",
-        "tables": {
-          "q05_samples": {
-            "closed": false,
-            "columns": [
-              {
-                "dtype": "utf8",
-                "name": "metric",
-                "nullable": false,
-                "table": null
-              },
-              {
-                "dtype": "utf8",
-                "name": "labels",
-                "nullable": false,
-                "table": null
-              },
-              {
-                "dtype": "timestamp",
-                "name": "ts_ms",
-                "nullable": false,
-                "table": null
-              },
-              {
-                "dtype": "float64",
-                "name": "value",
-                "nullable": false,
-                "table": null
-              }
-            ],
-            "time_index": 2,
-            "unique_keys": []
-          }
-        }
-      },
-      "entries": {
-        "clickhouse:Project { cols: [ProjectItem { alias: Some(\"value\"), expr: Column(0) }], qualifier: None, child: Aggregate { reduction: Reduce(GroupKeys { keys: [], without: false }), measures: [Max { col: Some(3) }], output_names: [\"max(q05_samples.value)\"], having: None, child: Scan { source: Table { table_ref: \"q05_samples\" }, predicates: [Predicate(BoolAnd([Compare { left: Column(2), op: Ge, right: Literal(Int64(1788848096001)) }, Compare { left: Column(2), op: Lt, right: Literal(Int64(1788891296001)) }]))], schema: Schema { columns: [Column { name: \"metric\", dtype: Utf8, nullable: false, table: Some(\"q05_samples\") }, Column { name: \"labels\", dtype: Utf8, nullable: false, table: Some(\"q05_samples\") }, Column { name: \"ts_ms\", dtype: Timestamp, nullable: false, table: Some(\"q05_samples\") }, Column { name: \"value\", dtype: Float64, nullable: false, table: Some(\"q05_samples\") }], time_index: Some(2), unique_keys: [], closed: true } } } }": {
-          "canonical_query": "Project { cols: [ProjectItem { alias: Some(\"value\"), expr: Column(0) }], qualifier: None, child: Aggregate { reduction: Reduce(GroupKeys { keys: [], without: false }), measures: [Max { col: Some(3) }], output_names: [\"max(q05_samples.value)\"], having: None, child: Scan { source: Table { table_ref: \"q05_samples\" }, predicates: [Predicate(BoolAnd([Compare { left: Column(2), op: Ge, right: Literal(Int64(1788848096001)) }, Compare { left: Column(2), op: Lt, right: Literal(Int64(1788891296001)) }]))], schema: Schema { columns: [Column { name: \"metric\", dtype: Utf8, nullable: false, table: Some(\"q05_samples\") }, Column { name: \"labels\", dtype: Utf8, nullable: false, table: Some(\"q05_samples\") }, Column { name: \"ts_ms\", dtype: Timestamp, nullable: false, table: Some(\"q05_samples\") }, Column { name: \"value\", dtype: Float64, nullable: false, table: Some(\"q05_samples\") }], time_index: Some(2), unique_keys: [], closed: true } } } }",
-          "fallback": "exact_backend",
-          "fixed_evaluation": {
-            "cumulative": true,
-            "end_ms": 1788891296001,
-            "start_ms": 1788848096001
-          },
-          "instant": {
-            "cumulative_readout": true,
-            "full_history": false,
-            "lookback_ms": 43200000
-          },
-          "language": "click_house_sql",
-          "nodes": {
-            "0": {
-              "input": 1,
-              "input_schema": {
-                "fields": [
-                  {
-                    "dtype": {
-                      "ExactAggregate": [
-                        "MinMax",
-                        "MinMax"
-                      ]
-                    },
-                    "name": "max(q05_samples.value)",
-                    "nullable": false
-                  }
-                ],
-                "time_index": null
-              },
-              "op": "relational",
-              "operation": {
-                "Project": {
-                  "cols": [
-                    {
-                      "alias": "value",
-                      "expr": {
-                        "Column": 0
-                      }
-                    }
-                  ],
-                  "qualifier": null
-                }
-              },
-              "output_schema": {
-                "fields": [
-                  {
-                    "dtype": {
-                      "Plain": "float64"
-                    },
-                    "name": "value",
-                    "nullable": false
-                  }
-                ],
-                "time_index": null
-              }
-            },
-            "1": {
-              "input": 2,
-              "op": "exact_readout",
-              "readout": "max"
-            },
-            "2": {
-              "binding": {
-                "materialization": 11497701252531036795,
-                "output_grouping": {
-                  "keys": [],
-                  "mode": "reduce"
-                },
-                "pane_origin_ms": 1788848096001,
-                "readout_lookback_ms": 43200000,
-                "window_ms": 43200000
-              },
-              "op": "read_materialization"
-            }
-          },
-          "query_id": "SELECT max(value) AS value FROM q05_samples WHERE ts_ms>=1788848096001 AND ts_ms<1788891296001",
-          "root": 0
-        }
-      },
-      "plan_id": 73,
-      "plan_version": 1
-    },
-    "summary_catalog": {
-      "data_descriptors": {
-        "data:v2|37:{\"table\":{\"table_ref\":\"q05_samples\"}}|27:{\"column\":{\"name\":\"value\"}}|0:|partition:Grouped|timestamp-ms:5:ts_ms|32:asap.timestamped-observations.v2": {
-          "group_by_keys": [],
-          "id": "data:v2|37:{\"table\":{\"table_ref\":\"q05_samples\"}}|27:{\"column\":{\"name\":\"value\"}}|0:|partition:Grouped|timestamp-ms:5:ts_ms|32:asap.timestamped-observations.v2",
-          "observation_semantics": "asap.timestamped-observations.v2",
-          "partitioning": "grouped",
-          "population_filter_canonical": "",
-          "source": {
-            "table": {
-              "table_ref": "q05_samples"
-            }
-          },
-          "timestamp_column": "ts_ms",
-          "value_projection": {
-            "column": {
-              "name": "value"
-            }
-          }
-        }
-      },
-      "materializations": {
-        "11497701252531036795": {
-          "data_descriptor_id": "data:v2|37:{\"table\":{\"table_ref\":\"q05_samples\"}}|27:{\"column\":{\"name\":\"value\"}}|0:|partition:Grouped|timestamp-ms:5:ts_ms|32:asap.timestamped-observations.v2",
-          "pane_origin_ms": 1788848096001,
-          "summary_descriptor_id": "summary:v2:{\"fidelity\":{\"kind\":\"exact\"},\"operator\":{\"aggregation_sub_type\":\"max\",\"aggregation_type\":\"MinMax\",\"kind\":\"configured\",\"parameters\":{}},\"state_schema_version\":1}",
-          "window_layout": {
-            "kind": "pane",
-            "pane_secs": 43200
-          }
-        }
-      },
-      "plan_id": 73,
-      "plan_version": 1,
-      "schema_version": 2,
-      "summary_descriptors": {
-        "summary:v2:{\"fidelity\":{\"kind\":\"exact\"},\"operator\":{\"aggregation_sub_type\":\"max\",\"aggregation_type\":\"MinMax\",\"kind\":\"configured\",\"parameters\":{}},\"state_schema_version\":1}": {
-          "fidelity": {
-            "kind": "exact"
-          },
-          "id": "summary:v2:{\"fidelity\":{\"kind\":\"exact\"},\"operator\":{\"aggregation_sub_type\":\"max\",\"aggregation_type\":\"MinMax\",\"kind\":\"configured\",\"parameters\":{}},\"state_schema_version\":1}",
-          "operator": {
-            "aggregation_sub_type": "max",
-            "aggregation_type": "MinMax",
-            "kind": "configured",
-            "parameters": {}
-          },
-          "state_schema_version": 1
-        }
-      }
-    },
-    "transmission_plan": {
-      "envelope": {
-        "activation_unix_ms": 0,
-        "backend_compat": "asap-query-backend.v1",
-        "capability_snapshot_id": "test",
-        "expiry_unix_ms": null,
-        "generated_at_unix_ms": 0,
-        "plan_id": 73,
-        "plan_version": 1,
-        "planner_revision": "0deceda3e776216c5542d638d958b159f22e27ce"
-      },
-      "frame_identity": {
-        "identity_version": 1,
-        "require_base_checkpoint_for_delta": true,
-        "require_checkpoint_for_full": true,
-        "sequence_scope": "materialization_series_producer_epoch"
-      },
-      "rules": [],
-      "summary_catalog": {
-        "plan_id": 73,
-        "plan_version": 1,
-        "schema_version": 2,
-        "snapshot_sha256": "642bd91f4dd5c5bb54f59fe86705a01ec2691b825730a36a5ac878ee7dfa621b"
-      }
-    }
-  },
-  "selection_trace": {
-    "Project { cols: [ProjectItem { alias: Some(\"value\"), expr: Column(0) }], qualifier: None, child: Aggregate { reduction: Reduce(GroupKeys { keys: [], without: false }), measures: [Max { col: Some(3) }], output_names: [\"max(q05_samples.value)\"], having: None, child: Scan { source: Table { table_ref: \"q05_samples\" }, predicates: [Predicate(BoolAnd([Compare { left: Column(2), op: Ge, right: Literal(Int64(1788848096001)) }, Compare { left: Column(2), op: Lt, right: Literal(Int64(1788891296001)) }]))], schema: Schema { columns: [Column { name: \"metric\", dtype: Utf8, nullable: false, table: Some(\"q05_samples\") }, Column { name: \"labels\", dtype: Utf8, nullable: false, table: Some(\"q05_samples\") }, Column { name: \"ts_ms\", dtype: Timestamp, nullable: false, table: Some(\"q05_samples\") }, Column { name: \"value\", dtype: Float64, nullable: false, table: Some(\"q05_samples\") }], time_index: Some(2), unique_keys: [], closed: true } } } }": {
-      "group_id_scope": "this_selection",
-      "groups": [
-        {
-          "candidates": [],
-          "consumer_count": 1,
-          "group_id": 0
-        },
-        {
-          "candidates": [
-            {
-              "estimated_cost": null,
-              "estimated_cost_status": "not_reported_by_cost_model",
-              "provenance": "SummaryImplementation",
-              "rank": 0,
-              "rationale": "Max { col: Some(3) } realizes as an exact MinMax accumulator \u2014 the only realization implementations_for_with produces for this intent (no approximate candidate applies)",
-              "replacement_kind": "summary",
-              "selected": true,
-              "strategy": "SketchAlgorithmStrategy"
-            }
-          ],
-          "consumer_count": 1,
-          "group_id": 1
-        },
-        {
-          "candidates": [],
-          "consumer_count": 1,
-          "group_id": 2
-        }
-      ],
-      "schema_version": 1
-    }
-  }
-}
diff --git a/tools/clickhouse-benefit/artifacts/automatic/raw-traces.json b/tools/clickhouse-benefit/artifacts/automatic/raw-traces.json
deleted file mode 100644
index 1c37a57a7..000000000
--- a/tools/clickhouse-benefit/artifacts/automatic/raw-traces.json
+++ /dev/null
@@ -1,26 +0,0 @@
-[
-  {
-    "path": "/mydata/clickhouse-automatic-benefit-study/fine-1s-matched-trialcontrolled-sum-1.json",
-    "sha256": "a957d60fec6132ea843ef8a3548740e4287dee1e22968a89609a903a6c7de52a"
-  },
-  {
-    "path": "/mydata/clickhouse-automatic-benefit-study/fine-1s-matched-trialcontrolled-sum-2.json",
-    "sha256": "d7256007455ab6a25672e2d9970e717e9fec5cc8014463f7faa7f0f8d8a40886"
-  },
-  {
-    "path": "/mydata/clickhouse-automatic-benefit-study/fine-1s-matched-trialcontrolled-sum-3.json",
-    "sha256": "db529845c5e1fd91c0080e3b7ced9649dbf3ec84c99469692dce46fd792c0aa2"
-  },
-  {
-    "path": "/mydata/clickhouse-automatic-benefit-study/fine-1s-matched-trialcontrolled-max-1.json",
-    "sha256": "8735b24def194437e90301667e9d2b806021a92724dc6d87350cf3ebe0ecc2b6"
-  },
-  {
-    "path": "/mydata/clickhouse-automatic-benefit-study/fine-1s-matched-trialcontrolled-max-2.json",
-    "sha256": "6c1b86e861bbc16cf1ed44b1297ca8b985163802f135c06790c86653aa4b0c49"
-  },
-  {
-    "path": "/mydata/clickhouse-automatic-benefit-study/fine-1s-matched-trialcontrolled-max-3.json",
-    "sha256": "cd00d30dd2d3ab4c17cbba223d1b6837c7ce6492fb2ecbee84fc85d59dd6428c"
-  }
-]
diff --git a/tools/clickhouse-benefit/artifacts/automatic/sum-planning.json b/tools/clickhouse-benefit/artifacts/automatic/sum-planning.json
deleted file mode 100644
index 54c0ddda9..000000000
--- a/tools/clickhouse-benefit/artifacts/automatic/sum-planning.json
+++ /dev/null
@@ -1,733 +0,0 @@
-{
-  "publication": {
-    "collector_plans": [],
-    "precompute_plan": {
-      "envelope": {
-        "activation_unix_ms": 0,
-        "backend_compat": "asap-query-backend.v1",
-        "capability_snapshot_id": "test",
-        "expiry_unix_ms": null,
-        "generated_at_unix_ms": 0,
-        "plan_id": 73,
-        "plan_version": 1,
-        "planner_revision": "0deceda3e776216c5542d638d958b159f22e27ce"
-      },
-      "executable_dags": {
-        "SELECT sum(value) AS value FROM q05_samples WHERE ts_ms>=1788848096001 AND ts_ms<1788891296001": {
-          "binding": {
-            "nodes": {
-              "0": {
-                "placement": "maintenance_input"
-              },
-              "1": {
-                "placement": "materialization",
-                "summary_definition": 10897179430287057821
-              },
-              "2": {
-                "placement": "query",
-                "query_node": 0
-              }
-            },
-            "precompute_sinks": [
-              1
-            ],
-            "query_plan_sink": 0,
-            "query_sink": 2
-          },
-          "document": {
-            "edges": [
-              {
-                "consumer": 1,
-                "data_state": {
-                  "primitive": "Raw",
-                  "timing": "MaintenanceTime"
-                },
-                "grouping": "NotApplicable",
-                "intermediate_schema": {
-                  "fields": [
-                    {
-                      "dtype": {
-                        "Plain": "utf8"
-                      },
-                      "name": "metric",
-                      "nullable": false
-                    },
-                    {
-                      "dtype": {
-                        "Plain": "utf8"
-                      },
-                      "name": "labels",
-                      "nullable": false
-                    },
-                    {
-                      "dtype": {
-                        "Plain": "timestamp"
-                      },
-                      "name": "ts_ms",
-                      "nullable": false
-                    },
-                    {
-                      "dtype": {
-                        "Plain": "float64"
-                      },
-                      "name": "value",
-                      "nullable": false
-                    }
-                  ],
-                  "time_index": 2
-                },
-                "producer": 0,
-                "role": "Input",
-                "window": "RequiresAlignedPanePhaseOrExactBoundaryResidual"
-              },
-              {
-                "consumer": 2,
-                "data_state": {
-                  "primitive": "SummaryState",
-                  "timing": "MaintenanceTime"
-                },
-                "grouping": "NotApplicable",
-                "intermediate_schema": {
-                  "fields": [
-                    {
-                      "dtype": {
-                        "ExactAggregate": [
-                          "Sum",
-                          "Sum"
-                        ]
-                      },
-                      "name": "sum(q05_samples.value)",
-                      "nullable": false
-                    }
-                  ],
-                  "time_index": null
-                },
-                "producer": 1,
-                "role": "Input",
-                "window": "NotApplicable"
-              }
-            ],
-            "nodes": [
-              {
-                "guarantee": {
-                  "bound": {
-                    "op": "zero"
-                  },
-                  "failure_probability": {
-                    "op": "zero"
-                  },
-                  "metric": "absolute_value",
-                  "provenance": [
-                    {
-                      "kind": "exact",
-                      "reason": "KeepPreAsap"
-                    }
-                  ]
-                },
-                "id": 0,
-                "operator": "Fallback",
-                "output_schema": {
-                  "fields": [
-                    {
-                      "dtype": {
-                        "Plain": "utf8"
-                      },
-                      "name": "metric",
-                      "nullable": false
-                    },
-                    {
-                      "dtype": {
-                        "Plain": "utf8"
-                      },
-                      "name": "labels",
-                      "nullable": false
-                    },
-                    {
-                      "dtype": {
-                        "Plain": "timestamp"
-                      },
-                      "name": "ts_ms",
-                      "nullable": false
-                    },
-                    {
-                      "dtype": {
-                        "Plain": "float64"
-                      },
-                      "name": "value",
-                      "nullable": false
-                    }
-                  ],
-                  "time_index": 2
-                },
-                "output_state": {
-                  "primitive": "Raw",
-                  "timing": "MaintenanceTime"
-                },
-                "payload": {
-                  "expression": {
-                    "Scan": {
-                      "predicates": [
-                        {
-                          "BoolAnd": [
-                            {
-                              "Compare": {
-                                "left": {
-                                  "Column": 2
-                                },
-                                "op": "Ge",
-                                "right": {
-                                  "Literal": {
-                                    "Int64": 1788848096001
-                                  }
-                                }
-                              }
-                            },
-                            {
-                              "Compare": {
-                                "left": {
-                                  "Column": 2
-                                },
-                                "op": "Lt",
-                                "right": {
-                                  "Literal": {
-                                    "Int64": 1788891296001
-                                  }
-                                }
-                              }
-                            }
-                          ]
-                        }
-                      ],
-                      "schema": {
-                        "closed": true,
-                        "columns": [
-                          {
-                            "dtype": "utf8",
-                            "name": "metric",
-                            "nullable": false,
-                            "table": "q05_samples"
-                          },
-                          {
-                            "dtype": "utf8",
-                            "name": "labels",
-                            "nullable": false,
-                            "table": "q05_samples"
-                          },
-                          {
-                            "dtype": "timestamp",
-                            "name": "ts_ms",
-                            "nullable": false,
-                            "table": "q05_samples"
-                          },
-                          {
-                            "dtype": "float64",
-                            "name": "value",
-                            "nullable": false,
-                            "table": "q05_samples"
-                          }
-                        ],
-                        "time_index": 2,
-                        "unique_keys": []
-                      },
-                      "source": {
-                        "Table": {
-                          "table_ref": "q05_samples"
-                        }
-                      }
-                    }
-                  },
-                  "kind": "fallback"
-                }
-              },
-              {
-                "guarantee": {
-                  "bound": {
-                    "op": "zero"
-                  },
-                  "failure_probability": {
-                    "op": "zero"
-                  },
-                  "metric": "absolute_value",
-                  "provenance": [
-                    {
-                      "kind": "exact",
-                      "reason": "ExactAggregate(Sum)"
-                    },
-                    {
-                      "guarantee": {
-                        "bound": {
-                          "op": "zero"
-                        },
-                        "failure_probability": {
-                          "op": "zero"
-                        },
-                        "metric": "absolute_value",
-                        "provenance": [
-                          {
-                            "kind": "exact",
-                            "reason": "KeepPreAsap"
-                          }
-                        ]
-                      },
-                      "input_index": 0,
-                      "kind": "child_guarantee"
-                    },
-                    {
-                      "kind": "composition_step",
-                      "operator": {
-                        "op": "exact_sum"
-                      },
-                      "rule": "exact_input"
-                    }
-                  ]
-                },
-                "id": 1,
-                "operator": "SummaryAgg",
-                "output_schema": {
-                  "fields": [
-                    {
-                      "dtype": {
-                        "ExactAggregate": [
-                          "Sum",
-                          "Sum"
-                        ]
-                      },
-                      "name": "sum(q05_samples.value)",
-                      "nullable": false
-                    }
-                  ],
-                  "time_index": null
-                },
-                "output_state": {
-                  "primitive": "SummaryState",
-                  "timing": "MaintenanceTime"
-                },
-                "payload": {
-                  "family": {
-                    "ExactAggregate": [
-                      "Sum",
-                      "Sum"
-                    ]
-                  },
-                  "grouping": "PerSubpopulationInstance",
-                  "input": {
-                    "item": null,
-                    "weight": {
-                      "Column": {
-                        "Qualified": {
-                          "name": "value",
-                          "table": "q05_samples"
-                        }
-                      }
-                    },
-                    "weight_domain": {
-                      "kind": "unknown_or_signed"
-                    }
-                  },
-                  "kind": "summary_agg",
-                  "reduction": {
-                    "Reduce": []
-                  }
-                }
-              },
-              {
-                "guarantee": {
-                  "bound": {
-                    "op": "zero"
-                  },
-                  "failure_probability": {
-                    "op": "zero"
-                  },
-                  "metric": "absolute_value",
-                  "provenance": [
-                    {
-                      "kind": "exact",
-                      "reason": "ExactAggregate(Sum)"
-                    },
-                    {
-                      "guarantee": {
-                        "bound": {
-                          "op": "zero"
-                        },
-                        "failure_probability": {
-                          "op": "zero"
-                        },
-                        "metric": "absolute_value",
-                        "provenance": [
-                          {
-                            "kind": "exact",
-                            "reason": "KeepPreAsap"
-                          }
-                        ]
-                      },
-                      "input_index": 0,
-                      "kind": "child_guarantee"
-                    },
-                    {
-                      "kind": "composition_step",
-                      "operator": {
-                        "op": "exact_sum"
-                      },
-                      "rule": "exact_input"
-                    }
-                  ]
-                },
-                "id": 2,
-                "operator": "Value",
-                "output_schema": {
-                  "fields": [
-                    {
-                      "dtype": {
-                        "Plain": "float64"
-                      },
-                      "name": "value",
-                      "nullable": false
-                    }
-                  ],
-                  "time_index": null
-                },
-                "output_state": {
-                  "primitive": "Raw",
-                  "timing": "ReadTime"
-                },
-                "payload": {
-                  "kind": "value",
-                  "operation": {
-                    "Project": {
-                      "cols": [
-                        {
-                          "alias": "value",
-                          "expr": {
-                            "Column": 0
-                          }
-                        }
-                      ],
-                      "qualifier": null
-                    }
-                  },
-                  "timing": "ReadTime"
-                }
-              }
-            ],
-            "query_id": "SELECT sum(value) AS value FROM q05_samples WHERE ts_ms>=1788848096001 AND ts_ms<1788891296001",
-            "root": 2,
-            "schema_version": 1
-          }
-        }
-      },
-      "ingest": {
-        "endpoint_path": "/api/v1/write",
-        "protocol": "prometheus_remote_write_v1",
-        "require_plan_identity": false,
-        "require_registered_producer": false,
-        "require_summary_definition_identity": false,
-        "timestamp_unit": "unix_milliseconds"
-      },
-      "materializations": [
-        {
-          "aggregated_labels": {
-            "labels": []
-          },
-          "aggregation_sub_type": "",
-          "aggregation_type": "Sum",
-          "grouping_labels": {
-            "labels": []
-          },
-          "metric": "q05_samples.value",
-          "num_aggregates_to_retain": 2,
-          "original_yaml": "",
-          "pane_origin_ms": 1788848096001,
-          "parameters": {},
-          "partitioning": "grouped",
-          "rollup_labels": {
-            "labels": []
-          },
-          "slide_interval": 43200,
-          "spatial_filter": "",
-          "spatial_filter_normalized": "",
-          "table_name": "q05_samples",
-          "table_population": {
-            "predicates": []
-          },
-          "table_timestamp_column": "ts_ms",
-          "value_column": "value",
-          "window_layout": {
-            "kind": "pane",
-            "pane_secs": 43200
-          },
-          "window_size": 43200,
-          "window_type": "tumbling"
-        }
-      ],
-      "producers": [],
-      "schemas": [
-        {
-          "encodings": [
-            "exact_accumulator_v1"
-          ],
-          "family": {
-            "family": "exact",
-            "kind": "sum"
-          },
-          "group_by": [],
-          "materialization": 10897179430287057821,
-          "schema_id": "asap-query-backend.v1:summary-state:v1:10897179430287057821",
-          "schema_version": 1,
-          "source": {
-            "Table": {
-              "table_ref": "q05_samples"
-            }
-          },
-          "value_column": {
-            "Named": "value"
-          },
-          "window": {
-            "kind": "tumbling",
-            "pane_origin_ms": 1788848096001,
-            "size_ms": 43200000,
-            "slide_ms": null
-          }
-        }
-      ],
-      "summary_catalog": {
-        "plan_id": 73,
-        "plan_version": 1,
-        "schema_version": 2,
-        "snapshot_sha256": "4ace75399a41e02d77391a26b75d2d6a501342ed73cb8ec3a1eb855fad188b67"
-      }
-    },
-    "query_plan": {
-      "clickhouse_context": {
-        "accuracy": "Exact",
-        "tables": {
-          "q05_samples": {
-            "closed": false,
-            "columns": [
-              {
-                "dtype": "utf8",
-                "name": "metric",
-                "nullable": false,
-                "table": null
-              },
-              {
-                "dtype": "utf8",
-                "name": "labels",
-                "nullable": false,
-                "table": null
-              },
-              {
-                "dtype": "timestamp",
-                "name": "ts_ms",
-                "nullable": false,
-                "table": null
-              },
-              {
-                "dtype": "float64",
-                "name": "value",
-                "nullable": false,
-                "table": null
-              }
-            ],
-            "time_index": 2,
-            "unique_keys": []
-          }
-        }
-      },
-      "entries": {
-        "clickhouse:Project { cols: [ProjectItem { alias: Some(\"value\"), expr: Column(0) }], qualifier: None, child: Aggregate { reduction: Reduce(GroupKeys { keys: [], without: false }), measures: [Sum { col: Some(3) }], output_names: [\"sum(q05_samples.value)\"], having: None, child: Scan { source: Table { table_ref: \"q05_samples\" }, predicates: [Predicate(BoolAnd([Compare { left: Column(2), op: Ge, right: Literal(Int64(1788848096001)) }, Compare { left: Column(2), op: Lt, right: Literal(Int64(1788891296001)) }]))], schema: Schema { columns: [Column { name: \"metric\", dtype: Utf8, nullable: false, table: Some(\"q05_samples\") }, Column { name: \"labels\", dtype: Utf8, nullable: false, table: Some(\"q05_samples\") }, Column { name: \"ts_ms\", dtype: Timestamp, nullable: false, table: Some(\"q05_samples\") }, Column { name: \"value\", dtype: Float64, nullable: false, table: Some(\"q05_samples\") }], time_index: Some(2), unique_keys: [], closed: true } } } }": {
-          "canonical_query": "Project { cols: [ProjectItem { alias: Some(\"value\"), expr: Column(0) }], qualifier: None, child: Aggregate { reduction: Reduce(GroupKeys { keys: [], without: false }), measures: [Sum { col: Some(3) }], output_names: [\"sum(q05_samples.value)\"], having: None, child: Scan { source: Table { table_ref: \"q05_samples\" }, predicates: [Predicate(BoolAnd([Compare { left: Column(2), op: Ge, right: Literal(Int64(1788848096001)) }, Compare { left: Column(2), op: Lt, right: Literal(Int64(1788891296001)) }]))], schema: Schema { columns: [Column { name: \"metric\", dtype: Utf8, nullable: false, table: Some(\"q05_samples\") }, Column { name: \"labels\", dtype: Utf8, nullable: false, table: Some(\"q05_samples\") }, Column { name: \"ts_ms\", dtype: Timestamp, nullable: false, table: Some(\"q05_samples\") }, Column { name: \"value\", dtype: Float64, nullable: false, table: Some(\"q05_samples\") }], time_index: Some(2), unique_keys: [], closed: true } } } }",
-          "fallback": "exact_backend",
-          "fixed_evaluation": {
-            "cumulative": true,
-            "end_ms": 1788891296001,
-            "start_ms": 1788848096001
-          },
-          "instant": {
-            "cumulative_readout": true,
-            "full_history": false,
-            "lookback_ms": 43200000
-          },
-          "language": "click_house_sql",
-          "nodes": {
-            "0": {
-              "input": 1,
-              "input_schema": {
-                "fields": [
-                  {
-                    "dtype": {
-                      "ExactAggregate": [
-                        "Sum",
-                        "Sum"
-                      ]
-                    },
-                    "name": "sum(q05_samples.value)",
-                    "nullable": false
-                  }
-                ],
-                "time_index": null
-              },
-              "op": "relational",
-              "operation": {
-                "Project": {
-                  "cols": [
-                    {
-                      "alias": "value",
-                      "expr": {
-                        "Column": 0
-                      }
-                    }
-                  ],
-                  "qualifier": null
-                }
-              },
-              "output_schema": {
-                "fields": [
-                  {
-                    "dtype": {
-                      "Plain": "float64"
-                    },
-                    "name": "value",
-                    "nullable": false
-                  }
-                ],
-                "time_index": null
-              }
-            },
-            "1": {
-              "input": 2,
-              "op": "exact_readout",
-              "readout": "sum"
-            },
-            "2": {
-              "binding": {
-                "materialization": 10897179430287057821,
-                "output_grouping": {
-                  "keys": [],
-                  "mode": "reduce"
-                },
-                "pane_origin_ms": 1788848096001,
-                "readout_lookback_ms": 43200000,
-                "window_ms": 43200000
-              },
-              "op": "read_materialization"
-            }
-          },
-          "query_id": "SELECT sum(value) AS value FROM q05_samples WHERE ts_ms>=1788848096001 AND ts_ms<1788891296001",
-          "root": 0
-        }
-      },
-      "plan_id": 73,
-      "plan_version": 1
-    },
-    "summary_catalog": {
-      "data_descriptors": {
-        "data:v2|37:{\"table\":{\"table_ref\":\"q05_samples\"}}|27:{\"column\":{\"name\":\"value\"}}|0:|partition:Grouped|timestamp-ms:5:ts_ms|32:asap.timestamped-observations.v2": {
-          "group_by_keys": [],
-          "id": "data:v2|37:{\"table\":{\"table_ref\":\"q05_samples\"}}|27:{\"column\":{\"name\":\"value\"}}|0:|partition:Grouped|timestamp-ms:5:ts_ms|32:asap.timestamped-observations.v2",
-          "observation_semantics": "asap.timestamped-observations.v2",
-          "partitioning": "grouped",
-          "population_filter_canonical": "",
-          "source": {
-            "table": {
-              "table_ref": "q05_samples"
-            }
-          },
-          "timestamp_column": "ts_ms",
-          "value_projection": {
-            "column": {
-              "name": "value"
-            }
-          }
-        }
-      },
-      "materializations": {
-        "10897179430287057821": {
-          "data_descriptor_id": "data:v2|37:{\"table\":{\"table_ref\":\"q05_samples\"}}|27:{\"column\":{\"name\":\"value\"}}|0:|partition:Grouped|timestamp-ms:5:ts_ms|32:asap.timestamped-observations.v2",
-          "pane_origin_ms": 1788848096001,
-          "summary_descriptor_id": "summary:v2:{\"fidelity\":{\"kind\":\"exact\"},\"operator\":{\"aggregation_sub_type\":\"\",\"aggregation_type\":\"Sum\",\"kind\":\"configured\",\"parameters\":{}},\"state_schema_version\":1}",
-          "window_layout": {
-            "kind": "pane",
-            "pane_secs": 43200
-          }
-        }
-      },
-      "plan_id": 73,
-      "plan_version": 1,
-      "schema_version": 2,
-      "summary_descriptors": {
-        "summary:v2:{\"fidelity\":{\"kind\":\"exact\"},\"operator\":{\"aggregation_sub_type\":\"\",\"aggregation_type\":\"Sum\",\"kind\":\"configured\",\"parameters\":{}},\"state_schema_version\":1}": {
-          "fidelity": {
-            "kind": "exact"
-          },
-          "id": "summary:v2:{\"fidelity\":{\"kind\":\"exact\"},\"operator\":{\"aggregation_sub_type\":\"\",\"aggregation_type\":\"Sum\",\"kind\":\"configured\",\"parameters\":{}},\"state_schema_version\":1}",
-          "operator": {
-            "aggregation_sub_type": "",
-            "aggregation_type": "Sum",
-            "kind": "configured",
-            "parameters": {}
-          },
-          "state_schema_version": 1
-        }
-      }
-    },
-    "transmission_plan": {
-      "envelope": {
-        "activation_unix_ms": 0,
-        "backend_compat": "asap-query-backend.v1",
-        "capability_snapshot_id": "test",
-        "expiry_unix_ms": null,
-        "generated_at_unix_ms": 0,
-        "plan_id": 73,
-        "plan_version": 1,
-        "planner_revision": "0deceda3e776216c5542d638d958b159f22e27ce"
-      },
-      "frame_identity": {
-        "identity_version": 1,
-        "require_base_checkpoint_for_delta": true,
-        "require_checkpoint_for_full": true,
-        "sequence_scope": "materialization_series_producer_epoch"
-      },
-      "rules": [],
-      "summary_catalog": {
-        "plan_id": 73,
-        "plan_version": 1,
-        "schema_version": 2,
-        "snapshot_sha256": "4ace75399a41e02d77391a26b75d2d6a501342ed73cb8ec3a1eb855fad188b67"
-      }
-    }
-  },
-  "selection_trace": {
-    "Project { cols: [ProjectItem { alias: Some(\"value\"), expr: Column(0) }], qualifier: None, child: Aggregate { reduction: Reduce(GroupKeys { keys: [], without: false }), measures: [Sum { col: Some(3) }], output_names: [\"sum(q05_samples.value)\"], having: None, child: Scan { source: Table { table_ref: \"q05_samples\" }, predicates: [Predicate(BoolAnd([Compare { left: Column(2), op: Ge, right: Literal(Int64(1788848096001)) }, Compare { left: Column(2), op: Lt, right: Literal(Int64(1788891296001)) }]))], schema: Schema { columns: [Column { name: \"metric\", dtype: Utf8, nullable: false, table: Some(\"q05_samples\") }, Column { name: \"labels\", dtype: Utf8, nullable: false, table: Some(\"q05_samples\") }, Column { name: \"ts_ms\", dtype: Timestamp, nullable: false, table: Some(\"q05_samples\") }, Column { name: \"value\", dtype: Float64, nullable: false, table: Some(\"q05_samples\") }], time_index: Some(2), unique_keys: [], closed: true } } } }": {
-      "group_id_scope": "this_selection",
-      "groups": [
-        {
-          "candidates": [],
-          "consumer_count": 1,
-          "group_id": 0
-        },
-        {
-          "candidates": [
-            {
-              "estimated_cost": null,
-              "estimated_cost_status": "not_reported_by_cost_model",
-              "provenance": "SummaryImplementation",
-              "rank": 0,
-              "rationale": "Sum { col: Some(3) } realizes as an exact Sum accumulator \u2014 the only realization implementations_for_with produces for this intent (no approximate candidate applies)",
-              "replacement_kind": "summary",
-              "selected": true,
-              "strategy": "SketchAlgorithmStrategy"
-            }
-          ],
-          "consumer_count": 1,
-          "group_id": 1
-        },
-        {
-          "candidates": [],
-          "consumer_count": 1,
-          "group_id": 2
-        }
-      ],
-      "schema_version": 1
-    }
-  }
-}
diff --git a/tools/clickhouse-benefit/artifacts/clickhouse-settings.jsonl b/tools/clickhouse-benefit/artifacts/clickhouse-settings.jsonl
deleted file mode 100644
index 1531a8903..000000000
--- a/tools/clickhouse-benefit/artifacts/clickhouse-settings.jsonl
+++ /dev/null
@@ -1,2 +0,0 @@
-{"name":"max_threads","value":"auto(2)"}
-{"name":"use_query_cache","value":"0"}
diff --git a/tools/clickhouse-benefit/artifacts/fine-1s-24h-series.provenance.json b/tools/clickhouse-benefit/artifacts/fine-1s-24h-series.provenance.json
deleted file mode 100644
index c466a2ea3..000000000
--- a/tools/clickhouse-benefit/artifacts/fine-1s-24h-series.provenance.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "source": "/mydata/o11y-scale-study/datasets/fine-1s-24h.prom",
-  "source_sha256": "6297663470b92bba012d6c63b072ae2e534c4caa9d6de5082b882fd163436769",
-  "output": "/mydata/clickhouse-o11y-main-results/fine-1s-24h-series.jsonl",
-  "series": "service_cache_refresh_lag_seconds{job=\"user-service\",instance=\"user-service:8082\"}",
-  "samples": 86371,
-  "start_ms": 1788804926000,
-  "end_ms": 1788891296000,
-  "transformation": "one exact series selection; unchanged values and timestamps"
-}
diff --git a/tools/clickhouse-benefit/artifacts/fine-1s-matched-trial1-summary.json b/tools/clickhouse-benefit/artifacts/fine-1s-matched-trial1-summary.json
deleted file mode 100644
index 9057ea34b..000000000
--- a/tools/clickhouse-benefit/artifacts/fine-1s-matched-trial1-summary.json
+++ /dev/null
@@ -1,164 +0,0 @@
-{
-  "artifact": "/mydata/clickhouse-o11y-main-results/fine-1s-matched-trial1.json",
-  "git_head": null,
-  "input": {
-    "end_ms": 1788891296001,
-    "metric": "service_cache_refresh_lag_seconds",
-    "path": "/mydata/clickhouse-o11y-main-results/fine-1s-24h-series.jsonl",
-    "samples": 86371,
-    "series": [
-      "service_cache_refresh_lag_seconds{job=\"user-service\",instance=\"user-service:8082\"}"
-    ],
-    "start_ms": 1788848096001
-  },
-  "planning_scope": "Planner chooses query DAG against a predeclared MinMax catalog; materialization sizing/selection is not measured",
-  "routes": {
-    "warm": {
-      "requests": 1000,
-      "median_ms": 0.851175,
-      "p95_ms": 0.964984,
-      "serial_service_requests_per_second": 1169.3772148369856,
-      "all_http_200": true,
-      "execution_modes": [
-        "warm"
-      ],
-      "backend_cpu_ms": 770.0,
-      "clickhouse_cpu_ms": 60.0
-    },
-    "exact": {
-      "requests": 1000,
-      "median_ms": 6.892122499999999,
-      "p95_ms": 15.055541,
-      "serial_service_requests_per_second": 131.8536619227096,
-      "all_http_200": true,
-      "execution_modes": [
-        "None"
-      ],
-      "backend_cpu_ms": 0.0,
-      "clickhouse_cpu_ms": 8530.0
-    }
-  },
-  "latency_speedup": 8.097186242547066,
-  "first_query": {
-    "exact_elapsed_ns": 5237616,
-    "warm_elapsed_ns": 3196042
-  },
-  "build_phase": {
-    "backend": {
-      "cpu_ticks": 23,
-      "pid": 3948209,
-      "rss_pages": 9042,
-      "vm_hwm": "VmHWM:\t   40392 kB",
-      "vm_rss": "VmRSS:\t   36168 kB"
-    },
-    "backend_output_bytes": 5721,
-    "clickhouse_after": {
-      "cpu_ticks": 1090,
-      "pid": 3947652,
-      "rss_pages": 213036,
-      "vm_hwm": "VmHWM:\t  912376 kB",
-      "vm_rss": "VmRSS:\t  852144 kB"
-    },
-    "clickhouse_before": {
-      "cpu_ticks": 1042,
-      "pid": 3947652,
-      "rss_pages": 198736,
-      "vm_hwm": "VmHWM:\t  912376 kB",
-      "vm_rss": "VmRSS:\t  794944 kB"
-    },
-    "elapsed_ns": 1934364490
-  },
-  "source_load_phase": {
-    "clickhouse_after": {
-      "cpu_ticks": 1072,
-      "pid": 3947652,
-      "rss_pages": 216121,
-      "vm_hwm": "VmHWM:\t  912376 kB",
-      "vm_rss": "VmRSS:\t  864484 kB"
-    },
-    "clickhouse_before": {
-      "cpu_ticks": 1042,
-      "pid": 3947652,
-      "rss_pages": 198736,
-      "vm_hwm": "VmHWM:\t  912376 kB",
-      "vm_rss": "VmRSS:\t  794944 kB"
-    },
-    "elapsed_ns": 556181863
-  },
-  "backfill_phase": {
-    "backend_after": {
-      "cpu_ticks": 23,
-      "pid": 3948209,
-      "rss_pages": 9042,
-      "vm_hwm": "VmHWM:\t   40392 kB",
-      "vm_rss": "VmRSS:\t   36168 kB"
-    },
-    "backend_before": {
-      "cpu_ticks": 1,
-      "pid": 3948209,
-      "rss_pages": 6138,
-      "vm_hwm": "VmHWM:\t   24552 kB",
-      "vm_rss": "VmRSS:\t   24552 kB"
-    },
-    "clickhouse_after": {
-      "cpu_ticks": 1090,
-      "pid": 3947652,
-      "rss_pages": 213036,
-      "vm_hwm": "VmHWM:\t  912376 kB",
-      "vm_rss": "VmRSS:\t  852144 kB"
-    },
-    "clickhouse_before": {
-      "cpu_ticks": 1072,
-      "pid": 3947652,
-      "rss_pages": 216121,
-      "vm_hwm": "VmHWM:\t  912376 kB",
-      "vm_rss": "VmRSS:\t  864484 kB"
-    },
-    "elapsed_ns": 1320698287
-  },
-  "query_phase": {
-    "backend_after": {
-      "cpu_ticks": 102,
-      "pid": 3948209,
-      "rss_pages": 13137,
-      "vm_hwm": "VmHWM:\t   52548 kB",
-      "vm_rss": "VmRSS:\t   52548 kB"
-    },
-    "backend_before": {
-      "cpu_ticks": 25,
-      "pid": 3948209,
-      "rss_pages": 13137,
-      "vm_hwm": "VmHWM:\t   52548 kB",
-      "vm_rss": "VmRSS:\t   52548 kB"
-    },
-    "backend_output_bytes": 5721,
-    "clickhouse_after": {
-      "cpu_ticks": 1963,
-      "pid": 3947652,
-      "rss_pages": 197269,
-      "vm_hwm": "VmHWM:\t  912376 kB",
-      "vm_rss": "VmRSS:\t  789076 kB"
-    },
-    "clickhouse_before": {
-      "cpu_ticks": 1100,
-      "pid": 3947652,
-      "rss_pages": 213654,
-      "vm_hwm": "VmHWM:\t  912376 kB",
-      "vm_rss": "VmRSS:\t  854616 kB"
-    },
-    "clickhouse_storage_bytes": null,
-    "elapsed_ns": 8956498855
-  },
-  "clickhouse_table": {
-    "bytes_on_disk": 507146,
-    "compressed_bytes": 499358,
-    "rows": 86371
-  },
-  "limitations": [
-    "single q05 max workload",
-    "CPU uses Linux scheduler ticks",
-    "RSS is whole-process",
-    "ClickHouse server is externally managed",
-    "CPU counters include server background work and have scheduler-tick precision"
-  ]
-}
diff --git a/tools/clickhouse-benefit/artifacts/fine-1s-matched-trial1.backend-runtime.json b/tools/clickhouse-benefit/artifacts/fine-1s-matched-trial1.backend-runtime.json
deleted file mode 100644
index 99aeffea7..000000000
--- a/tools/clickhouse-benefit/artifacts/fine-1s-matched-trial1.backend-runtime.json
+++ /dev/null
@@ -1 +0,0 @@
-{"cpu_affinity":"60,61","nano_cpus":2000000000,"memory_limit_bytes":4294967296,"image":"sha256:fa394da808cc53f76d0344429421d6c422a6ee85fe7450135c0e3cff4df9bcbb"}
diff --git a/tools/clickhouse-benefit/artifacts/fine-1s-matched-trial1.clickhouse-runtime.json b/tools/clickhouse-benefit/artifacts/fine-1s-matched-trial1.clickhouse-runtime.json
deleted file mode 100644
index 99aeffea7..000000000
--- a/tools/clickhouse-benefit/artifacts/fine-1s-matched-trial1.clickhouse-runtime.json
+++ /dev/null
@@ -1 +0,0 @@
-{"cpu_affinity":"60,61","nano_cpus":2000000000,"memory_limit_bytes":4294967296,"image":"sha256:fa394da808cc53f76d0344429421d6c422a6ee85fe7450135c0e3cff4df9bcbb"}
diff --git a/tools/clickhouse-benefit/artifacts/fine-1s-matched-trial1.executables.sha256 b/tools/clickhouse-benefit/artifacts/fine-1s-matched-trial1.executables.sha256
deleted file mode 100644
index f489416d1..000000000
--- a/tools/clickhouse-benefit/artifacts/fine-1s-matched-trial1.executables.sha256
+++ /dev/null
@@ -1,2 +0,0 @@
-0f04cda0f5ba95bbf43b4e97723ce70bb53d273012d09518034fcdcd062e9fda  /dev/shm/asap-clickhouse-release/release/deps/clickhouse_q05_process_e2e-215210bd391488ba
-4a6901b53ca2b411c4d00171214dc3e248b0a8c6566d36b41bd2a17fc9dabbd2  /dev/shm/asap-clickhouse-release/release/data_plane
diff --git a/tools/clickhouse-benefit/artifacts/fine-1s-matched-trial1.source-checkout.txt b/tools/clickhouse-benefit/artifacts/fine-1s-matched-trial1.source-checkout.txt
deleted file mode 100644
index 4cb1f5751..000000000
--- a/tools/clickhouse-benefit/artifacts/fine-1s-matched-trial1.source-checkout.txt
+++ /dev/null
@@ -1 +0,0 @@
-be62674624c8bf099c5c73bf93751b4cb8936e1f
diff --git a/tools/clickhouse-benefit/artifacts/fine-1s-matched-trial2-summary.json b/tools/clickhouse-benefit/artifacts/fine-1s-matched-trial2-summary.json
deleted file mode 100644
index edde24800..000000000
--- a/tools/clickhouse-benefit/artifacts/fine-1s-matched-trial2-summary.json
+++ /dev/null
@@ -1,164 +0,0 @@
-{
-  "artifact": "/mydata/clickhouse-o11y-main-results/fine-1s-matched-trial2.json",
-  "git_head": null,
-  "input": {
-    "end_ms": 1788891296001,
-    "metric": "service_cache_refresh_lag_seconds",
-    "path": "/mydata/clickhouse-o11y-main-results/fine-1s-24h-series.jsonl",
-    "samples": 86371,
-    "series": [
-      "service_cache_refresh_lag_seconds{job=\"user-service\",instance=\"user-service:8082\"}"
-    ],
-    "start_ms": 1788848096001
-  },
-  "planning_scope": "Planner chooses query DAG against a predeclared MinMax catalog; materialization sizing/selection is not measured",
-  "routes": {
-    "warm": {
-      "requests": 1000,
-      "median_ms": 0.8483295,
-      "p95_ms": 0.954979,
-      "serial_service_requests_per_second": 1192.0394338279,
-      "all_http_200": true,
-      "execution_modes": [
-        "warm"
-      ],
-      "backend_cpu_ms": 760.0,
-      "clickhouse_cpu_ms": 130.0
-    },
-    "exact": {
-      "requests": 1000,
-      "median_ms": 7.448784,
-      "p95_ms": 15.656504,
-      "serial_service_requests_per_second": 117.46095912455337,
-      "all_http_200": true,
-      "execution_modes": [
-        "None"
-      ],
-      "backend_cpu_ms": 10.0,
-      "clickhouse_cpu_ms": 9640.0
-    }
-  },
-  "latency_speedup": 8.780531621262728,
-  "first_query": {
-    "exact_elapsed_ns": 5323034,
-    "warm_elapsed_ns": 7661425
-  },
-  "build_phase": {
-    "backend": {
-      "cpu_ticks": 22,
-      "pid": 3949133,
-      "rss_pages": 9498,
-      "vm_hwm": "VmHWM:\t   42032 kB",
-      "vm_rss": "VmRSS:\t   37992 kB"
-    },
-    "backend_output_bytes": 5721,
-    "clickhouse_after": {
-      "cpu_ticks": 490,
-      "pid": 3948534,
-      "rss_pages": 209788,
-      "vm_hwm": "VmHWM:\t  886396 kB",
-      "vm_rss": "VmRSS:\t  839152 kB"
-    },
-    "clickhouse_before": {
-      "cpu_ticks": 434,
-      "pid": 3948534,
-      "rss_pages": 213713,
-      "vm_hwm": "VmHWM:\t  886396 kB",
-      "vm_rss": "VmRSS:\t  854852 kB"
-    },
-    "elapsed_ns": 2004463391
-  },
-  "source_load_phase": {
-    "clickhouse_after": {
-      "cpu_ticks": 467,
-      "pid": 3948534,
-      "rss_pages": 218020,
-      "vm_hwm": "VmHWM:\t  886396 kB",
-      "vm_rss": "VmRSS:\t  872080 kB"
-    },
-    "clickhouse_before": {
-      "cpu_ticks": 434,
-      "pid": 3948534,
-      "rss_pages": 213713,
-      "vm_hwm": "VmHWM:\t  886396 kB",
-      "vm_rss": "VmRSS:\t  854852 kB"
-    },
-    "elapsed_ns": 627080511
-  },
-  "backfill_phase": {
-    "backend_after": {
-      "cpu_ticks": 22,
-      "pid": 3949133,
-      "rss_pages": 9498,
-      "vm_hwm": "VmHWM:\t   42032 kB",
-      "vm_rss": "VmRSS:\t   37992 kB"
-    },
-    "backend_before": {
-      "cpu_ticks": 0,
-      "pid": 3949133,
-      "rss_pages": 6566,
-      "vm_hwm": "VmHWM:\t   26264 kB",
-      "vm_rss": "VmRSS:\t   26264 kB"
-    },
-    "clickhouse_after": {
-      "cpu_ticks": 490,
-      "pid": 3948534,
-      "rss_pages": 209788,
-      "vm_hwm": "VmHWM:\t  886396 kB",
-      "vm_rss": "VmRSS:\t  839152 kB"
-    },
-    "clickhouse_before": {
-      "cpu_ticks": 467,
-      "pid": 3948534,
-      "rss_pages": 218020,
-      "vm_hwm": "VmHWM:\t  886396 kB",
-      "vm_rss": "VmRSS:\t  872080 kB"
-    },
-    "elapsed_ns": 1320226099
-  },
-  "query_phase": {
-    "backend_after": {
-      "cpu_ticks": 101,
-      "pid": 3949133,
-      "rss_pages": 13713,
-      "vm_hwm": "VmHWM:\t   54852 kB",
-      "vm_rss": "VmRSS:\t   54852 kB"
-    },
-    "backend_before": {
-      "cpu_ticks": 24,
-      "pid": 3949133,
-      "rss_pages": 13713,
-      "vm_hwm": "VmHWM:\t   54852 kB",
-      "vm_rss": "VmRSS:\t   54852 kB"
-    },
-    "backend_output_bytes": 5721,
-    "clickhouse_after": {
-      "cpu_ticks": 1487,
-      "pid": 3948534,
-      "rss_pages": 199091,
-      "vm_hwm": "VmHWM:\t  886396 kB",
-      "vm_rss": "VmRSS:\t  796364 kB"
-    },
-    "clickhouse_before": {
-      "cpu_ticks": 505,
-      "pid": 3948534,
-      "rss_pages": 204421,
-      "vm_hwm": "VmHWM:\t  886396 kB",
-      "vm_rss": "VmRSS:\t  817684 kB"
-    },
-    "clickhouse_storage_bytes": null,
-    "elapsed_ns": 9861869376
-  },
-  "clickhouse_table": {
-    "bytes_on_disk": 507146,
-    "compressed_bytes": 499358,
-    "rows": 86371
-  },
-  "limitations": [
-    "single q05 max workload",
-    "CPU uses Linux scheduler ticks",
-    "RSS is whole-process",
-    "ClickHouse server is externally managed",
-    "CPU counters include server background work and have scheduler-tick precision"
-  ]
-}
diff --git a/tools/clickhouse-benefit/artifacts/fine-1s-matched-trial2.backend-runtime.json b/tools/clickhouse-benefit/artifacts/fine-1s-matched-trial2.backend-runtime.json
deleted file mode 100644
index 99aeffea7..000000000
--- a/tools/clickhouse-benefit/artifacts/fine-1s-matched-trial2.backend-runtime.json
+++ /dev/null
@@ -1 +0,0 @@
-{"cpu_affinity":"60,61","nano_cpus":2000000000,"memory_limit_bytes":4294967296,"image":"sha256:fa394da808cc53f76d0344429421d6c422a6ee85fe7450135c0e3cff4df9bcbb"}
diff --git a/tools/clickhouse-benefit/artifacts/fine-1s-matched-trial2.clickhouse-runtime.json b/tools/clickhouse-benefit/artifacts/fine-1s-matched-trial2.clickhouse-runtime.json
deleted file mode 100644
index 99aeffea7..000000000
--- a/tools/clickhouse-benefit/artifacts/fine-1s-matched-trial2.clickhouse-runtime.json
+++ /dev/null
@@ -1 +0,0 @@
-{"cpu_affinity":"60,61","nano_cpus":2000000000,"memory_limit_bytes":4294967296,"image":"sha256:fa394da808cc53f76d0344429421d6c422a6ee85fe7450135c0e3cff4df9bcbb"}
diff --git a/tools/clickhouse-benefit/artifacts/fine-1s-matched-trial2.executables.sha256 b/tools/clickhouse-benefit/artifacts/fine-1s-matched-trial2.executables.sha256
deleted file mode 100644
index f489416d1..000000000
--- a/tools/clickhouse-benefit/artifacts/fine-1s-matched-trial2.executables.sha256
+++ /dev/null
@@ -1,2 +0,0 @@
-0f04cda0f5ba95bbf43b4e97723ce70bb53d273012d09518034fcdcd062e9fda  /dev/shm/asap-clickhouse-release/release/deps/clickhouse_q05_process_e2e-215210bd391488ba
-4a6901b53ca2b411c4d00171214dc3e248b0a8c6566d36b41bd2a17fc9dabbd2  /dev/shm/asap-clickhouse-release/release/data_plane
diff --git a/tools/clickhouse-benefit/artifacts/fine-1s-matched-trial2.source-checkout.txt b/tools/clickhouse-benefit/artifacts/fine-1s-matched-trial2.source-checkout.txt
deleted file mode 100644
index 4cb1f5751..000000000
--- a/tools/clickhouse-benefit/artifacts/fine-1s-matched-trial2.source-checkout.txt
+++ /dev/null
@@ -1 +0,0 @@
-be62674624c8bf099c5c73bf93751b4cb8936e1f
diff --git a/tools/clickhouse-benefit/artifacts/fine-1s-matched-trial3-summary.json b/tools/clickhouse-benefit/artifacts/fine-1s-matched-trial3-summary.json
deleted file mode 100644
index 45772741b..000000000
--- a/tools/clickhouse-benefit/artifacts/fine-1s-matched-trial3-summary.json
+++ /dev/null
@@ -1,164 +0,0 @@
-{
-  "artifact": "/mydata/clickhouse-o11y-main-results/fine-1s-matched-trial3.json",
-  "git_head": null,
-  "input": {
-    "end_ms": 1788891296001,
-    "metric": "service_cache_refresh_lag_seconds",
-    "path": "/mydata/clickhouse-o11y-main-results/fine-1s-24h-series.jsonl",
-    "samples": 86371,
-    "series": [
-      "service_cache_refresh_lag_seconds{job=\"user-service\",instance=\"user-service:8082\"}"
-    ],
-    "start_ms": 1788848096001
-  },
-  "planning_scope": "Planner chooses query DAG against a predeclared MinMax catalog; materialization sizing/selection is not measured",
-  "routes": {
-    "warm": {
-      "requests": 1000,
-      "median_ms": 0.8495135,
-      "p95_ms": 0.955337,
-      "serial_service_requests_per_second": 1169.494625714339,
-      "all_http_200": true,
-      "execution_modes": [
-        "warm"
-      ],
-      "backend_cpu_ms": 780.0,
-      "clickhouse_cpu_ms": 70.0
-    },
-    "exact": {
-      "requests": 1000,
-      "median_ms": 7.0188415,
-      "p95_ms": 15.255142,
-      "serial_service_requests_per_second": 128.94987935753605,
-      "all_http_200": true,
-      "execution_modes": [
-        "None"
-      ],
-      "backend_cpu_ms": 0.0,
-      "clickhouse_cpu_ms": 8560.0
-    }
-  },
-  "latency_speedup": 8.26218947668283,
-  "first_query": {
-    "exact_elapsed_ns": 9517647,
-    "warm_elapsed_ns": 7966281
-  },
-  "build_phase": {
-    "backend": {
-      "cpu_ticks": 20,
-      "pid": 3949945,
-      "rss_pages": 9370,
-      "vm_hwm": "VmHWM:\t   41100 kB",
-      "vm_rss": "VmRSS:\t   37480 kB"
-    },
-    "backend_output_bytes": 5721,
-    "clickhouse_after": {
-      "cpu_ticks": 527,
-      "pid": 3949328,
-      "rss_pages": 196869,
-      "vm_hwm": "VmHWM:\t  826360 kB",
-      "vm_rss": "VmRSS:\t  787476 kB"
-    },
-    "clickhouse_before": {
-      "cpu_ticks": 479,
-      "pid": 3949328,
-      "rss_pages": 187106,
-      "vm_hwm": "VmHWM:\t  755728 kB",
-      "vm_rss": "VmRSS:\t  748424 kB"
-    },
-    "elapsed_ns": 1963306622
-  },
-  "source_load_phase": {
-    "clickhouse_after": {
-      "cpu_ticks": 509,
-      "pid": 3949328,
-      "rss_pages": 206590,
-      "vm_hwm": "VmHWM:\t  826360 kB",
-      "vm_rss": "VmRSS:\t  826360 kB"
-    },
-    "clickhouse_before": {
-      "cpu_ticks": 479,
-      "pid": 3949328,
-      "rss_pages": 187106,
-      "vm_hwm": "VmHWM:\t  755728 kB",
-      "vm_rss": "VmRSS:\t  748424 kB"
-    },
-    "elapsed_ns": 587903469
-  },
-  "backfill_phase": {
-    "backend_after": {
-      "cpu_ticks": 20,
-      "pid": 3949945,
-      "rss_pages": 9370,
-      "vm_hwm": "VmHWM:\t   41100 kB",
-      "vm_rss": "VmRSS:\t   37480 kB"
-    },
-    "backend_before": {
-      "cpu_ticks": 0,
-      "pid": 3949945,
-      "rss_pages": 6584,
-      "vm_hwm": "VmHWM:\t   26336 kB",
-      "vm_rss": "VmRSS:\t   26336 kB"
-    },
-    "clickhouse_after": {
-      "cpu_ticks": 527,
-      "pid": 3949328,
-      "rss_pages": 196869,
-      "vm_hwm": "VmHWM:\t  826360 kB",
-      "vm_rss": "VmRSS:\t  787476 kB"
-    },
-    "clickhouse_before": {
-      "cpu_ticks": 509,
-      "pid": 3949328,
-      "rss_pages": 206590,
-      "vm_hwm": "VmHWM:\t  826360 kB",
-      "vm_rss": "VmRSS:\t  826360 kB"
-    },
-    "elapsed_ns": 1318575148
-  },
-  "query_phase": {
-    "backend_after": {
-      "cpu_ticks": 100,
-      "pid": 3949945,
-      "rss_pages": 13480,
-      "vm_hwm": "VmHWM:\t   53920 kB",
-      "vm_rss": "VmRSS:\t   53920 kB"
-    },
-    "backend_before": {
-      "cpu_ticks": 22,
-      "pid": 3949945,
-      "rss_pages": 13480,
-      "vm_hwm": "VmHWM:\t   53920 kB",
-      "vm_rss": "VmRSS:\t   53920 kB"
-    },
-    "backend_output_bytes": 5721,
-    "clickhouse_after": {
-      "cpu_ticks": 1415,
-      "pid": 3949328,
-      "rss_pages": 192315,
-      "vm_hwm": "VmHWM:\t  826360 kB",
-      "vm_rss": "VmRSS:\t  769260 kB"
-    },
-    "clickhouse_before": {
-      "cpu_ticks": 544,
-      "pid": 3949328,
-      "rss_pages": 196595,
-      "vm_hwm": "VmHWM:\t  826360 kB",
-      "vm_rss": "VmRSS:\t  786380 kB"
-    },
-    "clickhouse_storage_bytes": null,
-    "elapsed_ns": 9129800855
-  },
-  "clickhouse_table": {
-    "bytes_on_disk": 507146,
-    "compressed_bytes": 499358,
-    "rows": 86371
-  },
-  "limitations": [
-    "single q05 max workload",
-    "CPU uses Linux scheduler ticks",
-    "RSS is whole-process",
-    "ClickHouse server is externally managed",
-    "CPU counters include server background work and have scheduler-tick precision"
-  ]
-}
diff --git a/tools/clickhouse-benefit/artifacts/fine-1s-matched-trial3.backend-runtime.json b/tools/clickhouse-benefit/artifacts/fine-1s-matched-trial3.backend-runtime.json
deleted file mode 100644
index 99aeffea7..000000000
--- a/tools/clickhouse-benefit/artifacts/fine-1s-matched-trial3.backend-runtime.json
+++ /dev/null
@@ -1 +0,0 @@
-{"cpu_affinity":"60,61","nano_cpus":2000000000,"memory_limit_bytes":4294967296,"image":"sha256:fa394da808cc53f76d0344429421d6c422a6ee85fe7450135c0e3cff4df9bcbb"}
diff --git a/tools/clickhouse-benefit/artifacts/fine-1s-matched-trial3.clickhouse-runtime.json b/tools/clickhouse-benefit/artifacts/fine-1s-matched-trial3.clickhouse-runtime.json
deleted file mode 100644
index 99aeffea7..000000000
--- a/tools/clickhouse-benefit/artifacts/fine-1s-matched-trial3.clickhouse-runtime.json
+++ /dev/null
@@ -1 +0,0 @@
-{"cpu_affinity":"60,61","nano_cpus":2000000000,"memory_limit_bytes":4294967296,"image":"sha256:fa394da808cc53f76d0344429421d6c422a6ee85fe7450135c0e3cff4df9bcbb"}
diff --git a/tools/clickhouse-benefit/artifacts/fine-1s-matched-trial3.executables.sha256 b/tools/clickhouse-benefit/artifacts/fine-1s-matched-trial3.executables.sha256
deleted file mode 100644
index f489416d1..000000000
--- a/tools/clickhouse-benefit/artifacts/fine-1s-matched-trial3.executables.sha256
+++ /dev/null
@@ -1,2 +0,0 @@
-0f04cda0f5ba95bbf43b4e97723ce70bb53d273012d09518034fcdcd062e9fda  /dev/shm/asap-clickhouse-release/release/deps/clickhouse_q05_process_e2e-215210bd391488ba
-4a6901b53ca2b411c4d00171214dc3e248b0a8c6566d36b41bd2a17fc9dabbd2  /dev/shm/asap-clickhouse-release/release/data_plane
diff --git a/tools/clickhouse-benefit/artifacts/fine-1s-matched-trial3.source-checkout.txt b/tools/clickhouse-benefit/artifacts/fine-1s-matched-trial3.source-checkout.txt
deleted file mode 100644
index 4cb1f5751..000000000
--- a/tools/clickhouse-benefit/artifacts/fine-1s-matched-trial3.source-checkout.txt
+++ /dev/null
@@ -1 +0,0 @@
-be62674624c8bf099c5c73bf93751b4cb8936e1f
diff --git a/tools/clickhouse-benefit/artifacts/fine-1s-release-trial1-summary.json b/tools/clickhouse-benefit/artifacts/fine-1s-release-trial1-summary.json
deleted file mode 100644
index a87144e6f..000000000
--- a/tools/clickhouse-benefit/artifacts/fine-1s-release-trial1-summary.json
+++ /dev/null
@@ -1,164 +0,0 @@
-{
-  "artifact": "/mydata/clickhouse-o11y-main-results/fine-1s-release-trial1.json",
-  "git_head": "a618e4e19f02167d95a461fb33a6b8d62b5bcd1d",
-  "input": {
-    "end_ms": 1788891296001,
-    "metric": "service_cache_refresh_lag_seconds",
-    "path": "/mydata/clickhouse-o11y-main-results/fine-1s-24h-series.jsonl",
-    "samples": 86371,
-    "series": [
-      "service_cache_refresh_lag_seconds{job=\"user-service\",instance=\"user-service:8082\"}"
-    ],
-    "start_ms": 1788848096001
-  },
-  "planning_scope": "Planner chooses query DAG against a predeclared MinMax catalog; materialization sizing/selection is not measured",
-  "routes": {
-    "warm": {
-      "requests": 1000,
-      "median_ms": 0.8525005,
-      "p95_ms": 0.935042,
-      "serial_service_requests_per_second": 1187.819655855078,
-      "all_http_200": true,
-      "execution_modes": [
-        "warm"
-      ],
-      "backend_cpu_ms": 770.0,
-      "clickhouse_cpu_ms": 70.0
-    },
-    "exact": {
-      "requests": 1000,
-      "median_ms": 6.574658,
-      "p95_ms": 13.609,
-      "serial_service_requests_per_second": 146.07200844928758,
-      "all_http_200": true,
-      "execution_modes": [
-        "None"
-      ],
-      "backend_cpu_ms": 0.0,
-      "clickhouse_cpu_ms": 7650.0
-    }
-  },
-  "latency_speedup": 7.712204274366995,
-  "first_query": {
-    "exact_elapsed_ns": 8443019,
-    "warm_elapsed_ns": 4285617
-  },
-  "build_phase": {
-    "backend": {
-      "cpu_ticks": 21,
-      "pid": 3945208,
-      "rss_pages": 9411,
-      "vm_hwm": "VmHWM:\t   41972 kB",
-      "vm_rss": "VmRSS:\t   37644 kB"
-    },
-    "backend_output_bytes": 5721,
-    "clickhouse_after": {
-      "cpu_ticks": 3705,
-      "pid": 3943989,
-      "rss_pages": 216394,
-      "vm_hwm": "VmHWM:\t  913604 kB",
-      "vm_rss": "VmRSS:\t  865576 kB"
-    },
-    "clickhouse_before": {
-      "cpu_ticks": 3641,
-      "pid": 3943989,
-      "rss_pages": 195830,
-      "vm_hwm": "VmHWM:\t  913604 kB",
-      "vm_rss": "VmRSS:\t  783320 kB"
-    },
-    "elapsed_ns": 1952419156
-  },
-  "source_load_phase": {
-    "clickhouse_after": {
-      "cpu_ticks": 3671,
-      "pid": 3943989,
-      "rss_pages": 216692,
-      "vm_hwm": "VmHWM:\t  913604 kB",
-      "vm_rss": "VmRSS:\t  866768 kB"
-    },
-    "clickhouse_before": {
-      "cpu_ticks": 3641,
-      "pid": 3943989,
-      "rss_pages": 195830,
-      "vm_hwm": "VmHWM:\t  913604 kB",
-      "vm_rss": "VmRSS:\t  783320 kB"
-    },
-    "elapsed_ns": 574669147
-  },
-  "backfill_phase": {
-    "backend_after": {
-      "cpu_ticks": 21,
-      "pid": 3945208,
-      "rss_pages": 9411,
-      "vm_hwm": "VmHWM:\t   41972 kB",
-      "vm_rss": "VmRSS:\t   37644 kB"
-    },
-    "backend_before": {
-      "cpu_ticks": 0,
-      "pid": 3945208,
-      "rss_pages": 6593,
-      "vm_hwm": "VmHWM:\t   26372 kB",
-      "vm_rss": "VmRSS:\t   26372 kB"
-    },
-    "clickhouse_after": {
-      "cpu_ticks": 3705,
-      "pid": 3943989,
-      "rss_pages": 216394,
-      "vm_hwm": "VmHWM:\t  913604 kB",
-      "vm_rss": "VmRSS:\t  865576 kB"
-    },
-    "clickhouse_before": {
-      "cpu_ticks": 3671,
-      "pid": 3943989,
-      "rss_pages": 212622,
-      "vm_hwm": "VmHWM:\t  913604 kB",
-      "vm_rss": "VmRSS:\t  850488 kB"
-    },
-    "elapsed_ns": 1318856557
-  },
-  "query_phase": {
-    "backend_after": {
-      "cpu_ticks": 99,
-      "pid": 3945208,
-      "rss_pages": 13021,
-      "vm_hwm": "VmHWM:\t   52084 kB",
-      "vm_rss": "VmRSS:\t   52084 kB"
-    },
-    "backend_before": {
-      "cpu_ticks": 22,
-      "pid": 3945208,
-      "rss_pages": 13021,
-      "vm_hwm": "VmHWM:\t   52084 kB",
-      "vm_rss": "VmRSS:\t   52084 kB"
-    },
-    "backend_output_bytes": 5721,
-    "clickhouse_after": {
-      "cpu_ticks": 4498,
-      "pid": 3943989,
-      "rss_pages": 212991,
-      "vm_hwm": "VmHWM:\t  913604 kB",
-      "vm_rss": "VmRSS:\t  851964 kB"
-    },
-    "clickhouse_before": {
-      "cpu_ticks": 3719,
-      "pid": 3943989,
-      "rss_pages": 217154,
-      "vm_hwm": "VmHWM:\t  913604 kB",
-      "vm_rss": "VmRSS:\t  868616 kB"
-    },
-    "clickhouse_storage_bytes": null,
-    "elapsed_ns": 8162678286
-  },
-  "clickhouse_table": {
-    "bytes_on_disk": 507146,
-    "compressed_bytes": 499358,
-    "rows": 86371
-  },
-  "limitations": [
-    "single q05 max workload",
-    "CPU uses Linux scheduler ticks",
-    "RSS is whole-process",
-    "ClickHouse server is externally managed",
-    "CPU counters include server background work and have scheduler-tick precision"
-  ]
-}
diff --git a/tools/clickhouse-benefit/artifacts/fine-1s-release-trial2-summary.json b/tools/clickhouse-benefit/artifacts/fine-1s-release-trial2-summary.json
deleted file mode 100644
index 3233cf977..000000000
--- a/tools/clickhouse-benefit/artifacts/fine-1s-release-trial2-summary.json
+++ /dev/null
@@ -1,164 +0,0 @@
-{
-  "artifact": "/mydata/clickhouse-o11y-main-results/fine-1s-release-trial2.json",
-  "git_head": "a618e4e19f02167d95a461fb33a6b8d62b5bcd1d",
-  "input": {
-    "end_ms": 1788891296001,
-    "metric": "service_cache_refresh_lag_seconds",
-    "path": "/mydata/clickhouse-o11y-main-results/fine-1s-24h-series.jsonl",
-    "samples": 86371,
-    "series": [
-      "service_cache_refresh_lag_seconds{job=\"user-service\",instance=\"user-service:8082\"}"
-    ],
-    "start_ms": 1788848096001
-  },
-  "planning_scope": "Planner chooses query DAG against a predeclared MinMax catalog; materialization sizing/selection is not measured",
-  "routes": {
-    "warm": {
-      "requests": 1000,
-      "median_ms": 0.852957,
-      "p95_ms": 1.017016,
-      "serial_service_requests_per_second": 1178.7970774022772,
-      "all_http_200": true,
-      "execution_modes": [
-        "warm"
-      ],
-      "backend_cpu_ms": 770.0,
-      "clickhouse_cpu_ms": 80.0
-    },
-    "exact": {
-      "requests": 1000,
-      "median_ms": 6.831614999999999,
-      "p95_ms": 15.355809,
-      "serial_service_requests_per_second": 130.18295633571148,
-      "all_http_200": true,
-      "execution_modes": [
-        "None"
-      ],
-      "backend_cpu_ms": 0.0,
-      "clickhouse_cpu_ms": 8410.0
-    }
-  },
-  "latency_speedup": 8.009331068271905,
-  "first_query": {
-    "exact_elapsed_ns": 7978286,
-    "warm_elapsed_ns": 5680973
-  },
-  "build_phase": {
-    "backend": {
-      "cpu_ticks": 20,
-      "pid": 3945895,
-      "rss_pages": 9062,
-      "vm_hwm": "VmHWM:\t   39320 kB",
-      "vm_rss": "VmRSS:\t   36248 kB"
-    },
-    "backend_output_bytes": 5721,
-    "clickhouse_after": {
-      "cpu_ticks": 913,
-      "pid": 3945404,
-      "rss_pages": 212022,
-      "vm_hwm": "VmHWM:\t  889284 kB",
-      "vm_rss": "VmRSS:\t  848088 kB"
-    },
-    "clickhouse_before": {
-      "cpu_ticks": 859,
-      "pid": 3945404,
-      "rss_pages": 201560,
-      "vm_hwm": "VmHWM:\t  889284 kB",
-      "vm_rss": "VmRSS:\t  806240 kB"
-    },
-    "elapsed_ns": 1999108917
-  },
-  "source_load_phase": {
-    "clickhouse_after": {
-      "cpu_ticks": 890,
-      "pid": 3945404,
-      "rss_pages": 217917,
-      "vm_hwm": "VmHWM:\t  889284 kB",
-      "vm_rss": "VmRSS:\t  871668 kB"
-    },
-    "clickhouse_before": {
-      "cpu_ticks": 859,
-      "pid": 3945404,
-      "rss_pages": 201560,
-      "vm_hwm": "VmHWM:\t  889284 kB",
-      "vm_rss": "VmRSS:\t  806240 kB"
-    },
-    "elapsed_ns": 621697688
-  },
-  "backfill_phase": {
-    "backend_after": {
-      "cpu_ticks": 20,
-      "pid": 3945895,
-      "rss_pages": 9062,
-      "vm_hwm": "VmHWM:\t   39320 kB",
-      "vm_rss": "VmRSS:\t   36248 kB"
-    },
-    "backend_before": {
-      "cpu_ticks": 1,
-      "pid": 3945895,
-      "rss_pages": 6158,
-      "vm_hwm": "VmHWM:\t   24632 kB",
-      "vm_rss": "VmRSS:\t   24632 kB"
-    },
-    "clickhouse_after": {
-      "cpu_ticks": 913,
-      "pid": 3945404,
-      "rss_pages": 212022,
-      "vm_hwm": "VmHWM:\t  889284 kB",
-      "vm_rss": "VmRSS:\t  848088 kB"
-    },
-    "clickhouse_before": {
-      "cpu_ticks": 890,
-      "pid": 3945404,
-      "rss_pages": 216543,
-      "vm_hwm": "VmHWM:\t  889284 kB",
-      "vm_rss": "VmRSS:\t  866172 kB"
-    },
-    "elapsed_ns": 1319154418
-  },
-  "query_phase": {
-    "backend_after": {
-      "cpu_ticks": 99,
-      "pid": 3945895,
-      "rss_pages": 13187,
-      "vm_hwm": "VmHWM:\t   52748 kB",
-      "vm_rss": "VmRSS:\t   52748 kB"
-    },
-    "backend_before": {
-      "cpu_ticks": 22,
-      "pid": 3945895,
-      "rss_pages": 13187,
-      "vm_hwm": "VmHWM:\t   52748 kB",
-      "vm_rss": "VmRSS:\t   52748 kB"
-    },
-    "backend_output_bytes": 5721,
-    "clickhouse_after": {
-      "cpu_ticks": 1781,
-      "pid": 3945404,
-      "rss_pages": 200633,
-      "vm_hwm": "VmHWM:\t  889284 kB",
-      "vm_rss": "VmRSS:\t  802532 kB"
-    },
-    "clickhouse_before": {
-      "cpu_ticks": 930,
-      "pid": 3945404,
-      "rss_pages": 211535,
-      "vm_hwm": "VmHWM:\t  889284 kB",
-      "vm_rss": "VmRSS:\t  846140 kB"
-    },
-    "clickhouse_storage_bytes": null,
-    "elapsed_ns": 9001513338
-  },
-  "clickhouse_table": {
-    "bytes_on_disk": 507146,
-    "compressed_bytes": 499358,
-    "rows": 86371
-  },
-  "limitations": [
-    "single q05 max workload",
-    "CPU uses Linux scheduler ticks",
-    "RSS is whole-process",
-    "ClickHouse server is externally managed",
-    "CPU counters include server background work and have scheduler-tick precision"
-  ]
-}
diff --git a/tools/clickhouse-benefit/artifacts/fine-1s-release-trial3-summary.json b/tools/clickhouse-benefit/artifacts/fine-1s-release-trial3-summary.json
deleted file mode 100644
index 6042ec647..000000000
--- a/tools/clickhouse-benefit/artifacts/fine-1s-release-trial3-summary.json
+++ /dev/null
@@ -1,164 +0,0 @@
-{
-  "artifact": "/mydata/clickhouse-o11y-main-results/fine-1s-release-trial3.json",
-  "git_head": "a618e4e19f02167d95a461fb33a6b8d62b5bcd1d",
-  "input": {
-    "end_ms": 1788891296001,
-    "metric": "service_cache_refresh_lag_seconds",
-    "path": "/mydata/clickhouse-o11y-main-results/fine-1s-24h-series.jsonl",
-    "samples": 86371,
-    "series": [
-      "service_cache_refresh_lag_seconds{job=\"user-service\",instance=\"user-service:8082\"}"
-    ],
-    "start_ms": 1788848096001
-  },
-  "planning_scope": "Planner chooses query DAG against a predeclared MinMax catalog; materialization sizing/selection is not measured",
-  "routes": {
-    "warm": {
-      "requests": 1000,
-      "median_ms": 0.8533085,
-      "p95_ms": 0.952131,
-      "serial_service_requests_per_second": 1180.720237904643,
-      "all_http_200": true,
-      "execution_modes": [
-        "warm"
-      ],
-      "backend_cpu_ms": 780.0,
-      "clickhouse_cpu_ms": 130.0
-    },
-    "exact": {
-      "requests": 1000,
-      "median_ms": 6.7635629999999995,
-      "p95_ms": 15.569402,
-      "serial_service_requests_per_second": 131.27853745728964,
-      "all_http_200": true,
-      "execution_modes": [
-        "None"
-      ],
-      "backend_cpu_ms": 0.0,
-      "clickhouse_cpu_ms": 8530.0
-    }
-  },
-  "latency_speedup": 7.926281057788595,
-  "first_query": {
-    "exact_elapsed_ns": 5997155,
-    "warm_elapsed_ns": 3894500
-  },
-  "build_phase": {
-    "backend": {
-      "cpu_ticks": 26,
-      "pid": 3946597,
-      "rss_pages": 9148,
-      "vm_hwm": "VmHWM:\t   40496 kB",
-      "vm_rss": "VmRSS:\t   36592 kB"
-    },
-    "backend_output_bytes": 5721,
-    "clickhouse_after": {
-      "cpu_ticks": 814,
-      "pid": 3946094,
-      "rss_pages": 212051,
-      "vm_hwm": "VmHWM:\t  848204 kB",
-      "vm_rss": "VmRSS:\t  848204 kB"
-    },
-    "clickhouse_before": {
-      "cpu_ticks": 762,
-      "pid": 3946094,
-      "rss_pages": 187048,
-      "vm_hwm": "VmHWM:\t  839656 kB",
-      "vm_rss": "VmRSS:\t  748192 kB"
-    },
-    "elapsed_ns": 1954645490
-  },
-  "source_load_phase": {
-    "clickhouse_after": {
-      "cpu_ticks": 795,
-      "pid": 3946094,
-      "rss_pages": 209575,
-      "vm_hwm": "VmHWM:\t  839656 kB",
-      "vm_rss": "VmRSS:\t  838300 kB"
-    },
-    "clickhouse_before": {
-      "cpu_ticks": 762,
-      "pid": 3946094,
-      "rss_pages": 187048,
-      "vm_hwm": "VmHWM:\t  839656 kB",
-      "vm_rss": "VmRSS:\t  748192 kB"
-    },
-    "elapsed_ns": 577783439
-  },
-  "backfill_phase": {
-    "backend_after": {
-      "cpu_ticks": 26,
-      "pid": 3946597,
-      "rss_pages": 9148,
-      "vm_hwm": "VmHWM:\t   40496 kB",
-      "vm_rss": "VmRSS:\t   36592 kB"
-    },
-    "backend_before": {
-      "cpu_ticks": 0,
-      "pid": 3946597,
-      "rss_pages": 6263,
-      "vm_hwm": "VmHWM:\t   25052 kB",
-      "vm_rss": "VmRSS:\t   25052 kB"
-    },
-    "clickhouse_after": {
-      "cpu_ticks": 814,
-      "pid": 3946094,
-      "rss_pages": 212051,
-      "vm_hwm": "VmHWM:\t  848204 kB",
-      "vm_rss": "VmRSS:\t  848204 kB"
-    },
-    "clickhouse_before": {
-      "cpu_ticks": 795,
-      "pid": 3946094,
-      "rss_pages": 209575,
-      "vm_hwm": "VmHWM:\t  839656 kB",
-      "vm_rss": "VmRSS:\t  838300 kB"
-    },
-    "elapsed_ns": 1319586321
-  },
-  "query_phase": {
-    "backend_after": {
-      "cpu_ticks": 105,
-      "pid": 3946597,
-      "rss_pages": 13424,
-      "vm_hwm": "VmHWM:\t   53696 kB",
-      "vm_rss": "VmRSS:\t   53696 kB"
-    },
-    "backend_before": {
-      "cpu_ticks": 27,
-      "pid": 3946597,
-      "rss_pages": 13424,
-      "vm_hwm": "VmHWM:\t   53696 kB",
-      "vm_rss": "VmRSS:\t   53696 kB"
-    },
-    "backend_output_bytes": 5721,
-    "clickhouse_after": {
-      "cpu_ticks": 1698,
-      "pid": 3946094,
-      "rss_pages": 210394,
-      "vm_hwm": "VmHWM:\t  883480 kB",
-      "vm_rss": "VmRSS:\t  841576 kB"
-    },
-    "clickhouse_before": {
-      "cpu_ticks": 824,
-      "pid": 3946094,
-      "rss_pages": 210703,
-      "vm_hwm": "VmHWM:\t  849852 kB",
-      "vm_rss": "VmRSS:\t  842812 kB"
-    },
-    "clickhouse_storage_bytes": null,
-    "elapsed_ns": 8935845648
-  },
-  "clickhouse_table": {
-    "bytes_on_disk": 507146,
-    "compressed_bytes": 499358,
-    "rows": 86371
-  },
-  "limitations": [
-    "single q05 max workload",
-    "CPU uses Linux scheduler ticks",
-    "RSS is whole-process",
-    "ClickHouse server is externally managed",
-    "CPU counters include server background work and have scheduler-tick precision"
-  ]
-}
diff --git a/tools/clickhouse-benefit/artifacts/latest-main-mixed-e2e.log b/tools/clickhouse-benefit/artifacts/latest-main-mixed-e2e.log
deleted file mode 100644
index 5a34049e1..000000000
--- a/tools/clickhouse-benefit/artifacts/latest-main-mixed-e2e.log
+++ /dev/null
@@ -1,6 +0,0 @@
-
-running 1 test
-test compiled_publication_executes_mixed_dag_in_data_plane_process ... ok
-
-test result: ok. 1 passed; 0 failed; 0 ignored; 0 measured; 1 filtered out; finished in 2.02s
-
diff --git a/tools/clickhouse-benefit/artifacts/latest-main-planner-matrix.json b/tools/clickhouse-benefit/artifacts/latest-main-planner-matrix.json
deleted file mode 100644
index be37b438d..000000000
--- a/tools/clickhouse-benefit/artifacts/latest-main-planner-matrix.json
+++ /dev/null
@@ -1,298 +0,0 @@
-{
-  "baseline": "0.1.0",
-  "queries": [
-    {
-      "id": "q01",
-      "operators": [
-        "sort_desc",
-        "increase",
-        "division"
-      ],
-      "parser_planner": "failure",
-      "reason": "SQL lowering failed: DataFusion error: SQL error: ParserError(\"Expected: joined table, found: .\")",
-      "sql": "SELECT * FROM (SELECT a.labels,a.value/b.value value FROM (SELECT map('job',job) labels,sum(value) value FROM (SELECT labels['job'] job,value FROM (SELECT labels, corrected*(sampled+least(start_extra,if(corrected>0,sampled*(first_value/corrected),start_extra))+end_extra)/sampled AS value FROM (SELECT labels,samples,length(samples) n,samples[1].1 first_ts,samples[n].1 last_ts,samples[1].2 first_value,samples[n].2 last_value,(last_ts-first_ts)/1000 sampled,(last_value-first_value)+arraySum(i -> if(samples[i].2<samples[i-1].2,samples[i-1].2,0.),range(2,n+1)) corrected,if((first_ts-((1788891296000-0)-21600000))/1000<sampled/(n-1)*1.1,(first_ts-((1788891296000-0)-21600000))/1000,sampled/(n-1)/2) start_extra,if(((1788891296000-0)-last_ts)/1000<sampled/(n-1)*1.1,((1788891296000-0)-last_ts)/1000,sampled/(n-1)/2) end_extra FROM (SELECT labels,arraySort(x -> x.1,groupArray((ts_ms,value))) samples FROM raw_samples WHERE metric='backend_http_5xx_total' AND ts_ms>=((1788891296000-0)-21600000) AND ts_ms<=(1788891296000-0) GROUP BY labels) WHERE n>=2))) GROUP BY job) a INNER JOIN (SELECT map('job',job) labels,sum(value) value FROM (SELECT labels['job'] job,value FROM (SELECT labels, corrected*(sampled+least(start_extra,if(corrected>0,sampled*(first_value/corrected),start_extra))+end_extra)/sampled AS value FROM (SELECT labels,samples,length(samples) n,samples[1].1 first_ts,samples[n].1 last_ts,samples[1].2 first_value,samples[n].2 last_value,(last_ts-first_ts)/1000 sampled,(last_value-first_value)+arraySum(i -> if(samples[i].2<samples[i-1].2,samples[i-1].2,0.),range(2,n+1)) corrected,if((first_ts-((1788891296000-0)-21600000))/1000<sampled/(n-1)*1.1,(first_ts-((1788891296000-0)-21600000))/1000,sampled/(n-1)/2) start_extra,if(((1788891296000-0)-last_ts)/1000<sampled/(n-1)*1.1,((1788891296000-0)-last_ts)/1000,sampled/(n-1)/2) end_extra FROM (SELECT labels,arraySort(x -> x.1,groupArray((ts_ms,value))) samples FROM raw_samples WHERE metric='backend_http_requests_total' AND ts_ms>=((1788891296000-0)-21600000) AND ts_ms<=(1788891296000-0) GROUP BY labels) WHERE n>=2))) GROUP BY job) b ON a.labels=b.labels) ORDER BY value DESC,labels"
-    },
-    {
-      "id": "q02",
-      "operators": [
-        "topk",
-        "increase",
-        "division"
-      ],
-      "parser_planner": "failure",
-      "reason": "SQL lowering failed: DataFusion error: SQL error: ParserError(\"Expected: joined table, found: .\")",
-      "sql": "SELECT * FROM (SELECT a.labels,a.value/b.value value FROM (SELECT map('job',job) labels,sum(value) value FROM (SELECT labels['job'] job,value FROM (SELECT labels, corrected*(sampled+least(start_extra,if(corrected>0,sampled*(first_value/corrected),start_extra))+end_extra)/sampled AS value FROM (SELECT labels,samples,length(samples) n,samples[1].1 first_ts,samples[n].1 last_ts,samples[1].2 first_value,samples[n].2 last_value,(last_ts-first_ts)/1000 sampled,(last_value-first_value)+arraySum(i -> if(samples[i].2<samples[i-1].2,samples[i-1].2,0.),range(2,n+1)) corrected,if((first_ts-((1788891296000-0)-21600000))/1000<sampled/(n-1)*1.1,(first_ts-((1788891296000-0)-21600000))/1000,sampled/(n-1)/2) start_extra,if(((1788891296000-0)-last_ts)/1000<sampled/(n-1)*1.1,((1788891296000-0)-last_ts)/1000,sampled/(n-1)/2) end_extra FROM (SELECT labels,arraySort(x -> x.1,groupArray((ts_ms,value))) samples FROM raw_samples WHERE metric='backend_http_5xx_total' AND ts_ms>=((1788891296000-0)-21600000) AND ts_ms<=(1788891296000-0) GROUP BY labels) WHERE n>=2))) GROUP BY job) a INNER JOIN (SELECT map('job',job) labels,sum(value) value FROM (SELECT labels['job'] job,value FROM (SELECT labels, corrected*(sampled+least(start_extra,if(corrected>0,sampled*(first_value/corrected),start_extra))+end_extra)/sampled AS value FROM (SELECT labels,samples,length(samples) n,samples[1].1 first_ts,samples[n].1 last_ts,samples[1].2 first_value,samples[n].2 last_value,(last_ts-first_ts)/1000 sampled,(last_value-first_value)+arraySum(i -> if(samples[i].2<samples[i-1].2,samples[i-1].2,0.),range(2,n+1)) corrected,if((first_ts-((1788891296000-0)-21600000))/1000<sampled/(n-1)*1.1,(first_ts-((1788891296000-0)-21600000))/1000,sampled/(n-1)/2) start_extra,if(((1788891296000-0)-last_ts)/1000<sampled/(n-1)*1.1,((1788891296000-0)-last_ts)/1000,sampled/(n-1)/2) end_extra FROM (SELECT labels,arraySort(x -> x.1,groupArray((ts_ms,value))) samples FROM raw_samples WHERE metric='backend_http_requests_total' AND ts_ms>=((1788891296000-0)-21600000) AND ts_ms<=(1788891296000-0) GROUP BY labels) WHERE n>=2))) GROUP BY job) b ON a.labels=b.labels) ORDER BY value DESC,labels LIMIT 1"
-    },
-    {
-      "id": "q03",
-      "operators": [
-        "increase",
-        "sum",
-        "division"
-      ],
-      "parser_planner": "failure",
-      "reason": "SQL lowering failed: DataFusion error: SQL error: ParserError(\"Expected: identifier, found: )\")",
-      "sql": "SELECT a.labels,a.value/b.value value FROM (SELECT map() labels,sum(value) value FROM (SELECT labels, corrected*(sampled+least(start_extra,if(corrected>0,sampled*(first_value/corrected),start_extra))+end_extra)/sampled AS value FROM (SELECT labels,samples,length(samples) n,samples[1].1 first_ts,samples[n].1 last_ts,samples[1].2 first_value,samples[n].2 last_value,(last_ts-first_ts)/1000 sampled,(last_value-first_value)+arraySum(i -> if(samples[i].2<samples[i-1].2,samples[i-1].2,0.),range(2,n+1)) corrected,if((first_ts-((1788891296000-0)-3600000))/1000<sampled/(n-1)*1.1,(first_ts-((1788891296000-0)-3600000))/1000,sampled/(n-1)/2) start_extra,if(((1788891296000-0)-last_ts)/1000<sampled/(n-1)*1.1,((1788891296000-0)-last_ts)/1000,sampled/(n-1)/2) end_extra FROM (SELECT labels,arraySort(x -> x.1,groupArray((ts_ms,value))) samples FROM raw_samples WHERE metric='payment_service_http_5xx_total' AND ts_ms>=((1788891296000-0)-3600000) AND ts_ms<=(1788891296000-0) GROUP BY labels) WHERE n>=2))) a INNER JOIN (SELECT map() labels,sum(value) value FROM (SELECT labels, corrected*(sampled+least(start_extra,if(corrected>0,sampled*(first_value/corrected),start_extra))+end_extra)/sampled AS value FROM (SELECT labels,samples,length(samples) n,samples[1].1 first_ts,samples[n].1 last_ts,samples[1].2 first_value,samples[n].2 last_value,(last_ts-first_ts)/1000 sampled,(last_value-first_value)+arraySum(i -> if(samples[i].2<samples[i-1].2,samples[i-1].2,0.),range(2,n+1)) corrected,if((first_ts-((1788891296000-0)-3600000))/1000<sampled/(n-1)*1.1,(first_ts-((1788891296000-0)-3600000))/1000,sampled/(n-1)/2) start_extra,if(((1788891296000-0)-last_ts)/1000<sampled/(n-1)*1.1,((1788891296000-0)-last_ts)/1000,sampled/(n-1)/2) end_extra FROM (SELECT labels,arraySort(x -> x.1,groupArray((ts_ms,value))) samples FROM raw_samples WHERE metric='payment_service_http_requests_total' AND ts_ms>=((1788891296000-0)-3600000) AND ts_ms<=(1788891296000-0) GROUP BY labels) WHERE n>=2))) b ON a.labels=b.labels"
-    },
-    {
-      "id": "q04",
-      "operators": [
-        "increase",
-        "sum",
-        "offset",
-        "division"
-      ],
-      "parser_planner": "failure",
-      "reason": "SQL lowering failed: DataFusion error: SQL error: ParserError(\"Expected: identifier, found: )\")",
-      "sql": "SELECT a.labels,a.value/b.value value FROM (SELECT map() labels,sum(value) value FROM (SELECT labels, corrected*(sampled+least(start_extra,if(corrected>0,sampled*(first_value/corrected),start_extra))+end_extra)/sampled AS value FROM (SELECT labels,samples,length(samples) n,samples[1].1 first_ts,samples[n].1 last_ts,samples[1].2 first_value,samples[n].2 last_value,(last_ts-first_ts)/1000 sampled,(last_value-first_value)+arraySum(i -> if(samples[i].2<samples[i-1].2,samples[i-1].2,0.),range(2,n+1)) corrected,if((first_ts-((1788891296000-21600000)-3600000))/1000<sampled/(n-1)*1.1,(first_ts-((1788891296000-21600000)-3600000))/1000,sampled/(n-1)/2) start_extra,if(((1788891296000-21600000)-last_ts)/1000<sampled/(n-1)*1.1,((1788891296000-21600000)-last_ts)/1000,sampled/(n-1)/2) end_extra FROM (SELECT labels,arraySort(x -> x.1,groupArray((ts_ms,value))) samples FROM raw_samples WHERE metric='payment_service_http_5xx_total' AND ts_ms>=((1788891296000-21600000)-3600000) AND ts_ms<=(1788891296000-21600000) GROUP BY labels) WHERE n>=2))) a INNER JOIN (SELECT map() labels,sum(value) value FROM (SELECT labels, corrected*(sampled+least(start_extra,if(corrected>0,sampled*(first_value/corrected),start_extra))+end_extra)/sampled AS value FROM (SELECT labels,samples,length(samples) n,samples[1].1 first_ts,samples[n].1 last_ts,samples[1].2 first_value,samples[n].2 last_value,(last_ts-first_ts)/1000 sampled,(last_value-first_value)+arraySum(i -> if(samples[i].2<samples[i-1].2,samples[i-1].2,0.),range(2,n+1)) corrected,if((first_ts-((1788891296000-21600000)-3600000))/1000<sampled/(n-1)*1.1,(first_ts-((1788891296000-21600000)-3600000))/1000,sampled/(n-1)/2) start_extra,if(((1788891296000-21600000)-last_ts)/1000<sampled/(n-1)*1.1,((1788891296000-21600000)-last_ts)/1000,sampled/(n-1)/2) end_extra FROM (SELECT labels,arraySort(x -> x.1,groupArray((ts_ms,value))) samples FROM raw_samples WHERE metric='payment_service_http_requests_total' AND ts_ms>=((1788891296000-21600000)-3600000) AND ts_ms<=(1788891296000-21600000) GROUP BY labels) WHERE n>=2))) b ON a.labels=b.labels"
-    },
-    {
-      "canonical_sql": "Sort { keys: [SortKey { expr: Column(0), ascending: true, nulls_first: false }], partition_by: GroupKeys { keys: [], without: false }, child: Project { cols: [ProjectItem { alias: None, expr: Column(0) }, ProjectItem { alias: Some(\"value\"), expr: Column(1) }], qualifier: None, child: Aggregate { reduction: Reduce(GroupKeys { keys: [1], without: false }), measures: [Max { col: Some(3) }], output_names: [\"max(raw_samples.value)\"], having: None, child: Scan { source: Table { table_ref: \"raw_samples\" }, predicates: [Predicate(BoolAnd([Compare { left: Column(0), op: Eq, right: Literal(Utf8(\"cache_refresh_lag_seconds\")) }, Compare { left: Column(2), op: Gt, right: Arithmetic { op: Sub, left: Literal(Int64(1788891296000)), right: Literal(Int64(43200000)) } }, Compare { left: Column(2), op: Le, right: Literal(Int64(1788891296000)) }]))], schema: Schema { columns: [Column { name: \"metric\", dtype: Utf8, nullable: false, table: Some(\"raw_samples\") }, Column { name: \"labels\", dtype: Utf8, nullable: false, table: Some(\"raw_samples\") }, Column { name: \"ts_ms\", dtype: Timestamp, nullable: false, table: Some(\"raw_samples\") }, Column { name: \"value\", dtype: Float64, nullable: false, table: Some(\"raw_samples\") }], time_index: Some(2), unique_keys: [], closed: true } } } } }",
-      "classification": "failure",
-      "id": "q05",
-      "operators": [
-        "max_over_time"
-      ],
-      "parser_planner": "pass",
-      "physical": "Committed(Summary(SummaryNode { expr: ValueOperation { child: SummaryNode { expr: ValueOperation { child: SummaryNode { expr: SummaryAgg { child: SummaryNode { expr: KeepPreAsap(Scan { source: Table { table_ref: \"raw_samples\" }, predicates: [Predicate(BoolAnd([Compare { left: Column(0), op: Eq, right: Literal(Utf8(\"cache_refresh_lag_seconds\")) }, Compare { left: Column(2), op: Gt, right: Arithmetic { op: Sub, left: Literal(Int64(1788891296000)), right: Literal(Int64(43200000)) } }, Compare { left: Column(2), op: Le, right: Literal(Int64(1788891296000)) }]))], schema: Schema { columns: [Column { name: \"metric\", dtype: Utf8, nullable: false, table: Some(\"raw_samples\") }, Column { name: \"labels\", dtype: Utf8, nullable: false, table: Some(\"raw_samples\") }, Column { name: \"ts_ms\", dtype: Timestamp, nullable: false, table: Some(\"raw_samples\") }, Column { name: \"value\", dtype: Float64, nullable: false, table: Some(\"raw_samples\") }], time_index: Some(2), unique_keys: [], closed: true } }), schema: SummarySchema { fields: [SummaryField { name: \"metric\", dtype: Plain(Utf8), nullable: false }, SummaryField { name: \"labels\", dtype: Plain(Utf8), nullable: false }, SummaryField { name: \"ts_ms\", dtype: Plain(Timestamp), nullable: false }, SummaryField { name: \"value\", dtype: Plain(Float64), nullable: false }], time_index: Some(2) }, guarantee: Some(ResultGuarantee { metric: AbsoluteValue, bound: Zero, failure_probability: Zero, provenance: [Exact { reason: \"KeepPreAsap\" }] }) }, family: ExactAggregate(MinMax, MinMax), input: SummaryUpdate { item: None, weight: Column(Qualified { table: \"raw_samples\", name: \"value\" }), weight_domain: UnknownOrSigned }, reduction: Reduce(GroupKeys { keys: [1], without: false }), grouping: PerSubpopulationInstance }, schema: SummarySchema { fields: [SummaryField { name: \"labels\", dtype: Plain(Utf8), nullable: false }, SummaryField { name: \"max(raw_samples.value)\", dtype: ExactAggregate(MinMax, MinMax), nullable: false }], time_index: None }, guarantee: Some(ResultGuarantee { metric: AbsoluteValue, bound: Zero, failure_probability: Zero, provenance: [Exact { reason: \"ExactAggregate(MinMax)\" }, ChildGuarantee { input_index: 0, guarantee: ResultGuarantee { metric: AbsoluteValue, bound: Zero, failure_probability: Zero, provenance: [Exact { reason: \"KeepPreAsap\" }] } }, CompositionStep { operator: ExactExtremum, rule: \"exact_input\" }] }) }, operation: Project { cols: [ProjectItem { alias: None, expr: Column(0) }, ProjectItem { alias: Some(\"value\"), expr: Column(1) }], qualifier: None }, timing: ReadTime }, schema: SummarySchema { fields: [SummaryField { name: \"labels\", dtype: Plain(Utf8), nullable: false }, SummaryField { name: \"value\", dtype: Plain(Float64), nullable: false }], time_index: None }, guarantee: Some(ResultGuarantee { metric: AbsoluteValue, bound: Zero, failure_probability: Zero, provenance: [Exact { reason: \"ExactAggregate(MinMax)\" }, ChildGuarantee { input_index: 0, guarantee: ResultGuarantee { metric: AbsoluteValue, bound: Zero, failure_probability: Zero, provenance: [Exact { reason: \"KeepPreAsap\" }] } }, CompositionStep { operator: ExactExtremum, rule: \"exact_input\" }] }) }, operation: Sort { keys: [SortKey { expr: Column(0), ascending: true, nulls_first: false }], partition_by: GroupKeys { keys: [], without: false } }, timing: ReadTime }, schema: SummarySchema { fields: [SummaryField { name: \"labels\", dtype: Plain(Utf8), nullable: false }, SummaryField { name: \"value\", dtype: Plain(Float64), nullable: false }], time_index: None }, guarantee: Some(ResultGuarantee { metric: AbsoluteValue, bound: Zero, failure_probability: Zero, provenance: [Exact { reason: \"ExactAggregate(MinMax)\" }, ChildGuarantee { input_index: 0, guarantee: ResultGuarantee { metric: AbsoluteValue, bound: Zero, failure_probability: Zero, provenance: [Exact { reason: \"KeepPreAsap\" }] } }, CompositionStep { operator: ExactExtremum, rule: \"exact_input\" }] }) }))",
-      "publication": "failure",
-      "reason": "SQL lowering failed: invalid QueryPlan: SQL population predicate on metric needs a canonical catalog filter",
-      "sql": "SELECT labels, max(value) AS value FROM raw_samples WHERE metric='cache_refresh_lag_seconds' AND ts_ms>1788891296000-43200000 AND ts_ms<=1788891296000 GROUP BY labels ORDER BY labels"
-    },
-    {
-      "canonical_sql": "Sort { keys: [SortKey { expr: Column(0), ascending: true, nulls_first: false }], partition_by: GroupKeys { keys: [], without: false }, child: Project { cols: [ProjectItem { alias: None, expr: Column(0) }, ProjectItem { alias: Some(\"value\"), expr: Column(1) }], qualifier: None, child: Aggregate { reduction: Reduce(GroupKeys { keys: [1], without: false }), measures: [Max { col: Some(3) }], output_names: [\"max(raw_samples.value)\"], having: None, child: Scan { source: Table { table_ref: \"raw_samples\" }, predicates: [Predicate(BoolAnd([Compare { left: Column(0), op: Eq, right: Literal(Utf8(\"user_service_cache_refresh_lag_seconds\")) }, Compare { left: Column(2), op: Gt, right: Arithmetic { op: Sub, left: Literal(Int64(1788891296000)), right: Literal(Int64(43200000)) } }, Compare { left: Column(2), op: Le, right: Literal(Int64(1788891296000)) }]))], schema: Schema { columns: [Column { name: \"metric\", dtype: Utf8, nullable: false, table: Some(\"raw_samples\") }, Column { name: \"labels\", dtype: Utf8, nullable: false, table: Some(\"raw_samples\") }, Column { name: \"ts_ms\", dtype: Timestamp, nullable: false, table: Some(\"raw_samples\") }, Column { name: \"value\", dtype: Float64, nullable: false, table: Some(\"raw_samples\") }], time_index: Some(2), unique_keys: [], closed: true } } } } }",
-      "classification": "failure",
-      "id": "q06",
-      "operators": [
-        "max_over_time"
-      ],
-      "parser_planner": "pass",
-      "physical": "Committed(Summary(SummaryNode { expr: ValueOperation { child: SummaryNode { expr: ValueOperation { child: SummaryNode { expr: SummaryAgg { child: SummaryNode { expr: KeepPreAsap(Scan { source: Table { table_ref: \"raw_samples\" }, predicates: [Predicate(BoolAnd([Compare { left: Column(0), op: Eq, right: Literal(Utf8(\"user_service_cache_refresh_lag_seconds\")) }, Compare { left: Column(2), op: Gt, right: Arithmetic { op: Sub, left: Literal(Int64(1788891296000)), right: Literal(Int64(43200000)) } }, Compare { left: Column(2), op: Le, right: Literal(Int64(1788891296000)) }]))], schema: Schema { columns: [Column { name: \"metric\", dtype: Utf8, nullable: false, table: Some(\"raw_samples\") }, Column { name: \"labels\", dtype: Utf8, nullable: false, table: Some(\"raw_samples\") }, Column { name: \"ts_ms\", dtype: Timestamp, nullable: false, table: Some(\"raw_samples\") }, Column { name: \"value\", dtype: Float64, nullable: false, table: Some(\"raw_samples\") }], time_index: Some(2), unique_keys: [], closed: true } }), schema: SummarySchema { fields: [SummaryField { name: \"metric\", dtype: Plain(Utf8), nullable: false }, SummaryField { name: \"labels\", dtype: Plain(Utf8), nullable: false }, SummaryField { name: \"ts_ms\", dtype: Plain(Timestamp), nullable: false }, SummaryField { name: \"value\", dtype: Plain(Float64), nullable: false }], time_index: Some(2) }, guarantee: Some(ResultGuarantee { metric: AbsoluteValue, bound: Zero, failure_probability: Zero, provenance: [Exact { reason: \"KeepPreAsap\" }] }) }, family: ExactAggregate(MinMax, MinMax), input: SummaryUpdate { item: None, weight: Column(Qualified { table: \"raw_samples\", name: \"value\" }), weight_domain: UnknownOrSigned }, reduction: Reduce(GroupKeys { keys: [1], without: false }), grouping: PerSubpopulationInstance }, schema: SummarySchema { fields: [SummaryField { name: \"labels\", dtype: Plain(Utf8), nullable: false }, SummaryField { name: \"max(raw_samples.value)\", dtype: ExactAggregate(MinMax, MinMax), nullable: false }], time_index: None }, guarantee: Some(ResultGuarantee { metric: AbsoluteValue, bound: Zero, failure_probability: Zero, provenance: [Exact { reason: \"ExactAggregate(MinMax)\" }, ChildGuarantee { input_index: 0, guarantee: ResultGuarantee { metric: AbsoluteValue, bound: Zero, failure_probability: Zero, provenance: [Exact { reason: \"KeepPreAsap\" }] } }, CompositionStep { operator: ExactExtremum, rule: \"exact_input\" }] }) }, operation: Project { cols: [ProjectItem { alias: None, expr: Column(0) }, ProjectItem { alias: Some(\"value\"), expr: Column(1) }], qualifier: None }, timing: ReadTime }, schema: SummarySchema { fields: [SummaryField { name: \"labels\", dtype: Plain(Utf8), nullable: false }, SummaryField { name: \"value\", dtype: Plain(Float64), nullable: false }], time_index: None }, guarantee: Some(ResultGuarantee { metric: AbsoluteValue, bound: Zero, failure_probability: Zero, provenance: [Exact { reason: \"ExactAggregate(MinMax)\" }, ChildGuarantee { input_index: 0, guarantee: ResultGuarantee { metric: AbsoluteValue, bound: Zero, failure_probability: Zero, provenance: [Exact { reason: \"KeepPreAsap\" }] } }, CompositionStep { operator: ExactExtremum, rule: \"exact_input\" }] }) }, operation: Sort { keys: [SortKey { expr: Column(0), ascending: true, nulls_first: false }], partition_by: GroupKeys { keys: [], without: false } }, timing: ReadTime }, schema: SummarySchema { fields: [SummaryField { name: \"labels\", dtype: Plain(Utf8), nullable: false }, SummaryField { name: \"value\", dtype: Plain(Float64), nullable: false }], time_index: None }, guarantee: Some(ResultGuarantee { metric: AbsoluteValue, bound: Zero, failure_probability: Zero, provenance: [Exact { reason: \"ExactAggregate(MinMax)\" }, ChildGuarantee { input_index: 0, guarantee: ResultGuarantee { metric: AbsoluteValue, bound: Zero, failure_probability: Zero, provenance: [Exact { reason: \"KeepPreAsap\" }] } }, CompositionStep { operator: ExactExtremum, rule: \"exact_input\" }] }) }))",
-      "publication": "failure",
-      "reason": "SQL lowering failed: invalid QueryPlan: SQL population predicate on metric needs a canonical catalog filter",
-      "sql": "SELECT labels, max(value) AS value FROM raw_samples WHERE metric='user_service_cache_refresh_lag_seconds' AND ts_ms>1788891296000-43200000 AND ts_ms<=1788891296000 GROUP BY labels ORDER BY labels"
-    },
-    {
-      "id": "q07",
-      "operators": [],
-      "parser_planner": "failure",
-      "reason": "SQL lowering failed: DataFusion error: Error during planning: Invalid function 'mapconcat'.\nDid you mean 'concat'?",
-      "sql": "SELECT mapConcat(labels,map('__name__','user_service_cache_refresh_lag_seconds')) AS labels, argMax(value,ts_ms) AS value FROM raw_samples WHERE metric='user_service_cache_refresh_lag_seconds' AND ts_ms>1788891296000-300000 AND ts_ms<=1788891296000 GROUP BY labels ORDER BY labels"
-    },
-    {
-      "id": "q08",
-      "operators": [
-        "rate",
-        "sum"
-      ],
-      "parser_planner": "failure",
-      "reason": "SQL lowering failed: DataFusion error: SQL error: ParserError(\"Expected: joined table, found: ,\")",
-      "sql": "SELECT map() labels,sum(value) value FROM (SELECT labels, corrected*(sampled+least(start_extra,if(corrected>0,sampled*(first_value/corrected),start_extra))+end_extra)/sampled/(3600000/1000) AS value FROM (SELECT labels,samples,length(samples) n,samples[1].1 first_ts,samples[n].1 last_ts,samples[1].2 first_value,samples[n].2 last_value,(last_ts-first_ts)/1000 sampled,(last_value-first_value)+arraySum(i -> if(samples[i].2<samples[i-1].2,samples[i-1].2,0.),range(2,n+1)) corrected,if((first_ts-((1788891296000-0)-3600000))/1000<sampled/(n-1)*1.1,(first_ts-((1788891296000-0)-3600000))/1000,sampled/(n-1)/2) start_extra,if(((1788891296000-0)-last_ts)/1000<sampled/(n-1)*1.1,((1788891296000-0)-last_ts)/1000,sampled/(n-1)/2) end_extra FROM (SELECT labels,arraySort(x -> x.1,groupArray((ts_ms,value))) samples FROM raw_samples WHERE metric='backend_process_cpu_seconds_total' AND ts_ms>=((1788891296000-0)-3600000) AND ts_ms<=(1788891296000-0) GROUP BY labels) WHERE n>=2))"
-    },
-    {
-      "id": "q09",
-      "operators": [
-        "sum"
-      ],
-      "parser_planner": "failure",
-      "reason": "SQL lowering failed: DataFusion error: Error during planning: Error during planning: map does not support zero arguments. No function matches the given name and argument types 'map()'. You might need to add explicit type casts.\n\tCandidate functions:\n\tmap(Any, .., Any)",
-      "sql": "SELECT map() AS labels, sum(value) AS value FROM (SELECT labels,argMax(value,ts_ms) AS value FROM raw_samples WHERE metric='backend_process_resident_memory_bytes' AND ts_ms>1788891296000-300000 AND ts_ms<=1788891296000 GROUP BY labels)"
-    },
-    {
-      "id": "q10",
-      "operators": [
-        "max_over_time",
-        "sum",
-        "subquery"
-      ],
-      "parser_planner": "failure",
-      "reason": "SQL lowering failed: DataFusion error: Error during planning: Invalid function 'modulo'.\nDid you mean 'todate'?",
-      "sql": "SELECT map() labels,max(value) value FROM (SELECT ts_ms,sum(value) value FROM raw_samples WHERE metric='backend_process_resident_memory_bytes' AND ts_ms>=1788891296000-21600000 AND ts_ms<=1788891296000 AND modulo(1788891296000-ts_ms,60000)=0 GROUP BY ts_ms)"
-    },
-    {
-      "id": "q11",
-      "operators": [
-        "topk",
-        "rate"
-      ],
-      "parser_planner": "failure",
-      "reason": "SQL lowering failed: DataFusion error: SQL error: ParserError(\"Expected: joined table, found: labels\")",
-      "sql": "SELECT * FROM (SELECT map('job',job) labels,sum(value) value FROM (SELECT labels['job'] job,value FROM (SELECT labels, corrected*(sampled+least(start_extra,if(corrected>0,sampled*(first_value/corrected),start_extra))+end_extra)/sampled/(3600000/1000) AS value FROM (SELECT labels,samples,length(samples) n,samples[1].1 first_ts,samples[n].1 last_ts,samples[1].2 first_value,samples[n].2 last_value,(last_ts-first_ts)/1000 sampled,(last_value-first_value)+arraySum(i -> if(samples[i].2<samples[i-1].2,samples[i-1].2,0.),range(2,n+1)) corrected,if((first_ts-((1788891296000-0)-3600000))/1000<sampled/(n-1)*1.1,(first_ts-((1788891296000-0)-3600000))/1000,sampled/(n-1)/2) start_extra,if(((1788891296000-0)-last_ts)/1000<sampled/(n-1)*1.1,((1788891296000-0)-last_ts)/1000,sampled/(n-1)/2) end_extra FROM (SELECT labels,arraySort(x -> x.1,groupArray((ts_ms,value))) samples FROM raw_samples WHERE metric='backend_process_cpu_seconds_total' AND ts_ms>=((1788891296000-0)-3600000) AND ts_ms<=(1788891296000-0) GROUP BY labels) WHERE n>=2))) GROUP BY job) ORDER BY value DESC,labels LIMIT 2"
-    },
-    {
-      "id": "q12",
-      "operators": [
-        "topk"
-      ],
-      "parser_planner": "failure",
-      "reason": "SQL lowering failed: DataFusion error: This feature is not implemented: Map Access",
-      "sql": "SELECT map('job',job) AS labels,sum(value) AS value FROM (SELECT labels['job'] AS job,labels,argMax(value,ts_ms) AS value FROM raw_samples WHERE metric='backend_process_resident_memory_bytes' AND ts_ms>1788891296000-300000 AND ts_ms<=1788891296000 GROUP BY job,labels) GROUP BY job ORDER BY value DESC,job LIMIT 2"
-    },
-    {
-      "id": "q13",
-      "operators": [
-        "rate",
-        "max_over_time",
-        "sum",
-        "subquery"
-      ],
-      "parser_planner": "failure",
-      "reason": "SQL lowering failed: DataFusion error: SQL error: ParserError(\"Expected: joined table, found: ,\")",
-      "sql": "SELECT map() labels,max(value) value FROM (SELECT grid_ms,sum(value) value FROM (SELECT grid_ms,labels,corrected*(sampled+least(start_extra,if(corrected>0,sampled*(first_value/corrected),start_extra))+end_extra)/sampled/300 value FROM (SELECT grid_ms,labels,samples,length(samples) n,samples[1].1 first_ts,samples[n].1 last_ts,samples[1].2 first_value,samples[n].2 last_value,(last_ts-first_ts)/1000 sampled,(last_value-first_value)+arraySum(i -> if(samples[i].2<samples[i-1].2,samples[i-1].2,0.),range(2,n+1)) corrected,if((first_ts-(grid_ms-300000))/1000<sampled/(n-1)*1.1,(first_ts-(grid_ms-300000))/1000,sampled/(n-1)/2) start_extra,if((grid_ms-last_ts)/1000<sampled/(n-1)*1.1,(grid_ms-last_ts)/1000,sampled/(n-1)/2) end_extra FROM (SELECT grid_ms,labels,arraySort(x->x.1,groupArray((ts_ms,value))) samples FROM raw_samples CROSS JOIN (SELECT arrayJoin(arrayMap(x->x*60000,range(toUInt64(intDiv(1788891296000-21600000+59999,60000)),toUInt64(intDiv(1788891296000,60000)+1)))) grid_ms) grids WHERE metric='backend_process_cpu_seconds_total' AND ts_ms>=grid_ms-300000 AND ts_ms<=grid_ms GROUP BY grid_ms,labels) WHERE n>=2)) GROUP BY grid_ms)"
-    },
-    {
-      "id": "q14",
-      "operators": [
-        "rate",
-        "sum"
-      ],
-      "parser_planner": "failure",
-      "reason": "SQL lowering failed: DataFusion error: SQL error: ParserError(\"Expected: joined table, found: ,\")",
-      "sql": "SELECT map() labels,sum(value) value FROM (SELECT labels, corrected*(sampled+least(start_extra,if(corrected>0,sampled*(first_value/corrected),start_extra))+end_extra)/sampled/(300000/1000) AS value FROM (SELECT labels,samples,length(samples) n,samples[1].1 first_ts,samples[n].1 last_ts,samples[1].2 first_value,samples[n].2 last_value,(last_ts-first_ts)/1000 sampled,(last_value-first_value)+arraySum(i -> if(samples[i].2<samples[i-1].2,samples[i-1].2,0.),range(2,n+1)) corrected,if((first_ts-((1788891296000-0)-300000))/1000<sampled/(n-1)*1.1,(first_ts-((1788891296000-0)-300000))/1000,sampled/(n-1)/2) start_extra,if(((1788891296000-0)-last_ts)/1000<sampled/(n-1)*1.1,((1788891296000-0)-last_ts)/1000,sampled/(n-1)/2) end_extra FROM (SELECT labels,arraySort(x -> x.1,groupArray((ts_ms,value))) samples FROM raw_samples WHERE metric='backend_http_requests_total' AND ts_ms>=((1788891296000-0)-300000) AND ts_ms<=(1788891296000-0) GROUP BY labels) WHERE n>=2))"
-    },
-    {
-      "id": "q15",
-      "operators": [
-        "rate"
-      ],
-      "parser_planner": "failure",
-      "reason": "SQL lowering failed: DataFusion error: SQL error: ParserError(\"Expected: joined table, found: [\")",
-      "sql": "SELECT map('job',job) labels,sum(value) value FROM (SELECT labels['job'] job,value FROM (SELECT labels, corrected*(sampled+least(start_extra,if(corrected>0,sampled*(first_value/corrected),start_extra))+end_extra)/sampled/(300000/1000) AS value FROM (SELECT labels,samples,length(samples) n,samples[1].1 first_ts,samples[n].1 last_ts,samples[1].2 first_value,samples[n].2 last_value,(last_ts-first_ts)/1000 sampled,(last_value-first_value)+arraySum(i -> if(samples[i].2<samples[i-1].2,samples[i-1].2,0.),range(2,n+1)) corrected,if((first_ts-((1788891296000-0)-300000))/1000<sampled/(n-1)*1.1,(first_ts-((1788891296000-0)-300000))/1000,sampled/(n-1)/2) start_extra,if(((1788891296000-0)-last_ts)/1000<sampled/(n-1)*1.1,((1788891296000-0)-last_ts)/1000,sampled/(n-1)/2) end_extra FROM (SELECT labels,arraySort(x -> x.1,groupArray((ts_ms,value))) samples FROM raw_samples WHERE metric='backend_http_requests_total' AND ts_ms>=((1788891296000-0)-300000) AND ts_ms<=(1788891296000-0) GROUP BY labels) WHERE n>=2))) GROUP BY job"
-    },
-    {
-      "id": "q16",
-      "operators": [
-        "increase",
-        "sum",
-        "division"
-      ],
-      "parser_planner": "failure",
-      "reason": "SQL lowering failed: DataFusion error: SQL error: ParserError(\"Expected: identifier, found: )\")",
-      "sql": "SELECT a.labels,a.value/b.value value FROM (SELECT map() labels,sum(value) value FROM (SELECT labels, corrected*(sampled+least(start_extra,if(corrected>0,sampled*(first_value/corrected),start_extra))+end_extra)/sampled AS value FROM (SELECT labels,samples,length(samples) n,samples[1].1 first_ts,samples[n].1 last_ts,samples[1].2 first_value,samples[n].2 last_value,(last_ts-first_ts)/1000 sampled,(last_value-first_value)+arraySum(i -> if(samples[i].2<samples[i-1].2,samples[i-1].2,0.),range(2,n+1)) corrected,if((first_ts-((1788891296000-0)-3600000))/1000<sampled/(n-1)*1.1,(first_ts-((1788891296000-0)-3600000))/1000,sampled/(n-1)/2) start_extra,if(((1788891296000-0)-last_ts)/1000<sampled/(n-1)*1.1,((1788891296000-0)-last_ts)/1000,sampled/(n-1)/2) end_extra FROM (SELECT labels,arraySort(x -> x.1,groupArray((ts_ms,value))) samples FROM raw_samples WHERE metric='backend_http_5xx_total' AND ts_ms>=((1788891296000-0)-3600000) AND ts_ms<=(1788891296000-0) GROUP BY labels) WHERE n>=2))) a INNER JOIN (SELECT map() labels,sum(value) value FROM (SELECT labels, corrected*(sampled+least(start_extra,if(corrected>0,sampled*(first_value/corrected),start_extra))+end_extra)/sampled AS value FROM (SELECT labels,samples,length(samples) n,samples[1].1 first_ts,samples[n].1 last_ts,samples[1].2 first_value,samples[n].2 last_value,(last_ts-first_ts)/1000 sampled,(last_value-first_value)+arraySum(i -> if(samples[i].2<samples[i-1].2,samples[i-1].2,0.),range(2,n+1)) corrected,if((first_ts-((1788891296000-0)-3600000))/1000<sampled/(n-1)*1.1,(first_ts-((1788891296000-0)-3600000))/1000,sampled/(n-1)/2) start_extra,if(((1788891296000-0)-last_ts)/1000<sampled/(n-1)*1.1,((1788891296000-0)-last_ts)/1000,sampled/(n-1)/2) end_extra FROM (SELECT labels,arraySort(x -> x.1,groupArray((ts_ms,value))) samples FROM raw_samples WHERE metric='backend_http_requests_total' AND ts_ms>=((1788891296000-0)-3600000) AND ts_ms<=(1788891296000-0) GROUP BY labels) WHERE n>=2))) b ON a.labels=b.labels"
-    },
-    {
-      "id": "q17",
-      "operators": [
-        "topk",
-        "increase",
-        "division"
-      ],
-      "parser_planner": "failure",
-      "reason": "SQL lowering failed: DataFusion error: SQL error: ParserError(\"Expected: joined table, found: .\")",
-      "sql": "SELECT * FROM (SELECT a.labels,a.value/b.value value FROM (SELECT map('job',job) labels,sum(value) value FROM (SELECT labels['job'] job,value FROM (SELECT labels, corrected*(sampled+least(start_extra,if(corrected>0,sampled*(first_value/corrected),start_extra))+end_extra)/sampled AS value FROM (SELECT labels,samples,length(samples) n,samples[1].1 first_ts,samples[n].1 last_ts,samples[1].2 first_value,samples[n].2 last_value,(last_ts-first_ts)/1000 sampled,(last_value-first_value)+arraySum(i -> if(samples[i].2<samples[i-1].2,samples[i-1].2,0.),range(2,n+1)) corrected,if((first_ts-((1788891296000-0)-21600000))/1000<sampled/(n-1)*1.1,(first_ts-((1788891296000-0)-21600000))/1000,sampled/(n-1)/2) start_extra,if(((1788891296000-0)-last_ts)/1000<sampled/(n-1)*1.1,((1788891296000-0)-last_ts)/1000,sampled/(n-1)/2) end_extra FROM (SELECT labels,arraySort(x -> x.1,groupArray((ts_ms,value))) samples FROM raw_samples WHERE metric='backend_http_5xx_total' AND ts_ms>=((1788891296000-0)-21600000) AND ts_ms<=(1788891296000-0) GROUP BY labels) WHERE n>=2))) GROUP BY job) a INNER JOIN (SELECT map('job',job) labels,sum(value) value FROM (SELECT labels['job'] job,value FROM (SELECT labels, corrected*(sampled+least(start_extra,if(corrected>0,sampled*(first_value/corrected),start_extra))+end_extra)/sampled AS value FROM (SELECT labels,samples,length(samples) n,samples[1].1 first_ts,samples[n].1 last_ts,samples[1].2 first_value,samples[n].2 last_value,(last_ts-first_ts)/1000 sampled,(last_value-first_value)+arraySum(i -> if(samples[i].2<samples[i-1].2,samples[i-1].2,0.),range(2,n+1)) corrected,if((first_ts-((1788891296000-0)-21600000))/1000<sampled/(n-1)*1.1,(first_ts-((1788891296000-0)-21600000))/1000,sampled/(n-1)/2) start_extra,if(((1788891296000-0)-last_ts)/1000<sampled/(n-1)*1.1,((1788891296000-0)-last_ts)/1000,sampled/(n-1)/2) end_extra FROM (SELECT labels,arraySort(x -> x.1,groupArray((ts_ms,value))) samples FROM raw_samples WHERE metric='backend_http_requests_total' AND ts_ms>=((1788891296000-0)-21600000) AND ts_ms<=(1788891296000-0) GROUP BY labels) WHERE n>=2))) GROUP BY job) b ON a.labels=b.labels) ORDER BY value DESC,labels LIMIT 1"
-    },
-    {
-      "id": "q18",
-      "operators": [
-        "increase",
-        "comparison"
-      ],
-      "parser_planner": "failure",
-      "reason": "SQL lowering failed: DataFusion error: SQL error: ParserError(\"Expected: joined table, found: labels\")",
-      "sql": "SELECT * FROM (SELECT map('job',job) labels,sum(value) value FROM (SELECT labels['job'] job,value FROM (SELECT labels, corrected*(sampled+least(start_extra,if(corrected>0,sampled*(first_value/corrected),start_extra))+end_extra)/sampled AS value FROM (SELECT labels,samples,length(samples) n,samples[1].1 first_ts,samples[n].1 last_ts,samples[1].2 first_value,samples[n].2 last_value,(last_ts-first_ts)/1000 sampled,(last_value-first_value)+arraySum(i -> if(samples[i].2<samples[i-1].2,samples[i-1].2,0.),range(2,n+1)) corrected,if((first_ts-((1788891296000-0)-86400000))/1000<sampled/(n-1)*1.1,(first_ts-((1788891296000-0)-86400000))/1000,sampled/(n-1)/2) start_extra,if(((1788891296000-0)-last_ts)/1000<sampled/(n-1)*1.1,((1788891296000-0)-last_ts)/1000,sampled/(n-1)/2) end_extra FROM (SELECT labels,arraySort(x -> x.1,groupArray((ts_ms,value))) samples FROM raw_samples WHERE metric='backend_http_5xx_total' AND ts_ms>=((1788891296000-0)-86400000) AND ts_ms<=(1788891296000-0) GROUP BY labels) WHERE n>=2))) GROUP BY job) WHERE value>0"
-    },
-    {
-      "id": "q19",
-      "operators": [
-        "rate",
-        "sum"
-      ],
-      "parser_planner": "failure",
-      "reason": "SQL lowering failed: DataFusion error: SQL error: ParserError(\"Expected: joined table, found: ,\")",
-      "sql": "SELECT map() labels,sum(value) value FROM (SELECT labels, corrected*(sampled+least(start_extra,if(corrected>0,sampled*(first_value/corrected),start_extra))+end_extra)/sampled/(300000/1000) AS value FROM (SELECT labels,samples,length(samples) n,samples[1].1 first_ts,samples[n].1 last_ts,samples[1].2 first_value,samples[n].2 last_value,(last_ts-first_ts)/1000 sampled,(last_value-first_value)+arraySum(i -> if(samples[i].2<samples[i-1].2,samples[i-1].2,0.),range(2,n+1)) corrected,if((first_ts-((1788891296000-0)-300000))/1000<sampled/(n-1)*1.1,(first_ts-((1788891296000-0)-300000))/1000,sampled/(n-1)/2) start_extra,if(((1788891296000-0)-last_ts)/1000<sampled/(n-1)*1.1,((1788891296000-0)-last_ts)/1000,sampled/(n-1)/2) end_extra FROM (SELECT labels,arraySort(x -> x.1,groupArray((ts_ms,value))) samples FROM raw_samples WHERE metric='order_service_http_requests_total' AND ts_ms>=((1788891296000-0)-300000) AND ts_ms<=(1788891296000-0) GROUP BY labels) WHERE n>=2))"
-    },
-    {
-      "id": "q20",
-      "operators": [
-        "rate",
-        "sum",
-        "offset"
-      ],
-      "parser_planner": "failure",
-      "reason": "SQL lowering failed: DataFusion error: SQL error: ParserError(\"Expected: joined table, found: ,\")",
-      "sql": "SELECT map() labels,sum(value) value FROM (SELECT labels, corrected*(sampled+least(start_extra,if(corrected>0,sampled*(first_value/corrected),start_extra))+end_extra)/sampled/(300000/1000) AS value FROM (SELECT labels,samples,length(samples) n,samples[1].1 first_ts,samples[n].1 last_ts,samples[1].2 first_value,samples[n].2 last_value,(last_ts-first_ts)/1000 sampled,(last_value-first_value)+arraySum(i -> if(samples[i].2<samples[i-1].2,samples[i-1].2,0.),range(2,n+1)) corrected,if((first_ts-((1788891296000-3600000)-300000))/1000<sampled/(n-1)*1.1,(first_ts-((1788891296000-3600000)-300000))/1000,sampled/(n-1)/2) start_extra,if(((1788891296000-3600000)-last_ts)/1000<sampled/(n-1)*1.1,((1788891296000-3600000)-last_ts)/1000,sampled/(n-1)/2) end_extra FROM (SELECT labels,arraySort(x -> x.1,groupArray((ts_ms,value))) samples FROM raw_samples WHERE metric='order_service_http_requests_total' AND ts_ms>=((1788891296000-3600000)-300000) AND ts_ms<=(1788891296000-3600000) GROUP BY labels) WHERE n>=2))"
-    },
-    {
-      "id": "q21",
-      "operators": [
-        "histogram_quantile",
-        "rate"
-      ],
-      "parser_planner": "failure",
-      "reason": "SQL lowering failed: DataFusion error: SQL error: ParserError(\"Expected: ), found: .1\")",
-      "sql": "SELECT map() labels,if(idx=length(buckets),buckets[idx-1].1,if(idx=1 AND buckets[idx].1<=0,buckets[idx].1,(if(idx=1,0.,buckets[idx-1].1)+(buckets[idx].1-if(idx=1,0.,buckets[idx-1].1))*(rank-if(idx=1,0.,buckets[idx-1].2))/(buckets[idx].2-if(idx=1,0.,buckets[idx-1].2))))) value FROM (SELECT buckets,0.95*buckets[length(buckets)].2 rank,arrayFirstIndex(x->x.2>=rank,buckets) idx FROM (SELECT arrayMap(i->(raw[i].1,arrayMax(arrayMap(x->x.2,arraySlice(raw,1,i)))),range(1,length(raw)+1)) buckets FROM (SELECT arraySort(x->x.1,groupArray((if(le='+Inf',inf,toFloat64(le)),value))) raw FROM (SELECT labels['le'] le,sum(value) value FROM (SELECT labels, corrected*(sampled+least(start_extra,if(corrected>0,sampled*(first_value/corrected),start_extra))+end_extra)/sampled/(300000/1000) AS value FROM (SELECT labels,samples,length(samples) n,samples[1].1 first_ts,samples[n].1 last_ts,samples[1].2 first_value,samples[n].2 last_value,(last_ts-first_ts)/1000 sampled,(last_value-first_value)+arraySum(i -> if(samples[i].2<samples[i-1].2,samples[i-1].2,0.),range(2,n+1)) corrected,if((first_ts-((1788891296000-0)-300000))/1000<sampled/(n-1)*1.1,(first_ts-((1788891296000-0)-300000))/1000,sampled/(n-1)/2) start_extra,if(((1788891296000-0)-last_ts)/1000<sampled/(n-1)*1.1,((1788891296000-0)-last_ts)/1000,sampled/(n-1)/2) end_extra FROM (SELECT labels,arraySort(x -> x.1,groupArray((ts_ms,value))) samples FROM raw_samples WHERE metric='order_service_http_request_duration_seconds_bucket' AND ts_ms>=((1788891296000-0)-300000) AND ts_ms<=(1788891296000-0) GROUP BY labels) WHERE n>=2)) GROUP BY le)))) WHERE idx>0"
-    },
-    {
-      "id": "q22",
-      "operators": [
-        "rate",
-        "sum"
-      ],
-      "parser_planner": "failure",
-      "reason": "SQL lowering failed: DataFusion error: SQL error: ParserError(\"Expected: joined table, found: ,\")",
-      "sql": "SELECT map() labels,sum(value) value FROM (SELECT labels, corrected*(sampled+least(start_extra,if(corrected>0,sampled*(first_value/corrected),start_extra))+end_extra)/sampled/(300000/1000) AS value FROM (SELECT labels,samples,length(samples) n,samples[1].1 first_ts,samples[n].1 last_ts,samples[1].2 first_value,samples[n].2 last_value,(last_ts-first_ts)/1000 sampled,(last_value-first_value)+arraySum(i -> if(samples[i].2<samples[i-1].2,samples[i-1].2,0.),range(2,n+1)) corrected,if((first_ts-((1788891296000-0)-300000))/1000<sampled/(n-1)*1.1,(first_ts-((1788891296000-0)-300000))/1000,sampled/(n-1)/2) start_extra,if(((1788891296000-0)-last_ts)/1000<sampled/(n-1)*1.1,((1788891296000-0)-last_ts)/1000,sampled/(n-1)/2) end_extra FROM (SELECT labels,arraySort(x -> x.1,groupArray((ts_ms,value))) samples FROM raw_samples WHERE metric='order_service_http_requests_total' AND ts_ms>=((1788891296000-0)-300000) AND ts_ms<=(1788891296000-0) GROUP BY labels) WHERE n>=2))"
-    },
-    {
-      "canonical_sql": "Limit { n: 2, offset: 0, child: Sort { keys: [SortKey { expr: Column(1), ascending: false, nulls_first: true }, SortKey { expr: Column(0), ascending: true, nulls_first: false }], partition_by: GroupKeys { keys: [], without: false }, child: Project { cols: [ProjectItem { alias: None, expr: Column(0) }, ProjectItem { alias: Some(\"value\"), expr: Column(1) }], qualifier: None, child: Aggregate { reduction: Reduce(GroupKeys { keys: [1], without: false }), measures: [Max { col: Some(3) }], output_names: [\"max(raw_samples.value)\"], having: None, child: Scan { source: Table { table_ref: \"raw_samples\" }, predicates: [Predicate(BoolAnd([Compare { left: Column(0), op: Eq, right: Literal(Utf8(\"backend_retry_backlog_depth\")) }, Compare { left: Column(2), op: Gt, right: Arithmetic { op: Sub, left: Literal(Int64(1788891296000)), right: Literal(Int64(21600000)) } }, Compare { left: Column(2), op: Le, right: Literal(Int64(1788891296000)) }]))], schema: Schema { columns: [Column { name: \"metric\", dtype: Utf8, nullable: false, table: Some(\"raw_samples\") }, Column { name: \"labels\", dtype: Utf8, nullable: false, table: Some(\"raw_samples\") }, Column { name: \"ts_ms\", dtype: Timestamp, nullable: false, table: Some(\"raw_samples\") }, Column { name: \"value\", dtype: Float64, nullable: false, table: Some(\"raw_samples\") }], time_index: Some(2), unique_keys: [], closed: true } } } } } }",
-      "classification": "failure",
-      "id": "q23",
-      "operators": [
-        "topk",
-        "max_over_time"
-      ],
-      "parser_planner": "pass",
-      "physical": "Committed(Summary(SummaryNode { expr: ValueOperation { child: SummaryNode { expr: ValueOperation { child: SummaryNode { expr: ValueOperation { child: SummaryNode { expr: SummaryAgg { child: SummaryNode { expr: KeepPreAsap(Scan { source: Table { table_ref: \"raw_samples\" }, predicates: [Predicate(BoolAnd([Compare { left: Column(0), op: Eq, right: Literal(Utf8(\"backend_retry_backlog_depth\")) }, Compare { left: Column(2), op: Gt, right: Arithmetic { op: Sub, left: Literal(Int64(1788891296000)), right: Literal(Int64(21600000)) } }, Compare { left: Column(2), op: Le, right: Literal(Int64(1788891296000)) }]))], schema: Schema { columns: [Column { name: \"metric\", dtype: Utf8, nullable: false, table: Some(\"raw_samples\") }, Column { name: \"labels\", dtype: Utf8, nullable: false, table: Some(\"raw_samples\") }, Column { name: \"ts_ms\", dtype: Timestamp, nullable: false, table: Some(\"raw_samples\") }, Column { name: \"value\", dtype: Float64, nullable: false, table: Some(\"raw_samples\") }], time_index: Some(2), unique_keys: [], closed: true } }), schema: SummarySchema { fields: [SummaryField { name: \"metric\", dtype: Plain(Utf8), nullable: false }, SummaryField { name: \"labels\", dtype: Plain(Utf8), nullable: false }, SummaryField { name: \"ts_ms\", dtype: Plain(Timestamp), nullable: false }, SummaryField { name: \"value\", dtype: Plain(Float64), nullable: false }], time_index: Some(2) }, guarantee: Some(ResultGuarantee { metric: AbsoluteValue, bound: Zero, failure_probability: Zero, provenance: [Exact { reason: \"KeepPreAsap\" }] }) }, family: ExactAggregate(MinMax, MinMax), input: SummaryUpdate { item: None, weight: Column(Qualified { table: \"raw_samples\", name: \"value\" }), weight_domain: UnknownOrSigned }, reduction: Reduce(GroupKeys { keys: [1], without: false }), grouping: PerSubpopulationInstance }, schema: SummarySchema { fields: [SummaryField { name: \"labels\", dtype: Plain(Utf8), nullable: false }, SummaryField { name: \"max(raw_samples.value)\", dtype: ExactAggregate(MinMax, MinMax), nullable: false }], time_index: None }, guarantee: Some(ResultGuarantee { metric: AbsoluteValue, bound: Zero, failure_probability: Zero, provenance: [Exact { reason: \"ExactAggregate(MinMax)\" }, ChildGuarantee { input_index: 0, guarantee: ResultGuarantee { metric: AbsoluteValue, bound: Zero, failure_probability: Zero, provenance: [Exact { reason: \"KeepPreAsap\" }] } }, CompositionStep { operator: ExactExtremum, rule: \"exact_input\" }] }) }, operation: Project { cols: [ProjectItem { alias: None, expr: Column(0) }, ProjectItem { alias: Some(\"value\"), expr: Column(1) }], qualifier: None }, timing: ReadTime }, schema: SummarySchema { fields: [SummaryField { name: \"labels\", dtype: Plain(Utf8), nullable: false }, SummaryField { name: \"value\", dtype: Plain(Float64), nullable: false }], time_index: None }, guarantee: Some(ResultGuarantee { metric: AbsoluteValue, bound: Zero, failure_probability: Zero, provenance: [Exact { reason: \"ExactAggregate(MinMax)\" }, ChildGuarantee { input_index: 0, guarantee: ResultGuarantee { metric: AbsoluteValue, bound: Zero, failure_probability: Zero, provenance: [Exact { reason: \"KeepPreAsap\" }] } }, CompositionStep { operator: ExactExtremum, rule: \"exact_input\" }] }) }, operation: Sort { keys: [SortKey { expr: Column(1), ascending: false, nulls_first: true }, SortKey { expr: Column(0), ascending: true, nulls_first: false }], partition_by: GroupKeys { keys: [], without: false } }, timing: ReadTime }, schema: SummarySchema { fields: [SummaryField { name: \"labels\", dtype: Plain(Utf8), nullable: false }, SummaryField { name: \"value\", dtype: Plain(Float64), nullable: false }], time_index: None }, guarantee: Some(ResultGuarantee { metric: AbsoluteValue, bound: Zero, failure_probability: Zero, provenance: [Exact { reason: \"ExactAggregate(MinMax)\" }, ChildGuarantee { input_index: 0, guarantee: ResultGuarantee { metric: AbsoluteValue, bound: Zero, failure_probability: Zero, provenance: [Exact { reason: \"KeepPreAsap\" }] } }, CompositionStep { operator: ExactExtremum, rule: \"exact_input\" }] }) }, operation: Limit { n: 2, offset: 0 }, timing: ReadTime }, schema: SummarySchema { fields: [SummaryField { name: \"labels\", dtype: Plain(Utf8), nullable: false }, SummaryField { name: \"value\", dtype: Plain(Float64), nullable: false }], time_index: None }, guarantee: Some(ResultGuarantee { metric: AbsoluteValue, bound: Zero, failure_probability: Zero, provenance: [Exact { reason: \"ExactAggregate(MinMax)\" }, ChildGuarantee { input_index: 0, guarantee: ResultGuarantee { metric: AbsoluteValue, bound: Zero, failure_probability: Zero, provenance: [Exact { reason: \"KeepPreAsap\" }] } }, CompositionStep { operator: ExactExtremum, rule: \"exact_input\" }] }) }))",
-      "publication": "failure",
-      "reason": "SQL lowering failed: invalid QueryPlan: SQL population predicate on metric needs a canonical catalog filter",
-      "sql": "SELECT labels,max(value) AS value FROM raw_samples WHERE metric='backend_retry_backlog_depth' AND ts_ms>1788891296000-21600000 AND ts_ms<=1788891296000 GROUP BY labels ORDER BY value DESC,labels LIMIT 2"
-    },
-    {
-      "id": "q24",
-      "operators": [
-        "rate",
-        "max_over_time",
-        "sum",
-        "subquery",
-        "division"
-      ],
-      "parser_planner": "failure",
-      "reason": "SQL lowering failed: DataFusion error: SQL error: ParserError(\"Expected: joined table, found: ,\")",
-      "sql": "SELECT map() labels,max(a.value/b.value) value FROM (SELECT grid_ms,sum(value) value FROM (SELECT grid_ms,labels,corrected*(sampled+least(start_extra,if(corrected>0,sampled*(first_value/corrected),start_extra))+end_extra)/sampled/300 value FROM (SELECT grid_ms,labels,samples,length(samples) n,samples[1].1 first_ts,samples[n].1 last_ts,samples[1].2 first_value,samples[n].2 last_value,(last_ts-first_ts)/1000 sampled,(last_value-first_value)+arraySum(i -> if(samples[i].2<samples[i-1].2,samples[i-1].2,0.),range(2,n+1)) corrected,if((first_ts-(grid_ms-300000))/1000<sampled/(n-1)*1.1,(first_ts-(grid_ms-300000))/1000,sampled/(n-1)/2) start_extra,if((grid_ms-last_ts)/1000<sampled/(n-1)*1.1,(grid_ms-last_ts)/1000,sampled/(n-1)/2) end_extra FROM (SELECT grid_ms,labels,arraySort(x->x.1,groupArray((ts_ms,value))) samples FROM raw_samples CROSS JOIN (SELECT arrayJoin(arrayMap(x->x*60000,range(toUInt64(intDiv(1788891296000-21600000+59999,60000)),toUInt64(intDiv(1788891296000,60000)+1)))) grid_ms) grids WHERE metric='order_service_http_5xx_total' AND ts_ms>=grid_ms-300000 AND ts_ms<=grid_ms GROUP BY grid_ms,labels) WHERE n>=2)) GROUP BY grid_ms) a INNER JOIN (SELECT grid_ms,sum(value) value FROM (SELECT grid_ms,labels,corrected*(sampled+least(start_extra,if(corrected>0,sampled*(first_value/corrected),start_extra))+end_extra)/sampled/300 value FROM (SELECT grid_ms,labels,samples,length(samples) n,samples[1].1 first_ts,samples[n].1 last_ts,samples[1].2 first_value,samples[n].2 last_value,(last_ts-first_ts)/1000 sampled,(last_value-first_value)+arraySum(i -> if(samples[i].2<samples[i-1].2,samples[i-1].2,0.),range(2,n+1)) corrected,if((first_ts-(grid_ms-300000))/1000<sampled/(n-1)*1.1,(first_ts-(grid_ms-300000))/1000,sampled/(n-1)/2) start_extra,if((grid_ms-last_ts)/1000<sampled/(n-1)*1.1,(grid_ms-last_ts)/1000,sampled/(n-1)/2) end_extra FROM (SELECT grid_ms,labels,arraySort(x->x.1,groupArray((ts_ms,value))) samples FROM raw_samples CROSS JOIN (SELECT arrayJoin(arrayMap(x->x*60000,range(toUInt64(intDiv(1788891296000-21600000+59999,60000)),toUInt64(intDiv(1788891296000,60000)+1)))) grid_ms) grids WHERE metric='order_service_http_requests_total' AND ts_ms>=grid_ms-300000 AND ts_ms<=grid_ms GROUP BY grid_ms,labels) WHERE n>=2)) GROUP BY grid_ms) b ON a.grid_ms=b.grid_ms"
-    },
-    {
-      "id": "q25",
-      "operators": [
-        "topk",
-        "scalar",
-        "increase",
-        "sum",
-        "division"
-      ],
-      "parser_planner": "failure",
-      "reason": "SQL lowering failed: DataFusion error: SQL error: ParserError(\"Expected: joined table, found: .\")",
-      "sql": "SELECT * FROM (SELECT a.labels,a.value/b.value value FROM (SELECT map('job',job) labels,sum(value) value FROM (SELECT labels['job'] job,value FROM (SELECT labels, corrected*(sampled+least(start_extra,if(corrected>0,sampled*(first_value/corrected),start_extra))+end_extra)/sampled AS value FROM (SELECT labels,samples,length(samples) n,samples[1].1 first_ts,samples[n].1 last_ts,samples[1].2 first_value,samples[n].2 last_value,(last_ts-first_ts)/1000 sampled,(last_value-first_value)+arraySum(i -> if(samples[i].2<samples[i-1].2,samples[i-1].2,0.),range(2,n+1)) corrected,if((first_ts-((1788891296000-0)-86400000))/1000<sampled/(n-1)*1.1,(first_ts-((1788891296000-0)-86400000))/1000,sampled/(n-1)/2) start_extra,if(((1788891296000-0)-last_ts)/1000<sampled/(n-1)*1.1,((1788891296000-0)-last_ts)/1000,sampled/(n-1)/2) end_extra FROM (SELECT labels,arraySort(x -> x.1,groupArray((ts_ms,value))) samples FROM raw_samples WHERE metric='backend_http_5xx_total' AND ts_ms>=((1788891296000-0)-86400000) AND ts_ms<=(1788891296000-0) GROUP BY labels) WHERE n>=2))) GROUP BY job) a CROSS JOIN (SELECT map() labels,sum(value) value FROM (SELECT labels, corrected*(sampled+least(start_extra,if(corrected>0,sampled*(first_value/corrected),start_extra))+end_extra)/sampled AS value FROM (SELECT labels,samples,length(samples) n,samples[1].1 first_ts,samples[n].1 last_ts,samples[1].2 first_value,samples[n].2 last_value,(last_ts-first_ts)/1000 sampled,(last_value-first_value)+arraySum(i -> if(samples[i].2<samples[i-1].2,samples[i-1].2,0.),range(2,n+1)) corrected,if((first_ts-((1788891296000-0)-86400000))/1000<sampled/(n-1)*1.1,(first_ts-((1788891296000-0)-86400000))/1000,sampled/(n-1)/2) start_extra,if(((1788891296000-0)-last_ts)/1000<sampled/(n-1)*1.1,((1788891296000-0)-last_ts)/1000,sampled/(n-1)/2) end_extra FROM (SELECT labels,arraySort(x -> x.1,groupArray((ts_ms,value))) samples FROM raw_samples WHERE metric='backend_http_5xx_total' AND ts_ms>=((1788891296000-0)-86400000) AND ts_ms<=(1788891296000-0) GROUP BY labels) WHERE n>=2))) b) ORDER BY value DESC,labels LIMIT 1"
-    },
-    {
-      "id": "q26",
-      "operators": [
-        "topk",
-        "rate"
-      ],
-      "parser_planner": "failure",
-      "reason": "SQL lowering failed: DataFusion error: SQL error: ParserError(\"Expected: joined table, found: labels\")",
-      "sql": "SELECT * FROM (SELECT map('job',job) labels,sum(value) value FROM (SELECT labels['job'] job,value FROM (SELECT labels, corrected*(sampled+least(start_extra,if(corrected>0,sampled*(first_value/corrected),start_extra))+end_extra)/sampled/(21600000/1000) AS value FROM (SELECT labels,samples,length(samples) n,samples[1].1 first_ts,samples[n].1 last_ts,samples[1].2 first_value,samples[n].2 last_value,(last_ts-first_ts)/1000 sampled,(last_value-first_value)+arraySum(i -> if(samples[i].2<samples[i-1].2,samples[i-1].2,0.),range(2,n+1)) corrected,if((first_ts-((1788891296000-0)-21600000))/1000<sampled/(n-1)*1.1,(first_ts-((1788891296000-0)-21600000))/1000,sampled/(n-1)/2) start_extra,if(((1788891296000-0)-last_ts)/1000<sampled/(n-1)*1.1,((1788891296000-0)-last_ts)/1000,sampled/(n-1)/2) end_extra FROM (SELECT labels,arraySort(x -> x.1,groupArray((ts_ms,value))) samples FROM raw_samples WHERE metric='backend_process_cpu_seconds_total' AND ts_ms>=((1788891296000-0)-21600000) AND ts_ms<=(1788891296000-0) GROUP BY labels) WHERE n>=2))) GROUP BY job) ORDER BY value DESC,labels LIMIT 1"
-    },
-    {
-      "id": "q27",
-      "operators": [
-        "topk",
-        "avg_over_time",
-        "subquery"
-      ],
-      "parser_planner": "failure",
-      "reason": "SQL lowering failed: DataFusion error: Error during planning: Invalid function 'modulo'.\nDid you mean 'round'?",
-      "sql": "SELECT map('job',job) labels,avg(value) value FROM (SELECT labels['job'] job,ts_ms,sum(value) value FROM raw_samples WHERE metric='backend_process_resident_memory_bytes' AND ts_ms+4000>=1788891296000-21600000 AND ts_ms+4000<=1788891296000 AND modulo(ts_ms+4000,60000)=0 GROUP BY job,ts_ms) GROUP BY job ORDER BY value DESC,job LIMIT 3"
-    }
-  ],
-  "query_count": 27
-}
diff --git a/tools/clickhouse-benefit/artifacts/latest-main-runtime-matrix.json b/tools/clickhouse-benefit/artifacts/latest-main-runtime-matrix.json
deleted file mode 100644
index d4c07562c..000000000
--- a/tools/clickhouse-benefit/artifacts/latest-main-runtime-matrix.json
+++ /dev/null
@@ -1,355 +0,0 @@
-{
-  "queries": [
-    {
-      "acceleration_reason": "Planning(\"SQL lowering failed: DataFusion error: SQL error: ParserError(\\\"Expected: joined table, found: .\\\")\")",
-      "clickhouse_exception_code": null,
-      "clickhouse_summary": "{\"read_rows\":\"40960\",\"read_bytes\":\"4192978\",\"written_rows\":\"0\",\"written_bytes\":\"0\",\"total_rows_to_read\":\"40960\",\"result_rows\":\"0\",\"result_bytes\":\"0\",\"elapsed_ns\":\"141662593\",\"memory_usage\":\"5791861\"}",
-      "direct_exact_status": 200,
-      "exact_executed": true,
-      "exact_status": 200,
-      "exact_success": true,
-      "fallback_requested": true,
-      "id": "q01",
-      "matches_direct_exact": true,
-      "result": "{'job':'payment-service'}\t0.09651474530831099\n{'job':'order-service'}\t0.04043126684636118\n{'job':'user-service'}\t0.03504043126684636\n"
-    },
-    {
-      "acceleration_reason": "Planning(\"SQL lowering failed: DataFusion error: SQL error: ParserError(\\\"Expected: joined table, found: .\\\")\")",
-      "clickhouse_exception_code": null,
-      "clickhouse_summary": "{\"read_rows\":\"40960\",\"read_bytes\":\"4192978\",\"written_rows\":\"0\",\"written_bytes\":\"0\",\"total_rows_to_read\":\"40960\",\"result_rows\":\"0\",\"result_bytes\":\"0\",\"elapsed_ns\":\"159230011\",\"memory_usage\":\"5793981\"}",
-      "direct_exact_status": 200,
-      "exact_executed": true,
-      "exact_status": 200,
-      "exact_success": true,
-      "fallback_requested": true,
-      "id": "q02",
-      "matches_direct_exact": true,
-      "result": "{'job':'payment-service'}\t0.09651474530831099\n"
-    },
-    {
-      "acceleration_reason": "Planning(\"SQL lowering failed: DataFusion error: SQL error: ParserError(\\\"Expected: identifier, found: )\\\")\")",
-      "clickhouse_exception_code": null,
-      "clickhouse_summary": "{\"read_rows\":\"24576\",\"read_bytes\":\"2065212\",\"written_rows\":\"0\",\"written_bytes\":\"0\",\"total_rows_to_read\":\"24576\",\"result_rows\":\"0\",\"result_bytes\":\"0\",\"elapsed_ns\":\"80231995\",\"memory_usage\":\"1999791\"}",
-      "direct_exact_status": 200,
-      "exact_executed": true,
-      "exact_status": 200,
-      "exact_success": true,
-      "fallback_requested": true,
-      "id": "q03",
-      "matches_direct_exact": true,
-      "result": "{}\t0.017857142857142856\n"
-    },
-    {
-      "acceleration_reason": "Planning(\"SQL lowering failed: DataFusion error: SQL error: ParserError(\\\"Expected: identifier, found: )\\\")\")",
-      "clickhouse_exception_code": null,
-      "clickhouse_summary": "{\"read_rows\":\"24576\",\"read_bytes\":\"2065212\",\"written_rows\":\"0\",\"written_bytes\":\"0\",\"total_rows_to_read\":\"24576\",\"result_rows\":\"0\",\"result_bytes\":\"0\",\"elapsed_ns\":\"72042147\",\"memory_usage\":\"2022831\"}",
-      "direct_exact_status": 200,
-      "exact_executed": true,
-      "exact_status": 200,
-      "exact_success": true,
-      "fallback_requested": true,
-      "id": "q04",
-      "matches_direct_exact": true,
-      "result": "{}\t0.017241379310344827\n"
-    },
-    {
-      "acceleration_reason": "CatalogMiss",
-      "clickhouse_exception_code": null,
-      "clickhouse_summary": "{\"read_rows\":\"24576\",\"read_bytes\":\"1737396\",\"written_rows\":\"0\",\"written_bytes\":\"0\",\"total_rows_to_read\":\"24576\",\"result_rows\":\"0\",\"result_bytes\":\"0\",\"elapsed_ns\":\"18892916\",\"memory_usage\":\"2940118\"}",
-      "direct_exact_status": 200,
-      "exact_executed": true,
-      "exact_status": 200,
-      "exact_success": true,
-      "fallback_requested": true,
-      "id": "q05",
-      "matches_direct_exact": true,
-      "result": "{'job':'api-gateway','instance':'api-gateway:8081'}\t0\n{'job':'order-service','instance':'order-service:8083'}\t0\n{'job':'payment-service','instance':'payment-service:8084'}\t0\n{'job':'user-service','instance':'user-service:8082'}\t530\n{'job':'webapp','instance':'webapp:8080'}\t0\n"
-    },
-    {
-      "acceleration_reason": "CatalogMiss",
-      "clickhouse_exception_code": null,
-      "clickhouse_summary": "{\"read_rows\":\"6596\",\"read_bytes\":\"639068\",\"written_rows\":\"0\",\"written_bytes\":\"0\",\"total_rows_to_read\":\"6596\",\"result_rows\":\"0\",\"result_bytes\":\"0\",\"elapsed_ns\":\"13463916\",\"memory_usage\":\"1267007\"}",
-      "direct_exact_status": 200,
-      "exact_executed": true,
-      "exact_status": 200,
-      "exact_success": true,
-      "fallback_requested": true,
-      "id": "q06",
-      "matches_direct_exact": true,
-      "result": "{'job':'user-service','instance':'user-service:8082'}\t530\n"
-    },
-    {
-      "acceleration_reason": "Planning(\"SQL lowering failed: DataFusion error: Error during planning: Invalid function 'mapconcat'.\\nDid you mean 'concat'?\")",
-      "clickhouse_exception_code": null,
-      "clickhouse_summary": "{\"read_rows\":\"6596\",\"read_bytes\":\"639068\",\"written_rows\":\"0\",\"written_bytes\":\"0\",\"total_rows_to_read\":\"6596\",\"result_rows\":\"0\",\"result_bytes\":\"0\",\"elapsed_ns\":\"13453832\",\"memory_usage\":\"1306007\"}",
-      "direct_exact_status": 200,
-      "exact_executed": true,
-      "exact_status": 200,
-      "exact_success": true,
-      "fallback_requested": true,
-      "id": "q07",
-      "matches_direct_exact": true,
-      "result": "{'job':'user-service','instance':'user-service:8082','__name__':'user_service_cache_refresh_lag_seconds'}\t0\n"
-    },
-    {
-      "acceleration_reason": "Planning(\"SQL lowering failed: DataFusion error: SQL error: ParserError(\\\"Expected: joined table, found: ,\\\")\")",
-      "clickhouse_exception_code": null,
-      "clickhouse_summary": "{\"read_rows\":\"16384\",\"read_bytes\":\"1597946\",\"written_rows\":\"0\",\"written_bytes\":\"0\",\"total_rows_to_read\":\"16384\",\"result_rows\":\"0\",\"result_bytes\":\"0\",\"elapsed_ns\":\"38447351\",\"memory_usage\":\"3091395\"}",
-      "direct_exact_status": 200,
-      "exact_executed": true,
-      "exact_status": 200,
-      "exact_success": true,
-      "fallback_requested": true,
-      "id": "q08",
-      "matches_direct_exact": true,
-      "result": "{}\t0.007247222222222231\n"
-    },
-    {
-      "acceleration_reason": "Planning(\"SQL lowering failed: DataFusion error: Error during planning: Error during planning: map does not support zero arguments. No function matches the given name and argument types 'map()'. You might need to add explicit type casts.\\n\\tCandidate functions:\\n\\tmap(Any, .., Any)\")",
-      "clickhouse_exception_code": null,
-      "clickhouse_summary": "{\"read_rows\":\"16384\",\"read_bytes\":\"1572468\",\"written_rows\":\"0\",\"written_bytes\":\"0\",\"total_rows_to_read\":\"16384\",\"result_rows\":\"0\",\"result_bytes\":\"0\",\"elapsed_ns\":\"10666037\",\"memory_usage\":\"2788497\"}",
-      "direct_exact_status": 200,
-      "exact_executed": true,
-      "exact_status": 200,
-      "exact_success": true,
-      "fallback_requested": true,
-      "id": "q09",
-      "matches_direct_exact": true,
-      "result": "{}\t570522659\n"
-    },
-    {
-      "acceleration_reason": "Planning(\"SQL lowering failed: DataFusion error: Error during planning: Invalid function 'modulo'.\\nDid you mean 'md5'?\")",
-      "clickhouse_exception_code": null,
-      "clickhouse_summary": "{\"read_rows\":\"16384\",\"read_bytes\":\"278528\",\"written_rows\":\"0\",\"written_bytes\":\"0\",\"total_rows_to_read\":\"16384\",\"result_rows\":\"0\",\"result_bytes\":\"0\",\"elapsed_ns\":\"9619551\",\"memory_usage\":\"1337455\"}",
-      "direct_exact_status": 200,
-      "exact_executed": true,
-      "exact_status": 200,
-      "exact_success": true,
-      "fallback_requested": true,
-      "id": "q10",
-      "matches_direct_exact": true,
-      "result": "{}\t631591324\n"
-    },
-    {
-      "acceleration_reason": "Planning(\"SQL lowering failed: DataFusion error: SQL error: ParserError(\\\"Expected: joined table, found: labels\\\")\")",
-      "clickhouse_exception_code": null,
-      "clickhouse_summary": "{\"read_rows\":\"16384\",\"read_bytes\":\"1597946\",\"written_rows\":\"0\",\"written_bytes\":\"0\",\"total_rows_to_read\":\"16384\",\"result_rows\":\"0\",\"result_bytes\":\"0\",\"elapsed_ns\":\"55780466\",\"memory_usage\":\"3865123\"}",
-      "direct_exact_status": 200,
-      "exact_executed": true,
-      "exact_status": 200,
-      "exact_success": true,
-      "fallback_requested": true,
-      "id": "q11",
-      "matches_direct_exact": true,
-      "result": "{'job':'payment-service'}\t0.0014705555555555587\n{'job':'order-service'}\t0.0014694444444444462\n"
-    },
-    {
-      "acceleration_reason": "Planning(\"SQL lowering failed: DataFusion error: This feature is not implemented: Map Access\")",
-      "clickhouse_exception_code": null,
-      "clickhouse_summary": "{\"read_rows\":\"16384\",\"read_bytes\":\"1572468\",\"written_rows\":\"0\",\"written_bytes\":\"0\",\"total_rows_to_read\":\"16384\",\"result_rows\":\"0\",\"result_bytes\":\"0\",\"elapsed_ns\":\"15626466\",\"memory_usage\":\"3161721\"}",
-      "direct_exact_status": 200,
-      "exact_executed": true,
-      "exact_status": 200,
-      "exact_success": true,
-      "fallback_requested": true,
-      "id": "q12",
-      "matches_direct_exact": true,
-      "result": "{'job':'webapp'}\t119294036\n{'job':'api-gateway'}\t116909806\n"
-    },
-    {
-      "acceleration_reason": "Planning(\"SQL lowering failed: DataFusion error: SQL error: ParserError(\\\"Expected: joined table, found: ,\\\")\")",
-      "clickhouse_exception_code": null,
-      "clickhouse_summary": "{\"read_rows\":\"16385\",\"read_bytes\":\"1597947\",\"written_rows\":\"0\",\"written_bytes\":\"0\",\"total_rows_to_read\":\"16385\",\"result_rows\":\"0\",\"result_bytes\":\"0\",\"elapsed_ns\":\"675135384\",\"memory_usage\":\"6500041\"}",
-      "direct_exact_status": 200,
-      "exact_executed": true,
-      "exact_status": 200,
-      "exact_success": true,
-      "fallback_requested": true,
-      "id": "q13",
-      "matches_direct_exact": true,
-      "result": "{}\t0.008770370370370298\n"
-    },
-    {
-      "acceleration_reason": "Planning(\"SQL lowering failed: DataFusion error: SQL error: ParserError(\\\"Expected: joined table, found: ,\\\")\")",
-      "clickhouse_exception_code": null,
-      "clickhouse_summary": "{\"read_rows\":\"24576\",\"read_bytes\":\"2212906\",\"written_rows\":\"0\",\"written_bytes\":\"0\",\"total_rows_to_read\":\"24576\",\"result_rows\":\"0\",\"result_bytes\":\"0\",\"elapsed_ns\":\"16595418\",\"memory_usage\":\"3274558\"}",
-      "direct_exact_status": 200,
-      "exact_executed": true,
-      "exact_status": 200,
-      "exact_success": true,
-      "fallback_requested": true,
-      "id": "q14",
-      "matches_direct_exact": true,
-      "result": "{}\t0.07\n"
-    },
-    {
-      "acceleration_reason": "Planning(\"SQL lowering failed: DataFusion error: SQL error: ParserError(\\\"Expected: joined table, found: [\\\")\")",
-      "clickhouse_exception_code": null,
-      "clickhouse_summary": "{\"read_rows\":\"24576\",\"read_bytes\":\"2212906\",\"written_rows\":\"0\",\"written_bytes\":\"0\",\"total_rows_to_read\":\"24576\",\"result_rows\":\"0\",\"result_bytes\":\"0\",\"elapsed_ns\":\"35979973\",\"memory_usage\":\"3781334\"}",
-      "direct_exact_status": 200,
-      "exact_executed": true,
-      "exact_status": 200,
-      "exact_success": true,
-      "fallback_requested": true,
-      "id": "q15",
-      "matches_direct_exact": true,
-      "result": "{'job':'user-service'}\t0.02\n{'job':'payment-service'}\t0.006666666666666667\n{'job':'order-service'}\t0.043333333333333335\n"
-    },
-    {
-      "acceleration_reason": "Planning(\"SQL lowering failed: DataFusion error: SQL error: ParserError(\\\"Expected: identifier, found: )\\\")\")",
-      "clickhouse_exception_code": null,
-      "clickhouse_summary": "{\"read_rows\":\"40960\",\"read_bytes\":\"3330802\",\"written_rows\":\"0\",\"written_bytes\":\"0\",\"total_rows_to_read\":\"40960\",\"result_rows\":\"0\",\"result_bytes\":\"0\",\"elapsed_ns\":\"69301546\",\"memory_usage\":\"3762184\"}",
-      "direct_exact_status": 200,
-      "exact_executed": true,
-      "exact_status": 200,
-      "exact_success": true,
-      "fallback_requested": true,
-      "id": "q16",
-      "matches_direct_exact": true,
-      "result": "{}\t0.04609929078014184\n"
-    },
-    {
-      "acceleration_reason": "Planning(\"SQL lowering failed: DataFusion error: SQL error: ParserError(\\\"Expected: joined table, found: .\\\")\")",
-      "clickhouse_exception_code": null,
-      "clickhouse_summary": "{\"read_rows\":\"40960\",\"read_bytes\":\"4192978\",\"written_rows\":\"0\",\"written_bytes\":\"0\",\"total_rows_to_read\":\"40960\",\"result_rows\":\"0\",\"result_bytes\":\"0\",\"elapsed_ns\":\"187734915\",\"memory_usage\":\"5793981\"}",
-      "direct_exact_status": 200,
-      "exact_executed": true,
-      "exact_status": 200,
-      "exact_success": true,
-      "fallback_requested": true,
-      "id": "q17",
-      "matches_direct_exact": true,
-      "result": "{'job':'payment-service'}\t0.09651474530831099\n"
-    },
-    {
-      "acceleration_reason": "Planning(\"SQL lowering failed: DataFusion error: SQL error: ParserError(\\\"Expected: joined table, found: labels\\\")\")",
-      "clickhouse_exception_code": null,
-      "clickhouse_summary": "{\"read_rows\":\"16384\",\"read_bytes\":\"1117896\",\"written_rows\":\"0\",\"written_bytes\":\"0\",\"total_rows_to_read\":\"16384\",\"result_rows\":\"0\",\"result_bytes\":\"0\",\"elapsed_ns\":\"392432743\",\"memory_usage\":\"5178010\"}",
-      "direct_exact_status": 200,
-      "exact_executed": true,
-      "exact_status": 200,
-      "exact_success": true,
-      "fallback_requested": true,
-      "id": "q18",
-      "matches_direct_exact": true,
-      "result": "{'job':'user-service'}\t23.00422018348624\n{'job':'payment-service'}\t46.008164714235\n{'job':'order-service'}\t79.01389377418221\n"
-    },
-    {
-      "acceleration_reason": "Planning(\"SQL lowering failed: DataFusion error: SQL error: ParserError(\\\"Expected: joined table, found: ,\\\")\")",
-      "clickhouse_exception_code": null,
-      "clickhouse_summary": "{\"read_rows\":\"8192\",\"read_bytes\":\"1028096\",\"written_rows\":\"0\",\"written_bytes\":\"0\",\"total_rows_to_read\":\"8192\",\"result_rows\":\"0\",\"result_bytes\":\"0\",\"elapsed_ns\":\"35002365\",\"memory_usage\":\"1867447\"}",
-      "direct_exact_status": 200,
-      "exact_executed": true,
-      "exact_status": 200,
-      "exact_success": true,
-      "fallback_requested": true,
-      "id": "q19",
-      "matches_direct_exact": true,
-      "result": "{}\t0.043333333333333335\n"
-    },
-    {
-      "acceleration_reason": "Planning(\"SQL lowering failed: DataFusion error: SQL error: ParserError(\\\"Expected: joined table, found: ,\\\")\")",
-      "clickhouse_exception_code": null,
-      "clickhouse_summary": "{\"read_rows\":\"8192\",\"read_bytes\":\"1028096\",\"written_rows\":\"0\",\"written_bytes\":\"0\",\"total_rows_to_read\":\"8192\",\"result_rows\":\"0\",\"result_bytes\":\"0\",\"elapsed_ns\":\"36514844\",\"memory_usage\":\"1867447\"}",
-      "direct_exact_status": 200,
-      "exact_executed": true,
-      "exact_status": 200,
-      "exact_success": true,
-      "fallback_requested": true,
-      "id": "q20",
-      "matches_direct_exact": true,
-      "result": "{}\t0.06666666666666667\n"
-    },
-    {
-      "acceleration_reason": "Planning(\"SQL lowering failed: DataFusion error: SQL error: ParserError(\\\"Expected: ), found: .1\\\")\")",
-      "clickhouse_exception_code": null,
-      "clickhouse_summary": "{\"read_rows\":\"0\",\"read_bytes\":\"0\",\"written_rows\":\"0\",\"written_bytes\":\"0\",\"total_rows_to_read\":\"0\",\"result_rows\":\"0\",\"result_bytes\":\"0\",\"elapsed_ns\":\"73269011\",\"memory_usage\":\"6224764\"}",
-      "direct_exact_status": 200,
-      "exact_executed": true,
-      "exact_status": 200,
-      "exact_success": true,
-      "fallback_requested": true,
-      "id": "q21",
-      "matches_direct_exact": true,
-      "result": ""
-    },
-    {
-      "acceleration_reason": "Planning(\"SQL lowering failed: DataFusion error: SQL error: ParserError(\\\"Expected: joined table, found: ,\\\")\")",
-      "clickhouse_exception_code": null,
-      "clickhouse_summary": "{\"read_rows\":\"8192\",\"read_bytes\":\"1028096\",\"written_rows\":\"0\",\"written_bytes\":\"0\",\"total_rows_to_read\":\"8192\",\"result_rows\":\"0\",\"result_bytes\":\"0\",\"elapsed_ns\":\"32275428\",\"memory_usage\":\"1867447\"}",
-      "direct_exact_status": 200,
-      "exact_executed": true,
-      "exact_status": 200,
-      "exact_success": true,
-      "fallback_requested": true,
-      "id": "q22",
-      "matches_direct_exact": true,
-      "result": "{}\t0.043333333333333335\n"
-    },
-    {
-      "acceleration_reason": "CatalogMiss",
-      "clickhouse_exception_code": null,
-      "clickhouse_summary": "{\"read_rows\":\"24576\",\"read_bytes\":\"1923892\",\"written_rows\":\"0\",\"written_bytes\":\"0\",\"total_rows_to_read\":\"24576\",\"result_rows\":\"0\",\"result_bytes\":\"0\",\"elapsed_ns\":\"17781619\",\"memory_usage\":\"2829098\"}",
-      "direct_exact_status": 200,
-      "exact_executed": true,
-      "exact_status": 200,
-      "exact_success": true,
-      "fallback_requested": true,
-      "id": "q23",
-      "matches_direct_exact": true,
-      "result": "{'job':'payment-service','instance':'payment-service:8084'}\t101\n{'job':'order-service','instance':'order-service:8083'}\t24\n"
-    },
-    {
-      "acceleration_reason": "Planning(\"SQL lowering failed: DataFusion error: SQL error: ParserError(\\\"Expected: joined table, found: ,\\\")\")",
-      "clickhouse_exception_code": null,
-      "clickhouse_summary": "{\"read_rows\":\"24578\",\"read_bytes\":\"3075298\",\"written_rows\":\"0\",\"written_bytes\":\"0\",\"total_rows_to_read\":\"24578\",\"result_rows\":\"0\",\"result_bytes\":\"0\",\"elapsed_ns\":\"514138636\",\"memory_usage\":\"5381809\"}",
-      "direct_exact_status": 200,
-      "exact_executed": true,
-      "exact_status": 200,
-      "exact_success": true,
-      "fallback_requested": true,
-      "id": "q24",
-      "matches_direct_exact": true,
-      "result": "{}\t0.3333333333333333\n"
-    },
-    {
-      "acceleration_reason": "Planning(\"SQL lowering failed: DataFusion error: SQL error: ParserError(\\\"Expected: joined table, found: .\\\")\")",
-      "clickhouse_exception_code": null,
-      "clickhouse_summary": "{\"read_rows\":\"32768\",\"read_bytes\":\"2235792\",\"written_rows\":\"0\",\"written_bytes\":\"0\",\"total_rows_to_read\":\"32768\",\"result_rows\":\"0\",\"result_bytes\":\"0\",\"elapsed_ns\":\"461866666\",\"memory_usage\":\"6463074\"}",
-      "direct_exact_status": 200,
-      "exact_executed": true,
-      "exact_status": 200,
-      "exact_success": true,
-      "fallback_requested": true,
-      "id": "q25",
-      "matches_direct_exact": true,
-      "result": "{'job':'order-service'}\t0.5337828828982084\n"
-    },
-    {
-      "acceleration_reason": "Planning(\"SQL lowering failed: DataFusion error: SQL error: ParserError(\\\"Expected: joined table, found: labels\\\")\")",
-      "clickhouse_exception_code": null,
-      "clickhouse_summary": "{\"read_rows\":\"16384\",\"read_bytes\":\"1597946\",\"written_rows\":\"0\",\"written_bytes\":\"0\",\"total_rows_to_read\":\"16384\",\"result_rows\":\"0\",\"result_bytes\":\"0\",\"elapsed_ns\":\"127135718\",\"memory_usage\":\"4047123\"}",
-      "direct_exact_status": 200,
-      "exact_executed": true,
-      "exact_status": 200,
-      "exact_success": true,
-      "fallback_requested": true,
-      "id": "q26",
-      "matches_direct_exact": true,
-      "result": "{'job':'order-service'}\t0.0015755555555555553\n"
-    },
-    {
-      "acceleration_reason": "Planning(\"SQL lowering failed: DataFusion error: Error during planning: Invalid function 'modulo'.\\nDid you mean 'today'?\")",
-      "clickhouse_exception_code": null,
-      "clickhouse_summary": "{\"read_rows\":\"16384\",\"read_bytes\":\"515898\",\"written_rows\":\"0\",\"written_bytes\":\"0\",\"total_rows_to_read\":\"16384\",\"result_rows\":\"0\",\"result_bytes\":\"0\",\"elapsed_ns\":\"24118741\",\"memory_usage\":\"3428334\"}",
-      "direct_exact_status": 200,
-      "exact_executed": true,
-      "exact_status": 200,
-      "exact_success": true,
-      "fallback_requested": true,
-      "id": "q27",
-      "matches_direct_exact": true,
-      "result": "{'job':'api-gateway'}\t118035226.79722223\n{'job':'user-service'}\t117853344.7638889\n{'job':'webapp'}\t117812478.69722222\n"
-    }
-  ]
-}
diff --git a/tools/clickhouse-benefit/artifacts/matched-raw-traces.sha256 b/tools/clickhouse-benefit/artifacts/matched-raw-traces.sha256
deleted file mode 100644
index 3b286d60d..000000000
--- a/tools/clickhouse-benefit/artifacts/matched-raw-traces.sha256
+++ /dev/null
@@ -1,3 +0,0 @@
-25e7be2eb6a5d8ee66013bc9a8d5e1807a8af4c74cf4f19b363e18d693288328  /mydata/clickhouse-o11y-main-results/fine-1s-matched-trial1.json
-9dd2eff0cb8fad6d1339be4d04aca3b9f71023c9f9f26d3119249de29ea16b8b  /mydata/clickhouse-o11y-main-results/fine-1s-matched-trial2.json
-0ad65f290f42aee7520a1648663112e3759c8a9d93806cab9c1cbb520ef1b8f3  /mydata/clickhouse-o11y-main-results/fine-1s-matched-trial3.json
diff --git a/tools/clickhouse-benefit/artifacts/raw-traces.sha256 b/tools/clickhouse-benefit/artifacts/raw-traces.sha256
deleted file mode 100644
index b7146d12a..000000000
--- a/tools/clickhouse-benefit/artifacts/raw-traces.sha256
+++ /dev/null
@@ -1,3 +0,0 @@
-721e4235ac30330e43baf9c48aed217d53c5e83995717a6a411da0363e4e017f  /mydata/clickhouse-o11y-main-results/fine-1s-release-trial1.json
-8fcf46456da9533540147c43b22a8cef6f0db81ad8778c2e6d889e676c6b2424  /mydata/clickhouse-o11y-main-results/fine-1s-release-trial2.json
-e09ee0844d63b3b91b065c4212b6efc6c314923a50bab9de6c883af6e1eecf51  /mydata/clickhouse-o11y-main-results/fine-1s-release-trial3.json
diff --git a/tools/clickhouse-benefit/automatic-aggregate-results.md b/tools/clickhouse-benefit/automatic-aggregate-results.md
deleted file mode 100644
index 992b64adb..000000000
--- a/tools/clickhouse-benefit/automatic-aggregate-results.md
+++ /dev/null
@@ -1,99 +0,0 @@
-# Automatically selected SUM and MAX over a bounded o11y series
-
-Measured 2026-09-11, source commit `a5dd4b3c`. The control plane now calls
-ASAPPlanner and constructs the catalog from its selected DAG. The probe supplies
-SQL, source schema, accuracy and time bounds; it does not supply a winning family
-or a predeclared materialization. Planner selected exact `Sum` and
-`MinMax(max)`, respectively. Full selected DAGs, catalog identities and candidate
-traces are in [the artifacts](artifacts/automatic/).
-
-This is a bounded aggregate sensitivity experiment using original o11y values.
-It is not evidence that the original 27-query SQL workload is accelerated.
-Grouped labels, general residual operators and original workload coverage still
-need their own validation. A quantile probe failed frontend function registration;
-there is no quantile benefit result here.
-
-## Input and execution
-
-The unchanged source series is
-`service_cache_refresh_lag_seconds{job="user-service",instance="user-service:8082"}`.
-Its 24-hour input has 86,371 samples at approximately one sample/second,
-16,086,775 bytes, at
-`/mydata/clickhouse-o11y-main-results/fine-1s-24h-series.jsonl`.
-The extraction provenance and original full-dataset hash are retained in
-[the prior source manifest](artifacts/fine-1s-24h-series.provenance.json).
-The half-open query interval is `[1788848096001,1788891296001)`: 12 hours and
-43,200 samples. Both engines query the same interval and values.
-
-Each SQL query is `SELECT max(value) AS value ...` or `SELECT sum(value) AS value ...`
-over that bounded interval. Three fresh-server trials per aggregate each alternate
-1,000 backend and 1,000 ClickHouse requests. Both processes receive two CPUs,
-CPU affinity 60–61 and a 4 GiB limit. The ClickHouse image is pinned, `max_threads`
-is two and query caching is disabled. Other agents paused builds and workload
-probes for the controlled measurements. An earlier interrupted, uncontrolled
-SUM attempt was excluded and is recorded outside the committed results.
-
-All 6,000 backend requests reported `warm`; all 12,000 requests returned HTTP 200.
-Every parsed backend result exactly equals its ClickHouse baseline: SUM is
-1,328,070 and MAX is 530. This is exact numeric equality, with no approximation
-or tolerance. The installed plan and completed backfill are exercised through
-separate production backend processes.
-
-## Repeated queries
-
-| Aggregate/trial | Backend median ms | ClickHouse median ms | Speedup | Backend CPU ms / 1,000 | ClickHouse exact CPU ms / 1,000 |
-| --- | ---: | ---: | ---: | ---: | ---: |
-| SUM 1 | 0.861 | 6.891 | 8.01x | 810 | 9,600 |
-| SUM 2 | 0.854 | 6.671 | 7.81x | 770 | 8,360 |
-| SUM 3 | 0.853 | 4.703 | 5.51x | 750 | 9,460 |
-| MAX 1 | 0.853 | 6.776 | 7.95x | 770 | 8,240 |
-| MAX 2 | 0.854 | 6.716 | 7.87x | 770 | 8,360 |
-| MAX 3 | 0.854 | 7.591 | 8.88x | 770 | 12,130 |
-
-Counting ClickHouse background CPU during the backend requests as well gives
-820–920 ms per 1,000 warm requests. CPU uses Linux scheduler ticks, so individual
-sub-millisecond CPU values are not claimed. Per-trial p95 latency and serial
-service throughput are retained in the summaries; these are serial request
-measurements, not saturated concurrent throughput.
-
-## Build, memory and storage
-
-Backfill took 1.32–1.42 seconds. Its backend CPU was 220–300 ms and its additional
-ClickHouse source-read CPU was 160–210 ms. The enclosing setup-to-built interval
-was 1.85–2.08 seconds and includes source loading, planning, installation and
-startup. Source loading and backfill are separately recorded; planning,
-installation and startup are not isolated measurements. First-query
-latency was not consistently better: backend 4.06–7.51 ms versus ClickHouse
-5.26–11.07 ms. The repeated-query gains do not erase construction costs.
-
-Backend query-phase RSS was 50.4–54.9 MiB; retained ClickHouse RSS was
-779.6–849.3 MiB. Per-phase RSS and observed process high-water marks are in the
-artifacts. These are whole-process observations, not isolated allocation sizes.
-The backend output directory occupied 5,795 bytes including persisted metadata;
-ClickHouse reported 507,146 bytes for its 86,371-row table. Backend summaries cover
-12 hours while that table retains 24 hours, so these sizes are **not a compression
-ratio**.
-
-The deployment still retains ClickHouse for exact queries and backfill. Adding
-the backend therefore adds memory and state storage to that deployment. These
-measurements demonstrate lower repeated-query latency and CPU for the served
-summaries, **not lower combined deployment memory or storage**. Control-plane
-planning memory is not included in backend RSS. The current fixed-window layout
-is not cost-optimized; candidate traces explicitly report estimated cost as
-unavailable rather than inventing a measured/estimated cost comparison.
-
-## Reproduction and evidence
-
-Build the release process probe, then use
-[the matched-budget runner](run_matched_trial.sh) with
-`CLICKHOUSE_BENCH_AGGREGATE=sum` or `max` and a unique trial suffix. Keep all
-required environment inputs described by the script. The committed runtime
-snapshots, executable hashes and checkout files identify these runs. The raw
-traces remain under `/mydata/clickhouse-automatic-benefit-study`; their hashes are
-in [the raw-trace manifest](artifacts/automatic/raw-traces.json).
-
-For independent plan inspection,
-`cargo run --release -p control_plane --example compile_clickhouse_workload`
-reads an automatic SQL workload JSON from stdin and emits the publication,
-install request and actual selection trace. Example workload files and failed
-quantile diagnostics are in `/mydata/clickhouse-automatic-benefit-study`.
diff --git a/tools/clickhouse-benefit/current-main-review.md b/tools/clickhouse-benefit/current-main-review.md
deleted file mode 100644
index ab44a634e..000000000
--- a/tools/clickhouse-benefit/current-main-review.md
+++ /dev/null
@@ -1,119 +0,0 @@
-# ClickHouse execution and benefit readiness
-
-Audience: developers assessing evaluation readiness.
-
-Backend baseline: `732b394abea16bca6f3b5c98c61333f81544a68a`.
-
-The real mixed process test passed against ClickHouse 26.8.2.7 with the
-ClickHouse endpoint explicitly configured. It compiled SQL through the control
-plane, published and installed the resulting plan, backfilled SummaryStore,
-then executed SummaryStore and external-exact branches through the production
-listener. The test's post-backfill source mutation guard also passed. A repeat
-against a dedicated ClickHouse container passed in 2.02 seconds: one test passed,
-zero skipped. This validates mixed execution; it is not a performance result.
-
-The 27-query SQL corpus was independently replanned on the same baseline.
-Twenty-four queries still fail in SQL parsing/lowering. q05, q06, and q23 reach
-Planner selection but fail publication because the metric population predicate
-has no canonical catalog binding. No corpus query is publication-ready. The
-new mixed execution implementation therefore does not establish warm coverage
-for this corpus.
-
-All 27 queries were also executed afresh through the production listener and
-the real external ClickHouse backend. All 27 requested fallback, executed exact,
-returned HTTP 200, and matched the direct exact response byte-for-byte. Thus
-the current corpus result is zero warm, zero hybrid, 27 successful exact
-fallbacks, and zero request failures. It demonstrates fallback correctness,
-not acceleration. That run used the existing `default.raw_samples` evaluation
-table with 408,012 rows and is separate from the scaled one-series runtime probe.
-
-The existing q05 warm probe supplies a MinMax catalog and pane configuration
-before asking Planner for a query DAG. Its two-row default also does not
-represent o11y data. This PR makes the probe usable with one unchanged real
-series and records that planning limitation explicitly. It verifies every
-measured response and its execution provenance. Runtime results from this
-probe must not be reported as automatic materialization selection or as
-full-corpus acceleration.
-
-Local evidence:
-
-- `/mydata/clickhouse-o11y-main-results/latest-main-mixed-e2e.log`
-- `/mydata/clickhouse-o11y-main-results/latest-main-planner-matrix.json`
-- `/mydata/clickhouse-o11y-main-results/latest-main-runtime-matrix.json`
-- `/mydata/clickhouse-o11y-main-results/fine-1s-24h-series.provenance.json`
-
-The original scaled trace is
-`/mydata/o11y-scale-study/datasets/fine-1s-24h.prom` (9,147,706 samples).
-Its SHA-256 is
-`6297663470b92bba012d6c63b072ae2e534c4caa9d6de5082b882fd163436769`.
-The exact `service_cache_refresh_lag_seconds` user-service series contains
-86,371 samples; extraction changes neither values nor timestamps. Its 1-second
-sampling was produced by the existing trace scaler, not by native one-second
-source capture. The source's generation metadata remains beside the trace.
-
-Remaining acceptance gaps are canonical SQL population/producer binding,
-automatic catalog construction from selected materialization candidates,
-recorded candidate costs, and grouped/multi-series workload execution. Increasing
-the scalar probe's input size does not resolve those gaps.
-
-Per-process warm-query memory must not be interpreted as total deployment
-memory savings: ClickHouse remains available as the historical/exact backend.
-Likewise the summary's size is additional state when raw ClickHouse data is
-retained. A whole-deployment cost comparison must include both processes and
-the summary build/update work.
-
-## Release runtime measurement
-
-Three trials restarted a dedicated ClickHouse 26.8.2.7 process and rebuilt the
-summary. Each then alternated 1,000 warm and 1,000 direct-exact requests after ten
-warmups. Backend/test driver and ClickHouse ran in separate containers, each with
-CPU cores 60–61, a two-CPU quota, and a 4 GiB memory limit. ClickHouse used two
-threads and its query cache was disabled. Rust 1.98.0 produced the release build.
-The ClickHouse image digest was
-`sha256:fa394da808cc53f76d0344429421d6c422a6ee85fe7450135c0e3cff4df9bcbb`.
-
-The table contained the 86,371 samples of **one** original series, not the entire
-9,147,706-sample trace. The fixed 12-hour query covered 43,200 samples. Every
-accelerated response was `warm` and every result equaled the direct exact value
-`530`: 3,000 of 3,000 accelerated results matched. The source table used
-MergeTree with timestamp ordering.
-
-| Trial | ASAP median / p95 | ClickHouse median / p95 | Median speedup | ASAP query CPU | ClickHouse exact query CPU |
-|---|---:|---:|---:|---:|---:|
-| 1 | 0.851 / 0.965 ms | 6.892 / 15.056 ms | 8.10× | 770 ms | 8,530 ms |
-| 2 | 0.848 / 0.955 ms | 7.449 / 15.657 ms | 8.78× | 760 ms | 9,640 ms |
-| 3 | 0.850 / 0.955 ms | 7.019 / 15.255 ms | 8.26× | 780 ms | 8,560 ms |
-
-CPU covers 1,000 queries per route, with 10 ms scheduler-tick precision.
-ClickHouse also consumed 60–130 ms of background CPU during the warm requests.
-The reciprocal mean latency was 1,169–1,192 requests/s for ASAP and 117–132
-requests/s for ClickHouse; this is a serial service rate, not a concurrency test.
-
-Backend query-phase RSS was 51.3–53.6 MiB; ClickHouse RSS was 751.2–777.7 MiB.
-Lifecycle high-water marks were 51.3–53.6 MiB and 807.0–891.0 MiB respectively.
-The backend output directory occupied 5,721 bytes, including persisted state
-and metadata; the complete ClickHouse table occupied 507,146 bytes. Those
-footprints cover different retention scopes: the summary is for 12 hours, while
-the ClickHouse table retains the complete approximately 24-hour selected series.
-They must not be interpreted as a like-for-like compression ratio.
-
-Source loading took 0.556–0.627 s. Additional summary backfill took 1.319–1.321 s,
-using 200–220 ms of backend CPU plus 180–230 ms of ClickHouse CPU. The first
-post-build warm request took 3.20–7.97 ms; direct exact took 5.24–9.52 ms. There
-was no consistent first-request advantage. These
-are first post-build requests, not cold filesystem-cache tests. Overall build,
-source loading, and backfill are retained separately in the artifacts.
-
-This establishes repeatable query latency and query CPU benefits for this
-predeclared single-series MinMax state. It does not establish total deployment
-memory savings, full-corpus acceleration, or automatic candidate selection.
-Summaries are in `artifacts/fine-1s-matched-trial{1,2,3}-summary.json`; complete
-per-request traces remain under `/mydata/clickhouse-o11y-main-results/`.
-
-The earlier three host-process trials obtained 7.71–8.01×, but did not impose a
-backend memory limit. Their `fine-1s-release-*` artifacts are retained as
-supplemental evidence; the table above uses the subsequent matched-budget runs.
-Selective Docker configuration snapshots, executable SHA-256s, and exact
-reproduction commands accompany the matched trials. Their JSON `git_head` is
-null because the runtime image lacks Git; the host checkout revision and binary
-hashes identify the tested artifacts instead.
diff --git a/tools/clickhouse-benefit/extract_series.py b/tools/clickhouse-benefit/extract_series.py
deleted file mode 100644
index ea439c2ab..000000000
--- a/tools/clickhouse-benefit/extract_series.py
+++ /dev/null
@@ -1,53 +0,0 @@
-#!/usr/bin/env python3
-"""Extract one unchanged OpenMetrics series for the bounded SQL max probe."""
-
-import argparse
-import hashlib
-import json
-from decimal import Decimal
-from pathlib import Path
-
-
-def main():
-    parser = argparse.ArgumentParser(description=__doc__)
-    parser.add_argument("input", type=Path)
-    parser.add_argument("output", type=Path)
-    parser.add_argument("--series", required=True, help="exact metric{labels} token")
-    args = parser.parse_args()
-    metric = args.series.split("{", 1)[0]
-    digest = hashlib.sha256()
-    count = 0
-    start_ms = None
-    end_ms = None
-    with args.input.open("rb") as source, args.output.open("w") as output:
-        for raw in source:
-            digest.update(raw)
-            line = raw.decode().strip()
-            if not line or line.startswith("#"):
-                continue
-            fields = line.rsplit(None, 2)
-            if len(fields) != 3 or fields[0] != args.series:
-                continue
-            timestamp = Decimal(fields[2]) * 1000
-            if timestamp != timestamp.to_integral_value():
-                raise ValueError("the ClickHouse probe requires integral millisecond timestamps")
-            timestamp_ms = int(timestamp)
-            value = float(fields[1])
-            output.write(json.dumps({"metric": metric, "labels": args.series,
-                                     "ts_ms": timestamp_ms, "value": value},
-                                    allow_nan=False) + "\n")
-            start_ms = timestamp_ms if start_ms is None else min(start_ms, timestamp_ms)
-            end_ms = timestamp_ms if end_ms is None else max(end_ms, timestamp_ms)
-            count += 1
-    if not count:
-        raise SystemExit("no matching samples")
-    provenance = {"source": str(args.input.resolve()), "source_sha256": digest.hexdigest(),
-                  "output": str(args.output.resolve()), "series": args.series,
-                  "samples": count, "start_ms": start_ms, "end_ms": end_ms,
-                  "transformation": "one exact series selection; unchanged values and timestamps"}
-    args.output.with_suffix(".provenance.json").write_text(json.dumps(provenance, indent=2) + "\n")
-    print(json.dumps(provenance))
-
-
-if __name__ == "__main__":
-    main()
diff --git a/tools/clickhouse-benefit/run_matched_trial.sh b/tools/clickhouse-benefit/run_matched_trial.sh
deleted file mode 100644
index 28461fe86..000000000
--- a/tools/clickhouse-benefit/run_matched_trial.sh
+++ /dev/null
@@ -1,66 +0,0 @@
-#!/usr/bin/env bash
-# Run an already-built probe with matching CPU and memory budgets.
-set -euo pipefail
-
-trial=${1:?pass a unique trial suffix}
-: "${CLICKHOUSE_USER:?set the evaluation account}"
-: "${CLICKHOUSE_PASSWORD:?set the evaluation password}"
-: "${TEST_BINARY:?set the executable path printed by cargo test --release --no-run}"
-: "${CARGO_TARGET_DIR:?set the target directory used for TEST_BINARY}"
-: "${CLICKHOUSE_BENCH_INPUT:?set the extracted JSONEachRow file}"
-: "${CLICKHOUSE_BENCH_END_MS:?set the exclusive evaluation endpoint}"
-: "${CLICKHOUSE_BENCH_METRIC:?set the original metric name}"
-: "${RESULT_DIR:?set an existing absolute result directory}"
-
-repo_root=$(git rev-parse --show-toplevel)
-image=clickhouse/clickhouse-server@sha256:fa394da808cc53f76d0344429421d6c422a6ee85fe7450135c0e3cff4df9bcbb
-server=${CLICKHOUSE_CONTAINER:-asap-clickhouse-current-eval}
-backend="asap-clickhouse-probe-trial${trial}"
-output="$RESULT_DIR/fine-1s-matched-trial${trial}"
-
-if ! docker inspect "$server" >/dev/null 2>&1; then
-    docker run -d --name "$server" --cpuset-cpus=60,61 --cpus=2 --memory=4g \
-        -p 127.0.0.1:28123:8123 -e CLICKHOUSE_USER -e CLICKHOUSE_PASSWORD "$image"
-else
-    expected_image=$(docker image inspect "$image" --format '{{.Id}}')
-    [[ $(docker inspect "$server" --format '{{.Image}}') == "$expected_image" ]]
-    [[ $(docker inspect "$server" --format '{{.HostConfig.CpusetCpus}}/{{.HostConfig.NanoCpus}}/{{.HostConfig.Memory}}') == '60,61/2000000000/4294967296' ]]
-    [[ $(docker inspect "$server" --format '{{with index .HostConfig.PortBindings "8123/tcp"}}{{(index . 0).HostIp}}:{{(index . 0).HostPort}}{{end}}') == '127.0.0.1:28123' ]]
-    docker restart "$server"
-fi
-budget=$(docker inspect "$server" --format '{{.HostConfig.CpusetCpus}}/{{.HostConfig.NanoCpus}}/{{.HostConfig.Memory}}')
-[[ "$budget" == '60,61/2000000000/4294967296' ]]
-for _ in $(seq 1 100); do
-    if curl --silent --fail http://127.0.0.1:28123/ping >/dev/null; then
-        break
-    fi
-    sleep 0.1
-done
-curl --silent --fail http://127.0.0.1:28123/ping >/dev/null
-server_pid=$(docker inspect "$server" --format '{{.State.Pid}}')
-settings=$(curl --silent --show-error --fail --user "$CLICKHOUSE_USER:$CLICKHOUSE_PASSWORD" \
-    --data-binary "SELECT name,value FROM system.settings WHERE name IN ('max_threads','use_query_cache') ORDER BY name FORMAT TSV" \
-    http://127.0.0.1:28123/)
-[[ "$settings" == $'max_threads\tauto(2)\nuse_query_cache\t0' ]]
-printf '%s\n' "$settings" > "$output.clickhouse-settings.tsv"
-
-docker run --name "$backend" --user "$(id -u):$(id -g)" \
-    --network host --pid host --cpuset-cpus=60,61 --cpus=2 --memory=4g \
-    -v "$CARGO_TARGET_DIR:$CARGO_TARGET_DIR:ro" \
-    -v "$repo_root:$repo_root:ro" \
-    -v "$RESULT_DIR:$RESULT_DIR" \
-    -v "$CLICKHOUSE_BENCH_INPUT:$CLICKHOUSE_BENCH_INPUT:ro" \
-    -w "$repo_root" -e CLICKHOUSE_URL=http://127.0.0.1:28123 \
-    -e CLICKHOUSE_USER -e CLICKHOUSE_PASSWORD -e CLICKHOUSE_PID="$server_pid" \
-    -e CLICKHOUSE_BENCH_INPUT -e CLICKHOUSE_BENCH_METRIC -e CLICKHOUSE_BENCH_END_MS \
-    -e CLICKHOUSE_BENCH_AGGREGATE="${CLICKHOUSE_BENCH_AGGREGATE:-max}" \
-    -e CLICKHOUSE_BENCH_REPETITIONS="${CLICKHOUSE_BENCH_REPETITIONS:-1000}" \
-    -e CLICKHOUSE_BENCH_OUTPUT="$output.json" \
-    --entrypoint "$TEST_BINARY" "$image" --nocapture
-
-format='{"cpu_affinity":"{{.HostConfig.CpusetCpus}}","nano_cpus":{{.HostConfig.NanoCpus}},"memory_limit_bytes":{{.HostConfig.Memory}},"image":"{{.Image}}"}'
-docker inspect "$backend" --format "$format" > "$output.backend-runtime.json"
-docker inspect "$server" --format "$format" > "$output.clickhouse-runtime.json"
-sha256sum "$TEST_BINARY" "$CARGO_TARGET_DIR/release/data_plane" > "$output.executables.sha256"
-git rev-parse HEAD > "$output.source-checkout.txt"
-python3 "$repo_root/tools/clickhouse-benefit/summarize.py" "$output.json" > "$output-summary.json"
diff --git a/tools/clickhouse-benefit/summarize.py b/tools/clickhouse-benefit/summarize.py
deleted file mode 100644
index 09c48275c..000000000
--- a/tools/clickhouse-benefit/summarize.py
+++ /dev/null
@@ -1,47 +0,0 @@
-#!/usr/bin/env python3
-"""Summarize a q05 probe while retaining its execution and planning limitations."""
-
-import argparse
-import json
-import math
-import statistics
-from pathlib import Path
-
-
-def main():
-    parser = argparse.ArgumentParser(description=__doc__)
-    parser.add_argument("artifact", type=Path)
-    args = parser.parse_args()
-    data = json.loads(args.artifact.read_text())
-    ticks = data["clock_ticks_per_second"]
-    routes = {}
-    for route in ("warm", "exact"):
-        rows = [row for row in data["requests"] if row["route"] == route]
-        latencies = sorted(row["elapsed_ns"] / 1e6 for row in rows)
-        cpu = {}
-        for process in ("backend", "clickhouse"):
-            available = [row for row in rows if row.get(f"{process}_before") and row.get(f"{process}_after")]
-            cpu[process + "_cpu_ms"] = (
-                sum(row[f"{process}_after"]["cpu_ticks"] - row[f"{process}_before"]["cpu_ticks"]
-                    for row in available) * 1000 / ticks
-                if len(available) == len(rows) else None
-            )
-        routes[route] = {"requests": len(rows), "median_ms": statistics.median(latencies),
-                         "p95_ms": latencies[math.ceil(len(latencies) * .95) - 1],
-                         "serial_service_requests_per_second": len(rows) * 1000 / sum(latencies),
-                         "all_http_200": all(row["status"] == 200 for row in rows),
-                         "execution_modes": sorted({str(row["execution"]) for row in rows}), **cpu}
-    summary = {"artifact": str(args.artifact.resolve()), "git_head": data["git_head"],
-               "input": data.get("input"), "planning_scope": data.get("planning_scope"),
-               "routes": routes, "latency_speedup": routes["exact"]["median_ms"] / routes["warm"]["median_ms"],
-               "first_query": data.get("first_query"), "build_phase": data["build_phase"],
-               "source_load_phase": data.get("source_load_phase"),
-               "backfill_phase": data.get("backfill_phase"),
-               "query_phase": data["query_phase"],
-               "clickhouse_table": data.get("clickhouse_table"),
-               "limitations": data["limitations"] + ["CPU counters include server background work and have scheduler-tick precision"]}
-    print(json.dumps(summary, indent=2))
-
-
-if __name__ == "__main__":
-    main()
diff --git a/tools/cluster-data-exporter/.dockerignore b/tools/cluster-data-exporter/.dockerignore
deleted file mode 100644
index 1634158c1..000000000
--- a/tools/cluster-data-exporter/.dockerignore
+++ /dev/null
@@ -1,9 +0,0 @@
-target/
-.git/
-.gitignore
-README.md
-data/
-*.csv
-*.gz
-docker_compose_frames/
-scripts/
diff --git a/tools/cluster-data-exporter/.gitignore b/tools/cluster-data-exporter/.gitignore
deleted file mode 100644
index 1e7caa9ea..000000000
--- a/tools/cluster-data-exporter/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-Cargo.lock
-target/
diff --git a/tools/cluster-data-exporter/Cargo.toml b/tools/cluster-data-exporter/Cargo.toml
deleted file mode 100644
index f2bb5222b..000000000
--- a/tools/cluster-data-exporter/Cargo.toml
+++ /dev/null
@@ -1,23 +0,0 @@
-[package]
-name = "cluster_data_exporter"
-version = "0.1.0"
-edition = "2021"
-
-[dependencies]
-prometheus = "0.14.0"
-tokio = { version = "1", features = ["full"] }
-hyper = { version = "1", features = ["full"] }
-hyper-util = { version = "0.1", features = ["full"] }
-lazy_static = "1.5"
-csv = "1.3"
-serde = { version = "1.0", features = ["derive"] }
-concurrent-queue = "2.5.0"
-flate2 = "1.1.2"
-clap = { version = "4.5.41", features = ["derive"] }
-tracing = "0.1"
-tracing-subscriber = { version = "0.3", features = ["env-filter"] }
-tracing-appender = "0.2"
-
-# Keep this replay source separate from ASAPQuery-backend's production
-# workspace and dependency graph.
-[workspace]
diff --git a/tools/cluster-data-exporter/Dockerfile b/tools/cluster-data-exporter/Dockerfile
deleted file mode 100644
index 582d812c2..000000000
--- a/tools/cluster-data-exporter/Dockerfile
+++ /dev/null
@@ -1,39 +0,0 @@
-# Use the official Rust image as a build environment
-FROM rust:latest AS builder
-
-# Set the working directory inside the container
-WORKDIR /usr/src/app
-
-# Copy the manifest before the source tree. This is intentionally a standalone
-# Cargo project, so Cargo resolves its lockfile during the image build.
-COPY Cargo.toml ./
-
-# Copy the source code
-COPY src ./src
-
-# Build the application in release mode
-RUN cargo build --release
-
-# Use a minimal runtime image
-FROM debian:bookworm-slim
-
-# Install necessary runtime dependencies
-RUN apt-get update && apt-get install -y \
-  ca-certificates \
-  && rm -rf /var/lib/apt/lists/*
-
-# Create a non-root user
-RUN useradd -r -s /bin/false exporter
-
-# Create the data and output directories that will be mounted as volumes
-RUN mkdir -p /data /output && chown exporter:exporter /data /output
-
-# Copy the binary from the builder stage
-COPY --from=builder /usr/src/app/target/release/cluster_data_exporter /usr/local/bin/cluster_data_exporter
-
-# Change to the non-root user
-USER exporter
-
-# Set the entrypoint to the binary
-# All arguments including port and input directory must be provided via docker run or docker-compose
-ENTRYPOINT ["cluster_data_exporter"]
diff --git a/tools/cluster-data-exporter/README.md b/tools/cluster-data-exporter/README.md
deleted file mode 100644
index 0d31d179f..000000000
--- a/tools/cluster-data-exporter/README.md
+++ /dev/null
@@ -1,273 +0,0 @@
-# CLUSTER DATA EXPORTER
-
-A Prometheus exporter that exposes cluster resource usage metrics from Google and Alibaba cluster trace datasets.
-
-This is an evaluation tool. It is deliberately outside the backend Cargo
-workspace: it replays offline CSV traces through Prometheus's normal scrape
-path, after which Prometheus may Remote Write into ASAPQuery-backend.
-
-Finite inputs retain the historical immediate shutdown behavior by default.
-For a final scrape grace period, pass `--exit-after-eof-ms=<milliseconds>`;
-the smoke test uses this option so it can inspect the terminal metric values.
-
-## DESCRIPTION
-
-This exporter reads CSV data from certain datasets provided by Google or Alibaba and exposes them as Prometheus metrics. The exporter supports both Google task resource usage data from 2011 and Alibaba node and microservice resource data from 2021 and 2022. Instructions for downloading this data are linked in this document.
-
-## INSTALLATION
-
-### Prerequisites
-
-- Rust 1.70+ (edition 2021)
-- Access to Google or Alibaba cluster datasets
-
-### Building
-
-```bash
-cargo build --release
-```
-
-Run the synthetic provider smoke checks (no trace dataset required):
-
-```bash
-./tests/smoke.sh
-```
-
-## USAGE
-
-```bash
-cluster_data_exporter -i <input_directory> -p <port> <provider> [OPTIONS]
-```
-
-### Google Provider
-
-```bash
-cluster_data_exporter -i ./google/clusterdata-2011/ -p 8080 google [OPTIONS]
-```
-
-### Alibaba Provider
-
-```bash
-cluster_data_exporter -i ./alibaba/2021/ -p 8080 alibaba [OPTIONS]
-```
-
-## DATA SOURCES
-
-### Google Cluster Data
-
-Instructions on how to download the Google Cluster 2011 task usage data:
-https://github.com/google/cluster-data/blob/master/ClusterData2011_2.md
-
-The only part of the dataset used by the exporter is the task_usage section, so there's no need to install the whole dataset
-
-Expected directory structure:
-```
-path/to/task/resource/usage/dir/
-├── part-00000-of-00500.csv.gz
-├── part-00001-of-00500.csv.gz
-└── ...
-```
-
-### Alibaba Cluster Data
-
-Instructions on downloading the Alibaba microservice trace datasets:
-- 2021: https://github.com/alibaba/clusterdata/blob/master/cluster-trace-microservices-v2021/README.md#introduction-of-trace-data
-- 2022: https://github.com/alibaba/clusterdata/tree/master/cluster-trace-microservices-v2022#trace-data-download
-
-The only parts of the datasets used by the exporter are the Node and MSResource sections, the rest can be discarded.
-
-Expected directory structure (after preprocessing):
-
-2021 Data:
-```
-path/to/Node/
-├── Node_0.csv.gz
-├── Node_1.csv.gz
-└── ...
-
-path/to/MSResource/
-├── MSResource_0.csv.gz
-├── MSResource_1.csv.gz
-└── ...
-```
-
-2022 Data:
-```
-path/to/NodeMetrics/
-├── NodeMetrics_0.csv.gz
-├── NodeMetrics_1.csv.gz
-└── ...
-
-path/to/MSMetrics/
-├── MSMetrics_0.csv.gz
-├── MSMetrics_1.csv.gz
-└── ...
-```
-
-## DATA PREPROCESSING FOR ALIBABA
-
-IMPORTANT: Before running the exporter on Alibaba data, you must run the preprocessing script to sort the data by timestamp and recompress it as a .csv.gz:
-
-```bash
-./bin/alibaba/sort_and_format.sh <alibaba_data_directory> --year <2021|2022> [-n] [-m]
-```
-
-This script extracts, sorts by timestamp, and recompresses the Alibaba CSV files in a format the exporter can read (.csv.gz). The sorting is necessary because some datasets (mainly 2022 data) are not sorted by timestamp, which is required for proper metric export timing.
-
-### Input Directory Structure
-
-The input directory should contain one or both of the subdirectories with unprocessed files, i.e. the untouched /data/ directory created from running the fetchData.sh scripts from the Alibaba github repos. For example:
-
-```
-alibaba/2021/data/
-├── Node/
-│   ├── Node_0.tar.gz
-│   ├── Node_1.tar.gz
-│   └── ...
-└── MSResource/
-    ├── MSResource_0.tar.gz
-    ├── MSResource_1.tar.gz
-    └── ...
-
-alibaba/2022/data/
-├── NodeMetrics/
-│   ├── NodeMetrics_0.tar.gz
-│   ├── NodeMetrics_1.tar.gz
-│   └── ...
-└── MSMetrics/
-    ├── MSMetrics_0.tar.gz
-    ├── MSMetrics_1.tar.gz
-    └── ...
-```
-
-Examples:
-
-```bash
-# Process 2021 Node data
-./bin/alibaba/sort_and_format.sh alibaba/2021/data --year 2021 -n
-
-# Process 2021 MSResource data
-./bin/alibaba/sort_and_format.sh alibaba/2021/data --year 2021 -m
-
-# Process both Node and MSResource data for 2021
-./bin/alibaba/sort_and_format.sh alibaba/2021/data --year 2021 -n -m
-```
-
-## COMMAND LINE ARGUMENTS
-
-- -i, --input-directory: Path to the directory containing CSV data files
-- -p, --port: Port number for the HTTP server
-- --exit-after-eof-ms: Optional grace period after finite input is exhausted
-  (default: 0, immediate shutdown)
-
-### Provider-specific Options
-
-#### Google
-- --metrics: Specific metrics to export from task resource usage data
-- --all-parts: Process all CSV parts (default behavior)
-- --part-index: Process only a specific part index (0-499)
-
-#### Alibaba
-- --data-type: Type of data to export (node or msresource)
-- --data-year: Year of the dataset (2021 or 2022)
-- --all-parts: Process all CSV parts (default behavior)
-- --part-index: Process only a specific part index
-- --speedup: Alibaba replay speedup factor (1 = real time)
-
-## DOCKER USAGE
-
-### Prerequisites for Docker
-
-1. Download and preprocess your CSV data as described in the DATA SOURCES section above
-2. Place the preprocessed data in a local directory (e.g., `./data/`)
-
-### Building and Running with Docker
-
-Build the Docker image:
-```bash
-docker build -t cluster-data-exporter .
-```
-
-Run with Docker (example for Google data):
-```bash
-docker run -v ./data:/data:ro -p 40000:40000 cluster-data-exporter \
-  --input-directory /data \
-  --port 40000 \
-  google \
-  --metrics mean_cpu_usage_rate,canonical_memory_usage \
-  --all-parts
-```
-
-Run with Docker (example for Alibaba data):
-```bash
-docker run -v ./data:/data:ro -p 40000:40000 cluster-data-exporter \
-  --input-directory /data \
-  --port 40000 \
-  alibaba \
-  --data-type node \
-  --data-year 2021 \
-  --all-parts
-```
-
-### Using Docker Compose
-
-`compose.yaml` is the smallest end-to-end source example: it runs the exporter
-and a Prometheus scraper for Google data. Set `CDE_DATA_DIR` to the preprocessed
-task-usage directory, then run:
-
-```bash
-CDE_DATA_DIR=/path/to/task/resource/usage docker compose up --build
-```
-
-Prometheus is then available at `http://localhost:9090`. To send those samples
-to ASAPQuery-backend, configure Remote Write through the backend's existing
-profile or demo rather than duplicating backend startup here.
-
-#### Automated Generation with Python Script
-
-The `scripts/generate_docker_compose.py` script automatically generates docker-compose.yml files from the frame templates and fill in certain fields.
-
-**Google Provider Example:**
-```bash
-python scripts/generate_docker_compose.py google --metrics mean_cpu_usage_rate,max_cpu_usage --port 8080 --input-dir ./data
-```
-
-**Alibaba Provider Example:**
-```bash
-python scripts/generate_docker_compose.py alibaba --data-type node --data-year 2021 --port 8080 --input-dir ./data
-```
-
-The script will:
-- Validate your configuration options
-- Generate a docker-compose.yml file with correct settings
-- Update port mappings and volume mounts automatically
-
-#### Manual Setup with Frame Files
-
-Alternatively, the `docker_compose_frames/` directory contains pre-configured docker-compose files for different providers and configurations. These frame files will still require small edits before running docker-compose, see each frame file for more information.
-
-- **Google Provider**: `google-docker-compose.yml` - Edit list of metrics to export
-- **Alibaba Provider**: Provider-specific frames for each data type and year combination:
-  - `alibaba-node-2021-docker-compose.yml`
-  - `alibaba-node-2022-docker-compose.yml`
-  - `alibaba-msresource-2021-docker-compose.yml`
-  - `alibaba-msresource-2022-docker-compose.yml`
-
-To use a frame file:
-1. Copy the appropriate frame file from `docker_compose_frames/` to your working directory as `docker-compose.yml`
-2. Edit the file with any options that still need to be filled in (marked with "CHANGE THIS" comments)
-3. Run: `docker-compose up -d`
-
-### Data Volume Requirements
-
-- The container expects data to be mounted at `/data`
-- Data must be preprocessed according to the instructions in the DATA SOURCES section
-- For Alibaba data, ensure you've run the sorting and compression scripts before mounting
-- Mount the volume as read-only (`:ro`)
-
-## METRICS ENDPOINT
-
-Once running, metrics are available at:
-```
-http://localhost:<port>/metrics
-```
diff --git a/tools/cluster-data-exporter/bin/alibaba/sort_and_format.sh b/tools/cluster-data-exporter/bin/alibaba/sort_and_format.sh
deleted file mode 100755
index 1cce61dd1..000000000
--- a/tools/cluster-data-exporter/bin/alibaba/sort_and_format.sh
+++ /dev/null
@@ -1,195 +0,0 @@
-#!/bin/bash
-
-# Script to process alibaba Node and MSResource data files with year-specific configurations
-# Usage: ./sort_and_format.sh <input_directory> --year <year> [-n] [-m]
-
-usage() {
-    echo "Usage: $0 <input_directory> --year <year> [-n] [-m]"
-    echo "  <input_directory>  Path to directory containing data subdirectories"
-    echo "  --year <year>      Year of data (2021 or 2022) - REQUIRED"
-    echo "  -n                 Clean Node csv files and recompress as .csv.gz"
-    echo "  -m                 Clean MSResource/MSMetrics csv files and recompress as .csv.gz"
-    echo "  At least one of -n or -m must be specified"
-    echo ""
-    echo "Year-specific configurations:"
-    echo "  2022: Uses NodeMetrics/ and MSMetrics/ subdirectories with NodeMetrics_*.tar.gz and MSMetrics_*.tar.gz files"
-    echo "        Timestamp in first column for both"
-    echo "  2021: Uses Node/ and MSResource/ subdirectories with Node_*.tar.gz and MSResource_*.tar.gz files"
-    echo "        Timestamp in second column for Node data, seventh column for MSResource data"
-    exit 1
-}
-
-# Function to process files in a given directory with a specific pattern
-process_files() {
-    local subdir="$1"
-    local pattern="$2"
-    local timestamp_col="$3"
-    local full_path="${INPUT_DIR}/${subdir}"
-
-    if [[ ! -d "$full_path" ]]; then
-        echo "Warning: Directory $full_path does not exist, skipping..."
-        return
-    fi
-
-    echo "Processing files in $full_path"
-
-    # Find all files matching the pattern, sorted by index
-    local files=()
-    mapfile -t files < <(find "$full_path" -maxdepth 1 -type f -name "${pattern}_*.tar.gz" -print | sort -V)
-
-    if [[ ${#files[@]} -eq 0 ]]; then
-        echo "No files matching ${pattern}_*.tar.gz found in $full_path"
-        return
-    fi
-
-    echo "Found ${#files[@]} files in $subdir:"
-
-    for file in "${files[@]}"; do
-        echo "Processing: $(basename "$file")"
-
-        # Create temporary directory for processing
-        local temp_dir
-        temp_dir=$(mktemp -d)
-        local base_name
-        base_name=$(basename "$file" .tar.gz)
-
-        echo "  -> Extracting $file to temporary directory..."
-        if ! tar -xzf "$file" -C "$temp_dir"; then
-            echo "  -> Error: Failed to extract $file"
-            rm -rf "$temp_dir"
-            continue
-        fi
-
-        # Find the extracted CSV file
-        local csv_file
-        csv_file=$(find "$temp_dir" -name "*.csv" -type f | head -1)
-        if [[ -z "$csv_file" ]]; then
-            echo "  -> Error: No CSV file found in extracted archive"
-            rm -rf "$temp_dir"
-            continue
-        fi
-
-        # Check if file is already sorted using sort -c
-        echo "  -> Checking if file is already sorted..."
-        if tail -n +2 "$csv_file" | sort -t',' -k"${timestamp_col}","${timestamp_col}"n -c 2>/dev/null; then
-            echo "  -> File is already sorted, skipping sort step"
-        else
-            echo "  -> Sorting CSV file by timestamp (column $timestamp_col)..."
-            # Use external sort for memory efficiency with large files
-            # Preserve header line by extracting first line, sorting the rest, then combining
-            # -t',' specifies comma as field separator
-            # -k${timestamp_col},${timestamp_col}n sorts by specified field numerically
-            # -S 1G uses 1GB of memory for sorting (adjust if needed)
-            # --temporary-directory ensures temp files go to a writable location
-            local sorted_file="${temp_dir}/sorted.csv"
-            if ! (head -n 1 "$csv_file"; tail -n +2 "$csv_file" | sort -t',' -k"${timestamp_col}","${timestamp_col}"n -S 1G --temporary-directory="$temp_dir") > "$sorted_file"; then
-                echo "  -> Error: Failed to sort CSV file"
-                rm -rf "$temp_dir"
-                continue
-            fi
-            mv "$sorted_file" "$csv_file"
-        fi
-
-        echo "  -> Compressing sorted file..."
-        local output_file="${full_path}/${base_name}.csv.gz"
-        if ! gzip -c "$csv_file" > "$output_file"; then
-            echo "  -> Error: Failed to compress sorted file"
-            rm -rf "$temp_dir"
-            continue
-        fi
-
-        echo "  -> Successfully processed: $(basename "$output_file")"
-
-        # Clean up temporary directory
-        rm -rf "$temp_dir"
-    done
-}
-
-# Parse command line arguments
-if [[ $# -lt 4 ]]; then
-    usage
-fi
-
-INPUT_DIR="$1"
-shift
-
-YEAR=""
-PROCESS_NODE=false
-PROCESS_MS=false
-
-while [[ $# -gt 0 ]]; do
-    case $1 in
-        --year)
-            YEAR="$2"
-            if [[ "$YEAR" != "2021" && "$YEAR" != "2022" ]]; then
-                echo "Error: Year must be either 2021 or 2022"
-                usage
-            fi
-            shift 2
-            ;;
-        -n)
-            PROCESS_NODE=true
-            shift
-            ;;
-        -m)
-            PROCESS_MS=true
-            shift
-            ;;
-        *)
-            echo "Unknown option: $1"
-            usage
-            ;;
-    esac
-done
-
-# Validate required arguments
-if [[ -z "$YEAR" ]]; then
-    echo "Error: --year parameter is required"
-    usage
-fi
-
-# Validate input directory
-if [[ ! -d "$INPUT_DIR" ]]; then
-    echo "Error: Input directory '$INPUT_DIR' does not exist"
-    exit 1
-fi
-
-# Check that at least one flag is specified
-if [[ "$PROCESS_NODE" == false && "$PROCESS_MS" == false ]]; then
-    echo "Error: At least one of -n or -m must be specified"
-    usage
-fi
-
-echo "Input directory: $INPUT_DIR"
-echo "Year: $YEAR"
-echo "Process Node data: $PROCESS_NODE"
-echo "Process MSResource data: $PROCESS_MS"
-echo
-
-# Configure year-specific settings
-if [[ "$YEAR" == "2022" ]]; then
-    NODE_SUBDIR="NodeMetrics"
-    MS_SUBDIR="MSMetrics"
-    NODE_PATTERN="NodeMetrics"
-    MS_PATTERN="MSMetrics"
-    NODE_TIMESTAMP_COL=1
-    MS_TIMESTAMP_COL=1
-else  # 2021
-    NODE_SUBDIR="Node"
-    MS_SUBDIR="MSResource"
-    NODE_PATTERN="Node"
-    MS_PATTERN="MSResource"
-    NODE_TIMESTAMP_COL=2
-    MS_TIMESTAMP_COL=7
-fi
-
-# Process files based on flags
-if [[ "$PROCESS_NODE" == true ]]; then
-    process_files "$NODE_SUBDIR" "$NODE_PATTERN" "$NODE_TIMESTAMP_COL"
-fi
-
-if [[ "$PROCESS_MS" == true ]]; then
-    process_files "$MS_SUBDIR" "$MS_PATTERN" "$MS_TIMESTAMP_COL"
-fi
-
-echo "Processing complete!"
diff --git a/tools/cluster-data-exporter/compose.yaml b/tools/cluster-data-exporter/compose.yaml
deleted file mode 100644
index d2e4bb728..000000000
--- a/tools/cluster-data-exporter/compose.yaml
+++ /dev/null
@@ -1,24 +0,0 @@
-services:
-  cluster-data-exporter:
-    build: .
-    volumes:
-      - ${CDE_DATA_DIR:?set CDE_DATA_DIR to the preprocessed Google task-usage directory}:/data:ro
-    ports:
-      - "40000:40000"
-    command:
-      - --input-directory
-      - /data
-      - --port
-      - "40000"
-      - google
-      - --metrics=${CDE_GOOGLE_METRICS:-mean-cpu-usage-rate}
-      - --part-index=${CDE_PART_INDEX:-0}
-
-  prometheus:
-    image: prom/prometheus:v2.55.1
-    depends_on:
-      - cluster-data-exporter
-    ports:
-      - "9090:9090"
-    volumes:
-      - ./prometheus.yml:/etc/prometheus/prometheus.yml:ro
diff --git a/tools/cluster-data-exporter/docker-compose.yml.j2 b/tools/cluster-data-exporter/docker-compose.yml.j2
deleted file mode 100644
index 2587b52a1..000000000
--- a/tools/cluster-data-exporter/docker-compose.yml.j2
+++ /dev/null
@@ -1,41 +0,0 @@
-# cluster_data_exporter Docker Compose Template
-# This template is rendered with Jinja2 to generate the final docker-compose.yml
-
-{% if x_bake %}
-x-bake:
-  - COMPOSE_BAKE=true
-
-{% endif %}
-services:
-  cluster-data-exporter:
-    image: sketchdb-cluster-data-exporter:latest
-    container_name: {{ container_name | default('sketchdb-cluster-data-exporter') }}
-    volumes:
-      - {{ data_directory }}:/data:ro
-    ports:
-      - "{{ port }}:{{ port }}"
-    command: [
-      "--input-directory","/data",
-      "--port","{{ port }}",
-      "{{ provider }}",{% if provider == "google" %}
-      "--metrics={{ metrics }}",{% if process_mode == "all-parts" %}
-      "--all-parts"{% else %}
-      "--part-index={{ part_index }}"{% endif %}{% elif provider == "alibaba" %}
-      "--data-type={{ data_type }}",
-      "--data-year={{ data_year }}",{% if process_mode == "all-parts" %}
-      "--all-parts"{% else %}
-      "--part-index={{ part_index }}"{% endif %}{% endif %}
-    ]
-    restart: unless-stopped
-{% if memory_limit or memory_reservation %}
-    deploy:
-      resources:
-{% if memory_limit %}
-        limits:
-          memory: {{ memory_limit }}
-{% endif %}
-{% if memory_reservation %}
-        reservations:
-          memory: {{ memory_reservation }}
-{% endif %}
-{% endif %}
diff --git a/tools/cluster-data-exporter/docker_compose_frames/alibaba-msresource-2021-docker-compose.yml b/tools/cluster-data-exporter/docker_compose_frames/alibaba-msresource-2021-docker-compose.yml
deleted file mode 100644
index 683bbfaa1..000000000
--- a/tools/cluster-data-exporter/docker_compose_frames/alibaba-msresource-2021-docker-compose.yml
+++ /dev/null
@@ -1,31 +0,0 @@
-x-bake:
-  - COMPOSE_BAKE=true
-
-services:
-  cluster-data-exporter:
-    build: .
-    container_name: cluster-data-exporter
-    volumes:
-      # CHANGE THIS: Replace './data' with the path to your Alibaba MsResource 2021 preprocessed csv.gz files
-      - ./data:/data:ro
-    ports:
-      # Map container port to host port - adjust as needed
-      - "40000:40000"
-    command: [
-        "--input-directory",
-        "/data",
-        "--port",
-        "40000",
-        "alibaba",
-        "--data-type=ms-resource",
-        "--data-year=2021",
-        "--all-parts", # or "--part-index=<INDEX_NO>"
-      ]
-    restart: unless-stopped
-    # Optional: set resource limits
-    deploy:
-      resources:
-        limits:
-          memory: 2G
-        reservations:
-          memory: 512M
diff --git a/tools/cluster-data-exporter/docker_compose_frames/alibaba-msresource-2022-docker-compose.yml b/tools/cluster-data-exporter/docker_compose_frames/alibaba-msresource-2022-docker-compose.yml
deleted file mode 100644
index 4bdf90ee6..000000000
--- a/tools/cluster-data-exporter/docker_compose_frames/alibaba-msresource-2022-docker-compose.yml
+++ /dev/null
@@ -1,32 +0,0 @@
-x-bake:
-  - COMPOSE_BAKE=true
-
-services:
-  cluster-data-exporter:
-    build: .
-    container_name: cluster-data-exporter
-    volumes:
-      # CHANGE THIS: Replace './data' with the path to your Alibaba MSResource 2022 preprocessed csv.gz files
-      - ./data:/data:ro
-    ports:
-      # Map container port to host port - adjust as needed
-      - "40000:40000"
-    command: [
-        "--input-directory",
-        "/data",
-        "--port",
-        "40000",
-        "alibaba",
-        "--data-type=ms-resource",
-        "--data-year=2022",
-        "--all-parts", # or "--part-index=<INDEX_NO>"
-
-      ]
-    restart: unless-stopped
-    # Optional: set resource limits
-    deploy:
-      resources:
-        limits:
-          memory: 2G
-        reservations:
-          memory: 512M
diff --git a/tools/cluster-data-exporter/docker_compose_frames/alibaba-node-2021-docker-compose.yml b/tools/cluster-data-exporter/docker_compose_frames/alibaba-node-2021-docker-compose.yml
deleted file mode 100644
index 213494378..000000000
--- a/tools/cluster-data-exporter/docker_compose_frames/alibaba-node-2021-docker-compose.yml
+++ /dev/null
@@ -1,32 +0,0 @@
-x-bake:
-  - COMPOSE_BAKE=true
-
-services:
-  cluster-data-exporter:
-    build: .
-    container_name: cluster-data-exporter
-    volumes:
-      # CHANGE THIS: Replace './data' with the path to your Alibaba Node 2021 preprocessed csv.gz files
-      - ./data:/data:ro
-    ports:
-      # Map container port to host port - adjust as needed
-      - "40000:40000"
-    command: [
-        "--input-directory",
-        "/data",
-        "--port",
-        "40000",
-        "alibaba",
-        "--data-type=node",
-        "--data-year=2021",
-        "--all-parts", # or "--part-index=<INDEX_NO>"
-
-      ]
-    restart: unless-stopped
-    # Optional: set resource limits
-    deploy:
-      resources:
-        limits:
-          memory: 2G
-        reservations:
-          memory: 512M
diff --git a/tools/cluster-data-exporter/docker_compose_frames/alibaba-node-2022-docker-compose.yml b/tools/cluster-data-exporter/docker_compose_frames/alibaba-node-2022-docker-compose.yml
deleted file mode 100644
index bbe7b7b11..000000000
--- a/tools/cluster-data-exporter/docker_compose_frames/alibaba-node-2022-docker-compose.yml
+++ /dev/null
@@ -1,32 +0,0 @@
-x-bake:
-  - COMPOSE_BAKE=true
-
-services:
-  cluster-data-exporter:
-    build: .
-    container_name: cluster-data-exporter
-    volumes:
-      # CHANGE THIS: Replace './data' with the path to your Alibaba Node 2022 preprocessed csv.gz files
-      - ./data:/data:ro
-    ports:
-      # Map container port to host port - adjust as needed
-      - "40000:40000"
-    command: [
-        "--input-directory",
-        "/data",
-        "--port",
-        "40000",
-        "alibaba",
-        "--data-type=node",
-        "--data-year=2022",
-        "--all-parts", # or "--part-index=<INDEX_NO>"
-
-      ]
-    restart: unless-stopped
-    # Optional: set resource limits
-    deploy:
-      resources:
-        limits:
-          memory: 2G
-        reservations:
-          memory: 512M
diff --git a/tools/cluster-data-exporter/docker_compose_frames/base-docker-compose.yml b/tools/cluster-data-exporter/docker_compose_frames/base-docker-compose.yml
deleted file mode 100644
index e013892ee..000000000
--- a/tools/cluster-data-exporter/docker_compose_frames/base-docker-compose.yml
+++ /dev/null
@@ -1,39 +0,0 @@
-x-bake:
-  - COMPOSE_BAKE=true
-
-services:
-  cluster-data-exporter:
-    build: .
-    container_name: cluster-data-exporter
-    volumes:
-      # Mount the local data directory to /data in the container
-      # Replace './data' with the path to your csv.gz files
-      - ./data:/data:ro
-    ports:
-      # Map container port to host port - adjust as needed
-      - "40000:40000"
-    command: [
-        "--input-directory",
-        "/data",
-        "--port",
-        "40000",
-        # Add your provider-specific arguments here
-        # For Google data example:
-        # "google",
-        # "--metrics", "mean_cpu_usage_rate,canonical_memory_usage",
-        # "--all-parts"
-        #
-        # For Alibaba data example:
-        # "alibaba",
-        # "--data-type", "node",
-        # "--data-year", "2021",
-        # "--all-parts"
-      ]
-    restart: unless-stopped
-    # Optional: set resource limits
-    deploy:
-      resources:
-        limits:
-          memory: 2G
-        reservations:
-          memory: 512M
diff --git a/tools/cluster-data-exporter/docker_compose_frames/google-docker-compose.yml b/tools/cluster-data-exporter/docker_compose_frames/google-docker-compose.yml
deleted file mode 100644
index 22ce38477..000000000
--- a/tools/cluster-data-exporter/docker_compose_frames/google-docker-compose.yml
+++ /dev/null
@@ -1,32 +0,0 @@
-x-bake:
-  - COMPOSE_BAKE=true
-
-services:
-  cluster-data-exporter:
-    build: .
-    container_name: cluster-data-exporter
-    volumes:
-      # CHANGE THIS: Replace './data' with the path to your Google csv.gz files
-      - ./data:/data:ro
-    ports:
-      # Map container port to host port - adjust as needed
-      - "40000:40000"
-    command: [
-        "--input-directory",
-        "/data",
-        "--port",
-        "40000",
-        "google",
-        # CHANGE THIS: Replace with your desired metrics (comma-separated)
-        "--metrics=mean_cpu_usage_rate,canonical_memory_usage",
-        "--all-parts", # or "--part-index=<INDEX_NO>"
-
-      ]
-    restart: unless-stopped
-    # Optional: set resource limits
-    deploy:
-      resources:
-        limits:
-          memory: 2G
-        reservations:
-          memory: 512M
diff --git a/tools/cluster-data-exporter/installation/install.sh b/tools/cluster-data-exporter/installation/install.sh
deleted file mode 100755
index 873019bc1..000000000
--- a/tools/cluster-data-exporter/installation/install.sh
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/bash
-
-set -e
-
-THIS_DIR=$(dirname "$(readlink -f "${BASH_SOURCE[0]}")")
-PARENT_DIR=$(dirname "$THIS_DIR")
-
-echo "Building Cluster Data Exporter Docker image..."
-cd "$PARENT_DIR"
-docker build . -f Dockerfile -t sketchdb-cluster-data-exporter:latest
-
-echo "Cluster Data Exporter Docker image built successfully: sketchdb-cluster-data-exporter:latest"
diff --git a/tools/cluster-data-exporter/prometheus.yml b/tools/cluster-data-exporter/prometheus.yml
deleted file mode 100644
index 263498f4e..000000000
--- a/tools/cluster-data-exporter/prometheus.yml
+++ /dev/null
@@ -1,7 +0,0 @@
-global:
-  scrape_interval: 1s
-
-scrape_configs:
-  - job_name: cluster-data-exporter
-    static_configs:
-      - targets: ["cluster-data-exporter:40000"]
diff --git a/tools/cluster-data-exporter/scripts/generate_docker_compose.py b/tools/cluster-data-exporter/scripts/generate_docker_compose.py
deleted file mode 100644
index 38c32f9a4..000000000
--- a/tools/cluster-data-exporter/scripts/generate_docker_compose.py
+++ /dev/null
@@ -1,253 +0,0 @@
-"""
-Script to generate docker-compose.yml files from frame templates based on data provider configuration.
-
-This script takes a data provider (google or alibaba) and provider-specific arguments,
-then generates a docker-compose.yml file by copying and modifying the appropriate frame file.
-"""
-
-import argparse
-import sys
-from pathlib import Path
-from typing import Any, Dict, List, Optional
-
-import yaml
-
-# Valid values from Rust enums (CLI format with hyphens)
-VALID_GOOGLE_METRICS = [
-    "mean-cpu-usage-rate",
-    "canonical-memory-usage",
-    "assigned-memory-usage",
-    "unmapped-page-cache-memory-usage",
-    "total-page-cache-memory-usage",
-    "max-memory-usage",
-    "mean-disk-io-time",
-    "mean-local-disk-space-used",
-    "max-cpu-usage",
-    "max-disk-io-time",
-    "cycles-per-instruction",
-    "memory-accesses-per-instruction",
-    "sample-portion",
-    "sampled-cpu-usage",
-]
-
-VALID_ALIBABA_DATA_TYPES = ["node", "msresource"]
-VALID_ALIBABA_DATA_YEARS = [2021, 2022]
-
-
-def validate_google_metrics(metrics: List[str]) -> None:
-    """Validate that all provided Google metrics are valid."""
-    invalid_metrics = [m for m in metrics if m not in VALID_GOOGLE_METRICS]
-    if invalid_metrics:
-        print(f"Error: Invalid Google metrics: {', '.join(invalid_metrics)}")
-        print(f"Valid metrics: {', '.join(VALID_GOOGLE_METRICS)}")
-        sys.exit(1)
-
-
-def validate_alibaba_args(data_type: str, data_year: int) -> None:
-    """Validate Alibaba data type and year arguments."""
-    if data_type not in VALID_ALIBABA_DATA_TYPES:
-        print(f"Error: Invalid data type: {data_type}")
-        print(f"Valid data types: {', '.join(VALID_ALIBABA_DATA_TYPES)}")
-        sys.exit(1)
-
-    if data_year not in VALID_ALIBABA_DATA_YEARS:
-        print(f"Error: Invalid data year: {data_year}")
-        print(f"Valid years: {', '.join(map(str, VALID_ALIBABA_DATA_YEARS))}")
-        sys.exit(1)
-
-
-def get_frame_file_path(
-    provider: str, data_type: Optional[str] = None, data_year: Optional[int] = None
-) -> Path:
-    """Get the path to the appropriate frame file based on provider and arguments."""
-    frames_dir = Path("docker_compose_frames")
-
-    if provider == "google":
-        return frames_dir / "google-docker-compose.yml"
-    elif provider == "alibaba":
-        return frames_dir / f"alibaba-{data_type}-{data_year}-docker-compose.yml"
-    else:
-        raise ValueError(f"Unknown provider: {provider}")
-
-
-def load_yaml_file(file_path: Path) -> Dict[str, Any]:
-    """Load YAML file and return parsed content."""
-    with open(file_path, "r") as f:
-        return yaml.safe_load(f)
-
-
-def save_yaml_file(file_path: Path, data: Dict[str, Any]) -> None:
-    """Save data to YAML file."""
-    with open(file_path, "w") as f:
-        yaml.dump(data, f, default_flow_style=False, sort_keys=False)
-
-
-def update_command_arg(command: List[str], arg_name: str, new_value: str) -> List[str]:
-    """Update a command line argument in the command list."""
-    updated_command = []
-    i = 0
-    while i < len(command):
-        if command[i] == arg_name:
-            updated_command.append(command[i])
-            if i + 1 < len(command):
-                updated_command.append(new_value)
-                i += 2
-            else:
-                updated_command.append(new_value)
-                i += 1
-        elif command[i].startswith(f"{arg_name}="):
-            updated_command.append(f"{arg_name}={new_value}")
-            i += 1
-        else:
-            updated_command.append(command[i])
-            i += 1
-    return updated_command
-
-
-def generate_google_compose(
-    metrics: List[str], port: Optional[int], input_dir: Optional[str]
-) -> None:
-    """Generate docker-compose.yml for Google provider."""
-    frame_file = get_frame_file_path("google")
-    output_file = Path("docker-compose.yml")
-
-    # Load frame file
-    compose_data = load_yaml_file(frame_file)
-
-    # Update metrics
-    metrics_str = ",".join(metrics)
-    service = compose_data["services"]["cluster-data-exporter"]
-    command = service["command"]
-
-    # Find and update metrics argument
-    for i, arg in enumerate(command):
-        if arg.startswith("--metrics="):
-            command[i] = f"--metrics={metrics_str}"
-            break
-
-    # Update optional arguments if provided
-    if port is not None:
-        # Update port mapping
-        service["ports"] = [f"{port}:{port}"]
-        # Update port in command
-        command = update_command_arg(command, "--port", str(port))
-        service["command"] = command
-
-    if input_dir is not None:
-        # Update volume mapping
-        service["volumes"] = [f"{input_dir}:/data:ro"]
-
-    # Save updated compose file
-    save_yaml_file(output_file, compose_data)
-
-
-def generate_alibaba_compose(
-    data_type: str,
-    data_year: int,
-    port: Optional[int],
-    input_dir: Optional[str],
-    speedup: Optional[int],
-) -> None:
-    """Generate docker-compose.yml for Alibaba provider."""
-    frame_file = get_frame_file_path("alibaba", data_type, data_year)
-    output_file = Path("docker-compose.yml")
-
-    # Load frame file
-    compose_data = load_yaml_file(frame_file)
-
-    service = compose_data["services"]["cluster-data-exporter"]
-    command = service["command"]
-
-    # Update optional arguments if provided
-    if port is not None:
-        # Update port mapping
-        service["ports"] = [f"{port}:{port}"]
-        # Update port in command
-        command = update_command_arg(command, "--port", str(port))
-        service["command"] = command
-
-    if input_dir is not None:
-        # Update volume mapping
-        service["volumes"] = [f"{input_dir}:/data:ro"]
-
-    # Add speedup if specified
-    if speedup is not None:
-        if "--speedup" not in " ".join(command):
-            command.append(f"--speedup={speedup}")
-        else:
-            command = update_command_arg(command, "--speedup", str(speedup))
-        service["command"] = command
-
-    # Save updated compose file
-    save_yaml_file(output_file, compose_data)
-
-
-def main():
-    parser = argparse.ArgumentParser(
-        description="Generate docker-compose.yml from frame files based on data provider configuration",
-        formatter_class=argparse.RawDescriptionHelpFormatter,
-        epilog="""
-Examples:
-  # Google provider with specific metrics
-  python scripts/generate_docker_compose.py google --metrics mean_cpu_usage_rate,max_cpu_usage --port 8080
-
-  # Alibaba provider with node data from 2021
-  python scripts/generate_docker_compose.py alibaba --data-type node --data-year 2021 --port 8080
-
-  # With custom input directory
-  python scripts/generate_docker_compose.py google --metrics canonical_memory_usage --input-dir /path/to/data
-        """,
-    )
-
-    parser.add_argument("provider", choices=["google", "alibaba"], help="Data provider")
-    parser.add_argument("--port", type=int, help="Port number for the HTTP server")
-    parser.add_argument("--input-dir", "--input-directory", help="Input directory path")
-
-    # Google-specific arguments
-    google_group = parser.add_argument_group("Google provider arguments")
-    google_group.add_argument(
-        "--metrics", type=str, help="Comma-separated list of metrics to export"
-    )
-
-    # Alibaba-specific arguments
-    alibaba_group = parser.add_argument_group("Alibaba provider arguments")
-    alibaba_group.add_argument(
-        "--data-type", choices=VALID_ALIBABA_DATA_TYPES, help="Type of data to export"
-    )
-    alibaba_group.add_argument(
-        "--data-year",
-        type=int,
-        choices=VALID_ALIBABA_DATA_YEARS,
-        help="Year of the dataset",
-    )
-    alibaba_group.add_argument(
-        "--speedup",
-        type=int,
-        help="Speedup factor for faster-than-realtime export (1=real-time, 10=10x faster)",
-    )
-
-    args = parser.parse_args()
-
-    # Validate provider-specific required arguments
-    if args.provider == "google":
-        if not args.metrics:
-            parser.error("Google provider requires --metrics argument")
-        metrics_list = [m.strip() for m in args.metrics.split(",")]
-        validate_google_metrics(metrics_list)
-        generate_google_compose(metrics_list, args.port, args.input_dir)
-
-    elif args.provider == "alibaba":
-        if not args.data_type:
-            parser.error("Alibaba provider requires --data-type argument")
-        if not args.data_year:
-            parser.error("Alibaba provider requires --data-year argument")
-        validate_alibaba_args(args.data_type, args.data_year)
-        generate_alibaba_compose(
-            args.data_type, args.data_year, args.port, args.input_dir, args.speedup
-        )
-
-    print(f"Generated docker-compose.yml for {args.provider} provider")
-
-
-if __name__ == "__main__":
-    main()
diff --git a/tools/cluster-data-exporter/scripts/requirements.txt b/tools/cluster-data-exporter/scripts/requirements.txt
deleted file mode 100644
index 5fde25803..000000000
--- a/tools/cluster-data-exporter/scripts/requirements.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-PyYAML==6.0.2
-types-PyYAML==6.0.12.20250516
diff --git a/tools/cluster-data-exporter/src/alibaba_metrics.rs b/tools/cluster-data-exporter/src/alibaba_metrics.rs
deleted file mode 100644
index 98bc4eca2..000000000
--- a/tools/cluster-data-exporter/src/alibaba_metrics.rs
+++ /dev/null
@@ -1,71 +0,0 @@
-use clap::ValueEnum;
-use std::sync::OnceLock;
-
-type BoxedErr = Box<dyn std::error::Error + Send + Sync + 'static>;
-
-// Speedup factor for faster-than-realtime export (set via CLI)
-pub static SPEEDUP_FACTOR: OnceLock<u64> = OnceLock::new();
-
-#[derive(Copy, Clone, Debug, ValueEnum)]
-pub enum MsDataType {
-    // BM Node runtime information.
-    // It records CPU and memory utilization of 1300+ BM nodes in a production cluster.
-    Node,
-    // MS runtime information.
-    // It records CPU and memory utilization of 90000+ containers for 1300+ MSs in the same production cluster.
-    MsResource,
-}
-
-pub mod ms_resource;
-pub mod node;
-
-// The type of microservice data to export. Should be initialized before any
-// reading or exporting begins
-pub static EXPORTER_DATA_TYPE: OnceLock<MsDataType> = OnceLock::new();
-
-/// @brief Calls the export_from_queue() function based on runtime initialized
-///        EXPORTER_DATA_TYPE
-pub fn export_from_queue() {
-    match EXPORTER_DATA_TYPE.get().unwrap() {
-        MsDataType::Node => node::export_from_queue(),
-        MsDataType::MsResource => ms_resource::export_from_queue(),
-    }
-}
-
-/// @brief Main routine for the thread that will be reading csv data and
-/// exporting. This function just uses a match statement to call the reading
-/// and exporting routine required by the specified mode
-///
-/// @param[in] input_dir  The input directory containing csv files
-/// @param[in] all_parts  Whether to start from part 0 of csv files and continue
-///                       until no more files are found. This should be false if
-///                       part_index is Some(part)
-/// @param[in] part_index Which csv file part to use as the data source.
-///                       This should be None if all_parts is true.
-/// @param[in] data_type  The type of data out of the different types of trace
-///                       data in the Alibaba micro-services trace data
-/// @param[in] data_year  The year of the trace data. Supported values are
-///                       2021 and 2022
-/// @param[in] speedup    Speedup factor for faster-than-realtime export
-///
-/// @return The result returned by the reader thread.
-pub fn reader_thread_routine(
-    input_dir: String,
-    all_parts: bool,
-    part_index: Option<u16>,
-    data_type: MsDataType,
-    data_year: u32,
-    speedup: u64,
-) -> Result<(), BoxedErr> {
-    use crate::alibaba_metrics::node;
-    let _ = EXPORTER_DATA_TYPE.set(data_type);
-    let _ = SPEEDUP_FACTOR.set(speedup);
-    let result = match EXPORTER_DATA_TYPE.get().unwrap() {
-        MsDataType::Node => node::read_and_queue(&input_dir, all_parts, part_index, data_year),
-        MsDataType::MsResource => {
-            ms_resource::read_and_queue(&input_dir, all_parts, part_index, data_year)
-        }
-    };
-
-    result
-}
diff --git a/tools/cluster-data-exporter/src/alibaba_metrics/ms_resource.rs b/tools/cluster-data-exporter/src/alibaba_metrics/ms_resource.rs
deleted file mode 100644
index b1c81c1a7..000000000
--- a/tools/cluster-data-exporter/src/alibaba_metrics/ms_resource.rs
+++ /dev/null
@@ -1,251 +0,0 @@
-use crate::utilities;
-pub use concurrent_queue::ConcurrentQueue;
-use csv::Reader;
-use flate2::read::GzDecoder;
-use lazy_static::lazy_static;
-use prometheus::{register_gauge_vec, GaugeVec};
-use std::fs::File;
-use std::io::BufReader;
-use std::thread;
-use std::time::Duration;
-use tracing::info;
-
-const FILENAME_PARTS_2021: [&str; 2] = ["MSResource_", ".csv.gz"];
-const FILENAME_PARTS_2022: [&str; 2] = ["MSMetrics_", ".csv.gz"];
-
-const DATA_QUEUE_CAP: usize = 400_000;
-const QUEUE_POLL_INTERVAL_MS: u64 = 250;
-const CSV_DELIMITER: u8 = b',';
-const LABELS: [&str; 3] = ["ms_name", "ms_instance_id", "node_id"];
-
-type CsvGzReader<File> = Reader<GzDecoder<BufReader<File>>>;
-type BoxedErr = Box<dyn std::error::Error + Send + Sync + 'static>;
-/// Struct for holding fields after deserialization
-/// for both 2021 and 2022
-#[derive(Debug, serde::Deserialize)]
-pub struct MsResourceCsvFields {
-    #[serde(rename = "", skip)]
-    _trace: u64,
-
-    #[serde(rename = "timestamp")]
-    timestamp: u64,
-
-    #[serde(rename = "nodeid")]
-    node_id: String,
-
-    #[serde(rename = "msname")]
-    ms_name: String,
-
-    #[serde(rename = "msinstanceid")]
-    ms_instance_id: String,
-
-    #[serde(alias = "instance_cpu_usage", alias = "cpu_utilization")]
-    cpu_usage: Option<f64>,
-
-    #[serde(alias = "instance_memory_usage", alias = "memory_utilization")]
-    memory_usage: Option<f64>,
-}
-
-lazy_static! {
-    pub static ref MS_RESOURCE_DATA_QUEUE: ConcurrentQueue<MsResourceCsvFields> =
-        ConcurrentQueue::bounded(DATA_QUEUE_CAP);
-    pub static ref CPU_USAGE: GaugeVec = register_gauge_vec!(
-        "alibaba_microservice_cpu_usage",
-        "Cpu usages for microservices by alibaba nodes",
-        &LABELS,
-    )
-    .unwrap();
-    pub static ref MEMORY_USAGE: GaugeVec = register_gauge_vec!(
-        "alibaba_microservice_memory_usage",
-        "Memory usages for microservices by alibaba nodes",
-        &LABELS,
-    )
-    .unwrap();
-}
-
-/// @brief Gets the filename for the MsResource csv data based on the year
-/// and the index number
-///
-/// @param[in] year     The year of the trace data. Supported values are 2021
-///                     and 2022
-/// @param[in] index_no The index of the csv file
-///
-/// @return A String of the filename based on the data year and index num
-fn get_filename(year: u32, index_no: u16) -> String {
-    let mut filename: String = String::new();
-    let prefix: &str;
-    let suffix: &str;
-    let index: &str = &format!("{}", index_no);
-
-    match year {
-        2021 => {
-            prefix = FILENAME_PARTS_2021[0];
-            suffix = FILENAME_PARTS_2021[1];
-        }
-        2022 => {
-            prefix = FILENAME_PARTS_2022[0];
-            suffix = FILENAME_PARTS_2022[1];
-        }
-        _ => {
-            panic!("Invalid year: {}", year);
-        }
-    }
-    filename.push_str(prefix);
-    filename.push_str(index);
-    filename.push_str(suffix);
-
-    filename
-}
-
-/// @brief Gets a csv reader for MsResource data
-///
-/// @param[in] input_dir The directory containing the csv file
-/// @param[in] year      Which trace data year to create the reader for.
-///                      supported years are 2021 and 2022
-/// @param[in] index     The index of the csv file
-///
-/// @return A Result type containing either the reader or an Error if the file
-///         cannot be found
-pub fn get_reader(input_dir: &str, year: u32, index: u16) -> Result<CsvGzReader<File>, BoxedErr> {
-    use csv::ReaderBuilder;
-    use std::path::Path;
-
-    let filename: String = get_filename(year, index);
-    let file_path = Path::new(input_dir).join(&filename);
-    let fd: File = File::open(file_path)?;
-    let buf_rdr: BufReader<File> = BufReader::new(fd);
-    let gz_decoder: GzDecoder<BufReader<File>> = GzDecoder::new(buf_rdr);
-
-    let csv_rdr: CsvGzReader<File> = ReaderBuilder::new()
-        .delimiter(CSV_DELIMITER)
-        .flexible(true)
-        .has_headers(true)
-        .from_reader(gz_decoder);
-
-    Ok(csv_rdr)
-}
-
-/// @brief Routine for reading MSResource csv data and enqueuing it
-///
-/// @param[in] input_dir  The input directory containing the csv file
-/// @param[in] all_parts  Whether or not to read all csv files in the
-///                       directory, starting from part 0. Once a file
-///                       cannot be found, this will return. This should
-///                       be false if a part_index is given.
-/// @param[in] part_index The part index for a single csv file to use as
-///                       the data source. This should be None if all_parts
-///                       is true.
-/// @param[in] year       The year of the trace data. Supported values are
-///                       2021 and 2022
-///
-/// @pre All csv files are uncompressed
-/// @pre If all_parts is specified, at least part 0 must exist
-/// @pre Either all_parts is true and part_index is None, or all_parts is
-///      false and part_index is Some(part)
-pub fn read_and_queue(
-    input_dir: &str,
-    all_parts: bool,
-    part_index: Option<u16>,
-    year: u32,
-) -> Result<(), BoxedErr> {
-    let mut part: u16 = 0;
-    if !all_parts {
-        part = part_index.unwrap();
-    }
-
-    while let Ok(mut rdr) = get_reader(input_dir, year, part) {
-        let csv_iter = rdr.deserialize();
-        for csv_line in csv_iter {
-            while MS_RESOURCE_DATA_QUEUE.is_full() {
-                thread::sleep(Duration::from_millis(QUEUE_POLL_INTERVAL_MS));
-            }
-            let parsed_line: MsResourceCsvFields = csv_line?;
-            let _ = MS_RESOURCE_DATA_QUEUE.push(parsed_line);
-        }
-        part += 1;
-        if !all_parts {
-            break;
-        }
-    } // No more files to read, or couldn't find initial file
-
-    if part == 0 {
-        // Reading always starts at part 0
-        panic!(
-            "Failed to read initial .csv.gz file. Check that all data files
-             are named in the correct format (2021: '{}<idx>{}', 2022: '{}<idx>{}),
-             and that the csv files contian the field headers at the top
-            ",
-            FILENAME_PARTS_2021[0],
-            FILENAME_PARTS_2021[1],
-            FILENAME_PARTS_2022[0],
-            FILENAME_PARTS_2022[1]
-        );
-    } else {
-        MS_RESOURCE_DATA_QUEUE.close();
-        Ok(())
-    }
-}
-
-/// @brief Takes the timestamp of a trace in milliseconds and
-///        returns the normalized time as a Duration
-///
-/// @param[in] time_millis The trace timestamp in milliseconds
-///
-/// @return The normalized timestamp as a Duration
-///
-/// @NOTE: Brief check of data suggests no dilation is necessary
-///
-/// @NOTE: MSResource data from 2022 is not sorted by timestamp whatsoever,
-/// sometimes the data is listed in order of decreasing timestamp and other
-/// times it's listed in order of increasing timestamp, so the timestamps
-/// are modified to work with the exporter before being queued
-///
-/// @NOTE: SPEEDUP_FACTOR can be set via --speedup CLI argument for faster-than-realtime export
-pub fn get_normalized_start_time(time_millis: u64) -> Duration {
-    let speedup = crate::alibaba_metrics::SPEEDUP_FACTOR.get().unwrap_or(&1);
-    Duration::from_millis(time_millis / speedup)
-}
-
-/// @brief Exports a single line from the MS_RESOURCE_DATA_QUEUE
-///
-/// @param[in] csv_line A parsed line from a MsResource csv file
-pub fn export_line(csv_line: MsResourceCsvFields) {
-    let label_vals: [&str; 3] = [
-        csv_line.ms_name.as_str(),
-        csv_line.ms_instance_id.as_str(),
-        csv_line.node_id.as_str(),
-    ];
-
-    if let Some(cpu_usage) = csv_line.cpu_usage {
-        CPU_USAGE.with_label_values(&label_vals).set(cpu_usage);
-    }
-
-    if let Some(memory_usage) = csv_line.memory_usage {
-        MEMORY_USAGE
-            .with_label_values(&label_vals)
-            .set(memory_usage);
-    }
-}
-
-/// @brief Exports lines from the queue until a line is found with a timestamp
-///        later than the current runtime. This function will terminate the
-///        the program once the queue has both been closed by the reader thread
-///        and the queue is empty
-pub fn export_from_queue() {
-    let elapsed_t: Duration = utilities::get_time_elapsed();
-    let check_time =
-        |line: &MsResourceCsvFields| get_normalized_start_time(line.timestamp) <= elapsed_t;
-    MS_RESOURCE_DATA_QUEUE
-        .try_iter()
-        .take_while(check_time)
-        .for_each(export_line);
-
-    // No more files to read and empty queue
-    if MS_RESOURCE_DATA_QUEUE.is_closed()
-        && MS_RESOURCE_DATA_QUEUE.is_empty()
-        && utilities::should_exit_after_eof()
-    {
-        info!("No more MSResource data to export, shutting down");
-        std::process::exit(0);
-    }
-}
diff --git a/tools/cluster-data-exporter/src/alibaba_metrics/node.rs b/tools/cluster-data-exporter/src/alibaba_metrics/node.rs
deleted file mode 100644
index 78ff25f5b..000000000
--- a/tools/cluster-data-exporter/src/alibaba_metrics/node.rs
+++ /dev/null
@@ -1,235 +0,0 @@
-use crate::utilities;
-use concurrent_queue::ConcurrentQueue;
-use csv::{Reader, ReaderBuilder};
-use flate2::read::GzDecoder;
-use lazy_static::lazy_static;
-use prometheus::{register_gauge_vec, GaugeVec};
-use std::fs::File;
-use std::io::BufReader;
-use std::path::Path;
-use std::thread;
-use std::time::Duration;
-use tracing::info;
-
-type BoxedErr = Box<dyn std::error::Error + Send + Sync + 'static>;
-type CsvGzReader<File> = Reader<GzDecoder<BufReader<File>>>;
-
-const FILENAME_PARTS_2021: [&str; 2] = ["Node_", ".csv.gz"];
-const FILENAME_PARTS_2022: [&str; 2] = ["NodeMetrics_", ".csv.gz"];
-
-const DATA_QUEUE_CAP: usize = 400_000;
-const QUEUE_POLL_INTERVAL_MS: u64 = 250;
-const CSV_DELIMITER: u8 = b',';
-
-const LABELS: [&str; 1] = ["node_id"];
-
-/// Struct for holding fields after deserialization
-#[derive(Debug, serde::Deserialize)]
-pub struct NodeCsvFields {
-    #[serde(rename = "", skip)]
-    _trace: u64,
-
-    #[serde(rename = "timestamp")]
-    timestamp: u64,
-
-    #[serde(rename = "nodeid")]
-    node_id: String,
-
-    #[serde(alias = "node_cpu_usage", alias = "cpu_utilization")]
-    cpu_usage: Option<f64>,
-
-    #[serde(alias = "node_memory_usage", alias = "memory_utilization")]
-    memory_usage: Option<f64>,
-}
-
-lazy_static! {
-    pub static ref NODE_DATA_QUEUE: ConcurrentQueue<NodeCsvFields> =
-        ConcurrentQueue::bounded(DATA_QUEUE_CAP);
-    pub static ref CPU_USAGE: GaugeVec = register_gauge_vec!(
-        "alibaba_node_cpu_usage",
-        "Cpu usages by alibaba nodes",
-        &LABELS,
-    )
-    .unwrap();
-    pub static ref MEMORY_USAGE: GaugeVec = register_gauge_vec!(
-        "alibaba_node_memory_usage",
-        "Memory usages by alibaba nodes",
-        &LABELS,
-    )
-    .unwrap();
-}
-
-/// @brief Gets the filename for the Node_<idx>.csv.gz data based on the year
-/// and the index number
-///
-/// @param[in] year     The year of the trace data. Supported values are 2021
-///                     and 2022
-/// @param[in] index_no The index of the csv file
-///
-/// @return A String of the filename based on the data year and index num
-fn get_filename(year: u32, index_no: u16) -> String {
-    let mut filename: String = String::new();
-    let prefix: &str;
-    let suffix: &str;
-    let index: &str = &format!("{}", index_no);
-
-    match year {
-        2021 => {
-            prefix = FILENAME_PARTS_2021[0];
-            suffix = FILENAME_PARTS_2021[1];
-        }
-        2022 => {
-            prefix = FILENAME_PARTS_2022[0];
-            suffix = FILENAME_PARTS_2022[1];
-        }
-        _ => {
-            panic!("Invalid year: {}", year);
-        }
-    }
-    filename.push_str(prefix);
-    filename.push_str(index);
-    filename.push_str(suffix);
-
-    filename
-}
-
-/// @brief Gets a csv reader for Node data
-///
-/// @param[in] input_dir The directory containing the csv file
-/// @param[in] year      Which trace data year to create the reader for.
-///                      supported years are 2021 and 2022
-///
-/// @return A reader for the .csv.gz files
-///
-/// @pre All files should have been converted to a .csv.gz format from the
-///      .tar.gz format that they come as initially.
-pub fn get_reader(
-    input_dir: &str,
-    year: u32,
-    index_no: u16,
-) -> Result<CsvGzReader<File>, BoxedErr> {
-    let filename = get_filename(year, index_no);
-    let file_path = Path::new(input_dir).join(&filename);
-    let fd: File = File::open(file_path)?;
-    let buf_rdr: BufReader<File> = BufReader::new(fd);
-    let gz_decoder: GzDecoder<BufReader<File>> = GzDecoder::new(buf_rdr);
-
-    let csv_rdr: CsvGzReader<File> = ReaderBuilder::new()
-        .delimiter(CSV_DELIMITER)
-        .flexible(true)
-        .has_headers(true)
-        .from_reader(gz_decoder);
-
-    Ok(csv_rdr)
-}
-
-/// @brief Takes the timestamp of a trace in milliseconds and
-///        returns the normalized time as a Duration
-///
-/// @param[in] time_millis The trace timestamp in milliseconds
-///
-/// @return The normalized timestamp as a Duration
-///
-/// @NOTE: Brief check of data suggests no dilation is necessary
-///
-/// @NOTE: Node data from 2022 is not sorted by timestamp whatsoever,
-/// sometimes the data is listed in order of decreasing timestamp and other
-/// times it's listed in order of increasing timestamp, so the timestamps
-/// are modified to work with the exporter before being queued
-///
-/// @NOTE: SPEEDUP_FACTOR can be set via --speedup CLI argument for faster-than-realtime export
-pub fn get_normalized_start_time(time_millis: u64) -> Duration {
-    let speedup = crate::alibaba_metrics::SPEEDUP_FACTOR.get().unwrap_or(&1);
-    Duration::from_millis(time_millis / speedup)
-}
-
-/// @brief Reads the csv data from .csv.gz files and adds them to the queue.
-///
-/// @param[in] input_dir The input directory
-/// @param[in] data_year The year of the trace data
-///
-/// @pre All csv data should have been sorted by timestamp and compressed with
-///      gzip
-pub fn read_and_queue(
-    input_dir: &str,
-    all_parts: bool,
-    part_index: Option<u16>,
-    data_year: u32,
-) -> Result<(), BoxedErr> {
-    let mut part: u16 = 0;
-    if !all_parts {
-        part = part_index.unwrap();
-    }
-
-    while let Ok(mut rdr) = get_reader(input_dir, data_year, part) {
-        let csv_iter = rdr.deserialize();
-        for csv_line in csv_iter {
-            while NODE_DATA_QUEUE.is_full() {
-                thread::sleep(Duration::from_millis(QUEUE_POLL_INTERVAL_MS));
-            }
-            let parsed_line: NodeCsvFields = csv_line?;
-            let _ = NODE_DATA_QUEUE.push(parsed_line);
-        } // EOF
-        part += 1;
-
-        if !all_parts {
-            break;
-        }
-    } // No more files to read, or couldn't find initial file
-
-    if part == 0 {
-        // Reading always starts at part 0
-        panic!(
-            "Failed to read initial .csv.gz file. Check that all data files
-             are named in the correct format (2021: '{}<idx>{}', 2022: '{}<idx>{}),
-             and that the csv files contain the field headers at the top.
-            ",
-            FILENAME_PARTS_2021[0],
-            FILENAME_PARTS_2021[1],
-            FILENAME_PARTS_2022[0],
-            FILENAME_PARTS_2022[1]
-        );
-    } else {
-        NODE_DATA_QUEUE.close();
-        Ok(())
-    }
-}
-
-/// @brief Exports a single line from the NODE_DATA_QUEUE
-///
-/// @param[in] csv_line A parsed line from a Node csv file
-pub fn export_line(csv_line: NodeCsvFields) {
-    let label_vals: [&str; 1] = [csv_line.node_id.as_str()];
-
-    if let Some(cpu_usage) = csv_line.cpu_usage {
-        CPU_USAGE.with_label_values(&label_vals).set(cpu_usage);
-    }
-
-    if let Some(memory_usage) = csv_line.memory_usage {
-        MEMORY_USAGE
-            .with_label_values(&label_vals)
-            .set(memory_usage);
-    }
-}
-
-/// @brief Exports lines from the queue until a line is found with a timestamp
-///        later than the current runtime. This function will terminate the
-///        the program once the queue has both been closed by the reader thread
-///        and the queue is empty
-pub fn export_from_queue() {
-    let elapsed_t: Duration = utilities::get_time_elapsed();
-    let check_time = |line: &NodeCsvFields| get_normalized_start_time(line.timestamp) <= elapsed_t;
-    NODE_DATA_QUEUE
-        .try_iter()
-        .take_while(check_time)
-        .for_each(export_line);
-
-    // No more files to read and empty queue
-    if NODE_DATA_QUEUE.is_closed()
-        && NODE_DATA_QUEUE.is_empty()
-        && utilities::should_exit_after_eof()
-    {
-        info!("No more Node data to export, shutting down");
-        std::process::exit(0);
-    }
-}
diff --git a/tools/cluster-data-exporter/src/google_metrics.rs b/tools/cluster-data-exporter/src/google_metrics.rs
deleted file mode 100644
index afc29c76c..000000000
--- a/tools/cluster-data-exporter/src/google_metrics.rs
+++ /dev/null
@@ -1,453 +0,0 @@
-use crate::utilities;
-use crate::utilities::*;
-use clap::ValueEnum;
-use concurrent_queue::ConcurrentQueue;
-use csv::Reader;
-use flate2::read::GzDecoder;
-use lazy_static::lazy_static;
-use prometheus::{register_gauge_vec, GaugeVec};
-use std::sync::OnceLock;
-use std::thread;
-use std::time::Duration;
-use std::{fs::File, io::BufReader};
-use tracing::info;
-
-type CsvGzReader<File> = Reader<GzDecoder<BufReader<File>>>;
-
-/* Standard labels for google's task resource usage data */
-const TRU_LABELS: [&str; 3] = ["job_id", "task_index", "machine_id"];
-const TRU_CSV_DELIMITER: u8 = b',';
-const DATA_QUEUE_CAP: usize = 400_000; // Max lines in the queue
-const CSV_MAX_PART_NO: u16 = 500;
-
-const MICRO_SECONDS_PER_SECOND: u64 = 1_000_000;
-const T_OFFSET_SECS: u64 = 600;
-const DILATION_FACTOR: u64 = 10; // Factor for scaling time stamps relative to when they are exported
-
-/// Each line of the csv file is serialized into the following struct.
-/// The ordering of the struct fields MUST match the order that fields
-/// appear in a line of the csv file.
-///
-/// All fields wrapped in Option<> are not considered mandatory by
-/// the schema and, therefore, may be missing from a given trace.
-/// The rest of the fields should never be missing, so failure to
-/// deserialize will result in an error and program termination
-#[derive(Debug, serde::Deserialize)]
-pub struct TruCsvFields {
-    pub start_time: u64,
-    pub _end_time: u64,     // unused, only here for parsing
-    pub job_id: String,     // label
-    pub task_index: String, // label
-    pub machine_id: String, // label
-    pub mean_cpu_usage_rate: Option<f64>,
-    pub canonical_memory_usage: Option<f64>,
-    pub assigned_memory_usage: Option<f64>,
-    pub unmapped_page_cache_memory_usage: Option<f64>,
-    pub total_page_cache_memory_usage: Option<f64>,
-    pub max_memory_usage: Option<f64>,
-    pub mean_disk_io_time: Option<f64>,
-    pub mean_local_disk_space_used: Option<f64>,
-    pub max_cpu_usage: Option<f64>,
-    pub max_disk_io_time: Option<f64>,
-    pub cycles_per_instruction: Option<f64>,
-    pub memory_accesses_per_instruction: Option<f64>,
-    pub sample_portion: Option<f64>,
-    pub aggregation_type: Option<u8>, // Divides metrics into two
-    pub sampled_cpu_usage: Option<f64>,
-}
-
-/// @brief An enum for matching the metrics to export with their
-/// corresponding prometheus gauges
-#[derive(Copy, Clone, Debug, ValueEnum)]
-pub enum TruMetrics {
-    MeanCpuUsageRate,
-    CanonicalMemoryUsage,
-    AssignedMemoryUsage,
-    UnmappedPageCacheMemoryUsage,
-    TotalPageCacheMemoryUsage,
-    MaxMemoryUsage,
-    MeanDiskIoTime,
-    MeanLocalDiskSpaceUsed,
-    MaxCpuUsage,
-    MaxDiskIoTime,
-    CyclesPerInstruction,
-    MemoryAccessesPerInstruction,
-    SamplePortion,
-    SampledCpuUsage,
-}
-
-/// @brief A tuple struct representing two of the same prometheus metrics,
-/// but partitioned by their aggregation type. Index number directly
-/// corresponds to the aggregation type, i.e. i=0 => aggregation_type=0
-pub struct GaugePair(GaugeVec, GaugeVec);
-
-impl GaugePair {
-    /// @brief Create and register both GaugeVecs in the GaugePair to the
-    /// default registry.
-    ///
-    /// @param[in] base_name The string used as the base of both metrics
-    /// names as seen by prometheus, where aggregation type will be appended
-    ///
-    /// @param[in] base_help The string used as the base of both metrics
-    /// help strings when scraped by prometheus. Aggregation type is
-    /// appended
-    fn new(base_name: &str, base_help: &str) -> GaugePair {
-        let mut name_0 = String::from(base_name);
-        name_0.push_str("_0");
-        let mut help_0 = String::from(base_help);
-        help_0.push_str(" (aggregation_type=0)");
-        let gauge_0 = register_gauge_vec!(name_0.as_str(), help_0.as_str(), &TRU_LABELS).unwrap();
-
-        let mut name_1 = String::from(base_name);
-        name_1.push_str("_1");
-        let mut help_1 = String::from(base_help);
-        help_1.push_str(" (aggregation_type=1)");
-        let gauge_1 = register_gauge_vec!(name_1.as_str(), help_1.as_str(), &TRU_LABELS).unwrap();
-
-        GaugePair(gauge_0, gauge_1)
-    }
-
-    /// @brief Retrieve a static reference to the gauge from the pair for
-    /// the given aggregation type
-    ///
-    /// @param[in] self             Statically defined GaugePair
-    /// @param[in] aggregation_type 0 or 1 (The aggregation type)
-    fn get(&'static self, aggregation_type: u8) -> &'static GaugeVec {
-        match aggregation_type {
-            0 => &self.0,
-            1 => &self.1,
-            _ => panic!("Invalid index into gauge vec"),
-        }
-    }
-}
-
-/// List of metrics to export from the google task resource usage data
-pub static GOOGLE_METRICS: OnceLock<Vec<TruMetrics>> = OnceLock::new();
-
-lazy_static! {
-    /// Queue for parsed csv lines
-    pub static ref GOOGLE_DATA_QUEUE: ConcurrentQueue<TruCsvFields> = ConcurrentQueue::bounded(DATA_QUEUE_CAP);
-
-    /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-         *                          ALL METRICS                              *
-         *                                                                   *
-         *  Each static reference is a GaugePair corresponding to a single   *
-         *  metric. Each element of the pair corresponds to an aggregation   *
-         *  type of 0 or 1. When the aggregation type is missing from a      *
-         *  trace the aggregation type defaults to 0                         *
-         *                                                                   *
-         * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-    pub static ref MEAN_CPU_USAGE_RATE_PAIR: GaugePair = GaugePair::new(
-        "google_mean_cpu_usage_rate", "Mean cpu usage rate by google machines",
-    );
-
-    pub static ref CANONICAL_MEMORY_USAGE_PAIR: GaugePair = GaugePair::new(
-       "google_canonical_memory_usage", "Canonical memory usage by google cluster machines",
-    );
-
-    pub static ref ASSIGNED_MEMORY_USAGE_PAIR: GaugePair = GaugePair::new(
-        "google_assigned_memory_usage", "Assigned memory usage for google cluster machines",
-    );
-
-    pub static ref UNMAPPED_PAGE_CACHE_MEMORY_USAGE_PAIR: GaugePair = GaugePair::new(
-        "google_unmapped_page_cache_memory_usage", "Unmapped page cache memory usage for google cluster machines",
-    );
-
-    pub static ref TOTAL_PAGE_CACHE_MEMORY_USAGE_PAIR: GaugePair = GaugePair::new(
-        "google_total_page_cache_memory_usage", "Total page cache memory usage for google cluster machines",
-    );
-
-    pub static ref MAX_MEMORY_USAGE_PAIR: GaugePair = GaugePair::new(
-        "google_max_memory_usage", "Maximum memory usage by google cluster machines",
-    );
-
-    pub static ref MEAN_DISK_IO_TIME_PAIR: GaugePair = GaugePair::new(
-        "google_mean_disk_io_time", "Mean disk I/O time for google cluster machines",
-    );
-
-    pub static ref MEAN_LOCAL_DISK_SPACE_USED_PAIR: GaugePair = GaugePair::new(
-        "google_mean_local_disk_space_used", "Mean local disk space used by google cluster machines",
-    );
-
-    pub static ref MAX_CPU_USAGE_PAIR: GaugePair = GaugePair::new(
-        "google_max_cpu_usage", "Maximum cpu usage for google cluster machines",
-    );
-
-    pub static ref MAX_DISK_IO_TIME_PAIR: GaugePair = GaugePair::new(
-        "google_max_disk_io_time", "Maximum disk I/O time for google cluster machines",
-    );
-
-    pub static ref CYCLES_PER_INSTRUCTION_PAIR: GaugePair = GaugePair::new(
-        "google_cycles_per_instruction", "Cycles per instruction for google cluster machines",
-    );
-
-    pub static ref MEMORY_ACCESSES_PER_INSTRUCTION_PAIR: GaugePair = GaugePair::new(
-        "google_memory_accesses_per_instruction", "Memory accesses per instruction for google cluster machines",
-    );
-
-    pub static ref SAMPLE_PORTION_PAIR: GaugePair = GaugePair::new(
-        "google_sample_portion", "Sample portion for google cluster machines",
-    );
-
-    pub static ref SAMPLED_CPU_USAGE_PAIR: GaugePair = GaugePair::new(
-        "google_sampled_cpu_usage", "Sampled cpu usage for google cluster machines",
-    );
-}
-
-/// @brief Given the part number, create a String for the filename.
-///
-/// @param[in] part    The csv part number such that: part ∈ [0, 500]
-/// @param[in] gzipped Whether or not .gz should be appended to the filename
-///
-/// @return The csv filename as a String, in the form:
-///             <part-00xxx-of-00500.csv(.gz)>
-pub fn get_csv_filename(part: u16, gzipped: bool) -> String {
-    const TRU_CSV_PATH_PARTS: [&str; 4] = ["part-", "00000", "-of-00500.csv", ".gz"];
-
-    let mut filename = String::new();
-    let part_name_str = if part < 10 {
-        format!("0000{}", part)
-    } else if (10..100).contains(&part) {
-        format!("000{}", part)
-    } else if (100..=CSV_MAX_PART_NO).contains(&part) {
-        format!("00{}", part)
-    } else {
-        panic!(
-            "Invalid part number: {} => part must be between 0 and 500",
-            part
-        )
-    };
-
-    filename.push_str(TRU_CSV_PATH_PARTS[0]);
-    filename.push_str(&part_name_str);
-    filename.push_str(TRU_CSV_PATH_PARTS[2]);
-
-    if gzipped {
-        filename.push_str(TRU_CSV_PATH_PARTS[3]);
-    }
-
-    filename
-}
-
-/// @brief Creates a new csv reader wrapped around a gzip decoder which
-/// streams data from the underlying file
-///
-/// @param[in] input_dir The directory containing gzipped csv files
-/// @param[in] part      The part number out of the total number of csv files
-///
-/// @return The configured reader
-fn get_reader(input_dir: &str, part: u16) -> Result<CsvGzReader<File>, BoxedErr> {
-    use csv::ReaderBuilder;
-    use flate2::read::GzDecoder;
-    use std::fs::File;
-    use std::io::BufReader;
-    use std::path::Path;
-
-    let filename: String = get_csv_filename(part, true);
-    let file_path = Path::new(input_dir).join(&filename);
-    let fd: File = File::open(file_path)?;
-    let buf_rdr = BufReader::new(fd);
-    let gz_decoder = GzDecoder::new(buf_rdr);
-
-    let csv_rdr: CsvGzReader<File> = ReaderBuilder::new()
-        .delimiter(TRU_CSV_DELIMITER)
-        .flexible(true)
-        .has_headers(false)
-        .from_reader(gz_decoder);
-
-    Ok(csv_rdr)
-}
-
-/// @brief Main routine of the helper (reader) thread.
-///
-/// The purpose of the thread is to handle all of the work involved in
-///     reading and enqueuing lines from the csv.gz file for the
-///     main thread to then pop and export on scrape
-///
-/// @param[in] input_dir  The path to the directory containing the csv.gz files
-/// @param[in] all_parts  Whether or not to run the exporter on all 500 parts of
-///                       the task resource usage csv data. Running in this mode
-///                       and not providing all 500 parts will cause the reader
-///                       thread to panic. If this option is true, part_index
-///                       should be None
-/// @param[in] part_index Specify a single part (out of 500) to read csv data
-///                       from. The reader thread will stop after reading this
-///                       single file. If part_index is not None, then all_parts
-///                       should be false
-/// @param[in] metrics    The list of metrics, or csv fields, for the exporter
-///                       to expose to prometheus. At least one must be given
-///
-/// @pre All csv files are expected to be of the form:
-///                 "part-00xxx-of-00500.csv.gz"
-pub fn reader_thread_routine(
-    input_dir: String,
-    all_parts: bool,
-    part_index: Option<u16>,
-    metrics: Vec<TruMetrics>,
-) -> Result<(), BoxedErr> {
-    const QUEUE_POLL_INTERVAL_MS: u64 = 250;
-    GOOGLE_METRICS.set(metrics).unwrap();
-    let mut part: u16 = 0_u16;
-
-    if !all_parts {
-        part = part_index.unwrap();
-    }
-
-    while let Ok(mut rdr) = get_reader(&input_dir, part) {
-        let csv_iter = rdr.deserialize();
-        for csv_line in csv_iter {
-            while GOOGLE_DATA_QUEUE.is_full() {
-                thread::sleep(Duration::from_millis(QUEUE_POLL_INTERVAL_MS));
-            }
-            let parsed_line: TruCsvFields = csv_line?;
-            let _ = GOOGLE_DATA_QUEUE.push(parsed_line);
-        }
-        part += 1;
-
-        if !all_parts || part > CSV_MAX_PART_NO {
-            break;
-        }
-    }
-
-    // Never read any parts or all parts was specified and we never read all 500
-    // parts of the csv data
-    if part == 0 || (all_parts && part <= CSV_MAX_PART_NO) {
-        panic!(
-            "Failed to read initial .csv.gz file. Check that all data files
-             are named in the correct format ('part-?????-of-00500.csv.gz').
-             If running with --all-parts, ensure all 500 parts exist in the
-             input directory.
-            "
-        );
-    } else {
-        GOOGLE_DATA_QUEUE.close();
-        Ok(())
-    }
-}
-
-/// @brief: Converts the start time of a job into seconds and normalizes it
-///
-/// From pg.2 of the schema doc:
-///    "Each record has a timestamp, which is in microseconds since 600
-///     seconds before the beginning of the trace period, and recorded as a
-///     64 bit integer (i.e., an event 20 second after the start of the
-///     trace would have a timestamp=620s)."
-///
-/// @param[in] time_micros The event start time in microseconds,
-///                        offset by T_OFFSET_SECS (600s)
-///
-/// @return A duration representing the dilated trace start time in seconds
-///            after subtracting the offset
-pub fn get_normalized_start_time(time_micros: u64) -> Duration {
-    let time_secs = time_micros / MICRO_SECONDS_PER_SECOND;
-    Duration::from_secs((time_secs - T_OFFSET_SECS) * DILATION_FACTOR)
-}
-
-/// @brief Given a single parsed line from the csv file, update all gauges
-/// corresponding to the metrics in the list
-///
-/// @param[in] csv_line A parsed line from the csv file containing label
-///                         values and metric data to export
-pub fn export_line(csv_line: TruCsvFields) {
-    let metrics = GOOGLE_METRICS.get().unwrap();
-    let label_vals: [&str; 3] = [
-        csv_line.job_id.as_str(),
-        csv_line.task_index.as_str(),
-        csv_line.machine_id.as_str(),
-    ];
-
-    let aggregation_type = csv_line.aggregation_type.unwrap_or(0_u8);
-
-    for metric in metrics {
-        let curr_gauge: &'static GaugeVec;
-        let wrapped_value: Option<f64>;
-
-        (curr_gauge, wrapped_value) = match metric {
-            TruMetrics::MeanCpuUsageRate => (
-                MEAN_CPU_USAGE_RATE_PAIR.get(aggregation_type),
-                csv_line.mean_cpu_usage_rate,
-            ),
-            TruMetrics::CanonicalMemoryUsage => (
-                CANONICAL_MEMORY_USAGE_PAIR.get(aggregation_type),
-                csv_line.canonical_memory_usage,
-            ),
-            TruMetrics::AssignedMemoryUsage => (
-                ASSIGNED_MEMORY_USAGE_PAIR.get(aggregation_type),
-                csv_line.assigned_memory_usage,
-            ),
-            TruMetrics::UnmappedPageCacheMemoryUsage => (
-                UNMAPPED_PAGE_CACHE_MEMORY_USAGE_PAIR.get(aggregation_type),
-                csv_line.unmapped_page_cache_memory_usage,
-            ),
-            TruMetrics::TotalPageCacheMemoryUsage => (
-                TOTAL_PAGE_CACHE_MEMORY_USAGE_PAIR.get(aggregation_type),
-                csv_line.total_page_cache_memory_usage,
-            ),
-            TruMetrics::MaxMemoryUsage => (
-                MAX_MEMORY_USAGE_PAIR.get(aggregation_type),
-                csv_line.max_memory_usage,
-            ),
-            TruMetrics::MeanDiskIoTime => (
-                MEAN_DISK_IO_TIME_PAIR.get(aggregation_type),
-                csv_line.mean_disk_io_time,
-            ),
-            TruMetrics::MeanLocalDiskSpaceUsed => (
-                MEAN_LOCAL_DISK_SPACE_USED_PAIR.get(aggregation_type),
-                csv_line.mean_local_disk_space_used,
-            ),
-            TruMetrics::MaxCpuUsage => (
-                MAX_CPU_USAGE_PAIR.get(aggregation_type),
-                csv_line.max_cpu_usage,
-            ),
-            TruMetrics::MaxDiskIoTime => (
-                MAX_DISK_IO_TIME_PAIR.get(aggregation_type),
-                csv_line.max_disk_io_time,
-            ),
-            TruMetrics::CyclesPerInstruction => (
-                CYCLES_PER_INSTRUCTION_PAIR.get(aggregation_type),
-                csv_line.cycles_per_instruction,
-            ),
-            TruMetrics::MemoryAccessesPerInstruction => (
-                MEMORY_ACCESSES_PER_INSTRUCTION_PAIR.get(aggregation_type),
-                csv_line.memory_accesses_per_instruction,
-            ),
-            TruMetrics::SamplePortion => (
-                SAMPLE_PORTION_PAIR.get(aggregation_type),
-                csv_line.sample_portion,
-            ),
-            TruMetrics::SampledCpuUsage => (
-                SAMPLED_CPU_USAGE_PAIR.get(aggregation_type),
-                csv_line.sampled_cpu_usage,
-            ),
-        };
-
-        if let Some(metric_value) = wrapped_value {
-            // Set the metric, unless it was missing
-            curr_gauge.with_label_values(&label_vals).set(metric_value);
-        }
-    }
-}
-
-/// @brief Exports all parsed CSV lines from the queue
-///
-/// This function will continue popping lines from the queue until it
-/// pops one with a start timestamp which should be exported later in time.
-/// This line will be saved in FUTURE_LINE and then exported on the next
-/// scrape for which the program runtime <= start time
-pub fn export_from_queue() {
-    let elapsed_t: Duration = utilities::get_time_elapsed();
-    let check_time = |line: &TruCsvFields| get_normalized_start_time(line.start_time) <= elapsed_t;
-
-    GOOGLE_DATA_QUEUE
-        .try_iter()
-        .take_while(check_time)
-        .for_each(export_line);
-
-    if GOOGLE_DATA_QUEUE.is_closed()
-        && GOOGLE_DATA_QUEUE.is_empty()
-        && utilities::should_exit_after_eof()
-    {
-        info!("No more task resource usage to export, shutting down");
-        std::process::exit(0);
-    }
-}
diff --git a/tools/cluster-data-exporter/src/main.rs b/tools/cluster-data-exporter/src/main.rs
deleted file mode 100644
index 8ff4dad6a..000000000
--- a/tools/cluster-data-exporter/src/main.rs
+++ /dev/null
@@ -1,274 +0,0 @@
-/// @NOTE: As new label-value combinations are added to each metric,
-/// they will persist unless another metric with the same label-value combo
-/// overwipes it. Therefore, user should be wary about the possibility
-/// of program memory usage steadily increasing over the course of the runtime
-use crate::alibaba_metrics::*;
-use crate::google_metrics::*;
-use crate::utilities::*;
-use clap::Parser;
-use hyper::body::Incoming;
-use hyper::header::CONTENT_TYPE;
-use hyper::server::conn::http1;
-use hyper::service::service_fn;
-use hyper::Request;
-use hyper::Response;
-use hyper_util::rt::TokioIo;
-use prometheus::{Encoder, TextEncoder};
-use std::net::{Ipv4Addr, SocketAddr};
-use std::sync::OnceLock;
-use std::{panic, process, thread};
-use tokio::net::TcpListener;
-use tracing::{debug, error, info};
-use tracing_subscriber::{layer::SubscriberExt, util::SubscriberInitExt, EnvFilter};
-
-mod alibaba_metrics;
-mod google_metrics;
-mod utilities;
-
-type BoxedErr = Box<dyn std::error::Error + Send + Sync + 'static>;
-
-/// Google or Alibaba. Must be initialized before starting export routine
-static DATA_PROVIDER: OnceLock<Provider> = OnceLock::new();
-
-/// @brief Async call-back function for servicing http requests, like
-///        prometheus scrapes
-///
-/// @param[in] _req The incoming http request
-///
-/// @return Prometheus metrics on success
-///         BoxedErr on failure
-async fn serve_req(_req: Request<Incoming>) -> Result<Response<String>, BoxedErr> {
-    let encoder = TextEncoder::new();
-    let provider = DATA_PROVIDER.get().unwrap();
-
-    match provider {
-        Provider::Google => google_metrics::export_from_queue(),
-        Provider::Alibaba => alibaba_metrics::export_from_queue(),
-    }
-
-    let metric_families = prometheus::gather();
-    let body = encoder.encode_to_string(&metric_families)?;
-    let response = Response::builder()
-        .status(200)
-        .header(CONTENT_TYPE, encoder.format_type())
-        .body(body)?;
-
-    Ok(response)
-}
-
-/// @brief Starts a thread to read and queue Google cluster data
-///
-/// @param[in] input_dir  The input directory to Google task resource usage
-///                       cluster data
-/// @param[in] all_parts  Whether to run the exporter across all csv parts or
-///                       not. This should be false if part index is not None
-/// @param[in] part_index The part number, out of 500, of the csv file to use
-///                       when exporting task resource usage data. This should
-///                       be None if all_parts is true.
-/// @param[in] metrics    The list of metrics from the task resource usage data
-///                       to export
-///
-/// @post All globals required by the main exporter thread are initialized.
-fn start_google_thread(
-    input_dir: String,
-    all_parts: bool,
-    part_index: Option<u16>,
-    metrics: Vec<TruMetrics>,
-) {
-    debug!("Starting Google reader thread");
-    thread::spawn(move || {
-        // start reader thread
-        // Drops thread handle => thread is implicitly detached
-        if let Err(err) =
-            google_metrics::reader_thread_routine(input_dir, all_parts, part_index, metrics)
-        {
-            error!("Error in Google reader thread: {:?}", err);
-            process::exit(1);
-        }
-    });
-    // Must be initialized before main thread starts exporting
-    google_metrics::GOOGLE_METRICS.wait();
-    debug!("Google reader thread initialized");
-}
-
-/// @brief Starts a thread to read and queue Alibaba cluster data
-///
-/// @param[in] input_dir  The input directory containing the csv files for
-///                       reading
-/// @param[in] all_parts  Whether to run the exporter from part 0 until no more
-///                       csv files are found, or not. This should be false if
-///                       part index is not None.
-/// @param[in] part_index Which csv file part to use as the data source.
-///                       This should be None if all_parts is true.
-/// @param[in] data_type  Which type of microservice data the reading thread
-///                       should be configured to read and queue
-/// @param[in] data_year  The year from which the source data comes from. Valid
-///                       options are 2021 and 2022
-/// @param[in] speedup    Speedup factor for faster-than-realtime export
-///
-/// @post All globals required by the main exporter thread are initialized.
-fn start_alibaba_thread(
-    input_dir: String,
-    all_parts: bool,
-    part_index: Option<u16>,
-    data_type: MsDataType,
-    data_year: u32,
-    speedup: u64,
-) {
-    debug!("Starting Alibaba reader thread");
-    thread::spawn(move || {
-        if let Err(err) = alibaba_metrics::reader_thread_routine(
-            input_dir, all_parts, part_index, data_type, data_year, speedup,
-        ) {
-            error!("Error in Alibaba reader thread: {:?}", err);
-            process::exit(1);
-        }
-    });
-    // Must be initialized before main thread starts exporting
-    alibaba_metrics::EXPORTER_DATA_TYPE.wait();
-    debug!("Alibaba reader thread initialized");
-}
-
-/// @brief Sets up logging with optional file output
-///
-/// @param[in] log_dir   Optional directory for log file output
-/// @param[in] log_level Log level string (DEBUG, INFO, WARN, ERROR)
-///
-/// @return WorkerGuard if file logging is enabled, None otherwise.
-///         The guard must be kept alive for the duration of the program.
-fn setup_logging(
-    log_dir: Option<&str>,
-    log_level: &str,
-) -> Result<Option<tracing_appender::non_blocking::WorkerGuard>, BoxedErr> {
-    // Create env filter that respects RUST_LOG, with fallback to command line arg
-    let env_filter = EnvFilter::try_from_default_env()
-        .or_else(|_| EnvFilter::try_new(log_level))
-        .unwrap_or_else(|_| EnvFilter::new("info"));
-
-    if let Some(dir) = log_dir {
-        // Log to file AND stdout
-        std::fs::create_dir_all(dir)?;
-        let file_appender = tracing_appender::rolling::never(dir, "cluster_data_exporter.log");
-        let (non_blocking, guard) = tracing_appender::non_blocking(file_appender);
-
-        tracing_subscriber::registry()
-            .with(env_filter)
-            .with(
-                tracing_subscriber::fmt::layer()
-                    .with_writer(std::io::stdout)
-                    .with_ansi(true),
-            )
-            .with(
-                tracing_subscriber::fmt::layer()
-                    .with_writer(non_blocking)
-                    .with_ansi(false),
-            )
-            .init();
-
-        info!(
-            "Logging initialized with file output: {}/cluster_data_exporter.log",
-            dir
-        );
-        Ok(Some(guard))
-    } else {
-        // Log to stdout only
-        tracing_subscriber::registry()
-            .with(env_filter)
-            .with(tracing_subscriber::fmt::layer())
-            .init();
-
-        info!("Logging initialized (stdout only)");
-        Ok(None)
-    }
-}
-
-#[tokio::main]
-async fn main() -> Result<(), BoxedErr> {
-    let cli = Cli::parse();
-    let _ = utilities::EXIT_AFTER_EOF.set(std::time::Duration::from_millis(cli.exit_after_eof_ms));
-
-    // Initialize logging (keep guard alive for lifetime of program)
-    let _log_guard = setup_logging(cli.log_dir.as_deref(), &cli.log_level)?;
-
-    info!("Starting cluster_data_exporter");
-    info!("Input directory: {}", cli.input_directory);
-    info!("Port: {}", cli.port);
-    info!("Exit-after-EOF grace period: {}ms", cli.exit_after_eof_ms);
-
-    // This code forces the program to exit if a reader thread panics.
-    // Comment it out if it's preferable for the main thread to remain
-    let orig_hook = panic::take_hook();
-    panic::set_hook(Box::new(move |panic_info| {
-        // invoke the default handler and then exit the process
-        orig_hook(panic_info);
-        process::exit(1);
-    }));
-
-    let input_directory: String = cli.input_directory.clone();
-    let port: u16 = cli.port;
-    let addr: SocketAddr = (Ipv4Addr::UNSPECIFIED, port).into();
-
-    let _ = utilities::T_START; // init t_start
-
-    // Spin up reader thread to start queueing csv data
-    match cli.provider {
-        ProviderCmd::Google {
-            metrics,
-            all_parts,
-            part_index,
-        } => {
-            info!("Provider: Google");
-            info!("Metrics: {:?}", metrics);
-            info!(
-                "Parts mode: {}",
-                if all_parts { "all-parts" } else { "part-index" }
-            );
-            if let Some(idx) = part_index {
-                info!("Part index: {}", idx);
-            }
-            let _ = DATA_PROVIDER.set(Provider::Google);
-            start_google_thread(input_directory, all_parts, part_index, metrics);
-        }
-        ProviderCmd::Alibaba {
-            data_type,
-            data_year,
-            all_parts,
-            part_index,
-            speedup,
-        } => {
-            info!("Provider: Alibaba");
-            info!("Data type: {:?}", data_type);
-            info!("Data year: {}", data_year);
-            info!(
-                "Parts mode: {}",
-                if all_parts { "all-parts" } else { "part-index" }
-            );
-            if let Some(idx) = part_index {
-                info!("Part index: {}", idx);
-            }
-            info!("Speedup factor: {}x", speedup);
-            let _ = DATA_PROVIDER.set(Provider::Alibaba);
-            start_alibaba_thread(
-                input_directory,
-                all_parts,
-                part_index,
-                data_type,
-                data_year,
-                speedup,
-            );
-        }
-    }
-
-    let listener = TcpListener::bind(addr).await?;
-    info!("Server listening on http://{}", addr);
-
-    loop {
-        // Main exporter routine
-        let (stream, _) = listener.accept().await?;
-        let io = TokioIo::new(stream);
-        let service = service_fn(serve_req);
-        if let Err(err) = http1::Builder::new().serve_connection(io, service).await {
-            error!("Server error: {:?}", err);
-        };
-    }
-}
diff --git a/tools/cluster-data-exporter/src/utilities.rs b/tools/cluster-data-exporter/src/utilities.rs
deleted file mode 100644
index bd9af884b..000000000
--- a/tools/cluster-data-exporter/src/utilities.rs
+++ /dev/null
@@ -1,133 +0,0 @@
-use crate::alibaba_metrics::*;
-use crate::google_metrics::*;
-use clap::{ArgGroup, Parser, Subcommand, ValueEnum};
-use lazy_static::lazy_static;
-use std::sync::OnceLock;
-use std::time::{Duration, Instant};
-
-pub type BoxedErr = Box<dyn std::error::Error + Send + Sync + 'static>;
-
-/// Optional grace period after finite input is exhausted. A zero duration
-/// preserves the legacy behavior of exiting during the terminal scrape.
-pub static EXIT_AFTER_EOF: OnceLock<Duration> = OnceLock::new();
-static EOF_REACHED_AT: OnceLock<Instant> = OnceLock::new();
-
-pub fn should_exit_after_eof() -> bool {
-    let timeout = EXIT_AFTER_EOF.get().copied().unwrap_or_default();
-    timeout.is_zero()
-        || EOF_REACHED_AT
-            .get_or_init(Instant::now)
-            .elapsed()
-            .ge(&timeout)
-}
-
-lazy_static! {
-    /// An instant in time to roughly represent the start time of the exporter
-    /// This is used as the reference point for calculating how much time has
-    /// elapsed, and therefore which traces should be exported during a scrape
-    /// and which ones should be held onto until later
-    pub static ref T_START: Instant = Instant::now();
-}
-
-/// @brief Returns the time since T_START as a Duration
-///
-/// @return Duration since the Instant defined by T_START
-///
-/// @note Since T_START isn't initialized until it is referenced for the first
-///       time, so if this function is called before T_START is ever referenced
-///       then T_START will be initialized here with Duration::Zero returned
-pub fn get_time_elapsed() -> Duration {
-    T_START.elapsed()
-}
-
-#[derive(Debug, Clone, ValueEnum)]
-pub enum Provider {
-    Google,
-    Alibaba,
-}
-
-#[derive(Parser, Debug)]
-#[command(name = "cluster_data_exporter", version, about)]
-#[command(subcommand_required = true)]
-pub struct Cli {
-    #[arg(short, long, aliases = ["input, in, dir, input_dir"])]
-    #[arg(required = true)]
-    pub input_directory: String,
-
-    #[arg(short, long)]
-    #[arg(required = true)]
-    pub port: u16,
-
-    /// Grace period after the finite input is exhausted before exiting.
-    /// Zero preserves the legacy immediate-shutdown behavior.
-    #[arg(long, default_value_t = 0)]
-    pub exit_after_eof_ms: u64,
-
-    /// Log level (DEBUG, INFO, WARN, ERROR)
-    #[arg(long, default_value = "INFO")]
-    pub log_level: String,
-
-    /// Output directory for log files (optional, defaults to stdout only)
-    #[arg(long)]
-    pub log_dir: Option<String>,
-
-    #[command(subcommand)]
-    pub provider: ProviderCmd,
-}
-
-#[derive(Subcommand, Debug)]
-pub enum ProviderCmd {
-    /// Run the exporter on google task resource usage data
-    #[command(group(ArgGroup::new("csv-parts")
-                        .args(&["all_parts", "part_index"])
-                        .required(true))
-    )]
-    Google {
-        #[arg(long, value_enum, value_delimiter = ',', num_args = 1..)]
-        #[arg(required = true, require_equals = true)]
-        metrics: Vec<TruMetrics>,
-
-        #[arg(long, group = "csv-parts", alias = "all")]
-        all_parts: bool,
-
-        #[arg(long, group = "csv-parts", aliases = ["part", "index"])]
-        #[arg(require_equals = true)]
-        part_index: Option<u16>,
-    },
-
-    /// Run the exporter on Alibaba microservice data
-    #[command(group(ArgGroup::new("csv-parts")
-                .args(&["all_parts", "part_index"])
-                .required(true))
-    )]
-    Alibaba {
-        /// The type of microservice data to use
-        #[arg(long, value_enum)]
-        #[arg(required = true, require_equals = true)]
-        data_type: MsDataType,
-
-        /// Which year the microservice data comes from
-        #[arg(long)]
-        #[arg(required = true, require_equals = true)]
-        #[arg(value_parser = clap::value_parser!(u32).range(2021..=2022))]
-        data_year: u32,
-
-        /// Whether or not to run the exporter starting on part 0 of the csv
-        /// files and continue sequentially until no more files are found.
-        /// This option is mutually exclusive with --part-index
-        #[arg(long, group = "csv-parts", alias = "all")]
-        all_parts: bool,
-
-        /// Specify a single csv file to use as trace data.
-        /// This option is mutually exclusive with --all-parts
-        #[arg(long, group = "csv-parts", aliases = ["part", "index"])]
-        #[arg(require_equals = true)]
-        part_index: Option<u16>,
-
-        /// Speedup factor for faster-than-realtime export
-        /// 1 = real-time, 10 = 10x faster, 100 = 100x faster
-        #[arg(long, require_equals = true)]
-        #[arg(value_parser = clap::value_parser!(u64).range(1..))]
-        speedup: u64,
-    },
-}
diff --git a/tools/cluster-data-exporter/tests/fixtures/alibaba/msresource.csv b/tools/cluster-data-exporter/tests/fixtures/alibaba/msresource.csv
deleted file mode 100644
index 66d91d24d..000000000
--- a/tools/cluster-data-exporter/tests/fixtures/alibaba/msresource.csv
+++ /dev/null
@@ -1,3 +0,0 @@
-timestamp,nodeid,msname,msinstanceid,instance_cpu_usage,instance_memory_usage
-0,node-a,frontend,frontend-1,0.5,0.25
-60000,node-b,worker,worker-1,0.75,0.5
diff --git a/tools/cluster-data-exporter/tests/fixtures/alibaba/node.csv b/tools/cluster-data-exporter/tests/fixtures/alibaba/node.csv
deleted file mode 100644
index 0e1fe83cf..000000000
--- a/tools/cluster-data-exporter/tests/fixtures/alibaba/node.csv
+++ /dev/null
@@ -1,3 +0,0 @@
-timestamp,nodeid,node_cpu_usage,node_memory_usage
-0,node-a,0.5,0.25
-60000,node-b,0.75,0.5
diff --git a/tools/cluster-data-exporter/tests/fixtures/google/part-00000-of-00500.csv b/tools/cluster-data-exporter/tests/fixtures/google/part-00000-of-00500.csv
deleted file mode 100644
index dd061f1f5..000000000
--- a/tools/cluster-data-exporter/tests/fixtures/google/part-00000-of-00500.csv
+++ /dev/null
@@ -1,2 +0,0 @@
-600000000,600000001,job-a,0,machine-a,0.5,,,,,,,,,,,,,,
-601000000,601000001,job-b,1,machine-b,0.75,,,,,,,,,,,,,,
diff --git a/tools/cluster-data-exporter/tests/smoke.sh b/tools/cluster-data-exporter/tests/smoke.sh
deleted file mode 100755
index c7898aeed..000000000
--- a/tools/cluster-data-exporter/tests/smoke.sh
+++ /dev/null
@@ -1,103 +0,0 @@
-#!/usr/bin/env bash
-set -Eeuo pipefail
-
-SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
-TOOL_DIR="$(cd "${SCRIPT_DIR}/.." && pwd)"
-FIXTURE_DIR="${SCRIPT_DIR}/fixtures"
-WORK_DIR="$(mktemp -d)"
-PORT_BASE="${CDE_TEST_PORT_BASE:-19400}"
-CURRENT_PID=""
-
-cleanup() {
-    if [[ -n "${CURRENT_PID}" ]]; then
-        kill "${CURRENT_PID}" 2>/dev/null || true
-        wait "${CURRENT_PID}" 2>/dev/null || true
-    fi
-    rm -rf "${WORK_DIR}"
-}
-trap cleanup EXIT
-
-require() {
-    command -v "$1" >/dev/null || {
-        echo "missing required command: $1" >&2
-        exit 1
-    }
-}
-
-for command in cargo curl gzip; do
-    require "${command}"
-done
-
-cargo build --manifest-path "${TOOL_DIR}/Cargo.toml"
-EXPORTER="${TOOL_DIR}/target/debug/cluster_data_exporter"
-
-start_exporter() {
-    local port="$1"
-    local input_directory="$2"
-    shift 2
-    "${EXPORTER}" -i "${input_directory}" -p "${port}" --exit-after-eof-ms=2000 "$@" &
-    CURRENT_PID="$!"
-    for _ in $(seq 1 80); do
-        if curl -fsS "http://127.0.0.1:${port}/metrics" >/dev/null 2>&1; then
-            return
-        fi
-        sleep 0.05
-    done
-    echo "exporter did not become ready on port ${port}" >&2
-    exit 1
-}
-
-assert_metric() {
-    local port="$1"
-    local metric="$2"
-    local label_fragment="$3"
-    curl -fsS "http://127.0.0.1:${port}/metrics" |
-        grep -F "${metric}" |
-        grep -Fq "${label_fragment}"
-}
-
-stop_exporter() {
-    kill "${CURRENT_PID}"
-    wait "${CURRENT_PID}" 2>/dev/null || true
-    CURRENT_PID=""
-}
-
-google_dir="${WORK_DIR}/google"
-mkdir -p "${google_dir}"
-# Verifies Google task-usage CSV replay and metric labels.
-gzip -c "${FIXTURE_DIR}/google/part-00000-of-00500.csv" > "${google_dir}/part-00000-of-00500.csv.gz"
-start_exporter "${PORT_BASE}" "${google_dir}" google --metrics=mean-cpu-usage-rate --part-index=0
-assert_metric "${PORT_BASE}" "google_mean_cpu_usage_rate_0" 'job_id="job-a"'
-stop_exporter
-
-for year in 2021 2022; do
-    node_dir="${WORK_DIR}/node-${year}"
-    mkdir -p "${node_dir}"
-    # Verifies both Alibaba Node filename conventions and metric output.
-    node_name="Node_0.csv.gz"
-    if [[ "${year}" == 2022 ]]; then
-        node_name="NodeMetrics_0.csv.gz"
-    fi
-    gzip -c "${FIXTURE_DIR}/alibaba/node.csv" > "${node_dir}/${node_name}"
-    port=$((PORT_BASE + year - 2020))
-    start_exporter "${port}" "${node_dir}" alibaba --data-type=node --data-year="${year}" --part-index=0 --speedup=1
-    assert_metric "${port}" "alibaba_node_cpu_usage" 'node_id="node-a"'
-    stop_exporter
-done
-
-for year in 2021 2022; do
-    ms_dir="${WORK_DIR}/msresource-${year}"
-    mkdir -p "${ms_dir}"
-    # Verifies both Alibaba MSResource filename conventions and metric output.
-    ms_name="MSResource_0.csv.gz"
-    if [[ "${year}" == 2022 ]]; then
-        ms_name="MSMetrics_0.csv.gz"
-    fi
-    gzip -c "${FIXTURE_DIR}/alibaba/msresource.csv" > "${ms_dir}/${ms_name}"
-    port=$((PORT_BASE + year - 2018))
-    start_exporter "${port}" "${ms_dir}" alibaba --data-type=ms-resource --data-year="${year}" --part-index=0 --speedup=1
-    assert_metric "${port}" "alibaba_microservice_cpu_usage" 'ms_name="frontend"'
-    stop_exporter
-done
-
-echo "cluster-data-exporter smoke checks passed"
diff --git a/tools/empirical-bench/.gitignore b/tools/empirical-bench/.gitignore
deleted file mode 100644
index 81c34145e..000000000
--- a/tools/empirical-bench/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-/results/
-/results-sweep/
-__pycache__/
diff --git a/tools/empirical-bench/ARTIFACTS.md b/tools/empirical-bench/ARTIFACTS.md
deleted file mode 100644
index 4ec53c746..000000000
--- a/tools/empirical-bench/ARTIFACTS.md
+++ /dev/null
@@ -1,32 +0,0 @@
-# Archived experiment results
-
-Full raw measurements and expanded query plans are distributed as an
-[experiment artifact](https://github.com/ProjectASAP/ASAPPlanner/releases/tag/offline-evidence-2026-09-08),
-not checked into the tool source tree. This prerelease is an experiment archive,
-not a product release. The concise conclusions remain in
-[the historical report](../../docs/offline-o11y-final-2026-09-08.md).
-
-Download and verify from the repository root:
-
-```sh
-gh release download offline-evidence-2026-09-08 --repo ProjectASAP/ASAPPlanner \
-  --pattern offline-evidence-2026-09-08.tar.gz --dir /tmp
-echo '180f3768203635c31188d19b500455290b96e19a4df4fdac7245af0944bd1b34  /tmp/offline-evidence-2026-09-08.tar.gz' | sha256sum --check
-tar -xzf /tmp/offline-evidence-2026-09-08.tar.gz
-```
-
-Extract only into a checkout without existing result files; extraction restores
-`tools/empirical-bench/results/` and `results-sweep/`. These generated directories
-are ignored by Git. The archive is 460,710 bytes and contains 43 text files.
-It preserves the original source snapshot
-`152ca6cb71fc11a8c38d93e69c9fd7dca682f03b`, per-run commands, environment metadata,
-raw timing/error reports, and measurement-source checksums.
-
-- `results/`: historical partial frequency measurements and initial planner/control-plane replay; also the later `o11y-exact-snapshot.json` reference evaluation.
-- `results-sweep/`: final frequency matrix, disjoint CPU and heap evidence, six recommendation scenarios, four frequency binding reports, and final o11y control-plane replay.
-- Each directory contains `MEASUREMENTS.md` explaining its measurement scope. Do not mix costs from the two runs.
-
-To produce new results instead of downloading these measurements, follow
-[the benchmark guide](README.md) and [the replay guide](../../control_plane/docs/offline-sketch-evidence.md).
-The archive preserves offline evidence, not production speedups or real-time
-accuracy guarantees.
diff --git a/tools/empirical-bench/README.md b/tools/empirical-bench/README.md
deleted file mode 100644
index cfb74ade8..000000000
--- a/tools/empirical-bench/README.md
+++ /dev/null
@@ -1,117 +0,0 @@
-# Offline sketch-bench evidence (developer guide)
-
-This driver runs ProjectASAP/sketch-bench's real `approxbench` CLI and adapts its
-schema-v5 reports to the planner's versioned evidence schema. It measures CMS and
-CountSketch using `asap_sketchlib` RegularPath/Vector2D plus an exact Polars
-frequency baseline, on deterministic uniform and Zipf streams. No collector,
-query backend, runtime ground truth, or runtime error feedback is involved.
-
-Full historical and final outputs are stored in the [experiment archive](ARTIFACTS.md),
-not in this source tree. Download and verify that archive to inspect saved results.
-The planner-side conclusions remain in the
-[historical report](../../docs/offline-o11y-final-2026-09-08.md).
-For control-plane integration and replay, see the
-[backend evidence guide](../../control_plane/docs/offline-sketch-evidence.md).
-
-```bash
-git clone https://github.com/ProjectASAP/sketch-bench.git /path/to/sketch-bench
-git -C /path/to/sketch-bench checkout 87f619e843fd2e4da784160d4e205a0d0d55f032
-(cd /path/to/sketch-bench && cargo build --release --locked -p aqpbm-cli)
-python3 tools/empirical-bench/run.py --bench-repo /path/to/sketch-bench --output /tmp/offline-evidence --sweep
-python3 -m unittest discover -s tools/empirical-bench -p 'test_*.py'
-```
-
-Build from the sketch-bench directory so its `.cargo/config.toml` applies
-`target-cpu=native`, as in the archived run. The driver records the source
-revision, dirty status, executable checksum, full invocations, compiler, CPU,
-OS, implementation, and parameters. It pins Polars to one worker. Five measured
-runs follow two warmups per timed operation by default. Upstream accuracy executes
-one offline truth comparison for the fixed generated dataset, recorded as
-`error.trials=1`; it is run separately because accuracy of insert is undefined.
-These timings are repeated observations
-within one process, not independent experiments: standard deviations are reported,
-but no confidence interval or cross-distribution guarantee is inferred.
-`manifest.json.runtime_provenance` distinguishes observed host metadata and the
-driver's enforced thread setting from declared build preconditions. The runtime
-string's release/native/jemalloc settings describe the documented required build;
-the driver does not independently recover compiler or allocator flags from the
-executable. Its SHA-256 identifies that binary without proving those build flags.
-The archived run used a shared development host without CPU affinity or an
-exclusive core reservation; timing estimates should be remeasured on deployment
-hardware before using them for capacity decisions.
-
-Outputs:
-
-- `raw.json`: unmodified per-invocation sketch-bench flat reports, including wall
-  times, CPU user/system samples, process RSS/allocator readings, and all errors.
-- `manifest.json`: execution and environment provenance.
-- `operation-reports.json`: original reports before upstream flattening; preserve
-  per-operation memory, including exact prepared-index state.
-- `memory-probe.json`: requested-allocation samples with each live sketch, using
-  the same library and upstream data generator on identical inputs.
-- `planner-evidence.json`: normalized sketch measurements, with unknowns null.
-- `exact-baselines.json`: exact frequency index costs on the same input.
-- `resource-probe.json`: disjoint live-state construction/update/read/merge CPU,
-  actual serialized snapshot size and allocated filesystem blocks.
-- `comparison-evidence.json`: query-bound sketch records and exact baselines;
-  its required `disjoint_live_state_v1` timing contract excludes duplicate setup
-  and destruction charges.
-- `request-*.json`: fixed-snapshot CPU-only comparisons at 1%/5% observed mean
-  relative error, plus an explicitly illustrative memory-weighted comparison.
-
-The default sketch parameters match formal planner sizing for epsilon=0.01, delta=0.01:
-CMS width 272, depth 5; CountSketch width 30,000, depth 83. Input defaults to
-20,000 i64 keys, key-space size 1,000, seed 42; Zipf exponent is 1.1. Actual
-distinct-key counts come from the ground-truth probe population. Errors are
-average absolute relative point-frequency errors over **all distinct keys**.
-They are not error of a total COUNT, or a formal epsilon bound. Aggregate error
-over repeated deterministic inputs does not establish a confidence interval.
-`--sweep` additionally measures CMS widths 512/2720/4096/27200/32768 (depth 5)
-and CountSketch widths 300/3000 (depth 83). The power-of-two CMS widths support
-the backend frequency extension's actual parameter constraints. An offline
-accuracy threshold does not authorize deployment below formal minimum sizes.
-
-Original upstream CPU reports use paired user+system samples and preserve wrapper
-allocation/destruction overhead. The current comparison exporter instead uses
-`resource_probe.rs`, linked to the exact release libraries and jemalloc. It times
-live-state phases separately with `CLOCK_PROCESS_CPUTIME_ID`: empty constructor,
-updates, exact prepare, reads, and sketch merge. Holder allocation and destruction
-are outside the constructor timer; constructors/destructors are outside the other
-phase timers. Queries cover every distinct key ten times against an unchanged
-snapshot, in a reproducible rotated sorted order. The exact implementation is
-the upstream public `PolarsFrequencyCore<i64>`, not a replacement algorithm.
-The model's scope ends with state retained after reading; retirement is excluded
-on both sides. Wall time remains in upstream raw reports and is never called CPU.
-
-`retained_bytes` and `peak_bytes` use the companion `memory_probe.rs`, linked to
-the exact release libraries built by sketch-bench. Its counting System allocator
-measures requested heap allocation bytes across construction and insertion,
-keeping the sketch alive at the final snapshot; input generation is outside
-the measurement. This is independent of allocator-resident pages and does not
-measure jemalloc overhead. Five runs must release every sketch allocation after
-destruction. CPU results come from a separate uninstrumented jemalloc probe.
-The exact heap probe warms Polars twice, then measures construction/ingestion/
-prepare with the exact state alive. Its readings are accepted only when every
-post-destruction allocation balance returns to zero; otherwise the exact footprint
-stays explicitly formula based. `--export-only --refresh-memory` refreshes this
-heap evidence without rerunning or replacing CPU timings.
-Upstream counter-storage formula, process RSS and allocator readings remain in
-raw reports only. The resource probe calls the actual `serialize_to_bytes` API
-and verifies estimate-equivalent deserialization for every input key. It writes
-one snapshot to a fresh local temporary file, flushes it, and records allocated
-blocks times 512 separately from logical byte length; the file is then removed.
-Directory/inode overhead and a runtime write schedule are outside this disk
-measurement. State bytes are never substituted for disk usage. Validity is a
-30-day reproducibility policy, not a statistical claim of future applicability.
-
-The exact baseline inserts the input into a buffer, then `prepare` executes
-Polars group-by/count and creates a HashMap. Reads query that prepared exact
-index. Compare `empty_build + (insert_per_item * N) + prepare + Q * read` with
-sketch `empty_build + (update_per_item * N) + Q * read`. All components use
-disjoint timed regions. A sketch can save state while losing CPU to this exact index.
-These comparisons are offline point-frequency microbenchmarks; they do not
-measure an o11y PromQL query or end-to-end deployed speedup.
-
-`results/` preserves the earlier partial run whose constructor/disk/serialization
-were unknown. `results-sweep/` contains the complete frequency component run;
-its additional probe must not retroactively change the earlier measurements.
diff --git a/tools/empirical-bench/memory_probe.rs b/tools/empirical-bench/memory_probe.rs
deleted file mode 100644
index 7564fbe46..000000000
--- a/tools/empirical-bench/memory_probe.rs
+++ /dev/null
@@ -1,101 +0,0 @@
-//! Counts requested allocation bytes with each sketch alive; input generation is excluded.
-use std::alloc::{GlobalAlloc, Layout, System};
-use std::sync::atomic::{AtomicUsize, Ordering::Relaxed};
-use asap_sketchlib::{Count, CountMin, DataInput, RegularPath, Vector2D};
-
-struct Tracking;
-static LIVE: AtomicUsize = AtomicUsize::new(0);
-static PEAK: AtomicUsize = AtomicUsize::new(0);
-fn account(bytes: usize) {
-    let live = LIVE.fetch_add(bytes, Relaxed) + bytes;
-    PEAK.fetch_max(live, Relaxed);
-}
-unsafe impl GlobalAlloc for Tracking {
-    unsafe fn alloc(&self, layout: Layout) -> *mut u8 {
-        let ptr = unsafe { System.alloc(layout) };
-        if !ptr.is_null() { account(layout.size()); }
-        ptr
-    }
-    unsafe fn alloc_zeroed(&self, layout: Layout) -> *mut u8 {
-        let ptr = unsafe { System.alloc_zeroed(layout) };
-        if !ptr.is_null() { account(layout.size()); }
-        ptr
-    }
-    unsafe fn dealloc(&self, ptr: *mut u8, layout: Layout) {
-        unsafe { System.dealloc(ptr, layout) };
-        LIVE.fetch_sub(layout.size(), Relaxed);
-    }
-    unsafe fn realloc(&self, ptr: *mut u8, layout: Layout, size: usize) -> *mut u8 {
-        let next = unsafe { System.realloc(ptr, layout, size) };
-        if !next.is_null() {
-            if size >= layout.size() { account(size - layout.size()); }
-            else { LIVE.fetch_sub(layout.size() - size, Relaxed); }
-        }
-        next
-    }
-}
-#[global_allocator]
-static ALLOCATOR: Tracking = Tracking;
-
-fn main() {
-    let path = std::env::args().nth(1).expect("raw.json path");
-    let rows: Vec<serde_json::Value> = serde_json::from_slice(&std::fs::read(path).unwrap()).unwrap();
-    let mut results = Vec::new();
-    for row in rows {
-        let description: aqpbm_datagen::TableDescription = serde_json::from_value(row["workload"]["synthetic"]["description"].clone()).unwrap();
-        let items = description.generate().unwrap().into_column(0).unwrap().into_i64().unwrap();
-        if row["impl"] == "polars" {
-            use sketch_bench::wrappers::polars_shared::PolarsFrequencyCore;
-            // Initialize Polars' worker/cache state before attributing bytes to one live index.
-            for _ in 0..2 {
-                let mut warm = PolarsFrequencyCore::<i64>::default();
-                for item in &items { warm.update(item); }
-                warm.finalize();
-            }
-            let mut samples = Vec::with_capacity(5);
-            let mut cleanup_deltas = Vec::with_capacity(5);
-            for _ in 0..5 {
-                let baseline = LIVE.load(Relaxed);
-                PEAK.store(baseline, Relaxed);
-                let mut state = PolarsFrequencyCore::<i64>::default();
-                for item in &items { state.update(item); }
-                state.finalize();
-                std::hint::black_box(&state);
-                let sample = (LIVE.load(Relaxed).saturating_sub(baseline), PEAK.load(Relaxed).saturating_sub(baseline));
-                drop(state);
-                cleanup_deltas.push(LIVE.load(Relaxed) as i64 - baseline as i64);
-                samples.push(sample);
-            }
-            results.push(serde_json::json!({"sketch": row["sketch"], "impl": "polars",
-                "workload": row["workload"], "sketch_config": row["sketch_config"], "samples": samples,
-                "cleanup_deltas": cleanup_deltas,
-                "method": "requested allocation bytes using counting System allocator; exact upstream PolarsFrequencyCore construction + insertion + prepare; state alive; input and two startup warmups excluded; valid only when cleanup deltas are zero; not allocator-resident pages"}));
-            continue;
-        }
-        let depth = row["sketch_config"]["params"]["rows"].as_u64().unwrap() as usize;
-        let width = row["sketch_config"]["params"]["cols"].as_u64().unwrap() as usize;
-        let cms = row["sketch"].as_str().unwrap().starts_with("cms-");
-        let mut samples = Vec::with_capacity(5);
-        for _ in 0..5 {
-            let baseline = LIVE.load(Relaxed);
-            PEAK.store(baseline, Relaxed);
-            // The sketch remains alive at both snapshots, unlike a consuming benchmark closure.
-            let (retained, peak) = if cms {
-                let mut sketch = CountMin::<Vector2D<i32>, RegularPath>::with_dimensions(depth, width);
-                for item in &items { sketch.insert(&DataInput::I64(*item)); }
-                std::hint::black_box(&sketch);
-                (LIVE.load(Relaxed) - baseline, PEAK.load(Relaxed) - baseline)
-            } else {
-                let mut sketch = Count::<Vector2D<i32>, RegularPath>::with_dimensions(depth, width);
-                for item in &items { sketch.insert(&DataInput::I64(*item)); }
-                std::hint::black_box(&sketch);
-                (LIVE.load(Relaxed) - baseline, PEAK.load(Relaxed) - baseline)
-            };
-            assert_eq!(LIVE.load(Relaxed), baseline, "sketch destruction must release its allocations");
-            samples.push((retained, peak));
-        }
-        results.push(serde_json::json!({"sketch": row["sketch"], "impl": "lib", "workload": row["workload"], "sketch_config": row["sketch_config"],
-            "samples": samples, "method": "requested allocation bytes using counting System allocator; construction + insertion; sketch alive; dataset excluded; not allocator-resident pages"}));
-    }
-    println!("{}", serde_json::to_string_pretty(&results).unwrap());
-}
diff --git a/tools/empirical-bench/resource_probe.rs b/tools/empirical-bench/resource_probe.rs
deleted file mode 100644
index e1a176295..000000000
--- a/tools/empirical-bench/resource_probe.rs
+++ /dev/null
@@ -1,138 +0,0 @@
-//! Complements sketch-bench with empty construction CPU and actual persisted snapshot size.
-use std::hint::black_box;
-use std::io::Write;
-use std::os::unix::fs::MetadataExt;
-use asap_sketchlib::{Count, CountMin, DataInput, RegularPath, Vector2D};
-
-#[global_allocator]
-static ALLOCATOR: tikv_jemallocator::Jemalloc = tikv_jemallocator::Jemalloc;
-
-fn cpu_ns() -> u64 {
-    #[repr(C)]
-    struct Timespec { tv_sec: std::os::raw::c_long, tv_nsec: std::os::raw::c_long }
-    extern "C" { fn clock_gettime(clock_id: std::os::raw::c_int, time: *mut Timespec) -> std::os::raw::c_int; }
-    // Linux CLOCK_PROCESS_CPUTIME_ID; this companion also uses Linux allocated blocks.
-    assert!(cfg!(target_os = "linux"));
-    let mut time = Timespec { tv_sec: 0, tv_nsec: 0 };
-    assert_eq!(unsafe { clock_gettime(2, &mut time) }, 0);
-    time.tv_sec as u64 * 1_000_000_000 + time.tv_nsec as u64
-}
-
-fn construction<T>(mut build: impl FnMut() -> T, batch: usize) -> Vec<f64> {
-    let mut samples = Vec::with_capacity(5);
-    for run in 0..7 {
-        let mut alive = Vec::with_capacity(batch);
-        let start = cpu_ns();
-        for _ in 0..batch { alive.push(black_box(build())); }
-        let elapsed = cpu_ns() - start;
-        if run >= 2 { samples.push(elapsed as f64 / batch as f64); }
-        // Empty objects remain alive until after the timed construction batch.
-        black_box(&alive);
-        drop(alive);
-    }
-    samples
-}
-
-fn live_phases<T>(items: &[i64], build: impl Fn() -> T, insert: impl Fn(&mut T, i64),
-                  read: impl Fn(&T, i64) -> f64, prepare: impl Fn(&mut T),
-                  merge: Option<fn(&mut T, &T)>) -> serde_json::Value {
-    let mut keys: Vec<_> = items.iter().copied().collect::<std::collections::BTreeSet<_>>().into_iter().collect();
-    // Fixed rotation avoids sorted probe order without introducing another RNG definition.
-    if !keys.is_empty() { let mid = keys.len() / 2; keys.rotate_left(mid); }
-    let mut updates = Vec::with_capacity(5);
-    let mut prepares = Vec::with_capacity(5);
-    let mut reads = Vec::with_capacity(5);
-    let mut merges = Vec::with_capacity(5);
-    for run in 0..7 {
-        let mut state = build();
-        let start = cpu_ns();
-        for item in items { insert(&mut state, black_box(*item)); }
-        let update = (cpu_ns() - start) as f64 / items.len() as f64;
-        let start = cpu_ns();
-        prepare(&mut state);
-        let prepare = (cpu_ns() - start) as f64;
-        let start = cpu_ns();
-        for _ in 0..10 { for key in &keys { black_box(read(&state, black_box(*key))); } }
-        let query = (cpu_ns() - start) as f64 / (keys.len() * 10) as f64;
-        let merge_time = merge.map(|merge| {
-            let mut other = build();
-            for item in items { insert(&mut other, *item); }
-            let start = cpu_ns();
-            merge(&mut state, &other);
-            (cpu_ns() - start) as f64
-        });
-        if run >= 2 {
-            updates.push(update); prepares.push(prepare); reads.push(query);
-            if let Some(time) = merge_time { merges.push(time); }
-        }
-        black_box(&state);
-    }
-    serde_json::json!({"update_cpu_ns_samples": updates, "prepare_cpu_ns_samples": prepares,
-        "read_cpu_ns_samples": reads, "merge_cpu_ns_samples": merges,
-        "query_distinct_keys": keys.len(), "query_passes": 10,
-        "method": "CLOCK_PROCESS_CPUTIME_ID; live state with constructor/destructor excluded; five runs after two warmups; update per input item; read per all-distinct-key lookup across ten repeated fixed-snapshot probe passes; merge per binary merge; fixed rotated sorted key order"})
-}
-
-fn main() {
-    let args: Vec<String> = std::env::args().collect();
-    let rows: Vec<serde_json::Value> = serde_json::from_slice(&std::fs::read(&args[1]).unwrap()).unwrap();
-    let directory = std::path::Path::new(&args[2]);
-    let mut results = Vec::new();
-    for (index, row) in rows.into_iter().enumerate() {
-        let description: aqpbm_datagen::TableDescription = serde_json::from_value(row["workload"]["synthetic"]["description"].clone()).unwrap();
-        let items = description.generate().unwrap().into_column(0).unwrap().into_i64().unwrap();
-        if row["impl"] == "polars" {
-            use sketch_bench::wrappers::polars_shared::PolarsFrequencyCore;
-            let samples = construction(PolarsFrequencyCore::<i64>::default, 4096);
-            let phases = live_phases(&items, PolarsFrequencyCore::<i64>::default,
-                |s, x| s.update(&x), |s, x| s.query(&x) as f64, |s| s.finalize(), None);
-            results.push(serde_json::json!({"sketch": row["sketch"], "impl": row["impl"],
-                "workload": row["workload"], "sketch_config": row["sketch_config"],
-                "build_cpu_ns_samples": samples, "build_batch": 4096,
-                "phases": phases,
-                "build_method": "process CPU around upstream PolarsFrequencyCore::<i64>::default(); output holder allocation and destruction excluded"}));
-            continue;
-        }
-        let depth = row["sketch_config"]["params"]["rows"].as_u64().unwrap() as usize;
-        let width = row["sketch_config"]["params"]["cols"].as_u64().unwrap() as usize;
-        let batch = (16_000_000 / (depth * width * 4)).clamp(2, 256);
-        let (samples, serialized, phases) = if row["sketch"].as_str().unwrap().starts_with("cms-") {
-            let samples = construction(|| CountMin::<Vector2D<i32>, RegularPath>::with_dimensions(depth, width), batch);
-            let phases = live_phases(&items, || CountMin::<Vector2D<i32>, RegularPath>::with_dimensions(depth, width),
-                |s,x| s.insert(&DataInput::I64(x)), |s,x| s.estimate(&DataInput::I64(x)) as f64, |_| {}, Some(CountMin::<Vector2D<i32>, RegularPath>::merge));
-            let mut sketch = CountMin::<Vector2D<i32>, RegularPath>::with_dimensions(depth, width);
-            for item in &items { sketch.insert(&DataInput::I64(*item)); }
-            let bytes = sketch.serialize_to_bytes().unwrap();
-            let restored = CountMin::<Vector2D<i32>, RegularPath>::deserialize_from_bytes(&bytes).unwrap();
-            for item in &items { assert_eq!(sketch.estimate(&DataInput::I64(*item)), restored.estimate(&DataInput::I64(*item))); }
-            (samples, bytes, phases)
-        } else {
-            let samples = construction(|| Count::<Vector2D<i32>, RegularPath>::with_dimensions(depth, width), batch);
-            let phases = live_phases(&items, || Count::<Vector2D<i32>, RegularPath>::with_dimensions(depth, width),
-                |s,x| s.insert(&DataInput::I64(x)), |s,x| s.estimate(&DataInput::I64(x)), |_| {}, Some(Count::<Vector2D<i32>, RegularPath>::merge));
-            let mut sketch = Count::<Vector2D<i32>, RegularPath>::with_dimensions(depth, width);
-            for item in &items { sketch.insert(&DataInput::I64(*item)); }
-            let bytes = sketch.serialize_to_bytes().unwrap();
-            let restored = Count::<Vector2D<i32>, RegularPath>::deserialize_from_bytes(&bytes).unwrap();
-            for item in &items { assert_eq!(sketch.estimate(&DataInput::I64(*item)), restored.estimate(&DataInput::I64(*item))); }
-            (samples, bytes, phases)
-        };
-        let path = directory.join(format!("snapshot-{index}.msgpack"));
-        let mut file = std::fs::OpenOptions::new().write(true).create_new(true).open(&path).unwrap();
-        file.write_all(&serialized).unwrap();
-        file.sync_all().unwrap();
-        let metadata = file.metadata().unwrap();
-        assert_eq!(metadata.len(), serialized.len() as u64);
-        let disk_bytes = metadata.blocks() * 512;
-        drop(file);
-        std::fs::remove_file(path).unwrap();
-        results.push(serde_json::json!({"sketch": row["sketch"], "impl": row["impl"],
-            "workload": row["workload"], "sketch_config": row["sketch_config"],
-            "build_cpu_ns_samples": samples, "build_batch": batch,
-            "phases": phases,
-            "build_method": "CLOCK_PROCESS_CPUTIME_ID around empty sketch constructors in batched live objects; holder allocation and all destruction excluded; jemalloc; five runs after two warmups",
-            "serialized_bytes": serialized.len(), "disk_bytes": disk_bytes,
-            "disk_method": "actual flushed single MsgPack snapshot file allocated blocks*512 on local temporary filesystem; directory/inode overhead excluded; file removed after measurement; not runtime persistence demand"}));
-    }
-    println!("{}", serde_json::to_string_pretty(&results).unwrap());
-}
diff --git a/tools/empirical-bench/run.py b/tools/empirical-bench/run.py
deleted file mode 100644
index cd56d756c..000000000
--- a/tools/empirical-bench/run.py
+++ /dev/null
@@ -1,367 +0,0 @@
-#!/usr/bin/env python3
-"""Run the real sketch-bench CLI and export offline planner evidence (stdlib only)."""
-import argparse
-import datetime
-import hashlib
-import json
-import math
-import os
-from pathlib import Path
-import platform
-import shlex
-import statistics
-import subprocess
-import tempfile
-
-
-BUILD_PROVENANCE = {
-    "runtime_field_status": "declared build preconditions, not introspected from the executable",
-    "compiler_status": "rustc --version observed on driver host; executable compiler not independently verified",
-    "required_build": "run cargo build --release --locked -p aqpbm-cli from the pinned sketch-bench directory with default features",
-    "declared_settings": "release; repository target-cpu=native; default jemalloc",
-    "verified_execution_setting": "driver sets POLARS_MAX_THREADS=1",
-    "binary_identity": "SHA-256 recorded; digest identifies executable but does not verify build settings",
-}
-
-
-def command(argv, **kwargs):
-    return subprocess.check_output(argv, text=True, **kwargs).strip()
-
-
-def measurement(values):
-    if not values or any(not math.isfinite(x) or x < 0 for x in values):
-        raise ValueError("invalid or missing measurement")
-    return {"value": statistics.mean(values),
-            "stddev": statistics.stdev(values) if len(values) > 1 else None,
-            "samples": len(values)}
-
-
-def cpu_per_op(row, op):
-    """Recover each run's work from paired rate and elapsed samples, as upstream does."""
-    rate = row.get(op + ("_folds_per_sec" if op == "merge" else "_throughput_items_per_sec"))
-    cpu = row.get(op + "_cpu_time_ms")
-    wall = row.get(op + "_wall_time_ms")
-    if not rate or not cpu or not wall:
-        return None
-    samples = [rate["samples"], wall["samples"], cpu["user_ms"]["samples"], cpu["sys_ms"]["samples"]]
-    if len({len(x) for x in samples}) != 1:
-        raise ValueError("unaligned CPU/rate/time samples")
-    values = []
-    for r, elapsed, user, system in zip(*samples):
-        work = r * elapsed / 1000
-        if work <= 0:
-            raise ValueError("zero benchmark work")
-        values.append((user + system) * 1_000_000 / work)
-    result = measurement(values)
-    result["method"] = "mean of paired run (process user+system CPU ns)/(throughput*wall seconds); per " + ("binary merge" if op == "merge" else "input item" if op == "insert" else "point-frequency key lookup")
-    return result
-
-
-def cpu_batch(row, op):
-    cpu = row.get(op + "_cpu_time_ms")
-    if not cpu:
-        return None
-    return measurement([(u + s) * 1_000_000 for u, s in
-                        zip(cpu["user_ms"]["samples"], cpu["sys_ms"]["samples"])])
-
-
-def export(raw, manifest, operation_reports, memory_rows, resource_rows=None):
-    records, baselines = [], []
-    if not (len(raw) == len(manifest["invocations"]) == len(operation_reports)):
-        raise ValueError("misaligned invocation reports")
-    for row, invocation, operations in zip(raw, manifest["invocations"], operation_reports):
-        if row["schema_version"] != 5:
-            raise ValueError("adapter requires sketch-bench schema 5")
-        accuracy = row["query_accuracy"]
-        resource = next((r for r in (resource_rows or []) if r["sketch"] == row["sketch"]
-                        and r["impl"] == row["impl"] and r["sketch_config"] == row["sketch_config"]
-                        and r["workload"] == row["workload"]), None)
-        if resource_rows is not None and (resource is None or "phases" not in resource):
-            raise ValueError("complete comparison requires matched disjoint live-state phase measurements for every record")
-        def phase_metric(phase):
-            return (dict(measurement(resource["phases"][phase + "_cpu_ns_samples"]), method=resource["phases"]["method"])
-                    if resource and resource.get("phases") else None)
-        shape = row["workload"]["synthetic"]["description"]
-        distribution = {"id": invocation["distribution_id"],
-                        "family": invocation["distribution"],
-                        "sample_count": shape["row_num"],
-                        "distinct_count": int(accuracy["probes_all"]),
-                        "parameters": shape["column_spec"][0]["distribution"]}
-        if invocation["algorithm"] == "Exact":
-            exact_memory = next((m for m in memory_rows if m.get("impl") == "polars" and m["workload"] == row["workload"]), None)
-            baselines.append({"distribution": distribution, "implementation": "polars exact group_by + HashMap",
-                              "insert_cpu_ns_per_item": phase_metric("update") or cpu_per_op(row, "insert"),
-                              "prepare_cpu_ns_per_dataset": phase_metric("prepare") or cpu_batch(row, "prepare"),
-                              "read_cpu_ns_per_key": phase_metric("read") or cpu_per_op(row, "query"),
-                              "retained_bytes": max(r["bench"]["memory_bytes"] for r in operations
-                                                    if r["bench"].get("operation") == "query"),
-                              "retained_bytes_method": "upstream prepared-query memory_bytes formula: buffer capacity plus HashMap capacity footprint; not measured allocated heap or peak",
-                              "accuracy": accuracy})
-            baselines[-1]["empty_build_cpu_ns"] = (dict(measurement(resource["build_cpu_ns_samples"]), method=resource["build_method"])
-                                                       if resource else None)
-            if exact_memory and all(delta == 0 for delta in exact_memory["cleanup_deltas"]):
-                baselines[-1]["retained_heap_bytes"] = dict(measurement([s[0] for s in exact_memory["samples"]]), method=exact_memory["method"])
-                baselines[-1]["peak_heap_bytes"] = dict(measurement([s[1] for s in exact_memory["samples"]]), method=exact_memory["method"])
-            continue
-        algorithm = invocation["algorithm"]
-        memory = next(m for m in memory_rows if m["sketch"] == row["sketch"] and m["workload"] == row["workload"]
-                      and (m.get("sketch_config", row["sketch_config"]) == row["sketch_config"]))
-        params = row["sketch_config"]["params"]
-        timestamp = row["insert_timestamp"]
-        if not timestamp.endswith("Z"):
-            raise ValueError("expected upstream UTC timestamp")
-        measured = int(datetime.datetime.fromisoformat(timestamp[:19] + "+00:00").timestamp())
-        environment = dict(manifest["environment"])
-        environment["implementation"] = "asap_sketchlib RegularPath Vector2D"
-        # The algorithm distinguishes families; storage/hash path must also match.
-        environment["id"] = hashlib.sha256(json.dumps(environment, sort_keys=True).encode()).hexdigest()[:16]
-        records.append({"id": invocation["id"], "algorithm": algorithm,
-                        "params": {algorithm: {"width": params["cols"], "depth": params["rows"]}},
-                        "distribution": distribution, "environment": environment,
-                        "measured_at_unix_seconds": measured,
-                        "valid_until_unix_seconds": measured + 30 * 86400,
-                        "provenance": {"command": shlex.join(invocation["argv"]),
-                                       "dataset": "deterministic synthetic i64 frequency stream, seed 42",
-                                       "source_revision": manifest["source_revision"],
-                                       "repetitions": row["runs"]},
-                        "metrics": {"build_cpu_ns": (dict(measurement(resource["build_cpu_ns_samples"]), method=resource["build_method"])
-                                                      if resource else None),
-                                    "update_cpu_ns": phase_metric("update") or cpu_per_op(row, "insert"),
-                                    "merge_cpu_ns": phase_metric("merge") or cpu_per_op(row, "merge"),
-                                    "read_cpu_ns": phase_metric("read") or cpu_per_op(row, "query"),
-                                    "retained_bytes": dict(measurement([float(s[0]) for s in memory["samples"]]), method=memory["method"]),
-                                    "peak_bytes": dict(measurement([float(s[1]) for s in memory["samples"]]), method=memory["method"]),
-                                    "serialized_bytes": (dict(measurement([resource["serialized_bytes"]]), method="actual serialize_to_bytes MsgPack length; estimate-equivalent roundtrip verified for every input key") if resource else None),
-                                    "disk_bytes": (dict(measurement([resource["disk_bytes"]]), method=resource["disk_method"]) if resource else None)},
-                        "error": {"metric": "mean_absolute_relative_frequency_error_all_distinct_keys",
-                                  "mean": accuracy["are_all"], "max": None,
-                                  "trials": int(accuracy.get("accuracy_runs", 1)),
-                                  "ground_truth_method": "exact offline HashMap counts; every distinct key probed",
-                                  "query": {"kind": "point_frequency", "value_type": "i64",
-                                            "accuracy_stddev": accuracy.get("are_all_stddev"),
-                                            "full_accuracy": accuracy}}})
-    return {"schema_version": 1,
-            "benchmark_version": "sketch-bench@" + manifest["source_revision"] + ("; adapter-v2-disjoint" if resource_rows else "; adapter-v1"),
-            "model_version": "empirical-update-cpu-v1", "records": records}, baselines
-
-
-def comparison_artifact(artifact, baselines, manifest):
-    query = {"kind": "point_frequency", "value_type": "i64", "probe_set": "all_distinct_keys"}
-    exact_records = []
-    for baseline in baselines:
-        if baseline["empty_build_cpu_ns"] is None:
-            continue
-        reference = next(r for r in artifact["records"] if r["distribution"] == baseline["distribution"])
-        environment = dict(manifest["environment"])
-        environment["implementation"] = "polars group_by + std HashMap"
-        environment["implementation_version"] = "polars 0.46.0"
-        environment["id"] = hashlib.sha256(json.dumps(environment, sort_keys=True).encode()).hexdigest()[:16]
-        invocation = next(i for i in manifest["invocations"] if i["algorithm"] == "Exact"
-                          and i["distribution_id"] == baseline["distribution"]["id"])
-        exact_records.append({"id": invocation["id"], "distribution": baseline["distribution"],
-                              "environment": environment, "query": query,
-                              "measured_at_unix_seconds": reference["measured_at_unix_seconds"],
-                              "valid_until_unix_seconds": reference["valid_until_unix_seconds"],
-                              "provenance": {"command": shlex.join(invocation["argv"]),
-                                             "dataset": "deterministic synthetic i64 frequency stream, seed 42; exact zero-error comparison verified offline",
-                                             "source_revision": manifest["source_revision"], "repetitions": 5},
-                              "metrics": {"empty_build_cpu_ns": baseline["empty_build_cpu_ns"],
-                                          "update_cpu_ns": baseline["insert_cpu_ns_per_item"],
-                                          "prepare_cpu_ns": baseline["prepare_cpu_ns_per_dataset"],
-                                          "read_cpu_ns": baseline["read_cpu_ns_per_key"],
-                                          "retained_bytes": baseline.get("retained_heap_bytes") or dict(measurement([baseline["retained_bytes"]]), method=baseline["retained_bytes_method"]),
-                                          "peak_bytes": baseline.get("peak_heap_bytes")}})
-    return {"schema_version": 1, "timing_contract": "disjoint_live_state_v1", "sketch_evidence": artifact,
-            "query_bindings": [{"record_id": r["id"], "query": query} for r in artifact["records"]],
-            "exact_records": exact_records}
-
-
-def refresh_memory(bench_repo, raw_path, memory_path):
-    deps = bench_repo.resolve() / "target/release/deps"
-    with tempfile.TemporaryDirectory(prefix="asap-memory-probe-") as temporary:
-        executable = str(Path(temporary) / "memory-probe")
-        argv = ["rustc", "--edition=2021", "-C", "opt-level=3", "-C", "panic=abort", "-C", "target-cpu=native",
-                "-L", f"dependency={deps}", str(Path(__file__).with_name("memory_probe.rs")), "-o", executable]
-        for name in ["asap_sketchlib", "aqpbm_datagen", "serde_json", "sketch_bench"]:
-            candidates = list(deps.glob(f"lib{name}-*.rlib"))
-            if len(candidates) != 1:
-                raise ValueError(f"expected one pinned release library for {name}, got {len(candidates)}")
-            argv += ["--extern", f"{name}={candidates[0]}"]
-        for pattern in ["*/out", "*/out/lib"]:
-            for native in (bench_repo.resolve() / "target/release/build").glob(pattern):
-                argv += ["-L", f"native={native}"]
-        subprocess.check_call(argv)
-        memory_path.write_text(command([executable, str(raw_path)], env=dict(os.environ, POLARS_MAX_THREADS="1")) + "\n")
-    return {"source_sha256": hashlib.sha256(Path(__file__).with_name("memory_probe.rs").read_bytes()).hexdigest(),
-            "compile_argv": argv,
-            "allocator": "System + requested-byte tracking; separate from uninstrumented jemalloc CPU measurements"}
-
-
-def main():
-    parser = argparse.ArgumentParser(description=__doc__)
-    parser.add_argument("--bench-repo", required=True, type=Path)
-    parser.add_argument("--output", required=True, type=Path)
-    parser.add_argument("--size", type=int, default=20000)
-    parser.add_argument("--cardinality", type=int, default=1000)
-    parser.add_argument("--runs", type=int, default=5)
-    parser.add_argument("--sweep", action="store_true", help="measure three widths per frequency family")
-    parser.add_argument("--export-only", action="store_true")
-    parser.add_argument("--refresh-memory", action="store_true", help="with --export-only, remeasure heap without rerunning CPU timings")
-    parser.add_argument("--resume", action="store_true", help="continue a partially completed run with identical parameters")
-    args = parser.parse_args()
-    if args.refresh_memory and not args.export_only:
-        parser.error("--refresh-memory requires --export-only")
-    args.output.mkdir(parents=True, exist_ok=True)
-    manifest_path = args.output / "manifest.json"
-    raw_path = args.output / "raw.json"
-    operations_path = args.output / "operation-reports.json"
-    if args.export_only:
-        manifest, raw = json.loads(manifest_path.read_text()), json.loads(raw_path.read_text())
-        operation_reports = json.loads(operations_path.read_text())
-    else:
-        if (raw_path.exists() or manifest_path.exists()) and not args.resume:
-            parser.error("output already contains a run; use a new directory or --export-only")
-        repo = args.bench_repo.resolve()
-        if 'name = "asap_sketchlib"\nversion = "0.2.2"' not in (repo / "Cargo.lock").read_text():
-            parser.error("adapter is validated with asap_sketchlib 0.2.2; do not relabel another version")
-        binary = repo / "target/release/approxbench"
-        cpu = next((line.split(":", 1)[1].strip() for line in Path("/proc/cpuinfo").read_text().splitlines()
-                    if line.startswith("model name")), platform.processor())
-        manifest = {"source_revision": command(["git", "rev-parse", "HEAD"], cwd=repo),
-                    "source_dirty": bool(command(["git", "status", "--porcelain"], cwd=repo)),
-                    "environment": {"cpu": cpu, "os": platform.platform(),
-                                    "runtime": command(["rustc", "--version"]) + "; release; target-cpu=native; jemalloc; POLARS_MAX_THREADS=1",
-                                    "implementation_version": "asap_sketchlib 0.2.2"},
-                    "binary_sha256": hashlib.sha256(binary.read_bytes()).hexdigest(),
-                    "runtime_provenance": BUILD_PROVENANCE,
-                    "invocations": []}
-        raw, operation_reports = [], []
-        if args.resume:
-            previous = json.loads(manifest_path.read_text())
-            if previous["binary_sha256"] != manifest["binary_sha256"] or previous["environment"] != manifest["environment"]:
-                parser.error("resume requires the same binary and environment")
-            manifest, raw = previous, json.loads(raw_path.read_text())
-            operation_reports = json.loads(operations_path.read_text())
-            for invocation in manifest["invocations"]:
-                argv = invocation["argv"]
-                if any(argv[argv.index(flag) + 1] != str(value) for flag, value in
-                       [("--size", args.size), ("--cardinality", args.cardinality), ("--runs", args.runs)]):
-                    parser.error("resume requires the same size, cardinality, and runs")
-        env = dict(os.environ, POLARS_MAX_THREADS="1")
-        for distribution in ["uniform", "zipf"]:
-            targets = [
-                    ("Cms", "cms-regularpath-vector2d", "lib", 5, 272),
-                    ("CountSketch", "countsketch-regularpath-vector2d", "lib", 83, 30000),
-                    ("Exact", "cms", "polars", 5, 272)]
-            if args.sweep:
-                targets += [("Cms", "cms-regularpath-vector2d", "lib", 5, width) for width in [2720, 27200, 512, 4096, 32768]]
-                targets += [("CountSketch", "countsketch-regularpath-vector2d", "lib", 83, width) for width in [300, 3000]]
-            for algorithm, variant, library, rows, cols in targets:
-                record_id = f"{algorithm.lower()}-{distribution}-seed42" + (f"-w{cols}-d{rows}" if args.sweep else "")
-                if any(i["id"] == record_id for i in manifest["invocations"]):
-                    continue
-                argv = [str(binary), "sketchbench", "--variant", variant, "--library", library,
-                        "--config", f"rows={rows} cols={cols}", "--dataset", distribution,
-                        "--size", str(args.size), "--cardinality", str(args.cardinality),
-                        "--dtype", "i64", "--seed", "42", "--runs", str(args.runs),
-                        "--warmup-runs", "2", "--operations",
-                        "insert,query" if algorithm == "Exact" else "insert,query,merge",
-                        "--metrics", "throughput,cpu,memory"]
-                if distribution == "zipf":
-                    argv += ["--zipf-s", "1.1"]
-                print(shlex.join(argv), flush=True)
-                output = command(argv, env=env)
-                accuracy_argv = list(argv)
-                accuracy_argv[accuracy_argv.index("--operations") + 1] = "query"
-                accuracy_argv[accuracy_argv.index("--metrics") + 1] = "accuracy"
-                output += "\n" + command(accuracy_argv, env=env)
-                prepare_argv = None
-                if algorithm == "Exact":
-                    prepare_argv = list(argv)
-                    prepare_argv[prepare_argv.index("--operations") + 1] = "prepare"
-                    prepare_argv[prepare_argv.index("--metrics") + 1] = "latency,cpu,memory"
-                    output += "\n" + command(prepare_argv, env=env)
-                operations = [json.loads(line) for line in output.splitlines() if line.strip()]
-                row = json.loads(command([str(binary), "flatten"], input=output, env=env))
-                raw.append(row)
-                operation_reports.append(operations)
-                manifest["invocations"].append({"id": record_id,
-                    "distribution_id": f"{distribution}-n{args.size}-c{args.cardinality}-seed42",
-                    "distribution": distribution, "algorithm": algorithm, "argv": argv,
-                    "accuracy_argv": accuracy_argv, "prepare_argv": prepare_argv})
-                raw_path.write_text(json.dumps(raw, indent=2) + "\n")
-                manifest_path.write_text(json.dumps(manifest, indent=2) + "\n")
-                operations_path.write_text(json.dumps(operation_reports, indent=2) + "\n")
-    memory_path = args.output / "memory-probe.json"
-    resources_path = args.output / "resource-probe.json"
-    if not args.export_only:
-        # Older partial runs may lack prepare: CPU/memory alone select no upstream timing pass.
-        for index, (row, invocation) in enumerate(zip(raw, manifest["invocations"])):
-            if invocation["algorithm"] == "Exact" and not row.get("prepare_cpu_time_ms"):
-                prepare_argv = list(invocation["argv"])
-                prepare_argv[prepare_argv.index("--operations") + 1] = "prepare"
-                prepare_argv[prepare_argv.index("--metrics") + 1] = "latency,cpu,memory"
-                output = command(prepare_argv, env=env)
-                operation_reports[index].extend(json.loads(line) for line in output.splitlines() if line.strip())
-                raw[index] = json.loads(command([str(binary), "flatten"],
-                    input="\n".join(json.dumps(r) for r in operation_reports[index]), env=env))
-                invocation["prepare_argv"] = prepare_argv
-        raw_path.write_text(json.dumps(raw, indent=2) + "\n")
-        operations_path.write_text(json.dumps(operation_reports, indent=2) + "\n")
-        deps = args.bench_repo.resolve() / "target/release/deps"
-        manifest["memory_probe"] = refresh_memory(args.bench_repo, raw_path, memory_path)
-        with tempfile.TemporaryDirectory(prefix="asap-resource-probe-") as temporary:
-            executable = str(Path(temporary) / "resource-probe")
-            argv = ["rustc", "--edition=2021", "-C", "opt-level=3", "-C", "panic=abort", "-C", "target-cpu=native",
-                    "-L", f"dependency={deps}", str(Path(__file__).with_name("resource_probe.rs")), "-o", executable]
-            for name in ["asap_sketchlib", "aqpbm_datagen", "serde_json", "tikv_jemallocator", "sketch_bench"]:
-                candidates = list(deps.glob(f"lib{name}-*.rlib"))
-                if len(candidates) != 1:
-                    raise ValueError(f"expected one pinned release library for {name}, got {len(candidates)}")
-                argv += ["--extern", f"{name}={candidates[0]}"]
-            for native in (args.bench_repo.resolve() / "target/release/build").glob("tikv-jemalloc-sys-*/out/lib"):
-                argv += ["-L", f"native={native}"]
-            for native in (args.bench_repo.resolve() / "target/release/build").glob("*/out"):
-                argv += ["-L", f"native={native}"]
-            subprocess.check_call(argv)
-            resources_path.write_text(command([executable, str(raw_path), temporary], env=env) + "\n")
-        manifest["resource_probe"] = {"source_sha256": hashlib.sha256(Path(__file__).with_name("resource_probe.rs").read_bytes()).hexdigest(),
-                                     "compile_argv": argv, "allocator": "jemalloc", "disk_filesystem_path": tempfile.gettempdir()}
-        manifest_path.write_text(json.dumps(manifest, indent=2) + "\n")
-    if args.refresh_memory:
-        if hashlib.sha256((args.bench_repo.resolve() / "target/release/approxbench").read_bytes()).hexdigest() != manifest["binary_sha256"]:
-            parser.error("memory refresh requires the original benchmark binary")
-        manifest["memory_probe"] = refresh_memory(args.bench_repo, raw_path, memory_path)
-    manifest["runtime_provenance"] = BUILD_PROVENANCE
-    manifest_path.write_text(json.dumps(manifest, indent=2) + "\n")
-    artifact, baselines = export(raw, manifest, operation_reports, json.loads(memory_path.read_text()),
-                                json.loads(resources_path.read_text()) if resources_path.exists() else None)
-    (args.output / "planner-evidence.json").write_text(json.dumps(artifact, indent=2) + "\n")
-    (args.output / "exact-baselines.json").write_text(json.dumps(baselines, indent=2) + "\n")
-    if resources_path.exists():
-        comparison = comparison_artifact(artifact, baselines, manifest)
-        (args.output / "comparison-evidence.json").write_text(json.dumps(comparison, indent=2) + "\n")
-        for exact in comparison["exact_records"]:
-            row = next(r for r in artifact["records"] if r["distribution"] == exact["distribution"])
-            for budget, suffix in [(0.01, "001"), (0.05, "005")]:
-                request = {"context": {"distribution": row["distribution"], "environment": row["environment"],
-                                        "now_unix_seconds": max(r["measured_at_unix_seconds"] for r in artifact["records"])},
-                           "exact_environment": exact["environment"], "query": exact["query"],
-                           "accuracy": {"metric": row["error"]["metric"], "max_observed_mean": budget, "minimum_trials": 1},
-                           "workload": {"input_items_per_state": row["distribution"]["sample_count"],
-                                        "reads_per_state": 1000, "merges_per_state": 0, "state_instances": 1, "horizon_seconds": 300.0},
-                           "weights": {"cpu_ns_weight": 1.0, "retained_byte_seconds_weight": 0.0}, "formal_minimums": None}
-                (args.output / ("request-" + row["distribution"]["family"] + "-are" + suffix + ".json")).write_text(json.dumps(request, indent=2) + "\n")
-            request["accuracy"]["max_observed_mean"] = 0.01
-            request["weights"]["retained_byte_seconds_weight"] = 0.01
-            request["formal_minimums"] = [{"algorithm": "Cms", "params": {"Cms": {"width": 512, "depth": 5}}}]
-            (args.output / ("request-" + row["distribution"]["family"] + "-memory-weighted.json")).write_text(json.dumps(request, indent=2) + "\n")
-    for row in artifact["records"]:
-        context = {"distribution": row["distribution"], "environment": row["environment"],
-                   "now_unix_seconds": max(r["measured_at_unix_seconds"] for r in artifact["records"])}
-        (args.output / ("context-" + row["distribution"]["family"] + ".json")).write_text(json.dumps(context, indent=2) + "\n")
-    print(f"Exported {len(artifact['records'])} sketch records and {len(baselines)} exact baselines.")
-
-
-if __name__ == "__main__":
-    main()
diff --git a/tools/empirical-bench/test_export.py b/tools/empirical-bench/test_export.py
deleted file mode 100644
index ab5389b58..000000000
--- a/tools/empirical-bench/test_export.py
+++ /dev/null
@@ -1,51 +0,0 @@
-"""Unit checks for measurement normalization, independent of running the benchmark."""
-import unittest
-
-from run import cpu_per_op, export
-
-
-class NormalizationTests(unittest.TestCase):
-    def test_complete_comparison_rejects_missing_live_phase_measurements(self):
-        """An old constructor-only probe cannot label consuming-wrapper CPU as disjoint."""
-        row = {"schema_version": 5, "query_accuracy": {}, "sketch": "cms", "impl": "lib",
-               "sketch_config": {}, "workload": {}}
-        manifest = {"invocations": [{}]}
-        for resources in [[], [dict(row, build_cpu_ns_samples=[1.0])]]:
-            with self.subTest(resources=resources):
-                with self.assertRaisesRegex(ValueError, "disjoint live-state"):
-                    export([row], manifest, [[]], [], resources)
-
-    def test_partial_report_files_are_rejected_before_pairing(self):
-        """A truncated report file must fail rather than silently lose invocations."""
-        for raw, invocations, operations in [([{}], [], []), ([], [{}], []), ([], [], [{}])]:
-            with self.subTest(lengths=(len(raw), len(invocations), len(operations))):
-                with self.assertRaisesRegex(ValueError, "misaligned invocation reports"):
-                    export(raw, {"invocations": invocations}, operations, [])
-
-    def test_cpu_normalizes_paired_work_not_wall_time(self):
-        """Different wall durations for identical work must not change the denominator."""
-        row = {"query_throughput_items_per_sec": {"samples": [2000, 1000]},
-               "query_wall_time_ms": {"samples": [100, 200]},
-               "query_cpu_time_ms": {"user_ms": {"samples": [20, 20]},
-                                     "sys_ms": {"samples": [10, 10]}}}
-        result = cpu_per_op(row, "query")
-        self.assertEqual(result["value"], 150000)
-        self.assertEqual(result["stddev"], 0)
-        self.assertEqual(result["samples"], 2)
-
-    def test_unmeasured_cpu_is_not_zero(self):
-        """Missing CPU evidence stays absent instead of looking like free work."""
-        self.assertIsNone(cpu_per_op({}, "query"))
-
-    def test_misaligned_samples_rejected(self):
-        """CPU and rates from different run populations cannot be paired."""
-        row = {"insert_throughput_items_per_sec": {"samples": [2000, 1000]},
-               "insert_wall_time_ms": {"samples": [100]},
-               "insert_cpu_time_ms": {"user_ms": {"samples": [20, 20]},
-                                      "sys_ms": {"samples": [10, 10]}}}
-        with self.assertRaises(ValueError):
-            cpu_per_op(row, "insert")
-
-
-if __name__ == "__main__":
-    unittest.main()
diff --git a/tools/erp-figure1/README.md b/tools/erp-figure1/README.md
deleted file mode 100644
index 700c27540..000000000
--- a/tools/erp-figure1/README.md
+++ /dev/null
@@ -1,54 +0,0 @@
-# ERP Figure 1 runner
-
-`run.py` is the experiment boundary for the five Figure 1 arms:
-
-1. `autosketch_per_query`
-2. `planner_analytical`
-3. `planner_erp`
-4. `asap_no_sharing`
-5. `exact`
-
-The manifest pins a dataset SHA-256 and one candidate space, memory budget,
-accuracy requirement, window workload, multi-family `ErpShapeObservation`, and
-the complete fit/divergence/confidence selection policy from ASAPPlanner #380.
-Each arm runs in a separate process.
-The runner measures wall time, user/system CPU, and peak RSS with GNU `time`;
-the arm reports its selected plan, selected candidate records, retained state
-bytes, measured error, and any additional metrics. The runner checks that every
-selected candidate belongs to the common space and that non-exact arms meet the
-total memory and accuracy bounds. A successful arm must echo the exact contract from
-`ASAP_FIGURE1_CONTRACT_JSON`; the dataset path is supplied in
-`ASAP_FIGURE1_DATASET`. Contract drift aborts the experiment rather than
-producing a comparison.
-
-The observation must contain positive cardinality/event counts and one or more
-unique fitted families. Every fit records numeric parameters, non-negative
-goodness-of-fit, and confidence in `[0,1]`. The shared selection policy includes
-event/cardinality/parameter gates plus maximum goodness-of-fit, minimum
-confidence, and minimum confidence margin. This keeps poor or ambiguous fits
-visible to every arm instead of letting the ERP arm silently use an older
-single-family shape contract.
-
-```sh
-python3 tools/erp-figure1/run.py \
-  --manifest /path/to/immutable-figure1-manifest.json \
-  --output /path/to/new-results.json
-python3 -m unittest tools/erp-figure1/test_run.py -v
-```
-
-Each command must print one JSON object:
-
-```json
-{
-  "contract": {"the exact object supplied in ASAP_FIGURE1_CONTRACT_JSON": true},
-  "selected_plan": {"family": "cms", "width": 1024, "depth": 5},
-  "selected_candidates": [{"family": "cms", "width": 1024, "depth": 5}],
-  "metrics": {"state_bytes": 40960, "max_error": 0.007},
-  "provenance": {"revision": "..."}
-}
-```
-
-The runner does not contain sketch, Planner, or AutoSketch implementations. The
-arm commands must invoke those production/reference implementations. Failed
-arms remain in the output and make the command fail. Do not publish a Figure 1
-from smoke adapters or from arms that merely relabel a fixed CLI configuration.
diff --git a/tools/erp-figure1/run.py b/tools/erp-figure1/run.py
deleted file mode 100644
index f022129dd..000000000
--- a/tools/erp-figure1/run.py
+++ /dev/null
@@ -1,169 +0,0 @@
-#!/usr/bin/env python3
-"""Run five isolated ERP evaluation arms under one immutable contract."""
-import argparse, hashlib, json, os, pathlib, subprocess, tempfile, time
-
-ARM_NAMES = ["autosketch_per_query", "planner_analytical", "planner_erp", "asap_no_sharing", "exact"]
-REQUIRED_METRICS = {"state_bytes", "max_error"}
-
-
-def canonical(value):
-    return json.dumps(value, sort_keys=True, separators=(",", ":"), allow_nan=False)
-
-
-def sha256_file(path):
-    digest = hashlib.sha256()
-    with open(path, "rb") as source:
-        for chunk in iter(lambda: source.read(1024 * 1024), b""):
-            digest.update(chunk)
-    return digest.hexdigest()
-
-
-def validate_manifest(manifest, root):
-    if manifest.get("schema_version") != 1:
-        raise ValueError("unsupported manifest schema_version")
-    dataset = manifest["dataset"]
-    path = (root / dataset["path"]).resolve() if not pathlib.Path(dataset["path"]).is_absolute() else pathlib.Path(dataset["path"])
-    actual = sha256_file(path)
-    if actual != dataset["sha256"]:
-        raise ValueError(f"dataset checksum mismatch: expected {dataset['sha256']}, got {actual}")
-    constraints = manifest["constraints"]
-    for key in (
-        "candidate_space", "memory_budget_bytes", "accuracy", "window",
-        "erp_observation", "erp_selection_policy",
-    ):
-        if key not in constraints:
-            raise ValueError(f"missing common constraint {key}")
-    if constraints["memory_budget_bytes"] <= 0 or not constraints["candidate_space"]:
-        raise ValueError("candidate space and memory budget must be non-empty/positive")
-    validate_erp_contract(constraints["erp_observation"], constraints["erp_selection_policy"])
-    arms = manifest["arms"]
-    if [arm.get("name") for arm in arms] != ARM_NAMES:
-        raise ValueError(f"arms must be ordered exactly as {ARM_NAMES}")
-    if any(not isinstance(arm.get("command"), list) or not arm["command"] for arm in arms):
-        raise ValueError("every arm requires a non-empty argv command")
-    return path, actual, constraints
-
-
-def validate_erp_contract(observation, policy):
-    if observation.get("cardinality", 0) <= 0 or observation.get("observed_events", 0) <= 0:
-        raise ValueError("ERP observation cardinality/events must be positive")
-    fits = observation.get("fits")
-    if not isinstance(fits, list) or not fits:
-        raise ValueError("ERP observation requires at least one fitted family")
-    families = set()
-    for fit in fits:
-        family = fit.get("family")
-        if not isinstance(family, str) or not family or family in families:
-            raise ValueError("ERP fit families must be unique and non-empty")
-        families.add(family)
-        parameters = fit.get("parameters")
-        goodness, confidence = fit.get("goodness_of_fit"), fit.get("confidence")
-        if not isinstance(parameters, dict) or any(not isinstance(v, (int, float)) for v in parameters.values()):
-            raise ValueError("ERP fit parameters must be numeric")
-        if not isinstance(goodness, (int, float)) or goodness < 0:
-            raise ValueError("ERP goodness_of_fit must be non-negative")
-        if not isinstance(confidence, (int, float)) or not 0 <= confidence <= 1:
-            raise ValueError("ERP confidence must be within [0,1]")
-    fingerprint = observation.get("empirical_fingerprint")
-    if fingerprint is not None and (not isinstance(fingerprint, str) or not fingerprint):
-        raise ValueError("ERP empirical_fingerprint must be absent or non-empty")
-    required = {
-        "minimum_benchmark_events", "max_log2_cardinality_distance",
-        "max_parameter_distance", "max_goodness_of_fit", "minimum_confidence",
-        "minimum_confidence_margin",
-    }
-    if required - set(policy):
-        raise ValueError(f"ERP selection policy missing {sorted(required - set(policy))}")
-    if policy["minimum_benchmark_events"] <= 0:
-        raise ValueError("ERP minimum benchmark events must be positive")
-    for key in ("max_log2_cardinality_distance", "max_parameter_distance", "max_goodness_of_fit"):
-        if not isinstance(policy[key], (int, float)) or policy[key] < 0:
-            raise ValueError(f"ERP {key} must be non-negative")
-    for key in ("minimum_confidence", "minimum_confidence_margin"):
-        if not isinstance(policy[key], (int, float)) or not 0 <= policy[key] <= 1:
-            raise ValueError(f"ERP {key} must be within [0,1]")
-
-
-def validate_result(name, result, expected_contract, candidate_space):
-    if result.get("contract") != expected_contract:
-        raise ValueError(f"{name} did not execute the identical evaluation contract")
-    missing = REQUIRED_METRICS - set(result.get("metrics", {}))
-    if missing or "selected_plan" not in result or "selected_candidates" not in result:
-        raise ValueError(f"{name} result missing selection/metrics: {sorted(missing)}")
-    selected = result["selected_candidates"]
-    if not isinstance(selected, list) or (name != "exact" and not selected):
-        raise ValueError(f"{name} must report selected candidate records")
-    legal = {canonical(candidate) for candidate in candidate_space}
-    if any(canonical(candidate) not in legal for candidate in selected):
-        raise ValueError(f"{name} selected a candidate outside the common space")
-    metrics = result["metrics"]
-    state_bytes, error = metrics["state_bytes"], metrics["max_error"]
-    if not isinstance(state_bytes, int) or state_bytes < 0 or not isinstance(error, (int, float)):
-        raise ValueError(f"{name} reported invalid state/error metrics")
-    if name != "exact" and state_bytes > expected_contract["memory_budget_bytes"]:
-        raise ValueError(f"{name} exceeded the common memory budget")
-    accuracy = expected_contract["accuracy"]
-    if accuracy.get("metric") != "max_error" or "upper_bound" not in accuracy:
-        raise ValueError("accuracy contract must define max_error upper_bound")
-    if error > accuracy["upper_bound"]:
-        raise ValueError(f"{name} violated the common accuracy constraint")
-
-
-def run_arm(arm, expected_contract, candidate_space, cwd, dataset_path=None):
-    with tempfile.NamedTemporaryFile(prefix="asap-figure1-time-", delete=False) as timing:
-        timing_path = timing.name
-    argv = ["/usr/bin/time", "-f", '{"user_seconds":%U,"system_seconds":%S,"peak_rss_kb":%M}', "-o", timing_path, "--"] + arm["command"]
-    started = time.monotonic_ns()
-    env = os.environ.copy()
-    env["ASAP_FIGURE1_CONTRACT_JSON"] = canonical(expected_contract)
-    if dataset_path is not None:
-        env["ASAP_FIGURE1_DATASET"] = str(dataset_path)
-    proc = subprocess.run(argv, cwd=cwd, capture_output=True, text=True, env=env)
-    wall_ns = time.monotonic_ns() - started
-    try:
-        timing_lines = pathlib.Path(timing_path).read_text().splitlines()
-        resources = json.loads(timing_lines[-1])
-    finally:
-        pathlib.Path(timing_path).unlink(missing_ok=True)
-    record = {"name": arm["name"], "command": arm["command"], "exit_code": proc.returncode,
-              "measured_resources": {**resources, "wall_seconds": wall_ns / 1e9}}
-    if proc.returncode:
-        record.update({"status": "failed", "stderr": proc.stderr})
-        return record
-    result = json.loads(proc.stdout)
-    validate_result(arm["name"], result, expected_contract, candidate_space)
-    record.update({"status": "completed", "selected_plan": result["selected_plan"],
-                   "metrics": result["metrics"], "provenance": result.get("provenance", {})})
-    return record
-
-
-def main():
-    parser = argparse.ArgumentParser(description=__doc__)
-    parser.add_argument("--manifest", required=True, type=pathlib.Path)
-    parser.add_argument("--output", required=True, type=pathlib.Path)
-    args = parser.parse_args()
-    if args.output.exists():
-        parser.error("output already exists")
-    manifest_path = args.manifest.resolve(); root = manifest_path.parent
-    manifest = json.loads(manifest_path.read_text())
-    dataset_path, dataset_sha, constraints = validate_manifest(manifest, root)
-    candidate_sha = hashlib.sha256(canonical(constraints["candidate_space"]).encode()).hexdigest()
-    contract = {"dataset_sha256": dataset_sha, "candidate_space_sha256": candidate_sha,
-                "memory_budget_bytes": constraints["memory_budget_bytes"],
-                "accuracy": constraints["accuracy"], "window": constraints["window"],
-                "erp_observation": constraints["erp_observation"],
-                "erp_selection_policy": constraints["erp_selection_policy"]}
-    report = {"schema_version": 1, "manifest_sha256": hashlib.sha256(canonical(manifest).encode()).hexdigest(),
-              "dataset": {"path": str(dataset_path), "sha256": dataset_sha}, "contract": contract,
-              "host": {"uname": list(os.uname())}, "arms": []}
-    for arm in manifest["arms"]:
-        report["arms"].append(
-            run_arm(arm, contract, constraints["candidate_space"], root, dataset_path)
-        )
-    args.output.parent.mkdir(parents=True, exist_ok=True)
-    with open(args.output, "x") as sink:
-        json.dump(report, sink, indent=2); sink.write("\n")
-    if any(row["status"] != "completed" for row in report["arms"]):
-        raise SystemExit(1)
-
-if __name__ == "__main__": main()
diff --git a/tools/erp-figure1/test_run.py b/tools/erp-figure1/test_run.py
deleted file mode 100644
index 72ca17313..000000000
--- a/tools/erp-figure1/test_run.py
+++ /dev/null
@@ -1,48 +0,0 @@
-import hashlib, importlib.util, json, pathlib, tempfile, unittest
-P=pathlib.Path(__file__).with_name('run.py'); S=importlib.util.spec_from_file_location('runner',P); R=importlib.util.module_from_spec(S); S.loader.exec_module(R)
-class ContractTests(unittest.TestCase):
- def manifest(self, root):
-  data=root/'data.tsv'; data.write_text('0\t1\n'); sha=hashlib.sha256(data.read_bytes()).hexdigest()
-  contract={'candidate_space':[{'family':'cms','width':64,'depth':2}],'memory_budget_bytes':1024,'accuracy':{'metric':'max_error','upper_bound':0.01},'window':{'pane_seconds':60,'window_panes':[1,5]},
-   'erp_observation':{'cardinality':20,'observed_events':1000,'fits':[{'family':'zipf','parameters':{'exponent':1.1},'goodness_of_fit':0.03,'confidence':0.9}],'empirical_fingerprint':'fixture-v1'},
-   'erp_selection_policy':{'minimum_benchmark_events':100,'max_log2_cardinality_distance':1.0,'max_parameter_distance':0.2,'max_goodness_of_fit':0.1,'minimum_confidence':0.8,'minimum_confidence_margin':0.1}}
-  arms=[{'name':n,'command':['true']} for n in R.ARM_NAMES]
-  return {'schema_version':1,'dataset':{'path':'data.tsv','sha256':sha},'constraints':contract,'arms':arms}
- def test_accepts_one_shared_contract(self):
-  with tempfile.TemporaryDirectory() as d: R.validate_manifest(self.manifest(pathlib.Path(d)),pathlib.Path(d))
- def test_rejects_dataset_drift(self):
-  with tempfile.TemporaryDirectory() as d:
-   root=pathlib.Path(d); m=self.manifest(root); (root/'data.tsv').write_text('changed')
-   with self.assertRaisesRegex(ValueError,'checksum mismatch'): R.validate_manifest(m,root)
- def test_rejects_missing_or_reordered_arm(self):
-  with tempfile.TemporaryDirectory() as d:
-   root=pathlib.Path(d); m=self.manifest(root); m['arms'].reverse()
-   with self.assertRaisesRegex(ValueError,'ordered exactly'): R.validate_manifest(m,root)
- def test_rejects_ambiguous_or_invalid_fit_contract(self):
-  with tempfile.TemporaryDirectory() as d:
-   root=pathlib.Path(d); m=self.manifest(root)
-   m['constraints']['erp_observation']['fits'].append(dict(m['constraints']['erp_observation']['fits'][0]))
-   with self.assertRaisesRegex(ValueError,'unique'): R.validate_manifest(m,root)
-   m=self.manifest(root); m['constraints']['erp_observation']['fits'][0]['confidence']=1.1
-   with self.assertRaisesRegex(ValueError,'confidence'): R.validate_manifest(m,root)
- def test_rejects_arm_contract_drift(self):
-  with tempfile.TemporaryDirectory() as d:
-   root=pathlib.Path(d); script=root/'arm.py'; script.write_text("import json; print(json.dumps({'contract':{},'selected_plan':{},'metrics':{'state_bytes':0,'max_error':0}}))")
-   with self.assertRaisesRegex(ValueError,'identical evaluation contract'): R.run_arm({'name':'exact','command':['python3',str(script)]},{'x':1},[],root)
- def test_failed_arm_keeps_resources_and_stderr(self):
-  with tempfile.TemporaryDirectory() as d:
-   row=R.run_arm({'name':'planner_erp','command':['python3','-c','import sys; print("bad", file=sys.stderr); sys.exit(3)']},
-                 {'memory_budget_bytes':1,'accuracy':{'metric':'max_error','upper_bound':0}},[],pathlib.Path(d))
-   self.assertEqual((row['status'],row['exit_code']),('failed',3))
-   self.assertIn('bad',row['stderr']); self.assertIn('peak_rss_kb',row['measured_resources'])
- def test_rejects_out_of_space_over_budget_or_inaccurate_selection(self):
-  contract={'memory_budget_bytes':100,'accuracy':{'metric':'max_error','upper_bound':0.01}}
-  base={'contract':contract,'selected_plan':{},'selected_candidates':[{'id':'a'}],
-        'metrics':{'state_bytes':10,'max_error':0.0}}
-  R.validate_result('planner_erp',base,contract,[{'id':'a'}])
-  for field,value,pattern in [('candidate',None,'outside'),('state_bytes',101,'memory'),('max_error',0.02,'accuracy')]:
-   row=json.loads(json.dumps(base))
-   if field=='candidate': row['selected_candidates']=[{'id':'b'}]
-   else: row['metrics'][field]=value
-   with self.assertRaisesRegex(ValueError,pattern): R.validate_result('planner_erp',row,contract,[{'id':'a'}])
-if __name__=='__main__': unittest.main()
diff --git a/tools/o11y-execution/CALIBRATION.md b/tools/o11y-execution/CALIBRATION.md
deleted file mode 100644
index cefa91fec..000000000
--- a/tools/o11y-execution/CALIBRATION.md
+++ /dev/null
@@ -1,125 +0,0 @@
-# Measured CPU cost provider
-
-This developer workflow prices whole candidates in CPU nanoseconds. Memory and
-storage remain separate resource measurements; they are not converted to CPU
-with arbitrary weights. The provider never chooses a winner. The control plane
-compares its complete quotes and installs the selected artifact.
-
-1. `discover_snapshot.py --corpus CORPUS --metrics METRICS --template
-   docs/examples/asapquery-planning-snapshot.json --output DISCOVERY` registers
-   every unique original query with exact accuracy. `--interval-ms` is an
-   explicitly declared experimental demand (default 60 seconds). The bounded logical cost horizon is `--repetitions` (default 20) times that
-   interval; it is separate from input timestamps and measured wall time.
-   Duplicate corpus occurrences increase their registered query frequency, so
-   the manifest accounts for all 28 occurrences, not merely 24 unique strings. Provenance preserves input hashes and source counts.
-   This discovery snapshot contains an **uncalibrated unit enumeration seed**,
-   not cost evidence; version 3 with no quotes cannot deploy it.
-2. Run `calibration_candidates DISCOVERY`. It calls the control plane and Planner,
-   and exports every bindable candidate with its manifest and install request.
-   Errors remain in the output. These artifacts are solely for calibration.
-3. Measure each candidate in a fresh isolated backend, including its exact service
-   if used. Feed the complete original input and execute every original query.
-   Record installation, ingestion/build/update, residency, and retirement CPU,
-   and each query's inclusive process CPU over enough repetitions to exceed the
-   operating system's accounting resolution. Validate correctness and record
-   `warm`, `hybrid`, `exact_fallback`, or failure. Record memory and storage separately.
-   Retain all raw artifacts. Do not reuse calibration timings as the independent
-   held-out performance evaluation.
-4. Run `update_global_profile.py --snapshot DISCOVERY --measurements MEASUREMENTS
-   --sample-count COUNT --output PROFILE` to replace discovery evidence with a
-   conservative shared CPU-only measured profile. Network/scan zero fields are
-   explicitly excluded model dimensions, not measured zero traffic. Re-export the
-   candidates, and ensure their implementation/manifests match what was measured.
-   The snapshot currently has one shared implementation model, so this is a
-   coarse global model; complete candidate quotes carry measured whole costs.
-5. Supply measurements to `calibrate.py --candidates CANDIDATES --measurements
-   MEASUREMENTS --metrics METRICS --snapshot SNAPSHOT --output COSTED_SNAPSHOT`.
-   The output includes a separate attribution audit. Run the normal control-plane
-   compiler on this costed snapshot, then perform an independent evaluation.
-
-Measurement JSON uses this structure (numbers below describe fields, not quotes):
-
-- `compiler_identity`: the exact backend and pinned Planner revisions used to
-  export and execute the candidate. Candidate export, measurement, and cost
-  evidence must agree; a stale binary fails before quote matching.
-- `units`: `cpu_ns`; `data_snapshot_id`: `sha256:` followed by the input file hash.
-- `candidates`: one record per measured `plan_id`, with the exact `manifest`,
-  `executable`, and matching `horizon_seconds`.
-- Each record's `horizon_phases` has `install`, `ingest_and_build`, `residency`,
-  and `retirement`, each containing measured `cpu_ns` and `raw_measurement_file`.
-- Each record's `queries` maps every manifest query ID to `cpu_ns`, `evaluations`,
-  `classification`, `correct`, and `raw_measurement_file`.
-- Optional `resources` preserves separately measured memory and storage.
-
-Inclusive horizon CPU is assigned once to the first horizon component, and
-inclusive per-query CPU once to the first component for that query. Other
-components explicitly receive zero **because their work is included in that
-measured total**, not because state update, output, or fallback is free. The
-attribution audit records these groups. Missing measurements make a candidate
-unavailable; failed or incorrect execution cannot obtain an executable quote.
-This is attribution of inclusive measured costs, not individual operator timing.
-
-The backend currently exposes its Planner-selected forest and a whole-workload
-exact alternative. This workflow does not claim exhaustive algorithm or lifecycle
-search, and its unit discovery seed can influence which forest becomes available.
-A calibrated comparison is only between the candidates actually exported.
-
-## VictoriaMetrics and readout-specific checks
-
-Use `calibration_candidates SNAPSHOT --metricsql` and
-`compile_workload_artifact SNAPSHOT --metricsql` to compile the shared parser
-subset through the existing MetricsQL serving path. This preserves language-tagged
-query entries and exact edges; do not change an emitted install artifact by hand.
-`BackendLocalPlanningSnapshot::compile_metricsql()` exposes the same operation.
-
-`calibrate_runtime.py --victoriametrics BINARY` starts a fresh VictoriaMetrics
-fallback instead of Prometheus. Ingestion and drain use the normal backend port;
-queries use `--metricsql-port`. `--exact-cache-bytes` controls VictoriaMetrics cache
-allocation, not process RSS. Record the binary version, cache budget and CPU set.
-`--disable-result-cache` sets VictoriaMetrics `-search.disableCache` (including
-its use through backend exact edges) and sends `nocache=1` to both query endpoints, so repeated
-identical timestamps measure query execution instead of the exact server's result
-cache. Declare that policy in the comparison report.
-
-A corpus occurrence may contain `accuracy_validation` with a `metric` and
-`bound`. Supported validation units are `relative`, `absolute_bits`, and `exact`
-(the last requires zero bound). In particular, entropy absolute bits cannot
-borrow a relative tolerance. A rank-error contract needs a rank oracle and is
-intentionally rejected by this scalar comparison helper; do not use value error
-to certify KLL rank accuracy. Native unsupported exact functions remain failed
-comparisons and cannot obtain an executable cost quote.
-
-For offline UnivMon error evidence, `cargo run --release -p data_plane --example
-univmon_erp_artifact -- samples.jsonl` measures two-pane merged readouts on the
-first ten source populations. It requires equal observed shapes; differing
-populations must be calibrated separately. The tool retains samples offline,
-records observed maxima and serialized state bytes, and does not measure CPU or
-calibrate a failure probability. Use a zero CPU objective weight for that artifact;
-whole-candidate CPU comes from the independent runtime calibration above. Keep
-held-out source populations and performance runs separate from these training
-populations. This tool does not select a plan.
-
-For the finite integer-valued distinct study, the offline artifact tool measures
-HLL precisions 10, 12, and 14 as a predeclared grid, alongside the UnivMon grid.
-It uses the first ten source series and shifts their values by 1e12 into a disjoint
-hash namespace; inputs outside its documented integer domain are rejected. The
-held-out query uses groups 3–9 with original values. Neither a training maximum
-nor HLL's theoretical relative standard error is a probabilistic per-query error
-bound. The held-out 5% target remains fixed, and failed configurations stay in the
-measurement history. A second optional argument writes the actual observed shape
-for bounded ERP matching. CPU fields in this offline artifact remain excluded;
-production process calibration measures CPU separately.
-
-Finite VictoriaMetrics replays call `/internal/force_flush` once after ingestion
-and charge it to build CPU. Accepted imports may otherwise remain invisible to
-queries for several seconds. This is a test barrier, not a production ingestion
-policy; see the [VictoriaMetrics forced-flush contract](https://docs.victoriametrics.com/victoriametrics/#forced-flush).
-
-`measure_native_exact.py` runs a separate fresh VictoriaMetrics process with no
-backend proxy. Use the same input, query corpus, CPU affinity, cache budget and
-cache policy as the candidate run. It records native query latencies, process
-CPU/RSS, lifecycle CPU and storage after shutdown. Report backend-only analytical
-resources separately from the candidate's combined backend + fallback service;
-retaining an exact service does not make its raw storage or memory disappear.
-Visibility validation scans can warm native data caches, so the first reported
-request is a first workload query after validation, not a cold-storage query.
diff --git a/tools/o11y-execution/README.md b/tools/o11y-execution/README.md
deleted file mode 100644
index 46a10e662..000000000
--- a/tools/o11y-execution/README.md
+++ /dev/null
@@ -1,186 +0,0 @@
-# Real-workload execution replay
-
-Developer acceptance tooling. A completed run does not establish a benefit.
-It invokes the **control-plane compiler**, which calls the pinned Planner,
-then boots the production data plane with that compiler's atomic install request.
-No family override, candidate index, or benchmark-selected winner is accepted.
-
-## Inputs and prerequisites
-
-- Original timestamped o11ybench OpenMetrics data. The strict numeric subset
-  preserves names, labels and finite values; seconds become Remote Write
-  milliseconds without rounding. Unsupported lines fail before any writes.
-- A JSON corpus with `upstream_revision` and `queries`, preserving every upstream
-  occurrence: `{id, query, eval_timestamp_ms}` (additional provenance is retained).
-  Export the pinned upstream task queries, not the historical 27-query fixture.
-  Provide generator revision, command and seed separately; a file hash cannot
-  establish that provenance.
-- A canonical **version 3** planning snapshot registering exactly the corpus's
-  unique queries and containing valid complete-workload provider cost evidence.
-  Collect evidence using `workload_cost_manifest`; keep calibration inputs and
-  evaluation inputs distinct. Do not reuse the demo snapshot's declared costs.
-  The harness does not invent registrations, cost quotes or unsupported bindings.
-- A dedicated, empty Prometheus instance with its Remote Write receiver enabled,
-  configured for the input's timestamp range. This process is also the fallback
-  service; do not point the runner at a production/shared instance.
-
-The lower-level `replay.py` uses externally managed Prometheus processes.
-`run_comparison.py` provisions fresh baseline and fallback processes for each
-trial. See [CALIBRATION.md](CALIBRATION.md) for measured cost evidence; calibration
-enumerates candidates, while the replay compiler chooses the winner normally.
-
-## Run
-
-```sh
-cargo build --locked -p control_plane --example compile_workload_artifact
-cargo build --locked -p data_plane --bin data_plane
-python3 tools/o11y-execution/replay.py \
-  --metrics /path/metrics.txt --queries /path/queries.json \
-  --snapshot /path/o11y-costed-snapshot.json \
-  --compiler target/debug/examples/compile_workload_artifact \
-  --data-plane target/debug/data_plane \
-  --exact-url http://127.0.0.1:9090 --output /path/new-run
-python3 -m unittest discover -s tools/o11y-execution -v
-```
-
-Use an unused backend port (`--port`, default 18089). The output directory must
-not exist. The runner validates all samples, compiles the supplied workload,
-records candidates/selected plan/costs, starts its own backend, sends identical
-Remote Write batches to both services, and queries every corpus occurrence at its
-original evaluation time. It stops only the backend process it started. Partial
-ingest is journaled without automatic retries: restart with fresh services and a
-new output directory after investigating a failure.
-
-`planning.json` contains the envelope, cost comparison, lifecycle estimates and
-install request. `installed.json` records runtime status. `queries.json` preserves
-every response, occurrence ID, timing and `warm`, `hybrid`, `exact_fallback` or `failed`
-classification. Forwarded responses carry a backend-owned `x-asap-execution`
-header; an unmarked success is not counted as warm or fallback. `ingestion.json`
-records accepted batches; acceptance does not prove worker completion.
-
-`execution_provenance` distinguishes summary-only `asap`, `hybrid`, and
-`external_exact`, and records summary readouts and Prometheus exact-subquery
-requests. Hybrid execution has its own top-level classification; `exact_fallback`
-means the whole query ran externally. A typed residual DAG can retain selected summary
-siblings, but a particular corpus may still produce no materializations.
-
-The runner waits for the finite-input completion barrier. The first traversal is
-called `first_pass`, not “cold cache”; later traversals are `repeat`. All failures
-and fallback responses remain in the denominator. A completion file means the
-replay finished, **not** that accuracy or benefit acceptance passed.
-
-## Matched exact comparison
-
-Add `--compare --exact-pid PID` to the same command. PID must identify the local
-Prometheus serving `--exact-url`; verify that association before running. If it is
-remote, omit PID: exact-service CPU and memory stay unavailable. The runner never
-stops this externally managed process. Prometheus must have the same data and
-evaluation range; both endpoints receive identical encoded sample batches.
-
-Every occurrence is queried against both endpoints with identical PromQL and
-time, alternating request order. Results are matched by full label set and sample
-timestamp, not row order. `comparison.json` reports missing/extra series and
-samples, completeness, absolute/relative error, zero-denominator mismatches,
-failures, first-pass/repeat latency distributions and sequential service rate.
-Duplicate series, failed responses, unsupported response types and warnings make
-a result uncomparable. Matching one dataset is not a formal confidence guarantee.
-
-The latency ratio is emitted only when **all** matched responses pass the recorded
-comparison and succeed. Tolerances default to zero; explicit absolute/relative
-tolerances preserve strict equality and raw errors alongside the decision. These
-numeric tolerances do not establish a sketch's accuracy guarantee. Fallbacks
-remain in the totals. The ratio measures query service time only, never amortized
-end-to-end savings. Raw per-request timings allow other analyses without hiding
-the unsuccessful portion of the workload.
-
-Linux process counters are captured around HTTP calls and at startup, ingestion
-and query boundaries. Backend calls also record exact-service CPU when available,
-so forwarded work is visible. Ingestion journal timings and phase snapshots expose
-the construction/update interval, including the finite-input drain. Counters
-include background work and have CPU-tick resolution. RSS/HWM are **whole-process**
-memory, not summary heap; HWM is process-lifetime peak, not isolated phase peak.
-`store.json` preserves the backend's raw state counters. `--cpu-affinity` applies
-one CPU set to the backend and supplied Prometheus processes/threads.
-`--address-space-bytes` applies the same RLIMIT_AS, which limits virtual address
-space, not RSS or combined process memory. These controls are optional and their
-presence is recorded; they do not establish a full cgroup resource budget.
-
-Use `--fallback-url` and `--fallback-pid` for a separate fresh Prometheus instance,
-keeping `--exact-url`/`--exact-pid` for the baseline. Identical process IDs and
-storage paths are rejected. Both receive identical input batches. Backend CPU
-includes its fallback service CPU; baseline CPU remains separate. With no
-separate fallback service, the report preserves the shared-cache limitation.
-`--exact-storage` and `--fallback-storage` record logical file sizes separately;
-backend output file sizes include logs and are not retained summary heap sizes.
-
-`summarize.py` compares estimated and measured query CPU only after verifying the
-CPU model, data hash, selected manifest and priced query multiplicities. It
-excludes lifecycle components from that ratio. Full lifecycle benefit remains
-unavailable until matching setup, update, residency and retirement measurements
-exist. A shared fallback/baseline service can transfer cache warmth; alternating
-order does not eliminate this confound.
-
-## Fresh repeated trials
-
-```sh
-python3 tools/o11y-execution/run_comparison.py \
-  --prometheus /path/prometheus \
-  --metrics /path/metrics.txt --queries /path/queries.json \
-  --snapshot /path/o11y-costed-snapshot.json \
-  --compiler target/release/examples/compile_workload_artifact \
-  --data-plane target/release/data_plane \
-  --cpu-affinity 4,5 --trials 3 --repetitions 20 \
-  --output /path/new-trials
-python3 tools/o11y-execution/summarize.py /path/new-trials/trial-1/replay \
-  --output /path/new-trials/trial-1/summary.json
-```
-
-Each trial uses new empty TSDB directories and three distinct ports. The wrapper
-records commands and Prometheus startup/lifetime resources, then stops its own
-services. `backend-lifecycle.json` records backend lifetime CPU and peak RSS using
-per-PID `wait4`. Process exit is not a summary-retirement measurement. Fresh
-processes do not imply evicted OS caches, fixed memory quotas, or a concurrent
-throughput test. Every repetition preserves the original evaluation timestamps;
-this run does not simulate a live dashboard's advancing query windows.
-
-## Finite-input completion
-
-After all Remote Write batches are accepted, the runner calls
-`POST /api/v1/precompute/drain` and saves `drain.json`. The receiver seals input
-before worker barriers are queued. Each worker publishes its trailing panes,
-then acknowledges completion; prior processing or sink failures remain failures
-on repeated drains. Queries begin only after a successful completion response.
-Subsequent Remote Write requests return HTTP 409 for that process. Start a new
-backend process for another input generation.
-
-This endpoint is for a finite replay, not a live ingestion watermark. Closing a
-trailing pane does not by itself prove its coverage matches every query window;
-unsupported or incomplete readouts must still follow exact fallback. Typed raw
-residual plans prepare their raw index during drain so setup costs remain visible.
-
-### Fixed-time and advancing-window repetition sweep
-
-`query_sweep.py` runs fresh paired trials for 1, 5, 20 and 100 evaluations,
-first at fixed timestamps and then at advancing timestamps over identical
-preloaded input. It accepts the same binary/input/snapshot arguments as
-`run_comparison.py`, plus `--scope full_upstream_corpus` or
-`--scope derived_subquery_child` and `--advance-step-ms 60000`. Advancing grids
-end at the original evaluation timestamp; the launcher rejects grids outside
-the actual input span. This measures moving query windows, not continuous ingestion.
-
-Keep the original 28-occurrence corpus regression separate from any derived
-subquery-child experiment. A derived query needs a matching registered workload
-and separately calibrated snapshot. The sweep never edits quotes or supplies a
-winning artifact: each fresh process invokes normal selection. The selected
-snapshot's declared cost horizon stays fixed, so sweeping repetition counts
-measures amortization rather than cost-optimal reselection at each count.
-
-The sweep uses `--batch-resources`: CPU probes occur before queries, after the
-first pass, and after repeats. Per-request latency, actual execution provenance
-and paired correctness are retained without per-RPC `/proc` sampling or repeated
-JSON writes. `query-batch-resources.json` retains raw counters; measurements below
-ten CPU ticks are marked low resolution, and zero ticks never mean free work.
-`sweep-summary.json` separates first-pass/repeat query CPU from setup, all input
-updates/build, and setup+updates+queries. Backend totals include its dedicated
-fallback and planning CPU. First pass means a fresh process, not an evicted OS
-cache; retirement and continuously updated input are outside these totals.
diff --git a/tools/o11y-execution/calibrate.py b/tools/o11y-execution/calibrate.py
deleted file mode 100644
index 17ec9eada..000000000
--- a/tools/o11y-execution/calibrate.py
+++ /dev/null
@@ -1,117 +0,0 @@
-#!/usr/bin/env python3
-"""Turn isolated, inclusive candidate CPU measurements into complete cost quotes.
-
-This provider selects no winner. All candidate measurements include backend and
-its exact service, when used. Horizon CPU includes installation, raw ingestion,
-state building/updating, residency and retirement. Query CPU includes every
-operator, fallback, and response encoding. Inclusive totals are attributed once;
-zero entries mean subsumed work, never an assertion of free execution. Memory
-and storage remain separately reported quantities, not invented CPU conversions.
-"""
-import argparse
-import hashlib
-import json
-import math
-from pathlib import Path
-
-
-def nonnegative(value, name):
-    if isinstance(value, bool) or not isinstance(value, (int, float)) or not math.isfinite(value) or value < 0:
-        raise ValueError(f"{name} must be finite nonnegative measured CPU nanoseconds")
-    return value
-
-
-def digest(path):
-    return hashlib.sha256(Path(path).read_bytes()).hexdigest()
-
-
-def calibrate(candidates, measurements, data_snapshot_id, observed_at_unix_ms, valid_for_ms):
-    identity = candidates.get("compiler_identity")
-    if not identity or measurements.get("compiler_identity") != identity:
-        raise ValueError("candidate and measurement compiler identities differ or are missing")
-    if measurements.get("units") != "cpu_ns" or measurements.get("data_snapshot_id") != data_snapshot_id:
-        raise ValueError("measurement units or data identity mismatch")
-    by_id = {}
-    for row in measurements["candidates"]:
-        key = row["plan_id"]
-        if key in by_id:
-            raise ValueError("duplicate measured candidate")
-        by_id[key] = row
-    quotes, attribution, unavailable = [], [], []
-    for artifact in candidates["candidates"]:
-        if "manifest" not in artifact:
-            unavailable.append(artifact)
-            continue
-        manifest = artifact["manifest"]
-        pid = manifest["plan_id"]
-        measured = by_id.get(pid)
-        if not measured or not measured.get("executable"):
-            unavailable.append({"plan_id": pid, "reason": (measured or {}).get("unavailable_reason", "not measured")})
-            continue
-        if measured.get("manifest") != manifest:
-            raise ValueError(f"candidate {pid}: measured manifest differs")
-        if measured.get("horizon_seconds") != manifest["horizon_seconds"]:
-            raise ValueError(f"candidate {pid}: measured horizon differs")
-        required_phases = {"install", "ingest_and_build", "residency", "retirement"}
-        phases = measured.get("horizon_phases", {})
-        if set(phases) != required_phases:
-            raise ValueError(f"candidate {pid}: incomplete horizon phases")
-        horizon_cpu = sum(nonnegative(phases[p]["cpu_ns"], p) for p in required_phases)
-        if any(not phases[p].get("raw_measurement_file") for p in required_phases):
-            raise ValueError("each phase requires a raw measurement artifact")
-        costs = {key: 0.0 for key in manifest["components"]}
-        horizon_keys = sorted(k for k, v in manifest["components"].items() if v["unit"] == "horizon")
-        if not horizon_keys:
-            raise ValueError("no horizon component for inclusive setup/upkeep CPU")
-        costs[horizon_keys[0]] = horizon_cpu
-        allocation = {horizon_keys[0]: {"inclusive_of": horizon_keys, "cpu_ns": horizon_cpu}}
-        query_measurements = measured.get("queries", {})
-        if set(query_measurements) != set(manifest["workload"]):
-            raise ValueError(f"candidate {pid}: incomplete query execution coverage")
-        for qid in manifest["workload"]:
-            row = query_measurements[qid]
-            count = row["evaluations"]
-            if isinstance(count, bool) or not isinstance(count, int) or count <= 0:
-                raise ValueError("query evaluation count must be positive")
-            if row.get("classification") not in ("warm", "hybrid", "exact_fallback") or not row.get("correct"):
-                raise ValueError(f"candidate {pid}: {qid} failed execution/correctness validation")
-            if not row.get("raw_measurement_file"):
-                raise ValueError("each query requires a raw measurement artifact")
-            keys = sorted(k for k in costs if k.startswith(f"query:{qid}:") or k == f"result:{qid}")
-            if not keys or any(manifest["components"][k]["unit"] != "query_evaluation" for k in keys):
-                raise ValueError("missing per-query components")
-            cpu = nonnegative(row["cpu_ns"], qid) / count
-            costs[keys[0]] = cpu
-            allocation[keys[0]] = {"inclusive_of": keys, "cpu_ns_per_evaluation": cpu}
-        quotes.append({"manifest": manifest, "executable": True, "unit_costs": costs})
-        attribution.append({"plan_id": pid, "allocation": allocation,
-                            "resources": measured.get("resources"),
-                            "scope": "backend plus any exact fallback service; complete inclusive CPU; memory/storage reported separately"})
-    return ({**identity, "data_snapshot_id": data_snapshot_id, "model_version": "measured-inclusive-cpu-ns-v1",
-             "observed_at_unix_ms": observed_at_unix_ms, "valid_for_ms": valid_for_ms, "quotes": quotes},
-            {"attribution": attribution, "unavailable": unavailable})
-
-
-def main():
-    parser = argparse.ArgumentParser(description=__doc__)
-    parser.add_argument("--candidates", type=Path, required=True)
-    parser.add_argument("--measurements", type=Path, required=True)
-    parser.add_argument("--metrics", type=Path, required=True)
-    parser.add_argument("--snapshot", type=Path, required=True)
-    parser.add_argument("--output", type=Path, required=True)
-    args = parser.parse_args()
-    snapshot = json.loads(args.snapshot.read_text())
-    if snapshot.get("snapshot_version") != 3:
-        raise ValueError("snapshot_version 3 with explicit dataset identity is required")
-    evidence, audit = calibrate(json.loads(args.candidates.read_text()), json.loads(args.measurements.read_text()),
-                                "sha256:" + digest(args.metrics), snapshot["environment"]["observed_at_unix_ms"],
-                                snapshot["environment"]["max_evidence_age_ms"])
-    snapshot["workload_cost_evidence"] = evidence
-    args.output.write_text(json.dumps(snapshot, indent=2, allow_nan=False) + "\n")
-    args.output.with_suffix(".calibration.json").write_text(json.dumps(audit, indent=2, allow_nan=False) + "\n")
-    if not evidence["quotes"]:
-        raise SystemExit("no completely measured executable candidates; audit saved, selection must fail closed")
-
-
-if __name__ == "__main__":
-    main()
diff --git a/tools/o11y-execution/calibrate_runtime.py b/tools/o11y-execution/calibrate_runtime.py
deleted file mode 100644
index 7b263db7c..000000000
--- a/tools/o11y-execution/calibrate_runtime.py
+++ /dev/null
@@ -1,425 +0,0 @@
-#!/usr/bin/env python3
-"""Measure unselected candidate artifacts in isolated backend/fallback processes.
-
-This produces calibration observations, never selection overrides. Accelerated
-input replay is explicitly distinct from a wall-clock deployment horizon.
-"""
-import argparse
-import hashlib
-import json
-import math
-import os
-from pathlib import Path
-import resource
-import subprocess
-import time
-import urllib.parse
-
-import replay as runner
-from compare import compare_results, process_delta, process_snapshot
-
-
-def input_inventory(path):
-    counts, last = {}, {}
-    first = None
-    with path.open() as stream:
-        for labels, _, timestamp in runner.iter_samples(stream):
-            key = tuple(sorted(labels.items()))
-            counts[key] = counts.get(key, 0) + 1
-            last[key] = max(last.get(key, timestamp), timestamp)
-            first = timestamp if first is None else min(first, timestamp)
-    return counts, last, first, max(last.values())
-
-
-def verify_vm_visibility(url, inventory, folder):
-    counts, last, first, end = inventory
-    expected = [counts, {key: timestamp / 1000 for key, timestamp in last.items()}]
-    attempts = []
-    deadline = time.monotonic() + 60
-    while True:
-        valid = True
-        for index, function in enumerate(("count_over_time", "tlast_over_time")):
-            query = function + '({__name__!=""}[' + str(end - first + 1) + 'ms]) keep_metric_names'
-            response = runner._http_request(url + "/api/v1/query?" + urllib.parse.urlencode({"query":query,"time":end/1000,"nocache":1}))
-            rows = response["response"].get("data", {}).get("result", [])
-            actual = {tuple(sorted(row["metric"].items())): float(row["value"][1]) for row in rows}
-            matched = response["http_status"] == 200 and actual == expected[index]
-            attempts.append({"query":query,"matched":matched,**response})
-            valid = valid and matched
-        if valid or time.monotonic() >= deadline:
-            runner.write_json(folder / "exact-visibility.json", {"complete":valid,"attempts":attempts})
-            if not valid:
-                raise RuntimeError("VictoriaMetrics input counts/last timestamps are incomplete")
-            return
-        time.sleep(.1)
-
-
-def wait_ready(url, child):
-    deadline = time.monotonic() + 60
-    while time.monotonic() < deadline:
-        if child.poll() is not None:
-            raise RuntimeError(f"process exited {child.returncode}: {url}")
-        if runner._http_request(url)["http_status"] == 200:
-            return
-        time.sleep(.1)
-    raise RuntimeError(f"readiness timeout: {url}")
-
-
-def snapshots(children):
-    return {name: process_snapshot(child.pid) for name, child in children.items()}
-
-
-def phase(folder, name, before, after, elapsed_ns):
-    deltas = {key: process_delta(before.get(key), after.get(key)) for key in before}
-    if not all(value is not None for value in deltas.values()):
-        raise RuntimeError(f"unreadable process counters in {name}")
-    raw = folder / f"phase-{name}.json"
-    runner.write_json(raw, {"before": before, "after": after, "deltas": deltas, "wall_ns": elapsed_ns})
-    return {"cpu_ns": sum(value["cpu_ns"] for value in deltas.values()), "raw_measurement_file": str(raw.resolve())}
-
-
-def file_bytes(root):
-    return sum(path.stat().st_size for path in root.rglob("*") if path.is_file())
-
-
-def exact_service_command(args, folder, port):
-    if getattr(args, "victoriametrics", None):
-        command = [str(args.victoriametrics.resolve()),
-                f"-storageDataPath={(folder / 'exact-data').resolve()}",
-                f"-httpListenAddr=127.0.0.1:{port}", "-retentionPeriod=1y",
-                f"-memory.allowedBytes={args.exact_cache_bytes}"]
-        if args.disable_result_cache:
-            command.append("-search.disableCache")
-        return command
-    config = folder / "prometheus.yml"
-    config.write_text('global:\n  scrape_interval: 1h\nscrape_configs: []\n')
-    return [str(args.prometheus.resolve()), f"--config.file={config.resolve()}",
-            f"--storage.tsdb.path={(folder / 'exact-data').resolve()}",
-            f"--web.listen-address=127.0.0.1:{port}", "--web.enable-remote-write-receiver",
-            "--storage.tsdb.retention.time=1000000h"]
-
-
-def query_parameters(occurrence, disable_cache):
-    params = {"query": occurrence["query"], "time": f'{occurrence["eval_timestamp_ms"] / 1000:.3f}'}
-    if disable_cache:
-        params["nocache"] = "1"
-    return urllib.parse.urlencode(params)
-
-
-def comparison_tolerances(occurrence, args):
-    contract = occurrence.get("accuracy_validation")
-    if contract is None:
-        return args.relative_tolerance, args.absolute_tolerance
-    bound = contract.get("bound")
-    if not isinstance(bound, (float, int)) or not math.isfinite(bound) or bound < 0:
-        raise ValueError("invalid per-query accuracy bound")
-    metric = contract.get("metric")
-    if metric == "relative":
-        return bound, 0.0
-    if metric == "absolute_bits":
-        return 0.0, bound
-    if metric == "exact" and bound == 0:
-        return 0.0, 0.0
-    raise ValueError("unsupported per-query accuracy metric")
-
-
-def measure(args, artifact, corpus, snapshot, folder):
-    folder.mkdir()
-    manifest = artifact["manifest"]
-    row = {"plan_id": manifest["plan_id"], "manifest": manifest, "executable": False,
-           "horizon_seconds": manifest["horizon_seconds"], "horizon_phases": {}, "queries": {}}
-    children, logs = {}, []
-    cpus = {int(value) for value in args.cpu_affinity.split(",")}
-    def limits():
-        os.sched_setaffinity(0, cpus)
-    def launch(name, command):
-        log = (folder / f"{name}.log").open("w")
-        logs.append(log)
-        child = subprocess.Popen(command, stdout=log, stderr=subprocess.STDOUT, preexec_fn=limits)
-        children[name] = child
-        return child
-    fallback = f"http://127.0.0.1:{args.fallback_port}"
-    backend = f"http://127.0.0.1:{args.backend_port}"
-    install = folder / "install.json"
-    runner.write_json(install, artifact["install_request"])
-    query_backend = f"http://127.0.0.1:{args.metricsql_port}" if args.victoriametrics else backend
-    children_cpu_before = resource.getrusage(resource.RUSAGE_CHILDREN)
-    try:
-        start = time.perf_counter_ns()
-        prom = launch("fallback", exact_service_command(args, folder, args.fallback_port))
-        wait_ready(fallback + ("/health" if args.victoriametrics else "/-/ready"), prom)
-        command = [str(args.data_plane.resolve()), "--profile", "asapquery", "--physical-plan", str(install.resolve()),
-                   "--prometheus-server", fallback, "--forward-unsupported-queries", "--http-port", str(args.backend_port),
-                   "--output-dir", str((folder / "backend-data").resolve()), "--precompute-allowed-lateness-ms", "0",
-                   "--precompute-flush-interval-ms", "25"]
-        if args.victoriametrics:
-            command += ["--victoriametrics-url", fallback, "--victoriametrics-http-port", str(args.metricsql_port)]
-        dp = launch("backend", command)
-        wait_ready(backend + "/api/v1/health", dp)
-        after = snapshots(children)
-        # Fresh processes: cumulative CPU from exec includes all install/startup work.
-        raw = folder / "phase-install.json"
-        runner.write_json(raw, {"after": after, "wall_ns": time.perf_counter_ns() - start})
-        row["horizon_phases"]["install"] = {"cpu_ns": sum(v["cpu_ns"] for v in after.values()), "raw_measurement_file": str(raw.resolve())}
-        before, start = after, time.perf_counter_ns()
-        runner.PROCESS_IDS.clear()
-        runner.PROCESS_IDS.update({"backend": dp.pid, "fallback_service": prom.pid})
-        runner.ingest_sample_file(args.metrics, [fallback, backend], folder)
-        drained = runner.request(backend + "/api/v1/precompute/drain", b"")
-        runner.write_json(folder / "drain.json", drained)
-        if drained["http_status"] != 200 or drained["response"].get("complete") is not True:
-            raise RuntimeError("precompute drain did not complete")
-        if args.victoriametrics:
-            # Finite replay barrier, charged to build: imported samples may still
-            # be buffered and invisible to queries after the write is accepted.
-            flushed = runner._http_request(fallback + "/internal/force_flush")
-            runner.write_json(folder / "exact-flush.json", flushed)
-            if flushed["http_status"] != 200:
-                raise RuntimeError("VictoriaMetrics finite replay flush failed")
-            verify_vm_visibility(fallback, args.input_inventory, folder)
-        after = snapshots(children)
-        row["horizon_phases"]["ingest_and_build"] = phase(folder, "ingest_and_build", before, after, time.perf_counter_ns() - start)
-        before, start = after, time.perf_counter_ns()
-        time.sleep(args.residency_seconds)
-        after = snapshots(children)
-        row["horizon_phases"]["residency"] = phase(folder, "residency", before, after, time.perf_counter_ns() - start)
-        original_by_id = {f"compat-query-{i}": entry["query"] for i, entry in enumerate(snapshot["query_workload"]["repeating_queries"])}
-        for qid in manifest["workload"]:
-            occurrences = [q for q in corpus["queries"] if q["query"] == original_by_id[qid]]
-            if not occurrences:
-                raise RuntimeError(f"no original corpus occurrences for {qid}")
-            exact = {}
-            records, before, start = [], snapshots(children), time.perf_counter_ns()
-            repeat = 0
-            measured_cpu = 0
-            while repeat < args.repetitions or (measured_cpu < args.minimum_query_cpu_ns and repeat < args.max_repetitions):
-                for occurrence in occurrences:
-                    params = query_parameters(occurrence, args.disable_result_cache)
-                    answer = runner._http_request(query_backend + "/api/v1/query?" + params)
-                    if occurrence["id"] not in exact:
-                        exact[occurrence["id"]] = runner._http_request(args.reference_url.rstrip("/") + "/api/v1/query?" + params)
-                    reference = exact[occurrence["id"]]
-                    route = runner.classify(answer["response"], answer["headers"]) if answer["http_status"] == 200 else "failed"
-                    comparison = compare_results(answer["response"], reference["response"], *comparison_tolerances(occurrence, args))
-                    records.append({**occurrence, "repetition": repeat, "execution": route,
-                                    "execution_provenance": runner.execution_provenance(answer["response"], answer["headers"]), **answer,
-                                    "exact": reference, "comparison": comparison})
-                repeat += 1
-                if repeat % 10 == 0 or repeat >= args.repetitions:
-                    current = snapshots(children)
-                    measured_cpu = sum(current[key]["cpu_ns"] - before[key]["cpu_ns"] for key in before)
-            after = snapshots(children)
-            query_phase = phase(folder, "query-" + qid, before, after, time.perf_counter_ns() - start)
-            raw = folder / f"queries-{qid}.json"
-            runner.write_json(raw, records)
-            validate_membership_filter_execution(artifact, records)
-            routes = {record["execution"] for record in records}
-            correct = all(record["comparison"]["equal"] and record["exact"]["http_status"] == 200 for record in records)
-            row["queries"][qid] = {"cpu_ns": query_phase["cpu_ns"], "evaluations": len(records),
-                "classification": next(iter(routes)) if len(routes) == 1 else "mixed", "correct": correct,
-                "raw_measurement_file": str(raw.resolve()), "resource_measurement_file": query_phase["raw_measurement_file"],
-                "cpu_resolution_censored": query_phase["cpu_ns"] < args.minimum_query_cpu_ns}
-        state = runner.request(backend + "/api/v1/store/metrics")
-        runner.write_json(folder / "store.json", state)
-        final = snapshots(children)
-        row["resources"] = {"peak_memory_bytes": sum(v["process_lifetime_peak_rss_bytes"] for v in final.values()),
-                            "storage_bytes": file_bytes(folder / "exact-data") + file_bytes(folder / "backend-data"),
-                            "backend_state": state, "processes": final, "source_scan_bytes": None, "network_bytes": None,
-                            "residency_wall_seconds": args.residency_seconds,
-                            "scope": "accelerated finite-input replay; no extrapolation of short idle residency to logical data horizon; process HWM sum is conservative"}
-        before_total = sum(v["cpu_ns"] for v in final.values())
-        for child in children.values():
-            child.terminate()
-        for child in children.values():
-            child.wait(timeout=None if args.wait_for_completion else 30)
-        row["resources"]["storage_before_shutdown_bytes"] = row["resources"]["storage_bytes"]
-        row["resources"]["storage_after_shutdown"] = {
-            "exact_bytes": file_bytes(folder / "exact-data"),
-            "backend_bytes": file_bytes(folder / "backend-data"),
-        }
-        row["resources"]["storage_bytes"] = sum(row["resources"]["storage_after_shutdown"].values())
-        usage = resource.getrusage(resource.RUSAGE_CHILDREN)
-        total_cpu = int((usage.ru_utime + usage.ru_stime - children_cpu_before.ru_utime - children_cpu_before.ru_stime) * 1e9)
-        retirement = folder / "phase-retirement.json"
-        runner.write_json(retirement, {"wait4_children_cpu_ns": total_cpu, "proc_before_retirement_cpu_ns": before_total,
-                                      "note": "difference includes /proc tick rounding; nonnegative clamp below tick resolution"})
-        row["horizon_phases"]["retirement"] = {"cpu_ns": max(0, total_cpu - before_total), "raw_measurement_file": str(retirement.resolve())}
-        invalid = [qid for qid, q in row["queries"].items() if not q["correct"] or q["classification"] not in ("warm", "hybrid", "exact_fallback") or q["cpu_resolution_censored"]]
-        if invalid:
-            row["unavailable_reason"] = "failed/mixed/incorrect or CPU below measurement resolution: " + ",".join(invalid)
-        else:
-            row["executable"] = True
-    except Exception as error:
-        row["unavailable_reason"] = str(error)
-    finally:
-        for child in children.values():
-            if child.poll() is None:
-                if args.wait_for_completion:
-                    child.terminate()
-                else:
-                    child.kill()
-                child.wait()
-        for log in logs:
-            log.close()
-        runner.PROCESS_IDS.clear()
-        runner.write_json(folder / "measurement.json", row)
-    return row
-
-
-
-def _membership_filter_inputs(nodes, root):
-    bindings, visiting, visited = set(), set(), set()
-    def visit(node_id):
-        node_id = str(node_id)
-        if node_id in visiting:
-            raise ValueError("MembershipFilter input DAG contains a cycle")
-        if node_id in visited:
-            return
-        if node_id not in nodes:
-            raise ValueError(f"MembershipFilter input DAG references missing node {node_id}")
-        visiting.add(node_id)
-        node = nodes[node_id]
-        if node.get("op") == "exact_fallback":
-            raise ValueError("MembershipFilter input contains ExactFallback")
-        if node.get("op") == "read_materialization":
-            bindings.add(str(node["binding"]["materialization"]))
-        children = [str(value) for value in node.get("inputs", [])]
-        if "input" in node:
-            children.append(str(node["input"]))
-        for child in children:
-            visit(child)
-        visiting.remove(node_id)
-        visited.add(node_id)
-    visit(root)
-    return bindings
-
-
-def validate_membership_filter_artifact(artifact):
-    """Reject MembershipFilter plans whose membership sidecar is not locally installed."""
-    request = artifact.get("install_request", {})
-    schemas = {str(row["materialization"]): row for row in request.get("precompute_plan", {}).get("schemas", [])}
-    modes = set()
-    for entry in request.get("query_plan", {}).get("entries", {}).values():
-        nodes = entry.get("nodes", {})
-        for node in nodes.values():
-            if node.get("op") != "membership_filter":
-                continue
-            inputs = node.get("inputs", [])
-            if len(inputs) != 2:
-                raise ValueError("MembershipFilter requires membership and exact-value inputs")
-            membership_bindings = _membership_filter_inputs(nodes, inputs[0])
-            value_bindings = _membership_filter_inputs(nodes, inputs[1])
-            heap_bindings = []
-            for materialization in membership_bindings:
-                schema = schemas.get(materialization)
-                family = json.dumps((schema or {}).get("family", {}), sort_keys=True)
-                if "CmsWithHeap" in family or "CountSketchWithHeap" in family:
-                    heap_bindings.append(materialization)
-            if not heap_bindings:
-                raise ValueError("MembershipFilter membership input has no installed heap materialization")
-            value_node = nodes.get(str(inputs[1]), {})
-            operator = value_node.get("operator", {}) if value_node.get("op") == "logical" else {}
-            if operator.get("kind") == "candidate_exact_subquery":
-                modes.add("candidate_filtered_exact")
-                if value_node.get("inputs") != [inputs[0]]:
-                    raise ValueError("candidate exact input must be the shared membership node")
-                if not operator.get("query") or not operator.get("item_label"):
-                    raise ValueError("candidate exact operator lacks query or item label")
-                heap_families = [json.dumps(row.get("family", {}), sort_keys=True)
-                                 for row in schemas.values()]
-                if sum("CmsWithHeap" in family or "CountSketchWithHeap" in family
-                       for family in heap_families) != 1 or len(heap_bindings) != 1:
-                    raise ValueError("candidate-filtered TopK requires exactly one installed heap materialization")
-                if any("exact" in family.lower() and any(kind in family.lower()
-                       for kind in ("counter", "rate", "increase")) for family in heap_families):
-                    raise ValueError("candidate-filtered TopK must not install an ExactCounter materialization")
-            else:
-                modes.add("local_exact")
-                if not any("exact" in json.dumps((schemas.get(mid) or {}).get("family", {})).lower()
-                           and any(kind in json.dumps((schemas.get(mid) or {}).get("family", {})).lower()
-                                   for kind in ("counter", "rate", "increase"))
-                           for mid in value_bindings):
-                    raise ValueError("MembershipFilter value input has no installed ExactCounter materialization")
-    return modes
-
-
-def validate_membership_filter_execution(artifact, records):
-    modes = validate_membership_filter_artifact(artifact)
-    if not modes:
-        return
-    if len(modes) != 1:
-        raise ValueError("mixed MembershipFilter execution contracts are not calibratable together")
-    mode = next(iter(modes))
-    for record in records:
-        provenance = record.get("execution_provenance", {})
-        if provenance.get("raw_scan_evaluations", 0) not in (0, None):
-            raise ValueError("MembershipFilter execution used a forbidden local raw scan")
-        if mode == "candidate_filtered_exact":
-            if record.get("execution") != "hybrid" or provenance.get("detail") != "hybrid":
-                raise ValueError("candidate-filtered TopK did not report hybrid execution")
-            expected = {"summary_readout_evaluations": 1, "exact_subquery_rpcs": 1,
-                        "exact_subquery_evaluations": 1, "exact_branch_evaluations": 1}
-            for key, value in expected.items():
-                if provenance.get(key) != value:
-                    raise ValueError(f"candidate-filtered TopK has invalid provenance: {key}")
-        else:
-            if record.get("execution") != "warm" or provenance.get("detail") not in (None, "asap"):
-                raise ValueError("local MembershipFilter execution was not warm")
-            for key in ("exact_subquery_rpcs", "exact_subquery_evaluations", "exact_branch_evaluations"):
-                if provenance.get(key, 0) != 0:
-                    raise ValueError(f"MembershipFilter execution used exact path: {key}")
-            if provenance.get("summary_readout_evaluations", 0) < 2:
-                raise ValueError("MembershipFilter execution did not read both summary branches")
-
-
-def main():
-    parser = argparse.ArgumentParser(description=__doc__)
-    for name in ["candidates", "metrics", "queries", "snapshot", "data-plane", "output"]:
-        parser.add_argument("--" + name, type=Path, required=True)
-    engines = parser.add_mutually_exclusive_group(required=True)
-    engines.add_argument("--prometheus", type=Path)
-    engines.add_argument("--victoriametrics", type=Path)
-    parser.add_argument("--metricsql-port", type=int, default=19212)
-    parser.add_argument("--exact-cache-bytes", type=int, default=268435456, help="VictoriaMetrics cache budget, not an RSS limit")
-    parser.add_argument("--disable-result-cache", action="store_true", help="send nocache=1 to both query endpoints")
-    parser.add_argument("--reference-url", required=True, help="separate already-loaded exact Prometheus using identical input")
-    parser.add_argument("--cpu-affinity", required=True)
-    parser.add_argument("--backend-port", type=int, default=19210)
-    parser.add_argument("--fallback-port", type=int, default=19211)
-    parser.add_argument("--repetitions", type=int, default=50)
-    parser.add_argument("--max-repetitions", type=int, default=1000)
-    parser.add_argument("--minimum-query-cpu-ns", type=int, default=100000000, help="ten Linux 100Hz CPU ticks by default")
-    parser.add_argument("--residency-seconds", type=float, default=1)
-    parser.add_argument("--relative-tolerance", type=float, default=0.0)
-    parser.add_argument("--absolute-tolerance", type=float, default=0.0)
-    parser.add_argument("--wait-for-completion", action="store_true", help="wait without client deadlines or forced shutdown kills")
-    args = parser.parse_args()
-    runner.HTTP_TIMEOUT = None if args.wait_for_completion else 60
-    if args.repetitions < 1 or args.max_repetitions < args.repetitions or args.minimum_query_cpu_ns <= 0 or args.residency_seconds < 0:
-        parser.error("positive repetitions and nonnegative residency required")
-    if len({args.backend_port, args.fallback_port, args.metricsql_port}) != 3 or args.exact_cache_bytes <= 0:
-        parser.error("distinct listener ports and positive exact cache budget required")
-    args.output.mkdir(parents=True, exist_ok=False)
-    args.input_inventory = input_inventory(args.metrics) if args.victoriametrics else None
-    sample_count = sum(args.input_inventory[0].values()) if args.input_inventory else runner.validate_sample_file(args.metrics)
-    corpus, snapshot = json.loads(args.queries.read_text()), json.loads(args.snapshot.read_text())
-    runner.validate_workload(snapshot, corpus)
-    candidate_document = json.loads(args.candidates.read_text())
-    result = {"units": "cpu_ns", "compiler_identity": candidate_document.get("compiler_identity"), "data_snapshot_id": "sha256:" + hashlib.sha256(args.metrics.read_bytes()).hexdigest(),
-              "runtime_binary_sha256": hashlib.sha256(args.data_plane.read_bytes()).hexdigest(),
-              "exact_binary_sha256": hashlib.sha256((args.victoriametrics or args.prometheus).read_bytes()).hexdigest(),
-              "exact_engine": "victoriametrics" if args.victoriametrics else "prometheus", "result_cache_disabled": args.disable_result_cache,
-              "scope": "accelerated finite-input calibration; measured wall residency is not full logical-horizon residency", "validated_sample_count": sample_count, "candidates": []}
-    candidates = candidate_document["candidates"]
-    for candidate in candidates:
-        if "manifest" in candidate and "install_request" in candidate:
-            validate_membership_filter_artifact(candidate)
-    for index, candidate in enumerate(candidates):
-        if "manifest" not in candidate or "install_request" not in candidate:
-            continue
-        result["candidates"].append(measure(args, candidate, corpus, snapshot, args.output / f"candidate-{index}"))
-        runner.write_json(args.output / "measurements.json", result)
-
-
-if __name__ == "__main__":
-    main()
diff --git a/tools/o11y-execution/compare.py b/tools/o11y-execution/compare.py
deleted file mode 100644
index f8718a650..000000000
--- a/tools/o11y-execution/compare.py
+++ /dev/null
@@ -1,148 +0,0 @@
-"""Matched Prometheus-result comparison and explicitly scoped process measurements."""
-import math
-import os
-from pathlib import Path
-import statistics
-
-
-def result_samples(response):
-    if response.get("status") != "success":
-        raise ValueError("query did not succeed")
-    if response.get("warnings"):
-        raise ValueError("response warnings require review for partial results")
-    data = response["data"]
-    kind = data["resultType"]
-    items = data["result"]
-    if kind == "scalar":
-        items = [{"metric": {}, "value": items}]
-    elif kind not in ("vector", "matrix"):
-        raise ValueError(f"unsupported comparison result type: {kind}")
-    result, groups = {}, set()
-    for item in items:
-        labels = tuple(sorted(item["metric"].items()))
-        if labels in groups:
-            raise ValueError("duplicate series")
-        groups.add(labels)
-        for timestamp, value in item["values"] if kind == "matrix" else [item["value"]]:
-            key = (labels, float(timestamp))
-            if key in result or not math.isfinite(key[1]):
-                raise ValueError("duplicate or invalid sample timestamp")
-            result[key] = float(value)
-    return kind, groups, result
-
-
-def compare_results(actual, expected, relative_tolerance=0.0, absolute_tolerance=0.0):
-    if any(not math.isfinite(v) or v < 0 for v in (relative_tolerance, absolute_tolerance)):
-        raise ValueError("comparison tolerances must be finite and nonnegative")
-    try:
-        ak, ag, a = result_samples(actual)
-        ek, eg, e = result_samples(expected)
-        if ak != ek:
-            raise ValueError("different result types")
-    except (ValueError, TypeError, KeyError) as error:
-        return {"comparable": False, "equal": False, "reason": str(error)}
-    absolute, relative, zero, nonfinite, outside_tolerance = [], [], 0, 0, 0
-    for key in a.keys() & e.keys():
-        x, y = a[key], e[key]
-        if not math.isfinite(x) or not math.isfinite(y):
-            if not (x == y or (math.isnan(x) and math.isnan(y))):
-                nonfinite += 1
-            continue
-        error = abs(x - y)
-        if not math.isfinite(error):
-            nonfinite += 1
-            continue
-        absolute.append(error)
-        if not math.isclose(x, y, rel_tol=relative_tolerance, abs_tol=absolute_tolerance):
-            outside_tolerance += 1
-        if y:
-            ratio = error / abs(y)
-            if math.isfinite(ratio):
-                relative.append(ratio)
-            else:
-                nonfinite += 1
-        elif error:
-            zero += 1
-    missing, extra = len(e.keys() - a.keys()), len(a.keys() - e.keys())
-    return {"comparable": True,
-            "equal": ag == eg and not (missing or extra or nonfinite or outside_tolerance),
-            "strict_equal": ag == eg and not (missing or extra or zero or nonfinite or any(absolute)),
-            "relative_tolerance": relative_tolerance, "absolute_tolerance": absolute_tolerance,
-            "samples_outside_tolerance": outside_tolerance,
-            "missing_series": len(eg - ag), "extra_series": len(ag - eg),
-            "missing_samples": missing, "extra_samples": extra,
-            "completeness": (len(a.keys() & e.keys()) / len(e)) if e else (1.0 if not a else 0.0),
-            "max_absolute_error": max(absolute, default=None),
-            "max_relative_error": max(relative, default=None),
-            "zero_baseline_mismatches": zero, "nonfinite_mismatches": nonfinite}
-
-
-def distribution(values):
-    if not values:
-        return None
-    values = sorted(values)
-    return {"count": len(values), "min_ns": values[0], "median_ns": statistics.median(values),
-            "p95_ns": values[math.ceil(0.95 * len(values)) - 1], "max_ns": values[-1],
-            "mean_ns": statistics.mean(values), "stddev_ns": statistics.stdev(values) if len(values) > 1 else None}
-
-
-def summarize(rows):
-    comparisons = [compare_results(row["response"], row.get("exact", {}).get("response", {}),
-                   row.get("comparison", {}).get("relative_tolerance", 0.0),
-                   row.get("comparison", {}).get("absolute_tolerance", 0.0)) for row in rows]
-    eligible = bool(rows) and all(
-        c["equal"] and r["execution"] in ("warm", "hybrid", "exact_fallback") and r["exact"].get("http_status") == 200
-        for r, c in zip(rows, comparisons))
-    actual = sum(r["elapsed_ns"] for r in rows)
-    exact = sum(r.get("exact", {}).get("elapsed_ns", 0) for r in rows)
-    def cpu_total(requests, names):
-        values = [request.get("process_resources", {}).get(name) for request in requests for name in names]
-        return sum(v["cpu_ns"] for v in values) if values and all(v is not None for v in values) else None
-    has_fallback_process = any("fallback_service" in r.get("process_resources", {}) for r in rows)
-    backend_names = ["backend", "fallback_service" if has_fallback_process else "exact_service"]
-    backend_cpu = cpu_total(rows, backend_names)
-    exact_cpu = cpu_total([r.get("exact", {}) for r in rows], ["exact_service"])
-    return {"backend_plus_fallback_cpu_ns": backend_cpu,
-            "baseline_cpu_ns": exact_cpu,
-            "baseline_over_backend_cpu_ratio": exact_cpu / backend_cpu if eligible and backend_cpu and exact_cpu is not None else None,
-            "cpu_scope": "request intervals, whole processes including background work; fallback CPU charged to backend; /proc tick granularity",
-            "occurrences": len(rows),
-            "execution_counts": {k: sum(r["execution"] == k for r in rows) for k in ("warm", "hybrid", "exact_fallback", "failed")},
-            "execution_detail_counts": {k: sum(r.get("execution_provenance", {}).get("detail") == k for r in rows) for k in ("asap", "hybrid", "external_exact")},
-            "summary_acceleration_scope": "warm is summary-only; hybrid combines summary candidates with a filtered exact subtree",
-            "equal_results": sum(c["equal"] for c in comparisons),
-            "uncomparable_results": sum(not c["comparable"] for c in comparisons),
-            "comparisons": comparisons,
-            "backend_latency": distribution([r["elapsed_ns"] for r in rows]),
-            "exact_latency": distribution([r["exact"]["elapsed_ns"] for r in rows if "exact" in r]),
-            "successful_backend_requests_per_query_service_second":
-                sum(r["execution"] != "failed" for r in rows) * 1e9 / actual if actual else None,
-            "matched_query_latency_ratio": exact / actual if eligible and actual else None,
-            "end_to_end_benefit": None,
-            "scope": "sequential HTTP service time including failures; not concurrent/system throughput; ratio only for wholly exact-equal matched results"}
-
-
-def process_snapshot(pid):
-    """Linux process scope, not retained summary heap. PID reuse invalidates deltas."""
-    try:
-        root = Path(f"/proc/{pid}")
-        stat = (root / "stat").read_text().rsplit(")", 1)[1].split()
-        status = dict(line.split(":", 1) for line in (root / "status").read_text().splitlines() if ":" in line)
-        return {"pid": pid, "start_ticks": int(stat[19]),
-                "cpu_ns": int((int(stat[11]) + int(stat[12])) * 1e9 / os.sysconf("SC_CLK_TCK")),
-                "rss_bytes": int(status["VmRSS"].split()[0]) * 1024,
-                "process_lifetime_peak_rss_bytes": int(status["VmHWM"].split()[0]) * 1024,
-                "cpu_affinity": status.get("Cpus_allowed_list", "").strip(),
-                "cgroup": (root / "cgroup").read_text(),
-                "retained_summary_state_bytes": None}
-    except (OSError, KeyError, ValueError, IndexError):
-        return None
-
-
-def process_delta(before, after):
-    if not before or not after or (before["pid"], before["start_ticks"]) != (after["pid"], after["start_ticks"]):
-        return None
-    return {"cpu_ns": after["cpu_ns"] - before["cpu_ns"],
-            "rss_before_bytes": before["rss_bytes"], "rss_after_bytes": after["rss_bytes"],
-            "process_lifetime_peak_rss_bytes": after["process_lifetime_peak_rss_bytes"],
-            "scope": "whole process including background work; CPU tick resolution; HWM is lifetime, not phase peak"}
diff --git a/tools/o11y-execution/discover_snapshot.py b/tools/o11y-execution/discover_snapshot.py
deleted file mode 100644
index 8cf15e7ad..000000000
--- a/tools/o11y-execution/discover_snapshot.py
+++ /dev/null
@@ -1,126 +0,0 @@
-#!/usr/bin/env python3
-"""Register the complete real corpus for candidate discovery, never cost selection.
-
-Unit discovery costs are an explicit uncalibrated enumeration seed. Version 3
-without quotes cannot select/deploy. Replace implementation evidence with measured
-calibration and re-export candidates before producing final deployment quotes.
-"""
-import argparse
-from collections import Counter
-import hashlib
-import json
-from pathlib import Path
-import time
-import math
-from replay import iter_samples
-
-
-def main():
-    parser = argparse.ArgumentParser(description=__doc__)
-    parser.add_argument("--corpus", type=Path, required=True)
-    parser.add_argument("--metrics", type=Path, required=True)
-    parser.add_argument("--template", type=Path, required=True)
-    parser.add_argument("--output", type=Path, required=True)
-    parser.add_argument("--interval-ms", type=int, default=60000, help="declared repeated-query experiment demand")
-    parser.add_argument("--repetitions", type=int, default=20, help="query evaluations per bounded replay batch")
-    args = parser.parse_args()
-    corpus = json.loads(args.corpus.read_text())
-    sample_count = 0
-    first_timestamp_ms = None
-    last_timestamp_ms = None
-    series = set()
-    last_by_series = {}
-    source_sample_interval_ms = None
-    with args.metrics.open() as metrics:
-        for labels, _, timestamp in iter_samples(metrics):
-            key = tuple(sorted(labels.items()))
-            prior = last_by_series.get(key)
-            if prior is not None:
-                source_sample_interval_ms = (
-                    timestamp - prior
-                    if source_sample_interval_ms is None
-                    else math.gcd(source_sample_interval_ms, timestamp - prior)
-                )
-            last_by_series[key] = timestamp
-            series.add(key)
-            sample_count += 1
-            first_timestamp_ms = timestamp if first_timestamp_ms is None else first_timestamp_ms
-            last_timestamp_ms = timestamp
-    snapshot = json.loads(args.template.read_text())
-    if snapshot.get("snapshot_version") != 3:
-        raise ValueError("snapshot_version 3 with explicit dataset identity is required")
-    now = int(time.time() * 1000)
-    input_span = (last_timestamp_ms - first_timestamp_ms) / 1000
-    horizon = args.repetitions * args.interval_ms / 1000
-    if input_span <= 0 or horizon <= 0 or args.interval_ms <= 0:
-        raise ValueError("positive input horizon and recurrence required")
-    def evidence(value):
-        return {"value": value, "source": "observed", "observed_at_ms": now, "valid_for_ms": 86400000}
-    data = snapshot["data_workload"]
-    data.update(ingestion_volume=evidence(sample_count), ingestion_rate=evidence(sample_count/horizon),
-                input_cardinality=evidence(len(series)))
-    data["ingestion_rate"]["source"] = "derived"
-    registrations, query_audit = [], []
-    frequencies = Counter(row["query"] for row in corpus["queries"])
-    for query in dict.fromkeys(row["query"] for row in corpus["queries"]):
-        if args.interval_ms % frequencies[query]:
-            raise ValueError("base interval must divide exactly by query occurrence frequency")
-        interval = args.interval_ms // frequencies[query]
-        phases = {row["eval_timestamp_ms"] % interval for row in corpus["queries"] if row["query"] == query}
-        if len(phases) != 1:
-            raise ValueError("query occurrences require one explicit evaluation phase")
-        phase = phases.pop()
-        registrations.append({"query": query, "demand": {"fixed_interval_at": {"interval": interval, "evaluation_phase": phase}},
-                              "requirements": {"accuracy": {"explicit": "Exact"}, "response_latency": "unspecified"},
-                              "predictability": {"predictable": {"known_at": None}},
-                              "time_selection": {"scope": "real_time", "lookback": None, "as_of": None}})
-        query_audit.append({"query": query,
-                            "occurrence_count": frequencies[query], "expected_evaluations": frequencies[query] * args.repetitions,
-                            "declared_interval_ms": interval, "evaluation_phase_ms": phase,
-                            "lookback_method": "derived by the backend compiler from PromQL and the declared scrape cadence"})
-    snapshot["query_workload"].update(repeating_queries=registrations, query_batch=None)
-    snapshot.pop("workload_cost_evidence", None)
-    implementation = snapshot["implementation"]
-    implementation.pop("source_sample_interval_ms", None)
-    # Prefer the observed cadence; retain the declared template cadence when
-    # the input has no repeated series from which to infer it.
-    scrape_interval_ms = source_sample_interval_ms or implementation.get("scrape_interval_ms")
-    if not isinstance(scrape_interval_ms, int) or scrape_interval_ms <= 0 or scrape_interval_ms % 1000:
-        raise ValueError("scrape_interval_ms must be a positive whole number of seconds")
-    implementation["scrape_interval_ms"] = scrape_interval_ms
-    data["data_ingestion_interval"] = evidence(scrape_interval_ms)
-    if source_sample_interval_ms is None:
-        data["data_ingestion_interval"]["source"] = "declared"
-    # Finite replay evaluates the oldest repetition first after loading the
-    # complete input. Preserve that admitted historical-query span separately
-    # from each query's PromQL range selector.
-    implementation["query_staleness_margin_ms"] = max(0, (args.repetitions - 1) * args.interval_ms)
-    implementation.update(evidence_observed_at_unix_ms=now, evidence_valid_for_ms=86400000, horizon_seconds=horizon)
-    implementation["lifecycle_costs"] = dict.fromkeys(("build", "maintenance_per_update", "read", "retention_per_second", "retirement"), 1.0)
-    implementation["window_cost_model"]["cost"].update(model_version="UNCALIBRATED-enumeration-only", observed_at_unix_ms=now,
-        valid_for_ms=86400000, horizon_seconds=horizon, cpu_cost=1.0, peak_memory_bytes=0, network_bytes=0,
-        storage_bytes=0, source_scan_bytes=0, weighted_cost=1.0)
-    # Plan lifecycle is control-plane wall time. Historical event timestamps
-    # describe the replay data and must not make a newly generated plan appear
-    # active before it was generated (SummaryCatalog rejects that lifecycle).
-    snapshot["environment"].update(observed_at_unix_ms=now, activation_unix_ms=now, max_evidence_age_ms=86400000,
-                                  capability_snapshot_id="o11y-backend-local-calibration-v1")
-    args.output.parent.mkdir(parents=True, exist_ok=True)
-    args.output.write_text(json.dumps(snapshot, indent=2) + "\n")
-    args.output.with_suffix(".provenance.json").write_text(json.dumps({
-        "purpose": "candidate discovery only; uncalibrated costs are NOT execution quotes or benefit evidence",
-        "input_sha256": hashlib.sha256(args.metrics.read_bytes()).hexdigest(),
-        "corpus_sha256": hashlib.sha256(args.corpus.read_bytes()).hexdigest(),
-        "upstream_revision": corpus["upstream_revision"], "sample_count": sample_count,
-        "series_count": data["input_cardinality"]["value"], "first_timestamp_ms": first_timestamp_ms, "last_timestamp_ms": last_timestamp_ms,
-        "declared_query_interval_ms": args.interval_ms, "repetitions": args.repetitions,
-        "input_span_seconds": input_span, "cost_horizon_seconds": horizon,
-        "event_time_ingestion_rate": sample_count / input_span,
-        "derived_bounded_replay_ingestion_rate": sample_count / horizon,
-        "cost_scope": "bounded accelerated replay: entire finite input once plus declared query repetitions; logical horizon is not wall-clock residency",
-        "accuracy": "exact",
-        "queries": query_audit}, indent=2) + "\n")
-
-
-if __name__ == "__main__":
-    main()
diff --git a/tools/o11y-execution/measure_native_exact.py b/tools/o11y-execution/measure_native_exact.py
deleted file mode 100644
index acfa57c3c..000000000
--- a/tools/o11y-execution/measure_native_exact.py
+++ /dev/null
@@ -1,91 +0,0 @@
-#!/usr/bin/env python3
-"""Measure a fresh native VictoriaMetrics baseline without a backend proxy."""
-import argparse
-import hashlib
-import json
-import os
-from pathlib import Path
-import resource
-import subprocess
-import time
-
-import calibrate_runtime as calibration
-import replay as runner
-
-
-def main():
-    parser = argparse.ArgumentParser(description=__doc__)
-    parser.add_argument('--victoriametrics', type=Path, required=True)
-    parser.add_argument('--metrics', type=Path, required=True)
-    parser.add_argument('--queries', type=Path, required=True)
-    parser.add_argument('--output', type=Path, required=True)
-    parser.add_argument('--cpu-affinity', required=True)
-    parser.add_argument('--port', type=int, default=19450)
-    parser.add_argument('--repetitions', type=int, default=60)
-    parser.add_argument('--exact-cache-bytes', type=int, default=268435456)
-    parser.add_argument('--disable-result-cache', action='store_true')
-    args = parser.parse_args()
-    if args.repetitions < 1 or args.exact_cache_bytes <= 0:
-        parser.error('positive repetitions and cache budget required')
-    cpus = {int(value) for value in args.cpu_affinity.split(',')}
-    inventory = calibration.input_inventory(args.metrics)
-    corpus = json.loads(args.queries.read_text())
-    if not corpus.get('upstream_revision') or not corpus.get('queries'):
-        raise ValueError('versioned nonempty corpus required')
-    args.output.mkdir(parents=True, exist_ok=False)
-    url = f'http://127.0.0.1:{args.port}'
-    command = calibration.exact_service_command(args, args.output, args.port)
-    report = {'engine':'victoriametrics','command':command,'result_cache_disabled':args.disable_result_cache,
-              'data_sha256':hashlib.sha256(args.metrics.read_bytes()).hexdigest(),
-              'binary_sha256':hashlib.sha256(args.victoriametrics.read_bytes()).hexdigest(),
-              'samples':sum(inventory[0].values()),'queries':{},'phases':{},
-              'scope':'native engine only; first workload query follows full input visibility validation'}
-    child = None
-    usage_before = resource.getrusage(resource.RUSAGE_CHILDREN)
-    try:
-        with (args.output/'native.log').open('w') as log:
-            child = subprocess.Popen(command, stdout=log, stderr=subprocess.STDOUT,
-                                     preexec_fn=lambda: os.sched_setaffinity(0, cpus))
-        children = {'native_exact':child}
-        calibration.wait_ready(url+'/health',child)
-        before = calibration.snapshots(children)
-        report['startup'] = before
-        started = time.perf_counter_ns()
-        runner.PROCESS_IDS.clear()
-        runner.PROCESS_IDS.update({'native_exact':child.pid})
-        runner.ingest_sample_file(args.metrics,[url],args.output)
-        flush = runner._http_request(url+'/internal/force_flush')
-        runner.write_json(args.output/'exact-flush.json',flush)
-        if flush['http_status'] != 200:
-            raise RuntimeError('native flush failed')
-        calibration.verify_vm_visibility(url,inventory,args.output)
-        after = calibration.snapshots(children)
-        report['phases']['ingest_and_build'] = calibration.phase(args.output,'ingest_and_build',before,after,time.perf_counter_ns()-started)
-        for query in corpus['queries']:
-            before, started = calibration.snapshots(children), time.perf_counter_ns()
-            records = []
-            for repeat in range(args.repetitions):
-                result = runner._http_request(url+'/api/v1/query?'+calibration.query_parameters(query,args.disable_result_cache))
-                records.append({**query,'repetition':repeat,**result})
-                if result['http_status'] != 200 or result['response'].get('status') != 'success':
-                    raise RuntimeError('native query failed: '+query['query'])
-            after = calibration.snapshots(children)
-            measurement = calibration.phase(args.output,'query-'+query['id'],before,after,time.perf_counter_ns()-started)
-            records_path = args.output/('queries-'+query['id']+'.json')
-            runner.write_json(records_path,records)
-            report['queries'][query['id']] = {**measurement,'evaluations':len(records),'raw_measurement_file':str(records_path.resolve())}
-        report['final_processes'] = calibration.snapshots(children)
-        child.terminate()
-        child.wait(timeout=30)
-        usage_after = resource.getrusage(resource.RUSAGE_CHILDREN)
-        report['lifecycle_cpu_ns'] = int((usage_after.ru_utime+usage_after.ru_stime-usage_before.ru_utime-usage_before.ru_stime)*1e9)
-        report['storage_after_shutdown_bytes'] = calibration.file_bytes(args.output/'exact-data')
-        runner.write_json(args.output/'measurement.json',report)
-    finally:
-        if child is not None and child.poll() is None:
-            child.terminate()
-            child.wait(timeout=30)
-
-
-if __name__ == '__main__':
-    main()
diff --git a/tools/o11y-execution/process_lifecycle.py b/tools/o11y-execution/process_lifecycle.py
deleted file mode 100644
index 559bcda06..000000000
--- a/tools/o11y-execution/process_lifecycle.py
+++ /dev/null
@@ -1,42 +0,0 @@
-"""Collect per-child lifetime usage; never label aggregate child usage as one PID."""
-import os
-import time
-from compare import process_snapshot
-
-
-def stop(child, timeout=30):
-    before = process_snapshot(child.pid)
-    started = time.perf_counter_ns()
-    forced = False
-    usage = None
-    # Popen.poll()/wait() may already have reaped an exited child. Its usage
-    # cannot subsequently be recovered with wait4, and is not a measured zero.
-    if child.returncode is None:
-        child.terminate()
-        deadline = time.monotonic() + timeout if timeout is not None else None
-        while True:
-            try:
-                pid, status, collected = os.wait4(child.pid, os.WNOHANG)
-            except ChildProcessError:
-                break
-            if pid:
-                child.returncode = os.waitstatus_to_exitcode(status)
-                usage = collected
-                break
-            if deadline is not None and time.monotonic() >= deadline:
-                forced = True
-                child.kill()
-                try:
-                    _, status, usage = os.wait4(child.pid, 0)
-                    child.returncode = os.waitstatus_to_exitcode(status)
-                except ChildProcessError:
-                    pass
-                break
-            time.sleep(.01)
-    return {'before_shutdown': before,
-            'lifetime_cpu_ns': int((usage.ru_utime + usage.ru_stime) * 1e9) if usage is not None else None,
-            'lifetime_peak_rss_bytes': usage.ru_maxrss * 1024 if usage is not None else None,
-            'usage_unavailable_reason': 'child was already reaped; per-PID wait4 usage unavailable' if usage is None else None,
-            'shutdown_wall_ns': time.perf_counter_ns() - started,
-            'forced_kill': forced, 'exit_code': child.returncode,
-            'scope': 'Per-PID wait4 CPU and peak RSS cover the whole child lifetime, not shutdown only. Process exit is not a measured summary retirement operation.'}
diff --git a/tools/o11y-execution/query_sweep.py b/tools/o11y-execution/query_sweep.py
deleted file mode 100644
index 3bd90868e..000000000
--- a/tools/o11y-execution/query_sweep.py
+++ /dev/null
@@ -1,85 +0,0 @@
-#!/usr/bin/env python3
-"""Fresh paired repetition sweeps of a normally selected, explicitly scoped workload."""
-import argparse
-import json
-from pathlib import Path
-import subprocess
-import sys
-
-
-def trial_summary(folder):
-    report = json.loads((folder / "replay/comparison.json").read_text())
-    batch = json.loads((folder / "replay/query-batch-resources.json").read_text())
-    phases = report["process_phases"]
-    def cpu(snapshot, names):
-        values = [snapshot.get(name, {}).get("cpu_ns") if snapshot.get(name) else None for name in names]
-        return sum(values) if all(value is not None for value in values) else None
-    sides = {"backend_plus_fallback": ["backend", "fallback_service"], "prometheus": ["exact_service"]}
-    result = {"correctness_and_latency": report["all_requests"], "execution_details": report["by_execution_detail"],
-              "estimated_selection": report["estimated_cost"], "units": "cpu_ns", "sides": {},
-              "scope": "Setup includes process startup, planning on backend side, full input admission/build; all process background CPU charged. Retirement excluded."}
-    for side, names in sides.items():
-        setup = cpu(phases["after_ingest_and_drain"], names)
-        total = cpu(phases["after_queries"], names)
-        if side == "backend_plus_fallback":
-            planning = report["planning_resources"].get("cpu_ns")
-            setup = setup + planning if setup is not None and planning is not None else None
-            total = total + planning if total is not None and planning is not None else None
-        query = cpu(batch["resources"], names)
-        result["sides"][side] = {"setup_and_all_updates_cpu_ns": setup, "setup_update_query_cpu_ns": total,
-            "query_batch_cpu_ns": query, "first_pass_cpu_ns": cpu(batch["first_pass_resources"], names),
-            "repeated_queries_cpu_ns": cpu(batch["repeat_resources"], names),
-            "query_cpu_censored": query is None or query < 10 * batch["cpu_tick_ns"]}
-    return result
-
-
-def main():
-    parser = argparse.ArgumentParser(description=__doc__)
-    for name in ("prometheus", "metrics", "queries", "snapshot", "compiler", "data-plane", "output"):
-        parser.add_argument("--" + name, type=Path, required=True)
-    parser.add_argument("--cpu-affinity", required=True)
-    parser.add_argument("--trials", type=int, default=3)
-    parser.add_argument("--advance-step-ms", type=int, default=60000)
-    parser.add_argument("--base-port", type=int, default=19600)
-    parser.add_argument("--scope", choices=("full_upstream_corpus", "original_occurrence_subset", "derived_subquery_child"), required=True)
-    args = parser.parse_args()
-    if args.advance_step_ms <= 0 or args.trials < 1:
-        parser.error("advancing step and trials must be positive")
-    # Check the complete advancing grid against actual retained input before starting services.
-    from replay import parse_samples
-    samples = parse_samples(args.metrics.read_text().splitlines())
-    first, last = min(row[2] for row in samples), max(row[2] for row in samples)
-    corpus = json.loads(args.queries.read_text())
-    for row in corpus["queries"]:
-        if not first <= row["eval_timestamp_ms"] - 99 * args.advance_step_ms <= row["eval_timestamp_ms"] <= last:
-            parser.error("100-repeat advancing grid must stay within input timestamps; reduce step or use a later endpoint")
-    del samples
-    args.output.mkdir(parents=True, exist_ok=False)
-    cases = []
-    for mode in ("fixed", "advancing"):
-        for repetitions in (1, 5, 20, 100):
-            folder = args.output / f"{mode}-{repetitions}"
-            command = [sys.executable, str(Path(__file__).with_name("run_comparison.py"))]
-            for name in ("prometheus", "metrics", "queries", "snapshot", "compiler", "data_plane"):
-                command += ["--" + name.replace("_", "-"), str(getattr(args, name).resolve())]
-            command += ["--output", str(folder.resolve()), "--trials", str(args.trials),
-                        "--repetitions", str(repetitions), "--cpu-affinity", args.cpu_affinity,
-                        "--base-port", str(args.base_port + len(cases) * args.trials * 3),
-                        "--batch-resources", "--evaluation-step-ms", str(args.advance_step_ms if mode == "advancing" else 0)]
-            cases.append({"mode": mode, "repetitions": repetitions, "command": command})
-    manifest = {"scope": args.scope, "cases": cases, "input_timestamp_ms": [first, last],
-                "selection": "Each fresh case invokes normal Planner selection from the supplied measured snapshot; no winning artifact override",
-                "demand_scope": "Repetition sweep amortizes the supplied selected workload; it does not recalibrate or reselect cost quotes for each repetition count",
-                "advancing_scope": "Same complete data preloaded on both sides; query time advances ending at original timestamp, not continuous ingestion",
-                "cold_scope": "First pass of fresh process, not evicted OS cache; repeat pass reported separately",
-                "coverage": "Derived child cases are supplementary and never replace full 28-occurrence regression"}
-    (args.output / "sweep.json").write_text(json.dumps(manifest, indent=2) + "\n")
-    for case in cases:
-        subprocess.run(case["command"], check=True)
-        folder = Path(case["command"][case["command"].index("--output") + 1])
-        summary = {"case": case, "trials": [trial_summary(folder / f"trial-{trial}") for trial in range(1, args.trials + 1)]}
-        (folder / "sweep-summary.json").write_text(json.dumps(summary, indent=2) + "\n")
-
-
-if __name__ == "__main__":
-    main()
diff --git a/tools/o11y-execution/replay.py b/tools/o11y-execution/replay.py
deleted file mode 100644
index 6ba2a1f85..000000000
--- a/tools/o11y-execution/replay.py
+++ /dev/null
@@ -1,555 +0,0 @@
-#!/usr/bin/env python3
-"""Replay supplied o11ybench inputs through the production backend. No winner overrides."""
-import argparse
-from decimal import Decimal
-import hashlib
-import itertools
-import json
-import math
-import os
-import resource
-from pathlib import Path
-import re
-import socket
-import struct
-import subprocess
-import time
-import urllib.error
-import urllib.parse
-import urllib.request
-
-from compare import compare_results, process_snapshot, process_delta, summarize
-
-PROCESS_IDS = {}
-
-
-def constrain_process(pid, cpus, address_space_bytes=None):
-    """Match schedulable CPUs for all existing threads, including Go workers."""
-    if cpus:
-        for task in Path(f"/proc/{pid}/task").iterdir():
-            try:
-                os.sched_setaffinity(int(task.name), cpus)
-            except ProcessLookupError:
-                pass
-    if address_space_bytes:
-        resource.prlimit(pid, resource.RLIMIT_AS, (address_space_bytes, address_space_bytes))
-
-
-def classify(response, headers=None):
-    if response.get("status") != "success":
-        return "failed"
-    declared = (headers or {}).get("x-asap-execution")
-    if declared in ("hybrid", "exact_fallback", "failed"):
-        return declared
-    detail = (headers or {}).get("x-asap-execution-detail")
-    if detail == "hybrid":
-        return "hybrid"
-    if detail == "invalid_provenance":
-        return "failed"
-    sources = {x for x in response.get("infos", []) if isinstance(x, str) and x.startswith("data_source:")}
-    if sources == {"data_source: asap_query"}:
-        return "warm"
-    if sources == {"data_source: exact_fallback"}:
-        return "exact_fallback"
-    return "failed"
-
-
-def execution_provenance(response, headers=None):
-    headers = headers or {}
-    route = classify(response, headers)
-    detail = headers.get("x-asap-execution-detail")
-    if detail is None:
-        detail = "asap" if route == "warm" else "hybrid" if route == "hybrid" else "external_exact" if route == "exact_fallback" else "failed"
-    counts = {}
-    for name, header in (("raw_scan_evaluations", "x-asap-raw-scan-evaluations"),
-                         ("summary_readout_evaluations", "x-asap-summary-readout-evaluations"),
-                         ("memo_hits", "x-asap-memo-hits"),
-                         ("exact_subquery_evaluations", "x-asap-exact-subquery-evaluations"),
-                         ("exact_subquery_rpcs", "x-asap-exact-subquery-rpcs"),
-                         ("exact_branch_evaluations", "x-asap-exact-branch-evaluations")):
-        value = headers.get(header)
-        counts[name] = int(value) if value is not None and value.isdigit() else None
-    return {"detail": detail, **counts}
-
-
-def validate_workload(snapshot, corpus):
-    rows = corpus["queries"]
-    if not corpus.get("upstream_revision") or not rows:
-        raise ValueError("a versioned, nonempty upstream query corpus is required")
-    ids = [row["id"] for row in rows]
-    if len(set(ids)) != len(ids):
-        raise ValueError("query occurrence IDs must be unique")
-    for row in rows:
-        if not isinstance(row["eval_timestamp_ms"], int) or row["eval_timestamp_ms"] < 0:
-            raise ValueError("each query needs its original nonnegative evaluation timestamp")
-    workload = snapshot["query_workload"]
-    if workload.get("query_batch"):
-        raise ValueError("this runner currently accepts repeating workload registrations only")
-    registered = {row["query"] for row in workload["repeating_queries"]}
-    if registered != {row["query"] for row in rows}:
-        raise ValueError("snapshot registrations must match the complete unique corpus exactly")
-    return rows
-
-
-_SAMPLE = re.compile(r'([a-zA-Z_:][a-zA-Z0-9_:]*)(?:\{(.*)\})?\s+(\S+)\s+(\d+(?:\.\d+)?)')
-_LABEL = re.compile(r'([a-zA-Z_][a-zA-Z0-9_]*)="((?:[^"\\]|\\[\\"n])*)"')
-
-
-def iter_samples(lines, require_global_order=True):
-    """Strict OpenMetrics subset: seconds converted losslessly to Remote Write milliseconds."""
-    seen, latest, yielded = {}, -1, False
-    for number, line in enumerate(lines, 1):
-        line = line.strip()
-        if not line or line.startswith("#"):
-            continue
-        match = _SAMPLE.fullmatch(line)
-        if not match:
-            raise ValueError(f"unsupported sample at line {number}")
-        metric, raw_labels, value, timestamp = match.groups()
-        labels = {"__name__": metric}
-        rest = raw_labels or ""
-        while rest:
-            label = _LABEL.match(rest)
-            if not label or label[1] in labels:
-                raise ValueError(f"invalid or duplicate label at line {number}")
-            labels[label[1]] = re.sub(r'\\([\\"n])', lambda m: '\n' if m[1] == 'n' else m[1], label[2])
-            rest = rest[label.end():]
-            if rest:
-                if not rest.startswith(",") or len(rest) == 1:
-                    raise ValueError(f"invalid label separator at line {number}")
-                rest = rest[1:]
-        millis = Decimal(timestamp) * 1000
-        if millis != millis.to_integral_value():
-            raise ValueError(f"submillisecond timestamp at line {number}")
-        value, timestamp = float(value), int(millis)
-        key = tuple(sorted(labels.items()))
-        if not math.isfinite(value) or timestamp > 2**63 - 1 or (require_global_order and timestamp < latest) or timestamp <= seen.get(key, -1):
-            raise ValueError(f"nonfinite, duplicate, or out-of-order sample at line {number}")
-        latest, seen[key] = timestamp, timestamp
-        yielded = True
-        yield labels, value, timestamp
-    if not yielded:
-        raise ValueError("empty dataset")
-
-
-def parse_samples(lines):
-    return list(iter_samples(lines))
-
-
-def validate_sample_file(path):
-    """Validate a dataset in one bounded-memory pass and return its sample count."""
-    with Path(path).open() as lines:
-        return sum(1 for _ in iter_samples(lines))
-
-
-def ingest_sample_file(path, endpoints, output):
-    """Validate and encode a dataset lazily; callers must run validation first."""
-    with Path(path).open() as lines:
-        ingest(iter_samples(lines), endpoints, output)
-
-
-def varint(value):
-    result = bytearray()
-    while value > 127:
-        result.append((value & 127) | 128)
-        value >>= 7
-    result.append(value)
-    return bytes(result)
-
-
-def field(number, payload):
-    return varint(number * 8 + 2) + varint(len(payload)) + payload
-
-
-def encode_write(rows):
-    """Remote Write v1 protobuf in an uncompressed-literal raw Snappy block."""
-    series = {}
-    for labels, value, timestamp in rows:
-        series.setdefault(tuple(sorted(labels.items())), []).append((value, timestamp))
-    wire = bytearray()
-    for labels, samples in series.items():
-        ts = b"".join(field(1, field(1, k.encode()) + field(2, v.encode())) for k, v in labels)
-        ts += b"".join(field(2, b"\x09" + struct.pack("<d", v) + b"\x10" + varint(t)) for v, t in samples)
-        wire.extend(field(1, ts))
-    length = len(wire)
-    if not length:
-        raise ValueError("cannot encode empty batch")
-    n = length - 1
-    if n < 60:
-        literal = bytes([n << 2])
-    else:
-        size = (n.bit_length() + 7) // 8
-        literal = bytes([(59 + size) << 2]) + n.to_bytes(size, "little")
-    return varint(length) + literal + wire
-
-
-HTTP_TIMEOUT = 60
-
-
-def _http_request(url, data=None, headers=None):
-    start = time.perf_counter_ns()
-    try:
-        with urllib.request.urlopen(urllib.request.Request(url, data=data, headers=headers or {}), timeout=HTTP_TIMEOUT) as response:
-            body, status, received = response.read(), response.status, dict(response.headers.items())
-        try:
-            body = json.loads(body)
-        except (ValueError, UnicodeDecodeError):
-            body = {"raw": body.decode(errors="replace")}
-        return {"http_status": status, "response": body, "headers": {k.lower(): v for k, v in received.items()},
-                "elapsed_ns": time.perf_counter_ns() - start}
-    except urllib.error.HTTPError as error:
-        raw = error.read()
-        try:
-            body = json.loads(raw)
-        except (ValueError, UnicodeDecodeError):
-            body = {"status": "error", "error": str(error), "raw": raw.decode(errors="replace")}
-        return {"http_status": error.code, "response": body,
-                "headers": {k.lower(): v for k, v in error.headers.items()},
-                "elapsed_ns": time.perf_counter_ns() - start}
-    except (OSError, urllib.error.URLError) as error:
-        return {"http_status": getattr(error, "code", None), "response": {"status": "error", "error": str(error)},
-                "headers": {}, "elapsed_ns": time.perf_counter_ns() - start}
-
-
-def process_snapshots():
-    return {name: process_snapshot(pid) for name, pid in PROCESS_IDS.items()}
-
-
-def request(url, data=None, headers=None):
-    before = process_snapshots()
-    result = _http_request(url, data, headers)
-    after = process_snapshots()
-    result["process_resources"] = {name: process_delta(before.get(name), after.get(name)) for name in PROCESS_IDS}
-    return result
-
-
-def write_json(path, value):
-    path.write_text(json.dumps(value, indent=2, allow_nan=False) + "\n")
-
-
-def ingest(rows, endpoints, output):
-    batch_size = 50_000
-    batches = []
-    offset = 0
-    journal_path = output / "ingestion.jsonl"
-    with journal_path.open("w") as journal:
-        iterator = iter(rows)
-        while batch_rows := list(itertools.islice(iterator, batch_size)):
-            payload = encode_write(batch_rows)
-            batch = {"offset": offset, "sample_count": len(batch_rows),
-                     "payload_sha256": hashlib.sha256(payload).hexdigest(), "endpoints": {}}
-            batches.append(batch)
-            for endpoint in endpoints:
-                # Append and fsync intent before the request: a timeout can
-                # follow partial acceptance, so a retry must never be silent.
-                intent = {"offset": offset, "endpoint": endpoint, "status": "attempting"}
-                journal.write(json.dumps(intent, allow_nan=False) + "\n")
-                journal.flush()
-                os.fsync(journal.fileno())
-                result = request(endpoint.rstrip("/") + "/api/v1/write", payload, {
-                    "Content-Type": "application/x-protobuf", "Content-Encoding": "snappy",
-                    "X-Prometheus-Remote-Write-Version": "0.1.0"})
-                batch["endpoints"][endpoint] = result
-                journal.write(json.dumps({"offset": offset, "endpoint": endpoint, "result": result}, allow_nan=False) + "\n")
-                journal.flush()
-                if not result["http_status"] or not 200 <= result["http_status"] < 300:
-                    write_json(output / "ingestion.json", batches)
-                    raise RuntimeError(f"ingestion failed at batch {offset}; inspect ingestion.jsonl before retry")
-            offset += len(batch_rows)
-    write_json(output / "ingestion.json", batches)
-
-
-def replay(queries, backend, output, repetitions, exact_url=None, relative_tolerance=0.0, absolute_tolerance=0.0, evaluation_step_ms=0, batch_resources=False, backend_first=False):
-    rows = []
-    if evaluation_step_ms < 0:
-        raise ValueError("evaluation step must be nonnegative")
-    query_request = _http_request if batch_resources else request
-    batch_before = process_snapshots() if batch_resources else None
-    batch_started = time.perf_counter_ns()
-    for repeat in range(repetitions):
-        for query_index, query in enumerate(queries):
-            exact_first = not backend_first and (repeat + query_index) % 2 == 0
-            evaluation_ms = query["eval_timestamp_ms"] - (repetitions - 1 - repeat) * evaluation_step_ms
-            if evaluation_ms < 0:
-                raise ValueError("advancing evaluation grid predates epoch")
-            params = urllib.parse.urlencode({"query": query["query"], "time": f'{evaluation_ms / 1000:.3f}'})
-            # Offline acceptance can require ASAP-first; preserve legacy alternating mode.
-            def recorded_request(endpoint, engine):
-                started = time.perf_counter_ns()
-                try:
-                    answer = query_request(endpoint.rstrip("/") + "/api/v1/query?" + params)
-                except Exception as error:
-                    answer = {"http_status": None, "response": {"status": "error", "error": str(error)},
-                              "headers": {}, "elapsed_ns": time.perf_counter_ns() - started}
-                with (output / "endpoint-requests.jsonl").open("a") as journal:
-                    journal.write(json.dumps({"id": query["id"], "evaluation_ms": evaluation_ms,
-                                              "repetition": repeat, "engine": engine, **answer}, allow_nan=False) + "\n")
-                    journal.flush()
-                return answer
-            exact = None
-            if exact_url and exact_first:
-                exact = recorded_request(exact_url, "native")
-            answer = recorded_request(backend, "asap")
-            if exact_url and exact is None:
-                exact = recorded_request(exact_url, "native")
-            route = classify(answer["response"], answer["headers"])
-            if answer["http_status"] != 200:
-                route = "failed"
-            rows.append({**query, "original_eval_timestamp_ms": query["eval_timestamp_ms"],
-                         "eval_timestamp_ms": evaluation_ms, "repetition": repeat, "phase": "first_pass" if repeat == 0 else "repeat",
-                         "execution": route, "execution_provenance": execution_provenance(answer["response"], answer["headers"]), **answer})
-            if exact is not None:
-                rows[-1]["exact"] = exact
-                rows[-1]["comparison"] = compare_results(answer["response"], exact["response"], relative_tolerance, absolute_tolerance)
-                rows[-1]["pair_order"] = "exact_first" if exact_first else "backend_first"
-            if not batch_resources:
-                write_json(output / "queries.json", rows)
-        if batch_resources and repeat == 0:
-            first_pass_after = process_snapshots()
-    if batch_resources:
-        batch_after = first_pass_after if repetitions == 1 else process_snapshots()
-        quantum = 1_000_000_000 // os.sysconf("SC_CLK_TCK")
-        deltas = {name: process_delta(batch_before.get(name), batch_after.get(name)) for name in PROCESS_IDS}
-        write_json(output / "query-batch-resources.json", {
-            "scope": "paired query batch including service background CPU; no per-RPC resource probes",
-            "before": batch_before, "after_first_pass": first_pass_after, "after": batch_after, "resources": deltas,
-            "first_pass_resources": {name: process_delta(batch_before.get(name), first_pass_after.get(name)) for name in PROCESS_IDS},
-            "repeat_resources": {name: process_delta(first_pass_after.get(name), batch_after.get(name)) for name in PROCESS_IDS},
-            "low_resolution_services": [name for name, delta in deltas.items() if delta is None or delta["cpu_ns"] < 10 * quantum],
-            "wall_ns": time.perf_counter_ns() - batch_started, "cpu_tick_ns": quantum,
-            "cpu_resolution": "Values below ten ticks are low-resolution/censored; zero is not zero cost",
-            "evaluations_per_service": len(rows), "evaluation_step_ms": evaluation_step_ms})
-        write_json(output / "queries.json", rows)
-    return rows
-
-
-def verify_summary_ready(queries, backend, output, repetitions, evaluation_step_ms):
-    """Exercise every admitted window after drain; a warmup is not a timed trial."""
-    probes = []
-    for repeat in range(repetitions):
-        for query in queries:
-            timestamp = query["eval_timestamp_ms"] - (repetitions - 1 - repeat) * evaluation_step_ms
-            params = urllib.parse.urlencode({"query": query["query"], "time": timestamp / 1000})
-            answer = request(backend + "/api/v1/query?" + params)
-            provenance = execution_provenance(answer["response"], answer["headers"])
-            ready = (answer["http_status"] == 200 and classify(answer["response"], answer["headers"]) == "warm"
-                     and (provenance.get("summary_readout_evaluations") or 0) > 0
-                     and provenance.get("exact_subquery_rpcs") == 0
-                     and bool(answer["response"].get("data", {}).get("result")))
-            probes.append({"id": query["id"], "evaluation_ms": timestamp, "ready": ready,
-                           "provenance": provenance, **answer})
-            write_json(output / "summary-readiness.json", {"complete": all(p["ready"] for p in probes),
-                       "scope": "post-drain warm probes at every evaluation window, before measured queries; warms ASAP caches", "probes": probes})
-            if not ready:
-                raise RuntimeError("summary window is not ready; see summary-readiness.json")
-
-
-def main():
-    global HTTP_TIMEOUT
-    parser = argparse.ArgumentParser(description=__doc__)
-    parser.add_argument("--metrics", type=Path, required=True)
-    parser.add_argument("--queries", type=Path, required=True)
-    parser.add_argument("--snapshot", type=Path, required=True)
-    parser.add_argument("--compiler", type=Path, required=True)
-    parser.add_argument("--data-plane", type=Path, required=True)
-    parser.add_argument("--exact-url", required=True, help="dedicated empty Prometheus with Remote Write receiver enabled")
-    parser.add_argument("--compare", action="store_true", help="execute a matched exact request for every corpus occurrence")
-    parser.add_argument("--exact-pid", type=int, help="local Prometheus PID for Linux CPU/RSS evidence; never stopped by this runner")
-    parser.add_argument("--exact-storage", type=Path, help="baseline Prometheus data directory for logical on-disk byte count")
-    parser.add_argument("--fallback-storage", type=Path, help="fallback Prometheus data directory for logical on-disk byte count")
-    parser.add_argument("--fallback-url", help="separate fresh Prometheus for backend fallback; defaults to exact-url")
-    parser.add_argument("--fallback-pid", type=int)
-    parser.add_argument("--cpu-affinity", help="comma-separated permitted CPU IDs; enforced on backend and supplied Prometheus PIDs")
-    parser.add_argument("--address-space-bytes", type=int, help="same RLIMIT_AS for backend and supplied Prometheus; virtual memory, not RSS cap")
-    parser.add_argument("--port", type=int, default=18089)
-    parser.add_argument("--settle-seconds", type=float, default=0, help="deprecated; completion uses explicit finite-input drain")
-    parser.add_argument("--repetitions", type=int, default=2)
-    parser.add_argument("--evaluation-step-ms", type=int, default=0, help="advance through preloaded data, ending at original timestamp; not incremental ingestion")
-    parser.add_argument("--batch-resources", action="store_true", help="measure CPU around the query batch, avoiding per-RPC /proc probes")
-    parser.add_argument("--relative-tolerance", type=float, default=0.0)
-    parser.add_argument("--absolute-tolerance", type=float, default=0.0)
-    parser.add_argument("--output", type=Path, required=True)
-    parser.add_argument("--backend-first", action="store_true")
-    parser.add_argument("--wait-for-completion", action="store_true", help="no HTTP deadline or forced shutdown kill")
-    parser.add_argument("--require-summary-ready", action="store_true")
-    args = parser.parse_args()
-    HTTP_TIMEOUT = None if args.wait_for_completion else 60
-    if args.repetitions < 1 or not 0 <= args.settle_seconds <= 60:
-        parser.error("positive repetitions and settle-seconds in [0, 60] required")
-    cpus = {int(x) for x in args.cpu_affinity.split(",")} if args.cpu_affinity else None
-    if cpus and not cpus <= os.sched_getaffinity(0):
-        parser.error("requested CPUs must be available to the runner")
-    if args.address_space_bytes is not None and args.address_space_bytes <= 0:
-        parser.error("address-space-bytes must be positive")
-    if (cpus or args.address_space_bytes) and not args.exact_pid:
-        parser.error("enforced resource comparison requires --exact-pid")
-    if args.fallback_url and args.fallback_url.rstrip("/") == args.exact_url.rstrip("/"):
-        parser.error("fallback-url must be a separate service")
-    if args.fallback_url and (cpus or args.address_space_bytes) and not args.fallback_pid:
-        parser.error("resource enforcement also requires --fallback-pid")
-    if args.fallback_url and args.exact_pid is not None and args.exact_pid == args.fallback_pid:
-        parser.error("baseline and fallback must use distinct processes")
-    if args.exact_storage and args.fallback_storage and args.exact_storage.resolve() == args.fallback_storage.resolve():
-        parser.error("baseline and fallback must use distinct storage directories")
-    fallback_url = args.fallback_url or args.exact_url
-    for pid in [args.exact_pid, args.fallback_pid]:
-        if pid is not None:
-            if process_snapshot(pid) is None:
-                parser.error("service PID must be readable and live")
-            constrain_process(pid, cpus, args.address_space_bytes)
-    corpus = json.loads(args.queries.read_text())
-    queries = validate_workload(json.loads(args.snapshot.read_text()), corpus)
-    sample_count = 0
-    timestamp_min_ms = None
-    timestamp_max_ms = None
-    with args.metrics.open() as metrics:
-        for _, _, timestamp in iter_samples(metrics):
-            sample_count += 1
-            timestamp_min_ms = timestamp if timestamp_min_ms is None else timestamp_min_ms
-            timestamp_max_ms = timestamp
-    if args.exact_pid is not None and process_snapshot(args.exact_pid) is None:
-        parser.error("exact-pid must name a readable live local process")
-    with socket.socket() as probe:
-        probe.bind(("127.0.0.1", args.port))
-    args.output.mkdir(parents=True, exist_ok=False)
-    provenance = {"schema_version": 1, "upstream_revision": corpus["upstream_revision"],
-                  "inputs": {str(p.resolve()): hashlib.sha256(p.read_bytes()).hexdigest()
-                             for p in [args.metrics, args.queries, args.snapshot, args.compiler, args.data_plane]},
-                  "samples": sample_count, "timestamp_min_ms": timestamp_min_ms, "timestamp_max_ms": timestamp_max_ms,
-                  "query_occurrences": len(queries), "configuration": {k: str(v) for k, v in vars(args).items()},
-                  "limitations": ["generator provenance must be supplied separately", "first pass is not a guaranteed cold cache", "finite-input drain closes trailing panes and permanently seals Remote Write; no live-ingestion claim"]}
-    write_json(args.output / "run.json", provenance)
-    planning_before = resource.getrusage(resource.RUSAGE_CHILDREN)
-    with (args.output / "planning.stderr").open("w") as log:
-        compiled = subprocess.run([str(args.compiler.resolve()), str(args.snapshot.resolve())], check=True,
-                                  stdout=subprocess.PIPE, stderr=log, text=True)
-    planning_after = resource.getrusage(resource.RUSAGE_CHILDREN)
-    planning_resources = {"cpu_ns": int(((planning_after.ru_utime + planning_after.ru_stime) -
-                                         (planning_before.ru_utime + planning_before.ru_stime)) * 1e9),
-                          "children_lifetime_peak_rss_bytes": planning_after.ru_maxrss * 1024}
-    plan = json.loads(compiled.stdout)
-    write_json(args.output / "planning.json", plan)
-    artifact = args.output / "install.json"
-    write_json(artifact, plan["install_request"])
-    backend = f"http://127.0.0.1:{args.port}"
-    command = [str(args.data_plane.resolve()), "--profile", "asapquery", "--physical-plan", str(artifact.resolve()),
-               "--prometheus-server", fallback_url, "--forward-unsupported-queries", "--http-port", str(args.port),
-               "--output-dir", str((args.output / "backend").resolve()), "--precompute-allowed-lateness-ms", "0",
-               "--precompute-flush-interval-ms", "25"]
-    write_json(args.output / "command.json", command)
-    with (args.output / "backend.log").open("w") as log:
-        def limits():
-            if cpus:
-                os.sched_setaffinity(0, cpus)
-            if args.address_space_bytes:
-                resource.setrlimit(resource.RLIMIT_AS, (args.address_space_bytes, args.address_space_bytes))
-        child = subprocess.Popen(command, stdout=log, stderr=subprocess.STDOUT, preexec_fn=limits)
-        PROCESS_IDS["backend"] = child.pid
-        if args.exact_pid is not None:
-            PROCESS_IDS["exact_service"] = args.exact_pid
-        if args.fallback_pid is not None:
-            PROCESS_IDS["fallback_service"] = args.fallback_pid
-        phases = {"startup": process_snapshots()}
-        try:
-            for _ in range(120):
-                if child.poll() is not None:
-                    raise RuntimeError("data plane exited; see backend.log")
-                if request(backend + "/api/v1/health")["http_status"] == 200:
-                    break
-                time.sleep(0.25)
-            else:
-                raise RuntimeError("data plane readiness timeout")
-            installed = request(backend + "/api/v1/physical-plan/status")
-            write_json(args.output / "installed.json", installed)
-            if installed["http_status"] != 200:
-                raise RuntimeError("could not read installed plan status")
-            envelope = plan["envelope"]
-            if not any(p["plan_id"] == envelope["plan_id"] and p["plan_version"] == envelope["plan_version"]
-                       and p["phase"] == "active" for p in installed["response"].get("plans", [])):
-                raise RuntimeError("runtime has not activated the selected plan generation")
-            phases["before_ingest"] = process_snapshots()
-            ingest_start = time.perf_counter_ns()
-            with args.metrics.open() as metrics:
-                ingest(iter_samples(metrics), list(dict.fromkeys([args.exact_url, fallback_url, backend])), args.output)
-            drained = request(backend + "/api/v1/precompute/drain", b"")
-            write_json(args.output / "drain.json", drained)
-            if drained["http_status"] != 200 or drained["response"].get("complete") is not True:
-                raise RuntimeError("finite-input materialization drain failed; see drain.json")
-            ingest_elapsed = time.perf_counter_ns() - ingest_start
-            phases["after_ingest_and_drain"] = process_snapshots()
-            write_json(args.output / "store-after-build.json", request(backend + "/api/v1/store/metrics"))
-            write_json(args.output / "process-phases.json", phases)
-            if args.require_summary_ready:
-                verify_summary_ready(queries, backend, args.output, args.repetitions, args.evaluation_step_ms)
-                phases["after_readiness_probes"] = process_snapshots()
-            results = replay(queries, backend, args.output, args.repetitions, args.exact_url if args.compare else None,
-                             args.relative_tolerance, args.absolute_tolerance,
-                             args.evaluation_step_ms, args.batch_resources, args.backend_first)
-            phases["after_queries"] = process_snapshots()
-            write_json(args.output / "process-phases.json", phases)
-            store = request(backend + "/api/v1/store/metrics")
-            write_json(args.output / "store.json", store)
-            def disk_bytes(path):
-                return sum(p.stat().st_size for p in path.rglob("*") if p.is_file()) if path else None
-            storage = {"backend_output_bytes": disk_bytes(args.output / "backend"),
-                       "baseline_prometheus_bytes": disk_bytes(args.exact_storage),
-                       "fallback_prometheus_bytes": disk_bytes(args.fallback_storage),
-                       "backend_store": store,
-                       "scope": "logical file bytes including WAL; backend output also contains logs; concurrent snapshots are approximate"}
-            write_json(args.output / "storage.json", storage)
-            write_json(args.output / "completion.json", {"complete": True,
-                       "execution_counts": {k: sum(r["execution"] == k for r in results) for k in ["warm", "hybrid", "exact_fallback", "failed"]},
-                       "execution_detail_counts": {k: sum(r["execution_provenance"]["detail"] == k for r in results) for k in ["asap", "hybrid", "external_exact", "failed", "invalid_provenance"]},
-                       "benefit_claim": None})
-            if args.compare:
-                report = {"schema_version": 1, "all_requests": summarize(results),
-                          "by_phase": {phase: summarize([r for r in results if r["phase"] == phase])
-                                       for phase in ["first_pass", "repeat"]},
-                          "by_query_occurrence": {query["id"]: summarize([r for r in results if r["id"] == query["id"]])
-                                                  for query in queries},
-                          "by_execution": {route: summarize([r for r in results if r["execution"] == route])
-                                           for route in ["warm", "hybrid", "exact_fallback", "failed"]},
-                          "by_execution_detail": {detail: summarize([r for r in results if r["execution_provenance"]["detail"] == detail])
-                                                  for detail in ["asap", "hybrid", "external_exact"]},
-                          "estimated_cost": plan["cost_comparison"],
-                          "measurement_units": {"latency": "nanoseconds", "cpu": "process CPU nanoseconds", "memory": "bytes"},
-                          "resource_limits": {"cpu_affinity": sorted(cpus) if cpus else None,
-                                              "address_space_bytes": args.address_space_bytes,
-                                              "scope": "per process; backend fallback service charged separately"},
-                          "separate_fallback_endpoint": bool(args.fallback_url),
-                          "isolated_baseline_service": bool(args.fallback_url and args.exact_pid and args.fallback_pid and args.exact_pid != args.fallback_pid),
-                          "measured_ingest_and_drain_wall_ns": ingest_elapsed,
-                          "planning_wall_ns": plan["planning_elapsed_ns"],
-                          "process_phases": phases,
-                          "planning_resources": planning_resources,
-                          "storage": storage,
-                          "phase_resources": {name: {service: process_delta(phases[before].get(service), phases[after].get(service))
-                                                     for service in PROCESS_IDS}
-                                              for name, before, after in [
-                                                  ("startup", "startup", "before_ingest"),
-                                                  ("ingest_and_build", "before_ingest", "after_ingest_and_drain"),
-                                                  *([("readiness_probes", "after_ingest_and_drain", "after_readiness_probes")]
-                                                    if args.require_summary_ready else []),
-                                                  ("queries", "after_readiness_probes" if args.require_summary_ready else "after_ingest_and_drain", "after_queries")]},
-                          "estimated_vs_measured_cost_ratio": None,
-                          "acceptance_complete": False,
-                          "limitations": ["No common conversion from provider cost units to measured resource units",
-                              *([] if args.fallback_url else ["Exact service is shared with fallback; caches are not isolated"]),
-                              *([] if cpus else ["CPU affinity is not enforced"]),
-                              "RLIMIT_AS is virtual address space, not physical-memory or aggregate multi-process CPU enforcement",
-                              "Raw process RSS is not summary state size; store.json retains backend counters",
-                              "Service startup before supplied PID attachment and isolated cold-cache runs remain unmeasured",
-                              "Query equality on one dataset is not a formal approximation confidence guarantee"]}
-                from summarize import query_cost_comparison, STALE
-                report["query_cost_comparison"] = query_cost_comparison(plan, report, results, provenance, json.loads(args.snapshot.read_text()))
-                if report["query_cost_comparison"]["available"]:
-                    report["limitations"] = [item for item in report["limitations"] if item != STALE]
-                report["limitations"].append("Full lifecycle ratio remains unavailable: residency, retirement and service startup scopes are not aligned")
-                write_json(args.output / "comparison.json", report)
-        finally:
-            from process_lifecycle import stop
-            write_json(args.output / "backend-lifecycle.json", stop(child, timeout=None if args.wait_for_completion else 10))
-
-
-if __name__ == "__main__":
-    main()
diff --git a/tools/o11y-execution/run_comparison.py b/tools/o11y-execution/run_comparison.py
deleted file mode 100644
index a6cdcbc43..000000000
--- a/tools/o11y-execution/run_comparison.py
+++ /dev/null
@@ -1,137 +0,0 @@
-#!/usr/bin/env python3
-"""Own fresh baseline/fallback services and retain repeated comparison evidence."""
-import argparse
-import hashlib
-import json
-import os
-from pathlib import Path
-import subprocess
-import sys
-import time
-import urllib.request
-
-from compare import process_snapshot
-from process_lifecycle import stop
-
-
-def save(path, value):
-    path.write_text(json.dumps(value, indent=2) + "\n")
-
-
-
-def main():
-    parser = argparse.ArgumentParser(description=__doc__)
-    for name in ("prometheus", "metrics", "queries", "snapshot", "compiler", "data-plane", "output"):
-        parser.add_argument("--" + name, type=Path, required=True)
-    parser.add_argument("--trials", type=int, default=3)
-    parser.add_argument("--repetitions", type=int, default=20)
-    parser.add_argument("--evaluation-step-ms", type=int, default=0)
-    parser.add_argument("--batch-resources", action="store_true")
-    parser.add_argument("--cpu-affinity", required=True)
-    parser.add_argument("--base-port", type=int, default=19410)
-    parser.add_argument("--backend-first", action="store_true")
-    parser.add_argument("--wait-for-completion", action="store_true")
-    parser.add_argument("--require-summary-ready", action="store_true")
-    args = parser.parse_args()
-    if args.trials < 1 or args.repetitions < 1:
-        parser.error("trials and repetitions must be positive")
-    if args.base_port < 1 or args.base_port + args.trials * 3 - 1 > 65535:
-        parser.error("trial port range must fit TCP ports")
-    cpus = {int(value) for value in args.cpu_affinity.split(",")}
-    if not cpus or not cpus <= os.sched_getaffinity(0):
-        parser.error("requested CPUs are unavailable")
-    args.output.mkdir(parents=True, exist_ok=False)
-    save(args.output / "manifest.json", {
-        "configuration": {key: str(value) for key, value in vars(args).items()},
-        "prometheus_sha256": hashlib.sha256(args.prometheus.read_bytes()).hexdigest(),
-        "limitations": ["Fresh processes and empty TSDBs; OS caches are not evicted",
-                        "CPU affinity is shared, not an aggregate quota or memory cap",
-                        "Finite-input replay; repeated queries retain original evaluation times"]})
-    for trial in range(1, args.trials + 1):
-        # Separate ports avoid previous trial connections still in TIME_WAIT.
-        base_port = args.base_port + (trial - 1) * 3
-        folder = args.output / f"trial-{trial}"
-        folder.mkdir()
-        config = folder / "prometheus.yml"
-        config.write_text("global:\n  scrape_interval: 1h\nscrape_configs: []\n")
-        children, logs, evidence = {}, [], {}
-        try:
-            for index, name in enumerate(("baseline", "fallback")):
-                port = base_port + index
-                command = [str(args.prometheus.resolve()), f"--config.file={config.resolve()}",
-                           f"--storage.tsdb.path={(folder / name).resolve()}",
-                           f"--web.listen-address=127.0.0.1:{port}",
-                           "--web.enable-remote-write-receiver", "--storage.tsdb.retention.time=1000000h"]
-                log = (folder / f"{name}.log").open("w")
-                logs.append(log)
-                started = time.perf_counter_ns()
-                child = subprocess.Popen(command, stdout=log, stderr=subprocess.STDOUT,
-                                         preexec_fn=lambda: os.sched_setaffinity(0, cpus))
-                children[name] = child
-                for attempt in range(240):
-                    if child.poll() is not None:
-                        raise RuntimeError(f"{name} exited before readiness")
-                    try:
-                        with urllib.request.urlopen(f"http://127.0.0.1:{port}/-/ready", timeout=1) as response:
-                            if response.status == 200:
-                                break
-                    except OSError:
-                        pass
-                    time.sleep(0.25)
-                else:
-                    raise RuntimeError(f"{name} readiness timeout")
-                evidence[name] = {"command": command, "ready": process_snapshot(child.pid),
-                                  "startup_wall_ns": time.perf_counter_ns() - started}
-            command = [sys.executable, str(Path(__file__).with_name("replay.py"))]
-            for name in ("metrics", "queries", "snapshot", "compiler", "data_plane"):
-                command += ["--" + name.replace("_", "-"), str(getattr(args, name).resolve())]
-            command += ["--compare", "--exact-url", f"http://127.0.0.1:{base_port}",
-                        "--fallback-url", f"http://127.0.0.1:{base_port + 1}",
-                        "--exact-pid", str(children["baseline"].pid),
-                        "--fallback-pid", str(children["fallback"].pid),
-                        "--exact-storage", str((folder / "baseline").resolve()),
-                        "--fallback-storage", str((folder / "fallback").resolve()),
-                        "--cpu-affinity", args.cpu_affinity, "--port", str(base_port + 2),
-                        "--repetitions", str(args.repetitions), "--relative-tolerance", "1e-9",
-                        "--absolute-tolerance", "1e-12", "--output", str((folder / "replay").resolve())]
-            command += ["--evaluation-step-ms", str(args.evaluation_step_ms)]
-            if args.batch_resources:
-                command.append("--batch-resources")
-            if args.backend_first:
-                command.append("--backend-first")
-            if args.wait_for_completion:
-                command.append("--wait-for-completion")
-            if args.require_summary_ready:
-                command.append("--require-summary-ready")
-            save(folder / "command.json", command)
-            subprocess.run(command, check=True)
-        finally:
-            cleanup_errors = []
-            for name, child in children.items():
-                try:
-                    evidence.setdefault(name, {})["termination"] = stop(child, timeout=None if args.wait_for_completion else 30)
-                except Exception as error:
-                    # An error collecting one service must not orphan the other.
-                    evidence.setdefault(name, {})["termination_error"] = repr(error)
-                    cleanup_errors.append(f"{name}: {error}")
-                    try:
-                        if args.wait_for_completion:
-                            child.terminate()
-                            child.wait()
-                        else:
-                            child.kill()
-                            child.wait(timeout=10)
-                    except Exception as kill_error:
-                        evidence[name]["cleanup_error"] = repr(kill_error)
-            try:
-                save(folder / "service-lifecycle.json", evidence)
-            finally:
-                for log in logs:
-                    log.close()
-            if cleanup_errors and sys.exc_info()[0] is None:
-                raise RuntimeError("Service cleanup failed: " + "; ".join(cleanup_errors))
-        print(f"completed trial {trial}: {folder}", flush=True)
-
-
-if __name__ == "__main__":
-    main()
diff --git a/tools/o11y-execution/scale_metrics.py b/tools/o11y-execution/scale_metrics.py
deleted file mode 100755
index 8c8722239..000000000
--- a/tools/o11y-execution/scale_metrics.py
+++ /dev/null
@@ -1,54 +0,0 @@
-#!/usr/bin/env python3
-"""Deterministically scale the versioned o11y-bench metric trace for systems tests."""
-import argparse, hashlib, json, re
-from collections import defaultdict
-from pathlib import Path
-
-SAMPLE=re.compile(r'([a-zA-Z_:][a-zA-Z0-9_:]*)(\{.*\})?\s+(\S+)\s+(\d+(?:\.\d+)?)$')
-COUNTER_SUFFIXES=("_total","_sum","_count","_bucket")
-
-def add_replica(lbls, replica):
-    tag=f'replica="r{replica:03d}"'
-    return "{"+tag+(","+lbls[1:-1] if lbls else "")+"}"
-
-def main():
-    ap=argparse.ArgumentParser(); ap.add_argument('--input',type=Path,required=True); ap.add_argument('--output',type=Path,required=True)
-    ap.add_argument('--interval-seconds',type=int,default=30); ap.add_argument('--days',type=int,default=1); ap.add_argument('--replicas',type=int,default=1); a=ap.parse_args()
-    headers=[]; groups=defaultdict(list)
-    for line in a.input.read_text().splitlines():
-        if line.startswith('#'):
-            if line != '# EOF': headers.append(line)
-            continue
-        m=SAMPLE.fullmatch(line); metric,lbls,value,ts=m.groups(); groups[int(float(ts)*1000)].append((metric,lbls or '',float(value)))
-    times=sorted(groups); source_step=times[1]-times[0]; target_step=a.interval_seconds*1000
-    if source_step%target_step: raise SystemExit('target interval must divide source interval')
-    first,last=times[0],times[-1]; span=last-first+source_step
-    by_key_first={}; by_key_last={}
-    for metric,lbls,value in groups[first]: by_key_first[(metric,lbls)]=value
-    for metric,lbls,value in groups[last]: by_key_last[(metric,lbls)]=value
-    a.output.parent.mkdir(parents=True,exist_ok=True)
-    rows=0
-    with a.output.open('w',buffering=1024*1024) as out:
-        out.write('\n'.join(headers)+'\n')
-        for day in range(a.days):
-            day_offset=(day - (a.days - 1))*span
-            for i,t in enumerate(times):
-                nxt=times[i+1] if i+1<len(times) else None
-                next_map={(m,l):v for m,l,v in groups[nxt]} if nxt is not None else {}
-                for sub in range(0,source_step,target_step):
-                    if nxt is None and sub: continue
-                    frac=sub/source_step
-                    out_t=t+day_offset+sub
-                    for metric,lbls,value in groups[t]:
-                        key=(metric,lbls); v=value
-                        if nxt is not None and key in next_map: v=value+(next_map[key]-value)*frac
-                        if metric.endswith(COUNTER_SUFFIXES):
-                            v += day*(by_key_last.get(key,value)-by_key_first.get(key,value))
-                        for replica in range(a.replicas):
-                            out.write(f'{metric}{add_replica(lbls,replica) if a.replicas>1 else lbls} {v:.12g} {out_t/1000:.3f}\n')
-                            rows+=1
-        out.write('# EOF\n')
-    meta={'source':str(a.input),'source_sha256':hashlib.sha256(a.input.read_bytes()).hexdigest(),'output':str(a.output),'output_sha256':hashlib.sha256(a.output.read_bytes()).hexdigest(),'interval_seconds':a.interval_seconds,'days':a.days,'replicas':a.replicas,'samples':rows,'start_ms':first-(a.days-1)*span,'end_ms':last}
-    a.output.with_suffix('.metadata.json').write_text(json.dumps(meta,indent=2)+'\n')
-    print(json.dumps(meta))
-if __name__=='__main__': main()
diff --git a/tools/o11y-execution/summarize.py b/tools/o11y-execution/summarize.py
deleted file mode 100644
index 1bfa774ec..000000000
--- a/tools/o11y-execution/summarize.py
+++ /dev/null
@@ -1,94 +0,0 @@
-#!/usr/bin/env python3
-"""Derive a compact report without modifying immutable replay evidence."""
-import argparse
-from collections import Counter
-import hashlib
-import json
-import math
-from pathlib import Path
-
-MODEL = 'measured-inclusive-cpu-ns-v1'
-STALE = 'No common conversion from provider cost units to measured resource units'
-
-
-def query_cost_comparison(planning, comparison, queries, run, snapshot=None):
-    cost = planning['cost_comparison']
-    unavailable = {'available': False, 'estimated_over_measured_ratio': None}
-    def reject(reason):
-        return dict(unavailable, reason=reason)
-    if cost.get('model_version') != MODEL:
-        return reject('Provider model has no verified CPU-nanosecond interpretation')
-    if cost.get('data_snapshot_id', '').removeprefix('sha256:') not in run.get('inputs', {}).values():
-        return reject('Measured input hash does not match the cost data snapshot')
-    manifest = cost['selected_manifest']
-    if manifest['plan_id'] != cost['selected_plan_id']:
-        return reject('Selected manifest does not match selected plan')
-    original_by_id = {}
-    if snapshot is not None:
-        evidence = snapshot.get('workload_cost_evidence', {})
-        if evidence.get('model_version') != MODEL or not any(q.get('manifest') == manifest for q in evidence.get('quotes', [])):
-            return reject('Snapshot does not contain the selected calibration manifest')
-        original_by_id = {f'compat-query-{i}': q['query'] for i, q in enumerate(snapshot['query_workload']['repeating_queries'])}
-    actual = Counter(q['query'] for q in queries)
-    expected = {}
-    for qid, query in manifest['workload'].items():
-        keys = [k for k in manifest['components'] if k.startswith(f'query:{qid}:') or k == f'result:{qid}']
-        counts = {manifest['components'][k]['multiplicity'] for k in keys}
-        if len(counts) != 1 or any(manifest['components'][k]['unit'] != 'query_evaluation' for k in keys):
-            return reject('Missing or inconsistent query evaluation multiplicities')
-        count = counts.pop()
-        text = original_by_id.get(qid, query['query'])
-        if text in expected:
-            return reject('Ambiguous duplicate query in manifest')
-        expected[text] = count
-    if actual != expected:
-        return reject('Measured query multiset differs from priced evaluation demand')
-    keys = [k for k in manifest['components'] if k.startswith(('query:', 'result:'))]
-    values = [cost['component_costs'].get(k) for k in keys]
-    if any(not isinstance(v, (int, float)) or not math.isfinite(v) or v < 0 for v in values):
-        return reject('Missing or invalid query cost')
-    measured = comparison['all_requests'].get('backend_plus_fallback_cpu_ns')
-    if not isinstance(measured, (int, float)) or not math.isfinite(measured) or measured <= 0:
-        return reject('Query CPU is unavailable or below measurement resolution')
-    estimated = sum(values)
-    return {'available': True, 'model_version': MODEL, 'estimated_query_cpu_ns': estimated,
-            'measured_query_cpu_ns': measured, 'estimated_over_measured_ratio': estimated / measured,
-            'scope': 'Same input hash and query evaluation multiset; backend plus fallback query CPU only. '
-                     'Component costs already include multiplicity. Setup, residency and retirement are excluded. '
-                     'Calibration and replay cache/background timing can differ; /proc CPU is tick-quantized.'}
-
-
-def summarize(directory):
-    def read(name):
-        return json.loads((directory / name).read_text())
-    comparison, planning, queries, run = [read(n) for n in ['comparison.json', 'planning.json', 'queries.json', 'run.json']]
-    snapshot_path = Path(run.get('configuration', {}).get('snapshot', '/missing'))
-    snapshot = None
-    if snapshot_path.is_file() and hashlib.sha256(snapshot_path.read_bytes()).hexdigest() == run['inputs'].get(str(snapshot_path.resolve())):
-        snapshot = json.loads(snapshot_path.read_text())
-    aligned = query_cost_comparison(planning, comparison, queries, run, snapshot)
-    aggregate = {k: v for k, v in comparison['all_requests'].items() if k != 'comparisons'}
-    limitations = [x for x in comparison['limitations'] if not (aligned['available'] and x == STALE)]
-    limitations += ['Full lifecycle estimated/measured ratio is unavailable: isolated residency, retirement and service startup scopes are not aligned.',
-                    'First pass is not a guaranteed cold-cache trial. Sequential service rate is not concurrent throughput.',
-                    'Summed process lifetime memory peaks are conservative and need not occur simultaneously.']
-    return {'schema_version': 1, 'inputs': run['inputs'], 'samples': run['samples'],
-            'query_occurrences': run['query_occurrences'], 'aggregate': aggregate,
-            'by_phase': {k: {a: b for a, b in v.items() if a != 'comparisons'} for k, v in comparison['by_phase'].items()},
-            'selected_plan_id': planning['cost_comparison']['selected_plan_id'],
-            # Smoke-test planning records the selected manifest without priced
-            # alternatives. Preserve that evidence instead of making report
-            # generation depend on calibrated selection fields.
-            'candidate_costs': planning['cost_comparison'].get('alternatives', []),
-            'query_cost_comparison': aligned, 'phase_resources': comparison['phase_resources'],
-            'storage': comparison['storage'], 'limitations': limitations, 'acceptance_complete': False,
-            'evidence_sha256': {n: hashlib.sha256((directory / n).read_bytes()).hexdigest() for n in
-                                ['comparison.json', 'planning.json', 'queries.json', 'run.json']}}
-
-
-if __name__ == '__main__':
-    parser = argparse.ArgumentParser(description=__doc__)
-    parser.add_argument('trial', type=Path)
-    parser.add_argument('--output', type=Path, required=True)
-    args = parser.parse_args()
-    args.output.write_text(json.dumps(summarize(args.trial), indent=2) + '\n')
diff --git a/tools/o11y-execution/test_calibrate.py b/tools/o11y-execution/test_calibrate.py
deleted file mode 100644
index 8b9eefc06..000000000
--- a/tools/o11y-execution/test_calibrate.py
+++ /dev/null
@@ -1,115 +0,0 @@
-import copy
-import hashlib
-import json
-from pathlib import Path
-import subprocess
-import tempfile
-import unittest
-from calibrate import calibrate
-
-
-class CalibrationTests(unittest.TestCase):
-    def setUp(self):
-        self.manifest = {"plan_id": 1, "horizon_seconds": 60,
-                         "workload": {"q": {}}, "components": {
-                             "source:x": {"unit": "horizon", "multiplicity": 1},
-                             "state:x:update": {"unit": "horizon", "multiplicity": 1},
-                             "query:q:0": {"unit": "query_evaluation", "multiplicity": 6},
-                             "result:q": {"unit": "query_evaluation", "multiplicity": 6}}}
-        identity = {"backend_revision": "backend-a", "planner_revision": "planner-a"}
-        self.candidates = {"compiler_identity": identity, "candidates": [{"manifest": self.manifest}]}
-        self.measurements = {"compiler_identity": identity, "units": "cpu_ns", "data_snapshot_id": "d", "candidates": [{
-            "plan_id": 1, "manifest": copy.deepcopy(self.manifest), "executable": True,
-            "horizon_seconds": 60,
-            "horizon_phases": {key: {"cpu_ns": 10, "raw_measurement_file": key + ".json"}
-                               for key in ("install", "ingest_and_build", "residency", "retirement")},
-            "queries": {"q": {"cpu_ns": 100, "evaluations": 10, "classification": "warm",
-                              "correct": True, "raw_measurement_file": "q.json"}}}]}
-
-    def test_cli_preserves_current_snapshot_and_dataset_identity(self):
-        # Calibration adds quotes without downgrading or inventing dataset semantics.
-        with tempfile.TemporaryDirectory() as folder:
-            root = Path(folder)
-            metrics = root / "metrics.prom"
-            metrics.write_text("m 1\n")
-            measurements = copy.deepcopy(self.measurements)
-            measurements["data_snapshot_id"] = "sha256:" + hashlib.sha256(metrics.read_bytes()).hexdigest()
-            dataset = {"namespace": "test-tenant", "dataset": "metrics"}
-            snapshot = {"snapshot_version": 3, "environment": {
-                "observed_at_unix_ms": 1000, "max_evidence_age_ms": 1000,
-                "dataset_identity": dataset}}
-            for name, value in [("candidates", self.candidates), ("measurements", measurements), ("snapshot", snapshot)]:
-                (root / (name + ".json")).write_text(json.dumps(value))
-            command = ["python3", str(Path(__file__).with_name("calibrate.py")),
-                       "--candidates", str(root / "candidates.json"),
-                       "--measurements", str(root / "measurements.json"),
-                       "--metrics", str(metrics), "--snapshot", str(root / "snapshot.json"),
-                       "--output", str(root / "output.json")]
-            subprocess.run(command, check=True, capture_output=True)
-            output = json.loads((root / "output.json").read_text())
-            self.assertEqual(output["snapshot_version"], 3)
-            self.assertEqual(output["environment"]["dataset_identity"], dataset)
-            self.assertTrue(output["workload_cost_evidence"]["quotes"])
-            snapshot["snapshot_version"] = 2
-            (root / "snapshot.json").write_text(json.dumps(snapshot))
-            result = subprocess.run(command, capture_output=True, text=True)
-            self.assertNotEqual(result.returncode, 0)
-            self.assertIn("snapshot_version 3", result.stderr)
-
-    def run_provider(self):
-        return calibrate(self.candidates, self.measurements, "d", 1000, 1000)
-
-    def test_inclusive_cpu_is_counted_once(self):
-        # Horizon and per-evaluation totals preserve measured CPU without double counting.
-        evidence, audit = self.run_provider()
-        costs = evidence["quotes"][0]["unit_costs"]
-        self.assertEqual(sum(costs[k] * v["multiplicity"] for k, v in self.manifest["components"].items()), 100)
-        self.assertEqual(len(audit["attribution"][0]["allocation"]), 2)
-
-    def test_unknown_candidate_is_not_given_free_quote(self):
-        # Unmeasured alternatives remain unavailable rather than getting default zeros.
-        self.measurements["candidates"] = []
-        evidence, audit = self.run_provider()
-        self.assertEqual(evidence["quotes"], [])
-        self.assertEqual(audit["unavailable"][0]["reason"], "not measured")
-
-    def test_binding_without_valid_execution_is_rejected(self):
-        # A binding or failed/incorrect response cannot authorize a cost quote.
-        self.measurements["candidates"][0]["queries"]["q"]["classification"] = "bound"
-        with self.assertRaises(ValueError):
-            self.run_provider()
-
-    def test_missing_retirement_is_rejected(self):
-        # Complete horizon accounting must not silently omit a lifecycle phase.
-        del self.measurements["candidates"][0]["horizon_phases"]["retirement"]
-        with self.assertRaises(ValueError):
-            self.run_provider()
-
-    def test_changed_manifest_cannot_reuse_measurements(self):
-        # Any change in calibrated candidate identity invalidates the quote.
-        self.measurements["candidates"][0]["manifest"]["horizon_seconds"] = 30
-        with self.assertRaises(ValueError):
-            self.run_provider()
-
-    def test_stale_compiler_measurement_is_rejected(self):
-        self.measurements["compiler_identity"] = {
-            "backend_revision": "backend-old", "planner_revision": "planner-a"
-        }
-        with self.assertRaisesRegex(ValueError, "compiler identities differ"):
-            self.run_provider()
-
-    def test_shared_profile_preserves_measured_cpu_units(self):
-        # Inclusive measured phases determine the coarse model; input count only normalizes updates.
-        from update_global_profile import update
-        self.measurements["candidates"][0]["resources"] = {"peak_memory_bytes": 123, "storage_bytes": 456}
-        snapshot = {"implementation": {"horizon_seconds": 60, "window_cost_model": {"cost": {}}},
-                    "workload_cost_evidence": {"old": True}}
-        result, audit = update(snapshot, self.measurements, 20)
-        self.assertEqual(result["implementation"]["lifecycle_costs"]["maintenance_per_update"], 0.5)
-        self.assertEqual(result["implementation"]["window_cost_model"]["cost"]["cpu_cost"], 40)
-        self.assertNotIn("workload_cost_evidence", result)
-        self.assertIn("not measured zero", " ".join(audit["limitations"]))
-
-
-if __name__ == "__main__":
-    unittest.main()
diff --git a/tools/o11y-execution/test_calibrate_runtime.py b/tools/o11y-execution/test_calibrate_runtime.py
deleted file mode 100644
index 891829f36..000000000
--- a/tools/o11y-execution/test_calibrate_runtime.py
+++ /dev/null
@@ -1,158 +0,0 @@
-"""Fail-closed validation for calibrated MembershipFilter artifacts."""
-import unittest
-
-from calibrate_runtime import validate_membership_filter_artifact, validate_membership_filter_execution
-
-
-class MembershipFilterArtifactTests(unittest.TestCase):
-    def artifact(self, membership):
-        return {"install_request": {
-            "query_plan": {"entries": {"q": {"nodes": {
-                "0": {"op": "membership_filter", "inputs": [1, 3]},
-                "1": {"op": "summary_estimate", "input": 2},
-                "2": membership,
-                "3": {"op": "exact_readout", "input": 4},
-                "4": {"op": "read_materialization", "binding": {"materialization": 8}},
-            }}}},
-            "precompute_plan": {"schemas": [
-                {"materialization": 7, "family": {"family": "sketch", "kind": {
-                    "algorithm": "CmsWithHeap", "params": {"width": 32, "depth": 4, "heap_size": 2}}}},
-                {"materialization": 8, "family": {"family": "exact", "kind": "increase"}},
-            ]},
-        }}
-
-    def candidate_filtered_artifact(self):
-        artifact = self.artifact({"op": "read_materialization", "binding": {"materialization": 7}})
-        request = artifact["install_request"]
-        request["query_plan"]["entries"]["q"]["nodes"]["3"] = {
-            "op": "logical",
-            "operator": {"kind": "candidate_exact_subquery", "query": "sum by (job) (rate(m[5m]))",
-                         "item_label": "job"},
-            "inputs": [1],
-        }
-        request["precompute_plan"]["schemas"] = request["precompute_plan"]["schemas"][:1]
-        return artifact
-
-    def test_rejects_exact_membership_fallback(self):
-        with self.assertRaisesRegex(ValueError, "contains ExactFallback"):
-            validate_membership_filter_artifact(self.artifact({"op": "exact_fallback", "reason": "unsupported"}))
-
-    def test_rejects_uninstalled_heap_membership(self):
-        artifact = self.artifact({"op": "read_materialization", "binding": {"materialization": 9}})
-        with self.assertRaisesRegex(ValueError, "no installed heap"):
-            validate_membership_filter_artifact(artifact)
-
-    def test_accepts_heap_membership_and_exact_values(self):
-        validate_membership_filter_artifact(
-            self.artifact({"op": "read_materialization", "binding": {"materialization": 7}})
-        )
-
-    def test_ignores_plans_without_membership_filter(self):
-        validate_membership_filter_artifact({"install_request": {
-            "query_plan": {"entries": {"q": {"nodes": {"0": {"op": "exact_fallback"}}}}},
-            "precompute_plan": {"schemas": []},
-        }})
-
-    def test_rejects_exact_value_fallback(self):
-        artifact = self.artifact({"op": "read_materialization", "binding": {"materialization": 7}})
-        artifact["install_request"]["query_plan"]["entries"]["q"]["nodes"]["3"] = {"op": "exact_fallback"}
-        with self.assertRaisesRegex(ValueError, "contains ExactFallback"):
-            validate_membership_filter_artifact(artifact)
-
-    def test_rejects_missing_or_cyclic_input_nodes(self):
-        artifact = self.artifact({"op": "summary_estimate", "input": 99})
-        with self.assertRaisesRegex(ValueError, "missing node 99"):
-            validate_membership_filter_artifact(artifact)
-        artifact = self.artifact({"op": "summary_estimate", "input": 2})
-        with self.assertRaisesRegex(ValueError, "contains a cycle"):
-            validate_membership_filter_artifact(artifact)
-
-    def test_requires_two_local_summary_readouts_at_runtime(self):
-        artifact = self.artifact({"op": "read_materialization", "binding": {"materialization": 7}})
-        provenance = {"summary_readout_evaluations": 2, "exact_subquery_rpcs": 0,
-                      "exact_subquery_evaluations": 0, "exact_branch_evaluations": 0}
-        validate_membership_filter_execution(artifact, [{"execution": "warm", "execution_provenance": provenance}])
-        with self.assertRaisesRegex(ValueError, "both summary branches"):
-            validate_membership_filter_execution(artifact, [{"execution": "warm", "execution_provenance": {
-                **provenance, "summary_readout_evaluations": 1}}])
-        with self.assertRaisesRegex(ValueError, "used exact path"):
-            validate_membership_filter_execution(artifact, [{"execution": "warm", "execution_provenance": {
-                **provenance, "exact_subquery_rpcs": 1}}])
-
-    def test_accepts_one_heap_and_candidate_filtered_external_exact(self):
-        validate_membership_filter_artifact(self.candidate_filtered_artifact())
-
-    def test_candidate_filtered_contract_rejects_local_exact_state_or_unshared_input(self):
-        artifact = self.candidate_filtered_artifact()
-        artifact["install_request"]["precompute_plan"]["schemas"].append(
-            {"materialization": 8, "family": {"family": "exact", "kind": "increase"}})
-        with self.assertRaisesRegex(ValueError, "must not install"):
-            validate_membership_filter_artifact(artifact)
-        artifact = self.candidate_filtered_artifact()
-        artifact["install_request"]["query_plan"]["entries"]["q"]["nodes"]["3"]["inputs"] = [2]
-        with self.assertRaisesRegex(ValueError, "shared membership"):
-            validate_membership_filter_artifact(artifact)
-
-    def test_candidate_filtered_execution_requires_hybrid_one_rpc_and_one_summary_read(self):
-        artifact = self.candidate_filtered_artifact()
-        provenance = {"detail": "hybrid", "raw_scan_evaluations": 0,
-                      "summary_readout_evaluations": 1, "exact_subquery_rpcs": 1,
-                      "exact_subquery_evaluations": 1, "exact_branch_evaluations": 1}
-        validate_membership_filter_execution(
-            artifact, [{"execution": "hybrid", "execution_provenance": provenance}])
-        for key in ("summary_readout_evaluations", "exact_subquery_rpcs",
-                    "exact_subquery_evaluations", "exact_branch_evaluations"):
-            with self.subTest(key=key), self.assertRaisesRegex(ValueError, "invalid provenance"):
-                validate_membership_filter_execution(artifact, [{"execution": "hybrid",
-                    "execution_provenance": {**provenance, key: 0}}])
-        with self.assertRaisesRegex(ValueError, "hybrid execution"):
-            validate_membership_filter_execution(
-                artifact, [{"execution": "hybrid", "execution_provenance": {
-                    **provenance, "detail": "external_exact"}}])
-
-
-if __name__ == "__main__":
-    unittest.main()
-
-class PerQueryAccuracyTests(unittest.TestCase):
-    def test_entropy_absolute_error_does_not_accept_relative_tolerance(self):
-        from types import SimpleNamespace
-        from calibrate_runtime import comparison_tolerances
-        from compare import compare_results
-        args = SimpleNamespace(relative_tolerance=.9, absolute_tolerance=.9)
-        relative, absolute = comparison_tolerances({"accuracy_validation": {"metric": "absolute_bits", "bound": .1}}, args)
-        actual = {"status": "success", "data": {"resultType": "vector", "result": [{"metric": {}, "value": [0, "10.2"]}]}}
-        exact = {"status": "success", "data": {"resultType": "vector", "result": [{"metric": {}, "value": [0, "10"]}]}}
-        self.assertEqual((relative, absolute), (0, .1))
-        self.assertFalse(compare_results(actual, exact, relative, absolute)["equal"])
-
-    def test_unknown_metric_and_invalid_bound_are_rejected(self):
-        from types import SimpleNamespace
-        from calibrate_runtime import comparison_tolerances
-        for metric, bound in [("rank", .1), ("relative", float("nan")), ("absolute_bits", -1), ("exact", .1)]:
-            with self.assertRaises(ValueError):
-                comparison_tolerances({"accuracy_validation": {"metric": metric, "bound": bound}}, SimpleNamespace())
-
-    def test_result_cache_policy_is_explicit_on_both_query_endpoints(self):
-        from urllib.parse import parse_qs
-        from calibrate_runtime import query_parameters
-        row = {"query": "count_over_time(m[1h])", "eval_timestamp_ms": 1234}
-        self.assertNotIn("nocache", parse_qs(query_parameters(row, False)))
-        self.assertEqual(parse_qs(query_parameters(row, True))["nocache"], ["1"])
-
-class VictoriaMetricsVisibilityTests(unittest.TestCase):
-    def test_incomplete_counts_are_retried_before_queries(self):
-        import tempfile
-        from pathlib import Path
-        from unittest.mock import patch
-        from calibrate_runtime import verify_vm_visibility
-        key = (("__name__", "m"),)
-        def answer(value):
-            return {"http_status":200,"response":{"data":{"result":[{"metric":dict(key),"value":[2,str(value)]}]}},"headers":{},"elapsed_ns":1}
-        with tempfile.TemporaryDirectory() as folder, patch("calibrate_runtime.runner._http_request", side_effect=[answer(1),answer(2),answer(2),answer(2)]) as request, patch("calibrate_runtime.time.sleep"):
-            verify_vm_visibility("http://test", ({key:2},{key:2000},1000,2000), Path(folder))
-            self.assertEqual(request.call_count, 4)
-            import json
-            report = json.loads((Path(folder)/"exact-visibility.json").read_text())
-            self.assertTrue(report["complete"])
-            self.assertFalse(report["attempts"][0]["matched"])
diff --git a/tools/o11y-execution/test_compare.py b/tools/o11y-execution/test_compare.py
deleted file mode 100644
index abedef8b8..000000000
--- a/tools/o11y-execution/test_compare.py
+++ /dev/null
@@ -1,105 +0,0 @@
-"""Correctness gates must survive missing rows, failed responses and zero baselines."""
-import unittest
-import tempfile
-from pathlib import Path
-from unittest.mock import patch
-from urllib.parse import urlparse, parse_qs
-from compare import compare_results, summarize, process_delta
-
-
-def vector(*values):
-    return {"status": "success", "data": {"resultType": "vector", "result": [
-        {"metric": {"job": key}, "value": [123, str(value)]} for key, value in values]}}
-
-
-class ComparisonTests(unittest.TestCase):
-    def test_explicit_roundoff_tolerance_preserves_errors_and_structure(self):
-        """Declared floating-point tolerance permits roundoff, never missing series."""
-        actual, expected = vector(("a", 1.0 + 1e-15)), vector(("a", 1.0))
-        self.assertFalse(compare_results(actual, expected)["equal"])
-        result = compare_results(actual, expected, 1e-9, 1e-12)
-        self.assertTrue(result["equal"])
-        self.assertFalse(result["strict_equal"])
-        self.assertGreater(result["max_absolute_error"], 0)
-        self.assertFalse(compare_results(actual, vector(("a", 1.0), ("b", 1.0)), 1e-9, 1e-12)["equal"])
-        self.assertFalse(compare_results(vector(("a", 1.1)), expected, 1e-9, 1e-12)["equal"])
-        with self.assertRaises(ValueError):
-            compare_results(actual, expected, float("nan"), 0)
-
-    def test_group_matching_is_not_row_position(self):
-        """Permuting a group-by result does not change correctness."""
-        result = compare_results(vector(("b", 2), ("a", 1)), vector(("a", 1), ("b", 2)))
-        self.assertTrue(result["equal"])
-        self.assertEqual(result["completeness"], 1)
-
-    def test_missing_rows_and_zero_baseline_cannot_hide_errors(self):
-        """Report structural loss separately; zero denominators are not epsilon-clamped."""
-        result = compare_results(vector(("a", 2)), vector(("a", 0), ("b", 3)))
-        self.assertFalse(result["equal"])
-        self.assertEqual(result["missing_series"], 1)
-        self.assertEqual(result["max_absolute_error"], 2)
-        self.assertEqual(result["zero_baseline_mismatches"], 1)
-        self.assertIsNone(result["max_relative_error"])
-
-    def test_duplicates_and_errors_are_not_equal(self):
-        """Malformed or failed responses cannot become a successful empty comparison."""
-        for response in [{"status": "error"}, vector(("a", 1), ("a", 1))]:
-            self.assertFalse(compare_results(response, vector(("a", 1)))["comparable"])
-
-    def test_failed_or_missing_baseline_prevents_benefit_claim(self):
-        """Failures remain in the workload denominator; no successful-subset speedup."""
-        row = {"execution": "warm", "phase": "repeat", "elapsed_ns": 10,
-               "response": vector(("a", 1)), "exact": {"http_status": 500,
-               "elapsed_ns": 100, "response": {"status": "error"}}}
-        report = summarize([row])
-        self.assertEqual(report["occurrences"], 1)
-        self.assertIsNone(report["matched_query_latency_ratio"])
-        self.assertIsNone(report["end_to_end_benefit"])
-
-    def test_backend_cpu_includes_separate_fallback_service(self):
-        """A forwarded query cannot claim CPU savings by omitting Prometheus work."""
-        row = {"execution": "exact_fallback", "elapsed_ns": 10, "response": vector(("a", 1)),
-               "process_resources": {"backend": {"cpu_ns": 2}, "fallback_service": {"cpu_ns": 7},
-                                     "exact_service": {"cpu_ns": 99}},
-               "exact": {"http_status": 200, "elapsed_ns": 10, "response": vector(("a", 1)),
-                         "process_resources": {"exact_service": {"cpu_ns": 8}}}}
-        report = summarize([row])
-        self.assertEqual(report["backend_plus_fallback_cpu_ns"], 9)
-        self.assertEqual(report["baseline_cpu_ns"], 8)
-        del row["process_resources"]["fallback_service"]
-        del row["process_resources"]["exact_service"]
-        self.assertIsNone(summarize([row])["backend_plus_fallback_cpu_ns"])
-
-    def test_matrix_requires_the_same_timestamps_and_empty_series(self):
-        """Series and time coverage are part of correctness even without numeric samples."""
-        empty = {"status": "success", "data": {"resultType": "matrix", "result": []}}
-        series = {"status": "success", "data": {"resultType": "matrix", "result": [
-            {"metric": {"job": "a"}, "values": []}]}}
-        self.assertFalse(compare_results(empty, series)["equal"])
-
-    def test_pid_reuse_and_unreadable_processes_are_not_free_cpu(self):
-        """A missing counter or a different process lifetime must remain unknown."""
-        self.assertIsNone(process_delta(None, None))
-        self.assertIsNone(process_delta({"pid": 1, "start_ticks": 1}, {"pid": 1, "start_ticks": 2}))
-
-    def test_paired_replay_preserves_occurrences_time_and_alternates_order(self):
-        """Harness conformance only: stub responses are never benchmark evidence."""
-        from replay import replay
-        calls = []
-        def respond(url):
-            calls.append(url)
-            response = vector(("a", 1))
-            response["infos"] = ["data_source: asap_query"]
-            return {"response": response, "http_status": 200, "headers": {}, "elapsed_ns": 10}
-        queries = [{"id": x, "query": "sum(up{job=\"a\"})", "eval_timestamp_ms": 1234567} for x in ["a", "b"]]
-        with tempfile.TemporaryDirectory() as folder, patch("replay.request", side_effect=respond):
-            rows = replay(queries, "http://backend", Path(folder), 2, "http://exact")
-        self.assertEqual(len(rows), 4)
-        self.assertTrue(all(r["comparison"]["equal"] for r in rows))
-        self.assertEqual([urlparse(u).netloc for u in calls[:4]], ["exact", "backend", "backend", "exact"])
-        for url in calls:
-            self.assertEqual(parse_qs(urlparse(url).query), {"query": [queries[0]["query"]], "time": ["1234.567"]})
-
-
-if __name__ == "__main__":
-    unittest.main()
diff --git a/tools/o11y-execution/test_discover_snapshot.py b/tools/o11y-execution/test_discover_snapshot.py
deleted file mode 100644
index e062430d0..000000000
--- a/tools/o11y-execution/test_discover_snapshot.py
+++ /dev/null
@@ -1,42 +0,0 @@
-import json
-from pathlib import Path
-import subprocess
-import tempfile
-import unittest
-
-
-class DiscoverSnapshotTests(unittest.TestCase):
-    def test_historical_input_does_not_backdate_plan_activation(self):
-        script = Path(__file__).with_name("discover_snapshot.py")
-        template = Path(__file__).parents[2] / "docs/examples/asapquery-planning-snapshot.json"
-        with tempfile.TemporaryDirectory() as folder:
-            root = Path(folder)
-            corpus = root / "queries.json"
-            metrics = root / "metrics.prom"
-            output = root / "snapshot.json"
-            corpus.write_text(json.dumps({
-                "upstream_revision": "test",
-                "queries": [{"id": "q", "query": "max_over_time(m[1m])", "eval_timestamp_ms": 120_000}],
-            }))
-            metrics.write_text("m{job=\"test\"} 1 60\nm{job=\"test\"} 2 120\n")
-            subprocess.run([
-                "python3", str(script), "--corpus", str(corpus), "--metrics", str(metrics),
-                "--template", str(template), "--output", str(output), "--repetitions", "1",
-            ], check=True)
-            snapshot = json.loads(output.read_text())
-            self.assertEqual(snapshot["snapshot_version"], 3)
-            self.assertEqual(snapshot["environment"]["dataset_identity"],
-                             json.loads(template.read_text())["environment"]["dataset_identity"])
-            self.assertEqual(snapshot["query_workload"]["repeating_queries"][0]["demand"], {"fixed_interval_at": {"interval": 60000, "evaluation_phase": 0}})
-            # Discovery output must obey the same schema as the compiler input.
-            self.assertIsNone(snapshot["query_workload"]["repeating_queries"][0]["time_selection"].get("lookback"))
-            self.assertEqual(snapshot["implementation"]["scrape_interval_ms"], 60_000)
-            self.assertNotIn("source_sample_interval_ms", snapshot["implementation"])
-            environment = snapshot["environment"]
-            self.assertEqual(environment["activation_unix_ms"], environment["observed_at_unix_ms"])
-            provenance = json.loads(output.with_suffix(".provenance.json").read_text())
-            self.assertEqual(provenance["first_timestamp_ms"], 60_000)
-
-
-if __name__ == "__main__":
-    unittest.main()
diff --git a/tools/o11y-execution/test_process_lifecycle.py b/tools/o11y-execution/test_process_lifecycle.py
deleted file mode 100644
index 699cb2916..000000000
--- a/tools/o11y-execution/test_process_lifecycle.py
+++ /dev/null
@@ -1,38 +0,0 @@
-import subprocess
-import sys
-import unittest
-from process_lifecycle import stop
-
-
-class LifecycleTests(unittest.TestCase):
-    def test_lifetime_wait4_not_shutdown_delta(self):
-        child = subprocess.Popen([sys.executable, '-u', '-c',
-            'import time; end=time.process_time()+.05\nwhile time.process_time()<end: pass\nprint("ready", flush=True)\ntime.sleep(20)'], stdout=subprocess.PIPE, text=True)
-        try:
-            self.assertEqual(child.stdout.readline().strip(), 'ready')
-            usage = stop(child)
-            self.assertGreater(usage['lifetime_cpu_ns'], 30_000_000)
-            self.assertGreater(usage['lifetime_peak_rss_bytes'], 0)
-            self.assertFalse(usage['forced_kill'])
-            self.assertIsNone(usage['usage_unavailable_reason'])
-        finally:
-            if child.returncode is None:
-                child.kill(); child.wait()
-            child.stdout.close()
-
-    def test_already_reaped_is_unknown_not_zero(self):
-        child = subprocess.Popen([sys.executable, '-c', 'pass'])
-        child.wait()
-        self.assertIsNone(stop(child)['lifetime_cpu_ns'])
-
-    def test_forced_kill_is_recorded(self):
-        child = subprocess.Popen([sys.executable, '-u', '-c',
-            'import signal,time;signal.signal(signal.SIGTERM, signal.SIG_IGN);print("ready",flush=True);time.sleep(20)'], stdout=subprocess.PIPE, text=True)
-        try:
-            child.stdout.readline()
-            self.assertTrue(stop(child, timeout=.01)['forced_kill'])
-            self.assertIsNotNone(child.returncode)
-        finally:
-            if child.returncode is None:
-                child.kill(); child.wait()
-            child.stdout.close()
diff --git a/tools/o11y-execution/test_query_sweep.py b/tools/o11y-execution/test_query_sweep.py
deleted file mode 100644
index f2b967a0a..000000000
--- a/tools/o11y-execution/test_query_sweep.py
+++ /dev/null
@@ -1,32 +0,0 @@
-"""CPU scope checks for repetition amortization reports."""
-import json
-from pathlib import Path
-from tempfile import TemporaryDirectory
-import unittest
-from query_sweep import trial_summary
-
-
-class SweepTests(unittest.TestCase):
-    def test_setup_charges_fallback_and_planning_but_keeps_query_batch_separate(self):
-        # Background/setup work cannot disappear when a warm query avoids fallback.
-        values = lambda a, b, c: {"backend": {"cpu_ns": a}, "fallback_service": {"cpu_ns": b}, "exact_service": {"cpu_ns": c}}
-        with TemporaryDirectory() as directory:
-            folder = Path(directory)
-            (folder / "replay").mkdir()
-            report = {"all_requests": {}, "by_execution_detail": {}, "estimated_cost": {},
-                      "planning_resources": {"cpu_ns": 7}, "process_phases": {
-                          "after_ingest_and_drain": values(10, 20, 15), "after_queries": values(13, 20, 19)}}
-            batch = {"resources": values(3, 0, 4), "first_pass_resources": values(1, 0, 2),
-                     "repeat_resources": values(2, 0, 2), "cpu_tick_ns": 1}
-            for name, content in (("comparison", report), ("query-batch-resources", batch)):
-                (folder / f"replay/{name}.json").write_text(json.dumps(content))
-            sides = trial_summary(folder)["sides"]
-            self.assertEqual(sides["backend_plus_fallback"]["setup_and_all_updates_cpu_ns"], 37)
-            self.assertEqual(sides["backend_plus_fallback"]["setup_update_query_cpu_ns"], 40)
-            self.assertEqual(sides["backend_plus_fallback"]["query_batch_cpu_ns"], 3)
-            self.assertTrue(sides["backend_plus_fallback"]["query_cpu_censored"])
-            self.assertEqual(sides["prometheus"]["setup_update_query_cpu_ns"], 19)
-
-
-if __name__ == "__main__":
-    unittest.main()
diff --git a/tools/o11y-execution/test_replay.py b/tools/o11y-execution/test_replay.py
deleted file mode 100644
index 78f33a01f..000000000
--- a/tools/o11y-execution/test_replay.py
+++ /dev/null
@@ -1,99 +0,0 @@
-"""Behavioral tests for the real-workload replay boundary (not speedup evidence)."""
-import unittest
-from unittest.mock import patch
-from tempfile import TemporaryDirectory
-from pathlib import Path
-
-from replay import execution_provenance, classify, validate_workload, encode_write, parse_samples, replay, validate_sample_file, ingest_sample_file
-
-
-class ReplayTests(unittest.TestCase):
-    def test_binding_or_unattributed_success_is_not_execution(self):
-        """Only an actual successful, attributed response establishes a route."""
-        self.assertEqual(classify({"status": "bound"}), "failed")
-        self.assertEqual(classify({"status": "success"}), "failed")
-        for source, expected in [("asap_query", "warm"), ("exact_fallback", "exact_fallback")]:
-            response = {"status": "success", "infos": [f"data_source: {source}"]}
-            self.assertEqual(classify(response), expected)
-            response["status"] = "error"
-            self.assertEqual(classify(response), "failed")
-        self.assertEqual(classify({"status": "success", "infos": ["data_source: asap_query"]},
-                                  {"x-asap-execution": "exact_fallback"}), "exact_fallback")
-
-    def test_hybrid_is_not_counted_as_pure_summary_acceleration(self):
-        response = {"status": "success", "infos": ["data_source: asap_query"]}
-        headers = {"x-asap-execution": "hybrid", "x-asap-execution-detail": "hybrid",
-                   "x-asap-raw-scan-evaluations": "2", "x-asap-summary-readout-evaluations": "1"}
-        self.assertEqual(classify(response, headers), "hybrid")
-        self.assertEqual(execution_provenance(response, headers)["summary_readout_evaluations"], 1)
-        self.assertEqual(classify(response, {"x-asap-execution": "failed"}), "failed")
-
-    def test_corpus_occurrences_preserved_but_all_unique_queries_registered(self):
-        """The harness cannot quietly replace or omit upstream queries."""
-        corpus = {"upstream_revision": "abc", "queries": [
-            {"id": "a", "query": "up", "eval_timestamp_ms": 1000},
-            {"id": "b", "query": "up", "eval_timestamp_ms": 1000}]}
-        snapshot = {"query_workload": {"repeating_queries": [{"query": "up"}]}}
-        self.assertEqual(len(validate_workload(snapshot, corpus)), 2)
-        snapshot["query_workload"]["repeating_queries"] = [{"query": "synthetic"}]
-        with self.assertRaises(ValueError):
-            validate_workload(snapshot, corpus)
-
-    def test_timestamped_metrics_keep_labels_values_and_time(self):
-        """A data adapter must not shift timestamps or lose histogram labels."""
-        rows = parse_samples(['# TYPE x histogram', 'x_bucket{le="1",job="a"} 2 1.234'])
-        self.assertEqual(rows, [({"__name__": "x_bucket", "le": "1", "job": "a"}, 2.0, 1234)])
-        self.assertTrue(encode_write(rows))
-
-    def test_odd_corpus_alternates_pair_order_across_repetitions(self):
-        """An odd corpus must not fix every occurrence to the same pair order."""
-        response = {"http_status": 200, "headers": {}, "elapsed_ns": 1,
-                    "response": {"status": "success", "infos": ["data_source: asap_query"],
-                                 "data": {"resultType": "vector", "result": []}}}
-        with TemporaryDirectory() as directory, patch("replay.request", return_value=response):
-            rows = replay([{"id": "q", "query": "up", "eval_timestamp_ms": 0}],
-                          "http://backend", Path(directory), 2, "http://exact")
-        self.assertEqual([r["pair_order"] for r in rows], ["exact_first", "backend_first"])
-
-    def test_advancing_batch_ends_at_original_time_without_per_rpc_probes(self):
-        """Moving windows preserve paired timestamps and never move beyond the corpus endpoint."""
-        response = {"http_status": 200, "headers": {}, "elapsed_ns": 1,
-                    "response": {"status": "success", "data": {"resultType": "vector", "result": []}}}
-        with TemporaryDirectory() as directory, patch("replay.request", side_effect=AssertionError("per-RPC probe")), \
-             patch("replay._http_request", return_value=response) as http, \
-             patch("replay.process_snapshots", return_value={}) as probes:
-            rows = replay([{"id": "q", "query": "up", "eval_timestamp_ms": 3000}],
-                          "http://backend", Path(directory), 3, "http://exact",
-                          evaluation_step_ms=1000, batch_resources=True)
-            self.assertEqual([r["eval_timestamp_ms"] for r in rows], [1000, 2000, 3000])
-            self.assertEqual([r["original_eval_timestamp_ms"] for r in rows], [3000] * 3)
-            self.assertEqual(http.call_count, 6)
-            self.assertEqual(probes.call_count, 3)
-            self.assertTrue((Path(directory) / "query-batch-resources.json").exists())
-
-    def test_file_validation_and_ingestion_stream_without_read_text(self):
-        with TemporaryDirectory() as directory:
-            root = Path(directory)
-            metrics = root / "metrics.prom"
-            metrics.write_text("x{job=\"a\"} 1 1\nx{job=\"a\"} 2 2\n")
-            self.assertEqual(validate_sample_file(metrics), 2)
-            captured = []
-            def consume(rows, endpoints, output):
-                self.assertNotIsInstance(rows, list)
-                captured.extend(rows)
-            with patch("replay.ingest", side_effect=consume):
-                ingest_sample_file(metrics, ["http://example"], root)
-                self.assertEqual(captured, [
-                    ({"__name__": "x", "job": "a"}, 1.0, 1000),
-                    ({"__name__": "x", "job": "a"}, 2.0, 2000),
-                ])
-
-    def test_bad_input_fails_before_any_ingest(self):
-        """No silent sample drops, duplicate samples, or time reordering."""
-        for lines in [["x NaN 1"], ["x 1"], ["x 1 2", "x 2 1"], ["x 1 1", "x 2 1"]]:
-            with self.assertRaises(ValueError):
-                parse_samples(lines)
-
-
-if __name__ == "__main__":
-    unittest.main()
diff --git a/tools/o11y-execution/test_summarize.py b/tools/o11y-execution/test_summarize.py
deleted file mode 100644
index 3969a2517..000000000
--- a/tools/o11y-execution/test_summarize.py
+++ /dev/null
@@ -1,57 +0,0 @@
-import copy
-import unittest
-from summarize import query_cost_comparison, MODEL
-
-
-class CostScopeTests(unittest.TestCase):
-    def setUp(self):
-        self.plan = {'cost_comparison': {'model_version': MODEL, 'data_snapshot_id': 'sha256:abc', 'selected_plan_id': 1,
-                    'selected_manifest': {'plan_id': 1, 'workload': {'q': {'query': 'sum(up)'}}, 'components': {
-                        'query:q:0': {'multiplicity': 2, 'unit': 'query_evaluation'},
-                        'result:q': {'multiplicity': 2, 'unit': 'query_evaluation'}}},
-                    'component_costs': {'query:q:0': 100, 'result:q': 0, 'source:x': 999}}}
-        self.report = {'all_requests': {'backend_plus_fallback_cpu_ns': 200}}
-        self.queries = [{'query': 'sum(up)'}, {'query': 'sum(up)'}]
-        self.run = {'inputs': {'data': 'abc'}}
-
-    def result(self):
-        return query_cost_comparison(self.plan, self.report, self.queries, self.run)
-
-    def test_query_only_already_weighted(self):
-        self.assertEqual(self.result()['estimated_over_measured_ratio'], .5)
-        self.assertEqual(self.result()['estimated_query_cpu_ns'], 100)
-
-    def test_wrong_demand(self):
-        self.queries.pop()
-        self.assertFalse(self.result()['available'])
-
-    def test_wrong_units(self):
-        self.plan['cost_comparison']['model_version'] = 'analytical'
-        self.assertFalse(self.result()['available'])
-
-    def test_wrong_input(self):
-        self.run['inputs']['data'] = 'other'
-        self.assertFalse(self.result()['available'])
-
-    def test_missing_cpu(self):
-        self.report['all_requests']['backend_plus_fallback_cpu_ns'] = None
-        self.assertFalse(self.result()['available'])
-
-    def test_missing_component(self):
-        del self.plan['cost_comparison']['component_costs']['result:q']
-        self.assertFalse(self.result()['available'])
-
-    def test_verified_snapshot_maps_original_text_by_compiler_id(self):
-        cost = self.plan['cost_comparison']
-        manifest = cost['selected_manifest']
-        manifest['workload']['compat-query-0'] = manifest['workload'].pop('q')
-        for mapping in [manifest['components'], cost['component_costs']]:
-            for old in list(mapping):
-                if ':q' in old:
-                    mapping[old.replace(':q', ':compat-query-0')] = mapping.pop(old)
-        self.queries = [{'query': 'sum (up)'}, {'query': 'sum (up)'}]
-        snapshot = {'query_workload': {'repeating_queries': [{'query': 'sum (up)'}]},
-                    'workload_cost_evidence': {'model_version': MODEL, 'quotes': [{'manifest': copy.deepcopy(manifest)}]}}
-        self.assertTrue(query_cost_comparison(self.plan, self.report, self.queries, self.run, snapshot)['available'])
-        snapshot['workload_cost_evidence']['quotes'][0]['manifest']['plan_id'] = 999
-        self.assertFalse(query_cost_comparison(self.plan, self.report, self.queries, self.run, snapshot)['available'])
diff --git a/tools/o11y-execution/update_global_profile.py b/tools/o11y-execution/update_global_profile.py
deleted file mode 100644
index c55fe1e0a..000000000
--- a/tools/o11y-execution/update_global_profile.py
+++ /dev/null
@@ -1,65 +0,0 @@
-#!/usr/bin/env python3
-"""Replace enumeration seeds with a conservative measured shared CPU-only model.
-
-The current snapshot schema has one implementation profile, not per-state costs.
-This uses maxima of inclusive candidate measurements as conservative coarse
-inputs. Zero network/scan fields are explicitly excluded model dimensions, not
-claims of zero bytes. Complete final quotes still require actual candidate runs.
-"""
-import argparse
-import hashlib
-import json
-from pathlib import Path
-from calibrate import nonnegative
-
-
-def update(snapshot, measurements, sample_count):
-    rows = [r for r in measurements["candidates"] if r.get("executable")]
-    if measurements.get("units") != "cpu_ns" or not rows or sample_count <= 0:
-        raise ValueError("requires executable CPU measurements and positive sample count")
-    horizon = snapshot["implementation"]["horizon_seconds"]
-    if any(r["horizon_seconds"] != horizon for r in rows):
-        raise ValueError("measurement horizon does not match snapshot")
-    def phase(name):
-        return max(nonnegative(r["horizon_phases"][name]["cpu_ns"], name) for r in rows)
-    reads = []
-    for row in rows:
-        for query in row["queries"].values():
-            if query["evaluations"] <= 0 or not query.get("correct") or query.get("classification") not in ("warm", "hybrid", "exact_fallback"):
-                raise ValueError("profile requires successful correct query measurements")
-            reads.append(nonnegative(query["cpu_ns"], "query CPU") / query["evaluations"])
-    costs = {"build": phase("install"), "maintenance_per_update": phase("ingest_and_build") / sample_count,
-             "read": max(reads), "retention_per_second": phase("residency") / horizon,
-             "retirement": phase("retirement")}
-    cpu = sum(phase(p) for p in ("install", "ingest_and_build", "residency", "retirement"))
-    impl = snapshot["implementation"]
-    impl["lifecycle_costs"] = costs
-    impl["window_cost_model"]["cost"].update(model_version="measured-inclusive-coarse-cpu-only-v1", cpu_cost=cpu,
-        weighted_cost=cpu, peak_memory_bytes=int(max(nonnegative(r["resources"]["peak_memory_bytes"], "peak memory") for r in rows)),
-        storage_bytes=int(max(nonnegative(r["resources"]["storage_bytes"], "storage") for r in rows)),
-        network_bytes=0, source_scan_bytes=0)
-    snapshot.pop("workload_cost_evidence", None)
-    return snapshot, {"model": "shared conservative inclusive CPU-only profile",
-        "method": "maximum observed complete-candidate phase costs; ingestion/build divided by actual sample count; query read maximum inclusive CPU per evaluation",
-        "limitations": ["Global profile is not per-state timing; inclusive costs can overestimate each maintained state",
-                        "Residency CPU is measured accelerated replay wall time, not extrapolated to the logical horizon",
-                        "network_bytes and source_scan_bytes zero fields are excluded from this CPU-only model, not measured zero traffic/scans",
-                        "Changing this profile requires candidate regeneration and verification before final quote creation"],
-        "sample_count": sample_count, "lifecycle_costs": costs}
-
-
-def main():
-    parser = argparse.ArgumentParser(description=__doc__)
-    parser.add_argument("--snapshot", type=Path, required=True)
-    parser.add_argument("--measurements", type=Path, required=True)
-    parser.add_argument("--sample-count", type=int, required=True)
-    parser.add_argument("--output", type=Path, required=True)
-    args = parser.parse_args()
-    snapshot, audit = update(json.loads(args.snapshot.read_text()), json.loads(args.measurements.read_text()), args.sample_count)
-    audit["measurement_sha256"] = hashlib.sha256(args.measurements.read_bytes()).hexdigest()
-    args.output.write_text(json.dumps(snapshot, indent=2, allow_nan=False) + "\n")
-    args.output.with_suffix(".profile.json").write_text(json.dumps(audit, indent=2, allow_nan=False) + "\n")
-
-
-if __name__ == "__main__":
-    main()
diff --git a/tools/o11y-sql-main-eval/REPORT.md b/tools/o11y-sql-main-eval/REPORT.md
deleted file mode 100644
index 66b41f47f..000000000
--- a/tools/o11y-sql-main-eval/REPORT.md
+++ /dev/null
@@ -1,123 +0,0 @@
-# ClickHouse SQL 27-query acceptance matrix on current `main`
-
-This report records a fresh run against backend commit
-`791f7d7b0feab3827e7e6f5100e65ef29aec68de`. That commit contains the merged
-shared-DAG ClickHouse path from #589. The corpus is the 27-query o11y corpus
-previously used by #560, but none of #560's classifications or runtime output
-is reused. Its SHA-256 is recorded in `artifacts/corpus.sha256`.
-
-## Result
-
-| Mode | Queries |
-|---|---:|
-| warm | 0 |
-| partial hybrid | 0 |
-| exact fallback | 27 |
-| request failure | 0 |
-
-The parser and Planner accept q05, q06, and q23 and select an exact MinMax
-summary followed by shared relational Project/Sort/Limit nodes. Publication
-rejects all three because the `metric = ...` table predicate has no canonical
-population binding in the summary catalog. The other 24 queries fail closed in
-the SQL frontend. Every query was sent through the production ClickHouse HTTP
-listener with an installed, validated current-generation catalog and a real
-ClickHouse 26.8.2.7 exact backend. The accelerator returns `Planning` for the 24
-frontend misses and `CatalogMiss` for the three entries whose publication was
-refused. The listener then executed exact ClickHouse: all 27 responses were HTTP
-200 and byte-for-byte equal to a direct request sent to the same exact backend.
-The artifacts record `fallback_requested`, `exact_executed`, `exact_success`,
-both HTTP statuses, response provenance headers, and the returned result.
-
-The machine-readable per-query evidence is in `artifacts/matrix.json`. Full
-canonical AST, selected post-ASAP tree, publication result, and data-plane
-routing reason are retained in the other JSON artifacts.
-
-## Operator and dialect gaps
-
-The first failing stage is more useful than assigning each query to its intended
-PromQL operator: most SQL mappings encode Prometheus semantics with nested
-ClickHouse-native expressions, so the frontend cannot reach the logical
-aggregation operator.
-
-| First gap | Count | Queries |
-|---|---:|---|
-| Nested SELECT/alias parsing (`found: ,`) | 7 | q08, q13, q14, q19, q20, q22, q24 |
-| Qualified derived-table columns (`found: .`) | 4 | q01, q02, q17, q25 |
-| Empty `map()` / derived alias parsing (`found: )`) | 3 | q03, q04, q16 |
-| Metric population predicate cannot bind to SDS | 3 | q05, q06, q23 |
-| Alias parsing after derived relation (`found: labels`) | 3 | q11, q18, q26 |
-| ClickHouse modulo operator/function | 2 | q10, q27 |
-| `mapConcat` | 1 | q07 |
-| Zero-argument `map()` | 1 | q09 |
-| Map indexing | 1 | q12 |
-| Array indexing | 1 | q15 |
-| Tuple field access | 1 | q21 |
-
-The corpus contains 13 `sum`, 11 `rate`, 8 `increase`, 8 division, 8 `topk`,
-6 `max_over_time`, 4 subquery, 2 offset, and one each of sorting, comparison,
-histogram quantile, scalar, and `avg_over_time` workloads. These counts describe
-the intended workload; they are not claims of SQL support. Only the three
-MinMax workloads currently reach post-ASAP selection.
-
-The SDS predicate failure is the smallest production gap, but accepting it
-requires a typed population identity for table predicates and matching
-ClickHouse backfill/ingest routing. Encoding the predicate as an ad hoc string
-inside the runner would produce a catalog entry that the producer cannot safely
-maintain, so this evaluation keeps the production fail-closed behavior.
-
-## Data-structure drift audit
-
-The merged production path has one backend query-plan identity and node model:
-
-- `asap_types::QueryLanguage` is the backend-wide language tag and is re-exported
-  by `control_plane::query_plan`; storage adapters also re-export the same type.
-- `QueryNodeId`, `QueryPlanNode`, `MaterializationBinding`, `PhysicalGrouping`,
-  `ExternalExactRequest`, and `FixedEvaluationRange` each have one definition in
-  `control_plane::query_plan`. ClickHouse compilation and both data-plane engines
-  consume those definitions directly.
-- Summary identities are `asap_types::sds::SummaryDefinitionId` end to end.
-  `MaterializationBinding` references that ID and validation resolves it through
-  the authoritative `SummaryCatalog` before installation.
-- Relational node schemas use ASAPPlanner's `SummarySchema` in the published
-  shared DAG and in data-plane execution. `ClickHouseRelation` is a runtime row
-  carrier and does not define a second published schema contract.
-- `ClickHousePlanningContext` is embedded in the shared `QueryPlan`; there is no
-  ClickHouse sidecar plan catalog, activation generation, materialization ID, or
-  parallel execution-node enum on `main`.
-
-Two similarly named language types remain across the Planner boundary:
-`planner_types::workload::QueryLanguage` describes Planner workload input and
-`asap_types::QueryLanguage` identifies backend serving entries. Their variants
-and roles differ, and conversion happens at compilation; they are not parallel
-backend catalogs. The SQL-specific request/response, table row adapter, schema
-catalog, and exact HTTP backend types are protocol adapters around the shared
-plan.
-
-The `data_plane::query_engines::canonical` module is production code: the SQL
-relational adapter uses its common executor and `RelationalAdapter` trait. Its
-comment calls the underlying PromQL file location a compatibility location,
-but the exposed types are shared and no stale SQL-only duplicate was found.
-The large hand-built plans in ClickHouse accelerator tests are test fixtures;
-they mirror wire values to exercise coverage, typed exact leaves, joins, and
-relational nodes, but they are not a production planning path.
-
-## Reproduction
-
-From a checkout descended from the recorded baseline:
-
-```bash
-tools/o11y-sql-main-eval/reproduce.sh
-```
-
-Artifacts:
-
-- `artifacts/frontend-planner-publication.json`
-- `artifacts/data-plane-routing.json`
-- `artifacts/matrix.json`
-- `artifacts/baseline.txt`
-- `artifacts/corpus.sha256`
-
-The run validates exact fallback execution and response equality through the
-production HTTP listener against live ClickHouse. It does not claim accelerated
-versus exact value equality or performance benefit because no query is published
-into a warm or hybrid state on this corpus.
diff --git a/tools/o11y-sql-main-eval/artifacts/baseline.txt b/tools/o11y-sql-main-eval/artifacts/baseline.txt
deleted file mode 100644
index 2dcc8d9a9..000000000
--- a/tools/o11y-sql-main-eval/artifacts/baseline.txt
+++ /dev/null
@@ -1 +0,0 @@
-791f7d7b0feab3827e7e6f5100e65ef29aec68de Add a strict multi-fit ERP Figure 1 runner (#592)
diff --git a/tools/o11y-sql-main-eval/artifacts/corpus.sha256 b/tools/o11y-sql-main-eval/artifacts/corpus.sha256
deleted file mode 100644
index 5642a1564..000000000
--- a/tools/o11y-sql-main-eval/artifacts/corpus.sha256
+++ /dev/null
@@ -1 +0,0 @@
-ec6db7ca425a3a77e8a810de5ed2928ca6d535476f8bb10f4e68a15b8887b24a  /mydata/asapquery-sql27-main/tools/o11y-sql-main-eval/corpus.json
diff --git a/tools/o11y-sql-main-eval/artifacts/data-plane-routing.json b/tools/o11y-sql-main-eval/artifacts/data-plane-routing.json
deleted file mode 100644
index e6f9ac172..000000000
--- a/tools/o11y-sql-main-eval/artifacts/data-plane-routing.json
+++ /dev/null
@@ -1,355 +0,0 @@
-{
-  "queries": [
-    {
-      "acceleration_reason": "Planning(\"SQL lowering failed: DataFusion error: SQL error: ParserError(\\\"Expected: joined table, found: .\\\")\")",
-      "clickhouse_exception_code": null,
-      "clickhouse_summary": "{\"read_rows\":\"40960\",\"read_bytes\":\"4192978\",\"written_rows\":\"0\",\"written_bytes\":\"0\",\"total_rows_to_read\":\"40960\",\"result_rows\":\"0\",\"result_bytes\":\"0\",\"elapsed_ns\":\"124613711\",\"memory_usage\":\"5790933\"}",
-      "direct_exact_status": 200,
-      "exact_executed": true,
-      "exact_status": 200,
-      "exact_success": true,
-      "fallback_requested": true,
-      "id": "q01",
-      "matches_direct_exact": true,
-      "result": "{'job':'payment-service'}\t0.09651474530831099\n{'job':'order-service'}\t0.04043126684636118\n{'job':'user-service'}\t0.03504043126684636\n"
-    },
-    {
-      "acceleration_reason": "Planning(\"SQL lowering failed: DataFusion error: SQL error: ParserError(\\\"Expected: joined table, found: .\\\")\")",
-      "clickhouse_exception_code": null,
-      "clickhouse_summary": "{\"read_rows\":\"40960\",\"read_bytes\":\"4192978\",\"written_rows\":\"0\",\"written_bytes\":\"0\",\"total_rows_to_read\":\"40960\",\"result_rows\":\"0\",\"result_bytes\":\"0\",\"elapsed_ns\":\"161313045\",\"memory_usage\":\"5793981\"}",
-      "direct_exact_status": 200,
-      "exact_executed": true,
-      "exact_status": 200,
-      "exact_success": true,
-      "fallback_requested": true,
-      "id": "q02",
-      "matches_direct_exact": true,
-      "result": "{'job':'payment-service'}\t0.09651474530831099\n"
-    },
-    {
-      "acceleration_reason": "Planning(\"SQL lowering failed: DataFusion error: SQL error: ParserError(\\\"Expected: identifier, found: )\\\")\")",
-      "clickhouse_exception_code": null,
-      "clickhouse_summary": "{\"read_rows\":\"24576\",\"read_bytes\":\"2065212\",\"written_rows\":\"0\",\"written_bytes\":\"0\",\"total_rows_to_read\":\"24576\",\"result_rows\":\"0\",\"result_bytes\":\"0\",\"elapsed_ns\":\"65564208\",\"memory_usage\":\"1999791\"}",
-      "direct_exact_status": 200,
-      "exact_executed": true,
-      "exact_status": 200,
-      "exact_success": true,
-      "fallback_requested": true,
-      "id": "q03",
-      "matches_direct_exact": true,
-      "result": "{}\t0.017857142857142856\n"
-    },
-    {
-      "acceleration_reason": "Planning(\"SQL lowering failed: DataFusion error: SQL error: ParserError(\\\"Expected: identifier, found: )\\\")\")",
-      "clickhouse_exception_code": null,
-      "clickhouse_summary": "{\"read_rows\":\"24576\",\"read_bytes\":\"2065212\",\"written_rows\":\"0\",\"written_bytes\":\"0\",\"total_rows_to_read\":\"24576\",\"result_rows\":\"0\",\"result_bytes\":\"0\",\"elapsed_ns\":\"47389095\",\"memory_usage\":\"2022831\"}",
-      "direct_exact_status": 200,
-      "exact_executed": true,
-      "exact_status": 200,
-      "exact_success": true,
-      "fallback_requested": true,
-      "id": "q04",
-      "matches_direct_exact": true,
-      "result": "{}\t0.017241379310344827\n"
-    },
-    {
-      "acceleration_reason": "CatalogMiss",
-      "clickhouse_exception_code": null,
-      "clickhouse_summary": "{\"read_rows\":\"24576\",\"read_bytes\":\"1737396\",\"written_rows\":\"0\",\"written_bytes\":\"0\",\"total_rows_to_read\":\"24576\",\"result_rows\":\"0\",\"result_bytes\":\"0\",\"elapsed_ns\":\"9692977\",\"memory_usage\":\"2940118\"}",
-      "direct_exact_status": 200,
-      "exact_executed": true,
-      "exact_status": 200,
-      "exact_success": true,
-      "fallback_requested": true,
-      "id": "q05",
-      "matches_direct_exact": true,
-      "result": "{'job':'api-gateway','instance':'api-gateway:8081'}\t0\n{'job':'order-service','instance':'order-service:8083'}\t0\n{'job':'payment-service','instance':'payment-service:8084'}\t0\n{'job':'user-service','instance':'user-service:8082'}\t530\n{'job':'webapp','instance':'webapp:8080'}\t0\n"
-    },
-    {
-      "acceleration_reason": "CatalogMiss",
-      "clickhouse_exception_code": null,
-      "clickhouse_summary": "{\"read_rows\":\"6596\",\"read_bytes\":\"639068\",\"written_rows\":\"0\",\"written_bytes\":\"0\",\"total_rows_to_read\":\"6596\",\"result_rows\":\"0\",\"result_bytes\":\"0\",\"elapsed_ns\":\"10163560\",\"memory_usage\":\"1267007\"}",
-      "direct_exact_status": 200,
-      "exact_executed": true,
-      "exact_status": 200,
-      "exact_success": true,
-      "fallback_requested": true,
-      "id": "q06",
-      "matches_direct_exact": true,
-      "result": "{'job':'user-service','instance':'user-service:8082'}\t530\n"
-    },
-    {
-      "acceleration_reason": "Planning(\"SQL lowering failed: DataFusion error: Error during planning: Invalid function 'mapconcat'.\\nDid you mean 'concat'?\")",
-      "clickhouse_exception_code": null,
-      "clickhouse_summary": "{\"read_rows\":\"6596\",\"read_bytes\":\"639068\",\"written_rows\":\"0\",\"written_bytes\":\"0\",\"total_rows_to_read\":\"6596\",\"result_rows\":\"0\",\"result_bytes\":\"0\",\"elapsed_ns\":\"10933695\",\"memory_usage\":\"1306007\"}",
-      "direct_exact_status": 200,
-      "exact_executed": true,
-      "exact_status": 200,
-      "exact_success": true,
-      "fallback_requested": true,
-      "id": "q07",
-      "matches_direct_exact": true,
-      "result": "{'job':'user-service','instance':'user-service:8082','__name__':'user_service_cache_refresh_lag_seconds'}\t0\n"
-    },
-    {
-      "acceleration_reason": "Planning(\"SQL lowering failed: DataFusion error: SQL error: ParserError(\\\"Expected: joined table, found: ,\\\")\")",
-      "clickhouse_exception_code": null,
-      "clickhouse_summary": "{\"read_rows\":\"16384\",\"read_bytes\":\"1597946\",\"written_rows\":\"0\",\"written_bytes\":\"0\",\"total_rows_to_read\":\"16384\",\"result_rows\":\"0\",\"result_bytes\":\"0\",\"elapsed_ns\":\"38599942\",\"memory_usage\":\"3091395\"}",
-      "direct_exact_status": 200,
-      "exact_executed": true,
-      "exact_status": 200,
-      "exact_success": true,
-      "fallback_requested": true,
-      "id": "q08",
-      "matches_direct_exact": true,
-      "result": "{}\t0.007247222222222231\n"
-    },
-    {
-      "acceleration_reason": "Planning(\"SQL lowering failed: DataFusion error: Error during planning: Error during planning: map does not support zero arguments. No function matches the given name and argument types 'map()'. You might need to add explicit type casts.\\n\\tCandidate functions:\\n\\tmap(Any, .., Any)\")",
-      "clickhouse_exception_code": null,
-      "clickhouse_summary": "{\"read_rows\":\"16384\",\"read_bytes\":\"1572468\",\"written_rows\":\"0\",\"written_bytes\":\"0\",\"total_rows_to_read\":\"16384\",\"result_rows\":\"0\",\"result_bytes\":\"0\",\"elapsed_ns\":\"14678487\",\"memory_usage\":\"2788497\"}",
-      "direct_exact_status": 200,
-      "exact_executed": true,
-      "exact_status": 200,
-      "exact_success": true,
-      "fallback_requested": true,
-      "id": "q09",
-      "matches_direct_exact": true,
-      "result": "{}\t570522659\n"
-    },
-    {
-      "acceleration_reason": "Planning(\"SQL lowering failed: DataFusion error: Error during planning: Invalid function 'modulo'.\\nDid you mean 'today'?\")",
-      "clickhouse_exception_code": null,
-      "clickhouse_summary": "{\"read_rows\":\"16384\",\"read_bytes\":\"278528\",\"written_rows\":\"0\",\"written_bytes\":\"0\",\"total_rows_to_read\":\"16384\",\"result_rows\":\"0\",\"result_bytes\":\"0\",\"elapsed_ns\":\"12765529\",\"memory_usage\":\"1337455\"}",
-      "direct_exact_status": 200,
-      "exact_executed": true,
-      "exact_status": 200,
-      "exact_success": true,
-      "fallback_requested": true,
-      "id": "q10",
-      "matches_direct_exact": true,
-      "result": "{}\t631591324\n"
-    },
-    {
-      "acceleration_reason": "Planning(\"SQL lowering failed: DataFusion error: SQL error: ParserError(\\\"Expected: joined table, found: labels\\\")\")",
-      "clickhouse_exception_code": null,
-      "clickhouse_summary": "{\"read_rows\":\"16384\",\"read_bytes\":\"1597946\",\"written_rows\":\"0\",\"written_bytes\":\"0\",\"total_rows_to_read\":\"16384\",\"result_rows\":\"0\",\"result_bytes\":\"0\",\"elapsed_ns\":\"58732518\",\"memory_usage\":\"3865123\"}",
-      "direct_exact_status": 200,
-      "exact_executed": true,
-      "exact_status": 200,
-      "exact_success": true,
-      "fallback_requested": true,
-      "id": "q11",
-      "matches_direct_exact": true,
-      "result": "{'job':'payment-service'}\t0.0014705555555555587\n{'job':'order-service'}\t0.0014694444444444462\n"
-    },
-    {
-      "acceleration_reason": "Planning(\"SQL lowering failed: DataFusion error: This feature is not implemented: Map Access\")",
-      "clickhouse_exception_code": null,
-      "clickhouse_summary": "{\"read_rows\":\"16384\",\"read_bytes\":\"1572468\",\"written_rows\":\"0\",\"written_bytes\":\"0\",\"total_rows_to_read\":\"16384\",\"result_rows\":\"0\",\"result_bytes\":\"0\",\"elapsed_ns\":\"22346675\",\"memory_usage\":\"3161721\"}",
-      "direct_exact_status": 200,
-      "exact_executed": true,
-      "exact_status": 200,
-      "exact_success": true,
-      "fallback_requested": true,
-      "id": "q12",
-      "matches_direct_exact": true,
-      "result": "{'job':'webapp'}\t119294036\n{'job':'api-gateway'}\t116909806\n"
-    },
-    {
-      "acceleration_reason": "Planning(\"SQL lowering failed: DataFusion error: SQL error: ParserError(\\\"Expected: joined table, found: ,\\\")\")",
-      "clickhouse_exception_code": null,
-      "clickhouse_summary": "{\"read_rows\":\"16385\",\"read_bytes\":\"1597947\",\"written_rows\":\"0\",\"written_bytes\":\"0\",\"total_rows_to_read\":\"16385\",\"result_rows\":\"0\",\"result_bytes\":\"0\",\"elapsed_ns\":\"717890827\",\"memory_usage\":\"6499881\"}",
-      "direct_exact_status": 200,
-      "exact_executed": true,
-      "exact_status": 200,
-      "exact_success": true,
-      "fallback_requested": true,
-      "id": "q13",
-      "matches_direct_exact": true,
-      "result": "{}\t0.008770370370370298\n"
-    },
-    {
-      "acceleration_reason": "Planning(\"SQL lowering failed: DataFusion error: SQL error: ParserError(\\\"Expected: joined table, found: ,\\\")\")",
-      "clickhouse_exception_code": null,
-      "clickhouse_summary": "{\"read_rows\":\"24576\",\"read_bytes\":\"2212906\",\"written_rows\":\"0\",\"written_bytes\":\"0\",\"total_rows_to_read\":\"24576\",\"result_rows\":\"0\",\"result_bytes\":\"0\",\"elapsed_ns\":\"41261718\",\"memory_usage\":\"3274558\"}",
-      "direct_exact_status": 200,
-      "exact_executed": true,
-      "exact_status": 200,
-      "exact_success": true,
-      "fallback_requested": true,
-      "id": "q14",
-      "matches_direct_exact": true,
-      "result": "{}\t0.07\n"
-    },
-    {
-      "acceleration_reason": "Planning(\"SQL lowering failed: DataFusion error: SQL error: ParserError(\\\"Expected: joined table, found: [\\\")\")",
-      "clickhouse_exception_code": null,
-      "clickhouse_summary": "{\"read_rows\":\"24576\",\"read_bytes\":\"2212906\",\"written_rows\":\"0\",\"written_bytes\":\"0\",\"total_rows_to_read\":\"24576\",\"result_rows\":\"0\",\"result_bytes\":\"0\",\"elapsed_ns\":\"53541928\",\"memory_usage\":\"3781334\"}",
-      "direct_exact_status": 200,
-      "exact_executed": true,
-      "exact_status": 200,
-      "exact_success": true,
-      "fallback_requested": true,
-      "id": "q15",
-      "matches_direct_exact": true,
-      "result": "{'job':'user-service'}\t0.02\n{'job':'payment-service'}\t0.006666666666666667\n{'job':'order-service'}\t0.043333333333333335\n"
-    },
-    {
-      "acceleration_reason": "Planning(\"SQL lowering failed: DataFusion error: SQL error: ParserError(\\\"Expected: identifier, found: )\\\")\")",
-      "clickhouse_exception_code": null,
-      "clickhouse_summary": "{\"read_rows\":\"40960\",\"read_bytes\":\"3330802\",\"written_rows\":\"0\",\"written_bytes\":\"0\",\"total_rows_to_read\":\"40960\",\"result_rows\":\"0\",\"result_bytes\":\"0\",\"elapsed_ns\":\"75231363\",\"memory_usage\":\"3762184\"}",
-      "direct_exact_status": 200,
-      "exact_executed": true,
-      "exact_status": 200,
-      "exact_success": true,
-      "fallback_requested": true,
-      "id": "q16",
-      "matches_direct_exact": true,
-      "result": "{}\t0.04609929078014184\n"
-    },
-    {
-      "acceleration_reason": "Planning(\"SQL lowering failed: DataFusion error: SQL error: ParserError(\\\"Expected: joined table, found: .\\\")\")",
-      "clickhouse_exception_code": null,
-      "clickhouse_summary": "{\"read_rows\":\"40960\",\"read_bytes\":\"4192978\",\"written_rows\":\"0\",\"written_bytes\":\"0\",\"total_rows_to_read\":\"40960\",\"result_rows\":\"0\",\"result_bytes\":\"0\",\"elapsed_ns\":\"149860681\",\"memory_usage\":\"5793981\"}",
-      "direct_exact_status": 200,
-      "exact_executed": true,
-      "exact_status": 200,
-      "exact_success": true,
-      "fallback_requested": true,
-      "id": "q17",
-      "matches_direct_exact": true,
-      "result": "{'job':'payment-service'}\t0.09651474530831099\n"
-    },
-    {
-      "acceleration_reason": "Planning(\"SQL lowering failed: DataFusion error: SQL error: ParserError(\\\"Expected: joined table, found: labels\\\")\")",
-      "clickhouse_exception_code": null,
-      "clickhouse_summary": "{\"read_rows\":\"16384\",\"read_bytes\":\"1117896\",\"written_rows\":\"0\",\"written_bytes\":\"0\",\"total_rows_to_read\":\"16384\",\"result_rows\":\"0\",\"result_bytes\":\"0\",\"elapsed_ns\":\"392401904\",\"memory_usage\":\"5178170\"}",
-      "direct_exact_status": 200,
-      "exact_executed": true,
-      "exact_status": 200,
-      "exact_success": true,
-      "fallback_requested": true,
-      "id": "q18",
-      "matches_direct_exact": true,
-      "result": "{'job':'user-service'}\t23.00422018348624\n{'job':'payment-service'}\t46.008164714235\n{'job':'order-service'}\t79.01389377418221\n"
-    },
-    {
-      "acceleration_reason": "Planning(\"SQL lowering failed: DataFusion error: SQL error: ParserError(\\\"Expected: joined table, found: ,\\\")\")",
-      "clickhouse_exception_code": null,
-      "clickhouse_summary": "{\"read_rows\":\"8192\",\"read_bytes\":\"1028096\",\"written_rows\":\"0\",\"written_bytes\":\"0\",\"total_rows_to_read\":\"8192\",\"result_rows\":\"0\",\"result_bytes\":\"0\",\"elapsed_ns\":\"36567364\",\"memory_usage\":\"1867447\"}",
-      "direct_exact_status": 200,
-      "exact_executed": true,
-      "exact_status": 200,
-      "exact_success": true,
-      "fallback_requested": true,
-      "id": "q19",
-      "matches_direct_exact": true,
-      "result": "{}\t0.043333333333333335\n"
-    },
-    {
-      "acceleration_reason": "Planning(\"SQL lowering failed: DataFusion error: SQL error: ParserError(\\\"Expected: joined table, found: ,\\\")\")",
-      "clickhouse_exception_code": null,
-      "clickhouse_summary": "{\"read_rows\":\"8192\",\"read_bytes\":\"1028096\",\"written_rows\":\"0\",\"written_bytes\":\"0\",\"total_rows_to_read\":\"8192\",\"result_rows\":\"0\",\"result_bytes\":\"0\",\"elapsed_ns\":\"36440712\",\"memory_usage\":\"1867447\"}",
-      "direct_exact_status": 200,
-      "exact_executed": true,
-      "exact_status": 200,
-      "exact_success": true,
-      "fallback_requested": true,
-      "id": "q20",
-      "matches_direct_exact": true,
-      "result": "{}\t0.06666666666666667\n"
-    },
-    {
-      "acceleration_reason": "Planning(\"SQL lowering failed: DataFusion error: SQL error: ParserError(\\\"Expected: ), found: .1\\\")\")",
-      "clickhouse_exception_code": null,
-      "clickhouse_summary": "{\"read_rows\":\"0\",\"read_bytes\":\"0\",\"written_rows\":\"0\",\"written_bytes\":\"0\",\"total_rows_to_read\":\"0\",\"result_rows\":\"0\",\"result_bytes\":\"0\",\"elapsed_ns\":\"74591970\",\"memory_usage\":\"6236100\"}",
-      "direct_exact_status": 200,
-      "exact_executed": true,
-      "exact_status": 200,
-      "exact_success": true,
-      "fallback_requested": true,
-      "id": "q21",
-      "matches_direct_exact": true,
-      "result": ""
-    },
-    {
-      "acceleration_reason": "Planning(\"SQL lowering failed: DataFusion error: SQL error: ParserError(\\\"Expected: joined table, found: ,\\\")\")",
-      "clickhouse_exception_code": null,
-      "clickhouse_summary": "{\"read_rows\":\"8192\",\"read_bytes\":\"1028096\",\"written_rows\":\"0\",\"written_bytes\":\"0\",\"total_rows_to_read\":\"8192\",\"result_rows\":\"0\",\"result_bytes\":\"0\",\"elapsed_ns\":\"28747512\",\"memory_usage\":\"1867447\"}",
-      "direct_exact_status": 200,
-      "exact_executed": true,
-      "exact_status": 200,
-      "exact_success": true,
-      "fallback_requested": true,
-      "id": "q22",
-      "matches_direct_exact": true,
-      "result": "{}\t0.043333333333333335\n"
-    },
-    {
-      "acceleration_reason": "CatalogMiss",
-      "clickhouse_exception_code": null,
-      "clickhouse_summary": "{\"read_rows\":\"24576\",\"read_bytes\":\"1923892\",\"written_rows\":\"0\",\"written_bytes\":\"0\",\"total_rows_to_read\":\"24576\",\"result_rows\":\"0\",\"result_bytes\":\"0\",\"elapsed_ns\":\"17787041\",\"memory_usage\":\"2829098\"}",
-      "direct_exact_status": 200,
-      "exact_executed": true,
-      "exact_status": 200,
-      "exact_success": true,
-      "fallback_requested": true,
-      "id": "q23",
-      "matches_direct_exact": true,
-      "result": "{'job':'payment-service','instance':'payment-service:8084'}\t101\n{'job':'order-service','instance':'order-service:8083'}\t24\n"
-    },
-    {
-      "acceleration_reason": "Planning(\"SQL lowering failed: DataFusion error: SQL error: ParserError(\\\"Expected: joined table, found: ,\\\")\")",
-      "clickhouse_exception_code": null,
-      "clickhouse_summary": "{\"read_rows\":\"24578\",\"read_bytes\":\"3075298\",\"written_rows\":\"0\",\"written_bytes\":\"0\",\"total_rows_to_read\":\"24578\",\"result_rows\":\"0\",\"result_bytes\":\"0\",\"elapsed_ns\":\"531152875\",\"memory_usage\":\"5381809\"}",
-      "direct_exact_status": 200,
-      "exact_executed": true,
-      "exact_status": 200,
-      "exact_success": true,
-      "fallback_requested": true,
-      "id": "q24",
-      "matches_direct_exact": true,
-      "result": "{}\t0.3333333333333333\n"
-    },
-    {
-      "acceleration_reason": "Planning(\"SQL lowering failed: DataFusion error: SQL error: ParserError(\\\"Expected: joined table, found: .\\\")\")",
-      "clickhouse_exception_code": null,
-      "clickhouse_summary": "{\"read_rows\":\"32768\",\"read_bytes\":\"2235792\",\"written_rows\":\"0\",\"written_bytes\":\"0\",\"total_rows_to_read\":\"32768\",\"result_rows\":\"0\",\"result_bytes\":\"0\",\"elapsed_ns\":\"463444920\",\"memory_usage\":\"6463074\"}",
-      "direct_exact_status": 200,
-      "exact_executed": true,
-      "exact_status": 200,
-      "exact_success": true,
-      "fallback_requested": true,
-      "id": "q25",
-      "matches_direct_exact": true,
-      "result": "{'job':'order-service'}\t0.5337828828982084\n"
-    },
-    {
-      "acceleration_reason": "Planning(\"SQL lowering failed: DataFusion error: SQL error: ParserError(\\\"Expected: joined table, found: labels\\\")\")",
-      "clickhouse_exception_code": null,
-      "clickhouse_summary": "{\"read_rows\":\"16384\",\"read_bytes\":\"1597946\",\"written_rows\":\"0\",\"written_bytes\":\"0\",\"total_rows_to_read\":\"16384\",\"result_rows\":\"0\",\"result_bytes\":\"0\",\"elapsed_ns\":\"93888655\",\"memory_usage\":\"4047283\"}",
-      "direct_exact_status": 200,
-      "exact_executed": true,
-      "exact_status": 200,
-      "exact_success": true,
-      "fallback_requested": true,
-      "id": "q26",
-      "matches_direct_exact": true,
-      "result": "{'job':'order-service'}\t0.0015755555555555553\n"
-    },
-    {
-      "acceleration_reason": "Planning(\"SQL lowering failed: DataFusion error: Error during planning: Invalid function 'modulo'.\\nDid you mean 'today'?\")",
-      "clickhouse_exception_code": null,
-      "clickhouse_summary": "{\"read_rows\":\"16384\",\"read_bytes\":\"515898\",\"written_rows\":\"0\",\"written_bytes\":\"0\",\"total_rows_to_read\":\"16384\",\"result_rows\":\"0\",\"result_bytes\":\"0\",\"elapsed_ns\":\"26775548\",\"memory_usage\":\"3428334\"}",
-      "direct_exact_status": 200,
-      "exact_executed": true,
-      "exact_status": 200,
-      "exact_success": true,
-      "fallback_requested": true,
-      "id": "q27",
-      "matches_direct_exact": true,
-      "result": "{'job':'api-gateway'}\t118035226.79722223\n{'job':'user-service'}\t117853344.7638889\n{'job':'webapp'}\t117812478.69722222\n"
-    }
-  ]
-}
diff --git a/tools/o11y-sql-main-eval/artifacts/frontend-planner-publication.json b/tools/o11y-sql-main-eval/artifacts/frontend-planner-publication.json
deleted file mode 100644
index 2deb95a2e..000000000
--- a/tools/o11y-sql-main-eval/artifacts/frontend-planner-publication.json
+++ /dev/null
@@ -1,298 +0,0 @@
-{
-  "baseline": "0.1.0",
-  "queries": [
-    {
-      "id": "q01",
-      "operators": [
-        "sort_desc",
-        "increase",
-        "division"
-      ],
-      "parser_planner": "failure",
-      "reason": "SQL lowering failed: DataFusion error: SQL error: ParserError(\"Expected: joined table, found: .\")",
-      "sql": "SELECT * FROM (SELECT a.labels,a.value/b.value value FROM (SELECT map('job',job) labels,sum(value) value FROM (SELECT labels['job'] job,value FROM (SELECT labels, corrected*(sampled+least(start_extra,if(corrected>0,sampled*(first_value/corrected),start_extra))+end_extra)/sampled AS value FROM (SELECT labels,samples,length(samples) n,samples[1].1 first_ts,samples[n].1 last_ts,samples[1].2 first_value,samples[n].2 last_value,(last_ts-first_ts)/1000 sampled,(last_value-first_value)+arraySum(i -> if(samples[i].2<samples[i-1].2,samples[i-1].2,0.),range(2,n+1)) corrected,if((first_ts-((1788891296000-0)-21600000))/1000<sampled/(n-1)*1.1,(first_ts-((1788891296000-0)-21600000))/1000,sampled/(n-1)/2) start_extra,if(((1788891296000-0)-last_ts)/1000<sampled/(n-1)*1.1,((1788891296000-0)-last_ts)/1000,sampled/(n-1)/2) end_extra FROM (SELECT labels,arraySort(x -> x.1,groupArray((ts_ms,value))) samples FROM raw_samples WHERE metric='backend_http_5xx_total' AND ts_ms>=((1788891296000-0)-21600000) AND ts_ms<=(1788891296000-0) GROUP BY labels) WHERE n>=2))) GROUP BY job) a INNER JOIN (SELECT map('job',job) labels,sum(value) value FROM (SELECT labels['job'] job,value FROM (SELECT labels, corrected*(sampled+least(start_extra,if(corrected>0,sampled*(first_value/corrected),start_extra))+end_extra)/sampled AS value FROM (SELECT labels,samples,length(samples) n,samples[1].1 first_ts,samples[n].1 last_ts,samples[1].2 first_value,samples[n].2 last_value,(last_ts-first_ts)/1000 sampled,(last_value-first_value)+arraySum(i -> if(samples[i].2<samples[i-1].2,samples[i-1].2,0.),range(2,n+1)) corrected,if((first_ts-((1788891296000-0)-21600000))/1000<sampled/(n-1)*1.1,(first_ts-((1788891296000-0)-21600000))/1000,sampled/(n-1)/2) start_extra,if(((1788891296000-0)-last_ts)/1000<sampled/(n-1)*1.1,((1788891296000-0)-last_ts)/1000,sampled/(n-1)/2) end_extra FROM (SELECT labels,arraySort(x -> x.1,groupArray((ts_ms,value))) samples FROM raw_samples WHERE metric='backend_http_requests_total' AND ts_ms>=((1788891296000-0)-21600000) AND ts_ms<=(1788891296000-0) GROUP BY labels) WHERE n>=2))) GROUP BY job) b ON a.labels=b.labels) ORDER BY value DESC,labels"
-    },
-    {
-      "id": "q02",
-      "operators": [
-        "topk",
-        "increase",
-        "division"
-      ],
-      "parser_planner": "failure",
-      "reason": "SQL lowering failed: DataFusion error: SQL error: ParserError(\"Expected: joined table, found: .\")",
-      "sql": "SELECT * FROM (SELECT a.labels,a.value/b.value value FROM (SELECT map('job',job) labels,sum(value) value FROM (SELECT labels['job'] job,value FROM (SELECT labels, corrected*(sampled+least(start_extra,if(corrected>0,sampled*(first_value/corrected),start_extra))+end_extra)/sampled AS value FROM (SELECT labels,samples,length(samples) n,samples[1].1 first_ts,samples[n].1 last_ts,samples[1].2 first_value,samples[n].2 last_value,(last_ts-first_ts)/1000 sampled,(last_value-first_value)+arraySum(i -> if(samples[i].2<samples[i-1].2,samples[i-1].2,0.),range(2,n+1)) corrected,if((first_ts-((1788891296000-0)-21600000))/1000<sampled/(n-1)*1.1,(first_ts-((1788891296000-0)-21600000))/1000,sampled/(n-1)/2) start_extra,if(((1788891296000-0)-last_ts)/1000<sampled/(n-1)*1.1,((1788891296000-0)-last_ts)/1000,sampled/(n-1)/2) end_extra FROM (SELECT labels,arraySort(x -> x.1,groupArray((ts_ms,value))) samples FROM raw_samples WHERE metric='backend_http_5xx_total' AND ts_ms>=((1788891296000-0)-21600000) AND ts_ms<=(1788891296000-0) GROUP BY labels) WHERE n>=2))) GROUP BY job) a INNER JOIN (SELECT map('job',job) labels,sum(value) value FROM (SELECT labels['job'] job,value FROM (SELECT labels, corrected*(sampled+least(start_extra,if(corrected>0,sampled*(first_value/corrected),start_extra))+end_extra)/sampled AS value FROM (SELECT labels,samples,length(samples) n,samples[1].1 first_ts,samples[n].1 last_ts,samples[1].2 first_value,samples[n].2 last_value,(last_ts-first_ts)/1000 sampled,(last_value-first_value)+arraySum(i -> if(samples[i].2<samples[i-1].2,samples[i-1].2,0.),range(2,n+1)) corrected,if((first_ts-((1788891296000-0)-21600000))/1000<sampled/(n-1)*1.1,(first_ts-((1788891296000-0)-21600000))/1000,sampled/(n-1)/2) start_extra,if(((1788891296000-0)-last_ts)/1000<sampled/(n-1)*1.1,((1788891296000-0)-last_ts)/1000,sampled/(n-1)/2) end_extra FROM (SELECT labels,arraySort(x -> x.1,groupArray((ts_ms,value))) samples FROM raw_samples WHERE metric='backend_http_requests_total' AND ts_ms>=((1788891296000-0)-21600000) AND ts_ms<=(1788891296000-0) GROUP BY labels) WHERE n>=2))) GROUP BY job) b ON a.labels=b.labels) ORDER BY value DESC,labels LIMIT 1"
-    },
-    {
-      "id": "q03",
-      "operators": [
-        "increase",
-        "sum",
-        "division"
-      ],
-      "parser_planner": "failure",
-      "reason": "SQL lowering failed: DataFusion error: SQL error: ParserError(\"Expected: identifier, found: )\")",
-      "sql": "SELECT a.labels,a.value/b.value value FROM (SELECT map() labels,sum(value) value FROM (SELECT labels, corrected*(sampled+least(start_extra,if(corrected>0,sampled*(first_value/corrected),start_extra))+end_extra)/sampled AS value FROM (SELECT labels,samples,length(samples) n,samples[1].1 first_ts,samples[n].1 last_ts,samples[1].2 first_value,samples[n].2 last_value,(last_ts-first_ts)/1000 sampled,(last_value-first_value)+arraySum(i -> if(samples[i].2<samples[i-1].2,samples[i-1].2,0.),range(2,n+1)) corrected,if((first_ts-((1788891296000-0)-3600000))/1000<sampled/(n-1)*1.1,(first_ts-((1788891296000-0)-3600000))/1000,sampled/(n-1)/2) start_extra,if(((1788891296000-0)-last_ts)/1000<sampled/(n-1)*1.1,((1788891296000-0)-last_ts)/1000,sampled/(n-1)/2) end_extra FROM (SELECT labels,arraySort(x -> x.1,groupArray((ts_ms,value))) samples FROM raw_samples WHERE metric='payment_service_http_5xx_total' AND ts_ms>=((1788891296000-0)-3600000) AND ts_ms<=(1788891296000-0) GROUP BY labels) WHERE n>=2))) a INNER JOIN (SELECT map() labels,sum(value) value FROM (SELECT labels, corrected*(sampled+least(start_extra,if(corrected>0,sampled*(first_value/corrected),start_extra))+end_extra)/sampled AS value FROM (SELECT labels,samples,length(samples) n,samples[1].1 first_ts,samples[n].1 last_ts,samples[1].2 first_value,samples[n].2 last_value,(last_ts-first_ts)/1000 sampled,(last_value-first_value)+arraySum(i -> if(samples[i].2<samples[i-1].2,samples[i-1].2,0.),range(2,n+1)) corrected,if((first_ts-((1788891296000-0)-3600000))/1000<sampled/(n-1)*1.1,(first_ts-((1788891296000-0)-3600000))/1000,sampled/(n-1)/2) start_extra,if(((1788891296000-0)-last_ts)/1000<sampled/(n-1)*1.1,((1788891296000-0)-last_ts)/1000,sampled/(n-1)/2) end_extra FROM (SELECT labels,arraySort(x -> x.1,groupArray((ts_ms,value))) samples FROM raw_samples WHERE metric='payment_service_http_requests_total' AND ts_ms>=((1788891296000-0)-3600000) AND ts_ms<=(1788891296000-0) GROUP BY labels) WHERE n>=2))) b ON a.labels=b.labels"
-    },
-    {
-      "id": "q04",
-      "operators": [
-        "increase",
-        "sum",
-        "offset",
-        "division"
-      ],
-      "parser_planner": "failure",
-      "reason": "SQL lowering failed: DataFusion error: SQL error: ParserError(\"Expected: identifier, found: )\")",
-      "sql": "SELECT a.labels,a.value/b.value value FROM (SELECT map() labels,sum(value) value FROM (SELECT labels, corrected*(sampled+least(start_extra,if(corrected>0,sampled*(first_value/corrected),start_extra))+end_extra)/sampled AS value FROM (SELECT labels,samples,length(samples) n,samples[1].1 first_ts,samples[n].1 last_ts,samples[1].2 first_value,samples[n].2 last_value,(last_ts-first_ts)/1000 sampled,(last_value-first_value)+arraySum(i -> if(samples[i].2<samples[i-1].2,samples[i-1].2,0.),range(2,n+1)) corrected,if((first_ts-((1788891296000-21600000)-3600000))/1000<sampled/(n-1)*1.1,(first_ts-((1788891296000-21600000)-3600000))/1000,sampled/(n-1)/2) start_extra,if(((1788891296000-21600000)-last_ts)/1000<sampled/(n-1)*1.1,((1788891296000-21600000)-last_ts)/1000,sampled/(n-1)/2) end_extra FROM (SELECT labels,arraySort(x -> x.1,groupArray((ts_ms,value))) samples FROM raw_samples WHERE metric='payment_service_http_5xx_total' AND ts_ms>=((1788891296000-21600000)-3600000) AND ts_ms<=(1788891296000-21600000) GROUP BY labels) WHERE n>=2))) a INNER JOIN (SELECT map() labels,sum(value) value FROM (SELECT labels, corrected*(sampled+least(start_extra,if(corrected>0,sampled*(first_value/corrected),start_extra))+end_extra)/sampled AS value FROM (SELECT labels,samples,length(samples) n,samples[1].1 first_ts,samples[n].1 last_ts,samples[1].2 first_value,samples[n].2 last_value,(last_ts-first_ts)/1000 sampled,(last_value-first_value)+arraySum(i -> if(samples[i].2<samples[i-1].2,samples[i-1].2,0.),range(2,n+1)) corrected,if((first_ts-((1788891296000-21600000)-3600000))/1000<sampled/(n-1)*1.1,(first_ts-((1788891296000-21600000)-3600000))/1000,sampled/(n-1)/2) start_extra,if(((1788891296000-21600000)-last_ts)/1000<sampled/(n-1)*1.1,((1788891296000-21600000)-last_ts)/1000,sampled/(n-1)/2) end_extra FROM (SELECT labels,arraySort(x -> x.1,groupArray((ts_ms,value))) samples FROM raw_samples WHERE metric='payment_service_http_requests_total' AND ts_ms>=((1788891296000-21600000)-3600000) AND ts_ms<=(1788891296000-21600000) GROUP BY labels) WHERE n>=2))) b ON a.labels=b.labels"
-    },
-    {
-      "canonical_sql": "Sort { keys: [SortKey { expr: Column(0), ascending: true, nulls_first: false }], partition_by: GroupKeys { keys: [], without: false }, child: Project { cols: [ProjectItem { alias: None, expr: Column(0) }, ProjectItem { alias: Some(\"value\"), expr: Column(1) }], qualifier: None, child: Aggregate { reduction: Reduce(GroupKeys { keys: [1], without: false }), measures: [Max { col: Some(3) }], output_names: [\"max(raw_samples.value)\"], having: None, child: Scan { source: Table { table_ref: \"raw_samples\" }, predicates: [Predicate(BoolAnd([Compare { left: Column(0), op: Eq, right: Literal(Utf8(\"cache_refresh_lag_seconds\")) }, Compare { left: Column(2), op: Gt, right: Arithmetic { op: Sub, left: Literal(Int64(1788891296000)), right: Literal(Int64(43200000)) } }, Compare { left: Column(2), op: Le, right: Literal(Int64(1788891296000)) }]))], schema: Schema { columns: [Column { name: \"metric\", dtype: Utf8, nullable: false, table: Some(\"raw_samples\") }, Column { name: \"labels\", dtype: Utf8, nullable: false, table: Some(\"raw_samples\") }, Column { name: \"ts_ms\", dtype: Timestamp, nullable: false, table: Some(\"raw_samples\") }, Column { name: \"value\", dtype: Float64, nullable: false, table: Some(\"raw_samples\") }], time_index: Some(2), unique_keys: [], closed: true } } } } }",
-      "classification": "failure",
-      "id": "q05",
-      "operators": [
-        "max_over_time"
-      ],
-      "parser_planner": "pass",
-      "physical": "Committed(Summary(SummaryNode { expr: ValueOperation { child: SummaryNode { expr: ValueOperation { child: SummaryNode { expr: SummaryAgg { child: SummaryNode { expr: KeepPreAsap(Scan { source: Table { table_ref: \"raw_samples\" }, predicates: [Predicate(BoolAnd([Compare { left: Column(0), op: Eq, right: Literal(Utf8(\"cache_refresh_lag_seconds\")) }, Compare { left: Column(2), op: Gt, right: Arithmetic { op: Sub, left: Literal(Int64(1788891296000)), right: Literal(Int64(43200000)) } }, Compare { left: Column(2), op: Le, right: Literal(Int64(1788891296000)) }]))], schema: Schema { columns: [Column { name: \"metric\", dtype: Utf8, nullable: false, table: Some(\"raw_samples\") }, Column { name: \"labels\", dtype: Utf8, nullable: false, table: Some(\"raw_samples\") }, Column { name: \"ts_ms\", dtype: Timestamp, nullable: false, table: Some(\"raw_samples\") }, Column { name: \"value\", dtype: Float64, nullable: false, table: Some(\"raw_samples\") }], time_index: Some(2), unique_keys: [], closed: true } }), schema: SummarySchema { fields: [SummaryField { name: \"metric\", dtype: Plain(Utf8), nullable: false }, SummaryField { name: \"labels\", dtype: Plain(Utf8), nullable: false }, SummaryField { name: \"ts_ms\", dtype: Plain(Timestamp), nullable: false }, SummaryField { name: \"value\", dtype: Plain(Float64), nullable: false }], time_index: Some(2) }, guarantee: Some(ResultGuarantee { metric: AbsoluteValue, bound: Zero, failure_probability: Zero, provenance: [Exact { reason: \"KeepPreAsap\" }] }) }, family: ExactAggregate(MinMax, MinMax), input: SummaryUpdate { item: None, weight: Column(Qualified { table: \"raw_samples\", name: \"value\" }), weight_domain: UnknownOrSigned }, reduction: Reduce(GroupKeys { keys: [1], without: false }), grouping: PerSubpopulationInstance }, schema: SummarySchema { fields: [SummaryField { name: \"labels\", dtype: Plain(Utf8), nullable: false }, SummaryField { name: \"max(raw_samples.value)\", dtype: ExactAggregate(MinMax, MinMax), nullable: false }], time_index: None }, guarantee: Some(ResultGuarantee { metric: AbsoluteValue, bound: Zero, failure_probability: Zero, provenance: [Exact { reason: \"ExactAggregate(MinMax)\" }, ChildGuarantee { input_index: 0, guarantee: ResultGuarantee { metric: AbsoluteValue, bound: Zero, failure_probability: Zero, provenance: [Exact { reason: \"KeepPreAsap\" }] } }, CompositionStep { operator: ExactExtremum, rule: \"exact_input\" }] }) }, operation: Project { cols: [ProjectItem { alias: None, expr: Column(0) }, ProjectItem { alias: Some(\"value\"), expr: Column(1) }], qualifier: None }, timing: ReadTime }, schema: SummarySchema { fields: [SummaryField { name: \"labels\", dtype: Plain(Utf8), nullable: false }, SummaryField { name: \"value\", dtype: Plain(Float64), nullable: false }], time_index: None }, guarantee: Some(ResultGuarantee { metric: AbsoluteValue, bound: Zero, failure_probability: Zero, provenance: [Exact { reason: \"ExactAggregate(MinMax)\" }, ChildGuarantee { input_index: 0, guarantee: ResultGuarantee { metric: AbsoluteValue, bound: Zero, failure_probability: Zero, provenance: [Exact { reason: \"KeepPreAsap\" }] } }, CompositionStep { operator: ExactExtremum, rule: \"exact_input\" }] }) }, operation: Sort { keys: [SortKey { expr: Column(0), ascending: true, nulls_first: false }], partition_by: GroupKeys { keys: [], without: false } }, timing: ReadTime }, schema: SummarySchema { fields: [SummaryField { name: \"labels\", dtype: Plain(Utf8), nullable: false }, SummaryField { name: \"value\", dtype: Plain(Float64), nullable: false }], time_index: None }, guarantee: Some(ResultGuarantee { metric: AbsoluteValue, bound: Zero, failure_probability: Zero, provenance: [Exact { reason: \"ExactAggregate(MinMax)\" }, ChildGuarantee { input_index: 0, guarantee: ResultGuarantee { metric: AbsoluteValue, bound: Zero, failure_probability: Zero, provenance: [Exact { reason: \"KeepPreAsap\" }] } }, CompositionStep { operator: ExactExtremum, rule: \"exact_input\" }] }) }))",
-      "publication": "failure",
-      "reason": "SQL lowering failed: invalid QueryPlan: SQL population predicate on metric needs a canonical catalog filter",
-      "sql": "SELECT labels, max(value) AS value FROM raw_samples WHERE metric='cache_refresh_lag_seconds' AND ts_ms>1788891296000-43200000 AND ts_ms<=1788891296000 GROUP BY labels ORDER BY labels"
-    },
-    {
-      "canonical_sql": "Sort { keys: [SortKey { expr: Column(0), ascending: true, nulls_first: false }], partition_by: GroupKeys { keys: [], without: false }, child: Project { cols: [ProjectItem { alias: None, expr: Column(0) }, ProjectItem { alias: Some(\"value\"), expr: Column(1) }], qualifier: None, child: Aggregate { reduction: Reduce(GroupKeys { keys: [1], without: false }), measures: [Max { col: Some(3) }], output_names: [\"max(raw_samples.value)\"], having: None, child: Scan { source: Table { table_ref: \"raw_samples\" }, predicates: [Predicate(BoolAnd([Compare { left: Column(0), op: Eq, right: Literal(Utf8(\"user_service_cache_refresh_lag_seconds\")) }, Compare { left: Column(2), op: Gt, right: Arithmetic { op: Sub, left: Literal(Int64(1788891296000)), right: Literal(Int64(43200000)) } }, Compare { left: Column(2), op: Le, right: Literal(Int64(1788891296000)) }]))], schema: Schema { columns: [Column { name: \"metric\", dtype: Utf8, nullable: false, table: Some(\"raw_samples\") }, Column { name: \"labels\", dtype: Utf8, nullable: false, table: Some(\"raw_samples\") }, Column { name: \"ts_ms\", dtype: Timestamp, nullable: false, table: Some(\"raw_samples\") }, Column { name: \"value\", dtype: Float64, nullable: false, table: Some(\"raw_samples\") }], time_index: Some(2), unique_keys: [], closed: true } } } } }",
-      "classification": "failure",
-      "id": "q06",
-      "operators": [
-        "max_over_time"
-      ],
-      "parser_planner": "pass",
-      "physical": "Committed(Summary(SummaryNode { expr: ValueOperation { child: SummaryNode { expr: ValueOperation { child: SummaryNode { expr: SummaryAgg { child: SummaryNode { expr: KeepPreAsap(Scan { source: Table { table_ref: \"raw_samples\" }, predicates: [Predicate(BoolAnd([Compare { left: Column(0), op: Eq, right: Literal(Utf8(\"user_service_cache_refresh_lag_seconds\")) }, Compare { left: Column(2), op: Gt, right: Arithmetic { op: Sub, left: Literal(Int64(1788891296000)), right: Literal(Int64(43200000)) } }, Compare { left: Column(2), op: Le, right: Literal(Int64(1788891296000)) }]))], schema: Schema { columns: [Column { name: \"metric\", dtype: Utf8, nullable: false, table: Some(\"raw_samples\") }, Column { name: \"labels\", dtype: Utf8, nullable: false, table: Some(\"raw_samples\") }, Column { name: \"ts_ms\", dtype: Timestamp, nullable: false, table: Some(\"raw_samples\") }, Column { name: \"value\", dtype: Float64, nullable: false, table: Some(\"raw_samples\") }], time_index: Some(2), unique_keys: [], closed: true } }), schema: SummarySchema { fields: [SummaryField { name: \"metric\", dtype: Plain(Utf8), nullable: false }, SummaryField { name: \"labels\", dtype: Plain(Utf8), nullable: false }, SummaryField { name: \"ts_ms\", dtype: Plain(Timestamp), nullable: false }, SummaryField { name: \"value\", dtype: Plain(Float64), nullable: false }], time_index: Some(2) }, guarantee: Some(ResultGuarantee { metric: AbsoluteValue, bound: Zero, failure_probability: Zero, provenance: [Exact { reason: \"KeepPreAsap\" }] }) }, family: ExactAggregate(MinMax, MinMax), input: SummaryUpdate { item: None, weight: Column(Qualified { table: \"raw_samples\", name: \"value\" }), weight_domain: UnknownOrSigned }, reduction: Reduce(GroupKeys { keys: [1], without: false }), grouping: PerSubpopulationInstance }, schema: SummarySchema { fields: [SummaryField { name: \"labels\", dtype: Plain(Utf8), nullable: false }, SummaryField { name: \"max(raw_samples.value)\", dtype: ExactAggregate(MinMax, MinMax), nullable: false }], time_index: None }, guarantee: Some(ResultGuarantee { metric: AbsoluteValue, bound: Zero, failure_probability: Zero, provenance: [Exact { reason: \"ExactAggregate(MinMax)\" }, ChildGuarantee { input_index: 0, guarantee: ResultGuarantee { metric: AbsoluteValue, bound: Zero, failure_probability: Zero, provenance: [Exact { reason: \"KeepPreAsap\" }] } }, CompositionStep { operator: ExactExtremum, rule: \"exact_input\" }] }) }, operation: Project { cols: [ProjectItem { alias: None, expr: Column(0) }, ProjectItem { alias: Some(\"value\"), expr: Column(1) }], qualifier: None }, timing: ReadTime }, schema: SummarySchema { fields: [SummaryField { name: \"labels\", dtype: Plain(Utf8), nullable: false }, SummaryField { name: \"value\", dtype: Plain(Float64), nullable: false }], time_index: None }, guarantee: Some(ResultGuarantee { metric: AbsoluteValue, bound: Zero, failure_probability: Zero, provenance: [Exact { reason: \"ExactAggregate(MinMax)\" }, ChildGuarantee { input_index: 0, guarantee: ResultGuarantee { metric: AbsoluteValue, bound: Zero, failure_probability: Zero, provenance: [Exact { reason: \"KeepPreAsap\" }] } }, CompositionStep { operator: ExactExtremum, rule: \"exact_input\" }] }) }, operation: Sort { keys: [SortKey { expr: Column(0), ascending: true, nulls_first: false }], partition_by: GroupKeys { keys: [], without: false } }, timing: ReadTime }, schema: SummarySchema { fields: [SummaryField { name: \"labels\", dtype: Plain(Utf8), nullable: false }, SummaryField { name: \"value\", dtype: Plain(Float64), nullable: false }], time_index: None }, guarantee: Some(ResultGuarantee { metric: AbsoluteValue, bound: Zero, failure_probability: Zero, provenance: [Exact { reason: \"ExactAggregate(MinMax)\" }, ChildGuarantee { input_index: 0, guarantee: ResultGuarantee { metric: AbsoluteValue, bound: Zero, failure_probability: Zero, provenance: [Exact { reason: \"KeepPreAsap\" }] } }, CompositionStep { operator: ExactExtremum, rule: \"exact_input\" }] }) }))",
-      "publication": "failure",
-      "reason": "SQL lowering failed: invalid QueryPlan: SQL population predicate on metric needs a canonical catalog filter",
-      "sql": "SELECT labels, max(value) AS value FROM raw_samples WHERE metric='user_service_cache_refresh_lag_seconds' AND ts_ms>1788891296000-43200000 AND ts_ms<=1788891296000 GROUP BY labels ORDER BY labels"
-    },
-    {
-      "id": "q07",
-      "operators": [],
-      "parser_planner": "failure",
-      "reason": "SQL lowering failed: DataFusion error: Error during planning: Invalid function 'mapconcat'.\nDid you mean 'concat'?",
-      "sql": "SELECT mapConcat(labels,map('__name__','user_service_cache_refresh_lag_seconds')) AS labels, argMax(value,ts_ms) AS value FROM raw_samples WHERE metric='user_service_cache_refresh_lag_seconds' AND ts_ms>1788891296000-300000 AND ts_ms<=1788891296000 GROUP BY labels ORDER BY labels"
-    },
-    {
-      "id": "q08",
-      "operators": [
-        "rate",
-        "sum"
-      ],
-      "parser_planner": "failure",
-      "reason": "SQL lowering failed: DataFusion error: SQL error: ParserError(\"Expected: joined table, found: ,\")",
-      "sql": "SELECT map() labels,sum(value) value FROM (SELECT labels, corrected*(sampled+least(start_extra,if(corrected>0,sampled*(first_value/corrected),start_extra))+end_extra)/sampled/(3600000/1000) AS value FROM (SELECT labels,samples,length(samples) n,samples[1].1 first_ts,samples[n].1 last_ts,samples[1].2 first_value,samples[n].2 last_value,(last_ts-first_ts)/1000 sampled,(last_value-first_value)+arraySum(i -> if(samples[i].2<samples[i-1].2,samples[i-1].2,0.),range(2,n+1)) corrected,if((first_ts-((1788891296000-0)-3600000))/1000<sampled/(n-1)*1.1,(first_ts-((1788891296000-0)-3600000))/1000,sampled/(n-1)/2) start_extra,if(((1788891296000-0)-last_ts)/1000<sampled/(n-1)*1.1,((1788891296000-0)-last_ts)/1000,sampled/(n-1)/2) end_extra FROM (SELECT labels,arraySort(x -> x.1,groupArray((ts_ms,value))) samples FROM raw_samples WHERE metric='backend_process_cpu_seconds_total' AND ts_ms>=((1788891296000-0)-3600000) AND ts_ms<=(1788891296000-0) GROUP BY labels) WHERE n>=2))"
-    },
-    {
-      "id": "q09",
-      "operators": [
-        "sum"
-      ],
-      "parser_planner": "failure",
-      "reason": "SQL lowering failed: DataFusion error: Error during planning: Error during planning: map does not support zero arguments. No function matches the given name and argument types 'map()'. You might need to add explicit type casts.\n\tCandidate functions:\n\tmap(Any, .., Any)",
-      "sql": "SELECT map() AS labels, sum(value) AS value FROM (SELECT labels,argMax(value,ts_ms) AS value FROM raw_samples WHERE metric='backend_process_resident_memory_bytes' AND ts_ms>1788891296000-300000 AND ts_ms<=1788891296000 GROUP BY labels)"
-    },
-    {
-      "id": "q10",
-      "operators": [
-        "max_over_time",
-        "sum",
-        "subquery"
-      ],
-      "parser_planner": "failure",
-      "reason": "SQL lowering failed: DataFusion error: Error during planning: Invalid function 'modulo'.\nDid you mean 'todate'?",
-      "sql": "SELECT map() labels,max(value) value FROM (SELECT ts_ms,sum(value) value FROM raw_samples WHERE metric='backend_process_resident_memory_bytes' AND ts_ms>=1788891296000-21600000 AND ts_ms<=1788891296000 AND modulo(1788891296000-ts_ms,60000)=0 GROUP BY ts_ms)"
-    },
-    {
-      "id": "q11",
-      "operators": [
-        "topk",
-        "rate"
-      ],
-      "parser_planner": "failure",
-      "reason": "SQL lowering failed: DataFusion error: SQL error: ParserError(\"Expected: joined table, found: labels\")",
-      "sql": "SELECT * FROM (SELECT map('job',job) labels,sum(value) value FROM (SELECT labels['job'] job,value FROM (SELECT labels, corrected*(sampled+least(start_extra,if(corrected>0,sampled*(first_value/corrected),start_extra))+end_extra)/sampled/(3600000/1000) AS value FROM (SELECT labels,samples,length(samples) n,samples[1].1 first_ts,samples[n].1 last_ts,samples[1].2 first_value,samples[n].2 last_value,(last_ts-first_ts)/1000 sampled,(last_value-first_value)+arraySum(i -> if(samples[i].2<samples[i-1].2,samples[i-1].2,0.),range(2,n+1)) corrected,if((first_ts-((1788891296000-0)-3600000))/1000<sampled/(n-1)*1.1,(first_ts-((1788891296000-0)-3600000))/1000,sampled/(n-1)/2) start_extra,if(((1788891296000-0)-last_ts)/1000<sampled/(n-1)*1.1,((1788891296000-0)-last_ts)/1000,sampled/(n-1)/2) end_extra FROM (SELECT labels,arraySort(x -> x.1,groupArray((ts_ms,value))) samples FROM raw_samples WHERE metric='backend_process_cpu_seconds_total' AND ts_ms>=((1788891296000-0)-3600000) AND ts_ms<=(1788891296000-0) GROUP BY labels) WHERE n>=2))) GROUP BY job) ORDER BY value DESC,labels LIMIT 2"
-    },
-    {
-      "id": "q12",
-      "operators": [
-        "topk"
-      ],
-      "parser_planner": "failure",
-      "reason": "SQL lowering failed: DataFusion error: This feature is not implemented: Map Access",
-      "sql": "SELECT map('job',job) AS labels,sum(value) AS value FROM (SELECT labels['job'] AS job,labels,argMax(value,ts_ms) AS value FROM raw_samples WHERE metric='backend_process_resident_memory_bytes' AND ts_ms>1788891296000-300000 AND ts_ms<=1788891296000 GROUP BY job,labels) GROUP BY job ORDER BY value DESC,job LIMIT 2"
-    },
-    {
-      "id": "q13",
-      "operators": [
-        "rate",
-        "max_over_time",
-        "sum",
-        "subquery"
-      ],
-      "parser_planner": "failure",
-      "reason": "SQL lowering failed: DataFusion error: SQL error: ParserError(\"Expected: joined table, found: ,\")",
-      "sql": "SELECT map() labels,max(value) value FROM (SELECT grid_ms,sum(value) value FROM (SELECT grid_ms,labels,corrected*(sampled+least(start_extra,if(corrected>0,sampled*(first_value/corrected),start_extra))+end_extra)/sampled/300 value FROM (SELECT grid_ms,labels,samples,length(samples) n,samples[1].1 first_ts,samples[n].1 last_ts,samples[1].2 first_value,samples[n].2 last_value,(last_ts-first_ts)/1000 sampled,(last_value-first_value)+arraySum(i -> if(samples[i].2<samples[i-1].2,samples[i-1].2,0.),range(2,n+1)) corrected,if((first_ts-(grid_ms-300000))/1000<sampled/(n-1)*1.1,(first_ts-(grid_ms-300000))/1000,sampled/(n-1)/2) start_extra,if((grid_ms-last_ts)/1000<sampled/(n-1)*1.1,(grid_ms-last_ts)/1000,sampled/(n-1)/2) end_extra FROM (SELECT grid_ms,labels,arraySort(x->x.1,groupArray((ts_ms,value))) samples FROM raw_samples CROSS JOIN (SELECT arrayJoin(arrayMap(x->x*60000,range(toUInt64(intDiv(1788891296000-21600000+59999,60000)),toUInt64(intDiv(1788891296000,60000)+1)))) grid_ms) grids WHERE metric='backend_process_cpu_seconds_total' AND ts_ms>=grid_ms-300000 AND ts_ms<=grid_ms GROUP BY grid_ms,labels) WHERE n>=2)) GROUP BY grid_ms)"
-    },
-    {
-      "id": "q14",
-      "operators": [
-        "rate",
-        "sum"
-      ],
-      "parser_planner": "failure",
-      "reason": "SQL lowering failed: DataFusion error: SQL error: ParserError(\"Expected: joined table, found: ,\")",
-      "sql": "SELECT map() labels,sum(value) value FROM (SELECT labels, corrected*(sampled+least(start_extra,if(corrected>0,sampled*(first_value/corrected),start_extra))+end_extra)/sampled/(300000/1000) AS value FROM (SELECT labels,samples,length(samples) n,samples[1].1 first_ts,samples[n].1 last_ts,samples[1].2 first_value,samples[n].2 last_value,(last_ts-first_ts)/1000 sampled,(last_value-first_value)+arraySum(i -> if(samples[i].2<samples[i-1].2,samples[i-1].2,0.),range(2,n+1)) corrected,if((first_ts-((1788891296000-0)-300000))/1000<sampled/(n-1)*1.1,(first_ts-((1788891296000-0)-300000))/1000,sampled/(n-1)/2) start_extra,if(((1788891296000-0)-last_ts)/1000<sampled/(n-1)*1.1,((1788891296000-0)-last_ts)/1000,sampled/(n-1)/2) end_extra FROM (SELECT labels,arraySort(x -> x.1,groupArray((ts_ms,value))) samples FROM raw_samples WHERE metric='backend_http_requests_total' AND ts_ms>=((1788891296000-0)-300000) AND ts_ms<=(1788891296000-0) GROUP BY labels) WHERE n>=2))"
-    },
-    {
-      "id": "q15",
-      "operators": [
-        "rate"
-      ],
-      "parser_planner": "failure",
-      "reason": "SQL lowering failed: DataFusion error: SQL error: ParserError(\"Expected: joined table, found: [\")",
-      "sql": "SELECT map('job',job) labels,sum(value) value FROM (SELECT labels['job'] job,value FROM (SELECT labels, corrected*(sampled+least(start_extra,if(corrected>0,sampled*(first_value/corrected),start_extra))+end_extra)/sampled/(300000/1000) AS value FROM (SELECT labels,samples,length(samples) n,samples[1].1 first_ts,samples[n].1 last_ts,samples[1].2 first_value,samples[n].2 last_value,(last_ts-first_ts)/1000 sampled,(last_value-first_value)+arraySum(i -> if(samples[i].2<samples[i-1].2,samples[i-1].2,0.),range(2,n+1)) corrected,if((first_ts-((1788891296000-0)-300000))/1000<sampled/(n-1)*1.1,(first_ts-((1788891296000-0)-300000))/1000,sampled/(n-1)/2) start_extra,if(((1788891296000-0)-last_ts)/1000<sampled/(n-1)*1.1,((1788891296000-0)-last_ts)/1000,sampled/(n-1)/2) end_extra FROM (SELECT labels,arraySort(x -> x.1,groupArray((ts_ms,value))) samples FROM raw_samples WHERE metric='backend_http_requests_total' AND ts_ms>=((1788891296000-0)-300000) AND ts_ms<=(1788891296000-0) GROUP BY labels) WHERE n>=2))) GROUP BY job"
-    },
-    {
-      "id": "q16",
-      "operators": [
-        "increase",
-        "sum",
-        "division"
-      ],
-      "parser_planner": "failure",
-      "reason": "SQL lowering failed: DataFusion error: SQL error: ParserError(\"Expected: identifier, found: )\")",
-      "sql": "SELECT a.labels,a.value/b.value value FROM (SELECT map() labels,sum(value) value FROM (SELECT labels, corrected*(sampled+least(start_extra,if(corrected>0,sampled*(first_value/corrected),start_extra))+end_extra)/sampled AS value FROM (SELECT labels,samples,length(samples) n,samples[1].1 first_ts,samples[n].1 last_ts,samples[1].2 first_value,samples[n].2 last_value,(last_ts-first_ts)/1000 sampled,(last_value-first_value)+arraySum(i -> if(samples[i].2<samples[i-1].2,samples[i-1].2,0.),range(2,n+1)) corrected,if((first_ts-((1788891296000-0)-3600000))/1000<sampled/(n-1)*1.1,(first_ts-((1788891296000-0)-3600000))/1000,sampled/(n-1)/2) start_extra,if(((1788891296000-0)-last_ts)/1000<sampled/(n-1)*1.1,((1788891296000-0)-last_ts)/1000,sampled/(n-1)/2) end_extra FROM (SELECT labels,arraySort(x -> x.1,groupArray((ts_ms,value))) samples FROM raw_samples WHERE metric='backend_http_5xx_total' AND ts_ms>=((1788891296000-0)-3600000) AND ts_ms<=(1788891296000-0) GROUP BY labels) WHERE n>=2))) a INNER JOIN (SELECT map() labels,sum(value) value FROM (SELECT labels, corrected*(sampled+least(start_extra,if(corrected>0,sampled*(first_value/corrected),start_extra))+end_extra)/sampled AS value FROM (SELECT labels,samples,length(samples) n,samples[1].1 first_ts,samples[n].1 last_ts,samples[1].2 first_value,samples[n].2 last_value,(last_ts-first_ts)/1000 sampled,(last_value-first_value)+arraySum(i -> if(samples[i].2<samples[i-1].2,samples[i-1].2,0.),range(2,n+1)) corrected,if((first_ts-((1788891296000-0)-3600000))/1000<sampled/(n-1)*1.1,(first_ts-((1788891296000-0)-3600000))/1000,sampled/(n-1)/2) start_extra,if(((1788891296000-0)-last_ts)/1000<sampled/(n-1)*1.1,((1788891296000-0)-last_ts)/1000,sampled/(n-1)/2) end_extra FROM (SELECT labels,arraySort(x -> x.1,groupArray((ts_ms,value))) samples FROM raw_samples WHERE metric='backend_http_requests_total' AND ts_ms>=((1788891296000-0)-3600000) AND ts_ms<=(1788891296000-0) GROUP BY labels) WHERE n>=2))) b ON a.labels=b.labels"
-    },
-    {
-      "id": "q17",
-      "operators": [
-        "topk",
-        "increase",
-        "division"
-      ],
-      "parser_planner": "failure",
-      "reason": "SQL lowering failed: DataFusion error: SQL error: ParserError(\"Expected: joined table, found: .\")",
-      "sql": "SELECT * FROM (SELECT a.labels,a.value/b.value value FROM (SELECT map('job',job) labels,sum(value) value FROM (SELECT labels['job'] job,value FROM (SELECT labels, corrected*(sampled+least(start_extra,if(corrected>0,sampled*(first_value/corrected),start_extra))+end_extra)/sampled AS value FROM (SELECT labels,samples,length(samples) n,samples[1].1 first_ts,samples[n].1 last_ts,samples[1].2 first_value,samples[n].2 last_value,(last_ts-first_ts)/1000 sampled,(last_value-first_value)+arraySum(i -> if(samples[i].2<samples[i-1].2,samples[i-1].2,0.),range(2,n+1)) corrected,if((first_ts-((1788891296000-0)-21600000))/1000<sampled/(n-1)*1.1,(first_ts-((1788891296000-0)-21600000))/1000,sampled/(n-1)/2) start_extra,if(((1788891296000-0)-last_ts)/1000<sampled/(n-1)*1.1,((1788891296000-0)-last_ts)/1000,sampled/(n-1)/2) end_extra FROM (SELECT labels,arraySort(x -> x.1,groupArray((ts_ms,value))) samples FROM raw_samples WHERE metric='backend_http_5xx_total' AND ts_ms>=((1788891296000-0)-21600000) AND ts_ms<=(1788891296000-0) GROUP BY labels) WHERE n>=2))) GROUP BY job) a INNER JOIN (SELECT map('job',job) labels,sum(value) value FROM (SELECT labels['job'] job,value FROM (SELECT labels, corrected*(sampled+least(start_extra,if(corrected>0,sampled*(first_value/corrected),start_extra))+end_extra)/sampled AS value FROM (SELECT labels,samples,length(samples) n,samples[1].1 first_ts,samples[n].1 last_ts,samples[1].2 first_value,samples[n].2 last_value,(last_ts-first_ts)/1000 sampled,(last_value-first_value)+arraySum(i -> if(samples[i].2<samples[i-1].2,samples[i-1].2,0.),range(2,n+1)) corrected,if((first_ts-((1788891296000-0)-21600000))/1000<sampled/(n-1)*1.1,(first_ts-((1788891296000-0)-21600000))/1000,sampled/(n-1)/2) start_extra,if(((1788891296000-0)-last_ts)/1000<sampled/(n-1)*1.1,((1788891296000-0)-last_ts)/1000,sampled/(n-1)/2) end_extra FROM (SELECT labels,arraySort(x -> x.1,groupArray((ts_ms,value))) samples FROM raw_samples WHERE metric='backend_http_requests_total' AND ts_ms>=((1788891296000-0)-21600000) AND ts_ms<=(1788891296000-0) GROUP BY labels) WHERE n>=2))) GROUP BY job) b ON a.labels=b.labels) ORDER BY value DESC,labels LIMIT 1"
-    },
-    {
-      "id": "q18",
-      "operators": [
-        "increase",
-        "comparison"
-      ],
-      "parser_planner": "failure",
-      "reason": "SQL lowering failed: DataFusion error: SQL error: ParserError(\"Expected: joined table, found: labels\")",
-      "sql": "SELECT * FROM (SELECT map('job',job) labels,sum(value) value FROM (SELECT labels['job'] job,value FROM (SELECT labels, corrected*(sampled+least(start_extra,if(corrected>0,sampled*(first_value/corrected),start_extra))+end_extra)/sampled AS value FROM (SELECT labels,samples,length(samples) n,samples[1].1 first_ts,samples[n].1 last_ts,samples[1].2 first_value,samples[n].2 last_value,(last_ts-first_ts)/1000 sampled,(last_value-first_value)+arraySum(i -> if(samples[i].2<samples[i-1].2,samples[i-1].2,0.),range(2,n+1)) corrected,if((first_ts-((1788891296000-0)-86400000))/1000<sampled/(n-1)*1.1,(first_ts-((1788891296000-0)-86400000))/1000,sampled/(n-1)/2) start_extra,if(((1788891296000-0)-last_ts)/1000<sampled/(n-1)*1.1,((1788891296000-0)-last_ts)/1000,sampled/(n-1)/2) end_extra FROM (SELECT labels,arraySort(x -> x.1,groupArray((ts_ms,value))) samples FROM raw_samples WHERE metric='backend_http_5xx_total' AND ts_ms>=((1788891296000-0)-86400000) AND ts_ms<=(1788891296000-0) GROUP BY labels) WHERE n>=2))) GROUP BY job) WHERE value>0"
-    },
-    {
-      "id": "q19",
-      "operators": [
-        "rate",
-        "sum"
-      ],
-      "parser_planner": "failure",
-      "reason": "SQL lowering failed: DataFusion error: SQL error: ParserError(\"Expected: joined table, found: ,\")",
-      "sql": "SELECT map() labels,sum(value) value FROM (SELECT labels, corrected*(sampled+least(start_extra,if(corrected>0,sampled*(first_value/corrected),start_extra))+end_extra)/sampled/(300000/1000) AS value FROM (SELECT labels,samples,length(samples) n,samples[1].1 first_ts,samples[n].1 last_ts,samples[1].2 first_value,samples[n].2 last_value,(last_ts-first_ts)/1000 sampled,(last_value-first_value)+arraySum(i -> if(samples[i].2<samples[i-1].2,samples[i-1].2,0.),range(2,n+1)) corrected,if((first_ts-((1788891296000-0)-300000))/1000<sampled/(n-1)*1.1,(first_ts-((1788891296000-0)-300000))/1000,sampled/(n-1)/2) start_extra,if(((1788891296000-0)-last_ts)/1000<sampled/(n-1)*1.1,((1788891296000-0)-last_ts)/1000,sampled/(n-1)/2) end_extra FROM (SELECT labels,arraySort(x -> x.1,groupArray((ts_ms,value))) samples FROM raw_samples WHERE metric='order_service_http_requests_total' AND ts_ms>=((1788891296000-0)-300000) AND ts_ms<=(1788891296000-0) GROUP BY labels) WHERE n>=2))"
-    },
-    {
-      "id": "q20",
-      "operators": [
-        "rate",
-        "sum",
-        "offset"
-      ],
-      "parser_planner": "failure",
-      "reason": "SQL lowering failed: DataFusion error: SQL error: ParserError(\"Expected: joined table, found: ,\")",
-      "sql": "SELECT map() labels,sum(value) value FROM (SELECT labels, corrected*(sampled+least(start_extra,if(corrected>0,sampled*(first_value/corrected),start_extra))+end_extra)/sampled/(300000/1000) AS value FROM (SELECT labels,samples,length(samples) n,samples[1].1 first_ts,samples[n].1 last_ts,samples[1].2 first_value,samples[n].2 last_value,(last_ts-first_ts)/1000 sampled,(last_value-first_value)+arraySum(i -> if(samples[i].2<samples[i-1].2,samples[i-1].2,0.),range(2,n+1)) corrected,if((first_ts-((1788891296000-3600000)-300000))/1000<sampled/(n-1)*1.1,(first_ts-((1788891296000-3600000)-300000))/1000,sampled/(n-1)/2) start_extra,if(((1788891296000-3600000)-last_ts)/1000<sampled/(n-1)*1.1,((1788891296000-3600000)-last_ts)/1000,sampled/(n-1)/2) end_extra FROM (SELECT labels,arraySort(x -> x.1,groupArray((ts_ms,value))) samples FROM raw_samples WHERE metric='order_service_http_requests_total' AND ts_ms>=((1788891296000-3600000)-300000) AND ts_ms<=(1788891296000-3600000) GROUP BY labels) WHERE n>=2))"
-    },
-    {
-      "id": "q21",
-      "operators": [
-        "histogram_quantile",
-        "rate"
-      ],
-      "parser_planner": "failure",
-      "reason": "SQL lowering failed: DataFusion error: SQL error: ParserError(\"Expected: ), found: .1\")",
-      "sql": "SELECT map() labels,if(idx=length(buckets),buckets[idx-1].1,if(idx=1 AND buckets[idx].1<=0,buckets[idx].1,(if(idx=1,0.,buckets[idx-1].1)+(buckets[idx].1-if(idx=1,0.,buckets[idx-1].1))*(rank-if(idx=1,0.,buckets[idx-1].2))/(buckets[idx].2-if(idx=1,0.,buckets[idx-1].2))))) value FROM (SELECT buckets,0.95*buckets[length(buckets)].2 rank,arrayFirstIndex(x->x.2>=rank,buckets) idx FROM (SELECT arrayMap(i->(raw[i].1,arrayMax(arrayMap(x->x.2,arraySlice(raw,1,i)))),range(1,length(raw)+1)) buckets FROM (SELECT arraySort(x->x.1,groupArray((if(le='+Inf',inf,toFloat64(le)),value))) raw FROM (SELECT labels['le'] le,sum(value) value FROM (SELECT labels, corrected*(sampled+least(start_extra,if(corrected>0,sampled*(first_value/corrected),start_extra))+end_extra)/sampled/(300000/1000) AS value FROM (SELECT labels,samples,length(samples) n,samples[1].1 first_ts,samples[n].1 last_ts,samples[1].2 first_value,samples[n].2 last_value,(last_ts-first_ts)/1000 sampled,(last_value-first_value)+arraySum(i -> if(samples[i].2<samples[i-1].2,samples[i-1].2,0.),range(2,n+1)) corrected,if((first_ts-((1788891296000-0)-300000))/1000<sampled/(n-1)*1.1,(first_ts-((1788891296000-0)-300000))/1000,sampled/(n-1)/2) start_extra,if(((1788891296000-0)-last_ts)/1000<sampled/(n-1)*1.1,((1788891296000-0)-last_ts)/1000,sampled/(n-1)/2) end_extra FROM (SELECT labels,arraySort(x -> x.1,groupArray((ts_ms,value))) samples FROM raw_samples WHERE metric='order_service_http_request_duration_seconds_bucket' AND ts_ms>=((1788891296000-0)-300000) AND ts_ms<=(1788891296000-0) GROUP BY labels) WHERE n>=2)) GROUP BY le)))) WHERE idx>0"
-    },
-    {
-      "id": "q22",
-      "operators": [
-        "rate",
-        "sum"
-      ],
-      "parser_planner": "failure",
-      "reason": "SQL lowering failed: DataFusion error: SQL error: ParserError(\"Expected: joined table, found: ,\")",
-      "sql": "SELECT map() labels,sum(value) value FROM (SELECT labels, corrected*(sampled+least(start_extra,if(corrected>0,sampled*(first_value/corrected),start_extra))+end_extra)/sampled/(300000/1000) AS value FROM (SELECT labels,samples,length(samples) n,samples[1].1 first_ts,samples[n].1 last_ts,samples[1].2 first_value,samples[n].2 last_value,(last_ts-first_ts)/1000 sampled,(last_value-first_value)+arraySum(i -> if(samples[i].2<samples[i-1].2,samples[i-1].2,0.),range(2,n+1)) corrected,if((first_ts-((1788891296000-0)-300000))/1000<sampled/(n-1)*1.1,(first_ts-((1788891296000-0)-300000))/1000,sampled/(n-1)/2) start_extra,if(((1788891296000-0)-last_ts)/1000<sampled/(n-1)*1.1,((1788891296000-0)-last_ts)/1000,sampled/(n-1)/2) end_extra FROM (SELECT labels,arraySort(x -> x.1,groupArray((ts_ms,value))) samples FROM raw_samples WHERE metric='order_service_http_requests_total' AND ts_ms>=((1788891296000-0)-300000) AND ts_ms<=(1788891296000-0) GROUP BY labels) WHERE n>=2))"
-    },
-    {
-      "canonical_sql": "Limit { n: 2, offset: 0, child: Sort { keys: [SortKey { expr: Column(1), ascending: false, nulls_first: true }, SortKey { expr: Column(0), ascending: true, nulls_first: false }], partition_by: GroupKeys { keys: [], without: false }, child: Project { cols: [ProjectItem { alias: None, expr: Column(0) }, ProjectItem { alias: Some(\"value\"), expr: Column(1) }], qualifier: None, child: Aggregate { reduction: Reduce(GroupKeys { keys: [1], without: false }), measures: [Max { col: Some(3) }], output_names: [\"max(raw_samples.value)\"], having: None, child: Scan { source: Table { table_ref: \"raw_samples\" }, predicates: [Predicate(BoolAnd([Compare { left: Column(0), op: Eq, right: Literal(Utf8(\"backend_retry_backlog_depth\")) }, Compare { left: Column(2), op: Gt, right: Arithmetic { op: Sub, left: Literal(Int64(1788891296000)), right: Literal(Int64(21600000)) } }, Compare { left: Column(2), op: Le, right: Literal(Int64(1788891296000)) }]))], schema: Schema { columns: [Column { name: \"metric\", dtype: Utf8, nullable: false, table: Some(\"raw_samples\") }, Column { name: \"labels\", dtype: Utf8, nullable: false, table: Some(\"raw_samples\") }, Column { name: \"ts_ms\", dtype: Timestamp, nullable: false, table: Some(\"raw_samples\") }, Column { name: \"value\", dtype: Float64, nullable: false, table: Some(\"raw_samples\") }], time_index: Some(2), unique_keys: [], closed: true } } } } } }",
-      "classification": "failure",
-      "id": "q23",
-      "operators": [
-        "topk",
-        "max_over_time"
-      ],
-      "parser_planner": "pass",
-      "physical": "Committed(Summary(SummaryNode { expr: ValueOperation { child: SummaryNode { expr: ValueOperation { child: SummaryNode { expr: ValueOperation { child: SummaryNode { expr: SummaryAgg { child: SummaryNode { expr: KeepPreAsap(Scan { source: Table { table_ref: \"raw_samples\" }, predicates: [Predicate(BoolAnd([Compare { left: Column(0), op: Eq, right: Literal(Utf8(\"backend_retry_backlog_depth\")) }, Compare { left: Column(2), op: Gt, right: Arithmetic { op: Sub, left: Literal(Int64(1788891296000)), right: Literal(Int64(21600000)) } }, Compare { left: Column(2), op: Le, right: Literal(Int64(1788891296000)) }]))], schema: Schema { columns: [Column { name: \"metric\", dtype: Utf8, nullable: false, table: Some(\"raw_samples\") }, Column { name: \"labels\", dtype: Utf8, nullable: false, table: Some(\"raw_samples\") }, Column { name: \"ts_ms\", dtype: Timestamp, nullable: false, table: Some(\"raw_samples\") }, Column { name: \"value\", dtype: Float64, nullable: false, table: Some(\"raw_samples\") }], time_index: Some(2), unique_keys: [], closed: true } }), schema: SummarySchema { fields: [SummaryField { name: \"metric\", dtype: Plain(Utf8), nullable: false }, SummaryField { name: \"labels\", dtype: Plain(Utf8), nullable: false }, SummaryField { name: \"ts_ms\", dtype: Plain(Timestamp), nullable: false }, SummaryField { name: \"value\", dtype: Plain(Float64), nullable: false }], time_index: Some(2) }, guarantee: Some(ResultGuarantee { metric: AbsoluteValue, bound: Zero, failure_probability: Zero, provenance: [Exact { reason: \"KeepPreAsap\" }] }) }, family: ExactAggregate(MinMax, MinMax), input: SummaryUpdate { item: None, weight: Column(Qualified { table: \"raw_samples\", name: \"value\" }), weight_domain: UnknownOrSigned }, reduction: Reduce(GroupKeys { keys: [1], without: false }), grouping: PerSubpopulationInstance }, schema: SummarySchema { fields: [SummaryField { name: \"labels\", dtype: Plain(Utf8), nullable: false }, SummaryField { name: \"max(raw_samples.value)\", dtype: ExactAggregate(MinMax, MinMax), nullable: false }], time_index: None }, guarantee: Some(ResultGuarantee { metric: AbsoluteValue, bound: Zero, failure_probability: Zero, provenance: [Exact { reason: \"ExactAggregate(MinMax)\" }, ChildGuarantee { input_index: 0, guarantee: ResultGuarantee { metric: AbsoluteValue, bound: Zero, failure_probability: Zero, provenance: [Exact { reason: \"KeepPreAsap\" }] } }, CompositionStep { operator: ExactExtremum, rule: \"exact_input\" }] }) }, operation: Project { cols: [ProjectItem { alias: None, expr: Column(0) }, ProjectItem { alias: Some(\"value\"), expr: Column(1) }], qualifier: None }, timing: ReadTime }, schema: SummarySchema { fields: [SummaryField { name: \"labels\", dtype: Plain(Utf8), nullable: false }, SummaryField { name: \"value\", dtype: Plain(Float64), nullable: false }], time_index: None }, guarantee: Some(ResultGuarantee { metric: AbsoluteValue, bound: Zero, failure_probability: Zero, provenance: [Exact { reason: \"ExactAggregate(MinMax)\" }, ChildGuarantee { input_index: 0, guarantee: ResultGuarantee { metric: AbsoluteValue, bound: Zero, failure_probability: Zero, provenance: [Exact { reason: \"KeepPreAsap\" }] } }, CompositionStep { operator: ExactExtremum, rule: \"exact_input\" }] }) }, operation: Sort { keys: [SortKey { expr: Column(1), ascending: false, nulls_first: true }, SortKey { expr: Column(0), ascending: true, nulls_first: false }], partition_by: GroupKeys { keys: [], without: false } }, timing: ReadTime }, schema: SummarySchema { fields: [SummaryField { name: \"labels\", dtype: Plain(Utf8), nullable: false }, SummaryField { name: \"value\", dtype: Plain(Float64), nullable: false }], time_index: None }, guarantee: Some(ResultGuarantee { metric: AbsoluteValue, bound: Zero, failure_probability: Zero, provenance: [Exact { reason: \"ExactAggregate(MinMax)\" }, ChildGuarantee { input_index: 0, guarantee: ResultGuarantee { metric: AbsoluteValue, bound: Zero, failure_probability: Zero, provenance: [Exact { reason: \"KeepPreAsap\" }] } }, CompositionStep { operator: ExactExtremum, rule: \"exact_input\" }] }) }, operation: Limit { n: 2, offset: 0 }, timing: ReadTime }, schema: SummarySchema { fields: [SummaryField { name: \"labels\", dtype: Plain(Utf8), nullable: false }, SummaryField { name: \"value\", dtype: Plain(Float64), nullable: false }], time_index: None }, guarantee: Some(ResultGuarantee { metric: AbsoluteValue, bound: Zero, failure_probability: Zero, provenance: [Exact { reason: \"ExactAggregate(MinMax)\" }, ChildGuarantee { input_index: 0, guarantee: ResultGuarantee { metric: AbsoluteValue, bound: Zero, failure_probability: Zero, provenance: [Exact { reason: \"KeepPreAsap\" }] } }, CompositionStep { operator: ExactExtremum, rule: \"exact_input\" }] }) }))",
-      "publication": "failure",
-      "reason": "SQL lowering failed: invalid QueryPlan: SQL population predicate on metric needs a canonical catalog filter",
-      "sql": "SELECT labels,max(value) AS value FROM raw_samples WHERE metric='backend_retry_backlog_depth' AND ts_ms>1788891296000-21600000 AND ts_ms<=1788891296000 GROUP BY labels ORDER BY value DESC,labels LIMIT 2"
-    },
-    {
-      "id": "q24",
-      "operators": [
-        "rate",
-        "max_over_time",
-        "sum",
-        "subquery",
-        "division"
-      ],
-      "parser_planner": "failure",
-      "reason": "SQL lowering failed: DataFusion error: SQL error: ParserError(\"Expected: joined table, found: ,\")",
-      "sql": "SELECT map() labels,max(a.value/b.value) value FROM (SELECT grid_ms,sum(value) value FROM (SELECT grid_ms,labels,corrected*(sampled+least(start_extra,if(corrected>0,sampled*(first_value/corrected),start_extra))+end_extra)/sampled/300 value FROM (SELECT grid_ms,labels,samples,length(samples) n,samples[1].1 first_ts,samples[n].1 last_ts,samples[1].2 first_value,samples[n].2 last_value,(last_ts-first_ts)/1000 sampled,(last_value-first_value)+arraySum(i -> if(samples[i].2<samples[i-1].2,samples[i-1].2,0.),range(2,n+1)) corrected,if((first_ts-(grid_ms-300000))/1000<sampled/(n-1)*1.1,(first_ts-(grid_ms-300000))/1000,sampled/(n-1)/2) start_extra,if((grid_ms-last_ts)/1000<sampled/(n-1)*1.1,(grid_ms-last_ts)/1000,sampled/(n-1)/2) end_extra FROM (SELECT grid_ms,labels,arraySort(x->x.1,groupArray((ts_ms,value))) samples FROM raw_samples CROSS JOIN (SELECT arrayJoin(arrayMap(x->x*60000,range(toUInt64(intDiv(1788891296000-21600000+59999,60000)),toUInt64(intDiv(1788891296000,60000)+1)))) grid_ms) grids WHERE metric='order_service_http_5xx_total' AND ts_ms>=grid_ms-300000 AND ts_ms<=grid_ms GROUP BY grid_ms,labels) WHERE n>=2)) GROUP BY grid_ms) a INNER JOIN (SELECT grid_ms,sum(value) value FROM (SELECT grid_ms,labels,corrected*(sampled+least(start_extra,if(corrected>0,sampled*(first_value/corrected),start_extra))+end_extra)/sampled/300 value FROM (SELECT grid_ms,labels,samples,length(samples) n,samples[1].1 first_ts,samples[n].1 last_ts,samples[1].2 first_value,samples[n].2 last_value,(last_ts-first_ts)/1000 sampled,(last_value-first_value)+arraySum(i -> if(samples[i].2<samples[i-1].2,samples[i-1].2,0.),range(2,n+1)) corrected,if((first_ts-(grid_ms-300000))/1000<sampled/(n-1)*1.1,(first_ts-(grid_ms-300000))/1000,sampled/(n-1)/2) start_extra,if((grid_ms-last_ts)/1000<sampled/(n-1)*1.1,(grid_ms-last_ts)/1000,sampled/(n-1)/2) end_extra FROM (SELECT grid_ms,labels,arraySort(x->x.1,groupArray((ts_ms,value))) samples FROM raw_samples CROSS JOIN (SELECT arrayJoin(arrayMap(x->x*60000,range(toUInt64(intDiv(1788891296000-21600000+59999,60000)),toUInt64(intDiv(1788891296000,60000)+1)))) grid_ms) grids WHERE metric='order_service_http_requests_total' AND ts_ms>=grid_ms-300000 AND ts_ms<=grid_ms GROUP BY grid_ms,labels) WHERE n>=2)) GROUP BY grid_ms) b ON a.grid_ms=b.grid_ms"
-    },
-    {
-      "id": "q25",
-      "operators": [
-        "topk",
-        "scalar",
-        "increase",
-        "sum",
-        "division"
-      ],
-      "parser_planner": "failure",
-      "reason": "SQL lowering failed: DataFusion error: SQL error: ParserError(\"Expected: joined table, found: .\")",
-      "sql": "SELECT * FROM (SELECT a.labels,a.value/b.value value FROM (SELECT map('job',job) labels,sum(value) value FROM (SELECT labels['job'] job,value FROM (SELECT labels, corrected*(sampled+least(start_extra,if(corrected>0,sampled*(first_value/corrected),start_extra))+end_extra)/sampled AS value FROM (SELECT labels,samples,length(samples) n,samples[1].1 first_ts,samples[n].1 last_ts,samples[1].2 first_value,samples[n].2 last_value,(last_ts-first_ts)/1000 sampled,(last_value-first_value)+arraySum(i -> if(samples[i].2<samples[i-1].2,samples[i-1].2,0.),range(2,n+1)) corrected,if((first_ts-((1788891296000-0)-86400000))/1000<sampled/(n-1)*1.1,(first_ts-((1788891296000-0)-86400000))/1000,sampled/(n-1)/2) start_extra,if(((1788891296000-0)-last_ts)/1000<sampled/(n-1)*1.1,((1788891296000-0)-last_ts)/1000,sampled/(n-1)/2) end_extra FROM (SELECT labels,arraySort(x -> x.1,groupArray((ts_ms,value))) samples FROM raw_samples WHERE metric='backend_http_5xx_total' AND ts_ms>=((1788891296000-0)-86400000) AND ts_ms<=(1788891296000-0) GROUP BY labels) WHERE n>=2))) GROUP BY job) a CROSS JOIN (SELECT map() labels,sum(value) value FROM (SELECT labels, corrected*(sampled+least(start_extra,if(corrected>0,sampled*(first_value/corrected),start_extra))+end_extra)/sampled AS value FROM (SELECT labels,samples,length(samples) n,samples[1].1 first_ts,samples[n].1 last_ts,samples[1].2 first_value,samples[n].2 last_value,(last_ts-first_ts)/1000 sampled,(last_value-first_value)+arraySum(i -> if(samples[i].2<samples[i-1].2,samples[i-1].2,0.),range(2,n+1)) corrected,if((first_ts-((1788891296000-0)-86400000))/1000<sampled/(n-1)*1.1,(first_ts-((1788891296000-0)-86400000))/1000,sampled/(n-1)/2) start_extra,if(((1788891296000-0)-last_ts)/1000<sampled/(n-1)*1.1,((1788891296000-0)-last_ts)/1000,sampled/(n-1)/2) end_extra FROM (SELECT labels,arraySort(x -> x.1,groupArray((ts_ms,value))) samples FROM raw_samples WHERE metric='backend_http_5xx_total' AND ts_ms>=((1788891296000-0)-86400000) AND ts_ms<=(1788891296000-0) GROUP BY labels) WHERE n>=2))) b) ORDER BY value DESC,labels LIMIT 1"
-    },
-    {
-      "id": "q26",
-      "operators": [
-        "topk",
-        "rate"
-      ],
-      "parser_planner": "failure",
-      "reason": "SQL lowering failed: DataFusion error: SQL error: ParserError(\"Expected: joined table, found: labels\")",
-      "sql": "SELECT * FROM (SELECT map('job',job) labels,sum(value) value FROM (SELECT labels['job'] job,value FROM (SELECT labels, corrected*(sampled+least(start_extra,if(corrected>0,sampled*(first_value/corrected),start_extra))+end_extra)/sampled/(21600000/1000) AS value FROM (SELECT labels,samples,length(samples) n,samples[1].1 first_ts,samples[n].1 last_ts,samples[1].2 first_value,samples[n].2 last_value,(last_ts-first_ts)/1000 sampled,(last_value-first_value)+arraySum(i -> if(samples[i].2<samples[i-1].2,samples[i-1].2,0.),range(2,n+1)) corrected,if((first_ts-((1788891296000-0)-21600000))/1000<sampled/(n-1)*1.1,(first_ts-((1788891296000-0)-21600000))/1000,sampled/(n-1)/2) start_extra,if(((1788891296000-0)-last_ts)/1000<sampled/(n-1)*1.1,((1788891296000-0)-last_ts)/1000,sampled/(n-1)/2) end_extra FROM (SELECT labels,arraySort(x -> x.1,groupArray((ts_ms,value))) samples FROM raw_samples WHERE metric='backend_process_cpu_seconds_total' AND ts_ms>=((1788891296000-0)-21600000) AND ts_ms<=(1788891296000-0) GROUP BY labels) WHERE n>=2))) GROUP BY job) ORDER BY value DESC,labels LIMIT 1"
-    },
-    {
-      "id": "q27",
-      "operators": [
-        "topk",
-        "avg_over_time",
-        "subquery"
-      ],
-      "parser_planner": "failure",
-      "reason": "SQL lowering failed: DataFusion error: Error during planning: Invalid function 'modulo'.\nDid you mean 'today'?",
-      "sql": "SELECT map('job',job) labels,avg(value) value FROM (SELECT labels['job'] job,ts_ms,sum(value) value FROM raw_samples WHERE metric='backend_process_resident_memory_bytes' AND ts_ms+4000>=1788891296000-21600000 AND ts_ms+4000<=1788891296000 AND modulo(ts_ms+4000,60000)=0 GROUP BY job,ts_ms) GROUP BY job ORDER BY value DESC,job LIMIT 3"
-    }
-  ],
-  "query_count": 27
-}
diff --git a/tools/o11y-sql-main-eval/artifacts/matrix.json b/tools/o11y-sql-main-eval/artifacts/matrix.json
deleted file mode 100644
index 6996e8499..000000000
--- a/tools/o11y-sql-main-eval/artifacts/matrix.json
+++ /dev/null
@@ -1,482 +0,0 @@
-{
-  "schema_version": 1,
-  "baseline_commit": "791f7d7b0feab3827e7e6f5100e65ef29aec68de",
-  "corpus_count": 27,
-  "counts": {
-    "warm": 0,
-    "partial_hybrid": 0,
-    "exact_fallback": 27,
-    "failure": 0
-  },
-  "queries": [
-    {
-      "id": "q01",
-      "operators": [
-        "sort_desc",
-        "increase",
-        "division"
-      ],
-      "parser_planner": "failure",
-      "publication": "not_reached",
-      "fallback_requested": true,
-      "exact_executed": true,
-      "exact_success": true,
-      "exact_status": 200,
-      "direct_exact_status": 200,
-      "matches_direct_exact": true,
-      "classification": "exact_fallback",
-      "reason": "SQL error: ParserError(\"Expected: joined table, found: .\")"
-    },
-    {
-      "id": "q02",
-      "operators": [
-        "topk",
-        "increase",
-        "division"
-      ],
-      "parser_planner": "failure",
-      "publication": "not_reached",
-      "fallback_requested": true,
-      "exact_executed": true,
-      "exact_success": true,
-      "exact_status": 200,
-      "direct_exact_status": 200,
-      "matches_direct_exact": true,
-      "classification": "exact_fallback",
-      "reason": "SQL error: ParserError(\"Expected: joined table, found: .\")"
-    },
-    {
-      "id": "q03",
-      "operators": [
-        "increase",
-        "sum",
-        "division"
-      ],
-      "parser_planner": "failure",
-      "publication": "not_reached",
-      "fallback_requested": true,
-      "exact_executed": true,
-      "exact_success": true,
-      "exact_status": 200,
-      "direct_exact_status": 200,
-      "matches_direct_exact": true,
-      "classification": "exact_fallback",
-      "reason": "SQL error: ParserError(\"Expected: identifier, found: )\")"
-    },
-    {
-      "id": "q04",
-      "operators": [
-        "increase",
-        "sum",
-        "offset",
-        "division"
-      ],
-      "parser_planner": "failure",
-      "publication": "not_reached",
-      "fallback_requested": true,
-      "exact_executed": true,
-      "exact_success": true,
-      "exact_status": 200,
-      "direct_exact_status": 200,
-      "matches_direct_exact": true,
-      "classification": "exact_fallback",
-      "reason": "SQL error: ParserError(\"Expected: identifier, found: )\")"
-    },
-    {
-      "id": "q05",
-      "operators": [
-        "max_over_time"
-      ],
-      "parser_planner": "pass",
-      "publication": "failure",
-      "fallback_requested": true,
-      "exact_executed": true,
-      "exact_success": true,
-      "exact_status": 200,
-      "direct_exact_status": 200,
-      "matches_direct_exact": true,
-      "classification": "exact_fallback",
-      "reason": "SQL population predicate on metric needs a canonical catalog filter"
-    },
-    {
-      "id": "q06",
-      "operators": [
-        "max_over_time"
-      ],
-      "parser_planner": "pass",
-      "publication": "failure",
-      "fallback_requested": true,
-      "exact_executed": true,
-      "exact_success": true,
-      "exact_status": 200,
-      "direct_exact_status": 200,
-      "matches_direct_exact": true,
-      "classification": "exact_fallback",
-      "reason": "SQL population predicate on metric needs a canonical catalog filter"
-    },
-    {
-      "id": "q07",
-      "operators": [],
-      "parser_planner": "failure",
-      "publication": "not_reached",
-      "fallback_requested": true,
-      "exact_executed": true,
-      "exact_success": true,
-      "exact_status": 200,
-      "direct_exact_status": 200,
-      "matches_direct_exact": true,
-      "classification": "exact_fallback",
-      "reason": "Error during planning: Invalid function 'mapconcat'."
-    },
-    {
-      "id": "q08",
-      "operators": [
-        "rate",
-        "sum"
-      ],
-      "parser_planner": "failure",
-      "publication": "not_reached",
-      "fallback_requested": true,
-      "exact_executed": true,
-      "exact_success": true,
-      "exact_status": 200,
-      "direct_exact_status": 200,
-      "matches_direct_exact": true,
-      "classification": "exact_fallback",
-      "reason": "SQL error: ParserError(\"Expected: joined table, found: ,\")"
-    },
-    {
-      "id": "q09",
-      "operators": [
-        "sum"
-      ],
-      "parser_planner": "failure",
-      "publication": "not_reached",
-      "fallback_requested": true,
-      "exact_executed": true,
-      "exact_success": true,
-      "exact_status": 200,
-      "direct_exact_status": 200,
-      "matches_direct_exact": true,
-      "classification": "exact_fallback",
-      "reason": "Error during planning: Error during planning: map does not support zero arguments. No function matches the given name and argument types 'map()'. You might need to add explicit type casts."
-    },
-    {
-      "id": "q10",
-      "operators": [
-        "max_over_time",
-        "sum",
-        "subquery"
-      ],
-      "parser_planner": "failure",
-      "publication": "not_reached",
-      "fallback_requested": true,
-      "exact_executed": true,
-      "exact_success": true,
-      "exact_status": 200,
-      "direct_exact_status": 200,
-      "matches_direct_exact": true,
-      "classification": "exact_fallback",
-      "reason": "Error during planning: Invalid function 'modulo'."
-    },
-    {
-      "id": "q11",
-      "operators": [
-        "topk",
-        "rate"
-      ],
-      "parser_planner": "failure",
-      "publication": "not_reached",
-      "fallback_requested": true,
-      "exact_executed": true,
-      "exact_success": true,
-      "exact_status": 200,
-      "direct_exact_status": 200,
-      "matches_direct_exact": true,
-      "classification": "exact_fallback",
-      "reason": "SQL error: ParserError(\"Expected: joined table, found: labels\")"
-    },
-    {
-      "id": "q12",
-      "operators": [
-        "topk"
-      ],
-      "parser_planner": "failure",
-      "publication": "not_reached",
-      "fallback_requested": true,
-      "exact_executed": true,
-      "exact_success": true,
-      "exact_status": 200,
-      "direct_exact_status": 200,
-      "matches_direct_exact": true,
-      "classification": "exact_fallback",
-      "reason": "This feature is not implemented: Map Access"
-    },
-    {
-      "id": "q13",
-      "operators": [
-        "rate",
-        "max_over_time",
-        "sum",
-        "subquery"
-      ],
-      "parser_planner": "failure",
-      "publication": "not_reached",
-      "fallback_requested": true,
-      "exact_executed": true,
-      "exact_success": true,
-      "exact_status": 200,
-      "direct_exact_status": 200,
-      "matches_direct_exact": true,
-      "classification": "exact_fallback",
-      "reason": "SQL error: ParserError(\"Expected: joined table, found: ,\")"
-    },
-    {
-      "id": "q14",
-      "operators": [
-        "rate",
-        "sum"
-      ],
-      "parser_planner": "failure",
-      "publication": "not_reached",
-      "fallback_requested": true,
-      "exact_executed": true,
-      "exact_success": true,
-      "exact_status": 200,
-      "direct_exact_status": 200,
-      "matches_direct_exact": true,
-      "classification": "exact_fallback",
-      "reason": "SQL error: ParserError(\"Expected: joined table, found: ,\")"
-    },
-    {
-      "id": "q15",
-      "operators": [
-        "rate"
-      ],
-      "parser_planner": "failure",
-      "publication": "not_reached",
-      "fallback_requested": true,
-      "exact_executed": true,
-      "exact_success": true,
-      "exact_status": 200,
-      "direct_exact_status": 200,
-      "matches_direct_exact": true,
-      "classification": "exact_fallback",
-      "reason": "SQL error: ParserError(\"Expected: joined table, found: [\")"
-    },
-    {
-      "id": "q16",
-      "operators": [
-        "increase",
-        "sum",
-        "division"
-      ],
-      "parser_planner": "failure",
-      "publication": "not_reached",
-      "fallback_requested": true,
-      "exact_executed": true,
-      "exact_success": true,
-      "exact_status": 200,
-      "direct_exact_status": 200,
-      "matches_direct_exact": true,
-      "classification": "exact_fallback",
-      "reason": "SQL error: ParserError(\"Expected: identifier, found: )\")"
-    },
-    {
-      "id": "q17",
-      "operators": [
-        "topk",
-        "increase",
-        "division"
-      ],
-      "parser_planner": "failure",
-      "publication": "not_reached",
-      "fallback_requested": true,
-      "exact_executed": true,
-      "exact_success": true,
-      "exact_status": 200,
-      "direct_exact_status": 200,
-      "matches_direct_exact": true,
-      "classification": "exact_fallback",
-      "reason": "SQL error: ParserError(\"Expected: joined table, found: .\")"
-    },
-    {
-      "id": "q18",
-      "operators": [
-        "increase",
-        "comparison"
-      ],
-      "parser_planner": "failure",
-      "publication": "not_reached",
-      "fallback_requested": true,
-      "exact_executed": true,
-      "exact_success": true,
-      "exact_status": 200,
-      "direct_exact_status": 200,
-      "matches_direct_exact": true,
-      "classification": "exact_fallback",
-      "reason": "SQL error: ParserError(\"Expected: joined table, found: labels\")"
-    },
-    {
-      "id": "q19",
-      "operators": [
-        "rate",
-        "sum"
-      ],
-      "parser_planner": "failure",
-      "publication": "not_reached",
-      "fallback_requested": true,
-      "exact_executed": true,
-      "exact_success": true,
-      "exact_status": 200,
-      "direct_exact_status": 200,
-      "matches_direct_exact": true,
-      "classification": "exact_fallback",
-      "reason": "SQL error: ParserError(\"Expected: joined table, found: ,\")"
-    },
-    {
-      "id": "q20",
-      "operators": [
-        "rate",
-        "sum",
-        "offset"
-      ],
-      "parser_planner": "failure",
-      "publication": "not_reached",
-      "fallback_requested": true,
-      "exact_executed": true,
-      "exact_success": true,
-      "exact_status": 200,
-      "direct_exact_status": 200,
-      "matches_direct_exact": true,
-      "classification": "exact_fallback",
-      "reason": "SQL error: ParserError(\"Expected: joined table, found: ,\")"
-    },
-    {
-      "id": "q21",
-      "operators": [
-        "histogram_quantile",
-        "rate"
-      ],
-      "parser_planner": "failure",
-      "publication": "not_reached",
-      "fallback_requested": true,
-      "exact_executed": true,
-      "exact_success": true,
-      "exact_status": 200,
-      "direct_exact_status": 200,
-      "matches_direct_exact": true,
-      "classification": "exact_fallback",
-      "reason": "SQL error: ParserError(\"Expected: ), found: .1\")"
-    },
-    {
-      "id": "q22",
-      "operators": [
-        "rate",
-        "sum"
-      ],
-      "parser_planner": "failure",
-      "publication": "not_reached",
-      "fallback_requested": true,
-      "exact_executed": true,
-      "exact_success": true,
-      "exact_status": 200,
-      "direct_exact_status": 200,
-      "matches_direct_exact": true,
-      "classification": "exact_fallback",
-      "reason": "SQL error: ParserError(\"Expected: joined table, found: ,\")"
-    },
-    {
-      "id": "q23",
-      "operators": [
-        "topk",
-        "max_over_time"
-      ],
-      "parser_planner": "pass",
-      "publication": "failure",
-      "fallback_requested": true,
-      "exact_executed": true,
-      "exact_success": true,
-      "exact_status": 200,
-      "direct_exact_status": 200,
-      "matches_direct_exact": true,
-      "classification": "exact_fallback",
-      "reason": "SQL population predicate on metric needs a canonical catalog filter"
-    },
-    {
-      "id": "q24",
-      "operators": [
-        "rate",
-        "max_over_time",
-        "sum",
-        "subquery",
-        "division"
-      ],
-      "parser_planner": "failure",
-      "publication": "not_reached",
-      "fallback_requested": true,
-      "exact_executed": true,
-      "exact_success": true,
-      "exact_status": 200,
-      "direct_exact_status": 200,
-      "matches_direct_exact": true,
-      "classification": "exact_fallback",
-      "reason": "SQL error: ParserError(\"Expected: joined table, found: ,\")"
-    },
-    {
-      "id": "q25",
-      "operators": [
-        "topk",
-        "scalar",
-        "increase",
-        "sum",
-        "division"
-      ],
-      "parser_planner": "failure",
-      "publication": "not_reached",
-      "fallback_requested": true,
-      "exact_executed": true,
-      "exact_success": true,
-      "exact_status": 200,
-      "direct_exact_status": 200,
-      "matches_direct_exact": true,
-      "classification": "exact_fallback",
-      "reason": "SQL error: ParserError(\"Expected: joined table, found: .\")"
-    },
-    {
-      "id": "q26",
-      "operators": [
-        "topk",
-        "rate"
-      ],
-      "parser_planner": "failure",
-      "publication": "not_reached",
-      "fallback_requested": true,
-      "exact_executed": true,
-      "exact_success": true,
-      "exact_status": 200,
-      "direct_exact_status": 200,
-      "matches_direct_exact": true,
-      "classification": "exact_fallback",
-      "reason": "SQL error: ParserError(\"Expected: joined table, found: labels\")"
-    },
-    {
-      "id": "q27",
-      "operators": [
-        "topk",
-        "avg_over_time",
-        "subquery"
-      ],
-      "parser_planner": "failure",
-      "publication": "not_reached",
-      "fallback_requested": true,
-      "exact_executed": true,
-      "exact_success": true,
-      "exact_status": 200,
-      "direct_exact_status": 200,
-      "matches_direct_exact": true,
-      "classification": "exact_fallback",
-      "reason": "Error during planning: Invalid function 'modulo'."
-    }
-  ]
-}
diff --git a/tools/o11y-sql-main-eval/automatic-map-artifact-manifest.json b/tools/o11y-sql-main-eval/automatic-map-artifact-manifest.json
deleted file mode 100644
index b79d4a8c0..000000000
--- a/tools/o11y-sql-main-eval/automatic-map-artifact-manifest.json
+++ /dev/null
@@ -1,247 +0,0 @@
-[
-  {
-    "path": "/mydata/clickhouse-o11y-main-results/original27-matched/driver-checkout.txt",
-    "bytes": 41,
-    "sha256": "18a3dd592033f38652545dcaa36ab404a40c7a83768110c09d9b7321d7982789"
-  },
-  {
-    "path": "/mydata/clickhouse-o11y-main-results/original27-matched/inputs.sha256",
-    "bytes": 247,
-    "sha256": "fadb2b1c95f0d398eb2a116ed66b77a061561977dc589c1f447da7fcdd1c426e"
-  },
-  {
-    "path": "/mydata/clickhouse-o11y-main-results/original27-matched/runtime-source-commit.txt",
-    "bytes": 9,
-    "sha256": "6b594b65f78fb97ed820c019b4644fe9d783ad3a9d17394a1748ee7571421adf"
-  },
-  {
-    "path": "/mydata/clickhouse-o11y-main-results/original27-matched/trial-1-q05/clickhouse-runtime.json",
-    "bytes": 162,
-    "sha256": "2d019b9f4b287881e48052ed6b581fa6e1624f5d3541b58d0d6ef3cd252c986e"
-  },
-  {
-    "path": "/mydata/clickhouse-o11y-main-results/original27-matched/trial-1-q05/q05/requests.jsonl",
-    "bytes": 3548372,
-    "sha256": "6d6f7c36aa924d1c52d533a023d304169bf8179d09340f120d55337fcd3c7f99"
-  },
-  {
-    "path": "/mydata/clickhouse-o11y-main-results/original27-matched/trial-1-q05/q05/result.json",
-    "bytes": 5260,
-    "sha256": "1ac6780718e6fb66b159c92a44901783ce2c7033327bcd8ea75d84dfa3f4bb2f"
-  },
-  {
-    "path": "/mydata/clickhouse-o11y-main-results/original27-matched/trial-1-q06/clickhouse-runtime.json",
-    "bytes": 162,
-    "sha256": "2d019b9f4b287881e48052ed6b581fa6e1624f5d3541b58d0d6ef3cd252c986e"
-  },
-  {
-    "path": "/mydata/clickhouse-o11y-main-results/original27-matched/trial-1-q06/q06/requests.jsonl",
-    "bytes": 2604895,
-    "sha256": "f671c3032885973cb521e4b7af450f5698391dc004a82fbc6d611c1dd7037724"
-  },
-  {
-    "path": "/mydata/clickhouse-o11y-main-results/original27-matched/trial-1-q06/q06/result.json",
-    "bytes": 4320,
-    "sha256": "de50b85a5325560ef63243a0bd7073d67a9a31afa574ce7f7e40bfb4f6da9816"
-  },
-  {
-    "path": "/mydata/clickhouse-o11y-main-results/original27-matched/trial-1-q23/clickhouse-runtime.json",
-    "bytes": 162,
-    "sha256": "2d019b9f4b287881e48052ed6b581fa6e1624f5d3541b58d0d6ef3cd252c986e"
-  },
-  {
-    "path": "/mydata/clickhouse-o11y-main-results/original27-matched/trial-1-q23/q23/requests.jsonl",
-    "bytes": 2905541,
-    "sha256": "ee05883c651673b36df8608dc31d421d51e37c597f5d8a47cd0d2ea434bf53ba"
-  },
-  {
-    "path": "/mydata/clickhouse-o11y-main-results/original27-matched/trial-1-q23/q23/result.json",
-    "bytes": 4620,
-    "sha256": "8100b7054f0c8f161bd986148c9fc661c7ded2ce90c33125f5aae6a6b944b8e7"
-  },
-  {
-    "path": "/mydata/clickhouse-o11y-main-results/original27-matched/trial-2-q05/clickhouse-runtime.json",
-    "bytes": 162,
-    "sha256": "2d019b9f4b287881e48052ed6b581fa6e1624f5d3541b58d0d6ef3cd252c986e"
-  },
-  {
-    "path": "/mydata/clickhouse-o11y-main-results/original27-matched/trial-2-q05/q05/requests.jsonl",
-    "bytes": 3548547,
-    "sha256": "65fc261c415cc3485a58bf301e0a7ffef2bb2c8a4c22e69122ed63a25555c53f"
-  },
-  {
-    "path": "/mydata/clickhouse-o11y-main-results/original27-matched/trial-2-q05/q05/result.json",
-    "bytes": 5260,
-    "sha256": "4ae2305987f4f538fd4da13f817aa11942ebbb3308ad9b29ebd83c28c2e94978"
-  },
-  {
-    "path": "/mydata/clickhouse-o11y-main-results/original27-matched/trial-2-q06/clickhouse-runtime.json",
-    "bytes": 162,
-    "sha256": "2d019b9f4b287881e48052ed6b581fa6e1624f5d3541b58d0d6ef3cd252c986e"
-  },
-  {
-    "path": "/mydata/clickhouse-o11y-main-results/original27-matched/trial-2-q06/q06/requests.jsonl",
-    "bytes": 2606114,
-    "sha256": "c4345d24793e863c2e9af41901854e6ce0145c626c1e44f5e1e6df7310c37b33"
-  },
-  {
-    "path": "/mydata/clickhouse-o11y-main-results/original27-matched/trial-2-q06/q06/result.json",
-    "bytes": 4320,
-    "sha256": "c9e2985833acbed36c264bbcbc8ca43d75b3629b402c73a9f642a63a4a760d24"
-  },
-  {
-    "path": "/mydata/clickhouse-o11y-main-results/original27-matched/trial-2-q23/clickhouse-runtime.json",
-    "bytes": 162,
-    "sha256": "2d019b9f4b287881e48052ed6b581fa6e1624f5d3541b58d0d6ef3cd252c986e"
-  },
-  {
-    "path": "/mydata/clickhouse-o11y-main-results/original27-matched/trial-2-q23/q23/requests.jsonl",
-    "bytes": 2906164,
-    "sha256": "8fa00d84d1d2f5264d13168e39825cd97419cfa9c903a604d56ceb6651694d7c"
-  },
-  {
-    "path": "/mydata/clickhouse-o11y-main-results/original27-matched/trial-2-q23/q23/result.json",
-    "bytes": 4620,
-    "sha256": "bd5f276af8c3c0cc30d7204924a926cb5c710c75d698f6e69a0572b3a1171d9b"
-  },
-  {
-    "path": "/mydata/clickhouse-o11y-main-results/original27-matched/trial-3-q05/clickhouse-runtime.json",
-    "bytes": 162,
-    "sha256": "2d019b9f4b287881e48052ed6b581fa6e1624f5d3541b58d0d6ef3cd252c986e"
-  },
-  {
-    "path": "/mydata/clickhouse-o11y-main-results/original27-matched/trial-3-q05/q05/requests.jsonl",
-    "bytes": 3547588,
-    "sha256": "58046878910dbf4d93d4d3ff569e1f40423086260237cbaa23845993e44ff2a0"
-  },
-  {
-    "path": "/mydata/clickhouse-o11y-main-results/original27-matched/trial-3-q05/q05/result.json",
-    "bytes": 5262,
-    "sha256": "04459d12a190f6a6fcb9bc4ef2eb460845df5759e9a629d68e21d20330e7ad41"
-  },
-  {
-    "path": "/mydata/clickhouse-o11y-main-results/original27-matched/trial-3-q06/clickhouse-runtime.json",
-    "bytes": 162,
-    "sha256": "2d019b9f4b287881e48052ed6b581fa6e1624f5d3541b58d0d6ef3cd252c986e"
-  },
-  {
-    "path": "/mydata/clickhouse-o11y-main-results/original27-matched/trial-3-q06/q06/requests.jsonl",
-    "bytes": 2606081,
-    "sha256": "212c6e2c61640348dd362e3f9bc5744cff9e7ef54c10545f6221b7bae43c4e7d"
-  },
-  {
-    "path": "/mydata/clickhouse-o11y-main-results/original27-matched/trial-3-q06/q06/result.json",
-    "bytes": 4320,
-    "sha256": "d754143c030aabd1be105dc46888c96dd0ad8a30b598db0f4202797e7358f337"
-  },
-  {
-    "path": "/mydata/clickhouse-o11y-main-results/original27-matched/trial-3-q23/clickhouse-runtime.json",
-    "bytes": 162,
-    "sha256": "2d019b9f4b287881e48052ed6b581fa6e1624f5d3541b58d0d6ef3cd252c986e"
-  },
-  {
-    "path": "/mydata/clickhouse-o11y-main-results/original27-matched/trial-3-q23/q23/requests.jsonl",
-    "bytes": 2905867,
-    "sha256": "5a0554274d325f6ddec93830e7af7f28798e9e893ed4b5868e984cc67d87b1e7"
-  },
-  {
-    "path": "/mydata/clickhouse-o11y-main-results/original27-matched/trial-3-q23/q23/result.json",
-    "bytes": 4619,
-    "sha256": "7269fd8c20b6277d96ed7ffbb9c5272e20e1cc219ecacedf9f8146be16be8c52"
-  },
-  {
-    "path": "/mydata/clickhouse-o11y-main-results/original27-deployment-pairs/inputs.sha256",
-    "bytes": 397,
-    "sha256": "c70dc43ef6d8772e796a6f10c840bdd82a012b140ff9faa7af2e77a9961a9212"
-  },
-  {
-    "path": "/mydata/clickhouse-o11y-main-results/original27-deployment-pairs/trial-1-asap/clickhouse-runtime.json",
-    "bytes": 162,
-    "sha256": "2d019b9f4b287881e48052ed6b581fa6e1624f5d3541b58d0d6ef3cd252c986e"
-  },
-  {
-    "path": "/mydata/clickhouse-o11y-main-results/original27-deployment-pairs/trial-1-asap/q05/requests.jsonl",
-    "bytes": 1227891,
-    "sha256": "d81cd271bdacd5f3f07c2cb3bee149d9e4ebac04768e0f9f5b818e8e19cccb98"
-  },
-  {
-    "path": "/mydata/clickhouse-o11y-main-results/original27-deployment-pairs/trial-1-asap/q05/result.json",
-    "bytes": 5414,
-    "sha256": "d5ecb41643d21f22eb812ffc2c85e5f4ede6518663d05fa47bc8033f71ff6695"
-  },
-  {
-    "path": "/mydata/clickhouse-o11y-main-results/original27-deployment-pairs/trial-1-native/clickhouse-runtime.json",
-    "bytes": 162,
-    "sha256": "2d019b9f4b287881e48052ed6b581fa6e1624f5d3541b58d0d6ef3cd252c986e"
-  },
-  {
-    "path": "/mydata/clickhouse-o11y-main-results/original27-deployment-pairs/trial-1-native/requests.jsonl",
-    "bytes": 1250315,
-    "sha256": "df3329158c97f5ac95e125c153c19bcece3a4a59e8f93cf60939db905f23e32e"
-  },
-  {
-    "path": "/mydata/clickhouse-o11y-main-results/original27-deployment-pairs/trial-1-native/result.json",
-    "bytes": 403,
-    "sha256": "d572fdfc34a5208af4c263f878084860d3c0ab469e8a78f9c2d6f0ffc5286f85"
-  },
-  {
-    "path": "/mydata/clickhouse-o11y-main-results/original27-deployment-pairs/trial-2-asap/clickhouse-runtime.json",
-    "bytes": 162,
-    "sha256": "2d019b9f4b287881e48052ed6b581fa6e1624f5d3541b58d0d6ef3cd252c986e"
-  },
-  {
-    "path": "/mydata/clickhouse-o11y-main-results/original27-deployment-pairs/trial-2-asap/q05/requests.jsonl",
-    "bytes": 1227892,
-    "sha256": "53619e372243b06b374695712aedbbd009599107a2166b56743bcd66c1eb3725"
-  },
-  {
-    "path": "/mydata/clickhouse-o11y-main-results/original27-deployment-pairs/trial-2-asap/q05/result.json",
-    "bytes": 5414,
-    "sha256": "d397f396056ad8d433ca51c41b6dd7d65ee565ae8af9a0a847e35187310dd21d"
-  },
-  {
-    "path": "/mydata/clickhouse-o11y-main-results/original27-deployment-pairs/trial-2-native/clickhouse-runtime.json",
-    "bytes": 162,
-    "sha256": "2d019b9f4b287881e48052ed6b581fa6e1624f5d3541b58d0d6ef3cd252c986e"
-  },
-  {
-    "path": "/mydata/clickhouse-o11y-main-results/original27-deployment-pairs/trial-2-native/requests.jsonl",
-    "bytes": 1249755,
-    "sha256": "9979477f6c16d9cf51c23fa46243b0a5c5ac0609684e44790806e947f3495bca"
-  },
-  {
-    "path": "/mydata/clickhouse-o11y-main-results/original27-deployment-pairs/trial-2-native/result.json",
-    "bytes": 402,
-    "sha256": "75e34dc04bd0ee64381cd9b99bd4c5e1c5dab1ddbeac013df169b88143739a97"
-  },
-  {
-    "path": "/mydata/clickhouse-o11y-main-results/original27-deployment-pairs/trial-3-asap/clickhouse-runtime.json",
-    "bytes": 162,
-    "sha256": "2d019b9f4b287881e48052ed6b581fa6e1624f5d3541b58d0d6ef3cd252c986e"
-  },
-  {
-    "path": "/mydata/clickhouse-o11y-main-results/original27-deployment-pairs/trial-3-asap/q05/requests.jsonl",
-    "bytes": 1227890,
-    "sha256": "2f196c6f74c13ec8453ec2c1bbb0b1a58e3449aa307ad63edabb94e73a4d7295"
-  },
-  {
-    "path": "/mydata/clickhouse-o11y-main-results/original27-deployment-pairs/trial-3-asap/q05/result.json",
-    "bytes": 5414,
-    "sha256": "a58f6e47deae4a301399472d41b37983d81f751ee722820234654d5331295fa3"
-  },
-  {
-    "path": "/mydata/clickhouse-o11y-main-results/original27-deployment-pairs/trial-3-native/clickhouse-runtime.json",
-    "bytes": 162,
-    "sha256": "2d019b9f4b287881e48052ed6b581fa6e1624f5d3541b58d0d6ef3cd252c986e"
-  },
-  {
-    "path": "/mydata/clickhouse-o11y-main-results/original27-deployment-pairs/trial-3-native/requests.jsonl",
-    "bytes": 1249777,
-    "sha256": "f2956c2a5a70f16088dbc38b750d0ebe531ae8117313f83b0bc6b766edd35328"
-  },
-  {
-    "path": "/mydata/clickhouse-o11y-main-results/original27-deployment-pairs/trial-3-native/result.json",
-    "bytes": 402,
-    "sha256": "d86b54ee3db980d3501e37c51f0e0bc7289b952866a6e9ac34798ab917827810"
-  }
-]
diff --git a/tools/o11y-sql-main-eval/automatic-map-coverage.json b/tools/o11y-sql-main-eval/automatic-map-coverage.json
deleted file mode 100644
index 9b65a7082..000000000
--- a/tools/o11y-sql-main-eval/automatic-map-coverage.json
+++ /dev/null
@@ -1,245 +0,0 @@
-[
-  {
-    "id": "q01",
-    "publication": "failure",
-    "execution": "failed",
-    "route": "exact_fallback",
-    "equal": false,
-    "backend_status": 500,
-    "native_status": 500
-  },
-  {
-    "id": "q02",
-    "publication": "failure",
-    "execution": "failed",
-    "route": "exact_fallback",
-    "equal": false,
-    "backend_status": 500,
-    "native_status": 500
-  },
-  {
-    "id": "q03",
-    "publication": "failure",
-    "execution": "exact_fallback",
-    "route": "exact_fallback",
-    "equal": true,
-    "backend_status": 200,
-    "native_status": 200
-  },
-  {
-    "id": "q04",
-    "publication": "failure",
-    "execution": "exact_fallback",
-    "route": "exact_fallback",
-    "equal": true,
-    "backend_status": 200,
-    "native_status": 200
-  },
-  {
-    "id": "q05",
-    "publication": "pass",
-    "execution": "warm",
-    "route": "warm",
-    "equal": true,
-    "backend_status": 200,
-    "native_status": 200
-  },
-  {
-    "id": "q06",
-    "publication": "pass",
-    "execution": "warm",
-    "route": "warm",
-    "equal": true,
-    "backend_status": 200,
-    "native_status": 200
-  },
-  {
-    "id": "q07",
-    "publication": "failure",
-    "execution": "exact_fallback",
-    "route": "exact_fallback",
-    "equal": true,
-    "backend_status": 200,
-    "native_status": 200
-  },
-  {
-    "id": "q08",
-    "publication": "failure",
-    "execution": "exact_fallback",
-    "route": "exact_fallback",
-    "equal": true,
-    "backend_status": 200,
-    "native_status": 200
-  },
-  {
-    "id": "q09",
-    "publication": "failure",
-    "execution": "exact_fallback",
-    "route": "exact_fallback",
-    "equal": true,
-    "backend_status": 200,
-    "native_status": 200
-  },
-  {
-    "id": "q10",
-    "publication": "failure",
-    "execution": "exact_fallback",
-    "route": "exact_fallback",
-    "equal": true,
-    "backend_status": 200,
-    "native_status": 200
-  },
-  {
-    "id": "q11",
-    "publication": "failure",
-    "execution": "exact_fallback",
-    "route": "exact_fallback",
-    "equal": true,
-    "backend_status": 200,
-    "native_status": 200
-  },
-  {
-    "id": "q12",
-    "publication": "failure",
-    "execution": "exact_fallback",
-    "route": "exact_fallback",
-    "equal": true,
-    "backend_status": 200,
-    "native_status": 200
-  },
-  {
-    "id": "q13",
-    "publication": "failure",
-    "execution": "exact_fallback",
-    "route": "exact_fallback",
-    "equal": true,
-    "backend_status": 200,
-    "native_status": 200
-  },
-  {
-    "id": "q14",
-    "publication": "failure",
-    "execution": "exact_fallback",
-    "route": "exact_fallback",
-    "equal": true,
-    "backend_status": 200,
-    "native_status": 200
-  },
-  {
-    "id": "q15",
-    "publication": "failure",
-    "execution": "exact_fallback",
-    "route": "exact_fallback",
-    "equal": true,
-    "backend_status": 200,
-    "native_status": 200
-  },
-  {
-    "id": "q16",
-    "publication": "failure",
-    "execution": "exact_fallback",
-    "route": "exact_fallback",
-    "equal": true,
-    "backend_status": 200,
-    "native_status": 200
-  },
-  {
-    "id": "q17",
-    "publication": "failure",
-    "execution": "failed",
-    "route": "exact_fallback",
-    "equal": false,
-    "backend_status": 500,
-    "native_status": 500
-  },
-  {
-    "id": "q18",
-    "publication": "failure",
-    "execution": "failed",
-    "route": "exact_fallback",
-    "equal": false,
-    "backend_status": 500,
-    "native_status": 500
-  },
-  {
-    "id": "q19",
-    "publication": "failure",
-    "execution": "exact_fallback",
-    "route": "exact_fallback",
-    "equal": true,
-    "backend_status": 200,
-    "native_status": 200
-  },
-  {
-    "id": "q20",
-    "publication": "failure",
-    "execution": "exact_fallback",
-    "route": "exact_fallback",
-    "equal": true,
-    "backend_status": 200,
-    "native_status": 200
-  },
-  {
-    "id": "q21",
-    "publication": "failure",
-    "execution": "exact_fallback",
-    "route": "exact_fallback",
-    "equal": true,
-    "backend_status": 200,
-    "native_status": 200
-  },
-  {
-    "id": "q22",
-    "publication": "failure",
-    "execution": "exact_fallback",
-    "route": "exact_fallback",
-    "equal": true,
-    "backend_status": 200,
-    "native_status": 200
-  },
-  {
-    "id": "q23",
-    "publication": "pass",
-    "execution": "warm",
-    "route": "warm",
-    "equal": true,
-    "backend_status": 200,
-    "native_status": 200
-  },
-  {
-    "id": "q24",
-    "publication": "failure",
-    "execution": "exact_fallback",
-    "route": "exact_fallback",
-    "equal": true,
-    "backend_status": 200,
-    "native_status": 200
-  },
-  {
-    "id": "q25",
-    "publication": "failure",
-    "execution": "failed",
-    "route": "exact_fallback",
-    "equal": false,
-    "backend_status": 500,
-    "native_status": 500
-  },
-  {
-    "id": "q26",
-    "publication": "failure",
-    "execution": "failed",
-    "route": "exact_fallback",
-    "equal": false,
-    "backend_status": 500,
-    "native_status": 500
-  },
-  {
-    "id": "q27",
-    "publication": "failure",
-    "execution": "exact_fallback",
-    "route": "exact_fallback",
-    "equal": true,
-    "backend_status": 200,
-    "native_status": 200
-  }
-]
diff --git a/tools/o11y-sql-main-eval/automatic-map-deployment-measurements.json b/tools/o11y-sql-main-eval/automatic-map-deployment-measurements.json
deleted file mode 100644
index 7063a2a53..000000000
--- a/tools/o11y-sql-main-eval/automatic-map-deployment-measurements.json
+++ /dev/null
@@ -1,56 +0,0 @@
-{
-  "scope": "fresh process startup, summary construction and 1000 queries; excludes common source ingestion and offline planning",
-  "pairs": [
-    {
-      "trial": 1,
-      "asap": {
-        "requests": {
-          "warm": 1000,
-          "equal": 1000,
-          "failed": 0
-        },
-        "cpu_seconds": 12.3,
-        "combined_end_rss_bytes": 906338304
-      },
-      "native": {
-        "requests_equal": 1000,
-        "cpu_seconds": 98.86,
-        "end_rss_bytes": 878465024
-      }
-    },
-    {
-      "trial": 2,
-      "asap": {
-        "requests": {
-          "warm": 1000,
-          "equal": 1000,
-          "failed": 0
-        },
-        "cpu_seconds": 11.16,
-        "combined_end_rss_bytes": 878211072
-      },
-      "native": {
-        "requests_equal": 1000,
-        "cpu_seconds": 97.49,
-        "end_rss_bytes": 837402624
-      }
-    },
-    {
-      "trial": 3,
-      "asap": {
-        "requests": {
-          "warm": 1000,
-          "equal": 1000,
-          "failed": 0
-        },
-        "cpu_seconds": 12.33,
-        "combined_end_rss_bytes": 909520896
-      },
-      "native": {
-        "requests_equal": 1000,
-        "cpu_seconds": 96.67,
-        "end_rss_bytes": 862224384
-      }
-    }
-  ]
-}
diff --git a/tools/o11y-sql-main-eval/automatic-map-measurements.json b/tools/o11y-sql-main-eval/automatic-map-measurements.json
deleted file mode 100644
index ce7951159..000000000
--- a/tools/o11y-sql-main-eval/automatic-map-measurements.json
+++ /dev/null
@@ -1,743 +0,0 @@
-{
-  "scope": "fixed-window repeated queries; excludes common source ingestion and offline planning cost",
-  "trials": [
-    {
-      "query": "q05",
-      "trial": "trial-1-q05",
-      "numeric_pairs_equal": 1000,
-      "warm_requests": 1000,
-      "latency_speedup": 21.573089315157763,
-      "routes": {
-        "backend": {
-          "requests": 1000,
-          "median_ms": 2.3571194999999996,
-          "p95_ms": 2.797406,
-          "request_time_rate_per_second": 422.34594680611144,
-          "backend_cpu_s_during_requests": 1.31,
-          "clickhouse_cpu_s_during_requests": 0.18,
-          "max_observed_backend_rss_bytes": 113074176,
-          "max_observed_clickhouse_rss_bytes": 1029861376
-        },
-        "exact": {
-          "requests": 1000,
-          "median_ms": 50.8503495,
-          "p95_ms": 72.84543,
-          "request_time_rate_per_second": 18.953400238689348,
-          "backend_cpu_s_during_requests": 0.04,
-          "clickhouse_cpu_s_during_requests": 88.92,
-          "max_observed_backend_rss_bytes": 113074176,
-          "max_observed_clickhouse_rss_bytes": 1029861376
-        }
-      },
-      "install_and_backfill_s": 4.289933355,
-      "build_cpu_s": {
-        "backend": 2.75,
-        "clickhouse": 1.29
-      },
-      "process_after_build": {
-        "backend": {
-          "cpu_ticks": 278,
-          "clock_ticks_per_second": 100,
-          "VmHWM": 118611968,
-          "VmRSS": 93077504
-        },
-        "clickhouse": {
-          "cpu_ticks": 756,
-          "clock_ticks_per_second": 100,
-          "VmHWM": 928849920,
-          "VmRSS": 865157120
-        }
-      },
-      "process_after_queries": {
-        "backend": {
-          "cpu_ticks": 413,
-          "clock_ticks_per_second": 100,
-          "VmHWM": 118611968,
-          "VmRSS": 113074176
-        },
-        "clickhouse": {
-          "cpu_ticks": 9696,
-          "clock_ticks_per_second": 100,
-          "VmHWM": 1029861376,
-          "VmRSS": 868360192
-        }
-      },
-      "state_directory_bytes_at_build": 5238,
-      "state_directory_bytes_after_stop": 7008,
-      "first_post_build_request_ms": {
-        "backend": 5.247254,
-        "exact": 72.45841
-      },
-      "backend_budget": {
-        "image": "sha256:fa394da808cc53f76d0344429421d6c422a6ee85fe7450135c0e3cff4df9bcbb",
-        "cpu_affinity": "60,61",
-        "nano_cpus": 2000000000,
-        "memory_limit_bytes": 4294967296
-      },
-      "clickhouse_budget": {
-        "image": "sha256:fa394da808cc53f76d0344429421d6c422a6ee85fe7450135c0e3cff4df9bcbb",
-        "cpu_affinity": "60,61",
-        "nano_cpus": 2000000000,
-        "memory_limit_bytes": 4294967296
-      },
-      "raw_trace": "/mydata/clickhouse-o11y-main-results/original27-matched/trial-1-q05/q05/requests.jsonl",
-      "raw_sha256": "6d6f7c36aa924d1c52d533a023d304169bf8179d09340f120d55337fcd3c7f99"
-    },
-    {
-      "query": "q06",
-      "trial": "trial-1-q06",
-      "numeric_pairs_equal": 1000,
-      "warm_requests": 1000,
-      "latency_speedup": 8.966121744078176,
-      "routes": {
-        "backend": {
-          "requests": 1000,
-          "median_ms": 2.2706895,
-          "p95_ms": 2.743556,
-          "request_time_rate_per_second": 434.58155879595193,
-          "backend_cpu_s_during_requests": 1.26,
-          "clickhouse_cpu_s_during_requests": 0.39,
-          "max_observed_backend_rss_bytes": 63422464,
-          "max_observed_clickhouse_rss_bytes": 1027055616
-        },
-        "exact": {
-          "requests": 1000,
-          "median_ms": 20.359278500000002,
-          "p95_ms": 34.012472,
-          "request_time_rate_per_second": 45.640250449306194,
-          "backend_cpu_s_during_requests": 0.01,
-          "clickhouse_cpu_s_during_requests": 31.92,
-          "max_observed_backend_rss_bytes": 63422464,
-          "max_observed_clickhouse_rss_bytes": 1027338240
-        }
-      },
-      "install_and_backfill_s": 1.771135748,
-      "build_cpu_s": {
-        "backend": 0.55,
-        "clickhouse": 0.24
-      },
-      "process_after_build": {
-        "backend": {
-          "cpu_ticks": 59,
-          "clock_ticks_per_second": 100,
-          "VmHWM": 48328704,
-          "VmRSS": 43794432
-        },
-        "clickhouse": {
-          "cpu_ticks": 561,
-          "clock_ticks_per_second": 100,
-          "VmHWM": 825528320,
-          "VmRSS": 801665024
-        }
-      },
-      "process_after_queries": {
-        "backend": {
-          "cpu_ticks": 186,
-          "clock_ticks_per_second": 100,
-          "VmHWM": 63422464,
-          "VmRSS": 63422464
-        },
-        "clickhouse": {
-          "cpu_ticks": 3806,
-          "clock_ticks_per_second": 100,
-          "VmHWM": 1031806976,
-          "VmRSS": 1005379584
-        }
-      },
-      "state_directory_bytes_at_build": 5238,
-      "state_directory_bytes_after_stop": 5238,
-      "first_post_build_request_ms": {
-        "backend": 5.141876,
-        "exact": 35.229285
-      },
-      "backend_budget": {
-        "image": "sha256:fa394da808cc53f76d0344429421d6c422a6ee85fe7450135c0e3cff4df9bcbb",
-        "cpu_affinity": "60,61",
-        "nano_cpus": 2000000000,
-        "memory_limit_bytes": 4294967296
-      },
-      "clickhouse_budget": {
-        "image": "sha256:fa394da808cc53f76d0344429421d6c422a6ee85fe7450135c0e3cff4df9bcbb",
-        "cpu_affinity": "60,61",
-        "nano_cpus": 2000000000,
-        "memory_limit_bytes": 4294967296
-      },
-      "raw_trace": "/mydata/clickhouse-o11y-main-results/original27-matched/trial-1-q06/q06/requests.jsonl",
-      "raw_sha256": "f671c3032885973cb521e4b7af450f5698391dc004a82fbc6d611c1dd7037724"
-    },
-    {
-      "query": "q23",
-      "trial": "trial-1-q23",
-      "numeric_pairs_equal": 1000,
-      "warm_requests": 1000,
-      "latency_speedup": 13.844018231429525,
-      "routes": {
-        "backend": {
-          "requests": 1000,
-          "median_ms": 2.4299795,
-          "p95_ms": 2.933214,
-          "request_time_rate_per_second": 400.44073885234246,
-          "backend_cpu_s_during_requests": 1.33,
-          "clickhouse_cpu_s_during_requests": 0.35,
-          "max_observed_backend_rss_bytes": 85598208,
-          "max_observed_clickhouse_rss_bytes": 1049919488
-        },
-        "exact": {
-          "requests": 1000,
-          "median_ms": 33.6406805,
-          "p95_ms": 48.905244,
-          "request_time_rate_per_second": 27.98093622395067,
-          "backend_cpu_s_during_requests": 0.07,
-          "clickhouse_cpu_s_during_requests": 52.32,
-          "max_observed_backend_rss_bytes": 85598208,
-          "max_observed_clickhouse_rss_bytes": 1049587712
-        }
-      },
-      "install_and_backfill_s": 2.782158745,
-      "build_cpu_s": {
-        "backend": 1.35,
-        "clickhouse": 0.84
-      },
-      "process_after_build": {
-        "backend": {
-          "cpu_ticks": 139,
-          "clock_ticks_per_second": 100,
-          "VmHWM": 74645504,
-          "VmRSS": 66084864
-        },
-        "clickhouse": {
-          "cpu_ticks": 597,
-          "clock_ticks_per_second": 100,
-          "VmHWM": 868454400,
-          "VmRSS": 867385344
-        }
-      },
-      "process_after_queries": {
-        "backend": {
-          "cpu_ticks": 279,
-          "clock_ticks_per_second": 100,
-          "VmHWM": 85598208,
-          "VmRSS": 85598208
-        },
-        "clickhouse": {
-          "cpu_ticks": 5889,
-          "clock_ticks_per_second": 100,
-          "VmHWM": 1050730496,
-          "VmRSS": 838840320
-        }
-      },
-      "state_directory_bytes_at_build": 5238,
-      "state_directory_bytes_after_stop": 6122,
-      "first_post_build_request_ms": {
-        "backend": 6.238476,
-        "exact": 37.060582
-      },
-      "backend_budget": {
-        "image": "sha256:fa394da808cc53f76d0344429421d6c422a6ee85fe7450135c0e3cff4df9bcbb",
-        "cpu_affinity": "60,61",
-        "nano_cpus": 2000000000,
-        "memory_limit_bytes": 4294967296
-      },
-      "clickhouse_budget": {
-        "image": "sha256:fa394da808cc53f76d0344429421d6c422a6ee85fe7450135c0e3cff4df9bcbb",
-        "cpu_affinity": "60,61",
-        "nano_cpus": 2000000000,
-        "memory_limit_bytes": 4294967296
-      },
-      "raw_trace": "/mydata/clickhouse-o11y-main-results/original27-matched/trial-1-q23/q23/requests.jsonl",
-      "raw_sha256": "ee05883c651673b36df8608dc31d421d51e37c597f5d8a47cd0d2ea434bf53ba"
-    },
-    {
-      "query": "q05",
-      "trial": "trial-2-q05",
-      "numeric_pairs_equal": 1000,
-      "warm_requests": 1000,
-      "latency_speedup": 21.037893332050977,
-      "routes": {
-        "backend": {
-          "requests": 1000,
-          "median_ms": 2.433027,
-          "p95_ms": 2.870542,
-          "request_time_rate_per_second": 399.68444625195576,
-          "backend_cpu_s_during_requests": 1.38,
-          "clickhouse_cpu_s_during_requests": 0.39,
-          "max_observed_backend_rss_bytes": 112373760,
-          "max_observed_clickhouse_rss_bytes": 1034268672
-        },
-        "exact": {
-          "requests": 1000,
-          "median_ms": 51.185762499999996,
-          "p95_ms": 77.391198,
-          "request_time_rate_per_second": 18.836641733699338,
-          "backend_cpu_s_during_requests": 0.03,
-          "clickhouse_cpu_s_during_requests": 89.05,
-          "max_observed_backend_rss_bytes": 112373760,
-          "max_observed_clickhouse_rss_bytes": 1034608640
-        }
-      },
-      "install_and_backfill_s": 4.291561459,
-      "build_cpu_s": {
-        "backend": 2.8,
-        "clickhouse": 1.0
-      },
-      "process_after_build": {
-        "backend": {
-          "cpu_ticks": 284,
-          "clock_ticks_per_second": 100,
-          "VmHWM": 119218176,
-          "VmRSS": 93425664
-        },
-        "clickhouse": {
-          "cpu_ticks": 640,
-          "clock_ticks_per_second": 100,
-          "VmHWM": 920530944,
-          "VmRSS": 868999168
-        }
-      },
-      "process_after_queries": {
-        "backend": {
-          "cpu_ticks": 427,
-          "clock_ticks_per_second": 100,
-          "VmHWM": 119218176,
-          "VmRSS": 112373760
-        },
-        "clickhouse": {
-          "cpu_ticks": 9629,
-          "clock_ticks_per_second": 100,
-          "VmHWM": 1034608640,
-          "VmRSS": 844017664
-        }
-      },
-      "state_directory_bytes_at_build": 5238,
-      "state_directory_bytes_after_stop": 7008,
-      "first_post_build_request_ms": {
-        "backend": 5.668682,
-        "exact": 84.462201
-      },
-      "backend_budget": {
-        "image": "sha256:fa394da808cc53f76d0344429421d6c422a6ee85fe7450135c0e3cff4df9bcbb",
-        "cpu_affinity": "60,61",
-        "nano_cpus": 2000000000,
-        "memory_limit_bytes": 4294967296
-      },
-      "clickhouse_budget": {
-        "image": "sha256:fa394da808cc53f76d0344429421d6c422a6ee85fe7450135c0e3cff4df9bcbb",
-        "cpu_affinity": "60,61",
-        "nano_cpus": 2000000000,
-        "memory_limit_bytes": 4294967296
-      },
-      "raw_trace": "/mydata/clickhouse-o11y-main-results/original27-matched/trial-2-q05/q05/requests.jsonl",
-      "raw_sha256": "65fc261c415cc3485a58bf301e0a7ffef2bb2c8a4c22e69122ed63a25555c53f"
-    },
-    {
-      "query": "q06",
-      "trial": "trial-2-q06",
-      "numeric_pairs_equal": 1000,
-      "warm_requests": 1000,
-      "latency_speedup": 8.373888984752382,
-      "routes": {
-        "backend": {
-          "requests": 1000,
-          "median_ms": 2.3789615,
-          "p95_ms": 2.744391,
-          "request_time_rate_per_second": 419.6522049931427,
-          "backend_cpu_s_during_requests": 1.29,
-          "clickhouse_cpu_s_during_requests": 0.39,
-          "max_observed_backend_rss_bytes": 63205376,
-          "max_observed_clickhouse_rss_bytes": 1022054400
-        },
-        "exact": {
-          "requests": 1000,
-          "median_ms": 19.9211595,
-          "p95_ms": 32.514515,
-          "request_time_rate_per_second": 46.399180384610496,
-          "backend_cpu_s_during_requests": 0.01,
-          "clickhouse_cpu_s_during_requests": 30.98,
-          "max_observed_backend_rss_bytes": 63205376,
-          "max_observed_clickhouse_rss_bytes": 1022054400
-        }
-      },
-      "install_and_backfill_s": 1.770374337,
-      "build_cpu_s": {
-        "backend": 0.55,
-        "clickhouse": 0.42
-      },
-      "process_after_build": {
-        "backend": {
-          "cpu_ticks": 58,
-          "clock_ticks_per_second": 100,
-          "VmHWM": 48218112,
-          "VmRSS": 43552768
-        },
-        "clickhouse": {
-          "cpu_ticks": 598,
-          "clock_ticks_per_second": 100,
-          "VmHWM": 811405312,
-          "VmRSS": 798826496
-        }
-      },
-      "process_after_queries": {
-        "backend": {
-          "cpu_ticks": 188,
-          "clock_ticks_per_second": 100,
-          "VmHWM": 63205376,
-          "VmRSS": 63205376
-        },
-        "clickhouse": {
-          "cpu_ticks": 3765,
-          "clock_ticks_per_second": 100,
-          "VmHWM": 1022054400,
-          "VmRSS": 916492288
-        }
-      },
-      "state_directory_bytes_at_build": 5238,
-      "state_directory_bytes_after_stop": 5238,
-      "first_post_build_request_ms": {
-        "backend": 4.364995,
-        "exact": 40.993606
-      },
-      "backend_budget": {
-        "image": "sha256:fa394da808cc53f76d0344429421d6c422a6ee85fe7450135c0e3cff4df9bcbb",
-        "cpu_affinity": "60,61",
-        "nano_cpus": 2000000000,
-        "memory_limit_bytes": 4294967296
-      },
-      "clickhouse_budget": {
-        "image": "sha256:fa394da808cc53f76d0344429421d6c422a6ee85fe7450135c0e3cff4df9bcbb",
-        "cpu_affinity": "60,61",
-        "nano_cpus": 2000000000,
-        "memory_limit_bytes": 4294967296
-      },
-      "raw_trace": "/mydata/clickhouse-o11y-main-results/original27-matched/trial-2-q06/q06/requests.jsonl",
-      "raw_sha256": "c4345d24793e863c2e9af41901854e6ce0145c626c1e44f5e1e6df7310c37b33"
-    },
-    {
-      "query": "q23",
-      "trial": "trial-2-q23",
-      "numeric_pairs_equal": 1000,
-      "warm_requests": 1000,
-      "latency_speedup": 14.663263235615045,
-      "routes": {
-        "backend": {
-          "requests": 1000,
-          "median_ms": 2.414867,
-          "p95_ms": 2.883722,
-          "request_time_rate_per_second": 407.0072293824753,
-          "backend_cpu_s_during_requests": 1.37,
-          "clickhouse_cpu_s_during_requests": 0.34,
-          "max_observed_backend_rss_bytes": 84406272,
-          "max_observed_clickhouse_rss_bytes": 1030189056
-        },
-        "exact": {
-          "requests": 1000,
-          "median_ms": 35.4098305,
-          "p95_ms": 51.677955,
-          "request_time_rate_per_second": 27.23270500509498,
-          "backend_cpu_s_during_requests": 0.04,
-          "clickhouse_cpu_s_during_requests": 53.73,
-          "max_observed_backend_rss_bytes": 84406272,
-          "max_observed_clickhouse_rss_bytes": 1030373376
-        }
-      },
-      "install_and_backfill_s": 2.777689036,
-      "build_cpu_s": {
-        "backend": 1.38,
-        "clickhouse": 0.6
-      },
-      "process_after_build": {
-        "backend": {
-          "cpu_ticks": 142,
-          "clock_ticks_per_second": 100,
-          "VmHWM": 75399168,
-          "VmRSS": 65105920
-        },
-        "clickhouse": {
-          "cpu_ticks": 611,
-          "clock_ticks_per_second": 100,
-          "VmHWM": 861368320,
-          "VmRSS": 844075008
-        }
-      },
-      "process_after_queries": {
-        "backend": {
-          "cpu_ticks": 283,
-          "clock_ticks_per_second": 100,
-          "VmHWM": 84406272,
-          "VmRSS": 84406272
-        },
-        "clickhouse": {
-          "cpu_ticks": 6045,
-          "clock_ticks_per_second": 100,
-          "VmHWM": 1030373376,
-          "VmRSS": 854810624
-        }
-      },
-      "state_directory_bytes_at_build": 5238,
-      "state_directory_bytes_after_stop": 6122,
-      "first_post_build_request_ms": {
-        "backend": 5.632831,
-        "exact": 36.710725
-      },
-      "backend_budget": {
-        "image": "sha256:fa394da808cc53f76d0344429421d6c422a6ee85fe7450135c0e3cff4df9bcbb",
-        "cpu_affinity": "60,61",
-        "nano_cpus": 2000000000,
-        "memory_limit_bytes": 4294967296
-      },
-      "clickhouse_budget": {
-        "image": "sha256:fa394da808cc53f76d0344429421d6c422a6ee85fe7450135c0e3cff4df9bcbb",
-        "cpu_affinity": "60,61",
-        "nano_cpus": 2000000000,
-        "memory_limit_bytes": 4294967296
-      },
-      "raw_trace": "/mydata/clickhouse-o11y-main-results/original27-matched/trial-2-q23/q23/requests.jsonl",
-      "raw_sha256": "8fa00d84d1d2f5264d13168e39825cd97419cfa9c903a604d56ceb6651694d7c"
-    },
-    {
-      "query": "q05",
-      "trial": "trial-3-q05",
-      "numeric_pairs_equal": 1000,
-      "warm_requests": 1000,
-      "latency_speedup": 21.741075496175057,
-      "routes": {
-        "backend": {
-          "requests": 1000,
-          "median_ms": 2.3618680000000003,
-          "p95_ms": 2.857925,
-          "request_time_rate_per_second": 417.6474853349689,
-          "backend_cpu_s_during_requests": 1.36,
-          "clickhouse_cpu_s_during_requests": 0.25,
-          "max_observed_backend_rss_bytes": 112996352,
-          "max_observed_clickhouse_rss_bytes": 1061302272
-        },
-        "exact": {
-          "requests": 1000,
-          "median_ms": 51.3495505,
-          "p95_ms": 77.297097,
-          "request_time_rate_per_second": 18.608955117751,
-          "backend_cpu_s_during_requests": 0.06,
-          "clickhouse_cpu_s_during_requests": 89.79,
-          "max_observed_backend_rss_bytes": 112996352,
-          "max_observed_clickhouse_rss_bytes": 1061408768
-        }
-      },
-      "install_and_backfill_s": 4.29229429,
-      "build_cpu_s": {
-        "backend": 2.73,
-        "clickhouse": 1.07
-      },
-      "process_after_build": {
-        "backend": {
-          "cpu_ticks": 277,
-          "clock_ticks_per_second": 100,
-          "VmHWM": 119361536,
-          "VmRSS": 93249536
-        },
-        "clickhouse": {
-          "cpu_ticks": 724,
-          "clock_ticks_per_second": 100,
-          "VmHWM": 991547392,
-          "VmRSS": 802988032
-        }
-      },
-      "process_after_queries": {
-        "backend": {
-          "cpu_ticks": 419,
-          "clock_ticks_per_second": 100,
-          "VmHWM": 119361536,
-          "VmRSS": 112996352
-        },
-        "clickhouse": {
-          "cpu_ticks": 9789,
-          "clock_ticks_per_second": 100,
-          "VmHWM": 1061408768,
-          "VmRSS": 891162624
-        }
-      },
-      "state_directory_bytes_at_build": 5238,
-      "state_directory_bytes_after_stop": 7008,
-      "first_post_build_request_ms": {
-        "backend": 4.985173,
-        "exact": 146.821824
-      },
-      "backend_budget": {
-        "image": "sha256:fa394da808cc53f76d0344429421d6c422a6ee85fe7450135c0e3cff4df9bcbb",
-        "cpu_affinity": "60,61",
-        "nano_cpus": 2000000000,
-        "memory_limit_bytes": 4294967296
-      },
-      "clickhouse_budget": {
-        "image": "sha256:fa394da808cc53f76d0344429421d6c422a6ee85fe7450135c0e3cff4df9bcbb",
-        "cpu_affinity": "60,61",
-        "nano_cpus": 2000000000,
-        "memory_limit_bytes": 4294967296
-      },
-      "raw_trace": "/mydata/clickhouse-o11y-main-results/original27-matched/trial-3-q05/q05/requests.jsonl",
-      "raw_sha256": "58046878910dbf4d93d4d3ff569e1f40423086260237cbaa23845993e44ff2a0"
-    },
-    {
-      "query": "q06",
-      "trial": "trial-3-q06",
-      "numeric_pairs_equal": 1000,
-      "warm_requests": 1000,
-      "latency_speedup": 8.72838994110124,
-      "routes": {
-        "backend": {
-          "requests": 1000,
-          "median_ms": 2.2988600000000003,
-          "p95_ms": 2.744593,
-          "request_time_rate_per_second": 428.3359654378522,
-          "backend_cpu_s_during_requests": 1.25,
-          "clickhouse_cpu_s_during_requests": 0.5,
-          "max_observed_backend_rss_bytes": 64716800,
-          "max_observed_clickhouse_rss_bytes": 1071005696
-        },
-        "exact": {
-          "requests": 1000,
-          "median_ms": 20.0653465,
-          "p95_ms": 33.411354,
-          "request_time_rate_per_second": 46.06321649971232,
-          "backend_cpu_s_during_requests": 0.02,
-          "clickhouse_cpu_s_during_requests": 31.53,
-          "max_observed_backend_rss_bytes": 64716800,
-          "max_observed_clickhouse_rss_bytes": 1071005696
-        }
-      },
-      "install_and_backfill_s": 1.772314251,
-      "build_cpu_s": {
-        "backend": 0.52,
-        "clickhouse": 0.3
-      },
-      "process_after_build": {
-        "backend": {
-          "cpu_ticks": 55,
-          "clock_ticks_per_second": 100,
-          "VmHWM": 48406528,
-          "VmRSS": 43905024
-        },
-        "clickhouse": {
-          "cpu_ticks": 586,
-          "clock_ticks_per_second": 100,
-          "VmHWM": 828514304,
-          "VmRSS": 806227968
-        }
-      },
-      "process_after_queries": {
-        "backend": {
-          "cpu_ticks": 183,
-          "clock_ticks_per_second": 100,
-          "VmHWM": 64716800,
-          "VmRSS": 64716800
-        },
-        "clickhouse": {
-          "cpu_ticks": 3817,
-          "clock_ticks_per_second": 100,
-          "VmHWM": 1071005696,
-          "VmRSS": 866656256
-        }
-      },
-      "state_directory_bytes_at_build": 5238,
-      "state_directory_bytes_after_stop": 5238,
-      "first_post_build_request_ms": {
-        "backend": 4.753846,
-        "exact": 36.319163
-      },
-      "backend_budget": {
-        "image": "sha256:fa394da808cc53f76d0344429421d6c422a6ee85fe7450135c0e3cff4df9bcbb",
-        "cpu_affinity": "60,61",
-        "nano_cpus": 2000000000,
-        "memory_limit_bytes": 4294967296
-      },
-      "clickhouse_budget": {
-        "image": "sha256:fa394da808cc53f76d0344429421d6c422a6ee85fe7450135c0e3cff4df9bcbb",
-        "cpu_affinity": "60,61",
-        "nano_cpus": 2000000000,
-        "memory_limit_bytes": 4294967296
-      },
-      "raw_trace": "/mydata/clickhouse-o11y-main-results/original27-matched/trial-3-q06/q06/requests.jsonl",
-      "raw_sha256": "212c6e2c61640348dd362e3f9bc5744cff9e7ef54c10545f6221b7bae43c4e7d"
-    },
-    {
-      "query": "q23",
-      "trial": "trial-3-q23",
-      "numeric_pairs_equal": 1000,
-      "warm_requests": 1000,
-      "latency_speedup": 14.699514293456742,
-      "routes": {
-        "backend": {
-          "requests": 1000,
-          "median_ms": 2.369126,
-          "p95_ms": 2.858031,
-          "request_time_rate_per_second": 414.0231017330702,
-          "backend_cpu_s_during_requests": 1.36,
-          "clickhouse_cpu_s_during_requests": 0.37,
-          "max_observed_backend_rss_bytes": 84619264,
-          "max_observed_clickhouse_rss_bytes": 1056153600
-        },
-        "exact": {
-          "requests": 1000,
-          "median_ms": 34.8250015,
-          "p95_ms": 54.463904,
-          "request_time_rate_per_second": 27.23789216168408,
-          "backend_cpu_s_during_requests": 0.03,
-          "clickhouse_cpu_s_during_requests": 53.69,
-          "max_observed_backend_rss_bytes": 84619264,
-          "max_observed_clickhouse_rss_bytes": 1056423936
-        }
-      },
-      "install_and_backfill_s": 2.782497867,
-      "build_cpu_s": {
-        "backend": 1.37,
-        "clickhouse": 0.65
-      },
-      "process_after_build": {
-        "backend": {
-          "cpu_ticks": 141,
-          "clock_ticks_per_second": 100,
-          "VmHWM": 74371072,
-          "VmRSS": 65110016
-        },
-        "clickhouse": {
-          "cpu_ticks": 623,
-          "clock_ticks_per_second": 100,
-          "VmHWM": 868835328,
-          "VmRSS": 863690752
-        }
-      },
-      "process_after_queries": {
-        "backend": {
-          "cpu_ticks": 281,
-          "clock_ticks_per_second": 100,
-          "VmHWM": 84619264,
-          "VmRSS": 84619264
-        },
-        "clickhouse": {
-          "cpu_ticks": 6053,
-          "clock_ticks_per_second": 100,
-          "VmHWM": 1056423936,
-          "VmRSS": 862023680
-        }
-      },
-      "state_directory_bytes_at_build": 5238,
-      "state_directory_bytes_after_stop": 6122,
-      "first_post_build_request_ms": {
-        "backend": 4.921386,
-        "exact": 47.286535
-      },
-      "backend_budget": {
-        "image": "sha256:fa394da808cc53f76d0344429421d6c422a6ee85fe7450135c0e3cff4df9bcbb",
-        "cpu_affinity": "60,61",
-        "nano_cpus": 2000000000,
-        "memory_limit_bytes": 4294967296
-      },
-      "clickhouse_budget": {
-        "image": "sha256:fa394da808cc53f76d0344429421d6c422a6ee85fe7450135c0e3cff4df9bcbb",
-        "cpu_affinity": "60,61",
-        "nano_cpus": 2000000000,
-        "memory_limit_bytes": 4294967296
-      },
-      "raw_trace": "/mydata/clickhouse-o11y-main-results/original27-matched/trial-3-q23/q23/requests.jsonl",
-      "raw_sha256": "5a0554274d325f6ddec93830e7af7f28798e9e893ed4b5868e984cc67d87b1e7"
-    }
-  ]
-}
diff --git a/tools/o11y-sql-main-eval/automatic-map-results.md b/tools/o11y-sql-main-eval/automatic-map-results.md
deleted file mode 100644
index 64fe7a306..000000000
--- a/tools/o11y-sql-main-eval/automatic-map-results.md
+++ /dev/null
@@ -1,77 +0,0 @@
-# Original o11y SQL execution through automatic summary plans
-
-The original 27-query corpus now has a real execution matrix: 3 warm queries, 18 successful exact fallbacks, and 6 failures on both the backend fallback and native ClickHouse. All 21 successful responses have equal decoded JSON metadata and data. This is per-query execution coverage; it does not establish acceleration for all 27 queries or one jointly installed dashboard workload.
-
-The warm queries are q05 (12-hour maximum grouped by the native labels Map), q06 (12-hour maximum for the user-service metric), and q23 (top 2 groups by the 6-hour retry-backlog maximum). The compiler receives the original SQL, table schema, and evaluation range. It calls Planner, records its actual selection, builds the catalog and executable plans, and installs the selected exact MinMax summaries. No materialization family or winner is supplied by the evaluation script.
-
-## Data and provenance
-
-- Existing o11y-derived capture with deterministic metric aliases: `/mydata/query-benefit-evaluation/o11y-evaluation-1s-24h.prom`.
-- Source SHA256: `527efecab22f935b7aa00a29d7ed8a187da902a223c4fef3991d433268b528f6`.
-- Samples: 12,236,002 across 142 series, at 1-second sampling granularity.
-- Observed timestamp span: 1788804926000–1788891296000 ms (86,370 seconds, approximately 24 hours).
-- Imported audit copy: `/mydata/clickhouse-o11y-main-results/o11y-27-1s-24h.jsonl.gz`, 85,682,422 bytes. Its `.jsonl.manifest.json` records counts per metric and the unchanged source hash.
-- Isolated ClickHouse destination: `asap_o11y27_eval.raw_samples` on port 28123.
-
-The importer preserves metric names, labels, Float64 sample values, and integral-millisecond timestamps. It rejects duplicate/malformed labels and nonfinite samples instead of silently changing them. Metric aliases were already present in the source file; this run does not claim those names are emitted directly by upstream o11y-bench.
-
-## Execution coverage
-
-The original arithmetic timestamp bounds `(evaluation_time - window, evaluation_time]` remain unchanged in SQL. The compiler evaluates checked integer constants to bind their equivalent half-open source interval. Native Map labels stay one typed grouping column through backfill, SummaryStore, and query readout.
-
-The six failures are q01, q02, q17, q18, q25, and q26. Both native ClickHouse and forwarded execution returned HTTP 500 with memory-limit errors under the 4 GiB server limit. The existing counter SQL uses indexed `arraySum` expressions that trigger large intermediate allocations. These failures are not counted as successful fallback or as an ASAP benefit. A separate diagnostic isolates the indexed array capture with two groups: ClickHouse query-log peak memory rises from 33.45 MB at 1,000 samples/group to 129.55 MB at 2,000, 513.77 MB at 4,000, and 2.05 GB at 8,000. Doubling samples approximately quadruples peak memory. This explains why the original long counter windows exhaust the limit; the diagnostic does not replace the original queries or count as workload acceleration. [Exact diagnostic SQL and query-log measurements](captured-array-memory-diagnostic.json) are included. HTTP summary memory is not used as a peak-memory measurement.
-
-The other 24 queries still fail the Planner SQL frontend because of ClickHouse-specific syntax or functions, including lambda/tuple syntax, Map access, `mapConcat`, empty `map()`, and `modulo`. Eighteen nevertheless execute correctly through whole-query native fallback. Their fallback success demonstrates routing correctness, not local DAG support or acceleration.
-
-## Measurement scope
-
-Repeated-query results are recorded separately from the correctness matrix. Each selected query uses a fresh backend and restarted native ClickHouse process, with 2 CPU cores (60–61) and a 4 GiB memory cap per process. Query cache is disabled and ClickHouse `max_threads=2`. The raw dataset is unchanged. Three independent trials contain 1000 backend and 1000 native requests each, alternating route order.
-
-The measurements include publication/backfill wall time, backend and source ClickHouse CPU during construction, process RSS/high-water marks, state directory bytes, and per-request latency/CPU. They exclude original data ingestion and offline planning costs. Estimated numeric Planner cost is not returned by the current SQL selection trace. No complete deployment cost reduction, moving-window behavior, or memory reduction is inferred from these fixed-window trials. The backend continues to require the external ClickHouse service for fallback.
-
-## Measured results
-
-All 9,000 backend requests were warm, and all 9,000 matched native/backend pairs had equal decoded JSON metadata and data. HTTP response bytes differ in formatting; this is not byte equality.
-
-| Original query | Backend median latency | Native median latency | Speedup across three trials | Summary directory after shutdown |
-| --- | ---: | ---: | ---: | ---: |
-| q05: 12h maximum, five groups | 2.36–2.43 ms | 50.85–51.35 ms | 21.04–21.74× | 7,008 B |
-| q06: 12h user-service maximum | 2.27–2.38 ms | 19.92–20.36 ms | 8.37–8.97× | 5,238 B |
-| q23: TopK over 6h retry-backlog maximum | 2.37–2.43 ms | 33.64–35.41 ms | 13.84–14.70× | 6,122 B |
-
-The serial request-time rate (requests divided by summed HTTP request durations, excluding controller gaps) was 399.7–422.3 versus 18.6–19.0 requests/s for q05, 419.7–434.6 versus 45.6–46.4 for q06, and 400.4–414.0 versus 27.2–28.0 for q23. This is not a concurrent saturation-throughput benchmark.
-
-First requests after state construction took 4.99–5.67 versus 72.46–146.82 ms for q05, 4.36–5.14 versus 35.23–40.99 ms for q06, and 4.92–6.24 versus 36.71–47.29 ms for q23. They are separate from the repeated-query medians and do not represent empty filesystem-cache cold starts: construction has already read the source data.
-
-Publication and backfill took approximately 4.29 seconds for q05, 1.77 seconds for q06, and 2.78 seconds for q23. Backend construction CPU was 2.73–2.80, 0.52–0.55, and 1.35–1.38 seconds respectively; the source ClickHouse process additionally used 1.00–1.29, 0.24–0.42, and 0.60–0.84 seconds. State-directory bytes include metadata and are not a comparison against the complete source database.
-
-A separate q05 experiment restarted ClickHouse before each of three ASAP-only and native-only phases. The ASAP phase used a previously validated response only as a correctness oracle, never to construct state, and issued no native query during its 1,000 warm requests. This avoids attributing native query allocations to the ASAP deployment.
-
-| Fresh deployment, startup through 1,000 queries | Backend plus retained ClickHouse | Native ClickHouse alone |
-| --- | ---: | ---: |
-| Process CPU, including summary construction | 11.16–12.33 s | 96.67–98.86 s |
-| End-of-query combined RSS | 837.5–867.4 MiB | 798.6–837.8 MiB |
-
-The CPU reduction survives including summary construction for this repeated workload. **Total deployment memory is higher with ASAP in all three pairs.** Summing individual process high-water marks is only an upper bound on simultaneous peak memory, so it is not reported as a measured deployment peak. Common initial raw-data ingestion and offline planning remain excluded. These results establish benefits for the three warm queries and do not establish benefits for the remaining 24 queries.
-
-The release runtime was built from `c825e804`; driver checkout `eff81f48` adds formatting changes only. Binary and input hashes are recorded with the raw trials. The correctness matrix was produced before the final conservative output-format guards; the three warm paths were rerun with the final release runtime.
-
-## Reproduction
-
-Compile publications with `cargo run -p control_plane --example audit_clickhouse_corpus -- --automatic tools/o11y-sql-main-eval/corpus.json`. The automatic mode shares the existing audit executable, avoiding an additional large evaluation binary during workspace checks.
-
-Use [the importer](import_openmetrics.py) with the source capture above, then [the automatic corpus compiler](../../control_plane/examples/support/automatic_clickhouse_corpus.rs). [The process driver](run_automatic.py) stages and activates each compiled publication and submits typed backfill jobs. [The matched runner](run_matched.sh) pins the container image, resource limits, executable hash, and input matrix, and restarts ClickHouse before each measured query/trial.
-
-Raw execution artifacts remain at `/mydata/clickhouse-o11y-main-results/original27-map-runtime/`; raw timing traces remain at `/mydata/clickhouse-o11y-main-results/original27-matched/`. Reproducing the exact capture requires that source file; a fresh upstream capture can have different values and cardinality.
-
-The separate [deployment runner](run_deployment_pair.sh) compares fresh ASAP-plus-ClickHouse and native-only phases. With `CLICKHOUSE_USER` and `CLICKHOUSE_PASSWORD` already set in the environment, run:
-
-```bash
-export MATRIX=/mydata/clickhouse-o11y-main-results/automatic-map-corpus.json
-export BACKEND_BIN=/dev/shm/asap-clickhouse-release/release/data_plane
-export RUNTIME_SOURCE_COMMIT=c825e804
-RESULT_ROOT=/mydata/clickhouse-o11y-main-results/new-matched bash tools/o11y-sql-main-eval/run_matched.sh
-EXACT_REFERENCE=/mydata/clickhouse-o11y-main-results/new-matched/trial-1-q05/q05/result.json RESULT_ROOT=/mydata/clickhouse-o11y-main-results/new-deployment bash tools/o11y-sql-main-eval/run_deployment_pair.sh
-```
-
-The runners require the dedicated source container and populated table described above and verify its pinned image and resource budget before restarting it. Use new output paths; do not point them at production services. Compact [coverage](automatic-map-coverage.json), [latency measurements](automatic-map-measurements.json), [deployment measurements](automatic-map-deployment-measurements.json), and [raw artifact hashes](automatic-map-artifact-manifest.json) accompany this report.
diff --git a/tools/o11y-sql-main-eval/captured-array-memory-diagnostic.json b/tools/o11y-sql-main-eval/captured-array-memory-diagnostic.json
deleted file mode 100644
index 5bc66ddd9..000000000
--- a/tools/o11y-sql-main-eval/captured-array-memory-diagnostic.json
+++ /dev/null
@@ -1,22 +0,0 @@
-[
-  {
-    "query_duration_ms": 1863,
-    "memory_usage": 2050188539,
-    "query": "SELECT g,arraySum(i -> if(samples[i].2 < samples[i-1].2, samples[i-1].2, 0), range(2,length(samples)+1)) FROM (SELECT number%2 g,groupArray(tuple(number,toFloat64(number))) samples FROM numbers(16000) GROUP BY g) FORMAT JSON"
-  },
-  {
-    "query_duration_ms": 442,
-    "memory_usage": 513765627,
-    "query": "SELECT g,arraySum(i -> if(samples[i].2 < samples[i-1].2, samples[i-1].2, 0), range(2,length(samples)+1)) FROM (SELECT number%2 g,groupArray(tuple(number,toFloat64(number))) samples FROM numbers(8000) GROUP BY g) FORMAT JSON"
-  },
-  {
-    "query_duration_ms": 124,
-    "memory_usage": 129554299,
-    "query": "SELECT g,arraySum(i -> if(samples[i].2 < samples[i-1].2, samples[i-1].2, 0), range(2,length(samples)+1)) FROM (SELECT number%2 g,groupArray(tuple(number,toFloat64(number))) samples FROM numbers(4000) GROUP BY g) FORMAT JSON"
-  },
-  {
-    "query_duration_ms": 47,
-    "memory_usage": 33448587,
-    "query": "SELECT g,arraySum(i -> if(samples[i].2 < samples[i-1].2, samples[i-1].2, 0), range(2,length(samples)+1)) FROM (SELECT number%2 g,groupArray(tuple(number,toFloat64(number))) samples FROM numbers(2000) GROUP BY g) FORMAT JSON"
-  }
-]
diff --git a/tools/o11y-sql-main-eval/corpus.json b/tools/o11y-sql-main-eval/corpus.json
deleted file mode 100644
index 58ee835eb..000000000
--- a/tools/o11y-sql-main-eval/corpus.json
+++ /dev/null
@@ -1,342 +0,0 @@
-{
-  "schema_version": 1,
-  "source": "source-corpus.json",
-  "count": 27,
-  "queries": [
-    {
-      "id": "q01",
-      "promql": "sort_desc(sum by (job) (increase(backend_http_5xx_total[6h])) / sum by (job) (increase(backend_http_requests_total[6h])))",
-      "metricsql": "sort_desc(sum by (job) (increase(backend_http_5xx_total[6h])) / sum by (job) (increase(backend_http_requests_total[6h])))",
-      "clickhouse_sql": "SELECT * FROM (SELECT a.labels,a.value/b.value value FROM (SELECT map('job',job) labels,sum(value) value FROM (SELECT labels['job'] job,value FROM (SELECT labels, corrected*(sampled+least(start_extra,if(corrected>0,sampled*(first_value/corrected),start_extra))+end_extra)/sampled AS value FROM (SELECT labels,samples,length(samples) n,samples[1].1 first_ts,samples[n].1 last_ts,samples[1].2 first_value,samples[n].2 last_value,(last_ts-first_ts)/1000 sampled,(last_value-first_value)+arraySum(i -> if(samples[i].2<samples[i-1].2,samples[i-1].2,0.),range(2,n+1)) corrected,if((first_ts-(({eval_ms}-0)-21600000))/1000<sampled/(n-1)*1.1,(first_ts-(({eval_ms}-0)-21600000))/1000,sampled/(n-1)/2) start_extra,if((({eval_ms}-0)-last_ts)/1000<sampled/(n-1)*1.1,(({eval_ms}-0)-last_ts)/1000,sampled/(n-1)/2) end_extra FROM (SELECT labels,arraySort(x -> x.1,groupArray((ts_ms,value))) samples FROM raw_samples WHERE metric='backend_http_5xx_total' AND ts_ms>=(({eval_ms}-0)-21600000) AND ts_ms<=({eval_ms}-0) GROUP BY labels) WHERE n>=2))) GROUP BY job) a INNER JOIN (SELECT map('job',job) labels,sum(value) value FROM (SELECT labels['job'] job,value FROM (SELECT labels, corrected*(sampled+least(start_extra,if(corrected>0,sampled*(first_value/corrected),start_extra))+end_extra)/sampled AS value FROM (SELECT labels,samples,length(samples) n,samples[1].1 first_ts,samples[n].1 last_ts,samples[1].2 first_value,samples[n].2 last_value,(last_ts-first_ts)/1000 sampled,(last_value-first_value)+arraySum(i -> if(samples[i].2<samples[i-1].2,samples[i-1].2,0.),range(2,n+1)) corrected,if((first_ts-(({eval_ms}-0)-21600000))/1000<sampled/(n-1)*1.1,(first_ts-(({eval_ms}-0)-21600000))/1000,sampled/(n-1)/2) start_extra,if((({eval_ms}-0)-last_ts)/1000<sampled/(n-1)*1.1,(({eval_ms}-0)-last_ts)/1000,sampled/(n-1)/2) end_extra FROM (SELECT labels,arraySort(x -> x.1,groupArray((ts_ms,value))) samples FROM raw_samples WHERE metric='backend_http_requests_total' AND ts_ms>=(({eval_ms}-0)-21600000) AND ts_ms<=({eval_ms}-0) GROUP BY labels) WHERE n>=2))) GROUP BY job) b ON a.labels=b.labels) ORDER BY value DESC,labels",
-      "operators": [
-        "sort_desc",
-        "increase",
-        "division"
-      ],
-      "sql_mapping_contract": "Derived from identical raw samples by the checked Prometheus-semantics loader, never from baseline query answers.",
-      "sql_mapping_status": "oracle_valid"
-    },
-    {
-      "id": "q02",
-      "promql": "topk(1, sum by (job) (increase(backend_http_5xx_total[6h])) / sum by (job) (increase(backend_http_requests_total[6h])))",
-      "metricsql": "topk(1, sum by (job) (increase(backend_http_5xx_total[6h])) / sum by (job) (increase(backend_http_requests_total[6h])))",
-      "clickhouse_sql": "SELECT * FROM (SELECT a.labels,a.value/b.value value FROM (SELECT map('job',job) labels,sum(value) value FROM (SELECT labels['job'] job,value FROM (SELECT labels, corrected*(sampled+least(start_extra,if(corrected>0,sampled*(first_value/corrected),start_extra))+end_extra)/sampled AS value FROM (SELECT labels,samples,length(samples) n,samples[1].1 first_ts,samples[n].1 last_ts,samples[1].2 first_value,samples[n].2 last_value,(last_ts-first_ts)/1000 sampled,(last_value-first_value)+arraySum(i -> if(samples[i].2<samples[i-1].2,samples[i-1].2,0.),range(2,n+1)) corrected,if((first_ts-(({eval_ms}-0)-21600000))/1000<sampled/(n-1)*1.1,(first_ts-(({eval_ms}-0)-21600000))/1000,sampled/(n-1)/2) start_extra,if((({eval_ms}-0)-last_ts)/1000<sampled/(n-1)*1.1,(({eval_ms}-0)-last_ts)/1000,sampled/(n-1)/2) end_extra FROM (SELECT labels,arraySort(x -> x.1,groupArray((ts_ms,value))) samples FROM raw_samples WHERE metric='backend_http_5xx_total' AND ts_ms>=(({eval_ms}-0)-21600000) AND ts_ms<=({eval_ms}-0) GROUP BY labels) WHERE n>=2))) GROUP BY job) a INNER JOIN (SELECT map('job',job) labels,sum(value) value FROM (SELECT labels['job'] job,value FROM (SELECT labels, corrected*(sampled+least(start_extra,if(corrected>0,sampled*(first_value/corrected),start_extra))+end_extra)/sampled AS value FROM (SELECT labels,samples,length(samples) n,samples[1].1 first_ts,samples[n].1 last_ts,samples[1].2 first_value,samples[n].2 last_value,(last_ts-first_ts)/1000 sampled,(last_value-first_value)+arraySum(i -> if(samples[i].2<samples[i-1].2,samples[i-1].2,0.),range(2,n+1)) corrected,if((first_ts-(({eval_ms}-0)-21600000))/1000<sampled/(n-1)*1.1,(first_ts-(({eval_ms}-0)-21600000))/1000,sampled/(n-1)/2) start_extra,if((({eval_ms}-0)-last_ts)/1000<sampled/(n-1)*1.1,(({eval_ms}-0)-last_ts)/1000,sampled/(n-1)/2) end_extra FROM (SELECT labels,arraySort(x -> x.1,groupArray((ts_ms,value))) samples FROM raw_samples WHERE metric='backend_http_requests_total' AND ts_ms>=(({eval_ms}-0)-21600000) AND ts_ms<=({eval_ms}-0) GROUP BY labels) WHERE n>=2))) GROUP BY job) b ON a.labels=b.labels) ORDER BY value DESC,labels LIMIT 1",
-      "operators": [
-        "topk",
-        "increase",
-        "division"
-      ],
-      "sql_mapping_contract": "Derived from identical raw samples by the checked Prometheus-semantics loader, never from baseline query answers.",
-      "sql_mapping_status": "oracle_valid"
-    },
-    {
-      "id": "q03",
-      "promql": "sum(increase(payment_service_http_5xx_total[1h])) / sum(increase(payment_service_http_requests_total[1h]))",
-      "metricsql": "sum(increase(payment_service_http_5xx_total[1h])) / sum(increase(payment_service_http_requests_total[1h]))",
-      "clickhouse_sql": "SELECT a.labels,a.value/b.value value FROM (SELECT map() labels,sum(value) value FROM (SELECT labels, corrected*(sampled+least(start_extra,if(corrected>0,sampled*(first_value/corrected),start_extra))+end_extra)/sampled AS value FROM (SELECT labels,samples,length(samples) n,samples[1].1 first_ts,samples[n].1 last_ts,samples[1].2 first_value,samples[n].2 last_value,(last_ts-first_ts)/1000 sampled,(last_value-first_value)+arraySum(i -> if(samples[i].2<samples[i-1].2,samples[i-1].2,0.),range(2,n+1)) corrected,if((first_ts-(({eval_ms}-0)-3600000))/1000<sampled/(n-1)*1.1,(first_ts-(({eval_ms}-0)-3600000))/1000,sampled/(n-1)/2) start_extra,if((({eval_ms}-0)-last_ts)/1000<sampled/(n-1)*1.1,(({eval_ms}-0)-last_ts)/1000,sampled/(n-1)/2) end_extra FROM (SELECT labels,arraySort(x -> x.1,groupArray((ts_ms,value))) samples FROM raw_samples WHERE metric='payment_service_http_5xx_total' AND ts_ms>=(({eval_ms}-0)-3600000) AND ts_ms<=({eval_ms}-0) GROUP BY labels) WHERE n>=2))) a INNER JOIN (SELECT map() labels,sum(value) value FROM (SELECT labels, corrected*(sampled+least(start_extra,if(corrected>0,sampled*(first_value/corrected),start_extra))+end_extra)/sampled AS value FROM (SELECT labels,samples,length(samples) n,samples[1].1 first_ts,samples[n].1 last_ts,samples[1].2 first_value,samples[n].2 last_value,(last_ts-first_ts)/1000 sampled,(last_value-first_value)+arraySum(i -> if(samples[i].2<samples[i-1].2,samples[i-1].2,0.),range(2,n+1)) corrected,if((first_ts-(({eval_ms}-0)-3600000))/1000<sampled/(n-1)*1.1,(first_ts-(({eval_ms}-0)-3600000))/1000,sampled/(n-1)/2) start_extra,if((({eval_ms}-0)-last_ts)/1000<sampled/(n-1)*1.1,(({eval_ms}-0)-last_ts)/1000,sampled/(n-1)/2) end_extra FROM (SELECT labels,arraySort(x -> x.1,groupArray((ts_ms,value))) samples FROM raw_samples WHERE metric='payment_service_http_requests_total' AND ts_ms>=(({eval_ms}-0)-3600000) AND ts_ms<=({eval_ms}-0) GROUP BY labels) WHERE n>=2))) b ON a.labels=b.labels",
-      "operators": [
-        "increase",
-        "sum",
-        "division"
-      ],
-      "sql_mapping_contract": "Derived from identical raw samples by the checked Prometheus-semantics loader, never from baseline query answers.",
-      "sql_mapping_status": "oracle_valid"
-    },
-    {
-      "id": "q04",
-      "promql": "sum(increase(payment_service_http_5xx_total[1h] offset 6h)) / sum(increase(payment_service_http_requests_total[1h] offset 6h))",
-      "metricsql": "sum(increase(payment_service_http_5xx_total[1h] offset 6h)) / sum(increase(payment_service_http_requests_total[1h] offset 6h))",
-      "clickhouse_sql": "SELECT a.labels,a.value/b.value value FROM (SELECT map() labels,sum(value) value FROM (SELECT labels, corrected*(sampled+least(start_extra,if(corrected>0,sampled*(first_value/corrected),start_extra))+end_extra)/sampled AS value FROM (SELECT labels,samples,length(samples) n,samples[1].1 first_ts,samples[n].1 last_ts,samples[1].2 first_value,samples[n].2 last_value,(last_ts-first_ts)/1000 sampled,(last_value-first_value)+arraySum(i -> if(samples[i].2<samples[i-1].2,samples[i-1].2,0.),range(2,n+1)) corrected,if((first_ts-(({eval_ms}-21600000)-3600000))/1000<sampled/(n-1)*1.1,(first_ts-(({eval_ms}-21600000)-3600000))/1000,sampled/(n-1)/2) start_extra,if((({eval_ms}-21600000)-last_ts)/1000<sampled/(n-1)*1.1,(({eval_ms}-21600000)-last_ts)/1000,sampled/(n-1)/2) end_extra FROM (SELECT labels,arraySort(x -> x.1,groupArray((ts_ms,value))) samples FROM raw_samples WHERE metric='payment_service_http_5xx_total' AND ts_ms>=(({eval_ms}-21600000)-3600000) AND ts_ms<=({eval_ms}-21600000) GROUP BY labels) WHERE n>=2))) a INNER JOIN (SELECT map() labels,sum(value) value FROM (SELECT labels, corrected*(sampled+least(start_extra,if(corrected>0,sampled*(first_value/corrected),start_extra))+end_extra)/sampled AS value FROM (SELECT labels,samples,length(samples) n,samples[1].1 first_ts,samples[n].1 last_ts,samples[1].2 first_value,samples[n].2 last_value,(last_ts-first_ts)/1000 sampled,(last_value-first_value)+arraySum(i -> if(samples[i].2<samples[i-1].2,samples[i-1].2,0.),range(2,n+1)) corrected,if((first_ts-(({eval_ms}-21600000)-3600000))/1000<sampled/(n-1)*1.1,(first_ts-(({eval_ms}-21600000)-3600000))/1000,sampled/(n-1)/2) start_extra,if((({eval_ms}-21600000)-last_ts)/1000<sampled/(n-1)*1.1,(({eval_ms}-21600000)-last_ts)/1000,sampled/(n-1)/2) end_extra FROM (SELECT labels,arraySort(x -> x.1,groupArray((ts_ms,value))) samples FROM raw_samples WHERE metric='payment_service_http_requests_total' AND ts_ms>=(({eval_ms}-21600000)-3600000) AND ts_ms<=({eval_ms}-21600000) GROUP BY labels) WHERE n>=2))) b ON a.labels=b.labels",
-      "operators": [
-        "increase",
-        "sum",
-        "offset",
-        "division"
-      ],
-      "sql_mapping_contract": "Derived from identical raw samples by the checked Prometheus-semantics loader, never from baseline query answers.",
-      "sql_mapping_status": "oracle_valid"
-    },
-    {
-      "id": "q05",
-      "promql": "max_over_time(cache_refresh_lag_seconds[12h])",
-      "metricsql": "max_over_time(cache_refresh_lag_seconds[12h])",
-      "clickhouse_sql": "SELECT labels, max(value) AS value FROM raw_samples WHERE metric='cache_refresh_lag_seconds' AND ts_ms>{eval_ms}-43200000 AND ts_ms<={eval_ms} GROUP BY labels ORDER BY labels",
-      "operators": [
-        "max_over_time"
-      ],
-      "sql_mapping_contract": "Derived from identical raw samples by the checked Prometheus-semantics loader, never from baseline query answers.",
-      "sql_mapping_status": "oracle_valid"
-    },
-    {
-      "id": "q06",
-      "promql": "max_over_time(user_service_cache_refresh_lag_seconds[12h])",
-      "metricsql": "max_over_time(user_service_cache_refresh_lag_seconds[12h])",
-      "clickhouse_sql": "SELECT labels, max(value) AS value FROM raw_samples WHERE metric='user_service_cache_refresh_lag_seconds' AND ts_ms>{eval_ms}-43200000 AND ts_ms<={eval_ms} GROUP BY labels ORDER BY labels",
-      "operators": [
-        "max_over_time"
-      ],
-      "sql_mapping_contract": "Derived from identical raw samples by the checked Prometheus-semantics loader, never from baseline query answers.",
-      "sql_mapping_status": "oracle_valid"
-    },
-    {
-      "id": "q07",
-      "promql": "user_service_cache_refresh_lag_seconds",
-      "metricsql": "user_service_cache_refresh_lag_seconds",
-      "clickhouse_sql": "SELECT mapConcat(labels,map('__name__','user_service_cache_refresh_lag_seconds')) AS labels, argMax(value,ts_ms) AS value FROM raw_samples WHERE metric='user_service_cache_refresh_lag_seconds' AND ts_ms>{eval_ms}-300000 AND ts_ms<={eval_ms} GROUP BY labels ORDER BY labels",
-      "operators": [],
-      "sql_mapping_contract": "Derived from identical raw samples by the checked Prometheus-semantics loader, never from baseline query answers.",
-      "sql_mapping_status": "oracle_valid"
-    },
-    {
-      "id": "q08",
-      "promql": "sum(rate(backend_process_cpu_seconds_total[1h]))",
-      "metricsql": "sum(rate(backend_process_cpu_seconds_total[1h]))",
-      "clickhouse_sql": "SELECT map() labels,sum(value) value FROM (SELECT labels, corrected*(sampled+least(start_extra,if(corrected>0,sampled*(first_value/corrected),start_extra))+end_extra)/sampled/(3600000/1000) AS value FROM (SELECT labels,samples,length(samples) n,samples[1].1 first_ts,samples[n].1 last_ts,samples[1].2 first_value,samples[n].2 last_value,(last_ts-first_ts)/1000 sampled,(last_value-first_value)+arraySum(i -> if(samples[i].2<samples[i-1].2,samples[i-1].2,0.),range(2,n+1)) corrected,if((first_ts-(({eval_ms}-0)-3600000))/1000<sampled/(n-1)*1.1,(first_ts-(({eval_ms}-0)-3600000))/1000,sampled/(n-1)/2) start_extra,if((({eval_ms}-0)-last_ts)/1000<sampled/(n-1)*1.1,(({eval_ms}-0)-last_ts)/1000,sampled/(n-1)/2) end_extra FROM (SELECT labels,arraySort(x -> x.1,groupArray((ts_ms,value))) samples FROM raw_samples WHERE metric='backend_process_cpu_seconds_total' AND ts_ms>=(({eval_ms}-0)-3600000) AND ts_ms<=({eval_ms}-0) GROUP BY labels) WHERE n>=2))",
-      "operators": [
-        "rate",
-        "sum"
-      ],
-      "sql_mapping_contract": "Derived from identical raw samples by the checked Prometheus-semantics loader, never from baseline query answers.",
-      "sql_mapping_status": "oracle_valid"
-    },
-    {
-      "id": "q09",
-      "promql": "sum(backend_process_resident_memory_bytes)",
-      "metricsql": "sum(backend_process_resident_memory_bytes)",
-      "clickhouse_sql": "SELECT map() AS labels, sum(value) AS value FROM (SELECT labels,argMax(value,ts_ms) AS value FROM raw_samples WHERE metric='backend_process_resident_memory_bytes' AND ts_ms>{eval_ms}-300000 AND ts_ms<={eval_ms} GROUP BY labels)",
-      "operators": [
-        "sum"
-      ],
-      "sql_mapping_contract": "Derived from identical raw samples by the checked Prometheus-semantics loader, never from baseline query answers.",
-      "sql_mapping_status": "oracle_valid"
-    },
-    {
-      "id": "q10",
-      "promql": "max_over_time((sum(backend_process_resident_memory_bytes))[6h:])",
-      "metricsql": "max_over_time((sum(backend_process_resident_memory_bytes))[6h:])",
-      "clickhouse_sql": "SELECT map() labels,max(value) value FROM (SELECT ts_ms,sum(value) value FROM raw_samples WHERE metric='backend_process_resident_memory_bytes' AND ts_ms>={eval_ms}-21600000 AND ts_ms<={eval_ms} AND modulo({eval_ms}-ts_ms,60000)=0 GROUP BY ts_ms)",
-      "operators": [
-        "max_over_time",
-        "sum",
-        "subquery"
-      ],
-      "sql_mapping_contract": "Derived from identical raw samples by the checked Prometheus-semantics loader, never from baseline query answers.",
-      "sql_mapping_status": "oracle_valid"
-    },
-    {
-      "id": "q11",
-      "promql": "topk(2, sum by (job) (rate(backend_process_cpu_seconds_total[1h])))",
-      "metricsql": "topk(2, sum by (job) (rate(backend_process_cpu_seconds_total[1h])))",
-      "clickhouse_sql": "SELECT * FROM (SELECT map('job',job) labels,sum(value) value FROM (SELECT labels['job'] job,value FROM (SELECT labels, corrected*(sampled+least(start_extra,if(corrected>0,sampled*(first_value/corrected),start_extra))+end_extra)/sampled/(3600000/1000) AS value FROM (SELECT labels,samples,length(samples) n,samples[1].1 first_ts,samples[n].1 last_ts,samples[1].2 first_value,samples[n].2 last_value,(last_ts-first_ts)/1000 sampled,(last_value-first_value)+arraySum(i -> if(samples[i].2<samples[i-1].2,samples[i-1].2,0.),range(2,n+1)) corrected,if((first_ts-(({eval_ms}-0)-3600000))/1000<sampled/(n-1)*1.1,(first_ts-(({eval_ms}-0)-3600000))/1000,sampled/(n-1)/2) start_extra,if((({eval_ms}-0)-last_ts)/1000<sampled/(n-1)*1.1,(({eval_ms}-0)-last_ts)/1000,sampled/(n-1)/2) end_extra FROM (SELECT labels,arraySort(x -> x.1,groupArray((ts_ms,value))) samples FROM raw_samples WHERE metric='backend_process_cpu_seconds_total' AND ts_ms>=(({eval_ms}-0)-3600000) AND ts_ms<=({eval_ms}-0) GROUP BY labels) WHERE n>=2))) GROUP BY job) ORDER BY value DESC,labels LIMIT 2",
-      "operators": [
-        "topk",
-        "rate"
-      ],
-      "sql_mapping_contract": "Derived from identical raw samples by the checked Prometheus-semantics loader, never from baseline query answers.",
-      "sql_mapping_status": "oracle_valid"
-    },
-    {
-      "id": "q12",
-      "promql": "topk(2, sum by (job) (backend_process_resident_memory_bytes))",
-      "metricsql": "topk(2, sum by (job) (backend_process_resident_memory_bytes))",
-      "clickhouse_sql": "SELECT map('job',job) AS labels,sum(value) AS value FROM (SELECT labels['job'] AS job,labels,argMax(value,ts_ms) AS value FROM raw_samples WHERE metric='backend_process_resident_memory_bytes' AND ts_ms>{eval_ms}-300000 AND ts_ms<={eval_ms} GROUP BY job,labels) GROUP BY job ORDER BY value DESC,job LIMIT 2",
-      "operators": [
-        "topk"
-      ],
-      "sql_mapping_contract": "Derived from identical raw samples by the checked Prometheus-semantics loader, never from baseline query answers.",
-      "sql_mapping_status": "oracle_valid"
-    },
-    {
-      "id": "q13",
-      "promql": "max_over_time((sum(rate(backend_process_cpu_seconds_total[5m])))[6h:])",
-      "metricsql": "max_over_time((sum(rate(backend_process_cpu_seconds_total[5m])))[6h:])",
-      "clickhouse_sql": "SELECT map() labels,max(value) value FROM (SELECT grid_ms,sum(value) value FROM (SELECT grid_ms,labels,corrected*(sampled+least(start_extra,if(corrected>0,sampled*(first_value/corrected),start_extra))+end_extra)/sampled/300 value FROM (SELECT grid_ms,labels,samples,length(samples) n,samples[1].1 first_ts,samples[n].1 last_ts,samples[1].2 first_value,samples[n].2 last_value,(last_ts-first_ts)/1000 sampled,(last_value-first_value)+arraySum(i -> if(samples[i].2<samples[i-1].2,samples[i-1].2,0.),range(2,n+1)) corrected,if((first_ts-(grid_ms-300000))/1000<sampled/(n-1)*1.1,(first_ts-(grid_ms-300000))/1000,sampled/(n-1)/2) start_extra,if((grid_ms-last_ts)/1000<sampled/(n-1)*1.1,(grid_ms-last_ts)/1000,sampled/(n-1)/2) end_extra FROM (SELECT grid_ms,labels,arraySort(x->x.1,groupArray((ts_ms,value))) samples FROM raw_samples CROSS JOIN (SELECT arrayJoin(arrayMap(x->x*60000,range(toUInt64(intDiv({eval_ms}-21600000+59999,60000)),toUInt64(intDiv({eval_ms},60000)+1)))) grid_ms) grids WHERE metric='backend_process_cpu_seconds_total' AND ts_ms>=grid_ms-300000 AND ts_ms<=grid_ms GROUP BY grid_ms,labels) WHERE n>=2)) GROUP BY grid_ms)",
-      "operators": [
-        "rate",
-        "max_over_time",
-        "sum",
-        "subquery"
-      ],
-      "sql_mapping_contract": "Derived from identical raw samples by the checked Prometheus-semantics loader, never from baseline query answers.",
-      "sql_mapping_status": "oracle_valid"
-    },
-    {
-      "id": "q14",
-      "promql": "sum(rate(backend_http_requests_total[5m]))",
-      "metricsql": "sum(rate(backend_http_requests_total[5m]))",
-      "clickhouse_sql": "SELECT map() labels,sum(value) value FROM (SELECT labels, corrected*(sampled+least(start_extra,if(corrected>0,sampled*(first_value/corrected),start_extra))+end_extra)/sampled/(300000/1000) AS value FROM (SELECT labels,samples,length(samples) n,samples[1].1 first_ts,samples[n].1 last_ts,samples[1].2 first_value,samples[n].2 last_value,(last_ts-first_ts)/1000 sampled,(last_value-first_value)+arraySum(i -> if(samples[i].2<samples[i-1].2,samples[i-1].2,0.),range(2,n+1)) corrected,if((first_ts-(({eval_ms}-0)-300000))/1000<sampled/(n-1)*1.1,(first_ts-(({eval_ms}-0)-300000))/1000,sampled/(n-1)/2) start_extra,if((({eval_ms}-0)-last_ts)/1000<sampled/(n-1)*1.1,(({eval_ms}-0)-last_ts)/1000,sampled/(n-1)/2) end_extra FROM (SELECT labels,arraySort(x -> x.1,groupArray((ts_ms,value))) samples FROM raw_samples WHERE metric='backend_http_requests_total' AND ts_ms>=(({eval_ms}-0)-300000) AND ts_ms<=({eval_ms}-0) GROUP BY labels) WHERE n>=2))",
-      "operators": [
-        "rate",
-        "sum"
-      ],
-      "sql_mapping_contract": "Derived from identical raw samples by the checked Prometheus-semantics loader, never from baseline query answers.",
-      "sql_mapping_status": "oracle_valid"
-    },
-    {
-      "id": "q15",
-      "promql": "sum by (job) (rate(backend_http_requests_total[5m]))",
-      "metricsql": "sum by (job) (rate(backend_http_requests_total[5m]))",
-      "clickhouse_sql": "SELECT map('job',job) labels,sum(value) value FROM (SELECT labels['job'] job,value FROM (SELECT labels, corrected*(sampled+least(start_extra,if(corrected>0,sampled*(first_value/corrected),start_extra))+end_extra)/sampled/(300000/1000) AS value FROM (SELECT labels,samples,length(samples) n,samples[1].1 first_ts,samples[n].1 last_ts,samples[1].2 first_value,samples[n].2 last_value,(last_ts-first_ts)/1000 sampled,(last_value-first_value)+arraySum(i -> if(samples[i].2<samples[i-1].2,samples[i-1].2,0.),range(2,n+1)) corrected,if((first_ts-(({eval_ms}-0)-300000))/1000<sampled/(n-1)*1.1,(first_ts-(({eval_ms}-0)-300000))/1000,sampled/(n-1)/2) start_extra,if((({eval_ms}-0)-last_ts)/1000<sampled/(n-1)*1.1,(({eval_ms}-0)-last_ts)/1000,sampled/(n-1)/2) end_extra FROM (SELECT labels,arraySort(x -> x.1,groupArray((ts_ms,value))) samples FROM raw_samples WHERE metric='backend_http_requests_total' AND ts_ms>=(({eval_ms}-0)-300000) AND ts_ms<=({eval_ms}-0) GROUP BY labels) WHERE n>=2))) GROUP BY job",
-      "operators": [
-        "rate"
-      ],
-      "sql_mapping_contract": "Derived from identical raw samples by the checked Prometheus-semantics loader, never from baseline query answers.",
-      "sql_mapping_status": "oracle_valid"
-    },
-    {
-      "id": "q16",
-      "promql": "sum(increase(backend_http_5xx_total[60m])) / sum(increase(backend_http_requests_total[60m]))",
-      "metricsql": "sum(increase(backend_http_5xx_total[60m])) / sum(increase(backend_http_requests_total[60m]))",
-      "clickhouse_sql": "SELECT a.labels,a.value/b.value value FROM (SELECT map() labels,sum(value) value FROM (SELECT labels, corrected*(sampled+least(start_extra,if(corrected>0,sampled*(first_value/corrected),start_extra))+end_extra)/sampled AS value FROM (SELECT labels,samples,length(samples) n,samples[1].1 first_ts,samples[n].1 last_ts,samples[1].2 first_value,samples[n].2 last_value,(last_ts-first_ts)/1000 sampled,(last_value-first_value)+arraySum(i -> if(samples[i].2<samples[i-1].2,samples[i-1].2,0.),range(2,n+1)) corrected,if((first_ts-(({eval_ms}-0)-3600000))/1000<sampled/(n-1)*1.1,(first_ts-(({eval_ms}-0)-3600000))/1000,sampled/(n-1)/2) start_extra,if((({eval_ms}-0)-last_ts)/1000<sampled/(n-1)*1.1,(({eval_ms}-0)-last_ts)/1000,sampled/(n-1)/2) end_extra FROM (SELECT labels,arraySort(x -> x.1,groupArray((ts_ms,value))) samples FROM raw_samples WHERE metric='backend_http_5xx_total' AND ts_ms>=(({eval_ms}-0)-3600000) AND ts_ms<=({eval_ms}-0) GROUP BY labels) WHERE n>=2))) a INNER JOIN (SELECT map() labels,sum(value) value FROM (SELECT labels, corrected*(sampled+least(start_extra,if(corrected>0,sampled*(first_value/corrected),start_extra))+end_extra)/sampled AS value FROM (SELECT labels,samples,length(samples) n,samples[1].1 first_ts,samples[n].1 last_ts,samples[1].2 first_value,samples[n].2 last_value,(last_ts-first_ts)/1000 sampled,(last_value-first_value)+arraySum(i -> if(samples[i].2<samples[i-1].2,samples[i-1].2,0.),range(2,n+1)) corrected,if((first_ts-(({eval_ms}-0)-3600000))/1000<sampled/(n-1)*1.1,(first_ts-(({eval_ms}-0)-3600000))/1000,sampled/(n-1)/2) start_extra,if((({eval_ms}-0)-last_ts)/1000<sampled/(n-1)*1.1,(({eval_ms}-0)-last_ts)/1000,sampled/(n-1)/2) end_extra FROM (SELECT labels,arraySort(x -> x.1,groupArray((ts_ms,value))) samples FROM raw_samples WHERE metric='backend_http_requests_total' AND ts_ms>=(({eval_ms}-0)-3600000) AND ts_ms<=({eval_ms}-0) GROUP BY labels) WHERE n>=2))) b ON a.labels=b.labels",
-      "operators": [
-        "increase",
-        "sum",
-        "division"
-      ],
-      "sql_mapping_contract": "Derived from identical raw samples by the checked Prometheus-semantics loader, never from baseline query answers.",
-      "sql_mapping_status": "oracle_valid"
-    },
-    {
-      "id": "q17",
-      "promql": "topk(1, sum by (job) (increase(backend_http_5xx_total[6h])) / sum by (job) (increase(backend_http_requests_total[6h])))",
-      "metricsql": "topk(1, sum by (job) (increase(backend_http_5xx_total[6h])) / sum by (job) (increase(backend_http_requests_total[6h])))",
-      "clickhouse_sql": "SELECT * FROM (SELECT a.labels,a.value/b.value value FROM (SELECT map('job',job) labels,sum(value) value FROM (SELECT labels['job'] job,value FROM (SELECT labels, corrected*(sampled+least(start_extra,if(corrected>0,sampled*(first_value/corrected),start_extra))+end_extra)/sampled AS value FROM (SELECT labels,samples,length(samples) n,samples[1].1 first_ts,samples[n].1 last_ts,samples[1].2 first_value,samples[n].2 last_value,(last_ts-first_ts)/1000 sampled,(last_value-first_value)+arraySum(i -> if(samples[i].2<samples[i-1].2,samples[i-1].2,0.),range(2,n+1)) corrected,if((first_ts-(({eval_ms}-0)-21600000))/1000<sampled/(n-1)*1.1,(first_ts-(({eval_ms}-0)-21600000))/1000,sampled/(n-1)/2) start_extra,if((({eval_ms}-0)-last_ts)/1000<sampled/(n-1)*1.1,(({eval_ms}-0)-last_ts)/1000,sampled/(n-1)/2) end_extra FROM (SELECT labels,arraySort(x -> x.1,groupArray((ts_ms,value))) samples FROM raw_samples WHERE metric='backend_http_5xx_total' AND ts_ms>=(({eval_ms}-0)-21600000) AND ts_ms<=({eval_ms}-0) GROUP BY labels) WHERE n>=2))) GROUP BY job) a INNER JOIN (SELECT map('job',job) labels,sum(value) value FROM (SELECT labels['job'] job,value FROM (SELECT labels, corrected*(sampled+least(start_extra,if(corrected>0,sampled*(first_value/corrected),start_extra))+end_extra)/sampled AS value FROM (SELECT labels,samples,length(samples) n,samples[1].1 first_ts,samples[n].1 last_ts,samples[1].2 first_value,samples[n].2 last_value,(last_ts-first_ts)/1000 sampled,(last_value-first_value)+arraySum(i -> if(samples[i].2<samples[i-1].2,samples[i-1].2,0.),range(2,n+1)) corrected,if((first_ts-(({eval_ms}-0)-21600000))/1000<sampled/(n-1)*1.1,(first_ts-(({eval_ms}-0)-21600000))/1000,sampled/(n-1)/2) start_extra,if((({eval_ms}-0)-last_ts)/1000<sampled/(n-1)*1.1,(({eval_ms}-0)-last_ts)/1000,sampled/(n-1)/2) end_extra FROM (SELECT labels,arraySort(x -> x.1,groupArray((ts_ms,value))) samples FROM raw_samples WHERE metric='backend_http_requests_total' AND ts_ms>=(({eval_ms}-0)-21600000) AND ts_ms<=({eval_ms}-0) GROUP BY labels) WHERE n>=2))) GROUP BY job) b ON a.labels=b.labels) ORDER BY value DESC,labels LIMIT 1",
-      "operators": [
-        "topk",
-        "increase",
-        "division"
-      ],
-      "sql_mapping_contract": "Derived from identical raw samples by the checked Prometheus-semantics loader, never from baseline query answers.",
-      "sql_mapping_status": "oracle_valid"
-    },
-    {
-      "id": "q18",
-      "promql": "sum by (job) (increase(backend_http_5xx_total[24h])) > 0",
-      "metricsql": "sum by (job) (increase(backend_http_5xx_total[24h])) > 0",
-      "clickhouse_sql": "SELECT * FROM (SELECT map('job',job) labels,sum(value) value FROM (SELECT labels['job'] job,value FROM (SELECT labels, corrected*(sampled+least(start_extra,if(corrected>0,sampled*(first_value/corrected),start_extra))+end_extra)/sampled AS value FROM (SELECT labels,samples,length(samples) n,samples[1].1 first_ts,samples[n].1 last_ts,samples[1].2 first_value,samples[n].2 last_value,(last_ts-first_ts)/1000 sampled,(last_value-first_value)+arraySum(i -> if(samples[i].2<samples[i-1].2,samples[i-1].2,0.),range(2,n+1)) corrected,if((first_ts-(({eval_ms}-0)-86400000))/1000<sampled/(n-1)*1.1,(first_ts-(({eval_ms}-0)-86400000))/1000,sampled/(n-1)/2) start_extra,if((({eval_ms}-0)-last_ts)/1000<sampled/(n-1)*1.1,(({eval_ms}-0)-last_ts)/1000,sampled/(n-1)/2) end_extra FROM (SELECT labels,arraySort(x -> x.1,groupArray((ts_ms,value))) samples FROM raw_samples WHERE metric='backend_http_5xx_total' AND ts_ms>=(({eval_ms}-0)-86400000) AND ts_ms<=({eval_ms}-0) GROUP BY labels) WHERE n>=2))) GROUP BY job) WHERE value>0",
-      "operators": [
-        "increase",
-        "comparison"
-      ],
-      "sql_mapping_contract": "Derived from identical raw samples by the checked Prometheus-semantics loader, never from baseline query answers.",
-      "sql_mapping_status": "oracle_valid"
-    },
-    {
-      "id": "q19",
-      "promql": "sum(rate(order_service_http_requests_total[5m]))",
-      "metricsql": "sum(rate(order_service_http_requests_total[5m]))",
-      "clickhouse_sql": "SELECT map() labels,sum(value) value FROM (SELECT labels, corrected*(sampled+least(start_extra,if(corrected>0,sampled*(first_value/corrected),start_extra))+end_extra)/sampled/(300000/1000) AS value FROM (SELECT labels,samples,length(samples) n,samples[1].1 first_ts,samples[n].1 last_ts,samples[1].2 first_value,samples[n].2 last_value,(last_ts-first_ts)/1000 sampled,(last_value-first_value)+arraySum(i -> if(samples[i].2<samples[i-1].2,samples[i-1].2,0.),range(2,n+1)) corrected,if((first_ts-(({eval_ms}-0)-300000))/1000<sampled/(n-1)*1.1,(first_ts-(({eval_ms}-0)-300000))/1000,sampled/(n-1)/2) start_extra,if((({eval_ms}-0)-last_ts)/1000<sampled/(n-1)*1.1,(({eval_ms}-0)-last_ts)/1000,sampled/(n-1)/2) end_extra FROM (SELECT labels,arraySort(x -> x.1,groupArray((ts_ms,value))) samples FROM raw_samples WHERE metric='order_service_http_requests_total' AND ts_ms>=(({eval_ms}-0)-300000) AND ts_ms<=({eval_ms}-0) GROUP BY labels) WHERE n>=2))",
-      "operators": [
-        "rate",
-        "sum"
-      ],
-      "sql_mapping_contract": "Derived from identical raw samples by the checked Prometheus-semantics loader, never from baseline query answers.",
-      "sql_mapping_status": "oracle_valid"
-    },
-    {
-      "id": "q20",
-      "promql": "sum(rate(order_service_http_requests_total[5m] offset 1h))",
-      "metricsql": "sum(rate(order_service_http_requests_total[5m] offset 1h))",
-      "clickhouse_sql": "SELECT map() labels,sum(value) value FROM (SELECT labels, corrected*(sampled+least(start_extra,if(corrected>0,sampled*(first_value/corrected),start_extra))+end_extra)/sampled/(300000/1000) AS value FROM (SELECT labels,samples,length(samples) n,samples[1].1 first_ts,samples[n].1 last_ts,samples[1].2 first_value,samples[n].2 last_value,(last_ts-first_ts)/1000 sampled,(last_value-first_value)+arraySum(i -> if(samples[i].2<samples[i-1].2,samples[i-1].2,0.),range(2,n+1)) corrected,if((first_ts-(({eval_ms}-3600000)-300000))/1000<sampled/(n-1)*1.1,(first_ts-(({eval_ms}-3600000)-300000))/1000,sampled/(n-1)/2) start_extra,if((({eval_ms}-3600000)-last_ts)/1000<sampled/(n-1)*1.1,(({eval_ms}-3600000)-last_ts)/1000,sampled/(n-1)/2) end_extra FROM (SELECT labels,arraySort(x -> x.1,groupArray((ts_ms,value))) samples FROM raw_samples WHERE metric='order_service_http_requests_total' AND ts_ms>=(({eval_ms}-3600000)-300000) AND ts_ms<=({eval_ms}-3600000) GROUP BY labels) WHERE n>=2))",
-      "operators": [
-        "rate",
-        "sum",
-        "offset"
-      ],
-      "sql_mapping_contract": "Derived from identical raw samples by the checked Prometheus-semantics loader, never from baseline query answers.",
-      "sql_mapping_status": "oracle_valid"
-    },
-    {
-      "id": "q21",
-      "promql": "histogram_quantile(0.95, sum by (le) (rate(order_service_http_request_duration_seconds_bucket[5m])))",
-      "metricsql": "histogram_quantile(0.95, sum by (le) (rate(order_service_http_request_duration_seconds_bucket[5m])))",
-      "clickhouse_sql": "SELECT map() labels,if(idx=length(buckets),buckets[idx-1].1,if(idx=1 AND buckets[idx].1<=0,buckets[idx].1,(if(idx=1,0.,buckets[idx-1].1)+(buckets[idx].1-if(idx=1,0.,buckets[idx-1].1))*(rank-if(idx=1,0.,buckets[idx-1].2))/(buckets[idx].2-if(idx=1,0.,buckets[idx-1].2))))) value FROM (SELECT buckets,0.95*buckets[length(buckets)].2 rank,arrayFirstIndex(x->x.2>=rank,buckets) idx FROM (SELECT arrayMap(i->(raw[i].1,arrayMax(arrayMap(x->x.2,arraySlice(raw,1,i)))),range(1,length(raw)+1)) buckets FROM (SELECT arraySort(x->x.1,groupArray((if(le='+Inf',inf,toFloat64(le)),value))) raw FROM (SELECT labels['le'] le,sum(value) value FROM (SELECT labels, corrected*(sampled+least(start_extra,if(corrected>0,sampled*(first_value/corrected),start_extra))+end_extra)/sampled/(300000/1000) AS value FROM (SELECT labels,samples,length(samples) n,samples[1].1 first_ts,samples[n].1 last_ts,samples[1].2 first_value,samples[n].2 last_value,(last_ts-first_ts)/1000 sampled,(last_value-first_value)+arraySum(i -> if(samples[i].2<samples[i-1].2,samples[i-1].2,0.),range(2,n+1)) corrected,if((first_ts-(({eval_ms}-0)-300000))/1000<sampled/(n-1)*1.1,(first_ts-(({eval_ms}-0)-300000))/1000,sampled/(n-1)/2) start_extra,if((({eval_ms}-0)-last_ts)/1000<sampled/(n-1)*1.1,(({eval_ms}-0)-last_ts)/1000,sampled/(n-1)/2) end_extra FROM (SELECT labels,arraySort(x -> x.1,groupArray((ts_ms,value))) samples FROM raw_samples WHERE metric='order_service_http_request_duration_seconds_bucket' AND ts_ms>=(({eval_ms}-0)-300000) AND ts_ms<=({eval_ms}-0) GROUP BY labels) WHERE n>=2)) GROUP BY le)))) WHERE idx>0",
-      "operators": [
-        "histogram_quantile",
-        "rate"
-      ],
-      "sql_mapping_contract": "Derived from identical raw samples by the checked Prometheus-semantics loader, never from baseline query answers.",
-      "sql_mapping_status": "oracle_valid"
-    },
-    {
-      "id": "q22",
-      "promql": "sum(rate(order_service_http_requests_total[5m]))",
-      "metricsql": "sum(rate(order_service_http_requests_total[5m]))",
-      "clickhouse_sql": "SELECT map() labels,sum(value) value FROM (SELECT labels, corrected*(sampled+least(start_extra,if(corrected>0,sampled*(first_value/corrected),start_extra))+end_extra)/sampled/(300000/1000) AS value FROM (SELECT labels,samples,length(samples) n,samples[1].1 first_ts,samples[n].1 last_ts,samples[1].2 first_value,samples[n].2 last_value,(last_ts-first_ts)/1000 sampled,(last_value-first_value)+arraySum(i -> if(samples[i].2<samples[i-1].2,samples[i-1].2,0.),range(2,n+1)) corrected,if((first_ts-(({eval_ms}-0)-300000))/1000<sampled/(n-1)*1.1,(first_ts-(({eval_ms}-0)-300000))/1000,sampled/(n-1)/2) start_extra,if((({eval_ms}-0)-last_ts)/1000<sampled/(n-1)*1.1,(({eval_ms}-0)-last_ts)/1000,sampled/(n-1)/2) end_extra FROM (SELECT labels,arraySort(x -> x.1,groupArray((ts_ms,value))) samples FROM raw_samples WHERE metric='order_service_http_requests_total' AND ts_ms>=(({eval_ms}-0)-300000) AND ts_ms<=({eval_ms}-0) GROUP BY labels) WHERE n>=2))",
-      "operators": [
-        "rate",
-        "sum"
-      ],
-      "sql_mapping_contract": "Derived from identical raw samples by the checked Prometheus-semantics loader, never from baseline query answers.",
-      "sql_mapping_status": "oracle_valid"
-    },
-    {
-      "id": "q23",
-      "promql": "topk(2, max_over_time(backend_retry_backlog_depth[6h]))",
-      "metricsql": "topk(2, max_over_time(backend_retry_backlog_depth[6h]))",
-      "clickhouse_sql": "SELECT labels,max(value) AS value FROM raw_samples WHERE metric='backend_retry_backlog_depth' AND ts_ms>{eval_ms}-21600000 AND ts_ms<={eval_ms} GROUP BY labels ORDER BY value DESC,labels LIMIT 2",
-      "operators": [
-        "topk",
-        "max_over_time"
-      ],
-      "sql_mapping_contract": "Derived from identical raw samples by the checked Prometheus-semantics loader, never from baseline query answers.",
-      "sql_mapping_status": "oracle_valid"
-    },
-    {
-      "id": "q24",
-      "promql": "max_over_time((sum(rate(order_service_http_5xx_total[5m])) / sum(rate(order_service_http_requests_total[5m])))[6h:])",
-      "metricsql": "max_over_time((sum(rate(order_service_http_5xx_total[5m])) / sum(rate(order_service_http_requests_total[5m])))[6h:])",
-      "clickhouse_sql": "SELECT map() labels,max(a.value/b.value) value FROM (SELECT grid_ms,sum(value) value FROM (SELECT grid_ms,labels,corrected*(sampled+least(start_extra,if(corrected>0,sampled*(first_value/corrected),start_extra))+end_extra)/sampled/300 value FROM (SELECT grid_ms,labels,samples,length(samples) n,samples[1].1 first_ts,samples[n].1 last_ts,samples[1].2 first_value,samples[n].2 last_value,(last_ts-first_ts)/1000 sampled,(last_value-first_value)+arraySum(i -> if(samples[i].2<samples[i-1].2,samples[i-1].2,0.),range(2,n+1)) corrected,if((first_ts-(grid_ms-300000))/1000<sampled/(n-1)*1.1,(first_ts-(grid_ms-300000))/1000,sampled/(n-1)/2) start_extra,if((grid_ms-last_ts)/1000<sampled/(n-1)*1.1,(grid_ms-last_ts)/1000,sampled/(n-1)/2) end_extra FROM (SELECT grid_ms,labels,arraySort(x->x.1,groupArray((ts_ms,value))) samples FROM raw_samples CROSS JOIN (SELECT arrayJoin(arrayMap(x->x*60000,range(toUInt64(intDiv({eval_ms}-21600000+59999,60000)),toUInt64(intDiv({eval_ms},60000)+1)))) grid_ms) grids WHERE metric='order_service_http_5xx_total' AND ts_ms>=grid_ms-300000 AND ts_ms<=grid_ms GROUP BY grid_ms,labels) WHERE n>=2)) GROUP BY grid_ms) a INNER JOIN (SELECT grid_ms,sum(value) value FROM (SELECT grid_ms,labels,corrected*(sampled+least(start_extra,if(corrected>0,sampled*(first_value/corrected),start_extra))+end_extra)/sampled/300 value FROM (SELECT grid_ms,labels,samples,length(samples) n,samples[1].1 first_ts,samples[n].1 last_ts,samples[1].2 first_value,samples[n].2 last_value,(last_ts-first_ts)/1000 sampled,(last_value-first_value)+arraySum(i -> if(samples[i].2<samples[i-1].2,samples[i-1].2,0.),range(2,n+1)) corrected,if((first_ts-(grid_ms-300000))/1000<sampled/(n-1)*1.1,(first_ts-(grid_ms-300000))/1000,sampled/(n-1)/2) start_extra,if((grid_ms-last_ts)/1000<sampled/(n-1)*1.1,(grid_ms-last_ts)/1000,sampled/(n-1)/2) end_extra FROM (SELECT grid_ms,labels,arraySort(x->x.1,groupArray((ts_ms,value))) samples FROM raw_samples CROSS JOIN (SELECT arrayJoin(arrayMap(x->x*60000,range(toUInt64(intDiv({eval_ms}-21600000+59999,60000)),toUInt64(intDiv({eval_ms},60000)+1)))) grid_ms) grids WHERE metric='order_service_http_requests_total' AND ts_ms>=grid_ms-300000 AND ts_ms<=grid_ms GROUP BY grid_ms,labels) WHERE n>=2)) GROUP BY grid_ms) b ON a.grid_ms=b.grid_ms",
-      "operators": [
-        "rate",
-        "max_over_time",
-        "sum",
-        "subquery",
-        "division"
-      ],
-      "sql_mapping_contract": "Derived from identical raw samples by the checked Prometheus-semantics loader, never from baseline query answers.",
-      "sql_mapping_status": "oracle_valid"
-    },
-    {
-      "id": "q25",
-      "promql": "topk(1, sum by (job) (increase(backend_http_5xx_total[24h])) / scalar(sum(increase(backend_http_5xx_total[24h]))))",
-      "metricsql": "topk(1, sum by (job) (increase(backend_http_5xx_total[24h])) / scalar(sum(increase(backend_http_5xx_total[24h]))))",
-      "clickhouse_sql": "SELECT * FROM (SELECT a.labels,a.value/b.value value FROM (SELECT map('job',job) labels,sum(value) value FROM (SELECT labels['job'] job,value FROM (SELECT labels, corrected*(sampled+least(start_extra,if(corrected>0,sampled*(first_value/corrected),start_extra))+end_extra)/sampled AS value FROM (SELECT labels,samples,length(samples) n,samples[1].1 first_ts,samples[n].1 last_ts,samples[1].2 first_value,samples[n].2 last_value,(last_ts-first_ts)/1000 sampled,(last_value-first_value)+arraySum(i -> if(samples[i].2<samples[i-1].2,samples[i-1].2,0.),range(2,n+1)) corrected,if((first_ts-(({eval_ms}-0)-86400000))/1000<sampled/(n-1)*1.1,(first_ts-(({eval_ms}-0)-86400000))/1000,sampled/(n-1)/2) start_extra,if((({eval_ms}-0)-last_ts)/1000<sampled/(n-1)*1.1,(({eval_ms}-0)-last_ts)/1000,sampled/(n-1)/2) end_extra FROM (SELECT labels,arraySort(x -> x.1,groupArray((ts_ms,value))) samples FROM raw_samples WHERE metric='backend_http_5xx_total' AND ts_ms>=(({eval_ms}-0)-86400000) AND ts_ms<=({eval_ms}-0) GROUP BY labels) WHERE n>=2))) GROUP BY job) a CROSS JOIN (SELECT map() labels,sum(value) value FROM (SELECT labels, corrected*(sampled+least(start_extra,if(corrected>0,sampled*(first_value/corrected),start_extra))+end_extra)/sampled AS value FROM (SELECT labels,samples,length(samples) n,samples[1].1 first_ts,samples[n].1 last_ts,samples[1].2 first_value,samples[n].2 last_value,(last_ts-first_ts)/1000 sampled,(last_value-first_value)+arraySum(i -> if(samples[i].2<samples[i-1].2,samples[i-1].2,0.),range(2,n+1)) corrected,if((first_ts-(({eval_ms}-0)-86400000))/1000<sampled/(n-1)*1.1,(first_ts-(({eval_ms}-0)-86400000))/1000,sampled/(n-1)/2) start_extra,if((({eval_ms}-0)-last_ts)/1000<sampled/(n-1)*1.1,(({eval_ms}-0)-last_ts)/1000,sampled/(n-1)/2) end_extra FROM (SELECT labels,arraySort(x -> x.1,groupArray((ts_ms,value))) samples FROM raw_samples WHERE metric='backend_http_5xx_total' AND ts_ms>=(({eval_ms}-0)-86400000) AND ts_ms<=({eval_ms}-0) GROUP BY labels) WHERE n>=2))) b) ORDER BY value DESC,labels LIMIT 1",
-      "operators": [
-        "topk",
-        "scalar",
-        "increase",
-        "sum",
-        "division"
-      ],
-      "sql_mapping_contract": "Derived from identical raw samples by the checked Prometheus-semantics loader, never from baseline query answers.",
-      "sql_mapping_status": "oracle_valid"
-    },
-    {
-      "id": "q26",
-      "promql": "topk(1, sum by (job) (rate(backend_process_cpu_seconds_total[6h])))",
-      "metricsql": "topk(1, sum by (job) (rate(backend_process_cpu_seconds_total[6h])))",
-      "clickhouse_sql": "SELECT * FROM (SELECT map('job',job) labels,sum(value) value FROM (SELECT labels['job'] job,value FROM (SELECT labels, corrected*(sampled+least(start_extra,if(corrected>0,sampled*(first_value/corrected),start_extra))+end_extra)/sampled/(21600000/1000) AS value FROM (SELECT labels,samples,length(samples) n,samples[1].1 first_ts,samples[n].1 last_ts,samples[1].2 first_value,samples[n].2 last_value,(last_ts-first_ts)/1000 sampled,(last_value-first_value)+arraySum(i -> if(samples[i].2<samples[i-1].2,samples[i-1].2,0.),range(2,n+1)) corrected,if((first_ts-(({eval_ms}-0)-21600000))/1000<sampled/(n-1)*1.1,(first_ts-(({eval_ms}-0)-21600000))/1000,sampled/(n-1)/2) start_extra,if((({eval_ms}-0)-last_ts)/1000<sampled/(n-1)*1.1,(({eval_ms}-0)-last_ts)/1000,sampled/(n-1)/2) end_extra FROM (SELECT labels,arraySort(x -> x.1,groupArray((ts_ms,value))) samples FROM raw_samples WHERE metric='backend_process_cpu_seconds_total' AND ts_ms>=(({eval_ms}-0)-21600000) AND ts_ms<=({eval_ms}-0) GROUP BY labels) WHERE n>=2))) GROUP BY job) ORDER BY value DESC,labels LIMIT 1",
-      "operators": [
-        "topk",
-        "rate"
-      ],
-      "sql_mapping_contract": "Derived from identical raw samples by the checked Prometheus-semantics loader, never from baseline query answers.",
-      "sql_mapping_status": "oracle_valid"
-    },
-    {
-      "id": "q27",
-      "promql": "topk(3, avg_over_time((sum by (job) (backend_process_resident_memory_bytes))[6h:]))",
-      "metricsql": "topk(3, avg_over_time((sum by (job) (backend_process_resident_memory_bytes))[6h:]))",
-      "clickhouse_sql": "SELECT map('job',job) labels,avg(value) value FROM (SELECT labels['job'] job,ts_ms,sum(value) value FROM raw_samples WHERE metric='backend_process_resident_memory_bytes' AND ts_ms+4000>={eval_ms}-21600000 AND ts_ms+4000<={eval_ms} AND modulo(ts_ms+4000,60000)=0 GROUP BY job,ts_ms) GROUP BY job ORDER BY value DESC,job LIMIT 3",
-      "operators": [
-        "topk",
-        "avg_over_time",
-        "subquery"
-      ],
-      "sql_mapping_contract": "Derived from identical raw samples by the checked Prometheus-semantics loader, never from baseline query answers.",
-      "sql_mapping_status": "oracle_valid"
-    }
-  ],
-  "source_sha256": "72c334fab18674746a2cef7c926e81d06a13dc9f11858d080460a99aa5b31ecf"
-}
diff --git a/tools/o11y-sql-main-eval/evaluation_query_datasets.snapshot.yaml b/tools/o11y-sql-main-eval/evaluation_query_datasets.snapshot.yaml
deleted file mode 100644
index 95bb913bb..000000000
--- a/tools/o11y-sql-main-eval/evaluation_query_datasets.snapshot.yaml
+++ /dev/null
@@ -1,27 +0,0 @@
-sort_desc(sum by (job) (increase(backend_http_5xx_total[6h])) / sum by (job) (increase(backend_http_requests_total[6h])))
-topk(1, sum by (job) (increase(backend_http_5xx_total[6h])) / sum by (job) (increase(backend_http_requests_total[6h])))
-sum(increase(payment_service_http_5xx_total[1h])) / sum(increase(payment_service_http_requests_total[1h]))
-sum(increase(payment_service_http_5xx_total[1h] offset 6h)) / sum(increase(payment_service_http_requests_total[1h] offset 6h))
-max_over_time(cache_refresh_lag_seconds[12h])
-max_over_time(user_service_cache_refresh_lag_seconds[12h])
-user_service_cache_refresh_lag_seconds
-sum(rate(backend_process_cpu_seconds_total[1h]))
-sum(backend_process_resident_memory_bytes)
-max_over_time((sum(backend_process_resident_memory_bytes))[6h:])
-topk(2, sum by (job) (rate(backend_process_cpu_seconds_total[1h])))
-topk(2, sum by (job) (backend_process_resident_memory_bytes))
-max_over_time((sum(rate(backend_process_cpu_seconds_total[5m])))[6h:])
-sum(rate(backend_http_requests_total[5m]))
-sum by (job) (rate(backend_http_requests_total[5m]))
-sum(increase(backend_http_5xx_total[60m])) / sum(increase(backend_http_requests_total[60m]))
-topk(1, sum by (job) (increase(backend_http_5xx_total[6h])) / sum by (job) (increase(backend_http_requests_total[6h])))
-sum by (job) (increase(backend_http_5xx_total[24h])) > 0
-sum(rate(order_service_http_requests_total[5m]))
-sum(rate(order_service_http_requests_total[5m] offset 1h))
-histogram_quantile(0.95, sum by (le) (rate(order_service_http_request_duration_seconds_bucket[5m])))
-sum(rate(order_service_http_requests_total[5m]))
-topk(2, max_over_time(backend_retry_backlog_depth[6h]))
-max_over_time((sum(rate(order_service_http_5xx_total[5m])) / sum(rate(order_service_http_requests_total[5m])))[6h:])
-topk(1, sum by (job) (increase(backend_http_5xx_total[24h])) / scalar(sum(increase(backend_http_5xx_total[24h]))))
-topk(1, sum by (job) (rate(backend_process_cpu_seconds_total[6h])))
-topk(3, avg_over_time((sum by (job) (backend_process_resident_memory_bytes))[6h:]))
\ No newline at end of file
diff --git a/tools/o11y-sql-main-eval/import_openmetrics.py b/tools/o11y-sql-main-eval/import_openmetrics.py
deleted file mode 100644
index bb6165bf8..000000000
--- a/tools/o11y-sql-main-eval/import_openmetrics.py
+++ /dev/null
@@ -1,107 +0,0 @@
-#!/usr/bin/env python3
-"""Import unchanged OpenMetrics samples into an isolated ClickHouse table."""
-import argparse
-import base64
-import collections
-from decimal import Decimal
-import gzip
-import hashlib
-import json
-import math
-import os
-from pathlib import Path
-import re
-import urllib.parse
-import urllib.request
-
-LABEL = re.compile(r'([a-zA-Z_][a-zA-Z0-9_]*)=("(?:\\.|[^"\\])*")(?:,|$)')
-
-
-def parse_series(token):
-    if '{' not in token:
-        return token, {}
-    metric, tail = token.split('{', 1)
-    if not tail.endswith('}'):
-        raise ValueError('unterminated series labels')
-    labels, offset = {}, 0
-    for match in LABEL.finditer(tail[:-1]):
-        if match.start() != offset or match[1] in labels:
-            raise ValueError('invalid or duplicate series label')
-        labels[match[1]] = json.loads(match[2])
-        offset = match.end()
-    if offset != len(tail) - 1:
-        raise ValueError('unparsed series labels')
-    return metric, labels
-
-
-def main():
-    ap = argparse.ArgumentParser(description=__doc__)
-    ap.add_argument('source', type=Path)
-    ap.add_argument('output', type=Path, help='lossless JSONEachRow gzip artifact')
-    ap.add_argument('--url', default='http://127.0.0.1:28123')
-    ap.add_argument('--database', default='asap_o11y27_eval')
-    args = ap.parse_args()
-    if not re.fullmatch(r'[A-Za-z_][A-Za-z0-9_]*', args.database):
-        ap.error('database must be a simple identifier')
-    credentials = f"{os.environ['CLICKHOUSE_USER']}:{os.environ['CLICKHOUSE_PASSWORD']}"
-    auth = 'Basic ' + base64.b64encode(credentials.encode()).decode()
-
-    def request(body, database=None, compressed=False):
-        url = args.url + '/?' + urllib.parse.urlencode({'database': database or 'default'})
-        headers = {'Authorization': auth}
-        if compressed:
-            headers['Content-Encoding'] = 'gzip'
-        req = urllib.request.Request(url, data=body, headers=headers)
-        with urllib.request.urlopen(req, timeout=120) as response:
-            return response.read()
-
-    request(f'CREATE DATABASE IF NOT EXISTS `{args.database}`'.encode())
-    request(b'CREATE TABLE IF NOT EXISTS raw_samples (metric String, labels Map(String,String), ts_ms Int64, value Float64) ENGINE=MergeTree ORDER BY (metric,ts_ms)', args.database)
-    if int(request(b'SELECT count() FROM raw_samples', args.database)):
-        raise RuntimeError('destination contains samples; use a fresh database')
-    if args.output.exists():
-        raise RuntimeError('output artifact already exists; choose a new path')
-    source_sha = hashlib.sha256()
-    counts, series, pending = collections.Counter(), {}, []
-    lower = upper = None
-    args.output.parent.mkdir(parents=True, exist_ok=True)
-
-    def flush():
-        if pending:
-            request(gzip.compress(b'INSERT INTO raw_samples FORMAT JSONEachRow\n' + b''.join(pending), compresslevel=1), args.database, True)
-            pending.clear()
-
-    with args.source.open('rb') as source, gzip.open(args.output, 'wb', compresslevel=1) as output:
-        for raw in source:
-            source_sha.update(raw)
-            if not raw.strip() or raw.startswith(b'#'):
-                continue
-            token, value, timestamp = raw.decode().strip().rsplit(None, 2)
-            if token not in series:
-                series[token] = parse_series(token)
-            metric, labels = series[token]
-            milliseconds = Decimal(timestamp) * 1000
-            if milliseconds != milliseconds.to_integral_value():
-                raise ValueError('sub-millisecond timestamp cannot enter the Int64 millisecond schema')
-            ts = int(milliseconds)
-            number = float(value)
-            if not math.isfinite(number):
-                raise ValueError('nonfinite sample requires an explicit ClickHouse transport contract')
-            record = (json.dumps({'metric': metric, 'labels': labels, 'ts_ms': ts, 'value': number}, separators=(',', ':'), allow_nan=False) + '\n').encode()
-            output.write(record)
-            pending.append(record)
-            counts[metric] += 1
-            lower = ts if lower is None else min(lower, ts)
-            upper = ts if upper is None else max(upper, ts)
-            if len(pending) >= 50_000:
-                flush()
-        flush()
-    actual = int(request(b'SELECT count() FROM raw_samples', args.database))
-    if actual != sum(counts.values()):
-        raise RuntimeError(f'row count differs: source {sum(counts.values())}, ClickHouse {actual}')
-    manifest = {'source': str(args.source.resolve()), 'source_sha256': source_sha.hexdigest(), 'output': str(args.output.resolve()), 'output_bytes': args.output.stat().st_size, 'database': args.database, 'table': 'raw_samples', 'samples': actual, 'series': len(series), 'start_ms': lower, 'end_ms': upper, 'metric_samples': counts, 'transformation': 'unchanged metric names, labels, Float64 samples, and integral-millisecond timestamps; no query-answer ingestion'}
-    args.output.with_suffix('.manifest.json').write_text(json.dumps(manifest, indent=2) + '\n')
-    print(json.dumps(manifest))
-
-if __name__ == '__main__':
-    main()
diff --git a/tools/o11y-sql-main-eval/measure_native.py b/tools/o11y-sql-main-eval/measure_native.py
deleted file mode 100644
index 4ff5e05e8..000000000
--- a/tools/o11y-sql-main-eval/measure_native.py
+++ /dev/null
@@ -1,47 +0,0 @@
-#!/usr/bin/env python3
-"""Fresh native-only replay for deployment CPU/RSS comparison."""
-import argparse
-import base64
-import json
-import os
-from pathlib import Path
-import time
-import urllib.parse
-import urllib.request
-from run_automatic import process_metrics
-
-
-def main():
-    ap = argparse.ArgumentParser(description=__doc__)
-    ap.add_argument('matrix', type=Path)
-    ap.add_argument('output', type=Path)
-    ap.add_argument('--query', default='q05')
-    ap.add_argument('--pid', type=int, required=True)
-    ap.add_argument('--expected', type=Path, required=True)
-    args = ap.parse_args()
-    query = next(q for q in json.loads(args.matrix.read_text())['queries'] if q['id'] == args.query)
-    reference = json.loads(args.expected.read_text())
-    if reference['id'] != args.query:
-        raise ValueError('reference identity mismatch')
-    expected = json.loads(reference['exact']['body'])
-    args.output.mkdir(parents=True, exist_ok=False)
-    auth = 'Basic ' + base64.b64encode(f"{os.environ['CLICKHOUSE_USER']}:{os.environ['CLICKHOUSE_PASSWORD']}".encode()).decode()
-    url = 'http://127.0.0.1:28123/?' + urllib.parse.urlencode({'database': 'asap_o11y27_eval', 'default_format': 'JSON', 'max_threads': 2, 'use_query_cache': 0})
-    before = process_metrics(args.pid)
-    with (args.output / 'requests.jsonl').open('w') as trace:
-        for repeat in range(1000):
-            start = time.perf_counter_ns()
-            with urllib.request.urlopen(urllib.request.Request(url, data=query['sql'].encode(), headers={'Authorization': auth}), timeout=180) as response:
-                body = response.read().decode()
-                status = response.status
-            elapsed = time.perf_counter_ns() - start
-            actual = json.loads(body)
-            if status != 200 or actual['meta'] != expected['meta'] or actual['data'] != expected['data']:
-                raise ValueError('native result mismatch')
-            trace.write(json.dumps({'repeat': repeat, 'status': status, 'elapsed_ns': elapsed, 'body': body, 'process': process_metrics(args.pid)}) + '\n')
-    result = {'query': args.query, 'requests_equal': 1000, 'process_before': before, 'process_after': process_metrics(args.pid), 'scope': 'fresh native process, persisted source data; common initial ingestion excluded'}
-    (args.output / 'result.json').write_text(json.dumps(result, indent=2) + '\n')
-    print(args.query, 'native-only', 1000, flush=True)
-
-if __name__ == '__main__':
-    main()
diff --git a/tools/o11y-sql-main-eval/reproduce.sh b/tools/o11y-sql-main-eval/reproduce.sh
deleted file mode 100755
index 9aa34d042..000000000
--- a/tools/o11y-sql-main-eval/reproduce.sh
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/usr/bin/env bash
-set -euo pipefail
-
-repo_root=$(git rev-parse --show-toplevel)
-artifact_dir="$repo_root/tools/o11y-sql-main-eval/artifacts"
-corpus="$repo_root/tools/o11y-sql-main-eval/corpus.json"
-baseline=791f7d7b0feab3827e7e6f5100e65ef29aec68de
-
-export CLICKHOUSE_URL=${CLICKHOUSE_URL:-http://127.0.0.1:18123}
-: "${CLICKHOUSE_USER:?set CLICKHOUSE_USER for the exact ClickHouse backend}"
-: "${CLICKHOUSE_PASSWORD:?set CLICKHOUSE_PASSWORD for the exact ClickHouse backend}"
-
-if [[ $(git merge-base "$baseline" HEAD) != "$baseline" ]]; then
-  echo "HEAD does not descend from recorded main baseline $baseline" >&2
-  exit 1
-fi
-
-mkdir -p "$artifact_dir"
-cargo run -q -p control_plane --example audit_clickhouse_corpus -- "$corpus" \
-  > "$artifact_dir/frontend-planner-publication.json"
-cargo run -q -p data_plane --example audit_clickhouse_fallback -- "$corpus" \
-  > "$artifact_dir/data-plane-routing.json"
-python3 "$repo_root/tools/o11y-sql-main-eval/summarize.py" \
-  --planner "$artifact_dir/frontend-planner-publication.json" \
-  --runtime "$artifact_dir/data-plane-routing.json" \
-  --output "$artifact_dir/matrix.json"
-sha256sum "$corpus" > "$artifact_dir/corpus.sha256"
-git -C "$repo_root" show -s --format='%H %s' "$baseline" > "$artifact_dir/baseline.txt"
diff --git a/tools/o11y-sql-main-eval/run_automatic.py b/tools/o11y-sql-main-eval/run_automatic.py
deleted file mode 100644
index 1d602718a..000000000
--- a/tools/o11y-sql-main-eval/run_automatic.py
+++ /dev/null
@@ -1,199 +0,0 @@
-#!/usr/bin/env python3
-"""Execute the original SQL corpus against automatic publications and native CH."""
-import argparse
-import base64
-import json
-import os
-from pathlib import Path
-import socket
-import subprocess
-import time
-import urllib.error
-import urllib.parse
-import urllib.request
-
-
-def port():
-    with socket.socket() as sock:
-        sock.bind(('127.0.0.1', 0))
-        return sock.getsockname()[1]
-
-
-def process_metrics(pid):
-    if not pid:
-        return None
-    stat = Path(f'/proc/{pid}/stat').read_text().rsplit(')', 1)[1].split()
-    status = {}
-    for line in Path(f'/proc/{pid}/status').read_text().splitlines():
-        if line.startswith(('VmRSS:', 'VmHWM:')):
-            name, value, _ = line.split()
-            status[name[:-1]] = int(value) * 1024
-    return {'cpu_ticks': int(stat[11]) + int(stat[12]), 'clock_ticks_per_second': os.sysconf('SC_CLK_TCK'), **status}
-
-
-def cpu_delta(before, after):
-    return None if before is None or after is None else after['cpu_ticks'] - before['cpu_ticks']
-
-
-def main():
-    ap = argparse.ArgumentParser(description=__doc__)
-    ap.add_argument('matrix', type=Path)
-    ap.add_argument('backend', type=Path)
-    ap.add_argument('output', type=Path)
-    ap.add_argument('--clickhouse', default='http://127.0.0.1:28123')
-    ap.add_argument('--database', default='asap_o11y27_eval')
-    ap.add_argument('--ids', help='comma-separated subset; the installed Planner choice is unchanged')
-    ap.add_argument('--repetitions', type=int, default=0)
-    ap.add_argument('--container-image', help='pin an image digest to enforce matched2CPU/4GiB budgets')
-    ap.add_argument('--clickhouse-pid', type=int)
-    ap.add_argument('--only-backend', action='store_true')
-    ap.add_argument('--expected-result', type=Path)
-    args = ap.parse_args()
-    if args.only_backend and (not args.expected_result or not args.ids or ',' in args.ids):
-        ap.error('--only-backend requires one --ids value and --expected-result')
-    args.output.mkdir(parents=True, exist_ok=False)
-    user, password = os.environ['CLICKHOUSE_USER'], os.environ['CLICKHOUSE_PASSWORD']
-    auth = 'Basic ' + base64.b64encode(f'{user}:{password}'.encode()).decode()
-
-    def request(url, body=None, data=None):
-        headers = {'Authorization': auth}
-        if data is not None:
-            body = json.dumps(data).encode()
-            headers['Content-Type'] = 'application/json'
-        if isinstance(body, str):
-            body = body.encode()
-        start = time.perf_counter_ns()
-        try:
-            response = urllib.request.urlopen(urllib.request.Request(url, data=body, headers=headers), timeout=180)
-        except urllib.error.HTTPError as error:
-            response = error
-        with response:
-            result = {'status': response.status, 'headers': {key.lower(): value for key, value in response.headers.items()}, 'body': response.read().decode()}
-        result['elapsed_ns'] = time.perf_counter_ns() - start
-        return result
-
-    def require(result):
-        if not 200 <= result['status'] < 300:
-            raise RuntimeError(str(result))
-        return json.loads(result['body']) if result['body'] else None
-
-    results = []
-    for query in json.loads(args.matrix.read_text())['queries']:
-        if args.ids and query['id'] not in args.ids.split(','):
-            continue
-        directory = args.output / query['id']
-        directory.mkdir()
-        bootstrap = directory / 'bootstrap.yaml'
-        bootstrap.write_text('aggregations: []\n')
-        api, sql = port(), port()
-        command = [str(args.backend.resolve()), '--streaming-config', str(bootstrap), '--http-port', str(api), '--clickhouse-http-port', str(sql), '--clickhouse-url', args.clickhouse, '--clickhouse-database', args.database, '--clickhouse-backfill-table', 'raw_samples', '--clickhouse-backfill-database', args.database, '--clickhouse-user', user, '--clickhouse-password', password, '--enable-backfill-worker', '--precompute-allowed-lateness-ms', '0', '--precompute-flush-interval-ms', '50', '--persistence-delete-older-than-secs', '0', '--output-dir', str(directory / 'state')]
-        container = None
-        if args.container_image:
-            container = f'asap-o11y27-{args.output.name}-{query["id"]}'
-            runtime = args.backend.resolve().parent.parent
-            command = ['docker', 'run', '--name', container, '--user', f'{os.getuid()}:{os.getgid()}', '--network', 'host', '--pid', 'host', '--cpuset-cpus', '60,61', '--cpus', '2', '--memory', '4g', '-v', f'{runtime}:{runtime}:ro', '-v', f'{args.output.resolve()}:{args.output.resolve()}', '--entrypoint', command[0], args.container_image, *command[1:]]
-        with (directory / 'backend.log').open('w') as log:
-            process = subprocess.Popen(command, stdout=log, stderr=log, env=dict(os.environ, RUST_LOG='data_plane=info'))
-            try:
-                base = f'http://127.0.0.1:{api}'
-                for _ in range(200):
-                    if process.poll() is not None:
-                        raise RuntimeError('backend exited: inspect backend.log')
-                    try:
-                        if request(base + '/api/v1/health')['status'] == 200:
-                            break
-                    except OSError:
-                        pass
-                    time.sleep(.05)
-                else:
-                    raise RuntimeError('backend did not start')
-                backend_pid = int(subprocess.check_output(['docker', 'inspect', container, '--format', '{{.State.Pid}}'])) if container else process.pid
-                build_before = {'backend': process_metrics(backend_pid), 'clickhouse': process_metrics(args.clickhouse_pid)}
-                build_started = time.perf_counter_ns()
-                jobs = None
-                if query['publication'] == 'pass':
-                    install = query['install']
-                    require(request(base + '/api/v1/physical-plan', data=install))
-                    envelope = install['precompute_plan']['envelope']
-                    require(request(base + '/api/v1/physical-plan/activate', data={'plan_id': envelope['plan_id'], 'plan_version': envelope['plan_version']}))
-                    for identity in install['summary_catalog']['materializations']:
-                        require(request(base + '/api/v1/db/backfill', data={'agg_id': int(identity), 'start_ms': query['window_start_ms'], 'end_ms': query['window_end_ms'], 'source': {'ClickHouse': {'database': args.database, 'table': 'raw_samples'}}, 'windows_total': 1}))
-                    for _ in range(2400):
-                        jobs = require(request(base + '/api/v1/db/backfill/jobs'))
-                        statuses = [job['status'] for job in jobs['jobs']]
-                        if not install['summary_catalog']['materializations'] or (statuses and all(status == 'complete' for status in statuses)):
-                            break
-                        if 'failed' in statuses:
-                            raise RuntimeError(str(jobs))
-                        time.sleep(.25)
-                    else:
-                        raise RuntimeError('backfill timed out')
-                build_ns = time.perf_counter_ns() - build_started
-                build_after = {'backend': process_metrics(backend_pid), 'clickhouse': process_metrics(args.clickhouse_pid)}
-                params = urllib.parse.urlencode({'database': args.database, 'default_format': 'JSON', 'max_threads': 2, 'use_query_cache': 0})
-                if args.only_backend:
-                    reference = json.loads(args.expected_result.read_text())
-                    if reference['id'] != query['id']:
-                        raise ValueError('reference query identity mismatch')
-                    exact = dict(reference['exact'], elapsed_ns=None)
-                else:
-                    exact = request(args.clickhouse + '/?' + params, query['sql'])
-                actual = request(f'http://127.0.0.1:{sql}/?' + params, query['sql'])
-                equal = False
-                if actual['status'] == exact['status'] == 200:
-                    left, right = json.loads(actual['body']), json.loads(exact['body'])
-                    equal = left['meta'] == right['meta'] and left['data'] == right['data']
-                result = {'id': query['id'], 'publication': query['publication'], 'route': actual['headers'].get('x-asap-execution', 'unmarked'), 'execution': actual['headers'].get('x-asap-execution', 'unmarked') if actual['status'] == 200 else 'failed', 'equal': equal, 'install_and_backfill_ns': build_ns, 'backfill_jobs': jobs, 'backend': actual, 'exact': exact, 'timing_scope': 'debug correctness run, not performance evidence'}
-                result['build_resources'] = {'before': build_before, 'after': build_after}
-                result['state_directory_bytes'] = sum(path.stat().st_size for path in (directory / 'state').rglob('*') if path.is_file())
-                if args.repetitions:
-                    result['timing_scope'] = ('ASAP-only deployment replay against a prior validated reference; ' if args.only_backend else 'alternating backend/native replay; ') + 'source-data ingestion and offline planning costs are not measured here'
-                    if args.only_backend:
-                        result['exact_reference_path'] = str(args.expected_result.resolve())
-                    counts = {'warm': 0, 'equal': 0, 'failed': 0}
-                    with (directory / 'requests.jsonl').open('w') as trace:
-                        for repeat in range(args.repetitions):
-                            pair = {}
-                            for route in (['backend'] if args.only_backend else (['backend', 'exact'] if repeat % 2 == 0 else ['exact', 'backend'])):
-                                before_backend, before_ch = process_metrics(backend_pid), process_metrics(args.clickhouse_pid)
-                                endpoint = f'http://127.0.0.1:{sql}/' if route == 'backend' else args.clickhouse + '/'
-                                measured = request(endpoint + '?' + params, query['sql'])
-                                after_backend, after_ch = process_metrics(backend_pid), process_metrics(args.clickhouse_pid)
-                                trace.write(json.dumps({'repeat': repeat, 'route': route, 'response': measured, 'backend_cpu_ticks': cpu_delta(before_backend, after_backend), 'clickhouse_cpu_ticks': cpu_delta(before_ch, after_ch), 'backend_process': after_backend, 'clickhouse_process': after_ch}) + '\n')
-                                pair[route] = measured
-                            if args.only_backend:
-                                pair['exact'] = exact
-                            counts['warm'] += pair['backend']['headers'].get('x-asap-execution') == 'warm'
-                            if pair['backend']['status'] == pair['exact']['status'] == 200:
-                                left, right = json.loads(pair['backend']['body']), json.loads(pair['exact']['body'])
-                                counts['equal'] += left['meta'] == right['meta'] and left['data'] == right['data']
-                            else:
-                                counts['failed'] += 1
-                    result['repeated'] = counts
-                    result['query_resources_after'] = {'backend': process_metrics(backend_pid), 'clickhouse': process_metrics(args.clickhouse_pid)}
-                if container:
-                    inspection = json.loads(subprocess.check_output(['docker', 'inspect', container]))[0]
-                    result['container'] = {'image': inspection['Image'], 'cpu_affinity': inspection['HostConfig']['CpusetCpus'], 'nano_cpus': inspection['HostConfig']['NanoCpus'], 'memory_limit_bytes': inspection['HostConfig']['Memory']}
-                (directory / 'result.json').write_text(json.dumps(result, indent=2) + '\n')
-                results.append(result)
-                print(query['id'], result['execution'], equal, flush=True)
-            except Exception as error:
-                result = {'id': query['id'], 'publication': query['publication'], 'execution': 'failed', 'error': str(error)}
-                results.append(result)
-                (directory / 'result.json').write_text(json.dumps(result, indent=2) + '\n')
-                print(query['id'], 'failed', str(error)[:200], flush=True)
-            finally:
-                if container:
-                    subprocess.run(['docker', 'stop', '-t', '10', container], stdout=subprocess.DEVNULL, check=False)
-                process.terminate()
-                try:
-                    process.wait(timeout=10)
-                except subprocess.TimeoutExpired:
-                    process.kill()
-                    process.wait()
-        (args.output / 'results.json').write_text(json.dumps(results, indent=2) + '\n')
-    if args.repetitions and (not results or any(result.get('repeated') != {'warm': args.repetitions, 'equal': args.repetitions, 'failed': 0} for result in results)):
-        raise SystemExit('Formal replay failed: every requested repetition must be warm and equal')
-
-if __name__ == '__main__':
-    main()
diff --git a/tools/o11y-sql-main-eval/run_deployment_pair.sh b/tools/o11y-sql-main-eval/run_deployment_pair.sh
deleted file mode 100644
index 4e9d38938..000000000
--- a/tools/o11y-sql-main-eval/run_deployment_pair.sh
+++ /dev/null
@@ -1,32 +0,0 @@
-#!/usr/bin/env bash
-set -euo pipefail
-: "${CLICKHOUSE_USER:?set the evaluation account}"
-: "${CLICKHOUSE_PASSWORD:?set the evaluation password}"
-: "${MATRIX:?set the automatic publication matrix}"
-: "${BACKEND_BIN:?set the frozen release executable}"
-: "${RESULT_ROOT:?set a new result root}"
-: "${EXACT_REFERENCE:?set a previously validated q05 paired result}"
-image=clickhouse/clickhouse-server@sha256:fa394da808cc53f76d0344429421d6c422a6ee85fe7450135c0e3cff4df9bcbb
-server=asap-clickhouse-current-eval
-repo_root=$(git rev-parse --show-toplevel)
-mkdir "$RESULT_ROOT"
-sha256sum "$BACKEND_BIN" "$MATRIX" "$EXACT_REFERENCE" > "$RESULT_ROOT/inputs.sha256"
-for trial in 1 2 3; do
-    for route in asap native; do
-        [[ $(docker inspect "$server" --format '{{.HostConfig.CpusetCpus}}/{{.HostConfig.NanoCpus}}/{{.HostConfig.Memory}}') == '60,61/2000000000/4294967296' ]]
-        [[ $(docker inspect "$server" --format '{{.Image}}') == $(docker image inspect "$image" --format '{{.Id}}') ]]
-        docker restart "$server" >/dev/null
-        for _ in $(seq 1 100); do
-            if curl --silent --fail http://127.0.0.1:28123/ping >/dev/null; then break; fi
-            sleep 0.1
-        done
-        curl --silent --fail http://127.0.0.1:28123/ping >/dev/null
-        server_pid=$(docker inspect "$server" --format '{{.State.Pid}}')
-        if [[ "$route" == asap ]]; then
-            python3 -B "$repo_root/tools/o11y-sql-main-eval/run_automatic.py" "$MATRIX" "$BACKEND_BIN" "$RESULT_ROOT/trial-$trial-asap" --ids q05 --repetitions 1000 --container-image "$image" --clickhouse-pid "$server_pid" --only-backend --expected-result "$EXACT_REFERENCE"
-        else
-            python3 -B "$repo_root/tools/o11y-sql-main-eval/measure_native.py" "$MATRIX" "$RESULT_ROOT/trial-$trial-native" --pid "$server_pid" --expected "$EXACT_REFERENCE"
-        fi
-        docker inspect "$server" --format '{"image":"{{.Image}}","cpu_affinity":"{{.HostConfig.CpusetCpus}}","nano_cpus":{{.HostConfig.NanoCpus}},"memory_limit_bytes":{{.HostConfig.Memory}}}' > "$RESULT_ROOT/trial-$trial-$route/clickhouse-runtime.json"
-    done
-done
diff --git a/tools/o11y-sql-main-eval/run_matched.sh b/tools/o11y-sql-main-eval/run_matched.sh
deleted file mode 100644
index 322b61020..000000000
--- a/tools/o11y-sql-main-eval/run_matched.sh
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/usr/bin/env bash
-set -euo pipefail
-: "${CLICKHOUSE_USER:?set the evaluation account}"
-: "${CLICKHOUSE_PASSWORD:?set the evaluation password}"
-: "${MATRIX:?set the automatic publication matrix}"
-: "${BACKEND_BIN:?set the frozen release backend executable}"
-: "${RESULT_ROOT:?set a new result root}"
-: "${RUNTIME_SOURCE_COMMIT:?set the commit used to build BACKEND_BIN}"
-image=clickhouse/clickhouse-server@sha256:fa394da808cc53f76d0344429421d6c422a6ee85fe7450135c0e3cff4df9bcbb
-server=asap-clickhouse-current-eval
-repo_root=$(git rev-parse --show-toplevel)
-mkdir "$RESULT_ROOT"
-sha256sum "$BACKEND_BIN" "$MATRIX" > "$RESULT_ROOT/inputs.sha256"
-git rev-parse HEAD > "$RESULT_ROOT/driver-checkout.txt"
-printf '%s\n' "$RUNTIME_SOURCE_COMMIT" > "$RESULT_ROOT/runtime-source-commit.txt"
-for trial in 1 2 3; do
-    for query in q05 q06 q23; do
-        [[ $(docker inspect "$server" --format '{{.Image}}') == $(docker image inspect "$image" --format '{{.Id}}') ]]
-        [[ $(docker inspect "$server" --format '{{.HostConfig.CpusetCpus}}/{{.HostConfig.NanoCpus}}/{{.HostConfig.Memory}}') == '60,61/2000000000/4294967296' ]]
-        docker restart "$server" >/dev/null
-        for _ in $(seq 1 100); do
-            if curl --silent --fail http://127.0.0.1:28123/ping >/dev/null; then break; fi
-            sleep 0.1
-        done
-        curl --silent --fail http://127.0.0.1:28123/ping >/dev/null
-        server_pid=$(docker inspect "$server" --format '{{.State.Pid}}')
-        python3 -B "$repo_root/tools/o11y-sql-main-eval/run_automatic.py" "$MATRIX" "$BACKEND_BIN" "$RESULT_ROOT/trial-$trial-$query" --ids "$query" --repetitions 1000 --container-image "$image" --clickhouse-pid "$server_pid"
-        docker inspect "$server" --format '{"image":"{{.Image}}","cpu_affinity":"{{.HostConfig.CpusetCpus}}","nano_cpus":{{.HostConfig.NanoCpus}},"memory_limit_bytes":{{.HostConfig.Memory}}}' > "$RESULT_ROOT/trial-$trial-$query/clickhouse-runtime.json"
-    done
-done
diff --git a/tools/o11y-sql-main-eval/summarize.py b/tools/o11y-sql-main-eval/summarize.py
deleted file mode 100755
index 0cbd581f7..000000000
--- a/tools/o11y-sql-main-eval/summarize.py
+++ /dev/null
@@ -1,57 +0,0 @@
-#!/usr/bin/env python3
-"""Join current-main stage and runtime evidence into the acceptance matrix."""
-import argparse
-import json
-from pathlib import Path
-
-
-def short_reason(reason: str) -> str:
-    reason = reason.replace("SQL lowering failed: DataFusion error: ", "")
-    reason = reason.replace("SQL lowering failed: invalid QueryPlan: ", "")
-    return reason.split("\n", 1)[0]
-
-
-def main() -> None:
-    parser = argparse.ArgumentParser()
-    parser.add_argument("--planner", type=Path, required=True)
-    parser.add_argument("--runtime", type=Path, required=True)
-    parser.add_argument("--output", type=Path, required=True)
-    args = parser.parse_args()
-    planner = json.loads(args.planner.read_text())
-    runtime = {row["id"]: row for row in json.loads(args.runtime.read_text())["queries"]}
-    rows = []
-    for stage in planner["queries"]:
-        route = runtime[stage["id"]]
-        if route["fallback_requested"] and route["exact_success"]:
-            classification = "exact_fallback"
-        elif not route["fallback_requested"]:
-            classification = "warm"
-        else:
-            classification = "failure"
-        rows.append({
-            "id": stage["id"],
-            "operators": stage["operators"],
-            "parser_planner": stage["parser_planner"],
-            "publication": stage.get("publication", "not_reached"),
-            "fallback_requested": route["fallback_requested"],
-            "exact_executed": route["exact_executed"],
-            "exact_success": route["exact_success"],
-            "exact_status": route["exact_status"],
-            "direct_exact_status": route["direct_exact_status"],
-            "matches_direct_exact": route["matches_direct_exact"],
-            "classification": classification,
-            "reason": short_reason(stage.get("reason", route.get("reason", ""))),
-        })
-    counts = {name: sum(row["classification"] == name for row in rows)
-              for name in ("warm", "partial_hybrid", "exact_fallback", "failure")}
-    args.output.write_text(json.dumps({
-        "schema_version": 1,
-        "baseline_commit": "791f7d7b0feab3827e7e6f5100e65ef29aec68de",
-        "corpus_count": len(rows),
-        "counts": counts,
-        "queries": rows,
-    }, indent=2) + "\n")
-
-
-if __name__ == "__main__":
-    main()
diff --git a/tools/o11y-sql-main-eval/summarize_automatic.py b/tools/o11y-sql-main-eval/summarize_automatic.py
deleted file mode 100644
index a3cc5f1aa..000000000
--- a/tools/o11y-sql-main-eval/summarize_automatic.py
+++ /dev/null
@@ -1,79 +0,0 @@
-#!/usr/bin/env python3
-"""Validate paired raw requests and summarize fixed-window release trials."""
-import argparse
-import hashlib
-import json
-from pathlib import Path
-import statistics
-
-
-def main():
-    ap = argparse.ArgumentParser(description=__doc__)
-    ap.add_argument('root', type=Path)
-    ap.add_argument('output', type=Path)
-    args = ap.parse_args()
-    summaries = []
-    for trace in sorted(args.root.glob('trial-*/q*/requests.jsonl')):
-        result = json.loads(trace.with_name('result.json').read_text())
-        rows = [json.loads(line) for line in trace.read_text().splitlines()]
-        pairs = {}
-        for row in rows:
-            pair = pairs.setdefault(row['repeat'], {})
-            if row['route'] in pair:
-                raise ValueError('duplicate route/repetition')
-            pair[row['route']] = row
-        for pair in pairs.values():
-            if set(pair) != {'backend', 'exact'}:
-                raise ValueError('incomplete pair')
-            left, right = pair['backend']['response'], pair['exact']['response']
-            if left['status'] != 200 or right['status'] != 200:
-                raise ValueError('unsuccessful response')
-            if left['headers'].get('x-asap-execution') != 'warm':
-                raise ValueError('backend did not execute warm')
-            left, right = json.loads(left['body']), json.loads(right['body'])
-            if left['meta'] != right['meta'] or left['data'] != right['data']:
-                raise ValueError('decoded result mismatch')
-        if len(pairs) != 1000 or set(pairs) != set(range(1000)):
-            raise ValueError('expected1000 complete repetitions')
-        routes = {}
-        for route in ['backend', 'exact']:
-            selected = [row for row in rows if row['route'] == route]
-            latency = [row['response']['elapsed_ns'] / 1e6 for row in selected]
-            hz = selected[0]['backend_process']['clock_ticks_per_second']
-            routes[route] = {
-                'requests': len(selected), 'median_ms': statistics.median(latency),
-                'p95_ms': sorted(latency)[949],
-                'request_time_rate_per_second': len(selected) / (sum(latency) / 1000),
-                'backend_cpu_s_during_requests': sum(row['backend_cpu_ticks'] for row in selected) / hz,
-                'clickhouse_cpu_s_during_requests': sum(row['clickhouse_cpu_ticks'] for row in selected) / hz,
-                'max_observed_backend_rss_bytes': max(row['backend_process']['VmRSS'] for row in selected),
-                'max_observed_clickhouse_rss_bytes': max(row['clickhouse_process']['VmRSS'] for row in selected),
-            }
-        before, after = result['build_resources']['before'], result['build_resources']['after']
-        build_cpu = {name: (after[name]['cpu_ticks'] - before[name]['cpu_ticks']) / after[name]['clock_ticks_per_second'] for name in before}
-        summary = {'query': result['id'], 'trial': trace.parent.parent.name,
-                   'numeric_pairs_equal': len(pairs), 'warm_requests': len(pairs),
-                   'latency_speedup': routes['exact']['median_ms'] / routes['backend']['median_ms'],
-                   'routes': routes, 'install_and_backfill_s': result['install_and_backfill_ns'] / 1e9,
-                   'build_cpu_s': build_cpu, 'process_after_build': after,
-                   'process_after_queries': result['query_resources_after'],
-                   'state_directory_bytes_at_build': result['state_directory_bytes'],
-                   'state_directory_bytes_after_stop': sum(path.stat().st_size for path in trace.parent.joinpath('state').rglob('*') if path.is_file()),
-                   'first_post_build_request_ms': {name: result[name]['elapsed_ns'] / 1e6 for name in ['backend', 'exact']},
-                   'backend_budget': result['container'],
-                   'clickhouse_budget': json.loads(trace.parent.parent.joinpath('clickhouse-runtime.json').read_text()),
-                   'raw_trace': str(trace.resolve()), 'raw_sha256': hashlib.sha256(trace.read_bytes()).hexdigest()}
-        for name in ['backend_budget', 'clickhouse_budget']:
-            budget = summary[name]
-            if (budget['cpu_affinity'], budget['nano_cpus'], budget['memory_limit_bytes']) != ('60,61',2000000000,4294967296):
-                raise ValueError('resource budget mismatch')
-        summaries.append(summary)
-    if len(summaries) != 9:
-        raise ValueError('expected9 completed trials')
-    args.output.write_text(json.dumps({'scope': 'fixed-window repeated queries; excludes common source ingestion and offline planning cost', 'trials': summaries}, indent=2) + '\n')
-    for q in ['q05','q06','q23']:
-        group = [s for s in summaries if s['query'] == q]
-        print(q, 'backend_ms', [round(s['routes']['backend']['median_ms'],3) for s in group], 'exact_ms', [round(s['routes']['exact']['median_ms'],3) for s in group], 'speedup', [round(s['latency_speedup'],2) for s in group])
-
-if __name__ == '__main__':
-    main()
diff --git a/tools/o11y-sql-main-eval/test_import.py b/tools/o11y-sql-main-eval/test_import.py
deleted file mode 100644
index a046db4c8..000000000
--- a/tools/o11y-sql-main-eval/test_import.py
+++ /dev/null
@@ -1,23 +0,0 @@
-import unittest
-from import_openmetrics import parse_series
-
-
-class LabelTransportTests(unittest.TestCase):
-    def test_escaped_labels_remain_distinct_and_ordered(self):
-        metric, labels = parse_series(r'm{job="a,b",member="x\"y",path="a\\b",line="a\nb"}')
-        self.assertEqual(metric, 'm')
-        self.assertEqual(list(labels), ['job', 'member', 'path', 'line'])
-        self.assertEqual(labels, {'job': 'a,b', 'member': 'x"y', 'path': 'a\\b', 'line': 'a\nb'})
-
-    def test_empty_label_set(self):
-        self.assertEqual(parse_series('m{}'), ('m', {}))
-        self.assertEqual(parse_series('m'), ('m', {}))
-
-    def test_invalid_or_duplicate_labels_are_rejected(self):
-        for token in ['m{x="a",x="b"}', 'm{x="a",garbage}', 'm{x="a"', 'm{garbage}']:
-            with self.assertRaises(ValueError):
-                parse_series(token)
-
-
-if __name__ == '__main__':
-    unittest.main()
diff --git a/tools/run-offline-planner-replay.py b/tools/run-offline-planner-replay.py
deleted file mode 100644
index 9b2e2aee5..000000000
--- a/tools/run-offline-planner-replay.py
+++ /dev/null
@@ -1,51 +0,0 @@
-#!/usr/bin/env python3
-"""Run the control-plane offline example against an explicit planner checkout."""
-import argparse
-import json
-from pathlib import Path
-import re
-import subprocess
-import sys
-
-
-def main():
-    parser = argparse.ArgumentParser(description=__doc__)
-    parser.add_argument("--planner", type=Path, help="optional local planner override; default uses the pinned git dependency")
-    parser.add_argument("--queries", required=True, type=Path)
-    parser.add_argument("--evidence", type=Path)
-    parser.add_argument("--context", type=Path)
-    parser.add_argument("--output", required=True, type=Path)
-    args = parser.parse_args()
-    if bool(args.evidence) != bool(args.context):
-        parser.error("--evidence and --context must be provided together")
-    backend = Path(__file__).resolve().parents[1]
-    planner = args.planner.resolve() if args.planner else None
-    command = ["cargo", "run", "--quiet", "-p", "control_plane", "--example", "offline_planner_replay"]
-    for package, directory in ([("asap-types", "types"), ("asap-aware-mapping", "asap-aware-mapping"), ("asap-frontend-promql", "frontend-promql")] if planner else []):
-        path = planner / "crates" / directory
-        if not (path / "Cargo.toml").is_file():
-            parser.error(f"missing planner crate: {path}")
-        command.extend(["--config", f'patch."https://github.com/ProjectASAP/ASAPPlanner".{package}.path={json.dumps(str(path))}'])
-    command.extend(["--", str(args.queries.resolve())])
-    if args.evidence:
-        command.extend([str(args.evidence.resolve()), str(args.context.resolve())])
-    result = subprocess.run(command, cwd=backend, capture_output=True, text=True)
-    if result.returncode:
-        sys.stderr.write(result.stderr)
-        result.check_returncode()
-    report = json.loads(result.stdout)
-    report["reproduction"] = {
-        "command": command,
-        "backend_revision": subprocess.check_output(["git", "rev-parse", "HEAD"], cwd=backend, text=True).strip(),
-        "planner_revision": subprocess.check_output(["git", "rev-parse", "HEAD"], cwd=planner, text=True).strip() if planner else re.search(r'asap-aware-mapping = .*rev = "([a-f0-9]+)"', (backend / "Cargo.toml").read_text()).group(1),
-        "backend_dirty": bool(subprocess.check_output(["git", "status", "--porcelain"], cwd=backend, text=True)),
-        "planner_dirty": bool(subprocess.check_output(["git", "status", "--porcelain"], cwd=planner, text=True)) if planner else False,
-        "planner_source": "local_override" if planner else "pinned_git_dependency",
-    }
-    args.output.parent.mkdir(parents=True, exist_ok=True)
-    args.output.write_text(json.dumps(report, indent=2) + "\n")
-    print(f"wrote {len(report['rows'])} query/mode results to {args.output}")
-
-
-if __name__ == "__main__":
-    main()
diff --git a/tools/shared-workload/ACCURACY_E2E.md b/tools/shared-workload/ACCURACY_E2E.md
deleted file mode 100644
index 7867a534c..000000000
--- a/tools/shared-workload/ACCURACY_E2E.md
+++ /dev/null
@@ -1,442 +0,0 @@
-# Dataset-specific accuracy and cost evaluation
-
-For developers running controlled experiments. This component binds the shared
-PromQL/SQL templates to three datasets, loads identical samples, and compares
-Prometheus, ClickHouse, native VictoriaMetrics, ASAP PromQL and ASAP SQL responses
-at repeated evaluation timestamps. It records accuracy, HTTP latency and optional
-Linux component accounting. It does **not** claim that the backend already
-accelerates every expression in the corpus.
-
-This is an **offline, manually invoked evaluation**. Neither the evaluation nor
-its harness tests are registered as a push/PR CI job. Run the commands below
-explicitly when preparing an experiment or validating changes to this tooling.
-The repository's existing backend CI is unchanged.
-
-Runtime scope is **backend-local precompute**. No ASAPCollector service is
-started or called: the generator sends Remote Write directly to the backend.
-The optional offline Google mapper source lives in the ASAPCollector repository;
-the backend build and runtime do not depend on that repository.
-
-## Query matrix
-
-`accuracy_suite.py manifest` emits **concrete PromQL and ClickHouse SQL** for each
-profile, with/without an equality label filter. Only SQL evaluation time
-`{eval_ms}` and selector lookback `{lookback_ms}` remain runtime parameters.
-Quantiles are 0.5, 0.75, 0.9, 0.95, 0.99; windows are 1m, 10m, 1h, 6h, 24h.
-PromQL syntax is `topk by (label_0) (3, metric)` and
-`quantile by (label_0) (0.9, metric)`: k/q are arguments, not grouping labels.
-
-| Family | PromQL shape | Evaluation interval |
-|---|---|---|
-| 1 | `sum by (G) (M)` | 1s |
-| 2 | `topk by (G) (3, M)` | 1s |
-| 3 | `quantile by (G) (q, M)` | 1s |
-| 4 | `sum_over_time(M[T])` | 1m |
-| 5 | `quantile_over_time(q, M[T])` | 1m |
-| 6 | `rate(C[T])` | 1m |
-| 7 | `sum by (G) (rate(C[T]))` | 1m |
-| 8 | `sum by (G) (sum_over_time(M[T]))` | 1m |
-| 9 | `topk by (G) (3, rate(C[T]))` | 1m |
-| 10 | `quantile_over_time(0.9,M[T]) / quantile_over_time(0.5,M[T])` | 1m |
-
-Also includes spatial count, count_over_time, increase, nested sum/topk and
-temporal-to-spatial compositions. This is a finite sensitivity corpus, **not**
-exhaustive coverage of arbitrary-depth SpatialAgg*, all binary operators, all
-label matcher operators or vector matching modifiers. `ready` means a template
-can be evaluated; it is not a declaration of planner/summary support.
-
-SQL uses the [shared normalized schema and translations](README.md): latest sample
-per complete series identity for spatial queries, `(t-T,t]` temporal bounds,
-linearly interpolated quantiles, and reset-corrected, boundary-extrapolated
-rate/increase. Rate is not translated as a naive slope. Pin engine versions;
-the existing [translation evidence](fixture-results.md) targets Prometheus 3.14.0
-and ClickHouse 26.8.2.7, not all versions. TopK compares labels strictly in this
-runner: equally valid tied winners can fail comparison and require review.
-Do not interpret these failures as numeric error without inspecting the cutoff.
-
-## Data selection and concrete expressions
-
-| Dataset | M (gauge) | G (spatial group) | Series identity |
-|---|---|---|---|
-| Synthetic | `fake_metric` | `label_0` | label_0, label_1, job, instance |
-| Google cluster | `google_cluster_cpu_rate` | `service` | original mapper attributes, including service, task, host |
-| Alibaba 2018 | `alibaba_container_cpu_util` | `machine_id` | machine_id, container_id |
-
-### Synthetic: Prometheus client fake metrics
-
-This uses Python `prometheus_client` to encode deterministic fake samples with
-the metric/label vocabulary from the repository's
-[streaming example](../../data_plane/examples/promql/streaming_config.yaml).
-It is an offline historical sample generator, **not** a running scraper; 100ms
-is the exact sample timestamp interval, not a measured scrape scheduling SLA.
-The OpenMetrics file is a historical import stream, not a single `/metrics`
-response. Remote Write and SQL import use the matched JSONL rows.
-
-For group index g, member m and step s, the gauge is
-`1 + g % 19 + m + (s % 31)/31`. The separate cumulative
-`fake_metric_counter_total` is `(s % 997)*(m+1)` and deliberately resets.
-Families 6, 7, 9 and increase use that counter, not the fake gauge.
-Examples: `quantile by(label_0)(0.95, fake_metric)` and
-`sum by(label_0)(rate(fake_metric_counter_total[10m]))`.
-
-Vary **group cardinality** over 10, 100, 1,000, 10,000, 100,000, 1,000,000.
-Default four member series per group make grouped TopK/quantile nondegenerate.
-There are two metrics, hence `2 * groups * members` total series and
-`2 * groups * members * (duration_ms/100 + 1)` samples. A 24h, million-group cell
-with four members contains **6,912,008,000,000 samples**. Generation is opt-in,
-streaming and budget-limited; per-series ordering validation still uses memory
-proportional to series cardinality. Do not run the entire matrix on a workstation.
-For repeated full-window evaluations, generate history covering T **plus** the
-evaluation span, not just T.
-
-### Google cluster: CPU usage per task, aggregated by job/collection
-
-Use the existing `ASAPCollector/datasets_eval/google_cluster/otlp_mapper.py`
-JSONL export, **not** raw event CSV or scheduling requests. Select records with
-`metric == "google_cluster_cpu_rate"`; retain `timestamp_ms`, `value` and all
-`attributes`. Require `service`, `task`, `host`; do not drop task identity before
-computing spatial quantiles or TopK.
-
-For 2011 `task_usage`, service is `job-{job_id}`, host is `host-{machine_id}` and
-task is the task index. For 2019 `instance_usage`, service is
-`coll-{collection_id}` and task is the instance index. This groups usage by the
-workload/job, rather than mixing unrelated jobs on a machine. Mapper-created
-zone/rack labels are synthetic placement metadata, not measured topology.
-Do not enable cardinality-cap hashing: merged identities invalidate accuracy.
-See the [official Google trace formats](https://github.com/google/cluster-data).
-
-Choose a contiguous trace interval and a deterministic set of **complete jobs**
-(e.g. sorted job IDs), retaining every task's samples in that interval. Preserve
-native timestamps and sampling density; do not upsample to synthetic 100ms or
-fill gaps with zeros. Record trace release, source objects/shards, time interval,
-selected IDs, mapper revision/options and exclusions alongside the generated
-manifest. The generator hashes its input, but cannot infer this provenance from
-an already-exported JSONL file. Do not pool 2011 and 2019 runs.
-
-Examples: `sum by(service)(google_cluster_cpu_rate)` and
-`quantile_over_time(0.9,google_cluster_cpu_rate[1h])`. For a filtered manifest use
-`--filter-value job-ACTUAL_ID` (2011) or `coll-ACTUAL_ID` (2019); the default
-`job-1234567890` is illustrative and must be replaced with a present ID.
-
-CPU **rate** in the field name means a utilization gauge, not a cumulative
-Prometheus counter. Rate/increase families are emitted as `not_applicable` and
-skipped. A separately derived integrated counter would be a different experiment
-and is not silently manufactured here.
-
-### Alibaba 2018: container CPU utilization, aggregated by machine
-
-Use headerless `container_usage.csv`, not `container_meta`, `batch_task`, resource
-requests or event counts. The [official 2018 schema](https://github.com/alibaba/clusterdata/blob/master/cluster-trace-v2018/schema.txt)
-defines 11 columns. Select column 1 `container_id`, column 2 `machine_id`,
-column 3 `time_stamp` (seconds from trace start), column 4 `cpu_util_percent`.
-Convert timestamp seconds to integer milliseconds without rounding; preserve
-CPU values in source units, with no division by machine core count or invented
-counter conversion. The [trace description](https://github.com/alibaba/clusterdata/blob/master/cluster-trace-v2018/trace_2018.md)
-explains normalization and collection limitations.
-
-Choose a contiguous interval and sorted machine IDs, retaining **all containers**
-on selected machines. This makes spatial queries compare per-machine container
-usage; grouping by container_id alone would often make spatial quantiles trivial.
-Record source shard hashes, interval, selected IDs and any cleaning policy.
-Negative CPU, the 101 sentinel and nonfinite values fail ingestion; clean them
-explicitly and report exclusion counts instead of silently changing the sample
-population. Duplicate/out-of-order samples within a series also fail. The tool
-does not silently average collisions or sort an arbitrarily large input.
-
-Examples: `topk by(machine_id)(3, alibaba_container_cpu_util)` and
-`sum by(machine_id)(sum_over_time(alibaba_container_cpu_util[6h]))`.
-Use `--filter-value m_ACTUAL_ID` for a machine in the selected data. Native
-timestamps are retained, including gaps. Configure historical retention at each
-receiver; do not independently shift time in different engines. CPU utilization
-is a gauge, so counter families are N/A here too. The trace's roughly 4,000
-machines do **not** establish natural million-group coverage; synthetic scale
-results must be reported separately from real-trace results.
-
-## Benefit-scale experiments (offline, opt-in)
-
-The 10-group, two-minute example below is **only a correctness smoke test**, not
-the input size for reporting ASAP benefits. The default `scale_plan.py` profile
-is `benefit`; it produces a plan and a window-matched query manifest, not data.
-
-| Profile | Groups × members per metric | Query T + evaluation span | Samples, both metrics | Unfiltered temporal input samples/query |
-|---|---|---|---:|---:|
-| smoke | 10 × 4 | 1m + 1m | 96,080 | 24,000 |
-| benefit (default) | 1,000 × 16 | 1h + 30m | 1,728,032,000 | 576,000,000 |
-| scale | 10,000 × 16 | 6h + 1h | 80,640,320,000 | 34,560,000,000 |
-| cardinality | 1,000,000 × 4 | 1m + 1m | 9,608,000,000 | 2,400,000,000 |
-
-Input counts are logical samples, not measured disk reads: engines may prune,
-cache, compress or use indexes. The benefit cell has 32,000 total series,
-31 temporal evaluation timestamps at 1m spacing, and 1,801 spatial timestamps at
-1s spacing. Full history precedes the **first** query. This tests repeated reuse
-of summaries; it does not claim that repetition necessarily amortizes build cost.
-
-```sh
-# Planning is cheap. This writes scale.json, queries.json and a 30-cell matrix.json.
-python3 tools/shared-workload/scale_plan.py --profile benefit --output /tmp/benefit-plan
-# Only after inspecting scale.json and provisioning storage, explicitly generate:
-python3 tools/shared-workload/dataset.py --dataset synthetic \
-  --scale-plan /tmp/benefit-plan/scale.json --max-samples 1728032000 \
-  --output /srv/eval/benefit-data
-```
-
-Load the resulting data with `load_dataset.py` as below. Run `accuracy_suite.py run`
-with `--manifest /tmp/benefit-plan/queries.json`, its matching `--loaded-data`
-receipt, the five endpoints, `--require-warm`, and component accounting. Omit
-`--start-ms`/`--end-ms`: the scale-bound manifest supplies the complete planned
-repetition interval. The runner rejects undersized/mismatched receipts and
-shortened intervals. `--query-name` can select a bounded family experiment.
-Queries have **no client deadline** and are never killed for taking too long.
-Wait for natural completion. Inspect and record each service's own limits
-(query timeout, samples, memory); a service-enforced failure is retained as a
-failure, never converted into a speedup or a fabricated completion time.
-
-The planner also emits the requested six group cardinalities × five windows,
-including full repeated-history sizes. It does not automatically execute that
-matrix. Use `--groups`, `--members`, `--window` and `--evaluation-minutes` to select
-one cell. Sweep members **4, 16, 64 at fixed group count** as a separate axis:
-increasing groups alone also increases output size, whereas more members increases
-the spatial reduction opportunity at fixed grouped-sum output cardinality. Keep
-single-group filtered controls separate: their input does not grow with the number
-of unselected groups. Do not describe every query as scanning the full dataset.
-
-Measure storage in a bounded pilot before generating these datasets. `scale.json`
-reports `16 * samples` uncompressed timestamp/value payload (27.65 GB for benefit),
-**not** physical disk size: labels, JSONL/OpenMetrics artifacts, indexes, compression,
-replicas, WAL and summaries change the actual requirement. Supply
-`--measured-bytes-per-sample` from a pilot to estimate **one** store; budget every
-baseline/fallback copy plus generated files and temporary storage separately.
-No measured bytes/sample means no invented disk estimate. Billion-sample Python
-client generation and import can themselves take substantial time; these profiles
-are explicit resource commitments, not a promise that the current host can run them.
-
-Report the crossover curve from smoke through benefit and larger feasible cells,
-including cases where ASAP loses. Charge ingestion, materialization, updates and
-fallback to ASAP; assess savings over the declared repeated-query horizon, not just
-one warm request. Large data is necessary to test scalability, not proof of benefit.
-For Google/Alibaba expand contiguous time coverage and complete selected job/machine
-populations, report their actual series/sample counts, and preserve native cadence.
-Do not replicate trace identities or invent 100ms observations to meet synthetic
-targets. A trace subset too small to stress the baseline remains an accuracy control.
-
-## Generate, load and compare (smoke example)
-
-```sh
-python3 -m pip install -r tools/shared-workload/requirements.txt
-python3 tools/shared-workload/dataset.py --dataset synthetic \
-  --groups 10 --members 4 --duration-ms 120000 --output /tmp/accuracy-data
-python3 tools/shared-workload/accuracy_suite.py manifest \
-  --dataset synthetic --output /tmp/accuracy-queries.json
-# For traces instead:
-# dataset.py --dataset google --input selected-mapper.jsonl --output NEW_DIR
-# dataset.py --dataset alibaba --input selected-container_usage.csv --output NEW_DIR
-# accuracy_suite.py manifest --dataset google --filter-value job-123 --output NEW_FILE
-```
-
-Provision **fresh isolated** baseline and fallback stores, with identical versions,
-CPU/memory limits, retention, evaluation lookback and data. Create `raw_samples`
-using the schema in [README.md](README.md) in an unused ClickHouse database.
-Prometheus must enable its Remote Write receiver. Choose historical-retention
-settings compatible with the dataset's timestamps. The loader performs writes;
-never point it at production or reuse a partially loaded database.
-
-Configure ASAP before loading: register the manifest's query strings and
-`interval_ms` frequencies with the normal control-plane planning workflow, gather
-independent calibration costs, compile/install its chosen plan and configure exact
-fallbacks. Reuse the [production compiler/replay workflow](../o11y-execution/README.md)
-and its [calibration requirements](../o11y-execution/CALIBRATION.md); this component
-does not synthesize valid planning snapshots or force a benchmark-selected sketch.
-Keep the compiler's candidates, selection, install request/status and versions as
-experiment artifacts. An SQL translation may be executable by ClickHouse but not
-recognized for summary acceleration by ASAP; such outcomes must remain visible.
-
-```sh
-python3 tools/shared-workload/load_dataset.py --data /tmp/accuracy-data \
-  --remote-write http://127.0.0.1:29090/api/v1/write \
-  --remote-write http://127.0.0.1:28428/api/v1/write \
-  --remote-write http://127.0.0.1:19090/api/v1/write \
-  --remote-write http://127.0.0.1:18089/api/v1/write \
-  --clickhouse 'http://127.0.0.1:18123/?database=accuracy_fixture' \
-  --output /tmp/accuracy-loaded.json
-```
-
-The endpoints above illustrate Prometheus baseline, VM, a separate Prometheus
-fallback, and ASAP ingestion; replace them with actual configured receivers,
-including additional SQL-backend ingestion/exact stores if deployed separately.
-The receipt means each batch was accepted, **not** that summaries finished.
-Invoke the backend's finite-input completion barrier before querying; the existing
-replay workflow documents it. Verify all endpoints serve the intended loaded
-dataset; receipt/profile/hash checks cannot authenticate arbitrary query URLs.
-On partial loading failure, investigate and restart with fresh stores. No retries
-or rollback hide partial ingestion.
-
-```sh
-python3 tools/shared-workload/accuracy_suite.py run \
-  --manifest /tmp/accuracy-queries.json --loaded-data /tmp/accuracy-loaded.json \
-  --query-name spatial_sum --query-name temporal_sum \
-  --start-ms 1700000060000 --end-ms 1700000120000 \
-  --prometheus http://127.0.0.1:29090 --victoriametrics http://127.0.0.1:28428 \
-  --clickhouse 'http://127.0.0.1:18123/?database=accuracy_fixture' \
-  --asap-prometheus http://127.0.0.1:18089 \
-  --asap-clickhouse http://127.0.0.1:18090 \
-  --required-pair promql --required-pair sql \
-  --require-warm --output /tmp/accuracy-results.jsonl
-python3 tools/shared-workload/summarize_accuracy.py /tmp/accuracy-results.jsonl \
-  --output /tmp/accuracy-summary.json
-```
-
-Repeat `--query-name` to bound a run. With no selection, all ready queries run;
-short histories fail full-window checks for larger T. Both filtered and
-unfiltered cases are evaluated. Absent filter IDs produce empty-oracle failures.
-Results record missing/extra labels and samples, completeness, max absolute and
-relative error, zero-baseline/nonfinite differences, tolerances, raw responses,
-route evidence and per-engine timings. Defaults are rtol=1e-9, atol=1e-12; choose
-and report an approximation budget explicitly, never tune it on evaluation data.
-This tolerance is not a statistical sketch guarantee or quantile rank-error bound.
-
-ClickHouse-vs-Prometheus oracle parity must pass before claiming SQL correctness.
-VM's **native** MetricsQL result is compared separately: semantic differences are
-reported, not relabeled as sketch error or silently normalized. The manifest also
-preserves the separately named VM Prometheus variant for follow-up experiments.
-Each comparison pair has its own correctness, execution route and eligibility:
-PromQL/Prometheus, SQL/ClickHouse and MetricsQL/VM. Supply `--asap-metricsql` for
-the third pair. By default all three pairs are required; a missing MetricsQL
-endpoint cannot pass full acceptance. The example explicitly selects only two
-pairs using `--required-pair`; its scope does **not** certify VM. Native VM vs
-Prometheus is a semantic diagnostic, not a replacement for ASAP MetricsQL vs VM.
-VM disagreement with Prometheus can coexist with a valid native-semantics VM pair;
-VM disagreement with its paired ASAP endpoint makes that pair ineligible.
-Empty oracles, warnings and malformed/duplicate results cannot establish accuracy.
-`--require-warm` rejects hybrid, fallback and unknown provenance even when values
-match. Without it, a pass means accuracy only, not acceleration. A pair's
-`eligible_for_query_comparison` concerns matching warm query service only;
-`eligible_for_benefit_conclusion` remains false without full lifecycle evidence.
-
-This runner is **sequential historical replay**: 1s/1m control evaluation timestamp
-spacing, not wall-clock dashboard concurrency. Latency is client-observed HTTP
-service time (including failures and connection overhead). **All configured ASAP
-endpoints run before native endpoints at each timestamp**. Each request executes
-independently; one failure cannot skip the next engine. Completed responses/errors
-are immediately flushed to `OUTPUT.endpoints.jsonl`, so an indefinitely slow
-later query does not erase earlier evidence. The final output retains all endpoints,
-including failures, and summary distributions must not discard unsuccessful cases.
-Use independent baseline/fallback stores to prevent ASAP-first fallback traffic
-from warming the baseline. Fixed order alone does not isolate caches. This is not
-a scheduled live-load or throughput benchmark.
-
-## Production-planned PromQL chain acceptance
-
-`planned_run.py` connects one selected corpus query to the existing production
-planning/replay workflow. It owns fresh, separate Prometheus baseline/fallback
-stores, invokes the normal compiler on measured version-3 cost evidence, installs
-its selected artifact, loads data, drains finite-input materialization and probes
-**every evaluation window** before timed replay. A readiness probe requires a
-nonempty warm response, positive summary-readout count and zero exact-subquery RPCs;
-an HTTP-success/warm label alone is insufficient. Probes warm ASAP caches and their
-cost is retained separately from query service timing.
-
-```sh
-python3 tools/shared-workload/planned_run.py \
-  --data /tmp/accuracy-data --manifest /tmp/accuracy-queries.json \
-  --query-id synthetic/1m/False/temporal_sum \
-  --snapshot /path/measured-costed-snapshot.json \
-  --compiler target/debug/examples/compile_workload_artifact \
-  --data-plane target/debug/data_plane --prometheus /path/to/prometheus \
-  --cpu-affinity 0,1 --repetitions 2 --output /tmp/planned-sum-acceptance
-```
-
-Obtain the snapshot via [candidate calibration](../o11y-execution/CALIBRATION.md),
-registering exactly the selected query. Use `calibrate_runtime.py
---wait-for-completion` for deadline-free calibration. Candidate calibration does
-not manually select the evaluation winner. The driver rejects discovery/demo
-snapshots without deployment cost quotes, invalid data hashes and partial windows.
-Trace exports may be ordered within each series without being globally ordered.
-The driver validates per-series ordering and, when needed, creates a timestamp-sorted
-copy using a disk-backed sort. It preserves sample values, labels and timestamps;
-`metrics-input.json` records both input hashes. Already ordered input is used directly.
-Reserve temporary disk space for the trace copy and sort database.
-Its owned replay uses `--backend-first --wait-for-completion
---require-summary-ready`; no client query timeout, subprocess deadline or
-timeout-based forced shutdown is used. Owned servers receive normal termination
-only after replay returns; the driver waits for shutdown without forced kill.
-
-`acceptance.json` reports chain correctness, warm/readout evidence, query latency,
-planning CPU, observed phase resources, retained storage and artifact locations.
-This is **PromQL-only** acceptance, not complete three-engine benefits evaluation.
-SQL's moving `{eval_ms}` fixed-plan limitation is not solved by this driver, nor
-does it provision a MetricsQL plan. Baseline/fallback stores are distinct, but
-their processes overlap in wall time. Independently matched complete lifecycle
-runs (including native ingestion and ASAP planning/build/upkeep/retained exact DB)
-remain required before a system-benefit claim. No full-cost total is invented.
-
-The [recorded small sum run](planned-sum-evidence.md) passed this real chain but
-ASAP was slower than direct Prometheus in that debug-build fixture. Keep that
-negative performance result; do not conflate compiler plan selection with beating
-an independently queried native DB.
-
-## Component and whole-system resources
-
-Use cgroup v2 with disjoint component cgroups. Supply `--components components.json`
-to `accuracy_suite.py run` for request-interval CPU, memory snapshots, block I/O
-and optional dedicated-network-namespace counters. Example configuration:
-
-```json
-{
-  "asap_promql": {
-    "data_plane": {"cgroup": "/sys/fs/cgroup/eval/asap", "data_directory": "/srv/eval/asap"},
-    "control_plane": {"cgroup": "/sys/fs/cgroup/eval/control"},
-    "fallback": {"cgroup": "/sys/fs/cgroup/eval/fallback", "data_directory": "/srv/eval/fallback"}
-  },
-  "asap_sql": {},
-  "asap_metricsql": {},
-  "prometheus": {"server": {"cgroup": "/sys/fs/cgroup/eval/prom", "data_directory": "/srv/eval/prom"}},
-  "clickhouse": {"server": {"cgroup": "/sys/fs/cgroup/eval/ch", "data_directory": "/srv/eval/ch"}},
-  "victoriametrics": {"server": {"cgroup": "/sys/fs/cgroup/eval/vm", "data_directory": "/srv/eval/vm"}}
-}
-```
-
-Populate `asap_sql`/`asap_metricsql` with their real components; an empty set
-intentionally reports unavailable totals. Include the backend-local data plane,
-the planning process during planning, and retained exact fallback services.
-Do not include a collector or broker: this profile does not deploy either.
-Shared dependencies count once **within**
-each system. Reject parent/child cgroup overlap; never sum all five alternative
-systems together and call it ASAP cost. `network_namespace_pid` optionally
-identifies a distinct non-host namespace per component. Host `/proc/net/dev` is
-not per-process accounting. Network RX/TX includes loopback and can count the same
-transfer at both endpoints, so it is not summed into a misleading system byte total.
-
-For a complete phase including ingestion, build, queries and background work:
-
-```sh
-python3 tools/shared-workload/resources.py --components components.json \
-  --engine asap_promql --output /tmp/asap-phase.json -- /path/to/experiment-command
-```
-
-The wrapper runs the explicit command and propagates its exit status. Components
-must already exist; run the same phase independently for each baseline. It reports
-CPU time, block bytes, per-component and aggregate memory endpoints, sampled memory
-peaks (100ms by default), and allocated storage blocks before/after for configured
-disjoint data directories. Missing evidence stays null, not zero. Memory is cgroup
-memory (including charged cache), not summary heap or process RSS. Sampled peaks
-can miss short spikes; directory accounting can be expensive and runs outside the
-measured command. The user-supplied component inventory defines the total; the tool
-cannot prove no service was omitted. No automatic system-benefit ratio is emitted.
-
-## Verification and remaining acceptance
-
-```sh
-python3 -m unittest discover -s tools/shared-workload -p 'test_*.py' -v
-```
-
-Tests cover profile binding, client-encoded samples, trace mappings, duplicate
-rejection, all five HTTP adapters, repeated timestamps, fallback/error rejection,
-matched loading/hash guards and whole-phase resource/exit-status boundaries.
-A local Prometheus 3.5.0 `promtool tsdb create-blocks-from openmetrics` smoke test
-imported 32 samples / 16 series spanning 100ms successfully; this verifies import
-format only, not the newer query-boundary semantics targeted by the SQL.
-HTTP fixtures validate the harness, **not** live engine or planner support; the
-separate small PromQL run above establishes one real planned summary-readout chain.
-Large trace runs, complete three-engine planned integration and SQL moving-time plans,
-all-family warm coverage, production resource measurements, live dashboard load,
-quantile rank error and tie-aware TopK accuracy remain separate acceptance work.
diff --git a/tools/shared-workload/README.md b/tools/shared-workload/README.md
deleted file mode 100644
index d60a2bad8..000000000
--- a/tools/shared-workload/README.md
+++ /dev/null
@@ -1,89 +0,0 @@
-# Shared aggregation sensitivity workload
-
-For dataset-specific fake-client, Google and Alibaba expressions, matched HTTP
-accuracy/latency replay and component/system resource accounting, see
-[Accuracy E2E](ACCURACY_E2E.md).
-
-This developer evaluation tool emits identical timestamped samples for Prometheus,
-VictoriaMetrics, and ClickHouse, with a query manifest. This synthetic sensitivity
-study supplements the original o11y workload; it does not replace its coverage or
-demonstrate an ASAP benefit by itself.
-
-`label_0` cardinality means groups, with four distinct `member` series per group by
-default. A million groups therefore means four million series. Samples arrive
-every 100 ms. `grid.json` lists all requested group counts (10 through 1,000,000)
-and durations (1m, 10m, 1h, 6h, 24h), including their actual sample counts. The largest
-default cell has 3,456,004,000,000 samples. Generation is opt-in and has an explicit
-sample budget; writing a manifest does not run this entire grid.
-
-```sh
-python3 tools/shared-workload/generate.py \
-  --output /mydata/shared-workload-study/example \
-  --groups 10 --members 4 --duration-ms 60000 --scrape-ms 100 --data
-```
-
-The output contains:
-
-- `manifest.json`: query expressions, cadence, bounds, dataset size, and hashes.
-- `grid.json`: proposed scale matrix; these are planned scales, not completed runs.
-- `samples.prom`: millisecond timestamps for VictoriaMetrics text import.
-- `samples.openmetrics`: second timestamps for `promtool tsdb create-blocks-from openmetrics`.
-- `samples.jsonl`: ClickHouse JSONEachRow input for the schema below.
-
-```sql
-CREATE TABLE raw_samples (
-    metric String, labels Map(String, String), ts_ms Int64, value Float64
-) ENGINE = MergeTree ORDER BY (metric, ts_ms);
-```
-
-Generation streams in timestamp order and does not retain the dataset in memory.
-Existing output files are never overwritten. `--reset-steps 97` exercises repeated
-counter resets in a one-minute fixture. Different member slopes and reset phases
-make grouped quantile/TopK nondegenerate. The generator uses finite, nonnegative
-values; it does not cover NaN, infinity, stale markers, or duplicate timestamps.
-
-Instant selectors choose the latest sample per series within the left-exclusive
-lookback interval. Temporal windows use `(evaluation - window, evaluation]`.
-Spatial count counts series; temporal count counts samples, not distinct values.
-Quantiles use linear interpolation. Rate/increase SQL corrects counter resets,
-estimates zero crossings, and applies boundary extrapolation; it is not a naive
-last-minus-first calculation. Query cadence is 1s for spatial queries and 1m for
-temporal queries. The differential command checks a single evaluation timestamp;
-it does not execute the cadence schedule or measure performance.
-
-Prometheus versions matter: 2.55.1 includes the left range boundary on this fixture;
-3.14.0 implements the exclusive boundary used here. VictoriaMetrics also has
-different native counter and metric-name semantics. The manifest keeps native
-`metricsql` and a separately labeled `metricsql_prometheus_variant` using
-`rate_prometheus`/`increase_prometheus` and explicit name-label removal. This variant
-is an experiment, not a guarantee of parity. See the
-[VictoriaMetrics function reference](https://docs.victoriametrics.com/victoriametrics/metricsql/).
-
-Load the same files into isolated databases before comparing:
-
-```sh
-python3 tools/shared-workload/differential.py \
-  --manifest /mydata/shared-workload-study/example/manifest.json \
-  --loaded-data-manifest /mydata/shared-workload-study/example/manifest.json \
-  --output /mydata/shared-workload-study/example/differential.json \
-  --prometheus http://localhost:29090 --victoriametrics http://localhost:28428 \
-  --clickhouse http://localhost:18123 --database isolated_fixture
-```
-
-Supply ClickHouse credentials through `CLICKHOUSE_USER`/`CLICKHOUSE_PASSWORD`.
-`--evaluation-ms` tests gaps and lookback boundaries; repeat `--query-name` to limit
-the probe. Repeat `--loaded-data-manifest` when the loaded history combines files.
-The report preserves each engine's differences and rejects duplicate output label
-sets. Labels are compared exactly, including metric names; numeric tolerance is
-1e-9 relative and 1e-12 absolute. Temporal sum/count followed by TopK validates
-cutoff admissibility against the full population; other TopK ties use strict
-comparison and can report valid cutoff membership differences. The report is not a bit-strict
-correctness claim, and its exit status does not imply all comparisons matched.
-
-The generated corpus covers the explicitly requested shapes and representative
-nested spatial and temporal-to-spatial compositions. It does not enumerate every
-possible `AnyAgg op AnyAgg`, MetricsQL extension, filter operator, or subquery.
-Larger-window queries against short fixtures have partial history; do not report
-them as full-window performance experiments. Planner candidates, installed catalog
-IDs, warm/hybrid/fallback provenance, and resource measurements must be recorded by
-the backend experiment driver when consuming this manifest.
diff --git a/tools/shared-workload/accuracy_suite.py b/tools/shared-workload/accuracy_suite.py
deleted file mode 100644
index 64974aefa..000000000
--- a/tools/shared-workload/accuracy_suite.py
+++ /dev/null
@@ -1,264 +0,0 @@
-#!/usr/bin/env python3
-"""Dataset-specific query manifests and repeated HTTP accuracy comparisons."""
-import argparse
-import importlib.util
-import json
-import math
-import time
-from pathlib import Path
-import urllib.parse
-import urllib.request
-import urllib.error
-
-from generate import WINDOWS, queries
-import resources
-
-spec = importlib.util.spec_from_file_location(
-    "accuracy_compare", Path(__file__).resolve().parents[1] / "o11y-execution/compare.py")
-comparison = importlib.util.module_from_spec(spec)
-spec.loader.exec_module(comparison)
-
-# Trace profiles use the normalized raw_samples table, not the original CSV.
-PROFILES = {
-    "synthetic": ("fake_metric", "label_0", "g000000", "fake_metric_counter_total"),
-    "google": ("google_cluster_cpu_rate", "service", "job-1234567890", None),
-    "alibaba": ("alibaba_container_cpu_util", "machine_id", "m_1", None),
-}
-
-
-def corpus(dataset, filter_value=None):
-    metric, group, default_filter, counter = PROFILES[dataset]
-    filter_value = default_filter if filter_value is None else filter_value
-    # Avoid inserting unescaped labels into PromQL or SQL templates.
-    if not filter_value or any(c not in "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789_-.:" for c in filter_value):
-        raise ValueError("filter value must be a nonempty simple trace identifier")
-    output = []
-    for window in WINDOWS:
-        for filtered in (False, True):
-            for query in queries(window, filtered):
-                if query["interval_ms"] == 1000 and window != "1m":
-                    continue  # Spatial queries have no T parameter.
-                is_counter = query["name"].startswith(("rate", "increase"))
-                selected_metric = counter if is_counter and counter else metric
-                def bind(expression):
-                    if expression is None:
-                        return None
-                    import re
-                    return re.sub(r"\bdata\b", selected_metric, expression).replace(
-                        "label_0", group).replace("g000000", filter_value)
-                row = {**query, "id": f"{dataset}/{window}/{filtered}/{query['name']}",
-                       "dataset": dataset, "window": window,
-                       "window_ms": WINDOWS[window], "metric": selected_metric,
-                       "status": "not_applicable" if is_counter and counter is None else "ready",
-                       "reason": "source CPU utilization is a gauge; no native cumulative counter" if is_counter and counter is None else None}
-                for key in ("promql", "clickhouse_sql", "metricsql", "metricsql_prometheus_variant", "topk_input_promql"):
-                    if key in row:
-                        row[key] = bind(row[key])
-                if "topk_group_labels" in row:
-                    row["topk_group_labels"] = [group]
-                output.append(row)
-    return {"schema_version": 1, "dataset": dataset, "queries": output,
-            "cardinalities": [10 ** i for i in range(1, 7)],
-            "scrape_ms": 100 if dataset == "synthetic" else None,
-            "trace_sampling": "preserve original timestamps; no implicit resampling",
-            "coverage": "requested ten families plus representative count, increase and nested compositions; not exhaustive AnyAgg/binary operators"}
-
-
-def request(url, query, timestamp, sql=False, timeout=None):
-    if sql:
-        req = urllib.request.Request(url, data=(query + " FORMAT JSONEachRow").encode())
-    else:
-        req = urllib.request.Request(url.rstrip("/") + "/api/v1/query?" + urllib.parse.urlencode(
-            {"query": query, "time": timestamp / 1000}))
-    with urllib.request.urlopen(req, timeout=timeout) as response:
-        headers = dict(response.headers.items())
-        if sql:
-            rows = [json.loads(line) for line in response if line.strip()]
-            body = {"status": "success", "data": {"resultType": "vector", "result": [
-                {"metric": row["labels"], "value": [timestamp / 1000, str(row["value"])]} for row in rows]}}
-        else:
-            body = json.load(response)
-    return body, headers
-
-
-def evaluate(actual, expected, rtol, atol):
-    result = comparison.compare_results(actual, expected, rtol, atol)
-    _, _, samples = comparison.result_samples(expected)
-    if not samples:
-        result.update(equal=False, reason="empty oracle cannot establish accuracy")
-    return result
-
-
-def execution(body, headers):
-    h = {k.lower(): v for k, v in headers.items()}
-    if h.get("x-asap-execution"):
-        return h["x-asap-execution"]
-    return "warm" if "data_source: asap_query" in body.get("infos", []) else "unknown"
-
-
-def compare_pair(endpoints, backend, baseline, rtol, atol):
-    actual, exact = endpoints.get(backend, {}), endpoints.get(baseline, {})
-    result = {"backend": backend, "baseline": baseline,
-              "execution": actual.get("execution", "unavailable"),
-              "eligible_for_query_comparison": False,
-              "eligible_for_benefit_conclusion": False,
-              "full_cost": None,
-              "cost_reason": "replay has no isolated complete-lifecycle cost evidence"}
-    if not actual.get("success") or not exact.get("success"):
-        result["correctness"] = {"equal": False, "comparable": False,
-                                 "reason": "paired endpoint missing or failed"}
-        return result
-    try:
-        result["correctness"] = evaluate(actual["response"], exact["response"], rtol, atol)
-    except (ValueError, KeyError, TypeError) as error:
-        result["correctness"] = {"equal": False, "comparable": False, "reason": str(error)}
-    result["eligible_for_query_comparison"] = (result["correctness"]["equal"] and result["execution"] == "warm")
-    result["latency_ns"] = {"backend": actual["latency_ns"], "baseline": exact["latency_ns"]}
-    result["query_latency_ratio"] = (exact["latency_ns"] / actual["latency_ns"]
-                                      if result["eligible_for_query_comparison"] and actual["latency_ns"] else None)
-    return result
-
-
-def run(args):
-    manifest = json.loads(args.manifest.read_text())
-    loaded = json.loads(args.loaded_data.read_text())["data"]
-    scale = manifest.get("scale")
-    if scale:
-        if (loaded.get("provenance", {}).get("scale_plan") != scale
-                or loaded["samples"] != scale["total_samples"]
-                or loaded["series"] != scale["total_series"]):
-            raise ValueError("loaded data does not match the requested scale plan")
-        args.start_ms = scale["evaluation_start_ms"] if args.start_ms is None else args.start_ms
-        args.end_ms = scale["evaluation_end_ms"] if args.end_ms is None else args.end_ms
-        if (args.start_ms, args.end_ms) != (scale["evaluation_start_ms"], scale["evaluation_end_ms"]):
-            raise ValueError("evaluation must cover the planned repetition interval")
-    if args.start_ms is None or args.end_ms is None or args.end_ms < args.start_ms:
-        raise ValueError("provide valid start/end timestamps or a scale-bound query manifest")
-    if loaded.get("provenance", {}).get("dataset") != manifest["dataset"]:
-        raise ValueError("query and loaded dataset profiles differ")
-    if args.end_ms > loaded["end_ms"] or args.start_ms < loaded["start_ms"]:
-        raise ValueError("evaluation outside loaded history")
-    results = []
-    component_sets = json.loads(args.components.read_text()) if args.components else {}
-    for components in component_sets.values():
-        resources.validate(components)
-    def measured(engine, url, expression, timestamp, sql=False):
-        components = component_sets.get(engine, {})
-        before = resources.snapshot(components)
-        start = time.perf_counter_ns()
-        record = {"success": False}
-        try:
-            # No client deadline: wait for the service to return, including slow natives.
-            body, headers = request(url, expression, timestamp, sql, timeout=None)
-            record.update(success=body.get("status") == "success", response=body, headers=headers,
-                          execution=execution(body, headers) if engine.startswith("asap_") else "native")
-            if not record["success"]:
-                record["error"] = {"kind": "api_error", "message": str(body.get("error", body))}
-        except Exception as error:
-            record["error"] = {"kind": "timeout" if isinstance(error, TimeoutError) else type(error).__name__,
-                               "message": str(error)}
-            if isinstance(error, urllib.error.HTTPError):
-                record["error"].update(http_status=error.code, body=error.read().decode(errors="replace"))
-                record["headers"] = dict(error.headers.items())
-        finally:
-            record["latency_ns"] = time.perf_counter_ns() - start
-            record["resources"] = resources.delta(before, resources.snapshot(components))
-        return record
-    with args.output.open("x") as output, args.output.with_name(args.output.name + ".endpoints.jsonl").open("x") as journal:
-        for query in manifest["queries"]:
-            if args.query_name and query["name"] not in args.query_name:
-                continue
-            if query["status"] != "ready":
-                continue
-            for timestamp in range(args.start_ms, args.end_ms + 1, query["interval_ms"]):
-                row = {"query_id": query["id"], "evaluation_ms": timestamp,
-                       "scale": scale,
-                       "dataset_sha256": loaded["sha256"], "interval_ms": query["interval_ms"],
-                       "schedule": "sequential historical replay, not wall-clock load"}
-                row["endpoints"] = {}
-                try:
-                    if query["interval_ms"] != 1000 and timestamp - query["window_ms"] < loaded["start_ms"]:
-                        raise ValueError("full temporal window not present in loaded history")
-                    sql = query["clickhouse_sql"].replace("{eval_ms}", str(timestamp)).replace("{lookback_ms}", "300000")
-                    jobs = [("asap_promql", args.asap_prometheus, query["promql"], False),
-                            ("asap_sql", args.asap_clickhouse, sql, True)]
-                    if getattr(args, "asap_metricsql", None):
-                        jobs.append(("asap_metricsql", args.asap_metricsql, query["metricsql"], False))
-                    jobs += [("prometheus", args.prometheus, query["promql"], False),
-                             ("clickhouse", args.clickhouse, sql, True),
-                             ("victoriametrics", args.victoriametrics, query["metricsql"], False)]
-                    row["request_order"] = [job[0] for job in jobs]
-                    for engine, url, expression, is_sql in jobs:
-                        record = measured(engine, url, expression, timestamp, is_sql)
-                        row["endpoints"][engine] = record
-                        # Persist each completed request even if the next service never returns.
-                        journal.write(json.dumps({"query_id": query["id"], "evaluation_ms": timestamp,
-                                                  "engine": engine, **record}, allow_nan=False) + "\n")
-                        journal.flush()
-                    ep = row["endpoints"]
-                    row["pairs"] = {name: compare_pair(ep, backend, baseline, args.rtol, args.atol)
-                                    for name, backend, baseline in (
-                                        ("promql", "asap_promql", "prometheus"),
-                                        ("sql", "asap_sql", "clickhouse"),
-                                        ("metricsql", "asap_metricsql", "victoriametrics"))}
-                    row["oracle_parity"] = compare_pair(ep, "clickhouse", "prometheus", 1e-9, 1e-12)["correctness"]
-                    row["victoriametrics"] = compare_pair(ep, "victoriametrics", "prometheus", 1e-9, 1e-12)["correctness"]
-                    row["sql"], row["promql"] = [row["pairs"][name]["correctness"] for name in ("sql", "promql")]
-                    if not row["oracle_parity"]["equal"]:
-                        row["pairs"]["sql"].update(eligible_for_query_comparison=False, query_latency_ratio=None,
-                                                    oracle_reason="ClickHouse/Prometheus translation parity unavailable or failed")
-                    row["execution"] = [ep[name].get("execution", "failed") for name in ("asap_promql", "asap_sql")]
-                    required = getattr(args, "required_pairs", None) or ["promql", "sql", "metricsql"]
-                    row["acceptance_scope"] = {"required_pairs": required, "full_benefit_acceptance": False}
-                    row["passed"] = all(row["pairs"][name]["correctness"]["equal"] and
-                                        (not args.require_warm or row["pairs"][name]["eligible_for_query_comparison"])
-                                        for name in required)
-                    if "sql" in required:
-                        row["passed"] &= row["oracle_parity"]["equal"]
-                except Exception as error:
-                    row.update(passed=False, error=str(error))
-                row["responses"] = {k: v["response"] for k, v in row["endpoints"].items() if "response" in v}
-                row["headers"] = {k: v.get("headers", {}) for k, v in row["endpoints"].items()}
-                row["measurements"] = {k: {"latency_ns": v["latency_ns"], "resources": v["resources"]}
-                                       for k, v in row["endpoints"].items()}
-                results.append(row["passed"])
-                output.write(json.dumps(row, allow_nan=False) + "\n")
-                output.flush()
-    return 0 if results and all(results) else 1
-
-
-def main():
-    parser = argparse.ArgumentParser(description=__doc__)
-    commands = parser.add_subparsers(dest="command", required=True)
-    emit = commands.add_parser("manifest")
-    emit.add_argument("--dataset", choices=PROFILES, required=True)
-    emit.add_argument("--filter-value")
-    emit.add_argument("--output", type=Path, required=True)
-    check = commands.add_parser("run")
-    check.add_argument("--manifest", type=Path, required=True)
-    check.add_argument("--loaded-data", type=Path, required=True)
-    check.add_argument("--output", type=Path, required=True)
-    for endpoint in ("prometheus", "victoriametrics", "clickhouse", "asap-prometheus", "asap-clickhouse"):
-        check.add_argument("--" + endpoint, required=True)
-    check.add_argument("--asap-metricsql", help="ASAP MetricsQL service paired with native VM; absent means unvalidated VM pair")
-    check.add_argument("--required-pair", dest="required_pairs", choices=("promql", "sql", "metricsql"), action="append",
-                       help="explicit partial acceptance scope; default requires all three pairs")
-    check.add_argument("--start-ms", type=int)
-    check.add_argument("--end-ms", type=int)
-    check.add_argument("--query-name", action="append", default=[])
-    check.add_argument("--rtol", type=float, default=1e-9)
-    check.add_argument("--atol", type=float, default=1e-12)
-    check.add_argument("--require-warm", action="store_true")
-    check.add_argument("--components", type=Path)
-    args = parser.parse_args()
-    if args.command == "manifest":
-        with args.output.open("x") as out:
-            json.dump(corpus(args.dataset, args.filter_value), out, indent=2)
-        return 0
-    if any(not math.isfinite(v) or v < 0 for v in (args.rtol, args.atol)):
-        parser.error("tolerances must be finite and nonnegative")
-    return run(args)
-
-
-if __name__ == "__main__":
-    raise SystemExit(main())
diff --git a/tools/shared-workload/dataset.py b/tools/shared-workload/dataset.py
deleted file mode 100644
index fcca4a479..000000000
--- a/tools/shared-workload/dataset.py
+++ /dev/null
@@ -1,139 +0,0 @@
-#!/usr/bin/env python3
-"""Create matched Prometheus-client exposition and ClickHouse rows."""
-import argparse
-import csv
-from decimal import Decimal
-import hashlib
-import json
-import math
-from pathlib import Path
-
-
-def synthetic(groups, members, start_ms, duration_ms):
-    for step in range(duration_ms // 100 + 1):
-        for group in range(groups):
-            for member in range(members):
-                labels = {"label_0": f"g{group:06d}", "label_1": str(member),
-                          "job": "fake-metrics", "instance": "synthetic:8000"}
-                ts = start_ms + step * 100
-                yield "fake_metric", labels, ts, float(1 + group % 19 + member + (step % 31) / 31)
-                yield "fake_metric_counter_total", labels, ts, float((step % 997) * (member + 1))
-
-
-def trace(path, dataset):
-    with path.open() as source:
-        if dataset == "google":
-            # Existing ASAPCollector mapper JSONL preserves original trace identities.
-            for line in source:
-                row = json.loads(line)
-                if row["metric"] != "google_cluster_cpu_rate":
-                    continue
-                labels = row["attributes"]
-                if not {"service", "task", "host"} <= labels.keys():
-                    raise ValueError("Google mapper record is missing service/task/host identity")
-                ts = Decimal(str(row["timestamp_ms"]))
-                if ts != int(ts):
-                    raise ValueError("sub-millisecond trace timestamp")
-                yield row["metric"], labels, int(ts), float(row["value"])
-        else:
-            # Official Alibaba 2018 container_usage.csv has no header.
-            for row in csv.reader(source):
-                if len(row) != 11:
-                    raise ValueError("expected 11 columns from Alibaba 2018 container_usage.csv")
-                value = float(row[3])
-                if value < 0 or value == 101 or not math.isfinite(value):
-                    raise ValueError("invalid Alibaba CPU utilization; select/clean source explicitly")
-                ts = Decimal(row[2]) * 1000
-                if ts != int(ts):
-                    raise ValueError("sub-millisecond trace timestamp")
-                yield "alibaba_container_cpu_util", {"machine_id": row[1], "container_id": row[0]}, int(ts), value
-
-
-def write(root, records, max_samples, provenance=None):
-    from prometheus_client import CollectorRegistry
-    from prometheus_client.core import Metric
-    from prometheus_client.openmetrics.exposition import generate_latest
-    count, first, last = 0, None, None
-    latest = {}
-    root.mkdir(parents=True, exist_ok=False)
-    with (root / "samples.openmetrics").open("wb") as prom, (root / "samples.jsonl").open("w") as sql:
-        for metric, labels, ts, value in records:
-            if count >= max_samples:
-                raise ValueError("sample budget exceeded; partial output must not be loaded")
-            if not math.isfinite(value) or not isinstance(ts, int) or ts < 0:
-                raise ValueError("samples must be finite and have nonnegative integer timestamps")
-            key = (metric, tuple(sorted(labels.items())))
-            if key in latest and ts <= latest[key]:
-                raise ValueError("duplicate or out-of-order sample within a series")
-            latest[key] = ts
-            family = Metric(metric, "Evaluation sample", "unknown")
-            family.add_sample(metric, labels, value, timestamp=ts / 1000)
-            class Collector:
-                def collect(self):
-                    yield family
-            registry = CollectorRegistry()
-            registry.register(Collector())
-            # Historical sample stream, not repeated HELP/TYPE declarations.
-            prom.write(b"".join(line + b"\n" for line in generate_latest(registry).splitlines()
-                                if not line.startswith(b"#")))
-            sql.write(json.dumps(dict(metric=metric, labels=labels, ts_ms=ts, value=value)) + "\n")
-            first = min(first, ts) if first is not None else ts
-            last = max(last, ts) if last is not None else ts
-            count += 1
-        prom.write(b"# EOF\n")
-    if not count:
-        raise ValueError("empty dataset")
-    hashes = {}
-    for file in (root / "samples.openmetrics", root / "samples.jsonl"):
-        digest = hashlib.sha256()
-        with file.open("rb") as data:
-            for block in iter(lambda: data.read(1024 * 1024), b""):
-                digest.update(block)
-        hashes[file.name] = digest.hexdigest()
-    metadata = dict(samples=count, series=len(latest), start_ms=first, end_ms=last,
-                    sha256=hashes, provenance=provenance or {})
-    (root / "data-manifest.json").write_text(json.dumps(metadata, indent=2))
-    return metadata
-
-
-def main():
-    parser = argparse.ArgumentParser(description=__doc__)
-    parser.add_argument("--dataset", choices=("synthetic", "google", "alibaba"), required=True)
-    parser.add_argument("--input", type=Path)
-    parser.add_argument("--output", type=Path, required=True)
-    parser.add_argument("--groups", type=int, default=10)
-    parser.add_argument("--members", type=int, default=4)
-    parser.add_argument("--start-ms", type=int, default=1700000000000)
-    parser.add_argument("--duration-ms", type=int, default=120000)
-    parser.add_argument("--max-samples", type=int, default=1000000)
-    parser.add_argument("--scale-plan", type=Path, help="synthetic scale.json; overrides group/member/time settings, not sample budget")
-    args = parser.parse_args()
-    if args.scale_plan:
-        if args.dataset != "synthetic":
-            parser.error("synthetic scale plans cannot rescale real traces")
-        scale = json.loads(args.scale_plan.read_text())
-        for name in ("groups", "members", "start_ms", "duration_ms"):
-            setattr(args, name, scale[name])
-    if min(args.groups, args.members, args.max_samples) < 1 or args.duration_ms < 0 or args.duration_ms % 100:
-        parser.error("counts must be positive and duration nonnegative")
-    if args.dataset != "synthetic" and not args.input:
-        parser.error("trace profiles require --input")
-    if args.dataset == "synthetic" and (args.duration_ms // 100 + 1) * args.groups * args.members * 2 > args.max_samples:
-        parser.error("synthetic cell exceeds --max-samples; increase budget explicitly")
-    records = synthetic(args.groups, args.members, args.start_ms, args.duration_ms) if args.dataset == "synthetic" else trace(args.input, args.dataset)
-    provenance = {"dataset": args.dataset, "generator": "prometheus_client", "groups": args.groups if args.dataset == "synthetic" else None,
-                  "members": args.members if args.dataset == "synthetic" else None,
-                  "scrape_ms": 100 if args.dataset == "synthetic" else None}
-    if args.scale_plan:
-        provenance["scale_plan"] = scale
-    if args.input:
-        digest = hashlib.sha256()
-        with args.input.open("rb") as source:
-            for block in iter(lambda: source.read(1024 * 1024), b""):
-                digest.update(block)
-        provenance.update(input=str(args.input.resolve()), input_sha256=digest.hexdigest())
-    print(json.dumps(write(args.output, records, args.max_samples, provenance)))
-
-
-if __name__ == "__main__":
-    main()
diff --git a/tools/shared-workload/differential.py b/tools/shared-workload/differential.py
deleted file mode 100644
index 3ea43c183..000000000
--- a/tools/shared-workload/differential.py
+++ /dev/null
@@ -1,130 +0,0 @@
-#!/usr/bin/env python3
-"""Compare generated query values on already loaded isolated fixture engines."""
-import argparse
-import base64
-import json
-import math
-import os
-import urllib.parse
-import urllib.request
-from pathlib import Path
-
-
-def get_json(url, params):
-    with urllib.request.urlopen(url + "/api/v1/query?" + urllib.parse.urlencode(params)) as response:
-        result = json.load(response)
-    if result["status"] != "success":
-        raise ValueError(result)
-    return unique_vector((item["metric"], item["value"][1]) for item in result["data"]["result"])
-
-
-def unique_vector(rows):
-    vector = {}
-    for labels, value in rows:
-        key = tuple(sorted(labels.items()))
-        if key in vector:
-            raise ValueError(f"duplicate output label set: {dict(key)}")
-        vector[key] = float(value)
-    return vector
-
-
-def failure(error):
-    return dict(error=error.read().decode() if hasattr(error, "read") else str(error))
-
-
-def compare(expected, actual):
-    if expected.keys() != actual.keys():
-        return dict(equal=False, reason="label sets differ", expected_count=len(expected), actual_count=len(actual))
-    differences = [dict(labels=dict(key), expected=expected[key], actual=actual[key])
-                   for key in expected if not math.isclose(expected[key], actual[key], rel_tol=1e-9, abs_tol=1e-12)]
-    return dict(equal=not differences, differences=differences[:5])
-
-
-def compare_topk(population, actual, group_labels, k):
-    groups = {}
-    selected = {}
-    for labels, value in population.items():
-        group = tuple((name, dict(labels).get(name)) for name in group_labels)
-        groups.setdefault(group, {})[labels] = value
-    for labels, value in actual.items():
-        if labels not in population or not math.isclose(value, population[labels], rel_tol=1e-9, abs_tol=1e-12):
-            return dict(equal=False, reason="TopK returned an unknown series or incorrect score")
-        group = tuple((name, dict(labels).get(name)) for name in group_labels)
-        selected.setdefault(group, {})[labels] = value
-    for group, candidates in groups.items():
-        output = selected.get(group, {})
-        if len(output) != min(k, len(candidates)):
-            return dict(equal=False, reason="TopK group cardinality differs")
-        cutoff = sorted(candidates.values(), reverse=True)[min(k, len(candidates)) - 1]
-        if any(value < cutoff for value in output.values()) or any(
-                value > cutoff and labels not in output for labels, value in candidates.items()):
-            return dict(equal=False, reason="TopK violated the cutoff ordering")
-    return dict(equal=True, equivalence="TopK cutoff admissibility; ties may select different labels")
-
-
-def main():
-    parser = argparse.ArgumentParser(description=__doc__)
-    parser.add_argument("--manifest", type=Path, required=True)
-    parser.add_argument("--output", type=Path, required=True)
-    parser.add_argument("--prometheus", required=True)
-    parser.add_argument("--victoriametrics", required=True)
-    parser.add_argument("--clickhouse", required=True)
-    parser.add_argument("--database", required=True)
-    parser.add_argument("--loaded-data-manifest", type=Path, action="append", default=[])
-    parser.add_argument("--evaluation-ms", type=int)
-    parser.add_argument("--query-name", action="append", default=[])
-    args = parser.parse_args()
-    if not args.database.replace("_", "").isalnum():
-        parser.error("database must be an identifier")
-    manifest = json.loads(args.manifest.read_text())
-    evaluation_ms = args.evaluation_ms if args.evaluation_ms is not None else manifest["end_ms"]
-    records = []
-    for query in manifest["queries"]:
-        if args.query_name and query["name"] not in args.query_name:
-            continue
-        record = dict(name=query["name"], window=query["window"], filtered=query["filtered"])
-        params = dict(query=query["promql"], time=evaluation_ms / 1000)
-        try:
-            baseline = get_json(args.prometheus, params)
-            population = get_json(args.prometheus, dict(params, query=query["topk_input_promql"])) if "topk_input_promql" in query else None
-            def evaluate(actual):
-                return compare_topk(population, actual, query["topk_group_labels"], query["topk_k"]) if population is not None else compare(baseline, actual)
-            record["prometheus_rows"] = len(baseline)
-            for route, expression in (("victoriametrics", query["metricsql"]),
-                                      ("victoriametrics_prometheus_variant", query["metricsql_prometheus_variant"])):
-                try:
-                    record[route] = evaluate(get_json(
-                        args.victoriametrics, dict(params, query=expression)))
-                except Exception as error:
-                    record[route] = failure(error)
-            if query["clickhouse_sql"]:
-                sql = (query["clickhouse_sql"].replace("{eval_ms}", str(evaluation_ms))
-                       .replace("{lookback_ms}", str(manifest["semantics"]["lookback_ms"]))
-                       + " FORMAT JSONEachRow")
-                headers = {}
-                user = os.environ.get("CLICKHOUSE_USER")
-                if user:
-                    credential = user + ":" + os.environ.get("CLICKHOUSE_PASSWORD", "")
-                    headers["Authorization"] = "Basic " + base64.b64encode(credential.encode()).decode()
-                request = urllib.request.Request(args.clickhouse + "/?" + urllib.parse.urlencode(
-                    dict(database=args.database)), data=sql.encode(), headers=headers)
-                with urllib.request.urlopen(request) as response:
-                    rows = [json.loads(line) for line in response if line.strip()]
-                actual = unique_vector((row["labels"], row["value"]) for row in rows)
-                record["clickhouse"] = evaluate(actual)
-            else:
-                record["clickhouse"] = dict(status="unsupported")
-        except Exception as error:
-            record["error"] = error.read().decode() if hasattr(error, "read") else str(error)
-        records.append(record)
-    args.output.write_text(json.dumps(dict(manifest=str(args.manifest.resolve()),
-                                          evaluation_ms=evaluation_ms,
-                                          loaded_data_manifests=[str(path.resolve()) for path in args.loaded_data_manifest],
-                                          numeric_tolerance=dict(relative=1e-9, absolute=1e-12),
-                                          results=records), indent=2))
-    print(json.dumps({engine: sum(record.get(engine, {}).get("equal", False) for record in records)
-                      for engine in ("clickhouse", "victoriametrics", "victoriametrics_prometheus_variant")}))
-
-
-if __name__ == "__main__":
-    main()
diff --git a/tools/shared-workload/fixture-results.md b/tools/shared-workload/fixture-results.md
deleted file mode 100644
index f0409d293..000000000
--- a/tools/shared-workload/fixture-results.md
+++ /dev/null
@@ -1,47 +0,0 @@
-# Small-fixture translation checks
-
-These are translation checks, not ASAP acceleration measurements. No backend
-plan or materialization was preselected or measured by this tool.
-
-The local dataset root is `/mydata/shared-workload-study`. Two deterministic files
-were loaded into each engine: `fixture-v2-100ms-10g-4m` and
-`reset-fixture-100ms-10g-4m`. Each contains 24,040 samples, 10 groups, four members
-per group, and one minute of 100ms observations. The second starts 200 seconds
-after the first and resets each counter every 97 steps. Together they contain
-48,080 samples and exercise a gap in history. Their manifests record each file's
-size and SHA256. Larger-window queries see partial history in this fixture.
-
-The engines were ClickHouse 26.8.2.7, Prometheus 3.14.0, and VictoriaMetrics 1.126.0.
-The ClickHouse schema is documented in [README.md](README.md). All three engines
-received the same rows; Prometheus used OpenMetrics-created TSDB blocks and
-VictoriaMetrics used the text import API. The Prometheus and VictoriaMetrics
-processes were isolated fixture containers; ClickHouse used a separate fixture
-database. Resource limits were not matched because this was a correctness check.
-
-| Check | ClickHouse vs Prometheus | Native VictoriaMetrics vs Prometheus | VM Prometheus-named variant |
-|---|---:|---:|---:|
-| 280 query/window/filter cases, reset fixture endpoint | 280 pass | 170 pass | 220 pass |
-| 20 rate/increase cases, 150ms after last sample | 20 pass | 0 pass | 0 pass |
-| 10 spatial cases at the exact 5m lookback boundary | 10 pass | 10 pass | 10 pass |
-| 10 spatial cases 1ms past lookback | 10 pass | 10 pass | 10 pass |
-
-Values use 1e-9 relative / 1e-12 absolute tolerance. Ten temporal-count TopK
-cases have tied cutoff scores; those pass cutoff admissibility against the
-full Prometheus population rather than requiring the same arbitrary members.
-Metric names remain part of ordinary label comparison. Native VictoriaMetrics
-differences include retained metric names and counter extrapolation; even its
-Prometheus-named functions did not establish parity in this version.
-
-Reports are in `final-reset-manifest/differential.json`,
-`final-reset-manifest/end-gap.json`,
-`final-boundary-manifest/lookback-boundary.json`, and
-`final-reset-manifest/lookback-expired.json`. Reports list both loaded dataset
-manifests. The earlier `fixture-v3-100ms-10g-4m/differential.json` used Prometheus
-2.55.1 and recorded 20 differences due to its inclusive temporal left endpoint;
-it is retained as a version-mismatch diagnostic. The final SQL targets the tested
-Prometheus 3.14 left-exclusive temporal and instant-lookback behavior.
-
-Remaining acceptance work includes zero/constant and irregular missing-sample
-fixtures, every requested composition, full repeated execution schedules,
-Planner candidate/selection capture, backend warm/hybrid/fallback classification,
-and scale/performance runs. These checks do not establish those claims.
diff --git a/tools/shared-workload/generate.py b/tools/shared-workload/generate.py
deleted file mode 100644
index 3b83bc14b..000000000
--- a/tools/shared-workload/generate.py
+++ /dev/null
@@ -1,193 +0,0 @@
-#!/usr/bin/env python3
-"""Generate bounded deterministic sensitivity data and a cross-engine query manifest."""
-import argparse
-import hashlib
-import json
-from pathlib import Path
-
-WINDOWS = {"1m": 60_000, "10m": 600_000, "1h": 3_600_000,
-           "6h": 21_600_000, "24h": 86_400_000}
-QUANTILES = (.5, .75, .9, .95, .99)
-
-
-def quantile_sql(q):
-    # PromQL interpolates between adjacent sorted samples at rank q*(n-1).
-    rank = f"({q} * (length(samples) - 1))"
-    lower = f"samples[toUInt64(floor({rank})) + 1]"
-    upper = f"samples[toUInt64(ceil({rank})) + 1]"
-    return f"({lower} + ({upper} - {lower}) * ({rank} - floor({rank})))"
-
-
-def counter_sql(temporal, window_ms, rate):
-    samples = f"SELECT labels, arraySort(x -> x.1, groupArray((ts_ms, value))) AS samples {temporal}"
-    edges = ("SELECT labels, samples, length(samples) AS n, samples[1].1 AS first_ts, "
-             "samples[n].1 AS last_ts, samples[1].2 AS first_value, "
-             "samples[n].2 AS last_value FROM (" + samples + ") WHERE n >= 2")
-    corrected = ("SELECT *, (last_ts-first_ts)/1000. AS sampled, sampled/(n-1) AS average, "
-                 "last_value-first_value + arraySum(i -> if(samples[i].2 < samples[i-1].2, "
-                 "samples[i-1].2, 0.), range(2,n+1)) AS corrected, "
-                 f"(first_ts - ({{eval_ms}} - {window_ms}))/1000. AS start_gap, "
-                 "({eval_ms}-last_ts)/1000. AS end_gap FROM (" + edges + ")")
-    extrapolated = ("SELECT labels, corrected, sampled, "
-                    "least(if(start_gap >= average*1.1, average/2, start_gap), "
-                    "if(corrected > 0, sampled*(first_value/corrected), inf)) AS start_extra, "
-                    "if(end_gap >= average*1.1, average/2, end_gap) AS end_extra "
-                    "FROM (" + corrected + ")")
-    divisor = f" / {window_ms / 1000.}" if rate else ""
-    return ("SELECT labels, corrected*((sampled+start_extra+end_extra)/sampled)"
-            f"{divisor} AS value FROM ({extrapolated})")
-
-
-def queries(window, filtered=False):
-    suffix = '{label_0="g000000"}' if filtered else ""
-    selector = "data" + suffix
-    predicate = " AND labels['label_0'] = 'g000000'" if filtered else ""
-    scan = f"FROM raw_samples WHERE metric = 'data'{predicate}"
-    instant = (f"SELECT labels, argMax(value, ts_ms) AS value {scan} "
-               "AND ts_ms > {eval_ms} - {lookback_ms} AND ts_ms <= {eval_ms} GROUP BY labels")
-    temporal = (f"{scan} AND ts_ms > {{eval_ms}} - {WINDOWS[window]} "
-                "AND ts_ms <= {eval_ms} GROUP BY labels")
-    by_group = "map('label_0', labels['label_0'])"
-    result = []
-
-    def add(name, promql, sql, cadence=60_000, **extra):
-        compatible = promql.replace("rate(", "rate_prometheus(").replace("increase(", "increase_prometheus(")
-        if name != "spatial_topk":
-            compatible = f'label_del({compatible}, "__name__")'
-        result.append(dict(name=name, promql=promql, metricsql=promql,
-                           metricsql_prometheus_variant=compatible,
-                           clickhouse_sql=sql, interval_ms=cadence,
-                           translation_status="supported" if sql else "unsupported",
-                           filtered=filtered, **extra))
-
-    for agg in ("sum", "count"):
-        function = "sum(value)" if agg == "sum" else "toFloat64(count())"
-        add(f"spatial_{agg}", f"{agg} by(label_0)({selector})",
-            f"SELECT {by_group} AS labels, {function} AS value FROM ({instant}) GROUP BY labels", 1000)
-    add("spatial_topk", f"topk by(label_0)(3, {selector})",
-        f"SELECT mapUpdate(labels, map('__name__', 'data')) AS labels, value FROM ({instant}) "
-        "ORDER BY value DESC LIMIT 3 BY labels['label_0']", 1000,
-        tie_policy="Equal-score cutoff membership may differ; strict label comparison reports such differences.")
-    for q in QUANTILES:
-        grouped = (f"SELECT {by_group} AS labels, arraySort(groupArray(value)) AS samples "
-                   f"FROM ({instant}) GROUP BY labels")
-        add(f"spatial_quantile_{q}", f"quantile by(label_0)({q}, {selector})",
-            f"SELECT labels, {quantile_sql(q)} AS value FROM ({grouped})", 1000)
-    grouped_sum = f"SELECT {by_group} AS labels, sum(value) AS value FROM ({instant}) GROUP BY labels"
-    add("nested_spatial_sum", f"sum(sum by(label_0)({selector}))",
-        f"SELECT map() AS labels, sum(value) AS value FROM ({grouped_sum}) HAVING count() > 0", 1000)
-    add("nested_spatial_topk", f"topk(3, sum by(label_0)({selector}))",
-        f"SELECT labels, value FROM ({grouped_sum}) ORDER BY value DESC LIMIT 3", 1000)
-    for agg in ("sum", "count"):
-        function = "sum(value)" if agg == "sum" else "toFloat64(count())"
-        sql = f"SELECT labels, {function} AS value {temporal}"
-        prom = f"{agg}_over_time({selector}[{window}])"
-        add(f"temporal_{agg}", prom, sql)
-        add(f"temporal_{agg}_spatial_sum", f"sum by(label_0)({prom})",
-            f"SELECT {by_group} AS labels, sum(value) AS value FROM ({sql}) GROUP BY labels")
-        add(f"temporal_{agg}_spatial_topk", f"topk by(label_0)(3, {prom})",
-            f"SELECT labels, value FROM ({sql}) ORDER BY value DESC LIMIT 3 BY labels['label_0']",
-            topk_input_promql=prom, topk_group_labels=["label_0"], topk_k=3)
-    quantiles = {}
-    for q in QUANTILES:
-        sql = (f"SELECT labels, {quantile_sql(q)} AS value FROM "
-               f"(SELECT labels, arraySort(groupArray(value)) AS samples {temporal})")
-        quantiles[q] = sql
-        add(f"temporal_quantile_{q}", f"quantile_over_time({q}, {selector}[{window}])", sql)
-    add("quantile_ratio", f"quantile_over_time(0.9, {selector}[{window}]) / "
-        f"quantile_over_time(0.5, {selector}[{window}])",
-        f"SELECT a.labels AS labels, a.value / b.value AS value FROM ({quantiles[.9]}) a "
-        f"INNER JOIN ({quantiles[.5]}) b ON a.labels = b.labels")
-    for agg in ("rate", "increase"):
-        prom = f"{agg}({selector}[{window}])"
-        sql = counter_sql(temporal, WINDOWS[window], agg == "rate")
-        add(agg, prom, sql)
-        add(f"{agg}_spatial_sum", f"sum by(label_0)({prom})",
-            f"SELECT {by_group} AS labels, sum(value) AS value FROM ({sql}) GROUP BY labels")
-        add(f"{agg}_spatial_topk", f"topk by(label_0)(3, {prom})",
-            f"SELECT labels, value FROM ({sql}) ORDER BY value DESC LIMIT 3 BY labels['label_0']")
-    return result
-
-
-def manifest(groups, members, duration_ms, scrape_ms):
-    return dict(schema_version=1, purpose="synthetic sensitivity; separate from real o11y coverage",
-                cardinality_definition="label_0 groups; total series = groups * members",
-                groups=groups, members_per_group=members, total_series=groups * members,
-                duration_ms=duration_ms, scrape_ms=scrape_ms,
-                total_samples=(duration_ms // scrape_ms + 1) * groups * members,
-                semantics=dict(temporal_bounds="(eval_ms - window_ms, eval_ms]",
-                               instant_bounds="(eval_ms - lookback_ms, eval_ms] latest per series (Prometheus 3.14)",
-                               values="finite nonnegative counter with deterministic resets",
-                               excluded="NaN, Inf, stale markers, duplicate timestamps",
-                               quantile="linear interpolation at q*(n-1)",
-                               equality="labels exact; numeric tolerance must be reported; not bit-strict",
-                               lookback_ms=300_000),
-                queries=[dict(window=window, window_ms=ms, **query)
-                         for window, ms in WINDOWS.items() for filtered in (False, True)
-                         for query in queries(window, filtered)])
-
-
-def write_data(directory, groups, members, duration_ms, scrape_ms, start_ms, reset_steps):
-    """Stream in timestamp order; memory does not grow with the requested dataset."""
-    paths = [directory / "samples.prom", directory / "samples.jsonl", directory / "samples.openmetrics"]
-    hashes = [hashlib.sha256() for _ in paths]
-    with paths[0].open("xb") as prom, paths[1].open("xb") as sql, paths[2].open("xb") as om:
-        for step in range(duration_ms // scrape_ms + 1):
-            timestamp = start_ms + step * scrape_ms
-            for group in range(groups):
-                for member in range(members):
-                    labels = {"label_0": f"g{group:06d}", "member": f"m{member:04d}"}
-                    # Different slopes and reset phases make grouped TopK nondegenerate.
-                    phase = (step + member * 17 + group * 13) % reset_steps
-                    value = phase * (member + 1) + group % 97
-                    label_text = ",".join(f'{key}="{value}"' for key, value in labels.items())
-                    lines = [f"data{{{label_text}}} {value} {timestamp}\n".encode(),
-                             (json.dumps(dict(metric="data", labels=labels, ts_ms=timestamp,
-                                              value=value), separators=(",", ":")) + "\n").encode(),
-                             f"data{{{label_text}}} {value} {timestamp // 1000}.{timestamp % 1000:03d}\n".encode()]
-                    for handle, digest, line in zip((prom, sql, om), hashes, lines):
-                        handle.write(line)
-                        digest.update(line)
-        om.write(b"# EOF\n")
-        hashes[2].update(b"# EOF\n")
-    return [dict(path=str(path.resolve()), bytes=path.stat().st_size, sha256=digest.hexdigest())
-            for path, digest in zip(paths, hashes)]
-
-
-def main():
-    parser = argparse.ArgumentParser(description=__doc__)
-    parser.add_argument("--output", type=Path, required=True)
-    parser.add_argument("--groups", type=int, default=10)
-    parser.add_argument("--members", type=int, default=4)
-    parser.add_argument("--duration-ms", type=int, default=60_000)
-    parser.add_argument("--scrape-ms", type=int, default=100)
-    parser.add_argument("--start-ms", type=int, default=1_700_000_000_000)
-    parser.add_argument("--max-samples", type=int, default=1_000_000)
-    parser.add_argument("--reset-steps", type=int, default=100_003)
-    parser.add_argument("--data", action="store_true", help="Actually stream data; default writes manifests only")
-    args = parser.parse_args()
-    if min(args.groups, args.members, args.scrape_ms, args.reset_steps) <= 0 or args.duration_ms < 0:
-        parser.error("groups, members, scrape must be positive; duration must be nonnegative")
-    if args.duration_ms % args.scrape_ms:
-        parser.error("duration must be an exact multiple of scrape_ms")
-    selected = manifest(args.groups, args.members, args.duration_ms, args.scrape_ms)
-    selected.update(start_ms=args.start_ms, end_ms=args.start_ms + args.duration_ms,
-                    reset_steps=args.reset_steps)
-    if args.data and selected["total_samples"] > args.max_samples:
-        parser.error(f"{selected['total_samples']} samples exceed explicit --max-samples budget")
-    args.output.mkdir(parents=True, exist_ok=True)
-    if args.data:
-        selected["artifacts"] = write_data(args.output, args.groups, args.members,
-                                           args.duration_ms, args.scrape_ms, args.start_ms, args.reset_steps)
-    grid = [dict(groups=10 ** exponent, members=args.members, duration=window,
-                 total_series=10 ** exponent * args.members,
-                 total_samples=(ms // args.scrape_ms + 1) * 10 ** exponent * args.members)
-            for exponent in range(1, 7) for window, ms in WINDOWS.items()]
-    with (args.output / "manifest.json").open("x") as handle:
-        json.dump(selected, handle, indent=2)
-    with (args.output / "grid.json").open("x") as handle:
-        json.dump(grid, handle, indent=2)
-
-
-if __name__ == "__main__":
-    main()
diff --git a/tools/shared-workload/load_dataset.py b/tools/shared-workload/load_dataset.py
deleted file mode 100644
index e76e2954e..000000000
--- a/tools/shared-workload/load_dataset.py
+++ /dev/null
@@ -1,57 +0,0 @@
-#!/usr/bin/env python3
-"""Load the same normalized JSONL samples into isolated evaluation services."""
-import argparse
-import hashlib
-import json
-from pathlib import Path
-import sys
-import urllib.request
-
-sys.path.insert(0, str(Path(__file__).resolve().parents[1] / "o11y-execution"))
-from replay import encode_write
-
-
-def main():
-    parser = argparse.ArgumentParser(description=__doc__)
-    parser.add_argument("--data", type=Path, required=True)
-    parser.add_argument("--remote-write", action="append", required=True,
-                        help="full write URL; repeat for baseline and ASAP receivers")
-    parser.add_argument("--clickhouse", required=True, help="HTTP URL including isolated database parameter")
-    parser.add_argument("--output", type=Path, required=True)
-    args = parser.parse_args()
-    if args.output.exists():
-        parser.error("receipt already exists; refusing to load again")
-    # Read and validate the completed manifest before any remote mutations.
-    manifest = json.loads((args.data / "data-manifest.json").read_text())
-    path = args.data / "samples.jsonl"
-    digest = hashlib.sha256()
-    with path.open("rb") as source:
-        for block in iter(lambda: source.read(1024 * 1024), b""):
-            digest.update(block)
-    if digest.hexdigest() != manifest["sha256"]["samples.jsonl"]:
-        raise ValueError("data hash does not match manifest")
-    def post(url, body, headers=None):
-        with urllib.request.urlopen(urllib.request.Request(url, data=body, headers=headers or {}), timeout=None) as response:
-            response.read()
-    def batch(rows):
-        encoded = encode_write([({**r["labels"], "__name__": r["metric"]}, r["value"], r["ts_ms"]) for r in rows])
-        for endpoint in args.remote_write:
-            post(endpoint, encoded, {"Content-Type": "application/x-protobuf", "Content-Encoding": "snappy",
-                                     "X-Prometheus-Remote-Write-Version": "0.1.0"})
-        post(args.clickhouse, ("INSERT INTO raw_samples FORMAT JSONEachRow\n" + "\n".join(json.dumps(r) for r in rows)).encode())
-    with path.open() as source:
-        pending = []
-        for line in source:
-            pending.append(json.loads(line))
-            if len(pending) == 1000:
-                batch(pending)
-                pending = []
-        if pending:
-            batch(pending)
-    with args.output.open("x") as out:
-        json.dump({"data": manifest, "remote_write": args.remote_write, "clickhouse": args.clickhouse,
-                   "scope": "all configured endpoints accepted batches; not proof of summary readiness"}, out, indent=2)
-
-
-if __name__ == "__main__":
-    main()
diff --git a/tools/shared-workload/planned-sum-evidence.md b/tools/shared-workload/planned-sum-evidence.md
deleted file mode 100644
index dd19fece7..000000000
--- a/tools/shared-workload/planned-sum-evidence.md
+++ /dev/null
@@ -1,78 +0,0 @@
-# Small planned PromQL chain: real execution, not benefits acceptance
-
-On 2026-09-12 the new `planned_run.py` completed one backend-local experiment:
-`sum_over_time(fake_metric[1m])`, 10 groups × 4 members, two metrics, 100ms samples,
-96,080 total samples / 80 series over two minutes. No ASAPCollector service ran.
-Evaluation times were 1700000060000 and 1700000120000 (milliseconds), with complete
-1m history for each. Every measured pair executed ASAP first, then Prometheus;
-client requests and subprocess execution had no deadlines.
-
-## Planning and materialization evidence
-
-The normal candidate exporter produced summary and whole-query fallback candidates.
-`calibrate_runtime.py` measured both in isolated runs, `update_global_profile.py`
-updated the shared implementation profile, candidates were re-exported/re-measured,
-and `calibrate.py` supplied complete measured cost quotes. The production compiler
-selected plan **1212003311198828710**, with no candidate override or hand-edited
-install artifact. Its projected workload was 1,000 repetitions; the held-out chain
-check below used **two** evaluations and is not a validation of that cost horizon.
-The exact alternative is backend-forwarded execution, not standalone native DB.
-
-Plan activation, matched ingestion and finite-input drain succeeded. Both post-drain
-readiness probes and both measured ASAP requests reported:
-
-- execution: warm / detail: asap;
-- summary readouts: 1 per request;
-- raw scans: 0;
-- exact-subquery RPCs: 0.
-
-Both matched comparisons passed rtol=1e-9 / atol=1e-12, with no missing or extra
-series/samples. Maximum relative value error was approximately 3.97e-16; this is
-floating-point-tolerant equality, not bitwise identity or a sketch rank guarantee.
-
-## Observed query timing (only two samples)
-
-| Endpoint | First | Second | Mean |
-|---|---:|---:|---:|
-| ASAP | 20.509ms | 26.854ms | 23.682ms |
-| Direct Prometheus | 9.067ms | 9.757ms | 9.412ms |
-
-ASAP was **slower** in this small debug-build run. The native/ASAP query-latency
-ratio was about 0.397, not a speedup. Readiness probes warmed ASAP first; native
-and fallback used separate empty TSDBs but shared the host and CPU set (0,1).
-Two observations, debug binaries and shared-host conditions cannot establish a
-performance distribution or extrapolate benefit at scale. Full lifecycle costs
-remain unaligned; `eligible_for_full_system_benefit` is false.
-
-## Reproduction and retained artifacts
-
-Generate with `dataset.py --dataset synthetic --groups 10 --members 4
---duration-ms 120000` (default start). Follow the calibration guide and the
-`planned_run.py` command in [ACCURACY_E2E.md](ACCURACY_E2E.md).
-The local evidence root is `/tmp/pr689-live.pZ4pd1`:
-
-- `discovery-{candidates.json,measurements/}` and `profile-{candidates.json,measurements/}`:
-  candidate manifests, raw calibration responses and phase measurements;
-- `costed.json`: compiler input with measured quotes;
-- `acceptance/run/trial-1/replay/`: planning, install/status, ingestion, drain,
-  summary readiness, paired queries, phase resources, storage and process lifecycle;
-- `acceptance/acceptance.json`: chain decision and limitations.
-
-Input OpenMetrics SHA256:
-`50d5b3d7dd7897a6232e1012692516909769aae066a9e5f1a8a0b161a8913054`.
-Costed snapshot SHA256:
-`46c1e797e6b2b2f57e0d47f96e4be82dd68970042fe15fabcf4b666dd735d838`.
-
-Binaries: Prometheus **3.5.0**; backend Rust **1.98.0 debug**, Rust sources from
-PR head `2d16f7fb` (subsequent harness-only edits); Planner
-`3be523fa0f06a905188e42cbe482d06aa843ba5d`; clean precompute dependency source
-`ASAPCollector@9b996305da9f8a2d840cb42714b50d05238a0500`; sketch library at CI's
-`8c03d7c68b7150710c79e70a6421971275614561`. The existing dirty dependency trees
-were not modified; a temporary dependency path override was reverted after build.
-Backend SHA256: `092c24eba9935ae065f84eba28e7dd743b677e503f323ea75e8d80471230d370`.
-Compiler SHA256: `0f1dd8817f75b0536697dcbc4a25bf311791a47a6c59b5beae36b814287e8cea`.
-
-This PromQL run does not validate SQL's Prometheus-3.14 boundary translation, VM
-semantics, large-scale benefit, or service-side limit removal. Services retained
-their own defaults; no service-side timeout occurred, and all queries completed
-naturally. Owned services were then terminated normally, with no forced kill.
diff --git a/tools/shared-workload/planned_run.py b/tools/shared-workload/planned_run.py
deleted file mode 100644
index 5e0c8b57c..000000000
--- a/tools/shared-workload/planned_run.py
+++ /dev/null
@@ -1,151 +0,0 @@
-#!/usr/bin/env python3
-"""Run one PromQL acceptance case through the production compiler and owned services."""
-import argparse
-from contextlib import closing
-from decimal import Decimal
-import hashlib
-import json
-from pathlib import Path
-import sqlite3
-import subprocess
-import tempfile
-import sys
-
-
-sys.path.insert(0, str(Path(__file__).resolve().parents[1] / "o11y-execution"))
-from replay import iter_samples
-
-
-def save(path, value):
-    path.write_text(json.dumps(value, indent=2) + "\n")
-
-
-def sha256(path):
-    digest = hashlib.sha256()
-    with path.open("rb") as source:
-        for block in iter(lambda: source.read(1024 * 1024), b""):
-            digest.update(block)
-    return digest.hexdigest()
-
-
-def prepare(data, manifest, query_id, snapshot, end_ms, repetitions):
-    metadata = json.loads((data / "data-manifest.json").read_text())
-    if metadata.get("provenance", {}).get("dataset") != manifest["dataset"]:
-        raise ValueError("dataset profile mismatch")
-    selected = [q for q in manifest["queries"] if q["id"] == query_id and q["status"] == "ready"]
-    if len(selected) != 1:
-        raise ValueError("select exactly one ready PromQL query ID")
-    query = selected[0]
-    for name, digest in metadata["sha256"].items():
-        if sha256(data / name) != digest:
-            raise ValueError("dataset hash mismatch")
-    end = metadata["end_ms"] if end_ms is None else end_ms
-    start = end - (repetitions - 1) * query["interval_ms"]
-    if repetitions < 1 or end > metadata["end_ms"] or start < metadata["start_ms"]:
-        raise ValueError("repetition interval exceeds loaded data")
-    if query["interval_ms"] != 1000 and start - query["window_ms"] < metadata["start_ms"]:
-        raise ValueError("first query lacks full temporal history")
-    registered = snapshot["query_workload"]
-    if registered.get("query_batch") or {q["query"] for q in registered["repeating_queries"]} != {query["promql"]}:
-        raise ValueError("costed snapshot must register exactly the selected query")
-    if snapshot.get("snapshot_version") != 3 or not snapshot.get("workload_cost_evidence", {}).get("quotes"):
-        raise ValueError("measured complete-workload cost evidence is required; discovery/demo costs are not deployment quotes")
-    return query, {"upstream_revision": "shared-workload:" + hashlib.sha256(json.dumps(manifest, sort_keys=True).encode()).hexdigest(),
-                   "queries": [{"id": query_id, "query": query["promql"], "eval_timestamp_ms": end}]}
-
-
-def prepare_metrics(source, output):
-    """Keep ordered input unchanged; sort valid interleaved series on disk."""
-    ordered, previous = True, -1
-    with source.open() as lines:
-        for _, _, timestamp in iter_samples(lines, require_global_order=False):
-            ordered = ordered and timestamp >= previous
-            previous = timestamp
-    if ordered:
-        return source
-    destination = output / "samples-ordered.openmetrics"
-    # SQLite keeps the sort off the Python heap for historical trace exports.
-    with tempfile.TemporaryDirectory(prefix="trace-sort-", dir=output) as temporary:
-        with closing(sqlite3.connect(str(Path(temporary) / "samples.sqlite"))) as database:
-            database.execute("PRAGMA cache_size=-8192")
-            database.execute("CREATE TABLE samples (timestamp INTEGER, ordinal INTEGER, line TEXT, PRIMARY KEY (timestamp, ordinal)) WITHOUT ROWID")
-            def rows():
-                with source.open() as lines:
-                    for ordinal, line in enumerate(lines):
-                        if not line.strip() or line.lstrip().startswith("#"):
-                            continue
-                        timestamp = int(Decimal(line.rsplit(None, 1)[1]) * 1000)
-                        yield timestamp, ordinal, line.rstrip("\n")
-            database.executemany("INSERT INTO samples VALUES (?, ?, ?)", rows())
-            database.commit()
-            with destination.open("x") as target:
-                for (line,) in database.execute("SELECT line FROM samples ORDER BY timestamp, ordinal"):
-                    target.write(line + "\n")
-                target.write("# EOF\n")
-    return destination
-
-
-def acceptance(folder):
-    replay = folder / "trial-1/replay"
-    readiness = json.loads((replay / "summary-readiness.json").read_text())
-    rows = json.loads((replay / "queries.json").read_text())
-    comparison = json.loads((replay / "comparison.json").read_text())
-    valid = bool(rows) and readiness["complete"] and all(
-        r["execution"] == "warm" and r.get("comparison", {}).get("equal")
-        and r["execution_provenance"].get("summary_readout_evaluations", 0) > 0
-        and r["execution_provenance"].get("exact_subquery_rpcs") == 0
-        and r.get("pair_order") == "backend_first" for r in rows)
-    return {"promql_chain_passed": valid, "occurrences": len(rows), "summary_readiness": readiness,
-            "pair": comparison["all_requests"], "planning_resources": comparison["planning_resources"],
-            "phase_resources": comparison["phase_resources"], "storage": comparison["storage"],
-            "isolated_baseline_service": comparison["isolated_baseline_service"],
-            "eligible_for_full_system_benefit": False,
-            "limitations": ["PromQL-only chain; SQL moving-time installation and MetricsQL orchestration are not covered",
-                            "owned baseline/fallback stores are distinct, but runs share a host and overlap in wall time",
-                            "resource phases are partial lifecycle evidence, not independently matched full system costs",
-                            "post-drain readiness probes warm ASAP caches before measured requests"],
-            "artifacts": str(replay.resolve())}
-
-
-def main():
-    parser = argparse.ArgumentParser(description=__doc__)
-    for name in ("data", "manifest", "snapshot", "compiler", "data-plane", "prometheus", "output"):
-        parser.add_argument("--" + name, type=Path, required=True)
-    parser.add_argument("--query-id", required=True)
-    parser.add_argument("--cpu-affinity", required=True)
-    parser.add_argument("--repetitions", type=int, default=2)
-    parser.add_argument("--end-ms", type=int)
-    parser.add_argument("--base-port", type=int, default=29410)
-    args = parser.parse_args()
-    query, corpus = prepare(args.data, json.loads(args.manifest.read_text()), args.query_id,
-                            json.loads(args.snapshot.read_text()), args.end_ms, args.repetitions)
-    args.output.mkdir(parents=True, exist_ok=False)
-    metrics = prepare_metrics(args.data / "samples.openmetrics", args.output)
-    save(args.output / "metrics-input.json", {"source": str((args.data / "samples.openmetrics").resolve()),
-         "source_sha256": sha256(args.data / "samples.openmetrics"),
-         "replay_input": str(metrics.resolve()), "replay_sha256": sha256(metrics),
-         "globally_sorted_copy": metrics != args.data / "samples.openmetrics"})
-    corpus_path = args.output / "corpus.json"
-    save(corpus_path, corpus)
-    results = args.output / "run"
-    command = [sys.executable, str(Path(__file__).resolve().parents[1] / "o11y-execution/run_comparison.py"),
-               "--metrics", str(metrics.resolve()), "--queries", str(corpus_path.resolve()),
-               "--snapshot", str(args.snapshot.resolve()), "--compiler", str(args.compiler.resolve()),
-               "--data-plane", str(args.data_plane.resolve()), "--prometheus", str(args.prometheus.resolve()),
-               "--output", str(results.resolve()), "--cpu-affinity", args.cpu_affinity,
-               "--base-port", str(args.base_port), "--trials", "1", "--repetitions", str(args.repetitions),
-               "--evaluation-step-ms", str(query["interval_ms"]), "--backend-first", "--wait-for-completion", "--require-summary-ready"]
-    save(args.output / "command.json", command)
-    # No subprocess deadline. Fresh services are owned and shut down only after replay returns.
-    completed = subprocess.run(command)
-    if completed.returncode:
-        save(args.output / "acceptance.json", {"promql_chain_passed": False, "returncode": completed.returncode,
-                                               "eligible_for_full_system_benefit": False, "artifacts": str(results.resolve())})
-        return completed.returncode
-    report = acceptance(results)
-    save(args.output / "acceptance.json", report)
-    return 0 if report["promql_chain_passed"] else 1
-
-
-if __name__ == "__main__":
-    raise SystemExit(main())
diff --git a/tools/shared-workload/requirements.txt b/tools/shared-workload/requirements.txt
deleted file mode 100644
index 8816e68af..000000000
--- a/tools/shared-workload/requirements.txt
+++ /dev/null
@@ -1 +0,0 @@
-prometheus-client==0.22.1
diff --git a/tools/shared-workload/resources.py b/tools/shared-workload/resources.py
deleted file mode 100644
index 84d8a4abb..000000000
--- a/tools/shared-workload/resources.py
+++ /dev/null
@@ -1,148 +0,0 @@
-"""Linux cgroup-v2 accounting; unavailable evidence remains null."""
-from pathlib import Path
-import argparse
-import json
-import os
-import subprocess
-import time
-
-
-def validate(components):
-    roots = [Path(c["cgroup"]).resolve() for c in components.values()]
-    if len(set(roots)) != len(roots) or any(a in b.parents for a in roots for b in roots if a != b):
-        raise ValueError("component cgroups must be disjoint, without parent/child overlap")
-    namespaces = []
-    for config in components.values():
-        if config.get("network_namespace_pid"):
-            identity = Path(f"/proc/{int(config['network_namespace_pid'])}/ns/net").stat().st_ino
-            if identity == Path("/proc/1/ns/net").stat().st_ino or identity in namespaces:
-                raise ValueError("network accounting requires distinct non-host namespaces")
-            namespaces.append(identity)
-
-
-def snapshot(components):
-    result = {}
-    for name, config in components.items():
-        root = Path(config["cgroup"])
-        row = {"sampled_ns": time.monotonic_ns()}
-        try:
-            row["cpu_usec"] = int(dict(line.split() for line in (root / "cpu.stat").read_text().splitlines())["usage_usec"])
-            row["memory_bytes"] = int((root / "memory.current").read_text())
-            io = [dict(item.split("=") for item in line.split()[1:]) for line in (root / "io.stat").read_text().splitlines()]
-            row["disk_read_bytes"] = sum(int(v.get("rbytes", 0)) for v in io)
-            row["disk_write_bytes"] = sum(int(v.get("wbytes", 0)) for v in io)
-            row["cgroup_identity"] = root.stat().st_ino
-        except (OSError, ValueError, KeyError) as error:
-            row["error"] = str(error)
-        # A dedicated network namespace is required; host net/dev is not per-process.
-        row["network"] = None
-        if config.get("network_namespace_pid"):
-            try:
-                net = Path(f"/proc/{int(config['network_namespace_pid'])}/net/dev").read_text().splitlines()[2:]
-                row["network"] = {"rx_bytes": sum(int(x.split(":")[1].split()[0]) for x in net),
-                                  "tx_bytes": sum(int(x.split(":")[1].split()[8]) for x in net)}
-            except (OSError, ValueError):
-                pass
-        result[name] = row
-    return result
-
-
-def delta(before, after):
-    rows = {}
-    for name, initial in before.items():
-        end = after[name]
-        if "error" in initial or "error" in end or initial.get("cgroup_identity") != end.get("cgroup_identity"):
-            rows[name] = {"error": "component accounting unavailable or cgroup replaced"}
-            continue
-        row = {key: end[key] - initial[key] for key in ("cpu_usec", "disk_read_bytes", "disk_write_bytes")}
-        if any(value < 0 for value in row.values()):
-            rows[name] = {"error": "accounting counter reset"}
-            continue
-        row.update(memory_before_bytes=initial["memory_bytes"], memory_after_bytes=end["memory_bytes"])
-        row["network"] = ({k: end["network"][k] - initial["network"][k] for k in ("rx_bytes", "tx_bytes")}
-                          if initial["network"] and end["network"] else None)
-        rows[name] = row
-    keys = ("cpu_usec", "disk_read_bytes", "disk_write_bytes", "memory_before_bytes", "memory_after_bytes")
-    total = {key: sum(row[key] for row in rows.values()) if rows and all(key in row for row in rows.values()) else None for key in keys}
-    return {"components": rows, "total": total,
-            "scope": "request interval across listed disjoint cgroups, including background work; endpoint memory snapshots are not peak RSS; network is per dedicated namespace and not summed across links"}
-
-
-def disk_usage(components):
-    """Allocated filesystem blocks, including retained data; not block-device I/O."""
-    result = {}
-    for name, config in components.items():
-        if not config.get("data_directory"):
-            result[name] = None
-            continue
-        try:
-            root = Path(config["data_directory"])
-            if not root.is_dir():
-                raise OSError("data directory unavailable")
-            total, seen = 0, set()
-            def fail(error):
-                raise error
-            for directory, _, files in os.walk(root, onerror=fail):
-                for path in [Path(directory)] + [Path(directory) / f for f in files]:
-                    st = path.lstat()
-                    identity = (st.st_dev, st.st_ino)
-                    if identity not in seen:
-                        total += st.st_blocks * 512
-                        seen.add(identity)
-            result[name] = total
-        except OSError:
-            result[name] = None
-    return result
-
-
-def main():
-    parser = argparse.ArgumentParser(description="Measure a complete load/build/query phase around an explicit command")
-    parser.add_argument("--components", type=Path, required=True)
-    parser.add_argument("--engine", required=True)
-    parser.add_argument("--output", type=Path, required=True)
-    parser.add_argument("--sample-seconds", type=float, default=0.1)
-    parser.add_argument("command", nargs=argparse.REMAINDER)
-    args = parser.parse_args()
-    command = args.command[1:] if args.command[:1] == ["--"] else args.command
-    if not command or not 0.01 <= args.sample_seconds <= 60 or args.output.exists():
-        parser.error("provide command, unused output, and sample interval in [0.01,60]")
-    components = json.loads(args.components.read_text())[args.engine]
-    validate(components)
-    directories = [Path(c["data_directory"]).resolve() for c in components.values() if c.get("data_directory")]
-    if len(set(directories)) != len(directories) or any(a in b.parents for a in directories for b in directories if a != b):
-        parser.error("storage directories must be disjoint")
-    storage_before = disk_usage(components)
-    before = snapshot(components)
-    peaks = {name: row.get("memory_bytes") for name, row in before.items()}
-    initial_values = list(peaks.values())
-    aggregate_peak = sum(initial_values) if initial_values and all(v is not None for v in initial_values) else None
-    start = time.monotonic_ns()
-    process = subprocess.Popen(command)
-    while True:
-        sample = snapshot(components)
-        for name, row in sample.items():
-            value = row.get("memory_bytes")
-            peaks[name] = max(peaks[name] or 0, value) if value is not None else peaks[name]
-        values = [row.get("memory_bytes") for row in sample.values()]
-        if values and all(v is not None for v in values):
-            aggregate_peak = max(aggregate_peak or 0, sum(values))
-        if process.poll() is not None:
-            break
-        time.sleep(args.sample_seconds)
-    elapsed = time.monotonic_ns() - start
-    report = delta(before, sample)
-    report.update(scope="whole wrapped command phase, including ingestion, summary build and idle/background work if included in command",
-                  engine=args.engine, command=command, returncode=process.returncode, elapsed_ns=elapsed,
-                  sampled_memory_peak_bytes=peaks, sampled_total_memory_peak_bytes=aggregate_peak,
-                  sample_seconds=args.sample_seconds, disk_allocated_before_bytes=storage_before,
-                  disk_allocated_after_bytes=disk_usage(components))
-    for key in ("disk_allocated_before_bytes", "disk_allocated_after_bytes"):
-        values = list(report[key].values())
-        report["total_" + key] = sum(values) if values and all(v is not None for v in values) else None
-    with args.output.open("x") as output:
-        json.dump(report, output, indent=2)
-    return process.returncode
-
-
-if __name__ == "__main__":
-    raise SystemExit(main())
diff --git a/tools/shared-workload/scale_plan.py b/tools/shared-workload/scale_plan.py
deleted file mode 100644
index 24d98eac7..000000000
--- a/tools/shared-workload/scale_plan.py
+++ /dev/null
@@ -1,91 +0,0 @@
-#!/usr/bin/env python3
-"""Plan explicit offline scale cells without allocating their datasets."""
-import argparse
-import json
-import math
-from pathlib import Path
-
-from accuracy_suite import corpus
-from generate import WINDOWS
-
-
-# Small correctness fixtures are deliberately distinct from benefit experiments.
-PROFILES = {
-    "smoke": (10, 4, "1m", 1),
-    "benefit": (1000, 16, "1h", 30),
-    "scale": (10000, 16, "6h", 60),
-    "cardinality": (1000000, 4, "1m", 1),
-}
-
-
-def plan(profile="benefit", groups=None, members=None, window=None,
-         evaluation_minutes=None, start_ms=1700000000000,
-         measured_bytes_per_sample=None):
-    defaults = PROFILES[profile]
-    groups = defaults[0] if groups is None else groups
-    members = defaults[1] if members is None else members
-    window = defaults[2] if window is None else window
-    minutes = defaults[3] if evaluation_minutes is None else evaluation_minutes
-    if min(groups, members, minutes) < 1 or start_ms < 0:
-        raise ValueError("groups, members and evaluation minutes must be positive; start must be nonnegative")
-    if measured_bytes_per_sample is not None and (not math.isfinite(measured_bytes_per_sample) or measured_bytes_per_sample <= 0):
-        raise ValueError("measured bytes per sample must be positive and finite")
-    window_ms = WINDOWS[window]
-    span = minutes * 60000
-    duration = window_ms + span
-    series = groups * members
-    samples = 2 * series * (duration // 100 + 1)
-    return {
-        "schema_version": 1, "profile": profile, "dataset": "synthetic",
-        "purpose": "correctness smoke only" if profile == "smoke" else "candidate benefit experiment; advantage is not guaranteed",
-        "groups": groups, "members": members, "window": window, "scrape_ms": 100,
-        "start_ms": start_ms, "duration_ms": duration,
-        "evaluation_start_ms": start_ms + window_ms,
-        "evaluation_end_ms": start_ms + duration,
-        "evaluation_minutes": minutes, "temporal_occurrences_per_query": minutes + 1,
-        "spatial_occurrences_per_query": span // 1000 + 1,
-        "series_per_metric": series, "total_series": 2 * series, "total_samples": samples,
-        "unfiltered_temporal_samples_per_query": series * (window_ms // 100),
-        "single_group_filtered_temporal_samples_per_query": members * (window_ms // 100),
-        "spatial_input_series_per_query": series, "spatial_sum_output_groups": groups,
-        "numeric_payload_bytes_uncompressed": samples * 16,
-        "measured_store_bytes_per_sample": measured_bytes_per_sample,
-        "estimated_store_bytes": math.ceil(samples * measured_bytes_per_sample) if measured_bytes_per_sample else None,
-        "storage_scope": "16-byte timestamp/value payload excludes labels and indexes and is not a disk estimate; optional store estimate uses caller-supplied pilot measurement for one store, not all system copies",
-    }
-
-
-def query_manifest(scale):
-    manifest = corpus("synthetic")
-    manifest["queries"] = [q for q in manifest["queries"]
-                           if q["interval_ms"] == 1000 or q["window"] == scale["window"]]
-    manifest["scale"] = scale
-    return manifest
-
-
-def main():
-    parser = argparse.ArgumentParser(description=__doc__)
-    parser.add_argument("--profile", choices=PROFILES, default="benefit")
-    parser.add_argument("--groups", type=int)
-    parser.add_argument("--members", type=int)
-    parser.add_argument("--window", choices=WINDOWS)
-    parser.add_argument("--evaluation-minutes", type=int)
-    parser.add_argument("--start-ms", type=int, default=1700000000000)
-    parser.add_argument("--measured-bytes-per-sample", type=float)
-    parser.add_argument("--output", type=Path, required=True)
-    args = parser.parse_args()
-    scale = plan(args.profile, args.groups, args.members, args.window,
-                 args.evaluation_minutes, args.start_ms, args.measured_bytes_per_sample)
-    args.output.mkdir(parents=True, exist_ok=False)
-    (args.output / "scale.json").write_text(json.dumps(scale, indent=2))
-    (args.output / "queries.json").write_text(json.dumps(query_manifest(scale), indent=2))
-    # Explicit requested cardinality/window matrix; planning never generates data.
-    matrix = [plan(args.profile, 10 ** exponent, scale["members"], window,
-                   scale["evaluation_minutes"], args.start_ms, args.measured_bytes_per_sample)
-              for exponent in range(1, 7) for window in WINDOWS]
-    (args.output / "matrix.json").write_text(json.dumps(matrix, indent=2))
-    print(json.dumps(scale))
-
-
-if __name__ == "__main__":
-    main()
diff --git a/tools/shared-workload/summarize_accuracy.py b/tools/shared-workload/summarize_accuracy.py
deleted file mode 100644
index 4472a1434..000000000
--- a/tools/shared-workload/summarize_accuracy.py
+++ /dev/null
@@ -1,53 +0,0 @@
-#!/usr/bin/env python3
-"""Summarize recorded service latency without claiming unmeasured system speedup."""
-import argparse
-from collections import defaultdict
-import json
-from pathlib import Path
-
-from accuracy_suite import comparison
-
-
-def summarize(rows):
-    groups = defaultdict(list)
-    for row in rows:
-        groups[row["query_id"]].append(row)
-    result = {}
-    for query, records in groups.items():
-        engines = {engine for row in records for engine in row["measurements"]}
-        result[query] = {
-            "occurrences": len(records), "passed": sum(r["passed"] for r in records),
-            "warm_occurrences": sum(r.get("execution") == ["warm", "warm"] for r in records),
-            "latency": {engine: comparison.distribution([r["measurements"][engine]["latency_ns"]
-                        for r in records if engine in r["measurements"]]) for engine in sorted(engines)},
-            "victoriametrics_equal": sum(r.get("victoriametrics", {}).get("equal", False) for r in records),
-            "endpoint_failures": {engine: sum(not r.get("endpoints", {}).get(engine, {}).get("success", False)
-                                               for r in records) for engine in sorted(engines)},
-            "pairs": {},
-        }
-        for name in ("promql", "sql", "metricsql"):
-            pairs = [r.get("pairs", {}).get(name, {}) for r in records]
-            eligible = bool(pairs) and all(p.get("eligible_for_query_comparison", False) for p in pairs)
-            result[query]["pairs"][name] = {
-                "correct_occurrences": sum(p.get("correctness", {}).get("equal", False) for p in pairs),
-                "query_comparison_eligible_occurrences": sum(p.get("eligible_for_query_comparison", False) for p in pairs),
-                "execution_counts": {route: sum(p.get("execution", "unavailable") == route for p in pairs)
-                                     for route in ("warm", "hybrid", "exact_fallback", "unknown", "unavailable", "failed")},
-                "paired_query_latency_ratio": (sum(p["latency_ns"]["baseline"] for p in pairs) /
-                                                sum(p["latency_ns"]["backend"] for p in pairs)) if eligible else None,
-                "eligible_for_benefit_conclusion": False,
-                "full_cost": None,
-                "reason": "complete isolated lifecycle costs are not supplied by endpoint replay",
-            }
-    return {"queries": result, "scope": "ASAP-first sequential HTTP latency including failures; no throughput or total-system speedup claim"}
-
-
-if __name__ == "__main__":
-    parser = argparse.ArgumentParser(description=__doc__)
-    parser.add_argument("input", type=Path)
-    parser.add_argument("--output", type=Path, required=True)
-    args = parser.parse_args()
-    with args.input.open() as source:
-        result = summarize(json.loads(line) for line in source)
-    with args.output.open("x") as output:
-        json.dump(result, output, indent=2)
diff --git a/tools/shared-workload/test_accuracy.py b/tools/shared-workload/test_accuracy.py
deleted file mode 100644
index fddc7a225..000000000
--- a/tools/shared-workload/test_accuracy.py
+++ /dev/null
@@ -1,271 +0,0 @@
-"""Contracts for dataset binding, matched HTTP replay and accounting boundaries."""
-import argparse
-from contextlib import contextmanager
-import json
-from pathlib import Path
-import tempfile
-import threading
-import unittest
-from unittest.mock import patch
-from http.server import BaseHTTPRequestHandler, ThreadingHTTPServer
-from urllib.parse import parse_qs, urlparse
-
-import accuracy_suite as suite
-import dataset
-import resources
-import load_dataset
-from summarize_accuracy import summarize
-
-
-@contextmanager
-def endpoints(route="warm", wrong=False):
-    calls = []
-    class Handler(BaseHTTPRequestHandler):
-        def log_message(self, *args):
-            pass
-
-        def do_GET(self):
-            query = parse_qs(urlparse(self.path).query)
-            calls.append((self.path, query))
-            value = "9" if wrong and self.path.startswith("/asap") else "8"
-            body = {"status": "success", "data": {"resultType": "vector", "result": [
-                {"metric": {"label_0": "g000000"}, "value": [float(query["time"][0]), value]}]}}
-            self.send_response(200)
-            self.send_header("x-asap-execution", route)
-            self.end_headers()
-            self.wfile.write(json.dumps(body).encode())
-
-        def do_POST(self):
-            body = self.rfile.read(int(self.headers["Content-Length"]))
-            calls.append((self.path, body))
-            self.send_response(200)
-            self.send_header("x-asap-execution", route)
-            self.end_headers()
-            self.wfile.write(b'{"labels":{"label_0":"g000000"},"value":8}\n')
-    server = ThreadingHTTPServer(("127.0.0.1", 0), Handler)
-    thread = threading.Thread(target=server.serve_forever, daemon=True)
-    thread.start()
-    try:
-        yield f"http://127.0.0.1:{server.server_port}", calls
-    finally:
-        server.shutdown()
-        server.server_close()
-        thread.join()
-
-
-class AccuracyTests(unittest.TestCase):
-    def test_profiles_and_families(self):
-        """Every requested window/filter is bound, while gauge counters are N/A."""
-        for profile, (metric, group, _, counter) in suite.PROFILES.items():
-            manifest = suite.corpus(profile)
-            queries = manifest["queries"]
-            self.assertEqual(len({q["id"] for q in queries}), len(queries))
-            self.assertEqual({q["window"] for q in queries}, set(suite.WINDOWS))
-            self.assertEqual(manifest["cardinalities"], [10, 100, 1000, 10000, 100000, 1000000])
-            for q in queries:
-                expected = counter or metric if q["name"].startswith(("rate", "increase")) else metric
-                self.assertIn(expected, q["promql"])
-                self.assertIn(expected, q["clickhouse_sql"])
-                self.assertNotIn("'data'", q["clickhouse_sql"])
-                if profile != "synthetic":
-                    self.assertNotIn("label_0", q["promql"])
-                    if q["name"].startswith(("rate", "increase")):
-                        self.assertEqual(q["status"], "not_applicable")
-            for name in ("spatial_sum", "spatial_topk", "spatial_quantile_0.99", "temporal_sum",
-                         "temporal_quantile_0.75", "rate", "rate_spatial_sum", "temporal_sum_spatial_sum",
-                         "rate_spatial_topk", "quantile_ratio", "spatial_count", "increase", "nested_spatial_sum"):
-                self.assertTrue(any(q["name"] == name for q in queries), name)
-        with self.assertRaises(ValueError):
-            suite.corpus("google", "x' OR 1=1")
-
-    def test_client_data_and_counter_resets(self):
-        """The client exposition and SQL rows encode identical 100ms samples."""
-        from prometheus_client.openmetrics.parser import text_string_to_metric_families
-        with tempfile.TemporaryDirectory() as tmp:
-            root = Path(tmp) / "data"
-            meta = dataset.write(root, dataset.synthetic(2, 4, 1000000, 100), 32)
-            rows = [json.loads(line) for line in (root / "samples.jsonl").read_text().splitlines()]
-            # A historical import stream repeats families; unlike one scrape,
-            # parse its individual client-encoded sample lines independently.
-            samples = [s for line in (root / "samples.openmetrics").read_text().splitlines() if not line.startswith("#")
-                       for family in text_string_to_metric_families(line + "\n# EOF\n") for s in family.samples]
-            self.assertEqual(meta["samples"], 32)
-            self.assertEqual(meta["series"], 16)
-            self.assertEqual(len(samples), len(rows))
-            for sample, row in zip(samples, rows):
-                self.assertEqual((sample.name, sample.labels, sample.value, float(sample.timestamp) * 1000),
-                                 (row["metric"], row["labels"], row["value"], row["ts_ms"]))
-        values = [v for m, _, _, v in dataset.synthetic(1, 1, 0, 99800) if m.endswith("_total")]
-        self.assertGreater(values[996], values[997])
-
-    def test_trace_mapping_and_duplicates(self):
-        """Native timestamps and identities survive normalization; duplicates fail."""
-        with tempfile.TemporaryDirectory() as tmp:
-            root = Path(tmp)
-            google = root / "google.jsonl"
-            google.write_text(json.dumps({"metric": "google_cluster_cpu_rate", "timestamp_ms": 1234,
-                                         "value": 0.25, "attributes": {"service": "job-1", "host": "host-2", "task": "3"}}) + "\n")
-            self.assertEqual(list(dataset.trace(google, "google"))[0][2:], (1234, 0.25))
-            alibaba = root / "container_usage.csv"
-            alibaba.write_text("c_1,m_1,12.5,25,30,0,0,0,0,0,0\n")
-            row = list(dataset.trace(alibaba, "alibaba"))[0]
-            self.assertEqual(row, ("alibaba_container_cpu_util", {"machine_id": "m_1", "container_id": "c_1"}, 12500, 25.0))
-            with self.assertRaisesRegex(ValueError, "duplicate"):
-                dataset.write(root / "bad", [row, row], 10)
-            self.assertFalse((root / "bad/data-manifest.json").exists())
-
-    def run_fixture(self, root, url, **changes):
-        manifest = suite.corpus("synthetic")
-        manifest["queries"] = [q for q in manifest["queries"] if q["name"] == "spatial_sum" and not q["filtered"]]
-        (root / "queries.json").write_text(json.dumps(manifest))
-        (root / "loaded.json").write_text(json.dumps({"data": {"start_ms": 1000000, "end_ms": 1002000,
-                                     "provenance": {"dataset": "synthetic"}, "sha256": {"samples.jsonl": "fixture"}}}))
-        args = argparse.Namespace(manifest=root / "queries.json", loaded_data=root / "loaded.json", output=root / "results.jsonl",
-                                  prometheus=url + "/prom", victoriametrics=url + "/vm", clickhouse=url + "/ch",
-                                  asap_prometheus=url + "/asap", asap_clickhouse=url + "/asap-sql",
-                                  start_ms=1000000, end_ms=1002000, query_name=[], rtol=1e-9, atol=1e-12,
-                                  require_warm=True, components=None, required_pairs=["promql", "sql"])
-        for key, value in changes.items():
-            setattr(args, key, value)
-        code = suite.run(args)
-        return code, [json.loads(line) for line in args.output.read_text().splitlines()]
-
-    def test_http_e2e_schedule_and_sql_rendering(self):
-        """All five HTTP adapters execute matched timestamps and record measurements."""
-        with tempfile.TemporaryDirectory() as tmp, endpoints() as (url, calls):
-            code, rows = self.run_fixture(Path(tmp), url)
-            self.assertEqual(code, 0)
-            self.assertEqual(len(calls), 15)
-            self.assertEqual([r["evaluation_ms"] for r in rows], [1000000, 1001000, 1002000])
-            self.assertEqual(len(rows[0]["measurements"]), 5)
-            sql = next(body for path, body in calls if path == "/ch")
-            self.assertNotIn(b"{eval_ms}", sql)
-            self.assertTrue(sql.endswith(b"FORMAT JSONEachRow"))
-            summary = next(iter(summarize(rows)["queries"].values()))
-            self.assertEqual(summary["warm_occurrences"], 3)
-            self.assertEqual(summary["latency"]["prometheus"]["count"], 3)
-
-    def test_wrong_results_and_fallback_fail(self):
-        """Equality cannot disguise fallback and warm evidence cannot disguise error."""
-        for route, wrong in (("exact_fallback", False), ("unknown", False), ("warm", True)):
-            with tempfile.TemporaryDirectory() as tmp, endpoints(route, wrong) as (url, _):
-                code, rows = self.run_fixture(Path(tmp), url)
-                self.assertEqual(code, 1)
-                self.assertFalse(any(row["passed"] for row in rows))
-
-    def test_native_timeout_does_not_skip_other_endpoints(self):
-        """A failed VM call cannot erase successful responses or skip ASAP calls."""
-        original = suite.request
-        for failed in ("/prom", "/ch", "/vm"):
-            with tempfile.TemporaryDirectory() as tmp, endpoints() as (url, calls):
-                def probe(endpoint, *args, **kwargs):
-                    if endpoint == url + failed:
-                        raise TimeoutError("native timed out")
-                    return original(endpoint, *args, **kwargs)
-                with patch.object(suite, "request", side_effect=probe):
-                    _, rows = self.run_fixture(Path(tmp), url)
-                self.assertEqual(sum(path.startswith("/asap") for path, _ in calls), 6)
-                self.assertTrue(all("asap_promql" in row["responses"] for row in rows))
-                engine = {"/prom": "prometheus", "/ch": "clickhouse", "/vm": "victoriametrics"}[failed]
-                self.assertTrue(all(row["endpoints"][engine]["error"]["kind"] == "timeout" for row in rows))
-
-    def test_vm_mismatch_cannot_establish_vm_benefit(self):
-        """Native VM semantics and a missing ASAP MetricsQL pair are explicit."""
-        original = suite.request
-        with tempfile.TemporaryDirectory() as tmp, endpoints() as (url, _):
-            def probe(endpoint, *args, **kwargs):
-                body, headers = original(endpoint, *args, **kwargs)
-                if endpoint == url + "/vm":
-                    body["data"]["result"][0]["value"][1] = "999"
-                return body, headers
-            with patch.object(suite, "request", side_effect=probe):
-                code, rows = self.run_fixture(Path(tmp), url, asap_metricsql=url + "/asap-vm",
-                                              required_pairs=["promql", "sql", "metricsql"])
-            self.assertEqual(code, 1)
-            self.assertTrue(all(not row["pairs"]["metricsql"]["eligible_for_query_comparison"] for row in rows))
-
-    def test_missing_metricsql_pair_is_not_full_acceptance(self):
-        """Without an ASAP VM endpoint the default three-pair acceptance fails."""
-        with tempfile.TemporaryDirectory() as tmp, endpoints() as (url, _):
-            code, rows = self.run_fixture(Path(tmp), url, required_pairs=None)
-            self.assertEqual(code, 1)
-            self.assertTrue(all(not row["pairs"]["metricsql"]["correctness"]["comparable"] for row in rows))
-
-    def test_asap_first_without_client_deadline_and_vm_pair(self):
-        """ASAP runs first without a deadline; MetricsQL has its own exact pair."""
-        original = suite.request
-        with tempfile.TemporaryDirectory() as tmp, endpoints() as (url, calls):
-            def probe(endpoint, *args, **kwargs):
-                self.assertIsNone(kwargs["timeout"])
-                return original(endpoint, *args, **kwargs)
-            with patch.object(suite, "request", side_effect=probe):
-                code, rows = self.run_fixture(Path(tmp), url, asap_metricsql=url + "/asap-vm",
-                                              required_pairs=["promql", "sql", "metricsql"])
-            self.assertEqual(code, 0)
-            self.assertTrue(all(row["pairs"]["metricsql"]["eligible_for_query_comparison"] for row in rows))
-            self.assertTrue(all(not row["pairs"]["metricsql"]["eligible_for_benefit_conclusion"] for row in rows))
-            self.assertEqual(rows[0]["request_order"], ["asap_promql", "asap_sql", "asap_metricsql", "prometheus", "clickhouse", "victoriametrics"])
-            journal = Path(tmp) / "results.jsonl.endpoints.jsonl"
-            self.assertEqual(len(journal.read_text().splitlines()), 18)
-
-    def test_empty_oracle_fails(self):
-        """An empty result pair is not positive accuracy evidence."""
-        empty = {"status": "success", "data": {"resultType": "vector", "result": []}}
-        self.assertFalse(suite.evaluate(empty, empty, 0, 0)["equal"])
-
-    def test_resources_no_double_counting(self):
-        """Overlapping cgroups are rejected and absent accounting stays null."""
-        with self.assertRaises(ValueError):
-            resources.validate({"a": {"cgroup": "/sys/fs/cgroup/test"}, "b": {"cgroup": "/sys/fs/cgroup/test/child"}})
-        self.assertIsNone(resources.delta({}, {})["total"]["cpu_usec"])
-        sample = {"x": {"cgroup_identity": 1, "cpu_usec": 10, "disk_read_bytes": 2,
-                        "disk_write_bytes": 4, "memory_bytes": 100, "network": None}}
-        after = {"x": {**sample["x"], "cpu_usec": 20, "memory_bytes": 150}}
-        result = resources.delta(sample, after)
-        self.assertEqual(result["total"]["cpu_usec"], 10)
-        self.assertEqual(result["total"]["memory_after_bytes"], 150)
-
-    def test_loader_http_receipt_and_hash_guard(self):
-        """One source feeds Remote Write and SQL; tampering fails before writes."""
-        with tempfile.TemporaryDirectory() as tmp, endpoints() as (url, calls):
-            root = Path(tmp)
-            dataset.write(root / "data", dataset.synthetic(1, 1, 1000000, 100), 4,
-                          {"dataset": "synthetic"})
-            argv = ["load_dataset.py", "--data", str(root / "data"), "--remote-write", url + "/write",
-                    "--clickhouse", url + "/ch", "--output", str(root / "receipt.json")]
-            with patch("sys.argv", argv):
-                load_dataset.main()
-            self.assertEqual(len(calls), 2)
-            self.assertIsInstance(calls[0][1], bytes)
-            self.assertTrue(calls[1][1].startswith(b"INSERT INTO raw_samples FORMAT JSONEachRow\n"))
-            self.assertEqual(json.loads((root / "receipt.json").read_text())["data"]["samples"], 4)
-            (root / "data/samples.jsonl").write_text("tampered\n")
-            argv[-1] = str(root / "second-receipt.json")
-            with patch("sys.argv", argv), self.assertRaisesRegex(ValueError, "hash"):
-                load_dataset.main()
-            self.assertEqual(len(calls), 2)
-
-    def test_phase_wrapper_preserves_exit_and_totals(self):
-        """Whole-command measurement reports disk/CPU and preserves failure status."""
-        import sys
-        with tempfile.TemporaryDirectory() as tmp:
-            root = Path(tmp)
-            cgroup = root / "cgroup"
-            cgroup.mkdir()
-            (cgroup / "cpu.stat").write_text("usage_usec 100\n")
-            (cgroup / "memory.current").write_text("500\n")
-            (cgroup / "io.stat").write_text("8:0 rbytes=10 wbytes=20\n")
-            config = root / "components.json"
-            config.write_text(json.dumps({"asap_promql": {"backend": {"cgroup": str(cgroup), "data_directory": str(cgroup)}}}))
-            output = root / "phase.json"
-            with patch("sys.argv", ["resources.py", "--components", str(config), "--engine", "asap_promql",
-                                    "--output", str(output), "--", sys.executable, "-c", "raise SystemExit(3)"]):
-                self.assertEqual(resources.main(), 3)
-            report = json.loads(output.read_text())
-            self.assertEqual(report["total"]["cpu_usec"], 0)
-            self.assertEqual(report["sampled_total_memory_peak_bytes"], 500)
-            self.assertGreater(report["total_disk_allocated_after_bytes"], 0)
-
-
-if __name__ == "__main__":
-    unittest.main()
diff --git a/tools/shared-workload/test_planned.py b/tools/shared-workload/test_planned.py
deleted file mode 100644
index 565caab6c..000000000
--- a/tools/shared-workload/test_planned.py
+++ /dev/null
@@ -1,128 +0,0 @@
-"""Preflight and readiness contracts for production-planned PromQL acceptance."""
-import json
-from pathlib import Path
-import tempfile
-import unittest
-from unittest.mock import patch
-
-import accuracy_suite
-import dataset
-import load_dataset  # Makes the existing replay module available.
-import replay
-import planned_run
-from planned_run import prepare
-
-
-class PlannedTests(unittest.TestCase):
-    def test_series_ordered_trace_reaches_production_replay(self):
-        """Globally interleaved trace times remain unchanged and replay in time order."""
-        with tempfile.TemporaryDirectory() as tmp:
-            root = Path(tmp)
-            records = [("google_cluster_cpu_rate", {"service": "job-a", "task": task, "host": "h"}, ts, value)
-                       for task, samples in [("a", [(0, 1.0), (120000, 2.0)]),
-                                             ("b", [(0, 3.0), (120000, 4.0)])]
-                       for ts, value in samples]
-            dataset.write(root / "data", records, 4, {"dataset": "google"})
-            original = (root / "data/samples.openmetrics").read_bytes()
-            manifest = accuracy_suite.corpus("google")
-            (root / "queries.json").write_text(json.dumps(manifest))
-            (root / "snapshot.json").write_text(json.dumps({
-                "snapshot_version": 3,
-                "query_workload": {"repeating_queries": [{"query": "sum_over_time(google_cluster_cpu_rate[1m])"}]},
-                "workload_cost_evidence": {"quotes": [{"test_placeholder": True}]}}))
-            argv = ["planned_run.py", "--data", str(root / "data"), "--manifest", str(root / "queries.json"),
-                    "--snapshot", str(root / "snapshot.json"), "--query-id", "google/1m/False/temporal_sum",
-                    "--compiler", "compiler", "--data-plane", "backend", "--prometheus", "prometheus",
-                    "--cpu-affinity", "0", "--output", str(root / "run")]
-            def replay_command(command):
-                path = Path(command[command.index("--metrics") + 1])
-                with path.open() as source:
-                    samples = list(replay.iter_samples(source))
-                self.assertEqual([row[2] for row in samples], [0, 0, 120000, 120000])
-                actual = {(labels["task"], timestamp, value) for labels, value, timestamp in samples}
-                self.assertEqual(actual, {(labels["task"], timestamp, value)
-                                          for _, labels, timestamp, value in records})
-                return type("Completed", (), {"returncode": 1})()
-            with patch("sys.argv", argv), patch.object(planned_run.subprocess, "run", side_effect=replay_command):
-                self.assertEqual(planned_run.main(), 1)
-            self.assertEqual((root / "data/samples.openmetrics").read_bytes(), original)
-
-    def test_ordered_metrics_use_original_file(self):
-        """Ordered synthetic data needs no copy or timestamp changes."""
-        with tempfile.TemporaryDirectory() as tmp:
-            root = Path(tmp)
-            source = root / "samples.openmetrics"
-            source.write_text('x{task="a"} 1 0\nx{task="b"} 2 0\nx{task="a"} 3 0.1\n# EOF\n')
-            self.assertEqual(planned_run.prepare_metrics(source, root), source)
-            self.assertEqual(list(root.iterdir()), [source])
-
-    def test_sort_does_not_hide_invalid_per_series_order(self):
-        """Sorting must not repair duplicate or backwards samples within a series."""
-        with tempfile.TemporaryDirectory() as tmp:
-            root = Path(tmp)
-            source = root / "samples.openmetrics"
-            for timestamp in ["0", "0.1"]:
-                source.write_text(f'x{{task="a"}} 1 0.1\nx{{task="b"}} 2 0\nx{{task="a"}} 3 {timestamp}\n')
-                with self.assertRaisesRegex(ValueError, "out-of-order"):
-                    planned_run.prepare_metrics(source, root)
-                self.assertEqual(list(root.iterdir()), [source])
-
-    def test_complete_window_and_costed_registration_are_required(self):
-        """Reject unpriced plans and repetitions whose first window predates the data."""
-        with tempfile.TemporaryDirectory() as tmp:
-            root = Path(tmp)
-            dataset.write(root / "data", dataset.synthetic(1, 1, 0, 120000), 2402, {"dataset": "synthetic"})
-            manifest = accuracy_suite.corpus("synthetic")
-            snapshot = {"snapshot_version": 3, "query_workload": {"repeating_queries": [{"query": "sum_over_time(fake_metric[1m])"}]}}
-            qid = "synthetic/1m/False/temporal_sum"
-            with self.assertRaisesRegex(ValueError, "cost evidence"):
-                prepare(root / "data", manifest, qid, snapshot, None, 2)
-            snapshot["workload_cost_evidence"] = {"quotes": [{"test_placeholder": True}]}
-            with self.assertRaisesRegex(ValueError, "cost evidence"):
-                prepare(root / "data", manifest, qid, {**snapshot, "snapshot_version": 2}, None, 2)
-            _, corpus = prepare(root / "data", manifest, qid, snapshot, None, 2)
-            self.assertEqual(corpus["queries"][0]["eval_timestamp_ms"], 120000)
-            with self.assertRaisesRegex(ValueError, "full temporal history"):
-                prepare(root / "data", manifest, qid, snapshot, None, 3)
-
-    def test_every_window_needs_observed_summary_readout(self):
-        """A warm label without a real summary read is insufficient readiness evidence."""
-        body = {"status": "success", "infos": ["data_source: asap_query"],
-                "data": {"resultType": "vector", "result": [{"metric": {}, "value": [120, "8"]}]}}
-        headers = {"x-asap-summary-readout-evaluations": "1", "x-asap-exact-subquery-rpcs": "0"}
-        answer = {"http_status": 200, "response": body, "headers": headers}
-        query = [{"id": "q", "query": "sum_over_time(fake_metric[1m])", "eval_timestamp_ms": 120000}]
-        with tempfile.TemporaryDirectory() as tmp:
-            root = Path(tmp)
-            with patch.object(replay, "request", return_value=answer) as calls:
-                replay.verify_summary_ready(query, "http://asap", root, 2, 60000)
-            self.assertEqual(calls.call_count, 2)
-            report = json.loads((root / "summary-readiness.json").read_text())
-            self.assertTrue(report["complete"])
-            self.assertEqual([p["evaluation_ms"] for p in report["probes"]], [60000, 120000])
-            with patch.object(replay, "request", return_value={**answer, "headers": {}}), self.assertRaisesRegex(RuntimeError, "not ready"):
-                replay.verify_summary_ready(query, "http://asap", root, 2, 60000)
-
-    def test_planned_replay_journals_asap_before_waiting_for_native(self):
-        """The production replay also preserves ASAP evidence before a native failure."""
-        answer = {"http_status": 200, "response": {"status": "success", "infos": ["data_source: asap_query"],
-                  "data": {"resultType": "vector", "result": [{"metric": {}, "value": [120, "8"]}]}},
-                  "headers": {}, "elapsed_ns": 100}
-        with tempfile.TemporaryDirectory() as tmp:
-            root = Path(tmp)
-            def request(url):
-                if url.startswith("http://native"):
-                    completed = [json.loads(line) for line in (root / "endpoint-requests.jsonl").read_text().splitlines()]
-                    self.assertEqual(completed[0]["engine"], "asap")
-                    raise OSError("service disconnected")
-                return answer
-            queries = [{"id": "q", "query": "sum_over_time(fake_metric[1m])", "eval_timestamp_ms": 120000}]
-            with patch.object(replay, "request", side_effect=request):
-                rows = replay.replay(queries, "http://asap", root, 1, exact_url="http://native", backend_first=True)
-            self.assertEqual(rows[0]["execution"], "warm")
-            self.assertEqual(rows[0]["exact"]["response"]["status"], "error")
-            self.assertFalse(rows[0]["comparison"]["equal"])
-
-
-if __name__ == "__main__":
-    unittest.main()
diff --git a/tools/shared-workload/test_scale.py b/tools/shared-workload/test_scale.py
deleted file mode 100644
index bf7f49a76..000000000
--- a/tools/shared-workload/test_scale.py
+++ /dev/null
@@ -1,116 +0,0 @@
-"""Scale planning never allocates the planned billion-sample datasets in tests."""
-import argparse
-import json
-import io
-from pathlib import Path
-import tempfile
-import unittest
-from unittest.mock import patch
-
-import accuracy_suite
-import dataset
-from scale_plan import main as plan_main, plan, query_manifest
-from test_accuracy import endpoints
-
-
-class ScaleTests(unittest.TestCase):
-    def test_benefit_is_large_and_has_complete_repeated_windows(self):
-        """The default benefit cell has billions of samples, not smoke-size input."""
-        scale = plan()
-        self.assertEqual(scale["total_samples"], 1728032000)
-        self.assertEqual(scale["total_series"], 32000)
-        self.assertEqual(scale["unfiltered_temporal_samples_per_query"], 576000000)
-        self.assertEqual(scale["temporal_occurrences_per_query"], 31)
-        self.assertEqual(scale["spatial_occurrences_per_query"], 1801)
-        self.assertEqual(scale["evaluation_start_ms"] - scale["start_ms"], 3600000)
-        self.assertEqual(scale["evaluation_end_ms"] - scale["evaluation_start_ms"], 1800000)
-        self.assertIsNone(scale["estimated_store_bytes"])
-        self.assertTrue(all(q["interval_ms"] == 1000 or q["window"] == "1h"
-                            for q in query_manifest(scale)["queries"]))
-
-    def test_members_and_cardinality_are_distinct_scale_axes(self):
-        """Increasing members increases scan work without changing sum output groups."""
-        small, large = plan(members=4), plan(members=64)
-        self.assertEqual(small["spatial_sum_output_groups"], large["spatial_sum_output_groups"])
-        self.assertEqual(large["unfiltered_temporal_samples_per_query"], 16 * small["unfiltered_temporal_samples_per_query"])
-        self.assertEqual(plan("cardinality")["total_series"], 8000000)
-        self.assertEqual(plan(measured_bytes_per_sample=20)["estimated_store_bytes"], 1728032000 * 20)
-
-    def test_scale_generation_requires_explicit_budget(self):
-        """A large plan fails before creating output unless its sample budget is allowed."""
-        with tempfile.TemporaryDirectory() as tmp:
-            root = Path(tmp)
-            (root / "scale.json").write_text(json.dumps(plan()))
-            with patch("sys.argv", ["dataset.py", "--dataset", "synthetic", "--scale-plan", str(root / "scale.json"),
-                                    "--output", str(root / "data")]), patch("sys.stderr", io.StringIO()), self.assertRaises(SystemExit):
-                dataset.main()
-            self.assertFalse((root / "data").exists())
-
-    def test_plan_command_emits_matrix_without_allocating_samples(self):
-        """All requested cardinality/window cells are planned without generating data."""
-        with tempfile.TemporaryDirectory() as tmp:
-            root = Path(tmp) / "plan"
-            with patch("sys.argv", ["scale_plan.py", "--output", str(root)]), patch("builtins.print"):
-                plan_main()
-            self.assertEqual({p.name for p in root.iterdir()}, {"scale.json", "queries.json", "matrix.json"})
-            matrix = json.loads((root / "matrix.json").read_text())
-            self.assertEqual(len(matrix), 30)
-            self.assertEqual({c["groups"] for c in matrix}, {10, 100, 1000, 10000, 100000, 1000000})
-
-    def test_runner_uses_planned_timestamps(self):
-        """A matching scale receipt supplies the full interval to the five HTTP adapters."""
-        with tempfile.TemporaryDirectory() as tmp, endpoints() as (url, calls):
-            root = Path(tmp)
-            scale = plan("smoke", groups=1, members=1)
-            (root / "queries.json").write_text(json.dumps(query_manifest(scale)))
-            meta = {"provenance": {"dataset": "synthetic", "scale_plan": scale},
-                    "samples": scale["total_samples"], "series": scale["total_series"],
-                    "start_ms": scale["start_ms"], "end_ms": scale["evaluation_end_ms"], "sha256": {}}
-            (root / "receipt.json").write_text(json.dumps({"data": meta}))
-            args = argparse.Namespace(manifest=root / "queries.json", loaded_data=root / "receipt.json", output=root / "results.jsonl",
-                                      start_ms=None, end_ms=None, query_name=["temporal_sum"], components=None,
-                                      prometheus=url + "/prom", victoriametrics=url + "/vm", clickhouse=url + "/ch",
-                                      asap_prometheus=url + "/asap", asap_clickhouse=url + "/asap-sql",
-                                      rtol=1e-9, atol=1e-12, require_warm=True, required_pairs=["promql", "sql"])
-            self.assertEqual(accuracy_suite.run(args), 0)
-            rows = [json.loads(line) for line in args.output.read_text().splitlines()]
-            self.assertEqual(len(calls), 20)
-            self.assertEqual({r["evaluation_ms"] for r in rows}, {scale["evaluation_start_ms"], scale["evaluation_end_ms"]})
-            self.assertTrue(all(r["scale"] == scale for r in rows))
-
-    def test_smoke_plan_drives_actual_generation(self):
-        """Plan dimensions override CLI defaults and survive in the data receipt."""
-        with tempfile.TemporaryDirectory() as tmp:
-            root = Path(tmp)
-            scale = plan("smoke", groups=1, members=1)
-            (root / "scale.json").write_text(json.dumps(scale))
-            with patch("sys.argv", ["dataset.py", "--dataset", "synthetic", "--scale-plan", str(root / "scale.json"),
-                                    "--output", str(root / "data")]), patch("builtins.print"):
-                dataset.main()
-            meta = json.loads((root / "data/data-manifest.json").read_text())
-            self.assertEqual(meta["samples"], scale["total_samples"])
-            self.assertEqual(meta["series"], scale["total_series"])
-            self.assertEqual(meta["provenance"]["scale_plan"], scale)
-
-    def test_runner_rejects_undersized_data_and_shortened_repetition(self):
-        """A run cannot advertise a large scale while loading less or replaying less."""
-        with tempfile.TemporaryDirectory() as tmp:
-            root = Path(tmp)
-            scale = plan()
-            manifest = root / "queries.json"
-            manifest.write_text(json.dumps(query_manifest(scale)))
-            receipt = root / "receipt.json"
-            meta = {"provenance": {"scale_plan": scale}, "samples": 100, "series": 2}
-            receipt.write_text(json.dumps({"data": meta}))
-            args = argparse.Namespace(manifest=manifest, loaded_data=receipt, start_ms=None, end_ms=None)
-            with self.assertRaisesRegex(ValueError, "requested scale"):
-                accuracy_suite.run(args)
-            meta.update(samples=scale["total_samples"], series=scale["total_series"])
-            receipt.write_text(json.dumps({"data": meta}))
-            args.end_ms = scale["evaluation_start_ms"]
-            with self.assertRaisesRegex(ValueError, "repetition interval"):
-                accuracy_suite.run(args)
-
-
-if __name__ == "__main__":
-    unittest.main()
diff --git a/tools/shared-workload/test_workload.py b/tools/shared-workload/test_workload.py
deleted file mode 100644
index 6f7a6a556..000000000
--- a/tools/shared-workload/test_workload.py
+++ /dev/null
@@ -1,43 +0,0 @@
-"""Semantic guards for the evaluation generator and differential reader."""
-import tempfile
-import unittest
-from pathlib import Path
-
-from differential import compare_topk, unique_vector
-from generate import manifest, write_data
-
-
-class WorkloadTest(unittest.TestCase):
-    def test_duplicate_outputs_are_rejected(self):
-        """A malformed engine response must not silently lose duplicate rows."""
-        with self.assertRaises(ValueError):
-            unique_vector([({"x": "a"}, 1), ({"x": "a"}, 2)])
-
-    def test_topk_allows_only_valid_cutoff_ties(self):
-        """Tied winners are valid, but missing a strictly higher value is not."""
-        population = unique_vector([({"member": str(i)}, value) for i, value in enumerate([5, 4, 4, 1])])
-        valid = unique_vector([({"member": "0"}, 5), ({"member": "2"}, 4)])
-        invalid = unique_vector([({"member": "1"}, 4), ({"member": "2"}, 4)])
-        self.assertTrue(compare_topk(population, valid, [], 2)["equal"])
-        self.assertFalse(compare_topk(population, invalid, [], 2)["equal"])
-
-    def test_groups_and_members_count_distinct_series(self):
-        """Scale counts groups separately from the series within each group."""
-        data = manifest(10, 4, 60_000, 100)
-        self.assertEqual(data["total_series"], 40)
-        self.assertEqual(data["total_samples"], 24_040)
-
-    def test_formats_preserve_the_same_millisecond_timestamps(self):
-        """Prometheus OpenMetrics uses seconds; VM text imports use milliseconds."""
-        with tempfile.TemporaryDirectory() as tmp:
-            root = Path(tmp)
-            write_data(root, 1, 1, 100, 100, 1_700_000_000_123, 97)
-            self.assertIn("1700000000123", (root / "samples.prom").read_text())
-            self.assertIn("1700000000.123", (root / "samples.openmetrics").read_text())
-            self.assertTrue((root / "samples.openmetrics").read_text().endswith("# EOF\n"))
-            with self.assertRaises(FileExistsError):
-                write_data(root, 1, 1, 100, 100, 1_700_000_000_123, 97)
-
-
-if __name__ == "__main__":
-    unittest.main()
diff --git a/tools/test_shared_panes.py b/tools/test_shared_panes.py
deleted file mode 100644
index 551b10d47..000000000
--- a/tools/test_shared_panes.py
+++ /dev/null
@@ -1,51 +0,0 @@
-#!/usr/bin/env python3
-"""Validate the unmerged Planner/backend pair against Planner main."""
-import argparse
-import json
-from pathlib import Path
-import shutil
-import subprocess
-import tempfile
-
-
-def main():
-    parser = argparse.ArgumentParser(description=__doc__)
-    parser.add_argument("--planner", required=True, type=Path)
-    parser.add_argument("--sketchlib", type=Path)
-    parser.add_argument("--toolchain")
-    parser.add_argument("cargo_args", nargs=argparse.REMAINDER)
-    args = parser.parse_args()
-    backend = Path(__file__).resolve().parents[1]
-    lock = backend / "Cargo.lock"
-    original_lock = lock.read_bytes()
-    with tempfile.TemporaryDirectory(prefix="asap-pane-reuse-") as temporary:
-        root = Path(temporary)
-        mapping = root / "asap-aware-mapping"
-        shutil.copytree(args.planner.resolve() / "crates/asap-aware-mapping", mapping)
-        cargo_toml = mapping / "Cargo.toml"
-        source = cargo_toml.read_text()
-        old = 'asap-types = { path = "../types" }'
-        if old not in source:
-            raise RuntimeError("unexpected Planner dependency declaration")
-        cargo_toml.write_text(source.replace(old, 'asap-types = { git = "https://github.com/ProjectASAP/ASAPPlanner", branch = "main" }'))
-        config = root / "validation.toml"
-        text = ""
-        if args.sketchlib:
-            text += "paths = [" + json.dumps(str(args.sketchlib.resolve())) + "]\n"
-        text += '[patch."https://github.com/ProjectASAP/ASAPPlanner"]\nasap-aware-mapping = { path = ' + json.dumps(str(mapping)) + ' }\n'
-        config.write_text(text)
-        command = ["cargo"]
-        if args.toolchain:
-            command.append("+" + args.toolchain)
-        cargo_args = args.cargo_args
-        if cargo_args[:1] == ["--"]:
-            cargo_args = cargo_args[1:]
-        command += ["--config", str(config)] + (cargo_args or ["test", "-p", "control_plane"])
-        try:
-            return subprocess.call(command, cwd=backend)
-        finally:
-            lock.write_bytes(original_lock)
-
-
-if __name__ == "__main__":
-    raise SystemExit(main())