Conversation
This changes the codex-agent default finish flow from "merge attempt then keep" to "wait/retry until merge succeeds, then clean merged branch/worktree". agent-branch-finish now supports wait controls (, timeout, poll interval) and retries PR merges until checks clear or timeout. The template codex-agent passes wait+cleanup by default, and documentation was updated to match the new default behavior. Regression coverage now verifies both direct finish waiting behavior and codex-agent end-to-end retry/cleanup behavior. Constraint: Keep manual agent-branch-finish behavior backward compatible unless wait flags are explicit Rejected: Force waiting for every finish invocation | would break manual async review workflows Confidence: high Scope-risk: moderate Reversibility: clean Directive: Codex automation should treat unresolved PR checks as incomplete work, not successful finish Tested: npm test; node --check bin/multiagent-safety.js; npm pack --dry-run Not-tested: Real GitHub required-check timing in external repos
NagyVikt
deleted the
agent/codex/zeus-edixai-com-wait-merge-and-cleanup-v2
branch
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Automated by scripts/agent-branch-finish.sh policy update and regression tests.