docs(pr-template): make branch naming agent-operable - #810
Merged
Conversation
|
PR template check (advisory, non-blocking) This PR body doesn't look like it covers everything
This isn't a required check -- it won't block merge. See the template's own "Notes for contributors" for which sections lighter-path PRs can skip. |
![chatgpt-codex-connector[bot]](https://avatars.githubusercontent.com/in/1144995?s=60&v=4){kind=small}
There was a problem hiding this comment.
💡 Codex Review
Here are some automated review suggestions for this pull request.
Reviewed commit: 620c735e4f
ℹ️ About Codex in GitHub
Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you
- Open a pull request for review
- Mark a draft as ready
- Comment "@codex review".
If Codex has suggestions, it will comment; otherwise it will react with 👍.
Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".
cgfixit
force-pushed
the
grok/pr-template-branch-rules
branch
from
August 6, 2026 01:09
0f6125c to
8c80d65
Compare
cgfixit
pushed a commit
that referenced
this pull request
Aug 6, 2026
…ly stale Two more codex findings on the same section fixed in the prior commit: - The documented recovery (checkout main, fetch, hard-reset main) only helps when local main itself is what's stale. Run the quick-check from a feature branch that's simply behind (the common case for an agent branch cut before a later merge landed on main) and it reports REWRITE/DIVERGED, but resetting main does nothing for that branch -- switching back to it fails the same check and the pre-push gate still refuses it. Verified against this session's own history: PR #804/#809/#810 were in exactly this state (cut before #802 merged) and the fix was `git rebase origin/main` on each feature branch, not a main reset. - `git reset --hard origin/main` was presented unconditionally, with no check for unique local commits or uncommitted work it would discard. `git reset -h` confirms --hard resets HEAD, the index, and the working tree. CLAUDE.md's own Git Safety Protocol treats `reset --hard` as destructive and never to run without explicit confirmation; this doc contradicted that by presenting it as a bare recovery one-liner. Added the feature-branch rebase path as the primary recovery, and gated the main-reset path on `git status --short` being clean and `git log origin/main..main` being empty first. Co-Authored-By: CyClaw Agent <cyclaw-agent@users.noreply.github.com>
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.
Summary
Rewrites the casual top-of-template branch note into explicit, agent-operable rules aligned with
utils/agent_identity.pyand.githooks.Changes
agent/when the driver is knownOut of scope
Does not change
DEFAULT_COMMIT_NAME/DEFAULT_BRANCH_PREFIXinutils/agent_identity.py(CyClaw Agent /agent/fallback). That remains a separate decision.Test plan