fix: syncDirectory same-path guard, nested .git exclusion, and sync stash handling

Conversation 0 Commits 2 Files Changed 4

+119 -5

2 Commits

Author	SHA1	Message	Date
jarvis	e83674ac51	fix: mosaic sync — auto-stash dirty worktree before pull --rebase ci/woodpecker/pr/ci Pipeline failed Details ci/woodpecker/push/ci Pipeline was successful Details git pull --rebase fails with 'cannot pull with rebase: You have unstaged changes' when the skills repo has local modifications. Fix: detect dirty index/worktree, stash before pull, restore after. Also gracefully handle pull failures (warn and continue with existing checkout) and stash pop conflicts.	2026-04-02 20:41:11 -05:00
jarvis	a6e59bf829	fix: syncDirectory — guard same-path copy and skip nested .git dirs Two bugs causing 'EACCES: permission denied, copyfile' when source and target are the same path (e.g. wizard with sourceDir == mosaicHome): 1. No same-path guard — syncDirectory tried to copy every file onto itself; git pack files are read-only (0444) so copyFileSync fails. 2. excludeGit only matched top-level .git — nested .git dirs like sources/agent-skills/.git were copied, hitting the same permission issue. Fixes: - Early return when resolve(source) === resolve(target) - Match .git dirs at any depth via dirName and relPath checks - Skip files inside .git/ paths Added file-ops.test.ts with 4 tests covering all cases.	2026-04-02 20:41:11 -05:00

Author

SHA1

Message

Date

jarvis

e83674ac51

fix: mosaic sync — auto-stash dirty worktree before pull --rebase

ci/woodpecker/pr/ci Pipeline failed

Details

ci/woodpecker/push/ci Pipeline was successful

Details

git pull --rebase fails with 'cannot pull with rebase: You have
unstaged changes' when the skills repo has local modifications.

Fix: detect dirty index/worktree, stash before pull, restore after.
Also gracefully handle pull failures (warn and continue with existing
checkout) and stash pop conflicts.

2026-04-02 20:41:11 -05:00

jarvis

a6e59bf829

fix: syncDirectory — guard same-path copy and skip nested .git dirs

Two bugs causing 'EACCES: permission denied, copyfile' when source
and target are the same path (e.g. wizard with sourceDir == mosaicHome):

1. No same-path guard — syncDirectory tried to copy every file onto
   itself; git pack files are read-only (0444) so copyFileSync fails.
2. excludeGit only matched top-level .git — nested .git dirs like
   sources/agent-skills/.git were copied, hitting the same permission
   issue.

Fixes:
- Early return when resolve(source) === resolve(target)
- Match .git dirs at any depth via dirName and relPath checks
- Skip files inside .git/ paths

Added file-ops.test.ts with 4 tests covering all cases.

2026-04-02 20:41:11 -05:00

fix: syncDirectory same-path guard, nested .git exclusion, and sync stash handling #356