story-kit: merge 225_story_surface_merge_conflicts_and_failures_in_the_web_ui

2026-02-27 10:23:30 +00:00
parent e6b18cfc3b
commit f8bbe1ea31
8 changed files with 174 additions and 9 deletions
--- a/frontend/src/api/client.ts
+++ b/frontend/src/api/client.ts
@@ -25,6 +25,7 @@ export interface PipelineStageItem {
 	story_id: string;
 	name: string | null;
 	error: string | null;
+	merge_failure: string | null;
 	agent: AgentAssignment | null;
 }