Release v2.47.0: drawings keep their own file, wikilinks at files are files, Cloud conflicts keep tasks visible and matching files converge

apps/desktop/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@zennotes/desktop",
   "productName": "ZenNotes",
-  "version": "2.46.0",
+  "version": "2.47.0",
   "description": "ZenNotes desktop shell",
   "private": true,
   "main": "./out/main/index.js",

apps/desktop/src/main/cloud-sync-service.test.ts

@@ -10,7 +10,7 @@ import type {
 } from '@zennotes/bridge-contract/cloud-sync'
 import { afterEach, describe, expect, it, vi } from 'vitest'
 import { CloudServiceRequestError } from './cloud-sync-client'
-import { DesktopCloudSyncService } from './cloud-sync-service'
+import { DesktopCloudSyncService, type DesktopCloudSyncServiceDependencies } from './cloud-sync-service'
 
 const temporaryDirectories: string[] = []
 
@@ -25,7 +25,8 @@ afterEach(async () => {
 async function setup(
   vaults: CloudSyncVault[] = [],
   fetchImplementation?: typeof fetch,
-  accountStatus?: () => Promise<CloudAccountStatus>
+  accountStatus?: () => Promise<CloudAccountStatus>,
+  withWindowSync?: DesktopCloudSyncServiceDependencies['withWindowSync']
 ) {
   const localRoot = await mkdtemp(path.join(os.tmpdir(), 'zennotes-local-vault-'))
   const storageDirectory = await mkdtemp(path.join(os.tmpdir(), 'zennotes-cloud-state-'))
@@ -189,12 +190,43 @@ async function setup(
     getSecret: async () => 'secret-token',
     createClient: () => client,
     fetchImplementation,
+    withWindowSync,
     now: () => new Date('2026-08-10T12:00:00.000Z')
   })
   return { service, client, localRoot }
 }
 
 describe('DesktopCloudSyncService', () => {
+  it('prepares windows before taking the vault lock and coalesces preparation', async () => {
+    let prepared!: () => void
+    const gate = new Promise<void>((resolve) => { prepared = resolve })
+    let prepareWork = async (): Promise<void> => {}
+    const prepare = vi.fn<NonNullable<DesktopCloudSyncServiceDependencies['withWindowSync']>>(async (_root, run) => {
+      await gate
+      await prepareWork()
+      return await run()
+    })
+    const vault: CloudSyncVault = {
+      id: 'vault-1', name: 'Notes', cursor: 0,
+      created_at: '2026-08-10T12:00:00.000Z', updated_at: '2026-08-10T12:00:00.000Z'
+    }
+    const { service, client, localRoot } = await setup([vault], undefined, undefined, prepare)
+    await service.link(localRoot, vault.id)
+    // getConflict uses the same exclusive queue as saveConflictDraft. If the
+    // sync takes that lock first, this awaited read would deadlock.
+    prepareWork = async () => {
+      await expect(service.getConflict(localRoot, 'not-pending')).rejects.toThrow()
+    }
+    const first = service.sync(localRoot)
+    const second = service.sync(localRoot)
+    expect(first).toBe(second)
+    expect(prepare).toHaveBeenCalledOnce()
+    expect(client.manifest).not.toHaveBeenCalled()
+    prepared()
+    await Promise.all([first, second])
+    expect(client.manifest).toHaveBeenCalledOnce()
+  })
+
   // Settings differ between devices, so sync asks instead of picking. Doing
   // nothing keeps this device's settings, which are already in use.
   it('answers the settings question either way', async () => {

apps/desktop/src/main/cloud-sync-service.ts

@@ -66,6 +66,7 @@ export interface DesktopCloudSyncServiceDependencies {
   createClient(baseUrl: string, token: string): SyncClient
   fetchImplementation?: typeof fetch
   now?: () => Date
+  withWindowSync?(root: string, run: () => Promise<CloudSyncRunSummary>): Promise<CloudSyncRunSummary>
 }
 
 /** Main-process orchestration for linking one local vault to one cloud vault. */
@@ -295,7 +296,8 @@ export class DesktopCloudSyncService {
     const existing = this.runs.get(runKey)
     if (existing) return existing
 
-    const running = this.exclusive(runKey, () => this.run(localRoot)).finally(() => {
+    const run = () => this.exclusive(runKey, () => this.run(localRoot))
+    const running = (this.dependencies.withWindowSync?.(runKey, run) ?? run()).finally(() => {
       this.runs.delete(runKey)
     })
     this.runs.set(runKey, running)