diff --git a/Cargo.lock b/Cargo.lock
index 21b9512f4..c71f0a86e 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -364,7 +364,7 @@ dependencies = [
 [[package]]
 name = "asap-aware-mapping"
 version = "0.1.0"
-source = "git+https://github.com/ProjectASAP/ASAPPlanner?rev=a049a3b6c17cee4c51c79e478799b32280a7d71d#a049a3b6c17cee4c51c79e478799b32280a7d71d"
+source = "git+https://github.com/ProjectASAP/ASAPPlanner?rev=ea12b31680be777b1866d3ea5fc82fd4a9a3e57e#ea12b31680be777b1866d3ea5fc82fd4a9a3e57e"
 dependencies = [
  "asap-types",
  "asap_sketchlib 0.3.0 (git+https://github.com/ProjectASAP/asap_sketchlib)",
@@ -376,7 +376,7 @@ dependencies = [
 [[package]]
 name = "asap-frontend-promql"
 version = "0.1.0"
-source = "git+https://github.com/ProjectASAP/ASAPPlanner?rev=a049a3b6c17cee4c51c79e478799b32280a7d71d#a049a3b6c17cee4c51c79e478799b32280a7d71d"
+source = "git+https://github.com/ProjectASAP/ASAPPlanner?rev=ea12b31680be777b1866d3ea5fc82fd4a9a3e57e#ea12b31680be777b1866d3ea5fc82fd4a9a3e57e"
 dependencies = [
  "asap-types",
  "promql-parser 0.10.0 (git+https://github.com/ProjectASAP/promql-parser?rev=9fede7eecca923c9882fe256484d00d37f8706cb)",
@@ -385,7 +385,7 @@ dependencies = [
 [[package]]
 name = "asap-frontend-sql"
 version = "0.1.0"
-source = "git+https://github.com/ProjectASAP/ASAPPlanner?rev=a049a3b6c17cee4c51c79e478799b32280a7d71d#a049a3b6c17cee4c51c79e478799b32280a7d71d"
+source = "git+https://github.com/ProjectASAP/ASAPPlanner?rev=ea12b31680be777b1866d3ea5fc82fd4a9a3e57e#ea12b31680be777b1866d3ea5fc82fd4a9a3e57e"
 dependencies = [
  "asap-sql-function-catalog",
  "asap-types",
@@ -396,7 +396,7 @@ dependencies = [
 [[package]]
 name = "asap-physical-operators"
 version = "0.1.0"
-source = "git+https://github.com/ProjectASAP/ASAPPlanner?rev=a049a3b6c17cee4c51c79e478799b32280a7d71d#a049a3b6c17cee4c51c79e478799b32280a7d71d"
+source = "git+https://github.com/ProjectASAP/ASAPPlanner?rev=ea12b31680be777b1866d3ea5fc82fd4a9a3e57e#ea12b31680be777b1866d3ea5fc82fd4a9a3e57e"
 dependencies = [
  "asap-types",
  "asap_sketchlib 0.3.0 (git+https://github.com/ProjectASAP/asap_sketchlib?rev=5f03ccbd798ed5fec62bdd839bcb331123cab369)",
@@ -411,12 +411,12 @@ dependencies = [
 [[package]]
 name = "asap-sql-function-catalog"
 version = "0.1.0"
-source = "git+https://github.com/ProjectASAP/ASAPPlanner?rev=a049a3b6c17cee4c51c79e478799b32280a7d71d#a049a3b6c17cee4c51c79e478799b32280a7d71d"
+source = "git+https://github.com/ProjectASAP/ASAPPlanner?rev=ea12b31680be777b1866d3ea5fc82fd4a9a3e57e#ea12b31680be777b1866d3ea5fc82fd4a9a3e57e"
 
 [[package]]
 name = "asap-types"
 version = "0.1.0"
-source = "git+https://github.com/ProjectASAP/ASAPPlanner?rev=a049a3b6c17cee4c51c79e478799b32280a7d71d#a049a3b6c17cee4c51c79e478799b32280a7d71d"
+source = "git+https://github.com/ProjectASAP/ASAPPlanner?rev=ea12b31680be777b1866d3ea5fc82fd4a9a3e57e#ea12b31680be777b1866d3ea5fc82fd4a9a3e57e"
 dependencies = [
  "serde",
  "serde_json",
diff --git a/Cargo.toml b/Cargo.toml
index 982dabb9e..cf059482b 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -16,10 +16,10 @@ 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 = "a049a3b6c17cee4c51c79e478799b32280a7d71d" }
-asap-aware-mapping = { git = "https://github.com/ProjectASAP/ASAPPlanner", rev = "a049a3b6c17cee4c51c79e478799b32280a7d71d" }
-asap-frontend-promql = { git = "https://github.com/ProjectASAP/ASAPPlanner", rev = "a049a3b6c17cee4c51c79e478799b32280a7d71d" }
-asap-frontend-sql = { git = "https://github.com/ProjectASAP/ASAPPlanner", rev = "a049a3b6c17cee4c51c79e478799b32280a7d71d" }
+planner-types = { package = "asap-types", git = "https://github.com/ProjectASAP/ASAPPlanner", rev = "ea12b31680be777b1866d3ea5fc82fd4a9a3e57e" }
+asap-aware-mapping = { git = "https://github.com/ProjectASAP/ASAPPlanner", rev = "ea12b31680be777b1866d3ea5fc82fd4a9a3e57e" }
+asap-frontend-promql = { git = "https://github.com/ProjectASAP/ASAPPlanner", rev = "ea12b31680be777b1866d3ea5fc82fd4a9a3e57e" }
+asap-frontend-sql = { git = "https://github.com/ProjectASAP/ASAPPlanner", rev = "ea12b31680be777b1866d3ea5fc82fd4a9a3e57e" }
 
 # Shared external deps (used by 2+ crates)
 serde = { version = "1.0", features = ["derive"] }
@@ -39,7 +39,7 @@ arc-swap = "1.7"
 reqwest = { version = "0.12", default-features = false, features = ["json", "rustls-tls"] }
 
 # Internal crates
-asap-physical-operators = { git = "https://github.com/ProjectASAP/ASAPPlanner", rev = "a049a3b6c17cee4c51c79e478799b32280a7d71d" }
+asap-physical-operators = { git = "https://github.com/ProjectASAP/ASAPPlanner", rev = "ea12b31680be777b1866d3ea5fc82fd4a9a3e57e" }
 asap_sketch_codec = { path = "crates/asap_sketch_codec" }
 asap_summary_state = { path = "crates/asap_summary_state" }
 asap_types = { path = "crates/asap_types" }
diff --git a/control_plane/src/physical/compiler.rs b/control_plane/src/physical/compiler.rs
index deec6bf6c..ae73605f1 100644
--- a/control_plane/src/physical/compiler.rs
+++ b/control_plane/src/physical/compiler.rs
@@ -1043,7 +1043,7 @@ impl BackendLocalPlanningInput {
                 exact_costs_by_id.insert(format!("compat-query-{index}"), rows.clone());
             }
         }
-        // PromQL rows carry their complete identity before PlanSpace chooses
+        // PromQL rows carry their complete identity before CandidatePostASAPDAGs chooses
         // shared states, so arithmetic never needs a second logical selection.
         let logical_roots = canonical_roots
             .iter()
@@ -1089,7 +1089,7 @@ impl BackendLocalPlanningInput {
         }
         let mut planner_candidate_forests = Vec::new();
         // Native physical realizations need the complete series identity in
-        // their rows. Planner's PlanSpace proposes them for the identity-typed
+        // their rows. Planner's CandidatePostASAPDAGs proposes them for the identity-typed
         // root; each is a logical alternative whose readout-built states are
         // placed by lifecycle, then substituted into the preferred workload.
         for (index, root) in canonical_roots.iter().enumerate() {
@@ -5394,7 +5394,7 @@ pub(crate) mod tests {
         snapshot
     }
 
-    // Per-series arithmetic compiles on the first selection, without retrying PlanSpace.
+    // Per-series arithmetic compiles on the first selection, without retrying CandidatePostASAPDAGs.
     #[test]
     fn logical_candidates_have_series_identity_before_selection() {
         let (request, _) = exact_workload_snapshot(&["avg_over_time(data[5m])"])
diff --git a/control_plane/src/physical/workload_cost.rs b/control_plane/src/physical/workload_cost.rs
index 4ff84cdfd..6fa69091b 100644
--- a/control_plane/src/physical/workload_cost.rs
+++ b/control_plane/src/physical/workload_cost.rs
@@ -959,7 +959,7 @@ mod tests {
     use super::super::compiler::BackendLocalPlanningInput;
     use super::*;
 
-    /// PlanSpace decides the computation: every quantile family it can
+    /// CandidatePostASAPDAGs decides the computation: every quantile family it can
     /// realize is ranked in the selection trace, and one is committed.
     #[test]
     fn planner_ranks_quantile_families_before_committing_one() {
diff --git a/docs/examples/workload-cost-evidence.md b/docs/examples/workload-cost-evidence.md
index aa928b4ba..6b2eeaca2 100644
--- a/docs/examples/workload-cost-evidence.md
+++ b/docs/examples/workload-cost-evidence.md
@@ -86,7 +86,7 @@ measurements.
 
 The default inventory compares the Planner-selected workload with its
 whole-workload exact fallback, maintained-population variants, and one
-substitution per native physical realization that Planner's PlanSpace proposes
+substitution per native physical realization that Planner's CandidatePostASAPDAGs proposes
 for a query (for example a heap over per-series Rate readouts). Planner's
 global selection, not a quote per alternative, decides every other summary
 choice such as the sketch family. Within a candidate, whether each summary state