From b5dc76dd75cef47efa54bbf068027c227775ad7c Mon Sep 17 00:00:00 2001
From: Meta Vens <rwvens@hotmail.com>
Date: Sun, 11 Oct 2026 14:19:42 +0200
Subject: [PATCH] VerseRunStore: tick writers are private to the driver,
 open_tick is the store's insert-if-absent

open_tick, close_tick and close_ticks_before lose `pub`: run_tick through
open_or_find is the only caller, and a compile_fail doctest pins that an
exported-type holder cannot call them. open_tick uses
OwnedRedbMessagePackBackingStore::insert_entry_if_absent in one write
transaction instead of read-then-push, so two opens of one ordinal cannot both
succeed. Fixes s2 tick-rows-have-a-public-writer and open-tick-is-check-then-put.
Builds.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
---
 crates/ghostlight/src/verse/run.rs | 54 +++++++++++++++++++++---------
 1 file changed, 39 insertions(+), 15 deletions(-)

diff --git a/crates/ghostlight/src/verse/run.rs b/crates/ghostlight/src/verse/run.rs
index d8e00d7..7b78198 100644
--- a/crates/ghostlight/src/verse/run.rs
+++ b/crates/ghostlight/src/verse/run.rs
@@ -301,6 +301,16 @@ fn tick_key(world: WorldId, ordinal: u64) -> String {
     format!("{}/{ordinal:020}", world.key())
 }
 
+fn tick_row(tick: &VerseTick) -> Result<CultCacheEnvelope, VerseRunError> {
+    Ok(CultCacheEnvelope {
+        key: tick_key(tick.world_id, tick.ordinal),
+        r#type: TICK_ROW.into(),
+        payload: rmp_serde::to_vec_named(tick).map_err(|_| VerseRunError::Store)?,
+        stored_at: Utc::now().to_rfc3339(),
+        schema_id: Some(TICK_RECORD_SCHEMA.into()),
+    })
+}
+
 /// Every row of the file, split by type.
 struct Rows {
     runs: Vec<VerseRunRecord>,
@@ -309,7 +319,14 @@ struct Rows {
 
 /// Run records and tick documents in one CultCache file. A run is saved when
 /// it begins and again each time it moves, so a row is replaced by its own
-/// later state. A tick is opened once and closed once.
+/// later state. A tick is opened once and closed once, and only by the tick
+/// driver: the writers are private to this module.
+///
+/// ```compile_fail
+/// fn wedge(store: &ghostlight::VerseRunStore, world: ghostlight::WorldId) {
+///     store.close_ticks_before(world, 1).unwrap();
+/// }
+/// ```
 pub struct VerseRunStore {
     store: Mutex<OwnedRedbMessagePackBackingStore>,
 }
@@ -399,16 +416,29 @@ impl VerseRunStore {
             .find(|tick| tick.world_id == world && tick.ordinal == ordinal))
     }
 
-    /// Writes a tick document that does not exist yet, open.
-    pub fn open_tick(&self, tick: &VerseTick) -> Result<(), VerseRunError> {
-        if tick.closed.is_some() || self.tick(tick.world_id, tick.ordinal)?.is_some() {
+    /// Writes a tick document that does not exist yet, open. The store's own
+    /// insert-if-absent decides, so two opens of one ordinal cannot both win.
+    /// Private: the tick driver is the only writer of tick rows.
+    fn open_tick(&self, tick: &VerseTick) -> Result<(), VerseRunError> {
+        if tick.closed.is_some() {
             return Err(VerseRunError::OutOfSequence);
         }
-        self.put_tick(tick)
+        let row = tick_row(tick)?;
+        let inserted = self
+            .store
+            .lock()
+            .map_err(|_| VerseRunError::Store)?
+            .insert_entry_if_absent(row)
+            .map_err(|_| VerseRunError::Store)?;
+        if inserted {
+            Ok(())
+        } else {
+            Err(VerseRunError::OutOfSequence)
+        }
     }
 
-    /// Closes an open tick document.
-    pub fn close_tick(
+    /// Closes an open tick document. Private, like every tick writer.
+    fn close_tick(
         &self,
         world: WorldId,
         ordinal: u64,
@@ -425,7 +455,7 @@ impl VerseRunStore {
     }
 
     /// Closes, as the world's, every open tick of the world below `ordinal`.
-    pub fn close_ticks_before(&self, world: WorldId, ordinal: u64) -> Result<(), VerseRunError> {
+    fn close_ticks_before(&self, world: WorldId, ordinal: u64) -> Result<(), VerseRunError> {
         for mut tick in self.records()?.ticks {
             if tick.world_id == world && tick.ordinal < ordinal && tick.closed.is_none() {
                 tick.closed = Some(TickClose::World);
@@ -436,13 +466,7 @@ impl VerseRunStore {
     }
 
     fn put_tick(&self, tick: &VerseTick) -> Result<(), VerseRunError> {
-        let row = CultCacheEnvelope {
-            key: tick_key(tick.world_id, tick.ordinal),
-            r#type: TICK_ROW.into(),
-            payload: rmp_serde::to_vec_named(tick).map_err(|_| VerseRunError::Store)?,
-            stored_at: Utc::now().to_rfc3339(),
-            schema_id: Some(TICK_RECORD_SCHEMA.into()),
-        };
+        let row = tick_row(tick)?;
         self.store
             .lock()
             .map_err(|_| VerseRunError::Store)?