Skip to content

refactor(skills): drop the Snapshot drift sections the pre-flight check already covers - #1470

Merged
potiuk merged 1 commit into
apache:mainfrom
potiuk:refactor/drop-snapshot-drift-sections
Sep 29, 2026
Merged

potiuk merged 1 commit into
apache:mainfrom
potiuk:refactor/drop-snapshot-drift-sections

Conversation

@potiuk

@potiuk potiuk commented Sep 29, 2026

Copy link
Copy Markdown
Member

Framework-wide follow-up to #1435.

Summary

#1435 removed the hand-written Snapshot drift sections from the security skills. The same prose remained in 37 other skills and sibling files, across the pr-management, release-management, issue, contributor-growth, repo-health, pairing, setup and utilities families. Each told the agent to compare .apache-magpie.local.lock with .apache-magpie.lock and propose setup upgrade. The generated pre-flight block does that in code, including the method/URL case since #1435, and stops the run where the prose only suggested.

  • The sections are removed. The Step 0 "Drift check — see Snapshot drift above" items and the pr-management adopter-config pointers now say the pre-flight block reports snapshot drift.
  • write-skill's init_skill.py no longer scaffolds the section into new skills.
  • Kept on purpose:
    • isolated-setup-install and isolated-setup-update: their evals grade their own drift step.
    • status: it renders drift in its dashboard.
  • About 480 lines removed.

Test plan

  • Hooks on commit, including the token stamps and markdownlint
  • All 12 eval steps whose extracted section changed (the Step 0 drift-check line), after the change:
    • 10 steps pass fully.
    • issue-deduplicate step-0 case 3 and release-audit-report step-0 case 3 fail the same way on main, so they predate this change.

Generated-by: Claude Code (Opus 5.5)

🤖 Generated with Claude Code

…ck already covers

apache#1435 removed these from the security skills. The same prose remained
in 37 other skills and siblings across the pr-management,
release-management, issue, contributor-growth, repo-health, pairing,
setup and utilities families: compare .apache-magpie.local.lock with
.apache-magpie.lock and propose `setup upgrade`. The generated pre-flight
block does that in code, including the method/URL case since apache#1435, and
stops the run where the prose only suggested.

- The sections are removed, and the Step 0 "Drift check — see Snapshot
  drift above" items and the adopter-config pointers now say the
  pre-flight block reports snapshot drift.
- write-skill's init_skill.py no longer scaffolds the section.
- Kept on purpose: isolated-setup-install and isolated-setup-update, whose
  evals grade their own drift step, and status, which renders drift in
  its dashboard.

About 480 lines removed.

Generated-by: Claude Code (Opus 5.5)
@potiuk potiuk added family:pr-management pr-management-* skills family:setup setup-* skills family:issue issue-* skills labels Sep 29, 2026
@potiuk
potiuk merged commit eaabd7d into apache:main Sep 29, 2026
10 checks passed
potiuk added a commit that referenced this pull request Oct 28, 2026
…t-behind from snapshot drift in update (#1888)

* skill-evals(setup-isolated-setup-verify): ground step-2-recommend in rules the skill has

Three step-2-recommend cases failed on main:

- case-3 expected an update follow-up for snapshot drift, which verify
  has not handled since #1470 moved it to the pre-flight; the model's
  "pass, nothing to do" was right. The case keeps its intent through a
  rule that exists: check 5 ⚠ for a pinned primitive drifted from the
  framework checkout's pin.
- case-5 and case-6 failed on the number of follow-ups: the output spec
  never said whether two checks with the same remedy share an entry,
  which the expected answers assumed. It now asks for one entry per
  skill or command, an operator-only decision folded into the entry for
  its check, and a hard fail first, which reorders case-5's expected.

Generated-by: Claude Opus 5

* setup-isolated-setup-update: split "framework checkout behind" from snapshot drift

After the report sent a framework checkout behind origin to `setup
upgrade`, described as refreshing the gitignored snapshot. Those are two
different things: check 1 prints `git pull --ff-only` for the user's own
magpie clone, and `setup upgrade` answers snapshot drift. Give each its
own bullet, so a run with both names both follow-ups; the
step-after-report case-2 that expected exactly that now passes.

Generated-by: Claude Opus 5
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

family:issue issue-* skills family:pr-management pr-management-* skills family:setup setup-* skills

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant