236e19eae1
Move the direct-merge scan (approved + CI green → try_direct_merge()) above the lock check. Merging an approved PR is a single API call that doesn't need the dev-agent lock or a Claude session. This ensures approved PRs get merged even while a dev-agent is running on an unrelated issue. The lock still guards dev-agent spawning (AD-002 preserved). Direct merge failures fall through to the post-lock code for dev-agent fallback. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> |
||
|---|---|---|
| .. | ||
| AGENTS.md | ||
| dev-agent.sh | ||
| dev-poll.sh | ||
| phase-handler.sh | ||
| phase-test.sh | ||