Skip to content

0.1.3

Choose a tag to compare

@dlsdgj dlsdgj released this 16 Nov 21:33
· 3 commits to main since this release

Added

  • Manual conflict merge UI — A new modal lets you resolve conflicts by editing a merged-result text field, with side-by-side previews of the desktop and device versions, quick buttons (keep desktop / keep device / keep both), and per-conflict navigation with apply all support.

Fixed

  • Three-way merge silently degrading to LWW — rememberBase() failed to create the base/ directory before writing blob files, so all merges fell back to last-write-wins, causing device-side edits to be lost.
  • Desktop showing green status dot with no device connected — peerSeenAt was initialized to Date.now() on boot; now initialized to 0 so the dot correctly shows yellow from start. Offline threshold reduced from 120s to 45s.
  • Device online/offline status in settings — Authorized device list now shows online/offline indicator with last-seen timestamp.