huskies: merge 1051

server/src/agents/pool/pipeline/merge/runner.rs

@@ -100,6 +100,16 @@ impl AgentPool {
             }
         }
 
+        // Story 1051: if the story is in MergeFailure, transition it to Merge
+        // before starting the pipeline so the UI shows an active retry state
+        // rather than the stale failure indicator (AC 1, AC 4).
+        if let Err(e) = crate::agents::lifecycle::transition_merge_failure_to_retry(story_id) {
+            slog!(
+                "[merge] Could not transition '{story_id}' from MergeFailure to Merge: {e} \
+                 (merge will proceed regardless)"
+            );
+        }
+
         // Insert Running job into CRDT.
         let started_at = unix_now();
         crate::crdt_state::write_merge_job(