Conversation
GitHub can delete the local source branch during PR merge while the Guardex cleanup phase is still about to run its own branch delete step. That race was failing finish even though the branch was already gone and the remaining cleanup work could succeed. This change makes the local cleanup step re-check branch existence before and after `git branch -d`, treat an already-missing ref as informational, mirror the behavior into the template script, and lock the path with a focused finish regression plus metadata parity coverage. Constraint: Finish cleanup must still fail on real local branch deletion errors Rejected: Ignore all `git branch -d` failures | would hide genuine cleanup problems Confidence: high Scope-risk: narrow Reversibility: clean Directive: Keep the branch-exists recheck paired with the concrete already-missing log line in both runtime and template scripts Tested: node --test test/finish.test.js Tested: node --check bin/multiagent-safety.js Tested: node --test test/metadata.test.js Tested: openspec validate agent-codex-tolerate-already-deleted-local-branch-in-2026-04-22-20-43 --type change --strict Tested: openspec validate --specs Not-tested: live GitHub PR merge against the real repository before finish flow
NagyVikt
deleted the
agent/codex/tolerate-already-deleted-local-branch-in-2026-04-22-20-43
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 gx branch finish (PR flow).