huskies: merge 759

2026-04-28 00:02:33 +00:00
parent 9b24c2e281
commit 63ce7b9ec3
3 changed files with 42 additions and 14 deletions
@@ -156,6 +156,7 @@ pub(crate) fn tool_list_upcoming(ctx: &AppContext) -> Result<String, String> {

 pub(crate) fn tool_get_pipeline_status(ctx: &AppContext) -> Result<String, String> {
    let state = load_pipeline_state(ctx)?;
+    let running_merges = ctx.services.agents.list_running_merges()?;

    fn map_items(items: &[crate::http::workflow::UpcomingStory], stage: &str) -> Vec<Value> {
        items
@@ -203,6 +204,7 @@ pub(crate) fn tool_get_pipeline_status(ctx: &AppContext) -> Result<String, Strin
        "active": active,
        "backlog": backlog,
        "backlog_count": backlog.len(),
+        "deterministic_merges_in_flight": running_merges,
    }))
    .map_err(|e| format!("Serialization error: {e}"))
 }