story-kit: merge 311_story_server_enforced_retry_limits_for_failed_merge_and_empty_diff_stories

server/src/http/mcp.rs

@@ -1156,7 +1156,7 @@ fn tool_get_pipeline_status(ctx: &AppContext) -> Result<String, String> {
         items
             .iter()
             .map(|s| {
-                json!({
+                let mut item = json!({
                     "story_id": s.story_id,
                     "name": s.name,
                     "stage": stage,
@@ -1165,7 +1165,19 @@ fn tool_get_pipeline_status(ctx: &AppContext) -> Result<String, String> {
                         "model": a.model,
                         "status": a.status,
                     })),
-                })
+                });
+                // Include blocked/retry_count when present so callers can
+                // identify stories stuck in the pipeline.
+                if let Some(true) = s.blocked {
+                    item["blocked"] = json!(true);
+                }
+                if let Some(rc) = s.retry_count {
+                    item["retry_count"] = json!(rc);
+                }
+                if let Some(ref mf) = s.merge_failure {
+                    item["merge_failure"] = json!(mf);
+                }
+                item
             })
             .collect()
     }