Merge release/v2.11.0 into main for v2.11.0 release

Author: adibhanna

apps/desktop/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@zennotes/desktop",
   "productName": "ZenNotes",
-  "version": "2.10.0",
+  "version": "2.11.0",
   "description": "ZenNotes desktop shell",
   "private": true,
   "main": "./out/main/index.js",
@@ -119,6 +119,10 @@
       "!**/*.map"
     ],
     "extraResources": [
+      {
+        "from": "../../node_modules/@excalidraw/excalidraw/dist/prod/fonts",
+        "to": "excalidraw-fonts"
+      },
       {
         "from": "build/icon.png",
         "to": "icon.png"

apps/desktop/src/main/app-config.ts

@@ -119,6 +119,16 @@ const SCALAR_FIELDS: Partial<Record<PortablePrefKey, ScalarFieldMap>> = {
     comment: 'editor + preview font size (px)'
   },
   editorLineHeight: { section: 'editor', tomlKey: 'line_height', comment: 'line-height multiplier' },
+  editorScrollOff: {
+    section: 'editor',
+    tomlKey: 'scroll_off',
+    comment: 'vim scrolloff — lines kept above/below the cursor (0 = off)'
+  },
+  timeFormat: {
+    section: 'editor',
+    tomlKey: 'time_format',
+    comment: 'clock format for the @time macro (12h or 24h)'
+  },
   previewMaxWidth: {
     section: 'editor',
     tomlKey: 'preview_max_width',

apps/desktop/src/main/index.ts

@@ -19,6 +19,7 @@ import { randomUUID } from 'node:crypto'
 import { promises as fsp } from 'node:fs'
 import path from 'node:path'
 import { fileURLToPath } from 'node:url'
+import { createRequire } from 'node:module'
 import { IPC } from '@shared/ipc'
 import type {
   NoteMeta,
@@ -80,6 +81,9 @@ import {
   renameAsset,
   removeDemoTour,
   restoreDeletedAsset,
+  listDeletedAssets,
+  purgeDeletedAsset,
+  emptyDeletedAssets,
   restoreFromTrash,
   searchVaultTextCapabilities,
   searchVaultText,
@@ -192,8 +196,10 @@ import {
 } from './file-open'
 
 const __dirname = path.dirname(fileURLToPath(import.meta.url))
+const nodeRequire = createRequire(import.meta.url)
 const LOCAL_ASSET_SCHEME = 'zen-asset'
 const THEME_ASSET_SCHEME = 'zen-theme'
+const EXCALIDRAW_ASSET_SCHEME = 'zen-excalidraw'
 
 const PRIVILEGED_ASSET_PRIVILEGES = {
   standard: true,
@@ -205,7 +211,8 @@ const PRIVILEGED_ASSET_PRIVILEGES = {
 
 protocol.registerSchemesAsPrivileged([
   { scheme: LOCAL_ASSET_SCHEME, privileges: PRIVILEGED_ASSET_PRIVILEGES },
-  { scheme: THEME_ASSET_SCHEME, privileges: PRIVILEGED_ASSET_PRIVILEGES }
+  { scheme: THEME_ASSET_SCHEME, privileges: PRIVILEGED_ASSET_PRIVILEGES },
+  { scheme: EXCALIDRAW_ASSET_SCHEME, privileges: PRIVILEGED_ASSET_PRIVILEGES }
 ])
 
 let mainWindow: BrowserWindow | null = null
@@ -2550,6 +2557,28 @@ function registerIpc(): void {
     return await restoreDeletedAsset(v.root, deleted)
   })
 
+  handle(IPC.VAULT_LIST_DELETED_ASSETS, async () => {
+    if (isRemoteWorkspaceActive()) return []
+    const v = requireVault()
+    return await listDeletedAssets(v.root)
+  })
+
+  handle(IPC.VAULT_PURGE_DELETED_ASSET, async (_e, undoToken: string) => {
+    if (isRemoteWorkspaceActive()) {
+      throw new Error('Asset deletion is only available for local vaults right now.')
+    }
+    const v = requireVault()
+    await purgeDeletedAsset(v.root, undoToken)
+  })
+
+  handle(IPC.VAULT_EMPTY_DELETED_ASSETS, async () => {
+    if (isRemoteWorkspaceActive()) {
+      throw new Error('Asset deletion is only available for local vaults right now.')
+    }
+    const v = requireVault()
+    await emptyDeletedAssets(v.root)
+  })
+
   handle(
     IPC.VAULT_CREATE_FOLDER,
     async (_e, folder: NoteFolder, subpath: string) => {
@@ -3430,6 +3459,47 @@ app.whenReady().then(async () => {
     })
   })
 
+  // Excalidraw's bundled fonts (dist/prod/fonts), served locally so the font
+  // picker works offline. With EXCALIDRAW_ASSET_PATH unset Excalidraw fetches its
+  // fonts from esm.sh, which the renderer CSP blocks, so nothing applied (#324). A
+  // packaged build ships only out/**, so the fonts are copied to
+  // resources/excalidraw-fonts (extraResources); dev reads them from node_modules.
+  const excalidrawFontsDir = (): string => {
+    if (app.isPackaged) return path.join(process.resourcesPath, 'excalidraw-fonts')
+    // The package `exports` map blocks resolving package.json, so derive the
+    // fonts dir from the main entry (.../dist/prod/index.js -> .../dist/prod/fonts).
+    const entry = nodeRequire.resolve('@excalidraw/excalidraw')
+    return path.join(path.dirname(entry), 'fonts')
+  }
+  const excalidrawFontMime = (p: string): string =>
+    /\.woff2$/i.test(p)
+      ? 'font/woff2'
+      : /\.woff$/i.test(p)
+        ? 'font/woff'
+        : /\.otf$/i.test(p)
+          ? 'font/otf'
+          : /\.ttf$/i.test(p)
+            ? 'font/ttf'
+            : 'application/octet-stream'
+  protocol.handle(EXCALIDRAW_ASSET_SCHEME, async (request) => {
+    // zen-excalidraw://assets/fonts/<Family>/<file> -> <fontsDir>/<Family>/<file>
+    const rel = decodeURIComponent(new URL(request.url).pathname)
+      .replace(/^\/+/, '')
+      .replace(/^fonts\//, '')
+    const root = path.resolve(excalidrawFontsDir())
+    const abs = path.resolve(root, rel)
+    if ((abs !== root && !abs.startsWith(root + path.sep)) || !/\.(woff2?|otf|ttf)$/i.test(abs)) {
+      throw new Error(`Invalid Excalidraw font URL: ${request.url}`)
+    }
+    const data = await fsp.readFile(abs)
+    return new Response(data, {
+      headers: {
+        'content-type': excalidrawFontMime(abs),
+        'cache-control': 'public, max-age=31536000, immutable'
+      }
+    })
+  })
+
   // Permissions this app grants to its own renderer (deny everything else —
   // it's our app talking to our own vault, no third-party surface):
   //   - 'local-fonts'   → queryLocalFonts() for the font picker

apps/desktop/src/main/vault.test.ts

@@ -8,16 +8,19 @@ import {
   archiveNote,
   deleteAsset,
   duplicateAsset,
+  emptyDeletedAssets,
   ensureVaultLayout,
   forgetLocalVault,
   getVaultSettings,
   importPastedImage,
   invalidateNoteMetaCache,
+  listDeletedAssets,
   listNotes,
   listFolders,
   moveAsset,
   moveToTrash,
   rememberLocalVault,
+  purgeDeletedAsset,
   renameAsset,
   renameFolder,
   restoreDeletedAsset,
@@ -277,6 +280,47 @@ describe('deleteAsset', () => {
     await expect(readFile(path.join(root, rel), 'utf8')).resolves.toBe('image-bytes')
   })
 
+  it('lists deleted assets so they are restorable without the in-session undo (#330)', async () => {
+    const root = await makeTempDir('zennotes-list-deleted-assets-')
+    await ensureVaultLayout(root)
+    await writeFile(path.join(root, 'One.png'), 'one-bytes', 'utf8')
+    await writeFile(path.join(root, 'Two.pdf'), 'two-bytes', 'utf8')
+
+    await deleteAsset(root, 'One.png')
+    await deleteAsset(root, 'Two.pdf')
+
+    const listed = await listDeletedAssets(root)
+    expect(listed).toHaveLength(2)
+    expect(listed.map((d) => d.name).sort()).toEqual(['One.png', 'Two.pdf'])
+    for (const d of listed) {
+      expect(typeof d.undoToken).toBe('string')
+      expect(typeof d.deletedAt).toBe('string')
+    }
+
+    // Restore straight from the listed record — no in-memory undo entry needed.
+    const entry = listed.find((d) => d.name === 'One.png')
+    expect(entry).toBeTruthy()
+    const restored = await restoreDeletedAsset(root, entry!)
+    expect(restored.path).toBe('One.png')
+    await expect(readFile(path.join(root, 'One.png'), 'utf8')).resolves.toBe('one-bytes')
+    expect(await listDeletedAssets(root)).toHaveLength(1)
+  })
+
+  it('purges a single deleted asset and empties them all (#330)', async () => {
+    const root = await makeTempDir('zennotes-purge-deleted-assets-')
+    await ensureVaultLayout(root)
+    await writeFile(path.join(root, 'A.png'), 'a', 'utf8')
+    await writeFile(path.join(root, 'B.png'), 'b', 'utf8')
+    const a = await deleteAsset(root, 'A.png')
+    await deleteAsset(root, 'B.png')
+
+    await purgeDeletedAsset(root, a.undoToken)
+    expect((await listDeletedAssets(root)).map((d) => d.name)).toEqual(['B.png'])
+
+    await emptyDeletedAssets(root)
+    expect(await listDeletedAssets(root)).toHaveLength(0)
+  })
+
   it('does not delete markdown notes through the asset path', async () => {
     const root = await makeTempDir('zennotes-delete-note-as-asset-')
     await ensureVaultLayout(root)