dave/storkit
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 7 Wiki Activity

story-kit: merge 225_story_surface_merge_conflicts_and_failures_in_the_web_ui

Browse Source
This commit is contained in:
Dave
2026-02-27 10:23:30 +00:00
parent e6b18cfc3b
commit f8bbe1ea31
8 changed files with 174 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
server/src/http/workflow.rs
View File

@@ -20,6 +20,8 @@ pub struct UpcomingStory {
pub story_id: String,
pub name: Option<String>,
pub error: Option<String>,
/// Merge failure reason persisted to front matter by the mergemaster agent.
pub merge_failure: Option<String>,
/// Active agent working on this item, if any.
pub agent: Option<AgentAssignment>,
}
@@ -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));