fix: add explicit cloud conflict resolution

[SunkenInTime]

Adds an explicit Keep mine / Use cloud decision to rejected sync work. Use cloud refreshes the authoritative snapshot before mutation, durably removes only the selected rejected entity records and their successors, adopts only successfully deleted entities, preserves unrelated work and text drafts, and blocks reconciliation until remote hydration. Keep mine remains the explicit retry/rebase path. Includes deterministic queue, session, strategy-metadata, restart, partial-deletion, successor, no-resubmission, and widget failure-path coverage. Stacked on #144.

[coderabbitai]

Important

Review skipped

Auto reviews are disabled on base/target branches other than the default branch.

Please check the settings in the CodeRabbit UI or the .coderabbit.yaml file in this repository. To trigger a single review, invoke the @coderabbitai review command.

⚙️ Run configuration

Configuration used: Organization UI

Review profile: CHILL

Plan: Team

Run ID: 1f0b4e32-e9f0-4994-9712-f8d239258522

You can disable this status message by setting the reviews.review_status to false in the CodeRabbit configuration file.

Use the checkbox below for a quick retry:

• 🔍 Trigger review

---

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

• X
• Mastodon
• Reddit
• LinkedIn

_{Comment @coderabbitai help to get the list of available commands.}

[greptile-apps]

Greptile Summary

Players with rejected cloud edits can now choose whether to keep their local work or adopt the cloud version. The cloud path refreshes the remote snapshot before removing selected rejected work, keeps unfinished text drafts during reload, and suppresses discarded page intents until the authoritative page is hydrated.

Partial durable deletion and pre-hydration synchronization were exercised directly. A rejected edit whose durable deletion fails remains visible locally after the cloud refresh, while successfully discarded edits are not recreated as outgoing sync work before hydration.

Confidence Score: 5/5

The verified conflict-resolution paths are safe to merge.

The partial durable-deletion scenario and the stale-canvas synchronization window were both executed with focused checks. The retained local entity remained visible after hydration, and the remote-adoption path prevented a discarded entity from creating new outgoing work before hydration.

Files Needing Attention: No additional files need attention from the verified conflict-resolution behavior.

T-Rex Logs

What T-Rex did

• T-Rex validated that a failed durable deletion remains in the attention queue and observed that in a two-entity cloud-resolution flow, the successfully discarded entity adopted the remote value while the failed-delete entity retained its local value after hydration.
• T-Rex captured the remote-adoption, synchronization, discard, and hydration paths, and showed that stale local canvas state would recreate outgoing work without the adoption guard, while the same state creates no outgoing work after remote adoption and before cloud hydration.
• T-Rex analyzed partial durable discard behavior with test and hydration evidence showing that deletion returns only the successful key while retaining the failed key, and that hydration flows preserve the correct key-state relationships.
• T-Rex examined the adoptRemoteForEntities flow and hydration boundary, confirming that overlays are removed, page keys are added to remote adoption pending, and that only hydration clears pending adoption entries; supported by before/after remote-adoption timing logs.

_{Ran code and verified through T-Rex}

_{Reviews (1): Last reviewed commit: "fix: add explicit cloud conflict resolut..." | Re-trigger Greptile}