Kernel: booleans with coincident planar faces push the faces apart exactly (perpendicular neighbours stretched or shrunk), union cuts the slab beyond the plane

Oracle: 29/29.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01AS5Tn3xieewUSg3uxrMVdL

ROADMAP.md

@@ -9,7 +9,7 @@ features → parametric timeline) as an open, pure-Rust, agent-drivable applicat
 |---|---|
 | Where are we? | **M0 done; M1/M2 in progress.** Sketch with solver, extrude (taper, two-sided, through all), revolve, fillet/chamfer, holes, patterns, mirror, shell, draft, loft, sweep, split, construction planes, parameters that rebuild the timeline, STEP/STL export, desktop and browser (wasm) app with Fusion-style selection (hover/selected highlights, origin planes, click-to-pick sketch planes, multi-select, window/crossing box selection, animated view cube), CLI, MCP server, oracle harness. |
 | Command parity (SOLID + SKETCH toolbar) | **57 / 291 (20%)** — [docs/parity.md](docs/parity.md) |
-| Fusion oracle | **28 / 29 parts match** Fusion's measurements — [docs/oracle.md](docs/oracle.md) |
+| Fusion oracle | **29 / 29 parts match** Fusion's measurements — [docs/oracle.md](docs/oracle.md) |
 | Tests | 85 (solver, profiles, kernel booleans/blends/measures, expressions, timeline, file formats, camera, engine end-to-end, hostile-input fuzz over every command) |
 | Gates | `cargo xtask ci`: fmt, clippy -D warnings, tests, asset attribution, layering, wasm32 build — green |
 | Weighted parity estimate | **≈ 5%** of Fusion's Design workspace by importance (sketch + basic solids are the core, but surfaces, assemblies, sheet metal, CAM, drawings are untouched) |
@@ -38,8 +38,9 @@ features → parametric timeline) as an open, pure-Rust, agent-drivable applicat
 - Fillets and chamfers: straight edges (convex or concave) between planar faces with perpendicular
   planar end faces; whole smooth loops of a planar face (pocket floors, plate outlines); every edge
   of a convex planar body (sphere corners). Other corner configurations are not supported yet.
-- Booleans of curved bodies with coincident faces can fail (planar ones have an exact fallback);
-  fully internal voids are not supported. Spheres are built from six pole-free patches so they
+- Coincident planar faces are pushed apart exactly when their neighbours stand perpendicular
+  (extruded and box-like parts); other coincident configurations can still fail. Fully internal
+  voids are not supported. Spheres are built from six pole-free patches so they
   combine reliably.
 - Mass properties come from fine tessellation (curved faces within ~1e-4 relative).
 - STEP import reads solids (B-rep with analytic and B-spline geometry), units, product names,

crates/kernel/src/coplanar.rs

@@ -0,0 +1,253 @@
+//! Booleans of bodies with coincident planar faces, by moving faces apart first.
+//!
+//! The mesh-based intersection cannot handle faces that lie in the same plane, nor the edges
+//! lying in them. A face whose neighbours stand perpendicular to it (any extruded or
+//! box-like part) can be pushed along its normal exactly, by rebuilding it and stretching or
+//! shrinking its neighbours. Then:
+//! - cut and intersect: the tool's coincident face moves out of the way (outward when the
+//!   bodies are on the same side of the plane, away from the target when they touch back to
+//!   back), which leaves the result unchanged;
+//! - union of faces facing the same way: both faces move outward by different amounts, the
+//!   union is taken, and the slab beyond the plane is cut off (now a transversal cut);
+//! - union of faces back to back: the tool's face moves into the target, which overlaps it.
+
+use std::collections::HashMap;
+
+use solvecraft_geom::Vec3;
+use truck_modeling::{self as mt, builder};
+
+use crate::body::{Body, Solid, from_p3, p3, v3};
+use crate::{BoolOp, KernelError, Result, guard};
+
+#[derive(Clone, Copy, Debug)]
+struct PlaneFace {
+    n: Vec3,
+    d: f64,
+}
+
+fn planes(b: &Body) -> Vec<(usize, PlaneFace)> {
+    b.solid
+        .face_iter()
+        .enumerate()
+        .filter_map(|(i, f)| match f.oriented_surface() {
+            mt::Surface::Plane(p) => {
+                let n = p.normal();
+                let n = Vec3::new(n.x, n.y, n.z).normalized()?;
+                Some((i, PlaneFace { n, d: n.dot(from_p3(p.origin())) }))
+            }
+            _ => None,
+        })
+        .collect()
+}
+
+/// Push the planar faces of `b` lying in the plane (n, d) — n their outward normal — along n
+/// by `delta` (negative: inward). Their neighbours must stand perpendicular to the plane.
+fn push_faces(b: &Body, n: Vec3, d: f64, delta: f64) -> Result<Body> {
+    let size = b.size();
+    let tol = (size * 1e-7).max(1e-9);
+    let fail = |m: &str| KernelError::Failed(format!("pushing a face: {m}"));
+    guard("push face", || {
+        let solid = b.deep_copy();
+        let shift = n * delta;
+        let mat = mt::Matrix4::from_translation(v3(shift));
+        let mut shells = Vec::new();
+        for sh in solid.boundaries() {
+            let faces: Vec<mt::Face> = sh.face_iter().cloned().collect();
+            let on_plane = |f: &mt::Face| match f.oriented_surface() {
+                mt::Surface::Plane(p) => {
+                    let m = p.normal();
+                    let m = Vec3::new(m.x, m.y, m.z);
+                    m.dot(n) > 1.0 - 1e-9 && (n.dot(from_p3(p.origin())) - d).abs() < tol * 10.0
+                }
+                _ => false,
+            };
+            let moving: Vec<usize> = (0..faces.len()).filter(|i| faces.get(*i).is_some_and(on_plane)).collect();
+            if moving.is_empty() {
+                shells.push(sh.clone());
+                continue;
+            }
+            // Vertices and edges of the moving faces.
+            let mut vmap: HashMap<mt::VertexID, mt::Vertex> = HashMap::new();
+            let mut emap: HashMap<mt::EdgeID, mt::Edge> = HashMap::new();
+            for i in &moving {
+                let f = faces.get(*i).ok_or_else(|| fail("face"))?;
+                for v in f.vertex_iter() {
+                    vmap.entry(v.id()).or_insert_with(|| builder::vertex(p3(from_p3(v.point()) + shift)));
+                }
+            }
+            for i in &moving {
+                let f = faces.get(*i).ok_or_else(|| fail("face"))?;
+                for e in f.edge_iter() {
+                    if emap.contains_key(&e.id()) {
+                        continue;
+                    }
+                    let (a, bb) = (
+                        vmap.get(&e.absolute_front().id()).ok_or_else(|| fail("vertex"))?,
+                        vmap.get(&e.absolute_back().id()).ok_or_else(|| fail("vertex"))?,
+                    );
+                    let curve = mt::Transformed::transformed(&e.curve(), mat);
+                    emap.insert(e.id(), mt::Edge::new(a, bb, curve));
+                }
+            }
+            // Edges leaving the plane at moved vertices: straight, along n.
+            for f in &faces {
+                for e in f.edge_iter() {
+                    if emap.contains_key(&e.id()) {
+                        continue;
+                    }
+                    let (fa, fb) = (e.absolute_front(), e.absolute_back());
+                    let (ma, mb) = (vmap.get(&fa.id()), vmap.get(&fb.id()));
+                    if ma.is_none() && mb.is_none() {
+                        continue;
+                    }
+                    if !matches!(e.curve(), mt::Curve::Line(_)) {
+                        return Err(fail("a neighbouring edge is not straight"));
+                    }
+                    let dir = (from_p3(fb.point()) - from_p3(fa.point())).normalized().ok_or_else(|| fail("zero edge"))?;
+                    if dir.cross(n).len() > 1e-9 {
+                        return Err(fail("a neighbouring face is not perpendicular"));
+                    }
+                    let (na, nb) = (ma.cloned().unwrap_or_else(|| fa.clone()), mb.cloned().unwrap_or_else(|| fb.clone()));
+                    if (from_p3(nb.point()) - from_p3(na.point())).dot(dir) <= tol {
+                        return Err(fail("the face would pass its opposite side"));
+                    }
+                    emap.insert(e.id(), builder::line(&na, &nb));
+                }
+            }
+            let rebuild_wires = |f: &mt::Face| -> Vec<mt::Wire> {
+                f.absolute_boundaries()
+                    .iter()
+                    .map(|w| {
+                        w.edge_iter()
+                            .map(|e| match emap.get(&e.id()) {
+                                Some(ne) => {
+                                    if e.front() == e.absolute_front() {
+                                        ne.clone()
+                                    } else {
+                                        ne.inverse()
+                                    }
+                                }
+                                None => e.clone(),
+                            })
+                            .collect::<Vec<_>>()
+                            .into()
+                    })
+                    .collect()
+            };
+            use mt::{ParametricSurface3D, SearchNearestParameter};
+            let mut out: Vec<mt::Face> = Vec::new();
+            for (i, f) in faces.iter().enumerate() {
+                let touches = f.edge_iter().any(|e| emap.contains_key(&e.id()));
+                if !touches {
+                    out.push(f.clone());
+                    continue;
+                }
+                let wires = rebuild_wires(f);
+                let surface = if moving.contains(&i) {
+                    mt::Transformed::transformed(&f.surface(), mat)
+                } else if matches!(f.surface(), mt::Surface::Plane(_)) {
+                    f.surface()
+                } else {
+                    // A curved side: sweep its edge in the plane along the new height.
+                    let base = f.edge_iter().find_map(|e| {
+                        emap.get(&e.id()).filter(|_| {
+                            let (a, bb) = (from_p3(e.absolute_front().point()), from_p3(e.absolute_back().point()));
+                            (n.dot(a) - d).abs() < tol * 10.0 && (n.dot(bb) - d).abs() < tol * 10.0
+                        })
+                    });
+                    let base = base.ok_or_else(|| fail("a curved side without an edge in the plane"))?;
+                    let height = f.vertex_iter().map(|v| n.dot(from_p3(v.point())) - d).fold(0.0f64, |m, x| if x.abs() > m.abs() { x } else { m });
+                    let swept: mt::Face = builder::tsweep(base, v3(n * (height - delta)));
+                    let mut s = swept.surface();
+                    // Same normal as the old side at a point both share.
+                    let probe = f.vertex_iter().map(|v| from_p3(v.point())).fold(Vec3::ZERO, |a, x| a + x) / f.vertex_iter().count().max(1) as f64;
+                    let old = f.surface();
+                    if let (Some((u0, v0)), Some((u1, v1))) =
+                        (old.search_nearest_parameter(p3(probe), None, 100), s.search_nearest_parameter(p3(probe), None, 100))
+                    {
+                        let (a, bb) = (old.normal(u0, v0), s.normal(u1, v1));
+                        if mt::InnerSpace::dot(a, bb) < 0.0 {
+                            s = mt::Invertible::inverse(&s);
+                        }
+                    }
+                    s
+                };
+                let mut nf = mt::Face::try_new(wires, surface).map_err(|e| fail(&e.to_string()))?;
+                if !f.orientation() {
+                    nf.invert();
+                }
+                out.push(nf);
+            }
+            shells.push(out.into());
+        }
+        let s = Solid::try_new(shells).map_err(|e| fail(&e.to_string()))?;
+        Body::new(s)
+    })
+}
+
+/// A box covering everything beyond the plane (n, d) by up to `depth`.
+fn slab_beyond(n: Vec3, d: f64, depth: f64, extent: f64) -> Result<Body> {
+    let u = n.any_perp();
+    let w = n.cross(u);
+    let o = n * d;
+    let pl = solvecraft_geom::Plane::new(o, u, w).ok_or_else(|| KernelError::Failed("slab plane".into()))?;
+    let sq = solvecraft_geom::Loop2::polygon(&[
+        solvecraft_geom::Vec2::new(-extent, -extent),
+        solvecraft_geom::Vec2::new(extent, -extent),
+        solvecraft_geom::Vec2::new(extent, extent),
+        solvecraft_geom::Vec2::new(-extent, extent),
+    ]);
+    let r = solvecraft_geom::Region2 { outer: sq, holes: vec![] };
+    crate::extrude(&pl, &[r], 0.0, depth)?.pop().ok_or_else(|| KernelError::Failed("slab".into()))
+}
+
+/// Retry a failed boolean with coincident planar faces pushed apart. `None` when there are no
+/// coincident faces or the faces can't be pushed.
+pub(crate) fn boolean_apart(a: &Body, b: &Body, op: BoolOp) -> Option<Result<Option<Body>>> {
+    let size = a.size().max(b.size());
+    let tol = (size * 1e-7).max(1e-9);
+    let (pa, pb) = (planes(a), planes(b));
+    let mut same: Vec<(Vec3, f64)> = Vec::new();
+    let mut back: Vec<(Vec3, f64)> = Vec::new();
+    for (_, x) in &pa {
+        for (_, y) in &pb {
+            if (x.d - y.d * x.n.dot(y.n)).abs() < tol * 10.0 && x.n.dot(y.n).abs() > 1.0 - 1e-9 {
+                let list = if x.n.dot(y.n) > 0.0 { &mut same } else { &mut back };
+                if !list.iter().any(|(n, d)| n.dot(x.n) > 1.0 - 1e-9 && (d - x.d).abs() < tol * 10.0) {
+                    list.push((x.n, x.d));
+                }
+            }
+        }
+    }
+    if same.is_empty() && back.is_empty() {
+        return None;
+    }
+    let (d1, d2) = (size * 0.0137, size * 0.0229);
+    let run = || -> Result<Option<Body>> {
+        let (mut a2, mut b2) = (a.clone(), b.clone());
+        for (n, d) in &same {
+            // b's face points along n too.
+            b2 = push_faces(&b2, *n, *d, d2)?;
+            if op == BoolOp::Union {
+                a2 = push_faces(&a2, *n, *d, d1)?;
+            }
+        }
+        for (n, d) in &back {
+            // a's face points along n; b's face points along −n at the same plane (−d).
+            let shift = if op == BoolOp::Union { d2 } else { -d2 };
+            b2 = push_faces(&b2, -*n, -*d, shift)?;
+        }
+        let Some(mut r) = crate::ops::boolean(&a2, &b2, op)? else { return Ok(None) };
+        if op == BoolOp::Union {
+            for (n, d) in &same {
+                let slab = slab_beyond(*n, *d, d1.max(d2) * 3.0, size * 4.0)?;
+                match crate::ops::boolean(&r, &slab, BoolOp::Cut)? {
+                    Some(x) => r = x,
+                    None => return Ok(None),
+                }
+            }
+        }
+        Ok(Some(r))
+    };
+    Some(run())
+}

crates/kernel/src/lib.rs

@@ -15,6 +15,7 @@
 mod blend;
 mod body;
 mod build;
+mod coplanar;
 mod heal;
 mod loopblend;
 mod measure;

crates/kernel/src/ops.rs

@@ -138,6 +138,27 @@ pub fn boolean(a: &Body, b: &Body, op: BoolOp) -> Result<Option<Body>> {
             return Ok(None);
         }
     }
+    // Coincident planar faces: push them apart (exactly) and try again.
+    thread_local! {
+        static APART: std::cell::Cell<bool> = const { std::cell::Cell::new(false) };
+    }
+    if !APART.with(|c| c.get()) {
+        APART.with(|c| c.set(true));
+        let r = crate::coplanar::boolean_apart(a, b, op);
+        APART.with(|c| c.set(false));
+        match r {
+            Some(Ok(Some(body))) => {
+                let v = volume(&body);
+                if v > 0.0 && plausible(v, &body) {
+                    return Ok(Some(body));
+                }
+                last = format!("{last}; faces pushed apart gave an implausible volume {v:.4}");
+            }
+            Some(Ok(None)) => {}
+            Some(Err(e)) => last = format!("{last}; {e}"),
+            None => {}
+        }
+    }
     // Coincident faces defeat the B-rep boolean; bodies with only planar faces have an exact
     // polygon fallback.
     match crate::polybool::planar_boolean(a, b, op) {

crates/kernel/src/tests.rs

@@ -725,3 +725,41 @@ fn debug_heal_sphere_cut() {
         }
     }
 }
+
+#[test]
+#[ignore]
+fn debug_coplanar_cylinder_union() {
+    let a = box_solid(Vec3::ZERO, Vec3::new(40.0, 40.0, 20.0)).unwrap();
+    let c = cylinder(Vec3::new(40.0, 20.0, 0.0), Vec3::Z, 12.0, 40.0).unwrap();
+    for op in [BoolOp::Union, BoolOp::Cut, BoolOp::Intersect] {
+        let r = guard("t", || {
+            let (sa, mut sb) = (a.deep_copy(), c.deep_copy());
+            Ok(match op {
+                BoolOp::Union => truck_shapeops::or(&sa, &sb, 0.05),
+                BoolOp::Cut => {
+                    sb.not();
+                    truck_shapeops::and(&sa, &sb, 0.05)
+                }
+                BoolOp::Intersect => truck_shapeops::and(&sa, &sb, 0.05),
+            }
+            .map(|s| s.face_iter().count()))
+        });
+        println!("{op:?}: {r:?}");
+    }
+}
+
+#[test]
+fn coplanar_curved_booleans() {
+    // A box and a cylinder standing on the same plane, the cylinder's axis on the box's side.
+    let a = box_solid(Vec3::ZERO, Vec3::new(40.0, 40.0, 20.0)).unwrap();
+    let c = cylinder(Vec3::new(40.0, 20.0, 0.0), Vec3::Z, 12.0, 40.0).unwrap();
+    let half = PI * 144.0 / 2.0;
+    let u = boolean(&a, &c, BoolOp::Union).unwrap().unwrap();
+    let m = measure(&u).unwrap();
+    assert!(rel(m.volume, 32000.0 + half * 40.0 + half * 20.0) < 1e-3, "{}", m.volume);
+    let cut = boolean(&a, &c, BoolOp::Cut).unwrap().unwrap();
+    assert!(rel(measure(&cut).unwrap().volume, 32000.0 - half * 20.0) < 1e-3);
+    let i = boolean(&a, &c, BoolOp::Intersect).unwrap().unwrap();
+    assert!(rel(measure(&i).unwrap().volume, half * 20.0) < 1e-3);
+    println!("union {:?}", m.merged);
+}

docs/oracle.md

@@ -2,7 +2,7 @@
 
 Generated by `cargo xtask oracle`. Each case is a part built in Fusion (recipe and measurements kept locally in `plan/fusion/oracle/`, not committed). SolveCraft replays the recipe through its command engine and compares body count, volume and area (relative tolerance 1e-3) and face/edge/vertex counts (exact).
 
-**25 / 29 cases pass** (0 need features not implemented yet).
+**29 / 29 cases pass** (0 need features not implemented yet).
 
 | Case | Result | Notes |
 |---|---|---|
@@ -12,13 +12,13 @@ Generated by `cargo xtask oracle`. Each case is a part built in Fusion (recipe a
 | 04-revolve-vase | pass |  |
 | 05-taper-extrude | pass |  |
 | 06-symmetric-extrude | pass |  |
-| 07-fillet-all-edges | FAIL | step 8 (FusionFilletEdgesCommand): not supported yet: the faces at the edge ends must be planar |
+| 07-fillet-all-edges | pass |  |
 | 08-chamfer | pass |  |
 | 09-shell | pass |  |
 | 10-rect-pattern-holes | pass |  |
 | 11-circular-pattern-flange | pass |  |
 | 12-mirror-feature | pass |  |
-| 13-combine-join | FAIL | step 12 (FusionCombineCommand): boolean Union: kernel internal error: boolean: This shell is not oriented and closed.; the operation failed: not supported yet: coincident faces on curved bodies |
+| 13-combine-join | pass |  |
 | 14-combine-cut | pass |  |
 | 15-combine-intersect | pass |  |
 | 16-sweep | pass |  |
@@ -28,10 +28,10 @@ Generated by `cargo xtask oracle`. Each case is a part built in Fusion (recipe a
 | 20-slot-constrained | pass |  |
 | 21-draft | pass |  |
 | 22-split-body | pass |  |
-| 23-bracket-multifeature | FAIL | step 15 (FusionFilletEdgesCommand): not supported yet: each end of the edge must touch exactly one more face |
+| 23-bracket-multifeature | pass |  |
 | 24-user-parameters | pass |  |
 | 25-sketch-triangle | pass |  |
 | 26-sketch-belt | pass |  |
 | 27-sketch-trapezoid | pass |  |
-| 28-blind-pocket-fillets | FAIL | step 15 (FusionFilletEdgesCommand): not supported yet: the blend is larger than the neighbouring faces |
+| 28-blind-pocket-fillets | pass |  |
 | 29-two-sided-and-partial-revolve | pass |  |