Problem
vcs_merge_resolve requires a pre-built JSON file of conflict resolutions. The agent has no way to inspect individual conflicts, reason about them, and submit resolutions interactively. The structural merge — one of lex-code's key differentiators — is unusable without external tooling.
Design
New tool: vcs_merge_show_conflicts
vcs_merge_show_conflicts(merge_id: Str) -> List[Conflict]
Each Conflict should include: file path, function name, base SigId, left SigId, right SigId, and a human-readable diff of the competing changes.
New tool: vcs_merge_resolve_one
vcs_merge_resolve_one(merge_id: Str, conflict_id: Str, resolution: ConflictResolution) -> MergeStatus
This allows the refactor agent to work through conflicts one at a time rather than preparing a bulk JSON blob.
Acceptance
- Both tools added and available to refactor agent
- Conflict resolution loop: show → reason → resolve → check → repeat
lex check --strict src/ passes
Problem
vcs_merge_resolverequires a pre-built JSON file of conflict resolutions. The agent has no way to inspect individual conflicts, reason about them, and submit resolutions interactively. The structural merge — one of lex-code's key differentiators — is unusable without external tooling.Design
New tool:
vcs_merge_show_conflictsEach
Conflictshould include: file path, function name, base SigId, left SigId, right SigId, and a human-readable diff of the competing changes.New tool:
vcs_merge_resolve_oneThis allows the refactor agent to work through conflicts one at a time rather than preparing a bulk JSON blob.
Acceptance
lex check --strict src/passes