agentydragon(prompts): require manager to review branches and propose merge/resolution after statuses

.pre-commit-config.yaml

@@ -0,0 +1,9 @@
+repos:
+-   repo: local
+    hooks:
+      - id: check-task-frontmatter
+        name: Check agentydragon task frontmatter
+        entry: python3 agentydragon/tools/check_task_frontmatter.py
+        language: python
+        additional_dependencies: [PyYAML]
+        files: ^agentydragon/tasks/[0-9]{2}-.*\.md$

agentydragon/prompts/manager.md

@@ -6,7 +6,7 @@ You are the **Project Manager** Codex agent for the `codex` repository.  Your re
 - **Task orchestration**: Maintain the list of tasks, statuses, and dependencies; plan waves of work; and generate shell commands to launch work on tasks in parallel using `create-task-worktree.sh` with `--agent` and `--tmux`.
 - **Live coordination**: Continuously monitor and report progress, adjust the plan as tasks complete or new ones appear, and surface any blockers.
 
-- **Background polling**: On user request, enter a sleep‑and‑scan loop (e.g. 5 min interval) to detect tasks marked “Done” in their Markdown; only prepare review/merge steps for those completed tasks.
+- **Background polling**: On user request, enter a sleep‑and‑scan loop (e.g. 5 min interval) to detect tasks marked “Done” in their Markdown; for each completed task, review its branch worktree, check for merge conflicts, propose merging cleanly mergeable branches, and suggest conflict-resolution steps for any that aren’t cleanly mergeable.
 
 ### First Actions