diff --git a/.claude/skills/upgrade-all/SKILL.md b/.claude/skills/upgrade-all/SKILL.md index e56ba50..6a71e0d 100644 --- a/.claude/skills/upgrade-all/SKILL.md +++ b/.claude/skills/upgrade-all/SKILL.md @@ -103,9 +103,21 @@ ssh cc-ci 'cd /root/cc-ci/tests && ls -d */' | sed 's#/##' \ | grep -vxF -f <(printf '%s\n' "$EXTERNAL") # drop externally-maintained recipes ``` (or the names passed in `$ARGUMENTS` — an explicit recipe name overrides the `external` skip, so you -can still upgrade one on request.) For each candidate, on cc-ci, check availability — skip -dirty/up-to-date. (If `/root/cc-ci` isn't present on the host, stage it first — see -`cc-ci-plan/plan-proxy-vip-exhaustion-fix.md` / the host-rebuild memory for the staging step.) +can still upgrade one on request.) + +**First, reconcile EVERY inventoried recipe's mirror with true upstream, before fetching its checkout, +checking versions, reading open PRs, or deciding it is up-to-date.** This is the first per-recipe +survey action, including for recipes that end up skipped. The helper syncs mirror `main` and closes +PRs whose changes are already upstream. It requires a local recipe checkout; if absent, stage that +checkout first (see `cc-ci-plan/plan-proxy-vip-exhaustion-fix.md` / the host-rebuild memory): +``` +set -a; . /srv/cc-ci/.testenv; set +a +ssh cc-ci "GITEA_USERNAME='$GITEA_USERNAME' GITEA_PASSWORD='$GITEA_PASSWORD' GITEA_URL='$GITEA_URL' bash -s --reconcile-only" \ + < /srv/cc-ci/.claude/skills/recipe-upgrade/open-recipe-pr.sh +``` +Record a reconciliation failure as `unverified` and investigate it; never label the recipe +up-to-date from an unsynced mirror. After successful reconciliation, refresh the checkout from that +mirror and check availability. If `/root/cc-ci` is absent, stage the cc-ci checkout first too. > ⚠️ **Four things that silently skip recipes — handle ALL FOUR per recipe before the version check:** > 1. **pseudo-TTY:** abra FATAs `inappropriate ioctl for device` under plain ssh — wrap every abra call @@ -178,16 +190,8 @@ advisory checks are subject to the anonymous 60-request/hour limit; any resultin failed source and must become `?` in the report. Never replace it with `0` or silently retry from model memory. The file is a read-only GitHub token location; never print its contents. -**Reconcile every candidate's mirror during the survey** (even the up-to-date ones), so merged-upstream -PRs are closed and every mirror `main` tracks true upstream — fleet-wide, not just where there's a new -upgrade: -``` -set -a; . /srv/cc-ci/.testenv; set +a -ssh cc-ci "GITEA_USERNAME='$GITEA_USERNAME' GITEA_PASSWORD='$GITEA_PASSWORD' GITEA_URL='$GITEA_URL' bash -s --reconcile-only" \ - < /srv/cc-ci/.claude/skills/recipe-upgrade/open-recipe-pr.sh -``` -(The per-recipe `/recipe-upgrade` also reconciles, so this is belt-and-suspenders for skipped recipes — -count closed-merged PRs in the summary.) +Count PRs closed as already merged upstream in the weekly summary. `/recipe-upgrade` reconciles +again before writing a PR, because upstream may advance while the survey and testing run. ## 2. Determine concurrency, then print the plan Read the live capacity (unless `--capacity N` / `--sequential` / `--parallel` was passed):