1 files changed, 18 insertions, 7 deletions

diff --git a/src/remake/switch.rs b/src/remake/switch.rs
index cf5ea75..9cc1ca0 100644
--- a/src/remake/switch.rs
+++ b/src/remake/switch.rs
@@ -32,7 +32,7 @@ use super::delta::{self, ReplayStats};
 use super::kind::Translator;
 use super::local::LocalStatus;
 use super::quarantine;
-use super::records::{self, EpochRecord, Record, unix_millis};
+use super::records::{self, EpochRecord, Record};
 use super::snapshot::{self, META_ROOT, REMAKES};
 use super::vote;
 use crate::document::replica::Epoch;
@@ -73,7 +73,8 @@ pub(crate) async fn run_worker<H: Host>(host: H) {
 
 async fn check<H: Host>(host: &H) {
     let local = host.current_epoch();
-    host.remake().prune_archive(local.generation);
+    host.remake()
+        .prune_archive(local.generation, host.now_millis());
 
     // While rejoining, the document is being filled from peers: its records are not
     // complete enough to act on.
@@ -87,7 +88,7 @@ async fn check<H: Host>(host: &H) {
     content::prune(
         host,
         &all,
-        unix_millis(),
+        host.now_millis(),
         host.dormant_after().as_millis() as u64,
     );
     let local_record = EpochRecord::from(local);
@@ -144,7 +145,7 @@ async fn check<H: Host>(host: &H) {
             host.remake().set_status(
                 &id,
                 LocalStatus {
-                    switched_at: Some(unix_millis()),
+                    switched_at: Some(host.now_millis()),
                     replayed_paths: Some(stats.replayed),
                     failed_paths: Some(stats.failed),
                     quarantine,
@@ -205,6 +206,10 @@ async fn switch<H: Host>(
         .take_prebuilt(id)
         .filter(|snapshot| snapshot.epoch == expected);
 
+    let actor = ActorId::random();
+    host.remake().add_own_actor(actor.clone());
+    let new_actor = actor.clone();
+
     // 2. Build (or reuse), verify and replay without holding any lock.
     let (new_doc, copy_heads, mut stats) = tokio::task::spawn_blocking(
         move || -> Result<(AutoCommit, Vec<ChangeHash>, ReplayStats), String> {
@@ -222,7 +227,7 @@ async fn switch<H: Host>(
             }
 
             // A fresh actor: this node's writes in the new epoch.
-            let mut doc = snapshot.doc.with_actor(ActorId::random());
+            let mut doc = snapshot.doc.with_actor(actor);
 
             // Keep this remake's record visible in the new epoch, for its history.
             if carry_record {
@@ -242,6 +247,7 @@ async fn switch<H: Host>(
     // 3. Swap, replaying what arrived since the copy.
     let (old, late) = swap_in(host, expected, new_doc, copy_heads, late_translator).await?;
     stats.absorb(late);
+    host.remake().reset_own_actors(new_actor);
 
     // 4. Writes the remake had no place for wait for an operator (the old document
     //    holds them); the old document is kept as configured either way.
@@ -252,8 +258,13 @@ async fn switch<H: Host>(
         &old,
         std::mem::take(&mut stats.quarantined),
     );
-    host.remake()
-        .archive(previous, old, retention, expected.generation);
+    host.remake().archive(
+        previous,
+        old,
+        retention,
+        expected.generation,
+        host.now_millis(),
+    );
 
     info!(
         remake = %id,