story-kit: merge 225_story_surface_merge_conflicts_and_failures_in_the_web_ui

server/src/http/mcp.rs

@@ -11,7 +11,7 @@ use crate::http::workflow::{
     validate_story_dirs,
 };
 use crate::worktree;
-use crate::io::story_metadata::{parse_front_matter, parse_unchecked_todos};
+use crate::io::story_metadata::{parse_front_matter, parse_unchecked_todos, write_merge_failure};
 use crate::workflow::{evaluate_acceptance_with_coverage, TestCaseResult, TestStatus};
 use poem::handler;
 use poem::http::StatusCode;
@@ -1668,6 +1668,28 @@ fn tool_report_merge_failure(args: &Value, ctx: &AppContext) -> Result<String, S
     slog!("[mergemaster] Merge failure reported for '{story_id}': {reason}");
     ctx.agents.set_merge_failure_reported(story_id);
 
+    // Persist the failure reason to the story file's front matter so it
+    // survives server restarts and is visible in the web UI.
+    if let Ok(project_root) = ctx.state.get_project_root() {
+        let story_file = project_root
+            .join(".story_kit")
+            .join("work")
+            .join("4_merge")
+            .join(format!("{story_id}.md"));
+        if story_file.exists() {
+            if let Err(e) = write_merge_failure(&story_file, reason) {
+                slog_warn!(
+                    "[mergemaster] Failed to persist merge_failure to story file for '{story_id}': {e}"
+                );
+            }
+        } else {
+            slog_warn!(
+                "[mergemaster] Story file not found in 4_merge/ for '{story_id}'; \
+                 merge_failure not persisted to front matter"
+            );
+        }
+    }
+
     Ok(format!(
         "Merge failure for '{story_id}' recorded. Story remains in work/4_merge/. Reason: {reason}"
     ))