Revert "feat(fts5): get rid of search comparison code"

This reverts commit 41f6fedc61.

.github/workflows/checks.yml

@@ -12,7 +12,7 @@ jobs:
     steps:
       - name: Check if PRs have conflicts
         uses: eps1lon/actions-label-merge-conflict@v3
-        if: github.repository == ${{ vars.REPO_MAIN }}
+        if: ${{ github.repository == vars.REPO_MAIN }}
         with:
           dirtyLabel: "merge-conflicts"
           repoToken: "${{ secrets.MERGE_CONFLICT_LABEL_PAT }}"

.github/workflows/deploy-docs.yml

@@ -67,7 +67,7 @@ jobs:
 
       - name: Deploy
         uses: ./.github/actions/deploy-to-cloudflare-pages
-        if: github.repository == ${{ vars.REPO_MAIN }}
+        if: ${{ github.repository == vars.REPO_MAIN }}
         with:
           project_name: "trilium-docs"
           comment_body: "📚 Documentation preview is ready"

.github/workflows/main-docker.yml

@@ -271,13 +271,16 @@ jobs:
           REF_NAME=$(echo "${GITHUB_REF}" | sed 's/refs\/heads\///' | sed 's/refs\/tags\///')
 
           # Create and push the manifest list with both the branch/tag name and the commit SHA
+          # Note: Images are only pushed to GHCR during build, so we always reference GHCR sources
+          # and copy to DockerHub using imagetools create
           docker buildx imagetools create $(jq -cr '.tags | map("-t " + .) | join(" ")' <<< "$DOCKER_METADATA_OUTPUT_JSON") \
             -t ${{ env.GHCR_REGISTRY }}/${{ env.IMAGE_NAME }}:${REF_NAME} \
             $(printf '${{ env.GHCR_REGISTRY }}/${{ env.IMAGE_NAME }}@sha256:%s ' *)
 
-          docker buildx imagetools create $(jq -cr '.tags | map("-t " + .) | join(" ")' <<< "$DOCKER_METADATA_OUTPUT_JSON") \
+          # Copy from GHCR to DockerHub (source digests only exist on GHCR)
+          docker buildx imagetools create \
             -t ${{ env.DOCKERHUB_REGISTRY }}/${{ env.IMAGE_NAME }}:${REF_NAME} \
-            $(printf '${{ env.DOCKERHUB_REGISTRY }}/${{ env.IMAGE_NAME }}@sha256:%s ' *)
+            $(printf '${{ env.GHCR_REGISTRY }}/${{ env.IMAGE_NAME }}@sha256:%s ' *)
 
           # If the ref is a tag, also tag the image as stable as this is part of a 'release'
           # and only go in the `if` if there is NOT a `-` in the tag's name, due to tagging of `-alpha`, `-beta`, etc...
@@ -287,9 +290,10 @@ jobs:
               -t ${{ env.GHCR_REGISTRY }}/${{ env.IMAGE_NAME }}:stable \
               $(printf '${{ env.GHCR_REGISTRY }}/${{ env.IMAGE_NAME }}@sha256:%s ' *)
 
-            docker buildx imagetools create $(jq -cr '.tags | map("-t " + .) | join(" ")' <<< "$DOCKER_METADATA_OUTPUT_JSON") \
+            # Copy stable tag from GHCR to DockerHub
+            docker buildx imagetools create \
               -t ${{ env.DOCKERHUB_REGISTRY }}/${{ env.IMAGE_NAME }}:stable \
-              $(printf '${{ env.DOCKERHUB_REGISTRY }}/${{ env.IMAGE_NAME }}@sha256:%s ' *)
+              $(printf '${{ env.GHCR_REGISTRY }}/${{ env.IMAGE_NAME }}@sha256:%s ' *)
 
             # Small delay to ensure stable tag is fully propagated
             sleep 5
@@ -301,7 +305,7 @@ jobs:
 
             docker buildx imagetools create \
               -t ${{ env.DOCKERHUB_REGISTRY }}/${{ env.IMAGE_NAME }}:latest \
-              ${{ env.DOCKERHUB_REGISTRY }}/${{ env.IMAGE_NAME }}:stable
+              ${{ env.GHCR_REGISTRY }}/${{ env.IMAGE_NAME }}:stable
 
           fi
 

.github/workflows/nightly.yml

@@ -26,7 +26,7 @@ permissions:
 
 jobs:
   nightly-electron:
-    if: github.repository == ${{ vars.REPO_MAIN }}
+    if: ${{ github.repository == vars.REPO_MAIN }}
     name: Deploy nightly
     strategy:
       fail-fast: false
@@ -109,7 +109,7 @@ jobs:
           path: apps/desktop/upload
 
   nightly-server:
-    if: github.repository == ${{ vars.REPO_MAIN }}
+    if: ${{ github.repository == vars.REPO_MAIN }}
     name: Deploy server nightly
     strategy:
       fail-fast: false

apps/build-docs/package.json

@@ -9,13 +9,13 @@
   "keywords": [],
   "author": "Elian Doran <contact@eliandoran.me>",
   "license": "AGPL-3.0-only",
-  "packageManager": "pnpm@10.28.1",
+  "packageManager": "pnpm@10.28.2",
   "devDependencies": {
-    "@redocly/cli": "2.14.9",
+    "@redocly/cli": "2.15.0",
     "archiver": "7.0.1",
     "fs-extra": "11.3.3",
-    "react": "19.2.3",
-    "react-dom": "19.2.3",
+    "react": "19.2.4",
+    "react-dom": "19.2.4",
     "typedoc": "0.28.16",
     "typedoc-plugin-missing-exports": "4.1.2"
   }

apps/client/index.html

@@ -13,13 +13,14 @@
     <body id="trilium-app">
         <noscript>Trilium requires JavaScript to be enabled.</noscript>
 
+        <div id="context-menu-cover"></div>
         <div class="dropdown-menu dropdown-menu-sm" id="context-menu-container" style="display: none"></div>
 
         <!-- Required to match the PWA's top bar color with the theme -->
         <!-- This works even when the user directly changes --root-background in CSS -->
         <div id="background-color-tracker" style="position: absolute; visibility: hidden; color: var(--root-background); transition: color 1ms;"></div>
 
-        <script src="./index.ts" type="module"></script>
+        <script src="./src/index.ts" type="module"></script>
 
         <!-- Required for correct loading of scripts in Electron -->
         <script>

apps/client/package.json

@@ -27,7 +27,7 @@
     "@mermaid-js/layout-elk": "0.2.0",
     "@mind-elixir/node-menu": "5.0.1",
     "@popperjs/core": "2.11.8",
-    "@preact/signals": "2.6.1",
+    "@preact/signals": "2.6.2",
     "@triliumnext/ckeditor5": "workspace:*",
     "@triliumnext/codemirror": "workspace:*",
     "@triliumnext/commons": "workspace:*",
@@ -43,13 +43,13 @@
     "debounce": "3.0.0",
     "draggabilly": "3.0.0",
     "force-graph": "1.51.0",
-    "globals": "17.0.0",
+    "globals": "17.2.0",
     "i18next": "25.8.0",
     "i18next-http-backend": "3.0.2",
     "jquery": "4.0.0",
     "jquery.fancytree": "2.38.5",
     "jsplumb": "2.15.6",
-    "katex": "0.16.27",
+    "katex": "0.16.28",
     "knockout": "3.5.1",
     "leaflet": "1.9.4",
     "leaflet-gpx": "2.2.0",
@@ -60,7 +60,7 @@
     "normalize.css": "8.0.1",
     "panzoom": "9.4.3",
     "preact": "10.28.2",
-    "react-i18next": "16.5.3",
+    "react-i18next": "16.5.4",
     "react-window": "2.2.5",
     "reveal.js": "5.2.1",
     "svg-pan-zoom": "3.6.2",
@@ -78,9 +78,9 @@
     "@types/reveal.js": "5.2.2",
     "@types/tabulator-tables": "6.3.1",
     "copy-webpack-plugin": "13.0.1",
-    "happy-dom": "20.3.7",
+    "happy-dom": "20.4.0",
     "lightningcss": "1.31.1",
     "script-loader": "0.7.2",
-    "vite-plugin-static-copy": "3.1.5"
+    "vite-plugin-static-copy": "3.2.0"
   }
 }

apps/client/src/desktop.ts

@@ -99,15 +99,22 @@ function initFullScreenDetection(currentWindow: Electron.BrowserWindow) {
 }
 
 function initTransparencyEffects(style: CSSStyleDeclaration, currentWindow: Electron.BrowserWindow) {
+    const material = style.getPropertyValue("--background-material").trim();
     if (window.glob.platform === "win32") {
-        const material = style.getPropertyValue("--background-material");
-        // TriliumNextTODO: find a nicer way to make TypeScript happy – unfortunately TS did not like Array.includes here
         const bgMaterialOptions = ["auto", "none", "mica", "acrylic", "tabbed"] as const;
         const foundBgMaterialOption = bgMaterialOptions.find((bgMaterialOption) => material === bgMaterialOption);
         if (foundBgMaterialOption) {
             currentWindow.setBackgroundMaterial(foundBgMaterialOption);
         }
     }
+
+    if (window.glob.platform === "darwin") {
+        const bgMaterialOptions = [ "popover", "tooltip", "titlebar", "selection", "menu", "sidebar", "header", "sheet", "window", "hud", "fullscreen-ui", "content", "under-window", "under-page" ] as const;
+        const foundBgMaterialOption = bgMaterialOptions.find((bgMaterialOption) => material === bgMaterialOption);
+        if (foundBgMaterialOption) {
+            currentWindow.setVibrancy(foundBgMaterialOption);
+        }
+    }
 }
 
 /**

apps/client/src/index.ts

@@ -30,7 +30,7 @@ async function initJQuery() {
 }
 
 async function setupGlob() {
-    const response = await fetch(`/bootstrap${window.location.search}`);
+    const response = await fetch(`./bootstrap${window.location.search}`);
     const json = await response.json();
 
     window.global = globalThis; /* fixes https://github.com/webpack/webpack/issues/10035 */

apps/client/src/layouts/mobile_layout.tsx

@@ -179,7 +179,6 @@ export default class MobileLayout {
                 new FlexContainer("column")
                     .contentSized()
                     .id("mobile-bottom-bar")
-                    .child(new TabRowWidget().css("height", "40px"))
                     .child(new FlexContainer("row")
                         .class("horizontal")
                         .css("height", "53px")

apps/client/src/menus/context_menu.ts

@@ -1,8 +1,9 @@
 import { KeyboardActionNames } from "@triliumnext/commons";
+import { h, JSX, render } from "preact";
+
 import keyboardActionService, { getActionSync } from "../services/keyboard_actions.js";
 import note_tooltip from "../services/note_tooltip.js";
 import utils from "../services/utils.js";
-import { h, JSX, render } from "preact";
 
 export interface ContextMenuOptions<T> {
     x: number;
@@ -62,17 +63,17 @@ export type ContextMenuEvent = PointerEvent | MouseEvent | JQuery.ContextMenuEve
 
 class ContextMenu {
     private $widget: JQuery<HTMLElement>;
-    private $cover: JQuery<HTMLElement>;
+    private $cover?: JQuery<HTMLElement>;
     private options?: ContextMenuOptions<any>;
     private isMobile: boolean;
 
     constructor() {
         this.$widget = $("#context-menu-container");
-        this.$cover = $("#context-menu-cover");
         this.$widget.addClass("dropend");
         this.isMobile = utils.isMobile();
 
         if (this.isMobile) {
+            this.$cover = $("#context-menu-cover");
             this.$cover.on("click", () => this.hide());
         } else {
             $(document).on("click", (e) => this.hide());
@@ -91,7 +92,7 @@ class ContextMenu {
         }
 
         this.$widget.toggleClass("mobile-bottom-menu", !this.options.forcePositionOnMobile);
-        this.$cover.addClass("show");
+        this.$cover?.addClass("show");
         $("body").addClass("context-menu-shown");
 
         this.$widget.empty();
@@ -140,16 +141,14 @@ class ContextMenu {
             } else {
                 left = this.options.x - contextMenuWidth + CONTEXT_MENU_OFFSET;
             }
+        } else if (contextMenuWidth && this.options.x + contextMenuWidth - CONTEXT_MENU_OFFSET > clientWidth - CONTEXT_MENU_PADDING) {
+            // Overflow: right
+            left = clientWidth - contextMenuWidth - CONTEXT_MENU_PADDING;
+        } else if (this.options.x - CONTEXT_MENU_OFFSET < CONTEXT_MENU_PADDING) {
+            // Overflow: left
+            left = CONTEXT_MENU_PADDING;
         } else {
-            if (contextMenuWidth && this.options.x + contextMenuWidth - CONTEXT_MENU_OFFSET > clientWidth - CONTEXT_MENU_PADDING) {
-                // Overflow: right
-                left = clientWidth - contextMenuWidth - CONTEXT_MENU_PADDING;
-            } else if (this.options.x - CONTEXT_MENU_OFFSET < CONTEXT_MENU_PADDING) {
-                // Overflow: left
-                left = CONTEXT_MENU_PADDING;
-            } else {
-                left = this.options.x - CONTEXT_MENU_OFFSET;
-            }
+            left = this.options.x - CONTEXT_MENU_OFFSET;
         }
 
         this.$widget
@@ -261,7 +260,7 @@ class ContextMenu {
             .append(item.title);
 
         if ("badges" in item && item.badges) {
-            for (let badge of item.badges) {
+            for (const badge of item.badges) {
                 const badgeElement = $(`<span class="badge">`).text(badge.title);
 
                 if (badge.className) {
@@ -352,7 +351,7 @@ class ContextMenu {
     async hide() {
         this.options?.onHide?.();
         this.$widget.removeClass("show");
-        this.$cover.removeClass("show");
+        this.$cover?.removeClass("show");
         $("body").removeClass("context-menu-shown");
         this.$widget.hide();
     }

apps/client/src/services/css_class_manager.ts

@@ -49,7 +49,7 @@ function createClassForColor(colorString: string | null) {
     return clsx("use-note-color", className, colorsWithHue.has(className) && "with-hue");
 }
 
-function parseColor(color: string) {
+export function parseColor(color: string) {
     try {
         return Color(color.toLowerCase());
     } catch (ex) {
@@ -77,7 +77,7 @@ function adjustColorLightness(color: ColorInstance, lightThemeMaxLightness: numb
 }
 
 /** Returns the hue of the specified color, or undefined if the color is grayscale. */
-function getHue(color: ColorInstance) {
+export function getHue(color: ColorInstance) {
     const hslColor = color.hsl();
     if (hslColor.saturationl() > 0) {
         return hslColor.hue();

apps/client/src/stylesheets/style.css

@@ -224,10 +224,6 @@ body.mobile .modal .modal-dialog {
     width: 100%;
 }
 
-body.mobile .modal .modal-content {
-    border-radius: var(--bs-modal-border-radius) var(--bs-modal-border-radius) 0 0;
-}
-
 .component {
     contain: size;
 }
@@ -1255,7 +1251,7 @@ a.external:not(.no-arrow):after, a[href^="http://"]:not(.no-arrow):after, a[href
     inset-inline-start: 0;
     inset-inline-end: 0;
     bottom: 0;
-    z-index: 1000;
+    z-index: 2500;
     background: rgba(0, 0, 0, 0.1);
 }
 
@@ -1614,6 +1610,7 @@ body:not(.mobile) #launcher-pane.horizontal .dropdown-submenu > .dropdown-menu {
 
     body.mobile .modal-content {
         overflow-y: auto;
+        border-radius: var(--bs-modal-border-radius) var(--bs-modal-border-radius) 0 0;
     }
 
     body.mobile .modal-footer {
@@ -1669,6 +1666,15 @@ body:not(.mobile) #launcher-pane.horizontal .dropdown-submenu > .dropdown-menu {
     #detail-container {
         background: var(--main-background-color);
     }
+
+    .modal-dialog {
+        margin: var(--bs-modal-margin);
+        max-width: 80%;
+    }
+
+    .modal-content {
+        height: 100%;
+    }
 }
 
 @media (max-width: 991px) {

apps/client/src/stylesheets/theme-next/shell.css

@@ -40,13 +40,30 @@ body.mobile {
 
 /* #region Mica */
 
+/* Quirk: --background-material is read before "theme-supports-background-effects" class
+ * is applied. Apply the matterial even if the theme doesn't support it. */
 body.background-effects.platform-win32 {
-    /* Quirk: --background-material is read before "theme-supports-background-effects" class
-     * is applied. Apply the matterial even if the theme doesn't support it. */
-    --background-material: tabbed;
+    &.layout-vertical {
+        --background-material: mica;
+    }
+
+    &.layout-horizontal {
+        --background-material: tabbed;
+    }
 }
 
-body.background-effects.theme-supports-background-effects.platform-win32 {
+body.background-effects.platform-darwin {
+    /** Reference: https://developer.apple.com/documentation/appkit/nsvisualeffectview?preferredLanguage=objc **/
+    &.layout-vertical {
+        --background-material: under-window;
+    }
+
+    &.layout-horizontal {
+        --background-material: hud;
+    }
+}
+
+body.background-effects.theme-supports-background-effects {
     --launcher-pane-horiz-border-color: var(--launcher-pane-horiz-border-color-bgfx);
     --launcher-pane-horiz-background-color: var(--launcher-pane-horiz-background-color-bgfx);
     --launcher-pane-vert-background-color: var(--launcher-pane-vert-background-color-bgfx);
@@ -56,33 +73,29 @@ body.background-effects.theme-supports-background-effects.platform-win32 {
     --root-background: transparent;
 }
 
-body.background-effects.platform-win32.layout-vertical {
-    --background-material: mica;
-}
-
-body.background-effects.theme-supports-background-effects.platform-win32.layout-vertical {
+body.background-effects.theme-supports-background-effects.layout-vertical {
     --left-pane-background-color: var(--window-background-color-bgfx);
     --center-pane-background-color-bgfx: var(--center-pane-vert-layout-background-color-bgfx);
     --right-pane-background-color: var(--right-pane-background-color-bgfx);
 }
 
-body.background-effects.theme-supports-background-effects.platform-win32.layout-horizontal {
+body.background-effects.theme-supports-background-effects.layout-horizontal {
     --center-pane-background-color-bgfx: var(--center-pane-horiz-layout-background-color-bgfx);
     --gutter-color: var(--left-pane-background-color);
 }
 
-body.background-effects.theme-supports-background-effects.platform-win32,
-body.background-effects.theme-supports-background-effects.platform-win32 #root-widget {
+body.background-effects.theme-supports-background-effects,
+body.background-effects.theme-supports-background-effects #root-widget {
     background: var(--window-background-color-bgfx) !important;
 }
 
-body.background-effects.theme-supports-background-effects.platform-win32.layout-horizontal #horizontal-main-container,
-body.background-effects.theme-supports-background-effects.platform-win32.layout-vertical #vertical-main-container {
+body.background-effects.theme-supports-background-effects.layout-horizontal #horizontal-main-container,
+body.background-effects.theme-supports-background-effects.layout-vertical #vertical-main-container {
     background-color: var(--root-background);
 }
 
 /* Note split with background effects */
-body.background-effects.theme-supports-background-effects.platform-win32 #center-pane .note-split.bgfx {
+body.background-effects.theme-supports-background-effects #center-pane .note-split.bgfx {
     --note-split-background-color: var(--center-pane-background-color-bgfx);
 }
 
@@ -1054,7 +1067,7 @@ body.layout-horizontal .tab-row-widget-container {
     overflow: hidden;
 }
 
-body.desktop:not(.background-effects.platform-win32) #root-widget.horizontal-layout {
+body.desktop:not(.background-effects) #root-widget.horizontal-layout {
     background-color: var(--root-background) !important;
 }
 

apps/client/src/translations/de/translation.json

@@ -28,9 +28,9 @@
     },
     "open-script-note": "Script-Notiz öffnen",
     "widget-render-error": {
-      "title": "Eine externe React Integration konnte nicht dargestellt werden"
+      "title": "Benutzerdefiniertes React-Widget konnte nicht dargestellt werden"
     },
-    "widget-missing-parent": "Der externen Integration fehlt die erforderliche Eigenschaft '{{property}}'\n\nFalls dieses Skript ohne UI-Element ausgeführt werden soll, benutze stattdessen '#run=frontendStartup'.",
+    "widget-missing-parent": "Benutzerdefiniertes Widget hat die erforderliche '{{property}}'-Eigenschaft nicht korrekt definiert.\n\nFalls dieses Skript ohne UI-Element ausgeführt werden soll, benutze stattdessen '#run=frontendStartup'.",
     "scripting-error": "Benutzerdefinierter Skriptfehler: {{title}}"
   },
   "add_link": {
@@ -129,7 +129,7 @@
     "scrollToActiveNote": "Scrolle zur aktiven Notiz",
     "jumpToParentNote": "Zur übergeordneten Notiz springen",
     "collapseWholeTree": "Reduziere den gesamten Notizbaum",
-    "collapseSubTree": "Teilbaum einklappen",
+    "collapseSubTree": "Zweig einklappen",
     "tabShortcuts": "Tab-Tastenkürzel",
     "newTabNoteLink": "auf den Notizlink öffnet die Notiz in einem neuen Tab",
     "onlyInDesktop": "Nur im Desktop (Electron Build)",
@@ -230,7 +230,7 @@
   "move_to": {
     "dialog_title": "Notizen verschieben nach ...",
     "notes_to_move": "Notizen zum Verschieben",
-    "target_parent_note": "Ziel-Elternnotiz",
+    "target_parent_note": "Übergeordnete Notiz bestimmen",
     "search_placeholder": "Suche nach einer Notiz anhand ihres Namens",
     "move_button": "Zur ausgewählten Notiz wechseln",
     "error_no_path": "Kein Weg, auf den man sich bewegen kann.",
@@ -333,8 +333,8 @@
     "target_note_title": "Eine Beziehung ist eine benannte Verbindung zwischen Quellnotiz und Zielnotiz.",
     "target_note": "Zielnotiz",
     "promoted_title": "Das heraufgestufte Attribut wird deutlich in der Notiz angezeigt.",
-    "promoted": "Gefördert",
-    "promoted_alias_title": "Der Name, der in der Benutzeroberfläche für heraufgestufte Attribute angezeigt werden soll.",
+    "promoted": "Hervorgehoben",
+    "promoted_alias_title": "Der Name, der in der Benutzeroberfläche für hervorgehobene Attribute angezeigt werden soll.",
     "promoted_alias": "Alias",
     "multiplicity_title": "Multiplizität definiert, wie viele Attribute mit demselben Namen erstellt werden können – maximal 1 oder mehr als 1.",
     "multiplicity": "Vielzahl",
@@ -367,7 +367,7 @@
     "disable_versioning": "deaktiviert die automatische Versionierung. Nützlich z.B. große, aber unwichtige Notizen – z.B. große JS-Bibliotheken, die für die Skripterstellung verwendet werden",
     "calendar_root": "Markiert eine Notiz, die als Basis für Tagesnotizen verwendet werden soll. Nur einer sollte als solcher gekennzeichnet sein.",
     "archived": "Notizen mit dieser Bezeichnung werden standardmäßig nicht in den Suchergebnissen angezeigt (auch nicht in den Dialogen „Springen zu“, „Link hinzufügen“ usw.).",
-    "exclude_from_export": "Notizen (mit ihrem Unterbaum) werden nicht in den Notizexport einbezogen",
+    "exclude_from_export": "Notizen (mit ihrem Unterbaum) werden nicht im Notizexport inkludiert",
     "run": "Definiert, bei welchen Ereignissen das Skript ausgeführt werden soll. Mögliche Werte sind:\n<ul>\n<li>frontendStartup - wenn das Trilium-Frontend startet (oder aktualisiert wird), außer auf mobilen Geräten.</li>\n<li>mobileStartup - wenn das Trilium-Frontend auf einem mobilen Gerät startet (oder aktualisiert wird).</li>\n<li>backendStartup - wenn das Trilium-Backend startet</li>\n<li>hourly - einmal pro Stunde ausführen. Du kannst das zusätzliche Label <code>runAtHour</code> verwenden, um die genaue Stunde festzulegen.</li>\n<li>daily - einmal pro Tag ausführen</li>\n</ul>",
     "run_on_instance": "Definiere, auf welcher Trilium-Instanz dies ausgeführt werden soll. Standardmäßig alle Instanzen.",
     "run_at_hour": "Zu welcher Stunde soll das laufen? Sollte zusammen mit <code>#runu003dhourly</code> verwendet werden. Kann für mehr Läufe im Laufe des Tages mehrfach definiert werden.",
@@ -376,7 +376,7 @@
     "sort_direction": "ASC (Standard) oder DESC",
     "sort_folders_first": "Ordner (Notizen mit Unternotizen) sollten oben sortiert werden",
     "top": "Behalte die angegebene Notiz oben in der übergeordneten Notiz (gilt nur für sortierte übergeordnete Notizen)",
-    "hide_promoted_attributes": "Heraufgestufte Attribute für diese Notiz ausblenden",
+    "hide_promoted_attributes": "Hervorgehobene Attribute für diese Notiz ausblenden",
     "read_only": "Der Editor befindet sich im schreibgeschützten Modus. Funktioniert nur für Text- und Codenotizen.",
     "auto_read_only_disabled": "Text-/Codenotizen können automatisch in den Lesemodus versetzt werden, wenn sie zu groß sind. Du kannst dieses Verhalten für jede einzelne Notiz deaktivieren, indem du diese Beschriftung zur Notiz hinzufügst",
     "app_css": "markiert CSS-Notizen, die in die Trilium-Anwendung geladen werden und somit zur Änderung des Aussehens von Trilium verwendet werden können.",
@@ -416,13 +416,13 @@
     "toc": "<code>#toc</code> oder <code>#tocu003dshow</code> erzwingen die Anzeige des Inhaltsverzeichnisses, <code>#tocu003dhide</code> erzwingt das Ausblenden. Wenn die Bezeichnung nicht vorhanden ist, wird die globale Einstellung beachtet",
     "color": "Definiert die Farbe der Notiz im Notizbaum, in Links usw. Verwende einen beliebigen gültigen CSS-Farbwert wie „rot“ oder #a13d5f",
     "keyboard_shortcut": "Definiert eine Tastenkombination, die sofort zu dieser Notiz springt. Beispiel: „Strg+Alt+E“. Erfordert ein Neuladen des Frontends, damit die Änderung wirksam wird.",
-    "keep_current_hoisting": "Das Öffnen dieses Links ändert das Hochziehen nicht, selbst wenn die Notiz im aktuell hochgezogenen Unterbaum nicht angezeigt werden kann.",
+    "keep_current_hoisting": "Das Öffnen dieses Links ändert das Hochziehen nicht, selbst wenn die Notiz im aktuell hochgezogenen Zweig nicht angezeigt werden kann.",
     "execute_button": "Titel der Schaltfläche, welche die aktuelle Codenotiz ausführt",
     "execute_description": "Längere Beschreibung der aktuellen Codenotiz, die zusammen mit der Schaltfläche „Ausführen“ angezeigt wird",
     "exclude_from_note_map": "Notizen mit dieser Bezeichnung werden in der Notizenkarte ausgeblendet",
     "new_notes_on_top": "Neue Notizen werden oben in der übergeordneten Notiz erstellt, nicht unten.",
-    "hide_highlight_widget": "Widget „Hervorhebungsliste“ ausblenden",
-    "run_on_note_creation": "Wird ausgeführt, wenn eine Notiz im Backend erstellt wird. Verwende diese Beziehung, wenn du das Skript für alle Notizen ausführen möchtest, die unter einer bestimmten Unternotiz erstellt wurden. Erstelle es in diesem Fall auf der Unternotiz-Stammnotiz und mache es vererbbar. Eine neue Notiz, die innerhalb der Unternotiz (beliebige Tiefe) erstellt wird, löst das Skript aus.",
+    "hide_highlight_widget": "Widget „Markierungsliste“ ausblenden",
+    "run_on_note_creation": "Wird ausgeführt, wenn eine Notiz im Backend erstellt wird. Verwende diese Beziehung, wenn du das Skript für alle Notizen ausführen möchtest, die unter einem bestimmten Zweig erstellt wurden. Erstelle es in diesem Fall auf der Stammnotiz und mache es vererbbar. Eine neue Notiz, die innerhalb des Zweigs (beliebige Tiefe) erstellt wird, löst das Skript aus.",
     "run_on_child_note_creation": "Wird ausgeführt, wenn eine neue Notiz unter der Notiz erstellt wird, in der diese Beziehung definiert ist",
     "run_on_note_title_change": "Wird ausgeführt, wenn der Notiztitel geändert wird (einschließlich der Notizerstellung)",
     "run_on_note_content_change": "Wird ausgeführt, wenn der Inhalt einer Notiz geändert wird (einschließlich der Erstellung von Notizen).",
@@ -433,8 +433,8 @@
     "run_on_branch_deletion": "wird ausgeführt, wenn ein Zweig gelöscht wird. Der Zweig ist eine Verknüpfung zwischen der übergeordneten Notiz und der untergeordneten Notiz und wird z. B. gelöscht. beim Verschieben der Notiz (alter Zweig/Link wird gelöscht).",
     "run_on_attribute_creation": "wird ausgeführt, wenn für die Notiz ein neues Attribut erstellt wird, das diese Beziehung definiert",
     "run_on_attribute_change": " wird ausgeführt, wenn das Attribut einer Notiz geändert wird, die diese Beziehung definiert. Dies wird auch ausgelöst, wenn das Attribut gelöscht wird",
-    "relation_template": "Die Attribute der Notiz werden auch ohne eine Eltern-Kind-Beziehung vererbt. Der Inhalt und der Unterbaum der Notiz werden den Instanznotizen hinzugefügt, wenn sie leer sind. Einzelheiten findest du in der Dokumentation.",
-    "inherit": "Die Attribute einer Notiz werden auch ohne eine Eltern-Kind-Beziehung vererbt. Ein ähnliches Konzept findest du unter Vorlagenbeziehung. Siehe Attributvererbung in der Dokumentation.",
+    "relation_template": "Die Attribute der Notiz werden auch ohne eine Hierarchische-Beziehung vererbt. Der Inhalt und der Zweig werden den Instanznotizen hinzugefügt, wenn sie leer sind. Einzelheiten findest du in der Dokumentation.",
+    "inherit": "Die Attribute einer Notiz werden auch ohne eine Hierarchische-Beziehung vererbt. Ein ähnliches Konzept findest du unter Vorlagenbeziehung. Siehe Attributsvererbung in der Dokumentation.",
     "render_note": "Notizen vom Typ \"HTML-Notiz rendern\" werden mit einer Code-Notiz (HTML oder Skript) gerendert, und es ist notwendig, über diese Beziehung anzugeben, welche Notiz gerendert werden soll",
     "widget_relation": "Das Ziel dieser Beziehung wird ausgeführt und als Widget in der Seitenleiste gerendert",
     "share_css": "CSS-Hinweis, der in die Freigabeseite eingefügt wird. Die CSS-Notiz muss sich ebenfalls im gemeinsamen Unterbaum befinden. Erwäge auch die Verwendung von „share_hidden_from_tree“ und „share_omit_default_css“.",
@@ -632,7 +632,7 @@
     "show_toc": "Inhaltsverzeichnis anzeigen"
   },
   "show_highlights_list_widget_button": {
-    "show_highlights_list": "Hervorhebungen anzeigen"
+    "show_highlights_list": "Markierungsliste anzeigen"
   },
   "global_menu": {
     "menu": "Menü",
@@ -645,8 +645,8 @@
     "zoom_out": "Herauszoomen",
     "reset_zoom_level": "Zoomstufe zurücksetzen",
     "zoom_in": "Hineinzoomen",
-    "configure_launchbar": "Konfiguriere die Launchbar",
-    "show_shared_notes_subtree": "Unterbaum „Freigegebene Notizen“ anzeigen",
+    "configure_launchbar": "Konfiguriere die Starterleiste",
+    "show_shared_notes_subtree": "Zweig „Freigegebene Notizen“ anzeigen",
     "advanced": "Erweitert",
     "open_dev_tools": "Öffne die Entwicklungstools",
     "open_sql_console": "Öffne die SQL-Konsole",
@@ -655,7 +655,7 @@
     "show_backend_log": "Backend-Protokoll anzeigen",
     "reload_hint": "Ein Neuladen kann bei einigen visuellen Störungen Abhilfe schaffen, ohne die gesamte App neu starten zu müssen.",
     "reload_frontend": "Frontend neu laden",
-    "show_hidden_subtree": "Versteckten Teilbaum anzeigen",
+    "show_hidden_subtree": "Versteckten Zweig anzeigen",
     "show_help": "Hilfe anzeigen",
     "about": "Über Trilium Notes",
     "logout": "Abmelden",
@@ -703,8 +703,8 @@
     "export_as_image_png": "PNG (Raster)",
     "export_as_image_svg": "SVG (Vektor)",
     "note_map": "Notizen Karte",
-    "view_revisions": "Änderungshistorie...",
-    "advanced": "Fortgeschritten"
+    "view_revisions": "Notizrevisionen...",
+    "advanced": "Erweitert"
   },
   "onclick_button": {
     "no_click_handler": "Das Schaltflächen-Widget „{{componentId}}“ hat keinen definierten Klick-Handler"
@@ -720,7 +720,7 @@
     "update_available": "Update verfügbar"
   },
   "note_launcher": {
-    "this_launcher_doesnt_define_target_note": "Dieser Launcher definiert keine Zielnotiz."
+    "this_launcher_doesnt_define_target_note": "Dieser Starter definiert keine Zielnotiz."
   },
   "code_buttons": {
     "execute_button_title": "Skript ausführen",
@@ -763,8 +763,8 @@
     "change_note_icon": "Notiz-Icon ändern",
     "search": "Suche:",
     "reset-default": "Standard wiederherstellen",
-    "search_placeholder_one": "Suche {{number}} Icons über {{count}} Pakete",
-    "search_placeholder_other": "Suche {{number}} Icons über {{count}} Pakete",
+    "search_placeholder_one": "Suche {{number}} Symbole über {{count}} Pakete",
+    "search_placeholder_other": "Suche {{number}} Symbole über {{count}} Pakete",
     "search_placeholder_filtered": "Suche {{number}} Icons in {{name}}",
     "filter": "Filter",
     "filter-none": "Alle Icons",
@@ -798,7 +798,7 @@
     "expand_tooltip": "Erweitert die direkten Unterelemente dieser Sammlung (eine Ebene tiefer). Für weitere Optionen auf den Pfeil rechts klicken.",
     "expand_first_level": "Direkte Unterelemente erweitern",
     "expand_nth_level": "{{depth}} Ebenen erweitern",
-    "hide_child_notes": "Unterknoten im Baum ausblenden"
+    "hide_child_notes": "Unternotizen im Baum ausblenden"
   },
   "edited_notes": {
     "no_edited_notes_found": "An diesem Tag wurden noch keine Notizen bearbeitet...",
@@ -842,7 +842,7 @@
     "note_size": "Notengröße",
     "note_size_info": "Die Notizgröße bietet eine grobe Schätzung des Speicherbedarfs für diese Notiz. Es berücksichtigt den Inhalt der Notiz und den Inhalt ihrer Notizrevisionen.",
     "calculate": "berechnen",
-    "subtree_size": "(Teilbaumgröße: {{size}} in {{count}} Notizen)",
+    "subtree_size": "(Zweiggröße: {{size}} in {{count}} Notizen)",
     "title": "Notizinfo",
     "mime": "MIME Typ",
     "show_similar_notes": "Zeige ähnliche Notizen"
@@ -871,7 +871,7 @@
     "owned_attributes": "Eigene Attribute"
   },
   "promoted_attributes": {
-    "promoted_attributes": "Übergebene Attribute",
+    "promoted_attributes": "Hervorgehobene Attribute",
     "url_placeholder": "http://website...",
     "open_external_link": "Externen Link öffnen",
     "unknown_label_type": "Unbekannter Labeltyp „{{type}}“",
@@ -1115,7 +1115,7 @@
   "vacuum_database": {
     "title": "Datenbank aufräumen",
     "description": "Dadurch wird die Datenbank neu erstellt, was normalerweise zu einer kleineren Datenbankdatei führt. Es werden keine Daten tatsächlich geändert.",
-    "button_text": "Vakuumdatenbank",
+    "button_text": "Datenbank aufräumen",
     "vacuuming_database": "Datenbank wird geleert...",
     "database_vacuumed": "Die Datenbank wurde geleert"
   },
@@ -1156,7 +1156,7 @@
   },
   "ribbon": {
     "widgets": "Multifunktionsleisten-Widgets",
-    "promoted_attributes_message": "Die Multifunktionsleisten-Registerkarte „Heraufgestufte Attribute“ wird automatisch geöffnet, wenn in der Notiz heraufgestufte Attribute vorhanden sind",
+    "promoted_attributes_message": "Die „Hervorgehobene Attribute“-Leiste wird automatisch geöffnet, wenn in der Notiz hervorgehobene Attribute vorhanden sind",
     "edited_notes_message": "Die Multifunktionsleisten-Registerkarte „Bearbeitete Notizen“ wird bei Tagesnotizen automatisch geöffnet"
   },
   "theme": {
@@ -1169,7 +1169,7 @@
     "layout": "Layout",
     "layout-vertical-title": "Vertikal",
     "layout-horizontal-title": "Horizontal",
-    "layout-vertical-description": "Startleiste ist auf der linken Seite (standard)",
+    "layout-vertical-description": "Startleiste ist auf der linken Seite (Standard)",
     "layout-horizontal-description": "Startleiste ist unter der Tableiste. Die Tableiste wird dadurch auf die ganze Breite erweitert.",
     "auto_theme": "Alt (Folge dem Farbschema des Systems)",
     "light_theme": "Alt (Hell)",
@@ -1177,7 +1177,7 @@
   },
   "zoom_factor": {
     "title": "Zoomfaktor (nur Desktop-Build)",
-    "description": "Das Zoomen kann auch mit den Tastenkombinationen STRG+- und STRG+u003d gesteuert werden."
+    "description": "Das Zoomen kann auch mit den Tastenkombinationen Strg+- und Strg+= gesteuert werden."
   },
   "code_auto_read_only_size": {
     "title": "Automatische schreibgeschützte Größe",
@@ -1266,16 +1266,16 @@
     "markdown": "Markdown-Stil"
   },
   "highlights_list": {
-    "title": "Highlights-Liste",
-    "description": "Du kannst die im rechten Bereich angezeigte Highlights-Liste anpassen:",
+    "title": "Markierungsliste",
+    "description": "Du kannst die im rechten Bereich angezeigte Markierungsliste anpassen:",
     "bold": "Fettgedruckter Text",
     "italic": "Kursiver Text",
     "underline": "Unterstrichener Text",
     "color": "Farbiger Text",
     "bg_color": "Text mit Hintergrundfarbe",
-    "visibility_title": "Sichtbarkeit der Highlights-Liste",
-    "visibility_description": "Du kannst das Hervorhebungs-Widget pro Notiz ausblenden, indem du die Beschriftung #hideHighlightWidget hinzufügst.",
-    "shortcut_info": "Du kannst eine Tastenkombination zum schnellen Umschalten des rechten Bereichs (einschließlich Hervorhebungen) in den Optionen -> Tastenkombinationen konfigurieren (Name „toggleRightPane“)."
+    "visibility_title": "Sichtbarkeit der Markierungsliste",
+    "visibility_description": "Du kannst das Markierungs-Widget pro Notiz ausblenden, indem du die Beschriftung #hideHighlightWidget hinzufügst.",
+    "shortcut_info": "Du kannst eine Tastenkombination zum schnellen Umschalten des rechten Bereichs (einschließlich Markierungen) in den Optionen -> Tastenkombinationen konfigurieren (Name „toggleRightPane“)."
   },
   "table_of_contents": {
     "title": "Inhaltsverzeichnis",
@@ -1445,19 +1445,19 @@
     "insert-note-after": "Notiz dahinter einfügen",
     "insert-child-note": "Unternotiz einfügen",
     "delete": "Löschen",
-    "search-in-subtree": "Im Notizbaum suchen",
+    "search-in-subtree": "Im Zweig suchen",
     "hoist-note": "Notiz-Fokus setzen",
     "unhoist-note": "Notiz-Fokus aufheben",
     "edit-branch-prefix": "Zweig-Präfix bearbeiten",
     "advanced": "Erweitert",
-    "expand-subtree": "Unterzweig aufklappen",
-    "collapse-subtree": "Notizbaum einklappen",
+    "expand-subtree": "Zweig aufklappen",
+    "collapse-subtree": "Zweig einklappen",
     "sort-by": "Sortieren nach...",
-    "recent-changes-in-subtree": "Kürzliche Änderungen im Notizbaum",
+    "recent-changes-in-subtree": "Kürzliche Änderungen im Zweig",
     "convert-to-attachment": "Als Anhang konvertieren",
     "copy-note-path-to-clipboard": "Notiz-Pfad in die Zwischenablage kopieren",
-    "protect-subtree": "Notizbaum schützen",
-    "unprotect-subtree": "Notizenbaum-Schutz aufheben",
+    "protect-subtree": "Zweig schützen",
+    "unprotect-subtree": "Zweig-Schutz aufheben",
     "copy-clone": "Kopieren / Klonen",
     "clone-to": "Klonen nach...",
     "cut": "Ausschneiden",
@@ -1474,12 +1474,12 @@
     "archive": "Archiviere",
     "unarchive": "Entarchivieren",
     "open-in-a-new-window": "In neuem Fenster öffnen",
-    "hide-subtree": "Teilbaum ausblenden",
-    "show-subtree": "Teilbaum anzeigen"
+    "hide-subtree": "Zweig ausblenden",
+    "show-subtree": "Zweig anzeigen"
   },
   "shared_info": {
-    "shared_publicly": "Diese Notiz ist öffentlich geteilt auf {{- link}}.",
-    "shared_locally": "Diese Notiz ist lokal geteilt auf {{- link}}.",
+    "shared_publicly": "Diese Notiz ist öffentlich freigegeben über {{- link}}.",
+    "shared_locally": "Diese Notiz ist lokal freigegeben über {{- link}}.",
     "help_link": "Für Hilfe besuche <a href=\"https://triliumnext.github.io/Docs/Wiki/sharing.html\">wiki</a>."
   },
   "note_types": {
@@ -1490,12 +1490,12 @@
     "note-map": "Notizkarte",
     "render-note": "Render Notiz",
     "mermaid-diagram": "Mermaid Diagramm",
-    "canvas": "Canvas",
+    "canvas": "Leinwand",
     "web-view": "Webansicht",
     "mind-map": "Mind Map",
     "file": "Datei",
     "image": "Bild",
-    "launcher": "Launcher",
+    "launcher": "Starter",
     "doc": "Dokument",
     "widget": "Widget",
     "confirm-change": "Es is nicht empfehlenswert den Notiz-Typ zu ändern, wenn der Inhalt der Notiz nicht leer ist. Möchtest du dennoch fortfahren?",
@@ -1514,10 +1514,10 @@
     "toggle-off-hint": "Notiz ist geschützt, klicken, um den Schutz aufzuheben"
   },
   "shared_switch": {
-    "shared": "Teilen",
-    "toggle-on-title": "Notiz teilen",
+    "shared": "Freigegeben",
+    "toggle-on-title": "Notiz freigeben",
     "toggle-off-title": "Notiz-Freigabe aufheben",
-    "shared-branch": "Diese Notiz existiert nur als geteilte Notiz, das Aufheben der Freigabe würde sie löschen. Möchtest du fortfahren und die Notiz damit löschen?",
+    "shared-branch": "Diese Notiz existiert nur als freigegebene Notiz, das Aufheben der Freigabe würde sie löschen. Möchtest du fortfahren und die Notiz damit löschen?",
     "inherited": "Die Notiz kann hier nicht von der Freigabe entfernt werden, da sie über Vererbung von einer übergeordneten Notiz geteilt wird."
   },
   "template_switch": {
@@ -1535,13 +1535,13 @@
     "replace_all": "Alle Ersetzen"
   },
   "highlights_list_2": {
-    "title": "Hervorhebungs-Liste",
+    "title": "Markierungsliste",
     "options": "Optionen",
-    "title_with_count_one": "{{count}} Highlight",
-    "title_with_count_other": "{{count}} Highlights",
-    "modal_title": "Highlight Liste konfigurieren",
-    "menu_configure": "Highlight Liste konfigurieren…",
-    "no_highlights": "Keine Highlights gefunden."
+    "title_with_count_one": "{{count}} Markierung",
+    "title_with_count_other": "{{count}} Markierungen",
+    "modal_title": "Markierungsliste konfigurieren",
+    "menu_configure": "Markierungsliste konfigurieren…",
+    "no_highlights": "Keine Markierungen gefunden."
   },
   "quick-search": {
     "placeholder": "Schnellsuche",
@@ -1566,15 +1566,15 @@
     "unhoist": "Fokus verlassen",
     "toggle-sidebar": "Seitenleiste ein-/ausblenden",
     "dropping-not-allowed": "Ablegen von Notizen an dieser Stelle ist nicht zulässig.",
-    "clone-indicator-tooltip": "Diese Notiz hat {{- count}} Elterknoten: {{- parents}}",
-    "clone-indicator-tooltip-single": "Diese Notiz ist geklont (1 weiterer Elternknoten: {{- parent}})",
-    "shared-indicator-tooltip": "Diese Notiz ist öffentlich einsehbar",
-    "shared-indicator-tooltip-with-url": "Diese Notiz ist unter {{- url}} öffentlich einsehbar",
-    "subtree-hidden-tooltip_one": "{{count}} Unterknoten, der im Baum ausgeblendet ist",
-    "subtree-hidden-tooltip_other": "{{count}} Unterknoten, die im Baum ausgeblendet sind",
+    "clone-indicator-tooltip": "Diese Notiz hat {{- count}} übergeordnete Knoten: {{- parents}}",
+    "clone-indicator-tooltip-single": "Diese Notiz ist geklont (1 weitere Quelle: {{- parent}})",
+    "shared-indicator-tooltip": "Diese Notiz ist öffentlich freigegeben",
+    "shared-indicator-tooltip-with-url": "Diese Notiz ist öffentlich freigegeben unter: {{- url}}",
+    "subtree-hidden-tooltip_one": "{{count}} untergeordnete Notiz, die im Baum ausgeblendet ist",
+    "subtree-hidden-tooltip_other": "{{count}} untergeordnete Notizen, die im Baum ausgeblendet sind",
     "subtree-hidden-moved-title": "Zu {{title}} hinzugefügt",
-    "subtree-hidden-moved-description-collection": "Diese Sammlung blendet ihre Unternotizem im Baum aus.",
-    "subtree-hidden-moved-description-other": "Diese Sammlung blendet ihre Unterknoten im Baum aus."
+    "subtree-hidden-moved-description-collection": "Diese Sammlung blendet ihre Unternotizen im Baum aus.",
+    "subtree-hidden-moved-description-other": "Untergeordnete Notizen sind im Baum für diese Notiz ausgeblendet."
   },
   "title_bar_buttons": {
     "window-on-top": "Dieses Fenster immer oben halten"
@@ -1586,8 +1586,8 @@
     "print_report_title": "Druckreport",
     "print_report_collection_details_button": "Details anzeigen",
     "print_report_collection_details_ignored_notes": "Ignorierte Notizen",
-    "print_report_collection_content_one": "{{count}} Notiz in der Sammlung konnte nicht gedruckt werden, weil sie nicht unterstützt ist oder geschützt ist.",
-    "print_report_collection_content_other": "{{count}} Notizen in der Sammlung konnten nicht gedruckt werden, weil sie nicht unterstützt sind oder geschützt sind."
+    "print_report_collection_content_one": "{{count}} Notiz in der Sammlung konnte nicht gedruckt werden, weil sie nicht unterstützt oder geschützt ist.",
+    "print_report_collection_content_other": "{{count}} Notizen in der Sammlung konnten nicht gedruckt werden, weil sie nicht unterstützt oder geschützt sind."
   },
   "note_title": {
     "placeholder": "Titel der Notiz hier eingeben…",
@@ -1595,7 +1595,7 @@
     "last_modified": "Bearbeitet am <Value />",
     "note_type_switcher_label": "Ändere von {{type}} zu:",
     "note_type_switcher_others": "Andere Notizart",
-    "note_type_switcher_templates": "Template",
+    "note_type_switcher_templates": "Vorlage",
     "note_type_switcher_collection": "Sammlung",
     "edited_notes": "Notizen, bearbeitet an diesem Tag",
     "promoted_attributes": "Hervorgehobene Attribute"
@@ -1605,14 +1605,14 @@
     "search_not_executed": "Die Suche wurde noch nicht ausgeführt. Klicke oben auf „Suchen“, um die Ergebnisse anzuzeigen."
   },
   "spacer": {
-    "configure_launchbar": "Startleiste konfigurieren"
+    "configure_launchbar": "Starterleiste konfigurieren"
   },
   "sql_result": {
     "no_rows": "Es wurden keine Zeilen für diese Abfrage zurückgegeben",
     "not_executed": "Die Abfrage wurde noch nicht ausgeführt.",
     "failed": "SQL-Abfrage ist fehlgeschlagen",
     "execute_now": "Jetzt ausführen",
-    "statement_result": "Anweisung Ergebnis"
+    "statement_result": "Abfrageergebnis"
   },
   "sql_table_schemas": {
     "tables": "Tabellen"
@@ -1683,16 +1683,16 @@
     "confirm_unhoisting": "Die angeforderte Notiz ‚{{requestedNote}}‘ befindet sich außerhalb des hoisted Bereichs der Notiz ‚{{hoistedNote}}‘. Du musst sie unhoisten, um auf die Notiz zuzugreifen. Möchtest du mit dem Unhoisting fortfahren?"
   },
   "launcher_context_menu": {
-    "reset_launcher_confirm": "Möchtest du „{{title}}“ wirklich zurücksetzen? Alle Daten / Einstellungen in dieser Notiz (und ihren Unternotizen) gehen verloren und der Launcher wird an seinen ursprünglichen Standort zurückgesetzt.",
-    "add-note-launcher": "Launcher für Notiz hinzufügen",
-    "add-script-launcher": "Launcher für Skript hinzufügen",
+    "reset_launcher_confirm": "Möchtest du „{{title}}“ wirklich zurücksetzen? Alle Daten / Einstellungen in dieser Notiz (und ihren Unternotizen) gehen verloren und der Starter wird an seinen ursprünglichen Standort zurückgesetzt.",
+    "add-note-launcher": "Notiz-Starter hinzufügen",
+    "add-script-launcher": "Skript-Starter hinzufügen",
     "add-custom-widget": "Benutzerdefiniertes Widget hinzufügen",
-    "add-spacer": "Spacer hinzufügen",
+    "add-spacer": "Abstandhalter hinzufügen",
     "delete": "Löschen <kbd data-command=\"deleteNotes\"></kbd>",
     "reset": "Zurücksetzen",
-    "move-to-visible-launchers": "Zu sichtbaren Launchern verschieben",
-    "move-to-available-launchers": "Zu verfügbaren Launchern verschieben",
-    "duplicate-launcher": "Launcher duplizieren <kbd data-command=\"duplicateSubtree\">"
+    "move-to-visible-launchers": "Zu sichtbaren Startern verschieben",
+    "move-to-available-launchers": "Zu verfügbaren Startern verschieben",
+    "duplicate-launcher": "Starter duplizieren <kbd data-command=\"duplicateSubtree\">"
   },
   "highlighting": {
     "description": "Steuert die Syntaxhervorhebung für Codeblöcke in Textnotizen, Code-Notizen sind nicht betroffen.",
@@ -1701,7 +1701,7 @@
   },
   "code_block": {
     "word_wrapping": "Wortumbruch",
-    "theme_none": "Keine Syntax-Hervorhebung",
+    "theme_none": "Keine Syntaxhervorhebung",
     "theme_group_light": "Helle Themen",
     "theme_group_dark": "Dunkle Themen",
     "copy_title": "Kopiere in Zwischenablage"
@@ -1751,8 +1751,8 @@
     "desktop-application": "Desktop Anwendung",
     "native-title-bar": "Native Anwendungsleiste",
     "native-title-bar-description": "In Windows und macOS, sorgt das Deaktivieren der nativen Anwendungsleiste für ein kompakteres Aussehen. Unter Linux, sorgt das Aktivieren der nativen Anwendungsleiste für eine bessere Integration mit anderen Teilen des Systems.",
-    "background-effects": "Hintergrundeffekte aktivieren (nur Windows 11)",
-    "background-effects-description": "Der Mica Effekt fügt einen unscharfen, stylischen Hintergrund in Anwendungsfenstern ein. Dieser erzeugt Tiefe und ein modernes Auftreten. \"Native Titelleiste\" muss deaktiviert sein.",
+    "background-effects": "Hintergrundeffekte aktivieren",
+    "background-effects-description": "Fügt einen unscharfen, stylischen Hintergrund in das Anwendungsfenstern ein. Dies erzeugt Tiefe und ein modernes Auftreten. \"Native Titelleiste\" muss deaktiviert sein.",
     "restart-app-button": "Anwendung neustarten um Änderungen anzuwenden",
     "zoom-factor": "Zoomfaktor"
   },
@@ -2000,7 +2000,7 @@
     "check_share_root": "Status des Freigabe-Roots prüfen",
     "share_root_found": "Freigabe-Root-Notiz '{{noteTitle}}' ist bereit",
     "share_root_not_found": "Keine Notiz mit #shareRoot Label gefunden",
-    "share_root_not_shared": "Notiz '{{noteTitle}}' hat das #shareRoot Label, wurde jedoch noch nicht geteilt"
+    "share_root_not_shared": "Notiz '{{noteTitle}}' hat das #shareRoot Label, wurde jedoch noch nicht freigegeben"
   },
   "tasks": {
     "due": {
@@ -2118,8 +2118,8 @@
     "show_attachments_description": "Notizanhänge anzeigen",
     "search_notes_title": "Suche Notiz",
     "search_notes_description": "Öffne erweiterte Suche",
-    "search_subtree_title": "Im Unterzweig suchen",
-    "search_subtree_description": "Im aktuellen Unterzweig suchen",
+    "search_subtree_title": "Im Zweig suchen",
+    "search_subtree_description": "Im aktuellen Zweig suchen",
     "search_history_title": "Zeige Suchhistorie",
     "search_history_description": "Zeige vorherige Suchen",
     "configure_launch_bar_title": "Startleiste anpassen",
@@ -2133,7 +2133,7 @@
     "next_theme_message": "Es wird aktuell das alte Design verwendet. Möchten Sie das neue Design ausprobieren?",
     "next_theme_button": "Teste das neue Design",
     "background_effects_title": "Hintergrundeffekte sind jetzt zuverlässig nutzbar",
-    "background_effects_message": "Auf Windows-Geräten sind die Hintergrundeffekte nun vollständig stabil. Die Hintergrundeffekte verleihen der Benutzeroberfläche einen Farbakzent, indem der Hintergrund dahinter weichgezeichnet wird. Diese Technik wird auch in anderen Anwendungen wie dem Windows-Explorer eingesetzt.",
+    "background_effects_message": "Auf Windows- und macOS-Geräten sind die Hintergrundeffekte nun stabil. Die Hintergrundeffekte verleihen der Benutzeroberfläche einen Farbakzent, indem der Hintergrund dahinter weichgezeichnet wird.",
     "background_effects_button": "Aktiviere Hintergrundeffekte",
     "dismiss": "Ablehnen",
     "new_layout_title": "Neues Layout",
@@ -2188,9 +2188,9 @@
     "new_layout_description": "Probiere das neue Layout für eine modernere Darstellung und verbesserte Benutzbarkeit aus. Kann sich in Zukunft stark ändern."
   },
   "server": {
-    "unknown_http_error_title": "Bei der Kommunikation mit dem Server ist ein Fehler aufgetreten",
+    "unknown_http_error_title": "Kommunikationsfehler mit dem Server",
     "unknown_http_error_content": "Statuscode: {{statusCode}}\nURL: {{method}} {{url}}\nNachricht: {{message}}",
-    "traefik_blocks_requests": "Der Traefik Reverse-Proxy hat ein fatales Update bekommen, welche die Kommunikation mit dem Server stört."
+    "traefik_blocks_requests": "Der Traefik Reverse-Proxy hat eine Änderung erfahren, welches die Kommunikation mit dem Server beeinflusst."
   },
   "tab_history_navigation_buttons": {
     "go-back": "Zur vorherigen Notiz zurück kehren",
@@ -2205,30 +2205,30 @@
     "empty_hide_archived_notes": "Archivierte Notizen ausblenden"
   },
   "breadcrumb_badges": {
-    "read_only_explicit": "Nicht Änderbar",
-    "read_only_explicit_description": "Diese Notiz wurde händisch als nicht änderbar markiert.\nKlicke hier um sie temporär zu bearbeiten.",
-    "read_only_auto": "Automatisch nicht änderbar",
-    "read_only_auto_description": "Diese Notiz wurde automatisch aus Leistungsgründen als nicht änderbar markiert. Dieses automatische Limit kann in den Einstellungen angepasst werden.\n\nKlicke hier, um sie temporär zu bearbeiten.",
+    "read_only_explicit": "Schreibgeschützt",
+    "read_only_explicit_description": "Diese Notiz wurde händisch schreibgeschützt.\nKlicke hier um sie temporär zu bearbeiten.",
+    "read_only_auto": "Automatisch schreibgeschützt",
+    "read_only_auto_description": "Diese Notiz wurde automatisch aus Leistungsgründen als schreibgeschützt markiert. Dieses automatische Limit kann in den Einstellungen angepasst werden.\n\nKlicke hier, um sie temporär zu bearbeiten.",
     "read_only_temporarily_disabled": "Temporär bearbeitbar",
-    "read_only_temporarily_disabled_description": "Diese Notiz ist aktuell bearbeitbar, ist aber normalerweise nicht änderbar. Sobald du zu einer anderen Notiz navigierst, kehrt diese Notiz in ihren Normalzustand zurück.\n\nKlicke hier, um die Notiz wieder nicht änderbar zu machen.",
-    "shared_publicly": "Öffentlich geteilt",
-    "shared_locally": "Lokal geteilt",
+    "read_only_temporarily_disabled_description": "Diese Notiz ist aktuell bearbeitbar, ist aber normalerweise schreibgeschützt. Sobald du zu einer anderen Notiz navigierst wird diese wieder schreibgeschützt.\n\nKlicke hier, um die Notiz wieder schreibgeschützt zu machen.",
+    "shared_publicly": "Öffentlich freigegeben",
+    "shared_locally": "Lokal freigegeben",
     "shared_copy_to_clipboard": "Link in die Zwischenablage kopieren",
-    "shared_open_in_browser": "Link öffnen",
-    "shared_unshare": "Teilen aufheben",
+    "shared_open_in_browser": "Link im Browser öffnen",
+    "shared_unshare": "Freigabe aufheben",
     "clipped_note": "Internetschnellverweis",
-    "clipped_note_description": "Diese Notiz wurde von {{url}} übernommen.\n\nKlicke hier, um zum Ursprung zu gehen.",
+    "clipped_note_description": "Diese Notiz wurde von {{url}} übernommen.\n\nKlicke hier, um zur Quelle zu gehen.",
     "execute_script": "Skript ausführen",
     "execute_script_description": "Diese Notiz ist eine Skriptnotiz. Klicke hier, um das Skript auszuführen.",
     "execute_sql": "SQL ausführen",
     "execute_sql_description": "Diese Notiz ist eine SQL-Notiz. Klicke hier, um die SQL-Abfrage auszuführen.",
     "save_status_saved": "Gespeichert",
-    "save_status_saving": "Speichern...",
+    "save_status_saving": "Speichere...",
     "save_status_unsaved": "Nicht gespeichert",
     "save_status_error": "Speichern fehlgeschlagen",
     "save_status_saving_tooltip": "Änderungen werden gespeichert.",
     "save_status_unsaved_tooltip": "Es gibt ungespeicherte Änderungen, welche gleich automatisch gespeichert werden.",
-    "save_status_error_tooltip": "Beim speichern der Notiz ist ein Fehler aufgetreten. Wenn möglich, versuche die Notiz woandershin zu kopieren und die Applikation neu zu laden."
+    "save_status_error_tooltip": "Beim speichern der Notiz ist ein Fehler aufgetreten. Wenn möglich, versuche die Notiz woandershin zu kopieren und die Anwendung neu zu laden."
   },
   "status_bar": {
     "language_title": "Inhaltssprache ändern",
@@ -2241,22 +2241,22 @@
     "attachments_other": "{{count}} Anhänge",
     "attachments_title_one": "Anhang in einem neuen Tab öffnen",
     "attachments_title_other": "Anhänge in einem neuen Tab öffnen",
-    "attributes_one": "{{count}} Eigenschaft",
-    "attributes_other": "{{count}} Eigenschaften",
-    "attributes_title": "Eigene und gererbte Eigenschaften",
+    "attributes_one": "{{count}} Attribut",
+    "attributes_other": "{{count}} Attribute",
+    "attributes_title": "Eigene und geerbte Attribute",
     "note_paths_one": "{{count}} Pfad",
     "note_paths_other": "{{count}} Pfade",
     "note_paths_title": "Notizpfade",
     "code_note_switcher": "Sprachmodus ändern"
   },
   "attributes_panel": {
-    "title": "Notizeigenschaften"
+    "title": "Notizattribute"
   },
   "right_pane": {
     "empty_message": "Für diese Notiz gibt es nichts anzuzeigen",
-    "empty_button": "Anzeige ausblenden",
-    "toggle": "Rechte Anzeige umschalten",
-    "custom_widget_go_to_source": "Zum Ursprungscode"
+    "empty_button": "Leiste ausblenden",
+    "toggle": "Rechte Leiste umschalten",
+    "custom_widget_go_to_source": "Zum Quellcode"
   },
   "pdf": {
     "attachments_one": "{{count}} Anhang",
@@ -2266,6 +2266,9 @@
     "pages_one": "{{count}} Seite",
     "pages_other": "{{count}} Seiten",
     "pages_alt": "Seite {{pageNumber}}",
-    "pages_loading": "Laden..."
+    "pages_loading": "Lädt..."
+  },
+  "platform_indicator": {
+    "available_on": "Verfügbar auf {{platform}}"
   }
 }

apps/client/src/translations/en/translation.json

@@ -1958,8 +1958,8 @@
     "desktop-application": "Desktop Application",
     "native-title-bar": "Native title bar",
     "native-title-bar-description": "For Windows and macOS, keeping the native title bar off makes the application look more compact. On Linux, keeping the native title bar on integrates better with the rest of the system.",
-    "background-effects": "Enable background effects (Windows 11 only)",
-    "background-effects-description": "The Mica effect adds a blurred, stylish background to app windows, creating depth and a modern look. \"Native title bar\" must be disabled.",
+    "background-effects": "Enable background effects",
+    "background-effects-description": "Adds a blurred, stylish background to app windows, creating depth and a modern look. \"Native title bar\" must be disabled.",
     "restart-app-button": "Restart the application to view the changes",
     "zoom-factor": "Zoom factor"
   },
@@ -1977,6 +1977,7 @@
   },
   "geo-map": {
     "create-child-note-title": "Create a new child note and add it to the map",
+    "create-child-note-text": "Add marker",
     "create-child-note-instruction": "Click on the map to create a new note at that location or press Escape to dismiss.",
     "unable-to-load-map": "Unable to load map."
   },
@@ -2152,7 +2153,7 @@
     "next_theme_message": "You are currently using the legacy theme, would you like to try the new theme?",
     "next_theme_button": "Try the new theme",
     "background_effects_title": "Background effects are now stable",
-    "background_effects_message": "On Windows devices, background effects are now fully stable. The background effects adds a touch of color to the user interface by blurring the background behind it. This technique is also used in other applications such as Windows Explorer.",
+    "background_effects_message": "On Windows and macOS devices, background effects are now stable. The background effects adds a touch of color to the user interface by blurring the background behind it.",
     "background_effects_button": "Enable background effects",
     "new_layout_title": "New layout",
     "new_layout_message": "We’ve introduced a modernized layout for Trilium. The ribbon has been removed and seamlessly integrated into the main interface, with a new status bar and expandable sections (such as promoted attributes) taking over key functions.\n\nThe new layout is enabled by default, and can be temporarily disabled via Options → Appearance.",
@@ -2267,5 +2268,13 @@
     "pages_other": "{{count}} pages",
     "pages_alt": "Page {{pageNumber}}",
     "pages_loading": "Loading..."
+  },
+  "platform_indicator": {
+    "available_on": "Available on {{platform}}"
+  },
+  "mobile_tab_switcher": {
+    "title_one": "{{count}} tab",
+    "title_other": "{{count}} tabs",
+    "more_options": "More options"
   }
 }

apps/client/src/translations/es/translation.json

@@ -28,7 +28,10 @@
     },
     "widget-render-error": {
       "title": "Hubo un fallo al renderizar un widget personalizado de React"
-    }
+    },
+    "widget-missing-parent": "El widget personalizado no tiene definida la propiedad obligatoria '{{property}}'.\n\nSi este script está pensado para ejecutarse sin un elemento de interfaz de usuario, utilice '#run=frontendStartup' en su lugar.",
+    "open-script-note": "Abrir script",
+    "scripting-error": "Error en script personalizado: {{title}}"
   },
   "add_link": {
     "add_link": "Agregar enlace",
@@ -211,7 +214,8 @@
   "info": {
     "modalTitle": "Mensaje informativo",
     "closeButton": "Cerrar",
-    "okButton": "Aceptar"
+    "okButton": "Aceptar",
+    "copy_to_clipboard": "Copiar al portapapeles"
   },
   "jump_to_note": {
     "search_button": "Buscar en texto completo",
@@ -697,7 +701,13 @@
     "convert_into_attachment_successful": "La nota '{{title}}' ha sido convertida a un archivo adjunto.",
     "convert_into_attachment_prompt": "¿Está seguro que desea convertir la nota '{{title}}' en un archivo adjunto de la nota padre?",
     "print_pdf": "Exportar como PDF...",
-    "open_note_on_server": "Abrir nota en servidor"
+    "open_note_on_server": "Abrir nota en servidor",
+    "view_revisions": "Revisiones de la nota...",
+    "advanced": "Avanzado",
+    "export_as_image": "Exportar como imagen",
+    "export_as_image_png": "PNG (ráster)",
+    "export_as_image_svg": "SVG (vectorial)",
+    "note_map": "Mapa de la nota"
   },
   "onclick_button": {
     "no_click_handler": "El widget de botón '{{componentId}}' no tiene un controlador de clics definido"
@@ -759,7 +769,13 @@
     "reset-default": "Restablecer a icono por defecto",
     "search_placeholder_one": "Buscar {{number}} icono a través de {{count}} paquetes",
     "search_placeholder_many": "Buscar {{number}} iconos a través de {{count}} paquetes",
-    "search_placeholder_other": "Buscar {{number}} iconos a través de {{count}} paquetes"
+    "search_placeholder_other": "Buscar {{number}} iconos a través de {{count}} paquetes",
+    "search_placeholder_filtered": "Buscar {{number}} iconos en {{name}}",
+    "filter": "Filtro",
+    "filter-none": "Todos los iconos",
+    "filter-default": "Iconos predeterminados",
+    "icon_tooltip": "{{name}}\nPaquete de iconos: {{iconPack}}",
+    "no_results": "No se encontraron iconos."
   },
   "basic_properties": {
     "note_type": "Tipo de nota",
@@ -783,10 +799,11 @@
     "board": "Tablero",
     "include_archived_notes": "Mostrar notas archivadas",
     "presentation": "Presentación",
-    "expand_tooltip": "Expande las notas hijas inmediatas de esta colección (un nivel). Para más opciones, pulsa la flecha a la derecha.",
+    "expand_tooltip": "Expande las subnotas inmediatas de esta colección (un nivel). Para más opciones, pulsa la flecha a la derecha.",
     "expand_first_level": "Expandir hijos inmediatos",
     "expand_nth_level": "Expandir {{depth}} niveles",
-    "expand_all_levels": "Expandir todos los niveles"
+    "expand_all_levels": "Expandir todos los niveles",
+    "hide_child_notes": "Ocultar subnotas en el árbol"
   },
   "edited_notes": {
     "no_edited_notes_found": "Aún no hay notas editadas en este día...",
@@ -819,7 +836,8 @@
   },
   "inherited_attribute_list": {
     "title": "Atributos heredados",
-    "no_inherited_attributes": "Sin atributos heredados."
+    "no_inherited_attributes": "Sin atributos heredados.",
+    "none": "ninguno"
   },
   "note_info_widget": {
     "note_id": "ID de nota",
@@ -830,7 +848,9 @@
     "note_size_info": "El tamaño de la nota proporciona una estimación aproximada de los requisitos de almacenamiento para esta nota. Toma en cuenta el contenido de la nota y el contenido de sus revisiones de nota.",
     "calculate": "calcular",
     "subtree_size": "(tamaño del subárbol: {{size}} en {{count}} notas)",
-    "title": "Información de nota"
+    "title": "Información de nota",
+    "mime": "Tipo MIME",
+    "show_similar_notes": "Mostrar notas similares"
   },
   "note_map": {
     "open_full": "Ampliar al máximo",
@@ -893,7 +913,8 @@
     "search_parameters": "Parámetros de búsqueda",
     "unknown_search_option": "Opción de búsqueda desconocida {{searchOptionName}}",
     "search_note_saved": "La nota de búsqueda se ha guardado en {{- notePathTitle}}",
-    "actions_executed": "Las acciones han sido ejecutadas."
+    "actions_executed": "Las acciones han sido ejecutadas.",
+    "view_options": "Ver opciones:"
   },
   "similar_notes": {
     "title": "Notas similares",
@@ -996,7 +1017,13 @@
   },
   "editable_text": {
     "placeholder": "Escribe aquí el contenido de tu nota...",
-    "auto-detect-language": "Detectado automáticamente"
+    "auto-detect-language": "Detectado automáticamente",
+    "editor_crashed_title": "El editor de texto ha dejado de responder",
+    "editor_crashed_content": "Su contenido ha sido recuperado con éxito, pero puede que algunos de sus cambios más recientes no se hayan guardado.",
+    "editor_crashed_details_button": "Ver más detalles...",
+    "editor_crashed_details_intro": "Si experimenta este error varias veces, considere informarlo en GitHub adjuntando la siguiente información.",
+    "editor_crashed_details_title": "Información técnica",
+    "keeps-crashing": "El componente de edición sigue fallando. Por favor, intente reiniciar Trilium. Si el problema persiste, considere crear un informe de fallos."
   },
   "empty": {
     "open_note_instruction": "Abra una nota escribiendo el título de la nota en la entrada a continuación o elija una nota en el árbol.",
@@ -1312,8 +1339,8 @@
   "code_mime_types": {
     "title": "Tipos MIME disponibles en el menú desplegable",
     "tooltip_syntax_highlighting": "Resaltado de sintaxis",
-    "tooltip_code_block_syntax": "Bloques de Código en notas de Texto",
-    "tooltip_code_note_syntax": "Notas de Código"
+    "tooltip_code_block_syntax": "Bloques de código en Notas de texto",
+    "tooltip_code_note_syntax": "Notas de código"
   },
   "vim_key_bindings": {
     "use_vim_keybindings_in_code_notes": "Combinaciones de teclas Vim",
@@ -1390,16 +1417,16 @@
     "markdown": "Estilo Markdown"
   },
   "highlights_list": {
-    "title": "Lista de aspectos destacados",
-    "description": "Puede personalizar la lista de aspectos destacados que se muestra en el panel derecho:",
+    "title": "Lista de puntos destacados",
+    "description": "Puede personalizar la lista de puntos destacados que se muestra en el panel derecho:",
     "bold": "Texto en negrita",
     "italic": "Texto en cursiva",
     "underline": "Texto subrayado",
     "color": "Texto con color",
     "bg_color": "Texto con color de fondo",
-    "visibility_title": "Visibilidad de la lista de aspectos destacados",
-    "visibility_description": "Puede ocultar el widget de aspectos destacados por nota agregando una etiqueta #hideHighlightWidget.",
-    "shortcut_info": "Puede configurar un método abreviado de teclado para alternar rápidamente el panel derecho (incluidos los aspectos destacados) en Opciones -> Atajos (nombre 'toggleRightPane')."
+    "visibility_title": "Visibilidad de la lista de puntos destacados",
+    "visibility_description": "Puede ocultar el widget de puntos destacados por nota agregando la etiqueta #hideHighlightWidget.",
+    "shortcut_info": "Puede configurar un método abreviado de teclado para alternar rápidamente el panel derecho (incluidos los puntos destacados) en Opciones -> Atajos (nombre 'toggleRightPane')."
   },
   "table_of_contents": {
     "title": "Tabla de contenido",
@@ -1587,7 +1614,7 @@
   },
   "bookmark_switch": {
     "bookmark": "Marcador",
-    "bookmark_this_note": "Añadir esta nota a marcadores en el panel lateral izquierdo",
+    "bookmark_this_note": "Agregar esta nota a marcadores en el panel lateral izquierdo",
     "remove_bookmark": "Eliminar marcador"
   },
   "editability_select": {
@@ -1635,7 +1662,10 @@
     "convert-to-attachment-confirm": "¿Está seguro que desea convertir las notas seleccionadas en archivos adjuntos de sus notas padres? Esta operación solo aplica a notas de Imagen, otras notas serán omitidas.",
     "open-in-popup": "Edición rápida",
     "archive": "Archivar",
-    "unarchive": "Desarchivar"
+    "unarchive": "Desarchivar",
+    "open-in-a-new-window": "Abrir en una nueva ventana",
+    "hide-subtree": "Ocultar subárbol",
+    "show-subtree": "Mostrar subárbol"
   },
   "shared_info": {
     "shared_publicly": "Esta nota está compartida públicamente en {{- link}}.",
@@ -1696,7 +1726,13 @@
   },
   "highlights_list_2": {
     "title": "Lista de destacados",
-    "options": "Opciones"
+    "options": "Opciones",
+    "title_with_count_one": "{{count}} punto destacado",
+    "title_with_count_many": "{{count}} puntos destacados",
+    "title_with_count_other": "{{count}} puntos destacados",
+    "modal_title": "Configurar la lista de puntos destacados",
+    "menu_configure": "Configurar la lista de puntos destacados...",
+    "no_highlights": "Ningún punto destacado encontrado."
   },
   "quick-search": {
     "placeholder": "Búsqueda rápida",
@@ -1719,7 +1755,18 @@
     "refresh-saved-search-results": "Refrescar resultados de búsqueda guardados",
     "create-child-note": "Crear subnota",
     "unhoist": "Desanclar",
-    "toggle-sidebar": "Alternar barra lateral"
+    "toggle-sidebar": "Alternar barra lateral",
+    "dropping-not-allowed": "No está permitido soltar notas en esta ubicación.",
+    "clone-indicator-tooltip": "Esta nota tiene {{- count}} padres: {{- parents}}",
+    "clone-indicator-tooltip-single": "Esta nota está clonada (1 padre adicional: {{- parent}})",
+    "shared-indicator-tooltip": "Esta nota está compartida públicamente",
+    "shared-indicator-tooltip-with-url": "Esta nota está compartida públicamente en: {{- url}}",
+    "subtree-hidden-tooltip_one": "{{count}} subnota que está oculta del árbol",
+    "subtree-hidden-tooltip_many": "{{count}} subnotas que están ocultas del árbol",
+    "subtree-hidden-tooltip_other": "{{count}} subnotas que están ocultas del árbol",
+    "subtree-hidden-moved-title": "Agregado a {{title}}",
+    "subtree-hidden-moved-description-collection": "Esta colección oculta sus subnotas en el árbol.",
+    "subtree-hidden-moved-description-other": "Las subnotas están ocultas en el árbol para esta nota."
   },
   "title_bar_buttons": {
     "window-on-top": "Mantener esta ventana en la parte superior"
@@ -1730,10 +1777,21 @@
     "printing_pdf": "Exportando a PDF en curso..",
     "print_report_collection_content_one": "{{count}} nota en la colección no se puede imprimir porque no son compatibles o está protegida.",
     "print_report_collection_content_many": "{{count}} notas en la colección no se pueden imprimir porque no son compatibles o están protegidas.",
-    "print_report_collection_content_other": "{{count}} notas en la colección no se pueden imprimir porque no son compatibles o están protegidas."
+    "print_report_collection_content_other": "{{count}} notas en la colección no se pueden imprimir porque no son compatibles o están protegidas.",
+    "print_report_title": "Imprimir informe",
+    "print_report_collection_details_button": "Ver detalles",
+    "print_report_collection_details_ignored_notes": "Notas ignoradas"
   },
   "note_title": {
-    "placeholder": "escriba el título de la nota aquí..."
+    "placeholder": "escriba el título de la nota aquí...",
+    "created_on": "Creado en <Value />",
+    "last_modified": "Modificado en <Value />",
+    "note_type_switcher_label": "Cambiar de {{type}} a:",
+    "note_type_switcher_others": "Otro tipo de nota",
+    "note_type_switcher_templates": "Plantilla",
+    "note_type_switcher_collection": "Colección",
+    "edited_notes": "Notas editadas en este día",
+    "promoted_attributes": "Atributos promovidos"
   },
   "search_result": {
     "no_notes_found": "No se han encontrado notas para los parámetros de búsqueda dados.",
@@ -1743,7 +1801,11 @@
     "configure_launchbar": "Configurar barra de lanzamiento"
   },
   "sql_result": {
-    "no_rows": "No se han devuelto filas para esta consulta"
+    "no_rows": "No se han devuelto filas para esta consulta",
+    "not_executed": "La consulta aún no ha sido ejecutada.",
+    "failed": "La ejecución de la consulta SQL ha fallado",
+    "statement_result": "Resultado de declaración",
+    "execute_now": "Ejecutar ahora"
   },
   "sql_table_schemas": {
     "tables": "Tablas"
@@ -1762,7 +1824,8 @@
   },
   "toc": {
     "table_of_contents": "Tabla de contenido",
-    "options": "Opciones"
+    "options": "Opciones",
+    "no_headings": "Sin encabezados."
   },
   "watched_file_update_status": {
     "file_last_modified": "Archivo <code class=\"file-path\"></code> ha sido modificado por última vez en<span class=\"file-last-modified\"></span>.",
@@ -1874,14 +1937,15 @@
     "open_note_in_new_tab": "Abrir nota en una pestaña nueva",
     "open_note_in_new_split": "Abrir nota en una nueva división",
     "open_note_in_new_window": "Abrir nota en una nueva ventana",
-    "open_note_in_popup": "Edición rápida"
+    "open_note_in_popup": "Edición rápida",
+    "open_note_in_other_split": "Abrir nota en la otra división"
   },
   "electron_integration": {
     "desktop-application": "Aplicación de escritorio",
     "native-title-bar": "Barra de título nativa",
     "native-title-bar-description": "Para Windows y macOS, quitar la barra de título nativa hace que la aplicación se vea más compacta. En Linux, mantener la barra de título nativa hace que se integre mejor con el resto del sistema.",
-    "background-effects": "Habilitar efectos de fondo (sólo en Windows 11)",
-    "background-effects-description": "El efecto Mica agrega un fondo borroso y elegante a las ventanas de la aplicación, creando profundidad y un aspecto moderno. \"Título nativo de la barra\" debe deshabilitarse.",
+    "background-effects": "Habilitar efectos de fondo",
+    "background-effects-description": "Agrega un fondo borroso y elegante a las ventanas de la aplicación, creando profundidad y un aspecto moderno. \"Título nativo de la barra\" debe deshabilitarse.",
     "restart-app-button": "Reiniciar la aplicación para ver los cambios",
     "zoom-factor": "Factor de zoom"
   },
@@ -1900,7 +1964,8 @@
   "geo-map": {
     "create-child-note-title": "Crear una nueva subnota y agregarla al mapa",
     "create-child-note-instruction": "Dé clic en el mapa para crear una nueva nota en esa ubicación o presione Escape para cancelar.",
-    "unable-to-load-map": "No se puede cargar el mapa."
+    "unable-to-load-map": "No se puede cargar el mapa.",
+    "create-child-note-text": "Agregar marcador"
   },
   "geo-map-context": {
     "open-location": "Abrir ubicación",
@@ -1943,10 +2008,11 @@
   },
   "note_language": {
     "not_set": "Idioma no establecido",
-    "configure-languages": "Configurar idiomas..."
+    "configure-languages": "Configurar idiomas...",
+    "help-on-languages": "Ayuda en idiomas de contenido..."
   },
   "content_language": {
-    "title": "Contenido de idiomas",
+    "title": "Idiomas de contenido",
     "description": "Seleccione uno o más idiomas que deben aparecer en la selección del idioma en la sección Propiedades Básicas de una nota de texto de solo lectura o editable. Esto permitirá características tales como corrección de ortografía o soporte de derecha a izquierda."
   },
   "switch_layout_button": {
@@ -1961,7 +2027,8 @@
     "button_title": "Exportar diagrama como PNG"
   },
   "svg": {
-    "export_to_png": "El diagrama no pudo ser exportado a PNG."
+    "export_to_png": "El diagrama no pudo ser exportado a PNG.",
+    "export_to_svg": "El diagrama no pudo ser exportado a SVG."
   },
   "code_theme": {
     "title": "Apariencia",
@@ -2064,9 +2131,12 @@
     "next_theme_message": "Estás usando actualmente el tema heredado. ¿Te gustaría probar el nuevo tema?",
     "next_theme_button": "Prueba el nuevo tema",
     "background_effects_title": "Los efectos de fondo son ahora estables",
-    "background_effects_message": "En los dispositivos Windows, los efectos de fondo ya son totalmente estables. Los efectos de fondo añaden un toque de color a la interfaz de usuario difuminando el fondo que hay detrás. Esta técnica también se utiliza en otras aplicaciones como el Explorador de Windows.",
+    "background_effects_message": "En los dispositivos Windows y macOS, los efectos de fondo ya son estables. Los efectos de fondo añaden un toque de color a la interfaz de usuario difuminando el fondo que hay detrás.",
     "background_effects_button": "Activar efectos de fondo",
-    "dismiss": "Desestimar"
+    "dismiss": "Desestimar",
+    "new_layout_title": "Nuevo diseño",
+    "new_layout_message": "Hemos introducido un diseño modernizado para Trilium. La cinta se ha eliminado y se ha integrado perfectamente en la interfaz principal, con una nueva barra de estado y secciones ampliables (como los atributos promovidos) que tienen funciones clave.\n\nEl nuevo diseño está habilitado por defecto, y puede ser deshabilitado temporalmente a través de Opciones → Apariencia.",
+    "new_layout_button": "Más información"
   },
   "ui-performance": {
     "title": "Rendimiento",
@@ -2081,7 +2151,10 @@
   },
   "settings_appearance": {
     "related_code_blocks": "Esquema de colores para bloques de código en notas de texto",
-    "related_code_notes": "Esquema de colores para notas de código"
+    "related_code_notes": "Esquema de colores para notas de código",
+    "ui": "Interfaz de usuario",
+    "ui_old_layout": "Antiguo diseño",
+    "ui_new_layout": "Nuevo diseño"
   },
   "units": {
     "percentage": "%"
@@ -2129,7 +2202,12 @@
     "attributes_other": "{{count}} atributos",
     "note_paths_one": "{{count}} ruta",
     "note_paths_many": "{{count}} rutas",
-    "note_paths_other": "{{count}} rutas"
+    "note_paths_other": "{{count}} rutas",
+    "language_title": "Cambiar el idioma del contenido",
+    "note_info_title": "Ver información de la nota (p. e., fechas, tamaño de la nota)",
+    "attributes_title": "Atributos propios y atributos heredados",
+    "note_paths_title": "Rutas de nota",
+    "code_note_switcher": "Cambiar modo de idioma"
   },
   "pdf": {
     "attachments_one": "{{count}} adjunto",
@@ -2140,6 +2218,72 @@
     "layers_other": "{{count}} capas",
     "pages_one": "{{count}} página",
     "pages_many": "{{count}} páginas",
-    "pages_other": "{{count}} páginas"
+    "pages_other": "{{count}} páginas",
+    "pages_alt": "Página {{pageNumber}}",
+    "pages_loading": "Cargando..."
+  },
+  "experimental_features": {
+    "title": "Opciones experimentales",
+    "disclaimer": "Estas opciones son experimentales y pueden causar inestabilidad. Úselas con precaución.",
+    "new_layout_name": "Nuevo diseño",
+    "new_layout_description": "Pruebe el nuevo diseño para tener un aspecto más moderno y usabilidad mejorada. Sujeto a grandes cambios en las próximas versiones."
+  },
+  "popup-editor": {
+    "maximize": "Cambiar a editor completo"
+  },
+  "server": {
+    "unknown_http_error_title": "Error de comunicación con el servidor",
+    "unknown_http_error_content": "Código de estado: {{statusCode}}\nURL: {{method}} {{url}}\nMensaje: {{message}}",
+    "traefik_blocks_requests": "Si está usando el proxy inverso Traefik, este introdujo un cambio que afecta la comunicación con el servidor."
+  },
+  "tab_history_navigation_buttons": {
+    "go-back": "Volver a la nota anterior",
+    "go-forward": "Avanzar a la siguiente nota"
+  },
+  "breadcrumb": {
+    "hoisted_badge": "Anclada",
+    "hoisted_badge_title": "Desanclar",
+    "workspace_badge": "Espacio de trabajo",
+    "scroll_to_top_title": "Saltar al inicio de la nota",
+    "create_new_note": "Crear nueva subnota",
+    "empty_hide_archived_notes": "Ocultar notas archivadas"
+  },
+  "breadcrumb_badges": {
+    "read_only_explicit": "Sólo lectura",
+    "read_only_explicit_description": "Esta nota se ha fijado manualmente como sólo lectura.\nHaga clic para editarla temporalmente.",
+    "read_only_auto": "Sólo lectura automática",
+    "read_only_auto_description": "Esta nota se fijó automáticamente con el modo de sólo lectura por razones de rendimiento. Este límite automático es ajustable desde los ajustes.\n\nHaga clic para editarla temporalmente.",
+    "read_only_temporarily_disabled": "Temporalmente editable",
+    "read_only_temporarily_disabled_description": "Esta nota actualmente es editable, pero normalmente es de sólo lectura. La nota volverá a ser de sólo lectura tan pronto como navegue a otra nota.\n\nHaga clic para volver a habilitar el modo de sólo lectura.",
+    "shared_publicly": "Compartida públicamente",
+    "shared_locally": "Compartida localmente",
+    "shared_copy_to_clipboard": "Copiar enlace al portapapeles",
+    "shared_open_in_browser": "Abrir enlace en el navegador",
+    "shared_unshare": "Eliminar compartido",
+    "clipped_note_description": "Esta nota fue tomada originalmente de {{url}}.\n\nHaga clic para navegar a la página web de origen.",
+    "execute_script": "Ejecutar script",
+    "execute_script_description": "Esta nota es una nota de script. Haga clic para ejecutar el script.",
+    "execute_sql": "Ejecutar SQL",
+    "execute_sql_description": "Esta nota es una nota SQL. Haga clic para ejecutar la consulta SQL.",
+    "save_status_saved": "Guardado",
+    "save_status_saving": "Guardando...",
+    "save_status_unsaved": "Sin guardar",
+    "save_status_error": "Fallo al guardar",
+    "save_status_saving_tooltip": "Los cambios están siendo guardados.",
+    "save_status_unsaved_tooltip": "Hay cambios sin guardar. Se guardarán automáticamente en un momento.",
+    "save_status_error_tooltip": "Se produjo un error al guardar la nota. Si es posible, trate de copiar el contenido de la nota en otro lugar y recargar la aplicación.",
+    "clipped_note": "Clip web"
+  },
+  "attributes_panel": {
+    "title": "Atributos de nota"
+  },
+  "right_pane": {
+    "empty_message": "Nada que mostrar para esta nota",
+    "empty_button": "Ocultar el panel",
+    "toggle": "Alternar panel derecho",
+    "custom_widget_go_to_source": "Ir al código fuente"
+  },
+  "platform_indicator": {
+    "available_on": "Disponible en {{platform}}"
   }
 }

apps/client/src/translations/id/translation.json

@@ -11,8 +11,8 @@
   },
   "toast": {
     "critical-error": {
-      "title": "Kesalahan kritis",
-      "message": "Telah terjadi kesalahan kritis yang mencegah aplikasi klien untuk memulai:\n\n{{message}}\n\nHal ini kemungkinan besar disebabkan oleh skrip yang gagal secara tidak terduga. Coba jalankan aplikasi dalam mode aman dan atasi masalahnya."
+      "title": "Eror kritikal",
+      "message": "Telah terjadi eror kritikal yang mencegah aplikasi klien untuk memulai:\n\n{{message}}\n\nHal ini kemungkinan besar disebabkan oleh skrip yang gagal secara tidak terduga. Coba jalankan aplikasi dalam mode aman dan atasi masalahnya."
     },
     "widget-error": {
       "title": "Gagal menginisialisasi widget",
@@ -21,16 +21,65 @@
     },
     "bundle-error": {
       "title": "Gagal memuat skrip kustom",
-      "message": "Skrip tidak dapat dijalankan karena:\n\n{{message}}"
+      "message": "Skrip tidak dapat dijalankan:\n\n{{message}}"
     },
     "widget-list-error": {
       "title": "Gagal mendapatkan daftar widget dari server"
     },
-    "open-script-note": "Buka skrip catatan"
+    "open-script-note": "Buka skrip catatan",
+    "widget-render-error": {
+      "title": "Gagal render widget React custom"
+    },
+    "widget-missing-parent": "Widget custom '{{property}}' tidak terdefinisi.\n\nJika skrip ini bermaksud untuk bisa dijalankan tanpa elemen UI, gunakanlah '#run=frontendStartup'.",
+    "scripting-error": "Skrip custom eror : {{title}}"
   },
   "add_link": {
     "add_link": "Tambah tautan",
     "help_on_links": "Bantuan pada tautan",
-    "note": "Catatan"
+    "note": "Catatan",
+    "search_note": "cari catatan berdasarkan nama",
+    "link_title_mirrors": "judul tautan mencerminkan judul catatan saat ini",
+    "link_title_arbitrary": "judul tautan dapat diubah secara bebas",
+    "link_title": "Judul tautan",
+    "button_add_link": "Tambah tautan"
+  },
+  "branch_prefix": {
+    "edit_branch_prefix_multiple": "Edit prefiks cabang untuk {{count}} cabang",
+    "help_on_tree_prefix": "Bantuan pada prefiks pohon catatan",
+    "prefix": "Prefiks: ",
+    "save": "Simpan",
+    "branch_prefix_saved": "Prefiks cabang telah disimpan.",
+    "branch_prefix_saved_multiple": "Prefix cabang telah disimpan pada {{count}} cabang.",
+    "affected_branches": "Cabang terdampak ({{count}}):"
+  },
+  "bulk_actions": {
+    "bulk_actions": "Aksi borongan",
+    "affected_notes": "Catatan terdampak",
+    "include_descendants": "Sertakan anakan dari catatan yang dipilih",
+    "available_actions": "Pilihan aksi",
+    "chosen_actions": "Aksi terpilih",
+    "execute_bulk_actions": "Eksekusi aksi borongan",
+    "bulk_actions_executed": "Aksi borongan telah di eksekusi dengan sukses.",
+    "none_yet": "Belum ada... tambahkan aksi dengan memilih salah satu dari aksi di atas.",
+    "labels": "Label-label"
+  },
+  "confirm": {
+    "cancel": "Batal",
+    "ok": "Oke",
+    "are_you_sure_remove_note": "Apakah anda yakin mau membuang catatan \"{{title}}\" dari peta relasi? ",
+    "if_you_dont_check": "Jika Anda tidak mencentang ini, catatan hanya akan dihapus dari peta relasi.",
+    "also_delete_note": "Hapus juga catatannya"
+  },
+  "delete_notes": {
+    "delete_notes_preview": "Hapus pratinjau catatan",
+    "close": "Tutup",
+    "delete_all_clones_description": "Hapus seluruh duplikat (bisa dikembalikan di menu revisi)",
+    "erase_notes_description": "Penghapusan normal hanya menandai catatan sebagai dihapus dan dapat dipulihkan (melalui dialog versi revisi) dalam jangka waktu tertentu. Mencentang opsi ini akan menghapus catatan secara permanen seketika dan catatan tidak akan bisa dipulihkan kembali.",
+    "erase_notes_warning": "Hapus catatan secara permanen (tidak bisa dikembalikan), termasuk semua duplikat. Aksi akan memaksa aplikasi untuk mengulang kembali.",
+    "notes_to_be_deleted": "Catatan-catatan berikut akan dihapuskan ({{notesCount}})",
+    "no_note_to_delete": "Tidak ada Catatan yang akan dihapus (hanya duplikat)."
+  },
+  "clone_to": {
+    "clone_notes_to": "Duplikat catatan ke…"
   }
 }

apps/client/src/translations/it/translation.json

@@ -325,7 +325,10 @@
     "apply-bulk-actions": "Applica azioni in blocco",
     "converted-to-attachments": "{{count}} note sono state convertite in allegati.",
     "convert-to-attachment-confirm": "Sei sicuro di voler convertire le note selezionate in allegati delle note principali? Questa operazione si applica solo alle note immagine, le altre note verranno ignorate.",
-    "open-in-popup": "Modifica rapida"
+    "open-in-popup": "Modifica rapida",
+    "open-in-a-new-window": "Apri in una nuova finestra",
+    "hide-subtree": "Nascondi sottostruttura",
+    "show-subtree": "Mostra sottoalbero"
   },
   "electron_context_menu": {
     "cut": "Taglia",
@@ -1378,7 +1381,8 @@
     "expand_tooltip": "Espande i figli diretti di questa raccolta (a un livello di profondità). Per ulteriori opzioni, premere la freccia a destra.",
     "expand_first_level": "Espandi figli diretti",
     "expand_nth_level": "Espandi {{depth}} livelli",
-    "expand_all_levels": "Espandi tutti i livelli"
+    "expand_all_levels": "Espandi tutti i livelli",
+    "hide_child_notes": "Nascondi note secondarie nell'albero"
   },
   "edited_notes": {
     "no_edited_notes_found": "Nessuna nota modificata per questo giorno...",
@@ -1899,7 +1903,13 @@
     "clone-indicator-tooltip": "Questa nota ha {{- count}} genitori: {{- parents}}",
     "clone-indicator-tooltip-single": "Questa nota è stata clonata (1 genitore aggiuntivo: {{- parent}})",
     "shared-indicator-tooltip": "Questa nota è condivisa pubblicamente",
-    "shared-indicator-tooltip-with-url": "Questa nota è condivisa pubblicamente all'indirizzo: {{- url}}"
+    "shared-indicator-tooltip-with-url": "Questa nota è condivisa pubblicamente all'indirizzo: {{- url}}",
+    "subtree-hidden-tooltip_one": "{{count}} nota secondaria nascosta dall'albero",
+    "subtree-hidden-tooltip_many": "{{count}} note secondarie nascoste dall'albero",
+    "subtree-hidden-tooltip_other": "{{count}} note secondarie nascoste dall'albero",
+    "subtree-hidden-moved-title": "Aggiunto a {{title}}",
+    "subtree-hidden-moved-description-collection": "Questa raccolta nasconde le sue note secondarie nell'albero.",
+    "subtree-hidden-moved-description-other": "Le note secondarie sono nascoste nell'albero di questa nota."
   },
   "title_bar_buttons": {
     "window-on-top": "Mantieni la finestra in primo piano"
@@ -1934,7 +1944,11 @@
     "configure_launchbar": "Configura Launchbar"
   },
   "sql_result": {
-    "no_rows": "Nessuna riga è stata restituita per questa query"
+    "no_rows": "Nessuna riga è stata restituita per questa query",
+    "not_executed": "La query non è stata ancora eseguita.",
+    "failed": "Esecuzione query SQL non riuscita",
+    "statement_result": "Risultato della dichiarazione",
+    "execute_now": "Esegui ora"
   },
   "watched_file_update_status": {
     "file_last_modified": "Il file <code class=\"file-path\"></code> è stato modificato l'ultima volta il <span class=\"file-last-modified\"></span>.",

apps/client/src/translations/ja/translation.json

@@ -1757,8 +1757,8 @@
     "desktop-application": "デスクトップアプリケーション",
     "native-title-bar": "ネイティブタイトルバー",
     "native-title-bar-description": "WindowsとmacOSでは、ネイティブタイトルバーをオフにしておくと、アプリケーションがよりコンパクトに見えます。Linuxでは、ネイティブタイトルバーを表示したままの方が、他のシステムとの統一性が高まります。",
-    "background-effects": "背景効果を有効化（Windows 11のみ）",
-    "background-effects-description": "Mica効果は、アプリのウィンドウにぼかされたスタイリッシュな背景を追加し、奥行きとモダンな外観を演出します。「ネイティブタイトルバー」を無効にする必要があります。",
+    "background-effects": "背景効果を有効化",
+    "background-effects-description": "アプリウィンドウにぼかしの効いたスタイリッシュな背景を追加し、奥行きとモダンな外観を演出します。「ネイティブタイトルバー」を無効にする必要があります。",
     "restart-app-button": "アプリケーションを再起動して変更を反映",
     "zoom-factor": "ズーム倍率"
   },
@@ -2044,7 +2044,7 @@
     "next_theme_message": "現在、レガシーテーマを使用しています。新しいテーマを試してみませんか?",
     "next_theme_button": "新しいテーマを試す",
     "background_effects_title": "背景効果が安定しました",
-    "background_effects_message": "Windowsデバイスでは、背景効果が完全に安定しました。背景効果は、背景をぼかすことでユーザーインターフェースに彩りを添えます。この技術は、Windowsエクスプローラーなどの他のアプリケーションでも使用されています。",
+    "background_effects_message": "WindowsおよびmacOSデバイスで、背景効果が安定しました。背景効果は、背景をぼかすことでユーザーインターフェースに彩りを添えます。",
     "background_effects_button": "背景効果を有効にする",
     "dismiss": "却下",
     "new_layout_title": "新しいレイアウト",
@@ -2253,5 +2253,8 @@
     "pages_other": "{{count}} ページ",
     "pages_alt": "ページ {{pageNumber}}",
     "pages_loading": "読み込み中..."
+  },
+  "platform_indicator": {
+    "available_on": "{{platform}} で利用可能"
   }
 }

apps/client/src/translations/tw/translation.json

@@ -1566,6 +1566,7 @@
     "shared-indicator-tooltip": "此筆記已公開分享",
     "shared-indicator-tooltip-with-url": "此筆記已公開分享至：{{- url}}",
     "subtree-hidden-tooltip_one": "從樹中隱藏的 {{count}} 篇子筆記",
+    "subtree-hidden-tooltip_other": "",
     "subtree-hidden-moved-title": "已新增至 {{title}}",
     "subtree-hidden-moved-description-collection": "此集合隱藏其樹中的子筆記。",
     "subtree-hidden-moved-description-other": "子筆記隱藏於此筆記的樹中。"
@@ -1602,7 +1603,11 @@
     "configure_launchbar": "設定啟動欄"
   },
   "sql_result": {
-    "no_rows": "此次查詢沒有返回任何數據"
+    "no_rows": "此次查詢沒有返回任何數據",
+    "not_executed": "查詢尚未執行。",
+    "failed": "SQL 查詢執行失敗",
+    "statement_result": "查詢結果",
+    "execute_now": "立即執行"
   },
   "sql_table_schemas": {
     "tables": "表"

apps/client/src/widgets/FloatingButtonsDefinitions.tsx

@@ -54,7 +54,6 @@ export const DESKTOP_FLOATING_BUTTONS: FloatingButtonsList = [
     OpenTriliumApiDocsButton,
     SaveToNoteButton,
     RelationMapButtons,
-    GeoMapButtons,
     CopyImageReferenceButton,
     ExportImageButtons,
     InAppHelpButton,
@@ -98,10 +97,10 @@ function SwitchSplitOrientationButton({ note, isReadOnly, isDefaultViewMode }: F
     />;
 }
 
-function ToggleReadOnlyButton({ note, viewType, isDefaultViewMode }: FloatingButtonContext) {
+function ToggleReadOnlyButton({ note, isDefaultViewMode }: FloatingButtonContext) {
     const [ isReadOnly, setReadOnly ] = useNoteLabelBoolean(note, "readOnly");
     const isSavedSqlite = note.isTriliumSqlite() && !note.isHiddenCompletely();
-    const isEnabled = ([ "mermaid", "mindMap", "canvas" ].includes(note.type) || viewType === "geoMap" || isSavedSqlite)
+    const isEnabled = ([ "mermaid", "mindMap", "canvas" ].includes(note.type) || isSavedSqlite)
             && note.isContentAvailable() && isDefaultViewMode;
 
     return isEnabled && <FloatingButton
@@ -243,17 +242,6 @@ function RelationMapButtons({ note, isDefaultViewMode, triggerEvent }: FloatingB
     );
 }
 
-function GeoMapButtons({ triggerEvent, viewType, isReadOnly }: FloatingButtonContext) {
-    const isEnabled = viewType === "geoMap" && !isReadOnly;
-    return isEnabled && (
-        <FloatingButton
-            icon="bx bx-plus-circle"
-            text={t("geo-map.create-child-note-title")}
-            onClick={() => triggerEvent("geoMapCreateChildNote")}
-        />
-    );
-}
-
 function CopyImageReferenceButton({ note, isDefaultViewMode }: FloatingButtonContext) {
     const hiddenImageCopyRef = useRef<HTMLDivElement>(null);
     const isEnabled = (
@@ -305,7 +293,7 @@ function ExportImageButtons({ note, triggerEvent, isDefaultViewMode }: FloatingB
 
 function InAppHelpButton({ note }: FloatingButtonContext) {
     const helpUrl = getHelpUrlForNote(note);
-    const isEnabled = !!helpUrl;
+    const isEnabled = note.type !== "book" && !!helpUrl;
 
     return isEnabled && (
         <FloatingButton

apps/client/src/widgets/collections/NoteList.css

@@ -1,7 +1,7 @@
 .note-list-widget {
     min-height: 0;
     max-width: var(--max-content-width); /* Inherited from .note-split */
- 
+
     overflow: auto;
     contain: none !important;
 }
@@ -11,10 +11,6 @@ body.prefers-centered-content .note-list-widget:not(.full-height) {
     margin-inline: auto;
 }
 
-.note-list-widget .note-list {
-    padding-block: 10px;
-}
-
 .note-list-widget.full-height,
 .note-list-widget.full-height .note-list-widget-content {
     height: 100%;
@@ -25,8 +21,12 @@ body.prefers-centered-content .note-list-widget:not(.full-height) {
 }
 
 /* #region Pagination */
-.note-list-pager span.current-page {
-    text-decoration: underline;
-    font-weight: bold;
+.note-list-pager {
+    font-size: 1rem;
+
+    span.current-page {
+        text-decoration: underline;
+        font-weight: bold;
+    }
 }
-/* #endregion */
+/* #endregion */

apps/client/src/widgets/collections/board/index.css

@@ -2,7 +2,8 @@
   position: relative;
   height: 100%;
   user-select: none;
-  overflow-x: auto;
+  display: flex;
+  flex-direction: column;
 
   --card-font-size: 0.9em;
   --card-line-height: 1.2;
@@ -19,8 +20,10 @@ body.mobile .board-view {
   height: 100%;
   display: flex;
   gap: 1em;
-  padding: 1em;
+  padding-inline: 12px;
+  padding-block: 4px;
   align-items: flex-start;
+  overflow-x: auto;
 }
 
 .board-view-container .board-column {
@@ -352,4 +355,4 @@ body.mobile .board-view-container .board-column {
   font-size: 0.9em;
   max-width: 200px;
   word-wrap: break-word;
-}
+}

apps/client/src/widgets/collections/board/index.tsx

@@ -1,20 +1,23 @@
-import { Dispatch, StateUpdater, useCallback, useEffect, useMemo, useRef, useState } from "preact/hooks";
-import { ViewModeProps } from "../interface";
 import "./index.css";
-import { ColumnMap, getBoardData } from "./data";
+
+import { createContext, TargetedKeyboardEvent } from "preact";
+import { Dispatch, StateUpdater, useCallback, useEffect, useMemo, useRef, useState } from "preact/hooks";
+
+import FNote from "../../../entities/fnote";
+import { t } from "../../../services/i18n";
+import toast from "../../../services/toast";
+import CollectionProperties from "../../note_bars/CollectionProperties";
+import FormTextArea from "../../react/FormTextArea";
+import FormTextBox from "../../react/FormTextBox";
 import { useNoteLabelBoolean, useNoteLabelWithDefault, useTriliumEvent } from "../../react/hooks";
 import Icon from "../../react/Icon";
-import { t } from "../../../services/i18n";
-import Api from "./api";
-import FormTextBox from "../../react/FormTextBox";
-import { createContext, TargetedKeyboardEvent } from "preact";
-import { onWheelHorizontalScroll } from "../../widget_utils";
-import Column from "./column";
-import BoardApi from "./api";
-import FormTextArea from "../../react/FormTextArea";
-import FNote from "../../../entities/fnote";
 import NoteAutocomplete from "../../react/NoteAutocomplete";
-import toast from "../../../services/toast";
+import { onWheelHorizontalScroll } from "../../widget_utils";
+import { ViewModeProps } from "../interface";
+import Api from "./api";
+import BoardApi from "./api";
+import Column from "./column";
+import { ColumnMap, getBoardData } from "./data";
 
 export interface BoardViewData {
     columns?: BoardColumnData[];
@@ -145,7 +148,7 @@ export default function BoardView({ note: parentNote, noteIds, viewConfig, saveC
         const insertBefore = mouseX < columnMiddle;
 
         // Calculate the target position
-        let targetIndex = insertBefore ? index : index + 1;
+        const targetIndex = insertBefore ? index : index + 1;
 
         setColumnDropPosition(targetIndex);
     }, [draggedColumn]);
@@ -159,15 +162,14 @@ export default function BoardView({ note: parentNote, noteIds, viewConfig, saveC
     }, [draggedColumn, columnDropPosition, handleColumnDrop]);
 
     return (
-        <div
-            className="board-view"
-            onWheel={onWheelHorizontalScroll}
-        >
+        <div className="board-view">
+            <CollectionProperties note={parentNote} />
             <BoardViewContext.Provider value={boardViewContext}>
                 {byColumn && columns && <div
                     className="board-view-container"
                     onDragOver={handleColumnDragOver}
                     onDrop={handleContainerDrop}
+                    onWheel={onWheelHorizontalScroll}
                 >
                     {columns.map((column, index) => (
                         <>
@@ -194,7 +196,7 @@ export default function BoardView({ note: parentNote, noteIds, viewConfig, saveC
                 </div>}
             </BoardViewContext.Provider>
         </div>
-    )
+    );
 }
 
 function AddNewColumn({ api, isInRelationMode }: { api: BoardApi, isInRelationMode: boolean }) {
@@ -218,26 +220,26 @@ function AddNewColumn({ api, isInRelationMode }: { api: BoardApi, isInRelationMo
             tabIndex={300}
         >
             {!isCreatingNewColumn
-            ? <>
-                <Icon icon="bx bx-plus" />{" "}
-                {t("board_view.add-column")}
-            </>
-            : (
-                <TitleEditor
-                    placeholder={t("board_view.add-column-placeholder")}
-                    save={async (columnName) => {
-                        const created = await api.addNewColumn(columnName);
-                        if (!created) {
-                            toast.showMessage(t("board_view.column-already-exists"), undefined, "bx bx-duplicate");
-                        }
-                    }}
-                    dismiss={() => setIsCreatingNewColumn(false)}
-                    isNewItem
-                    mode={isInRelationMode ? "relation" : "normal"}
-                />
-            )}
+                ? <>
+                    <Icon icon="bx bx-plus" />{" "}
+                    {t("board_view.add-column")}
+                </>
+                : (
+                    <TitleEditor
+                        placeholder={t("board_view.add-column-placeholder")}
+                        save={async (columnName) => {
+                            const created = await api.addNewColumn(columnName);
+                            if (!created) {
+                                toast.showMessage(t("board_view.column-already-exists"), undefined, "bx bx-duplicate");
+                            }
+                        }}
+                        dismiss={() => setIsCreatingNewColumn(false)}
+                        isNewItem
+                        mode={isInRelationMode ? "relation" : "normal"}
+                    />
+                )}
         </div>
-    )
+    );
 }
 
 export function TitleEditor({ currentValue, placeholder, save, dismiss, mode, isNewItem }: {
@@ -302,26 +304,26 @@ export function TitleEditor({ currentValue, placeholder, save, dismiss, mode, is
                 onBlur={onBlur}
             />
         );
-    } else {
-        return (
-            <NoteAutocomplete
-                inputRef={inputRef}
-                noteId={currentValue ?? ""}
-                opts={{
-                    hideAllButtons: true,
-                    allowCreatingNotes: true
-                }}
-                onKeyDown={(e) => {
-                    if (e.key === "Escape") {
-                        dismiss();
-                    }
-                }}
-                onBlur={() => dismiss()}
-                noteIdChanged={(newValue) => {
-                    save(newValue);
-                    dismiss();
-                }}
-            />
-        );
     }
+    return (
+        <NoteAutocomplete
+            inputRef={inputRef}
+            noteId={currentValue ?? ""}
+            opts={{
+                hideAllButtons: true,
+                allowCreatingNotes: true
+            }}
+            onKeyDown={(e) => {
+                if (e.key === "Escape") {
+                    dismiss();
+                }
+            }}
+            onBlur={() => dismiss()}
+            noteIdChanged={(newValue) => {
+                save(newValue);
+                dismiss();
+            }}
+        />
+    );
+
 }

apps/client/src/widgets/collections/calendar/index.css

@@ -21,7 +21,16 @@
     outline: 0;
     height: 100%;
     user-select: none;
-    padding: 10px;
+    padding: 0;
+
+    @media (max-width: 991px) {
+        padding: 0;
+
+        th {
+            font-weight: normal;
+            font-size: 0.9em;
+        }
+    }
 }
 
 .calendar-view a,
@@ -43,6 +52,7 @@
     --fc-border-color: var(--main-border-color);
     --fc-neutral-bg-color: var(--launcher-pane-background-color);
     --fc-list-event-hover-bg-color: var(--left-pane-item-hover-background);
+    padding: 0 12px;
 }
 
 .calendar-container .fc-list-sticky .fc-list-day > * {
@@ -59,33 +69,35 @@
     overflow: hidden;
 }
 
-/* #region Header */
-.calendar-view .calendar-header {
-    margin-bottom: 10px;
-    display: flex;
-    align-items: center;
-    gap: 10px;
-}
+.calendar-view .collection-properties {
+    .center-container {
+        justify-content: center;
 
-.calendar-view .calendar-header .btn {
-    min-width: unset !important;
-}
+        .title {
+            min-width: 150px;
+            font-size: 1.2em;
+            text-align: center;
+        }
+    }
 
-.calendar-view .calendar-header > .title {
-    flex-grow: 1;
-    font-size: 1.3rem;
-    font-weight: normal;
-}
+    @media (max-width: 991px) {
+        >div {
+            justify-content: flex-start;
+        }
 
-body.desktop:not(.zen) .calendar-view .calendar-header {
-    padding-block-start: 4px;
-    padding-inline-end: 5em;
-}
+        .right-container {
+            flex-grow: 0;
+        }
 
-.search-result-widget-content .calendar-view .calendar-header {
-    padding-inline-end: unset !important;
+        .center-container {
+            .title {
+                flex-grow: 1;
+                min-width: 110px;
+                font-size: 0.95em;
+            }
+        }
+    }
 }
-/* #endregion */
 
 /* #region Events */
 
@@ -93,7 +105,7 @@ body.desktop:not(.zen) .calendar-view .calendar-header {
  * week, month, year views
  */
 
- .calendar-container a.fc-event {
+.calendar-container a.fc-event {
     text-decoration: none;
 }
 
@@ -126,7 +138,7 @@ body.desktop:not(.zen) .calendar-view .calendar-header {
 .calendar-view a.fc-timegrid-event,
 .calendar-view a.fc-daygrid-event {
     --border-color: transparent;
-    
+
     border: 2px solid;
     border-left-width: 4px;
     border-color: var(--border-color) var(--border-color) var(--border-color)
@@ -175,7 +187,7 @@ body.desktop:not(.zen) .calendar-view .calendar-header {
     opacity: .75;
 }
 
-/* 
+/*
  * List view
  */
 
@@ -188,4 +200,4 @@ body.desktop:not(.zen) .calendar-view .calendar-header {
     --fc-event-border-color: var(--custom-color);
 }
 
-/* #endregion */
+/* #endregion */

apps/client/src/widgets/collections/calendar/index.tsx

@@ -14,8 +14,11 @@ import dialog from "../../../services/dialog";
 import froca from "../../../services/froca";
 import { t } from "../../../services/i18n";
 import { isMobile } from "../../../services/utils";
+import CollectionProperties from "../../note_bars/CollectionProperties";
 import ActionButton from "../../react/ActionButton";
 import Button, { ButtonGroup } from "../../react/Button";
+import Dropdown from "../../react/Dropdown";
+import { FormListItem } from "../../react/FormList";
 import { useNoteLabel, useNoteLabelBoolean, useResizeObserver, useSpacedUpdate, useTriliumEvent, useTriliumOption, useTriliumOptionInt } from "../../react/hooks";
 import { ParentComponent } from "../../react/react_utils";
 import TouchBar, { TouchBarButton, TouchBarLabel, TouchBarSegmentedControl, TouchBarSpacer } from "../../react/TouchBar";
@@ -41,24 +44,28 @@ const CALENDAR_VIEWS = [
     {
         type: "timeGridWeek",
         name: t("calendar.week"),
+        icon: "bx bx-calendar-week",
         previousText: t("calendar.week_previous"),
         nextText: t("calendar.week_next")
     },
     {
         type: "dayGridMonth",
         name: t("calendar.month"),
+        icon: "bx bx-calendar",
         previousText: t("calendar.month_previous"),
         nextText: t("calendar.month_next")
     },
     {
         type: "multiMonthYear",
         name: t("calendar.year"),
+        icon: "bx bx-layer",
         previousText: t("calendar.year_previous"),
         nextText: t("calendar.year_next")
     },
     {
         type: "listMonth",
         name: t("calendar.list"),
+        icon: "bx bx-list-ol",
         previousText: t("calendar.month_previous"),
         nextText: t("calendar.month_next")
     }
@@ -140,7 +147,7 @@ export default function CalendarView({ note, noteIds }: ViewModeProps<CalendarVi
 
     return (plugins &&
         <div className="calendar-view" ref={containerRef} tabIndex={100}>
-            <CalendarHeader calendarRef={calendarRef} />
+            <CalendarCollectionProperties note={note} calendarRef={calendarRef} />
             <Calendar
                 events={eventBuilder}
                 calendarRef={calendarRef}
@@ -169,28 +176,67 @@ export default function CalendarView({ note, noteIds }: ViewModeProps<CalendarVi
     );
 }
 
-function CalendarHeader({ calendarRef }: { calendarRef: RefObject<FullCalendar> }) {
+function CalendarCollectionProperties({ note, calendarRef }: {
+    note: FNote;
+    calendarRef: RefObject<FullCalendar>;
+}) {
     const { title, viewType: currentViewType } = useOnDatesSet(calendarRef);
     const currentViewData = CALENDAR_VIEWS.find(v => calendarRef.current && v.type === currentViewType);
+    const isMobileLocal = isMobile();
 
     return (
-        <div className="calendar-header">
-            <span className="title">{title}</span>
+        <CollectionProperties
+            note={note}
+            centerChildren={<>
+                <ActionButton icon="bx bx-chevron-left" text={currentViewData?.previousText ?? ""} onClick={() => calendarRef.current?.prev()} />
+                <span className="title">{title}</span>
+                <ActionButton icon="bx bx-chevron-right" text={currentViewData?.nextText ?? ""} onClick={() => calendarRef.current?.next()} />
+                <Button text={t("calendar.today")} onClick={() => calendarRef.current?.today()} />
+                {isMobileLocal && <MobileCalendarViewSwitcher calendarRef={calendarRef} />}
+            </>}
+            rightChildren={<>
+                {!isMobileLocal && <DesktopCalendarViewSwitcher calendarRef={calendarRef} />}
+            </>}
+        />
+    );
+}
+
+function DesktopCalendarViewSwitcher({ calendarRef }: { calendarRef: RefObject<FullCalendar> }) {
+    const { viewType: currentViewType } = useOnDatesSet(calendarRef);
+
+    return (
+        <>
             <ButtonGroup>
                 {CALENDAR_VIEWS.map(viewData => (
                     <Button
-                        text={viewData.name.toLocaleLowerCase()}
+                        key={viewData.type}
+                        text={viewData.name}
                         className={currentViewType === viewData.type ? "active" : ""}
                         onClick={() => calendarRef.current?.changeView(viewData.type)}
                     />
                 ))}
             </ButtonGroup>
-            <Button text={t("calendar.today").toLocaleLowerCase()} onClick={() => calendarRef.current?.today()} />
-            <ButtonGroup>
-                <ActionButton icon="bx bx-chevron-left" text={currentViewData?.previousText ?? ""} frame onClick={() => calendarRef.current?.prev()} />
-                <ActionButton icon="bx bx-chevron-right" text={currentViewData?.nextText ?? ""} frame onClick={() => calendarRef.current?.next()} />
-            </ButtonGroup>
-        </div>
+        </>
+    );
+}
+
+function MobileCalendarViewSwitcher({ calendarRef }: { calendarRef: RefObject<FullCalendar> }) {
+    const { viewType: currentViewType } = useOnDatesSet(calendarRef);
+    const currentViewTypeData = CALENDAR_VIEWS.find(view => view.type === currentViewType);
+
+    return (
+        <Dropdown
+            text={currentViewTypeData?.name}
+        >
+            {CALENDAR_VIEWS.map(viewData => (
+                <FormListItem
+                    key={viewData.type}
+                    selected={currentViewType === viewData.type}
+                    icon={viewData.icon}
+                    onClick={() => calendarRef.current?.changeView(viewData.type)}
+                >{viewData.name}</FormListItem>
+            ))}
+        </Dropdown>
     );
 }
 
@@ -217,17 +263,18 @@ function usePlugins(isEditable: boolean, isCalendarRoot: boolean) {
 }
 
 function useLocale() {
+    const [ locale ] = useTriliumOption("locale");
     const [ formattingLocale ] = useTriliumOption("formattingLocale");
     const [ calendarLocale, setCalendarLocale ] = useState<LocaleInput>();
 
     useEffect(() => {
-        const correspondingLocale = LOCALE_MAPPINGS[formattingLocale];
+        const correspondingLocale = LOCALE_MAPPINGS[formattingLocale] ?? LOCALE_MAPPINGS[locale];
         if (correspondingLocale) {
             correspondingLocale().then((locale) => setCalendarLocale(locale.default));
         } else {
             setCalendarLocale(undefined);
         }
-    });
+    }, [formattingLocale, locale]);
 
     return calendarLocale;
 }

apps/client/src/widgets/collections/calendar/utils.ts

@@ -32,9 +32,11 @@ export function formatDateToLocalISO(date: Date | null | undefined) {
         return undefined;
     }
 
-    const offset = date.getTimezoneOffset();
-    const localDate = new Date(date.getTime() - offset * 60 * 1000);
-    return localDate.toISOString().split("T")[0];
+    // Use local date methods directly - no timezone conversion needed
+    const year = date.getFullYear();
+    const month = String(date.getMonth() + 1).padStart(2, '0');
+    const day = String(date.getDate()).padStart(2, '0');
+    return `${year}-${month}-${day}`;
 }
 
 export function offsetDate(date: Date | string | null | undefined, offset: number) {
@@ -42,6 +44,15 @@ export function offsetDate(date: Date | string | null | undefined, offset: numbe
         return undefined;
     }
 
+    // When given a date string (YYYY-MM-DD), parse as local time rather than UTC
+    // to avoid timezone-related off-by-one errors
+    if (typeof date === 'string') {
+        const [year, month, day] = date.split('-').map(Number);
+        const newDate = new Date(year, month - 1, day);
+        newDate.setDate(newDate.getDate() + offset);
+        return newDate;
+    }
+
     const newDate = new Date(date);
     newDate.setDate(newDate.getDate() + offset);
     return newDate;

apps/client/src/widgets/collections/geomap/index.css

@@ -2,6 +2,13 @@
   overflow: hidden;
   position: relative;
   height: 100%;
+  display: flex;
+  flex-direction: column;
+
+  > .collection-properties {
+    position: relative;
+    z-index: 2000;
+  }
 }
 
 .geo-map-container {

apps/client/src/widgets/collections/geomap/index.tsx

@@ -1,24 +1,29 @@
-import Map from "./map";
 import "./index.css";
-import { ViewModeProps } from "../interface";
-import { useNoteBlob, useNoteLabel, useNoteLabelBoolean, useNoteProperty, useNoteTreeDrag, useSpacedUpdate, useTriliumEvent } from "../../react/hooks";
-import { DEFAULT_MAP_LAYER_NAME } from "./map_layer";
+
 import { divIcon, GPXOptions, LatLng, LeafletMouseEvent } from "leaflet";
-import { useCallback, useContext, useEffect, useMemo, useRef, useState } from "preact/hooks";
-import Marker, { GpxTrack } from "./marker";
-import froca from "../../../services/froca";
-import FNote from "../../../entities/fnote";
 import markerIcon from "leaflet/dist/images/marker-icon.png";
 import markerIconShadow from "leaflet/dist/images/marker-shadow.png";
+import { useCallback, useContext, useEffect, useMemo, useRef, useState } from "preact/hooks";
+
 import appContext from "../../../components/app_context";
-import { createNewNote, moveMarker } from "./api";
-import openContextMenu, { openMapContextMenu } from "./context_menu";
-import toast from "../../../services/toast";
+import FNote from "../../../entities/fnote";
+import branches from "../../../services/branches";
+import froca from "../../../services/froca";
 import { t } from "../../../services/i18n";
 import server from "../../../services/server";
-import branches from "../../../services/branches";
-import TouchBar, { TouchBarButton, TouchBarLabel, TouchBarSlider } from "../../react/TouchBar";
+import toast from "../../../services/toast";
+import CollectionProperties from "../../note_bars/CollectionProperties";
+import ActionButton from "../../react/ActionButton";
+import { ButtonOrActionButton } from "../../react/Button";
+import { useNoteBlob, useNoteLabel, useNoteLabelBoolean, useNoteProperty, useNoteTreeDrag, useSpacedUpdate, useTriliumEvent } from "../../react/hooks";
 import { ParentComponent } from "../../react/react_utils";
+import TouchBar, { TouchBarButton, TouchBarSlider } from "../../react/TouchBar";
+import { ViewModeProps } from "../interface";
+import { createNewNote, moveMarker } from "./api";
+import openContextMenu, { openMapContextMenu } from "./context_menu";
+import Map from "./map";
+import { DEFAULT_MAP_LAYER_NAME } from "./map_layer";
+import Marker, { GpxTrack } from "./marker";
 
 const DEFAULT_COORDINATES: [number, number] = [3.878638227135724, 446.6630455551659];
 const DEFAULT_ZOOM = 2;
@@ -50,7 +55,7 @@ export default function GeoView({ note, noteIds, viewConfig, saveConfig }: ViewM
         }
     }, 5000);
 
-    useEffect(() => { froca.getNotes(noteIds).then(setNotes) }, [ noteIds ]);
+    useEffect(() => { froca.getNotes(noteIds).then(setNotes); }, [ noteIds ]);
 
     useEffect(() => {
         if (!note) return;
@@ -60,7 +65,7 @@ export default function GeoView({ note, noteIds, viewConfig, saveConfig }: ViewM
 
     // Note creation.
     useTriliumEvent("geoMapCreateChildNote", () => {
-         toast.showPersistent({
+        toast.showPersistent({
             icon: "plus",
             id: "geo-new-note",
             title: "New note",
@@ -130,6 +135,19 @@ export default function GeoView({ note, noteIds, viewConfig, saveConfig }: ViewM
 
     return (
         <div className={`geo-view ${state === State.NewNote ? "placing-note" : ""}`}>
+            <CollectionProperties
+                note={note}
+                rightChildren={<>
+                    <ToggleReadOnlyButton note={note} />
+                    <ButtonOrActionButton
+                        icon="bx bx-plus"
+                        text={t("geo-map.create-child-note-text")}
+                        title={t("geo-map.create-child-note-title")}
+                        triggerCommand="geoMapCreateChildNote"
+                        disabled={isReadOnly}
+                    />
+                </>}
+            />
             { coordinates !== undefined && zoom !== undefined && <Map
                 apiRef={apiRef} containerRef={containerRef}
                 coordinates={coordinates}
@@ -151,6 +169,16 @@ export default function GeoView({ note, noteIds, viewConfig, saveConfig }: ViewM
     );
 }
 
+function ToggleReadOnlyButton({ note }: { note: FNote }) {
+    const [ isReadOnly, setReadOnly ] = useNoteLabelBoolean(note, "readOnly");
+
+    return <ActionButton
+        text={isReadOnly ? t("toggle_read_only_button.unlock-editing") : t("toggle_read_only_button.lock-editing")}
+        icon={isReadOnly ? "bx bx-lock-open-alt" : "bx bx-lock-alt"}
+        onClick={() => setReadOnly(!isReadOnly)}
+    />;
+}
+
 function NoteWrapper({ note, isReadOnly }: { note: FNote, isReadOnly: boolean }) {
     const mime = useNoteProperty(note, "mime");
     const [ location ] = useNoteLabel(note, LOCATION_ATTRIBUTE);
@@ -204,7 +232,7 @@ function NoteMarker({ note, editable, latLng }: { note: FNote, editable: boolean
         onDragged={editable ? onDragged : undefined}
         onClick={!editable ? onClick : undefined}
         onContextMenu={onContextMenu}
-    />
+    />;
 }
 
 function NoteGpxTrack({ note }: { note: FNote }) {
@@ -238,7 +266,7 @@ function NoteGpxTrack({ note }: { note: FNote }) {
             color: note.getLabelValue("color") ?? "blue"
         }
     }), [ color, iconClass ]);
-    return xmlString && <GpxTrack gpxXmlString={xmlString} options={options} />
+    return xmlString && <GpxTrack gpxXmlString={xmlString} options={options} />;
 }
 
 function buildIcon(bxIconClass: string, colorClass?: string, title?: string, noteIdLink?: string, archived?: boolean) {
@@ -292,5 +320,5 @@ function GeoMapTouchBar({ state, map }: { state: State, map: L.Map | null | unde
                 enabled={state === State.Normal}
             />
         </TouchBar>
-    )
+    );
 }

apps/client/src/widgets/collections/legacy/ListOrGridView.tsx

@@ -7,7 +7,8 @@ import attribute_renderer from "../../../services/attribute_renderer";
 import content_renderer from "../../../services/content_renderer";
 import { t } from "../../../services/i18n";
 import link from "../../../services/link";
-import { useImperativeSearchHighlighlighting, useNoteLabel, useNoteLabelBoolean } from "../../react/hooks";
+import CollectionProperties from "../../note_bars/CollectionProperties";
+import { useImperativeSearchHighlighlighting, useNoteLabel, useNoteLabelBoolean, useNoteProperty } from "../../react/hooks";
 import Icon from "../../react/Icon";
 import NoteLink from "../../react/NoteLink";
 import { ViewModeProps } from "../interface";
@@ -19,11 +20,18 @@ export function ListView({ note, noteIds: unfilteredNoteIds, highlightedTokens }
     const noteIds = useFilteredNoteIds(note, unfilteredNoteIds);
     const { pageNotes, ...pagination } = usePagination(note, noteIds);
     const [ includeArchived ] = useNoteLabelBoolean(note, "includeArchived");
+    const noteType = useNoteProperty(note, "type");
+    const hasCollectionProperties = [ "book", "search" ].includes(noteType ?? "");
 
     return (
         <div class="note-list list-view">
+            <CollectionProperties
+                note={note}
+                centerChildren={<Pager {...pagination} />}
+            />
+
             { noteIds.length > 0 && <div class="note-list-wrapper">
-                <Pager {...pagination} />
+                {!hasCollectionProperties && <Pager {...pagination} />}
 
                 <div class="note-list-container use-tn-links">
                     {pageNotes?.map(childNote => (
@@ -45,11 +53,18 @@ export function GridView({ note, noteIds: unfilteredNoteIds, highlightedTokens }
     const noteIds = useFilteredNoteIds(note, unfilteredNoteIds);
     const { pageNotes, ...pagination } = usePagination(note, noteIds);
     const [ includeArchived ] = useNoteLabelBoolean(note, "includeArchived");
+    const noteType = useNoteProperty(note, "type");
+    const hasCollectionProperties = [ "book", "search" ].includes(noteType ?? "");
 
     return (
         <div class="note-list grid-view">
+            <CollectionProperties
+                note={note}
+                centerChildren={<Pager {...pagination} />}
+            />
+
             <div class="note-list-wrapper">
-                <Pager {...pagination} />
+                {!hasCollectionProperties && <Pager {...pagination} />}
 
                 <div class="note-list-container use-tn-links">
                     {pageNotes?.map(childNote => (
@@ -140,7 +155,7 @@ function NoteAttributes({ note }: { note: FNote }) {
     return <span className="note-list-attributes" ref={ref} />;
 }
 
-function NoteContent({ note, trim, noChildrenList, highlightedTokens, includeArchivedNotes }: {
+export function NoteContent({ note, trim, noChildrenList, highlightedTokens, includeArchivedNotes }: {
     note: FNote;
     trim?: boolean;
     noChildrenList?: boolean;

apps/client/src/widgets/collections/presentation/index.css

@@ -1,11 +1,7 @@
-.presentation-button-bar {
-    position: absolute;
-    top: 1em;
-    right: 1em;
-
-    .floating-buttons-children {
-        top: 0;
-    }
+.presentation-view {
+    display: flex;
+    flex-direction: column;
+    height: 100%;
 }
 
 .presentation-container {

apps/client/src/widgets/collections/presentation/index.tsx

@@ -1,18 +1,21 @@
-import { ViewModeMedia, ViewModeProps } from "../interface";
+import "./index.css";
+
+import { RefObject } from "preact";
 import { useEffect, useLayoutEffect, useRef, useState } from "preact/hooks";
 import Reveal from "reveal.js";
 import slideBaseStylesheet from "reveal.js/dist/reveal.css?raw";
-import slideCustomStylesheet from "./slidejs.css?raw";
-import { buildPresentationModel, PresentationModel, PresentationSlideBaseModel } from "./model";
-import ShadowDom from "../../react/ShadowDom";
-import ActionButton from "../../react/ActionButton";
-import "./index.css";
-import { RefObject } from "preact";
+
 import { openInCurrentNoteContext } from "../../../components/note_context";
-import { useNoteLabelWithDefault, useTriliumEvent } from "../../react/hooks";
-import { t } from "../../../services/i18n";
-import { DEFAULT_THEME, loadPresentationTheme } from "./themes";
 import FNote from "../../../entities/fnote";
+import { t } from "../../../services/i18n";
+import CollectionProperties from "../../note_bars/CollectionProperties";
+import ActionButton from "../../react/ActionButton";
+import { useNoteLabelWithDefault, useTriliumEvent } from "../../react/hooks";
+import ShadowDom from "../../react/ShadowDom";
+import { ViewModeMedia, ViewModeProps } from "../interface";
+import { buildPresentationModel, PresentationModel, PresentationSlideBaseModel } from "./model";
+import slideCustomStylesheet from "./slidejs.css?raw";
+import { DEFAULT_THEME, loadPresentationTheme } from "./themes";
 
 export default function PresentationView({ note, noteIds, media, onReady, onProgressChanged }: ViewModeProps<{}>) {
     const [ presentation, setPresentation ] = useState<PresentationModel>();
@@ -51,14 +54,17 @@ export default function PresentationView({ note, noteIds, media, onReady, onProg
 
     if (media === "screen") {
         return (
-            <>
+            <div class="presentation-view">
+                <CollectionProperties
+                    note={note}
+                    rightChildren={<ButtonOverlay containerRef={containerRef} api={api} />}
+                />
                 <ShadowDom
                     className="presentation-container"
                     containerRef={containerRef}
                 >{content}</ShadowDom>
-                <ButtonOverlay containerRef={containerRef} api={api} />
-            </>
-        )
+            </div>
+        );
     } else if (media === "print") {
         // Printing needs a query parameter that is read by Reveal.js.
         const url = new URL(window.location.href);
@@ -108,42 +114,34 @@ function ButtonOverlay({ containerRef, api }: { containerRef: RefObject<HTMLDivE
     }, [ api ]);
 
     return (
-        <div className="presentation-button-bar">
-            <div className="floating-buttons-children">
-                <ActionButton
-                    className="floating-button"
-                    icon="bx bx-edit"
-                    text={t("presentation_view.edit-slide")}
-                    noIconActionClass
-                    onClick={e => {
-                        const currentSlide = api?.getCurrentSlide();
-                        const noteId = getNoteIdFromSlide(currentSlide);
+        <>
+            <ActionButton
+                icon="bx bx-edit"
+                text={t("presentation_view.edit-slide")}
+                onClick={e => {
+                    const currentSlide = api?.getCurrentSlide();
+                    const noteId = getNoteIdFromSlide(currentSlide);
 
-                        if (noteId) {
-                            openInCurrentNoteContext(e, noteId);
-                        }
-                    }}
-                />
+                    if (noteId) {
+                        openInCurrentNoteContext(e, noteId);
+                    }
+                }}
+            />
 
-                <ActionButton
-                    className="floating-button"
-                    icon="bx bx-grid-horizontal"
-                    text={t("presentation_view.slide-overview")}
-                    active={isOverviewActive}
-                    noIconActionClass
-                    onClick={() => api?.toggleOverview()}
-                />
+            <ActionButton
+                icon="bx bx-grid-horizontal"
+                text={t("presentation_view.slide-overview")}
+                active={isOverviewActive}
+                onClick={() => api?.toggleOverview()}
+            />
 
-                <ActionButton
-                    className="floating-button"
-                    icon="bx bx-fullscreen"
-                    text={t("presentation_view.start-presentation")}
-                    noIconActionClass
-                    onClick={() => containerRef.current?.requestFullscreen()}
-                />
-            </div>
-        </div>
-    )
+            <ActionButton
+                icon="bx bx-fullscreen"
+                text={t("presentation_view.start-presentation")}
+                onClick={() => containerRef.current?.requestFullscreen()}
+            />
+        </>
+    );
 }
 
 function Presentation({ presentation, setApi } : { presentation: PresentationModel, setApi: (api: Reveal.Api | undefined) => void }) {
@@ -179,7 +177,7 @@ function Presentation({ presentation, setApi } : { presentation: PresentationMod
             api.destroy();
             setRevealApi(undefined);
             setApi(undefined);
-        }
+        };
     }, []);
 
     useEffect(() => {
@@ -191,19 +189,19 @@ function Presentation({ presentation, setApi } : { presentation: PresentationMod
             <div className="slides">
                 {presentation.slides?.map(slide => {
                     if (!slide.verticalSlides) {
-                        return <Slide key={slide.noteId} slide={slide} />
-                    } else {
-                        return (
-                            <section>
-                                <Slide key={slide.noteId} slide={slide} />
-                                {slide.verticalSlides.map(slide => <Slide key={slide.noteId} slide={slide} /> )}
-                            </section>
-                        );
+                        return <Slide key={slide.noteId} slide={slide} />;
                     }
+                    return (
+                        <section>
+                            <Slide key={slide.noteId} slide={slide} />
+                            {slide.verticalSlides.map(slide => <Slide key={slide.noteId} slide={slide} /> )}
+                        </section>
+                    );
+
                 })}
             </div>
         </div>
-    )
+    );
 
 }
 

apps/client/src/widgets/collections/table/index.css

@@ -3,7 +3,8 @@
     position: relative;
     height: 100%;
     user-select: none;
-    padding: 0 5px 0 10px;
+    display: flex;
+    flex-direction: column;
 
     .tabulator-tableholder {
         height: unset !important;

apps/client/src/widgets/collections/table/index.tsx

@@ -1,20 +1,22 @@
-import { useCallback, useContext, useEffect, useMemo, useRef, useState } from "preact/hooks";
-import { ViewModeProps } from "../interface";
-import { TableData } from "./rows";
-import { useLegacyWidget } from "../../react/hooks";
-import Tabulator from "./tabulator";
-import { Tabulator as VanillaTabulator, SortModule, FormatModule, InteractionModule, EditModule, ResizeColumnsModule, FrozenColumnsModule, PersistenceModule, MoveColumnsModule, MoveRowsModule, DataTreeModule, Options, RowComponent} from 'tabulator-tables';
-import { useContextMenu } from "./context_menu";
-import { ParentComponent } from "../../react/react_utils";
-import FNote from "../../../entities/fnote";
-import { t } from "../../../services/i18n";
-import Button from "../../react/Button";
 import "./index.css";
-import useRowTableEditing from "./row_editing";
-import useColTableEditing from "./col_editing";
-import AttributeDetailWidget from "../../attribute_widgets/attribute_detail";
+
+import { useCallback, useContext, useEffect, useMemo, useRef, useState } from "preact/hooks";
+import { DataTreeModule, EditModule, FormatModule, FrozenColumnsModule, InteractionModule, MoveColumnsModule, MoveRowsModule, Options, PersistenceModule, ResizeColumnsModule, RowComponent,SortModule, Tabulator as VanillaTabulator} from 'tabulator-tables';
+
+import { t } from "../../../services/i18n";
 import SpacedUpdate from "../../../services/spaced_update";
+import AttributeDetailWidget from "../../attribute_widgets/attribute_detail";
+import CollectionProperties from "../../note_bars/CollectionProperties";
+import { ButtonOrActionButton } from "../../react/Button";
+import { useLegacyWidget } from "../../react/hooks";
+import { ParentComponent } from "../../react/react_utils";
+import { ViewModeProps } from "../interface";
+import useColTableEditing from "./col_editing";
+import { useContextMenu } from "./context_menu";
 import useData, { TableConfig } from "./data";
+import useRowTableEditing from "./row_editing";
+import { TableData } from "./rows";
+import Tabulator from "./tabulator";
 
 export default function TableView({ note, noteIds, notePath, viewConfig, saveConfig }: ViewModeProps<TableConfig>) {
     const tabulatorRef = useRef<VanillaTabulator>(null);
@@ -36,7 +38,7 @@ export default function TableView({ note, noteIds, notePath, viewConfig, saveCon
             dataTreeChildIndent: 20,
             dataTreeExpandElement: `<button class="tree-expand"><span class="bx bx-chevron-right"></span></button>`,
             dataTreeCollapseElement: `<button class="tree-collapse"><span class="bx bx-chevron-down"></span></button>`
-        }
+        };
     }, [ hasChildren ]);
 
     const rowFormatter = useCallback((row: RowComponent) => {
@@ -46,6 +48,16 @@ export default function TableView({ note, noteIds, notePath, viewConfig, saveCon
 
     return (
         <div className="table-view">
+            <CollectionProperties
+                note={note}
+                rightChildren={note.type !== "search" &&
+                    <>
+                        <ButtonOrActionButton triggerCommand="addNewRow" icon="bx bx-plus" text={t("table_view.new-row")} />
+                        <ButtonOrActionButton triggerCommand="addNewTableColumn" icon="bx bx-carousel" text={t("table_view.new-column")} />
+                    </>
+                }
+            />
+
             {rowData !== undefined && persistenceProps &&  (
                 <>
                     <Tabulator
@@ -54,7 +66,6 @@ export default function TableView({ note, noteIds, notePath, viewConfig, saveCon
                         columns={columnDefs ?? []}
                         data={rowData}
                         modules={[ SortModule, FormatModule, InteractionModule, EditModule, ResizeColumnsModule, FrozenColumnsModule, PersistenceModule, MoveColumnsModule, MoveRowsModule, DataTreeModule ]}
-                        footerElement={<TableFooter note={note} />}
                         events={{
                             ...contextMenuEvents,
                             ...rowEditingEvents
@@ -67,24 +78,11 @@ export default function TableView({ note, noteIds, notePath, viewConfig, saveCon
                         rowFormatter={rowFormatter}
                         {...dataTreeProps}
                     />
-                    <TableFooter note={note} />
                 </>
             )}
             {attributeDetailWidgetEl}
         </div>
-    )
-}
-
-function TableFooter({ note }: { note: FNote }) {
-    return (note.type !== "search" &&
-        <div className="tabulator-footer">
-            <div className="tabulator-footer-contents">
-                <Button triggerCommand="addNewRow" icon="bx bx-plus" text={t("table_view.new-row")} />
-                {" "}
-                <Button triggerCommand="addNewTableColumn" icon="bx bx-carousel" text={t("table_view.new-column")} />
-            </div>
-        </div>
-    )
+    );
 }
 
 function usePersistence(viewConfig: TableConfig | null | undefined, saveConfig: (newConfig: TableConfig) => void) {

apps/client/src/widgets/containers/scrolling_container.css

@@ -5,7 +5,7 @@
 
     > .inline-title,
     > .note-detail > .note-detail-editable-text,
-    > .note-list-widget:not(.full-height) {
+    > .note-list-widget:not(.full-height) .note-list-wrapper {
         padding-inline: 24px;
     }
 

apps/client/src/widgets/dialogs/call_to_action_definitions.ts

@@ -1,7 +1,7 @@
 import appContext from "../../components/app_context";
 import { t } from "../../services/i18n";
 import options from "../../services/options";
-import utils from "../../services/utils";
+import utils, { isMac } from "../../services/utils";
 
 /**
  * A "call-to-action" is an interactive message for the user, generally to present new features.
@@ -41,10 +41,6 @@ export interface CallToAction {
     }[];
 }
 
-function isNextTheme() {
-    return [ "next", "next-light", "next-dark" ].includes(options.get("theme"));
-}
-
 const CALL_TO_ACTIONS: CallToAction[] = [
     {
         id: "new_layout",
@@ -63,7 +59,7 @@ const CALL_TO_ACTIONS: CallToAction[] = [
         id: "background_effects",
         title: t("call_to_action.background_effects_title"),
         message: t("call_to_action.background_effects_message"),
-        enabled: () => false,
+        enabled: () => (isMac() && !options.is("backgroundEffects")),
         buttons: [
             {
                 text: t("call_to_action.background_effects_button"),
@@ -78,7 +74,7 @@ const CALL_TO_ACTIONS: CallToAction[] = [
         id: "next_theme",
         title: t("call_to_action.next_theme_title"),
         message: t("call_to_action.next_theme_message"),
-        enabled: () => !isNextTheme(),
+        enabled: () => ![ "next", "next-light", "next-dark" ].includes(options.get("theme")),
         buttons: [
             {
                 text: t("call_to_action.next_theme_button"),

apps/client/src/widgets/launch_bar/LauncherContainer.tsx

@@ -3,6 +3,7 @@ import { useCallback, useLayoutEffect, useState } from "preact/hooks";
 import FNote from "../../entities/fnote";
 import froca from "../../services/froca";
 import { isDesktop, isMobile } from "../../services/utils";
+import TabSwitcher from "../mobile_widgets/TabSwitcher";
 import { useTriliumEvent } from "../react/hooks";
 import { onWheelHorizontalScroll } from "../widget_utils";
 import BookmarkButtons from "./BookmarkButtons";
@@ -97,6 +98,8 @@ function initBuiltinWidget(note: FNote, isHorizontalLayout: boolean) {
             return <QuickSearchLauncherWidget />;
         case "aiChatLauncher":
             return <AiChatButton launcherNote={note} />;
+        case "mobileTabSwitcher":
+            return <TabSwitcher />;
         default:
             throw new Error(`Unrecognized builtin widget ${builtinWidget} for launcher ${note.noteId} "${note.title}"`);
     }

apps/client/src/widgets/launch_bar/launch_bar_widgets.tsx

@@ -1,3 +1,4 @@
+import clsx from "clsx";
 import { createContext } from "preact";
 import { useContext } from "preact/hooks";
 
@@ -18,12 +19,12 @@ export interface LauncherNoteProps {
     launcherNote: FNote;
 }
 
-export function LaunchBarActionButton(props: Omit<ActionButtonProps, "className" | "noIconActionClass" | "titlePosition">) {
+export function LaunchBarActionButton({ className, ...props }: Omit<ActionButtonProps, "noIconActionClass" | "titlePosition">) {
     const { isHorizontalLayout } = useContext(LaunchBarContext);
 
     return (
         <ActionButton
-            className="button-widget launcher-button"
+            className={clsx("button-widget launcher-button", className)}
             noIconActionClass
             titlePosition={isHorizontalLayout ? "bottom" : "right"}
             {...props}

apps/client/src/widgets/layout/InlineTitle.tsx

@@ -5,6 +5,7 @@ import { Tooltip } from "bootstrap";
 import clsx from "clsx";
 import { ComponentChild } from "preact";
 import { useLayoutEffect, useMemo, useRef, useState } from "preact/hooks";
+import type React from "react";
 import { Trans } from "react-i18next";
 
 import FNote from "../../entities/fnote";

apps/client/src/widgets/layout/NoteTitleActions.tsx

@@ -26,7 +26,6 @@ export default function NoteTitleActions() {
         <div className="title-actions">
             <PromotedAttributes note={note} componentId={componentId} noteContext={noteContext} />
             {noteType === "search" && <SearchProperties note={note} ntxId={ntxId} />}
-            {!isHiddenNote && note && noteType === "book" && <CollectionProperties note={note} />}
             <EditedNotes />
             <NoteTypeSwitcher />
         </div>

apps/client/src/widgets/mobile_widgets/TabSwitcher.css

@@ -0,0 +1,133 @@
+#launcher-container .mobile-tab-switcher {
+    position: relative;
+
+    &::after {
+        content: attr(data-tab-count);
+        font-family: var(--main-font-family);
+        font-size: 10px;
+        position: absolute;
+        top: 50%;
+        left: 50%;
+        transform: translate(-50%, -50%);
+    }
+}
+
+.modal.tab-bar-modal {
+    .modal-dialog {
+        min-height: 85vh;
+    }
+
+    .tabs {
+        display: grid;
+        grid-template-columns: 1fr 1fr;
+        gap: 1em;
+
+        @media (min-width: 850px) {
+            grid-template-columns: 1fr 1fr 1fr;
+        }
+
+        .tab-card {
+            background: var(--card-background-color);
+            border-radius: 1em;
+            min-width: 0;
+            overflow: hidden;
+            height: 200px;
+            display: flex;
+            flex-direction: column;
+
+            &.with-hue {
+                background-color: hsl(var(--bg-hue), 8.8%, 11.2%);
+                border-color: hsl(var(--bg-hue), 9.4%, 25.1%);
+            }
+
+            &.active {
+                outline: 4px solid var(--more-accented-background-color);
+                background: var(--card-background-hover-color);
+
+                .title {
+                    font-weight: bold;
+                }
+            }
+
+            header {
+                padding: 0.4em 0.5em;
+                border-bottom: 1px solid rgba(150, 150, 150, 0.1);
+                display: flex;
+                overflow: hidden;
+                align-items: center;
+                color: var(--custom-color, inherit);
+                flex-shrink: 0;
+
+                &:not(:first-of-type) {
+                    border-top: 1px solid rgba(150, 150, 150, 0.1);
+                }
+
+                >.tn-icon {
+                    margin-inline-end: 0.4em;
+                }
+
+                .title {
+                    overflow: hidden;
+                    text-overflow: ellipsis;
+                    text-wrap: nowrap;
+                    font-size: 0.9em;
+                    flex-grow: 1;
+                }
+
+                .icon-action {
+                    flex-shrink: 0;
+                }
+            }
+
+            .tab-preview {
+                flex-grow: 1;
+                height: 100%;
+                overflow: hidden;
+                font-size: 0.5em;
+                user-select: none;
+                pointer-events: none;
+
+                &.type-text {
+                    padding: 10px;
+                }
+
+                &.type-book,
+                &.type-contentWidget,
+                &.type-search,
+                &.type-empty {
+                    display: flex;
+                    align-items: center;
+                    justify-content: center;
+                    font-size: 1.25em;
+                    color: var(--muted-text-color);
+                }
+
+                .preview-placeholder {
+                    font-size: 500%;
+                }
+
+                p { margin-bottom: 0.2em;}
+                h2 { font-size: 1.20em; }
+                h3 { font-size: 1.15em; }
+                h4 { font-size: 1.10em; }
+                h5 { font-size: 1.05em}
+                h6 { font-size: 1em; }
+            }
+
+            &.with-split {
+                .preview-placeholder {
+                    font-size: 250%;
+                }
+            }
+        }
+    }
+
+    .modal-footer {
+        .tn-link {
+            color: var(--main-text-color);
+            width: 40%;
+            text-align: center;
+            text-decoration: none;
+        }
+    }
+}

apps/client/src/widgets/mobile_widgets/TabSwitcher.tsx

@@ -0,0 +1,240 @@
+import "./TabSwitcher.css";
+
+import clsx from "clsx";
+import { createPortal, Fragment } from "preact/compat";
+import { useCallback, useEffect, useRef, useState } from "preact/hooks";
+
+import appContext, { CommandNames } from "../../components/app_context";
+import NoteContext from "../../components/note_context";
+import FNote from "../../entities/fnote";
+import contextMenu from "../../menus/context_menu";
+import { getHue, parseColor } from "../../services/css_class_manager";
+import froca from "../../services/froca";
+import { t } from "../../services/i18n";
+import { NoteContent } from "../collections/legacy/ListOrGridView";
+import { LaunchBarActionButton } from "../launch_bar/launch_bar_widgets";
+import { ICON_MAPPINGS } from "../note_bars/CollectionProperties";
+import ActionButton from "../react/ActionButton";
+import { useActiveNoteContext, useNoteIcon, useTriliumEvents } from "../react/hooks";
+import Icon from "../react/Icon";
+import LinkButton from "../react/LinkButton";
+import Modal from "../react/Modal";
+
+export default function TabSwitcher() {
+    const [ shown, setShown ] = useState(false);
+    const mainNoteContexts = useMainNoteContexts();
+
+    return (
+        <>
+            <LaunchBarActionButton
+                className="mobile-tab-switcher"
+                icon="bx bx-rectangle"
+                text="Tabs"
+                onClick={() => setShown(true)}
+                data-tab-count={mainNoteContexts.length > 99 ? "∞" : mainNoteContexts.length}
+            />
+            {createPortal(<TabBarModal mainNoteContexts={mainNoteContexts} shown={shown} setShown={setShown} />, document.body)}
+        </>
+    );
+}
+
+function TabBarModal({ mainNoteContexts, shown, setShown }: {
+    mainNoteContexts: NoteContext[];
+    shown: boolean;
+    setShown: (newValue: boolean) => void;
+}) {
+    const [ fullyShown, setFullyShown ] = useState(false);
+    const selectTab = useCallback((noteContextToActivate: NoteContext) => {
+        appContext.tabManager.activateNoteContext(noteContextToActivate.ntxId);
+        setShown(false);
+    }, [ setShown ]);
+
+    return (
+        <Modal
+            className="tab-bar-modal"
+            size="xl"
+            title={t("mobile_tab_switcher.title", { count: mainNoteContexts.length})}
+            show={shown}
+            onShown={() => setFullyShown(true)}
+            customTitleBarButtons={[
+                {
+                    iconClassName: "bx bx-dots-vertical-rounded",
+                    title: t("mobile_tab_switcher.more_options"),
+                    onClick(e) {
+                        contextMenu.show<CommandNames>({
+                            x: e.pageX,
+                            y: e.pageY,
+                            items: [
+                                { title: t("tab_row.new_tab"), command: "openNewTab", uiIcon: "bx bx-plus" },
+                                { title: t("tab_row.reopen_last_tab"), command: "reopenLastTab", uiIcon: "bx bx-undo", enabled: appContext.tabManager.recentlyClosedTabs.length !== 0 },
+                                { kind: "separator" },
+                                { title: t("tab_row.close_all_tabs"), command: "closeAllTabs", uiIcon: "bx bx-trash destructive-action-icon" },
+                            ],
+                            selectMenuItemHandler: ({ command }) => {
+                                if (command) {
+                                    appContext.triggerCommand(command);
+                                }
+                            }
+                        });
+                    },
+                }
+            ]}
+            footer={<>
+                <LinkButton
+                    text={t("tab_row.new_tab")}
+                    onClick={() => {
+                        appContext.triggerCommand("openNewTab");
+                        setShown(false);
+                    }}
+                />
+            </>}
+            scrollable
+            onHidden={() => {
+                setShown(false);
+                setFullyShown(false);
+            }}
+        >
+            <TabBarModelContent mainNoteContexts={mainNoteContexts} selectTab={selectTab} shown={fullyShown} />
+        </Modal>
+    );
+}
+
+function TabBarModelContent({ mainNoteContexts, selectTab, shown }: {
+    mainNoteContexts: NoteContext[];
+    shown: boolean;
+    selectTab: (noteContextToActivate: NoteContext) => void;
+}) {
+    const activeNoteContext = useActiveNoteContext();
+    const tabRefs = useRef<Record<string, HTMLDivElement | null>>({});
+
+    // Scroll to active tab.
+    useEffect(() => {
+        if (!shown || !activeNoteContext?.ntxId) return;
+        const correspondingEl = tabRefs.current[activeNoteContext.ntxId];
+        requestAnimationFrame(() => {
+            correspondingEl?.scrollIntoView();
+        });
+    }, [ activeNoteContext, shown ]);
+
+    return (
+        <div className="tabs">
+            {mainNoteContexts.map((noteContext) => (
+                <Tab
+                    key={noteContext.ntxId}
+                    noteContext={noteContext}
+                    activeNtxId={activeNoteContext.ntxId}
+                    selectTab={selectTab}
+                    containerRef={el => (tabRefs.current[noteContext.ntxId ?? ""] = el)}
+                />
+            ))}
+        </div>
+    );
+}
+
+function Tab({ noteContext, containerRef, selectTab, activeNtxId }: {
+    containerRef: (el: HTMLDivElement | null) => void;
+    noteContext: NoteContext;
+    selectTab: (noteContextToActivate: NoteContext) => void;
+    activeNtxId: string | null | undefined;
+}) {
+    const { note } = noteContext;
+    const iconClass = useNoteIcon(note);
+    const colorClass = note?.getColorClass() || '';
+    const workspaceTabBackgroundColorHue = getWorkspaceTabBackgroundColorHue(noteContext);
+    const subContexts = noteContext.getSubContexts();
+
+    return (
+        <div
+            ref={containerRef}
+            class={clsx("tab-card", {
+                active: noteContext.ntxId === activeNtxId,
+                "with-hue": workspaceTabBackgroundColorHue !== undefined,
+                "with-split": subContexts.length > 1
+            })}
+            onClick={() => selectTab(noteContext)}
+            style={{
+                "--bg-hue": workspaceTabBackgroundColorHue
+            }}
+        >
+            {subContexts.map(subContext => (
+                <Fragment key={subContext.ntxId}>
+                    <header className={colorClass}>
+                        {subContext.note && <Icon icon={iconClass} />}
+                        <span className="title">{subContext.note?.title ?? t("tab_row.new_tab")}</span>
+                        {subContext.isMainContext() && <ActionButton
+                            icon="bx bx-x"
+                            text={t("tab_row.close_tab")}
+                            onClick={(e) => {
+                                // We are closing a tab, so we need to prevent propagation for click (activate tab).
+                                e.stopPropagation();
+                                appContext.tabManager.removeNoteContext(subContext.ntxId);
+                            }}
+                        />}
+                    </header>
+                    <div className={clsx("tab-preview", `type-${subContext.note?.type ?? "empty"}`)}>
+                        <TabPreviewContent note={subContext.note} />
+                    </div>
+                </Fragment>
+            ))}
+        </div>
+    );
+}
+
+function TabPreviewContent({ note }: {
+    note: FNote | null
+}) {
+    if (!note) {
+        return <PreviewPlaceholder icon="bx bx-plus" />;
+    }
+
+    if (note.type === "book") {
+        return <PreviewPlaceholder icon={ICON_MAPPINGS[note.getLabelValue("viewType") ?? ""] ?? "bx bx-book"} />;
+    }
+
+    return (
+        <NoteContent
+            note={note}
+            highlightedTokens={undefined}
+            trim
+            includeArchivedNotes={false}
+        />
+    );
+}
+
+function PreviewPlaceholder({ icon}: {
+    icon: string;
+}) {
+    return (
+        <div className="preview-placeholder">
+            <Icon icon={icon} />
+        </div>
+    );
+}
+
+function getWorkspaceTabBackgroundColorHue(noteContext: NoteContext) {
+    if (!noteContext.hoistedNoteId) return;
+    const hoistedNote = froca.getNoteFromCache(noteContext.hoistedNoteId);
+    if (!hoistedNote) return;
+
+    const workspaceTabBackgroundColor = hoistedNote.getWorkspaceTabBackgroundColor();
+    if (!workspaceTabBackgroundColor) return;
+
+    try {
+        const parsedColor = parseColor(workspaceTabBackgroundColor);
+        if (!parsedColor) return;
+        return getHue(parsedColor);
+    } catch (e) {
+        // Colors are non-critical, simply ignore.
+        console.warn(e);
+    }
+}
+
+function useMainNoteContexts() {
+    const [ noteContexts, setNoteContexts ] = useState(appContext.tabManager.getMainNoteContexts());
+
+    useTriliumEvents([ "newNoteContextCreated", "noteContextRemoved" ] , () => {
+        setNoteContexts(appContext.tabManager.getMainNoteContexts());
+    });
+
+    return noteContexts;
+}

apps/client/src/widgets/mobile_widgets/mobile_detail_menu.tsx

@@ -1,13 +1,16 @@
 import { useContext } from "preact/hooks";
+
 import appContext, { CommandMappings } from "../../components/app_context";
 import contextMenu, { MenuItem } from "../../menus/context_menu";
 import branches from "../../services/branches";
 import { t } from "../../services/i18n";
+import { getHelpUrlForNote } from "../../services/in_app_help";
 import note_create from "../../services/note_create";
 import tree from "../../services/tree";
+import { openInAppHelpFromUrl } from "../../services/utils";
+import BasicWidget from "../basic_widget";
 import ActionButton from "../react/ActionButton";
 import { ParentComponent } from "../react/react_utils";
-import BasicWidget from "../basic_widget";
 
 export default function MobileDetailMenu() {
     const parentComponent = useContext(ParentComponent);
@@ -24,6 +27,7 @@ export default function MobileDetailMenu() {
                 const subContexts = noteContext.getMainContext().getSubContexts();
                 const isMainContext = noteContext?.isMainContext();
                 const note = noteContext.note;
+                const helpUrl = getHelpUrlForNote(note);
 
                 const items: (MenuItem<keyof CommandMappings>)[] = [
                     { title: t("mobile_detail_menu.insert_child_note"), command: "insertChildNote", uiIcon: "bx bx-plus", enabled: note?.type !== "search" },
@@ -31,6 +35,12 @@ export default function MobileDetailMenu() {
                     { kind: "separator" },
                     { title: t("mobile_detail_menu.note_revisions"), command: "showRevisions", uiIcon: "bx bx-history" },
                     { kind: "separator" },
+                    helpUrl && {
+                        title: t("help-button.title"),
+                        uiIcon: "bx bx-help-circle",
+                        handler: () => openInAppHelpFromUrl(helpUrl)
+                    },
+                    { kind: "separator" },
                     subContexts.length < 2 && { title: t("create_pane_button.create_new_split"), command: "openNewNoteSplit", uiIcon: "bx bx-dock-right" },
                     !isMainContext && { title: t("close_pane_button.close_this_pane"), command: "closeThisNoteSplit", uiIcon: "bx bx-x" }
                 ].filter(i => !!i) as MenuItem<keyof CommandMappings>[];
@@ -70,5 +80,5 @@ export default function MobileDetailMenu() {
                 });
             }}
         />
-    )
+    );
 }

apps/client/src/widgets/note_bars/CollectionProperties.css

@@ -1,5 +1,5 @@
 .collection-properties {
-    padding: 0;
+    padding: 0.55em 12px;
     display: flex;
     gap: 0.25em;
     align-items: center;
@@ -14,7 +14,31 @@
         }
     }
 
-    .spacer {
+    >div {
+        display: inline-flex;
+        align-items: center;
+        gap: 0.5em;
+    }
+
+    .center-container {
         flex-grow: 1;
+        justify-content: center;
+    }
+
+    .right-container {
+        justify-content: flex-end;
+    }
+
+    button.btn {
+        min-width: 0;
+    }
+
+    @media (max-width: 991px) {
+        flex-wrap: wrap;
+        padding: 0.55em 1em;
+
+        >div {
+            flex-grow: 1;
+        }
     }
 }

apps/client/src/widgets/note_bars/CollectionProperties.tsx

@@ -1,24 +1,22 @@
 import "./CollectionProperties.css";
 
 import { t } from "i18next";
+import { ComponentChildren } from "preact";
 import { useContext, useRef } from "preact/hooks";
 import { Fragment } from "preact/jsx-runtime";
 
 import FNote from "../../entities/fnote";
-import { getHelpUrlForNote } from "../../services/in_app_help";
-import { openInAppHelpFromUrl } from "../../services/utils";
 import { ViewTypeOptions } from "../collections/interface";
-import ActionButton from "../react/ActionButton";
 import Dropdown from "../react/Dropdown";
 import { FormDropdownDivider, FormDropdownSubmenu, FormListItem, FormListToggleableItem } from "../react/FormList";
 import FormTextBox from "../react/FormTextBox";
-import { useNoteLabel, useNoteLabelBoolean, useNoteLabelWithDefault, useTriliumEvent } from "../react/hooks";
+import { useNoteLabel, useNoteLabelBoolean, useNoteLabelWithDefault, useNoteProperty, useTriliumEvent } from "../react/hooks";
 import Icon from "../react/Icon";
 import { ParentComponent } from "../react/react_utils";
 import { bookPropertiesConfig, BookProperty, ButtonProperty, CheckBoxProperty, ComboBoxItem, ComboBoxProperty, NumberProperty, SplitButtonProperty } from "../ribbon/collection-properties-config";
 import { useViewType, VIEW_TYPE_MAPPINGS } from "../ribbon/CollectionPropertiesTab";
 
-const ICON_MAPPINGS: Record<ViewTypeOptions, string> = {
+export const ICON_MAPPINGS: Record<ViewTypeOptions, string> = {
     grid: "bx bxs-grid",
     list: "bx bx-list-ul",
     calendar: "bx bx-calendar",
@@ -28,15 +26,26 @@ const ICON_MAPPINGS: Record<ViewTypeOptions, string> = {
     presentation: "bx bx-rectangle"
 };
 
-export default function CollectionProperties({ note }: { note: FNote }) {
+export default function CollectionProperties({ note, centerChildren, rightChildren }: {
+    note: FNote;
+    centerChildren?: ComponentChildren;
+    rightChildren?: ComponentChildren;
+}) {
     const [ viewType, setViewType ] = useViewType(note);
+    const noteType = useNoteProperty(note, "type");
 
-    return (
+    return ([ "book", "search" ].includes(noteType ?? "") &&
         <div className="collection-properties">
-            <ViewTypeSwitcher viewType={viewType} setViewType={setViewType} />
-            <ViewOptions note={note} viewType={viewType} />
-            <div className="spacer" />
-            <HelpButton note={note} />
+            <div className="left-container">
+                <ViewTypeSwitcher viewType={viewType} setViewType={setViewType} />
+                <ViewOptions note={note} viewType={viewType} />
+            </div>
+            <div className="center-container">
+                {centerChildren}
+            </div>
+            <div className="right-container">
+                {rightChildren}
+            </div>
         </div>
     );
 }
@@ -222,15 +231,3 @@ function CheckBoxPropertyView({ note, property }: { note: FNote, property: Check
         />
     );
 }
-
-function HelpButton({ note }: { note: FNote }) {
-    const helpUrl = getHelpUrlForNote(note);
-
-    return (helpUrl && (
-        <ActionButton
-            icon="bx bx-help-circle"
-            onClick={(() => openInAppHelpFromUrl(helpUrl))}
-            text={t("help-button.title")}
-        />
-    ));
-}

apps/client/src/widgets/note_icon.tsx

@@ -6,6 +6,7 @@ import clsx from "clsx";
 import { t } from "i18next";
 import { CSSProperties, RefObject } from "preact";
 import { useEffect, useMemo, useRef, useState } from "preact/hooks";
+import type React from "react";
 import { CellComponentProps, Grid } from "react-window";
 
 import FNote from "../entities/fnote";
@@ -153,10 +154,10 @@ function NoteIconList({ note, dropdownRef }: {
 
 function IconItemCell({ rowIndex, columnIndex, style, filteredIcons }: CellComponentProps<{
     filteredIcons: IconWithName[];
-}>): React.JSX.Element {
+}>) {
     const iconIndex = rowIndex * 12 + columnIndex;
     const iconData = filteredIcons[iconIndex] as IconWithName | undefined;
-    if (!iconData) return <></>;
+    if (!iconData) return <></> as React.ReactElement;
 
     const { id, terms, iconPack } = iconData;
     return (
@@ -166,7 +167,7 @@ function IconItemCell({ rowIndex, columnIndex, style, filteredIcons }: CellCompo
             title={t("note_icon.icon_tooltip", { name: terms?.[0] ?? id, iconPack })}
             style={style as CSSProperties}
         />
-    );
+    ) as React.ReactElement;
 }
 
 function IconFilterContent({ filterByPrefix, setFilterByPrefix }: {

apps/client/src/widgets/react/ActionButton.tsx

@@ -1,10 +1,11 @@
-import { useEffect, useRef, useState } from "preact/hooks";
-import { CommandNames } from "../../components/app_context";
-import { useStaticTooltip } from "./hooks";
-import keyboard_actions from "../../services/keyboard_actions";
 import { HTMLAttributes } from "preact";
+import { useEffect, useRef, useState } from "preact/hooks";
 
-export interface ActionButtonProps extends Pick<HTMLAttributes<HTMLButtonElement>, "onClick" | "onAuxClick" | "onContextMenu"> {
+import { CommandNames } from "../../components/app_context";
+import keyboard_actions from "../../services/keyboard_actions";
+import { useStaticTooltip } from "./hooks";
+
+export interface ActionButtonProps extends Pick<HTMLAttributes<HTMLButtonElement>, "onClick" | "onAuxClick" | "onContextMenu" | "style"> {
     text: string;
     titlePosition?: "top" | "right" | "bottom" | "left";
     icon: string;

apps/client/src/widgets/react/Button.tsx

@@ -1,8 +1,11 @@
 import type { ComponentChildren, RefObject } from "preact";
 import type { CSSProperties } from "preact/compat";
-import { useMemo } from "preact/hooks";
 import { memo } from "preact/compat";
+import { useMemo } from "preact/hooks";
+
 import { CommandNames } from "../../components/app_context";
+import { isDesktop } from "../../services/utils";
+import ActionButton from "./ActionButton";
 import Icon from "./Icon";
 
 export interface ButtonProps {
@@ -78,7 +81,7 @@ export function ButtonGroup({ children }: { children: ComponentChildren }) {
         <div className="btn-group" role="group">
             {children}
         </div>
-    )
+    );
 }
 
 export function SplitButton({ text, icon, children, ...restProps }: {
@@ -103,7 +106,17 @@ export function SplitButton({ text, icon, children, ...restProps }: {
                 {children}
             </ul>
         </ButtonGroup>
-    )
+    );
+}
+
+export function ButtonOrActionButton(props: {
+    text: string;
+    icon: string;
+} & Pick<ButtonProps, "onClick" | "triggerCommand" | "disabled" | "title">) {
+    if (isDesktop()) {
+        return <Button {...props} />;
+    }
+    return <ActionButton {...props} />;
 }
 
 export default Button;

apps/client/src/widgets/react/Icon.tsx

@@ -1,7 +1,7 @@
 import clsx from "clsx";
 import { HTMLAttributes } from "preact";
 
-interface IconProps extends Pick<HTMLAttributes<HTMLSpanElement>, "className" | "onClick"> {
+interface IconProps extends Pick<HTMLAttributes<HTMLSpanElement>, "className" | "onClick" | "title"> {
     icon?: string;
     className?: string;
 }

apps/client/src/widgets/react/Modal.tsx

@@ -1,17 +1,17 @@
-import clsx from "clsx";
-import { useEffect, useRef, useMemo } from "preact/hooks";
-import { t } from "../../services/i18n";
-import { ComponentChildren } from "preact";
-import type { CSSProperties, RefObject } from "preact/compat";
-import { openDialog } from "../../services/dialog";
 import { Modal as BootstrapModal } from "bootstrap";
+import clsx from "clsx";
+import { ComponentChildren, CSSProperties, RefObject } from "preact";
 import { memo } from "preact/compat";
+import { useEffect, useMemo, useRef } from "preact/hooks";
+
+import { openDialog } from "../../services/dialog";
+import { t } from "../../services/i18n";
 import { useSyncedRef } from "./hooks";
 
 interface CustomTitleBarButton {
     title: string;
     iconClassName: string;
-    onClick: () => void;
+    onClick: (e: MouseEvent) => void;
 }
 
 export interface ModalProps {
@@ -80,7 +80,7 @@ export interface ModalProps {
     noFocus?: boolean;
 }
 
-export default function Modal({ children, className, size, title, customTitleBarButtons: titleBarButtons, header, footer, footerStyle, footerAlignment, onShown, onSubmit, helpPageId, minWidth, maxWidth, zIndex, scrollable, onHidden: onHidden, modalRef: externalModalRef, formRef, bodyStyle, show, stackable, keepInDom, noFocus }: ModalProps) {
+export default function Modal({ children, className, size, title, customTitleBarButtons: titleBarButtons, header, footer, footerStyle, footerAlignment, onShown, onSubmit, helpPageId, minWidth, maxWidth, zIndex, scrollable, onHidden, modalRef: externalModalRef, formRef, bodyStyle, show, stackable, keepInDom, noFocus }: ModalProps) {
     const modalRef = useSyncedRef<HTMLDivElement>(externalModalRef);
     const modalInstanceRef = useRef<BootstrapModal>();
     const elementToFocus = useRef<Element | null>();
@@ -116,7 +116,7 @@ export default function Modal({ children, className, size, title, customTitleBar
                 focus: !noFocus
             }).then(($widget) => {
                 modalInstanceRef.current = BootstrapModal.getOrCreateInstance($widget[0]);
-            })
+            });
         } else {
             modalInstanceRef.current?.hide();
         }
@@ -159,13 +159,12 @@ export default function Modal({ children, className, size, title, customTitleBar
 
                         {titleBarButtons?.filter((b) => b !== null).map((titleBarButton) => (
                             <button type="button"
-                                    className={clsx("custom-title-bar-button bx", titleBarButton.iconClassName)}
-                                    title={titleBarButton.title}
-                                    onClick={titleBarButton.onClick}>
-                            </button>
+                                className={clsx("custom-title-bar-button bx", titleBarButton.iconClassName)}
+                                title={titleBarButton.title}
+                                onClick={titleBarButton.onClick} />
                         ))}
 
-                        <button type="button" className="btn-close" data-bs-dismiss="modal" aria-label={t("modal.close")}></button>
+                        <button type="button" className="btn-close" data-bs-dismiss="modal" aria-label={t("modal.close")} />
 
                     </div>
 

apps/client/src/widgets/ribbon/NoteActionsCustom.tsx

@@ -182,10 +182,10 @@ function SwitchSplitOrientationButton({ note, isReadOnly, isDefaultViewMode }: N
     />;
 }
 
-function ToggleReadOnlyButton({ note, viewType, isDefaultViewMode }: NoteActionsCustomInnerProps) {
+export function ToggleReadOnlyButton({ note, isDefaultViewMode }: NoteActionsCustomInnerProps) {
     const [ isReadOnly, setReadOnly ] = useNoteLabelBoolean(note, "readOnly");
     const isSavedSqlite = note.isTriliumSqlite() && !note.isHiddenCompletely();
-    const isEnabled = ([ "mermaid", "mindMap", "canvas" ].includes(note.type) || viewType === "geoMap" || isSavedSqlite)
+    const isEnabled = ([ "mermaid", "mindMap", "canvas" ].includes(note.type) || isSavedSqlite)
             && note.isContentAvailable() && isDefaultViewMode;
 
     return isEnabled && <ActionButton
@@ -234,9 +234,9 @@ function OpenTriliumApiDocsButton({ noteMime }: NoteActionsCustomInnerProps) {
     />;
 }
 
-function InAppHelpButton({ note, noteType }: NoteActionsCustomInnerProps) {
+function InAppHelpButton({ note }: NoteActionsCustomInnerProps) {
     const helpUrl = getHelpUrlForNote(note);
-    const isEnabled = !!helpUrl && (noteType !== "book");
+    const isEnabled = !!helpUrl;
 
     return isEnabled && (
         <ActionButton
@@ -247,15 +247,8 @@ function InAppHelpButton({ note, noteType }: NoteActionsCustomInnerProps) {
     );
 }
 
-function AddChildButton({ parentComponent, noteType, viewType, ntxId, isReadOnly }: NoteActionsCustomInnerProps) {
-    if (noteType === "book" && viewType === "geoMap") {
-        return <ActionButton
-            icon="bx bx-plus-circle"
-            text={t("geo-map.create-child-note-title")}
-            onClick={() => parentComponent.triggerEvent("geoMapCreateChildNote", { ntxId })}
-            disabled={isReadOnly}
-        />;
-    } else if (noteType === "relationMap") {
+function AddChildButton({ parentComponent, noteType, ntxId, isReadOnly }: NoteActionsCustomInnerProps) {
+    if (noteType === "relationMap") {
         return <ActionButton
             icon="bx bx-folder-plus"
             text={t("relation_map_buttons.create_child_note_title")}

apps/client/src/widgets/ribbon/SearchDefinitionTab.tsx

@@ -7,7 +7,6 @@ import appContext from "../../components/app_context";
 import FNote from "../../entities/fnote";
 import attributes from "../../services/attributes";
 import bulk_action, { ACTION_GROUPS } from "../../services/bulk_action";
-import { isExperimentalFeatureEnabled } from "../../services/experimental_features";
 import froca from "../../services/froca";
 import { t } from "../../services/i18n";
 import server from "../../services/server";
@@ -16,7 +15,6 @@ import tree from "../../services/tree";
 import { getErrorMessage } from "../../services/utils";
 import ws from "../../services/ws";
 import RenameNoteBulkAction from "../bulk_actions/note/rename_note";
-import CollectionProperties from "../note_bars/CollectionProperties";
 import Button from "../react/Button";
 import Dropdown from "../react/Dropdown";
 import { FormListHeader, FormListItem } from "../react/FormList";
@@ -26,8 +24,6 @@ import { ParentComponent } from "../react/react_utils";
 import { TabContext } from "./ribbon-interface";
 import { SEARCH_OPTIONS, SearchOption } from "./SearchDefinitionOptions";
 
-const isNewLayout = isExperimentalFeatureEnabled("new-layout");
-
 export default function SearchDefinitionTab({ note, ntxId, hidden }: Pick<TabContext, "note" | "ntxId" | "hidden">) {
     const parentComponent = useContext(ParentComponent);
     const [ searchOptions, setSearchOptions ] = useState<{ availableOptions: SearchOption[], activeOptions: SearchOption[] }>();
@@ -115,11 +111,6 @@ export default function SearchDefinitionTab({ note, ntxId, hidden }: Pick<TabCon
                                     defaultValue={defaultValue}
                                 />;
                             })}
-
-                            {isNewLayout && <tr className="view-options">
-                                <td className="title-column">{t("search_definition.view_options")}</td>
-                                <td><CollectionProperties note={note} /></td>
-                            </tr>}
                         </tbody>
                         <BulkActionsList note={note} />
                         <tbody className="search-actions">

apps/client/src/widgets/ribbon/style.css

@@ -459,7 +459,7 @@ body.experimental-feature-new-layout {
             gap: var(--button-gap);
 
             &> button:last-of-type {
-                margin-right: 1em;
+                margin-right: 0.5em;
             }
         }
     }

apps/client/src/widgets/type_widgets/options/appearance.tsx

@@ -18,6 +18,7 @@ import FormTextBox, { FormTextBoxWithUnit } from "../../react/FormTextBox";
 import { useTriliumOption, useTriliumOptionBool } from "../../react/hooks";
 import Icon from "../../react/Icon";
 import OptionsSection from "./components/OptionsSection";
+import PlatformIndicator from "./components/PlatformIndicator";
 import RadioWithIllustration from "./components/RadioWithIllustration";
 import RelatedSettings from "./components/RelatedSettings";
 
@@ -174,13 +175,13 @@ function LayoutIllustration({ isNewLayout }: { isNewLayout?: boolean }) {
                             </div>
                         </div>
                     ) : (
-                    <div>
-                        <div className="title-bar">
-                            <Icon icon="bx bx-leaf" />
-                            <span className="title">Title</span>
-                            <Icon icon="bx bx-dock-right" />
+                        <div>
+                            <div className="title-bar">
+                                <Icon icon="bx bx-leaf" />
+                                <span className="title">Title</span>
+                                <Icon icon="bx bx-dock-right" />
+                            </div>
                         </div>
-                    </div>
                     )}
 
                     {!isNewLayout && <div className="ribbon">
@@ -192,7 +193,7 @@ function LayoutIllustration({ isNewLayout }: { isNewLayout?: boolean }) {
                         </div>
 
                         <div className="ribbon-body">
-                            <div className="ribbon-body-content"></div>
+                            <div className="ribbon-body-content" />
                         </div>
                     </div>}
 
@@ -356,7 +357,11 @@ function ElectronIntegration() {
 
             <FormGroup name="background-effects" description={t("electron_integration.background-effects-description")}>
                 <FormCheckbox
-                    label={t("electron_integration.background-effects")}
+                    label={<>
+                        {t("electron_integration.background-effects")}
+                        {" "}
+                        <PlatformIndicator windows="11" mac />
+                    </>}
                     currentValue={backgroundEffects} onChange={setBackgroundEffects}
                     disabled={nativeTitleBarVisible}
                 />

apps/client/src/widgets/type_widgets/options/components/PlatformIndicator.css

@@ -0,0 +1,5 @@
+.platform-indicator {
+    display: inline-flex;
+    gap: 0.25em;
+    color: var(--muted-text-color);
+}

apps/client/src/widgets/type_widgets/options/components/PlatformIndicator.tsx

@@ -0,0 +1,34 @@
+import "./PlatformIndicator.css";
+
+import { useRef } from "preact/hooks";
+
+import { t } from "../../../../services/i18n";
+import { useStaticTooltip } from "../../../react/hooks";
+import Icon from "../../../react/Icon";
+
+interface PlatformIndicatorProps {
+    windows?: boolean | "11";
+    mac: boolean;
+}
+
+export default function PlatformIndicator({ windows, mac }: PlatformIndicatorProps) {
+    const containerRef = useRef<HTMLDivElement>(null);
+    useStaticTooltip(containerRef, {
+        selector: "span",
+        animation: false,
+        title() { return this.title; },
+    });
+
+    return (
+        <div ref={containerRef} className="platform-indicator">
+            {windows && <Icon
+                icon="bx bxl-windows"
+                title={t("platform_indicator.available_on", { platform: windows === "11" ? "Windows 11" : "Windows" })}
+            />}
+            {mac && <Icon
+                icon="bx bxl-apple"
+                title={t("platform_indicator.available_on", { platform: "macOS" })}
+            />}
+        </div>
+    );
+}

apps/client/src/widgets/type_widgets/options/other.tsx

@@ -1,20 +1,22 @@
+import { SANITIZER_DEFAULT_ALLOWED_TAGS } from "@triliumnext/commons";
+import { useMemo } from "preact/hooks";
+import type React from "react";
 import { Trans } from "react-i18next";
+
 import { t } from "../../../services/i18n";
+import search from "../../../services/search";
 import server from "../../../services/server";
 import toast from "../../../services/toast";
+import { isElectron } from "../../../services/utils";
 import Button from "../../react/Button";
-import FormText from "../../react/FormText";
-import OptionsSection from "./components/OptionsSection";
-import TimeSelector from "./components/TimeSelector";
-import { useMemo } from "preact/hooks";
-import { useTriliumOption, useTriliumOptionBool, useTriliumOptionJson } from "../../react/hooks";
-import { SANITIZER_DEFAULT_ALLOWED_TAGS } from "@triliumnext/commons";
 import FormCheckbox from "../../react/FormCheckbox";
 import FormGroup from "../../react/FormGroup";
-import search from "../../../services/search";
-import FormTextBox, { FormTextBoxWithUnit } from "../../react/FormTextBox";
 import FormSelect from "../../react/FormSelect";
-import { isElectron } from "../../../services/utils";
+import FormText from "../../react/FormText";
+import FormTextBox, { FormTextBoxWithUnit } from "../../react/FormTextBox";
+import { useTriliumOption, useTriliumOptionBool, useTriliumOptionJson } from "../../react/hooks";
+import OptionsSection from "./components/OptionsSection";
+import TimeSelector from "./components/TimeSelector";
 
 export default function OtherSettings() {
     return (
@@ -31,7 +33,7 @@ export default function OtherSettings() {
             <ShareSettings />
             <NetworkSettings />
         </>
-    )
+    );
 }
 
 function SearchEngineSettings() {
@@ -82,7 +84,7 @@ function SearchEngineSettings() {
                 />
             </FormGroup>
         </OptionsSection>
-    )
+    );
 }
 
 function TrayOptionsSettings() {
@@ -97,7 +99,7 @@ function TrayOptionsSettings() {
                 onChange={trayEnabled => setDisableTray(!trayEnabled)}
             />
         </OptionsSection>
-    )
+    );
 }
 
 function NoteErasureTimeout() {
@@ -105,13 +107,13 @@ function NoteErasureTimeout() {
         <OptionsSection title={t("note_erasure_timeout.note_erasure_timeout_title")}>
             <FormText>{t("note_erasure_timeout.note_erasure_description")}</FormText>
             <FormGroup name="erase-entities-after" label={t("note_erasure_timeout.erase_notes_after")}>
-                <TimeSelector           
-                    name="erase-entities-after"         
+                <TimeSelector
+                    name="erase-entities-after"
                     optionValueId="eraseEntitiesAfterTimeInSeconds" optionTimeScaleId="eraseEntitiesAfterTimeScale"
                 />
             </FormGroup>
             <FormText>{t("note_erasure_timeout.manual_erasing_description")}</FormText>
-            
+
             <Button
                 text={t("note_erasure_timeout.erase_deleted_notes_now")}
                 onClick={() => {
@@ -121,7 +123,7 @@ function NoteErasureTimeout() {
                 }}
             />
         </OptionsSection>
-    )
+    );
 }
 
 function AttachmentErasureTimeout() {
@@ -145,7 +147,7 @@ function AttachmentErasureTimeout() {
                 }}
             />
         </OptionsSection>
-    )
+    );
 }
 
 function RevisionSnapshotInterval() {
@@ -165,7 +167,7 @@ function RevisionSnapshotInterval() {
                 />
             </FormGroup>
         </OptionsSection>
-    )
+    );
 }
 
 function RevisionSnapshotLimit() {
@@ -176,7 +178,7 @@ function RevisionSnapshotLimit() {
             <FormText>{t("revisions_snapshot_limit.note_revisions_snapshot_limit_description")}</FormText>
 
             <FormGroup name="revision-snapshot-number-limit">
-                <FormTextBoxWithUnit                    
+                <FormTextBoxWithUnit
                     type="number" min={-1}
                     currentValue={revisionSnapshotNumberLimit}
                     unit={t("revisions_snapshot_limit.snapshot_number_limit_unit")}
@@ -197,7 +199,7 @@ function RevisionSnapshotLimit() {
                 }}
             />
         </OptionsSection>
-    )
+    );
 }
 
 function HtmlImportTags() {
@@ -236,7 +238,7 @@ function HtmlImportTags() {
                 onClick={() => setAllowedHtmlTags(SANITIZER_DEFAULT_ALLOWED_TAGS)}
             />
         </OptionsSection>
-    )
+    );
 }
 
 function ShareSettings() {
@@ -246,8 +248,8 @@ function ShareSettings() {
     return (
         <OptionsSection title={t("share.title")}>
             <FormGroup name="redirectBareDomain" description={t("share.redirect_bare_domain_description")}>
-                <FormCheckbox                    
-                    label={t(t("share.redirect_bare_domain"))}   
+                <FormCheckbox
+                    label={t(t("share.redirect_bare_domain"))}
                     currentValue={redirectBareDomain}
                     onChange={async value => {
                         if (value) {
@@ -264,17 +266,17 @@ function ShareSettings() {
                         }
                         setRedirectBareDomain(value);
                     }}
-                /> 
+                />
             </FormGroup>
 
             <FormGroup name="showLoginInShareTheme" description={t("share.show_login_link_description")}>
-                <FormCheckbox                    
+                <FormCheckbox
                     label={t("share.show_login_link")}
                     currentValue={showLogInShareTheme} onChange={setShowLogInShareTheme}
                 />
             </FormGroup>
         </OptionsSection>
-    )
+    );
 }
 
 function NetworkSettings() {
@@ -288,5 +290,5 @@ function NetworkSettings() {
                 currentValue={checkForUpdates} onChange={setCheckForUpdates}
             />
         </OptionsSection>
-    )
-}
+    );
+}

apps/client/src/widgets/type_widgets/options/text_notes.tsx

@@ -2,6 +2,7 @@ import { normalizeMimeTypeForCKEditor, type OptionNames } from "@triliumnext/com
 import { Themes } from "@triliumnext/highlightjs";
 import type { CSSProperties } from "preact/compat";
 import { useEffect, useMemo, useState } from "preact/hooks";
+import type React from "react";
 import { Trans } from "react-i18next";
 
 import { isExperimentalFeatureEnabled } from "../../../services/experimental_features";

apps/client/vite.config.mts

@@ -85,7 +85,7 @@ export default defineConfig(() => ({
         sourcemap: false,
         rollupOptions: {
             input: {
-                index: join(__dirname, "src", "index.html"),
+                index: join(__dirname, "index.html"),
                 login: join(__dirname, "src", "login.ts"),
                 setup: join(__dirname, "src", "setup.ts"),
                 set_password: join(__dirname, "src", "set_password.ts"),

apps/desktop/.gitignore

@@ -0,0 +1 @@
+electron-forge/app-icon/mac

apps/desktop/electron-forge/forge.config.ts

@@ -1,9 +1,11 @@
-import path, { join } from "path";
-import fs from "fs-extra";
-import { LOCALES } from "@triliumnext/commons";
-import { PRODUCT_NAME } from "../src/app-info.js";
 import type { ForgeConfig } from "@electron-forge/shared-types";
+import { LOCALES } from "@triliumnext/commons";
 import { existsSync } from "fs";
+import fs from "fs-extra";
+import path, { join } from "path";
+
+import packageJson from "../package.json" assert { type: "json" };
+import { PRODUCT_NAME } from "../src/app-info.js";
 
 const ELECTRON_FORGE_DIR = __dirname;
 
@@ -12,12 +14,12 @@ const APP_ICON_PATH = path.join(ELECTRON_FORGE_DIR, "app-icon");
 
 const extraResourcesForPlatform = getExtraResourcesForPlatform();
 const baseLinuxMakerConfigOptions = {
-  name: EXECUTABLE_NAME,
-  bin: EXECUTABLE_NAME,
-  productName: PRODUCT_NAME,
-  icon: path.join(APP_ICON_PATH, "png/128x128.png"),
-  desktopTemplate: path.resolve(path.join(ELECTRON_FORGE_DIR, "desktop.ejs")),
-  categories: ["Office", "Utility"]
+    name: EXECUTABLE_NAME,
+    bin: EXECUTABLE_NAME,
+    productName: PRODUCT_NAME,
+    icon: path.join(APP_ICON_PATH, "png/128x128.png"),
+    desktopTemplate: path.resolve(path.join(ELECTRON_FORGE_DIR, "desktop.ejs")),
+    categories: ["Office", "Utility"]
 };
 const windowsSignConfiguration = process.env.WINDOWS_SIGN_EXECUTABLE ? {
     hookModulePath: path.join(ELECTRON_FORGE_DIR, "sign-windows.cjs")
@@ -30,6 +32,7 @@ const macosSignConfiguration = process.env.APPLE_ID ? {
         teamId: process.env.APPLE_TEAM_ID!
     }
 } : undefined;
+const isNightly = packageJson.version.includes("test");
 
 const config: ForgeConfig = {
     outDir: "out",
@@ -37,9 +40,10 @@ const config: ForgeConfig = {
     packagerConfig: {
         executableName: EXECUTABLE_NAME,
         name: PRODUCT_NAME,
+        appVersion: packageJson.version,
         overwrite: true,
         asar: true,
-        icon: path.join(APP_ICON_PATH, "icon"),
+        icon: path.join(APP_ICON_PATH, isNightly ? "icon-dev" : "icon"),
         ...macosSignConfiguration,
         windowsSign: windowsSignConfiguration,
         extraResource: [
@@ -87,7 +91,7 @@ const config: ForgeConfig = {
                     ...baseLinuxMakerConfigOptions,
                     desktopTemplate: undefined, // otherwise it would put in the wrong exec
                     icon: {
-                        "128x128": path.join(APP_ICON_PATH, "png/128x128.png"),
+                        "128x128": path.join(APP_ICON_PATH, isNightly ? "png/128x128-dev.png" : "png/128x128.png"),
                     },
                     id: "com.triliumnext.notes",
                     runtimeVersion: "24.08",
@@ -136,24 +140,24 @@ const config: ForgeConfig = {
             config: {
                 name: EXECUTABLE_NAME,
                 productName: PRODUCT_NAME,
-                iconUrl: "https://raw.githubusercontent.com/TriliumNext/Trilium/refs/heads/main/apps/desktop/electron-forge/app-icon/icon.ico",
-                setupIcon: path.join(ELECTRON_FORGE_DIR, "setup-icon/setup.ico"),
-                loadingGif: path.join(ELECTRON_FORGE_DIR, "setup-icon/setup-banner.gif"),
+                iconUrl: `https://raw.githubusercontent.com/TriliumNext/Trilium/refs/heads/main/apps/desktop/electron-forge/app-icon/${isNightly ? "icon-dev" : "icon"}.ico`,
+                setupIcon: path.join(ELECTRON_FORGE_DIR, isNightly ? "setup-icon/setup-dev.ico" : "setup-icon/setup.ico"),
+                loadingGif: path.join(ELECTRON_FORGE_DIR, isNightly ? "setup-icon/setup-banner-dev.gif" : "setup-icon/setup-banner.gif"),
                 windowsSign: windowsSignConfiguration
             }
         },
         {
             name: "@electron-forge/maker-dmg",
             config: {
-                icon: path.join(APP_ICON_PATH, "icon.icns")
+                icon: path.join(APP_ICON_PATH, isNightly ? "icon-dev.icns" : "icon.icns")
             }
         },
         {
             name: "@electron-forge/maker-zip",
             config: {
                 options: {
-                    iconUrl: "https://raw.githubusercontent.com/TriliumNext/Trilium/refs/heads/main/apps/desktop/electron-forge/app-icon/icon.ico",
-                    icon: path.join(APP_ICON_PATH, "icon.ico")
+                    iconUrl: `https://raw.githubusercontent.com/TriliumNext/Trilium/refs/heads/main/apps/desktop/electron-forge/app-icon/${isNightly ? "icon-dev" : "icon"}.ico`,
+                    icon: path.join(APP_ICON_PATH, isNightly ? "icon-dev.ico" : "icon.ico")
                 }
             }
         }
@@ -172,7 +176,7 @@ const config: ForgeConfig = {
                 .filter(locale => !locale.contentOnly)
                 .map(locale => locale.electronLocale) as string[];
             if (!isMac) {
-                localesToKeep = localesToKeep.map(locale => locale.replace("_", "-"))
+                localesToKeep = localesToKeep.map(locale => locale.replace("_", "-"));
             }
 
             const keptLocales = new Set();
@@ -283,11 +287,11 @@ function getExtraResourcesForPlatform() {
         const scripts = ["trilium-portable", "trilium-safe-mode", "trilium-no-cert-check"];
         const scriptExt = (process.platform === "win32") ? "bat" : "sh";
         return scripts.map(script => `electron-forge/${script}.${scriptExt}`);
-    }
+    };
 
     switch (process.platform) {
         case "win32":
-            resources.push(...getScriptResources())
+            resources.push(...getScriptResources());
             break;
         case "linux":
             resources.push(...getScriptResources(), path.join(APP_ICON_PATH, "png/256x256.png"));
@@ -300,18 +304,18 @@ function getExtraResourcesForPlatform() {
 }
 
 function getELFArch(file: string) {
-  const buf = fs.readFileSync(file);
+    const buf = fs.readFileSync(file);
 
-  if (buf[0] !== 0x7f || buf[1] !== 0x45 || buf[2] !== 0x4c || buf[3] !== 0x46) {
-    throw new Error("Not an ELF file");
-  }
+    if (buf[0] !== 0x7f || buf[1] !== 0x45 || buf[2] !== 0x4c || buf[3] !== 0x46) {
+        throw new Error("Not an ELF file");
+    }
 
-  const eiClass = buf[4];      // 1=32-bit, 2=64-bit
-  const eiMachine = buf[18];   // architecture code
+    const eiClass = buf[4];      // 1=32-bit, 2=64-bit
+    const eiMachine = buf[18];   // architecture code
 
-  if (eiMachine === 0x3E) return 'x86-64';
-  if (eiMachine === 0xB7) return 'ARM64';
-  return 'other';
+    if (eiMachine === 0x3E) return 'x86-64';
+    if (eiMachine === 0xB7) return 'ARM64';
+    return 'other';
 }
 
 

apps/desktop/package.json

@@ -35,7 +35,7 @@
     "@triliumnext/commons": "workspace:*",
     "@triliumnext/server": "workspace:*",
     "copy-webpack-plugin": "13.0.1",
-    "electron": "40.0.0",
+    "electron": "40.1.0",
     "@electron-forge/cli": "7.11.1",
     "@electron-forge/maker-deb": "7.11.1",
     "@electron-forge/maker-dmg": "7.11.1",

apps/edit-docs/package.json

@@ -12,7 +12,7 @@
     "@triliumnext/desktop": "workspace:*",
     "@types/fs-extra": "11.0.4",
     "copy-webpack-plugin": "13.0.1",
-    "electron": "40.0.0",
+    "electron": "40.1.0",
     "fs-extra": "11.3.3"
   },
   "scripts": {

apps/server-e2e/src/layout/tab_bar.spec.ts

@@ -17,17 +17,17 @@ test("Can drag tabs around", async ({ page, context }) => {
     await app.addNewTab();
     await app.addNewTab();
 
-    let tab = app.getTab(0);
+    let tab = await app.getTab(0);
 
     // Drag the first tab at the end
-    await tab.dragTo(app.getTab(2), { targetPosition: { x: 50, y: 0 } });
+    await tab.dragTo(await app.getTab(2), { targetPosition: { x: 50, y: 0 } });
 
-    tab = app.getTab(2);
+    tab = await app.getTab(2);
     await expect(tab).toContainText(NOTE_TITLE);
 
     // Drag the tab to the left
-    await tab.dragTo(app.getTab(0), { targetPosition: { x: 50, y: 0 } });
-    await expect(app.getTab(0)).toContainText(NOTE_TITLE);
+    await tab.dragTo(await app.getTab(0), { targetPosition: { x: 50, y: 0 } });
+    await expect(await app.getTab(0)).toContainText(NOTE_TITLE);
 });
 
 test("Can drag tab to new window", async ({ page, context }) => {
@@ -36,7 +36,7 @@ test("Can drag tab to new window", async ({ page, context }) => {
 
     await app.closeAllTabs();
     await app.clickNoteOnNoteTreeByTitle(NOTE_TITLE);
-    const tab = app.getTab(0);
+    const tab = await app.getTab(0);
     await expect(tab).toContainText(NOTE_TITLE);
 
     const popupPromise = page.waitForEvent("popup");
@@ -75,14 +75,14 @@ test("Tabs are restored in right order", async ({ page, context }) => {
     await expect(app.getActiveTab()).toContainText("Mermaid");
 
     // Select the mid one.
-    await app.getTab(1).click();
+    await (await app.getTab(1)).click();
     await expect(app.noteTreeActiveNote).toContainText("Text notes");
 
     // Refresh the page and check the order.
     await app.goto( { preserveTabs: true });
-    await expect(app.getTab(0)).toContainText("Code notes");
-    await expect(app.getTab(1)).toContainText("Text notes");
-    await expect(app.getTab(2)).toContainText("Mermaid");
+    await expect(await app.getTab(0)).toContainText("Code notes");
+    await expect(await app.getTab(1)).toContainText("Text notes");
+    await expect(await app.getTab(2)).toContainText("Mermaid");
 
     // Check the note tree has the right active node.
     await expect(app.noteTreeActiveNote).toContainText("Text notes");
@@ -118,7 +118,7 @@ test("Search works when dismissing a tab", async ({ page, context }) => {
     await app.addNewTab();
     await app.goToNoteInNewTab("Sample mindmap");
 
-    await app.getTab(0).click();
+    await (await app.getTab(0)).click();
     await app.openAndClickNoteActionMenu("Search in note");
     await expect(app.findAndReplaceWidget.first()).toBeVisible();
 });

apps/server-e2e/src/support/app.ts

@@ -26,6 +26,7 @@ export default class App {
     readonly currentNoteSplitTitle: Locator;
     readonly currentNoteSplitContent: Locator;
     readonly sidebar: Locator;
+    private isMobile: boolean = false;
 
     constructor(page: Page, context: BrowserContext) {
         this.page = page;
@@ -43,6 +44,8 @@ export default class App {
     }
 
     async goto({ url, isMobile, preserveTabs }: GotoOpts = {}) {
+        this.isMobile = !!isMobile;
+
         await this.context.addCookies([
             {
                 url: BASE_URL,
@@ -59,7 +62,7 @@ export default class App {
 
         // Wait for the page to load.
         if (url === "/") {
-            await expect(this.page.locator(".tree")).toContainText("Trilium Integration Test");
+            await expect(this.page.locator(".tree", { hasText: "Trilium Integration Test" })).toBeVisible();
             if (!preserveTabs) {
                 await this.closeAllTabs();
             }
@@ -76,14 +79,19 @@ export default class App {
         const suggestionSelector = resultsSelector.locator(".aa-suggestion")
             .nth(1); // Select the second one (best candidate), as the first one is "Create a new note"
         await expect(suggestionSelector).toContainText(noteTitle);
-        suggestionSelector.click();
+        await suggestionSelector.click();
     }
 
     async goToSettings() {
         await this.page.locator(".launcher-button.bx-cog").click();
     }
 
-    getTab(tabIndex: number) {
+    async getTab(tabIndex: number) {
+        if (this.isMobile) {
+            await this.launcherBar.locator(".mobile-tab-switcher").click();
+            return this.page.locator(".modal.tab-bar-modal .tab-card").nth(tabIndex);
+        }
+
         return this.tabBar.locator(".note-tab-wrapper").nth(tabIndex);
     }
 
@@ -97,7 +105,8 @@ export default class App {
     async closeAllTabs() {
         await this.triggerCommand("closeAllTabs");
         // Page in Playwright is not updated somehow, need to click on the tab to make sure it's rendered
-        await this.getTab(0).click();
+        const tab = await this.getTab(0);
+        await tab.click();
     }
 
     /**

apps/server/package.json

@@ -35,8 +35,8 @@
     "sucrase": "3.35.1"
   },
   "devDependencies": {
-    "@anthropic-ai/sdk": "0.71.2",
-    "@braintree/sanitize-url": "7.1.1",
+    "@anthropic-ai/sdk": "0.72.1",
+    "@braintree/sanitize-url": "7.1.2",
     "@electron/remote": "2.1.3",
     "@triliumnext/commons": "workspace:*",
     "@triliumnext/express-partial-content": "workspace:*",
@@ -70,7 +70,7 @@
     "@types/xml2js": "0.4.14",
     "archiver": "7.0.1",
     "async-mutex": "0.5.0",
-    "axios": "1.13.2",
+    "axios": "1.13.4",
     "bindings": "1.5.0",
     "bootstrap": "5.3.8",
     "chardet": "2.1.1",
@@ -83,7 +83,7 @@
     "debounce": "3.0.0",
     "debug": "4.4.3",
     "ejs": "4.0.1",
-    "electron": "40.0.0",
+    "electron": "40.1.0",
     "electron-debug": "4.1.0",
     "electron-window-state": "5.0.3",
     "escape-html": "1.0.3",
@@ -112,7 +112,7 @@
     "multer": "2.0.2",
     "normalize-strings": "1.1.1",
     "ollama": "0.6.3",
-    "openai": "6.16.0",
+    "openai": "6.17.0",
     "rand-token": "1.0.1",
     "safe-compare": "1.1.4",
     "sanitize-filename": "1.6.3",

apps/server/spec/etapi/search.spec.ts

@@ -20,21 +20,353 @@ describe("etapi/search", () => {
 
         content = randomUUID();
         await createNote(app, token, content);
+    }, 30000); // Increase timeout to 30 seconds for app initialization
+
+    describe("Basic Search", () => {
+        it("finds by content", async () => {
+            const response = await supertest(app)
+                .get(`/etapi/notes?search=${content}&debug=true`)
+                .auth(USER, token, { "type": "basic"})
+                .expect(200);
+            expect(response.body.results).toHaveLength(1);
+        });
+
+        it("does not find by content when fast search is on", async () => {
+            const response = await supertest(app)
+                .get(`/etapi/notes?search=${content}&debug=true&fastSearch=true`)
+                .auth(USER, token, { "type": "basic"})
+                .expect(200);
+            expect(response.body.results).toHaveLength(0);
+        });
+
+        it("returns proper response structure", async () => {
+            const response = await supertest(app)
+                .get(`/etapi/notes?search=${content}`)
+                .auth(USER, token, { "type": "basic"})
+                .expect(200);
+
+            expect(response.body).toHaveProperty("results");
+            expect(Array.isArray(response.body.results)).toBe(true);
+
+            if (response.body.results.length > 0) {
+                const note = response.body.results[0];
+                expect(note).toHaveProperty("noteId");
+                expect(note).toHaveProperty("title");
+                expect(note).toHaveProperty("type");
+            }
+        });
+
+        it("returns debug info when requested", async () => {
+            const response = await supertest(app)
+                .get(`/etapi/notes?search=${content}&debug=true`)
+                .auth(USER, token, { "type": "basic"})
+                .expect(200);
+
+            expect(response.body).toHaveProperty("debugInfo");
+            expect(response.body.debugInfo).toBeTruthy();
+        });
+
+        it("returns 400 for missing search parameter", async () => {
+            await supertest(app)
+                .get("/etapi/notes")
+                .auth(USER, token, { "type": "basic"})
+                .expect(400);
+        });
+
+        it("returns 400 for empty search parameter", async () => {
+            await supertest(app)
+                .get("/etapi/notes?search=")
+                .auth(USER, token, { "type": "basic"})
+                .expect(400);
+        });
     });
 
-    it("finds by content", async () => {
-        const response = await supertest(app)
-            .get(`/etapi/notes?search=${content}&debug=true`)
-            .auth(USER, token, { "type": "basic"})
-            .expect(200);
-        expect(response.body.results).toHaveLength(1);
+    describe("Search Parameters", () => {
+        let testNoteId: string;
+
+        beforeAll(async () => {
+            // Create a test note with unique content
+            const uniqueContent = `test-${randomUUID()}`;
+            testNoteId = await createNote(app, token, uniqueContent);
+        }, 10000);
+
+        it("respects fastSearch parameter", async () => {
+            // Fast search should not find by content
+            const fastResponse = await supertest(app)
+                .get(`/etapi/notes?search=${content}&fastSearch=true`)
+                .auth(USER, token, { "type": "basic"})
+                .expect(200);
+            expect(fastResponse.body.results).toHaveLength(0);
+
+            // Regular search should find by content
+            const regularResponse = await supertest(app)
+                .get(`/etapi/notes?search=${content}&fastSearch=false`)
+                .auth(USER, token, { "type": "basic"})
+                .expect(200);
+            expect(regularResponse.body.results.length).toBeGreaterThan(0);
+        });
+
+        it("respects includeArchivedNotes parameter", async () => {
+            // Default should include archived notes
+            const withArchivedResponse = await supertest(app)
+                .get(`/etapi/notes?search=*&includeArchivedNotes=true`)
+                .auth(USER, token, { "type": "basic"})
+                .expect(200);
+
+            const withoutArchivedResponse = await supertest(app)
+                .get(`/etapi/notes?search=*&includeArchivedNotes=false`)
+                .auth(USER, token, { "type": "basic"})
+                .expect(200);
+
+            // Note: Actual behavior depends on whether there are archived notes
+            expect(withArchivedResponse.body.results).toBeDefined();
+            expect(withoutArchivedResponse.body.results).toBeDefined();
+        });
+
+        it("respects limit parameter", async () => {
+            const limit = 5;
+            const response = await supertest(app)
+                .get(`/etapi/notes?search=*&limit=${limit}`)
+                .auth(USER, token, { "type": "basic"})
+                .expect(200);
+
+            expect(response.body.results.length).toBeLessThanOrEqual(limit);
+        });
+
+        it("handles fuzzyAttributeSearch parameter", async () => {
+            const response = await supertest(app)
+                .get(`/etapi/notes?search=*&fuzzyAttributeSearch=true`)
+                .auth(USER, token, { "type": "basic"})
+                .expect(200);
+
+            expect(response.body.results).toBeDefined();
+        });
     });
 
-    it("does not find by content when fast search is on", async () => {
-        const response = await supertest(app)
-            .get(`/etapi/notes?search=${content}&debug=true&fastSearch=true`)
-            .auth(USER, token, { "type": "basic"})
-            .expect(200);
-        expect(response.body.results).toHaveLength(0);
+    describe("Search Queries", () => {
+        let titleNoteId: string;
+        let labelNoteId: string;
+
+        beforeAll(async () => {
+            // Create test notes with specific attributes
+            const uniqueTitle = `SearchTest-${randomUUID()}`;
+
+            // Create note with specific title
+            const titleResponse = await supertest(app)
+                .post("/etapi/create-note")
+                .auth(USER, token, { "type": "basic"})
+                .send({
+                    "parentNoteId": "root",
+                    "title": uniqueTitle,
+                    "type": "text",
+                    "content": "Title test content"
+                })
+                .expect(201);
+            titleNoteId = titleResponse.body.note.noteId;
+
+            // Create note with label
+            const labelResponse = await supertest(app)
+                .post("/etapi/create-note")
+                .auth(USER, token, { "type": "basic"})
+                .send({
+                    "parentNoteId": "root",
+                    "title": "Label Test",
+                    "type": "text",
+                    "content": "Label test content"
+                })
+                .expect(201);
+            labelNoteId = labelResponse.body.note.noteId;
+
+            // Add label to note
+            await supertest(app)
+                .post("/etapi/attributes")
+                .auth(USER, token, { "type": "basic"})
+                .send({
+                    "noteId": labelNoteId,
+                    "type": "label",
+                    "name": "testlabel",
+                    "value": "testvalue"
+                })
+                .expect(201);
+        }, 15000); // 15 second timeout for setup
+
+        it("searches by title", async () => {
+            // Get the title we created
+            const noteResponse = await supertest(app)
+                .get(`/etapi/notes/${titleNoteId}`)
+                .auth(USER, token, { "type": "basic"})
+                .expect(200);
+
+            const title = noteResponse.body.title;
+
+            const searchResponse = await supertest(app)
+                .get(`/etapi/notes?search=${encodeURIComponent(title)}`)
+                .auth(USER, token, { "type": "basic"})
+                .expect(200);
+
+            expect(searchResponse.body.results.length).toBeGreaterThan(0);
+            const foundNote = searchResponse.body.results.find((n: any) => n.noteId === titleNoteId);
+            expect(foundNote).toBeTruthy();
+        });
+
+        it("searches by label", async () => {
+            const searchResponse = await supertest(app)
+                .get(`/etapi/notes?search=${encodeURIComponent("#testlabel")}`)
+                .auth(USER, token, { "type": "basic"})
+                .expect(200);
+
+            expect(searchResponse.body.results.length).toBeGreaterThan(0);
+            const foundNote = searchResponse.body.results.find((n: any) => n.noteId === labelNoteId);
+            expect(foundNote).toBeTruthy();
+        });
+
+        it("searches by label with value", async () => {
+            const searchResponse = await supertest(app)
+                .get(`/etapi/notes?search=${encodeURIComponent("#testlabel=testvalue")}`)
+                .auth(USER, token, { "type": "basic"})
+                .expect(200);
+
+            expect(searchResponse.body.results.length).toBeGreaterThan(0);
+            const foundNote = searchResponse.body.results.find((n: any) => n.noteId === labelNoteId);
+            expect(foundNote).toBeTruthy();
+        });
+
+        it("handles complex queries with AND operator", async () => {
+            const searchResponse = await supertest(app)
+                .get(`/etapi/notes?search=${encodeURIComponent("#testlabel AND note.type=text")}`)
+                .auth(USER, token, { "type": "basic"})
+                .expect(200);
+
+            expect(searchResponse.body.results).toBeDefined();
+        });
+
+        it("handles queries with OR operator", async () => {
+            const searchResponse = await supertest(app)
+                .get(`/etapi/notes?search=${encodeURIComponent("#testlabel OR #nonexistent")}`)
+                .auth(USER, token, { "type": "basic"})
+                .expect(200);
+
+            expect(searchResponse.body.results.length).toBeGreaterThan(0);
+        });
+
+        it("handles queries with NOT operator", async () => {
+            const searchResponse = await supertest(app)
+                .get(`/etapi/notes?search=${encodeURIComponent("#testlabel NOT #nonexistent")}`)
+                .auth(USER, token, { "type": "basic"})
+                .expect(200);
+
+            expect(searchResponse.body.results.length).toBeGreaterThan(0);
+        });
+
+        it("handles wildcard searches", async () => {
+            const searchResponse = await supertest(app)
+                .get(`/etapi/notes?search=note.type%3Dtext&limit=10`)
+                .auth(USER, token, { "type": "basic"})
+                .expect(200);
+
+            expect(searchResponse.body.results).toBeDefined();
+            // Should return results if any text notes exist
+            expect(Array.isArray(searchResponse.body.results)).toBe(true);
+        });
+
+        it("handles empty results gracefully", async () => {
+            const nonexistentQuery = `nonexistent-${randomUUID()}`;
+            const searchResponse = await supertest(app)
+                .get(`/etapi/notes?search=${encodeURIComponent(nonexistentQuery)}`)
+                .auth(USER, token, { "type": "basic"})
+                .expect(200);
+
+            expect(searchResponse.body.results).toHaveLength(0);
+        });
+    });
+
+    describe("Error Handling", () => {
+        it("handles invalid query syntax gracefully", async () => {
+            const response = await supertest(app)
+                .get(`/etapi/notes?search=${encodeURIComponent("(((")}`)
+                .auth(USER, token, { "type": "basic"})
+                .expect(200);
+
+            // Should return empty results or handle error gracefully
+            expect(response.body.results).toBeDefined();
+        });
+
+        it("requires authentication", async () => {
+            await supertest(app)
+                .get(`/etapi/notes?search=test`)
+                .expect(401);
+        });
+
+        it("rejects invalid authentication", async () => {
+            await supertest(app)
+                .get(`/etapi/notes?search=test`)
+                .auth(USER, "invalid-token", { "type": "basic"})
+                .expect(401);
+        });
+    });
+
+    describe("Performance", () => {
+        it("handles large result sets", async () => {
+            const startTime = Date.now();
+
+            const response = await supertest(app)
+                .get(`/etapi/notes?search=*&limit=100`)
+                .auth(USER, token, { "type": "basic"})
+                .expect(200);
+
+            const endTime = Date.now();
+            const duration = endTime - startTime;
+
+            expect(response.body.results).toBeDefined();
+            // Search should complete in reasonable time (5 seconds)
+            expect(duration).toBeLessThan(5000);
+        });
+
+        it("handles queries efficiently", async () => {
+            const startTime = Date.now();
+
+            await supertest(app)
+                .get(`/etapi/notes?search=${encodeURIComponent("#*")}`)
+                .auth(USER, token, { "type": "basic"})
+                .expect(200);
+
+            const endTime = Date.now();
+            const duration = endTime - startTime;
+
+            // Attribute search should be fast
+            expect(duration).toBeLessThan(3000);
+        });
+    });
+
+    describe("Special Characters", () => {
+        it("handles special characters in search", async () => {
+            const specialChars = "test@#$%";
+            const response = await supertest(app)
+                .get(`/etapi/notes?search=${encodeURIComponent(specialChars)}`)
+                .auth(USER, token, { "type": "basic"})
+                .expect(200);
+
+            expect(response.body.results).toBeDefined();
+        });
+
+        it("handles unicode characters", async () => {
+            const unicode = "测试";
+            const response = await supertest(app)
+                .get(`/etapi/notes?search=${encodeURIComponent(unicode)}`)
+                .auth(USER, token, { "type": "basic"})
+                .expect(200);
+
+            expect(response.body.results).toBeDefined();
+        });
+
+        it("handles quotes in search", async () => {
+            const quoted = '"test phrase"';
+            const response = await supertest(app)
+                .get(`/etapi/notes?search=${encodeURIComponent(quoted)}`)
+                .auth(USER, token, { "type": "basic"})
+                .expect(200);
+
+            expect(response.body.results).toBeDefined();
+        });
     });
 });

apps/server/src/assets/db/schema.sql

@@ -146,9 +146,289 @@ CREATE INDEX IDX_notes_blobId on notes (blobId);
 CREATE INDEX IDX_revisions_blobId on revisions (blobId);
 CREATE INDEX IDX_attachments_blobId on attachments (blobId);
 
+-- Strategic Performance Indexes from migration 234
+-- NOTES TABLE INDEXES
+CREATE INDEX IDX_notes_search_composite 
+ON notes (isDeleted, type, mime, dateModified DESC);
+
+CREATE INDEX IDX_notes_metadata_covering 
+ON notes (noteId, isDeleted, type, mime, title, dateModified, isProtected);
+
+CREATE INDEX IDX_notes_protected_deleted 
+ON notes (isProtected, isDeleted) 
+WHERE isProtected = 1;
+
+-- BRANCHES TABLE INDEXES  
+CREATE INDEX IDX_branches_tree_traversal 
+ON branches (parentNoteId, isDeleted, notePosition);
+
+CREATE INDEX IDX_branches_covering 
+ON branches (noteId, parentNoteId, isDeleted, notePosition, prefix);
+
+CREATE INDEX IDX_branches_note_parents 
+ON branches (noteId, isDeleted) 
+WHERE isDeleted = 0;
+
+-- ATTRIBUTES TABLE INDEXES
+CREATE INDEX IDX_attributes_search_composite 
+ON attributes (name, value, isDeleted);
+
+CREATE INDEX IDX_attributes_covering 
+ON attributes (noteId, name, value, type, isDeleted, position);
+
+CREATE INDEX IDX_attributes_inheritable 
+ON attributes (isInheritable, isDeleted) 
+WHERE isInheritable = 1 AND isDeleted = 0;
+
+CREATE INDEX IDX_attributes_labels 
+ON attributes (type, name, value) 
+WHERE type = 'label' AND isDeleted = 0;
+
+CREATE INDEX IDX_attributes_relations 
+ON attributes (type, name, value) 
+WHERE type = 'relation' AND isDeleted = 0;
+
+-- BLOBS TABLE INDEXES
+CREATE INDEX IDX_blobs_content_size 
+ON blobs (blobId, LENGTH(content));
+
+-- ATTACHMENTS TABLE INDEXES
+CREATE INDEX IDX_attachments_composite 
+ON attachments (ownerId, role, isDeleted, position);
+
+-- REVISIONS TABLE INDEXES
+CREATE INDEX IDX_revisions_note_date 
+ON revisions (noteId, utcDateCreated DESC);
+
+-- ENTITY_CHANGES TABLE INDEXES
+CREATE INDEX IDX_entity_changes_sync
+ON entity_changes (isSynced, utcDateChanged);
+
+-- RECENT_NOTES TABLE INDEXES
+CREATE INDEX IDX_recent_notes_date 
+ON recent_notes (utcDateCreated DESC);
+
 
 CREATE TABLE IF NOT EXISTS sessions (
     id TEXT PRIMARY KEY,
     data TEXT,
     expires INTEGER
 );
+
+-- FTS5 Full-Text Search Support
+-- Create FTS5 virtual table with trigram tokenizer
+-- Trigram tokenizer provides language-agnostic substring matching:
+-- 1. Fast substring matching (50-100x speedup for LIKE queries without wildcards)
+-- 2. Case-insensitive search without custom collation
+-- 3. No language-specific stemming assumptions (works for all languages)
+-- 4. Boolean operators (AND, OR, NOT) and phrase matching with quotes
+--
+-- IMPORTANT: Trigram requires minimum 3-character tokens for matching
+-- detail='full' enables phrase queries (required for exact match with = operator)
+-- and provides position info for highlight() function
+-- Note: Using detail='full' instead of detail='none' increases index size by ~50%
+-- but is necessary to support phrase queries like "exact phrase"
+CREATE VIRTUAL TABLE notes_fts USING fts5(
+    noteId UNINDEXED,
+    title,
+    content,
+    tokenize = 'trigram',
+    detail = 'full'
+);
+
+-- Triggers to keep FTS table synchronized with notes
+-- IMPORTANT: These triggers must handle all SQL operations including:
+-- - Regular INSERT/UPDATE/DELETE
+-- - INSERT OR REPLACE
+-- - INSERT ... ON CONFLICT ... DO UPDATE (upsert)
+-- - Cases where notes are created before blobs (import scenarios)
+
+-- Trigger for INSERT operations on notes
+-- Handles: INSERT, INSERT OR REPLACE, INSERT OR IGNORE, and the INSERT part of upsert
+CREATE TRIGGER notes_fts_insert 
+AFTER INSERT ON notes
+WHEN NEW.type IN ('text', 'code', 'mermaid', 'canvas', 'mindMap') 
+    AND NEW.isDeleted = 0
+    AND NEW.isProtected = 0
+BEGIN
+    -- First delete any existing FTS entry (in case of INSERT OR REPLACE)
+    DELETE FROM notes_fts WHERE noteId = NEW.noteId;
+    
+    -- Then insert the new entry, using LEFT JOIN to handle missing blobs
+    INSERT INTO notes_fts (noteId, title, content)
+    SELECT 
+        NEW.noteId,
+        NEW.title,
+        COALESCE(b.content, '')  -- Use empty string if blob doesn't exist yet
+    FROM (SELECT NEW.noteId) AS note_select
+    LEFT JOIN blobs b ON b.blobId = NEW.blobId;
+END;
+
+-- Trigger for UPDATE operations on notes table
+-- Handles: Regular UPDATE and the UPDATE part of upsert (ON CONFLICT DO UPDATE)
+-- Fires for ANY update to searchable notes to ensure FTS stays in sync
+CREATE TRIGGER notes_fts_update 
+AFTER UPDATE ON notes
+WHEN NEW.type IN ('text', 'code', 'mermaid', 'canvas', 'mindMap')
+    -- Fire on any change, not just specific columns, to handle all upsert scenarios
+BEGIN
+    -- Always delete the old entry
+    DELETE FROM notes_fts WHERE noteId = NEW.noteId;
+    
+    -- Insert new entry if note is not deleted and not protected
+    INSERT INTO notes_fts (noteId, title, content)
+    SELECT 
+        NEW.noteId,
+        NEW.title,
+        COALESCE(b.content, '')  -- Use empty string if blob doesn't exist yet
+    FROM (SELECT NEW.noteId) AS note_select
+    LEFT JOIN blobs b ON b.blobId = NEW.blobId
+    WHERE NEW.isDeleted = 0
+        AND NEW.isProtected = 0;
+END;
+
+-- Trigger for UPDATE operations on blobs
+-- Handles: Regular UPDATE and the UPDATE part of upsert (ON CONFLICT DO UPDATE)
+-- IMPORTANT: Uses INSERT OR REPLACE for efficiency with deduplicated blobs
+CREATE TRIGGER notes_fts_blob_update 
+AFTER UPDATE ON blobs
+BEGIN
+    -- Use INSERT OR REPLACE for atomic update of all notes sharing this blob
+    -- This is more efficient than DELETE + INSERT when many notes share the same blob
+    INSERT OR REPLACE INTO notes_fts (noteId, title, content)
+    SELECT 
+        n.noteId,
+        n.title,
+        NEW.content
+    FROM notes n
+    WHERE n.blobId = NEW.blobId
+        AND n.type IN ('text', 'code', 'mermaid', 'canvas', 'mindMap')
+        AND n.isDeleted = 0
+        AND n.isProtected = 0;
+END;
+
+-- Trigger for DELETE operations
+CREATE TRIGGER notes_fts_delete 
+AFTER DELETE ON notes
+BEGIN
+    DELETE FROM notes_fts WHERE noteId = OLD.noteId;
+END;
+
+-- Trigger for soft delete (isDeleted = 1)
+CREATE TRIGGER notes_fts_soft_delete 
+AFTER UPDATE ON notes
+WHEN OLD.isDeleted = 0 AND NEW.isDeleted = 1
+BEGIN
+    DELETE FROM notes_fts WHERE noteId = NEW.noteId;
+END;
+
+-- Trigger for notes becoming protected
+-- Remove from FTS when a note becomes protected
+CREATE TRIGGER notes_fts_protect 
+AFTER UPDATE ON notes
+WHEN OLD.isProtected = 0 AND NEW.isProtected = 1
+BEGIN
+    DELETE FROM notes_fts WHERE noteId = NEW.noteId;
+END;
+
+-- Trigger for notes becoming unprotected
+-- Add to FTS when a note becomes unprotected (if eligible)
+CREATE TRIGGER notes_fts_unprotect 
+AFTER UPDATE ON notes
+WHEN OLD.isProtected = 1 AND NEW.isProtected = 0
+    AND NEW.type IN ('text', 'code', 'mermaid', 'canvas', 'mindMap')
+    AND NEW.isDeleted = 0
+BEGIN
+    DELETE FROM notes_fts WHERE noteId = NEW.noteId;
+    
+    INSERT INTO notes_fts (noteId, title, content)
+    SELECT 
+        NEW.noteId,
+        NEW.title,
+        COALESCE(b.content, '')
+    FROM (SELECT NEW.noteId) AS note_select
+    LEFT JOIN blobs b ON b.blobId = NEW.blobId;
+END;
+
+-- Trigger for INSERT operations on blobs
+-- Handles: INSERT, INSERT OR REPLACE, and the INSERT part of upsert
+-- Updates all notes that reference this blob (common during import and deduplication)
+CREATE TRIGGER notes_fts_blob_insert
+AFTER INSERT ON blobs
+BEGIN
+    -- Use INSERT OR REPLACE to handle both new and existing FTS entries
+    -- This is crucial for blob deduplication where multiple notes may already
+    -- exist that reference this blob before the blob itself is created
+    INSERT OR REPLACE INTO notes_fts (noteId, title, content)
+    SELECT
+        n.noteId,
+        n.title,
+        NEW.content
+    FROM notes n
+    WHERE n.blobId = NEW.blobId
+        AND n.type IN ('text', 'code', 'mermaid', 'canvas', 'mindMap')
+        AND n.isDeleted = 0
+        AND n.isProtected = 0;
+END;
+
+-- =====================================================
+-- FTS5 Full-Text Search Index for Attributes
+-- =====================================================
+-- This FTS5 table enables fast full-text searching of attribute names and values
+-- Benefits:
+-- - Fast free-text searches like ="somevalue" (10-50ms vs 1-2 seconds)
+-- - Scales well with large attribute counts (650K+ attributes)
+-- - Consistent performance with notes_fts
+--
+-- Uses trigram tokenizer with detail='full' for:
+-- 1. Substring matching (3+ characters)
+-- 2. Phrase query support (exact matches with word boundaries)
+-- 3. Multi-language support without stemming assumptions
+
+CREATE VIRTUAL TABLE attributes_fts USING fts5(
+    attributeId UNINDEXED,
+    noteId UNINDEXED,
+    name,
+    value,
+    tokenize = 'trigram',
+    detail = 'full'
+);
+
+-- Triggers to keep attributes_fts synchronized with attributes table
+
+-- Trigger for INSERT operations
+CREATE TRIGGER attributes_fts_insert
+AFTER INSERT ON attributes
+WHEN NEW.isDeleted = 0
+BEGIN
+    INSERT INTO attributes_fts (attributeId, noteId, name, value)
+    VALUES (NEW.attributeId, NEW.noteId, NEW.name, COALESCE(NEW.value, ''));
+END;
+
+-- Trigger for UPDATE operations
+CREATE TRIGGER attributes_fts_update
+AFTER UPDATE ON attributes
+BEGIN
+    -- Remove old entry
+    DELETE FROM attributes_fts WHERE attributeId = OLD.attributeId;
+
+    -- Add new entry if not deleted
+    INSERT INTO attributes_fts (attributeId, noteId, name, value)
+    SELECT NEW.attributeId, NEW.noteId, NEW.name, COALESCE(NEW.value, '')
+    WHERE NEW.isDeleted = 0;
+END;
+
+-- Trigger for DELETE operations
+CREATE TRIGGER attributes_fts_delete
+AFTER DELETE ON attributes
+BEGIN
+    DELETE FROM attributes_fts WHERE attributeId = OLD.attributeId;
+END;
+
+-- Trigger for soft delete (isDeleted = 1)
+CREATE TRIGGER attributes_fts_soft_delete
+AFTER UPDATE ON attributes
+WHEN OLD.isDeleted = 0 AND NEW.isDeleted = 1
+BEGIN
+    DELETE FROM attributes_fts WHERE attributeId = NEW.attributeId;
+END;

apps/server/src/assets/doc_notes/en/User Guide/User Guide/Installation & Setup/Web Clipper.html

@@ -7,13 +7,9 @@
 <h2>Supported browsers</h2>
 <p>Trilium Web Clipper officially supports the following web browsers:</p>
 <ul>
-  <li>
-    <p>Mozilla Firefox, using Manifest v2.</p>
-  </li>
-  <li>
-    <p>Google Chrome, using Manifest v3. Theoretically the extension should work
-      on other Chromium-based browsers as well, but they are not officially supported.</p>
-  </li>
+  <li>Mozilla Firefox, using Manifest v2.</li>
+  <li>Google Chrome, using Manifest v3. Theoretically the extension should work
+    on other Chromium-based browsers as well, but they are not officially supported.</li>
 </ul>
 <h2>Obtaining the extension</h2>
 <aside class="admonition warning">
@@ -68,5 +64,48 @@
 <p>It's also possible to configure the <a href="#root/_help_WOcw2SLH6tbX">server</a> address
   if you don't run the desktop application, or want it to work without the
   desktop application running.</p>
+<h2>Testing development versions</h2>
+<p>Development versions are version pre-release versions, generally meant
+  for testing purposes. These are not available in the Google or Firefox
+  web stores, but can be downloaded from either:</p>
+<ul>
+  <li><a href="https://github.com/TriliumNext/Trilium/releases">GitHub Releases</a> by
+    looking for releases starting with <em>Web Clipper.</em>
+  </li>
+  <li>Artifacts in GitHub Actions, by looking for the <a href="https://github.com/TriliumNext/Trilium/actions/workflows/web-clipper.yml"><em>Deploy web clipper extension </em>workflow</a>.
+    Once a workflow run is selected, the ZIP files are available in the <em>Artifacts</em> section,
+    under the name <code spellcheck="false">web-clipper-extension</code>.</li>
+</ul>
+<h3>For Chrome</h3>
+<ol>
+  <li>Download <code spellcheck="false">trilium-web-clipper-[x.y.z]-chrome.zip</code>.</li>
+  <li
+ >Extract the archive.</li>
+    <li>In Chrome, navigate to <code spellcheck="false">chrome://extensions/</code>
+    </li>
+    <li>Toggle <em>Developer Mode</em> in top-right of the page.</li>
+    <li>Press the <em>Load unpacked</em> button near the header.</li>
+    <li>Point to the extracted directory from step (2).</li>
+</ol>
+<h3>For Firefox</h3>
+<aside class="admonition warning">
+  <p>Firefox prevents installation of unsigned packages in the “retail” version.
+    To be able to install extensions from disk, consider using <em>Firefox Developer Edition</em> or
+    a non-branded version of Firefox (e.g. <em>GNU IceCat</em>).</p>
+  <p>One time, go to <code spellcheck="false">about:config</code> and change
+    <code
+    spellcheck="false">xpinstall.signatures.required</code>to <code spellcheck="false">false</code>.</p>
+</aside>
+<ol>
+  <li>Navigate to <code spellcheck="false">about:addons</code>.</li>
+  <li>Select <em>Extensions</em> in the left-side navigation.</li>
+  <li>Press the <em>Gear</em> icon on the right of the <em>Manage Your Extensions</em> title.</li>
+  <li
+ >Select <em>Install Add-on From File…</em>
+    </li>
+    <li>Point it to <code spellcheck="false">trilium-web-clipper-[x.y.z]-firefox.zip</code>.</li>
+    <li
+   >Press the <em>Add</em> button to confirm.</li>
+</ol>
 <h2>Credits</h2>
 <p>Some parts of the code are based on the <a href="https://github.com/laurent22/joplin/tree/master/Clipper">Joplin Notes browser extension</a>.</p>

apps/server/src/assets/images/icon-installer-purple.svg

@@ -0,0 +1,309 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Generator: Adobe Illustrator 22.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+
+<svg
+   version="1.1"
+   id="Layer_1"
+   x="0px"
+   y="0px"
+   viewBox="0 0 256 256"
+   style="enable-background:new 0 0 256 256;"
+   xml:space="preserve"
+   sodipodi:docname="icon-installer-purple.svg"
+   inkscape:version="1.4.3 (0d15f75, 2025-12-25)"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"><defs
+   id="defs34" /><sodipodi:namedview
+   id="namedview34"
+   pagecolor="#ffffff"
+   bordercolor="#000000"
+   borderopacity="0.25"
+   inkscape:showpageshadow="2"
+   inkscape:pageopacity="0.0"
+   inkscape:pagecheckerboard="0"
+   inkscape:deskcolor="#d1d1d1"
+   inkscape:zoom="3.5449219"
+   inkscape:cx="96.61708"
+   inkscape:cy="167.70468"
+   inkscape:window-width="1536"
+   inkscape:window-height="1494"
+   inkscape:window-x="5312"
+   inkscape:window-y="379"
+   inkscape:window-maximized="0"
+   inkscape:current-layer="g20" />
+<style
+   type="text/css"
+   id="style1">
+	.st0{fill:#686768;}
+	.st1{fill:#808080;}
+	.st2{fill:url(#SVGID_1_);}
+	.st3{fill:url(#SVGID_2_);}
+	.st4{fill:url(#SVGID_3_);}
+	.st5{fill:#D9D9D9;}
+	.st6{fill:url(#SVGID_4_);}
+	.st7{opacity:0.47;}
+	.st8{fill:#5B5A5A;}
+	.st9{fill:#95C980;}
+	.st10{fill:#72B755;}
+	.st11{fill:#4FA52B;}
+	.st12{fill:#EE8C89;}
+	.st13{fill:#E96562;}
+	.st14{fill:#E33F3B;}
+	.st15{fill:#EFB075;}
+	.st16{fill:#E99547;}
+	.st17{fill:#E47B19;}
+	.st18{opacity:0.38;fill:url(#SVGID_5_);enable-background:new    ;}
+</style>
+<g
+   id="Layer_1_2_">
+	<g
+   id="Layer_1_1_">
+	</g>
+</g>
+<g
+   id="Layer_2_1_">
+	<polygon
+   class="st0"
+   points="69.5,48.6 69.3,93.1 4,95.2 3.3,93.7 29.6,53.4  "
+   id="polygon1" />
+	<path
+   class="st1"
+   d="M69.5,47l-0.2,46.1c0,0-66.3,1-66,0.6l26.1-41.8L69.5,47z"
+   id="path1" />
+	
+		<linearGradient
+   id="SVGID_1_"
+   gradientUnits="userSpaceOnUse"
+   x1="69.458"
+   y1="120.0202"
+   x2="219.2576"
+   y2="120.0202"
+   gradientTransform="matrix(1 0 0 1 0 8)">
+		<stop
+   offset="0"
+   style="stop-color:#E3E3E3"
+   id="stop1" />
+		<stop
+   offset="1"
+   style="stop-color:#F4F4F4"
+   id="stop2" />
+	</linearGradient>
+	<polygon
+   class="st2"
+   points="69.5,47 218.9,55.6 219.3,202.6 69.9,209.1  "
+   id="polygon2" />
+	
+		<linearGradient
+   id="SVGID_2_"
+   gradientUnits="userSpaceOnUse"
+   x1="29.2408"
+   y1="120.0202"
+   x2="69.8681"
+   y2="120.0202"
+   gradientTransform="matrix(1 0 0 1 0 8)">
+		<stop
+   offset="0"
+   style="stop-color:#D9D9D9"
+   id="stop3" />
+		<stop
+   offset="1"
+   style="stop-color:#D4D4D4"
+   id="stop4" />
+	</linearGradient>
+	<polygon
+   class="st3"
+   points="29.2,51.8 69.5,47 69.8,209.1 29.2,204.4  "
+   id="polygon4" />
+	
+		<linearGradient
+   id="SVGID_3_"
+   gradientUnits="userSpaceOnUse"
+   x1="151.9309"
+   y1="42.7213"
+   x2="142.8473"
+   y2="-43.5726"
+   gradientTransform="matrix(0.9941 1.431752e-03 1.431754e-03 1.1143 -3.0394 44.4335)">
+		<stop
+   offset="0"
+   style="stop-color:#B3B3B3"
+   id="stop5" />
+		<stop
+   offset="0.4752"
+   style="stop-color:#B5B5B5"
+   id="stop6" />
+		<stop
+   offset="0.6464"
+   style="stop-color:#BCBCBC"
+   id="stop7" />
+		<stop
+   offset="0.7685"
+   style="stop-color:#C7C7C7"
+   id="stop8" />
+		<stop
+   offset="0.8671"
+   style="stop-color:#D8D8D8"
+   id="stop9" />
+		<stop
+   offset="0.9506"
+   style="stop-color:#EEEEEE"
+   id="stop10" />
+		<stop
+   offset="1"
+   style="stop-color:#FFFFFF"
+   id="stop11" />
+	</linearGradient>
+	<polygon
+   class="st4"
+   points="219.3,98.5 97.4,93.2 69.5,47.3 218.9,55.6  "
+   id="polygon11" />
+	<polygon
+   class="st1"
+   points="102,85.3 251.2,93 252.8,91.1 72.2,48.9 69.5,47  "
+   id="polygon12" />
+	<polygon
+   class="st5"
+   points="252.8,91.1 128,84.6 102,82.9 69.8,47.3 219.1,55.6 233.6,71.4 252.3,90.6 252.3,90.6  "
+   id="polygon13" />
+	
+		<radialGradient
+   id="SVGID_4_"
+   cx="445.2994"
+   cy="-436.338"
+   r="4.0179"
+   gradientTransform="matrix(0.5088 -4.329579e-03 0.1464 14.7395 -92.0455 6569.5317)"
+   gradientUnits="userSpaceOnUse">
+		<stop
+   offset="0"
+   style="stop-color:#FFFFFF"
+   id="stop13" />
+		<stop
+   offset="6.758273e-02"
+   style="stop-color:#FFFFFF;stop-opacity:0.9324"
+   id="stop14" />
+		<stop
+   offset="1"
+   style="stop-color:#FFFFFF;stop-opacity:0"
+   id="stop15" />
+	</radialGradient>
+	<path
+   class="st6"
+   d="M72.2,152.5c0.2,26.2,0.9,42.4,0.1,42.4c-0.9,0-1.5-6.3-2.5-32.3c-1.1-26.1-1.4-85-0.5-85.1   C70.1,77.2,71.9,126.4,72.2,152.5z"
+   id="path15" />
+	<g
+   class="st7"
+   id="g17">
+		<path
+   class="st8"
+   d="M29.1,203.9l20.4,2.1c3.3,0.4,6.9,0.6,10.2,1.1l10.2,1.2h-0.1l74.7-3.2l37.4-1.7l9.3-0.4    c3.1-0.1,6.3-0.2,9.3-0.4l18.7-0.5l-18.7,1.2c-3.1,0.2-6.3,0.4-9.3,0.5l-9.3,0.4l-37.4,1.7l-74.5,3.2l0,0l0,0L59.7,208    c-3.3-0.4-6.8-0.9-10.2-1.4L29.1,203.9z"
+   id="path16" />
+		<path
+   class="st1"
+   d="M28.6,203.9c3.3,0.2,6.8,0.4,10.3,0.6s7.1,0.5,10.6,0.9l10.2,1.1l10.2,1.2l-0.1,1.1h-0.1v-1.1l74.8-3.1    l37.4-1.6l18.7-0.7l18.7-0.5v0.6l-18.7,1.1l-9.3,0.5l-9.3,0.4l-37.4,1.6l-74.7,3.1l0,0l0,0l-10.2-1.2l-10.2-1.4L29,203.8    L28.6,203.9z M30.3,204.1l19.2,2.5l10.2,1.4l10.2,1.2l0,0l74.7-3.3l37.4-1.7l9.3-0.4l9.3-0.5l18.7-1.2v0.6l-18.7,0.5l-18.7,0.7    l-37.4,1.7l-74.7,3.3v-1.1h0.1l-0.1,1.1l-10.2-1.2l-10.2-1.1c-3.3-0.4-6.5-0.6-9.7-1.1C36.6,205,33.5,204.5,30.3,204.1z"
+   id="path17" />
+	</g>
+	<g
+   id="g28">
+		<g
+   id="g27">
+			<g
+   id="g20">
+				<path
+   class="st9"
+   d="M181.4,136.4c-8.7,6.8-23.5,8.1-33.8,5.5c2.6-2.3,3.8-3.4,6.3-5.8c2.5-2.2,3.6-3.2,6-5.4      c8.4-7.4,12.5-10.8,20.7-17.7c-8.5,6.4-12.9,9.6-21.6,16.4c-2.5,2-3.7,2.8-6.1,4.8c-2.6,2-3.8,3.1-6.4,5      c-0.5-9.5,1.1-22.1,10.3-28.9c0.7-0.6,1.7-1.1,2.6-1.7c1.2-0.6,2.5-1.4,3.9-1.8c11.4-4.4,24.8-7.5,37.3-5.9      c0.7,6.5-4.9,18.9-11.8,28.2c-1,1.2-1.8,2.5-2.8,3.6C184.2,133.9,182.7,135.3,181.4,136.4z"
+   id="path18"
+   style="fill:#ab60e3;fill-opacity:1" />
+				<path
+   class="st10"
+   d="M185.6,132.4c-9.2,6-22.6,5.8-31.7,3.7c2.5-2.2,3.6-3.2,6-5.4c8.4-7.4,12.5-10.8,20.7-17.7      c-8.5,6.4-12.9,9.6-21.6,16.4c-2.5,2-3.7,2.8-6.1,4.8c-0.5-7.9,0.4-18.4,6.5-25.5c1.2-0.6,2.5-1.4,3.9-1.8      c11.4-4.6,24.8-7.5,37.3-5.9c0.7,6.5-4.9,18.9-11.8,28.2C187.5,130.1,186.5,131.3,185.6,132.4z"
+   id="path19"
+   style="fill:#8038b8;fill-opacity:1" />
+				<path
+   class="st11"
+   d="M188.5,128.9c-8.9,4.2-20.5,3.8-28.5,1.8c8.4-7.4,12.5-10.8,20.7-17.7c-8.5,6.4-12.9,9.6-21.6,16.4      c-0.5-6.8,0-15.7,4.3-22.6c11.4-4.4,24.8-7.5,37.3-5.9C201.2,107.4,195.5,119.9,188.5,128.9z"
+   id="path20"
+   style="fill:#560a8f;fill-opacity:1" />
+			</g>
+			<g
+   id="g23">
+				<path
+   class="st12"
+   d="M140.4,169.2c-3.6-8.9,0.5-19.6,4.7-26c1.1,2.5,1.6,3.7,2.7,6c1.1,2.3,1.6,3.4,2.6,5.7      c3.7,7.9,5.5,11.8,9.3,19.2c-3.1-7.6-4.7-11.6-7.9-19.7c-0.9-2.2-1.4-3.3-2.2-5.5c-1-2.3-1.5-3.6-2.3-6      c7.4,2.2,16.8,6.6,20.3,15c0.2,0.7,0.5,1.5,0.7,2.2c0.2,1,0.5,2.1,0.6,3.2c1.5,9.6-0.9,23-4.4,28c-5.5-0.9-14.5-7.7-20-15.1      c-0.7-1-1.5-2-2.1-3C141.7,171.9,141,170.6,140.4,169.2z"
+   id="path21"
+   style="fill:#bb9dd2;fill-opacity:1" />
+				<path
+   class="st13"
+   d="M142.5,173.3c-2.3-8.4,1.5-18.1,5.4-24c1.1,2.3,1.6,3.4,2.6,5.7c3.7,7.9,5.5,11.8,9.3,19.2      c-3.1-7.6-4.7-11.6-7.9-19.7c-0.9-2.2-1.4-3.3-2.2-5.5c6.3,1.7,14.4,5.2,18.7,11.3c0.2,1,0.5,2.1,0.6,3.2      c1.5,9.6-0.9,23-4.4,27.9c-5.5-0.9-14.5-7.7-20-15.1C143.9,175.2,143.3,174.3,142.5,173.3z"
+   id="path22"
+   style="fill:#9a6cbc;fill-opacity:1" />
+				<path
+   class="st14"
+   d="M144.6,176.2c-1.1-7.5,2.5-16,5.9-21.3c3.7,7.9,5.5,11.8,9.3,19.2c-3.1-7.6-4.7-11.6-7.9-19.7      c5.5,1.4,12.5,4.1,17.2,8.9c1.5,9.6-0.9,23-4.4,27.9C159,190.4,150.1,183.6,144.6,176.2z"
+   id="path23"
+   style="fill:#783ba5;fill-opacity:1" />
+			</g>
+			<g
+   id="g26">
+				<path
+   class="st15"
+   d="M125.9,116.6c10.5,4.3,16.5,15.4,18.8,23.4c-3-1-4.3-1.4-7.3-2.3c-2.8-0.9-4.2-1.4-6.9-2.2      c-9.7-3.2-14.5-4.9-23.9-8.2c9.1,3.8,13.7,5.8,23.1,9.6c2.6,1.1,3.9,1.6,6.5,2.7c2.7,1.1,4.1,1.6,6.9,2.7      c-7.4,4.2-18.4,8.4-28.3,4.6c-0.7-0.2-1.7-0.7-2.6-1.2c-1-0.6-2.2-1.2-3.3-2.1c-8.5-6-17.6-16.7-20.9-26.8      c4.9-3.4,17.6-4.2,28.3-2.3c1.5,0.2,2.8,0.5,4.3,0.9C122.7,115.4,124.3,115.8,125.9,116.6z"
+   id="path24"
+   style="fill:#ab60e3;fill-opacity:1" />
+				<path
+   class="st16"
+   d="M120.7,114.9c9.1,4.8,14.5,15,16.7,22.6c-2.8-0.9-4.2-1.4-6.9-2.2c-9.7-3.2-14.5-4.9-23.9-8.2      c9.1,3.8,13.7,5.8,23,9.6c2.6,1.1,3.9,1.6,6.5,2.7c-6.1,3.6-15.4,7.4-23.9,6c-1-0.6-2.2-1.2-3.3-2.1c-8.5-6-17.6-16.7-20.9-26.8      c4.9-3.4,17.6-4.2,28.3-2.3C118,114.2,119.4,114.4,120.7,114.9z"
+   id="path25"
+   style="fill:#8038b8;fill-opacity:1" />
+				<path
+   class="st17"
+   d="M116.6,113.9c7.5,5.3,12.1,14.4,14,21.3c-9.7-3.2-14.5-4.9-23.9-8.2c9.1,3.8,13.7,5.8,23.1,9.6      c-5.4,3.2-13,6.6-20.7,6.5c-8.5-6-17.6-16.7-20.9-26.8C93.2,112.8,105.7,112,116.6,113.9z"
+   id="path26"
+   style="fill:#6f2796;fill-opacity:1" />
+			</g>
+		</g>
+	</g>
+	
+		<linearGradient
+   id="SVGID_5_"
+   gradientUnits="userSpaceOnUse"
+   x1="241.7537"
+   y1="104.2354"
+   x2="160.0455"
+   y2="55.1756"
+   gradientTransform="matrix(1 0 0 -1 0 256)">
+		<stop
+   offset="0.1721"
+   style="stop-color:#C7C7C7"
+   id="stop28" />
+		<stop
+   offset="0.3798"
+   style="stop-color:#D8D8D8"
+   id="stop29" />
+		<stop
+   offset="0.6814"
+   style="stop-color:#DADADA"
+   id="stop30" />
+		<stop
+   offset="0.7898"
+   style="stop-color:#E1E1E1"
+   id="stop31" />
+		<stop
+   offset="0.867"
+   style="stop-color:#ECECEC"
+   id="stop32" />
+		<stop
+   offset="0.8745"
+   style="stop-color:#EEEEEE"
+   id="stop33" />
+		<stop
+   offset="1"
+   style="stop-color:#FFFFFF"
+   id="stop34" />
+	</linearGradient>
+	<path
+   class="st18"
+   d="M219.1,128.3c-1,0.4-3.3,15.7-3.7,19.2c-0.7,5.8-3.9,28.7-11.1,41.2c-7.3,12.8-15.7,13.7-16.4,14.6l31.1-0.9   C219.1,179.1,219.1,151.5,219.1,128.3L219.1,128.3z"
+   id="path34" />
+</g>
+</svg>

apps/server/src/assets/translations/de/server.json

@@ -65,7 +65,7 @@
     "toggle-image-properties": "Bildattribute umschalten",
     "toggle-owned-attributes": "Eigene Attribute umschalten",
     "toggle-inherited-attributes": "Vererbte Attribute umschalten",
-    "toggle-promoted-attributes": "Beworbene Attribute umschalten",
+    "toggle-promoted-attributes": "Hervorgehobene Attribute umschalten",
     "toggle-link-map": "Link-Karte umschalten",
     "toggle-note-info": "Notizinformationen umschalten",
     "toggle-note-paths": "Notizpfade umschalten",
@@ -216,13 +216,13 @@
     "launch-bar-templates-title": "Startleiste Vorlagen",
     "base-abstract-launcher-title": "Basis Abstrakte Startleiste",
     "command-launcher-title": "Befehlslauncher",
-    "note-launcher-title": "Notiz Launcher",
+    "note-launcher-title": "Notiz-Starter",
     "script-launcher-title": "Skript-Starter",
     "built-in-widget-title": "Eingebautes Widget",
     "spacer-title": "Freifeld",
     "custom-widget-title": "Benutzerdefiniertes Widget",
-    "launch-bar-title": "Launchbar",
-    "available-launchers-title": "Verfügbare Launchers",
+    "launch-bar-title": "Starterleiste",
+    "available-launchers-title": "Verfügbare Starter",
     "go-to-previous-note-title": "Zur vorherigen Notiz gehen",
     "go-to-next-note-title": "Zur nächsten Notiz gehen",
     "new-note-title": "Neue Notiz",
@@ -248,7 +248,7 @@
     "sync-title": "Synchronisation",
     "other": "Weitere",
     "advanced-title": "Erweitert",
-    "visible-launchers-title": "Sichtbare Launcher",
+    "visible-launchers-title": "Sichtbare Starter",
     "user-guide": "Nutzerhandbuch",
     "jump-to-note-title": "Springe zu...",
     "llm-chat-title": "Chat mit Notizen",
@@ -391,7 +391,7 @@
     "toggle-ribbon-tab-image-properties": "Registerkarte Bilder-Eigenschaften umschalten",
     "toggle-ribbon-tab-owned-attributes": "Registerkarte Besitzerattribute umschalten",
     "toggle-ribbon-tab-inherited-attributes": "Registerkarte geerbte Attribute umschalten",
-    "toggle-ribbon-tab-promoted-attributes": "Registerkarte verliehene Attribute umschalten",
+    "toggle-ribbon-tab-promoted-attributes": "Registerkarte hervorgehobene Attribute umschalten",
     "toggle-ribbon-tab-note-map": "Registerkarte Notizkarte umschalten",
     "toggle-ribbon-tab-note-info": "Registerkarte Notiz-Info umschalten",
     "toggle-ribbon-tab-note-paths": "Registerkarte Notiz-Pfad umschalten",

apps/server/src/assets/translations/en/server.json

@@ -356,7 +356,8 @@
     "visible-launchers-title": "Visible Launchers",
     "user-guide": "User Guide",
     "localization": "Language & Region",
-    "inbox-title": "Inbox"
+    "inbox-title": "Inbox",
+    "tab-switcher-title": "Tab Switcher"
   },
   "notes": {
     "new-note": "New note",

apps/server/src/assets/translations/es/server.json

@@ -293,7 +293,7 @@
   "migration": {
     "old_version": "La migración directa desde tu versión actual no está soportada. Por favor actualice a v0.60.4 primero y solo después a esta versión.",
     "error_message": "Error durante la migración a la versión {{version}}: {{stack}}",
-    "wrong_db_version": "La versión de la DB {{version}} es más nueva que la versión de la DB actual {{targetVersion}}, lo que significa que fue creada por una versión más reciente e incompatible de Trilium. Actualice a la última versión de Trilium para resolver este problema."
+    "wrong_db_version": "La versión de la base de datos {{version}} es más nueva de lo que la aplicación espera {{targetVersion}}, lo que significa que fue creada por una versión más reciente e incompatible de Trilium. Actualice a la última versión de Trilium para resolver este problema."
   },
   "modals": {
     "error_title": "Error"

apps/server/src/assets/translations/id/server.json

@@ -59,7 +59,7 @@
     "show-backend-log": "Buka halaman \"Log Backend\"",
     "show-help": "Buka Panduan Pengguna bawaan",
     "show-cheatsheet": "Menampilkan modal dengan operasi keyboard umum",
-    "text-note-operations": "Operasi catatan teks",
+    "text-note-operations": "Tindakan catatan teks",
     "add-link-to-text": "Buka dialog untuk menambahkan tautan ke teks",
     "follow-link-under-cursor": "Ikuti tautan tempat tanda sisipan ditempatkan",
     "insert-date-and-time-to-text": "Masukkan tanggal & waktu saat ini ke dalam teks",
@@ -71,7 +71,7 @@
     "add-new-label": "Buat label baru",
     "create-new-relation": "Buat relasi baru",
     "ribbon-tabs": "Tab pita",
-    "toggle-basic-properties": "Alihkan Properti Dasar",
+    "toggle-basic-properties": "Tampilkan/Sembunyikan Properti Dasar",
     "toggle-file-properties": "Alihkan Properti File",
     "toggle-image-properties": "Alihkan Properti Gambar",
     "toggle-owned-attributes": "Alihkan Atribut yang Dimiliki",

apps/server/src/assets/translations/nb-NO/server.json

@@ -25,7 +25,8 @@
   "login": {
     "title": "Logg inn",
     "password": "Passord",
-    "button": "Logg inn"
+    "button": "Logg inn",
+    "remember-me": "Husk meg"
   },
   "setup_sync-from-server": {
     "server-host-placeholder": "https://<hostnavn>:<port>",

apps/server/src/migrations/0234__add_fts5_search.ts

@@ -0,0 +1,566 @@
+/**
+ * Migration to add FTS5 full-text search support and strategic performance indexes
+ *
+ * This migration:
+ * 1. Creates an FTS5 virtual table for full-text searching of notes
+ * 2. Populates it with existing note content
+ * 3. Creates triggers to keep the FTS table synchronized with note changes
+ * 4. Creates an FTS5 virtual table for full-text searching of attributes
+ * 5. Populates it with existing attributes and creates synchronization triggers
+ * 6. Adds strategic composite and covering indexes for improved query performance
+ * 7. Optimizes common query patterns identified through performance analysis
+ */
+
+import sql from "../services/sql.js";
+import log from "../services/log.js";
+
+function createNotesFtsTable(): void {
+    log.info("Creating FTS5 virtual table for full-text search...");
+
+    // Create FTS5 virtual table
+    // We store noteId, title, and content for searching
+    sql.executeScript(`
+        -- Create FTS5 virtual table with trigram tokenizer
+        -- Trigram tokenizer provides language-agnostic substring matching:
+        -- 1. Fast substring matching (50-100x speedup for LIKE queries without wildcards)
+        -- 2. Case-insensitive search without custom collation
+        -- 3. No language-specific stemming assumptions (works for all languages)
+        -- 4. Boolean operators (AND, OR, NOT) and phrase matching with quotes
+        --
+        -- IMPORTANT: Trigram requires minimum 3-character tokens for matching
+        -- detail='full' enables phrase queries (required for exact match with = operator)
+        -- and provides position info for highlight() function
+        -- Note: Using detail='full' instead of detail='none' increases index size by ~50%
+        -- but is necessary to support phrase queries like "exact phrase"
+        CREATE VIRTUAL TABLE IF NOT EXISTS notes_fts USING fts5(
+            noteId UNINDEXED,
+            title,
+            content,
+            tokenize = 'trigram',
+            detail = 'full'
+        );
+    `);
+}
+
+function populateNotesFtsIndex(): void {
+    log.info("Populating FTS5 table with existing note content...");
+
+    const eligibleCount = sql.getValue<number>(`
+        SELECT COUNT(*) FROM notes n
+        LEFT JOIN blobs b ON n.blobId = b.blobId
+        WHERE n.type IN ('text','code','mermaid','canvas','mindMap')
+            AND n.isDeleted = 0 AND n.isProtected = 0
+    `) || 0;
+
+    log.info(`Indexing ${eligibleCount} notes into FTS5 (this may take a moment for large databases)...`);
+    const startTime = Date.now();
+
+    // Disable automerge to prevent incremental b-tree merging during bulk insert.
+    // Raise crisismerge threshold to prevent blocking merges.
+    // This is the recommended approach from SQLite FTS5 docs for bulk operations.
+    sql.execute(`INSERT INTO notes_fts(notes_fts, rank) VALUES('automerge', 0)`);
+    sql.execute(`INSERT INTO notes_fts(notes_fts, rank) VALUES('crisismerge', 64)`);
+
+    sql.execute(`
+        INSERT INTO notes_fts (noteId, title, content)
+        SELECT n.noteId, n.title, COALESCE(b.content, '')
+        FROM notes n
+        LEFT JOIN blobs b ON n.blobId = b.blobId
+        WHERE n.type IN ('text','code','mermaid','canvas','mindMap')
+            AND n.isDeleted = 0 AND n.isProtected = 0
+    `);
+
+    // Restore defaults and optimize: merge all b-trees into one for optimal query performance.
+    sql.execute(`INSERT INTO notes_fts(notes_fts, rank) VALUES('automerge', 4)`);
+    sql.execute(`INSERT INTO notes_fts(notes_fts, rank) VALUES('crisismerge', 16)`);
+    sql.execute(`INSERT INTO notes_fts(notes_fts) VALUES('optimize')`);
+
+    log.info(`Completed FTS indexing of ${eligibleCount} notes in ${Date.now() - startTime}ms`);
+}
+
+function createNotesFtsTriggers(): void {
+    // Create triggers to keep FTS table synchronized
+    log.info("Creating FTS synchronization triggers...");
+
+    // Drop all existing triggers first to ensure clean state
+    sql.execute(`DROP TRIGGER IF EXISTS notes_fts_insert`);
+    sql.execute(`DROP TRIGGER IF EXISTS notes_fts_update`);
+    sql.execute(`DROP TRIGGER IF EXISTS notes_fts_delete`);
+    sql.execute(`DROP TRIGGER IF EXISTS notes_fts_soft_delete`);
+    sql.execute(`DROP TRIGGER IF EXISTS notes_fts_blob_insert`);
+    sql.execute(`DROP TRIGGER IF EXISTS notes_fts_blob_update`);
+    sql.execute(`DROP TRIGGER IF EXISTS notes_fts_protect`);
+    sql.execute(`DROP TRIGGER IF EXISTS notes_fts_unprotect`);
+
+    // Create improved triggers that handle all SQL operations properly
+    // including INSERT OR REPLACE and INSERT ... ON CONFLICT ... DO UPDATE (upsert)
+
+    // Trigger for INSERT operations on notes
+    sql.execute(`
+        CREATE TRIGGER notes_fts_insert
+        AFTER INSERT ON notes
+        WHEN NEW.type IN ('text', 'code', 'mermaid', 'canvas', 'mindMap')
+            AND NEW.isDeleted = 0
+            AND NEW.isProtected = 0
+        BEGIN
+            -- First delete any existing FTS entry (in case of INSERT OR REPLACE)
+            DELETE FROM notes_fts WHERE noteId = NEW.noteId;
+
+            -- Then insert the new entry, using LEFT JOIN to handle missing blobs
+            INSERT INTO notes_fts (noteId, title, content)
+            SELECT
+                NEW.noteId,
+                NEW.title,
+                COALESCE(b.content, '')  -- Use empty string if blob doesn't exist yet
+            FROM (SELECT NEW.noteId) AS note_select
+            LEFT JOIN blobs b ON b.blobId = NEW.blobId;
+        END
+    `);
+
+    // Trigger for UPDATE operations on notes table
+    // Fires for ANY update to searchable notes to ensure FTS stays in sync
+    sql.execute(`
+        CREATE TRIGGER notes_fts_update
+        AFTER UPDATE ON notes
+        WHEN NEW.type IN ('text', 'code', 'mermaid', 'canvas', 'mindMap')
+            -- Fire on any change, not just specific columns, to handle all upsert scenarios
+        BEGIN
+            -- Always delete the old entry
+            DELETE FROM notes_fts WHERE noteId = NEW.noteId;
+
+            -- Insert new entry if note is not deleted and not protected
+            INSERT INTO notes_fts (noteId, title, content)
+            SELECT
+                NEW.noteId,
+                NEW.title,
+                COALESCE(b.content, '')  -- Use empty string if blob doesn't exist yet
+            FROM (SELECT NEW.noteId) AS note_select
+            LEFT JOIN blobs b ON b.blobId = NEW.blobId
+            WHERE NEW.isDeleted = 0
+                AND NEW.isProtected = 0;
+        END
+    `);
+
+    // Trigger for DELETE operations on notes
+    sql.execute(`
+        CREATE TRIGGER notes_fts_delete
+        AFTER DELETE ON notes
+        BEGIN
+            DELETE FROM notes_fts WHERE noteId = OLD.noteId;
+        END
+    `);
+
+    // Trigger for soft delete (isDeleted = 1)
+    sql.execute(`
+        CREATE TRIGGER notes_fts_soft_delete
+        AFTER UPDATE ON notes
+        WHEN OLD.isDeleted = 0 AND NEW.isDeleted = 1
+        BEGIN
+            DELETE FROM notes_fts WHERE noteId = NEW.noteId;
+        END
+    `);
+
+    // Trigger for notes becoming protected
+    sql.execute(`
+        CREATE TRIGGER notes_fts_protect
+        AFTER UPDATE ON notes
+        WHEN OLD.isProtected = 0 AND NEW.isProtected = 1
+        BEGIN
+            DELETE FROM notes_fts WHERE noteId = NEW.noteId;
+        END
+    `);
+
+    // Trigger for notes becoming unprotected
+    sql.execute(`
+        CREATE TRIGGER notes_fts_unprotect
+        AFTER UPDATE ON notes
+        WHEN OLD.isProtected = 1 AND NEW.isProtected = 0
+            AND NEW.type IN ('text', 'code', 'mermaid', 'canvas', 'mindMap')
+            AND NEW.isDeleted = 0
+        BEGIN
+            DELETE FROM notes_fts WHERE noteId = NEW.noteId;
+
+            INSERT INTO notes_fts (noteId, title, content)
+            SELECT
+                NEW.noteId,
+                NEW.title,
+                COALESCE(b.content, '')
+            FROM (SELECT NEW.noteId) AS note_select
+            LEFT JOIN blobs b ON b.blobId = NEW.blobId;
+        END
+    `);
+
+    // Trigger for INSERT operations on blobs
+    // Uses INSERT OR REPLACE for efficiency with deduplicated blobs
+    sql.execute(`
+        CREATE TRIGGER notes_fts_blob_insert
+        AFTER INSERT ON blobs
+        BEGIN
+            -- Use INSERT OR REPLACE for atomic update
+            -- This handles the case where FTS entries may already exist
+            INSERT OR REPLACE INTO notes_fts (noteId, title, content)
+            SELECT
+                n.noteId,
+                n.title,
+                NEW.content
+            FROM notes n
+            WHERE n.blobId = NEW.blobId
+                AND n.type IN ('text', 'code', 'mermaid', 'canvas', 'mindMap')
+                AND n.isDeleted = 0
+                AND n.isProtected = 0;
+        END
+    `);
+
+    // Trigger for UPDATE operations on blobs
+    // Uses INSERT OR REPLACE for efficiency
+    sql.execute(`
+        CREATE TRIGGER notes_fts_blob_update
+        AFTER UPDATE ON blobs
+        BEGIN
+            -- Use INSERT OR REPLACE for atomic update
+            INSERT OR REPLACE INTO notes_fts (noteId, title, content)
+            SELECT
+                n.noteId,
+                n.title,
+                NEW.content
+            FROM notes n
+            WHERE n.blobId = NEW.blobId
+                AND n.type IN ('text', 'code', 'mermaid', 'canvas', 'mindMap')
+                AND n.isDeleted = 0
+                AND n.isProtected = 0;
+        END
+    `);
+
+    log.info("FTS5 triggers created successfully");
+}
+
+function createPerformanceIndexes(): void {
+    log.info("Adding strategic performance indexes...");
+    const startTime = Date.now();
+    let indexCount = 0;
+
+    // ========================================
+    // NOTES TABLE INDEXES
+    // ========================================
+
+    // Composite index for common search filters
+    log.info("Creating composite index on notes table for search filters...");
+    sql.executeScript(`
+        DROP INDEX IF EXISTS IDX_notes_search_composite;
+        CREATE INDEX IF NOT EXISTS IDX_notes_search_composite
+        ON notes (isDeleted, type, mime, dateModified DESC);
+    `);
+    indexCount++;
+
+    // Covering index for note metadata queries
+    log.info("Creating covering index for note metadata...");
+    sql.executeScript(`
+        DROP INDEX IF EXISTS IDX_notes_metadata_covering;
+        CREATE INDEX IF NOT EXISTS IDX_notes_metadata_covering
+        ON notes (noteId, isDeleted, type, mime, title, dateModified, isProtected);
+    `);
+    indexCount++;
+
+    // Index for protected notes filtering
+    log.info("Creating index for protected notes...");
+    sql.executeScript(`
+        DROP INDEX IF EXISTS IDX_notes_protected_deleted;
+        CREATE INDEX IF NOT EXISTS IDX_notes_protected_deleted
+        ON notes (isProtected, isDeleted)
+        WHERE isProtected = 1;
+    `);
+    indexCount++;
+
+    // ========================================
+    // BRANCHES TABLE INDEXES
+    // ========================================
+
+    // Composite index for tree traversal
+    log.info("Creating composite index on branches for tree traversal...");
+    sql.executeScript(`
+        DROP INDEX IF EXISTS IDX_branches_tree_traversal;
+        CREATE INDEX IF NOT EXISTS IDX_branches_tree_traversal
+        ON branches (parentNoteId, isDeleted, notePosition);
+    `);
+    indexCount++;
+
+    // Covering index for branch queries
+    log.info("Creating covering index for branch queries...");
+    sql.executeScript(`
+        DROP INDEX IF EXISTS IDX_branches_covering;
+        CREATE INDEX IF NOT EXISTS IDX_branches_covering
+        ON branches (noteId, parentNoteId, isDeleted, notePosition, prefix);
+    `);
+    indexCount++;
+
+    // Index for finding all parents of a note
+    log.info("Creating index for reverse tree lookup...");
+    sql.executeScript(`
+        DROP INDEX IF EXISTS IDX_branches_note_parents;
+        CREATE INDEX IF NOT EXISTS IDX_branches_note_parents
+        ON branches (noteId, isDeleted)
+        WHERE isDeleted = 0;
+    `);
+    indexCount++;
+
+    // ========================================
+    // ATTRIBUTES TABLE INDEXES
+    // ========================================
+
+    // Composite index for attribute searches
+    log.info("Creating composite index on attributes for search...");
+    sql.executeScript(`
+        DROP INDEX IF EXISTS IDX_attributes_search_composite;
+        CREATE INDEX IF NOT EXISTS IDX_attributes_search_composite
+        ON attributes (name, value, isDeleted);
+    `);
+    indexCount++;
+
+    // Covering index for attribute queries
+    log.info("Creating covering index for attribute queries...");
+    sql.executeScript(`
+        DROP INDEX IF EXISTS IDX_attributes_covering;
+        CREATE INDEX IF NOT EXISTS IDX_attributes_covering
+        ON attributes (noteId, name, value, type, isDeleted, position);
+    `);
+    indexCount++;
+
+    // Index for inherited attributes
+    log.info("Creating index for inherited attributes...");
+    sql.executeScript(`
+        DROP INDEX IF EXISTS IDX_attributes_inheritable;
+        CREATE INDEX IF NOT EXISTS IDX_attributes_inheritable
+        ON attributes (isInheritable, isDeleted)
+        WHERE isInheritable = 1 AND isDeleted = 0;
+    `);
+    indexCount++;
+
+    // Index for specific attribute types
+    log.info("Creating index for label attributes...");
+    sql.executeScript(`
+        DROP INDEX IF EXISTS IDX_attributes_labels;
+        CREATE INDEX IF NOT EXISTS IDX_attributes_labels
+        ON attributes (type, name, value)
+        WHERE type = 'label' AND isDeleted = 0;
+    `);
+    indexCount++;
+
+    log.info("Creating index for relation attributes...");
+    sql.executeScript(`
+        DROP INDEX IF EXISTS IDX_attributes_relations;
+        CREATE INDEX IF NOT EXISTS IDX_attributes_relations
+        ON attributes (type, name, value)
+        WHERE type = 'relation' AND isDeleted = 0;
+    `);
+    indexCount++;
+
+    // ========================================
+    // BLOBS TABLE INDEXES
+    // ========================================
+
+    // Index for blob content size filtering
+    log.info("Creating index for blob content size...");
+    sql.executeScript(`
+        DROP INDEX IF EXISTS IDX_blobs_content_size;
+        CREATE INDEX IF NOT EXISTS IDX_blobs_content_size
+        ON blobs (blobId, LENGTH(content));
+    `);
+    indexCount++;
+
+    // ========================================
+    // ATTACHMENTS TABLE INDEXES
+    // ========================================
+
+    // Composite index for attachment queries
+    log.info("Creating composite index for attachments...");
+    sql.executeScript(`
+        DROP INDEX IF EXISTS IDX_attachments_composite;
+        CREATE INDEX IF NOT EXISTS IDX_attachments_composite
+        ON attachments (ownerId, role, isDeleted, position);
+    `);
+    indexCount++;
+
+    // ========================================
+    // REVISIONS TABLE INDEXES
+    // ========================================
+
+    // Composite index for revision queries
+    log.info("Creating composite index for revisions...");
+    sql.executeScript(`
+        DROP INDEX IF EXISTS IDX_revisions_note_date;
+        CREATE INDEX IF NOT EXISTS IDX_revisions_note_date
+        ON revisions (noteId, utcDateCreated DESC);
+    `);
+    indexCount++;
+
+    // ========================================
+    // ENTITY_CHANGES TABLE INDEXES
+    // ========================================
+
+    // Composite index for sync operations
+    log.info("Creating composite index for entity changes sync...");
+    sql.executeScript(`
+        DROP INDEX IF EXISTS IDX_entity_changes_sync;
+        CREATE INDEX IF NOT EXISTS IDX_entity_changes_sync
+        ON entity_changes (isSynced, utcDateChanged);
+    `);
+    indexCount++;
+
+    // ========================================
+    // RECENT_NOTES TABLE INDEXES
+    // ========================================
+
+    // Index for recent notes ordering
+    log.info("Creating index for recent notes...");
+    sql.executeScript(`
+        DROP INDEX IF EXISTS IDX_recent_notes_date;
+        CREATE INDEX IF NOT EXISTS IDX_recent_notes_date
+        ON recent_notes (utcDateCreated DESC);
+    `);
+    indexCount++;
+
+    // ========================================
+    // ANALYZE TABLES FOR QUERY PLANNER
+    // ========================================
+
+    log.info("Running ANALYZE to update SQLite query planner statistics...");
+    sql.executeScript(`
+        ANALYZE notes;
+        ANALYZE branches;
+        ANALYZE attributes;
+        ANALYZE blobs;
+        ANALYZE attachments;
+        ANALYZE revisions;
+        ANALYZE entity_changes;
+        ANALYZE recent_notes;
+    `);
+
+    const duration = Date.now() - startTime;
+    log.info(`Performance index creation completed in ${duration}ms (${indexCount} indexes created)`);
+}
+
+function setupAttributesFts(): void {
+    log.info("Creating FTS5 index for attributes...");
+
+    // Create FTS5 virtual table for attributes
+    // IMPORTANT: Trigram requires minimum 3-character tokens for matching
+    // detail='full' enables phrase queries (required for exact match with = operator)
+    // and provides position info for highlight() function
+    sql.execute(`
+        CREATE VIRTUAL TABLE IF NOT EXISTS attributes_fts USING fts5(
+            attributeId UNINDEXED,
+            noteId UNINDEXED,
+            name,
+            value,
+            tokenize = 'trigram',
+            detail = 'full'
+        )
+    `);
+
+    log.info("Populating attributes_fts table...");
+
+    // Populate FTS table with existing attributes (non-deleted only)
+    const attrStartTime = Date.now();
+
+    // Disable automerge to prevent incremental b-tree merging during bulk insert.
+    // Raise crisismerge threshold to prevent blocking merges.
+    sql.execute(`INSERT INTO attributes_fts(attributes_fts, rank) VALUES('automerge', 0)`);
+    sql.execute(`INSERT INTO attributes_fts(attributes_fts, rank) VALUES('crisismerge', 64)`);
+
+    sql.execute(`
+        INSERT INTO attributes_fts (attributeId, noteId, name, value)
+        SELECT
+            attributeId,
+            noteId,
+            name,
+            COALESCE(value, '')
+        FROM attributes
+        WHERE isDeleted = 0
+    `);
+
+    // Restore defaults and optimize: merge all b-trees into one for optimal query performance.
+    sql.execute(`INSERT INTO attributes_fts(attributes_fts, rank) VALUES('automerge', 4)`);
+    sql.execute(`INSERT INTO attributes_fts(attributes_fts, rank) VALUES('crisismerge', 16)`);
+    sql.execute(`INSERT INTO attributes_fts(attributes_fts) VALUES('optimize')`);
+
+    const populateTime = Date.now() - attrStartTime;
+    const attrCount = sql.getValue<number>(`SELECT COUNT(*) FROM attributes_fts`) || 0;
+    log.info(`Populated ${attrCount} attributes in ${populateTime}ms`);
+
+    // Create triggers to keep FTS index synchronized with attributes table
+
+    // Trigger 1: INSERT - Add new attributes to FTS
+    sql.execute(`
+        CREATE TRIGGER attributes_fts_insert
+        AFTER INSERT ON attributes
+        WHEN NEW.isDeleted = 0
+        BEGIN
+            INSERT INTO attributes_fts (attributeId, noteId, name, value)
+            VALUES (NEW.attributeId, NEW.noteId, NEW.name, COALESCE(NEW.value, ''));
+        END
+    `);
+
+    // Trigger 2: UPDATE - Update FTS when attributes change
+    sql.execute(`
+        CREATE TRIGGER attributes_fts_update
+        AFTER UPDATE ON attributes
+        BEGIN
+            -- Remove old entry
+            DELETE FROM attributes_fts WHERE attributeId = OLD.attributeId;
+
+            -- Add new entry if not deleted
+            INSERT INTO attributes_fts (attributeId, noteId, name, value)
+            SELECT NEW.attributeId, NEW.noteId, NEW.name, COALESCE(NEW.value, '')
+            WHERE NEW.isDeleted = 0;
+        END
+    `);
+
+    // Trigger 3: DELETE - Remove from FTS
+    sql.execute(`
+        CREATE TRIGGER attributes_fts_delete
+        AFTER DELETE ON attributes
+        BEGIN
+            DELETE FROM attributes_fts WHERE attributeId = OLD.attributeId;
+        END
+    `);
+
+    // Trigger 4: Soft delete (isDeleted = 1) - Remove from FTS
+    sql.execute(`
+        CREATE TRIGGER attributes_fts_soft_delete
+        AFTER UPDATE ON attributes
+        WHEN OLD.isDeleted = 0 AND NEW.isDeleted = 1
+        BEGIN
+            DELETE FROM attributes_fts WHERE attributeId = NEW.attributeId;
+        END
+    `);
+
+    log.info("Attributes FTS5 setup completed successfully");
+}
+
+function cleanupLegacyTables(): void {
+    // Remove tables from previous custom SQLite search implementation
+    // that has been replaced by FTS5
+    log.info("Cleaning up legacy custom search tables...");
+
+    sql.executeScript(`DROP TABLE IF EXISTS note_search_content`);
+    sql.executeScript(`DROP TABLE IF EXISTS note_tokens`);
+
+    // Clean up any entity changes for these tables
+    sql.execute(`
+        DELETE FROM entity_changes
+        WHERE entityName IN ('note_search_content', 'note_tokens')
+    `);
+}
+
+export default function addFTS5SearchAndPerformanceIndexes() {
+    log.info("Starting FTS5 and performance optimization migration...");
+
+    createNotesFtsTable();
+    populateNotesFtsIndex();
+    createNotesFtsTriggers();
+    createPerformanceIndexes();
+    setupAttributesFts();
+    cleanupLegacyTables();
+
+    log.info("FTS5 and performance optimization migration completed successfully");
+}

apps/server/src/migrations/migrations.ts

@@ -6,6 +6,11 @@
 
 // Migrations should be kept in descending order, so the latest migration is first.
 const MIGRATIONS: (SqlMigration | JsMigration)[] = [
+    // Add FTS5 full-text search support and strategic performance indexes
+    {
+        version: 234,
+        module: async () => import("./0234__add_fts5_search.js")
+    },
     // Migrate geo map to collection
     {
         version: 233,

apps/server/src/routes/api/import.ts

@@ -98,6 +98,9 @@ async function importNotesToBranch(req: Request) {
     // import has deactivated note events so becca is not updated, instead we force it to reload
     beccaLoader.load();
 
+    // FTS indexing is now handled directly during note creation when entity events are disabled
+    // This ensures all imported notes are immediately searchable without needing a separate sync step
+
     return note.getPojo();
 }
 

apps/server/src/routes/api/search.ts

@@ -10,6 +10,8 @@ import cls from "../../services/cls.js";
 import attributeFormatter from "../../services/attribute_formatter.js";
 import ValidationError from "../../errors/validation_error.js";
 import type SearchResult from "../../services/search/search_result.js";
+import { ftsSearchService } from "../../services/search/fts/index.js";
+import log from "../../services/log.js";
 import hoistedNoteService from "../../services/hoisted_note.js";
 import beccaService from "../../becca/becca_service.js";
 
@@ -159,11 +161,86 @@ function searchTemplates() {
         .map((note) => note.noteId);
 }
 
+/**
+ * Syncs missing notes to the FTS index
+ * This endpoint is useful for maintenance or after imports where FTS triggers might not have fired
+ */
+function syncFtsIndex(req: Request) {
+    try {
+        const noteIds = req.body?.noteIds;
+        
+        log.info(`FTS sync requested for ${noteIds?.length || 'all'} notes`);
+        
+        const syncedCount = ftsSearchService.syncMissingNotes(noteIds);
+        
+        return {
+            success: true,
+            syncedCount,
+            message: syncedCount > 0 
+                ? `Successfully synced ${syncedCount} notes to FTS index` 
+                : 'FTS index is already up to date'
+        };
+    } catch (error) {
+        log.error(`FTS sync failed: ${error}`);
+        throw new ValidationError(`Failed to sync FTS index: ${error}`);
+    }
+}
+
+/**
+ * Rebuilds the entire FTS index from scratch
+ * This is a more intensive operation that should be used sparingly
+ */
+function rebuildFtsIndex() {
+    try {
+        log.info('FTS index rebuild requested');
+        
+        ftsSearchService.rebuildIndex();
+        
+        return {
+            success: true,
+            message: 'FTS index rebuild completed successfully'
+        };
+    } catch (error) {
+        log.error(`FTS rebuild failed: ${error}`);
+        throw new ValidationError(`Failed to rebuild FTS index: ${error}`);
+    }
+}
+
+/**
+ * Gets statistics about the FTS index
+ */
+function getFtsIndexStats() {
+    try {
+        const stats = ftsSearchService.getIndexStats();
+        
+        // Get count of notes that should be indexed
+        const eligibleNotesCount = searchService.searchNotes('', {
+            includeArchivedNotes: false,
+            ignoreHoistedNote: true
+        }).filter(note => 
+            ['text', 'code', 'mermaid', 'canvas', 'mindMap'].includes(note.type) &&
+            !note.isProtected
+        ).length;
+        
+        return {
+            ...stats,
+            eligibleNotesCount,
+            missingFromIndex: Math.max(0, eligibleNotesCount - stats.totalDocuments)
+        };
+    } catch (error) {
+        log.error(`Failed to get FTS stats: ${error}`);
+        throw new ValidationError(`Failed to get FTS index statistics: ${error}`);
+    }
+}
+
 export default {
     searchFromNote,
     searchAndExecute,
     getRelatedNotes,
     quickSearch,
     search,
-    searchTemplates
+    searchTemplates,
+    syncFtsIndex,
+    rebuildFtsIndex,
+    getFtsIndexStats
 };

apps/server/src/routes/assets.ts

@@ -47,10 +47,10 @@ async function register(app: express.Application) {
             vite.middlewares(req, res, next);
         });
         app.get(`/`, [ rootLimiter, auth.checkAuth, csrfMiddleware ], (req, res, next) => {
-            req.url = `/${assetUrlFragment}/src/index.html`;
+            req.url = `/${assetUrlFragment}/index.html`;
             vite.middlewares(req, res, next);
         });
-        app.get(`/index.ts`, [ rootLimiter ], (req, res, next) => {
+        app.get(`/src/index.ts`, [ rootLimiter ], (req, res, next) => {
             req.url = `/${assetUrlFragment}/src/index.ts`;
             vite.middlewares(req, res, next);
         });
@@ -66,7 +66,7 @@ async function register(app: express.Application) {
             // broken when closing the browser and coming back in to the page.
             // The page is restored from cache, but the API call fail.
             res.setHeader("Cache-Control", "no-cache, no-store, must-revalidate");
-            res.sendFile(path.join(publicDir, "src", "index.html"));
+            res.sendFile(path.join(publicDir, "index.html"));
         });
         app.use("/assets", persistentCacheStatic(path.join(publicDir, "assets")));
         app.use(`/src`, persistentCacheStatic(path.join(publicDir, "src")));

apps/server/src/routes/index.ts

@@ -12,7 +12,7 @@ import log from "../services/log.js";
 import optionService from "../services/options.js";
 import protectedSessionService from "../services/protected_session.js";
 import sql from "../services/sql.js";
-import { isDev, isElectron, isWindows11 } from "../services/utils.js";
+import { isDev, isElectron, isMac, isWindows11 } from "../services/utils.js";
 import { generateToken as generateCsrfToken } from "./csrf_protection.js";
 
 
@@ -43,7 +43,10 @@ export function bootstrap(req: Request, res: Response) {
         platform: process.platform,
         isElectron,
         hasNativeTitleBar: isElectron && nativeTitleBarVisible,
-        hasBackgroundEffects: isElectron && isWindows11 && !nativeTitleBarVisible && options.backgroundEffects === "true",
+        hasBackgroundEffects: options.backgroundEffects === "true"
+            && isElectron
+            && (isWindows11 || isMac)
+            && !nativeTitleBarVisible,
         maxEntityChangeIdAtLoad: sql.getValue("SELECT COALESCE(MAX(id), 0) FROM entity_changes"),
         maxEntityChangeSyncIdAtLoad: sql.getValue("SELECT COALESCE(MAX(id), 0) FROM entity_changes WHERE isSynced = 1"),
         instanceName: config.General ? config.General.instanceName : null,

apps/server/src/services/app_info.ts

@@ -4,7 +4,7 @@ import packageJson from "../../package.json" with { type: "json" };
 import dataDir from "./data_dir.js";
 import { AppInfo } from "@triliumnext/commons";
 
-const APP_DB_VERSION = 233;
+const APP_DB_VERSION = 234;
 const SYNC_VERSION = 36;
 const CLIPPER_PROTOCOL_VERSION = "1.0";
 

apps/server/src/services/hidden_subtree_launcherbar.ts

@@ -48,7 +48,7 @@ export default function buildLaunchBarConfig() {
             id: "_lbBackInHistory",
             ...sharedLaunchers.backInHistory
         },
-        {   
+        {
             id: "_lbForwardInHistory",
             ...sharedLaunchers.forwardInHistory
         },
@@ -59,12 +59,12 @@ export default function buildLaunchBarConfig() {
             command: "commandPalette",
             icon: "bx bx-chevron-right-square"
         },
-        { 
+        {
             id: "_lbBackendLog",
             title: t("hidden-subtree.backend-log-title"),
             type: "launcher",
             targetNoteId: "_backendLog",
-            icon: "bx bx-detail" 
+            icon: "bx bx-detail"
         },
         {
             id: "_zenMode",
@@ -128,7 +128,7 @@ export default function buildLaunchBarConfig() {
             baseSize: "50",
             growthFactor: "0"
         },
-        {   
+        {
             id: "_lbBookmarks",
             title: t("hidden-subtree.bookmarks-title"),
             type: "launcher",
@@ -139,7 +139,7 @@ export default function buildLaunchBarConfig() {
             id: "_lbToday",
             ...sharedLaunchers.openToday
         },
-        {   
+        {
             id: "_lbSpacer2",
             title: t("hidden-subtree.spacer-title"),
             type: "launcher",
@@ -179,7 +179,11 @@ export default function buildLaunchBarConfig() {
 
     const mobileAvailableLaunchers: HiddenSubtreeItem[] = [
         { id: "_lbMobileNewNote", ...sharedLaunchers.newNote },
-        { id: "_lbMobileToday", ...sharedLaunchers.openToday }
+        { id: "_lbMobileToday", ...sharedLaunchers.openToday },
+        {
+            id: "_lbMobileRecentChanges",
+            ...sharedLaunchers.recentChanges
+        }
     ];
 
     const mobileVisibleLaunchers: HiddenSubtreeItem[] = [
@@ -203,8 +207,10 @@ export default function buildLaunchBarConfig() {
             ...sharedLaunchers.calendar
         },
         {
-            id: "_lbMobileRecentChanges",
-            ...sharedLaunchers.recentChanges
+            id: "_lbMobileTabSwitcher",
+            title: t("hidden-subtree.tab-switcher-title"),
+            type: "launcher",
+            builtinWidget: "mobileTabSwitcher"
         }
     ];
 
@@ -214,4 +220,4 @@ export default function buildLaunchBarConfig() {
         mobileAvailableLaunchers,
         mobileVisibleLaunchers
     };
-}
+}

apps/server/src/services/log.ts

@@ -8,9 +8,7 @@ import dataDir from "./data_dir.js";
 import cls from "./cls.js";
 import config, { LOGGING_DEFAULT_RETENTION_DAYS } from "./config.js";
 
-if (!fs.existsSync(dataDir.LOG_DIR)) {
-    fs.mkdirSync(dataDir.LOG_DIR, 0o700);
-}
+fs.mkdirSync(dataDir.LOG_DIR, { recursive: true, mode: 0o700 });
 
 let logFile: fs.WriteStream | undefined;
 

apps/server/src/services/notes.ts

@@ -238,6 +238,14 @@ function createNewNote(params: NoteParams): {
                 prefix: params.prefix || "",
                 isExpanded: !!params.isExpanded
             }).save();
+            
+            // FTS indexing is now handled entirely by database triggers
+            // The improved triggers in schema.sql handle all scenarios including:
+            // - INSERT OR REPLACE operations
+            // - INSERT ... ON CONFLICT ... DO UPDATE (upsert) 
+            // - Cases where notes are created before blobs (common during import)
+            // - All UPDATE scenarios, not just specific column changes
+            // This ensures FTS stays in sync even when entity events are disabled
         } finally {
             if (!isEntityEventsDisabled) {
                 // re-enable entity events only if they were previously enabled

apps/server/src/services/search/attribute_search.spec.ts

@@ -0,0 +1,688 @@
+import { describe, it, expect, beforeEach } from "vitest";
+import searchService from "./services/search.js";
+import BNote from "../../becca/entities/bnote.js";
+import BBranch from "../../becca/entities/bbranch.js";
+import SearchContext from "./search_context.js";
+import becca from "../../becca/becca.js";
+import { findNoteByTitle, note, NoteBuilder } from "../../test/becca_mocking.js";
+
+/**
+ * Attribute Search Tests - Comprehensive Coverage
+ *
+ * Tests all attribute-related search features including:
+ * - Label search with all operators
+ * - Relation search with traversal
+ * - Promoted vs regular labels
+ * - Inherited vs owned attributes
+ * - Attribute counts
+ * - Multi-hop relations
+ */
+describe("Attribute Search - Comprehensive", () => {
+    let rootNote: any;
+
+    beforeEach(() => {
+        becca.reset();
+
+        rootNote = new NoteBuilder(new BNote({ noteId: "root", title: "root", type: "text" }));
+        new BBranch({
+            branchId: "none_root",
+            noteId: "root",
+            parentNoteId: "none",
+            notePosition: 10
+        });
+    });
+
+    describe("Label Search - Existence", () => {
+        it("should find notes with label using #label syntax", () => {
+            rootNote
+                .child(note("Book One").label("book"))
+                .child(note("Book Two").label("book"))
+                .child(note("Article").label("article"));
+
+            const searchContext = new SearchContext();
+            const searchResults = searchService.findResultsWithQuery("#book", searchContext);
+
+            expect(searchResults.length).toEqual(2);
+            expect(findNoteByTitle(searchResults, "Book One")).toBeTruthy();
+            expect(findNoteByTitle(searchResults, "Book Two")).toBeTruthy();
+        });
+
+        it("should find notes without label using #!label syntax", () => {
+            rootNote
+                .child(note("Book").label("published"))
+                .child(note("Draft"))
+                .child(note("Article"));
+
+            const searchContext = new SearchContext();
+            const searchResults = searchService.findResultsWithQuery("#!published", searchContext);
+
+            expect(searchResults.length).toBeGreaterThanOrEqual(2);
+            expect(findNoteByTitle(searchResults, "Draft")).toBeTruthy();
+            expect(findNoteByTitle(searchResults, "Article")).toBeTruthy();
+            expect(findNoteByTitle(searchResults, "Book")).toBeFalsy();
+        });
+
+        it("should find notes using full syntax note.labels.labelName", () => {
+            rootNote
+                .child(note("Tagged").label("important"))
+                .child(note("Untagged"));
+
+            const searchContext = new SearchContext();
+            const searchResults = searchService.findResultsWithQuery("# note.labels.important", searchContext);
+
+            expect(searchResults.length).toEqual(1);
+            expect(findNoteByTitle(searchResults, "Tagged")).toBeTruthy();
+        });
+    });
+
+    describe("Label Search - Value Comparisons", () => {
+        it("should find labels with exact value using = operator", () => {
+            rootNote
+                .child(note("Book 1").label("status", "published"))
+                .child(note("Book 2").label("status", "draft"))
+                .child(note("Book 3").label("status", "published"));
+
+            const searchContext = new SearchContext();
+            const searchResults = searchService.findResultsWithQuery("#status = published", searchContext);
+
+            expect(searchResults.length).toEqual(2);
+            expect(findNoteByTitle(searchResults, "Book 1")).toBeTruthy();
+            expect(findNoteByTitle(searchResults, "Book 3")).toBeTruthy();
+        });
+
+        it("should find labels with value not equal using != operator", () => {
+            rootNote
+                .child(note("Book 1").label("status", "published"))
+                .child(note("Book 2").label("status", "draft"));
+
+            const searchContext = new SearchContext();
+            const searchResults = searchService.findResultsWithQuery("#status != published", searchContext);
+
+            expect(searchResults.length).toEqual(1);
+            expect(findNoteByTitle(searchResults, "Book 2")).toBeTruthy();
+        });
+
+        it("should find labels containing substring using *=* operator", () => {
+            rootNote
+                .child(note("Genre 1").label("genre", "science fiction"))
+                .child(note("Genre 2").label("genre", "fantasy"))
+                .child(note("Genre 3").label("genre", "historical fiction"));
+
+            const searchContext = new SearchContext();
+            const searchResults = searchService.findResultsWithQuery("#genre *=* fiction", searchContext);
+
+            expect(searchResults.length).toEqual(2);
+            expect(findNoteByTitle(searchResults, "Genre 1")).toBeTruthy();
+            expect(findNoteByTitle(searchResults, "Genre 3")).toBeTruthy();
+        });
+
+        it("should find labels starting with prefix using =* operator", () => {
+            rootNote
+                .child(note("File 1").label("filename", "document.pdf"))
+                .child(note("File 2").label("filename", "document.txt"))
+                .child(note("File 3").label("filename", "image.pdf"));
+
+            const searchContext = new SearchContext();
+            const searchResults = searchService.findResultsWithQuery("#filename =* document", searchContext);
+
+            expect(searchResults.length).toEqual(2);
+            expect(findNoteByTitle(searchResults, "File 1")).toBeTruthy();
+            expect(findNoteByTitle(searchResults, "File 2")).toBeTruthy();
+        });
+
+        it("should find labels ending with suffix using *= operator", () => {
+            rootNote
+                .child(note("File 1").label("filename", "report.pdf"))
+                .child(note("File 2").label("filename", "document.pdf"))
+                .child(note("File 3").label("filename", "image.png"));
+
+            const searchContext = new SearchContext();
+            const searchResults = searchService.findResultsWithQuery("#filename *= pdf", searchContext);
+
+            expect(searchResults.length).toEqual(2);
+            expect(findNoteByTitle(searchResults, "File 1")).toBeTruthy();
+            expect(findNoteByTitle(searchResults, "File 2")).toBeTruthy();
+        });
+
+        it("should find labels matching regex using %= operator", () => {
+            rootNote
+                .child(note("Year 1950").label("year", "1950"))
+                .child(note("Year 1975").label("year", "1975"))
+                .child(note("Year 2000").label("year", "2000"));
+
+            const searchContext = new SearchContext();
+            const searchResults = searchService.findResultsWithQuery("#year %= '19[0-9]{2}'", searchContext);
+
+            expect(searchResults.length).toEqual(2);
+            expect(findNoteByTitle(searchResults, "Year 1950")).toBeTruthy();
+            expect(findNoteByTitle(searchResults, "Year 1975")).toBeTruthy();
+        });
+    });
+
+    describe("Label Search - Numeric Comparisons", () => {
+        it("should compare label values as numbers using >= operator", () => {
+            rootNote
+                .child(note("Book 1").label("pages", "150"))
+                .child(note("Book 2").label("pages", "300"))
+                .child(note("Book 3").label("pages", "500"));
+
+            const searchContext = new SearchContext();
+            const searchResults = searchService.findResultsWithQuery("#pages >= 300", searchContext);
+
+            expect(searchResults.length).toEqual(2);
+            expect(findNoteByTitle(searchResults, "Book 2")).toBeTruthy();
+            expect(findNoteByTitle(searchResults, "Book 3")).toBeTruthy();
+        });
+
+        it("should compare label values using > operator", () => {
+            rootNote
+                .child(note("Item 1").label("price", "10"))
+                .child(note("Item 2").label("price", "20"))
+                .child(note("Item 3").label("price", "30"));
+
+            const searchContext = new SearchContext();
+            const searchResults = searchService.findResultsWithQuery("#price > 15", searchContext);
+
+            expect(searchResults.length).toEqual(2);
+            expect(findNoteByTitle(searchResults, "Item 2")).toBeTruthy();
+            expect(findNoteByTitle(searchResults, "Item 3")).toBeTruthy();
+        });
+
+        it("should compare label values using <= operator", () => {
+            rootNote
+                .child(note("Score 1").label("score", "75"))
+                .child(note("Score 2").label("score", "85"))
+                .child(note("Score 3").label("score", "95"));
+
+            const searchContext = new SearchContext();
+            const searchResults = searchService.findResultsWithQuery("#score <= 85", searchContext);
+
+            expect(searchResults.length).toEqual(2);
+            expect(findNoteByTitle(searchResults, "Score 1")).toBeTruthy();
+            expect(findNoteByTitle(searchResults, "Score 2")).toBeTruthy();
+        });
+
+        it("should compare label values using < operator", () => {
+            rootNote
+                .child(note("Value 1").label("value", "100"))
+                .child(note("Value 2").label("value", "200"))
+                .child(note("Value 3").label("value", "300"));
+
+            const searchContext = new SearchContext();
+            const searchResults = searchService.findResultsWithQuery("#value < 250", searchContext);
+
+            expect(searchResults.length).toEqual(2);
+            expect(findNoteByTitle(searchResults, "Value 1")).toBeTruthy();
+            expect(findNoteByTitle(searchResults, "Value 2")).toBeTruthy();
+        });
+    });
+
+    describe("Label Search - Multiple Labels", () => {
+        it("should find notes with multiple labels using AND", () => {
+            rootNote
+                .child(note("Book 1").label("book").label("fiction"))
+                .child(note("Book 2").label("book").label("nonfiction"))
+                .child(note("Article").label("article").label("fiction"));
+
+            const searchContext = new SearchContext();
+            const searchResults = searchService.findResultsWithQuery("#book AND #fiction", searchContext);
+
+            expect(searchResults.length).toEqual(1);
+            expect(findNoteByTitle(searchResults, "Book 1")).toBeTruthy();
+        });
+
+        it("should find notes with any of multiple labels using OR", () => {
+            rootNote
+                .child(note("Item 1").label("book"))
+                .child(note("Item 2").label("article"))
+                .child(note("Item 3").label("video"));
+
+            const searchContext = new SearchContext();
+            const searchResults = searchService.findResultsWithQuery("#book OR #article", searchContext);
+
+            expect(searchResults.length).toEqual(2);
+            expect(findNoteByTitle(searchResults, "Item 1")).toBeTruthy();
+            expect(findNoteByTitle(searchResults, "Item 2")).toBeTruthy();
+        });
+
+        it("should combine multiple label conditions", () => {
+            rootNote
+                .child(note("Book 1").label("type", "book").label("year", "1950"))
+                .child(note("Book 2").label("type", "book").label("year", "1960"))
+                .child(note("Article").label("type", "article").label("year", "1955"));
+
+            const searchContext = new SearchContext();
+            const searchResults = searchService.findResultsWithQuery(
+                "#type = book AND #year >= 1950 AND #year < 1960",
+                searchContext
+            );
+
+            expect(searchResults.length).toEqual(1);
+            expect(findNoteByTitle(searchResults, "Book 1")).toBeTruthy();
+        });
+    });
+
+    describe("Label Search - Promoted vs Regular", () => {
+        it("should find both promoted and regular labels", () => {
+            rootNote
+                .child(note("Note 1").label("tag", "value", false)) // Regular
+                .child(note("Note 2").label("tag", "value", true)); // Promoted (inheritable)
+
+            const searchContext = new SearchContext();
+            const searchResults = searchService.findResultsWithQuery("#tag", searchContext);
+
+            expect(searchResults.length).toEqual(2);
+            expect(findNoteByTitle(searchResults, "Note 1")).toBeTruthy();
+            expect(findNoteByTitle(searchResults, "Note 2")).toBeTruthy();
+        });
+    });
+
+    describe("Label Search - Inherited Labels", () => {
+        it("should find notes with inherited labels", () => {
+            rootNote
+                .child(note("Parent")
+                    .label("category", "books", true) // Inheritable
+                    .child(note("Child 1"))
+                    .child(note("Child 2")));
+
+            const searchContext = new SearchContext();
+            const searchResults = searchService.findResultsWithQuery("#category = books", searchContext);
+
+            expect(searchResults.length).toBeGreaterThanOrEqual(2);
+            expect(findNoteByTitle(searchResults, "Child 1")).toBeTruthy();
+            expect(findNoteByTitle(searchResults, "Child 2")).toBeTruthy();
+        });
+
+        it("should distinguish inherited vs owned labels in counts", () => {
+            const parent = note("Parent").label("inherited", "value", true);
+            const child = note("Child").label("owned", "value", false);
+
+            rootNote.child(parent.child(child));
+
+            const searchContext = new SearchContext();
+
+            // Child should have 2 total labels (1 owned + 1 inherited)
+            const searchResults = searchService.findResultsWithQuery(
+                "# note.title = Child AND note.labelCount = 2",
+                searchContext
+            );
+
+            expect(searchResults.length).toEqual(1);
+        });
+    });
+
+    describe("Relation Search - Existence", () => {
+        it("should find notes with relation using ~relation syntax", () => {
+            const target = note("Target");
+
+            rootNote
+                .child(note("Note 1").relation("linkedTo", target.note))
+                .child(note("Note 2").relation("linkedTo", target.note))
+                .child(note("Note 3"))
+                .child(target);
+
+            const searchContext = new SearchContext();
+            const searchResults = searchService.findResultsWithQuery("~linkedTo", searchContext);
+
+            expect(searchResults.length).toEqual(2);
+            expect(findNoteByTitle(searchResults, "Note 1")).toBeTruthy();
+            expect(findNoteByTitle(searchResults, "Note 2")).toBeTruthy();
+        });
+
+        it("should find notes without relation using ~!relation syntax", () => {
+            const target = note("Target");
+
+            rootNote
+                .child(note("Linked").relation("author", target.note))
+                .child(note("Unlinked 1"))
+                .child(note("Unlinked 2"))
+                .child(target);
+
+            const searchContext = new SearchContext();
+            const searchResults = searchService.findResultsWithQuery("~!author AND note.title *=* Unlinked", searchContext);
+
+            expect(searchResults.length).toEqual(2);
+            expect(findNoteByTitle(searchResults, "Unlinked 1")).toBeTruthy();
+            expect(findNoteByTitle(searchResults, "Unlinked 2")).toBeTruthy();
+        });
+
+        it("should find notes using full syntax note.relations.relationName", () => {
+            const author = note("Tolkien");
+
+            rootNote
+                .child(note("Book").relation("author", author.note))
+                .child(author);
+
+            const searchContext = new SearchContext();
+            const searchResults = searchService.findResultsWithQuery("# note.relations.author", searchContext);
+
+            expect(searchResults.length).toEqual(1);
+            expect(findNoteByTitle(searchResults, "Book")).toBeTruthy();
+        });
+    });
+
+    describe("Relation Search - Target Properties", () => {
+        it("should find relations by target title using ~relation.title", () => {
+            const tolkien = note("J.R.R. Tolkien");
+            const herbert = note("Frank Herbert");
+
+            rootNote
+                .child(note("Lord of the Rings").relation("author", tolkien.note))
+                .child(note("The Hobbit").relation("author", tolkien.note))
+                .child(note("Dune").relation("author", herbert.note))
+                .child(tolkien)
+                .child(herbert);
+
+            const searchContext = new SearchContext();
+            const searchResults = searchService.findResultsWithQuery("~author.title = 'J.R.R. Tolkien'", searchContext);
+
+            expect(searchResults.length).toEqual(2);
+            expect(findNoteByTitle(searchResults, "Lord of the Rings")).toBeTruthy();
+            expect(findNoteByTitle(searchResults, "The Hobbit")).toBeTruthy();
+        });
+
+        it("should find relations by target title pattern", () => {
+            const author1 = note("Author Tolkien");
+            const author2 = note("Editor Tolkien");
+            const author3 = note("Publisher Smith");
+
+            rootNote
+                .child(note("Book 1").relation("creator", author1.note))
+                .child(note("Book 2").relation("creator", author2.note))
+                .child(note("Book 3").relation("creator", author3.note))
+                .child(author1)
+                .child(author2)
+                .child(author3);
+
+            const searchContext = new SearchContext();
+            const searchResults = searchService.findResultsWithQuery("~creator.title *=* Tolkien", searchContext);
+
+            expect(searchResults.length).toEqual(2);
+            expect(findNoteByTitle(searchResults, "Book 1")).toBeTruthy();
+            expect(findNoteByTitle(searchResults, "Book 2")).toBeTruthy();
+        });
+
+        it("should find relations by target properties", () => {
+            const codeNote = note("Code Example", { type: "code" });
+            const textNote = note("Text Example", { type: "text" });
+
+            rootNote
+                .child(note("Reference 1").relation("example", codeNote.note))
+                .child(note("Reference 2").relation("example", textNote.note))
+                .child(codeNote)
+                .child(textNote);
+
+            const searchContext = new SearchContext();
+            const searchResults = searchService.findResultsWithQuery("~example.type = code", searchContext);
+
+            expect(searchResults.length).toEqual(1);
+            expect(findNoteByTitle(searchResults, "Reference 1")).toBeTruthy();
+        });
+    });
+
+    describe("Relation Search - Multi-Hop Traversal", () => {
+        it("should traverse two-hop relations", () => {
+            const tolkien = note("J.R.R. Tolkien");
+            const christopher = note("Christopher Tolkien");
+
+            tolkien.relation("son", christopher.note);
+
+            rootNote
+                .child(note("Lord of the Rings").relation("author", tolkien.note))
+                .child(note("The Hobbit").relation("author", tolkien.note))
+                .child(tolkien)
+                .child(christopher);
+
+            const searchContext = new SearchContext();
+            const searchResults = searchService.findResultsWithQuery(
+                "~author.relations.son.title = 'Christopher Tolkien'",
+                searchContext
+            );
+
+            expect(searchResults.length).toEqual(2);
+            expect(findNoteByTitle(searchResults, "Lord of the Rings")).toBeTruthy();
+            expect(findNoteByTitle(searchResults, "The Hobbit")).toBeTruthy();
+        });
+
+        it("should traverse three-hop relations", () => {
+            const person1 = note("Person 1");
+            const person2 = note("Person 2");
+            const person3 = note("Person 3");
+
+            person1.relation("knows", person2.note);
+            person2.relation("knows", person3.note);
+
+            rootNote
+                .child(note("Document").relation("author", person1.note))
+                .child(person1)
+                .child(person2)
+                .child(person3);
+
+            const searchContext = new SearchContext();
+            const searchResults = searchService.findResultsWithQuery(
+                "~author.relations.knows.relations.knows.title = 'Person 3'",
+                searchContext
+            );
+
+            expect(searchResults.length).toEqual(1);
+            expect(findNoteByTitle(searchResults, "Document")).toBeTruthy();
+        });
+
+        it("should handle relation chains with labels", () => {
+            const tolkien = note("J.R.R. Tolkien").label("profession", "author");
+
+            rootNote
+                .child(note("Book").relation("creator", tolkien.note))
+                .child(tolkien);
+
+            const searchContext = new SearchContext();
+            const searchResults = searchService.findResultsWithQuery(
+                "~creator.labels.profession = author",
+                searchContext
+            );
+
+            expect(searchResults.length).toEqual(1);
+            expect(findNoteByTitle(searchResults, "Book")).toBeTruthy();
+        });
+    });
+
+    describe("Relation Search - Circular References", () => {
+        it("should handle circular relations without infinite loop", () => {
+            const note1 = note("Note 1");
+            const note2 = note("Note 2");
+
+            note1.relation("linkedTo", note2.note);
+            note2.relation("linkedTo", note1.note);
+
+            rootNote.child(note1).child(note2);
+
+            const searchContext = new SearchContext();
+
+            // This should complete without hanging
+            const searchResults = searchService.findResultsWithQuery("~linkedTo", searchContext);
+
+            expect(searchResults.length).toEqual(2);
+        });
+    });
+
+    describe("Attribute Count Properties", () => {
+        it("should filter by total label count", () => {
+            rootNote
+                .child(note("Note 1").label("tag1").label("tag2").label("tag3"))
+                .child(note("Note 2").label("tag1"))
+                .child(note("Note 3"));
+
+            const searchContext = new SearchContext();
+
+            let searchResults = searchService.findResultsWithQuery("# note.labelCount = 3", searchContext);
+            expect(findNoteByTitle(searchResults, "Note 1")).toBeTruthy();
+
+            searchResults = searchService.findResultsWithQuery("# note.labelCount >= 1", searchContext);
+            expect(searchResults.length).toBeGreaterThanOrEqual(2);
+        });
+
+        it("should filter by owned label count", () => {
+            const parent = note("Parent").label("inherited", "", true);
+            const child = note("Child").label("owned", "");
+
+            rootNote.child(parent.child(child));
+
+            const searchContext = new SearchContext();
+
+            // Child should have exactly 1 owned label
+            const searchResults = searchService.findResultsWithQuery(
+                "# note.title = Child AND note.ownedLabelCount = 1",
+                searchContext
+            );
+
+            expect(searchResults.length).toEqual(1);
+        });
+
+        it("should filter by relation count", () => {
+            const target1 = note("Target 1");
+            const target2 = note("Target 2");
+
+            rootNote
+                .child(note("Note With Two Relations")
+                    .relation("rel1", target1.note)
+                    .relation("rel2", target2.note))
+                .child(note("Note With One Relation")
+                    .relation("rel1", target1.note))
+                .child(target1)
+                .child(target2);
+
+            const searchContext = new SearchContext();
+
+            let searchResults = searchService.findResultsWithQuery("# note.relationCount = 2", searchContext);
+            expect(findNoteByTitle(searchResults, "Note With Two Relations")).toBeTruthy();
+
+            searchResults = searchService.findResultsWithQuery("# note.relationCount >= 1", searchContext);
+            expect(searchResults.length).toBeGreaterThanOrEqual(2);
+        });
+
+        it("should filter by owned relation count", () => {
+            const target = note("Target");
+            const owned = note("Owned Relation").relation("owns", target.note);
+
+            rootNote.child(owned).child(target);
+
+            const searchContext = new SearchContext();
+            const searchResults = searchService.findResultsWithQuery(
+                "# note.ownedRelationCount = 1 AND note.title = 'Owned Relation'",
+                searchContext
+            );
+
+            expect(searchResults.length).toEqual(1);
+        });
+
+        it("should filter by total attribute count", () => {
+            rootNote
+                .child(note("Note 1")
+                    .label("label1")
+                    .label("label2")
+                    .relation("rel1", rootNote.note))
+                .child(note("Note 2")
+                    .label("label1"));
+
+            const searchContext = new SearchContext();
+
+            const searchResults = searchService.findResultsWithQuery("# note.attributeCount = 3", searchContext);
+            expect(findNoteByTitle(searchResults, "Note 1")).toBeTruthy();
+        });
+
+        it("should filter by owned attribute count", () => {
+            const noteWithAttrs = note("NoteWithAttrs")
+                .label("label1")
+                .relation("rel1", rootNote.note);
+
+            rootNote.child(noteWithAttrs);
+
+            const searchContext = new SearchContext();
+            const searchResults = searchService.findResultsWithQuery(
+                "# note.ownedAttributeCount = 2 AND note.title = 'NoteWithAttrs'",
+                searchContext
+            );
+
+            expect(findNoteByTitle(searchResults, "NoteWithAttrs")).toBeTruthy();
+        });
+
+        it("should filter by target relation count", () => {
+            const popularTarget = note("Popular Target");
+
+            rootNote
+                .child(note("Source 1").relation("pointsTo", popularTarget.note))
+                .child(note("Source 2").relation("pointsTo", popularTarget.note))
+                .child(note("Source 3").relation("pointsTo", popularTarget.note))
+                .child(popularTarget);
+
+            const searchContext = new SearchContext();
+
+            // Popular target should have 3 incoming relations
+            const searchResults = searchService.findResultsWithQuery(
+                "# note.targetRelationCount = 3",
+                searchContext
+            );
+
+            expect(findNoteByTitle(searchResults, "Popular Target")).toBeTruthy();
+        });
+    });
+
+    describe("Complex Attribute Combinations", () => {
+        it("should combine labels, relations, and properties", () => {
+            const tolkien = note("J.R.R. Tolkien");
+
+            rootNote
+                .child(note("Lord of the Rings", { type: "text" })
+                    .label("published", "1954")
+                    .relation("author", tolkien.note))
+                .child(note("Code Example", { type: "code" })
+                    .label("published", "2020")
+                    .relation("author", tolkien.note))
+                .child(tolkien);
+
+            const searchContext = new SearchContext();
+            const searchResults = searchService.findResultsWithQuery(
+                "# #published < 2000 AND ~author.title = 'J.R.R. Tolkien' AND note.type = text",
+                searchContext
+            );
+
+            expect(searchResults.length).toEqual(1);
+            expect(findNoteByTitle(searchResults, "Lord of the Rings")).toBeTruthy();
+        });
+
+        it("should use OR conditions with attributes", () => {
+            rootNote
+                .child(note("Item 1").label("priority", "high"))
+                .child(note("Item 2").label("priority", "urgent"))
+                .child(note("Item 3").label("priority", "low"));
+
+            const searchContext = new SearchContext();
+            const searchResults = searchService.findResultsWithQuery(
+                "#priority = high OR #priority = urgent",
+                searchContext
+            );
+
+            expect(searchResults.length).toEqual(2);
+            expect(findNoteByTitle(searchResults, "Item 1")).toBeTruthy();
+            expect(findNoteByTitle(searchResults, "Item 2")).toBeTruthy();
+        });
+
+        it("should negate attribute conditions", () => {
+            rootNote
+                .child(note("Active Note").label("status", "active"))
+                .child(note("Archived Note").label("status", "archived"));
+
+            const searchContext = new SearchContext();
+
+            // Use #!label syntax for negation
+            const searchResults = searchService.findResultsWithQuery(
+                "# #status AND #status != archived",
+                searchContext
+            );
+
+            // Should find the note with status=active
+            expect(findNoteByTitle(searchResults, "Active Note")).toBeTruthy();
+            expect(findNoteByTitle(searchResults, "Archived Note")).toBeFalsy();
+        });
+    });
+});

apps/server/src/services/search/content_search.spec.ts

@@ -0,0 +1,399 @@
+import { describe, it, expect, beforeEach } from "vitest";
+import searchService from "./services/search.js";
+import BNote from "../../becca/entities/bnote.js";
+import BBranch from "../../becca/entities/bbranch.js";
+import SearchContext from "./search_context.js";
+import becca from "../../becca/becca.js";
+import { findNoteByTitle, note, NoteBuilder } from "../../test/becca_mocking.js";
+
+/**
+ * Content Search Tests
+ *
+ * Tests full-text content search features including:
+ * - Fulltext tokens and operators
+ * - Content size handling
+ * - Note type-specific content extraction
+ * - Protected content
+ * - Combining content with other searches
+ */
+describe("Content Search", () => {
+    let rootNote: any;
+
+    beforeEach(() => {
+        becca.reset();
+
+        rootNote = new NoteBuilder(new BNote({ noteId: "root", title: "root", type: "text" }));
+        new BBranch({
+            branchId: "none_root",
+            noteId: "root",
+            parentNoteId: "none",
+            notePosition: 10
+        });
+    });
+
+    describe("Fulltext Token Search", () => {
+        it("should find notes with single fulltext token", () => {
+            rootNote
+                .child(note("Document containing Tolkien information"))
+                .child(note("Another document"))
+                .child(note("Reference to J.R.R. Tolkien"));
+
+            const searchContext = new SearchContext();
+            const searchResults = searchService.findResultsWithQuery("tolkien", searchContext);
+
+            expect(searchResults.length).toEqual(2);
+            expect(findNoteByTitle(searchResults, "Document containing Tolkien information")).toBeTruthy();
+            expect(findNoteByTitle(searchResults, "Reference to J.R.R. Tolkien")).toBeTruthy();
+        });
+
+        it("should find notes with multiple fulltext tokens (implicit AND)", () => {
+            rootNote
+                .child(note("The Lord of the Rings by Tolkien"))
+                .child(note("Book about rings and jewelry"))
+                .child(note("Tolkien biography"));
+
+            const searchContext = new SearchContext();
+            const searchResults = searchService.findResultsWithQuery("tolkien rings", searchContext);
+
+            expect(searchResults.length).toEqual(1);
+            expect(findNoteByTitle(searchResults, "The Lord of the Rings by Tolkien")).toBeTruthy();
+        });
+
+        it("should find notes with exact phrase in quotes", () => {
+            rootNote
+                .child(note("The Lord of the Rings is a classic"))
+                .child(note("Lord and Rings are different words"))
+                .child(note("A ring for a lord"));
+
+            const searchContext = new SearchContext();
+            const searchResults = searchService.findResultsWithQuery('"Lord of the Rings"', searchContext);
+
+            expect(searchResults.length).toEqual(1);
+            expect(findNoteByTitle(searchResults, "The Lord of the Rings is a classic")).toBeTruthy();
+        });
+
+        it("should combine exact phrases with tokens", () => {
+            rootNote
+                .child(note("The Lord of the Rings by Tolkien is amazing"))
+                .child(note("Tolkien wrote many books"))
+                .child(note("The Lord of the Rings was published in 1954"));
+
+            const searchContext = new SearchContext();
+            const searchResults = searchService.findResultsWithQuery('"Lord of the Rings" Tolkien', searchContext);
+
+            expect(searchResults.length).toEqual(1);
+            expect(findNoteByTitle(searchResults, "The Lord of the Rings by Tolkien is amazing")).toBeTruthy();
+        });
+    });
+
+    describe("Content Property Search", () => {
+        it("should support note.content *=* operator syntax", () => {
+            // Note: Content search requires database setup, tested in integration tests
+            // This test validates the query syntax is recognized
+            const searchContext = new SearchContext();
+
+            // Should not throw error when parsing
+            expect(() => {
+                searchService.findResultsWithQuery('note.content *=* "search"', searchContext);
+            }).not.toThrow();
+        });
+
+        it("should support note.text property syntax", () => {
+            // Note: Text search requires database setup, tested in integration tests
+            const searchContext = new SearchContext();
+
+            // Should not throw error when parsing
+            expect(() => {
+                searchService.findResultsWithQuery('note.text *=* "sample"', searchContext);
+            }).not.toThrow();
+        });
+
+        it("should support note.rawContent property syntax", () => {
+            // Note: RawContent search requires database setup, tested in integration tests
+            const searchContext = new SearchContext();
+
+            // Should not throw error when parsing
+            expect(() => {
+                searchService.findResultsWithQuery('note.rawContent *=* "html"', searchContext);
+            }).not.toThrow();
+        });
+    });
+
+    describe("Content with OR Operator", () => {
+        it("should support OR operator in queries", () => {
+            // Note: OR with content requires proper fulltext setup
+            const searchContext = new SearchContext();
+
+            // Should parse without error
+            expect(() => {
+                searchService.findResultsWithQuery(
+                    'note.content *=* "rings" OR note.content *=* "tolkien"',
+                    searchContext
+                );
+            }).not.toThrow();
+        });
+    });
+
+    describe("Content Size Handling", () => {
+        it("should support contentSize property in queries", () => {
+            // Note: Content size requires database setup
+            const searchContext = new SearchContext();
+
+            // Should parse contentSize queries without error
+            expect(() => {
+                searchService.findResultsWithQuery("# note.contentSize < 100", searchContext);
+            }).not.toThrow();
+
+            expect(() => {
+                searchService.findResultsWithQuery("# note.contentSize > 1000", searchContext);
+            }).not.toThrow();
+        });
+    });
+
+    describe("Note Type-Specific Content", () => {
+        it("should filter by note type", () => {
+            rootNote
+                .child(note("Text File", { type: "text", mime: "text/html" }))
+                .child(note("Code File", { type: "code", mime: "application/javascript" }))
+                .child(note("JSON File", { type: "code", mime: "application/json" }));
+
+            const searchContext = new SearchContext();
+
+            let searchResults = searchService.findResultsWithQuery("# note.type = text", searchContext);
+            expect(findNoteByTitle(searchResults, "Text File")).toBeTruthy();
+
+            searchResults = searchService.findResultsWithQuery("# note.type = code", searchContext);
+            expect(searchResults.length).toBeGreaterThanOrEqual(2);
+            expect(findNoteByTitle(searchResults, "Code File")).toBeTruthy();
+            expect(findNoteByTitle(searchResults, "JSON File")).toBeTruthy();
+        });
+
+        it("should combine type and mime filters", () => {
+            rootNote
+                .child(note("JS File", { type: "code", mime: "application/javascript" }))
+                .child(note("JSON File", { type: "code", mime: "application/json" }));
+
+            const searchContext = new SearchContext();
+            const searchResults = searchService.findResultsWithQuery(
+                "# note.type = code AND note.mime = 'application/json'",
+                searchContext
+            );
+
+            expect(searchResults.length).toEqual(1);
+            expect(findNoteByTitle(searchResults, "JSON File")).toBeTruthy();
+        });
+    });
+
+    describe("Protected Content", () => {
+        it("should filter by isProtected property", () => {
+            rootNote
+                .child(note("Protected Note", { isProtected: true }))
+                .child(note("Public Note", { isProtected: false }));
+
+            const searchContext = new SearchContext();
+
+            // Find protected notes
+            let searchResults = searchService.findResultsWithQuery("# note.isProtected = true", searchContext);
+            expect(findNoteByTitle(searchResults, "Protected Note")).toBeTruthy();
+            expect(findNoteByTitle(searchResults, "Public Note")).toBeFalsy();
+
+            // Find public notes
+            searchResults = searchService.findResultsWithQuery("# note.isProtected = false", searchContext);
+            expect(findNoteByTitle(searchResults, "Public Note")).toBeTruthy();
+        });
+    });
+
+    describe("Combining Content with Other Searches", () => {
+        it("should combine fulltext search with labels", () => {
+            rootNote
+                .child(note("React Tutorial").label("tutorial"))
+                .child(note("React Book").label("book"));
+
+            const searchContext = new SearchContext();
+            const searchResults = searchService.findResultsWithQuery("react #tutorial", searchContext);
+
+            expect(searchResults.length).toEqual(1);
+            expect(findNoteByTitle(searchResults, "React Tutorial")).toBeTruthy();
+        });
+
+        it("should combine fulltext search with relations", () => {
+            const framework = note("React Framework");
+
+            rootNote
+                .child(framework)
+                .child(note("Introduction to React").relation("framework", framework.note))
+                .child(note("Introduction to Programming"));
+
+            const searchContext = new SearchContext();
+            const searchResults = searchService.findResultsWithQuery(
+                'introduction ~framework.title = "React Framework"',
+                searchContext
+            );
+
+            expect(searchResults.length).toEqual(1);
+            expect(findNoteByTitle(searchResults, "Introduction to React")).toBeTruthy();
+        });
+
+        it("should combine type filter with note properties", () => {
+            rootNote
+                .child(note("Example Code", { type: "code", mime: "application/javascript" }))
+                .child(note("Example Text", { type: "text" }));
+
+            const searchContext = new SearchContext();
+            const searchResults = searchService.findResultsWithQuery(
+                "# example AND note.type = code",
+                searchContext
+            );
+
+            expect(searchResults.length).toEqual(1);
+            expect(findNoteByTitle(searchResults, "Example Code")).toBeTruthy();
+        });
+
+        it("should combine fulltext with hierarchy", () => {
+            rootNote
+                .child(note("Tutorials")
+                    .child(note("React Tutorial")))
+                .child(note("References")
+                    .child(note("React Reference")));
+
+            const searchContext = new SearchContext();
+            const searchResults = searchService.findResultsWithQuery(
+                '# react AND note.parents.title = "Tutorials"',
+                searchContext
+            );
+
+            expect(searchResults.length).toEqual(1);
+            expect(findNoteByTitle(searchResults, "React Tutorial")).toBeTruthy();
+        });
+    });
+
+    describe("Fast Search Option", () => {
+        it("should support fast search mode", () => {
+            rootNote
+                .child(note("Note Title").label("important"));
+
+            const searchContext = new SearchContext({ fastSearch: true });
+
+            // Fast search should still find by title
+            let searchResults = searchService.findResultsWithQuery("Title", searchContext);
+            expect(findNoteByTitle(searchResults, "Note Title")).toBeTruthy();
+
+            // Fast search should still find by label
+            searchResults = searchService.findResultsWithQuery("#important", searchContext);
+            expect(findNoteByTitle(searchResults, "Note Title")).toBeTruthy();
+        });
+    });
+
+    describe("Case Sensitivity", () => {
+        it("should handle case-insensitive title search", () => {
+            rootNote.child(note("TypeScript Programming"));
+
+            const searchContext = new SearchContext();
+
+            // Should find regardless of case in title
+            let searchResults = searchService.findResultsWithQuery("typescript", searchContext);
+            expect(findNoteByTitle(searchResults, "TypeScript Programming")).toBeTruthy();
+
+            searchResults = searchService.findResultsWithQuery("PROGRAMMING", searchContext);
+            expect(findNoteByTitle(searchResults, "TypeScript Programming")).toBeTruthy();
+        });
+    });
+
+    describe("Multiple Word Phrases", () => {
+        it("should handle multi-word fulltext search", () => {
+            rootNote
+                .child(note("Document about Lord of the Rings"))
+                .child(note("Book review of The Hobbit"))
+                .child(note("Random text about fantasy"));
+
+            const searchContext = new SearchContext();
+            const searchResults = searchService.findResultsWithQuery("lord rings", searchContext);
+
+            expect(searchResults.length).toEqual(1);
+            expect(findNoteByTitle(searchResults, "Document about Lord of the Rings")).toBeTruthy();
+        });
+
+        it("should handle exact phrase with multiple words", () => {
+            rootNote
+                .child(note("The quick brown fox jumps"))
+                .child(note("A brown fox is quick"))
+                .child(note("Quick and brown animals"));
+
+            const searchContext = new SearchContext();
+            const searchResults = searchService.findResultsWithQuery('"quick brown fox"', searchContext);
+
+            expect(searchResults.length).toEqual(1);
+            expect(findNoteByTitle(searchResults, "The quick brown fox jumps")).toBeTruthy();
+        });
+    });
+
+    describe("Plain Text Search Matches Attribute Values", () => {
+        it("should find notes by searching for label value as plain text", () => {
+            // Note has a label with value "Tolkien", searching for "Tolkien" should find it
+            rootNote
+                .child(note("The Hobbit").label("author", "Tolkien"))
+                .child(note("Dune").label("author", "Herbert"))
+                .child(note("Random Note"));
+
+            const searchContext = new SearchContext();
+            const searchResults = searchService.findResultsWithQuery("Tolkien", searchContext);
+
+            expect(searchResults.length).toEqual(1);
+            expect(findNoteByTitle(searchResults, "The Hobbit")).toBeTruthy();
+        });
+
+        it("should find notes by searching for label name as plain text", () => {
+            // Note has a label named "important", searching for "important" should find it
+            rootNote
+                .child(note("Critical Task").label("important"))
+                .child(note("Regular Task"));
+
+            const searchContext = new SearchContext();
+            const searchResults = searchService.findResultsWithQuery("important", searchContext);
+
+            expect(searchResults.length).toEqual(1);
+            expect(findNoteByTitle(searchResults, "Critical Task")).toBeTruthy();
+        });
+
+        it("should find notes by searching for relation name as plain text", () => {
+            const author = note("J.R.R. Tolkien");
+
+            rootNote
+                .child(note("The Hobbit").relation("writtenBy", author.note))
+                .child(note("Random Book"))
+                .child(author);
+
+            const searchContext = new SearchContext();
+            const searchResults = searchService.findResultsWithQuery("writtenBy", searchContext);
+
+            expect(searchResults.length).toEqual(1);
+            expect(findNoteByTitle(searchResults, "The Hobbit")).toBeTruthy();
+        });
+
+        it("should find notes when label value contains the search term", () => {
+            rootNote
+                .child(note("Fantasy Book").label("genre", "Science Fiction"))
+                .child(note("History Book").label("genre", "Historical"));
+
+            const searchContext = new SearchContext();
+            const searchResults = searchService.findResultsWithQuery("Fiction", searchContext);
+
+            expect(searchResults.length).toEqual(1);
+            expect(findNoteByTitle(searchResults, "Fantasy Book")).toBeTruthy();
+        });
+
+        it("should combine plain text attribute search with title search", () => {
+            rootNote
+                .child(note("Programming Guide").label("language", "JavaScript"))
+                .child(note("Programming Tutorial").label("language", "Python"))
+                .child(note("Cooking Guide").label("cuisine", "Italian"));
+
+            const searchContext = new SearchContext();
+            // Search for notes with "Guide" in title AND "JavaScript" in attributes
+            const searchResults = searchService.findResultsWithQuery("Guide JavaScript", searchContext);
+
+            expect(searchResults.length).toEqual(1);
+            expect(findNoteByTitle(searchResults, "Programming Guide")).toBeTruthy();
+        });
+    });
+});

apps/server/src/services/search/edge_cases.spec.ts

@@ -0,0 +1,518 @@
+import { describe, it, expect, beforeEach } from 'vitest';
+import searchService from './services/search.js';
+import BNote from '../../becca/entities/bnote.js';
+import BBranch from '../../becca/entities/bbranch.js';
+import SearchContext from './search_context.js';
+import becca from '../../becca/becca.js';
+import { findNoteByTitle, note, NoteBuilder } from '../../test/becca_mocking.js';
+
+/**
+ * Edge Cases and Error Handling Tests
+ *
+ * Tests edge cases, error handling, and security aspects including:
+ * - Empty/null queries
+ * - Very long queries
+ * - Special characters (search.md lines 188-206)
+ * - Unicode and emoji
+ * - Malformed queries
+ * - SQL injection attempts
+ * - XSS prevention
+ * - Boundary values
+ * - Type mismatches
+ * - Performance and stress tests
+ */
+describe('Search - Edge Cases and Error Handling', () => {
+    let rootNote: any;
+
+    beforeEach(() => {
+        becca.reset();
+
+        rootNote = new NoteBuilder(new BNote({ noteId: 'root', title: 'root', type: 'text' }));
+        new BBranch({
+            branchId: 'none_root',
+            noteId: 'root',
+            parentNoteId: 'none',
+            notePosition: 10,
+        });
+    });
+
+    describe('Empty/Null Queries', () => {
+        it('should handle empty string query', () => {
+            rootNote.child(note('Test Note'));
+
+            const searchContext = new SearchContext();
+            const results = searchService.findResultsWithQuery('', searchContext);
+
+            // Empty query should return all notes (or handle gracefully)
+            expect(Array.isArray(results)).toBeTruthy();
+        });
+
+        it('should handle whitespace-only query', () => {
+            rootNote.child(note('Test Note'));
+
+            const searchContext = new SearchContext();
+            const results = searchService.findResultsWithQuery('   ', searchContext);
+
+            expect(Array.isArray(results)).toBeTruthy();
+        });
+
+        it('should handle null/undefined query gracefully', () => {
+            rootNote.child(note('Test Note'));
+
+            // TypeScript would prevent this, but test runtime behavior
+            expect(() => {
+                const searchContext = new SearchContext();
+                searchService.findResultsWithQuery('', searchContext);
+            }).not.toThrow();
+        });
+    });
+
+    describe('Very Long Queries', () => {
+        it('should handle very long queries (1000+ characters)', () => {
+            rootNote.child(note('Test', { content: 'test content' }));
+
+            // Create a 1000+ character query with repeated terms
+            const longQuery = 'test AND ' + 'note.title *= test OR '.repeat(50) + '#label';
+
+            expect(() => {
+                const searchContext = new SearchContext();
+                searchService.findResultsWithQuery(longQuery, searchContext);
+            }).not.toThrow();
+        });
+
+        it('should handle deep nesting (100+ parentheses)', () => {
+            rootNote.child(note('Deep').label('test'));
+
+            // Create deeply nested query
+            let deepQuery = '#test';
+            for (let i = 0; i < 50; i++) {
+                deepQuery = `(${deepQuery} OR #test)`;
+            }
+
+            expect(() => {
+                const searchContext = new SearchContext();
+                searchService.findResultsWithQuery(deepQuery, searchContext);
+            }).not.toThrow();
+        });
+
+        it('should handle long attribute chains', () => {
+            const parent1Builder = rootNote.child(note('Parent1'));
+            const parent2Builder = parent1Builder.child(note('Parent2'));
+            parent2Builder.child(note('Child'));
+
+            expect(() => {
+                const searchContext = new SearchContext();
+                searchService.findResultsWithQuery(
+                    "note.parents.parents.parents.parents.title = 'Parent1'",
+                    searchContext
+                );
+            }).not.toThrow();
+        });
+    });
+
+    describe('Special Characters (search.md lines 188-206)', () => {
+        it('should handle escaping with backslash', () => {
+            rootNote.child(note('#hashtag in title', { content: 'content with #hashtag' }));
+
+            const searchContext = new SearchContext();
+            // Escaped # should be treated as literal character
+            const results = searchService.findResultsWithQuery('\\#hashtag', searchContext);
+
+            expect(findNoteByTitle(results, '#hashtag in title')).toBeTruthy();
+        });
+
+        it('should handle quotes in search', () => {
+            rootNote
+                .child(note("Single 'quote'"))
+                .child(note('Double "quote"'));
+
+            // Search for notes with quotes
+            expect(() => {
+                const searchContext = new SearchContext();
+                searchService.findResultsWithQuery('note.title *= quote', searchContext);
+            }).not.toThrow();
+        });
+
+        it('should handle hash character (#)', () => {
+            rootNote.child(note('Issue #123', { content: 'Bug #123' }));
+
+            // # without escaping should be treated as label prefix
+            // Escaped # should be literal
+            expect(() => {
+                const searchContext = new SearchContext();
+                searchService.findResultsWithQuery('note.text *= #123', searchContext);
+            }).not.toThrow();
+        });
+
+        it('should handle tilde character (~)', () => {
+            rootNote.child(note('File~backup', { content: 'Backup file~' }));
+
+            expect(() => {
+                const searchContext = new SearchContext();
+                searchService.findResultsWithQuery('note.text *= backup', searchContext);
+            }).not.toThrow();
+        });
+
+        it.skip('should handle unmatched parentheses (known search engine limitation)', () => {
+            // TODO: This test reveals a limitation in the current search implementation
+            // Specific issue: Search engine doesn't validate malformed queries, returns empty results instead
+            // Test is valid but search engine needs fixes to pass
+            rootNote.child(note('Test'));
+
+            // Unmatched opening parenthesis
+            expect(() => {
+                const searchContext = new SearchContext();
+                searchService.findResultsWithQuery('(#label AND note.title *= test', searchContext);
+            }).toThrow();
+        });
+
+        it('should handle operators in text content', () => {
+            rootNote.child(note('Math: a >= b', { content: 'Expression: x *= y' }));
+
+            expect(() => {
+                const searchContext = new SearchContext();
+                searchService.findResultsWithQuery('note.text *= Math', searchContext);
+            }).not.toThrow();
+        });
+
+        it('should handle reserved words (AND, OR, NOT, TODAY)', () => {
+            rootNote
+                .child(note('AND gate', { content: 'Logic AND operation' }))
+                .child(note('Today is the day', { content: 'TODAY' }));
+
+            // Reserved words in content should work with proper quoting
+            expect(() => {
+                const searchContext = new SearchContext();
+                searchService.findResultsWithQuery('note.text *= gate', searchContext);
+                searchService.findResultsWithQuery('note.text *= day', searchContext);
+            }).not.toThrow();
+        });
+    });
+
+    describe('Unicode and Emoji', () => {
+        it('should handle Unicode characters (café, 日本語, Ελληνικά)', () => {
+            rootNote
+                .child(note('café', { content: 'French café' }))
+                .child(note('日本語', { content: 'Japanese text' }))
+                .child(note('Ελληνικά', { content: 'Greek text' }));
+
+            const searchContext = new SearchContext();
+            const results1 = searchService.findResultsWithQuery('café', searchContext);
+            const results2 = searchService.findResultsWithQuery('日本語', searchContext);
+            const results3 = searchService.findResultsWithQuery('Ελληνικά', searchContext);
+
+            expect(findNoteByTitle(results1, 'café')).toBeTruthy();
+            expect(findNoteByTitle(results2, '日本語')).toBeTruthy();
+            expect(findNoteByTitle(results3, 'Ελληνικά')).toBeTruthy();
+        });
+
+        it('should handle emoji in search queries', () => {
+            rootNote
+                .child(note('Rocket 🚀', { content: 'Space exploration' }))
+                .child(note('Notes 📝', { content: 'Documentation' }));
+
+            const searchContext = new SearchContext();
+            const results1 = searchService.findResultsWithQuery('🚀', searchContext);
+            const results2 = searchService.findResultsWithQuery('📝', searchContext);
+
+            expect(findNoteByTitle(results1, 'Rocket 🚀')).toBeTruthy();
+            expect(findNoteByTitle(results2, 'Notes 📝')).toBeTruthy();
+        });
+
+        it('should handle emoji in note titles and content', () => {
+            rootNote.child(note('✅ Completed Tasks', { content: 'Task 1 ✅\nTask 2 ❌\nTask 3 🔄' }));
+
+            const searchContext = new SearchContext();
+            const results = searchService.findResultsWithQuery('Tasks', searchContext);
+
+            expect(findNoteByTitle(results, '✅ Completed Tasks')).toBeTruthy();
+        });
+
+        it('should handle mixed ASCII and Unicode', () => {
+            rootNote.child(note('Project Alpha (α) - Phase 1', { content: 'Données en français with English text' }));
+
+            const searchContext = new SearchContext();
+            const results = searchService.findResultsWithQuery('Project', searchContext);
+
+            expect(findNoteByTitle(results, 'Project Alpha (α) - Phase 1')).toBeTruthy();
+        });
+    });
+
+    describe('Malformed Queries', () => {
+        it('should handle unclosed quotes', () => {
+            rootNote.child(note('Test'));
+
+            // Unclosed quote should be handled gracefully
+            expect(() => {
+                const searchContext = new SearchContext();
+                searchService.findResultsWithQuery('note.title = "unclosed', searchContext);
+            }).not.toThrow();
+        });
+
+        it.skip('should handle unbalanced parentheses (known search engine limitation)', () => {
+            // TODO: This test reveals a limitation in the current search implementation
+            // Specific issue: Search engine doesn't validate malformed queries, returns empty results instead
+            // Test is valid but search engine needs fixes to pass
+            rootNote.child(note('Test'));
+
+            // More opening than closing
+            expect(() => {
+                const searchContext = new SearchContext();
+                searchService.findResultsWithQuery('(term1 AND term2', searchContext);
+            }).toThrow();
+
+            // More closing than opening
+            expect(() => {
+                const searchContext = new SearchContext();
+                searchService.findResultsWithQuery('term1 AND term2)', searchContext);
+            }).toThrow();
+        });
+
+        it.skip('should handle invalid operators (known search engine limitation)', () => {
+            // TODO: This test reveals a limitation in the current search implementation
+            // Specific issue: Search engine doesn't validate malformed queries, returns empty results instead
+            // Test is valid but search engine needs fixes to pass
+            rootNote.child(note('Test').label('label', '5'));
+
+            // Invalid operator >>
+            expect(() => {
+                const searchContext = new SearchContext();
+                searchService.findResultsWithQuery('#label >> 10', searchContext);
+            }).toThrow();
+        });
+
+        it.skip('should handle invalid regex patterns (known search engine limitation)', () => {
+            // TODO: This test reveals a limitation in the current search implementation
+            // Specific issue: Search engine doesn't validate malformed queries, returns empty results instead
+            // Test is valid but search engine needs fixes to pass
+            rootNote.child(note('Test', { content: 'content' }));
+
+            // Invalid regex pattern with unmatched parenthesis
+            expect(() => {
+                const searchContext = new SearchContext();
+                searchService.findResultsWithQuery("note.text %= '(invalid'", searchContext);
+            }).toThrow();
+        });
+
+        it.skip('should handle mixing operators incorrectly (known search engine limitation)', () => {
+            // TODO: This test reveals a limitation in the current search implementation
+            // Specific issue: Search engine doesn't validate malformed queries, returns empty results instead
+            // Test is valid but search engine needs fixes to pass
+            rootNote.child(note('Test').label('label', 'value'));
+
+            // Multiple operators in wrong order
+            expect(() => {
+                const searchContext = new SearchContext();
+                searchService.findResultsWithQuery('#label = >= value', searchContext);
+            }).toThrow();
+        });
+    });
+
+    describe('SQL Injection Attempts', () => {
+        it('should prevent SQL injection with keywords', () => {
+            rootNote.child(note("Test'; DROP TABLE notes; --", { content: 'Safe content' }));
+
+            expect(() => {
+                const searchContext = new SearchContext();
+                const results = searchService.findResultsWithQuery("note.title *= DROP", searchContext);
+                // Should treat as regular search term, not SQL
+                expect(Array.isArray(results)).toBeTruthy();
+            }).not.toThrow();
+        });
+
+        it('should prevent UNION attacks', () => {
+            rootNote.child(note('Test UNION SELECT', { content: 'Normal content' }));
+
+            expect(() => {
+                const searchContext = new SearchContext();
+                searchService.findResultsWithQuery('note.title *= UNION', searchContext);
+            }).not.toThrow();
+        });
+
+        it('should prevent comment-based attacks', () => {
+            rootNote.child(note('Test /* comment */ injection', { content: 'content' }));
+
+            expect(() => {
+                const searchContext = new SearchContext();
+                searchService.findResultsWithQuery('note.title *= comment', searchContext);
+            }).not.toThrow();
+        });
+
+        it('should handle escaped quotes in search', () => {
+            rootNote.child(note("Test with \\'escaped\\' quotes", { content: 'content' }));
+
+            expect(() => {
+                const searchContext = new SearchContext();
+                searchService.findResultsWithQuery("note.title *= escaped", searchContext);
+            }).not.toThrow();
+        });
+    });
+
+    describe('XSS Prevention in Results', () => {
+        it('should handle search terms with <script> tags', () => {
+            rootNote.child(note('<script>alert("xss")</script>', { content: 'Safe content' }));
+
+            const searchContext = new SearchContext();
+            const results = searchService.findResultsWithQuery('note.title *= script', searchContext);
+
+            expect(Array.isArray(results)).toBeTruthy();
+            // Results should be safe (sanitization handled by frontend)
+        });
+
+        it('should handle HTML entities in search', () => {
+            rootNote.child(note('Test &lt;tag&gt; entity', { content: 'HTML entities' }));
+
+            expect(() => {
+                const searchContext = new SearchContext();
+                searchService.findResultsWithQuery('note.title *= entity', searchContext);
+            }).not.toThrow();
+        });
+
+        it('should handle JavaScript injection attempts in titles', () => {
+            rootNote.child(note('javascript:alert(1)', { content: 'content' }));
+
+            const searchContext = new SearchContext();
+            const results = searchService.findResultsWithQuery('javascript', searchContext);
+
+            expect(Array.isArray(results)).toBeTruthy();
+        });
+    });
+
+    describe('Boundary Values', () => {
+        it('should handle empty labels (#)', () => {
+            rootNote.child(note('Test').label('', ''));
+
+            // Empty label name
+            expect(() => {
+                const searchContext = new SearchContext();
+                searchService.findResultsWithQuery('#', searchContext);
+            }).not.toThrow();
+        });
+
+        it('should handle empty relations (~)', () => {
+            rootNote.child(note('Test'));
+
+            expect(() => {
+                const searchContext = new SearchContext();
+                searchService.findResultsWithQuery('~', searchContext);
+            }).not.toThrow();
+        });
+
+        it('should handle very large numbers', () => {
+            rootNote.child(note('Test').label('count', '9999999999999'));
+
+            const searchContext = new SearchContext();
+            const results = searchService.findResultsWithQuery('#count > 1000000000000', searchContext);
+
+            expect(Array.isArray(results)).toBeTruthy();
+        });
+
+        it('should handle very small numbers', () => {
+            rootNote.child(note('Test').label('value', '-9999999999999'));
+
+            const searchContext = new SearchContext();
+            const results = searchService.findResultsWithQuery('#value < 0', searchContext);
+
+            expect(Array.isArray(results)).toBeTruthy();
+        });
+
+        it('should handle zero values', () => {
+            rootNote.child(note('Test').label('count', '0'));
+
+            const searchContext = new SearchContext();
+            const results = searchService.findResultsWithQuery('#count = 0', searchContext);
+
+            expect(findNoteByTitle(results, 'Test')).toBeTruthy();
+        });
+
+        it('should handle scientific notation', () => {
+            rootNote.child(note('Test').label('scientific', '1e10'));
+
+            expect(() => {
+                const searchContext = new SearchContext();
+                searchService.findResultsWithQuery('#scientific > 1000000000', searchContext);
+            }).not.toThrow();
+        });
+    });
+
+    describe('Type Mismatches', () => {
+        it('should handle string compared to number', () => {
+            rootNote.child(note('Test').label('value', 'text'));
+
+            // Comparing text label to number
+            expect(() => {
+                const searchContext = new SearchContext();
+                searchService.findResultsWithQuery('#value > 10', searchContext);
+            }).not.toThrow();
+        });
+
+        it('should handle boolean compared to string', () => {
+            rootNote.child(note('Test').label('flag', 'true'));
+
+            expect(() => {
+                const searchContext = new SearchContext();
+                searchService.findResultsWithQuery('#flag = true', searchContext);
+            }).not.toThrow();
+        });
+
+        it('should handle date compared to number', () => {
+            const testNoteBuilder = rootNote.child(note('Test'));
+            testNoteBuilder.note.dateCreated = '2023-01-01 10:00:00.000Z';
+
+            expect(() => {
+                const searchContext = new SearchContext();
+                searchService.findResultsWithQuery('note.dateCreated > 1000000', searchContext);
+            }).not.toThrow();
+        });
+
+        it('should handle null/undefined attribute access', () => {
+            rootNote.child(note('Test'));
+            // No labels
+
+            expect(() => {
+                const searchContext = new SearchContext();
+                searchService.findResultsWithQuery('#nonexistent = value', searchContext);
+            }).not.toThrow();
+        });
+    });
+
+    describe('Performance and Stress Tests', () => {
+        it('should handle searching through many notes (1000+)', () => {
+            // Create 1000 notes
+            for (let i = 0; i < 1000; i++) {
+                rootNote.child(note(`Note ${i}`, { content: `Content ${i}` }));
+            }
+
+            const start = Date.now();
+            const searchContext = new SearchContext();
+            const results = searchService.findResultsWithQuery('Note', searchContext);
+            const duration = Date.now() - start;
+
+            expect(results.length).toBeGreaterThan(0);
+            // Performance check - should complete in reasonable time (< 5 seconds)
+            expect(duration).toBeLessThan(5000);
+        });
+
+        it('should handle notes with very large content', () => {
+            const largeContent = 'test '.repeat(10000);
+            rootNote.child(note('Large Note', { content: largeContent }));
+
+            expect(() => {
+                const searchContext = new SearchContext();
+                searchService.findResultsWithQuery('test', searchContext);
+            }).not.toThrow();
+        });
+
+        it('should handle notes with many attributes', () => {
+            const noteBuilder = rootNote.child(note('Many Attributes'));
+            for (let i = 0; i < 100; i++) {
+                noteBuilder.label(`label${i}`, `value${i}`);
+            }
+
+            expect(() => {
+                const searchContext = new SearchContext();
+                searchService.findResultsWithQuery('#label50', searchContext);
+            }).not.toThrow();
+        });
+    });
+});

apps/server/src/services/search/expressions/note_content_fulltext.ts

@@ -19,6 +19,7 @@ import {
     fuzzyMatchWord,
     FUZZY_SEARCH_CONFIG 
 } from "../utils/text_utils.js";
+import { ftsSearchService, FTSError, FTSNotAvailableError, FTSQueryError } from "../fts/index.js";
 
 const ALLOWED_OPERATORS = new Set(["=", "!=", "*=*", "*=", "=*", "%=", "~=", "~*"]);
 
@@ -84,7 +85,132 @@ class NoteContentFulltextExp extends Expression {
 
         const resultNoteSet = new NoteSet();
 
-        // Search through notes with content
+        // Skip FTS5 for empty token searches - traditional search is more efficient
+        // Empty tokens means we're returning all notes (no filtering), which FTS5 doesn't optimize
+        if (this.tokens.length === 0) {
+            // Fall through to traditional search below
+        }
+        // Try to use FTS5 if available for better performance
+        else if (ftsSearchService.checkFTS5Availability() && this.canUseFTS5()) {
+            try {
+                // Check if we need to search protected notes
+                const searchProtected = protectedSessionService.isProtectedSessionAvailable();
+
+                const noteIdSet = inputNoteSet.getNoteIds();
+
+                // Determine which FTS5 method to use based on operator
+                let ftsResults;
+                if (this.operator === "*=*" || this.operator === "*=" || this.operator === "=*") {
+                    // Substring operators use LIKE queries (optimized by trigram index)
+                    // Do NOT pass a limit - we want all results to match traditional search behavior
+                    ftsResults = ftsSearchService.searchWithLike(
+                        this.tokens,
+                        this.operator,
+                        noteIdSet.size > 0 ? noteIdSet : undefined,
+                        {
+                            includeSnippets: false,
+                            searchProtected: false
+                            // No limit specified - return all results
+                        },
+                        searchContext // Pass context to track internal timing
+                    );
+                } else {
+                    // Other operators use MATCH syntax
+                    ftsResults = ftsSearchService.searchSync(
+                        this.tokens,
+                        this.operator,
+                        noteIdSet.size > 0 ? noteIdSet : undefined,
+                        {
+                            includeSnippets: false,
+                            searchProtected: false // FTS5 doesn't index protected notes
+                        },
+                        searchContext // Pass context to track internal timing
+                    );
+                }
+
+                // Add FTS results to note set
+                for (const result of ftsResults) {
+                    if (becca.notes[result.noteId]) {
+                        resultNoteSet.add(becca.notes[result.noteId]);
+                    }
+                }
+
+                // If we need to search protected notes, use the separate method
+                if (searchProtected) {
+                    const protectedResults = ftsSearchService.searchProtectedNotesSync(
+                        this.tokens,
+                        this.operator,
+                        noteIdSet.size > 0 ? noteIdSet : undefined,
+                        {
+                            includeSnippets: false
+                        }
+                    );
+
+                    // Add protected note results
+                    for (const result of protectedResults) {
+                        if (becca.notes[result.noteId]) {
+                            resultNoteSet.add(becca.notes[result.noteId]);
+                        }
+                    }
+                }
+
+                // Handle special cases that FTS5 doesn't support well
+                if (this.operator === "%=") {
+                    // Fall back to original implementation for regex searches
+                    return this.executeWithFallback(inputNoteSet, resultNoteSet, searchContext);
+                }
+
+                // If flatText search is enabled, also search attributes using FTS5
+                if (this.flatText) {
+                    try {
+                        const attributeNoteIds = ftsSearchService.searchAttributesSync(
+                            this.tokens,
+                            this.operator,
+                            noteIdSet.size > 0 ? noteIdSet : undefined
+                        );
+
+                        // Add notes with matching attributes
+                        for (const noteId of attributeNoteIds) {
+                            if (becca.notes[noteId]) {
+                                resultNoteSet.add(becca.notes[noteId]);
+                            }
+                        }
+                    } catch (error) {
+                        log.error(`FTS5 attribute search failed: ${error}`);
+                        // Fall back to traditional search for attributes only
+                        return this.executeWithFallback(inputNoteSet, resultNoteSet, searchContext);
+                    }
+                }
+
+                return resultNoteSet;
+            } catch (error) {
+                // Handle structured errors from FTS service
+                if (error instanceof FTSError) {
+                    if (error instanceof FTSNotAvailableError) {
+                        log.info("FTS5 not available, using standard search");
+                    } else if (error instanceof FTSQueryError) {
+                        log.error(`FTS5 query error: ${error.message}`);
+                        searchContext.addError(`Search optimization failed: ${error.message}`);
+                    } else {
+                        log.error(`FTS5 error: ${error}`);
+                    }
+
+                    // Use fallback for recoverable errors
+                    if (error.recoverable) {
+                        log.info("Using fallback search implementation");
+                    } else {
+                        // For non-recoverable errors, return empty result
+                        searchContext.addError(`Search failed: ${error.message}`);
+                        return resultNoteSet;
+                    }
+                } else {
+                    log.error(`Unexpected error in FTS5 search: ${error}`);
+                }
+                // Fall back to original implementation
+            }
+        }
+
+        // Original implementation for fallback or when FTS5 is not available
         for (const row of sql.iterateRows<SearchRow>(`
                 SELECT noteId, type, mime, content, isProtected
                 FROM notes JOIN blobs USING (blobId)
@@ -133,6 +259,76 @@ class NoteContentFulltextExp extends Expression {
         return resultNoteSet;
     }
 
+    /**
+     * Determines if the current search can use FTS5
+     */
+    private canUseFTS5(): boolean {
+        // FTS5 doesn't support regex searches well
+        if (this.operator === "%=") {
+            return false;
+        }
+
+        // FTS5 now supports exact match (=) with post-filtering for word boundaries
+        // The FTS search service will filter results to ensure exact word matches
+        return true;
+    }
+
+    /**
+     * Executes search with fallback for special cases
+     */
+    private executeWithFallback(inputNoteSet: NoteSet, resultNoteSet: NoteSet, searchContext: SearchContext): NoteSet {
+        // Keep existing results from FTS5 and add additional results from fallback
+        for (const row of sql.iterateRows<SearchRow>(`
+                SELECT noteId, type, mime, content, isProtected
+                FROM notes JOIN blobs USING (blobId)
+                WHERE type IN ('text', 'code', 'mermaid', 'canvas', 'mindMap')
+                  AND isDeleted = 0
+                  AND LENGTH(content) < ${MAX_SEARCH_CONTENT_SIZE}`)) {
+            if (this.operator === "%=" || this.flatText) {
+                // Only process for special cases
+                this.findInText(row, inputNoteSet, resultNoteSet);
+            }
+        }
+
+        // For exact match with flatText, also search notes WITHOUT content (they may have matching attributes)
+        if (this.flatText && (this.operator === "=" || this.operator === "!=")) {
+            for (const note of inputNoteSet.notes) {
+                // Skip if already found or doesn't exist
+                if (resultNoteSet.hasNoteId(note.noteId) || !(note.noteId in becca.notes)) {
+                    continue;
+                }
+
+                const noteFromBecca = becca.notes[note.noteId];
+                const flatText = noteFromBecca.getFlatText();
+
+                // For flatText, only check attribute values (format: #name=value or ~name=value)
+                // Don't match against noteId, type, mime, or title which are also in flatText
+                let matches = false;
+                const phrase = this.tokens.join(" ");
+                const normalizedPhrase = normalizeSearchText(phrase);
+                const normalizedFlatText = normalizeSearchText(flatText);
+
+                // Check if =phrase appears in flatText (indicates attribute value match)
+                // For single words, use word-boundary matching to avoid substring matches
+                if (!normalizedPhrase.includes(' ')) {
+                    // Single word: look for =word with word boundaries
+                    // Split by = to get attribute values, then check each value for exact word match
+                    const parts = normalizedFlatText.split('=');
+                    matches = parts.slice(1).some(part => this.exactWordMatch(normalizedPhrase, part));
+                } else {
+                    // Multi-word phrase: check for substring match
+                    matches = normalizedFlatText.includes(`=${normalizedPhrase}`);
+                }
+
+                if ((this.operator === "=" && matches) || (this.operator === "!=" && !matches)) {
+                    resultNoteSet.add(noteFromBecca);
+                }
+            }
+        }
+
+        return resultNoteSet;
+    }
+
     /**
      * Helper method to check if a single word appears as an exact match in text
      * @param wordToFind - The word to search for (should be normalized)
@@ -178,7 +374,27 @@ class NoteContentFulltextExp extends Expression {
         // e.g., "asd" should not match "asdfasdf"
         if (!phrase.includes(' ')) {
             // Single word: use exact word matching to avoid substring matches
-            return this.exactWordMatch(phrase, normalizedContent);
+            if (this.exactWordMatch(phrase, normalizedContent)) {
+                return true;
+            }
+
+            // For flatText, also check attribute names/values
+            // Attributes in flatText appear as "#name" or "#name=value" or "~name" or "~name=value"
+            if (checkFlatTextAttributes) {
+                // Check for attribute value: #something=phrase or ~something=phrase
+                if (normalizedContent.includes(`=${phrase}`)) {
+                    return true;
+                }
+                // Check for attribute name: #phrase or ~phrase (followed by space or =)
+                if (normalizedContent.includes(`#${phrase} `) ||
+                    normalizedContent.includes(`#${phrase}=`) ||
+                    normalizedContent.includes(`~${phrase} `) ||
+                    normalizedContent.includes(`~${phrase}=`)) {
+                    return true;
+                }
+            }
+
+            return false;
         }
 
         // For multi-word phrases, check if the phrase appears as consecutive words
@@ -315,16 +531,21 @@ class NoteContentFulltextExp extends Expression {
                 [key: string]: any; // Other properties that may exist
             }
 
-            const canvasContent = JSON.parse(content);
-            const elements = canvasContent.elements;
+            try {
+                const canvasContent = JSON.parse(content);
+                const elements = canvasContent.elements;
 
-            if (Array.isArray(elements)) {
-                const texts = elements
-                    .filter((element: Element) => element.type === "text" && element.text) // Filter for 'text' type elements with a 'text' property
-                    .map((element: Element) => element.text!); // Use `!` to assert `text` is defined after filtering
+                if (Array.isArray(elements)) {
+                    const texts = elements
+                        .filter((element: Element) => element.type === "text" && element.text) // Filter for 'text' type elements with a 'text' property
+                        .map((element: Element) => element.text!); // Use `!` to assert `text` is defined after filtering
 
-                content = normalize(texts.join(" "));
-            } else {
+                    content = normalize(texts.join(" "));
+                } else {
+                    content = "";
+                }
+            } catch (e) {
+                // Handle JSON parse errors or malformed canvas content
                 content = "";
             }
         }

apps/server/src/services/search/fts/errors.ts

@@ -0,0 +1,40 @@
+/**
+ * FTS5 Error Classes
+ *
+ * Custom error types for FTS5 operations to enable proper error handling
+ * and recovery strategies.
+ */
+
+/**
+ * Base error class for FTS operations
+ */
+export class FTSError extends Error {
+    constructor(
+        message: string,
+        public readonly code: string,
+        public readonly recoverable: boolean = true
+    ) {
+        super(message);
+        this.name = 'FTSError';
+    }
+}
+
+/**
+ * Error thrown when FTS5 is not available
+ */
+export class FTSNotAvailableError extends FTSError {
+    constructor(message: string = "FTS5 is not available") {
+        super(message, 'FTS_NOT_AVAILABLE', true);
+        this.name = 'FTSNotAvailableError';
+    }
+}
+
+/**
+ * Error thrown when an FTS query is malformed or invalid
+ */
+export class FTSQueryError extends FTSError {
+    constructor(message: string, public readonly query?: string) {
+        super(message, 'FTS_QUERY_ERROR', true);
+        this.name = 'FTSQueryError';
+    }
+}