What problem does it solve? Projects that import shared agent scaffolding (.agents/ directory, AGENTS.md, CLAUDE.md) from an upstream repository drift out of date over time, and manually syncing files risks losing local customizations or creating messy merge conflicts. ## Core Features & Use Cases - Dual update paths: Uses npx skills add as the preferred update mechanism and falls back to a pure git fetch/merge workflow when npx is unavailable. - Incremental merges: Creates real merge commits with --allow-unrelated-histories so subsequent updates only diff the delta since the last update instead of the entire upstream history. - Conflict resolution policy: Accepts upstream versions unconditionally for upstream-owned files (.agents/, import script) while reconciling AGENTS.md to preserve local routing rules and sections. - Quick check mode: Runs only the diff steps to report what changed upstream without applying anything. - Use Case: A team member notices the shared scaffolding repo added new skills; they invoke this skill to fetch, merge, review the staged diff, and commit the update safely. ## Quick Start Ask the agent to update the agents-core scaffolding from upstream and report what changed before committing.
