huskies: merge 868

server/src/pipeline_state/projection.rs

@@ -91,6 +91,14 @@ pub fn project_stage(view: &PipelineItemView) -> Result<Stage, ProjectionError>
                 commits_ahead: NonZeroU32::new(1).expect("1 is non-zero"),
             })
         }
+        "4_merge_failure" => {
+            // The reason is persisted in front-matter (merge_failure: "...") but
+            // is not part of the raw CRDT view; the projection uses an empty
+            // string here.  Consumers that need the reason should read content.
+            Ok(Stage::MergeFailure {
+                reason: String::new(),
+            })
+        }
         "5_done" => {
             // Use the stored merged_at timestamp if present.  Legacy items
             // that pre-date this field have merged_at = None, so we fall back