fix: resolve merge conflicts with main (Situation + Mood variants)

Keep all new variants from both branches: Greeting (copy), FirstMeeting
and RepeatedVisit (server). Combine Mood doc comments.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

server/tests/bridge_ipc.rs

@@ -62,6 +62,8 @@ fn snapshot_roundtrip_over_unix_socket() {
             blocked_entities: vec![],
             scan_events: vec![],
             sound_events: vec![],
+            conversation_events: vec![],
+            conversation_ended: vec![],
             rng_seed: None,
         };
 

server/tests/bridge_tcp.rs

@@ -48,6 +48,8 @@ fn snapshot_roundtrip_over_tcp() {
             blocked_entities: vec![],
             scan_events: vec![],
             sound_events: vec![],
+            conversation_events: vec![],
+            conversation_ended: vec![],
             rng_seed: None,
         };
 

server/tests/gen_fixtures.rs

@@ -38,6 +38,8 @@ fn fixture_snapshot(tick: u64, entities: Vec<VisibleEntity>) -> ObserverSnapshot
         blocked_entities: vec![],
         scan_events: vec![],
         sound_events: vec![],
+        conversation_events: vec![],
+        conversation_ended: vec![],
         rng_seed: None,
     }
 }
@@ -214,6 +216,8 @@ fn generate_msgpack_fixtures() {
         blocked_entities: vec![],
         scan_events: vec![],
         sound_events: vec![],
+        conversation_events: vec![],
+        conversation_ended: vec![],
         rng_seed: None,
     };
     write_fixture(

server/tests/serialization.rs

@@ -27,6 +27,8 @@ fn test_snapshot(tick: u64, entities: Vec<VisibleEntity>) -> ObserverSnapshot {
         blocked_entities: vec![],
         scan_events: vec![],
         sound_events: vec![],
+        conversation_events: vec![],
+        conversation_ended: vec![],
         rng_seed: None,
     }
 }
@@ -259,6 +261,8 @@ fn snapshot_v2_fields_roundtrip() {
         blocked_entities: vec![],
         scan_events: vec![],
         sound_events: vec![],
+        conversation_events: vec![],
+        conversation_ended: vec![],
         rng_seed: None,
     };
 
@@ -355,6 +359,8 @@ fn all_facing_direction_variants_roundtrip() {
             blocked_entities: vec![],
             scan_events: vec![],
             sound_events: vec![],
+            conversation_events: vec![],
+            conversation_ended: vec![],
             rng_seed: None,
         };
         let bytes = rmp_serde::to_vec_named(&snapshot).expect("serialize");