Why: Resolve the component conflict using the tested combined Core lineage.
Evidence: Both exact Core histories are included in beafd753; no source conflict in App or Server.
Impact: Preserve TaskSnapshot and upstream managed settings/session checks; composition replay follows.
Refs: Core beafd753; Backend main 741da4a0