fix(stokowski): keep PR branches intact and accept "Accept" approvals - #290
Merged
Merged
Conversation
The hook rebased every clean branch onto origin/main. On a PR branch that already contains a merge from main (EXT-68's PR #286 after "Update branch"), that dropped the merge commit and replayed the feature commits, leaving the workspace "ahead 5, behind 6" of the PR on every dispatch. A branch with an upstream (main, or a pushed PR branch) is now only fast-forwarded to that upstream with `git pull --ff-only`. Only an unpushed local branch still rebases onto origin/main. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
EXT-68's approval read "Accepted: G1, G2, and G3". It has no "Approve", so under the prompt's own rule nothing should have been created, yet improvement created all three: the outcome was right but the agent broke its rule to get there. The rule now accepts a word starting with "Approve" or "Accept", and the report must quote the approval comment it used, so a reviewer can check the match. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.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
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.
Two small fixes to the stokowski setup, both found while finishing EXT-68.
1.
before_runno longer rewrites pushed branches (workflow.glean.yaml)The hook rebased every clean branch onto
origin/main. PR #286's branch contained a merge frommain(from "Update branch"). On that branch the rebase dropped the merge commit and replayed the 5 feature commits, which left the workspaceahead 5, behind 6of the PR, and it did this on every dispatch.Now:
main, or a pushed PR branch) is only fast-forwarded to that upstream withgit pull --ff-only, and is never rewritten.origin/main.I ran the hook with
/bin/shagainst a scratch repo:mainbehindorigin/mainmainAll four exit 0.
2. Improvement accepts "Accept" (
improvement.md,glean.md)EXT-68's approval read "Accepted: G1, G2, and G3". It contains no
Approve, so under the prompt's own rule nothing should have been created, yet improvement created all three. The result was right, but the agent broke its rule to get there.ApproveorAccept.Verification
workflow.glean.yamlparses, and the hook cases above pass.🤖 Generated with Claude Code