gabriel / muse public
feat patch ergonomics task/ergonomics-merge-autostash-grep-files #1 / 1
gabriel · 62 days ago · Apr 15, 2026 · Diff

feat(ergonomics): muse merge --autostash + muse code grep --files

- merge --autostash: stash dirty working tree before merge, pop in finally block regardless of outcome (clean/conflict/error). Mirrors muse checkout --autostash using the same _stash_push_programmatic / _apply_autostash primitives. Mutually exclusive with --force. Extracted merge body into _run_merge() to enable clean try/finally.

- code grep --files: print unique matching file paths one per line, sorted. Mirrors grep -l / rg -l. Trivially pipeable without JSON parsing or key-name knowledge.

Tests: 13 merge-autostash cases + 10 grep-files cases; 163 existing merge+grep tests all passing.

sha256:40c2a9d7a0ed1fe019cc06cb5e1b8b7a2468b1398279bed823bfb3e122a46115 sha
sha256:dc75cb5018fff8320d083cfb3e0cd3c3ec67a279a8716d108d2075a60a16db36 snapshot
← Older Oldest on task/ergonomics-merge-autostash-grep-files
All commits
Newer → Latest on task/ergonomics-merge-autostash-grep-files

0 comments

No comments yet. Be the first to start the discussion.

To add a comment, use the Muse CLI: muse hub commit comment sha256:40c2a9d7a0ed1fe019cc06cb5e1b8b7a2468b1398279bed823bfb3e122a46115 --body "your comment"