Bind physical-plan execution to the authoritative SummaryCatalog

control_plane/Cargo.toml

@@ -17,7 +17,6 @@ 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     = { version = "0.12", default-features = false, features = ["json", "rustls-tls"] }
 anyhow      = "1"
@@ -50,13 +49,11 @@ tonic          = { version = "0.12", features = ["gzip"] }
 tokio-stream   = { version = "0.1", features = ["net"] }
 asap_types.workspace = true
 
-# Transitional pin (docs/migration-plan-backend-plan.md Phase 1b; see also
-# control_plane/docs/design-asapplanner-pin-migration.md for the migration
-# this bump landed): locked to a specific commit on ASAPPlanner's main,
+# Locked to a specific commit on ASAPPlanner's main (see
+# control_plane/docs/design-asapplanner-pin-migration.md):
 # not a tag -- ASAPPlanner has no tagged releases yet. Re-pin as
 # ASAPPlanner's IR evolves; move to a tag once one exists.
 #
-# Bumped to cb70086 (main tip, 2026-08-22) from cc18c987. In between,
 # ASAPPlanner consolidated its crates (ASAPPlanner#198): `asap-ir` and
 # `asap-sketch` merged into one crate -- Cargo package `asap-types`, with
 # `pre_asap`/`post_asap` modules replacing the old L3/L4 split -- and
@@ -94,16 +91,16 @@ asap_types.workspace = true
 # scaffolding, unaware that `data_plane`'s `summary_executor.rs` in *this*
 # repo is a real one. Vendored locally instead of chased upstream -- see
 # `data_plane/src/query_engines/asap_query_engine/summary_exec.rs`.
-planner-types = { package = "asap-types", git = "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/ProjectASAP/ASAPPlanner", rev = "abb2f20e27091ac0c60715dc42b9b59c75b3447c" }
-asap-aware-mapping = { git = "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/ProjectASAP/ASAPPlanner", rev = "abb2f20e27091ac0c60715dc42b9b59c75b3447c" }
+planner-types = { package = "asap-types", git = "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/ProjectASAP/ASAPPlanner", rev = "2270f1f8f98b64e2cc8aa5b7602a570aa0e95f1e" }
+asap-aware-mapping = { git = "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/ProjectASAP/ASAPPlanner", rev = "2270f1f8f98b64e2cc8aa5b7602a570aa0e95f1e" }
 
 # L1 adoption (design-target-architecture.md Part B): the PromQL front
 # end itself, replacing control_plane's own query_parser/promql.rs.
 # Pinned via `rev`, not a floating branch reference. Same rev as
 # `planner-types`/`asap-aware-mapping` above -- these three MUST move
 # together (two revs of the same upstream repo's types in one workspace
 # resolve to distinct Rust types that won't unify).
-asap-frontend-promql = { git = "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/ProjectASAP/ASAPPlanner", rev = "abb2f20e27091ac0c60715dc42b9b59c75b3447c" }
+asap-frontend-promql = { git = "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/ProjectASAP/ASAPPlanner", rev = "2270f1f8f98b64e2cc8aa5b7602a570aa0e95f1e" }
 
 [dev-dependencies]
 tokio = { version = "1", features = ["full", "test-util"] }

control_plane/build.rs

@@ -1,12 +1,5 @@
 fn main() -> Result<(), Box<dyn std::error::Error>> {
     prost_build::compile_protos(&["proto/opamp.proto"], &["proto/"])?;
-    // `BackendPlan` wire contract — see
-    // `control_plane/docs/design-backend-plan-wire-format.md`. Needs
-    // `--experimental_allow_proto3_optional` for the `optional` scalar
-    // fields (`WindowSpec.slide_ms`, `RetentionPolicy.num_aggregates_to_retain`).
-    prost_build::Config::new()
-        .protoc_arg("--experimental_allow_proto3_optional")
-        .compile_protos(&["proto/backend_plan.proto"], &["proto/"])?;
     // asap.runtime.v1.RuntimeSamples service — receives
     // PushExporter batches from agents. Must stay in lockstep
     // with `sketch-bench/sketch-runtime/proto/feedback.proto`.

control_plane/examples/calibration_candidates.rs

@@ -32,6 +32,15 @@ fn planner_forest(queries: &[control_plane::physical::compiler::PlanningQuery])
                 vec![lhs, rhs],
                 json!({"operator_debug":format!("{operator:?}")}),
             ),
+            SummaryExpr::ValueOperation {
+                child,
+                operation,
+                timing,
+            } => (
+                "ValueOperation",
+                vec![child],
+                json!({"operation_debug":format!("{operation:?}"),"timing_debug":format!("{timing:?}")}),
+            ),
             SummaryExpr::SummaryAgg {
                 child,
                 family,
@@ -126,9 +135,10 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
             "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,
-                "backend_plan": plan.backend_plan.encode_to_vec(),
                 "query_plan": plan.query_plan,
                 "storage_routing": null,
                 "adaptation_evidence": []

control_plane/examples/compile_workload_artifact.rs

@@ -27,9 +27,10 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
             "cost_comparison": comparison,
             "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,
-                "backend_plan": plan.backend_plan.encode_to_vec(),
                 "query_plan": plan.query_plan,
                 "storage_routing": null,
                 "adaptation_evidence": []

control_plane/examples/offline_planner_replay.rs

@@ -28,6 +28,7 @@ fn inspect(
     }
     match &node.expr {
         SummaryExpr::KeepPreAsap(_) => *raw += 1,
+        SummaryExpr::ValueOperation { child, .. } => inspect(child, model, seen, states, raw),
         SummaryExpr::SummaryAgg { family, child, .. } => {
             if let SummaryFamilyType::Sketch(kind, _) = family {
                 let lookup = model