Skip to content

feat(sync): implement three-way diff for deletions#3

Merged
donk8r merged 2 commits into
masterfrom
feature/3-way-merge
Jun 12, 2026
Merged

feat(sync): implement three-way diff for deletions#3
donk8r merged 2 commits into
masterfrom
feature/3-way-merge

Conversation

@donk8r

@donk8r donk8r commented Jun 9, 2026

Copy link
Copy Markdown
Member
  • Add persistent baseline tracking for converged manifests
  • Implement three-way diff logic to distinguish deletions from creations
  • Enable propagation of deletions to both local and remote peers
  • Update sync plan to track and display deletion counts

donk8r added 2 commits June 9, 2026 17:59
- Add persistent baseline tracking for converged manifests
- Implement three-way diff logic to distinguish deletions from creations
- Enable propagation of deletions to both local and remote peers
- Update sync plan to track and display deletion counts
- Introduce LiveBaseline for tracking converged state across sessions
- Implement GitGate to defer .git events during active operations
- Add 5s settle time to prevent transient churn leakage
- Implement debounced disk writes for LiveBaseline to reduce IO overhead
- Seed LiveBaseline from converged manifests
- Integrate GitGate and LiveBaseline into agent runtime and event loops
- Ensure thread-safe access using Arc and Mutex
- Support disabling baseline updates for specific agent modes
@donk8r donk8r merged commit 66355e3 into master Jun 12, 2026
9 checks 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