gabriel / muse public
fix patch resolve task/issue-8-autostage #1 / 1
AI Agent gabriel · 20 days ago · May 21, 2026 · Diff

fix(resolve): auto-stage resolved files — closes acceptance criterion #1

muse resolve now stages each resolved file into the code index immediately after clearing it from conflict_paths, so a bare muse commit works without a separate muse code add step.

_stage_files() helper: no-op for non-code domains; for code repos it hashes the on-disk content, writes the blob, determines A vs M from the HEAD manifest, and updates the stage index atomically.

Three new tests lock the behavior: file-level, --all, and symbol-level resolve all auto-stage without any intervening code add call.

sha256:43b516a70ad066d2dca6fd627c3b52510283d4d1e960523416124b6aaeb9806b sha
sha256:7f8df71179860c428bbd461c5ddb1287a19eb1fd67d89c3b8660f7f372e9668c parent
2 changed · 1044 in snapshot files
sha256:5a9f1fc8683ee59bad62a29c446f4b14e3175991c805849c1053e4e07b5639fb snapshot
2
files changed
1044
files in snapshot
Files Changed
~2
1044 in snapshot
~ muse/cli/commands/resolve.py .py
~ tests/test_resolve_phase3.py .py
← Older Oldest on task/issue-8-autostage
All commits
Newer → Latest on task/issue-8-autostage

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:43b516a70ad066d2dca6fd627c3b52510283d4d1e960523416124b6aaeb9806b --body "your comment"