huskies: merge 866

server/src/pipeline_state/projection.rs

@@ -72,6 +72,9 @@ pub fn project_stage(view: &PipelineItemView) -> Result<Stage, ProjectionError>
     match view.stage.as_str() {
         "0_upcoming" => Ok(Stage::Upcoming),
         "1_backlog" => Ok(Stage::Backlog),
+        "2_blocked" => Ok(Stage::Blocked {
+            reason: String::new(),
+        }),
         "2_current" => Ok(Stage::Coding),
         "3_qa" => Ok(Stage::Qa),
         "4_merge" => {
@@ -147,10 +150,11 @@ impl PipelineItem {
         let dir = stage_dir_name(&self.stage);
         let blocked = matches!(
             self.stage,
-            Stage::Archived {
-                reason: ArchiveReason::Blocked { .. },
-                ..
-            }
+            Stage::Blocked { .. }
+                | Stage::Archived {
+                    reason: ArchiveReason::Blocked { .. },
+                    ..
+                }
         );
         // Frozen stories map to "7_frozen"; they are not "blocked" in the CRDT sense.
         (dir, blocked)
@@ -302,6 +306,26 @@ mod tests {
         }
     }
 
+    #[test]
+    fn project_blocked_item() {
+        let view = PipelineItemView {
+            story_id: "42_story_test".to_string(),
+            stage: "2_blocked".to_string(),
+            name: Some("Test".to_string()),
+            agent: None,
+            retry_count: None,
+            blocked: None,
+            depends_on: None,
+            claimed_by: None,
+            claimed_at: None,
+            merged_at: None,
+            qa_mode: None,
+            mergemaster_attempted: None,
+        };
+        let item = PipelineItem::try_from(&view).unwrap();
+        assert!(matches!(item.stage, Stage::Blocked { .. }));
+    }
+
     #[test]
     fn project_archived_blocked_item() {
         let view = PipelineItemView {
@@ -385,6 +409,13 @@ mod tests {
             (Stage::Upcoming, "0_upcoming", false),
             (Stage::Backlog, "1_backlog", false),
             (Stage::Coding, "2_current", false),
+            (
+                Stage::Blocked {
+                    reason: "stuck".into(),
+                },
+                "2_blocked",
+                true,
+            ),
             (Stage::Qa, "3_qa", false),
             (
                 Stage::Merge {