Conflicts kept both sides:
- eval.rs: main's thread-search change (#10227) moved into develop's eval_thread.rs; construction axis/point source bodies with the branch's fallible construction_state; main's identity shortcut in the branch's fallible placed().
- eval_more.rs: main's box helpers and beyond_cylinder_reach kept (main's cut and tap-marking code uses them), body_box meshing through Body::mesh.
- project3d/project.rs: SMLib meeting_edges kept; a face pick now takes its whole surface patch (#9009) through meeting_edges over a set of faces.
- frames.rs: main's split_move (#9660) with the branch's fallible to_local.
- ao.rs: main's draw_opaque with the branch's open-body triangles.
- dialogs.rs, move_preview.rs, viewport.rs: both sides.
- Generated files from main. Tests calling world_state() unwrap its Result.
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01SdcgEu4Lr3moCCisdZShKz