Merge remote-tracking branch 'origin/main' into ci

# Conflicts:
#	client/tests/fixtures/msgpack/snapshot_boundary_tick_0.msgpack
#	client/tests/fixtures/msgpack/snapshot_boundary_tick_127.msgpack
#	client/tests/fixtures/msgpack/snapshot_boundary_tick_2b31m1.msgpack
#	client/tests/fixtures/msgpack/snapshot_boundary_tick_2b32.msgpack
#	client/tests/fixtures/msgpack/snapshot_boundary_tick_32767.msgpack
#	client/tests/fixtures/msgpack/snapshot_empty.msgpack
#	client/tests/fixtures/msgpack/snapshot_multi_entity.msgpack
#	client/tests/fixtures/msgpack/snapshot_one_npc.msgpack
#	client/tests/fixtures/msgpack/snapshot_player.msgpack
#	client/tests/fixtures/msgpack/snapshot_v2_full.msgpack
#	server/src/perception/observer/mod.rs

server/src/perception/observer/mod.rs

@@ -384,6 +384,9 @@ pub fn compute_observer_snapshot(
         None
     };
 
+    // Consume pending save/load result for this tick (#553).
+    let save_result = buffer.pending_save_result.take();
+
     buffer.snapshot = Some(ObserverSnapshot {
         version: crate::bridge::types::PROTOCOL_VERSION,
         tick: time.tick,
@@ -402,14 +405,15 @@ pub fn compute_observer_snapshot(
         conversation_events,
         conversation_ended,
         follow_state,
-        examine_result,
         character_pressure: pressure_query.iter().next().map(|p| {
             crate::simulation::pressure::CharacterPressureWire::from(p)
         }),
         sound_events,
         rng_seed: sim_rng.as_deref().map(|r| r.seed()),
         poi_list,
+        examine_result,
         player_knowledge,
+        save_result,
     });
 }