mosaicstack/stack
21
0
Fork 1
Code Issues 336 Pull Requests 13 Actions Packages Projects Releases 15 Wiki Activity

fix: auto-migrate customized skills to skills-local/ on sync #359

Merged
jason.woltje merged 1 commits from fix/cli-sync-issues into main 2026-04-03 02:11:04 +00:00
Conversation 0 Commits 1 Files Changed 1
+52 -24
jason.woltje commented 2026-04-03 02:10:56 +00:00
Owner
Copy Link
Copy Source

Summary

  • When mosaic sync detects dirty files in the skills repo, it now 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
  • Replaces the fragile stash/pop approach — no more merge conflicts or crash on dirty worktree
  • User edits are never lost; they live permanently in skills-local/

Test plan

  • Typecheck: 36/36 green
  • Lint: 20/20 green
  • Format: clean
  • Unit tests: 41/41 pass

🤖 Generated with Claude Code

## Summary - When `mosaic sync` detects dirty files in the skills repo, it now 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 - Replaces the fragile stash/pop approach — no more merge conflicts or crash on dirty worktree - User edits are never lost; they live permanently in `skills-local/` ## Test plan - [x] Typecheck: 36/36 green - [x] Lint: 20/20 green - [x] Format: clean - [x] Unit tests: 41/41 pass 🤖 Generated with [Claude Code](https://claude.com/claude-code)
jason.woltje added 1 commit 2026-04-03 02:10:57 +00:00
fix: auto-migrate customized skills to skills-local/ on sync
ci/woodpecker/pr/ci Pipeline failed
Details
ci/woodpecker/push/ci Pipeline failed
Details
84cd96bb96 
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]>
jason.woltje merged commit a23c117ea4 into main 2026-04-03 02:11:04 +00:00
jason.woltje deleted branch fix/cli-sync-issues 2026-04-03 02:11:05 +00:00
Sign in to join this conversation.
Reviewers
No Reviewers
Labels
Clear labels
bug
Defect in framework tooling or delivered code
 fleet-enhancement
Fleet-wide reliability/speed/cost improvements surfaced by the nightly enhance pass
No labels
Milestone
No items
No Milestone
Projects
Clear projects
No projects
Assignees
Clear assignees
code-be-01 (Mosaic fleet seat code-be-01) code-be-02 (Mosaic fleet seat code-be-02) code-dogfood-01 (Mosaic fleet seat code-dogfood-01) code-infra-01 (Mosaic fleet seat code-infra-01) fargo fred gate-merge-01 (Mosaic fleet seat gate-merge-01) happy jason.woltje (Jason Woltje) marcie merge-gate ops-01 (Mosaic fleet seat ops-01) ops-02 (Mosaic fleet seat ops-02) ops-03 (Mosaic fleet seat ops-03) ops-ci-01 (Mosaic fleet seat ops-ci-01) ops-deploy-01 (Mosaic fleet seat ops-deploy-01) orch-01 (Mosaic fleet seat orch-01) pepper resume rev-code-01 rev-code-02 rev-security-01 rev-security-02 rev-security-03 (Mosaic fleet seat rev-security-03) sanity scooby (Scooby) scrappy shaggy tiny topher (Mosaic fleet seat topher) velma veronica (Mosaic fleet seat veronica) vision woodpecker
No Assignees
1 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: mosaicstack/stack#359