huskies: merge 866

server/src/io/story_metadata/fields.rs

@@ -115,18 +115,6 @@ pub fn write_review_hold(path: &Path) -> Result<(), String> {
     Ok(())
 }
 
-/// Write `blocked: true` to the YAML front matter of a story file.
-///
-/// Used to mark stories that have exceeded the retry limit and should not
-/// be auto-assigned again.
-pub fn write_blocked(path: &Path) -> Result<(), String> {
-    let contents =
-        fs::read_to_string(path).map_err(|e| format!("Failed to read story file: {e}"))?;
-    let updated = set_front_matter_field(&contents, "blocked", "true");
-    fs::write(path, &updated).map_err(|e| format!("Failed to write story file: {e}"))?;
-    Ok(())
-}
-
 /// Write or update `depends_on:` field in the YAML front matter of a story file.
 ///
 /// Serialises `deps` as an inline YAML sequence, e.g. `[477, 478]`.
@@ -162,11 +150,6 @@ pub fn write_rejection_notes_to_content(contents: &str, notes: &str) -> String {
     format!("{contents}{section}")
 }
 
-/// Write `blocked: true` to story content (pure function).
-pub fn write_blocked_in_content(contents: &str) -> String {
-    set_front_matter_field(contents, "blocked", "true")
-}
-
 /// Write or update `merge_failure` in story content (pure function).
 pub fn write_merge_failure_in_content(contents: &str, reason: &str) -> String {
     let escaped = reason

server/src/io/story_metadata/mod.rs

@@ -14,8 +14,8 @@ 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_blocked, write_blocked_in_content, write_depends_on, write_depends_on_in_content,
-    write_merge_failure, write_merge_failure_in_content, write_mergemaster_attempted_in_content,
+    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,
 };
 pub use parser::{

server/src/io/watcher/mod.rs

@@ -52,6 +52,7 @@ pub fn stage_metadata(stage: &str, item_id: &str) -> Option<(&'static str, Strin
         Stage::Upcoming => ("create", format!("huskies: triage {item_id}")),
         Stage::Backlog => ("create", format!("huskies: create {item_id}")),
         Stage::Coding => ("start", format!("huskies: start {item_id}")),
+        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::Done { .. } => ("done", format!("huskies: done {item_id}")),