Skip to content

fix(skills): tag-release keeps its live edits #27

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
fredericrous merged 1 commit into from
Oct 8, 2026
Merged

fix(skills): tag-release keeps its live edits #27

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 18 additions & 3 deletions dot_claude/skills/tag-release/SKILL.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,20 @@ Standing rule (see `~/.claude/CLAUDE.md` § Git hygiene): in repos where a `v*`
```
Compare against the pre-commit SHA. If the commit-msg hook rejected the commit (common failure modes in this user's repos: subject >50 chars, gitmoji-prefix eating the character budget, `--no-verify` needed for a Helm-template false-positive), HEAD will NOT have moved. **STOP here if it didn't** — surface the hook's rejection reason, fix the commit message/content, and retry step 1. Do not proceed to tagging on an unchanged HEAD.

3. **Only once HEAD has confirmed-advanced, tag and push:**
3. **Only once HEAD has confirmed-advanced, tag, then push — as two separate commands:**
```bash
git tag v<version>
git push origin v<version>
git tag v<version> <sha> # one command
```
```bash
git push origin v<version> # the next command, after the tag exists
```
Never `git tag … && git push …` in one command: the amont-agent push
guards judge the whole command before any of it runs, so the tag does
not exist yet, the push "cannot be read", and under deny it is held
(2026-10-08, duro v5.5.0). A push of an existing tag needs no preview
and no implementation review — never hand it to the person.
Push from a clean task worktree whose builds are current (the pre-push
gate tests the working tree), not from the live checkout.
(If the repo also needs the commit itself pushed to `main` first, per the repo-ownership rule, push the branch before or together with the tag — check the repo's actual release workflow trigger.)

4. **Watch the release workflow, verifying `conclusion` explicitly** (not `gh run watch --exit-status` alone — see `~/.claude/CLAUDE.md` § Before pushing):
Expand All @@ -44,6 +53,12 @@ Standing rule (see `~/.claude/CLAUDE.md` § Git hygiene): in repos where a `v*`
- container image: check the digest/sha that was actually pushed (`gh api` on the release, or `docker manifest inspect`), not just that the job exited 0.
- GH release: confirm the expected assets are attached.

6. **Once the artifact is verified, clean up.** A worktree only becomes sweepable when its PR is merged AND contained in a release tag, so this is the moment the release makes worktrees removable:
- Remove the worktree(s) this release used (the bump, the tag push), from the primary checkout.
- Fast-forward the live checkout: `merge-when-green` step 6, the same guarded command, never anything but `--ff-only`.
- Sweep the repo: `python3 ~/.claude/tools/worktree-sweep/sweep.py --repo <repo> --apply`. It removes only worktrees that are clean, pushed, merged and released, and keeps the rest.
- Put what it removed and kept in the report, one line each. A release is not done until this step has run.

## Recovery if the tag ended up on the wrong commit

- **Mutable registries (container images via ghcr, etc.):** delete the remote+local tag, re-tag the correct commit, cancel the bad in-flight release run, let the correct one rebuild. Recoverable.
Expand Down
Loading