bevy_persistence_database 0.3.0

A persistence and database integration solution for the Bevy game engine
Documentation
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
583
584
585
586
587
588
589
590
591
592
593
594
595
596
597
598
599
600
601
602
603
604
605
606
607
608
609
610
611
612
613
614
615
616
617
618
619
620
621
622
623
624
625
626
627
628
629
630
631
632
633
634
635
636
637
638
639
640
641
642
643
644
645
646
647
648
649
650
651
652
653
654
655
656
657
658
659
660
661
662
663
664
665
666
667
668
669
670
671
672
673
674
675
676
677
678
679
680
681
682
683
684
685
686
687
688
689
690
691
692
693
694
695
696
697
698
699
700
701
702
703
704
705
706
707
708
709
710
711
712
713
714
715
716
717
718
719
720
721
722
723
724
725
726
727
728
729
730
731
732
733
734
735
736
737
738
739
740
741
742
743
744
745
746
747
748
749
750
751
752
753
754
755
756
757
758
759
760
761
762
763
764
765
766
767
768
769
770
771
772
773
774
775
776
777
778
779
780
781
782
783
784
785
786
787
788
789
790
791
792
793
794
795
use super::listeners::take_commit_listener;
use super::plugin::PersistencePluginConfig;
use super::runtime::TokioRuntime;
use crate::bevy::components::Guid;
use crate::core::db::{DatabaseConnection, PersistenceError, TransactionOperation};
use crate::core::session::PersistenceSession;
use crate::core::session::persistence_session::DirtyState;
use crate::core::versioning::version_manager::VersionKey;
use bevy::prelude::*;
use std::any::TypeId;
use std::collections::{HashMap, HashSet};
use std::sync::{
    Arc, Mutex,
    atomic::{AtomicBool, AtomicUsize, Ordering},
};
use tokio::sync::oneshot;

#[derive(Component)]
pub(super) struct CommitTask {
    receiver: Option<oneshot::Receiver<Result<(Vec<String>, Vec<Entity>), PersistenceError>>>,
}

#[derive(Component)]
pub(super) struct MultiBatchCommitTracker {
    correlation_id: u64,
    remaining_batches: Arc<AtomicUsize>,
    result_sender: Arc<Mutex<Option<oneshot::Sender<Result<(), PersistenceError>>>>>,
    /// Metas from batches that completed successfully, held until all batches finish.
    /// On full success we apply them all; on any failure we restore dirty state for all.
    pending_metas: Arc<Mutex<Vec<CommitMeta>>>,
    /// Set to true when any batch in the group fails.
    failed: Arc<AtomicBool>,
}

/// Message emitted when a background commit task is complete.
#[derive(Message)]
pub struct CommitCompleted {
    pub result: Result<Vec<String>, PersistenceError>,
    pub dirty_entities: Vec<Entity>,
    pub correlation_id: Option<u64>,
}

/// Message that users send to trigger a commit.
#[derive(Message, Clone)]
pub struct TriggerCommit {
    /// An optional ID to correlate this trigger with a `CommitCompleted` event.
    pub correlation_id: Option<u64>,
    /// Connection to use directly for this commit.
    pub target_connection: Arc<dyn DatabaseConnection>,
    /// Store to write into for this commit.
    pub store: String,
}

/// A state machine resource to track the commit lifecycle.
#[derive(Resource, Default, PartialEq, Debug)]
pub enum CommitStatus {
    #[default]
    Idle,
    InProgress,
    InProgressAndDirty,
}

#[derive(Component)]
pub(super) struct TriggerId {
    correlation_id: Option<u64>,
}

#[derive(Component)]
pub(super) struct CommitMeta {
    dirty_entity_components: HashMap<Entity, HashSet<TypeId>>,
    despawned_entities: HashSet<Entity>,
    dirty_resources: HashSet<TypeId>,
    despawned_resources: HashSet<TypeId>,
    connection: Arc<dyn DatabaseConnection>,
    store: String,
    /// Updated edge snapshot to apply on success.
    new_edge_snapshot: HashSet<String>,
    /// Client-side preassigned keys for new entities.
    preassigned_keys: HashMap<Entity, String>,
}

pub(super) fn handle_commit_trigger(ecs: &mut World) {
    let mut should_commit = false;
    let mut correlation_id = None;
    let mut requested_connection: Option<Arc<dyn DatabaseConnection>> = None;
    let mut requested_store: Option<String> = None;

    ecs.resource_scope(|ecs, mut events: Mut<Messages<TriggerCommit>>| {
        let mut status = ecs.resource_mut::<CommitStatus>();
        if !events.is_empty() {
            let first_trigger = events.drain().next().unwrap();
            requested_connection = Some(first_trigger.target_connection.clone());
            requested_store = Some(first_trigger.store.clone());

            match *status {
                CommitStatus::Idle => {
                    bevy::log::info!("[handle_commit_trigger] TriggerCommit received while Idle");
                    should_commit = true;
                    correlation_id = first_trigger.correlation_id;
                }
                CommitStatus::InProgress => {
                    bevy::log::info!(
                        "[handle_commit_trigger] TriggerCommit received while busy; queueing"
                    );
                    *status = CommitStatus::InProgressAndDirty;
                }
                CommitStatus::InProgressAndDirty => {
                    // A commit is already in progress and another is already queued.
                }
            }
        }
    });

    if !should_commit {
        return;
    }

    let connection = if let Some(conn) = requested_connection {
        conn
    } else {
        let err = PersistenceError::new("TriggerCommit missing target_connection");
        ecs.write_message(CommitCompleted {
            result: Err(err.clone()),
            dirty_entities: vec![],
            correlation_id,
        });
        bevy::log::error!(%err, "failed to select database connection before commit");
        return;
    };

    let store = if let Some(store) = requested_store {
        if store.is_empty() {
            let err = PersistenceError::new("TriggerCommit store must be non-empty");
            ecs.write_message(CommitCompleted {
                result: Err(err.clone()),
                dirty_entities: vec![],
                correlation_id,
            });
            bevy::log::error!(%err, "invalid store for commit");
            return;
        }
        store
    } else {
        let err = PersistenceError::new("TriggerCommit missing store");
        ecs.write_message(CommitCompleted {
            result: Err(err.clone()),
            dirty_entities: vec![],
            correlation_id,
        });
        bevy::log::error!(%err, "failed to select store before commit");
        return;
    };

    let plugin_config = ecs.resource::<PersistencePluginConfig>().clone();

    // 1) isolate dirty sets from the session
    let (dirty_entity_components, despawned_entities, dirty_resources, despawned_resources, dirty_relationship_entities) = {
        let mut session = ecs.resource_mut::<PersistenceSession>();
        session.take_dirty_state().into_parts()
    };

    // 2) prepare commit with those sets
    let commit_data = match PersistenceSession::_prepare_commit(
        ecs.resource::<PersistenceSession>(),
        ecs,
        &dirty_entity_components,
        &despawned_entities,
        &dirty_resources,
        &despawned_resources,
        &dirty_relationship_entities,
        plugin_config.thread_count,
        connection.document_key_field(),
        &store,
    ) {
        Ok(data) if data.operations.is_empty() => {
            ecs.write_message(CommitCompleted {
                result: Ok(vec![]),
                dirty_entities: vec![],
                correlation_id,
            });
            let mut session = ecs.resource_mut::<PersistenceSession>();
            session.restore_dirty_state(DirtyState::from_parts_with_relationships(
                dirty_entity_components,
                despawned_entities,
                dirty_resources,
                despawned_resources,
                dirty_relationship_entities,
            ));
            return;
        }
        Ok(data) => data,
        Err(e) => {
            ecs.write_message(CommitCompleted {
                result: Err(e.clone()),
                dirty_entities: vec![],
                correlation_id,
            });
            let mut session = ecs.resource_mut::<PersistenceSession>();
            session.restore_dirty_state(DirtyState::from_parts_with_relationships(
                dirty_entity_components,
                despawned_entities,
                dirty_resources,
                despawned_resources,
                dirty_relationship_entities,
            ));
            return;
        }
    };

    // 3) spawn the async task(s)
    *ecs.resource_mut::<CommitStatus>() = CommitStatus::InProgress;
    let runtime = ecs.resource::<TokioRuntime>().runtime.clone();
    let db = connection.clone();

    let all_operations = commit_data.operations;
    let new_entities = commit_data.new_entities;
    let new_edge_snapshot = commit_data.new_edge_snapshot;
    let preassigned_keys = commit_data.preassigned_keys;

    let use_batching =
        plugin_config.batching_enabled && all_operations.len() > plugin_config.commit_batch_size;
    let batch_size = plugin_config.commit_batch_size;

    let request = CommitRequest {
        correlation_id,
        runtime,
        db,
        store,
        operations: all_operations,
        new_entities,
        dirty_entity_components,
        despawned_entities,
        dirty_resources,
        despawned_resources,
        new_edge_snapshot,
        preassigned_keys,
    };

    if use_batching {
        spawn_batched_commit_tasks(ecs, batch_size, &plugin_config, request);
    } else {
        spawn_single_commit_task(ecs, request);
    }
}

/// Bundles all per-commit data so that the spawn helpers have a clean two-argument
/// signature instead of a long positional argument list.
struct CommitRequest {
    correlation_id: Option<u64>,
    runtime: Arc<tokio::runtime::Runtime>,
    db: Arc<dyn DatabaseConnection>,
    store: String,
    operations: Vec<TransactionOperation>,
    new_entities: Vec<Entity>,
    dirty_entity_components: HashMap<Entity, HashSet<TypeId>>,
    despawned_entities: HashSet<Entity>,
    dirty_resources: HashSet<TypeId>,
    despawned_resources: HashSet<TypeId>,
    new_edge_snapshot: HashSet<String>,
    preassigned_keys: HashMap<Entity, String>,
}

fn spawn_single_commit_task(ecs: &mut World, request: CommitRequest) {
    let CommitRequest {
        correlation_id,
        runtime,
        db,
        store,
        operations,
        new_entities,
        dirty_entity_components,
        despawned_entities,
        dirty_resources,
        despawned_resources,
        new_edge_snapshot,
        preassigned_keys,
    } = request;
    let db_for_task = db.clone();
    let (tx, rx) = oneshot::channel();
    runtime.spawn(async move {
        bevy::log::trace!("commit task started (single batch)");
        let res = db_for_task
            .execute_transaction(operations)
            .await
            .map(|keys| (keys, new_entities));
        bevy::log::trace!("commit runtime task completed send");
        let _ = tx.send(res);
    });

    ecs.spawn((
        CommitTask { receiver: Some(rx) },
        TriggerId { correlation_id },
        CommitMeta {
            dirty_entity_components,
            despawned_entities,
            dirty_resources,
            despawned_resources,
            connection: db,
            store,
            new_edge_snapshot,
            preassigned_keys,
        },
    ));
}

#[derive(Default)]
struct CommitBatch {
    operations: Vec<TransactionOperation>,
    dirty_entities: HashSet<Entity>,
    new_entities: Vec<Entity>,
}

fn spawn_batched_commit_tasks(
    ecs: &mut World,
    batch_size: usize,
    _plugin_config: &PersistencePluginConfig,
    request: CommitRequest,
) {
    let CommitRequest {
        correlation_id,
        runtime,
        db,
        store,
        operations,
        new_entities,
        dirty_entity_components,
        despawned_entities,
        dirty_resources,
        despawned_resources,
        new_edge_snapshot,
        preassigned_keys,
    } = request;
    let session = ecs.resource::<PersistenceSession>();

    let mut key_to_entity: HashMap<String, Entity> = HashMap::new();
    for (entity, key) in session.entity_keys().iter() {
        key_to_entity.insert(key.clone(), *entity);
    }

    // Split operations into logical groups
    let mut entity_ops: HashMap<Entity, Vec<TransactionOperation>> = HashMap::new();
    let mut new_entity_ops: Vec<(TransactionOperation, Entity)> = Vec::new();
    let mut resource_ops: Vec<TransactionOperation> = Vec::new();
    let mut new_entity_idx = 0;

    for op in operations {
        match &op {
            TransactionOperation::UpdateDocument {
                kind: crate::core::db::connection::DocumentKind::Entity,
                key,
                ..
            }
            | TransactionOperation::DeleteDocument {
                kind: crate::core::db::connection::DocumentKind::Entity,
                key,
                ..
            } => {
                if let Some(entity) = key_to_entity.get(key) {
                    entity_ops.entry(*entity).or_default().push(op);
                }
            }
            TransactionOperation::CreateDocument {
                kind: crate::core::db::connection::DocumentKind::Entity,
                ..
            } => {
                if let Some(entity) = new_entities.get(new_entity_idx) {
                    new_entity_ops.push((op, *entity));
                    new_entity_idx += 1;
                }
            }
            _ => resource_ops.push(op),
        }
    }

    let mut batches: Vec<CommitBatch> = Vec::new();
    let mut current = CommitBatch::default();

    let push_current = |batches: &mut Vec<CommitBatch>, current: &mut CommitBatch| {
        if !current.operations.is_empty() {
            batches.push(std::mem::take(current));
        }
    };

    for (entity, ops) in entity_ops {
        if current.operations.len() + ops.len() > batch_size && !current.operations.is_empty() {
            push_current(&mut batches, &mut current);
        }
        current.operations.extend(ops);
        current.dirty_entities.insert(entity);
    }

    for (op, entity) in new_entity_ops {
        if current.operations.len() + 1 > batch_size && !current.operations.is_empty() {
            push_current(&mut batches, &mut current);
        }
        current.operations.push(op);
        current.new_entities.push(entity);
    }

    if current.operations.len() + resource_ops.len() > batch_size && !current.operations.is_empty() {
        push_current(&mut batches, &mut current);
    }
    current.operations.extend(resource_ops);
    push_current(&mut batches, &mut current);

    let num_batches = batches.len();
    bevy::log::info!(
        "[handle_commit_trigger] Splitting commit into {} batches of size ~{}.",
        num_batches,
        batch_size
    );

    if let (Some(cid), Some(listener)) =
        (correlation_id, correlation_id.and_then(|cid| take_commit_listener(ecs, cid)))
    {
        bevy::log::debug!(
            "registered multi-batch tracker for correlation_id={cid} batches={}",
            num_batches
        );
        ecs.spawn(MultiBatchCommitTracker {
            correlation_id: cid,
            remaining_batches: Arc::new(AtomicUsize::new(num_batches)),
            result_sender: Arc::new(Mutex::new(Some(listener))),
            pending_metas: Arc::new(Mutex::new(Vec::new())),
            failed: Arc::new(AtomicBool::new(false)),
        });
    }

    // Divide resource types across batches
    let mut resource_sets = Vec::with_capacity(num_batches);
    for _ in 0..num_batches {
        resource_sets.push(HashSet::new());
    }
    for (i, res_type) in dirty_resources.iter().enumerate() {
        let batch_idx = i % num_batches;
        resource_sets[batch_idx].insert(*res_type);
    }

    for (i, batch) in batches.into_iter().enumerate() {
        let batch_db = db.clone();
        let batch_runtime = runtime.clone();
        let batch_new_entities = batch.new_entities.clone();

        let (tx, rx) = oneshot::channel();
        batch_runtime.spawn(async move {
            bevy::log::trace!("commit batch task started (batched)");
            let res = batch_db
                .execute_transaction(batch.operations)
                .await
                .map(|keys| (keys, batch_new_entities));
            bevy::log::trace!("commit batch runtime task completed send");
            let _ = tx.send(res);
        });

        // Each batch gets its own subset of dirty entities and resources
        let mut batch_dirty_entities: HashMap<Entity, HashSet<TypeId>> = HashMap::new();
        for entity in &batch.dirty_entities {
            if let Some(dirty) = dirty_entity_components.get(entity) {
                batch_dirty_entities.insert(*entity, dirty.clone());
            }
        }

        // Preassigned keys for this batch's new entities only
        let mut batch_preassigned_keys: HashMap<Entity, String> = HashMap::new();
        for entity in &batch.new_entities {
            if let Some(key) = preassigned_keys.get(entity) {
                batch_preassigned_keys.insert(*entity, key.clone());
            }
        }

        let meta = CommitMeta {
            dirty_entity_components: batch_dirty_entities,
            despawned_entities: if i == 0 {
                despawned_entities.clone()
            } else {
                HashSet::new()
            },
            dirty_resources: resource_sets[i].clone(),
            despawned_resources: if i == 0 {
                despawned_resources.clone()
            } else {
                HashSet::new()
            },
            connection: db.clone(),
            store: store.clone(),
            // Only the first batch carries the edge snapshot
            new_edge_snapshot: if i == 0 {
                new_edge_snapshot.clone()
            } else {
                HashSet::new()
            },
            preassigned_keys: batch_preassigned_keys,
        };

        ecs.spawn((
            CommitTask { receiver: Some(rx) },
            TriggerId { correlation_id },
            meta,
        ));
    }
}

pub(super) fn handle_commit_completed(
    mut commands: Commands,
    mut query: Query<(Entity, &mut CommitTask, &TriggerId, Option<&mut CommitMeta>)>,
    mut session: ResMut<PersistenceSession>,
    mut status: ResMut<CommitStatus>,
    mut completed: MessageWriter<CommitCompleted>,
    mut triggers: MessageWriter<TriggerCommit>,
    mut trackers: Query<(Entity, &MultiBatchCommitTracker)>,
) {
    static PENDING_LOG_COUNT: AtomicUsize = AtomicUsize::new(0);

    let mut to_despawn = Vec::new();
    let mut had_error = false;

    for (ent, mut task, trigger_id, meta_opt) in &mut query {
        if let Some(mut receiver) = task.receiver.take() {
            let result: Result<(Vec<String>, Vec<Entity>), PersistenceError> =
                match receiver.try_recv() {
                    Ok(res) => res,
                    Err(tokio::sync::oneshot::error::TryRecvError::Empty) => {
                        task.receiver = Some(receiver);
                        continue;
                    }
                    Err(tokio::sync::oneshot::error::TryRecvError::Closed) => {
                        bevy::log::error!("commit task channel closed before result");
                        Err(PersistenceError::new(
                            "Commit task cancelled before completion",
                        ))
                    }
                };

            let cid = trigger_id.correlation_id;
            let mut is_final_batch = true;
            let mut should_send_result = true;
            let mut commit_connection: Option<Arc<dyn DatabaseConnection>> = None;
            let mut commit_store: Option<String> = None;
            let mut tracker_found = false;
            let mut group_failed = false;
            let mut pending_metas_arc: Option<Arc<Mutex<Vec<CommitMeta>>>> = None;

            if result.is_err() {
                had_error = true;
            }

            if let Some(correlation_id) = cid {
                if let Some((tracker_entity, tracker)) =
                    trackers.iter_mut().find(|(_, t)| t.correlation_id == correlation_id)
                {
                    tracker_found = true;
                    pending_metas_arc = Some(tracker.pending_metas.clone());
                    group_failed = tracker.failed.load(Ordering::SeqCst);
                    let remaining = tracker.remaining_batches.fetch_sub(1, Ordering::SeqCst) - 1;
                    is_final_batch = remaining == 0;

                    if result.is_err() && !group_failed {
                        // First failure in the group — mark failed and send error
                        tracker.failed.store(true, Ordering::SeqCst);
                        group_failed = true;
                        if let Some(sender) = tracker.result_sender.lock().unwrap().take() {
                            let _ = sender.send(Err(result.as_ref().unwrap_err().clone()));
                        }
                    } else if is_final_batch && !group_failed {
                        // All batches completed successfully
                        if let Some(sender) = tracker.result_sender.lock().unwrap().take() {
                            let _ = sender.send(Ok(()));
                        }
                    }

                    if is_final_batch {
                        commands
                            .entity(tracker_entity)
                            .remove::<MultiBatchCommitTracker>();
                    }

                    // Only emit events for the first error or the successful final batch
                    if !is_final_batch && result.is_ok() {
                        should_send_result = false;
                    }
                }
            }

            if let Err(err) = &result {
                bevy::log::error!(
                    "commit batch completed with error (cid={:?} tracker_found={} final_batch={} err={})",
                    cid,
                    tracker_found,
                    is_final_batch,
                    err
                );
            } else {
                bevy::log::trace!(
                    "commit batch completed ok (cid={:?} tracker_found={} final_batch={})",
                    cid,
                    tracker_found,
                    is_final_batch
                );
            }

            if let Some(mut meta) = meta_opt {
                commit_connection = Some(meta.connection.clone());
                commit_store = Some(meta.store.clone());

                let event_res = if tracker_found {
                    // Atomic multi-batch: defer success until all batches complete
                    if group_failed {
                        // Group has failed — restore dirty state for all deferred metas + this one
                        if is_final_batch {
                            if let Some(ref pending) = pending_metas_arc {
                                let mut deferred = pending.lock().unwrap();
                                for deferred_meta in deferred.iter_mut() {
                                    restore_dirty_state_on_failure(&mut session, deferred_meta);
                                }
                                deferred.clear();
                            }
                        }
                        let err_for_event = if let Err(err) = &result {
                            Some(err.clone())
                        } else {
                            None
                        };
                        restore_dirty_state_on_failure(&mut session, &mut meta);
                        // Only emit event for the first error batch
                        err_for_event.map(Err)
                    } else if !is_final_batch {
                        // Stash this meta for later; don't apply yet
                        if let Some(ref pending) = pending_metas_arc {
                            let connection = meta.connection.clone();
                            let store = meta.store.clone();
                            let taken_meta = std::mem::replace(&mut *meta, CommitMeta {
                                dirty_entity_components: HashMap::new(),
                                despawned_entities: HashSet::new(),
                                dirty_resources: HashSet::new(),
                                despawned_resources: HashSet::new(),
                                connection,
                                store,
                                new_edge_snapshot: HashSet::new(),
                                preassigned_keys: HashMap::new(),
                            });
                            pending.lock().unwrap().push(taken_meta);
                        }
                        None // No event to emit for intermediate batches
                    } else {
                        // Final batch succeeded and no failures — apply ALL deferred metas + this one
                        let deferred = if let Some(ref pending) = pending_metas_arc {
                            std::mem::take(&mut *pending.lock().unwrap())
                        } else {
                            Vec::new()
                        };
                        for deferred_meta in &deferred {
                            apply_commit_success(&mut commands, &mut session, deferred_meta);
                        }
                        apply_commit_success(&mut commands, &mut session, &meta);
                        Some(Ok(vec![]))
                    }
                } else {
                    // Single batch (non-atomic): apply immediately
                    match &result {
                        Ok(_) => {
                            apply_commit_success(&mut commands, &mut session, &meta);
                            Some(Ok(vec![]))
                        }
                        Err(err) => {
                            restore_dirty_state_on_failure(&mut session, &mut meta);
                            Some(Err(err.clone()))
                        }
                    }
                };

                if let Some(event_res) = event_res {
                    if should_send_result && (is_final_batch || result.is_err()) {
                        bevy::log::debug!(
                            "emitting CommitCompleted for cid={:?} final_batch={} err={}",
                            cid,
                            is_final_batch,
                            result.is_err()
                        );
                        completed.write(CommitCompleted {
                            result: event_res,
                            dirty_entities: vec![],
                            correlation_id: cid,
                        });
                    }
                }
            } else if let Err(e) = &result {
                if should_send_result {
                    completed.write(CommitCompleted {
                        result: Err(e.clone()),
                        dirty_entities: vec![],
                        correlation_id: cid,
                    });
                }
            }

            to_despawn.push(ent);

            if is_final_batch || had_error {
                let should_trigger_next = !had_error && *status == CommitStatus::InProgressAndDirty;
                *status = CommitStatus::Idle;

                if should_trigger_next {
                    if let (Some(conn), Some(store)) = (commit_connection.clone(), commit_store.clone()) {
                        triggers.write(TriggerCommit {
                            correlation_id: None,
                            target_connection: conn,
                            store,
                        });
                    }
                }
            }
        } else if PENDING_LOG_COUNT.fetch_add(1, Ordering::Relaxed) < 5 {
            bevy::log::debug!("commit task still pending (cid={:?})", trigger_id.correlation_id);
        }
    }

    if had_error {
        *status = CommitStatus::Idle;
    }

    for entity in to_despawn {
        commands.entity(entity).despawn();
    }
}

fn apply_commit_success(
    commands: &mut Commands,
    session: &mut PersistenceSession,
    meta: &CommitMeta,
) {
    // Assign GUIDs using the client-side preassigned keys.
    // These keys were embedded in the documents sent to the DB, so the DB
    // already has them — we just need to reflect them in the ECS world.
    for (entity, key) in &meta.preassigned_keys {
        commands.entity(*entity).insert(Guid::new(key.clone()));
        session.insert_entity_key(*entity, key.clone());
        session
            .version_manager_mut()
            .set_version(VersionKey::Entity(key.clone()), 1);
    }

    for tid in &meta.dirty_resources {
        if meta.despawned_resources.contains(tid) {
            continue;
        }
        let vk = VersionKey::Resource(*tid);
        let nv = session.version_manager().get_version(&vk).unwrap_or(0) + 1;
        session.version_manager_mut().set_version(vk, nv);
    }

    for tid in &meta.despawned_resources {
        session
            .version_manager_mut()
            .remove_version(&VersionKey::Resource(*tid));
    }

    for &entity in meta.dirty_entity_components.keys() {
        if meta.preassigned_keys.contains_key(&entity) {
            continue;
        }
        if let Some(key) = session.entity_key(entity) {
            let vk = VersionKey::Entity(key.clone());
            if let Some(v) = session.version_manager().get_version(&vk) {
                session.version_manager_mut().set_version(vk, v + 1);
            }
        }
    }

    for e in &meta.despawned_entities {
        if let Some(key) = session.entity_key(*e).cloned() {
            session
                .version_manager_mut()
                .remove_version(&VersionKey::Entity(key));
        }
    }

    // Apply the edge snapshot on successful commit
    if !meta.new_edge_snapshot.is_empty() {
        session.set_edge_snapshot(meta.new_edge_snapshot.clone());
    }
}

fn restore_dirty_state_on_failure(session: &mut PersistenceSession, meta: &mut CommitMeta) {
    let dirty_entity_components: HashMap<Entity, HashSet<TypeId>> =
        meta.dirty_entity_components.drain().collect();
    let despawned_entities = std::mem::take(&mut meta.despawned_entities);
    let dirty_resources = std::mem::take(&mut meta.dirty_resources);
    let despawned_resources = std::mem::take(&mut meta.despawned_resources);
    session.restore_dirty_state(DirtyState::from_parts(
        dirty_entity_components,
        despawned_entities,
        dirty_resources,
        despawned_resources,
    ));
}