Repository navigation
fix(macos): restore event edits through undo and redo - #4508
Merged
Merged
Conversation
tyler-dane
marked this pull request as ready for review
October 16, 2026 23:37
tyler-dane
added
the
agent-automerge
tyler-dane
enabled auto-merge
October 16, 2026 23:37
github-merge-queue
Bot
removed this pull request from the merge queue due to a conflict with the base branch
Oct 17, 2026
Contributor
Author
|
agent-loop: still conflicting after update-branch onto main. Closing so the issue can be relaunched. |
tyler-dane
removed
the
agent-automerge
tyler-dane
added
the
agent-automerge
tyler-dane
enabled auto-merge
October 17, 2026 00:13
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Fixes #4507
What and why
Saving an event edit did not record undo history, and edit history replay had no implementation. Record supported single-event edits and replay their complete before/after snapshots through the existing event store, preserving event identity and calendar. Decline stale history rather than overwrite a subsequent change. Series-wide edits create a non-undoable history boundary. Prevent overlapping history restores. Existing-event drafts now retain guests, and optimistic edits preserve organizer, conference, guest responses, and provider metadata.
Verify
VERDICT: PASS
Full
bun run verify --strictpasses on f4f7d50: Swift package tests, Xcode native tests (including form save followed by Command-Z and Command-Shift-Z), type-check, lint, and knip.Passed: 125 CompassData package tests, including edit/undo/redo/undo and missing/changed-event stale-history and provider-detail preservation regressions; focused undo suite (5 tests) after the final test update; contracts:swift --check; desktop:export --check; bun lint; git diff --check.
Simplify review retained the existing event store/history boundary and two small private replay helpers. No additional abstraction or test-only product hook was needed.
Resolved the main-branch conflict with account isolation while retaining both session guards and the history-restore guard. The reconciled head passes the full strict sweep.