fix(window): windowId is always main on mobile devices

.editorconfig

@@ -1,6 +1,6 @@
 root = true
 
-[*.{js,cjs,ts,tsx,css}]
+[*.{js,ts,tsx,css}]
 charset = utf-8
 end_of_line = lf
 indent_size = 4

.github/actions/build-electron/action.yml

@@ -85,7 +85,6 @@ runs:
       APPLE_ID: ${{ env.APPLE_ID }}
       APPLE_ID_PASSWORD: ${{ env.APPLE_ID_PASSWORD }}
       WINDOWS_SIGN_EXECUTABLE: ${{ env.WINDOWS_SIGN_EXECUTABLE }}
-      WINDOWS_SIGN_ERROR_LOG: ${{ env.WINDOWS_SIGN_ERROR_LOG }}
       TRILIUM_ARTIFACT_NAME_HINT: TriliumNotes-${{ github.ref_name }}-${{ inputs.os }}-${{ inputs.arch }}
       TARGET_ARCH: ${{ inputs.arch }}
     run: pnpm run --filter desktop electron-forge:make --arch=${{ inputs.arch }} --platform=${{ inputs.forge_platform }}

.github/actions/build-server/action.yml

@@ -8,7 +8,7 @@ inputs:
 runs:
   using: composite
   steps:
-  - uses: pnpm/action-setup@v5
+  - uses: pnpm/action-setup@v4
   - name: Set up node & dependencies
     uses: actions/setup-node@v6
     with:

.github/actions/report-size/action.yml

@@ -69,7 +69,7 @@ runs:
 
     # Post github action comment
     - name: Post comment
-      uses: marocchino/sticky-pull-request-comment@v3
+      uses: marocchino/sticky-pull-request-comment@v2
       if: ${{ steps.bundleSize.outputs.hasDifferences == 'true' }} # post only in case of changes
       with:
         number: ${{ github.event.pull_request.number }}

.github/copilot-instructions.md

@@ -186,14 +186,6 @@ When adding query parameters to ETAPI endpoints (`apps/server/src/etapi/`), main
 
 **Auth note**: ETAPI uses basic auth with tokens. Internal API endpoints trust the frontend.
 
-### Adding New LLM Tools
-Tools are defined using `defineTools()` in `apps/server/src/services/llm/tools/` and automatically registered for both the LLM chat and MCP server.
-
-1. Add the tool definition in the appropriate module (`note_tools.ts`, `attribute_tools.ts`, `hierarchy_tools.ts`) or create a new module
-2. Each tool needs: `description`, `inputSchema` (Zod), `execute` function, and optionally `mutates: true` for write operations or `needsContext: true` for tools that need the current note context
-3. If creating a new module, wrap tools in `defineTools({...})` and add the registry to `allToolRegistries` in `tools/index.ts`
-4. Add a client-side friendly name in `apps/client/src/translations/en/translation.json` under `llm.tools.<tool_name>` — use **imperative tense** (e.g. "Search notes", "Create note", "Get attributes"), not present continuous
-
 ### Database Migrations
 - Add scripts in `apps/server/src/migrations/YYMMDD_HHMM__description.sql`
 - Update schema in `apps/server/src/assets/db/schema.sql`
@@ -221,12 +213,6 @@ Tools are defined using `defineTools()` in `apps/server/src/services/llm/tools/`
 
 10. **Attribute inheritance can be complex** - When checking for labels/relations, use `note.getOwnedAttribute()` for direct attributes or `note.getAttribute()` for inherited ones. Don't assume attributes are directly on the note.
 
-## MCP Server
-- Trilium exposes an MCP (Model Context Protocol) server at `http://localhost:8080/mcp`, configured in `.mcp.json`
-- The MCP server is **only available when the Trilium server is running** (`pnpm run server:start`)
-- It provides tools for reading, searching, and modifying notes directly from the AI assistant
-- Use it to interact with actual note data when developing or debugging note-related features
-
 ## TypeScript Configuration
 
 - **Project references**: Monorepo uses TypeScript project references (`tsconfig.json`)
@@ -289,12 +275,6 @@ View types are configured via `#viewType` label (e.g., `#viewType=table`). Each
 - Register in `packages/ckeditor5/src/plugins.ts`
 - See `ckeditor5-admonition`, `ckeditor5-footnotes`, `ckeditor5-math`, `ckeditor5-mermaid` for examples
 
-### Updating PDF.js
-1. Update `pdfjs-dist` version in `packages/pdfjs-viewer/package.json`
-2. Run `npx tsx scripts/update-viewer.ts` from that directory
-3. Run `pnpm build` to verify success
-4. Commit all changes including updated viewer files
-
 ### Database Migrations
 - Add migration scripts in `apps/server/src/migrations/YYMMDD_HHMM__description.sql`
 - Update schema in `apps/server/src/assets/db/schema.sql`
@@ -319,8 +299,6 @@ Trilium provides powerful user scripting capabilities:
 - Translation files in `apps/client/src/translations/`
 - Use translation system via `t()` function
 - Automatic pluralization: Add `_other` suffix to translation keys (e.g., `item` and `item_other` for singular/plural)
-- When a translated string contains **interpolated components** (e.g. links, note references) whose order may vary across languages, use `<Trans>` from `react-i18next` instead of `t()`. This lets translators reorder components freely (e.g. `"<Note/> in <Parent/>"` vs `"in <Parent/>, <Note/>"`)
-- When adding a new locale, follow the step-by-step guide in `docs/Developer Guide/Developer Guide/Concepts/Internationalisation  Translations/Adding a new locale.md`
 
 ## Testing Conventions
 

.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

@@ -45,7 +45,7 @@ jobs:
         uses: actions/checkout@v6
 
       - name: Setup pnpm
-        uses: pnpm/action-setup@v5
+        uses: pnpm/action-setup@v4
 
       - name: Setup Node.js
         uses: actions/setup-node@v6
@@ -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/dev.yml

@@ -1,13 +1,9 @@
 name: Dev
 on:
   push:
-    branches:
-      - main
-      - "release/*"
+    branches: [ main ]
   pull_request:
-    branches:
-      - main
-      - "release/*"
+    branches: [ main ]
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
@@ -30,7 +26,7 @@ jobs:
       - name: Checkout the repository
         uses: actions/checkout@v6
 
-      - uses: pnpm/action-setup@v5
+      - uses: pnpm/action-setup@v4
       - name: Set up node & dependencies
         uses: actions/setup-node@v6
         with:
@@ -41,35 +37,8 @@ jobs:
       - name: Typecheck
         run: pnpm typecheck
 
-      - name: Run the client-side tests
-        run: pnpm run --filter=client test
-
-      - name: Upload client test report
-        uses: actions/upload-artifact@v7
-        if: always()
-        with:
-          name: client-test-report
-          path: apps/client/test-output/vitest/html/
-          retention-days: 30
-
-      - name: Run the server-side tests
-        run: pnpm run --filter=server test
-
-      - name: Upload server test report
-        uses: actions/upload-artifact@v7
-        if: always()
-        with:
-          name: server-test-report
-          path: apps/server/test-output/vitest/html/
-          retention-days: 30
-
-      - name: Run CKEditor e2e tests
-        run: |
-          pnpm run --filter=ckeditor5-mermaid test
-          pnpm run --filter=ckeditor5-math test
-
-      - name: Run the rest of the tests
-        run: pnpm run --filter=\!client --filter=\!server --filter=\!ckeditor5-mermaid --filter=\!ckeditor5-math test
+      - name: Run the unit tests
+        run: pnpm run test:all
 
   build_docker:
     name: Build Docker image
@@ -78,7 +47,7 @@ jobs:
       - test_dev
     steps:
       - uses: actions/checkout@v6
-      - uses: pnpm/action-setup@v5
+      - uses: pnpm/action-setup@v4
       - name: Install dependencies
         run: pnpm install --frozen-lockfile
       - name: Update build info
@@ -93,8 +62,8 @@ jobs:
           key: ${{ secrets.RELATIVE_CI_CLIENT_KEY }}
       - name: Trigger server build
         run: pnpm run server:build
-      - uses: docker/setup-buildx-action@v4
-      - uses: docker/build-push-action@v7
+      - uses: docker/setup-buildx-action@v3
+      - uses: docker/build-push-action@v6
         with:
           context: apps/server
           cache-from: type=gha
@@ -113,7 +82,7 @@ jobs:
       - name: Checkout the repository
         uses: actions/checkout@v6
 
-      - uses: pnpm/action-setup@v5
+      - uses: pnpm/action-setup@v4
       - name: Install dependencies
         run: pnpm install --frozen-lockfile
 
@@ -128,10 +97,10 @@ jobs:
         run: echo "TEST_TAG=${TEST_TAG,,}" >> $GITHUB_ENV
 
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v4
+        uses: docker/setup-buildx-action@v3
 
       - name: Build and export to Docker
-        uses: docker/build-push-action@v7
+        uses: docker/build-push-action@v6
         with:
           context: apps/server
           file: apps/server/${{ matrix.dockerfile }}

.github/workflows/i18n.yml

@@ -18,7 +18,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v6
-      - uses: pnpm/action-setup@v5
+      - uses: pnpm/action-setup@v4
       - name: Set up node & dependencies
         uses: actions/setup-node@v6
         with:

.github/workflows/main-docker.yml

@@ -40,9 +40,9 @@ jobs:
         run: echo "TEST_TAG=${TEST_TAG,,}" >> $GITHUB_ENV
 
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v4
+        uses: docker/setup-buildx-action@v3
 
-      - uses: pnpm/action-setup@v5
+      - uses: pnpm/action-setup@v4
       - name: Set up node & dependencies
         uses: actions/setup-node@v6
         with:
@@ -59,7 +59,7 @@ jobs:
         run: pnpm run server:build
 
       - name: Build and export to Docker
-        uses: docker/build-push-action@v7
+        uses: docker/build-push-action@v6
         with:
           context: apps/server
           file: apps/server/${{ matrix.dockerfile }}
@@ -86,12 +86,12 @@ jobs:
 
       - name: Upload Playwright trace
         if: failure()
-        uses: actions/upload-artifact@v7
+        uses: actions/upload-artifact@v6
         with:
           name: Playwright trace (${{ matrix.dockerfile }})
           path: test-output/playwright/output
 
-      - uses: actions/upload-artifact@v7
+      - uses: actions/upload-artifact@v6
         if: ${{ !cancelled() }}
         with:
           name: Playwright report (${{ matrix.dockerfile }})
@@ -142,7 +142,7 @@ jobs:
 
       - name: Checkout repository
         uses: actions/checkout@v6
-      - uses: pnpm/action-setup@v5
+      - uses: pnpm/action-setup@v4
       - name: Set up node & dependencies
         uses: actions/setup-node@v6
         with:
@@ -164,9 +164,11 @@ jobs:
 
       - name: Docker meta
         id: meta
-        uses: docker/metadata-action@v6
+        uses: docker/metadata-action@v5
         with:
-          images: ${{ env.GHCR_REGISTRY }}/${{ env.IMAGE_NAME }}
+          images: |
+            ${{ env.GHCR_REGISTRY }}/${{ env.IMAGE_NAME }}
+            ${{ env.DOCKERHUB_REGISTRY }}/${{ env.IMAGE_NAME }}
           tags: |
             type=ref,event=branch
             type=ref,event=tag
@@ -175,21 +177,28 @@ jobs:
             latest=false
 
       - name: Set up QEMU
-        uses: docker/setup-qemu-action@v4
+        uses: docker/setup-qemu-action@v3
 
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v4
+        uses: docker/setup-buildx-action@v3
 
       - name: Login to GHCR
-        uses: docker/login-action@v4
+        uses: docker/login-action@v3
         with:
           registry: ${{ env.GHCR_REGISTRY }}
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
+      - name: Login to DockerHub
+        uses: docker/login-action@v3
+        with:
+          registry: ${{ env.DOCKERHUB_REGISTRY }}
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+
       - name: Build and push by digest
         id: build
-        uses: docker/build-push-action@v7
+        uses: docker/build-push-action@v6
         with:
           context: apps/server
           file: apps/server/${{ matrix.dockerfile }}
@@ -204,7 +213,7 @@ jobs:
           touch "/tmp/digests/${digest#sha256:}"
 
       - name: Upload digest
-        uses: actions/upload-artifact@v7
+        uses: actions/upload-artifact@v6
         with:
           name: digests-${{ env.PLATFORM_PAIR }}-${{ matrix.dockerfile }}
           path: /tmp/digests/*
@@ -218,7 +227,7 @@ jobs:
       - build
     steps:
       - name: Download digests
-        uses: actions/download-artifact@v8
+        uses: actions/download-artifact@v7
         with:
           path: /tmp/digests
           pattern: digests-*
@@ -228,86 +237,75 @@ jobs:
       - name: Set TEST_TAG to lowercase
         run: echo "TEST_TAG=${TEST_TAG,,}" >> $GITHUB_ENV
 
-      - name: Set up crane
-        uses: imjasonh/setup-crane@v0.5
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: Docker meta
+        id: meta
+        uses: docker/metadata-action@v5
+        with:
+          images: |
+            ${{ env.GHCR_REGISTRY }}/${{ env.IMAGE_NAME }}
+            ${{ env.DOCKERHUB_REGISTRY }}/${{ env.IMAGE_NAME }}
+          flavor: |
+            latest=false
 
       - name: Login to GHCR
-        uses: docker/login-action@v4
+        uses: docker/login-action@v3
         with:
           registry: ${{ env.GHCR_REGISTRY }}
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Login to DockerHub
-        uses: docker/login-action@v4
+        uses: docker/login-action@v3
         with:
           registry: ${{ env.DOCKERHUB_REGISTRY }}
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
 
-      - name: Docker meta
-        id: meta
-        uses: docker/metadata-action@v6
-        with:
-          images: ${{ env.GHCR_REGISTRY }}/${{ env.IMAGE_NAME }}
-          tags: |
-            type=ref,event=branch
-            type=ref,event=tag
-            type=sha
-          flavor: |
-            latest=false
-
-      - name: Verify digests exist on GHCR
+      - name: Create manifest list and push
         working-directory: /tmp/digests
         run: |
-          echo "Verifying all digests are available on GHCR..."
-          for DIGEST_FILE in *; do
-            DIGEST="sha256:${DIGEST_FILE}"
-            echo -n "  ${DIGEST}: "
-            crane manifest "${{ env.GHCR_REGISTRY }}/${{ env.IMAGE_NAME }}@${DIGEST}" > /dev/null
-            echo "OK"
-          done
+          # Extract the branch or tag name from the ref
+          REF_NAME=$(echo "${GITHUB_REF}" | sed 's/refs\/heads\///' | sed 's/refs\/tags\///')
 
-      - name: Create and push multi-arch manifest
-        working-directory: /tmp/digests
-        run: |
-          GHCR_IMAGE="${{ env.GHCR_REGISTRY }}/${{ env.IMAGE_NAME }}"
-          DOCKERHUB_IMAGE="${{ env.DOCKERHUB_REGISTRY }}/${{ env.IMAGE_NAME }}"
+          # Create and push the manifest list with both the branch/tag name and the commit SHA
+          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 ' *)
 
-          # Build -m flags for crane index append from digest files
-          MANIFEST_ARGS=""
-          for d in *; do
-            MANIFEST_ARGS="${MANIFEST_ARGS} -m ${GHCR_IMAGE}@sha256:${d}"
-          done
+          docker buildx imagetools create $(jq -cr '.tags | map("-t " + .) | join(" ")' <<< "$DOCKER_METADATA_OUTPUT_JSON") \
+            -t ${{ env.DOCKERHUB_REGISTRY }}/${{ env.IMAGE_NAME }}:${REF_NAME} \
+            $(printf '${{ env.DOCKERHUB_REGISTRY }}/${{ env.IMAGE_NAME }}@sha256:%s ' *)
 
-          # Create multi-arch manifest for each tag from metadata, plus copy to DockerHub
-          while IFS= read -r TAG; do
-            echo "Creating manifest: ${TAG}"
-            crane index append ${MANIFEST_ARGS} -t "${TAG}"
-
-            SUFFIX="${TAG#*:}"
-            echo "Copying to DockerHub: ${DOCKERHUB_IMAGE}:${SUFFIX}"
-            crane copy "${TAG}" "${DOCKERHUB_IMAGE}:${SUFFIX}"
-          done <<< "${{ steps.meta.outputs.tags }}"
-
-          # For stable releases (tags without hyphens), also create stable + latest
-          REF_NAME="${GITHUB_REF#refs/tags/}"
+          # 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...
           if [[ "${GITHUB_REF}" == refs/tags/* && ! "${REF_NAME}" =~ - ]]; then
-            echo "Creating stable tags..."
-            crane index append ${MANIFEST_ARGS} -t "${GHCR_IMAGE}:stable"
-            crane copy "${GHCR_IMAGE}:stable" "${DOCKERHUB_IMAGE}:stable"
+            # First create stable tags
+            docker buildx imagetools create $(jq -cr '.tags | map("-t " + .) | join(" ")' <<< "$DOCKER_METADATA_OUTPUT_JSON") \
+              -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") \
+              -t ${{ env.DOCKERHUB_REGISTRY }}/${{ env.IMAGE_NAME }}:stable \
+              $(printf '${{ env.DOCKERHUB_REGISTRY }}/${{ env.IMAGE_NAME }}@sha256:%s ' *)
+
+            # Small delay to ensure stable tag is fully propagated
+            sleep 5
+
+            # Now update latest tags
+            docker buildx imagetools create \
+              -t ${{ env.GHCR_REGISTRY }}/${{ env.IMAGE_NAME }}:latest \
+              ${{ env.GHCR_REGISTRY }}/${{ env.IMAGE_NAME }}:stable
+
+            docker buildx imagetools create \
+              -t ${{ env.DOCKERHUB_REGISTRY }}/${{ env.IMAGE_NAME }}:latest \
+              ${{ env.DOCKERHUB_REGISTRY }}/${{ env.IMAGE_NAME }}:stable
 
-            echo "Creating latest tags..."
-            crane copy "${GHCR_IMAGE}:stable" "${GHCR_IMAGE}:latest"
-            crane copy "${GHCR_IMAGE}:latest" "${DOCKERHUB_IMAGE}:latest"
           fi
 
-      - name: Inspect manifests
+      - name: Inspect image
         run: |
-          REF_NAME="${GITHUB_REF#refs/heads/}"
-          REF_NAME="${REF_NAME#refs/tags/}"
-          echo "=== GHCR ==="
-          crane manifest "${{ env.GHCR_REGISTRY }}/${{ env.IMAGE_NAME }}:${REF_NAME}"
-          echo ""
-          echo "=== DockerHub ==="
-          crane manifest "${{ env.DOCKERHUB_REGISTRY }}/${{ env.IMAGE_NAME }}:${REF_NAME}"
+          docker buildx imagetools inspect ${{ env.GHCR_REGISTRY }}/${{ env.IMAGE_NAME }}:${{ steps.meta.outputs.version }}
+          docker buildx imagetools inspect ${{ env.DOCKERHUB_REGISTRY }}/${{ env.IMAGE_NAME }}:${{ steps.meta.outputs.version }}

.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
@@ -61,7 +61,7 @@ jobs:
     runs-on: ${{ matrix.os.image }}
     steps:
       - uses: actions/checkout@v6
-      - uses: pnpm/action-setup@v5
+      - uses: pnpm/action-setup@v4
       - name: Set up node & dependencies
         uses: actions/setup-node@v6
         with:
@@ -69,8 +69,6 @@ jobs:
           cache: 'pnpm'
       - name: Install dependencies
         run: pnpm install --frozen-lockfile
-        env:
-          npm_config_package_import_method: copy
       - name: Update nightly version
         run: pnpm run chore:ci-update-nightly-version
       - name: Run the build
@@ -89,11 +87,10 @@ jobs:
           APPLE_ID: ${{ secrets.APPLE_ID }}
           APPLE_ID_PASSWORD: ${{ secrets.APPLE_ID_PASSWORD }}
           WINDOWS_SIGN_EXECUTABLE: ${{ vars.WINDOWS_SIGN_EXECUTABLE }}
-          WINDOWS_SIGN_ERROR_LOG: ${{ vars.WINDOWS_SIGN_ERROR_LOG }}
           GPG_SIGNING_KEY: ${{ secrets.GPG_SIGN_KEY }}
 
       - name: Publish release
-        uses: softprops/action-gh-release@v2.6.1
+        uses: softprops/action-gh-release@v2.5.0
         if: ${{ github.event_name != 'pull_request' }}
         with:
           make_latest: false
@@ -105,14 +102,14 @@ jobs:
           name: Nightly Build
 
       - name: Publish artifacts
-        uses: actions/upload-artifact@v7
+        uses: actions/upload-artifact@v6
         if: ${{ github.event_name == 'pull_request' }}
         with:
           name: TriliumNotes ${{ matrix.os.name }} ${{ matrix.arch }}
           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
@@ -134,7 +131,7 @@ jobs:
           arch: ${{ matrix.arch }}
 
       - name: Publish release
-        uses: softprops/action-gh-release@v2.6.1
+        uses: softprops/action-gh-release@v2.5.0
         if: ${{ github.event_name != 'pull_request' }}
         with:
           make_latest: false

.github/workflows/playwright.yml

@@ -38,7 +38,7 @@ jobs:
           filter: tree:0
           fetch-depth: 0
 
-      - uses: pnpm/action-setup@v5
+      - uses: pnpm/action-setup@v4
       - uses: actions/setup-node@v6
         with:
           node-version: 24
@@ -77,7 +77,7 @@ jobs:
 
       - name: Upload test report
         if: failure()
-        uses: actions/upload-artifact@v7
+        uses: actions/upload-artifact@v6
         with:
           name: e2e report ${{ matrix.arch }}
           path: apps/server-e2e/test-output

.github/workflows/release.yml

@@ -17,22 +17,10 @@ jobs:
     steps:
       - uses: actions/checkout@v6
 
-      - uses: pnpm/action-setup@v5
-      - name: Set up node & dependencies
-        uses: actions/setup-node@v6
-        with:
-          node-version: 24
-          cache: 'pnpm'
-
-      - name: Install dependencies
-        run: pnpm install --filter source --frozen-lockfile --ignore-scripts
-
       - name: Check version consistency
         run: pnpm tsx ${{ github.workspace }}/scripts/check-version-consistency.ts ${{ github.ref_name }}
   make-electron:
     name: Make Electron
-    needs:
-      - sanity-check
     strategy:
       fail-fast: false
       matrix:
@@ -66,7 +54,7 @@ jobs:
     runs-on: ${{ matrix.os.image }}
     steps:
       - uses: actions/checkout@v6
-      - uses: pnpm/action-setup@v5
+      - uses: pnpm/action-setup@v4
       - name: Set up node & dependencies
         uses: actions/setup-node@v6
         with:
@@ -90,19 +78,16 @@ jobs:
           APPLE_ID: ${{ secrets.APPLE_ID }}
           APPLE_ID_PASSWORD: ${{ secrets.APPLE_ID_PASSWORD }}
           WINDOWS_SIGN_EXECUTABLE: ${{ vars.WINDOWS_SIGN_EXECUTABLE }}
-          WINDOWS_SIGN_ERROR_LOG: ${{ vars.WINDOWS_SIGN_ERROR_LOG }}
           GPG_SIGNING_KEY: ${{ secrets.GPG_SIGN_KEY }}
 
       - name: Upload the artifact
-        uses: actions/upload-artifact@v7
+        uses: actions/upload-artifact@v6
         with:
           name: release-desktop-${{ matrix.os.name }}-${{ matrix.arch }}
           path: apps/desktop/upload/*.*
 
   build_server:
     name: Build Linux Server
-    needs:
-      - sanity-check
     strategy:
       fail-fast: false
       matrix:
@@ -123,7 +108,7 @@ jobs:
           arch: ${{ matrix.arch }}
 
       - name: Upload the artifact
-        uses: actions/upload-artifact@v7
+        uses: actions/upload-artifact@v6
         with:
           name: release-server-linux-${{ matrix.arch }}
           path: upload/*.*
@@ -143,14 +128,14 @@ jobs:
             docs/Release Notes
 
       - name: Download all artifacts
-        uses: actions/download-artifact@v8
+        uses: actions/download-artifact@v7
         with:
           merge-multiple: true
           pattern: release-*
           path: upload
 
       - name: Publish stable release
-        uses: softprops/action-gh-release@v2.6.1
+        uses: softprops/action-gh-release@v2.5.0
         with:
           draft: false
           body_path: docs/Release Notes/Release Notes/${{ github.ref_name }}.md

.github/workflows/web-clipper.yml

@@ -1,69 +0,0 @@
-name: Deploy web clipper extension
-
-on:
-  push:
-    branches:
-      - main
-    paths:
-      - "apps/web-clipper/**"
-    tags:
-      - "web-clipper-v*"
-
-  pull_request:
-    paths:
-      - "apps/web-clipper/**"
-
-permissions:
-  contents: write
-  discussions: write
-
-concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: true
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    name: Build web clipper extension
-
-    permissions:
-      contents: read
-      deployments: write
-
-    steps:
-      - uses: actions/checkout@v6
-      - uses: pnpm/action-setup@v5
-      - name: Set up node & dependencies
-        uses: actions/setup-node@v6
-        with:
-          node-version: 24
-          cache: "pnpm"
-
-      - name: Install dependencies
-        run: pnpm install --filter web-clipper --frozen-lockfile --ignore-scripts
-
-      - name: Build the web clipper extension
-        run: |
-          pnpm --filter web-clipper zip
-          pnpm --filter web-clipper zip:firefox
-
-      - name: Upload build artifacts
-        uses: actions/upload-artifact@v7
-        if: ${{ !startsWith(github.ref, 'refs/tags/web-clipper-v') }}
-        with:
-          name: web-clipper-extension
-          path: apps/web-clipper/.output/*.zip
-          include-hidden-files: true
-          if-no-files-found: error
-          compression-level: 0
-
-      - name: Release web clipper extension
-        uses: softprops/action-gh-release@v2.6.1
-        if: ${{ startsWith(github.ref, 'refs/tags/web-clipper-v') }}
-        with:
-          draft: false
-          fail_on_unmatched_files: true
-          files: apps/web-clipper/.output/*.zip
-          discussion_category_name: Releases
-          make_latest: false
-          token: ${{ secrets.RELEASE_PAT }}

.github/workflows/website.yml

@@ -26,7 +26,7 @@ jobs:
 
     steps:
       - uses: actions/checkout@v6
-      - uses: pnpm/action-setup@v5
+      - uses: pnpm/action-setup@v4
       - name: Set up node & dependencies
         uses: actions/setup-node@v6
         with:

.gitignore

@@ -46,6 +46,7 @@ upload
 
 /.direnv
 /result
+.svelte-kit
 
 # docs
 site/

.mcp.json

@@ -1,8 +0,0 @@
-{
-  "mcpServers": {
-    "trilium": {
-      "type": "http",
-      "url": "http://localhost:8080/mcp"
-    }
-  }
-}

.nvmrc

@@ -1 +1 @@
-24.14.1
+24.13.0

.vscode/launch.json

@@ -1,57 +0,0 @@
-{
-  "version": "0.2.0",
-  "configurations": [
-    {
-      "name": "Launch client (Chrome)",
-      "request": "launch",
-      "type": "chrome",
-      "url": "http://localhost:8080",
-      "webRoot": "${workspaceFolder}/apps/client"
-    },
-    {
-      "name": "Launch server",
-      "type": "node",
-      "request": "launch",
-      "program": "${workspaceFolder}/apps/server/src/main.ts",
-      "runtimeExecutable": "${workspaceFolder}/node_modules/.bin/tsx",
-      "env": {
-        "NODE_ENV": "development",
-        "TRILIUM_ENV": "dev",
-        "TRILIUM_DATA_DIR": "${input:trilium_data_dir}",
-        "TRILIUM_RESOURCE_DIR": "${workspaceFolder}/apps/server/src"
-      },
-      "autoAttachChildProcesses": true,
-      "cwd": "${workspaceFolder}",
-      "console": "integratedTerminal",
-      "internalConsoleOptions": "neverOpen",
-      "skipFiles": ["<node_internals>/**", "${workspaceFolder}/node_modules/**"]
-    },
-    {
-      "name": "Launch Vitest with current test file",
-      "type": "node",
-      "request": "launch",
-      "autoAttachChildProcesses": true,
-      "program": "${workspaceFolder}/node_modules/vitest/vitest.mjs",
-      "args": ["run", "${relativeFile}"],
-      "smartStep": true,
-      "console": "integratedTerminal",
-      "skipFiles": ["<node_internals>/**", "**/node_modules/**"],
-      "cwd": "${workspaceFolder}"
-    }
-  ],
-  "compounds": [
-    {
-      "name": "Launch client (Chrome) and server",
-      "configurations": ["Launch server","Launch client (Chrome)"],
-      "stopAll": true
-    }
-  ],
-  "inputs": [
-    {
-      "id": "trilium_data_dir",
-      "type": "promptString",
-      "description": "Select Trilum Notes data directory",
-      "default": "${workspaceFolder}/apps/server/data"
-    }
-  ]
-}

.vscode/settings.json

@@ -42,8 +42,5 @@
     },
     "eslint.rules.customizations": [
         { "rule": "*", "severity": "warn" }
-    ],
-    "cSpell.words": [
-      "Trilium"
     ]
-}
+}

CLAUDE.md

@@ -118,10 +118,6 @@ Trilium provides powerful user scripting capabilities:
 ### Internationalization
 - Translation files in `apps/client/src/translations/`
 - Supported languages: English, German, Spanish, French, Romanian, Chinese
-- **Only add new translation keys to `en/translation.json`** — translations for other languages are managed via Weblate and will be contributed by the community
-- Third-party components (e.g., mind-map context menu) should use i18next `t()` for their labels, with the English strings added to `en/translation.json` under a dedicated namespace (e.g., `"mind-map"`)
-- When a translated string contains **interpolated components** (e.g. links, note references) whose order may vary across languages, use `<Trans>` from `react-i18next` instead of `t()`. This lets translators reorder components freely (e.g. `"<Note/> in <Parent/>"` vs `"in <Parent/>, <Note/>"`)
-- When adding a new locale, follow the step-by-step guide in `docs/Developer Guide/Developer Guide/Concepts/Internationalisation  Translations/Adding a new locale.md`
 
 ### Security Considerations
 - Per-note encryption with granular protected sessions
@@ -129,15 +125,6 @@ Trilium provides powerful user scripting capabilities:
 - OpenID and TOTP authentication support
 - Sanitization of user-generated content
 
-### Client-Side API Restrictions
-- **Do not use `crypto.randomUUID()`** or other Web Crypto APIs that require secure contexts - Trilium can run over HTTP, not just HTTPS
-- Use `randomString()` from `apps/client/src/services/utils.ts` for generating IDs instead
-
-### Shared Types Policy
-- Types shared between client and server belong in `@triliumnext/commons` (`packages/commons/src/lib/`)
-- Import shared types directly from `@triliumnext/commons` - do not re-export them from app-specific modules
-- Keep app-specific types (e.g., `LlmProvider` for server, `StreamCallbacks` for client) in their respective apps
-
 ## Common Development Tasks
 
 ### Adding New Note Types
@@ -153,37 +140,10 @@ Trilium provides powerful user scripting capabilities:
 - Create new package in `packages/` following existing plugin structure
 - Register in `packages/ckeditor5/src/plugins.ts`
 
-### Adding New LLM Tools
-Tools are defined using `defineTools()` in `apps/server/src/services/llm/tools/` and automatically registered for both the LLM chat and MCP server.
-
-1. Add the tool definition in the appropriate module (`note_tools.ts`, `attribute_tools.ts`, `attachment_tools.ts`, `hierarchy_tools.ts`) or create a new module
-2. Each tool needs: `description`, `inputSchema` (Zod), `execute` function, and optionally `mutates: true` for write operations
-3. If creating a new module, wrap tools in `defineTools({...})` and add the registry to `allToolRegistries` in `tools/index.ts`
-4. Add a client-side friendly name in `apps/client/src/translations/en/translation.json` under `llm.tools.<tool_name>` — use **imperative tense** (e.g. "Search notes", "Create note", "Get attributes"), not present continuous
-5. Use ETAPI (`apps/server/src/etapi/`) as inspiration for what fields to expose, but **do not import ETAPI mappers** — inline the field mappings directly in the tool so the LLM layer stays decoupled from the API layer
-
-### Updating PDF.js
-1. Update `pdfjs-dist` version in `packages/pdfjs-viewer/package.json`
-2. Run `npx tsx scripts/update-viewer.ts` from that directory
-3. Run `pnpm build` to verify success
-4. Commit all changes including updated viewer files
-
 ### Database Migrations
 - Add migration scripts in `apps/server/src/migrations/`
 - Update schema in `apps/server/src/assets/db/schema.sql`
 
-### Server-Side Static Assets
-- Static assets (templates, SQL, translations, etc.) go in `apps/server/src/assets/`
-- Access them at runtime via `RESOURCE_DIR` from `apps/server/src/services/resource_dir.ts` (e.g. `path.join(RESOURCE_DIR, "llm", "skills", "file.md")`)
-- **Do not use `import.meta.url`/`fileURLToPath`** to resolve file paths — the server is bundled into CJS for production, so `import.meta.url` will not point to the source directory
-- **Do not use `__dirname` with relative paths** from source files — after bundling, `__dirname` points to the bundle output, not the original source tree
-
-## MCP Server
-- Trilium exposes an MCP (Model Context Protocol) server at `http://localhost:8080/mcp`, configured in `.mcp.json`
-- The MCP server is **only available when the Trilium server is running** (`pnpm run server:start`)
-- It provides tools for reading, searching, and modifying notes directly from the AI assistant
-- Use it to interact with actual note data when developing or debugging note-related features
-
 ## Build System Notes
 - Uses pnpm for monorepo management
 - Vite for fast development builds

SECURITY.md

@@ -2,87 +2,12 @@
 
 ## Supported Versions
 
-Only the latest stable minor release receives security fixes.
+In the (still active) 0.X phase of the project only the latest stable minor release is getting bugfixes (including security ones).
 
-For example, if the latest stable version is 0.92.3 and the latest beta is 0.93.0-beta, then only the 0.92.x line will receive security patches. Older versions (like 0.91.x) will not receive fixes.
+So e.g. if the latest stable version is 0.42.3 and the latest beta version is 0.43.0-beta, then 0.42 line will still get security fixes but older versions (like 0.41.X) won't get any fixes.
 
-This policy may be altered on a case-by-case basis for critical vulnerabilities.
+Description above is a general rule and may be altered on case by case basis.
 
 ## Reporting a Vulnerability
 
-**Please report all security vulnerabilities through [GitHub Security Advisories](https://github.com/TriliumNext/Notes/security/advisories/new).**
-
-We do not accept security reports via email, public issues, or other channels. GitHub Security Advisories allows us to:
-- Discuss and triage vulnerabilities privately
-- Coordinate fixes before public disclosure
-- Credit reporters appropriately
-- Publish advisories with CVE identifiers
-
-### What to Include
-
-When reporting, please provide:
-- A clear description of the vulnerability
-- Steps to reproduce or proof-of-concept
-- Affected versions (if known)
-- Potential impact assessment
-- Any suggested mitigations or fixes
-
-### Response Timeline
-
-- **Initial response**: Within 7 days
-- **Triage decision**: Within 14 days
-- **Fix timeline**: Depends on severity and complexity
-
-## Scope
-
-### In Scope
-
-- Remote code execution
-- Authentication/authorization bypass
-- Cross-site scripting (XSS) that affects other users
-- SQL injection
-- Path traversal
-- Sensitive data exposure
-- Privilege escalation
-
-### Out of Scope (Won't Fix)
-
-The following are considered out of scope or accepted risks:
-
-#### Self-XSS / Self-Injection
-Trilium is a personal knowledge base where users have full control over their own data. Users can intentionally create notes containing scripts, HTML, or other executable content. This is by design - Trilium's scripting system allows users to extend functionality with custom JavaScript.
-
-Vulnerabilities that require a user to inject malicious content into their own notes and then view it themselves are not considered security issues.
-
-#### Electron Architecture (nodeIntegration)
-Trilium's desktop application runs with `nodeIntegration: true` to enable its powerful scripting features. This is an intentional design decision, similar to VS Code extensions having full system access. We mitigate risks by:
-- Sanitizing content at input boundaries
-- Fixing specific XSS vectors as they're discovered
-- Using Electron fuses to prevent external abuse
-
-#### Authenticated User Actions
-Actions that require valid authentication and only affect the authenticated user's own data are generally not vulnerabilities.
-
-#### Denial of Service via Resource Exhaustion
-Creating extremely large notes or performing many operations is expected user behavior in a note-taking application.
-
-#### Missing Security Headers on Non-Sensitive Endpoints
-We implement security headers where they provide meaningful protection, but may omit them on endpoints where they provide no practical benefit.
-
-## Coordinated Disclosure
-
-We follow a coordinated disclosure process:
-
-1. **Report received** - We acknowledge receipt and begin triage
-2. **Fix developed** - We develop and test a fix privately
-3. **Release prepared** - Security release is prepared with vague changelog
-4. **Users notified** - Release is published, users encouraged to upgrade
-5. **Advisory published** - After reasonable upgrade window (typically 2-4 weeks), full advisory is published
-
-We appreciate reporters allowing us time to fix issues before public disclosure. We aim to credit all reporters in published advisories unless they prefer to remain anonymous.
-
-## Security Updates
-
-Security fixes are released as patch versions (e.g., 0.92.1 → 0.92.2) to minimize upgrade friction. We recommend all users keep their installations up to date.
-
-Subscribe to GitHub releases or watch the repository to receive notifications of new releases.
+You can report low severity vulnerabilities as GitHub issues, more severe vulnerabilities should be reported to the email [contact@eliandoran.me](mailto:contact@eliandoran.me)

apps/build-docs/package.json

@@ -1,26 +1,22 @@
 {
   "name": "build-docs",
   "version": "1.0.0",
-  "description": "Build documentation from Trilium notes",
+  "description": "",
   "main": "src/main.ts",
-  "bin": {
-    "trilium-build-docs": "dist/cli.js"
-  },
   "scripts": {
-    "start": "tsx .",
-    "cli": "tsx src/cli.ts",
-    "build": "tsx scripts/build.ts"
+    "start": "tsx ."
   },
   "keywords": [],
   "author": "Elian Doran <contact@eliandoran.me>",
   "license": "AGPL-3.0-only",
-  "packageManager": "pnpm@10.33.0",
+  "packageManager": "pnpm@10.28.0",
   "devDependencies": {
-    "@redocly/cli": "2.25.4",
+    "@redocly/cli": "2.14.5",
     "archiver": "7.0.1",
-    "fs-extra": "11.3.4",
-    "js-yaml": "4.1.1",
-    "typedoc": "0.28.18",
+    "fs-extra": "11.3.3",
+    "react": "19.2.3",
+    "react-dom": "19.2.3",
+    "typedoc": "0.28.16",
     "typedoc-plugin-missing-exports": "4.1.2"
   }
 }

apps/build-docs/scripts/build.ts

@@ -1,23 +0,0 @@
-import BuildHelper from "../../../scripts/build-utils";
-
-const build = new BuildHelper("apps/build-docs");
-
-async function main() {
-    // Build the CLI and other TypeScript files
-    await build.buildBackend([
-        "src/cli.ts",
-        "src/main.ts",
-        "src/build-docs.ts",
-        "src/swagger.ts",
-        "src/script-api.ts",
-        "src/context.ts"
-    ]);
-
-    // Copy HTML template
-    build.copy("src/index.html", "index.html");
-
-    // Copy node modules dependencies if needed
-    build.copyNodeModules([ "better-sqlite3", "bindings", "file-uri-to-path" ]);
-}
-
-main();

apps/build-docs/src/backend_script_entrypoint.ts

@@ -13,12 +13,8 @@
  * Make sure to keep in line with backend's `script_context.ts`.
  */
 
-export type {
-    default as AbstractBeccaEntity
-} from "../../server/src/becca/entities/abstract_becca_entity.js";
-export type {
-    default as BAttachment
-} from "../../server/src/becca/entities/battachment.js";
+export type { default as AbstractBeccaEntity } from "../../server/src/becca/entities/abstract_becca_entity.js";
+export type { default as BAttachment } from "../../server/src/becca/entities/battachment.js";
 export type { default as BAttribute } from "../../server/src/becca/entities/battribute.js";
 export type { default as BBranch } from "../../server/src/becca/entities/bbranch.js";
 export type { default as BEtapiToken } from "../../server/src/becca/entities/betapi_token.js";
@@ -35,7 +31,6 @@ export type { Api };
 const fakeNote = new BNote();
 
 /**
- * The `api` global variable allows access to the backend script API,
- * which is documented in {@link Api}.
+ * The `api` global variable allows access to the backend script API, which is documented in {@link Api}.
  */
 export const api: Api = new BackendScriptApi(fakeNote, {});

apps/build-docs/src/build-docs.ts

@@ -1,90 +1,19 @@
 process.env.TRILIUM_INTEGRATION_TEST = "memory-no-store";
-// Only set TRILIUM_RESOURCE_DIR if not already set (e.g., by Nix wrapper)
-if (!process.env.TRILIUM_RESOURCE_DIR) {
-    process.env.TRILIUM_RESOURCE_DIR = "../server/src";
-}
+process.env.TRILIUM_RESOURCE_DIR = "../server/src";
 process.env.NODE_ENV = "development";
 
 import cls from "@triliumnext/server/src/services/cls.js";
-import archiver from "archiver";
-import { execSync } from "child_process";
-import { WriteStream } from "fs";
+import { dirname, join, resolve } from "path";
 import * as fs from "fs/promises";
 import * as fsExtra from "fs-extra";
-import yaml from "js-yaml";
-import { dirname, join, resolve } from "path";
-
+import archiver from "archiver";
+import { WriteStream } from "fs";
+import { execSync } from "child_process";
 import BuildContext from "./context.js";
 
-interface NoteMapping {
-    rootNoteId: string;
-    path: string;
-    format: "markdown" | "html" | "share";
-    ignoredFiles?: string[];
-    exportOnly?: boolean;
-}
-
-interface Config {
-    baseUrl: string;
-    noteMappings: NoteMapping[];
-}
-
 const DOCS_ROOT = "../../../docs";
 const OUTPUT_DIR = "../../site";
 
-// Load configuration from edit-docs-config.yaml
-async function loadConfig(configPath?: string): Promise<Config | null> {
-    const pathsToTry = configPath
-        ? [resolve(configPath)]
-        : [
-            join(process.cwd(), "edit-docs-config.yaml"),
-            join(__dirname, "../../../edit-docs-config.yaml")
-        ];
-
-    for (const path of pathsToTry) {
-        try {
-            const configContent = await fs.readFile(path, "utf-8");
-            const config = yaml.load(configContent) as Config;
-
-            // Resolve all paths relative to the config file's directory
-            const CONFIG_DIR = dirname(path);
-            config.noteMappings = config.noteMappings.map((mapping) => ({
-                ...mapping,
-                path: resolve(CONFIG_DIR, mapping.path)
-            }));
-
-            return config;
-        } catch (error) {
-            if (error.code !== "ENOENT") {
-                throw error; // rethrow unexpected errors
-            }
-        }
-    }
-
-    return null; // No config file found
-}
-
-async function exportDocs(
-    noteId: string,
-    format: "markdown" | "html" | "share",
-    outputPath: string,
-    ignoredFiles?: string[]
-) {
-    const zipFilePath = `output-${noteId}.zip`;
-    try {
-        const { exportToZipFile } = (await import("@triliumnext/server/src/services/export/zip.js"))
-            .default;
-        await exportToZipFile(noteId, format, zipFilePath, {});
-
-        const ignoredSet = ignoredFiles ? new Set(ignoredFiles) : undefined;
-        await extractZip(zipFilePath, outputPath, ignoredSet);
-    } finally {
-        if (await fsExtra.exists(zipFilePath)) {
-            await fsExtra.rm(zipFilePath);
-        }
-    }
-}
-
 async function importAndExportDocs(sourcePath: string, outputSubDir: string) {
     const note = await importData(sourcePath);
 
@@ -92,18 +21,15 @@ async function importAndExportDocs(sourcePath: string, outputSubDir: string) {
     const zipName = outputSubDir || "user-guide";
     const zipFilePath = `output-${zipName}.zip`;
     try {
-        const { exportToZip } = (await import("@triliumnext/server/src/services/export/zip.js"))
-            .default;
+        const { exportToZip } = (await import("@triliumnext/server/src/services/export/zip.js")).default;
         const branch = note.getParentBranches()[0];
-        const taskContext = new (await import("@triliumnext/server/src/services/task_context.js"))
-            .default(
-                "no-progress-reporting",
-                "export",
-                null
-            );
+        const taskContext = new (await import("@triliumnext/server/src/services/task_context.js")).default(
+            "no-progress-reporting",
+            "export",
+            null
+        );
         const fileOutputStream = fsExtra.createWriteStream(zipFilePath);
         await exportToZip(taskContext, branch, "share", fileOutputStream);
-        const { waitForStreamToFinish } = await import("@triliumnext/server/src/services/utils.js");
         await waitForStreamToFinish(fileOutputStream);
 
         // Output to root directory if outputSubDir is empty, otherwise to subdirectory
@@ -116,7 +42,7 @@ async function importAndExportDocs(sourcePath: string, outputSubDir: string) {
     }
 }
 
-async function buildDocsInner(config?: Config) {
+async function buildDocsInner() {
     const i18n = await import("@triliumnext/server/src/services/i18n.js");
     await i18n.initializeTranslations();
 
@@ -127,49 +53,18 @@ async function buildDocsInner(config?: Config) {
     const beccaLoader = await import("../../server/src/becca/becca_loader.js");
     await beccaLoader.beccaLoaded;
 
-    if (config) {
-        // Config-based build (reads from edit-docs-config.yaml)
-        console.log("Building documentation from config file...");
+    // Build User Guide
+    console.log("Building User Guide...");
+    await importAndExportDocs(join(__dirname, DOCS_ROOT, "User Guide"), "user-guide");
 
-        // Import all non-export-only mappings
-        for (const mapping of config.noteMappings) {
-            if (!mapping.exportOnly) {
-                console.log(`Importing from ${mapping.path}...`);
-                await importData(mapping.path);
-            }
-        }
+    // Build Developer Guide
+    console.log("Building Developer Guide...");
+    await importAndExportDocs(join(__dirname, DOCS_ROOT, "Developer Guide"), "developer-guide");
 
-        // Export all mappings
-        for (const mapping of config.noteMappings) {
-            if (mapping.exportOnly) {
-                console.log(`Exporting ${mapping.format} to ${mapping.path}...`);
-                await exportDocs(
-                    mapping.rootNoteId,
-                    mapping.format,
-                    mapping.path,
-                    mapping.ignoredFiles
-                );
-            }
-        }
-    } else {
-        // Legacy hardcoded build (for backward compatibility)
-        console.log("Building User Guide...");
-        await importAndExportDocs(join(__dirname, DOCS_ROOT, "User Guide"), "user-guide");
-
-        console.log("Building Developer Guide...");
-        await importAndExportDocs(
-            join(__dirname, DOCS_ROOT, "Developer Guide"),
-            "developer-guide"
-        );
-
-        // Copy favicon.
-        await fs.copyFile("../../apps/website/src/assets/favicon.ico",
-            join(OUTPUT_DIR, "favicon.ico"));
-        await fs.copyFile("../../apps/website/src/assets/favicon.ico",
-            join(OUTPUT_DIR, "user-guide", "favicon.ico"));
-        await fs.copyFile("../../apps/website/src/assets/favicon.ico",
-            join(OUTPUT_DIR, "developer-guide", "favicon.ico"));
-    }
+    // Copy favicon.
+    await fs.copyFile("../../apps/website/src/assets/favicon.ico", join(OUTPUT_DIR, "favicon.ico"));
+    await fs.copyFile("../../apps/website/src/assets/favicon.ico", join(OUTPUT_DIR, "user-guide", "favicon.ico"));
+    await fs.copyFile("../../apps/website/src/assets/favicon.ico", join(OUTPUT_DIR, "developer-guide", "favicon.ico"));
 
     console.log("Documentation built successfully!");
 }
@@ -196,13 +91,12 @@ async function createImportZip(path: string) {
         zlib: { level: 0 }
     });
 
-    console.log("Archive path is ", resolve(path));
+    console.log("Archive path is ", resolve(path))
     archive.directory(path, "/");
 
     const outputStream = fsExtra.createWriteStream(inputFile);
     archive.pipe(outputStream);
     archive.finalize();
-    const { waitForStreamToFinish } = await import("@triliumnext/server/src/services/utils.js");
     await waitForStreamToFinish(outputStream);
 
     try {
@@ -212,15 +106,15 @@ async function createImportZip(path: string) {
     }
 }
 
+function waitForStreamToFinish(stream: WriteStream) {
+    return new Promise<void>((res, rej) => {
+        stream.on("finish", () => res());
+        stream.on("error", (err) => rej(err));
+    });
+}
 
-export async function extractZip(
-    zipFilePath: string,
-    outputPath: string,
-    ignoredFiles?: Set<string>
-) {
-    const { readZipFile, readContent } = (await import(
-        "@triliumnext/server/src/services/import/zip.js"
-    ));
+export async function extractZip(zipFilePath: string, outputPath: string, ignoredFiles?: Set<string>) {
+    const { readZipFile, readContent } = (await import("@triliumnext/server/src/services/import/zip.js"));
     await readZipFile(await fs.readFile(zipFilePath), async (zip, entry) => {
         // We ignore directories since they can appear out of order anyway.
         if (!entry.fileName.endsWith("/") && !ignoredFiles?.has(entry.fileName)) {
@@ -235,27 +129,6 @@ export async function extractZip(
     });
 }
 
-export async function buildDocsFromConfig(configPath?: string, gitRootDir?: string) {
-    const config = await loadConfig(configPath);
-
-    if (gitRootDir) {
-        // Build the share theme if we have a gitRootDir (for Trilium project)
-        execSync(`pnpm run --filter share-theme build`, {
-            stdio: "inherit",
-            cwd: gitRootDir
-        });
-    }
-
-    // Trigger the actual build.
-    await new Promise((res, rej) => {
-        cls.init(() => {
-            buildDocsInner(config ?? undefined)
-                .catch(rej)
-                .then(res);
-        });
-    });
-}
-
 export default async function buildDocs({ gitRootDir }: BuildContext) {
     // Build the share theme.
     execSync(`pnpm run --filter share-theme build`, {

apps/build-docs/src/cli.ts

@@ -1,89 +0,0 @@
-#!/usr/bin/env node
-
-import packageJson from "../package.json" with { type: "json" };
-import { buildDocsFromConfig } from "./build-docs.js";
-
-// Parse command-line arguments
-function parseArgs() {
-    const args = process.argv.slice(2);
-    let configPath: string | undefined;
-    let showHelp = false;
-    let showVersion = false;
-
-    for (let i = 0; i < args.length; i++) {
-        if (args[i] === "--config" || args[i] === "-c") {
-            configPath = args[i + 1];
-            if (!configPath) {
-                console.error("Error: --config/-c requires a path argument");
-                process.exit(1);
-            }
-            i++; // Skip the next argument as it's the value
-        } else if (args[i] === "--help" || args[i] === "-h") {
-            showHelp = true;
-        } else if (args[i] === "--version" || args[i] === "-v") {
-            showVersion = true;
-        }
-    }
-
-    return { configPath, showHelp, showVersion };
-}
-
-function getVersion(): string {
-    return packageJson.version;
-}
-
-function printHelp() {
-    const version = getVersion();
-    console.log(`
-Usage: trilium-build-docs [options]
-
-Options:
-  -c, --config <path>  Path to the configuration file
-                       (default: edit-docs-config.yaml in current directory)
-  -h, --help           Display this help message
-  -v, --version        Display version information
-
-Description:
-  Builds documentation from Trilium note structure and exports to various formats.
-  Configuration file should be in YAML format with the following structure:
-
-  baseUrl: "https://example.com"
-  noteMappings:
-    - rootNoteId: "noteId123"
-      path: "docs"
-      format: "markdown"
-    - rootNoteId: "noteId456"
-      path: "public/docs"
-      format: "share"
-      exportOnly: true
-
-Version: ${version}
-`);
-}
-
-function printVersion() {
-    const version = getVersion();
-    console.log(version);
-}
-
-async function main() {
-    const { configPath, showHelp, showVersion } = parseArgs();
-
-    if (showHelp) {
-        printHelp();
-        process.exit(0);
-    } else if (showVersion) {
-        printVersion();
-        process.exit(0);
-    }
-
-    try {
-        await buildDocsFromConfig(configPath);
-        process.exit(0);
-    } catch (error) {
-        console.error("Error building documentation:", error);
-        process.exit(1);
-    }
-}
-
-main();

apps/build-docs/src/frontend_script_entrypoint.ts

@@ -13,19 +13,16 @@
  * Make sure to keep in line with frontend's `script_context.ts`.
  */
 
+export type { default as BasicWidget } from "../../client/src/widgets/basic_widget.js";
 export type { default as FAttachment } from "../../client/src/entities/fattachment.js";
 export type { default as FAttribute } from "../../client/src/entities/fattribute.js";
 export type { default as FBranch } from "../../client/src/entities/fbranch.js";
 export type { default as FNote } from "../../client/src/entities/fnote.js";
 export type { Api } from "../../client/src/services/frontend_script_api.js";
-export type { default as BasicWidget } from "../../client/src/widgets/basic_widget.js";
-export type {
-    default as NoteContextAwareWidget
-} from "../../client/src/widgets/note_context_aware_widget.js";
+export type { default as NoteContextAwareWidget } from "../../client/src/widgets/note_context_aware_widget.js";
 export type { default as RightPanelWidget } from "../../client/src/widgets/right_panel_widget.js";
 
 import FrontendScriptApi, { type Api } from "../../client/src/services/frontend_script_api.js";
 
-
-// @ts-expect-error - FrontendScriptApi is not directly exportable as Api without this simulation.
+//@ts-expect-error
 export const api: Api = new FrontendScriptApi();

apps/build-docs/src/main.ts

@@ -1,10 +1,9 @@
-import { cpSync, existsSync, mkdirSync, rmSync } from "fs";
 import { join } from "path";
-
-import buildDocs from "./build-docs";
 import BuildContext from "./context";
-import buildScriptApi from "./script-api";
 import buildSwagger from "./swagger";
+import { cpSync, existsSync, mkdirSync, rmSync } from "fs";
+import buildDocs from "./build-docs";
+import buildScriptApi from "./script-api";
 
 const context: BuildContext = {
     gitRootDir: join(__dirname, "../../../"),

apps/build-docs/src/script-api.ts

@@ -1,7 +1,6 @@
 import { execSync } from "child_process";
-import { join } from "path";
-
 import BuildContext from "./context";
+import { join } from "path";
 
 export default function buildScriptApi({ baseDir, gitRootDir }: BuildContext) {
     // Generate types

apps/build-docs/src/swagger.ts

@@ -1,8 +1,7 @@
+import BuildContext from "./context";
+import { join } from "path";
 import { execSync } from "child_process";
 import { mkdirSync } from "fs";
-import { join } from "path";
-
-import BuildContext from "./context";
 
 interface BuildInfo {
     specPath: string;
@@ -28,9 +27,6 @@ export default function buildSwagger({ baseDir, gitRootDir }: BuildContext) {
         const absSpecPath = join(gitRootDir, specPath);
         const targetDir = join(baseDir, outDir);
         mkdirSync(targetDir, { recursive: true });
-        execSync(
-            `pnpm redocly build-docs ${absSpecPath} -o ${targetDir}/index.html`,
-            { stdio: "inherit" }
-        );
+        execSync(`pnpm redocly build-docs ${absSpecPath} -o ${targetDir}/index.html`, { stdio: "inherit" });
     }
 }

apps/build-docs/tsconfig.json

@@ -1,8 +1,6 @@
 {
   "extends": "../../tsconfig.base.json",
-  "include": [
-    "scripts/**/*.ts"
-  ],
+  "include": [],
   "references": [
     {
       "path": "../server"

apps/build-docs/typedoc.backend.json

@@ -4,7 +4,6 @@
   "entryPoints": [
     "src/backend_script_entrypoint.ts"
   ],
-  "tsconfig": "tsconfig.app.json",
   "plugin": [
     "typedoc-plugin-missing-exports"
   ]

apps/build-docs/typedoc.frontend.json

@@ -4,7 +4,6 @@
   "entryPoints": [
     "src/frontend_script_entrypoint.ts"
   ],
-  "tsconfig": "tsconfig.app.json",
   "plugin": [
     "typedoc-plugin-missing-exports"
   ]

apps/client/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@triliumnext/client",
-  "version": "0.102.2",
+  "version": "0.101.3",
   "description": "JQuery-based client for TriliumNext, used for both web and desktop (via Electron)",
   "private": true,
   "license": "AGPL-3.0-only",
@@ -22,71 +22,65 @@
     "@fullcalendar/interaction": "6.1.20",
     "@fullcalendar/list": "6.1.20",
     "@fullcalendar/multimonth": "6.1.20",
-    "@fullcalendar/rrule": "6.1.20",
     "@fullcalendar/timegrid": "6.1.20",
     "@maplibre/maplibre-gl-leaflet": "0.1.3",
-    "@mermaid-js/layout-elk": "0.2.1",
+    "@mermaid-js/layout-elk": "0.2.0",
     "@mind-elixir/node-menu": "5.0.1",
-    "@preact/signals": "2.9.0",
+    "@popperjs/core": "2.11.8",
+    "@preact/signals": "2.5.1",
     "@triliumnext/ckeditor5": "workspace:*",
     "@triliumnext/codemirror": "workspace:*",
     "@triliumnext/commons": "workspace:*",
     "@triliumnext/highlightjs": "workspace:*",
     "@triliumnext/share-theme": "workspace:*",
     "@triliumnext/split.js": "workspace:*",
-    "@univerjs/preset-sheets-conditional-formatting": "0.19.0",
-    "@univerjs/preset-sheets-core": "0.19.0",
-    "@univerjs/preset-sheets-data-validation": "0.19.0",
-    "@univerjs/preset-sheets-filter": "0.19.0",
-    "@univerjs/preset-sheets-find-replace": "0.19.0",
-    "@univerjs/preset-sheets-note": "0.19.0",
-    "@univerjs/preset-sheets-sort": "0.19.0",
-    "@univerjs/presets": "0.19.0",
-    "@zumer/snapdom": "2.7.0",
+    "@zumer/snapdom": "2.0.1",
     "autocomplete.js": "0.38.1",
     "bootstrap": "5.3.8",
     "boxicons": "2.1.4",
     "clsx": "2.1.1",
     "color": "5.0.3",
     "debounce": "3.0.0",
-    "dompurify": "3.3.3",
     "draggabilly": "3.0.0",
-    "force-graph": "1.51.2",
-    "i18next": "26.0.3",
-    "i18next-http-backend": "3.0.4",
-    "jquery": "4.0.0",
+    "force-graph": "1.51.0",
+    "globals": "17.0.0",
+    "i18next": "25.7.4",
+    "i18next-http-backend": "3.0.2",
+    "jquery": "3.7.1",
     "jquery.fancytree": "2.38.5",
     "jsplumb": "2.15.6",
-    "katex": "0.16.44",
+    "katex": "0.16.27",
+    "knockout": "3.5.1",
     "leaflet": "1.9.4",
     "leaflet-gpx": "2.2.0",
     "mark.js": "8.11.1",
-    "marked": "17.0.5",
-    "mermaid": "11.14.0",
-    "mind-elixir": "5.10.0",
-    "panzoom": "9.4.4",
-    "preact": "10.29.0",
-    "react-i18next": "17.0.2",
-    "react-window": "2.2.7",
-    "reveal.js": "6.0.0",
-    "rrule": "2.8.1",
+    "marked": "17.0.1",
+    "mermaid": "11.12.2",
+    "mind-elixir": "5.5.0",
+    "normalize.css": "8.0.1",
+    "panzoom": "9.4.3",
+    "preact": "10.28.2",
+    "react-i18next": "16.5.3",
+    "react-window": "2.2.5",
+    "reveal.js": "5.2.1",
     "svg-pan-zoom": "3.6.2",
-    "tabulator-tables": "6.4.0",
+    "tabulator-tables": "6.3.1",
     "vanilla-js-wheel-zoom": "9.0.4"
   },
   "devDependencies": {
     "@ckeditor/ckeditor5-inspector": "5.0.0",
-    "@prefresh/vite": "2.4.12",
+    "@prefresh/vite": "2.4.11",
     "@types/bootstrap": "5.2.10",
-    "@types/jquery": "4.0.0",
+    "@types/jquery": "3.5.33",
     "@types/leaflet": "1.9.21",
     "@types/leaflet-gpx": "1.3.8",
     "@types/mark.js": "8.11.12",
+    "@types/reveal.js": "5.2.2",
     "@types/tabulator-tables": "6.3.1",
-    "copy-webpack-plugin": "14.0.0",
-    "happy-dom": "20.8.9",
-    "lightningcss": "1.32.0",
+    "copy-webpack-plugin": "13.0.1",
+    "happy-dom": "20.1.0",
+    "lightningcss": "1.30.2",
     "script-loader": "0.7.2",
-    "vite-plugin-static-copy": "4.0.0"
+    "vite-plugin-static-copy": "3.1.4"
   }
-}
+}

apps/client/src/components/app_context.ts

@@ -1,11 +1,10 @@
 import type { CKTextEditor } from "@triliumnext/ckeditor5";
 import type CodeMirror from "@triliumnext/codemirror";
-import { type LOCALE_IDS, SqlExecuteResponse } from "@triliumnext/commons";
+import { SqlExecuteResults } from "@triliumnext/commons";
 import type { NativeImage, TouchBar } from "electron";
 import { ColumnComponent } from "tabulator-tables";
 
 import type { Attribute } from "../services/attribute_parser.js";
-import bundleService from "../services/bundle.js";
 import froca from "../services/froca.js";
 import { initLocale, t } from "../services/i18n.js";
 import keyboardActionsService from "../services/keyboard_actions.js";
@@ -102,6 +101,8 @@ export type CommandMappings = {
     showRevisions: CommandData & {
         noteId?: string | null;
     };
+    showLlmChat: CommandData;
+    createAiChat: CommandData;
     showOptions: CommandData & {
         section: string;
     };
@@ -303,7 +304,6 @@ export type CommandMappings = {
     ninthTab: CommandData;
     lastTab: CommandData;
     showNoteSource: CommandData;
-    showNoteOCRText: CommandData;
     showSQLConsole: CommandData;
     showBackendLog: CommandData;
     showCheatsheet: CommandData;
@@ -410,7 +410,7 @@ type EventMappings = {
     addNewLabel: CommandData;
     addNewRelation: CommandData;
     sqlQueryResults: CommandData & {
-        response: SqlExecuteResponse;
+        results: SqlExecuteResults;
     };
     readOnlyTemporarilyDisabled: {
         noteContext: NoteContext;
@@ -510,7 +510,7 @@ type EventMappings = {
     contentSafeMarginChanged: {
         top: number;
         noteContext: NoteContext;
-    };
+    }
 };
 
 export type EventListener<T extends EventNames> = {
@@ -542,6 +542,7 @@ export type FilteredCommandNames<T extends CommandData> = keyof Pick<CommandMapp
 
 export class AppContext extends Component {
     isMainWindow: boolean;
+    windowId: string;
     components: Component[];
     beforeUnloadListeners: (WeakRef<BeforeUploadListener> | (() => boolean))[];
     tabManager!: TabManager;
@@ -550,10 +551,11 @@ export class AppContext extends Component {
 
     lastSearchString?: string;
 
-    constructor(isMainWindow: boolean) {
+    constructor(isMainWindow: boolean, windowId: string) {
         super();
 
         this.isMainWindow = isMainWindow;
+        this.windowId = windowId;
         // non-widget/layout components needed for the application
         this.components = [];
         this.beforeUnloadListeners = [];
@@ -564,7 +566,7 @@ export class AppContext extends Component {
      */
     async earlyInit() {
         await options.initializedPromise;
-        await initLocale((options.get("locale") || "en") as LOCALE_IDS);
+        await initLocale();
     }
 
     setLayout(layout: Layout) {
@@ -579,6 +581,7 @@ export class AppContext extends Component {
 
         this.tabManager.loadTabs();
 
+        const bundleService = (await import("../services/bundle.js")).default;
         setTimeout(() => bundleService.executeStartupBundles(), 2000);
     }
 
@@ -682,8 +685,7 @@ export class AppContext extends Component {
         this.beforeUnloadListeners = this.beforeUnloadListeners.filter(l => l !== listener);
     }
 }
-
-const appContext = new AppContext(window.glob.isMainWindow);
+const appContext = new AppContext(window.glob.isMainWindow, window.glob.windowId);
 
 // we should save all outstanding changes before the page/app is closed
 $(window).on("beforeunload", () => {

apps/client/src/components/entrypoints.ts

@@ -1,17 +1,16 @@
-import { CreateChildrenResponse, SqlExecuteResponse } from "@triliumnext/commons";
-
-import bundleService from "../services/bundle.js";
+import utils from "../services/utils.js";
 import dateNoteService from "../services/date_notes.js";
-import froca from "../services/froca.js";
-import { t } from "../services/i18n.js";
-import linkService from "../services/link.js";
 import protectedSessionHolder from "../services/protected_session_holder.js";
 import server from "../services/server.js";
-import toastService from "../services/toast.js";
-import utils from "../services/utils.js";
-import ws from "../services/ws.js";
 import appContext, { type NoteCommandData } from "./app_context.js";
 import Component from "./component.js";
+import toastService from "../services/toast.js";
+import ws from "../services/ws.js";
+import bundleService from "../services/bundle.js";
+import froca from "../services/froca.js";
+import linkService from "../services/link.js";
+import { t } from "../services/i18n.js";
+import { CreateChildrenResponse, SqlExecuteResponse } from "@triliumnext/commons";
 
 export default class Entrypoints extends Component {
     constructor() {
@@ -143,14 +142,15 @@ export default class Entrypoints extends Component {
     }
 
     async openInWindowCommand({ notePath, hoistedNoteId, viewScope }: NoteCommandData) {
+        const extraWindowId = utils.randomString(4);
         const extraWindowHash = linkService.calculateHash({ notePath, hoistedNoteId, viewScope });
 
         if (utils.isElectron()) {
             const { ipcRenderer } = utils.dynamicRequire("electron");
 
-            ipcRenderer.send("create-extra-window", { extraWindowHash });
+            ipcRenderer.send("create-extra-window", { extraWindowId, extraWindowHash });
         } else {
-            const url = `${window.location.protocol}//${window.location.host}${window.location.pathname}?extraWindow=1${extraWindowHash}`;
+            const url = `${window.location.protocol}//${window.location.host}${window.location.pathname}?extraWindow=${extraWindowId}${extraWindowHash}`;
 
             window.open(url, "", "width=1000,height=800");
         }
@@ -188,8 +188,13 @@ export default class Entrypoints extends Component {
         } else if (note.mime.endsWith("env=backend")) {
             await server.post(`script/run/${note.noteId}`);
         } else if (note.mime === "text/x-sqlite;schema=trilium") {
-            const response = await server.post<SqlExecuteResponse>(`sql/execute/${note.noteId}`);
-            await appContext.triggerEvent("sqlQueryResults", { ntxId, response });
+            const resp = await server.post<SqlExecuteResponse>(`sql/execute/${note.noteId}`);
+
+            if (!resp.success) {
+                toastService.showError(t("entrypoints.sql-error", { message: resp.error }));
+            }
+
+            await appContext.triggerEvent("sqlQueryResults", { ntxId: ntxId, results: resp.results });
         }
 
         toastService.showMessage(t("entrypoints.note-executed"));

apps/client/src/components/note_context.ts

@@ -381,10 +381,6 @@ class NoteContext extends Component implements EventListener<"entitiesReloaded">
 
         // Collections must always display a note list, even if no children.
         if (note.type === "book") {
-            if (note.isProtected && !protectedSessionHolder.isProtectedSessionAvailable()) {
-                return false;
-            }
-
             const viewType = note.getLabelValue("viewType") ?? "grid";
             if (!["list", "grid"].includes(viewType)) {
                 return true;

apps/client/src/components/root_command_executor.ts

@@ -1,8 +1,10 @@
 import dateNoteService from "../services/date_notes.js";
 import froca from "../services/froca.js";
+import noteCreateService from "../services/note_create.js";
 import openService from "../services/open.js";
 import options from "../services/options.js";
 import protectedSessionService from "../services/protected_session.js";
+import toastService from "../services/toast.js";
 import treeService from "../services/tree.js";
 import utils, { openInReusableSplit } from "../services/utils.js";
 import appContext, { type CommandListenerData } from "./app_context.js";
@@ -148,19 +150,6 @@ export default class RootCommandExecutor extends Component {
         }
     }
 
-    async showNoteOCRTextCommand() {
-        const notePath = appContext.tabManager.getActiveContextNotePath();
-
-        if (notePath) {
-            await appContext.tabManager.openTabWithNoteWithHoisting(notePath, {
-                activate: true,
-                viewScope: {
-                    viewMode: "ocr"
-                }
-            });
-        }
-    }
-
     async showAttachmentsCommand() {
         const notePath = appContext.tabManager.getActiveContextNotePath();
 
@@ -259,4 +248,34 @@ export default class RootCommandExecutor extends Component {
         }
     }
 
+    async createAiChatCommand() {
+        try {
+            // Create a new AI Chat note at the root level
+            const rootNoteId = "root";
+
+            const result = await noteCreateService.createNote(rootNoteId, {
+                title: "New AI Chat",
+                type: "aiChat",
+                content: JSON.stringify({
+                    messages: [],
+                    title: "New AI Chat"
+                })
+            });
+
+            if (!result.note) {
+                toastService.showError("Failed to create AI Chat note");
+                return;
+            }
+
+            await appContext.tabManager.openTabWithNoteWithHoisting(result.note.noteId, {
+                activate: true
+            });
+
+            toastService.showMessage("Created new AI Chat note");
+        }
+        catch (e) {
+            console.error("Error creating AI Chat note:", e);
+            toastService.showError(`Failed to create AI Chat note: ${(e as Error).message}`);
+        }
+    }
 }

apps/client/src/components/tab_manager.ts

@@ -11,6 +11,8 @@ import linkService from "../services/link.js";
 import type { EventData } from "./app_context.js";
 import type FNote from "../entities/fnote.js";
 
+const MAX_SAVED_WINDOWS = 10;
+
 interface TabState {
     contexts: NoteContext[];
     position: number;
@@ -25,6 +27,13 @@ interface NoteContextState {
     viewScope: Record<string, any>;
 }
 
+interface WindowState {
+    windowId: string;
+    createdAt: number;
+    closedAt: number;
+    contexts: NoteContextState[];
+}
+
 export default class TabManager extends Component {
     public children: NoteContext[];
     public mutex: Mutex;
@@ -41,9 +50,6 @@ export default class TabManager extends Component {
         this.recentlyClosedTabs = [];
 
         this.tabsUpdate = new SpacedUpdate(async () => {
-            if (!appContext.isMainWindow) {
-                return;
-            }
             if (options.is("databaseReadonly")) {
                 return;
             }
@@ -52,9 +58,21 @@ export default class TabManager extends Component {
                 .map((nc) => nc.getPojoState())
                 .filter((t) => !!t);
 
-            await server.put("options", {
-                openNoteContexts: JSON.stringify(openNoteContexts)
-            });
+            // Update the current window’s openNoteContexts in options    
+            const savedWindows = options.getJson("openNoteContexts") || [];
+            const win = savedWindows.find((w: WindowState) => w.windowId === appContext.windowId);
+            if (win) {
+                win.contexts = openNoteContexts;
+            } else {
+                savedWindows.push({
+                    windowId: appContext.windowId,
+                    createdAt: Date.now(),
+                    closedAt: 0,
+                    contexts: openNoteContexts
+                } as WindowState);
+            }
+
+            await options.save("openNoteContexts", JSON.stringify(savedWindows));
         });
 
         appContext.addBeforeUnloadListener(this);
@@ -69,8 +87,13 @@ export default class TabManager extends Component {
     }
 
     async loadTabs() {
+        // Get the current window’s openNoteContexts
+        const savedWindows = options.getJson("openNoteContexts") || [];
+        const currentWin = savedWindows.find(w => w.windowId === appContext.windowId);
+        const openNoteContexts = currentWin ? currentWin.contexts : undefined;
+
         try {
-            const noteContextsToOpen = (appContext.isMainWindow && options.getJson("openNoteContexts")) || [];
+            const noteContextsToOpen = openNoteContexts || [];
 
             // preload all notes at once
             await froca.getNotes([...noteContextsToOpen.flatMap((tab: NoteContextState) =>
@@ -119,6 +142,51 @@ export default class TabManager extends Component {
                 }
             });
 
+            // Save window contents
+            if (currentWin as WindowState) {
+                currentWin.createdAt = Date.now();
+                currentWin.closedAt = 0;
+                currentWin.contexts = filteredNoteContexts;
+            } else {
+                if (savedWindows?.length >= MAX_SAVED_WINDOWS) {
+                    // Filter out the oldest entry
+                    // 1) Never remove the "main" window
+                    // 2) Prefer removing the oldest closed window (closedAt !== 0)
+                    // 3) If no closed window exists, remove the window with the oldest created window
+                    let oldestClosedIndex = -1;
+                    let oldestClosedTime = Infinity;
+                    let oldestCreatedIndex = -1;
+                    let oldestCreatedTime = Infinity;
+                    savedWindows.forEach((w: WindowState, i: number) => {
+                        if (w.windowId === "main") return;
+                        if (w.closedAt !== 0) {
+                            if (w.closedAt < oldestClosedTime) {
+                                oldestClosedTime = w.closedAt;
+                                oldestClosedIndex = i;
+                            }
+                        } else {
+                            if (w.createdAt < oldestCreatedTime) {
+                                oldestCreatedTime = w.createdAt;
+                                oldestCreatedIndex = i;
+                            }
+                        }
+                    });
+                    const indexToRemove = oldestClosedIndex !== -1 ? oldestClosedIndex : oldestCreatedIndex;
+                    if (indexToRemove !== -1) {
+                        savedWindows.splice(indexToRemove, 1);
+                    }
+                }
+
+                savedWindows.push({
+                    windowId: appContext.windowId,
+                    createdAt: Date.now(),
+                    closedAt: 0,
+                    contexts: filteredNoteContexts
+                } as WindowState);
+            }
+
+            await options.save("openNoteContexts", JSON.stringify(savedWindows));
+
             // if there's a notePath in the URL, make sure it's open and active
             // (useful, for e.g., opening clipped notes from clipper or opening link in an extra window)
             if (parsedFromUrl.notePath) {

apps/client/src/desktop.ts

@@ -46,6 +46,10 @@ if (utils.isElectron()) {
     electronContextMenu.setupContextMenu();
 }
 
+if (utils.isPWA()) {
+    initPWATopbarColor();
+}
+
 function initOnElectron() {
     const electron: typeof Electron = utils.dynamicRequire("electron");
     electron.ipcRenderer.on("globalShortcut", async (event, actionName) => appContext.triggerCommand(actionName));
@@ -54,7 +58,7 @@ function initOnElectron() {
     const currentWindow = electronRemote.getCurrentWindow();
     const style = window.getComputedStyle(document.body);
 
-    initDarkOrLightMode();
+    initDarkOrLightMode(style);
     initTransparencyEffects(style, currentWindow);
     initFullScreenDetection(currentWindow);
 
@@ -95,22 +99,15 @@ 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);
-        }
-    }
 }
 
 /**
@@ -119,14 +116,31 @@ function initTransparencyEffects(style: CSSStyleDeclaration, currentWindow: Elec
  *
  * @param style the root CSS element to read variables from.
  */
-function initDarkOrLightMode() {
+function initDarkOrLightMode(style: CSSStyleDeclaration) {
     let themeSource: typeof nativeTheme.themeSource = "system";
 
-    const themeStyle = window.glob.getThemeStyle();
-    if (themeStyle !== "auto") {
+    const themeStyle = style.getPropertyValue("--theme-style");
+    if (style.getPropertyValue("--theme-style-auto") !== "true" && (themeStyle === "light" || themeStyle === "dark")) {
         themeSource = themeStyle;
     }
 
     const { nativeTheme } = utils.dynamicRequire("@electron/remote") as typeof ElectronRemote;
     nativeTheme.themeSource = themeSource;
 }
+
+function initPWATopbarColor() {
+    const tracker = $("#background-color-tracker");
+
+    if (tracker.length) {
+        const applyThemeColor = () => {
+            let meta = $("meta[name='theme-color']");
+            if (!meta.length) {
+                meta = $(`<meta name="theme-color">`).appendTo($("head"));
+            }
+            meta.attr("content", tracker.css("color"));
+        };
+
+        tracker.on("transitionend", applyThemeColor);
+        applyThemeColor();
+    }
+}

apps/client/src/entities/fnote.ts

@@ -1,6 +1,5 @@
-import { getNoteIcon } from "@triliumnext/commons";
+import { MIME_TYPES_DICT } from "@triliumnext/commons";
 
-import bundleService from "../services/bundle.js";
 import cssClassManager from "../services/css_class_manager.js";
 import type { Froca } from "../services/froca-interface.js";
 import noteAttributeCache from "../services/note_attribute_cache.js";
@@ -14,12 +13,31 @@ import type { AttributeType, default as FAttribute } from "./fattribute.js";
 const LABEL = "label";
 const RELATION = "relation";
 
+export const NOTE_TYPE_ICONS = {
+    file: "bx bx-file",
+    image: "bx bx-image",
+    code: "bx bx-code",
+    render: "bx bx-extension",
+    search: "bx bx-file-find",
+    relationMap: "bx bxs-network-chart",
+    book: "bx bx-book",
+    noteMap: "bx bxs-network-chart",
+    mermaid: "bx bx-selection",
+    canvas: "bx bx-pen",
+    webView: "bx bx-globe-alt",
+    launcher: "bx bx-link",
+    doc: "bx bxs-file-doc",
+    contentWidget: "bx bxs-widget",
+    mindMap: "bx bx-sitemap",
+    aiChat: "bx bx-bot"
+};
+
 /**
  * There are many different Note types, some of which are entirely opaque to the
  * end user. Those types should be used only for checking against, they are
  * not for direct use.
  */
-export type NoteType = "file" | "image" | "search" | "noteMap" | "launcher" | "doc" | "contentWidget" | "text" | "relationMap" | "render" | "canvas" | "mermaid" | "book" | "webView" | "code" | "mindMap" | "spreadsheet" | "llmChat";
+export type NoteType = "file" | "image" | "search" | "noteMap" | "launcher" | "doc" | "contentWidget" | "text" | "relationMap" | "render" | "canvas" | "mermaid" | "book" | "webView" | "code" | "mindMap" | "aiChat";
 
 export interface NotePathRecord {
     isArchived: boolean;
@@ -564,18 +582,32 @@ export default class FNote {
     }
 
     getIcon() {
+        return `tn-icon ${this.#getIconInternal()}`;
+    }
+
+    #getIconInternal() {
         const iconClassLabels = this.getLabels("iconClass");
         const workspaceIconClass = this.getWorkspaceIconClass();
 
-        const icon = getNoteIcon({
-            noteId: this.noteId,
-            type: this.type,
-            mime: this.mime,
-            iconClass: iconClassLabels.length > 0 ? iconClassLabels[0].value : undefined,
-            workspaceIconClass,
-            isFolder: this.isFolder.bind(this)
-        });
-        return `tn-icon ${icon}`;
+        if (iconClassLabels && iconClassLabels.length > 0) {
+            return iconClassLabels[0].value;
+        } else if (workspaceIconClass) {
+            return workspaceIconClass;
+        } else if (this.noteId === "root") {
+            return "bx bx-home-alt-2";
+        }
+        if (this.noteId === "_share") {
+            return "bx bx-share-alt";
+        } else if (this.type === "text") {
+            if (this.isFolder()) {
+                return "bx bx-folder";
+            }
+            return "bx bx-note";
+        } else if (this.type === "code") {
+            const correspondingMimeType = MIME_TYPES_DICT.find(m => m.mime === this.mime);
+            return correspondingMimeType?.icon ?? NOTE_TYPE_ICONS.code;
+        }
+        return NOTE_TYPE_ICONS[this.type];
     }
 
     getColorClass() {
@@ -701,15 +733,6 @@ export default class FNote {
         return this.hasAttribute(LABEL, name);
     }
 
-    /**
-     * Returns `true` if the note has a label with the given name (same as {@link hasOwnedLabel}), or it has a label with the `disabled:` prefix (for example due to a safe import).
-     * @param name the name of the label to look for.
-     * @returns `true` if the label exists, or its version with the `disabled:` prefix.
-     */
-    hasLabelOrDisabled(name: string) {
-        return this.hasLabel(name) || this.hasLabel(`disabled:${name}`);
-    }
-
     /**
      * @param name - label name
      * @returns true if label exists (including inherited) and does not have "false" value.
@@ -1015,6 +1038,7 @@ export default class FNote {
         const env = this.getScriptEnv();
 
         if (env === "frontend") {
+            const bundleService = (await import("../services/bundle.js")).default;
             return await bundleService.getAndExecuteBundle(this.noteId);
         } else if (env === "backend") {
             await server.post(`script/run/${this.noteId}`);

apps/client/src/index.html

@@ -13,14 +13,13 @@
     <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="./src/index.ts" type="module"></script>
+        <script src="./index.ts" type="module"></script>
 
         <!-- Required for correct loading of scripts in Electron -->
         <script>

apps/client/src/index.ts

@@ -1,5 +1,3 @@
-import { getThemeStyle } from "./services/theme";
-
 async function bootstrap() {
     showSplash();
     await setupGlob();
@@ -18,21 +16,10 @@ async function initJQuery() {
     const $ = (await import("jquery")).default;
     window.$ = $;
     window.jQuery = $;
-
-    // Polyfill removed jQuery methods for autocomplete.js compatibility
-    ($ as any).isArray = Array.isArray;
-    ($ as any).isFunction = function(obj: any) { return typeof obj === 'function'; };
-    ($ as any).isPlainObject = function(obj: any) {
-        if (obj == null || typeof obj !== 'object') { return false; }
-        const proto = Object.getPrototypeOf(obj);
-        if (proto === null) { return true; }
-        const Ctor = Object.prototype.hasOwnProperty.call(proto, 'constructor') && proto.constructor;
-        return typeof Ctor === 'function' && Ctor === Object;
-    };
 }
 
 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 */
@@ -40,7 +27,6 @@ async function setupGlob() {
         ...json,
         activeDialog: null
     };
-    window.glob.getThemeStyle = getThemeStyle;
 }
 
 async function loadBootstrapCss() {
@@ -52,65 +38,28 @@ async function loadBootstrapCss() {
     }
 }
 
-type StylesheetRef = {
-    href: string;
-    media?: string;
-};
-
-function getConfiguredThemeStylesheets(stylesheetsPath: string, theme: string, customThemeCssUrl?: string) {
-    if (theme === "auto") {
-        return [{ href: `${stylesheetsPath}/theme-dark.css`, media: "(prefers-color-scheme: dark)" }];
-    }
-
-    if (theme === "dark") {
-        return [{ href: `${stylesheetsPath}/theme-dark.css` }];
-    }
-
-    if (theme === "next") {
-        return [
-            { href: `${stylesheetsPath}/theme-next-light.css` },
-            { href: `${stylesheetsPath}/theme-next-dark.css`, media: "(prefers-color-scheme: dark)" }
-        ];
-    }
-
-    if (theme === "next-light") {
-        return [{ href: `${stylesheetsPath}/theme-next-light.css` }];
-    }
-
-    if (theme === "next-dark") {
-        return [{ href: `${stylesheetsPath}/theme-next-dark.css` }];
-    }
-
-    if (theme !== "light" && customThemeCssUrl) {
-        return [{ href: customThemeCssUrl }];
-    }
-
-    return [];
-}
-
 function loadStylesheets() {
-    const { device, assetPath, theme, themeBase, customThemeCssUrl } = window.glob;
-    const stylesheetsPath = `${assetPath}/stylesheets`;
-
-    const cssToLoad: StylesheetRef[] = [];
-    if (device !== "print") {
-        cssToLoad.push({ href: `${stylesheetsPath}/ckeditor-theme.css` });
-        cssToLoad.push({ href: `api/fonts` });
-        cssToLoad.push({ href: `${stylesheetsPath}/theme-light.css` });
-        cssToLoad.push(...getConfiguredThemeStylesheets(stylesheetsPath, theme, customThemeCssUrl));
-        if (themeBase) {
-            cssToLoad.push(...getConfiguredThemeStylesheets(stylesheetsPath, themeBase));
-        }
-        cssToLoad.push({ href: `${stylesheetsPath}/style.css` });
+    const { assetPath, themeCssUrl, themeUseNextAsBase } = window.glob;
+    const cssToLoad: string[] = [];
+    cssToLoad.push(`${assetPath}/stylesheets/ckeditor-theme.css`);
+    cssToLoad.push(`api/fonts`);
+    cssToLoad.push(`${assetPath}/stylesheets/theme-light.css`);
+    if (themeCssUrl) {
+        cssToLoad.push(themeCssUrl);
     }
+    if (themeUseNextAsBase === "next") {
+        cssToLoad.push(`${assetPath}/stylesheets/theme-next.css`);
+    } else if (themeUseNextAsBase === "next-dark") {
+        cssToLoad.push(`${assetPath}/stylesheets/theme-next-dark.css`);
+    } else if (themeUseNextAsBase === "next-light") {
+        cssToLoad.push(`${assetPath}/stylesheets/theme-next-light.css`);
+    }
+    cssToLoad.push(`${assetPath}/stylesheets/style.css`);
 
-    for (const { href, media } of cssToLoad) {
+    for (const href of cssToLoad) {
         const linkEl = document.createElement("link");
         linkEl.href = href;
         linkEl.rel = "stylesheet";
-        if (media) {
-            linkEl.media = media;
-        }
         document.head.appendChild(linkEl);
     }
 }
@@ -122,7 +71,7 @@ function loadIcons() {
 }
 
 function setBodyAttributes() {
-    const { device, headingStyle, layoutOrientation, platform, isElectron, hasNativeTitleBar, hasBackgroundEffects, currentLocale } = window.glob;
+    const { device, headingStyle, layoutOrientation, platform, isElectron, hasNativeTitleBar, hasBackgroundEffects, currentLocale, isMainWindow } = window.glob;
     const classesToSet = [
         device,
         `heading-style-${headingStyle}`,
@@ -130,7 +79,8 @@ function setBodyAttributes() {
         `platform-${platform}`,
         isElectron && "electron",
         hasNativeTitleBar && "native-titlebar",
-        hasBackgroundEffects && "background-effects"
+        hasBackgroundEffects && "background-effects",
+        !isMainWindow && 'extra-window'
     ].filter(Boolean) as string[];
 
     for (const classToSet of classesToSet) {
@@ -142,17 +92,10 @@ function setBodyAttributes() {
 }
 
 async function loadScripts() {
-    switch (glob.device) {
-        case "mobile":
-            await import("./mobile.js");
-            break;
-        case "print":
-            await import("./print.js");
-            break;
-        case "desktop":
-        default:
-            await import("./desktop.js");
-            break;
+    if (glob.device === "mobile") {
+        await import("./mobile.js");
+    } else {
+        await import("./desktop.js");
     }
 }
 

apps/client/src/layouts/desktop_layout.tsx

@@ -46,6 +46,8 @@ import ScrollPadding from "../widgets/scroll_padding.js";
 import SearchResult from "../widgets/search_result.jsx";
 import SharedInfo from "../widgets/shared_info.jsx";
 import RightPanelContainer from "../widgets/sidebar/RightPanelContainer.jsx";
+import SqlResults from "../widgets/sql_result.js";
+import SqlTableSchemas from "../widgets/sql_table_schemas.js";
 import TabRowWidget from "../widgets/tab_row.js";
 import TabHistoryNavigationButtons from "../widgets/TabHistoryNavigationButtons.jsx";
 import TitleBarButtons from "../widgets/title_bar_buttons.jsx";
@@ -161,9 +163,11 @@ export default class DesktopLayout {
                                                                     .child(<SharedInfo />)
                                                                 )
                                                                 .optChild(!isNewLayout, <PromotedAttributes />)
+                                                                .child(<SqlTableSchemas />)
                                                                 .child(<NoteDetail />)
                                                                 .child(<NoteList media="screen" />)
                                                                 .child(<SearchResult />)
+                                                                .child(<SqlResults />)
                                                                 .child(<ScrollPadding />)
                                                         )
                                                         .child(<ApiLog />)

apps/client/src/layouts/mobile_layout.css

@@ -1,76 +0,0 @@
-#background-color-tracker {
-    color: var(--main-background-color) !important;
-}
-
-span.keyboard-shortcut,
-kbd {
-    display: none;
-}
-
-.dropdown-menu {
-    font-size: larger;
-}
-
-.action-button {
-    background: none;
-    border: none;
-    cursor: pointer;
-    font-size: 1.25em;
-    padding-inline-start: 0.5em;
-    padding-inline-end: 0.5em;
-    color: var(--main-text-color);
-}
-.quick-search {
-    margin: 0;
-}
-.quick-search .dropdown-menu {
-    max-width: 350px;
-}
-
-/* #region Tree */
-.tree-wrapper {
-    max-height: 100%;
-    margin-top: 0px;
-    overflow-y: auto;
-    contain: content;
-    padding-inline-start: 10px;
-}
-
-.fancytree-title {
-    margin-inline-start: 0.6em !important;
-}
-
-.fancytree-node {
-    padding: 5px;
-}
-
-span.fancytree-expander {
-    width: 24px !important;
-    margin-inline-end: 5px;
-}
-
-.fancytree-loading span.fancytree-expander {
-    width: 24px;
-    height: 32px;
-}
-
-.fancytree-loading  span.fancytree-expander:after {
-    width: 20px;
-    height: 20px;
-    margin-top: 4px;
-    border-width: 2px;
-    border-style: solid;
-}
-
-.tree-wrapper .collapse-tree-button,
-.tree-wrapper .scroll-to-active-note-button,
-.tree-wrapper .tree-settings-button {
-    position: fixed;
-    margin-inline-end: 16px;
-    display: none;
-}
-
-.tree-wrapper .unhoist-button {
-    font-size: 200%;
-}
-/* #endregion */

apps/client/src/layouts/mobile_layout.tsx

@@ -1,38 +1,128 @@
-import "./mobile_layout.css";
-
 import type AppContext from "../components/app_context.js";
 import GlobalMenuWidget from "../widgets/buttons/global_menu.js";
 import CloseZenModeButton from "../widgets/close_zen_button.js";
 import NoteList from "../widgets/collections/NoteList.jsx";
+import ContentHeader from "../widgets/containers/content_header.js";
 import FlexContainer from "../widgets/containers/flex_container.js";
 import RootContainer from "../widgets/containers/root_container.js";
 import ScrollingContainer from "../widgets/containers/scrolling_container.js";
 import SplitNoteContainer from "../widgets/containers/split_note_container.js";
-import FindWidget from "../widgets/find.js";
+import FloatingButtons from "../widgets/FloatingButtons.jsx";
+import { MOBILE_FLOATING_BUTTONS } from "../widgets/FloatingButtonsDefinitions.jsx";
 import LauncherContainer from "../widgets/launch_bar/LauncherContainer.jsx";
-import InlineTitle from "../widgets/layout/InlineTitle.jsx";
-import NoteBadges from "../widgets/layout/NoteBadges.jsx";
-import NoteTitleActions from "../widgets/layout/NoteTitleActions.jsx";
 import MobileDetailMenu from "../widgets/mobile_widgets/mobile_detail_menu.js";
 import ScreenContainer from "../widgets/mobile_widgets/screen_container.js";
 import SidebarContainer from "../widgets/mobile_widgets/sidebar_container.js";
 import ToggleSidebarButton from "../widgets/mobile_widgets/toggle_sidebar_button.jsx";
-import NoteIconWidget from "../widgets/note_icon.jsx";
 import NoteTitleWidget from "../widgets/note_title.js";
 import NoteTreeWidget from "../widgets/note_tree.js";
 import NoteWrapperWidget from "../widgets/note_wrapper.js";
 import NoteDetail from "../widgets/NoteDetail.jsx";
+import PromotedAttributes from "../widgets/PromotedAttributes.jsx";
 import QuickSearchWidget from "../widgets/quick_search.js";
-import ScrollPadding from "../widgets/scroll_padding";
+import { useNoteContext } from "../widgets/react/hooks.jsx";
+import ReadOnlyNoteInfoBar from "../widgets/ReadOnlyNoteInfoBar.jsx";
+import StandaloneRibbonAdapter from "../widgets/ribbon/components/StandaloneRibbonAdapter.jsx";
+import FilePropertiesTab from "../widgets/ribbon/FilePropertiesTab.jsx";
+import SearchDefinitionTab from "../widgets/ribbon/SearchDefinitionTab.jsx";
 import SearchResult from "../widgets/search_result.jsx";
+import SharedInfoWidget from "../widgets/shared_info.js";
+import TabRowWidget from "../widgets/tab_row.js";
 import MobileEditorToolbar from "../widgets/type_widgets/text/mobile_editor_toolbar.jsx";
 import { applyModals } from "./layout_commons.js";
 
+const MOBILE_CSS = `
+<style>
+span.keyboard-shortcut,
+kbd {
+    display: none;
+}
+
+.dropdown-menu {
+    font-size: larger;
+}
+
+.action-button {
+    background: none;
+    border: none;
+    cursor: pointer;
+    font-size: 1.25em;
+    padding-inline-start: 0.5em;
+    padding-inline-end: 0.5em;
+    color: var(--main-text-color);
+}
+.quick-search {
+    margin: 0;
+}
+.quick-search .dropdown-menu {
+    max-width: 350px;
+}
+</style>`;
+
+const FANCYTREE_CSS = `
+<style>
+.tree-wrapper {
+    max-height: 100%;
+    margin-top: 0px;
+    overflow-y: auto;
+    contain: content;
+    padding-inline-start: 10px;
+}
+
+.fancytree-custom-icon {
+    font-size: 2em;
+}
+
+.fancytree-title {
+    font-size: 1.5em;
+    margin-inline-start: 0.6em !important;
+}
+
+.fancytree-node {
+    padding: 5px;
+}
+
+.fancytree-node .fancytree-expander:before {
+    font-size: 2em !important;
+}
+
+span.fancytree-expander {
+    width: 24px !important;
+    margin-inline-end: 5px;
+}
+
+.fancytree-loading span.fancytree-expander {
+    width: 24px;
+    height: 32px;
+}
+
+.fancytree-loading  span.fancytree-expander:after {
+    width: 20px;
+    height: 20px;
+    margin-top: 4px;
+    border-width: 2px;
+    border-style: solid;
+}
+
+.tree-wrapper .collapse-tree-button,
+.tree-wrapper .scroll-to-active-note-button,
+.tree-wrapper .tree-settings-button {
+    position: fixed;
+    margin-inline-end: 16px;
+    display: none;
+}
+
+.tree-wrapper .unhoist-button {
+    font-size: 200%;
+}
+</style>`;
+
 export default class MobileLayout {
     getRootWidget(appContext: typeof AppContext) {
         const rootContainer = new RootContainer(true)
             .setParent(appContext)
             .class("horizontal-layout")
+            .cssBlock(MOBILE_CSS)
             .child(new FlexContainer("column").id("mobile-sidebar-container"))
             .child(
                 new FlexContainer("row")
@@ -46,7 +136,7 @@ export default class MobileLayout {
                             .css("padding-inline-start", "0")
                             .css("padding-inline-end", "0")
                             .css("contain", "content")
-                            .child(new FlexContainer("column").filling().id("mobile-sidebar-wrapper").child(new QuickSearchWidget()).child(new NoteTreeWidget()))
+                            .child(new FlexContainer("column").filling().id("mobile-sidebar-wrapper").child(new QuickSearchWidget()).child(new NoteTreeWidget().cssBlock(FANCYTREE_CSS)))
                     )
                     .child(
                         new ScreenContainer("detail", "row")
@@ -57,28 +147,30 @@ export default class MobileLayout {
                                     new NoteWrapperWidget()
                                         .child(
                                             new FlexContainer("row")
-                                                .class("title-row note-split-title")
                                                 .contentSized()
+                                                .css("font-size", "larger")
                                                 .css("align-items", "center")
                                                 .child(<ToggleSidebarButton />)
-                                                .child(<NoteIconWidget />)
                                                 .child(<NoteTitleWidget />)
-                                                .child(<NoteBadges />)
                                                 .child(<MobileDetailMenu />)
                                         )
+                                        .child(<FloatingButtons items={MOBILE_FLOATING_BUTTONS} />)
+                                        .child(<PromotedAttributes />)
                                         .child(
                                             new ScrollingContainer()
                                                 .filling()
                                                 .contentSized()
-                                                .child(<InlineTitle />)
-                                                .child(<NoteTitleActions />)
+                                                .child(new ContentHeader()
+                                                    .child(<ReadOnlyNoteInfoBar />)
+                                                    .child(<SharedInfoWidget />)
+                                                )
                                                 .child(<NoteDetail />)
                                                 .child(<NoteList media="screen" />)
+                                                .child(<StandaloneRibbonAdapter component={SearchDefinitionTab} />)
                                                 .child(<SearchResult />)
-                                                .child(<ScrollPadding />)
+                                                .child(<FilePropertiesWrapper />)
                                         )
                                         .child(<MobileEditorToolbar />)
-                                        .child(new FindWidget())
                                 )
                             )
                     )
@@ -87,6 +179,7 @@ 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")
@@ -99,3 +192,13 @@ export default class MobileLayout {
         return rootContainer;
     }
 }
+
+function FilePropertiesWrapper() {
+    const { note, ntxId } = useNoteContext();
+
+    return (
+        <div>
+            {note?.type === "file" && <FilePropertiesTab note={note} ntxId={ntxId} />}
+        </div>
+    );
+}

apps/client/src/menus/context_menu.ts

@@ -1,9 +1,8 @@
 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;
@@ -63,17 +62,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());
@@ -92,7 +91,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();
@@ -141,14 +140,16 @@ 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 {
-            left = this.options.x - CONTEXT_MENU_OFFSET;
+            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;
+            }
         }
 
         this.$widget
@@ -248,7 +249,7 @@ class ContextMenu {
         if ("uiIcon" in item || "checked" in item) {
             const icon = (item.checked ? "bx bx-check" : item.uiIcon);
             if (icon) {
-                $icon.addClass([icon, "tn-icon"]);
+                $icon.addClass(icon);
             } else {
                 $icon.append("&nbsp;");
             }
@@ -260,7 +261,7 @@ class ContextMenu {
             .append(item.title);
 
         if ("badges" in item && item.badges) {
-            for (const badge of item.badges) {
+            for (let badge of item.badges) {
                 const badgeElement = $(`<span class="badge">`).text(badge.title);
 
                 if (badge.className) {
@@ -351,7 +352,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/menus/electron_context_menu.ts

@@ -1,14 +1,10 @@
-import type { BrowserWindow } from "electron";
-
-import type { CommandNames } from "../components/app_context.js";
-import appContext from "../components/app_context.js";
-import zoomService from "../components/zoom.js";
-import * as clipboardExt from "../services/clipboard_ext.js";
-import { t } from "../services/i18n.js";
-import options from "../services/options.js";
-import server from "../services/server.js";
 import utils from "../services/utils.js";
+import options from "../services/options.js";
+import zoomService from "../components/zoom.js";
 import contextMenu, { type MenuItem } from "./context_menu.js";
+import { t } from "../services/i18n.js";
+import type { BrowserWindow } from "electron";
+import type { CommandNames, AppContext } from "../components/app_context.js";
 
 function setupContextMenu() {
     const electron = utils.dynamicRequire("electron");
@@ -17,6 +13,8 @@ function setupContextMenu() {
     // FIXME: Remove typecast once Electron is properly integrated.
     const { webContents } = remote.getCurrentWindow() as BrowserWindow;
 
+    let appContext: AppContext;
+
     webContents.on("context-menu", (event, params) => {
         const { editFlags } = params;
         const hasText = params.selectionText.trim().length > 0;
@@ -62,33 +60,6 @@ function setupContextMenu() {
                 uiIcon: "bx bx-copy",
                 handler: () => webContents.copy()
             });
-
-            items.push({
-                enabled: hasText,
-                title: t("electron_context_menu.copy-as-markdown"),
-                uiIcon: "bx bx-copy-alt",
-                handler: async () => {
-                    const selection = window.getSelection();
-                    if (!selection || !selection.rangeCount) return '';
-
-                    const range = selection.getRangeAt(0);
-                    const div = document.createElement('div');
-                    div.appendChild(range.cloneContents());
-
-                    const htmlContent = div.innerHTML;
-                    if (htmlContent) {
-                        try {
-                            const { markdownContent } = await server.post<{ markdownContent: string }>(
-                                "other/to-markdown",
-                                { htmlContent }
-                            );
-                            await clipboardExt.copyTextWithToast(markdownContent);
-                        } catch (error) {
-                            console.error("Failed to copy as markdown:", error);
-                        }
-                    }
-                }
-            });
         }
 
         if (!["", "javascript:", "about:blank#blocked"].includes(params.linkURL) && params.mediaType === "none") {
@@ -141,7 +112,7 @@ function setupContextMenu() {
             }
 
             // Replace the placeholder with the real search keyword.
-            const searchUrl = searchEngineUrl.replace("{keyword}", encodeURIComponent(params.selectionText));
+            let searchUrl = searchEngineUrl.replace("{keyword}", encodeURIComponent(params.selectionText));
 
             items.push({ kind: "separator" });
 
@@ -155,6 +126,10 @@ function setupContextMenu() {
                 title: t("electron_context_menu.search_in_trilium", { term: shortenedSelection }),
                 uiIcon: "bx bx-search",
                 handler: async () => {
+                    if (!appContext) {
+                        appContext = (await import("../components/app_context.js")).default;
+                    }
+
                     await appContext.triggerCommand("searchNotes", {
                         searchString: params.selectionText
                     });

apps/client/src/menus/launcher_context_menu.ts

@@ -1,12 +1,12 @@
-import type { ContextMenuCommandData,FilteredCommandNames } from "../components/app_context.js";
-import type { SelectMenuItemEventListener } from "../components/events.js";
-import dialogService from "../services/dialog.js";
-import froca from "../services/froca.js";
-import { t } from "../services/i18n.js";
-import server from "../services/server.js";
 import treeService from "../services/tree.js";
-import type NoteTreeWidget from "../widgets/note_tree.js";
+import froca from "../services/froca.js";
 import contextMenu, { type MenuCommandItem, type MenuItem } from "./context_menu.js";
+import dialogService from "../services/dialog.js";
+import server from "../services/server.js";
+import { t } from "../services/i18n.js";
+import type { SelectMenuItemEventListener } from "../components/events.js";
+import type NoteTreeWidget from "../widgets/note_tree.js";
+import type { FilteredCommandNames, ContextMenuCommandData } from "../components/app_context.js";
 
 type LauncherCommandNames = FilteredCommandNames<ContextMenuCommandData>;
 
@@ -32,8 +32,8 @@ export default class LauncherContextMenu implements SelectMenuItemEventListener<
         const note = this.node.data.noteId ? await froca.getNote(this.node.data.noteId) : null;
         const parentNoteId = this.node.getParent().data.noteId;
 
-        const isVisibleRoot = note?.noteId === "_lbVisibleLaunchers" || note?.noteId === "_lbMobileVisibleLaunchers";
-        const isAvailableRoot = note?.noteId === "_lbAvailableLaunchers" || note?.noteId === "_lbMobileAvailableLaunchers";
+        const isVisibleRoot = note?.noteId === "_lbVisibleLaunchers";
+        const isAvailableRoot = note?.noteId === "_lbAvailableLaunchers";
         const isVisibleItem = parentNoteId === "_lbVisibleLaunchers" || parentNoteId === "_lbMobileVisibleLaunchers";
         const isAvailableItem = parentNoteId === "_lbAvailableLaunchers" || parentNoteId === "_lbMobileAvailableLaunchers";
         const isItem = isVisibleItem || isAvailableItem;

apps/client/src/print.tsx

@@ -4,7 +4,6 @@ import { useCallback, useLayoutEffect, useRef } from "preact/hooks";
 import FNote from "./entities/fnote";
 import content_renderer from "./services/content_renderer";
 import { applyInlineMermaid } from "./services/content_renderer_text";
-import froca from "./services/froca";
 import { dynamicRequire, isElectron } from "./services/utils";
 import { CustomNoteList, useNoteViewType } from "./widgets/collections/NoteList";
 
@@ -19,10 +18,6 @@ export type PrintReport = {
 } | {
     type: "collection";
     ignoredNoteIds: string[];
-} | {
-    type: "error";
-    message: string;
-    stack?: string;
 };
 
 async function main() {
@@ -31,11 +26,10 @@ async function main() {
     if (!noteId) return;
 
     await import("./print.css");
+    const froca = (await import("./services/froca")).default;
     const note = await froca.getNote(noteId);
 
-    const bodyWrapper = document.createElement("div");
-    render(<App note={note} noteId={noteId} />, bodyWrapper);
-    document.body.appendChild(bodyWrapper);
+    render(<App note={note} noteId={noteId} />, document.body);
 }
 
 function App({ note, noteId }: { note: FNote | null | undefined, noteId: string }) {

apps/client/src/runtime.ts

@@ -8,17 +8,6 @@ async function loadBootstrap() {
     }
 }
 
-// Polyfill removed jQuery methods for autocomplete.js compatibility
-($ as any).isArray = Array.isArray;
-($ as any).isFunction = function(obj: any) { return typeof obj === 'function'; };
-($ as any).isPlainObject = function(obj: any) {
-    if (obj == null || typeof obj !== 'object') { return false; }
-    const proto = Object.getPrototypeOf(obj);
-    if (proto === null) { return true; }
-    const Ctor = Object.prototype.hasOwnProperty.call(proto, 'constructor') && proto.constructor;
-    return typeof Ctor === 'function' && Ctor === Object;
-};
-
 (window as any).$ = $;
 (window as any).jQuery = $;
 await loadBootstrap();

apps/client/src/services/attributes.spec.ts

@@ -42,7 +42,7 @@ describe("Set boolean with inheritance", () => {
             name: "foo",
             value: "",
             isInheritable: false
-        }, undefined);
+        });
     });
 
     it("removes boolean normally without inheritance", async () => {
@@ -91,7 +91,7 @@ describe("Set boolean with inheritance", () => {
             name: "foo",
             value: "false",
             isInheritable: false
-        }, undefined);
+        });
     });
 
     it("overrides boolean with inherited false", async () => {
@@ -112,7 +112,7 @@ describe("Set boolean with inheritance", () => {
             name: "foo",
             value: "",
             isInheritable: false
-        }, undefined);
+        });
     });
 
     it("deletes override boolean with inherited false with already existing value", async () => {
@@ -134,6 +134,6 @@ describe("Set boolean with inheritance", () => {
             name: "foo",
             value: "",
             isInheritable: false
-        }, undefined);
+        });
     });
 });

apps/client/src/services/attributes.ts

@@ -14,13 +14,13 @@ async function addLabel(noteId: string, name: string, value: string = "", isInhe
     });
 }
 
-export async function setLabel(noteId: string, name: string, value: string = "", isInheritable = false, componentId?: string) {
+export async function setLabel(noteId: string, name: string, value: string = "", isInheritable = false) {
     await server.put(`notes/${noteId}/set-attribute`, {
         type: "label",
         name,
         value,
-        isInheritable,
-    }, componentId);
+        isInheritable
+    });
 }
 
 export async function setRelation(noteId: string, name: string, value: string = "", isInheritable = false) {
@@ -117,15 +117,15 @@ function removeOwnedRelationByName(note: FNote, relationName: string) {
  * @param name the name of the attribute to set.
  * @param value the value of the attribute to set.
  */
-export async function setAttribute(note: FNote, type: "label" | "relation", name: string, value: string | null | undefined, componentId?: string) {
+export async function setAttribute(note: FNote, type: "label" | "relation", name: string, value: string | null | undefined) {
     if (value !== null && value !== undefined) {
         // Create or update the attribute.
-        await server.put(`notes/${note.noteId}/set-attribute`, { type, name, value }, componentId);
+        await server.put(`notes/${note.noteId}/set-attribute`, { type, name, value });
     } else {
         // Remove the attribute if it exists on the server but we don't define a value for it.
         const attributeId = note.getAttribute(type, name)?.attributeId;
         if (attributeId) {
-            await server.remove(`notes/${note.noteId}/attributes/${attributeId}`, componentId);
+            await server.remove(`notes/${note.noteId}/attributes/${attributeId}`);
         }
     }
 }
@@ -168,49 +168,6 @@ function isAffecting(attrRow: AttributeRow, affectedNote: FNote | null | undefin
     return false;
 }
 
-/**
- * Toggles whether a dangerous attribute is enabled or not. When an attribute is disabled, its name is prefixed with `disabled:`.
- *
- * Note that this work for non-dangerous attributes as well.
- *
- * If there are multiple attributes with the same name, all of them will be toggled at the same time.
- *
- * @param note the note whose attribute to change.
- * @param type the type of dangerous attribute (label or relation).
- * @param name the name of the dangerous attribute.
- * @param willEnable whether to enable or disable the attribute.
- * @returns a promise that will resolve when the request to the server completes.
- */
-async function toggleDangerousAttribute(note: FNote, type: "label" | "relation", name: string, willEnable: boolean) {
-    const attrs = [
-        ...note.getOwnedAttributes(type, name),
-        ...note.getOwnedAttributes(type, `disabled:${name}`)
-    ];
-
-    for (const attr of attrs) {
-        const baseName = getNameWithoutDangerousPrefix(attr.name);
-        const newName = willEnable ? baseName : `disabled:${baseName}`;
-        if (newName === attr.name) continue;
-
-        // We are adding and removing afterwards to avoid a flicker (because for a moment there would be no active content attribute anymore) because the operations are done in sequence and not atomically.
-        if (attr.type === "label") {
-            await setLabel(note.noteId, newName, attr.value);
-        } else {
-            await setRelation(note.noteId, newName, attr.value);
-        }
-        await removeAttributeById(note.noteId, attr.attributeId);
-    }
-}
-
-/**
- * Returns the name of an attribute without the `disabled:` prefix, or the same name if it's not disabled.
- * @param name the name of an attribute.
- * @returns the name without the `disabled:` prefix.
- */
-function getNameWithoutDangerousPrefix(name: string) {
-    return name.startsWith("disabled:") ? name.substring(9) : name;
-}
-
 export default {
     addLabel,
     setLabel,
@@ -220,7 +177,5 @@ export default {
     removeAttributeById,
     removeOwnedLabelByName,
     removeOwnedRelationByName,
-    isAffecting,
-    toggleDangerousAttribute,
-    getNameWithoutDangerousPrefix
+    isAffecting
 };

apps/client/src/services/branches.ts

@@ -103,7 +103,7 @@ async function moveToParentNote(branchIdsToMove: string[], newParentBranchId: st
  * @param moveToParent whether to automatically go to the parent note path after a succesful delete. Usually makes sense if deleting the active note(s).
  * @returns promise that returns false if the operation was cancelled or there was nothing to delete, true if the operation succeeded.
  */
-async function deleteNotes(branchIdsToDelete: string[], forceDeleteAllClones = false, moveToParent = true, componentId?: string) {
+async function deleteNotes(branchIdsToDelete: string[], forceDeleteAllClones = false, moveToParent = true) {
     branchIdsToDelete = filterRootNote(branchIdsToDelete);
 
     if (branchIdsToDelete.length === 0) {
@@ -139,9 +139,9 @@ async function deleteNotes(branchIdsToDelete: string[], forceDeleteAllClones = f
         const branch = froca.getBranch(branchIdToDelete);
 
         if (deleteAllClones && branch) {
-            await server.remove(`notes/${branch.noteId}${query}`, componentId);
+            await server.remove(`notes/${branch.noteId}${query}`);
         } else {
-            await server.remove(`branches/${branchIdToDelete}${query}`, componentId);
+            await server.remove(`branches/${branchIdToDelete}${query}`);
         }
     }
 

apps/client/src/services/bundle.ts

@@ -2,6 +2,7 @@ import { h, VNode } from "preact";
 
 import BasicWidget, { ReactWrappedWidget } from "../widgets/basic_widget.js";
 import RightPanelWidget from "../widgets/right_panel_widget.js";
+import froca from "./froca.js";
 import type { Entity } from "./frontend_script_api.js";
 import { WidgetDefinitionWithType } from "./frontend_script_api_preact.js";
 import { t } from "./i18n.js";
@@ -26,7 +27,7 @@ type WithNoteId<T> = T & {
 };
 export type Widget = WithNoteId<(LegacyWidget | WidgetDefinitionWithType)>;
 
-async function getAndExecuteBundle(noteId: string, originEntity: Entity | null = null, script: string | null = null, params: string | null = null) {
+async function getAndExecuteBundle(noteId: string, originEntity = null, script = null, params = null) {
     const bundle = await server.post<Bundle>(`script/bundle/${noteId}`, {
         script,
         params
@@ -37,18 +38,15 @@ async function getAndExecuteBundle(noteId: string, originEntity: Entity | null =
 
 export type ParentName = "left-pane" | "center-pane" | "note-detail-pane" | "right-pane";
 
-export async function executeBundleWithoutErrorHandling(bundle: Bundle, originEntity?: Entity | null, $container?: JQuery<HTMLElement>) {
-    const apiContext = await ScriptContext(bundle.noteId, bundle.allNoteIds, originEntity, $container);
-    return await function () {
-        return eval(`const apiContext = this; (async function() { ${bundle.script}\r\n})()`);
-    }.call(apiContext);
-}
-
 export async function executeBundle(bundle: Bundle, originEntity?: Entity | null, $container?: JQuery<HTMLElement>) {
+    const apiContext = await ScriptContext(bundle.noteId, bundle.allNoteIds, originEntity, $container);
+
     try {
-        return await executeBundleWithoutErrorHandling(bundle, originEntity, $container);
-    } catch (e: unknown) {
-        showErrorForScriptNote(bundle.noteId, t("toast.bundle-error.message", { message: getErrorMessage(e) }));
+        return await function () {
+            return eval(`const apiContext = this; (async function() { ${bundle.script}\r\n})()`);
+        }.call(apiContext);
+    } catch (e: any) {
+        showErrorForScriptNote(bundle.noteId, t("toast.bundle-error.message", { message: e.message }));
         logError("Widget initialization failed: ", e);
     }
 }

apps/client/src/services/clipboard_ext.ts

@@ -1,6 +1,3 @@
-import { t } from "./i18n.js";
-import toast from "./toast.js";
-
 export function copyText(text: string) {
     if (!text) {
         return;
@@ -9,26 +6,29 @@ export function copyText(text: string) {
         if (navigator.clipboard) {
             navigator.clipboard.writeText(text);
             return true;
-        } 
-        // Fallback method: https://stackoverflow.com/a/72239825
-        const textArea = document.createElement("textarea");
-        textArea.value = text;
-        try {
-            document.body.appendChild(textArea);
-            textArea.focus();
-            textArea.select();
-            return document.execCommand('copy');
-        } finally {
-            document.body.removeChild(textArea);
+        } else {
+            // Fallback method: https://stackoverflow.com/a/72239825
+            const textArea = document.createElement("textarea");
+            textArea.value = text;
+            try {
+                document.body.appendChild(textArea);
+                textArea.focus();
+                textArea.select();
+                return document.execCommand('copy');
+            } finally {
+                document.body.removeChild(textArea);
+            }
         }
-        
     } catch (e) {
         console.warn(e);
         return false;
     }
 }
 
-export function copyTextWithToast(text: string) {
+export async function copyTextWithToast(text: string) {
+    const t = (await import("./i18n.js")).t;
+    const toast = (await import("./toast.js")).default;
+
     if (copyText(text)) {
         toast.showMessage(t("clipboard.copy_success"));
     } else {

apps/client/src/services/content_renderer.css

@@ -1,9 +0,0 @@
-.rendered-content.no-preview > div {
-    display: flex;
-    flex-direction: column;
-    justify-content: space-around;
-    align-items: center;
-    height: 100%;
-    font-size: 500%;
-    flex-grow: 1;
-}

apps/client/src/services/content_renderer.ts

@@ -1,7 +1,4 @@
-import "./content_renderer.css";
-
-import { normalizeMimeTypeForCKEditor, type TextRepresentationResponse } from "@triliumnext/commons";
-import { h, render } from "preact";
+import { normalizeMimeTypeForCKEditor } from "@triliumnext/commons";
 import WheelZoom from 'vanilla-js-wheel-zoom';
 
 import FAttachment from "../entities/fattachment.js";
@@ -15,9 +12,8 @@ import openService from "./open.js";
 import protectedSessionService from "./protected_session.js";
 import protectedSessionHolder from "./protected_session_holder.js";
 import renderService from "./render.js";
-import server from "./server.js";
 import { applySingleBlockSyntaxHighlight } from "./syntax_highlight.js";
-import utils, { getErrorMessage } from "./utils.js";
+import utils from "./utils.js";
 
 let idCounter = 1;
 
@@ -33,7 +29,6 @@ export interface RenderOptions {
     includeArchivedNotes?: boolean;
     /** Set of note IDs that have already been seen during rendering to prevent infinite recursion. */
     seenNoteIds?: Set<string>;
-    showTextRepresentation?: boolean;
 }
 
 const CODE_MIME_TYPES = new Set(["application/json"]);
@@ -56,19 +51,16 @@ export async function getRenderedContent(this: {} | { ctx: string }, entity: FNo
         await renderText(entity, $renderedContent, options);
     } else if (type === "code") {
         await renderCode(entity, $renderedContent);
-    } else if (["image", "canvas", "mindMap", "spreadsheet"].includes(type)) {
-        await renderImage(entity, $renderedContent, options);
+    } else if (["image", "canvas", "mindMap"].includes(type)) {
+        renderImage(entity, $renderedContent, options);
     } else if (!options.tooltip && ["file", "pdf", "audio", "video"].includes(type)) {
-        await renderFile(entity, type, $renderedContent, options);
+        renderFile(entity, type, $renderedContent);
     } else if (type === "mermaid") {
         await renderMermaid(entity, $renderedContent);
     } else if (type === "render" && entity instanceof FNote) {
         const $content = $("<div>");
 
-        await renderService.render(entity, $content, (e) => {
-            const $error = $("<div>").addClass("admonition caution").text(typeof e === "string" ? e : getErrorMessage(e));
-            $content.empty().append($error);
-        });
+        await renderService.render(entity, $content);
 
         $renderedContent.append($content);
     } else if (type === "doc" && "noteId" in entity) {
@@ -79,9 +71,18 @@ export async function getRenderedContent(this: {} | { ctx: string }, entity: FNo
 
         $renderedContent.append($("<div>").append("<div>This note is protected and to access it you need to enter password.</div>").append("<br/>").append($button));
     } else if (entity instanceof FNote) {
-        $renderedContent.addClass("no-preview");
+        $renderedContent
+            .css("display", "flex")
+            .css("flex-direction", "column");
         $renderedContent.append(
-            $("<div>").append($("<span>").addClass(entity.getIcon()))
+            $("<div>")
+                .css("display", "flex")
+                .css("justify-content", "space-around")
+                .css("align-items", "center")
+                .css("height", "100%")
+                .css("font-size", "500%")
+                .css("flex-grow", "1")
+                .append($("<span>").addClass(entity.getIcon()))
         );
 
         if (entity.type === "webView" && entity.hasLabel("webViewSrc")) {
@@ -140,7 +141,7 @@ async function renderCode(note: FNote | FAttachment, $renderedContent: JQuery<HT
     await applySingleBlockSyntaxHighlight($codeBlock, normalizeMimeTypeForCKEditor(note.mime));
 }
 
-async function renderImage(entity: FNote | FAttachment, $renderedContent: JQuery<HTMLElement>, options: RenderOptions = {}) {
+function renderImage(entity: FNote | FAttachment, $renderedContent: JQuery<HTMLElement>, options: RenderOptions = {}) {
     const encodedTitle = encodeURIComponent(entity.title);
 
     let url;
@@ -148,14 +149,13 @@ async function renderImage(entity: FNote | FAttachment, $renderedContent: JQuery
     if (entity instanceof FNote) {
         url = `api/images/${entity.noteId}/${encodedTitle}?${Math.random()}`;
     } else if (entity instanceof FAttachment) {
-        url = `api/attachments/${entity.attachmentId}/image/${encodedTitle}?${entity.utcDateModified}`;
+        url = `api/attachments/${entity.attachmentId}/image/${encodedTitle}?${entity.utcDateModified}">`;
     }
 
     $renderedContent // styles needed for the zoom to work well
         .css("display", "flex")
         .css("align-items", "center")
-        .css("justify-content", "center")
-        .css("flex-direction", "column");   // OCR text is displayed below the image.
+        .css("justify-content", "center");
 
     const $img = $("<img>")
         .attr("src", url || "")
@@ -181,35 +181,9 @@ async function renderImage(entity: FNote | FAttachment, $renderedContent: JQuery
     }
 
     imageContextMenuService.setupContextMenu($img);
-
-    if (entity instanceof FNote && options.showTextRepresentation) {
-        await addOCRTextIfAvailable(entity, $renderedContent);
-    }
 }
 
-async function addOCRTextIfAvailable(note: FNote, $content: JQuery<HTMLElement>) {
-    try {
-        const data = await server.get<TextRepresentationResponse>(`ocr/notes/${note.noteId}/text`);
-        if (data.success && data.hasOcr && data.text) {
-            const $ocrSection = $(`
-                <div class="ocr-text-section">
-                    <div class="ocr-header">
-                        <span class="bx bx-text"></span> ${t("ocr.extracted_text")}
-                    </div>
-                    <div class="ocr-content"></div>
-                </div>
-            `);
-
-            $ocrSection.find('.ocr-content').text(data.text);
-            $content.append($ocrSection);
-        }
-    } catch (error) {
-        // Silently fail if OCR API is not available
-        console.debug('Failed to fetch OCR text:', error);
-    }
-}
-
-async function renderFile(entity: FNote | FAttachment, type: string, $renderedContent: JQuery<HTMLElement>, options: RenderOptions = {}) {
+function renderFile(entity: FNote | FAttachment, type: string, $renderedContent: JQuery<HTMLElement>) {
     let entityType, entityId;
 
     if (entity instanceof FNote) {
@@ -222,17 +196,13 @@ async function renderFile(entity: FNote | FAttachment, type: string, $renderedCo
         throw new Error(`Can't recognize entity type of '${entity}'`);
     }
 
-    const $content = $('<div style="display: flex; flex-direction: column; height: 100%; justify-content: end;">');
+    const $content = $('<div style="display: flex; flex-direction: column; height: 100%;">');
 
     if (type === "pdf") {
-        const url = `../../api/${entityType}/${entityId}/open`;
-        const $viewer = $(`<div style="height: 100%">`);
-        const PdfViewer = (await import("../widgets/type_widgets/file/PdfViewer")).default;
-        render(h(PdfViewer, {pdfUrl: url, editable: false}), $viewer.get(0)!);
-
-        $content.append($viewer);
-
+        const $pdfPreview = $('<iframe class="pdf-preview" style="width: 100%; flex-grow: 100;"></iframe>');
+        $pdfPreview.attr("src", openService.getUrlForDownload(`pdfjs/web/viewer.html?file=../../api/${entityType}/${entityId}/open`));
 
+        $content.append($pdfPreview);
     } else if (type === "audio") {
         const $audioPreview = $("<audio controls></audio>")
             .attr("src", openService.getUrlForDownload(`api/${entityType}/${entityId}/open-partial`))
@@ -249,10 +219,6 @@ async function renderFile(entity: FNote | FAttachment, type: string, $renderedCo
         $content.append($videoPreview);
     }
 
-    if (entity instanceof FNote && options.showTextRepresentation) {
-        await addOCRTextIfAvailable(entity, $content);
-    }
-
     if (entityType === "notes" && "noteId" in entity) {
         // TODO: we should make this available also for attachments, but there's a problem with "Open externally" support
         //       in attachment list
@@ -326,11 +292,10 @@ function getRenderingType(entity: FNote | FAttachment) {
     }
 
     const mime = "mime" in entity && entity.mime;
-    const isIconPack = entity instanceof FNote && entity.hasLabel("iconPack");
 
     if (type === "file" && mime === "application/pdf") {
         type = "pdf";
-    } else if ((type === "file" || type === "viewConfig") && mime && CODE_MIME_TYPES.has(mime) && !isIconPack) {
+    } else if ((type === "file" || type === "viewConfig") && mime && CODE_MIME_TYPES.has(mime)) {
         type = "code";
     } else if (type === "file" && mime && mime.startsWith("audio/")) {
         type = "audio";

apps/client/src/services/content_renderer_text.ts

@@ -120,6 +120,7 @@ async function renderChildrenList($renderedContent: JQuery<HTMLElement>, note: F
         return;
     }
 
+    $renderedContent.css("padding", "10px");
     $renderedContent.addClass("text-with-ellipsis");
 
     // just load the first 10 child notes

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");
 }
 
-export function parseColor(color: string) {
+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. */
-export function getHue(color: ColorInstance) {
+function getHue(color: ColorInstance) {
     const hslColor = color.hsl();
     if (hslColor.saturationl() > 0) {
         return hslColor.hue();

apps/client/src/services/date_notes.ts

@@ -1,5 +1,4 @@
 import { dayjs } from "@triliumnext/commons";
-
 import type { FNoteRow } from "../entities/fnote.js";
 import froca from "./froca.js";
 import server from "./server.js";
@@ -15,13 +14,8 @@ async function getTodayNote() {
     return await getDayNote(dayjs().format("YYYY-MM-DD"));
 }
 
-async function getDayNote(date: string, calendarRootId?: string) {
-    let url = `special-notes/days/${date}`;
-    if (calendarRootId) {
-        url += `?calendarRootId=${calendarRootId}`;
-    }
-
-    const note = await server.get<FNoteRow>(url, "date-note");
+async function getDayNote(date: string) {
+    const note = await server.get<FNoteRow>(`special-notes/days/${date}`, "date-note");
 
     await ws.waitForMaxKnownEntityChangeId();
 
@@ -84,55 +78,6 @@ async function createSearchNote(opts = {}) {
     return await froca.getNote(note.noteId);
 }
 
-async function createLlmChat() {
-    const note = await server.post<FNoteRow>("special-notes/llm-chat");
-
-    await ws.waitForMaxKnownEntityChangeId();
-
-    return await froca.getNote(note.noteId);
-}
-
-/**
- * Gets the most recently modified LLM chat.
- * Returns null if no chat exists.
- */
-async function getMostRecentLlmChat() {
-    const note = await server.get<FNoteRow | null>("special-notes/most-recent-llm-chat");
-
-    if (!note) {
-        return null;
-    }
-
-    await ws.waitForMaxKnownEntityChangeId();
-
-    return await froca.getNote(note.noteId);
-}
-
-/**
- * Gets the most recent LLM chat, or creates a new one if none exists.
- * Used by sidebar chat for persistent conversations across page refreshes.
- */
-async function getOrCreateLlmChat() {
-    const note = await server.get<FNoteRow>("special-notes/get-or-create-llm-chat");
-
-    await ws.waitForMaxKnownEntityChangeId();
-
-    return await froca.getNote(note.noteId);
-}
-
-export interface RecentLlmChat {
-    noteId: string;
-    title: string;
-    dateModified: string;
-}
-
-/**
- * Gets a list of recent LLM chats for the history popup.
- */
-async function getRecentLlmChats(limit: number = 10): Promise<RecentLlmChat[]> {
-    return await server.get<RecentLlmChat[]>(`special-notes/recent-llm-chats?limit=${limit}`);
-}
-
 export default {
     getInboxNote,
     getTodayNote,
@@ -143,9 +88,5 @@ export default {
     getMonthNote,
     getYearNote,
     createSqlConsole,
-    createSearchNote,
-    createLlmChat,
-    getMostRecentLlmChat,
-    getOrCreateLlmChat,
-    getRecentLlmChats
+    createSearchNote
 };

apps/client/src/services/dialog.ts

@@ -1,11 +1,9 @@
 import { Modal } from "bootstrap";
-
 import appContext from "../components/app_context.js";
 import type { ConfirmDialogOptions, ConfirmDialogResult, ConfirmWithMessageOptions, MessageType } from "../widgets/dialogs/confirm.js";
-import { InfoExtraProps } from "../widgets/dialogs/info.jsx";
 import type { PromptDialogOptions } from "../widgets/dialogs/prompt.js";
 import { focusSavedElement, saveFocusedElement } from "./focus.js";
-import keyboardActionsService from "./keyboard_actions.js";
+import { InfoExtraProps } from "../widgets/dialogs/info.jsx";
 
 export async function openDialog($dialog: JQuery<HTMLElement>, closeActDialog = true, config?: Partial<Modal.Options>) {
     if (closeActDialog) {
@@ -27,6 +25,7 @@ export async function openDialog($dialog: JQuery<HTMLElement>, closeActDialog =
         }
     });
 
+    const keyboardActionsService = (await import("./keyboard_actions.js")).default;
     keyboardActionsService.updateDisplayedShortcuts($dialog);
 
     return $dialog;

apps/client/src/services/doc_renderer.spec.ts

@@ -1,30 +0,0 @@
-import { describe, expect, it } from "vitest";
-
-import { isValidDocName } from "./doc_renderer.js";
-
-describe("isValidDocName", () => {
-    it("accepts valid docNames", () => {
-        expect(isValidDocName("launchbar_intro")).toBe(true);
-        expect(isValidDocName("User Guide/Quick Start")).toBe(true);
-        expect(isValidDocName("User Guide/User Guide/Quick Start")).toBe(true);
-        expect(isValidDocName("Quick Start Guide")).toBe(true);
-        expect(isValidDocName("quick_start_guide")).toBe(true);
-        expect(isValidDocName("quick-start-guide")).toBe(true);
-    });
-
-    it("rejects path traversal attacks", () => {
-        expect(isValidDocName("..")).toBe(false);
-        expect(isValidDocName("../etc/passwd")).toBe(false);
-        expect(isValidDocName("foo/../bar")).toBe(false);
-        expect(isValidDocName("../../../../api/notes/_malicious/open")).toBe(false);
-        expect(isValidDocName("..\\etc\\passwd")).toBe(false);
-        expect(isValidDocName("foo\\bar")).toBe(false);
-    });
-
-    it("rejects URL manipulation attacks", () => {
-        expect(isValidDocName("../../../../api/notes/_malicious/open?x=")).toBe(false);
-        expect(isValidDocName("foo#bar")).toBe(false);
-        expect(isValidDocName("%2e%2e")).toBe(false);
-        expect(isValidDocName("%2e%2e%2f%2e%2e%2fapi")).toBe(false);
-    });
-});

apps/client/src/services/doc_renderer.ts

@@ -3,39 +3,22 @@ import { applyReferenceLinks } from "../widgets/type_widgets/text/read_only_help
 import { getCurrentLanguage } from "./i18n.js";
 import { formatCodeBlocks } from "./syntax_highlight.js";
 
-/**
- * Validates a docName to prevent path traversal attacks.
- * Allows forward slashes for subdirectories (e.g., "User Guide/Quick Start")
- * but blocks traversal sequences and URL manipulation characters.
- */
-export function isValidDocName(docName: string): boolean {
-    // Allow alphanumeric characters, spaces, underscores, hyphens, and forward slashes.
-    const validDocNameRegex = /^[a-zA-Z0-9_/\- ]+$/;
-    return validDocNameRegex.test(docName);
-}
-
 export default function renderDoc(note: FNote) {
     return new Promise<JQuery<HTMLElement>>((resolve) => {
-        const docName = note.getLabelValue("docName");
+        let docName = note.getLabelValue("docName");
         const $content = $("<div>");
 
-        // find doc based on language
-        const url = getUrl(docName, getCurrentLanguage());
-
-        if (url) {
+        if (docName) {
+            // find doc based on language
+            const url = getUrl(docName, getCurrentLanguage());
             $content.load(url, async (response, status) => {
                 // fallback to english doc if no translation available
                 if (status === "error") {
                     const fallbackUrl = getUrl(docName, "en");
-
-                    if (fallbackUrl) {
-                        $content.load(fallbackUrl, async () => {
-                            await processContent(fallbackUrl, $content);
-                            resolve($content);
-                        });
-                    } else {
+                    $content.load(fallbackUrl, async () => {
+                        await processContent(fallbackUrl, $content)
                         resolve($content);
-                    }
+                    });
                     return;
                 }
 
@@ -45,6 +28,8 @@ export default function renderDoc(note: FNote) {
         } else {
             resolve($content);
         }
+
+        return $content;
     });
 }
 
@@ -54,7 +39,7 @@ async function processContent(url: string, $content: JQuery<HTMLElement>) {
     // Images are relative to the docnote but that will not work when rendered in the application since the path breaks.
     $content.find("img").each((i, el) => {
         const $img = $(el);
-        $img.attr("src", `${dir}/${$img.attr("src")}`);
+        $img.attr("src", dir + "/" + $img.attr("src"));
     });
 
     formatCodeBlocks($content);
@@ -63,17 +48,10 @@ async function processContent(url: string, $content: JQuery<HTMLElement>) {
     await applyReferenceLinks($content[0]);
 }
 
-function getUrl(docNameValue: string | null, language: string) {
-    if (!docNameValue) return;
-
-    if (!isValidDocName(docNameValue)) {
-        console.error(`Invalid docName: ${docNameValue}`);
-        return null;
-    }
-
+function getUrl(docNameValue: string, language: string) {
     // Cannot have spaces in the URL due to how JQuery.load works.
     docNameValue = docNameValue.replaceAll(" ", "%20");
 
-    const basePath = window.glob.isDev ? `${window.glob.assetPath  }/..` : window.glob.assetPath;
+    const basePath = window.glob.isDev ? window.glob.assetPath + "/.." : window.glob.assetPath;
     return `${basePath}/doc_notes/${language}/${docNameValue}.html`;
 }

apps/client/src/services/experimental_features.ts

@@ -1,6 +1,5 @@
 import { t } from "./i18n";
 import options from "./options";
-import { isMobile } from "./utils";
 
 export interface ExperimentalFeature {
     id: string;
@@ -13,11 +12,6 @@ export const experimentalFeatures = [
         id: "new-layout",
         name: t("experimental_features.new_layout_name"),
         description: t("experimental_features.new_layout_description"),
-    },
-    {
-        id: "llm",
-        name: t("experimental_features.llm_name"),
-        description: t("experimental_features.llm_description"),
     }
 ] as const satisfies ExperimentalFeature[];
 
@@ -27,7 +21,7 @@ let enabledFeatures: Set<ExperimentalFeatureId> | null = null;
 
 export function isExperimentalFeatureEnabled(featureId: ExperimentalFeatureId): boolean {
     if (featureId === "new-layout") {
-        return (isMobile() || options.is("newLayout"));
+        return options.is("newLayout");
     }
 
     return getEnabledFeatures().has(featureId);
@@ -35,7 +29,7 @@ export function isExperimentalFeatureEnabled(featureId: ExperimentalFeatureId):
 
 export function getEnabledExperimentalFeatureIds() {
     const values = [ ...getEnabledFeatures().values() ];
-    if (isMobile() || options.is("newLayout")) {
+    if (options.is("newLayout")) {
         values.push("new-layout");
     }
     return values;

apps/client/src/services/froca_updater.ts

@@ -1,16 +1,14 @@
-import type { OptionNames } from "@triliumnext/commons";
-
-import appContext from "../components/app_context.js";
-import FAttachment, { type FAttachmentRow } from "../entities/fattachment.js";
-import FAttribute, { type FAttributeRow } from "../entities/fattribute.js";
+import LoadResults from "./load_results.js";
+import froca from "./froca.js";
+import utils from "./utils.js";
+import options from "./options.js";
+import noteAttributeCache from "./note_attribute_cache.js";
 import FBranch, { type FBranchRow } from "../entities/fbranch.js";
+import FAttribute, { type FAttributeRow } from "../entities/fattribute.js";
+import FAttachment, { type FAttachmentRow } from "../entities/fattachment.js";
 import type { default as FNote, FNoteRow } from "../entities/fnote.js";
 import type { EntityChange } from "../server_types.js";
-import froca from "./froca.js";
-import LoadResults from "./load_results.js";
-import noteAttributeCache from "./note_attribute_cache.js";
-import options from "./options.js";
-import utils from "./utils.js";
+import type { OptionNames } from "@triliumnext/commons";
 
 async function processEntityChanges(entityChanges: EntityChange[]) {
     const loadResults = new LoadResults(entityChanges);
@@ -29,10 +27,6 @@ async function processEntityChanges(entityChanges: EntityChange[]) {
                 loadResults.addRevision(ec.entityId, ec.noteId, ec.componentId);
             } else if (ec.entityName === "options") {
                 const attributeEntity = ec.entity as FAttributeRow;
-                if (attributeEntity.name === "openNoteContexts") {
-                    continue; // only noise
-                }
-
                 options.set(attributeEntity.name as OptionNames, attributeEntity.value);
                 loadResults.addOption(attributeEntity.name as OptionNames);
             } else if (ec.entityName === "attachments") {
@@ -65,7 +59,7 @@ async function processEntityChanges(entityChanges: EntityChange[]) {
         if (entityName === "branches" && !((entity as FBranchRow).parentNoteId in froca.notes)) {
             missingNoteIds.push((entity as FBranchRow).parentNoteId);
         } else if (entityName === "attributes") {
-            const attributeEntity = entity as FAttributeRow;
+            let attributeEntity = entity as FAttributeRow;
             if (attributeEntity.type === "relation" && (attributeEntity.name === "template" || attributeEntity.name === "inherit") && !(attributeEntity.value in froca.notes)) {
                 missingNoteIds.push(attributeEntity.value);
             }
@@ -81,6 +75,7 @@ async function processEntityChanges(entityChanges: EntityChange[]) {
             noteAttributeCache.invalidate();
         }
 
+        const appContext = (await import("../components/app_context.js")).default;
         await appContext.triggerEvent("entitiesReloaded", { loadResults });
     }
 }
@@ -111,12 +106,7 @@ function processNoteChange(loadResults: LoadResults, ec: EntityChange) {
                 }
             }
 
-            // Only register as a content change if the protection status didn't change.
-            // When isProtected changes, the blobId change is a side effect of re-encryption,
-            // not a content edit. Registering it as content would cause the tree's content-only
-            // filter to incorrectly skip the note update (since both changes share the same
-            // componentId).
-            if (ec.componentId && note.isProtected === (ec.entity as FNoteRow).isProtected) {
+            if (ec.componentId) {
                 loadResults.addNoteContent(note.noteId, ec.componentId);
             }
         }

apps/client/src/services/i18n.ts

@@ -1,14 +1,21 @@
-import { LOCALE_IDS, LOCALES, setDayjsLocale } from "@triliumnext/commons";
+import options from "./options.js";
 import i18next from "i18next";
 import i18nextHttpBackend from "i18next-http-backend";
+import server from "./server.js";
+import { LOCALE_IDS, setDayjsLocale, type Locale } from "@triliumnext/commons";
 import { initReactI18next } from "react-i18next";
 
+let locales: Locale[] | null;
+
 /**
  * A deferred promise that resolves when translations are initialized.
  */
-export const translationsInitializedPromise = $.Deferred();
+export let translationsInitializedPromise = $.Deferred();
 
-export async function initLocale(locale: LOCALE_IDS = "en") {
+export async function initLocale() {
+    const locale = ((options.get("locale") as string) || "en") as LOCALE_IDS;
+
+    locales = await server.get<Locale[]>("options/locales");
 
     i18next.use(initReactI18next);
     await i18next.use(i18nextHttpBackend).init({
@@ -25,7 +32,11 @@ export async function initLocale(locale: LOCALE_IDS = "en") {
 }
 
 export function getAvailableLocales() {
-    return LOCALES;
+    if (!locales) {
+        throw new Error("Tried to load list of locales, but localization is not yet initialized.")
+    }
+
+    return locales;
 }
 
 /**
@@ -36,7 +47,7 @@ export function getAvailableLocales() {
  */
 export function getLocaleById(localeId: string | null | undefined) {
     if (!localeId) return null;
-    return LOCALES.find((l) => l.id === localeId) ?? null;
+    return locales?.find((l) => l.id === localeId) ?? null;
 }
 
 export const t = i18next.t;

apps/client/src/services/in_app_help.ts

@@ -1,5 +1,4 @@
 import { NoteType } from "@triliumnext/commons";
-
 import FNote from "../entities/fnote";
 import { ViewTypeOptions } from "../widgets/collections/interface";
 
@@ -19,8 +18,7 @@ export const byNoteType: Record<Exclude<NoteType, "book">, string | null> = {
     search: null,
     text: null,
     webView: null,
-    spreadsheet: null,
-    llmChat: null
+    aiChat: null
 };
 
 export const byBookType: Record<ViewTypeOptions, string | null> = {
@@ -41,6 +39,6 @@ export function getHelpUrlForNote(note: FNote | null | undefined) {
     } else if (note?.hasLabel("textSnippet")) {
         return "pwc194wlRzcH";
     } else if (note && note.type === "book") {
-        return byBookType[note.getAttributeValue("label", "viewType") as ViewTypeOptions ?? ""];
+        return byBookType[note.getAttributeValue("label", "viewType") as ViewTypeOptions ?? ""]
     }
 }

apps/client/src/services/link.ts

@@ -28,7 +28,7 @@ async function getLinkIcon(noteId: string, viewMode: ViewMode | undefined) {
     return icon;
 }
 
-export type ViewMode = "default" | "source" | "attachments" | "contextual-help" | "note-map" | "ocr";
+export type ViewMode = "default" | "source" | "attachments" | "contextual-help" | "note-map";
 
 export interface ViewScope {
     /**

apps/client/src/services/llm_chat.ts

@@ -1,114 +0,0 @@
-import type { LlmChatConfig, LlmCitation, LlmMessage, LlmModelInfo,LlmUsage } from "@triliumnext/commons";
-
-import server from "./server.js";
-
-/**
- * Fetch available models from all configured providers.
- */
-export async function getAvailableModels(): Promise<LlmModelInfo[]> {
-    const response = await server.get<{ models?: LlmModelInfo[] }>("llm-chat/models");
-    return response.models ?? [];
-}
-
-export interface StreamCallbacks {
-    onChunk: (text: string) => void;
-    onThinking?: (text: string) => void;
-    onToolUse?: (toolName: string, input: Record<string, unknown>) => void;
-    onToolResult?: (toolName: string, result: string, isError?: boolean) => void;
-    onCitation?: (citation: LlmCitation) => void;
-    onUsage?: (usage: LlmUsage) => void;
-    onError: (error: string) => void;
-    onDone: () => void;
-}
-
-/**
- * Stream a chat completion from the LLM API using Server-Sent Events.
- */
-export async function streamChatCompletion(
-    messages: LlmMessage[],
-    config: LlmChatConfig,
-    callbacks: StreamCallbacks
-): Promise<void> {
-    const headers = await server.getHeaders();
-
-    const response = await fetch(`${window.glob.baseApiUrl}llm-chat/stream`, {
-        method: "POST",
-        headers: {
-            ...headers,
-            "Content-Type": "application/json"
-        } as HeadersInit,
-        body: JSON.stringify({ messages, config })
-    });
-
-    if (!response.ok) {
-        callbacks.onError(`HTTP ${response.status}: ${response.statusText}`);
-        return;
-    }
-
-    const reader = response.body?.getReader();
-    if (!reader) {
-        callbacks.onError("No response body");
-        return;
-    }
-
-    const decoder = new TextDecoder();
-    let buffer = "";
-
-    try {
-        while (true) {
-            const { done, value } = await reader.read();
-            if (done) break;
-
-            buffer += decoder.decode(value, { stream: true });
-            const lines = buffer.split("\n");
-            buffer = lines.pop() || "";
-
-            for (const line of lines) {
-                if (line.startsWith("data: ")) {
-                    try {
-                        const data = JSON.parse(line.slice(6));
-
-                        switch (data.type) {
-                            case "text":
-                                callbacks.onChunk(data.content);
-                                break;
-                            case "thinking":
-                                callbacks.onThinking?.(data.content);
-                                break;
-                            case "tool_use":
-                                callbacks.onToolUse?.(data.toolName, data.toolInput);
-                                // Yield to force Preact to commit the pending tool call
-                                // state before we process the result.
-                                await new Promise((r) => setTimeout(r, 1));
-                                break;
-                            case "tool_result":
-                                callbacks.onToolResult?.(data.toolName, data.result, data.isError);
-                                await new Promise((r) => setTimeout(r, 1));
-                                break;
-                            case "citation":
-                                if (data.citation) {
-                                    callbacks.onCitation?.(data.citation);
-                                }
-                                break;
-                            case "usage":
-                                if (data.usage) {
-                                    callbacks.onUsage?.(data.usage);
-                                }
-                                break;
-                            case "error":
-                                callbacks.onError(data.error);
-                                break;
-                            case "done":
-                                callbacks.onDone();
-                                break;
-                        }
-                    } catch (e) {
-                        console.error("Failed to parse SSE data line:", line, e);
-                    }
-                }
-            }
-        }
-    } finally {
-        reader.releaseLock();
-    }
-}

apps/client/src/services/note_create.ts

@@ -1,17 +1,15 @@
-import type { CKTextEditor } from "@triliumnext/ckeditor5";
-import { AttributeRow } from "@triliumnext/commons";
-
 import appContext from "../components/app_context.js";
-import type FBranch from "../entities/fbranch.js";
-import type FNote from "../entities/fnote.js";
-import type { ChooseNoteTypeResponse } from "../widgets/dialogs/note_type_chooser.js";
-import froca from "./froca.js";
-import { t } from "./i18n.js";
 import protectedSessionHolder from "./protected_session_holder.js";
 import server from "./server.js";
-import toastService from "./toast.js";
-import treeService from "./tree.js";
 import ws from "./ws.js";
+import froca from "./froca.js";
+import treeService from "./tree.js";
+import toastService from "./toast.js";
+import { t } from "./i18n.js";
+import type FNote from "../entities/fnote.js";
+import type FBranch from "../entities/fbranch.js";
+import type { ChooseNoteTypeResponse } from "../widgets/dialogs/note_type_chooser.js";
+import type { CKTextEditor } from "@triliumnext/ckeditor5";
 
 export interface CreateNoteOpts {
     isProtected?: boolean;
@@ -26,8 +24,6 @@ export interface CreateNoteOpts {
     target?: string;
     targetBranchId?: string;
     textEditor?: CKTextEditor;
-    /** Attributes to be set on the note. These are set atomically on note creation, so entity changes are not sent for attributes defined here. */
-    attributes?: Omit<AttributeRow, "noteId" | "attributeId">[];
 }
 
 interface Response {
@@ -41,7 +37,7 @@ interface DuplicateResponse {
     note: FNote;
 }
 
-async function createNote(parentNotePath: string | undefined, options: CreateNoteOpts = {}, componentId?: string) {
+async function createNote(parentNotePath: string | undefined, options: CreateNoteOpts = {}) {
     options = Object.assign(
         {
             activate: true,
@@ -67,15 +63,22 @@ async function createNote(parentNotePath: string | undefined, options: CreateNot
 
     const parentNoteId = treeService.getNoteIdFromUrl(parentNotePath);
 
+    if (options.type === "mermaid" && !options.content && !options.templateNoteId) {
+        options.content = `graph TD;
+    A-->B;
+    A-->C;
+    B-->D;
+    C-->D;`;
+    }
+
     const { note, branch } = await server.post<Response>(`notes/${parentNoteId}/children?target=${options.target}&targetBranchId=${options.targetBranchId || ""}`, {
         title: options.title,
         content: options.content || "",
         isProtected: options.isProtected,
         type: options.type,
         mime: options.mime,
-        templateNoteId: options.templateNoteId,
-        attributes: options.attributes
-    }, componentId);
+        templateNoteId: options.templateNoteId
+    });
 
     if (options.saveSelection) {
         // we remove the selection only after it was saved to server to make sure we don't lose anything
@@ -137,8 +140,9 @@ function parseSelectedHtml(selectedHtml: string) {
         const content = selectedHtml.replace(dom[0].outerHTML, "");
 
         return [title, content];
+    } else {
+        return [null, selectedHtml];
     }
-    return [null, selectedHtml];
 }
 
 async function duplicateSubtree(noteId: string, parentNotePath: string) {

apps/client/src/services/note_tooltip.ts

@@ -1,20 +1,20 @@
-import appContext from "../components/app_context.js";
-import type FNote from "../entities/fnote.js";
+import treeService from "./tree.js";
+import linkService from "./link.js";
+import froca from "./froca.js";
+import utils from "./utils.js";
 import attributeRenderer from "./attribute_renderer.js";
 import contentRenderer from "./content_renderer.js";
-import froca from "./froca.js";
+import appContext from "../components/app_context.js";
+import type FNote from "../entities/fnote.js";
 import { t } from "./i18n.js";
-import linkService from "./link.js";
-import treeService from "./tree.js";
-import utils from "./utils.js";
 
 // Track all elements that open tooltips
 let openTooltipElements: JQuery<HTMLElement>[] = [];
 let dismissTimer: ReturnType<typeof setTimeout>;
 
 function setupGlobalTooltip() {
-    $(document).on("pointerenter", "a:not(.no-tooltip-preview)", mouseEnterHandler);
-    $(document).on("pointerenter", "[data-href]:not(.no-tooltip-preview)", mouseEnterHandler);
+    $(document).on("mouseenter", "a:not(.no-tooltip-preview)", mouseEnterHandler);
+    $(document).on("mouseenter", "[data-href]:not(.no-tooltip-preview)", mouseEnterHandler);
 
     // close any note tooltip after click, this fixes the problem that sometimes tooltips remained on the screen
     $(document).on("click", (e) => {
@@ -37,12 +37,10 @@ function dismissAllTooltips() {
 }
 
 function setupElementTooltip($el: JQuery<HTMLElement>) {
-    $el.on("pointerenter", mouseEnterHandler);
+    $el.on("mouseenter", mouseEnterHandler);
 }
 
-async function mouseEnterHandler<T>(this: HTMLElement, e: JQuery.TriggeredEvent<T, undefined, T, T>) {
-    if (e.pointerType !== "mouse") return;
-
+async function mouseEnterHandler(this: HTMLElement) {
     const $link = $(this);
 
     if ($link.hasClass("no-tooltip-preview") || $link.hasClass("disabled")) {
@@ -93,7 +91,7 @@ async function mouseEnterHandler<T>(this: HTMLElement, e: JQuery.TriggeredEvent<
     }
 
     const html = `<div class="note-tooltip-content">${content}</div>`;
-    const tooltipClass = `tooltip-${  Math.floor(Math.random() * 999_999_999)}`;
+    const tooltipClass = "tooltip-" + Math.floor(Math.random() * 999_999_999);
 
     // we need to check if we're still hovering over the element
     // since the operation to get tooltip content was async, it is possible that
@@ -226,7 +224,7 @@ function renderFootnoteOrAnchor($link: JQuery<HTMLElement>, url: string) {
     }
 
     let footnoteContent = $targetContent.html();
-    footnoteContent = `<div class="ck-content">${footnoteContent}</div>`;
+    footnoteContent = `<div class="ck-content">${footnoteContent}</div>`
     return footnoteContent || "";
 }
 

apps/client/src/services/note_types.ts

@@ -1,10 +1,9 @@
-import type { NoteType } from "../entities/fnote.js";
-import type { MenuCommandItem, MenuItem, MenuItemBadge, MenuSeparatorItem } from "../menus/context_menu.js";
-import type { TreeCommandNames } from "../menus/tree_context_menu.js";
-import { isExperimentalFeatureEnabled } from "./experimental_features.js";
-import froca from "./froca.js";
 import { t } from "./i18n.js";
+import froca from "./froca.js";
 import server from "./server.js";
+import type { MenuCommandItem, MenuItem, MenuItemBadge, MenuSeparatorItem } from "../menus/context_menu.js";
+import type { NoteType } from "../entities/fnote.js";
+import type { TreeCommandNames } from "../menus/tree_context_menu.js";
 
 export interface NoteTypeMapping {
     type: NoteType;
@@ -27,7 +26,6 @@ export const NOTE_TYPES: NoteTypeMapping[] = [
 
     // The default note type (always the first item)
     { type: "text", mime: "text/html", title: t("note_types.text"), icon: "bx-note" },
-    { type: "spreadsheet", mime: "application/json", title: t("note_types.spreadsheet"), icon: "bx-table", isBeta: true },
 
     // Text notes group
     { type: "book", mime: "", title: t("note_types.book"), icon: "bx-book" },
@@ -42,7 +40,6 @@ export const NOTE_TYPES: NoteTypeMapping[] = [
     { type: "relationMap", mime: "application/json", title: t("note_types.relation-map"), icon: "bxs-network-chart" },
 
     // Misc note types
-    { type: "llmChat", mime: "application/json", title: t("note_types.llm-chat"), icon: "bx-message-square-dots", isBeta: true },
     { type: "render", mime: "", title: t("note_types.render-note"), icon: "bx-extension" },
     { type: "search", title: t("note_types.saved-search"), icon: "bx-file-find", static: true },
     { type: "webView", mime: "", title: t("note_types.web-view"), icon: "bx-globe-alt" },
@@ -56,6 +53,7 @@ export const NOTE_TYPES: NoteTypeMapping[] = [
     { type: "file", title: t("note_types.file"), reserved: true },
     { type: "image", title: t("note_types.image"), reserved: true },
     { type: "launcher", mime: "", title: t("note_types.launcher"), reserved: true },
+    { type: "aiChat", mime: "application/json", title: t("note_types.ai-chat"), reserved: true }
 ];
 
 /** The maximum age in days for a template to be marked with the "New" badge */
@@ -94,15 +92,14 @@ async function getNoteTypeItems(command?: TreeCommandNames) {
 function getBlankNoteTypes(command?: TreeCommandNames): MenuItem<TreeCommandNames>[] {
     return NOTE_TYPES
         .filter((nt) => !nt.reserved && nt.type !== "book")
-        .filter((nt) => nt.type !== "llmChat" || isExperimentalFeatureEnabled("llm"))
         .map((nt) => {
             const menuItem: MenuCommandItem<TreeCommandNames> = {
                 title: nt.title,
                 command,
                 type: nt.type,
-                uiIcon: `bx ${nt.icon}`,
+                uiIcon: "bx " + nt.icon,
                 badges: []
-            };
+            }
 
             if (nt.isNew) {
                 menuItem.badges?.push(NEW_BADGE);
@@ -134,7 +131,7 @@ async function getUserTemplates(command?: TreeCommandNames) {
         const item: MenuItem<TreeCommandNames> = {
             title: templateNote.title,
             uiIcon: templateNote.getIcon(),
-            command,
+            command: command,
             type: templateNote.type,
             templateNoteId: templateNote.noteId
         };
@@ -163,7 +160,7 @@ async function getBuiltInTemplates(title: string | null, command: TreeCommandNam
     const items: MenuItem<TreeCommandNames>[] = [];
     if (title) {
         items.push({
-            title,
+            title: title,
             kind: "header"
         });
     } else {
@@ -179,7 +176,7 @@ async function getBuiltInTemplates(title: string | null, command: TreeCommandNam
         const item: MenuItem<TreeCommandNames> = {
             title: templateNote.title,
             uiIcon: templateNote.getIcon(),
-            command,
+            command: command,
             type: templateNote.type,
             templateNoteId: templateNote.noteId
         };
@@ -197,7 +194,7 @@ async function isNewTemplate(templateNoteId) {
     if (rootCreationDate === undefined) {
         // Retrieve the root note creation date
         try {
-            const rootNoteInfo: any = await server.get("notes/root");
+            let rootNoteInfo: any = await server.get("notes/root");
             if ("dateCreated" in rootNoteInfo) {
                 rootCreationDate = new Date(rootNoteInfo.dateCreated);
             }
@@ -212,7 +209,7 @@ async function isNewTemplate(templateNoteId) {
     if (creationDate === undefined) {
         // The creation date isn't available in the cache, try to retrieve it from the server
         try {
-            const noteInfo: any = await server.get(`notes/${templateNoteId}`);
+            const noteInfo: any = await server.get("notes/" + templateNoteId);
             if ("dateCreated" in noteInfo) {
                 creationDate = new Date(noteInfo.dateCreated);
                 creationDateCache.set(templateNoteId, creationDate);
@@ -234,8 +231,9 @@ async function isNewTemplate(templateNoteId) {
         const age = (new Date().getTime() - creationDate.getTime()) / DAY_LENGTH;
         // Return true if the template is at most NEW_TEMPLATE_MAX_AGE days old
         return (age <= NEW_TEMPLATE_MAX_AGE);
+    } else {
+        return false;
     }
-    return false;
 }
 
 export default {

apps/client/src/services/promoted_attribute_definition_parser.ts

@@ -1,4 +1,4 @@
-export type LabelType = "text" | "textarea" | "number" | "boolean" | "date" | "datetime" | "time" | "url" | "color";
+export type LabelType = "text" | "number" | "boolean" | "date" | "datetime" | "time" | "url" | "color";
 type Multiplicity = "single" | "multi";
 
 export interface DefinitionObject {
@@ -17,7 +17,7 @@ function parse(value: string) {
     for (const token of tokens) {
         if (token === "promoted") {
             defObj.isPromoted = true;
-        } else if (["text", "textarea", "number", "boolean", "date", "datetime", "time", "url", "color"].includes(token)) {
+        } else if (["text", "number", "boolean", "date", "datetime", "time", "url", "color"].includes(token)) {
             defObj.labelType = token as LabelType;
         } else if (["single", "multi"].includes(token)) {
             defObj.multiplicity = token as Multiplicity;

apps/client/src/services/render.ts

@@ -0,0 +1,54 @@
+import { h, VNode } from "preact";
+
+import type FNote from "../entities/fnote.js";
+import { renderReactWidgetAtElement } from "../widgets/react/react_utils.jsx";
+import bundleService, { type Bundle } from "./bundle.js";
+import froca from "./froca.js";
+import server from "./server.js";
+
+async function render(note: FNote, $el: JQuery<HTMLElement>) {
+    const relations = note.getRelations("renderNote");
+    const renderNoteIds = relations.map((rel) => rel.value).filter((noteId) => noteId);
+
+    $el.empty().toggle(renderNoteIds.length > 0);
+
+    for (const renderNoteId of renderNoteIds) {
+        const bundle = await server.post<Bundle>(`script/bundle/${renderNoteId}`);
+
+        const $scriptContainer = $("<div>");
+        $el.append($scriptContainer);
+
+        $scriptContainer.append(bundle.html);
+
+        // async so that scripts cannot block trilium execution
+        bundleService.executeBundle(bundle, note, $scriptContainer).then(result => {
+            // Render JSX
+            if (bundle.html === "") {
+                renderIfJsx(bundle, result, $el);
+            }
+        });
+    }
+
+    return renderNoteIds.length > 0;
+}
+
+async function renderIfJsx(bundle: Bundle, result: unknown, $el: JQuery<HTMLElement>) {
+    // Ensure the root script note is actually a JSX.
+    const rootScriptNoteId = await froca.getNote(bundle.noteId);
+    if (rootScriptNoteId?.mime !== "text/jsx") return;
+
+    // Ensure the output is a valid el.
+    if (typeof result !== "function") return;
+
+    // Obtain the parent component.
+    const closestComponent = glob.getComponentByEl($el.closest(".component")[0]);
+    if (!closestComponent) return;
+
+    // Render the element.
+    const el = h(result as () => VNode, {});
+    renderReactWidgetAtElement(closestComponent, el, $el[0]);
+}
+
+export default {
+    render
+};

apps/client/src/services/render.tsx

@@ -1,86 +0,0 @@
-import { Component, h, VNode } from "preact";
-
-import type FNote from "../entities/fnote.js";
-import { renderReactWidgetAtElement } from "../widgets/react/react_utils.jsx";
-import { type Bundle, executeBundleWithoutErrorHandling } from "./bundle.js";
-import froca from "./froca.js";
-import server from "./server.js";
-
-type ErrorHandler = (e: unknown) => void;
-
-async function render(note: FNote, $el: JQuery<HTMLElement>, onError?: ErrorHandler) {
-    const relations = note.getRelations("renderNote");
-    const renderNoteIds = relations.map((rel) => rel.value).filter((noteId) => noteId);
-
-    $el.empty().toggle(renderNoteIds.length > 0);
-
-    try {
-        for (const renderNoteId of renderNoteIds) {
-            const bundle = await server.postWithSilentInternalServerError<Bundle>(`script/bundle/${renderNoteId}`);
-
-            const $scriptContainer = $("<div>");
-            $el.append($scriptContainer);
-
-            $scriptContainer.append(bundle.html);
-
-            // async so that scripts cannot block trilium execution
-            executeBundleWithoutErrorHandling(bundle, note, $scriptContainer)
-                .catch(onError)
-                .then(result => {
-                    // Render JSX
-                    if (bundle.html === "") {
-                        renderIfJsx(bundle, result, $el, onError).catch(onError);
-                    }
-                });
-        }
-
-        return renderNoteIds.length > 0;
-    } catch (e) {
-        if (typeof e === "string" && e.startsWith("{") && e.endsWith("}")) {
-            try {
-                onError?.(JSON.parse(e));
-            } catch (e) {
-                onError?.(e);
-            }
-        } else {
-            onError?.(e);
-        }
-    }
-}
-
-async function renderIfJsx(bundle: Bundle, result: unknown, $el: JQuery<HTMLElement>, onError?: ErrorHandler) {
-    // Ensure the root script note is actually a JSX.
-    const rootScriptNoteId = await froca.getNote(bundle.noteId);
-    if (rootScriptNoteId?.mime !== "text/jsx") return;
-
-    // Ensure the output is a valid el.
-    if (typeof result !== "function") return;
-
-    // Obtain the parent component.
-    const closestComponent = glob.getComponentByEl($el.closest(".component")[0]);
-    if (!closestComponent) return;
-
-    // Render the element.
-    const UserErrorBoundary = class UserErrorBoundary extends Component {
-        constructor(props: object) {
-            super(props);
-            this.state = { error: null };
-        }
-
-        componentDidCatch(error: unknown) {
-            onError?.(error);
-            this.setState({ error });
-        }
-
-        render() {
-            if ("error" in this.state && this.state?.error) return null;
-            return this.props.children;
-        }
-    };
-    const el = h(UserErrorBoundary, {}, h(result as () => VNode, {}));
-    renderReactWidgetAtElement(closestComponent, el, $el[0]);
-}
-
-export default {
-    render
-};

apps/client/src/services/server.ts

@@ -1,4 +1,3 @@
-import { t } from "./i18n.js";
 import utils, { isShare } from "./utils.js";
 import ValidationError from "./validation_error.js";
 
@@ -33,7 +32,8 @@ async function getHeaders(headers?: Headers) {
         return {};
     }
 
-    const activeNoteContext = glob.appContext?.tabManager ? glob.appContext.tabManager.getActiveContext() : null;
+    const appContext = (await import("../components/app_context.js")).default;
+    const activeNoteContext = appContext.tabManager ? appContext.tabManager.getActiveContext() : null;
 
     // headers need to be lowercase because node.js automatically converts them to lower case
     // also avoiding using underscores instead of dashes since nginx filters them out by default
@@ -73,10 +73,6 @@ async function post<T>(url: string, data?: unknown, componentId?: string) {
     return await call<T>("POST", url, componentId, { data });
 }
 
-async function postWithSilentInternalServerError<T>(url: string, data?: unknown, componentId?: string) {
-    return await call<T>("POST", url, componentId, { data, silentInternalServerError: true });
-}
-
 async function put<T>(url: string, data?: unknown, componentId?: string) {
     return await call<T>("PUT", url, componentId, { data });
 }
@@ -89,33 +85,21 @@ async function remove<T>(url: string, componentId?: string) {
     return await call<T>("DELETE", url, componentId);
 }
 
-async function upload(url: string, fileToUpload: File, componentId?: string, method = "PUT") {
+async function upload(url: string, fileToUpload: File, componentId?: string) {
     const formData = new FormData();
     formData.append("upload", fileToUpload);
 
-    const doUpload = async () => $.ajax({
+    return await $.ajax({
         url: window.glob.baseApiUrl + url,
         headers: await getHeaders(componentId ? {
             "trilium-component-id": componentId
         } : undefined),
         data: formData,
-        type: method,
+        type: "PUT",
         timeout: 60 * 60 * 1000,
         contentType: false, // NEEDED, DON'T REMOVE THIS
         processData: false // NEEDED, DON'T REMOVE THIS
     });
-
-    try {
-        return await doUpload();
-    } catch (e: unknown) {
-        // jQuery rejects with the jqXHR object
-        const jqXhr = e as JQuery.jqXHR;
-        if (jqXhr?.status && isCsrfError(jqXhr.status, jqXhr.responseText)) {
-            await refreshCsrfToken();
-            return await doUpload();
-        }
-        throw e;
-    }
 }
 
 let idCounter = 1;
@@ -124,55 +108,11 @@ const idToRequestMap: Record<string, RequestData> = {};
 
 let maxKnownEntityChangeId = 0;
 
-let csrfRefreshInProgress: Promise<void> | null = null;
-
-/**
- * Re-fetches /bootstrap to obtain a fresh CSRF token. This is needed when the
- * server session expires (e.g. mobile tab backgrounded for a long time) and the
- * existing CSRF token is no longer valid.
- *
- * Coalesces concurrent calls so only one bootstrap request is in-flight at a time.
- */
-async function refreshCsrfToken(): Promise<void> {
-    if (csrfRefreshInProgress) {
-        return csrfRefreshInProgress;
-    }
-
-    csrfRefreshInProgress = (async () => {
-        try {
-            const response = await fetch(`./bootstrap${window.location.search}`, { cache: "no-store" });
-            if (response.ok) {
-                const json = await response.json();
-                glob.csrfToken = json.csrfToken;
-            }
-        } finally {
-            csrfRefreshInProgress = null;
-        }
-    })();
-
-    return csrfRefreshInProgress;
-}
-
-function isCsrfError(status: number, responseText: string): boolean {
-    if (status !== 403) {
-        return false;
-    }
-    try {
-        const body = JSON.parse(responseText);
-        return body.message === "Invalid CSRF token";
-    } catch {
-        return false;
-    }
-}
-
 interface CallOptions {
     data?: unknown;
     silentNotFound?: boolean;
-    silentInternalServerError?: boolean;
     // If `true`, the value will be returned as a string instead of a JavaScript object if JSON, XMLDocument if XML, etc.
     raw?: boolean;
-    /** Used internally to prevent infinite retry loops on CSRF refresh. */
-    csrfRetried?: boolean;
 }
 
 async function call<T>(method: string, url: string, componentId?: string, options: CallOptions = {}) {
@@ -203,7 +143,7 @@ async function call<T>(method: string, url: string, componentId?: string, option
             });
         })) as any;
     } else {
-        resp = await ajax(url, method, data, headers, options);
+        resp = await ajax(url, method, data, headers, !!options.silentNotFound, options.raw);
     }
 
     const maxEntityChangeIdStr = resp.headers["trilium-max-entity-change-id"];
@@ -215,14 +155,17 @@ async function call<T>(method: string, url: string, componentId?: string, option
     return resp.body as T;
 }
 
-function ajax(url: string, method: string, data: unknown, headers: Headers, opts: CallOptions): Promise<Response> {
+/**
+ * @param raw if `true`, the value will be returned as a string instead of a JavaScript object if JSON, XMLDocument if XML, etc.
+ */
+function ajax(url: string, method: string, data: unknown, headers: Headers, silentNotFound: boolean, raw?: boolean): Promise<Response> {
     return new Promise((res, rej) => {
         const options: JQueryAjaxSettings = {
             url: window.glob.baseApiUrl + url,
             type: method,
             headers,
             timeout: 60000,
-            success: (body, _textStatus, jqXhr) => {
+            success: (body, textStatus, jqXhr) => {
                 const respHeaders: Headers = {};
 
                 jqXhr
@@ -247,41 +190,17 @@ function ajax(url: string, method: string, data: unknown, headers: Headers, opts
                     // don't report requests that are rejected by the browser, usually when the user is refreshing or going to a different page.
                     rej("rejected by browser");
                     return;
-                }
-
-                // If the CSRF token is stale (e.g. session expired while tab was backgrounded),
-                // refresh it and retry the request once.
-                if (!opts.csrfRetried && isCsrfError(jqXhr.status, jqXhr.responseText)) {
-                    try {
-                        await refreshCsrfToken();
-                        // Rebuild headers so the fresh glob.csrfToken is picked up
-                        const retryHeaders = await getHeaders({ "trilium-component-id": headers["trilium-component-id"] });
-                        const retryResult = await ajax(url, method, data, retryHeaders, { ...opts, csrfRetried: true });
-                        res(retryResult);
-                        return;
-                    } catch (retryErr) {
-                        rej(retryErr);
-                        return;
-                    }
-                }
-
-                if (opts.silentNotFound && jqXhr.status === 404) {
-                    // report nothing
-                } else if (opts.silentInternalServerError && jqXhr.status === 500) {
+                } else if (silentNotFound && jqXhr.status === 404) {
                     // report nothing
                 } else {
-                    try {
-                        await reportError(method, url, jqXhr.status, jqXhr.responseText);
-                    } catch {
-                        // reportError may throw (e.g. ValidationError); ensure rej() is still called below.
-                    }
+                    await reportError(method, url, jqXhr.status, jqXhr.responseText);
                 }
 
                 rej(jqXhr.responseText);
             }
         };
 
-        if (opts.raw) {
+        if (raw) {
             options.dataType = "text";
         }
 
@@ -344,7 +263,6 @@ async function reportError(method: string, url: string, statusCode: number, resp
         } catch (e) {}
     }
 
-    // Dynamic import to avoid circular dependency (toast → app_context → options → server).
     const toastService = (await import("./toast.js")).default;
 
     const messageStr = (typeof message === "string" ? message : JSON.stringify(message)) || "-";
@@ -358,6 +276,7 @@ async function reportError(method: string, url: string, statusCode: number, resp
             ...response
         });
     } else {
+        const { t } = await import("./i18n.js");
         if (statusCode === 400 && (url.includes("%23") || url.includes("%2F"))) {
             toastService.showPersistent({
                 id: "trafik-blocked",
@@ -371,7 +290,8 @@ async function reportError(method: string, url: string, statusCode: number, resp
                 t("server.unknown_http_error_content", { statusCode, method, url, message: messageStr }),
                 15_000);
         }
-        window.logError(`${statusCode} ${method} ${url} - ${message}`);
+        const { logError } = await import("./ws.js");
+        logError(`${statusCode} ${method} ${url} - ${message}`);
     }
 }
 
@@ -379,7 +299,6 @@ export default {
     get,
     getWithSilentNotFound,
     post,
-    postWithSilentInternalServerError,
     put,
     patch,
     remove,

apps/client/src/services/shortcuts.spec.ts

@@ -1,6 +1,5 @@
-import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
-
-import shortcuts, { isIMEComposing, keyMatches, matchesShortcut } from "./shortcuts.js";
+import { describe, expect, it, vi, beforeEach, afterEach } from "vitest";
+import shortcuts, { keyMatches, matchesShortcut, isIMEComposing } from "./shortcuts.js";
 
 // Mock utils module
 vi.mock("./utils.js", () => ({
@@ -62,10 +61,9 @@ describe("shortcuts", () => {
     });
 
     describe("keyMatches", () => {
-        const createKeyboardEvent = (key: string, code?: string, extraProps: Partial<KeyboardEvent> = {}) => ({
+        const createKeyboardEvent = (key: string, code?: string) => ({
             key,
-            code: code || `Key${key.toUpperCase()}`,
-            ...extraProps
+            code: code || `Key${key.toUpperCase()}`
         } as KeyboardEvent);
 
         it("should match regular letter keys using key code", () => {
@@ -103,23 +101,17 @@ describe("shortcuts", () => {
             consoleSpy.mockRestore();
         });
 
-        it("should match azerty keys", () => {
-            const event = createKeyboardEvent("A", "KeyQ");
-            expect(keyMatches(event, "a")).toBe(true);
-            expect(keyMatches(event, "q")).toBe(false);
-        });
-
         it("should match letter keys using code when key is a special character (macOS Alt behavior)", () => {
             // On macOS, pressing Option/Alt + A produces 'å' as the key, but code is still 'KeyA'
-            const macOSAltAEvent = createKeyboardEvent("å", "KeyA", { altKey: true });
+            const macOSAltAEvent = createKeyboardEvent("å", "KeyA");
             expect(keyMatches(macOSAltAEvent, "a")).toBe(true);
 
             // Option + H produces '˙'
-            const macOSAltHEvent = createKeyboardEvent("˙", "KeyH", { altKey: true });
+            const macOSAltHEvent = createKeyboardEvent("˙", "KeyH");
             expect(keyMatches(macOSAltHEvent, "h")).toBe(true);
 
             // Option + S produces 'ß'
-            const macOSAltSEvent = createKeyboardEvent("ß", "KeyS", { altKey: true });
+            const macOSAltSEvent = createKeyboardEvent("ß", "KeyS");
             expect(keyMatches(macOSAltSEvent, "s")).toBe(true);
         });
     });
@@ -223,15 +215,6 @@ describe("shortcuts", () => {
             consoleSpy.mockRestore();
         });
 
-        it("matches azerty", () => {
-            const event = createKeyboardEvent({
-                key: "a",
-                code: "KeyQ",
-                ctrlKey: true
-            });
-            expect(matchesShortcut(event, "Ctrl+A")).toBe(true);
-        });
-
         it("should match Alt+letter shortcuts on macOS where key is a special character", () => {
             // On macOS, pressing Option/Alt + A produces 'å' but code remains 'KeyA'
             const macOSAltAEvent = createKeyboardEvent({

apps/client/src/services/shortcuts.ts

@@ -215,12 +215,9 @@ export function keyMatches(e: KeyboardEvent, key: string): boolean {
     // For letter keys, use the physical key code for consistency
     // On macOS, Option/Alt key produces special characters, so we must use e.code
     if (key.length === 1 && key >= 'a' && key <= 'z') {
-        if (e.altKey) {
-            // e.code is like "KeyA", "KeyB", etc.
-            const expectedCode = `Key${key.toUpperCase()}`;
-            return e.code === expectedCode || e.key.toLowerCase() === key.toLowerCase();
-        }
-        return e.key.toLowerCase() === key.toLowerCase();
+        // e.code is like "KeyA", "KeyB", etc.
+        const expectedCode = `Key${key.toUpperCase()}`;
+        return e.code === expectedCode || e.key.toLowerCase() === key.toLowerCase();
     }
 
     // For regular keys, check both key and code as fallback

apps/client/src/services/spaced_update.ts

@@ -12,7 +12,6 @@ export default class SpacedUpdate {
     private updateInterval: number;
     private changeForbidden?: boolean;
     private stateCallback?: StateCallback;
-    private lastState: SaveState = "saved";
 
     constructor(updater: Callback, updateInterval = 1000, stateCallback?: StateCallback) {
         this.updater = updater;
@@ -25,7 +24,7 @@ export default class SpacedUpdate {
     scheduleUpdate() {
         if (!this.changeForbidden) {
             this.changed = true;
-            this.onStateChanged("unsaved");
+            this.stateCallback?.("unsaved");
             setTimeout(() => this.triggerUpdate());
         }
     }
@@ -35,12 +34,12 @@ export default class SpacedUpdate {
             this.changed = false; // optimistic...
 
             try {
-                this.onStateChanged("saving");
+                this.stateCallback?.("saving");
                 await this.updater();
-                this.onStateChanged("saved");
+                this.stateCallback?.("saved");
             } catch (e) {
                 this.changed = true;
-                this.onStateChanged("error");
+                this.stateCallback?.("error");
                 logError(getErrorMessage(e));
                 throw e;
             }
@@ -77,13 +76,13 @@ export default class SpacedUpdate {
         }
 
         if (Date.now() - this.lastUpdated > this.updateInterval) {
-            this.onStateChanged("saving");
+            this.stateCallback?.("saving");
             try {
                 await this.updater();
-                this.onStateChanged("saved");
+                this.stateCallback?.("saved");
                 this.changed = false;
             } catch (e) {
-                this.onStateChanged("error");
+                this.stateCallback?.("error");
                 logError(getErrorMessage(e));
             }
             this.lastUpdated = Date.now();
@@ -93,13 +92,6 @@ export default class SpacedUpdate {
         }
     }
 
-    onStateChanged(state: SaveState) {
-        if (state === this.lastState) return;
-
-        this.stateCallback?.(state);
-        this.lastState = state;
-    }
-
     async allowUpdateWithoutChange(callback: Callback) {
         this.changeForbidden = true;
 

apps/client/src/services/syntax_highlight.ts

@@ -1,11 +1,10 @@
-import { MimeType } from "@triliumnext/commons";
-import { type AutoHighlightResult, ensureMimeTypes, highlight, highlightAuto, type HighlightResult, loadTheme, type Theme,Themes } from "@triliumnext/highlightjs";
-
-import { copyText, copyTextWithToast } from "./clipboard_ext.js";
-import { t } from "./i18n.js";
+import { ensureMimeTypes, highlight, highlightAuto, loadTheme, Themes, type AutoHighlightResult, type HighlightResult, type Theme } from "@triliumnext/highlightjs";
 import mime_types from "./mime_types.js";
 import options from "./options.js";
+import { t } from "./i18n.js";
+import { copyText, copyTextWithToast } from "./clipboard_ext.js";
 import { isShare } from "./utils.js";
+import { MimeType } from "@triliumnext/commons";
 
 let highlightingLoaded = false;
 
@@ -77,15 +76,13 @@ export async function applySingleBlockSyntaxHighlight($codeBlock: JQuery<HTMLEle
 }
 
 export async function ensureMimeTypesForHighlighting(mimeTypeHint?: string) {
-    if (!mimeTypeHint && highlightingLoaded) {
+    if (highlightingLoaded) {
         return;
     }
 
     // Load theme.
-    if (!highlightingLoaded) {
-        const currentThemeName = String(options.get("codeBlockTheme"));
-        await loadHighlightingTheme(currentThemeName);
-    }
+    const currentThemeName = String(options.get("codeBlockTheme"));
+    await loadHighlightingTheme(currentThemeName);
 
     // Load mime types.
     let mimeTypes: MimeType[];
@@ -97,7 +94,7 @@ export async function ensureMimeTypesForHighlighting(mimeTypeHint?: string) {
                 enabled: true,
                 mime: mimeTypeHint.replace("-", "/")
             }
-        ];
+        ]
     } else {
         mimeTypes = mime_types.getMimeTypes();
     }
@@ -127,9 +124,9 @@ export function isSyntaxHighlightEnabled() {
     if (!isShare) {
         const theme = options.get("codeBlockTheme");
         return !!theme && theme !== "none";
+    } else {
+        return true;
     }
-    return true;
-
 }
 
 /**

apps/client/src/services/theme.ts

@@ -1,35 +0,0 @@
-export function getThemeStyle(): "auto" | "light" | "dark" {
-    const configuredTheme = window.glob?.theme;
-    if (configuredTheme === "auto" || configuredTheme === "next") {
-        return "auto";
-    }
-
-    if (configuredTheme === "light" || configuredTheme === "dark") {
-        return configuredTheme;
-    }
-
-    if (configuredTheme === "next-light") {
-        return "light";
-    }
-
-    if (configuredTheme === "next-dark") {
-        return "dark";
-    }
-
-    const style = window.getComputedStyle(document.body);
-    const themeStyle = style.getPropertyValue("--theme-style");
-    if (style.getPropertyValue("--theme-style-auto") !== "true" && (themeStyle === "light" || themeStyle === "dark")) {
-        return themeStyle as "light" | "dark";
-    }
-
-    return "auto";
-}
-
-export function getEffectiveThemeStyle(): "light" | "dark" {
-    const themeStyle = getThemeStyle();
-    if (themeStyle === "auto") {
-        return window.matchMedia && window.matchMedia("(prefers-color-scheme: dark)").matches ? "dark" : "light";
-    }
-
-    return themeStyle === "dark" ? "dark" : "light";
-}

apps/client/src/services/utils.ts

@@ -14,9 +14,7 @@ export function reloadFrontendApp(reason?: string) {
     }
 
     if (isElectron()) {
-        for (const window of dynamicRequire("@electron/remote").BrowserWindow.getAllWindows()) {
-            window.reload();
-        }
+        dynamicRequire("@electron/remote").BrowserWindow.getFocusedWindow()?.reload();
     } else {
         window.location.reload();
     }
@@ -455,7 +453,9 @@ export function openInAppHelpFromUrl(inAppHelpPage: string) {
 export async function openInReusableSplit(targetNoteId: string, targetViewMode: ViewMode, openOpts: {
     hoistedNoteId?: string;
 } = {}) {
-    const activeContext = glob.appContext?.tabManager?.getActiveContext();
+    // Dynamic import to avoid import issues in tests.
+    const appContext = (await import("../components/app_context.js")).default;
+    const activeContext = appContext.tabManager.getActiveContext();
     if (!activeContext) {
         return;
     }
@@ -465,7 +465,7 @@ export async function openInReusableSplit(targetNoteId: string, targetViewMode:
     if (!existingSubcontext) {
         // The target split is not already open, open a new split with it.
         const { ntxId } = subContexts[subContexts.length - 1];
-        glob.appContext?.triggerCommand("openNewNoteSplit", {
+        appContext.triggerCommand("openNewNoteSplit", {
             ntxId,
             notePath: targetNoteId,
             hoistedNoteId: openOpts.hoistedNoteId,
@@ -920,7 +920,6 @@ export default {
     parseDate,
     formatDateISO,
     formatDateTime,
-    formatTime,
     formatTimeInterval,
     formatSize,
     localNowDateTime,

apps/client/src/services/ws.ts

@@ -1,15 +1,13 @@
-import { WebSocketMessage } from "@triliumnext/commons";
-
-import appContext from "../components/app_context.js";
-import type { EntityChange } from "../server_types.js";
-import bundleService from "./bundle.js";
-import froca from "./froca.js";
-import frocaUpdater from "./froca_updater.js";
-import { t } from "./i18n.js";
-import options from "./options.js";
-import server from "./server.js";
-import toast from "./toast.js";
 import utils from "./utils.js";
+import toastService from "./toast.js";
+import server from "./server.js";
+import options from "./options.js";
+import frocaUpdater from "./froca_updater.js";
+import appContext from "../components/app_context.js";
+import { t } from "./i18n.js";
+import type { EntityChange } from "../server_types.js";
+import { WebSocketMessage } from "@triliumnext/commons";
+import toast from "./toast.js";
 
 type MessageHandler = (message: WebSocketMessage) => void;
 let messageHandlers: MessageHandler[] = [];
@@ -128,14 +126,63 @@ async function handleMessage(event: MessageEvent<any>) {
     } else if (message.type === "frontend-update") {
         await executeFrontendUpdate(message.data.entityChanges);
     } else if (message.type === "sync-hash-check-failed") {
-        toast.showError(t("ws.sync-check-failed"), 60000);
+        toastService.showError(t("ws.sync-check-failed"), 60000);
     } else if (message.type === "consistency-checks-failed") {
-        toast.showError(t("ws.consistency-checks-failed"), 50 * 60000);
+        toastService.showError(t("ws.consistency-checks-failed"), 50 * 60000);
     } else if (message.type === "api-log-messages") {
         appContext.triggerEvent("apiLogMessages", { noteId: message.noteId, messages: message.messages });
     } else if (message.type === "toast") {
-        toast.showMessage(message.message);
+        toastService.showMessage(message.message);
+    } else if (message.type === "llm-stream") {
+        // ENHANCED LOGGING FOR DEBUGGING
+        console.log(`[WS-CLIENT] >>> RECEIVED LLM STREAM MESSAGE <<<`);
+        console.log(`[WS-CLIENT] Message details: sessionId=${message.sessionId}, hasContent=${!!message.content}, contentLength=${message.content ? message.content.length : 0}, hasThinking=${!!message.thinking}, hasToolExecution=${!!message.toolExecution}, isDone=${!!message.done}`);
+
+        if (message.content) {
+            console.log(`[WS-CLIENT] CONTENT PREVIEW: "${message.content.substring(0, 50)}..."`);
+        }
+
+        // Create the event with detailed logging
+        console.log(`[WS-CLIENT] Creating CustomEvent 'llm-stream-message'`);
+        const llmStreamEvent = new CustomEvent('llm-stream-message', { detail: message });
+
+        // Dispatch to multiple targets to ensure delivery
+        try {
+            console.log(`[WS-CLIENT] Dispatching event to window`);
+            window.dispatchEvent(llmStreamEvent);
+            console.log(`[WS-CLIENT] Event dispatched to window`);
+
+            // Also try document for completeness
+            console.log(`[WS-CLIENT] Dispatching event to document`);
+            document.dispatchEvent(new CustomEvent('llm-stream-message', { detail: message }));
+            console.log(`[WS-CLIENT] Event dispatched to document`);
+        } catch (err) {
+            console.error(`[WS-CLIENT] Error dispatching event:`, err);
+        }
+
+        // Debug current listeners (though we can't directly check for specific event listeners)
+        console.log(`[WS-CLIENT] Active event listeners should receive this message now`);
+
+        // Detailed logging based on message type
+        if (message.content) {
+            console.log(`[WS-CLIENT] Content message: ${message.content.length} chars`);
+        } else if (message.thinking) {
+            console.log(`[WS-CLIENT] Thinking update: "${message.thinking}"`);
+        } else if (message.toolExecution) {
+            console.log(`[WS-CLIENT] Tool execution: action=${message.toolExecution.action}, tool=${message.toolExecution.tool || 'unknown'}`);
+            if (message.toolExecution.result) {
+                console.log(`[WS-CLIENT] Tool result preview: "${String(message.toolExecution.result).substring(0, 50)}..."`);
+            }
+        } else if (message.done) {
+            console.log(`[WS-CLIENT] Completion signal received`);
+        }
     } else if (message.type === "execute-script") {
+        // TODO: Remove after porting the file
+        // @ts-ignore
+        const bundleService = (await import("./bundle.js")).default as any;
+        // TODO: Remove after porting the file
+        // @ts-ignore
+        const froca = (await import("./froca.js")).default as any;
         const originEntity = message.originEntityId ? await froca.getNote(message.originEntityId) : null;
 
         bundleService.getAndExecuteBundle(message.currentNoteId, originEntity, message.script, message.params);
@@ -157,7 +204,7 @@ function waitForEntityChangeId(desiredEntityChangeId: number) {
 
     return new Promise<void>((res, rej) => {
         entityChangeIdReachedListeners.push({
-            desiredEntityChangeId,
+            desiredEntityChangeId: desiredEntityChangeId,
             resolvePromise: res,
             start: Date.now()
         });
@@ -201,7 +248,7 @@ async function consumeFrontendUpdateData() {
             } else {
                 console.log("nonProcessedEntityChanges causing the timeout", nonProcessedEntityChanges);
 
-                toast.showError(t("ws.encountered-error", { message: e.message }));
+                toastService.showError(t("ws.encountered-error", { message: e.message }));
             }
         }
 

apps/client/src/setup.ts

@@ -1,107 +1,66 @@
 import "jquery";
-
 import utils from "./services/utils.js";
+import ko from "knockout";
 
-type SetupStep = "sync-in-progress" | "setup-type" | "new-document-in-progress" | "sync-from-desktop" | "sync-from-server";
-type SetupType = "new-document" | "sync-from-desktop" | "sync-from-server" | "";
+// TriliumNextTODO: properly make use of below types
+// type SetupModelSetupType = "new-document" | "sync-from-desktop" | "sync-from-server" | "";
+// type SetupModelStep = "sync-in-progress" | "setup-type" | "new-document-in-progress" | "sync-from-desktop";
 
-class SetupController {
-    private step: SetupStep;
-    private setupType: SetupType = "";
-    private syncPollIntervalId: number | null = null;
-    private rootNode: HTMLElement;
-    private setupTypeForm: HTMLFormElement;
-    private syncFromServerForm: HTMLFormElement;
-    private setupTypeNextButton: HTMLButtonElement;
-    private setupTypeInputs: HTMLInputElement[];
-    private syncServerHostInput: HTMLInputElement;
-    private syncProxyInput: HTMLInputElement;
-    private passwordInput: HTMLInputElement;
-    private sections: Record<SetupStep, HTMLElement>;
+class SetupModel {
+    syncInProgress: boolean;
+    step: ko.Observable<string>;
+    setupType: ko.Observable<string>;
+    setupNewDocument: ko.Observable<boolean>;
+    setupSyncFromDesktop: ko.Observable<boolean>;
+    setupSyncFromServer: ko.Observable<boolean>;
+    syncServerHost: ko.Observable<string | undefined>;
+    syncProxy: ko.Observable<string | undefined>;
+    password: ko.Observable<string | undefined>;
 
-    constructor(rootNode: HTMLElement, syncInProgress: boolean) {
-        this.rootNode = rootNode;
-        this.step = syncInProgress ? "sync-in-progress" : "setup-type";
-        this.setupTypeForm = mustGetElement("setup-type-form", HTMLFormElement);
-        this.syncFromServerForm = mustGetElement("sync-from-server-form", HTMLFormElement);
-        this.setupTypeNextButton = mustGetElement("setup-type-next", HTMLButtonElement);
-        this.setupTypeInputs = Array.from(document.querySelectorAll<HTMLInputElement>("input[name='setup-type']"));
-        this.syncServerHostInput = mustGetElement("sync-server-host", HTMLInputElement);
-        this.syncProxyInput = mustGetElement("sync-proxy", HTMLInputElement);
-        this.passwordInput = mustGetElement("password", HTMLInputElement);
-        this.sections = {
-            "setup-type": mustGetElement("setup-type-section", HTMLElement),
-            "new-document-in-progress": mustGetElement("new-document-in-progress-section", HTMLElement),
-            "sync-from-desktop": mustGetElement("sync-from-desktop-section", HTMLElement),
-            "sync-from-server": mustGetElement("sync-from-server-section", HTMLElement),
-            "sync-in-progress": mustGetElement("sync-in-progress-section", HTMLElement)
-        };
-    }
+    constructor(syncInProgress: boolean) {
+        this.syncInProgress = syncInProgress;
+        this.step = ko.observable(syncInProgress ? "sync-in-progress" : "setup-type");
+        this.setupType = ko.observable("");
+        this.setupNewDocument = ko.observable(false);
+        this.setupSyncFromDesktop = ko.observable(false);
+        this.setupSyncFromServer = ko.observable(false);
+        this.syncServerHost = ko.observable();
+        this.syncProxy = ko.observable();
+        this.password = ko.observable();
 
-    init() {
-        this.setupTypeForm.addEventListener("submit", (event) => {
-            event.preventDefault();
-            void this.selectSetupType();
-        });
-
-        this.syncFromServerForm.addEventListener("submit", (event) => {
-            event.preventDefault();
-            void this.finish();
-        });
-
-        for (const input of this.setupTypeInputs) {
-            input.addEventListener("change", () => {
-                this.setupType = input.value as SetupType;
-                this.render();
-            });
+        if (this.syncInProgress) {
+            setInterval(checkOutstandingSyncs, 1000);
         }
-
-        for (const backButton of document.querySelectorAll<HTMLElement>("[data-action='back']")) {
-            backButton.addEventListener("click", () => {
-                this.back();
-            });
-        }
-
         const serverAddress = `${location.protocol}//${location.host}`;
         $("#current-host").html(serverAddress);
-
-        if (this.step === "sync-in-progress") {
-            this.startSyncPolling();
-        }
-
-        this.render();
-        this.rootNode.style.display = "";
     }
 
-    private async selectSetupType() {
-        if (this.setupType === "new-document") {
-            this.setStep("new-document-in-progress");
+    // this is called in setup.ejs
+    setupTypeSelected() {
+        return !!this.setupType();
+    }
 
-            await $.post("api/setup/new-document");
-            window.location.replace("./setup");
-            return;
-        }
+    selectSetupType() {
+        if (this.setupType() === "new-document") {
+            this.step("new-document-in-progress");
 
-        if (this.setupType) {
-            this.setStep(this.setupType);
+            $.post("api/setup/new-document").then(() => {
+                window.location.replace("./setup");
+            });
+        } else {
+            this.step(this.setupType());
         }
     }
 
-    private back() {
-        this.setStep("setup-type");
-        this.setupType = "";
-
-        for (const input of this.setupTypeInputs) {
-            input.checked = false;
-        }
-
-        this.render();
+    back() {
+        this.step("setup-type");
+        this.setupType("");
     }
 
-    private async finish() {
-        const syncServerHost = this.syncServerHostInput.value.trim();
-        const syncProxy = this.syncProxyInput.value.trim();
-        const password = this.passwordInput.value;
+    async finish() {
+        const syncServerHost = this.syncServerHost();
+        const syncProxy = this.syncProxy();
+        const password = this.password();
 
         if (!syncServerHost) {
             showAlert("Trilium server address can't be empty");
@@ -115,44 +74,21 @@ class SetupController {
 
         // not using server.js because it loads too many dependencies
         const resp = await $.post("api/setup/sync-from-server", {
-            syncServerHost,
-            syncProxy,
-            password
+            syncServerHost: syncServerHost,
+            syncProxy: syncProxy,
+            password: password
         });
 
         if (resp.result === "success") {
+            this.step("sync-in-progress");
+
+            setInterval(checkOutstandingSyncs, 1000);
+
             hideAlert();
-            this.setStep("sync-in-progress");
-            this.startSyncPolling();
         } else {
             showAlert(`Sync setup failed: ${resp.error}`);
         }
     }
-
-    private setStep(step: SetupStep) {
-        this.step = step;
-        this.render();
-    }
-
-    private render() {
-        for (const [step, section] of Object.entries(this.sections) as [SetupStep, HTMLElement][]) {
-            section.style.display = step === this.step ? "" : "none";
-        }
-
-        this.setupTypeNextButton.disabled = !this.setupType;
-    }
-
-    private getSelectedSetupType(): SetupType {
-        return (this.setupTypeInputs.find((input) => input.checked)?.value ?? "") as SetupType;
-    }
-
-    private startSyncPolling() {
-        if (this.syncPollIntervalId !== null) {
-            return;
-        }
-
-        this.syncPollIntervalId = window.setInterval(checkOutstandingSyncs, 1000);
-    }
 }
 
 async function checkOutstandingSyncs() {
@@ -186,19 +122,7 @@ function getSyncInProgress() {
     return !!parseInt(el.content);
 }
 
-function mustGetElement<T extends typeof HTMLElement>(id: string, ctor: T): InstanceType<T> {
-    const element = document.getElementById(id);
-
-    if (!element || !(element instanceof ctor)) {
-        throw new Error(`Expected element #${id}`);
-    }
-
-    return element as InstanceType<T>;
-}
-
 addEventListener("DOMContentLoaded", (event) => {
-    const rootNode = document.getElementById("setup-dialog");
-    if (!rootNode || !(rootNode instanceof HTMLElement)) return;
-
-    new SetupController(rootNode, getSyncInProgress()).init();
+    ko.applyBindings(new SetupModel(getSyncInProgress()), document.getElementById("setup-dialog"));
+    $("#setup-dialog").show();
 });

apps/client/src/stylesheets/llm_chat.css

@@ -0,0 +1,450 @@
+/* LLM Chat Panel Styles */
+.note-context-chat {
+    background-color: var(--main-background-color);
+}
+
+/* Message Styling */
+.chat-message {
+    margin-bottom: 1rem;
+}
+
+.message-avatar {
+    width: 36px;
+    height: 36px;
+    border-radius: 50%;
+    font-size: 1.25rem;
+    flex-shrink: 0;
+}
+
+.user-avatar {
+    background-color: var(--input-background-color);
+    color: var(--cmd-button-icon-color);
+}
+
+.assistant-avatar {
+    background-color: var(--subtle-border-color, var(--main-border-color));
+    color: var(--hover-item-text-color);
+}
+
+.message-content {
+    max-width: calc(100% - 50px);
+    box-shadow: 0 1px 3px rgba(0, 0, 0, 0.05);
+    color: var(--main-text-color);
+}
+
+.user-content {
+    border-radius: 0.5rem 0.5rem 0 0.5rem !important;
+    background-color: var(--input-background-color) !important;
+}
+
+.assistant-content {
+    border-radius: 0.5rem 0.5rem 0.5rem 0 !important;
+    background-color: var(--main-background-color);
+    border: 1px solid var(--subtle-border-color, var(--main-border-color));
+}
+
+/* Tool Execution Styling */
+.tool-execution-info {
+    margin-top: 0.75rem;
+    margin-bottom: 1.5rem;
+    border: 1px solid var(--subtle-border-color);
+    border-radius: 0.5rem;
+    overflow: hidden;
+    box-shadow: 0 1px 4px rgba(0, 0, 0, 0.05);
+    background-color: var(--main-background-color);
+    /* Add a subtle transition effect */
+    transition: all 0.2s ease-in-out;
+}
+
+.tool-execution-status {
+    background-color: var(--accented-background-color, rgba(0, 0, 0, 0.03)) !important;
+    border-radius: 0 !important;
+    padding: 0.5rem !important;
+    max-height: 250px !important;
+    overflow-y: auto;
+}
+
+.tool-execution-status .d-flex {
+    border-bottom: 1px solid var(--subtle-border-color);
+    padding-bottom: 0.5rem;
+    margin-bottom: 0.5rem;
+}
+
+.tool-step {
+    padding: 0.5rem;
+    margin-bottom: 0.75rem;
+    border-radius: 0.375rem;
+    background-color: var(--main-background-color);
+    border: 1px solid var(--subtle-border-color);
+    transition: background-color 0.2s ease;
+}
+
+.tool-step:hover {
+    background-color: rgba(0, 0, 0, 0.01);
+}
+
+.tool-step:last-child {
+    margin-bottom: 0;
+}
+
+/* Tool step specific styling */
+.tool-step.executing {
+    background-color: rgba(0, 123, 255, 0.05);
+    border-color: rgba(0, 123, 255, 0.2);
+}
+
+.tool-step.result {
+    background-color: rgba(40, 167, 69, 0.05);
+    border-color: rgba(40, 167, 69, 0.2);
+}
+
+.tool-step.error {
+    background-color: rgba(220, 53, 69, 0.05);
+    border-color: rgba(220, 53, 69, 0.2);
+}
+
+/* Tool result formatting */
+.tool-result pre {
+    margin: 0.5rem 0;
+    padding: 0.5rem;
+    background-color: rgba(0, 0, 0, 0.03);
+    border-radius: 0.25rem;
+    overflow: auto;
+    max-height: 300px;
+}
+
+.tool-result code {
+    font-family: "SFMono-Regular", Consolas, "Liberation Mono", Menlo, monospace;
+    font-size: 0.9em;
+}
+
+.tool-args code {
+    display: block;
+    padding: 0.5rem;
+    background-color: rgba(0, 0, 0, 0.03);
+    border-radius: 0.25rem;
+    margin-top: 0.25rem;
+    font-size: 0.85em;
+    color: var(--muted-text-color);
+    white-space: pre-wrap;
+    overflow: auto;
+    max-height: 100px;
+}
+
+/* Tool Execution in Chat Styling */
+.chat-tool-execution {
+    padding: 0 0 0 36px; /* Aligned with message content, accounting for avatar width */
+    width: 100%;
+    margin-bottom: 1rem;
+}
+
+.tool-execution-container {
+    background-color: var(--accented-background-color, rgba(245, 247, 250, 0.7));
+    border: 1px solid var(--subtle-border-color);
+    border-radius: 0.375rem;
+    box-shadow: 0 1px 3px rgba(0, 0, 0, 0.05);
+    overflow: hidden;
+    max-width: calc(100% - 20px);
+    transition: all 0.3s ease;
+}
+
+.tool-execution-container.collapsed {
+    display: none;
+}
+
+.tool-execution-header {
+    background-color: var(--main-background-color);
+    border-bottom: 1px solid var(--subtle-border-color);
+    margin-bottom: 0.5rem;
+    color: var(--muted-text-color);
+    font-weight: 500;
+    padding: 0.6rem 0.8rem;
+    cursor: pointer;
+    transition: background-color 0.2s ease;
+}
+
+.tool-execution-header:hover {
+    background-color: var(--hover-item-background-color, rgba(0, 0, 0, 0.03));
+}
+
+.tool-execution-toggle {
+    color: var(--muted-text-color) !important;
+    background: transparent !important;
+    padding: 0.2rem 0.4rem !important;
+    transition: transform 0.2s ease;
+}
+
+.tool-execution-toggle:hover {
+    color: var(--main-text-color) !important;
+}
+
+.tool-execution-toggle i.bx-chevron-down {
+    transform: rotate(0deg);
+    transition: transform 0.3s ease;
+}
+
+.tool-execution-toggle i.bx-chevron-right {
+    transform: rotate(-90deg);
+    transition: transform 0.3s ease;
+}
+
+.tool-execution-chat-steps {
+    padding: 0.5rem;
+    max-height: 300px;
+    overflow-y: auto;
+}
+
+/* Make error text more visible */
+.text-danger {
+    color: #dc3545 !important;
+}
+
+/* Sources Styling */
+.sources-container {
+    background-color: var(--accented-background-color, var(--main-background-color));
+    border-top: 1px solid var(--main-border-color);
+    color: var(--main-text-color);
+}
+
+.source-item {
+    transition: all 0.2s ease;
+    background-color: var(--main-background-color);
+    border-color: var(--subtle-border-color, var(--main-border-color)) !important;
+}
+
+.source-item:hover {
+    background-color: var(--link-hover-background, var(--hover-item-background-color));
+}
+
+.source-link {
+    color: var(--link-color, var(--hover-item-text-color));
+    text-decoration: none;
+    display: block;
+    width: 100%;
+}
+
+.source-link:hover {
+    color: var(--link-hover-color, var(--hover-item-text-color));
+}
+
+/* Input Area Styling */
+.note-context-chat-form {
+    background-color: var(--main-background-color);
+    border-top: 1px solid var(--main-border-color);
+}
+
+.context-option-container {
+    padding: 0.5rem 0;
+    border-bottom: 1px solid var(--subtle-border-color, var(--main-border-color));
+    color: var(--main-text-color);
+}
+
+.chat-input-container {
+    padding-top: 0.5rem;
+}
+
+.note-context-chat-input {
+    border-color: var(--subtle-border-color, var(--main-border-color));
+    background-color: var(--input-background-color) !important;
+    color: var(--input-text-color) !important;
+    resize: none;
+    transition: all 0.2s ease;
+    min-height: 50px;
+    max-height: 150px;
+}
+
+.note-context-chat-input:focus {
+    border-color: var(--input-focus-outline-color, var(--main-border-color));
+    box-shadow: 0 0 0 0.25rem var(--input-focus-outline-color, rgba(13, 110, 253, 0.25));
+}
+
+.note-context-chat-send-button {
+    width: 40px;
+    height: 40px;
+    align-self: flex-end;
+    background-color: var(--cmd-button-background-color) !important;
+    color: var(--cmd-button-text-color) !important;
+}
+
+/* Loading Indicator */
+.loading-indicator {
+    align-items: center;
+    justify-content: center;
+    padding: 1rem;
+    color: var(--muted-text-color);
+}
+
+/* Thinking display styles */
+.llm-thinking-container {
+    margin: 1rem 0;
+    animation: fadeInUp 0.3s ease-out;
+}
+
+.thinking-bubble {
+    background-color: var(--accented-background-color, var(--main-background-color));
+    border: 1px solid var(--subtle-border-color, var(--main-border-color));
+    border-radius: 0.75rem;
+    padding: 0.75rem;
+    box-shadow: 0 2px 8px rgba(0, 0, 0, 0.05);
+    position: relative;
+    overflow: hidden;
+    transition: all 0.2s ease;
+}
+
+.thinking-bubble:hover {
+    box-shadow: 0 4px 12px rgba(0, 0, 0, 0.08);
+}
+
+.thinking-bubble::before {
+    content: '';
+    position: absolute;
+    top: 0;
+    inset-inline-start: -100%;
+    width: 100%;
+    height: 100%;
+    background: linear-gradient(90deg, transparent, var(--hover-item-background-color, rgba(0, 0, 0, 0.03)), transparent);
+    animation: shimmer 2s infinite;
+    opacity: 0.5;
+}
+
+.thinking-header {
+    cursor: pointer;
+    transition: all 0.2s ease;
+    border-radius: 0.375rem;
+}
+
+.thinking-header:hover {
+    background-color: var(--hover-item-background-color, rgba(0, 0, 0, 0.03));
+    padding: 0.25rem;
+    margin: -0.25rem;
+}
+
+.thinking-dots {
+    display: flex;
+    gap: 3px;
+    align-items: center;
+}
+
+.thinking-dots span {
+    width: 6px;
+    height: 6px;
+    background-color: var(--link-color, var(--hover-item-text-color));
+    border-radius: 50%;
+    animation: thinkingPulse 1.4s infinite ease-in-out;
+}
+
+.thinking-dots span:nth-child(1) {
+    animation-delay: -0.32s;
+}
+
+.thinking-dots span:nth-child(2) {
+    animation-delay: -0.16s;
+}
+
+.thinking-dots span:nth-child(3) {
+    animation-delay: 0s;
+}
+
+.thinking-label {
+    font-weight: 500;
+    color: var(--link-color, var(--hover-item-text-color)) !important;
+}
+
+.thinking-toggle {
+    color: var(--muted-text-color) !important;
+    transition: transform 0.2s ease;
+    background: transparent !important;
+    border: none !important;
+}
+
+.thinking-toggle:hover {
+    color: var(--main-text-color) !important;
+}
+
+.thinking-toggle.expanded {
+    transform: rotate(180deg);
+}
+
+.thinking-content {
+    margin-top: 0.75rem;
+    padding-top: 0.75rem;
+    border-top: 1px solid var(--subtle-border-color, var(--main-border-color));
+    animation: expandDown 0.3s ease-out;
+}
+
+.thinking-text {
+    font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', system-ui, sans-serif;
+    font-size: 0.875rem;
+    line-height: 1.5;
+    color: var(--main-text-color);
+    white-space: pre-wrap;
+    word-wrap: break-word;
+    background-color: var(--input-background-color);
+    padding: 0.75rem;
+    border-radius: 0.5rem;
+    border: 1px solid var(--subtle-border-color, var(--main-border-color));
+    max-height: 300px;
+    overflow-y: auto;
+    transition: border-color 0.2s ease;
+}
+
+.thinking-text:hover {
+    border-color: var(--main-border-color);
+}
+
+/* Animations */
+@keyframes thinkingPulse {
+    0%, 80%, 100% {
+        transform: scale(0.8);
+        opacity: 0.6;
+    }
+    40% {
+        transform: scale(1);
+        opacity: 1;
+    }
+}
+
+@keyframes shimmer {
+    0% {
+        inset-inline-start: -100%;
+    }
+    100% {
+        inset-inline-start: 100%;
+    }
+}
+
+@keyframes fadeInUp {
+    from {
+        opacity: 0;
+        transform: translateY(10px);
+    }
+    to {
+        opacity: 1;
+        transform: translateY(0);
+    }
+}
+
+@keyframes expandDown {
+    from {
+        opacity: 0;
+        max-height: 0;
+    }
+    to {
+        opacity: 1;
+        max-height: 300px;
+    }
+}
+
+/* Responsive adjustments */
+@media (max-width: 768px) {
+    .thinking-bubble {
+        margin: 0.5rem 0;
+        padding: 0.5rem;
+    }
+    
+    .thinking-text {
+        font-size: 0.8rem;
+        padding: 0.5rem;
+        max-height: 200px;
+    }
+} 

apps/client/src/stylesheets/style.css

@@ -28,7 +28,7 @@
     --bs-body-color: var(--main-text-color) !important;
     --bs-body-bg: var(--main-background-color) !important;
     --ck-mention-list-max-height: 500px;
-    --tn-modal-max-height: 90svh;
+    --tn-modal-max-height: 90vh;
 
     --tree-item-light-theme-max-color-lightness: 50;
     --tree-item-dark-theme-min-color-lightness: 75;
@@ -111,7 +111,6 @@ body.mobile #root-widget.virtual-keyboard-opened #mobile-bottom-bar {
 }
 
 #mobile-bottom-bar {
-    border-top: 1px solid var(--main-border-color);
     padding-bottom: var(--mobile-bottom-offset);
 }
 
@@ -153,11 +152,6 @@ textarea,
     background: var(--input-background-color);
 }
 
-.form-control:disabled {
-    background-color: var(--input-background-color);
-    opacity: 0.6;
-}
-
 .form-control:focus {
     color: var(--input-text-color);
     background: var(--input-background-color);
@@ -230,6 +224,10 @@ 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;
 }
@@ -415,7 +413,6 @@ body.desktop .tabulator-popup-container,
 
 .dropdown-menu.static {
     box-shadow: unset;
-    backdrop-filter: unset !important;
 }
 
 .dropend .dropdown-toggle::after {
@@ -461,7 +458,7 @@ body.desktop .tabulator-popup-container,
     visibility: hidden;
 }
 
-.dropdown-menu:not(#context-menu-container) .dropdown-item,
+body.desktop .dropdown-menu:not(#context-menu-container) .dropdown-item,
 body.desktop .dropdown-menu .dropdown-toggle,
 body #context-menu-container .dropdown-item > span,
 body.mobile .dropdown .dropdown-submenu > span {
@@ -469,15 +466,6 @@ body.mobile .dropdown .dropdown-submenu > span {
     align-items: center;
 }
 
-
-body.mobile .dropdown .dropdown-submenu {
-    flex-wrap: wrap;
-
-    & > span {
-        flex-grow: 1;
-    }
-}
-
 .dropdown-item span.keyboard-shortcut,
 .dropdown-item *:not(.keyboard-shortcut) > kbd {
     flex-grow: 1;
@@ -947,7 +935,6 @@ table.promoted-attributes-in-tooltip th {
     color: var(--muted-text-color);
     opacity: 0.6;
     line-height: 1;
-    word-wrap: break-word;
 }
 
 .aa-dropdown-menu .aa-suggestion p {
@@ -1268,7 +1255,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: 2500;
+    z-index: 1000;
     background: rgba(0, 0, 0, 0.1);
 }
 
@@ -1342,12 +1329,15 @@ body.desktop .dropdown-submenu > .dropdown-menu {
     max-width: 300px;
 }
 
-.dropdown-submenu.dropstart > .dropdown-menu,
-body:not(.mobile) #launcher-pane.horizontal .dropdown-submenu > .dropdown-menu {
+.dropdown-submenu.dropstart > .dropdown-menu {
     inset-inline-start: auto;
     inset-inline-end: calc(100% - 2px);
 }
 
+body:not(.mobile) #launcher-pane.horizontal .dropdown-submenu > .dropdown-menu {
+    inset-inline-start: calc(-100% + 10px);
+}
+
 .right-dropdown-widget {
     flex-shrink: 0;
 }
@@ -1544,8 +1534,7 @@ body:not(.mobile) #launcher-pane.horizontal .dropdown-submenu > .dropdown-menu {
 
 @media (max-width: 991px) {
     body.mobile #launcher-pane .dropdown.global-menu > .dropdown-menu.show,
-    body.mobile #launcher-container .dropdown > .dropdown-menu.show,
-    body.mobile .dropdown-menu.mobile-bottom-menu.show {
+    body.mobile #launcher-container .dropdown > .dropdown-menu.show {
         --dropdown-bottom: calc(var(--mobile-bottom-offset) + var(--launcher-pane-size));
         position: fixed !important;
         bottom: var(--dropdown-bottom) !important;
@@ -1557,16 +1546,6 @@ body:not(.mobile) #launcher-pane.horizontal .dropdown-submenu > .dropdown-menu {
         max-height: calc(var(--tn-modal-max-height) - var(--dropdown-bottom));
     }
 
-    body.mobile #launcher-container .dropdown > .dropdown-menu.show {
-        border-bottom-left-radius: 0;
-        border-bottom-right-radius: 0;
-    }
-
-    body.mobile .dropdown-menu.mobile-bottom-menu.show {
-        --dropdown-bottom: 0px;
-        padding-bottom: calc(max(var(--menu-padding-size), env(safe-area-inset-bottom))) !important;
-    }
-
     #mobile-sidebar-container {
         position: fixed;
         top: 0;
@@ -1587,7 +1566,7 @@ body:not(.mobile) #launcher-pane.horizontal .dropdown-submenu > .dropdown-menu {
         position: absolute;
         top: 0;
         inset-inline-start: 0;
-        height: 100dvh;
+        bottom: 0;
         width: 85vw;
         padding-top: env(safe-area-inset-top);
         transition: transform 250ms ease-in-out;
@@ -1612,7 +1591,11 @@ body:not(.mobile) #launcher-pane.horizontal .dropdown-submenu > .dropdown-menu {
     }
 
     body.mobile #launcher-container {
-        justify-content: space-evenly;
+        justify-content: center;
+    }
+
+    body.mobile #launcher-container button {
+        margin: 0 16px;
     }
 
     body.mobile .modal.show {
@@ -1631,7 +1614,6 @@ 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 {
@@ -1647,27 +1629,13 @@ body:not(.mobile) #launcher-pane.horizontal .dropdown-submenu > .dropdown-menu {
         word-break: break-all;
     }
 
-    body.mobile .jump-to-note-dialog {
-        .modal-header {
-            padding-bottom: 0.75rem !important;
-        }
+    body.mobile .jump-to-note-dialog .modal-content {
+        overflow-y: auto;
+    }
 
-        .modal-content {
-            padding-bottom: 0 !important;
-        }
-
-        .modal-body {
-            overflow-y: auto;
-        }
-
-        .aa-dropdown-menu {
-            max-height: unset;
-            overflow: auto;
-        }
-
-        .aa-suggestion {
-            padding-inline: 0;
-        }
+    body.mobile .jump-to-note-dialog .modal-dialog .aa-dropdown-menu {
+        max-height: unset;
+        overflow: auto;
     }
 
     body.mobile .modal-dialog .dropdown-menu {
@@ -1701,16 +1669,39 @@ body:not(.mobile) #launcher-pane.horizontal .dropdown-submenu > .dropdown-menu {
     #detail-container {
         background: var(--main-background-color);
     }
+}
 
-    body.mobile {
-        .modal-dialog {
-            margin: var(--bs-modal-margin);
-            max-width: 80%;
-        }
+@media (max-width: 991px) {
+    body.mobile.force-fixed-tree #mobile-sidebar-wrapper {
+        padding-top: 0;
+        position: static;
+        height: 40vh;
+        width: 100vw;
+        transform: none !important;
+        background-color: var(--left-pane-background-color) !important;
+        border-bottom: 0.5px solid var(--main-border-color);
+    }
 
-        .modal-content {
-            height: 100%;
-        }
+    body.mobile.force-fixed-tree #mobile-sidebar-container {
+        display: none !important;
+    }
+
+    body.mobile.force-fixed-tree #mobile-sidebar-wrapper .quick-search {
+        display: none;
+    }
+
+    body.mobile.force-fixed-tree .component > button.bx-sidebar {
+        visibility: hidden;
+        padding: 0;
+        width: 6px;
+    }
+
+    body.mobile.force-fixed-tree #mobile-rest-container {
+        flex-direction: column !important;
+    }
+
+    body.mobile.force-fixed-tree #detail-container {
+        flex-grow: 1;
     }
 }
 
@@ -1750,11 +1741,8 @@ body:not(.mobile) #launcher-pane.horizontal .dropdown-submenu > .dropdown-menu {
     justify-content: space-between;
     align-items: baseline;
     font-weight: bold;
-    color: var(--muted-text-color) !important;
-}
-
-#right-pane .card-header-title {
     text-transform: uppercase;
+    color: var(--muted-text-color) !important;
 }
 
 #right-pane .card-header-buttons {
@@ -2629,38 +2617,15 @@ iframe.print-iframe {
             }
         }
 
-        body:not(.ios) #root-widget.virtual-keyboard-opened .note-split:not(.active) {
+        #root-widget.virtual-keyboard-opened .note-split:not(:focus-within) {
             max-height: 80px;
             opacity: 0.4;
         }
     }
 }
 
-.title-row {
+body.desktop .title-row {
     height: 50px;
     min-height: 50px;
     align-items: center;
 }
-
-.ocr-text-section {
-    padding: 10px;
-    background: var(--accented-background-color);
-    border-left: 3px solid var(--main-border-color);
-    text-align: left;
-    width: 100%;
-}
-
-.ocr-header {
-    font-weight: bold;
-    margin-bottom: 8px;
-    font-size: 0.9em;
-    color: var(--muted-text-color);
-}
-
-.ocr-content {
-    max-height: 150px;
-    overflow-y: auto;
-    font-size: 0.9em;
-    line-height: 1.4;
-    white-space: pre-wrap;
-}

apps/client/src/stylesheets/table.css

@@ -14,13 +14,13 @@
     --row-moving-background-color: var(--accented-background-color);
     --row-text-color: var(--main-text-color);
     --row-delimiter-color: var(--more-accented-background-color);
-
+    
     --cell-horiz-padding-size: 8px;
     --cell-vert-padding-size: 8px;
-
+    
     --cell-editable-hover-outline-color: var(--main-border-color);
     --cell-read-only-text-color: var(--muted-text-color);
-
+    
     --cell-editing-border-color: var(--main-border-color);
     --cell-editing-border-width: 2px;
     --cell-editing-background-color: var(--ck-color-selector-focused-cell-background);
@@ -40,42 +40,10 @@
     border-bottom: var(--col-header-bottom-border);
     background: var(--col-header-background-color);
     color: var(--col-header-text-color);
-    font-weight: normal;
+}
 
-    .tabulator-col.tabulator-range-highlight {
-        background: inherit;
-        color: inherit;
-        font-weight: bold;
-    }
-
-    .tabulator-col-content {
-        padding: 0 !important;
-
-        .tabulator-col-title-holder {
-            padding: 8px 4px;
-        }
-
-        &:has(.tabulator-header-filter) {
-            .tabulator-col-title-holder {
-                padding: 4px;
-                padding-bottom: 0;
-            }
-        }
-
-        .tabulator-header-filter {
-            background: var(--main-background-color);
-            padding: 2px 1px;
-
-            input {
-                background: var(--main-background-color);
-                color: var(--main-text-color);
-                border: 1px solid var(--button-border-color);
-                border-radius: 3px;
-                outline: none;
-                padding: 2px;
-            }
-        }
-    }
+.tabulator .tabulator-col-content {
+    padding: 8px 4px !important;
 }
 
 @media (hover: hover) and (pointer: fine) {
@@ -112,6 +80,7 @@
 
 .tabulator-tableholder {
     padding-top: 10px;
+    height: unset !important; /* Don't extend on the full height */
 }
 
 /* Rows */
@@ -130,14 +99,6 @@
     border-top: none;
     border-bottom: 1px solid var(--row-delimiter-color);
     color: var(--row-text-color);
-
-    &:last-of-type {
-        border-bottom: none;
-    }
-
-    &.tabulator-range-highlight > .tabulator-cell.tabulator-frozen {
-        font-weight: bold;
-    }
 }
 
 .tabulator-row.tabulator-row-odd {
@@ -159,14 +120,11 @@
     margin-inline-end: var(--cell-editing-border-width);
 }
 
+.tabulator-row .tabulator-cell.tabulator-frozen.tabulator-frozen-left,
 .tabulator-row .tabulator-cell {
     border-inline-end-color: transparent;
 }
 
-.tabulator-row .tabulator-cell.tabulator-frozen.tabulator-frozen-left {
-    border-inline-end-color: var(--main-border-color);
-}
-
 .tabulator-row .tabulator-cell:not(.tabulator-editable) {
     color: var(--cell-read-only-text-color);
 }
@@ -216,6 +174,10 @@
     margin: 0;
 }
 
+.tabulator .tabulator-footer {
+    color: var(--main-text-color);
+}
+
 /* Context menus */
 
 .tabulator-popup-container {
@@ -230,27 +192,8 @@
 }
 
 /* Footer */
+
 :root .tabulator .tabulator-footer {
-    background: transparent;
-    color: var(--main-text-color);
-    border-top: 1px solid var(--main-border-color);
+    border-top: unset;
     padding: 10px 0;
-
-    .tabulator-page {
-        background: var(--button-background-color);
-        color: var(--button-text-color);
-        border: 1px solid var(--button-border-color);
-        border-radius: var(--button-border-radius);
-
-        &:hover {
-            border-color: var(--hover-item-border-color);
-            color: var(--button-text-color);
-        }
-    }
-
-    select {
-        background: var(--button-background-color);
-        color: var(--input-text-color);
-        border: 1px solid var(--button-border-color);
-    }
-}
+}

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

@@ -134,7 +134,6 @@
     --left-pane-collapsed-border-color: #0009;
     --left-pane-background-color: #1f1f1f;
     --left-pane-text-color: #aaaaaa;
-    --left-pane-icon-color: #c5c5c5;
     --left-pane-item-hover-background: #ffffff0d;
     --left-pane-item-selected-background: #ffffff25;
     --left-pane-item-selected-color: #dfdfdf;
@@ -210,7 +209,6 @@
     --badge-share-background-color: #4d4d4d;
     --badge-clipped-note-background-color: #295773;
     --badge-execute-background-color: #604180;
-    --badge-active-content-background-color: rgb(12, 68, 70);
 
     --note-icon-background-color: #444444;
     --note-icon-color: #d4d4d4;
@@ -239,9 +237,9 @@
 
     --bottom-panel-background-color: #11111180;
     --bottom-panel-title-bar-background-color: #3F3F3F80;
-
+    
     --status-bar-border-color: var(--main-border-color);
-
+    
     --scrollbar-thumb-color: #fdfdfd5c;
     --scrollbar-thumb-hover-color: #ffffff7d;
     --scrollbar-background-color: transparent;
@@ -291,15 +289,6 @@
     --ck-editor-toolbar-button-on-shadow: 1px 1px 2px rgba(0, 0, 0, .75);
     --ck-editor-toolbar-dropdown-button-open-background: #ffffff14;
 
-    --note-list-view-icon-color: var(--left-pane-icon-color);
-    --note-list-view-large-icon-background: var(--note-icon-background-color);
-    --note-list-view-large-icon-color: var(--note-icon-color);
-    --note-list-view-search-result-highlight-background: transparent;
-    --note-list-view-search-result-highlight-color: var(--quick-search-result-highlight-color);
-    --note-list-view-content-background: rgba(0, 0, 0, .2);
-    --note-list-view-content-search-result-highlight-background: var(--quick-search-result-highlight-color);
-    --note-list-view-content-search-result-highlight-color: black;
-
     --calendar-coll-event-background-saturation: 25%;
     --calendar-coll-event-background-lightness: 20%;
     --calendar-coll-event-background-color: #3c3c3c;
@@ -313,9 +302,7 @@
  * Dark color scheme tweaks
  */
 
-#left-pane .fancytree-node.tinted,
-.nested-note-list-item.use-note-color,
-.note-book-card .note-book-header.use-note-color {
+#left-pane .fancytree-node.tinted {
     --custom-color: var(--dark-theme-custom-color);
 
     /* The background color of the active item in the note tree.
@@ -349,25 +336,12 @@ body .todo-list input[type="checkbox"]:not(:checked):before {
     --promoted-attribute-card-background-color: hsl(var(--custom-color-hue), 13.2%, 20.8%);
 }
 
-.modal.tab-bar-modal .tabs .tab-card.with-hue {
-    background-color: hsl(var(--bg-hue), 8.8%, 11.2%);
-    border-color: hsl(var(--bg-hue), 9.4%, 25.1%);
-}
-
-.modal.tab-bar-modal .tabs .tab-card.active.with-hue {
-    background-color: hsl(var(--bg-hue), 8.8%, 16.2%);
-    border-color: hsl(var(--bg-hue), 9.4%, 25.1%);
-}
-
-
 .use-note-color {
     --custom-color: var(--dark-theme-custom-color);
 }
 
 .note-split.with-hue,
-.quick-edit-dialog-wrapper.with-hue,
-.nested-note-list-item.with-hue,
-.note-book-card.with-hue .note-book-header {
+.quick-edit-dialog-wrapper.with-hue {
     --note-icon-custom-background-color: hsl(var(--custom-color-hue), 15.8%, 30.9%);
     --note-icon-custom-color: hsl(var(--custom-color-hue), 100%, 76.5%);
     --note-icon-hover-custom-background-color: hsl(var(--custom-color-hue), 28.3%, 36.7%);
@@ -376,9 +350,4 @@ body .todo-list input[type="checkbox"]:not(:checked):before {
 .note-split.with-hue *::selection,
 .quick-edit-dialog-wrapper.with-hue *::selection {
     --selection-background-color: hsl(var(--custom-color-hue), 49.2%, 35%);
-}
-
-.note-book-card.with-hue {
-    --card-background-color: hsl(var(--custom-color-hue), 6%, 21%);
-    --card-background-hover-color: hsl(var(--custom-color-hue), 8%, 25%);
 }

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

@@ -127,7 +127,6 @@
     --left-pane-collapsed-border-color: #0000000d;
     --left-pane-background-color: #f2f2f2;
     --left-pane-text-color: #383838;
-    --left-pane-icon-color: currentColor;
     --left-pane-item-hover-background: rgba(0, 0, 0, 0.032);
     --left-pane-item-selected-background: white;
     --left-pane-item-selected-color: black;
@@ -202,7 +201,6 @@
     --badge-share-background-color: #6b6b6b;
     --badge-clipped-note-background-color: #2284c0;
     --badge-execute-background-color: #7b47af;
-    --badge-active-content-background-color: rgb(27, 164, 168);
 
     --note-icon-background-color: #4f4f4f;
     --note-icon-color: white;
@@ -289,15 +287,6 @@
     --ck-editor-toolbar-button-on-shadow: none;
     --ck-editor-toolbar-dropdown-button-open-background: #0000000f;
 
-    --note-list-view-icon-color: var(--left-pane-icon-color);
-    --note-list-view-large-icon-background: var(--note-icon-background-color);
-    --note-list-view-large-icon-color: var(--note-icon-color);
-    --note-list-view-search-result-highlight-background: transparent;
-    --note-list-view-search-result-highlight-color: var(--quick-search-result-highlight-color);
-    --note-list-view-content-background: #b1b1b133;
-    --note-list-view-content-search-result-highlight-background: var(--quick-search-result-highlight-color);
-    --note-list-view-content-search-result-highlight-color: white;
-
     --calendar-coll-event-background-lightness: 95%;
     --calendar-coll-event-background-saturation: 80%;
     --calendar-coll-event-background-color: #eaeaea;
@@ -307,9 +296,7 @@
     --calendar-coll-today-background-color: #00000006;
 }
 
-#left-pane .fancytree-node.tinted,
-.nested-note-list-item.use-note-color,
-.note-book-card .note-book-header.use-note-color {
+#left-pane .fancytree-node.tinted {
     --custom-color: var(--light-theme-custom-color);
 
     /* The background color of the active item in the note tree.
@@ -324,20 +311,8 @@
     --promoted-attribute-card-background-color: hsl(var(--custom-color-hue), 40%, 88%);
 }
 
-.modal.tab-bar-modal .tabs .tab-card.with-hue {
-    background-color: hsl(var(--bg-hue), 56%, 96%);
-    border-color: hsl(var(--bg-hue), 33%, 41%);
-}
-
-.modal.tab-bar-modal .tabs .tab-card.active.with-hue {
-    background-color: hsl(var(--bg-hue), 86%, 96%);
-    border-color: hsl(var(--bg-hue), 33%, 41%);
-}
-
 .note-split.with-hue,
-.quick-edit-dialog-wrapper.with-hue,
-.nested-note-list-item.with-hue,
-.note-book-card.with-hue .note-book-header {
+.quick-edit-dialog-wrapper.with-hue {
     --note-icon-custom-background-color: hsl(var(--custom-color-hue), 44.5%, 43.1%);
     --note-icon-custom-color: hsl(var(--custom-color-hue), 91.3%, 91%);
     --note-icon-hover-custom-background-color: hsl(var(--custom-color-hue), 55.1%, 50.2%);
@@ -346,9 +321,4 @@
 .note-split.with-hue *::selection,
 .quick-edit-dialog-wrapper.with-hue *::selection {
     --selection-background-color: hsl(var(--custom-color-hue), 60%, 90%);
-}
-
-.note-book-card.with-hue {
-    --card-background-color: hsl(var(--custom-color-hue), 21%, 94%);
-    --card-background-hover-color: hsl(var(--custom-color-hue), 21%, 87%);
 }

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

@@ -0,0 +1,11 @@
+/* Import the light color scheme.
+ * This is the base color scheme, always active and overridden by the dark
+ * color scheme stylesheet when necessary. */
+@import url(./theme-next-light.css);
+
+/* Import the dark color scheme when the system preference is set to dark mode */
+@import url(./theme-next-dark.css) (prefers-color-scheme: dark);
+
+:root {
+    --theme-style-auto: true;
+}

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

@@ -544,11 +544,14 @@ li.dropdown-item a.dropdown-item-button:focus-visible {
     vertical-align: middle;
 }
 
-#toast-container .toast .toast-header .btn-close,
-#toast-container .toast .toast-close .btn-close {
+#toast-container .toast .toast-header .btn-close {
     margin: 0 0 0 12px;
 }
 
+#toast-container .toast.no-title {
+    flex-direction: row;
+}
+
 #toast-container .toast .toast-body {
     flex-grow: 1;
     overflow: hidden;
@@ -640,6 +643,139 @@ li.dropdown-item a.dropdown-item-button:focus-visible {
     transform: translateY(4%);
 }
 
+/*
+ * NOTE LIST
+ */
+
+ .note-list .note-book-card {
+    --note-list-horizontal-padding: 22px;
+    --note-list-vertical-padding: 15px;
+    background-color: var(--card-background-color);
+    border: 1px solid var(--card-border-color) !important;
+    border-radius: 12px;
+    user-select: none;
+    padding: 0;
+    margin: 5px 10px 5px 0;
+}
+
+:root .note-list .note-book-card:hover {
+    background-color: var(--card-background-hover-color);
+    transition: background-color 200ms ease-out;
+}
+
+:root .note-list.grid-view .note-book-card:active {
+    transform: scale(.98);
+}
+
+.note-list.list-view .note-book-card {
+    box-shadow: 0 0 3px var(--card-shadow-color);
+}
+
+.note-list.list-view .note-book-card .note-book-header .note-icon {
+    vertical-align: middle;
+}
+
+.note-list-wrapper .note-book-card a {
+    color: inherit !important;
+}
+
+.note-list-wrapper .note-book-card .note-book-header {
+    font-size: 1em;
+    font-weight: bold;
+    padding: 0.5em 1rem;
+    border-bottom-color: var(--card-border-color);
+}
+
+.note-list-wrapper .note-book-card .note-book-header .note-icon {
+    font-size: 17px;
+    vertical-align: text-bottom;
+}
+
+.note-list-wrapper .note-book-card .note-book-header .note-book-title {
+    font-size: 1em;
+    color: var(--active-item-text-color);
+    vertical-align: middle;
+}
+
+.note-list-wrapper .note-book-card .note-book-header .rendered-note-attributes {
+    font-size: 0.7em;
+    font-weight: normal;
+    margin-bottom: 0;
+}
+
+.note-list-wrapper .note-book-card .note-book-header:last-child {
+    border-bottom: 0;
+}
+
+.note-list-wrapper .note-book-card .note-book-content {
+    padding: 0 !important;
+    font-size: 0.8rem;
+}
+
+.note-list-wrapper .note-book-card .note-book-content .rendered-content {
+    padding: 1rem;
+}
+
+.note-list-wrapper .note-book-card .note-book-content.type-image .rendered-content,
+.note-list-wrapper .note-book-card .note-book-content.type-pdf .rendered-content {
+    padding: 0;
+}
+
+.note-list-wrapper .note-book-card .note-book-content .rendered-content.text-with-ellipsis {
+    padding: 1rem !important;
+}
+
+.note-list-wrapper .note-book-card .note-book-content h1,
+.note-list-wrapper .note-book-card .note-book-content h2,
+.note-list-wrapper .note-book-card .note-book-content h3,
+.note-list-wrapper .note-book-card .note-book-content h4,
+.note-list-wrapper .note-book-card .note-book-content h5,
+.note-list-wrapper .note-book-card .note-book-content h6 {
+    font-size: 1rem;
+    color: var(--active-item-text-color);
+}
+
+.note-list-wrapper .note-book-card .note-book-content p:last-child {
+    margin-bottom: 0;
+}
+
+.note-list-wrapper .note-book-card .note-book-content.type-canvas .rendered-content,
+.note-list-wrapper .note-book-card .note-book-content.type-mindMap .rendered-content,
+.note-list-wrapper .note-book-card .note-book-content.type-code .rendered-content,
+.note-list-wrapper .note-book-card .note-book-content.type-video .rendered-content {
+    padding: 0;
+}
+
+.note-list-wrapper .note-book-card .note-book-content.type-code {
+    height: 100%;
+}
+
+.note-list-wrapper .note-book-card .note-book-content.type-code pre {
+    height: 100%;
+    padding: 1em;
+    margin-bottom: 0;
+}
+
+.note-list-wrapper .note-book-card .tn-icon {
+    color: var(--left-pane-icon-color) !important;
+}
+
+.note-list.grid-view .note-book-card:hover {
+    filter: contrast(105%);
+}
+
+.note-list.grid-view .ck-content {
+    line-height: 1.3;
+}
+
+.note-list.grid-view .ck-content p {
+    margin-bottom: 0.5em;
+}
+
+.note-list.grid-view .ck-content figure.image {
+    width: 25%;
+}
+
 /*
  * NOTE SEARCH SUGGESTIONS
  */
@@ -664,19 +800,3 @@ li.dropdown-item a.dropdown-item-button:focus-visible {
     background: var(--hover-item-background-color);
     color: var(--hover-item-text-color);
 }
-
-/*
- * Alert bars
- */
-
-div.alert {
-    margin-bottom: 8px;
-    background: var(--alert-bar-background) !important;
-    color: var(--main-text-color);
-    border-radius: 8px;
-    font-size: .85em;
-}
-
-div.alert p + p {
-    margin-block: 1em 0;
-}

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

@@ -26,8 +26,7 @@
 .modal .modal-header .btn-close,
 .modal .modal-header .help-button,
 .modal .modal-header .custom-title-bar-button,
-#toast-container .toast .toast-header .btn-close,
-#toast-container .toast .toast-close .btn-close {
+#toast-container .toast .toast-header .btn-close {
     display: flex;
     justify-content: center;
     align-items: center;
@@ -47,14 +46,12 @@
 }
 
 .modal .modal-header .btn-close,
-#toast-container .toast .toast-header .btn-close,
-#toast-container .toast .toast-close .btn-close {
+#toast-container .toast .toast-header .btn-close {
     --modal-control-button-hover-background: var(--modal-close-button-hover-background);
 }
 
 .modal .modal-header .btn-close::after,
-#toast-container .toast .toast-header .btn-close::after,
-#toast-container .toast .toast-close .btn-close::after {
+#toast-container .toast .toast-header .btn-close::after {
     content: "\ec8d";
     font-family: boxicons;
 }
@@ -70,8 +67,7 @@
 .modal .modal-header .btn-close:hover,
 .modal .modal-header .help-button:hover,
 .modal .modal-header .custom-title-bar-button:hover,
-#toast-container .toast .toast-header .btn-close:hover,
-#toast-container .toast .toast-close .btn-close:hover {
+#toast-container .toast .toast-header .btn-close:hover {
     background: var(--modal-control-button-hover-background);
     color: var(--modal-control-button-hover-color);
 }
@@ -79,22 +75,19 @@
 .modal .modal-header .btn-close:active,
 .modal .modal-header .help-button:active,
 .modal .modal-header .custom-title-bar-button:active,
-#toast-container .toast .toast-header .btn-close:active,
-#toast-container .toast .toast-close .btn-close:active {
+#toast-container .toast .toast-header .btn-close:active {
     transform: scale(.85);
 }
 
 .modal .modal-header .btn-close:focus,
 .modal .modal-header .help-button:focus,
-#toast-container .toast .toast-header .btn-close:focus,
-#toast-container .toast .toast-close .btn-close:focus {
+#toast-container .toast .toast-header .btn-close:focus {
     box-shadow: none !important;
 }
 
 .modal .modal-header .btn-close:focus-visible,
 .modal .modal-header .help-button:focus-visible,
-#toast-container .toast .toast-header .btn-close:focus-visible,
-#toast-container .toast .toast-close .btn-close:focus-visible {
+#toast-container .toast .toast-header .btn-close:focus-visible {
     outline: 2px solid var(--input-focus-outline-color);
     outline-offset: 2px;
 }

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

@@ -84,22 +84,6 @@ button.btn.btn-success kbd {
     letter-spacing: 0.5pt;
 }
 
-/*
- * Low profile buttons
- */
-
-button.tn-low-profile {
-    appearance: none;
-    background: transparent;
-    border: 0;
-    border-radius: 8px;
-    color: inherit;
-}
-
-button.tn-low-profile:hover {
-    background-color: var(--icon-button-hover-background);
-}
-
 /*
  * Icon buttons
  */
@@ -145,10 +129,6 @@ button.tn-low-profile:hover {
     font-size: calc(var(--icon-button-size) * var(--icon-button-icon-ratio));
 }
 
-:root .icon-action.disabled::before {
-    opacity: .5;
-}
-
 :root .icon-action:not(.global-menu-button):hover,
 :root .icon-action:not(.global-menu-button).show,
 :root .tn-tool-button:hover,
@@ -814,35 +794,3 @@ input[type="range"] {
         scrollbar-width: unset;
     }
 }
-
-/*
- * Centered forms
- */
-
-.tn-centered-form {
-    display: flex;
-    flex-direction: column;
-    align-items: center;
-    margin-bottom: 20vh;
-}
-
-.tn-centered-form .form-group {
-    text-align: center;
-    color: var(--muted-text-color);
-}
-
-.tn-centered-form .form-icon {
-    font-size: 140px;
-    color: var(--main-border-color);
-}
-
-.tn-centered-form .protected-session-password {
-    margin-inline: auto;
-    max-width: 350px;
-    text-align: center;
-}
-
-.tn-centered-form .input-group,
-.tn-centered-form button {
-    margin-top: 12px;
-}

apps/client/src/stylesheets/theme-next/llm-chat.css

@@ -0,0 +1,122 @@
+/* LLM Chat Launcher Widget Styles */
+.note-context-chat {
+    display: flex;
+    flex-direction: column;
+    height: 100%;
+    width: 100%;
+}
+
+.note-context-chat-container {
+    flex-grow: 1;
+    overflow-y: auto;
+    padding: 15px;
+}
+
+.chat-message {
+    display: flex;
+    margin-bottom: 15px;
+    max-width: 85%;
+}
+
+.chat-message.user-message {
+    margin-inline-start: auto;
+}
+
+.chat-message.assistant-message {
+    margin-inline-end: auto;
+}
+
+.message-avatar {
+    width: 32px;
+    height: 32px;
+    border-radius: 50%;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    margin-inline-end: 8px;
+}
+
+.user-message .message-avatar {
+    background-color: var(--primary-color);
+    color: white;
+}
+
+.assistant-message .message-avatar {
+    background-color: var(--secondary-color);
+    color: white;
+}
+
+.message-content {
+    background-color: var(--more-accented-background-color);
+    border-radius: 12px;
+    padding: 10px 15px;
+    max-width: calc(100% - 40px);
+}
+
+.user-message .message-content {
+    background-color: var(--accented-background-color);
+}
+
+.message-content pre {
+    background-color: var(--code-background-color);
+    border-radius: 5px;
+    padding: 10px;
+    overflow-x: auto;
+    max-width: 100%;
+}
+
+.message-content code {
+    background-color: var(--code-background-color);
+    padding: 2px 4px;
+    border-radius: 3px;
+}
+
+.loading-indicator {
+    display: flex;
+    align-items: center;
+    margin: 10px 0;
+    color: var(--muted-text-color);
+}
+
+.sources-container {
+    background-color: var(--accented-background-color);
+    border-top: 1px solid var(--main-border-color);
+    padding: 8px;
+}
+
+.sources-list {
+    font-size: 0.9em;
+}
+
+.source-item {
+    padding: 4px 0;
+}
+
+.source-link {
+    color: var(--link-color);
+    text-decoration: none;
+}
+
+.source-link:hover {
+    text-decoration: underline;
+}
+
+.note-context-chat-form {
+    display: flex;
+    background-color: var(--main-background-color);
+    border-top: 1px solid var(--main-border-color);
+    padding: 10px;
+}
+
+.note-context-chat-input {
+    resize: vertical;
+    min-height: 44px;
+    max-height: 200px;
+}
+
+/* Responsive adjustments */
+@media (max-width: 768px) {
+    .chat-message {
+        max-width: 95%;
+    }
+} 

apps/client/src/stylesheets/theme-next/notes/text.css

@@ -47,14 +47,9 @@
 }
 
 /* The toolbar show / hide button for the current text block */
-:root .ck.ck-block-toolbar-button {
-    --ck-color-block-toolbar-button: var(--muted-text-color);
+.ck.ck-block-toolbar-button {
     --ck-color-button-on-background: transparent;
-    --ck-color-button-on-color: var(--ck-editor-toolbar-button-on-color);
-    translate: -40% 0;
-    min-width: 0;
-    padding: 0;
-    z-index: 1600;
+    --ck-color-button-on-color: currentColor;
 }
 
 :root .ck.ck-toolbar .ck-button:not(.ck-disabled):active,
@@ -522,10 +517,6 @@ button.ck.ck-button:is(.ck-button-action, .ck-button-save, .ck-button-cancel).ck
  * EDITOR'S CONTENT
  */
 
-.note-detail-editable-text-editor > .ck-placeholder {
-    opacity: .5;
-}
-
 /*
  * Code Blocks
  */
@@ -647,10 +638,10 @@ html .note-detail-editable-text :not(figure, .include-note, hr):first-child {
     font-weight: 600;
 }
 
-:root .ck-content hr {
-    margin-block: 5px;
-    height: 0;
-    border: thin solid var(--main-border-color);
+.ck-content hr {
+    margin: 5px 0;
+    height: 1px;
+    background-color: var(--main-border-color);
     opacity: 1;
 }
 

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

@@ -57,12 +57,12 @@
     height: 18px;
 }
 
-/*
+/* 
  * SEARCH PAGE
  */
 
  /* Button bar */
- .search-definition-widget .search-setting-table .search-actions-container {
+ .search-definition-widget .search-setting-table tbody:last-child div {
     justify-content: flex-end;
     gap: 8px;
  }
@@ -143,7 +143,7 @@
 /*
  * OPTIONS PAGES
  */
-
+ 
  :root {
     --options-card-min-width: 500px;
     --options-card-max-width: 900px;
@@ -156,10 +156,6 @@
     --preferred-max-content-width: var(--options-card-max-width);
 }
 
-.note-split.options .collection-properties {
-    visibility: hidden;
-}
-
 /* Create a gap at the top of the option pages */
 .note-detail-content-widget-content.options>*:first-child {
     margin-top: var(--options-first-item-top-margin, 1em);
@@ -265,6 +261,13 @@ body.desktop .options-section:not(.tn-no-card) {
     margin-bottom: 6px;
 }
 
+.options-section .alert {
+    margin-bottom: 8px;
+    background: var(--alert-bar-background) !important;
+    border-radius: 8px;
+    font-size: .85em;
+}
+
 nav.options-section-tabs {
     min-width: var(--options-card-min-width);
     max-width: var(--options-card-max-width);
@@ -328,4 +331,4 @@ nav.options-section-tabs + .options-section {
 
 .etapi-options-section div {
     height: auto !important;
-}
+}

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

@@ -40,30 +40,13 @@ 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 {
-    &.layout-vertical {
-        --background-material: mica;
-    }
-
-    &.layout-horizontal {
-        --background-material: tabbed;
-    }
+    /* 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;
 }
 
-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 {
+body.background-effects.theme-supports-background-effects.platform-win32 {
     --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);
@@ -73,29 +56,33 @@ body.background-effects.theme-supports-background-effects {
     --root-background: transparent;
 }
 
-body.background-effects.theme-supports-background-effects.layout-vertical {
+body.background-effects.platform-win32.layout-vertical {
+    --background-material: mica;
+}
+
+body.background-effects.theme-supports-background-effects.platform-win32.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.layout-horizontal {
+body.background-effects.theme-supports-background-effects.platform-win32.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,
-body.background-effects.theme-supports-background-effects #root-widget {
+body.background-effects.theme-supports-background-effects.platform-win32,
+body.background-effects.theme-supports-background-effects.platform-win32 #root-widget {
     background: var(--window-background-color-bgfx) !important;
 }
 
-body.background-effects.theme-supports-background-effects.layout-horizontal #horizontal-main-container,
-body.background-effects.theme-supports-background-effects.layout-vertical #vertical-main-container {
+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 {
     background-color: var(--root-background);
 }
 
 /* Note split with background effects */
-body.background-effects.theme-supports-background-effects #center-pane .note-split.bgfx {
+body.background-effects.theme-supports-background-effects.platform-win32 #center-pane .note-split.bgfx {
     --note-split-background-color: var(--center-pane-background-color-bgfx);
 }
 
@@ -372,6 +359,10 @@ body[dir=ltr] #launcher-container {
 .calendar-dropdown-widget .calendar-header [data-calendar-input="month"] {
     --input-background-color: transparent;
     --menu-background-color: transparent;
+
+    text-align: center;
+    font-size: 1.4em;
+    font-weight: 300;
 }
 
 .calendar-dropdown-widget .calendar-header input:not(:focus) {
@@ -421,6 +412,8 @@ body[dir=ltr] #launcher-container {
 }
 
 .calendar-dropdown-widget .calendar-week span {
+    font-size: 0.85em;
+    font-weight: 500;
     color: var(--calendar-weekday-labels-color);
 }
 
@@ -683,10 +676,9 @@ body.layout-vertical.background-effects div.quick-search .dropdown-menu {
     padding-inline-start: 12px;
 }
 
-#left-pane span.fancytree-node.fancytree-active,
-#left-pane span.fancytree-node.fancytree-active:hover {
+#left-pane span.fancytree-node.fancytree-active {
     position: relative;
-    background: transparent;
+    background: transparent !important;
     color: var(--custom-color, var(--left-pane-item-selected-color));
 }
 
@@ -699,14 +691,6 @@ body.layout-vertical.background-effects div.quick-search .dropdown-menu {
     }
 }
 
-/*
- * .fancytree-node pseudo-elements:
- *
- *      - ::before: the active tree item decorator.
- *      - ::after:  the selected tree item background. A pseudo-element is used instead of the
- *                  element's background color, to allow alpha compositing for the hover state.
- */
-
 #left-pane span.fancytree-node.fancytree-active::before {
     position: absolute;
     content: "";
@@ -721,24 +705,6 @@ body.layout-vertical.background-effects div.quick-search .dropdown-menu {
     z-index: -1;
 }
 
-#left-pane span.fancytree-node.fancytree-selected {
-    --left-pane-item-selected-shadow-size: 4px;
-
-    position: relative;
-    background-color: transparent;
-    border-radius: 0;
-}
-
-#left-pane span.fancytree-node.fancytree-selected::after {
-    display: block;
-    position: absolute;
-    z-index: -2;
-    content: "";
-    inset: 0;
-    background: var(--selection-background-color);
-    animation: left-pane-item-select 100ms ease-out;
-}
-
 #left-pane span.fancytree-node.protected > span.fancytree-custom-icon {
     position: relative;
     filter: unset !important;
@@ -760,35 +726,39 @@ body[dir=rtl] #left-pane span.fancytree-node.protected > span.fancytree-custom-i
     transform: translateX(-25%);
 }
 
+body.mobile .fancytree-expander::before,
+body.mobile .fancytree-title,
+body.mobile .fancytree-node > span {
+    font-size: 1rem !important;
+}
+
 @media (max-width: 991px) {
     body.mobile #mobile-sidebar-container {
         background-color: rgba(0, 0, 0, 0.5);
     }
 
-    body.mobile #mobile-sidebar-wrapper {
+    body.mobile:not(.force-fixed-tree) #mobile-sidebar-wrapper {
         border-top-right-radius: 12px;
         border-bottom-right-radius: 12px;
         border-inline-end: 1px solid var(--subtle-border-color);
     }
 }
 
-#left-pane .fancytree-expander,
-.nested-note-list-item .note-expander {
+#left-pane .fancytree-expander {
     opacity: 0.65;
     transition: opacity 150ms ease-in;
 }
 
-#left-pane .fancytree-expander:hover,
-.nested-note-list-item .note-expander:hover {
+#left-pane .fancytree-expander:hover {
     opacity: 1;
     transition: opacity 300ms ease-out;
 }
 
 #left-pane .fancytree-custom-icon {
     margin-top: 0; /* Use this to align the icon with the tree view item's caption */
-    color: var(--custom-color, var(--left-pane-icon-color));
 }
 
+
 #left-pane span.fancytree-active .fancytree-title {
     font-weight: normal;
 }
@@ -801,8 +771,7 @@ body[dir=rtl] #left-pane span.fancytree-node.protected > span.fancytree-custom-i
     opacity: 0.5;
 }
 
-#left-pane .tree-item-button,
-#left-pane span.fancytree-node.fancytree-selected .fancytree-custom-icon {
+#left-pane .tree-item-button {
     margin-inline-end: 6px;
     border: unset;
     border-radius: 50%;
@@ -813,8 +782,7 @@ body[dir=rtl] #left-pane span.fancytree-node.protected > span.fancytree-custom-i
         box-shadow 200ms ease-out;
 }
 
-#left-pane .tree-item-button:hover,
-#left-pane span.fancytree-node.fancytree-selected .fancytree-custom-icon:hover {
+#left-pane .tree-item-button:hover {
     background: var(--left-pane-item-action-button-hover-background);
     box-shadow: var(--left-pane-item-action-button-hover-shadow);
     transition:
@@ -822,41 +790,10 @@ body[dir=rtl] #left-pane span.fancytree-node.protected > span.fancytree-custom-i
         box-shadow 100ms ease-in;
 }
 
-#left-pane span.fancytree-node.fancytree-active .tree-item-button:hover,
-#left-pane span.fancytree-node.fancytree-active.fancytree-selected .fancytree-custom-icon:hover {
+#left-pane span.fancytree-node.fancytree-active .tree-item-button:hover {
     box-shadow: var(--left-pane-item-selected-action-button-hover-shadow);
 }
 
-/* Selected item bulk action button */
-
-@keyframes bulk-action-button-blink {
-    from {
-        opacity: 1;
-    }
-    to {
-        opacity: .3;
-    }
-}
-
-#left-pane span.fancytree-node.fancytree-selected .fancytree-custom-icon {
-    margin: 0;
-}
-
-#left-pane span.fancytree-node.fancytree-selected .fancytree-custom-icon::before {
-    border: 0;
-    font-size: .65em;
-}
-
-#left-pane span.fancytree-node.fancytree-selected:hover .fancytree-custom-icon:not(:hover)::before {
-    animation: bulk-action-button-blink 500ms linear infinite alternate;
-}
-
-#left-pane span.fancytree-node.fancytree-selected.protected .fancytree-custom-icon::after {
-    /* Protected note indicator */
-    display: none;
-}
-
-
 #context-menu-container {
     /* The context menu of the tree */
     --menu-item-icon-vert-offset: -1px;
@@ -1087,7 +1024,7 @@ body.layout-vertical.electron.platform-darwin .tab-row-container {
     height: var(--tab-height) !important;
 }
 
-body.layout-vertical .tab-row-widget > * {
+.tab-row-widget > * {
     margin-top: calc((var(--tab-bar-height) - var(--tab-height)) / 2);
 }
 
@@ -1117,7 +1054,7 @@ body.layout-horizontal .tab-row-widget-container {
     overflow: hidden;
 }
 
-body.desktop:not(.background-effects) #root-widget.horizontal-layout {
+body.desktop:not(.background-effects.platform-win32) #root-widget.horizontal-layout {
     background-color: var(--root-background) !important;
 }
 
@@ -1322,7 +1259,7 @@ body.layout-horizontal #rest-pane > .classic-toolbar-widget {
 #center-pane .note-split {
     padding-top: 2px;
     background-color: var(--note-split-background-color, var(--main-background-color));
-    transition: border-color 150ms ease-out;
+    transition: border-color 250ms ease-in;
     border: 2px solid transparent;
 }
 
@@ -1372,7 +1309,7 @@ body.mobile .note-title {
     margin-inline-start: 0;
 }
 
-body.desktop .title-row {
+.title-row {
     /* Aligns the "Create new split" button with the note menu button (the three dots button) */
     padding-inline-end: 3px;
 }

apps/client/src/stylesheets/theme.css

@@ -0,0 +1,11 @@
+/* Import the light color scheme.
+ * This is the base color scheme, always active and overridden by the dark
+ * color scheme stylesheet when necessary. */
+@import url(./theme-light.css);
+
+/* Import the dark color scheme when the system preference is set to dark mode */
+@import url(./theme-dark.css) (prefers-color-scheme: dark);
+
+:root {
+    --theme-style-auto: true;
+}