huskies: merge 1036

server/src/crdt_state/read.rs

@@ -403,6 +403,11 @@ pub(super) fn extract_item_view(item: &PipelineItemCrdt) -> Option<PipelineItemV
         _ => None,
     };
 
+    let merge_server_start = match item.merge_server_start.view() {
+        JsonValue::Number(n) if n > 0.0 => Some(n),
+        _ => None,
+    };
+
     let stage = project_stage_for_view(
         &stage_str,
         &story_id,
@@ -412,6 +417,7 @@ pub(super) fn extract_item_view(item: &PipelineItemCrdt) -> Option<PipelineItemV
         claim_ts_secs,
         plan_state_str.as_deref(),
         retry_count_register,
+        merge_server_start,
     )?;
 
     Some(PipelineItemView {
@@ -449,6 +455,7 @@ fn project_stage_for_view(
     claim_ts_secs: Option<u64>,
     plan_state_str: Option<&str>,
     retries: u32,
+    merge_server_start: Option<f64>,
 ) -> Option<crate::pipeline_state::Stage> {
     use crate::pipeline_state::{
         AgentClaim, AgentName, ArchiveReason, BranchName, GitSha, PlanState, Stage,
@@ -518,6 +525,7 @@ fn project_stage_for_view(
             commits_ahead: NonZeroU32::new(1).expect("1 is non-zero"),
             claim,
             retries,
+            server_start_time: merge_server_start,
         }),
         "merge_failure" => {
             // Story 986: read the typed kind directly from ContentKey::MergeFailureKind