Release v2.48.0: Cloud conflict decisions save one note and stay saved, queued conflicts merge when they can, interrupted uploads clean up, Escape keeps Quick Capture open

[adibhanna]

Summary

Release branch for ZenNotes 2.48.0: a follow-up to the 2.47.0 Cloud conflict work from Unyanda's reports, one Quick Capture fix, and a community Nix packaging update. No new features.

• Resolving a conflict no longer depends on the rest of the vault. Choosing your version, the other device's version, both, or a combined note downloaded the full content manifest of the vault before it would save, so one small note waited on every unrelated asset and, on a vault with many attachments, could time out with nothing written. The server already checks the base revision and the destination path atomically, so the save now goes against the reviewed revision alone; taking the Cloud version, or keeping both, checks freshness from metadata and fetches only that file's retained bytes when the snapshot lacks them. Hosts without a revision reader keep the content-manifest path. A stale revision is reported as "The Cloud version changed. Sync again before choosing a version." Commit 06dc99e0.
• A saved decision stays saved when the follow-up sync is slow or fails. The whole-vault sync after a decision used to own the outcome, leaving the review open on a resolved note and inviting a second save. The decision is retired the moment the save succeeds, the review advances or closes, the vault sync runs in the background, and a failure surfaces as Note saved. Remaining vault sync failed: plus the reason. A resolver that has saved ignores further clicks; Settings adopts the shared summary when the later run replaces it. Commit 06dc99e0.
• Queued conflicts merge themselves once they safely can. A content conflict that could not merge when found stayed queued until opened, even once the two sides had become a clean three-way merge. Every sync now reconsiders those when the Cloud side is unchanged, all three paths agree, there is no draft and no paused path, and the current local file merges cleanly; the result is written and uploaded and the conflict clears. Overlaps, drafts, renames, paused paths and a file changing mid-write stay queued. Commit 06dc99e0.
• Interrupted large-asset uploads close their file reader before the upload reservation is released, removing the stream-adapter path behind the "Controller is already closed" error, and Cloud Settings follows the live sync state (no stale "Everything is up to date" during a failure, no old error after a successful retry, drafts and unrelated backup or publishing errors stay visible). Commit 55cafa08.
• Escape cancels a Quick Capture selection without closing the window (#765, uNyanda). An Escape the editor handles (Vim visual mode, insert mode, an ordinary selection, the completion popup, the picker) leaves the draft open; the next unhandled Escape still saves and hides, and the save shortcut is unchanged. Commit edd55e03.
• Nix: the top-level X11 libraries instead of the deprecated xorg set (#763, blueagledev). Same derivation on the pinned nixpkgs; requires nixpkgs 25.11 or later. Commit ba4ae683.

Also on the branch: the release notes and post (443c34cd) and the chore(release): 2.48.0 version bump (71bafa15).

Verification

• New tests: cloud-sync-resolution.test.ts, the "safely merging queued conflicts" block in cloud-sync-coordinator.test.ts, cloud-sync-upload-network.test.ts (real HTTP uploads of 8.1 MB and 10 MB with byte and hash checks, disconnects, timeouts, retries, restart recovery), resolver, Settings and status-store cases for a saved decision followed by a slow or failing sync, and the Quick Capture Escape cases in QuickCaptureApp.test.ts.
• The Cloud fixes and the Quick Capture change were driven in the built desktop app on macOS against the local Cloud fixture. The Arch Linux upload report was reproduced through the synthetic upload fixtures only.
• Release gates run fresh at the cut: apps/desktop build:prod (typecheck:node, typecheck:web, 749 tests, build, packaged CLI isolation) and electron-builder --dir, Go vet and tests (-count=1), app-core suite (2,003 tests), shared-domain suite (1,593 tests), repo typecheck, web build, and the signed packaged app launched from an isolated profile reaching a CDP page target in 3.3 s.
• npm audit --omit=dev --audit-level=high passes; the only remaining finding is a moderate, development-only vitest advisory.
• CI, CodeQL and the Nix build are green on ba4ae683.

Docs

Release notes and post under docs/releases/v2.48.0/; no in-app manual or website docs change was needed (bug fixes only). The website release page entry is prepared in the Laravel repo and is pushed with the release.

https://claude.ai/code/session_01Pa8u7FTkwZD3zZ5AoFxKC8