Resolved conflict in types.ts: dropped the duplicate EntityTraits definition (D and E both added it identically) and combined both workstreams' new ServerFrame variants (tell/ritual_complete from D, judgment_result from E). 223/223 frontend tests pass, tsc clean.