Replace fragile stash/pop approach with intelligent migration: when mosaic sync detects dirty files in the skills repo, it identifies which skills were edited, copies them to skills-local/ (which takes precedence during linking), then resets the repo clean so git pull always succeeds. User edits are never lost. Co-Authored-By: Claude Opus 4.6 <[email protected]>