huskies: merge 820

server/src/http/workflow/pipeline.rs

@@ -57,6 +57,8 @@ pub struct PipelineState {
     pub qa: Vec<UpcomingStory>,
     pub merge: Vec<UpcomingStory>,
     pub done: Vec<UpcomingStory>,
+    /// Story IDs that currently have a deterministic merge in progress.
+    pub deterministic_merges_in_flight: Vec<String>,
 }
 
 /// Load the full pipeline state (all 5 active stages).
@@ -71,12 +73,19 @@ pub fn load_pipeline_state(ctx: &AppContext) -> Result<PipelineState, String> {
 
     let typed_items = crate::pipeline_state::read_all_typed();
 
+    let deterministic_merges_in_flight = ctx
+        .services
+        .agents
+        .list_running_merges()
+        .unwrap_or_default();
+
     let mut state = PipelineState {
         backlog: Vec::new(),
         current: Vec::new(),
         qa: Vec::new(),
         merge: Vec::new(),
         done: Vec::new(),
+        deterministic_merges_in_flight,
     };
 
     for item in typed_items {