huskies: merge 984

server/src/chat/commands/status/render.rs

@@ -28,7 +28,10 @@ pub(crate) fn display_section(s: &Stage) -> Option<&'static str> {
         }
         Stage::Done { .. } => Some("Done"),
         Stage::Frozen { resume_to } => display_section(resume_to),
-        Stage::Archived { .. } => None, // other archived variants are hidden
+        Stage::Abandoned { .. } | Stage::Superseded { .. } | Stage::Rejected { .. } => {
+            Some("Closed")
+        }
+        Stage::Archived { .. } => None, // Completed/MergeFailed/ReviewHeld stay hidden
     }
 }
 
@@ -50,7 +53,18 @@ pub(crate) fn unmet_deps_from_items(item: &PipelineItem, all_items: &[PipelineIt
                     || i.story_id.0.split('_').next() == Some(dep_id.0.as_str())
             });
             match dep {
-                Some(d) if matches!(d.stage, Stage::Done { .. } | Stage::Archived { .. }) => None,
+                Some(d)
+                    if matches!(
+                        d.stage,
+                        Stage::Done { .. }
+                            | Stage::Archived { .. }
+                            | Stage::Abandoned { .. }
+                            | Stage::Superseded { .. }
+                            | Stage::Rejected { .. }
+                    ) =>
+                {
+                    None
+                }
                 Some(_) => Some(dep_num), // Found but not done = unmet
                 None => None,             // Not in CRDT; treat as met
             }
@@ -126,7 +140,7 @@ pub(crate) fn build_status_from_items(
     // under their stage section (determined by `display_section`); there is
     // no separate "Blocked" section.  Frozen items appear under the section
     // their `resume_to` stage maps to.
-    let sections = ["Backlog", "In Progress", "QA", "Merge", "Done"];
+    let sections = ["Backlog", "In Progress", "QA", "Merge", "Done", "Closed"];
 
     for label in sections {
         let mut section_items: Vec<&PipelineItem> = items
@@ -225,6 +239,25 @@ fn render_item_line(
         format!(" *(waiting on: {})*", nums.join(", "))
     };
 
+    // Closed-stage items (abandoned / superseded / rejected) each get a
+    // distinct indicator and optionally display their metadata.
+    match &item.stage {
+        Stage::Abandoned { .. } => {
+            return format!("  \u{1F5D1}\u{FE0F} {display}{cost_suffix}\n"); // 🗑️
+        }
+        Stage::Superseded { superseded_by, .. } => {
+            return format!(
+                "  \u{1F500} {display}{cost_suffix} — superseded by {}\n", // 🔀
+                superseded_by.0
+            );
+        }
+        Stage::Rejected { reason, .. } => {
+            let snippet = first_non_empty_snippet(reason, 120);
+            return format!("  \u{1F6AB} {display}{cost_suffix} — {snippet}\n"); // 🚫
+        }
+        _ => {}
+    }
+
     // Merge-stage items get dedicated breakdown indicators instead of the
     // generic traffic-light dot.  MergeFailure / MergeFailureFinal items
     // now also appear in the Merge section (in-place) so they are handled