Conversation
Previously the post-checkout guard only reverted a primary-tree switch back to the protected branch when the working tree was clean. A dirty tree caused the guard to print "auto-revert skipped" and silently leave the primary checkout on the agent branch - the exact symptom that flips local main to an agent/* worktree branch. - templates/githooks/post-checkout: stash dirty worktree as `guardex-auto-revert <ts> <prev>-><new>` (include untracked) before reverting; primary always ends up back on the protected branch in an agent session. Fallback message only fires when stash itself fails. - AGENTS.md + templates/AGENTS.multiagent-safety.md: promote the primary-tree lock to an explicit blocking rule enumerating every disallowed command (git checkout/switch/checkout -b/switch -c/worktree add onto an existing agent branch) and add a dirty-tree rule that points at the new auto-stash safety net without making it a workflow.
NagyVikt
deleted the
agent/claude/harden-primary-branch-guard-2026-04-24-14-10
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).