Skip to content

sync: refresh plans after conflict decisions - #9

Merged
callumalpass merged 1 commit into
mainfrom
agent/entity-aware-conflicts
Aug 7, 2026
Merged

sync: refresh plans after conflict decisions#9
callumalpass merged 1 commit into
mainfrom
agent/entity-aware-conflicts

Conversation

@callumalpass

Copy link
Copy Markdown
Collaborator

Summary

  • invalidate the reviewed plan before applying an explicit conflict decision
  • obtain and render a fresh engine plan only after the decision succeeds
  • keep a rejected stale decision from manufacturing a replacement preview

Found by live beta.41 Obsidian testing: resolution succeeded, but the view retained its pre-decision plan and left a stale apply button enabled.

Verification

  • npm run build
  • npm test (46 tests)
  • live reproduced against the preserved production conflict fixture

@callumalpass
callumalpass merged commit 392798b into main Aug 7, 2026
1 check passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant