Handle merge conflicts as orchestration events

2026-02-24 10:29:06 -05:00
parent ca5fd3f096
commit 9f032d9b14
18 changed files with 863 additions and 70 deletions
--- a/src/ui/public/app.js
+++ b/src/ui/public/app.js
@@ -117,6 +117,10 @@ const MANIFEST_EVENT_TRIGGERS = [
  "validation_passed",
  "validation_failed",
  "branch_merged",
+  "merge_conflict_detected",
+  "merge_conflict_resolved",
+  "merge_conflict_unresolved",
+  "merge_retry_started",
 ];

 const RUN_MANIFEST_EDITOR_VALUE = "__editor__";