huskies: merge 820

server/src/service/ws/message/response.rs

@@ -54,6 +54,8 @@ pub enum WsResponse {
         qa: Vec<UpcomingStory>,
         merge: Vec<UpcomingStory>,
         done: Vec<UpcomingStory>,
+        /// Story IDs that currently have a deterministic merge in progress.
+        deterministic_merges_in_flight: Vec<String>,
     },
     /// `.huskies/project.toml` was modified; the frontend should re-fetch the
     /// agent roster. Does NOT trigger a pipeline state refresh.
@@ -215,6 +217,7 @@ mod tests {
             qa: vec![],
             merge: vec![],
             done: vec![],
+            deterministic_merges_in_flight: vec![],
         };
         let json = serde_json::to_value(&resp).unwrap();
         assert_eq!(json["type"], "pipeline_state");