gabriel / muse public
feat patch task/issue-8-phase2 #1 / 1
AI Agent gabriel · 113 days ago · May 21, 2026 · Diff

feat: add muse resolve command (issue #8 phase 2)

Implements the `muse resolve` CLI command which marks conflict paths as resolved in MERGE_STATE after manual editing.

- resolve_path / resolve_symbol primitives from phase 1 are exposed via CLI - Supports plain file paths and symbol-address targets (file::Symbol) - --all flag drains the entire conflict list - --json flag for agent consumption - Prints per-entry confirmation and remaining conflict count - Prints staging + commit guidance when all conflicts are cleared - Registered in app.py with full --help documentation

sha256:d22ae2a43e397fa1a33efa343f79f94f07d76b29ad01b5ecedf232570db2ba8c sha
+17 ~123 symbols
sha256:6f8da41f7acf4ab891dacc56b16a783b4b1e6245b9a71e6195f211600efd303c snapshot
+17
symbols added
~123
symbols modified
0
dead code introduced
Semantic Changes 140 symbols
~ muse/cli/commands/resolve.py .py 16 symbols added
+ _ResolveJson class class _ResolveJson L52–55
+ EnvelopeJson import import EnvelopeJson L48–48
+ ExitCode import import ExitCode L44–44
+ TypedDict import import TypedDict L42–42
+ annotations import import annotations L38–38
+ argparse import import argparse L40–40
+ json import import json L41–41
+ make_envelope import import make_envelope L48–48
+ read_merge_state import import read_merge_state L45–45
+ require_repo import import require_repo L46–46
+ resolve_path import import resolve_path L45–45
+ resolve_symbol import import resolve_symbol L45–45
+ sanitize_display import import sanitize_display L49–49
+ start_timer import import start_timer L47–47
+ register function function register L58–82
+ run function function run L85–197
← Older Oldest on task/issue-8-phase2
All commits
Newer → Latest on task/issue-8-phase2

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