story-kit: merge 225_story_surface_merge_conflicts_and_failures_in_the_web_ui

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

View File

@@ -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()),