+ {hasMergeFailure && (
+
+ ✕
+
+ )}
{itemNumber && (
)}
+ {item.merge_failure && (
+
+ {item.merge_failure}
+
+ )}
{item.agent && (
diff --git a/server/src/http/mcp.rs b/server/src/http/mcp.rs
index 1566340..148caf0 100644
--- a/server/src/http/mcp.rs
+++ b/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
,
pub error: Option,
+ /// Merge failure reason persisted to front matter by the mergemaster agent.
+ pub merge_failure: Option,
/// Active agent working on this item, if any.
pub agent: Option,
}
@@ -115,12 +117,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) = match parse_front_matter(&contents) {
- Ok(meta) => (meta.name, None),
- Err(e) => (None, Some(e.to_string())),
+ let (name, error, merge_failure) = match parse_front_matter(&contents) {
+ Ok(meta) => (meta.name, None, meta.merge_failure),
+ Err(e) => (None, Some(e.to_string()), None),
};
let agent = agent_map.get(&story_id).cloned();
- stories.push(UpcomingStory { story_id, name, error, agent });
+ stories.push(UpcomingStory { story_id, name, error, merge_failure, agent });
}
stories.sort_by(|a, b| a.story_id.cmp(&b.story_id));
diff --git a/server/src/http/ws.rs b/server/src/http/ws.rs
index 07f212d..9c942cb 100644
--- a/server/src/http/ws.rs
+++ b/server/src/http/ws.rs
@@ -612,6 +612,7 @@ mod tests {
story_id: "10_story_test".to_string(),
name: Some("Test".to_string()),
error: None,
+ merge_failure: None,
agent: None,
};
let resp = WsResponse::PipelineState {
@@ -748,12 +749,14 @@ mod tests {
story_id: "1_story_a".to_string(),
name: Some("Story A".to_string()),
error: None,
+ merge_failure: None,
agent: None,
}],
current: vec![UpcomingStory {
story_id: "2_story_b".to_string(),
name: Some("Story B".to_string()),
error: None,
+ merge_failure: None,
agent: None,
}],
qa: vec![],
@@ -762,6 +765,7 @@ mod tests {
story_id: "50_story_done".to_string(),
name: Some("Done Story".to_string()),
error: None,
+ merge_failure: None,
agent: None,
}],
};
@@ -913,6 +917,7 @@ mod tests {
story_id: "10_story_x".to_string(),
name: Some("Story X".to_string()),
error: None,
+ merge_failure: None,
agent: Some(crate::http::workflow::AgentAssignment {
agent_name: "coder-1".to_string(),
model: Some("claude-3-5-sonnet".to_string()),
diff --git a/server/src/io/story_metadata.rs b/server/src/io/story_metadata.rs
index 808ad9e..c360c0d 100644
--- a/server/src/io/story_metadata.rs
+++ b/server/src/io/story_metadata.rs
@@ -6,6 +6,7 @@ use std::path::Path;
pub struct StoryMetadata {
pub name: Option,
pub coverage_baseline: Option,
+ pub merge_failure: Option,
}
#[derive(Debug, Clone, PartialEq, Eq)]
@@ -27,6 +28,7 @@ impl std::fmt::Display for StoryMetaError {
struct FrontMatter {
name: Option,
coverage_baseline: Option,
+ merge_failure: Option,
}
pub fn parse_front_matter(contents: &str) -> Result {
@@ -58,6 +60,7 @@ fn build_metadata(front: FrontMatter) -> StoryMetadata {
StoryMetadata {
name: front.name,
coverage_baseline: front.coverage_baseline,
+ merge_failure: front.merge_failure,
}
}
@@ -74,6 +77,24 @@ pub fn write_coverage_baseline(path: &Path, coverage_pct: f64) -> Result<(), Str
Ok(())
}
+/// Write or update a `merge_failure:` field in the YAML front matter of a story file.
+///
+/// The reason is stored as a quoted YAML string so that colons, hashes, and newlines
+/// in the failure message do not break front-matter parsing.
+/// If no front matter is present, this is a no-op (returns Ok).
+pub fn write_merge_failure(path: &Path, reason: &str) -> Result<(), String> {
+ let contents =
+ fs::read_to_string(path).map_err(|e| format!("Failed to read story file: {e}"))?;
+
+ // Produce a YAML-safe inline quoted string: collapse newlines, escape inner quotes.
+ let escaped = reason.replace('"', "\\\"").replace('\n', " ").replace('\r', "");
+ let yaml_value = format!("\"{escaped}\"");
+
+ let updated = set_front_matter_field(&contents, "merge_failure", &yaml_value);
+ fs::write(path, &updated).map_err(|e| format!("Failed to write story file: {e}"))?;
+ Ok(())
+}
+
/// Insert or update a key: value pair in the YAML front matter of a markdown string.
///
/// If no front matter (opening `---`) is found, returns the content unchanged.