huskies: merge 868

server/src/io/story_metadata/fields.rs

@@ -83,27 +83,6 @@ pub fn clear_front_matter_field(path: &Path, key: &str) -> Result<(), String> {
     Ok(())
 }
 
-/// Write or update a `merge_failure:` field in the YAML front matter of a story file.
-///
-/// The reason is stored as a quoted YAML string so that colons, hashes, and newlines
-/// in the failure message do not break front-matter parsing.
-/// If no front matter is present, this is a no-op (returns Ok).
-pub fn write_merge_failure(path: &Path, reason: &str) -> Result<(), String> {
-    let contents =
-        fs::read_to_string(path).map_err(|e| format!("Failed to read story file: {e}"))?;
-
-    // Produce a YAML-safe inline quoted string: collapse newlines, escape inner quotes.
-    let escaped = reason
-        .replace('"', "\\\"")
-        .replace('\n', " ")
-        .replace('\r', "");
-    let yaml_value = format!("\"{escaped}\"");
-
-    let updated = set_front_matter_field(&contents, "merge_failure", &yaml_value);
-    fs::write(path, &updated).map_err(|e| format!("Failed to write story file: {e}"))?;
-    Ok(())
-}
-
 /// Write `review_hold: true` to the YAML front matter of a story file.
 ///
 /// Used to mark spikes that have passed QA and are waiting for human review.

server/src/io/story_metadata/mod.rs

@@ -14,9 +14,9 @@ mod types;
 pub use deps::{check_archived_deps, check_archived_deps_from_list, check_unmet_deps};
 pub use fields::{
     clear_front_matter_field, clear_front_matter_field_in_content, set_front_matter_field,
-    write_depends_on, write_depends_on_in_content, write_merge_failure,
-    write_merge_failure_in_content, write_mergemaster_attempted_in_content,
-    write_rejection_notes_to_content, write_review_hold, write_review_hold_in_content,
+    write_depends_on, write_depends_on_in_content, write_merge_failure_in_content,
+    write_mergemaster_attempted_in_content, write_rejection_notes_to_content, write_review_hold,
+    write_review_hold_in_content,
 };
 pub use parser::{
     is_story_frozen_in_store, parse_front_matter, parse_unchecked_todos, resolve_qa_mode,

server/src/io/watcher/mod.rs

@@ -55,6 +55,9 @@ pub fn stage_metadata(stage: &str, item_id: &str) -> Option<(&'static str, Strin
         Stage::Blocked { .. } => ("block", format!("huskies: block {item_id}")),
         Stage::Qa => ("qa", format!("huskies: queue {item_id} for QA")),
         Stage::Merge { .. } => ("merge", format!("huskies: queue {item_id} for merge")),
+        Stage::MergeFailure { .. } => {
+            ("merge_failure", format!("huskies: merge_failure {item_id}"))
+        }
         Stage::Done { .. } => ("done", format!("huskies: done {item_id}")),
         Stage::Archived { .. } => ("accept", format!("huskies: accept {item_id}")),
         Stage::Frozen { .. } => ("freeze", format!("huskies: freeze {item_id}")),