huskies: merge 1036

server/src/crdt_state/write/item.rs

@@ -267,6 +267,14 @@ pub fn write_item(
         Stage::Merge { retries, .. } => *retries as f64,
         _ => 0.0,
     };
+    // Extract merge_server_start from Stage::Merge; 0.0 clears the register.
+    let merge_server_start_val: f64 = match stage {
+        Stage::Merge {
+            server_start_time: Some(t),
+            ..
+        } => *t,
+        _ => 0.0,
+    };
     let Some(state_mutex) = get_crdt() else {
         return;
     };
@@ -335,6 +343,11 @@ pub fn write_item(
         apply_and_persist(&mut state, |s| {
             s.crdt.doc.items[idx].claim_ts.set(claim_ts_val)
         });
+        apply_and_persist(&mut state, |s| {
+            s.crdt.doc.items[idx]
+                .merge_server_start
+                .set(merge_server_start_val)
+        });
         if let Some(ma) = merged_at {
             apply_and_persist(&mut state, |s| s.crdt.doc.items[idx].merged_at.set(ma));
         }
@@ -380,6 +393,7 @@ pub fn write_item(
             "epic": "",
             "resume_to": "",
             "plan_state": "",
+            "merge_server_start": merge_server_start_val,
         })
         .into();
 
@@ -409,6 +423,7 @@ pub fn write_item(
             item.epic.advance_seq(floor);
             item.resume_to.advance_seq(floor);
             item.plan_state.advance_seq(floor);
+            item.merge_server_start.advance_seq(floor);
         }
 
         // Broadcast a CrdtEvent for the new item.
@@ -484,11 +499,13 @@ pub fn set_retry_count(story_id: &str, count: i64) {
             commits_ahead,
             claim,
             retries: _,
+            server_start_time,
         } => Stage::Merge {
             feature_branch,
             commits_ahead,
             claim,
             retries: count.max(0) as u32,
+            server_start_time,
         },
         _ => return,
     };
@@ -525,6 +542,7 @@ pub fn bump_retry_count(story_id: &str) -> i64 {
             commits_ahead,
             claim,
             retries,
+            server_start_time,
         } => {
             let n = retries + 1;
             (
@@ -533,6 +551,7 @@ pub fn bump_retry_count(story_id: &str) -> i64 {
                     commits_ahead,
                     claim,
                     retries: n,
+                    server_start_time,
                 },
                 n,
             )