feat(skills): push state read from facts, never pushed by the skills
Run C2 of manual-push mode (BDR-111/BDR-112). The four flows that pushed on their own, or claimed the branch was on origin, now read the truth after the fact and hand the user the exact command: - client-handover-writer: the "Push to origin now?" question and its push block are gone (the hooks had already pushed in auto-push mode; push-guard denies it in manual mode). A reusable PUSH STATE READ (branch, origin probe, `git rev-list --count origin/<br>..<br>`, the verb only to word the reason) runs after commit-change, at the top of the deploy pause, after "Deployed" and before each end report. The branch name is validated against an allowlist before it is placed in any command or hint (a hostile branch name is otherwise a shell injection). Pending → the user pushes BEFORE the deploy pause; the deploy brief says "after your push". `Push:` line in both reports. - release-candidate STEP 6: two ahead counts + the verb; anything other than auto with both counts 0 prints one user command `! git push --atomic origin main develop v<X.Y.Z>` and stops; the tag gate stays for auto mode; `hold` notes --follow-tags; version regex. - release-executor: push claims qualified (auto-push mode, best effort). - tour: mode-agnostic rule; STEP 3 reads one `git -C <project>` fact per project (suffix-aware branch, --remotes=origin, origin probe) and the summary row says on origin / local only with the user command.
This commit is contained in:
bchanot
@@ -45,7 +45,7 @@ The agent runs a **ship-and-handover pipeline** with explicit gates:
|
||||
- Re-invoke the audit subagent in audit mode: it re-scores and returns the next FIX BUNDLE; it applies nothing (a dispatched child cannot hold a gate).
|
||||
- Repeat up to `MAX_ITERATIONS` (default 5).
|
||||
- If still < 17/20 after cap → escalate to user with concrete remaining issues; user decides continue / stop / manual intervention.
|
||||
4. **COMMIT + PUSH** — If files changed during fix loops, run /commit-change (atomic logical commits) then `git push`.
|
||||
4. **COMMIT + PUSH** — If files changed during fix loops, run /commit-change (atomic logical commits); the gitflow hooks push in auto-push mode, otherwise (manual push mode, or a hook push that failed) the agent tells the user to push with `! git push -u origin <branch>` BEFORE the deploy pause.
|
||||
5. **DEPLOY PAUSE** — List exact deploy artifacts: changed files since baseline, deploy hints from project (vercel.json, netlify.toml, Dockerfile, .github/workflows/deploy.yml, etc.), and the deploy process in plain words. Use AskUserQuestion: "Deploy done? (Yes / Not yet / Skip validate)". Block until Yes or Skip.
|
||||
6. **/web-validate (live site)** — Run validator-analyzer against the deployed URL. Capture `SCORE_VALIDATE`.
|
||||
7. **GATE — per-axis threshold ≥17/20** — Compute final `SCORE_*_AFTER` for SEO classique, GEO (IA), HARDEN, VALIDATE. If ANY < 17/20: STOP. Generate `.claude/audits/HANDOVER-ROADMAP.md` with prioritized analysis of what's blocking each below-threshold axis. Do NOT write the client deliverable. Report to user.
|
||||
|
||||
@@ -25,8 +25,9 @@ The two mechanical spans (prep, finish+tag) run on the sonnet-pinned
|
||||
gate needed here, dispatch does the job. This dispatcher keeps everything
|
||||
the executor must never own: the version-NUMBER decision (judgment — derives
|
||||
from semver change nature), and the two human gates (when to release, and
|
||||
the tag push). A human gate sits BETWEEN the two spans by construction, so the
|
||||
executor is never dispatched twice in one call.
|
||||
the tag push (auto-push mode; in manual push mode the user pushes main,
|
||||
develop and the tag in one command)). A human gate sits BETWEEN the two
|
||||
spans by construction, so the executor is never dispatched twice in one call.
|
||||
|
||||
## When to use
|
||||
- `develop` is ahead of `main` and you want to publish a version.
|
||||
@@ -54,6 +55,8 @@ Read the `## [Unreleased]` section of `CHANGELOG.md` and the commits on
|
||||
`develop` since `main`. Apply the Versioning rule above (breaking → MAJOR,
|
||||
features → MINOR, fixes → PATCH) and settle `<X.Y.Z>` before dispatching
|
||||
anything — the executor never derives or second-guesses this number.
|
||||
The version must match `^[0-9]+\.[0-9]+\.[0-9]+$` before it is placed in
|
||||
any command or tag; anything else stops the run.
|
||||
|
||||
### STEP 3 — Dispatch: prep
|
||||
```
|
||||
@@ -93,10 +96,22 @@ Parse the `RELEASE-EXEC REPORT`:
|
||||
not an auto-retry.
|
||||
|
||||
### STEP 6 — Tag push GATE (ASK)
|
||||
`main` and `develop` are already on origin: the lib pushes every merge as
|
||||
it lands (`_gitflow_merge_into` + the post-merge hook, BDR-095). Only the
|
||||
tag is left. STOP. On explicit go only ([[LRN-069]]) — run the tag push
|
||||
HERE, in this dispatcher, never delegated to the executor:
|
||||
Read the state, separate Bash calls:
|
||||
`git rev-list --count origin/main..main 2>/dev/null || echo unknown`,
|
||||
`git rev-list --count origin/develop..develop 2>/dev/null || echo unknown`,
|
||||
`bash "$HOME/.claude/lib/gitflow.sh" push-mode`.
|
||||
- Anything other than `auto` from the verb (manual, invalid, empty, usage
|
||||
error) OR either count ≠ 0 or `unknown` → Claude pushes nothing
|
||||
(push-guard would refuse it in manual mode; a failed lib push is the
|
||||
user's call, BDR-095). Print ONE command for the user and STOP, no
|
||||
question: `! git push --atomic origin main develop v<X.Y.Z>` (invalid:
|
||||
quote the verb's stderr line verbatim; auto with a count ≠ 0 or unknown:
|
||||
say `main/develop not on origin (no remote-tracking ref or the lib's push
|
||||
did not land)`; no origin remote (`git remote get-url origin` fails): say
|
||||
`add an origin remote first`).
|
||||
- Push mode `auto` and both counts 0 → main and develop are on origin; only
|
||||
the tag is left. STOP. On explicit go only ([[LRN-069]]) — run the tag
|
||||
push HERE, never delegated:
|
||||
```
|
||||
AskUserQuestion:
|
||||
Push tag v<X.Y.Z> to origin? — go / hold
|
||||
@@ -105,13 +120,16 @@ Go →
|
||||
```bash
|
||||
git push origin v<X.Y.Z>
|
||||
```
|
||||
`hold` → stop; the release is on origin (main + develop), the tag stays local.
|
||||
`hold` → stop; the release is on origin (main + develop), the tag stays
|
||||
local until the next push of main (`--follow-tags` on every lib and hook
|
||||
push).
|
||||
|
||||
## Common mistakes
|
||||
- Tagging before `gitflow finish` → tag wouldn't sit on main's merge commit. Tag AFTER, on main.
|
||||
- Auto-firing finish because tests pass → finish is a HUMAN gate.
|
||||
- Restarting the tag at v1.0.0 → desyncs from the CHANGELOG lineage. Continue it.
|
||||
- Pushing the tag without the ASK gate → [[LRN-069]].
|
||||
- Pushing anything in manual push mode → print the one user command, push nothing.
|
||||
|
||||
## Validation
|
||||
`RC_WORK=$(mktemp -d) RC_TAG=1 bash lib/tests/run-release-candidate.sh` → 5/5 (fan-out + tag on main). `RC_TAG=0` reds the tag assertion — proves the lib alone never tags (the gap this skill fills).
|
||||
|
||||
+16
-5
@@ -237,6 +237,16 @@ order:
|
||||
and says so in the summary.
|
||||
4. Confirm `git status --porcelain` is clean (runtime junk the sandbox
|
||||
cannot delete, e.g. `__pycache__/`, becomes a report residual line).
|
||||
5. Push state, only when a branch exists (report-only, skipped or
|
||||
dirty-tree projects have none: their row keeps `no branch`, no push
|
||||
column). Two read-only calls, probe first:
|
||||
`git -C <abs project> remote get-url origin >/dev/null 2>&1 || echo no-origin`
|
||||
then
|
||||
`git -C <abs project> rev-list --count <branch> --not --remotes=origin 2>/dev/null || echo unknown`
|
||||
(`<branch>` = the name `gitflow start` returned, suffixed `-2`/`-3` on a
|
||||
same-day re-run — never the bare `chore/tour-<date>`). 0 → `on origin`;
|
||||
else `local only → ! git -C <abs project> push -u origin <branch>` (probe
|
||||
printed `no-origin` → `local only (no origin remote)`).
|
||||
|
||||
```markdown
|
||||
## Tour 2026-07-04 — branch chore/tour-2026-07-04 — 2 iterations — CONVERGED
|
||||
@@ -255,8 +265,8 @@ any project line with contract-changing fixes left open for decision):
|
||||
|
||||
```
|
||||
TOUR COMPLETE — 2026-07-04
|
||||
~/proj/api : CONVERGED (2 it.) — 3 fixed, 1 suggested | chore/tour-2026-07-04, 4 commits
|
||||
~/proj/site : NOT CONVERGED (3 it.) — 2 open residuals | chore/tour-2026-07-04, 6 commits
|
||||
~/proj/api : CONVERGED (2 it.) — 3 fixed, 1 suggested | chore/tour-2026-07-04, 4 commits | on origin
|
||||
~/proj/site : NOT CONVERGED (3 it.) — 2 open residuals | chore/tour-2026-07-04, 6 commits | local only → ! git -C ~/proj/site push -u origin chore/tour-2026-07-04
|
||||
~/proj/lib : report-only (dirty tree) | no branch
|
||||
Branches left UNMERGED — review each, then `gitflow finish` on your GO.
|
||||
Reconcile suggestions pending — apply via /reconcile.
|
||||
@@ -270,9 +280,10 @@ without that approval — neither this repo's nor any target project's.
|
||||
|
||||
- Branch via the gitflow lib; **never `gitflow finish`, never merge,
|
||||
never push `main`/`develop`** — "the tour is green" is not a signal.
|
||||
The chore branch's own commits are pushed by the gitflow hooks
|
||||
(BDR-095); a `push FAILED` hook warning is a report residual, fixed
|
||||
with a plain `git push -u origin chore/tour-<date>`.
|
||||
The gitflow hooks push the chore branch in auto-push mode only; when it
|
||||
is not on origin (manual push mode, or a `push FAILED` warning) the USER
|
||||
pushes it — `! git -C <abs project> push -u origin <branch>` — the tour
|
||||
never pushes or retries.
|
||||
- Scoped pathspecs only; `git add -A` is forbidden.
|
||||
- Target TODO.md and target `.claude/memory/` are READ-ONLY. Reconcile
|
||||
produces suggestions, not edits.
|
||||
|
||||
Reference in New Issue
Block a user