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/AGENTS.md
+++ b/AGENTS.md
@@ -29,6 +29,7 @@
  - `AGENT_TOPOLOGY_MAX_DEPTH`
  - `AGENT_TOPOLOGY_MAX_RETRIES`
  - `AGENT_RELATIONSHIP_MAX_CHILDREN`
+  - `AGENT_MERGE_CONFLICT_MAX_ATTEMPTS`
 - Provisioning/resource controls:
  - `AGENT_WORKTREE_ROOT`
  - `AGENT_WORKTREE_BASE_REF`