2 files changed, 22 insertions, 2 deletions

diff --git a/src/swarm/bootstrap.rs b/src/swarm/bootstrap.rs
index d2a593b..5c3b5ef 100644
--- a/src/swarm/bootstrap.rs
+++ b/src/swarm/bootstrap.rs
@@ -266,6 +266,9 @@ pub(crate) struct StartingDocument {
     pub(crate) earlier_actors: Vec<ActorId>,
     /// The signatures of its changes (from the document file).
     pub(crate) signatures: Vec<(crate::document::ChangeHash, [u8; 64])>,
+    /// The actor this node wrote with, where it stopped cleanly (the document file's
+    /// `resumable`): it may write on as that one (`--keep-actor`).
+    pub(crate) resumable: Option<ActorId>,
 }
 
 /// What `--recover-from` and `--document-file` say about where to start.
@@ -314,7 +317,7 @@ pub(crate) fn starting_document(
         Some(path) => Some(load_backup(path, files)?),
     };
 
-    let (doc, origin, earlier_actors, signatures) = match (backup, from_file) {
+    let (doc, origin, earlier_actors, signatures, resumable) = match (backup, from_file) {
         (Some(_), Some(_)) if !force.allows("replaceDocumentFile") => {
             bail!(
                 "recover-from would replace the document in the document file; add --force replaceDocumentFile to recover the backup anyway"
@@ -326,13 +329,14 @@ pub(crate) fn starting_document(
                     "Recovering the backup instead of the document file's document (--force replaceDocumentFile)"
                 );
             }
-            (backup, Origin::Backup, Vec::new(), Vec::new())
+            (backup, Origin::Backup, Vec::new(), Vec::new(), None)
         }
         (None, Some(loaded)) => (
             loaded.doc,
             Origin::DocumentFile,
             loaded.actors,
             loaded.signatures,
+            loaded.resumable,
         ),
         (None, None) => return Ok(None),
     };
@@ -343,6 +347,7 @@ pub(crate) fn starting_document(
     }
     let mut starting = identify(doc, origin, earlier_actors)?;
     starting.signatures = signatures;
+    starting.resumable = resumable;
 
     if let Some(remembered) = options.remembered.filter(|id| *id != starting.swarm_id) {
         let what = origin.describe();
@@ -379,6 +384,7 @@ fn identify(
         origin,
         earlier_actors,
         signatures: Vec::new(),
+        resumable: None,
     })
 }
 
diff --git a/src/swarm/document_file.rs b/src/swarm/document_file.rs
index e066e27..4c7843d 100644
--- a/src/swarm/document_file.rs
+++ b/src/swarm/document_file.rs
@@ -25,6 +25,20 @@ pub(crate) async fn run(state: AppState) {
     }
 }
 
+/// At a clean stop, after the last `flush`: the file marked as holding everything this
+/// node wrote (`DocumentFile::close`), where it does (ready, not rejoining, up to the
+/// document's heads), so a restart may write on as the same actor (`--keep-actor`).
+pub(crate) async fn close(state: &AppState) {
+    let Some(file) = state.document_file.clone() else {
+        return;
+    };
+    if state.remake.is_rejoining() || !state.is_ready().await {
+        return;
+    }
+    let heads = state.doc.read().await.doc.get_heads();
+    file.close(&heads);
+}
+
 /// Writes what is due now (`DocumentFile::due`). Also called at shutdown.
 pub(crate) async fn flush(state: &AppState) {
     let Some(file) = state.document_file.clone() else {