Summary

• When git apply fails pulling sandbox changes locally, retries with git apply --reject to partially apply clean hunks and write .rej files for conflicts
• Saves the full rejected patch to .rwx/sandboxes/patch-rejected.diff for manual inspection
• Returns partially-applied files in the exec result so agents know what was pulled
• Warns about leftover .rej files at the start of the next sync (sync still proceeds)

Example output

Pull with conflicts:

Warning: failed to pull changes from sandbox: patch partially applied. 1 file(s) have conflicts:
  Makefile (see Makefile.rej)
Resolve the conflicts in each .rej file, then delete the .rej files.
Full patch saved to /Users/jasonrobinaugh/code/cli/.rwx/sandboxes/patch-rejected.diff

Next sync with unresolved .rej files:

Warning: 1 unresolved .rej file(s) from a previous pull:
  Makefile.rej
These will be synced to the sandbox and may cause issues. Resolve and delete them when possible.

Test plan

• Unit test: --reject retry produces .rej files and reports them in warnings
• Unit test: saved patch is cleaned up when --reject succeeds fully
• Unit test: rejected patch is saved to .rwx/sandboxes/patch-rejected.diff
• Unit test: sync warns about leftover .rej files
• Manual: created local/sandbox divergence on Makefile, verified .rej file + saved patch + warning output
• Manual: verified .rej warning appears on next sync, disappears after cleanup