noppu-labs/ai-toolkit

Sync vendored skills with upstream

Prerequisites: gh CLI authenticated. Run everything from the repo root.

Workflow

1. Run node scripts/skills-sync.mjs status. States and what to do:

   • up-to-date — nothing to do.
   • local — our own skill, no upstream; nothing to sync.
   • upstream-updated — safe fast-forward: node scripts/skills-sync.mjs pull <plugin>/<skill>.
   • locally-modified — we edited since the last baseline. If the edits are intentional, node scripts/skills-sync.mjs accept <plugin>/<skill>.
   • diverged — both sides changed: merge manually (section below).
   • fetch-error (...) — upstream unreachable or moved; check source/skillPath in the plugin's skills-lock.json against the upstream repo.

2. After all changes: node scripts/skills-sync.mjs verify, then commit with a message that lists which skills were pulled or merged and from which upstream commits.

Manual merge for diverged skills

Never blind-overwrite a diverged skill — pull --force discards our customizations.

1. node scripts/skills-sync.mjs diff <plugin>/<skill> — full diff, vendored → upstream.
2. Identify which differences are OUR deliberate customizations (git log -p -- <plugin>/skills/<skill> shows how the vendored copy evolved) versus genuine upstream improvements.
3. Edit the vendored files to incorporate the upstream improvements while preserving every local customization. Read both versions fully before editing.
4. Re-baseline BOTH sides: node scripts/skills-sync.mjs seed <plugin>/<skill> (accept only re-baselines the vendored hash and would leave the skill permanently flagged as upstream-updated).