Conflicts, resolved hunk by hunk: - main's mesh-based changes stay out: - #10303's `beyond_cylinder_reach` (eval_thread); - #8634's `cut_end_past_face` (eval); - #9009's mesh surface-patch pick in `project3d::part_of`, which would add a mesh decision. - frames: `split_move` keeps propagating `world_state`'s error, not swallowing it. - surface_analysis and eval_cost_tests: the same code; our side. - KNOWN_FAILING_TESTS: our #9107/#8634 reasons; brett's new `a_hole_wider_than_the_part_says_it_removes_all_of_it` (main's #10701 on SMLib); the mirrored-mesh test known-failing until the mesher moves to solidcore. No excluded symbol came back (`beyond_cylinder_reach`, `cut_end_past_face` and the rest, counts unchanged), and no truck dependency. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01DtL5M41G8Nua7HvuFPZkmJ