story-kit: merge 311_story_server_enforced_retry_limits_for_failed_merge_and_empty_diff_stories

server/src/http/workflow.rs

@@ -30,6 +30,12 @@ pub struct UpcomingStory {
     /// QA mode for this item: "human", "server", or "agent".
     #[serde(skip_serializing_if = "Option::is_none")]
     pub qa: Option<String>,
+    /// Number of retries at the current pipeline stage.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub retry_count: Option<u32>,
+    /// True when the story has exceeded its retry limit and will not be auto-assigned.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub blocked: Option<bool>,
 }
 
 pub struct StoryValidationResult {
@@ -123,12 +129,12 @@ fn load_stage_items(
             .to_string();
         let contents = fs::read_to_string(&path)
             .map_err(|e| format!("Failed to read story file {}: {e}", path.display()))?;
-        let (name, error, merge_failure, review_hold, qa) = match parse_front_matter(&contents) {
-            Ok(meta) => (meta.name, None, meta.merge_failure, meta.review_hold, meta.qa.map(|m| m.as_str().to_string())),
-            Err(e) => (None, Some(e.to_string()), None, None, None),
+        let (name, error, merge_failure, review_hold, qa, retry_count, blocked) = match parse_front_matter(&contents) {
+            Ok(meta) => (meta.name, None, meta.merge_failure, meta.review_hold, meta.qa.map(|m| m.as_str().to_string()), meta.retry_count, meta.blocked),
+            Err(e) => (None, Some(e.to_string()), None, None, None, None, None),
         };
         let agent = agent_map.get(&story_id).cloned();
-        stories.push(UpcomingStory { story_id, name, error, merge_failure, agent, review_hold, qa });
+        stories.push(UpcomingStory { story_id, name, error, merge_failure, agent, review_hold, qa, retry_count, blocked });
     }
 
     stories.sort_by(|a, b| a.story_id.cmp(&b.story_id));