Update README.md

This reverts commit ce305f0f45.

.dockerignore

@@ -1,42 +0,0 @@
-# ignored Files
-.dockerignore
-.editorconfig
-.git*
-.prettier*
-electron*
-entitlements.plist
-nodemon.json
-renovate.json
-trilium.iml
-Dockerfile
-Dockerfile.*
-npm-debug.log
-/src/**/*.spec.ts
-
-# ignored folders
-/.cache
-/.git
-/.github
-/.idea
-/.vscode
-/bin
-/build
-/dist
-/docs
-/dump-db
-/e2e
-/integration-tests
-/spec
-/test
-/test-etapi
-/node_modules
-
-
-# exceptions
-!/bin/copy-dist.ts
-
-# temporary exception to make copy-dist inside Docker build not fail
-# TriliumNextTODO: make copy-dist *not* requiring to copy this file for builds other than electron-forge
-!forge.config.cjs
-!/bin/tpl
-!/bin/electron-forge/desktop.ejs

.editorconfig

@@ -8,6 +8,9 @@ indent_style = space
 insert_final_newline = true
 trim_trailing_whitespace = true
 
+[*.sh]
+end_of_line = lf
+
 [{server,translation}.json]
 charset = utf-8
 end_of_line = lf

.env

@@ -0,0 +1 @@
+NODE_OPTIONS=--max_old_space_size=4096

.gitattributes

@@ -1,4 +1,21 @@
+# Mark files as auto-generated to simplify reviews.
 package-lock.json linguist-generated=true
 **/package-lock.json linguist-generated=true
-src/public/app/doc_notes/en/User[[:space:]]Guide/** linguist-generated=true
-libraries/** linguist-vendored
+apps/server/src/assets/doc_notes/en/User[[:space:]]Guide/** linguist-generated
+
+# Ignore from GitHub language stats.
+apps/server/src/assets/doc_notes/en/User[[:space:]]Guide/**/*.html eol=lf
+apps/server/src/assets/doc_notes/** linguist-vendored=true
+apps/edit-docs/demo/** linguist-vendored=true
+docs/** linguist-vendored=true
+
+# Normalize line endings.
+docs/**/*.md eol=lf
+docs/**/*.json eol=lf
+demo/**/*.html eol=lf
+demo/**/*.json eol=lf
+demo/**/*.svg eol=lf
+demo/**/*.txt eol=lf
+demo/**/*.js eol=lf
+demo/**/*.css eol=lf
+*.sh eol=lf

.github/FUNDING.yml

@@ -1,4 +1,4 @@
 # These are supported funding model platforms
 
-github: [zadam]
-custom: ["https://paypal.me/za4am"]
+github: [eliandoran]
+custom: ["https://paypal.me/eliandoran"]

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

@@ -8,206 +8,157 @@ inputs:
   arch:
     description: "The architecture to build for: x64, arm64"
     required: true
-  extension:
-    description: "Platform specific extensions to copy in the output: dmg, deb, rpm, exe, zip"
+  shell:
+    description: "Which shell to use"
+    required: true
+  forge_platform:
+    description: "The --platform to pass to Electron Forge"
     required: true
 
 runs:
   using: composite
   steps:
-    # Certificate setup
-    - name: Import Apple certificates
-      if: inputs.os == 'macos'
-      uses: apple-actions/import-codesign-certs@v3
-      with:
-        p12-file-base64: ${{ env.APPLE_APP_CERTIFICATE_BASE64 }}
-        p12-password: ${{ env.APPLE_APP_CERTIFICATE_PASSWORD }}
-        keychain: build
-        keychain-password: ${{ github.run_id }}
-
-    - name: Install Installer certificate
-      if: inputs.os == 'macos'
-      uses: apple-actions/import-codesign-certs@v3
-      with:
-        p12-file-base64: ${{ env.APPLE_INSTALLER_CERTIFICATE_BASE64 }}
-        p12-password: ${{ env.APPLE_INSTALLER_CERTIFICATE_PASSWORD }}
-        keychain: build
-        keychain-password: ${{ github.run_id }}
-        # We don't need to create a keychain here because we're using the build keychain that was created in the previous step
-        create-keychain: false
-
-    - name: Verify certificates
-      if: inputs.os == 'macos'
-      shell: bash
-      run: |
-        echo "Available signing identities:"
-        security find-identity -v -p codesigning build.keychain
-
-    - name: Set up Python and other macOS dependencies
-      if: ${{ inputs.os == 'macos' }}
-      shell: bash
-      run: |
-        brew install python-setuptools
-        brew install create-dmg
-
-    - name: Install dependencies for RPM and Flatpak package building
-      if: ${{ inputs.os == 'linux' }}
-      shell: bash
-      run: |
-        sudo apt-get update && sudo apt-get install rpm flatpak-builder elfutils
-        flatpak remote-add --user --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo
-        FLATPAK_ARCH=$(if [[ ${{ inputs.arch }} = 'arm64' ]]; then echo 'aarch64'; else echo 'x86_64'; fi)
-        FLATPAK_VERSION='24.08'
-        flatpak install --user --no-deps --arch $FLATPAK_ARCH --assumeyes runtime/org.freedesktop.Platform/$FLATPAK_ARCH/$FLATPAK_VERSION runtime/org.freedesktop.Sdk/$FLATPAK_ARCH/$FLATPAK_VERSION org.electronjs.Electron2.BaseApp/$FLATPAK_ARCH/$FLATPAK_VERSION
-
-    # Build setup
-    - name: Install dependencies
-      shell: bash
-      run: npm ci
-
-    - name: Update build info
-      shell: bash
-      run: npm run chore:update-build-info
-
-    # Critical debugging configuration
-    - name: Run electron-forge build with enhanced logging
-      shell: bash
-      env:
-        # Pass through required environment variables for signing and notarization
-        APPLE_TEAM_ID: ${{ env.APPLE_TEAM_ID }}
-        APPLE_ID: ${{ env.APPLE_ID }}
-        APPLE_ID_PASSWORD: ${{ env.APPLE_ID_PASSWORD }}
-      run: |
-        # Map OS names to Electron Forge platform names
-        if [ "${{ inputs.os }}" = "macos" ]; then
-          PLATFORM="darwin"
-        elif [ "${{ inputs.os }}" = "windows" ]; then
-          PLATFORM="win32"
-        else
-          PLATFORM="${{ inputs.os }}"
-        fi
-
-        npm run electron-forge:make -- \
-          --arch=${{ inputs.arch }} \
-          --platform=$PLATFORM
-
-    # Add DMG signing step
-    - name: Sign DMG
-      if: inputs.os == 'macos'
-      shell: bash
-      run: |
-        echo "Signing DMG file..."
-        dmg_file=$(find ./dist -name "*.dmg" -print -quit)
-        if [ -n "$dmg_file" ]; then
-          echo "Found DMG: $dmg_file"
-          # Get the first valid signing identity from the keychain
-          SIGNING_IDENTITY=$(security find-identity -v -p codesigning build.keychain | grep "Developer ID Application" | head -1 | sed -E 's/.*"([^"]+)".*/\1/')
-          if [ -z "$SIGNING_IDENTITY" ]; then
-            echo "Error: No valid Developer ID Application certificate found in keychain"
-            exit 1
-          fi
-          echo "Using signing identity: $SIGNING_IDENTITY"
-          # Sign the DMG
-          codesign --force --sign "$SIGNING_IDENTITY" --options runtime --timestamp "$dmg_file"
-          # Notarize the DMG
-          xcrun notarytool submit "$dmg_file" --apple-id "$APPLE_ID" --password "$APPLE_ID_PASSWORD" --team-id "$APPLE_TEAM_ID" --wait
-          # Staple the notarization ticket
-          xcrun stapler staple "$dmg_file"
-        else
-          echo "No DMG found to sign"
-        fi
-
-    - name: Verify code signing
-      if: inputs.os == 'macos'
-      shell: bash
-      run: |
-        echo "Verifying code signing for all artifacts..."
-
-        # First check the .app bundle
-        echo "Looking for .app bundle..."
-        app_bundle=$(find ./dist -name "*.app" -print -quit)
-        if [ -n "$app_bundle" ]; then
-          echo "Found app bundle: $app_bundle"
-          echo "Verifying app bundle signing..."
-          codesign --verify --deep --strict --verbose=2 "$app_bundle"
-          echo "Displaying app bundle signing info..."
-          codesign --display --verbose=2 "$app_bundle"
-
-          echo "Checking entitlements..."
-          codesign --display --entitlements :- "$app_bundle"
-
-          echo "Checking notarization status..."
-          xcrun stapler validate "$app_bundle" || echo "Warning: App bundle not notarized yet"
-        else
-          echo "No .app bundle found to verify"
-        fi
-
-        # Then check DMG if it exists
-        echo "Looking for DMG..."
-        dmg_file=$(find ./dist -name "*.dmg" -print -quit)
-        if [ -n "$dmg_file" ]; then
-          echo "Found DMG: $dmg_file"
-          echo "Verifying DMG signing..."
-          codesign --verify --deep --strict --verbose=2 "$dmg_file"
-          echo "Displaying DMG signing info..."
-          codesign --display --verbose=2 "$dmg_file"
-
-          echo "Checking DMG notarization..."
-          xcrun stapler validate "$dmg_file" || echo "Warning: DMG not notarized yet"
-        else
-          echo "No DMG found to verify"
-        fi
-
-        # Finally check ZIP if it exists
-        echo "Looking for ZIP..."
-        zip_file=$(find ./dist -name "*.zip" -print -quit)
-        if [ -n "$zip_file" ]; then
-          echo "Found ZIP: $zip_file"
-          echo "Note: ZIP files are not code signed, but their contents should be"
+  # Certificate setup
+  - name: Import Apple certificates
+    if: inputs.os == 'macos'
+    uses: apple-actions/import-codesign-certs@v5
+    with:
+      p12-file-base64: ${{ env.APPLE_APP_CERTIFICATE_BASE64 }}
+      p12-password: ${{ env.APPLE_APP_CERTIFICATE_PASSWORD }}
+      keychain: build-app-${{ github.run_id }}
+      keychain-password: ${{ github.run_id }}
+
+  - name: Install Installer certificate
+    if: inputs.os == 'macos'
+    uses: apple-actions/import-codesign-certs@v5
+    with:
+      p12-file-base64: ${{ env.APPLE_INSTALLER_CERTIFICATE_BASE64 }}
+      p12-password: ${{ env.APPLE_INSTALLER_CERTIFICATE_PASSWORD }}
+      keychain: build-installer-${{ github.run_id }}
+      keychain-password: ${{ github.run_id }}
+
+  - name: Verify certificates
+    if: inputs.os == 'macos'
+    shell: ${{ inputs.shell }}
+    run: |
+      echo "Available signing identities in app keychain:"
+      security find-identity -v -p codesigning build-app-${{ github.run_id }}.keychain
+
+      echo "Available signing identities in installer keychain:"
+      security find-identity -v -p codesigning build-installer-${{ github.run_id }}.keychain
+
+      # Make the keychains searchable
+      security list-keychains -d user -s build-app-${{ github.run_id }}.keychain build-installer-${{ github.run_id }}.keychain $(security list-keychains -d user | tr -d '"')
+      security default-keychain -s build-app-${{ github.run_id }}.keychain
+      security unlock-keychain -p ${{ github.run_id }} build-app-${{ github.run_id }}.keychain
+      security unlock-keychain -p ${{ github.run_id }} build-installer-${{ github.run_id }}.keychain
+      security set-keychain-settings -t 3600 -l build-app-${{ github.run_id }}.keychain
+      security set-keychain-settings -t 3600 -l build-installer-${{ github.run_id }}.keychain
+
+  - name: Set up Python and other macOS dependencies
+    if: ${{ inputs.os == 'macos' }}
+    shell: ${{ inputs.shell }}
+    run: |
+      brew install python-setuptools
+      brew install create-dmg
+
+  - name: Install dependencies for RPM and Flatpak package building
+    if: ${{ inputs.os == 'linux' }}
+    shell: ${{ inputs.shell }}
+    run: |
+      sudo apt-get update && sudo apt-get install rpm flatpak-builder elfutils
+      flatpak remote-add --user --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo
+      FLATPAK_ARCH=$(if [[ ${{ inputs.arch }} = 'arm64' ]]; then echo 'aarch64'; else echo 'x86_64'; fi)
+      FLATPAK_VERSION='24.08'
+      flatpak install --user --no-deps --arch $FLATPAK_ARCH --assumeyes runtime/org.freedesktop.Platform/$FLATPAK_ARCH/$FLATPAK_VERSION runtime/org.freedesktop.Sdk/$FLATPAK_ARCH/$FLATPAK_VERSION org.electronjs.Electron2.BaseApp/$FLATPAK_ARCH/$FLATPAK_VERSION
+
+  - name: Update build info
+    shell: ${{ inputs.shell }}
+    run: npm run chore:update-build-info
+
+  # Critical debugging configuration
+  - name: Run electron-forge build with enhanced logging
+    shell: ${{ inputs.shell }}
+    env:
+      # Pass through required environment variables for signing and notarization
+      APPLE_TEAM_ID: ${{ env.APPLE_TEAM_ID }}
+      APPLE_ID: ${{ env.APPLE_ID }}
+      APPLE_ID_PASSWORD: ${{ env.APPLE_ID_PASSWORD }}
+      WINDOWS_SIGN_EXECUTABLE: ${{ env.WINDOWS_SIGN_EXECUTABLE }}
+      TRILIUM_ARTIFACT_NAME_HINT: TriliumNextNotes-${{ github.ref_name }}-${{ inputs.os }}-${{ inputs.arch }}
+    run: pnpm nx --project=desktop electron-forge:make -- --arch=${{ inputs.arch }} --platform=${{ inputs.forge_platform }}
+
+  # Add DMG signing step
+  - name: Sign DMG
+    if: inputs.os == 'macos'
+    shell: ${{ inputs.shell }}
+    run: |
+      echo "Signing DMG file..."
+      dmg_file=$(find ./apps/desktop/dist -name "*.dmg" -print -quit)
+      if [ -n "$dmg_file" ]; then
+        echo "Found DMG: $dmg_file"
+        # Get the first valid signing identity from the keychain
+        SIGNING_IDENTITY=$(security find-identity -v -p codesigning build-app-${{ github.run_id }}.keychain | grep "Developer ID Application" | head -1 | sed -E 's/.*"([^"]+)".*/\1/')
+        if [ -z "$SIGNING_IDENTITY" ]; then
+          echo "Error: No valid Developer ID Application certificate found in keychain"
+          exit 1
         fi
-
-    - name: Prepare artifacts
-      shell: bash
-      run: |
-        mkdir -p upload
-
-        if [ "${{ inputs.os }}" = "macos" ]; then
-          # For macOS, we need to look in specific directories based on the maker
-          echo "Collecting macOS artifacts..."
-
-          # Look for DMG files recursively
-          echo "Looking for DMG files..."
-          dmg_file=$(find ./dist -name "*.dmg" -print -quit)
-          if [ -n "$dmg_file" ]; then
-            echo "Found DMG: $dmg_file"
-            cp "$dmg_file" "upload/TriliumNextNotes-${{ github.ref_name }}-macos-${{ inputs.arch }}.dmg"
-          else
-            echo "Warning: No DMG file found"
-          fi
-
-          # Look for ZIP files recursively
-          echo "Looking for ZIP files..."
-          zip_file=$(find ./dist -name "*.zip" -print -quit)
-          if [ -n "$zip_file" ]; then
-            echo "Found ZIP: $zip_file"
-            cp "$zip_file" "upload/TriliumNextNotes-${{ github.ref_name }}-macos-${{ inputs.arch }}.zip"
-          else
-            echo "Warning: No ZIP file found"
-          fi
-        else
-          # For other platforms, use the existing logic but with better error handling
-          echo "Collecting artifacts for ${{ inputs.os }}..."
-          for ext in ${{ inputs.extension }}; do
-            echo "Looking for .$ext files..."
-            file=$(find ./dist -name "*.$ext" -print -quit)
-            if [ -n "$file" ]; then
-              echo "Found $file for extension $ext"
-              cp "$file" "upload/TriliumNextNotes-${{ github.ref_name }}-${{ inputs.os }}-${{ inputs.arch }}.$ext"
-            else
-              echo "Warning: No file found with extension .$ext"
-            fi
-          done
-        fi
-
-        echo "Final contents of upload directory:"
-        ls -la upload/
+        echo "Using signing identity: $SIGNING_IDENTITY"
+        # Sign the DMG
+        codesign --force --sign "$SIGNING_IDENTITY" --options runtime --timestamp "$dmg_file"
+        # Notarize the DMG
+        xcrun notarytool submit "$dmg_file" --apple-id "$APPLE_ID" --password "$APPLE_ID_PASSWORD" --team-id "$APPLE_TEAM_ID" --wait
+        # Staple the notarization ticket
+        xcrun stapler staple "$dmg_file"
+      else
+        echo "No DMG found to sign"
+      fi
+
+  - name: Verify code signing
+    if: inputs.os == 'macos'
+    shell: ${{ inputs.shell }}
+    run: |
+      echo "Verifying code signing for all artifacts..."
+
+      # First check the .app bundle
+      echo "Looking for .app bundle..."
+      app_bundle=$(find ./apps/desktop/dist -name "*.app" -print -quit)
+      if [ -n "$app_bundle" ]; then
+        echo "Found app bundle: $app_bundle"
+        echo "Verifying app bundle signing..."
+        codesign --verify --deep --strict --verbose=2 "$app_bundle"
+        echo "Displaying app bundle signing info..."
+        codesign --display --verbose=2 "$app_bundle"
+
+        echo "Checking entitlements..."
+        codesign --display --entitlements :- "$app_bundle"
+
+        echo "Checking notarization status..."
+        xcrun stapler validate "$app_bundle" || echo "Warning: App bundle not notarized yet"
+      else
+        echo "No .app bundle found to verify"
+      fi
+
+      # Then check DMG if it exists
+      echo "Looking for DMG..."
+      dmg_file=$(find ./apps/desktop/dist -name "*.dmg" -print -quit)
+      if [ -n "$dmg_file" ]; then
+        echo "Found DMG: $dmg_file"
+        echo "Verifying DMG signing..."
+        codesign --verify --deep --strict --verbose=2 "$dmg_file"
+        echo "Displaying DMG signing info..."
+        codesign --display --verbose=2 "$dmg_file"
+
+        echo "Checking DMG notarization..."
+        xcrun stapler validate "$dmg_file" || echo "Warning: DMG not notarized yet"
+      else
+        echo "No DMG found to verify"
+      fi
+
+      # Finally check ZIP if it exists
+      echo "Looking for ZIP..."
+      zip_file=$(find ./apps/desktop/dist -name "*.zip" -print -quit)
+      if [ -n "$zip_file" ]; then
+        echo "Found ZIP: $zip_file"
+        echo "Note: ZIP files are not code signed, but their contents should be"
+      fi

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

@@ -8,24 +8,26 @@ inputs:
 runs:
   using: composite
   steps:
-    - name: Set up node & dependencies
-      uses: actions/setup-node@v4
-      with:
-        node-version: 20
-        cache: "npm"
-    - name: Install dependencies
-      shell: bash
-      run: npm ci
-    - name: Run Linux server build
-      env:
-        MATRIX_ARCH: ${{ inputs.arch }}
-      shell: bash
-      run: |
-        npm run chore:update-build-info
-        ./bin/build-server.sh
-    - name: Prepare artifacts
-      shell: bash
-      run: |
-        mkdir -p upload
-        file=$(find dist -name '*.tar.xz' -print -quit)
-        cp "$file" "upload/TriliumNextNotes-Server-${{ github.ref_name }}-${{ inputs.os }}-${{ inputs.arch }}.tar.xz"
+  - uses: pnpm/action-setup@v4
+  - name: Set up node & dependencies
+    uses: actions/setup-node@v4
+    with:
+      node-version: 22
+      cache: "pnpm"
+  - name: Install dependencies
+    shell: bash
+    run: pnpm install --frozen-lockfile
+  - name: Run Linux server build
+    env:
+      MATRIX_ARCH: ${{ inputs.arch }}
+    shell: bash
+    run: |
+      pnpm run chore:update-build-info
+      pnpm nx --project=server package
+  - name: Prepare artifacts
+    shell: bash
+    run: |
+      mkdir -p upload
+      file=$(find ./apps/server/out -name '*.tar.xz' -print -quit)
+      name=${{ github.ref_name }}
+      cp "$file" "upload/TriliumNextNotes-Server-${name//\//-}-${{ inputs.os }}-${{ inputs.arch }}.tar.xz"

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

@@ -0,0 +1,79 @@
+name: 'Bundle size reporter'
+description: 'Post bundle size difference compared to another branch'
+inputs:
+  branch:
+    description: 'Branch to compare to'
+    required: true
+    default: 'main'
+  paths:
+    description:
+      'Paths to json file bundle size report or folder containing bundles'
+    required: true
+    default: '/'
+  onlyDiff:
+    description: 'Report only different sizes'
+    required: false
+    default: 'false'
+  filter:
+    description: 'Regex filter based on file path'
+    required: false
+  unit:
+    description: 'Size unit'
+    required: false
+    default: 'KB'
+
+  # Comment inputs
+  comment:
+    description: 'Post comment'
+    required: false
+    default: 'true'
+  header:
+    description: 'Comment header'
+    required: false
+    default: 'Bundle size report'
+  append:
+    description: 'Append comment'
+    required: false
+    default: 'false'
+  ghToken:
+    description: 'Github token'
+    required: false
+
+runs:
+  using: 'composite'
+  steps:
+    # Checkout branch to compare to [required]
+    - name: Checkout base branch
+      uses: actions/checkout@v4
+      with:
+        ref: ${{ inputs.branch }}
+        path: br-base
+        token: ${{ inputs.ghToken }}
+
+    # Generate the bundle size difference report [required]
+    - name: Generate report
+      id: bundleSize
+      uses: nejcm/bundle-size-reporter-action@v1.4.1
+      with:
+        paths: ${{ inputs.paths }}
+        onlyDiff: ${{ inputs.onlyDiff }}
+        filter: ${{ inputs.filter }}
+        unit: ${{ inputs.unit }}
+
+    # Post github action summary
+    - name: Post summary
+      if: ${{ steps.bundleSize.outputs.hasDifferences == 'true' }} # post only in case of changes
+      run: |
+        echo '${{ steps.bundleSize.outputs.summary }}' >> $GITHUB_STEP_SUMMARY
+      shell: bash
+
+    # Post github action comment
+    - name: Post comment
+      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 }}
+        header: ${{ inputs.header }}
+        append: ${{ inputs.append }}
+        message: '${{ steps.bundleSize.outputs.summary }}'
+        GITHUB_TOKEN: ${{ inputs.ghToken }}

.github/workflows/codeql.yml

@@ -0,0 +1,100 @@
+# For most projects, this workflow file will not need changing; you simply need
+# to commit it to your repository.
+#
+# You may wish to alter this file to override the set of languages analyzed,
+# or to provide custom queries or build logic.
+#
+# ******** NOTE ********
+# We have attempted to detect the languages in your repository. Please check
+# the `language` matrix defined below to confirm you have the correct set of
+# supported CodeQL languages.
+#
+name: "CodeQL Advanced"
+
+on:
+  push:
+    branches: [ "develop" ]
+  pull_request:
+    branches: [ "develop" ]
+  schedule:
+    - cron: '20 7 * * 0'
+
+jobs:
+  analyze:
+    name: Analyze (${{ matrix.language }})
+    # Runner size impacts CodeQL analysis time. To learn more, please see:
+    #   - https://gh.io/recommended-hardware-resources-for-running-codeql
+    #   - https://gh.io/supported-runners-and-hardware-resources
+    #   - https://gh.io/using-larger-runners (GitHub.com only)
+    # Consider using larger runners or machines with greater resources for possible analysis time improvements.
+    runs-on: ${{ (matrix.language == 'swift' && 'macos-latest') || 'ubuntu-latest' }}
+    permissions:
+      # required for all workflows
+      security-events: write
+
+      # required to fetch internal or private CodeQL packs
+      packages: read
+
+      # only required for workflows in private repositories
+      actions: read
+      contents: read
+
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+        - language: actions
+          build-mode: none
+        - language: javascript-typescript
+          build-mode: none
+        # CodeQL supports the following values keywords for 'language': 'actions', 'c-cpp', 'csharp', 'go', 'java-kotlin', 'javascript-typescript', 'python', 'ruby', 'swift'
+        # Use `c-cpp` to analyze code written in C, C++ or both
+        # Use 'java-kotlin' to analyze code written in Java, Kotlin or both
+        # Use 'javascript-typescript' to analyze code written in JavaScript, TypeScript or both
+        # To learn more about changing the languages that are analyzed or customizing the build mode for your analysis,
+        # see https://docs.github.com/en/code-security/code-scanning/creating-an-advanced-setup-for-code-scanning/customizing-your-advanced-setup-for-code-scanning.
+        # If you are analyzing a compiled language, you can modify the 'build-mode' for that language to customize how
+        # your codebase is analyzed, see https://docs.github.com/en/code-security/code-scanning/creating-an-advanced-setup-for-code-scanning/codeql-code-scanning-for-compiled-languages
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@v4
+
+    # Add any setup steps before running the `github/codeql-action/init` action.
+    # This includes steps like installing compilers or runtimes (`actions/setup-node`
+    # or others). This is typically only required for manual builds.
+    # - name: Setup runtime (example)
+    #   uses: actions/setup-example@v1
+
+    # Initializes the CodeQL tools for scanning.
+    - name: Initialize CodeQL
+      uses: github/codeql-action/init@v3
+      with:
+        languages: ${{ matrix.language }}
+        build-mode: ${{ matrix.build-mode }}
+        # If you wish to specify custom queries, you can do so here or in a config file.
+        # By default, queries listed here will override any specified in a config file.
+        # Prefix the list here with "+" to use these queries and those in the config file.
+
+        # For more details on CodeQL's query packs, refer to: https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-code-scanning#using-queries-in-ql-packs
+        # queries: security-extended,security-and-quality
+
+    # If the analyze step fails for one of the languages you are analyzing with
+    # "We were unable to automatically build your code", modify the matrix above
+    # to set the build mode to "manual" for that language. Then modify this step
+    # to build your code.
+    # ℹ️ Command-line programs to run using the OS shell.
+    # 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
+    - if: matrix.build-mode == 'manual'
+      shell: bash
+      run: |
+        echo 'If you are using a "manual" build mode for one or more of the' \
+          'languages you are analyzing, replace this with the commands to build' \
+          'your code, for example:'
+        echo '  make bootstrap'
+        echo '  make release'
+        exit 1
+
+    - name: Perform CodeQL Analysis
+      uses: github/codeql-action/analyze@v3
+      with:
+        category: "/language:${{matrix.language}}"

.github/workflows/dev.yml

@@ -15,39 +15,78 @@ env:
   IMAGE_NAME: ${{ github.repository_owner }}/notes
   TEST_TAG: ${{ github.repository_owner }}/notes:test
 
+permissions:
+  pull-requests: write  # for PR comments
+
 jobs:
-  test_dev:
-    name: Test development
+  check-affected:
+    name: Check affected jobs (NX)
     runs-on: ubuntu-latest
     steps:
       - name: Checkout the repository
         uses: actions/checkout@v4
+        with:
+          fetch-depth: 0  # needed for https://github.com/marketplace/actions/nx-set-shas
 
+      - uses: pnpm/action-setup@v4
       - name: Set up node & dependencies
         uses: actions/setup-node@v4
         with:
-          node-version: 20
-          cache: "npm"
+          node-version: 22
+          cache: 'pnpm'
+      - name: Install dependencies
+        run: pnpm install --frozen-lockfile
 
-      - run: npm ci
+      - uses: nrwl/nx-set-shas@v4
+      - name: Check affected
+        run: pnpm nx affected --verbose -t typecheck build rebuild-deps test-build
 
-      - name: Run the TypeScript build
-        run: npx tsc
+  test_dev:
+    name: Test development
+    runs-on: ubuntu-latest
+    needs:
+      - check-affected
+    steps:
+      - name: Checkout the repository
+        uses: actions/checkout@v4
+
+      - uses: pnpm/action-setup@v4
+      - name: Set up node & dependencies
+        uses: actions/setup-node@v4
+        with:
+          node-version: 22
+          cache: "pnpm"
+      - run: pnpm install --frozen-lockfile
 
       - name: Run the unit tests
-        run: npm run test
+        run: pnpm run test:all
 
   build_docker:
     name: Build Docker image
     runs-on: ubuntu-latest
     needs:
       - test_dev
+      - check-affected
     steps:
       - uses: actions/checkout@v4
+      - uses: pnpm/action-setup@v4
+      - name: Install dependencies
+        run: pnpm install --frozen-lockfile
+      - name: Update build info
+        run: pnpm run chore:update-build-info
+      - name: Trigger client build
+        run: pnpm nx run client:build
+      - name: Send client bundle stats to RelativeCI
+        uses: relative-ci/agent-action@v3
+        with:
+          webpackStatsFile: ./apps/client/dist/webpack-stats.json
+          key: ${{ secrets.RELATIVE_CI_CLIENT_KEY }}
+      - name: Trigger server build
+        run: pnpm nx run server:build
       - uses: docker/setup-buildx-action@v3
       - uses: docker/build-push-action@v6
         with:
-          context: .
+          context: apps/server
           cache-from: type=gha
           cache-to: type=gha,mode=max
   test_docker:
@@ -55,6 +94,7 @@ jobs:
     runs-on: ubuntu-latest
     needs:
       - build_docker
+      - check-affected
     strategy:
       matrix:
         include:
@@ -64,6 +104,15 @@ jobs:
       - name: Checkout the repository
         uses: actions/checkout@v4
 
+      - uses: pnpm/action-setup@v4
+      - name: Install dependencies
+        run: pnpm install --frozen-lockfile
+
+      - name: Update build info
+        run: pnpm run chore:update-build-info
+      - name: Trigger build
+        run: pnpm nx run server:build
+
       - name: Set IMAGE_NAME to lowercase
         run: echo "IMAGE_NAME=${IMAGE_NAME,,}" >> $GITHUB_ENV
       - name: Set TEST_TAG to lowercase
@@ -75,8 +124,8 @@ jobs:
       - name: Build and export to Docker
         uses: docker/build-push-action@v6
         with:
-          context: .
-          file: ${{ matrix.dockerfile }}
+          context: apps/server
+          file: apps/server/${{ matrix.dockerfile }}
           load: true
           tags: ${{ env.TEST_TAG }}
           cache-from: type=gha
@@ -98,5 +147,4 @@ jobs:
       # Print the entire log of the container thus far, regardless if the healthcheck failed or succeeded
       - name: Print entire log
         if: always()
-        run: |
-          journalctl -u docker CONTAINER_NAME=trilium_local --no-pager
+        run: journalctl -u docker CONTAINER_NAME=trilium_local --no-pager

.github/workflows/main-docker.yml

@@ -42,26 +42,27 @@ jobs:
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
 
+      - uses: pnpm/action-setup@v4
       - name: Set up node & dependencies
         uses: actions/setup-node@v4
         with:
-          node-version: 20
-          cache: "npm"
+          node-version: 22
+          cache: "pnpm"
 
       - name: Install npm dependencies
-        run: npm ci
+        run: pnpm install --frozen-lockfile
 
       - name: Install Playwright Browsers
-        run: npx playwright install --with-deps
+        run: pnpm exec playwright install --with-deps
 
       - name: Run the TypeScript build
-        run: npx tsc
+        run: pnpm run server:build
 
       - name: Build and export to Docker
         uses: docker/build-push-action@v6
         with:
-          context: .
-          file: ${{ matrix.dockerfile }}
+          context: apps/server
+          file: apps/server/${{ matrix.dockerfile }}
           load: true
           tags: ${{ env.TEST_TAG }}
           cache-from: type=gha
@@ -69,7 +70,7 @@ jobs:
 
       - name: Validate container run output
         run: |
-          CONTAINER_ID=$(docker run -d --log-driver=journald --rm --network=host -e TRILIUM_PORT=8082 --volume ./integration-tests/db:/home/node/trilium-data --name trilium_local ${{ env.TEST_TAG }})
+          CONTAINER_ID=$(docker run -d --log-driver=journald --rm --network=host -e TRILIUM_PORT=8082 --volume ./apps/server/spec/db:/home/node/trilium-data --name trilium_local ${{ env.TEST_TAG }})
           echo "Container ID: $CONTAINER_ID"
 
       - name: Wait for the healthchecks to pass
@@ -81,7 +82,15 @@ jobs:
           require-healthy: true
 
       - name: Run Playwright tests
-        run: TRILIUM_DOCKER=1 npx playwright test
+        run: TRILIUM_DOCKER=1 TRILIUM_PORT=8082 pnpm exec nx run server-e2e:e2e
+
+      - name: Upload Playwright trace
+        if: failure()
+        uses: actions/upload-artifact@v4
+        with:
+          name: Playwright trace (${{ matrix.dockerfile }})
+          path: test-output/playwright/output
+
       - uses: actions/upload-artifact@v4
         if: ${{ !cancelled() }}
         with:
@@ -110,6 +119,9 @@ jobs:
           - dockerfile: Dockerfile
             platform: linux/arm/v7
             image: ubuntu-24.04-arm
+          - dockerfile: Dockerfile
+            platform: linux/arm/v8
+            image: ubuntu-24.04-arm
     runs-on: ${{ matrix.image }}
     needs:
       - test_docker
@@ -128,9 +140,24 @@ jobs:
       - name: Set TEST_TAG to lowercase
         run: echo "TEST_TAG=${TEST_TAG,,}" >> $GITHUB_ENV
 
-
       - name: Checkout repository
         uses: actions/checkout@v4
+      - uses: pnpm/action-setup@v4
+      - name: Set up node & dependencies
+        uses: actions/setup-node@v4
+        with:
+          node-version: 22
+          cache: 'pnpm'
+
+      - name: Install dependencies
+        run: pnpm install --frozen-lockfile
+
+      - name: Run the TypeScript build
+        run: pnpm run server:build
+
+      - name: Update build info
+        run: pnpm run chore:update-build-info
+
       - name: Docker meta
         id: meta
         uses: docker/metadata-action@v5
@@ -169,8 +196,8 @@ jobs:
         id: build
         uses: docker/build-push-action@v6
         with:
-          context: .
-          file: ${{ matrix.dockerfile }}
+          context: apps/server
+          file: apps/server/${{ matrix.dockerfile }}
           platforms: ${{ matrix.platform }}
           labels: ${{ steps.meta.outputs.labels }}
           outputs: type=image,name=${{ env.GHCR_REGISTRY }}/${{ env.IMAGE_NAME }},push-by-digest=true,name-canonical=true,push=true

.github/workflows/main.yml

@@ -1,93 +0,0 @@
-name: Main
-on:
-  push:
-    branches:
-      - "feature/update**"
-      - "feature/server_esm**"
-    paths-ignore:
-      - "docs/**"
-      - ".github/workflows/main-docker.yml"
-  workflow_dispatch:
-
-concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: true
-
-jobs:
-  make-electron:
-    name: Make Electron
-    strategy:
-      fail-fast: false
-      matrix:
-        arch: [x64, arm64]
-        os:
-          - name: macos
-            image: macos-latest
-            extension: [dmg, zip]
-          - name: linux
-            image: ubuntu-latest
-            extension: [deb, rpm, zip, flatpak]
-          - name: windows
-            image: windows-latest
-            extension: [exe, zip]
-    runs-on: ${{ matrix.os.image }}
-    steps:
-      - uses: actions/checkout@v4
-      - name: Set up node & dependencies
-        uses: actions/setup-node@v4
-        with:
-          node-version: 20
-      - name: Run the build
-        uses: ./.github/actions/build-electron
-        with:
-          os: ${{ matrix.os.name }}
-          arch: ${{ matrix.arch }}
-          extension: ${{ matrix.os.extension }}
-        env:
-          APPLE_APP_CERTIFICATE_BASE64: ${{ secrets.APPLE_APP_CERTIFICATE_BASE64 }}
-          APPLE_APP_CERTIFICATE_PASSWORD: ${{ secrets.APPLE_APP_CERTIFICATE_PASSWORD }}
-          APPLE_INSTALLER_CERTIFICATE_BASE64: ${{ secrets.APPLE_INSTALLER_CERTIFICATE_BASE64 }}
-          APPLE_INSTALLER_CERTIFICATE_PASSWORD: ${{ secrets.APPLE_INSTALLER_CERTIFICATE_PASSWORD }}
-          APPLE_TEAM_ID: ${{ secrets.APPLE_TEAM_ID }}
-          APPLE_ID: ${{ secrets.APPLE_ID }}
-          APPLE_ID_PASSWORD: ${{ secrets.APPLE_ID_PASSWORD }}
-
-      # Clean up keychain after build
-      - name: Clean up keychain
-        if: matrix.os.name == 'macos' && always()
-        run: |
-          security delete-keychain build.keychain
-
-      - name: Publish artifacts
-        uses: actions/upload-artifact@v4
-        with:
-          name: TriliumNextNotes ${{ matrix.os.name }} ${{ matrix.arch }}.zip
-          path: upload/*.zip
-      - name: Publish installer artifacts
-        uses: actions/upload-artifact@v4
-        with:
-          name: TriliumNextNotes ${{ matrix.os.name }} ${{ matrix.arch }}.${{matrix.os.extension}}
-          path: upload/*.${{ matrix.os.extension }}
-
-  build_linux_server:
-    name: Build Linux Server
-    strategy:
-      fail-fast: false
-      matrix:
-        arch: [x64, arm64]
-        include:
-          - arch: x64
-            runs-on: ubuntu-latest
-          - arch: arm64
-            runs-on: ubuntu-24.04-arm
-    runs-on: ${{ matrix.runs-on }}
-    steps:
-      - uses: actions/checkout@v4
-      - name: Run the build
-        uses: ./.github/actions/build-server
-        with:
-          arch: ${{ matrix.arch }}
-      - uses: actions/upload-artifact@v4
-        with:
-          name: TriliumNextNotes linux server ${{ matrix.arch }}
-          path: upload/TriliumNextNotes-linux-${{ matrix.arch }}-${{ github.ref_name }}.tar.xz

.github/workflows/nightly.yml

@@ -5,11 +5,26 @@ on:
     - cron: "0 2 * * *" # run at 2 AM UTC
   # This can be used to allow manually triggering nightlies from the web interface
   workflow_dispatch:
+  push:
+    branches:
+      - renovate/electron-forge*
+  pull_request:
+    paths:
+      - .github/actions/build-electron/*
+      - .github/workflows/nightly.yml
+      - forge.config.ts
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
 env:
   GITHUB_UPLOAD_URL: https://uploads.github.com/repos/TriliumNext/Notes/releases/179589950/assets{?name,label}
   GITHUB_RELEASE_ID: 179589950
+
 permissions:
   contents: write
+
 jobs:
   nightly-electron:
     name: Deploy nightly
@@ -20,23 +35,28 @@ jobs:
         os:
           - name: macos
             image: macos-latest
-            extension: [dmg, zip]
+            shell: bash
+            forge_platform: darwin
           - name: linux
-            image: ubuntu-latest
-            extension: [deb, rpm, zip, flatpak]
+            image: ubuntu-22.04
+            shell: bash
+            forge_platform: linux
           - name: windows
-            image: windows-latest
-            extension: [exe, zip]
+            image: win-signing
+            shell: cmd
+            forge_platform: win32
     runs-on: ${{ matrix.os.image }}
     steps:
       - uses: actions/checkout@v4
+      - uses: pnpm/action-setup@v4
       - name: Set up node & dependencies
         uses: actions/setup-node@v4
         with:
-          node-version: 20
+          node-version: 22
+          cache: 'pnpm'
       - name: Install dependencies
-        shell: bash
-        run: npm ci
+        run: pnpm install --frozen-lockfile
+      - uses: nrwl/nx-set-shas@v4
       - name: Update nightly version
         run: npm run chore:ci-update-nightly-version
       - name: Run the build
@@ -44,7 +64,8 @@ jobs:
         with:
           os: ${{ matrix.os.name }}
           arch: ${{ matrix.arch }}
-          extension: ${{ join(matrix.os.extension, ' ') }}
+          shell: ${{ matrix.os.shell }}
+          forge_platform: ${{ matrix.os.forge_platform }}
         env:
           APPLE_APP_CERTIFICATE_BASE64: ${{ secrets.APPLE_APP_CERTIFICATE_BASE64 }}
           APPLE_APP_CERTIFICATE_PASSWORD: ${{ secrets.APPLE_APP_CERTIFICATE_PASSWORD }}
@@ -53,18 +74,27 @@ jobs:
           APPLE_TEAM_ID: ${{ secrets.APPLE_TEAM_ID }}
           APPLE_ID: ${{ secrets.APPLE_ID }}
           APPLE_ID_PASSWORD: ${{ secrets.APPLE_ID_PASSWORD }}
+          WINDOWS_SIGN_EXECUTABLE: ${{ vars.WINDOWS_SIGN_EXECUTABLE }}
 
       - name: Publish release
-        uses: softprops/action-gh-release@v2
+        uses: softprops/action-gh-release@v2.3.2
+        if: ${{ github.event_name != 'pull_request' }}
         with:
           make_latest: false
           prerelease: true
           draft: false
           fail_on_unmatched_files: true
-          files: upload/*.*
+          files: apps/desktop/upload/*.*
           tag_name: nightly
           name: Nightly Build
 
+      - name: Publish artifacts
+        uses: actions/upload-artifact@v4
+        if: ${{ github.event_name == 'pull_request' }}
+        with:
+          name: TriliumNextNotes ${{ matrix.os.name }} ${{ matrix.arch }}
+          path: apps/desktop/upload
+
   nightly-server:
     name: Deploy server nightly
     strategy:
@@ -73,7 +103,7 @@ jobs:
         arch: [x64, arm64]
         include:
           - arch: x64
-            runs-on: ubuntu-latest
+            runs-on: ubuntu-22.04
           - arch: arm64
             runs-on: ubuntu-24.04-arm
     runs-on: ${{ matrix.runs-on }}
@@ -87,7 +117,8 @@ jobs:
           arch: ${{ matrix.arch }}
 
       - name: Publish release
-        uses: softprops/action-gh-release@v2
+        uses: softprops/action-gh-release@v2.3.2
+        if: ${{ github.event_name != 'pull_request' }}
         with:
           make_latest: false
           prerelease: true

.github/workflows/playwright.yml

@@ -1,27 +1,43 @@
-name: Playwright Tests
+name: playwright
+
 on:
   push:
-    branches: [ develop ]
+    branches:
+      - master
   pull_request:
-    branches: [ develop ]
+
+permissions:
+  actions: read
+  contents: read
+
 jobs:
-  test:
-    timeout-minutes: 60
+  main:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v4
-    - uses: actions/setup-node@v4
-      with:
-        node-version: lts/*
-    - name: Install dependencies
-      run: npm ci
-    - name: Install Playwright Browsers
-      run: npx playwright install --with-deps
-    - name: Run Playwright tests
-      run: npx playwright test
-    - uses: actions/upload-artifact@v4
-      if: ${{ !cancelled() }}
-      with:
-        name: playwright-report
-        path: playwright-report/
-        retention-days: 30
+      - uses: actions/checkout@v4
+        with:
+          filter: tree:0
+          fetch-depth: 0
+
+      # This enables task distribution via Nx Cloud
+      # Run this command as early as possible, before dependencies are installed
+      # Learn more at https://nx.dev/ci/reference/nx-cloud-cli#npx-nxcloud-startcirun
+      # Connect your workspace by running "nx connect" and uncomment this line to enable task distribution
+      # - run: npx nx-cloud start-ci-run --distribute-on="3 linux-medium-js" --stop-agents-after="e2e-ci"
+
+      - uses: pnpm/action-setup@v4
+      - uses: actions/setup-node@v4
+        with:
+          node-version: 22
+          cache: 'pnpm'
+
+      - name: Install dependencies
+        run: pnpm install --frozen-lockfile
+      - run: pnpm exec playwright install --with-deps
+      - uses: nrwl/nx-set-shas@v4
+
+      # Prepend any command with "nx-cloud record --" to record its logs to Nx Cloud
+      # - run: npx nx-cloud record -- echo Hello World
+      # Nx Affected runs only tasks affected by the changes in this PR/commit. Learn more: https://nx.dev/ci/features/affected
+      # When you enable task distribution, run the e2e-ci task instead of e2e
+      - run: pnpm exec nx affected -t e2e

.github/workflows/release-winget.yml

@@ -0,0 +1,20 @@
+name: Release to winget
+on:
+  release:
+    types: [ published ]
+  workflow_dispatch:
+    inputs:
+      release_tag:
+        description: 'Git tag to release from'
+        type: string
+        required: true
+jobs:
+  release-winget:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Publish to WinGet
+        uses: vedantmgoyal9/winget-releaser@main
+        with:
+          identifier: TriliumNext.Notes
+          token: ${{ secrets.WINGET_PAT  }}
+          release-tag:  ${{ github.event.inputs.release_tag || github.event.release.tag_name }}

.github/workflows/release.yml

@@ -3,9 +3,9 @@ on:
   push:
     tags:
       - "v*"
-  workflow_dispatch:
 permissions:
   contents: write
+  discussions: write
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
   cancel-in-progress: true
@@ -20,26 +20,35 @@ jobs:
         os:
           - name: macos
             image: macos-latest
-            extension: [dmg, zip]
+            shell: bash
+            forge_platform: darwin
           - name: linux
             image: ubuntu-latest
-            extension: [deb, rpm, zip, flatpak]
+            shell: bash
+            forge_platform: linux
           - name: windows
-            image: windows-latest
-            extension: [exe, zip]
+            image: win-signing
+            shell: cmd
+            forge_platform: win32
     runs-on: ${{ matrix.os.image }}
     steps:
       - uses: actions/checkout@v4
+      - uses: pnpm/action-setup@v4
       - name: Set up node & dependencies
         uses: actions/setup-node@v4
         with:
-          node-version: 20
+          node-version: 22
+          cache: 'pnpm'
+      - name: Install dependencies
+        run: pnpm install --frozen-lockfile
+      - uses: nrwl/nx-set-shas@v4
       - name: Run the build
         uses: ./.github/actions/build-electron
         with:
           os: ${{ matrix.os.name }}
           arch: ${{ matrix.arch }}
-          extension: ${{ join(matrix.os.extension, ' ') }}
+          shell: ${{ matrix.os.shell }}
+          forge_platform: ${{ matrix.os.forge_platform }}
         env:
           APPLE_APP_CERTIFICATE_BASE64: ${{ secrets.APPLE_APP_CERTIFICATE_BASE64 }}
           APPLE_APP_CERTIFICATE_PASSWORD: ${{ secrets.APPLE_APP_CERTIFICATE_PASSWORD }}
@@ -48,15 +57,15 @@ jobs:
           APPLE_TEAM_ID: ${{ secrets.APPLE_TEAM_ID }}
           APPLE_ID: ${{ secrets.APPLE_ID }}
           APPLE_ID_PASSWORD: ${{ secrets.APPLE_ID_PASSWORD }}
+          WINDOWS_SIGN_EXECUTABLE: ${{ vars.WINDOWS_SIGN_EXECUTABLE }}
 
-      - name: Publish release
-        uses: softprops/action-gh-release@v2
+      - name: Upload the artifact
+        uses: actions/upload-artifact@v4
         with:
-          draft: true
-          fail_on_unmatched_files: true
-          files: upload/*.*
+          name: release-desktop-${{ matrix.os.name }}-${{ matrix.arch }}
+          path: apps/desktop/upload/*.*
 
-  build_linux_server-x64:
+  build_server:
     name: Build Linux Server
     strategy:
       fail-fast: false
@@ -64,7 +73,7 @@ jobs:
         arch: [x64, arm64]
         include:
           - arch: x64
-            runs-on: ubuntu-latest
+            runs-on: ubuntu-22.04
           - arch: arm64
             runs-on: ubuntu-24.04-arm
     runs-on: ${{ matrix.runs-on }}
@@ -77,9 +86,41 @@ jobs:
           os: linux
           arch: ${{ matrix.arch }}
 
-      - name: Publish release
-        uses: softprops/action-gh-release@v2
+      - name: Upload the artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: release-server-linux-${{ matrix.arch }}
+          path: upload/*.*
+
+  publish_release:
+    name: Publish release
+    runs-on: ubuntu-latest
+    needs:
+      - make-electron
+      - build_server
+    steps:
+      - run: mkdir upload
+
+      - uses: actions/checkout@v4
+        with:
+          sparse-checkout: |
+            docs/Release Notes
+
+      - name: Download all artifacts
+        uses: actions/download-artifact@v4
+        with:
+          merge-multiple: true
+          pattern: release-*
+          path: upload
+
+      - name: Publish stable release
+        uses: softprops/action-gh-release@v2.3.2
         with:
-          draft: true
+          draft: false
+          body_path: docs/Release Notes/Release Notes/${{ github.ref_name }}.md
           fail_on_unmatched_files: true
           files: upload/*.*
+          discussion_category_name: Announcements
+          make_latest: ${{ !contains(github.ref, 'rc') }}
+          prerelease: ${{ contains(github.ref, 'rc') }}
+          token: ${{ secrets.RELEASE_PAT }}

.github/workflows_old/codeql-analysis.yml

@@ -1,71 +0,0 @@
-# For most projects, this workflow file will not need changing; you simply need
-# to commit it to your repository.
-#
-# You may wish to alter this file to override the set of languages analyzed,
-# or to provide custom queries or build logic.
-#
-# ******** NOTE ********
-# We have attempted to detect the languages in your repository. Please check
-# the `language` matrix defined below to confirm you have the correct set of
-# supported CodeQL languages.
-#
-name: "CodeQL"
-
-on:
-  push:
-    branches: [ master ]
-  pull_request:
-    # The branches below must be a subset of the branches above
-    branches: [ master ]
-  schedule:
-    - cron: '37 4 * * 1'
-
-jobs:
-  analyze:
-    name: Analyze
-    runs-on: ubuntu-latest
-    permissions:
-      actions: read
-      contents: read
-      security-events: write
-
-    strategy:
-      fail-fast: false
-      matrix:
-        language: [ 'javascript' ]
-        # CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python' ]
-        # Learn more:
-        # https://docs.github.com/en/free-pro-team@latest/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-code-scanning#changing-the-languages-that-are-analyzed
-
-    steps:
-    - name: Checkout repository
-      uses: actions/checkout@v2
-
-    # Initializes the CodeQL tools for scanning.
-    - name: Initialize CodeQL
-      uses: github/codeql-action/init@v1
-      with:
-        languages: ${{ matrix.language }}
-        # If you wish to specify custom queries, you can do so here or in a config file.
-        # By default, queries listed here will override any specified in a config file.
-        # Prefix the list here with "+" to use these queries and those in the config file.
-        # queries: ./path/to/local/query, your-org/your-repo/queries@main
-
-    # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
-    # If this step fails, then you should remove it and run the build manually (see below)
-    - name: Autobuild
-      uses: github/codeql-action/autobuild@v1
-
-    # ℹ️ Command-line programs to run using the OS shell.
-    # 📚 https://git.io/JvXDl
-
-    # ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
-    #    and modify them (or add more) to build your code if your project
-    #    uses a compiled language
-
-    #- run: |
-    #   make bootstrap
-    #   make release
-
-    - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v1

.github/workflows_old/docker.yaml

@@ -1,53 +0,0 @@
-name: Publish Docker image
-on:
-    push:
-        tags: [v*]
-jobs:
-    push_to_registries:
-        name: Push Docker image to multiple registries
-        runs-on: ubuntu-latest
-        permissions:
-            packages: write
-            contents: read
-        steps:
-            - name: Checkout
-              uses: actions/checkout@v2
-            - name: Set up QEMU
-              uses: docker/setup-qemu-action@v1
-            - name: Docker meta
-              id: meta
-              uses: docker/metadata-action@v3
-              with:
-                  images: |
-                      zadam/trilium
-                      ghcr.io/zadam/trilium
-                  tags: |
-                      type=semver,pattern={{version}}
-                      type=semver,pattern={{major}}.{{minor}}-latest
-                      type=match,pattern=(\d+.\d+).\d+\-beta,enable=${{ endsWith(github.ref, 'beta') }},group=1,suffix=-latest
-            - name: Set up Docker Buildx
-              uses: docker/setup-buildx-action@v1
-              with:
-                  install: true
-            - name: Log in to Docker Hub
-              uses: docker/login-action@v1
-              with:
-                  username: ${{ secrets.DOCKER_USERNAME }}
-                  password: ${{ secrets.DOCKER_PASSWORD }}
-            - name: Log in to GitHub Docker Registry
-              uses: docker/login-action@v1
-              with:
-                  registry: ghcr.io
-                  username: ${{ github.repository_owner }}
-                  password: ${{ secrets.GITHUB_TOKEN }}
-            - name: Create server-package.json
-              run: cat package.json | grep -v electron > server-package.json
-            - name: Build and Push
-              uses: docker/build-push-action@v2.7.0
-              with:
-                  context: .
-                  platforms: linux/amd64,linux/arm64,linux/arm/v7,linux/arm/v6
-                  push: true
-                  cache-from: type=registry,ref=zadam/trilium:buildcache
-                  cache-to: type=registry,ref=zadam/trilium:buildcache,mode=max
-                  tags: ${{ steps.meta.outputs.tags }}

.gitignore

@@ -1,45 +1,49 @@
-.cache
-.DS_Store
-node_modules/
-dist/
-build/
-coverage/
-src/public/app-dist/
+# See https://docs.github.com/en/get-started/getting-started-with-git/ignoring-files for more about ignoring files.
+
+# compiled output
+dist
+tmp
+out-tsc
+
+# dependencies
+node_modules
+
+# IDEs and editors
+/.idea
+.project
+.classpath
+.c9/
+*.launch
+.settings/
+*.sublime-workspace
+
+# misc
+/.sass-cache
+/connect.lock
+/coverage
+/libpeerconnection.log
 npm-debug.log
 yarn-error.log
-po-*/
-.flatpak-builder/
-
-*.db
-!test/**/*.db
-!integration-tests/db/document.db
-!integration-tests/db/config.ini
-integration-tests/db/log
-integration-tests/db/sessions
-integration-tests/db/backup
-integration-tests/db/session_secret.txt
-
-cert.key
-cert.crt
-server-package.json
-.idea/httpRequests/
-.idea/shelf/
-data/
-data-test/
-tmp/
-.eslintcache
-
-out/
-
-images/app-icons/mac/*.png
-/test-results/
-/playwright-report/
-/blob-report/
-/playwright/.cache/
-/playwright/.auth/
-
-data-docs/backup
-data-docs/log
-data-docs/session
-data-docs/session_secret.txt
-data-docs/document.*
+testem.log
+/typings
+
+# System Files
+.DS_Store
+Thumbs.db
+
+.nx/cache
+.nx/workspace-data
+
+vite.config.*.timestamp*
+vitest.config.*.timestamp*
+test-output
+
+apps/*/data
+apps/*/out
+upload
+
+.rollup.cache
+*.tsbuildinfo
+
+/result
+.svelte-kit

.gitpod.dockerfile

@@ -1,15 +0,0 @@
-FROM gitpod/workspace-full
-
-RUN sudo apt-get update \
-    && sudo apt-get install -yq --no-install-recommends \
-        libpng16-16 \
-        libpng-dev \
-        pkg-config \
-        autoconf \
-        libtool \
-        build-essential \
-        nasm \
-        libx11-dev \
-        libxkbfile-dev \
-    && sudo rm -rf /var/lib/apt/lists/*
-

.gitpod.yml

@@ -1,11 +0,0 @@
-image:
-  file: .gitpod.dockerfile
-
-tasks:
-    - before: nvm install 20.15.1 && nvm use 20.15.1
-      init: npm install
-      command: npm run server:start
-
-ports:
-    - port: 8080
-      onOpen: open-preview

.mailmap

@@ -0,0 +1,2 @@
+Adam Zivner <adam.zivner@gmail.com>
+Adam Zivner <zadam.apps@gmail.com>

.nvmrc

@@ -0,0 +1 @@
+22.16.0

.nxignore

@@ -0,0 +1,2 @@
+_regroup
+_regroup_monorepo

.prettierignore

@@ -1,6 +0,0 @@
-*.html
-*.md
-*.yml
-libraries/*
-docs/*
-src/public/app/doc_notes/**/*

.prettierrc

@@ -1,22 +0,0 @@
-{
-    "printWidth": 200,
-    "tabWidth": 4,
-    "useTabs": false,
-    "semi": true,
-    "singleQuote": false,
-    "quoteProps": "as-needed",
-    "trailingComma": "none",
-    "bracketSpacing": true,
-    "arrowParens": "always",
-    "proseWrap": "preserve",
-    "htmlWhitespaceSensitivity": "css",
-    "endOfLine": "lf",
-    "overrides": [
-        {
-            "files": ["*.json"],
-            "options": {
-                "tabWidth": 2
-            }
-        }
-    ]
-}

.vscode/extensions.json

@@ -1,7 +1,16 @@
 {
   "recommendations": [
-    "lokalise.i18n-ally",
+    "dbaeumer.vscode-eslint",
     "editorconfig.editorconfig",
-    "vitest.explorer"
+    "lokalise.i18n-ally",
+    "ms-azuretools.vscode-docker",
+    "ms-playwright.playwright",
+    "nrwl.angular-console",
+    "redhat.vscode-yaml",
+    "tobermory.es6-string-html",
+    "vitest.explorer",
+    "yzhang.markdown-all-in-one",
+    "svelte.svelte-vscode",
+    "bradlc.vscode-tailwindcss"
   ]
 }

.vscode/i18n-ally-reviews.yml

@@ -1,20 +0,0 @@
-# Review comments generated by i18n-ally. Please commit this file.
-
-reviews:
-  help.inPageSearch:
-    description: >-
-      Describes the shortcut which triggers a search within the current
-      page/note only
-  add_label.to_value:
-    locales:
-      fr:
-        comments:
-          - user:
-              name: Potjoe-97
-              email: giann@LAPTOPT490-GF
-            id: QXec0JUoxfGmMlpch-B1S
-            comment: ''
-            suggestion: vers la valeur
-            type: request_change
-            time: '2024-10-15T16:57:06.188Z'
-            resolved: true

.vscode/launch.json

@@ -1,22 +0,0 @@
-{
-  "version": "0.2.0",
-  "configurations": [
-    // nodemon should be installed globally, use npm i -g nodemon
-    {
-      "console": "integratedTerminal",
-      "internalConsoleOptions": "neverOpen",
-      "name": "nodemon start-server",
-      "program": "${workspaceFolder}/src/www",
-      "request": "launch",
-      "restart": true,
-      "runtimeExecutable": "nodemon",
-      "env": {
-        "TRILIUM_ENV": "dev",
-        "TRILIUM_DATA_DIR": "./data"
-      },
-      "skipFiles": ["<node_internals>/**"],
-      "type": "node",
-      "outputCapture": "std"
-    }
-  ]
-}

.vscode/settings.json

@@ -1,30 +1,32 @@
 {
-  "editor.formatOnSave": false,
-  "editor.defaultFormatter": "esbenp.prettier-vscode",
-  "files.eol": "\n",
-  "typescript.tsdk": "node_modules/typescript/lib",
-  "i18n-ally.sourceLanguage": "en",
-  "i18n-ally.keystyle": "nested",
-  "i18n-ally.localesPaths": ["./src/public/translations", "./translations"],
-  "[jsonc]": {
-    "editor.defaultFormatter": "vscode.json-language-features"
-  },
-  "[javascript]": {
-    "editor.defaultFormatter": "vscode.typescript-language-features"
-  },
-  "[typescript]": {
-    "editor.defaultFormatter": "vscode.typescript-language-features"
-  },
-  "github-actions.workflows.pinned.workflows": [".github/workflows/nightly.yml"],
-  "[css]": {
-    "editor.defaultFormatter": "vscode.css-language-features"
-  },
-  "npm.exclude": [
-    "**/build",
-    "**/dist",
-    "**/out/**"
-  ],
-  "[xml]": {
-    "editor.defaultFormatter": "redhat.vscode-xml"
-  }
-}
+    "editor.formatOnSave": false,
+    "files.eol": "\n",
+    "i18n-ally.sourceLanguage": "en",
+    "i18n-ally.keystyle": "nested",
+    "i18n-ally.localesPaths": [
+        "apps/server/src/assets/translations",
+        "apps/client/src/translations"
+    ],
+    "npm.exclude": [
+        "**/dist",
+    ],
+    "[jsonc]": {
+        "editor.defaultFormatter": "vscode.json-language-features"
+    },
+    "[javascript]": {
+        "editor.defaultFormatter": "vscode.typescript-language-features"
+    },
+    "[typescript]": {
+        "editor.defaultFormatter": "vscode.typescript-language-features"
+    },
+    "[css]": {
+        "editor.defaultFormatter": "vscode.css-language-features"
+    },
+    "github-actions.workflows.pinned.workflows": [
+        ".github/workflows/nightly.yml"
+    ],
+    "typescript.validate.enable": true,
+    "typescript.tsserver.experimental.enableProjectDiagnostics": true,
+    "typescript.tsdk": "node_modules/typescript/lib",
+    "typescript.enablePromptUseWorkspaceTsdk": true
+}

Dockerfile

@@ -1,48 +0,0 @@
-# Build stage
-FROM node:22.14.0-bullseye-slim AS builder
-
-WORKDIR /usr/src/app/build
-
-# Copy only necessary files for build
-COPY . .
-
-# Build and cleanup in a single layer
-RUN npm ci && \
-    npm run build:prepare-dist && \
-    npm cache clean --force && \
-    rm -rf build/node_modules && \
-    mv build/* \
-      start-docker.sh \
-      /usr/src/app/ && \
-    rm -rf \
-      /usr/src/app/build \
-      /tmp/node-compile-cache
-
-#TODO: improve node_modules handling in copy-dist/Dockerfile -> remove duplicated work
-#      currently copy-dist will copy certain node_module folders, but in the Dockerfile we delete them again (to keep image size down),
-#      as we install necessary dependencies in runtime buildstage anyways
-
-# Runtime stage
-FROM node:22.14.0-bullseye-slim
-
-WORKDIR /usr/src/app
-
-# Install only runtime dependencies
-RUN apt-get update && \
-    apt-get install -y --no-install-recommends \
-      gosu && \
-    rm -rf \
-      /var/lib/apt/lists/* \
-      /var/cache/apt/*
-
-COPY --from=builder /usr/src/app ./
-
-RUN sed -i "/electron/d" package.json && \
-    npm ci --omit=dev && \
-    npm cache clean --force && \
-    rm -rf /tmp/node-compile-cache
-
-# Configure container
-EXPOSE 8080
-CMD [ "./start-docker.sh" ]
-HEALTHCHECK --start-period=10s CMD exec gosu node node docker_healthcheck.js

Dockerfile.alpine

@@ -1,46 +0,0 @@
-# Build stage
-FROM node:22.14.0-alpine AS builder
-
-WORKDIR /usr/src/app/build
-
-# Copy only necessary files for build
-COPY . .
-
-# Build and cleanup in a single layer
-RUN npm ci && \
-    npm run build:prepare-dist && \
-    npm cache clean --force && \
-    rm -rf build/node_modules && \
-    mv build/* \
-      start-docker.sh \
-      /usr/src/app/ && \
-    rm -rf \
-      /usr/src/app/build \
-      /tmp/node-compile-cache
-
-#TODO: improve node_modules handling in copy-dist/Dockerfile -> remove duplicated work
-#      currently copy-dist will copy certain node_module folders, but in the Dockerfile we delete them again (to keep image size down),
-#      as we install necessary dependencies in runtime buildstage anyways
-
-# Runtime stage
-FROM node:22.14.0-alpine
-
-# Install runtime dependencies
-RUN apk add --no-cache su-exec shadow
-
-WORKDIR /usr/src/app
-
-COPY --from=builder /usr/src/app ./
-
-RUN sed -i "/electron/d" package.json && \
-    npm ci --omit=dev && \
-    npm cache clean --force && \
-    rm -rf /tmp/node-compile-cache
-
-# Add application user
-RUN adduser -s /bin/false node; exit 0
-
-# Configure container
-EXPOSE 8080
-CMD [ "./start-docker.sh" ]
-HEALTHCHECK --start-period=10s CMD exec su-exec node node docker_healthcheck.js

README.md

@@ -1,128 +1,2 @@
-# TriliumNext Notes
-
-![Docker Pulls](https://img.shields.io/docker/pulls/triliumnext/notes) ![GitHub Downloads (all assets, all releases)](https://img.shields.io/github/downloads/triliumnext/notes/total)
-
-[English](./README.md) | [Chinese](./README-ZH_CN.md) | [Russian](./README.ru.md) | [Japanese](./README.ja.md) | [Italian](./README.it.md) | [Spanish](./README.es.md)
-
-TriliumNext Notes is an open-source, cross-platform hierarchical note taking application with focus on building large personal knowledge bases.
-
-See [screenshots](https://triliumnext.github.io/Docs/Wiki/screenshot-tour) for quick overview:
-
-<a href="https://triliumnext.github.io/Docs/Wiki/screenshot-tour"><img src="https://github.com/TriliumNext/Docs/blob/main/Wiki/images/screenshot.png?raw=true" alt="Trilium Screenshot" width="1000"></a>
-
-## ⚠️ Why TriliumNext?
-
-[The original Trilium project is in maintenance mode](https://github.com/zadam/trilium/issues/4620)
-
-### Migrating from Trilium?
-
-There are no special migration steps to migrate from a zadam/Trilium instance to a TriliumNext/Notes instance. Just upgrade your Trilium instance to the latest version and [install TriliumNext/Notes as usual](#-installation)
-
-Versions up to and including [v0.90.4](https://github.com/TriliumNext/Notes/releases/tag/v0.90.4) are compatible with the latest zadam/trilium version of [v0.63.7](https://github.com/zadam/trilium/releases/tag/v0.63.7). Any later versions of TriliumNext have their sync versions incremented.
-
-## 💬 Discuss with us
-
-Feel free to join our official conversations. We would love to hear what features, suggestions, or issues you may have!
-
-- [Matrix](https://matrix.to/#/#triliumnext:matrix.org) (For synchronous discussions)
-  - The `General` Matrix room is also bridged to [XMPP](xmpp:discuss@trilium.thisgreat.party?join)
-- [Github Discussions](https://github.com/TriliumNext/Notes/discussions) (For Asynchronous discussions)
-- [Wiki](https://triliumnext.github.io/Docs/) (For common how-to questions and user guides)
-
-## 🎁 Features
-
-* Notes can be arranged into arbitrarily deep tree. Single note can be placed into multiple places in the tree (see [cloning](https://triliumnext.github.io/Docs/Wiki/cloning-notes))
-* Rich WYSIWYG note editing including e.g. tables, images and [math](https://triliumnext.github.io/Docs/Wiki/text-notes) with markdown [autoformat](https://triliumnext.github.io/Docs/Wiki/text-notes#autoformat)
-* Support for editing [notes with source code](https://triliumnext.github.io/Docs/Wiki/code-notes), including syntax highlighting
-* Fast and easy [navigation between notes](https://triliumnext.github.io/Docs/Wiki/note-navigation), full text search and [note hoisting](https://triliumnext.github.io/Docs/Wiki/note-hoisting)
-* Seamless [note versioning](https://triliumnext.github.io/Docs/Wiki/note-revisions)
-* Note [attributes](https://triliumnext.github.io/Docs/Wiki/attributes) can be used for note organization, querying and advanced [scripting](https://triliumnext.github.io/Docs/Wiki/scripts)
-* [Synchronization](https://triliumnext.github.io/Docs/Wiki/synchronization) with self-hosted sync server
-  * there's a [3rd party service for hosting synchronisation server](https://trilium.cc/paid-hosting)
-* [Sharing](https://triliumnext.github.io/Docs/Wiki/sharing) (publishing) notes to public internet
-* Strong [note encryption](https://triliumnext.github.io/Docs/Wiki/protected-notes) with per-note granularity
-* Sketching diagrams with built-in Excalidraw (note type "canvas")
-* [Relation maps](https://triliumnext.github.io/Docs/Wiki/relation-map) and [link maps](https://triliumnext.github.io/Docs/Wiki/link-map) for visualizing notes and their relations
-* [Scripting](https://triliumnext.github.io/Docs/Wiki/scripts) - see [Advanced showcases](https://triliumnext.github.io/Docs/Wiki/advanced-showcases)
-* [REST API](https://triliumnext.github.io/Docs/Wiki/etapi) for automation
-* Scales well in both usability and performance upwards of 100 000 notes
-* Touch optimized [mobile frontend](https://triliumnext.github.io/Docs/Wiki/mobile-frontend) for smartphones and tablets
-* [Night theme](https://triliumnext.github.io/Docs/Wiki/themes)
-* [Evernote](https://triliumnext.github.io/Docs/Wiki/evernote-import) and [Markdown import & export](https://triliumnext.github.io/Docs/Wiki/markdown)
-* [Web Clipper](https://triliumnext.github.io/Docs/Wiki/web-clipper) for easy saving of web content
-
-✨ Check out the following third-party resources/communities for more TriliumNext related goodies:
-
-- [awesome-trilium](https://github.com/Nriver/awesome-trilium) for 3rd party themes, scripts, plugins and more.
-- [TriliumRocks!](https://trilium.rocks/) for tutorials, guides, and much more.
-
-## 🏗 Installation
-
-### Desktop
-
-To use TriliumNext on your desktop machine (Linux, MacOS, and Windows) you have a few options:
-
-* Download the binary release for your platform from the [latest release page](https://github.com/TriliumNext/Notes/releases/latest), unzip the package and run the ```trilium``` executable.
-* Access TriliumNext via the web interface of a server installation (see below)
-    * Currently only the latest versions of Chrome & Firefox are supported (and tested).
-* (Coming Soon) TriliumNext will also be provided as a Flatpak
-
-#### MacOS
-Currently when running TriliumNext/Notes on MacOS, you may get the following error:
-> Apple could not verify "TriliumNext Notes" is free of malware and may harm your Mac or compromise your privacy.
-
-You will need to run the command on your shell to resolve the error (documented [here](https://github.com/TriliumNext/Notes/issues/329#issuecomment-2287164137)):
-
-```bash
-xattr -c "/path/to/Trilium Next.app"
-```
-
-### Mobile
-
-To use TriliumNext on a mobile device:
-
-* Use a mobile web browser to access the mobile interface of a server installation (see below)
-* Use of a mobile app is not yet supported ([see here](https://github.com/TriliumNext/Notes/issues/72)) to track mobile improvements.
-
-### Server
-
-To install TriliumNext on your own server (including via Docker from [Dockerhub](https://hub.docker.com/r/triliumnext/notes)) follow [the server installation docs](https://triliumnext.github.io/Docs/Wiki/server-installation).
-
-## 📝 Documentation
-
-[See wiki for complete list of documentation pages.](https://triliumnext.github.io/Docs)
-
-You can also read [Patterns of personal knowledge base](https://triliumnext.github.io/Docs/Wiki/patterns-of-personal-knowledge) to get some inspiration on how you might use TriliumNext.
-
-## 💻 Contribute
-
-### Code
-
-```shell
-git clone https://github.com/TriliumNext/Notes.git
-cd Notes
-npm install
-npm run server:start
-```
-
-### Documentation
-
-Head on over to our [Docs repo](https://github.com/TriliumNext/Docs)
-
-## 👏 Shoutouts
-
-* [CKEditor 5](https://github.com/ckeditor/ckeditor5) - best WYSIWYG editor on the market, very interactive and listening team
-* [FancyTree](https://github.com/mar10/fancytree) - very feature rich tree library without real competition. TriliumNext Notes would not be the same without it.
-* [CodeMirror](https://github.com/codemirror/CodeMirror) - code editor with support for huge amount of languages
-* [jsPlumb](https://github.com/jsplumb/jsplumb) - visual connectivity library without competition. Used in [relation maps](https://triliumnext.github.io/Docs/Wiki/relation-map.html) and [link maps](https://triliumnext.github.io/Docs/Wiki/note-map.html#link-map)
-
-## 🤝 Support
-
-Support for the TriliumNext organization will be possible in the near future. For now, you can:
-- Support continued development on TriliumNext by supporting our developers: [eliandoran](https://github.com/sponsors/eliandoran) (See the [repository insights]([developers]([url](https://github.com/TriliumNext/Notes/graphs/contributors))) for a full list)
-- Show a token of gratitude to the original Trilium developer ([zadam](https://github.com/sponsors/zadam)) via [PayPal](https://paypal.me/za4am) or Bitcoin (bitcoin:bc1qv3svjn40v89mnkre5vyvs2xw6y8phaltl385d2).
-
-
-## 🔑 License
-
-This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
+> [!IMPORTANT]
+> TriliumNext started as a fork of the original Trilium repository (`zadam/trilium`). @zadam transferred the original repo to us so the work will continue in https://github.com/TriliumNext/Trilium.

_check_ts_progress.sh

@@ -1,13 +0,0 @@
-#!/usr/bin/env bash
-
-cd src/public
-echo Summary
-cloc HEAD \
-    --git --md \
-    --include-lang=javascript,typescript
-
-echo By file
-cloc HEAD \
-    --git --md \
-    --include-lang=javascript,typescript \
-    --by-file | grep \.js\|

_regroup/bin/translation.sh

@@ -25,15 +25,16 @@ stats() {
 	# Print the number of existing strings on the JSON files for each locale
 	s=$(number_of_keys "${paths[0]}/en/server.json")
 	c=$(number_of_keys "${paths[1]}/en/translation.json")
-	echo "| locale |server strings |client strings |"
-	echo "|--------|---------------|---------------|"
-	echo "|   en   |      ${s}      |     ${c}      |"
+	echo "| locale | server strings | client strings |"
+	echo "|--------|----------------|----------------|"
+	echo "|   en   |       ${s}      |      ${c}      |"
+	echo "|--------|----------------|----------------|"
 	for locale in "${locales[@]}"; do
 		s=$(number_of_keys "${paths[0]}/${locale}/server.json")
 		c=$(number_of_keys "${paths[1]}/${locale}/translation.json")
 		n1=$(((8 - ${#locale}) / 2))
 		n2=$((n1 == 1 ? n1 + 1 : n1))
-		echo "|$(printf "%${n1}s")${locale}$(printf "%${n2}s")|      ${s}      |     ${c}      |"
+		echo "|$(printf "%${n1}s")${locale}$(printf "%${n2}s")|       ${s}      |      ${c}      |"
 	done
 }
 
@@ -78,7 +79,10 @@ file_path="$(
 	cd -- "$(dirname "${0}")" >/dev/null 2>&1 || exit
 	pwd -P
 )"
-paths=("${file_path}/../translations/" "${file_path}/../src/public/translations/")
+paths=(
+	"${file_path}/../../apps/server/src/assets/translations/"
+	"${file_path}/../../apps/client/src/translations/"
+)
 locales=(cn de es fr pt_br ro tw)
 
 if [ $# -eq 1 ]; then

_regroup/eslint.config.js

@@ -0,0 +1,51 @@
+import eslint from "@eslint/js";
+import tseslint from "typescript-eslint";
+import simpleImportSort from "eslint-plugin-simple-import-sort";
+
+export default tseslint.config(
+    eslint.configs.recommended,
+    tseslint.configs.recommended,
+    // consider using rules below, once we have a full TS codebase and can be more strict
+    // tseslint.configs.strictTypeChecked,
+    // tseslint.configs.stylisticTypeChecked,
+    // tseslint.configs.recommendedTypeChecked,
+    {
+        languageOptions: {
+            parserOptions: {
+                projectService: true,
+                tsconfigRootDir: import.meta.dirname
+            }
+        }
+    },
+    {
+        plugins: {
+            "simple-import-sort": simpleImportSort
+        }
+    },
+    {
+        rules: {
+            // add rule overrides here
+            "no-undef": "off",
+            "no-unused-vars": "off",
+            "@typescript-eslint/no-unused-vars": [
+                "error",
+                {
+                    argsIgnorePattern: "^_",
+                    varsIgnorePattern: "^_"
+                }
+            ],
+            "simple-import-sort/imports": "error",
+            "simple-import-sort/exports": "error"
+        }
+    },
+    {
+        ignores: [
+            "build/*",
+            "dist/*",
+            "docs/*",
+            "demo/*",
+            "src/public/app-dist/*",
+            "src/public/app/doc_notes/*"
+        ]
+    }
+);

_regroup/eslint.format.config.js

@@ -0,0 +1,47 @@
+import stylistic from "@stylistic/eslint-plugin";
+import tsParser from "@typescript-eslint/parser";
+
+// eslint config just for formatting rules
+// potentially to be merged with the linting rules into one single config,
+// once we have fixed the majority of lint errors
+
+// Go to https://eslint.style/rules/default/${rule_without_prefix} to check the rule details
+export const stylisticRules = {
+    "@stylistic/indent": [ "error", 4 ],
+    "@stylistic/quotes": [ "error", "double", { avoidEscape: true, allowTemplateLiterals: "always" } ],
+    "@stylistic/semi": [ "error", "always" ],
+    "@stylistic/quote-props": [ "error", "consistent-as-needed" ],
+    "@stylistic/max-len": [ "error", { code: 100 } ],
+    "@stylistic/comma-dangle": [ "error", "never" ],
+    "@stylistic/linebreak-style": [ "error", "unix" ],
+    "@stylistic/array-bracket-spacing": [ "error", "always" ],
+    "@stylistic/object-curly-spacing": [ "error", "always" ],
+    "@stylistic/padded-blocks": [ "error", { classes: "always" } ]
+};
+
+export default [
+    {
+        files: [ "**/*.{js,ts,mjs,cjs}" ],
+        languageOptions: {
+            parser: tsParser
+        },
+        plugins: {
+            "@stylistic": stylistic
+        },
+        rules: {
+            ...stylisticRules
+        }
+    },
+    {
+        ignores: [
+            "build/*",
+            "dist/*",
+            "docs/*",
+            "demo/*",
+            // TriliumNextTODO: check if we want to format packages here as well - for now skipping it
+            "packages/*",
+            "src/public/app-dist/*",
+            "src/public/app/doc_notes/*"
+        ]
+    }
+];

_regroup/package.json

@@ -0,0 +1,58 @@
+{
+  "main": "./electron-main.js",
+  "bin": {
+    "trilium": "src/main.js"
+  },
+  "type": "module",
+  "scripts": {    
+    "server:start-safe": "cross-env TRILIUM_DATA_DIR=./data TRILIUM_ENV=dev nodemon src/main.ts",
+    "server:start-no-dir": "cross-env TRILIUM_ENV=dev nodemon src/main.ts",
+    "server:start-test": "npm run server:switch && rimraf ./data-test && cross-env TRILIUM_DATA_DIR=./data-test TRILIUM_ENV=dev TRILIUM_PORT=9999 nodemon src/main.ts",
+    "server:qstart": "npm run server:switch && npm run server:start",
+    "server:switch": "rimraf ./node_modules/better-sqlite3 && npm install",
+    "electron:start-no-dir": "cross-env NODE_OPTIONS=\"--import tsx\" TRILIUM_ENV=dev TRILIUM_PORT=37742 electron --inspect=5858 .",
+    "electron:start-nix": "electron-rebuild --version 33.3.1 && cross-env NODE_OPTIONS=\"--import tsx\" TRILIUM_DATA_DIR=./data TRILIUM_ENV=dev nix-shell -p electron_33 --run \"electron ./electron-main.ts --inspect=5858 .\"",
+    "electron:start-nix-no-dir": "electron-rebuild --version 33.3.1 && cross-env NODE_OPTIONS=\"--import tsx\" TRILIUM_ENV=dev TRILIUM_PORT=37742 nix-shell -p electron_33 --run \"electron ./electron-main.ts --inspect=5858 .\"",    
+    "electron:start-prod-no-dir": "npm run build:prepare-dist && cross-env TRILIUM_ENV=prod electron --inspect=5858 .",
+    "electron:start-prod-nix": "electron-rebuild --version 33.3.1 && npm run build:prepare-dist && cross-env TRILIUM_DATA_DIR=./data TRILIUM_ENV=dev nix-shell -p electron_33 --run \"electron ./dist/electron-main.js --inspect=5858 .\"",
+    "electron:start-prod-nix-no-dir": "electron-rebuild --version 33.3.1 && npm run build:prepare-dist && cross-env TRILIUM_ENV=dev nix-shell -p electron_33 --run \"electron ./dist/electron-main.js --inspect=5858 .\"",
+    "electron:qstart": "npm run electron:switch && npm run electron:start",
+    "electron:switch": "electron-rebuild",    
+    "docs:build": "typedoc",        
+    "test": "npm run client:test && npm run server:test",    
+    "client:test": "cross-env TRILIUM_ENV=dev TRILIUM_DATA_DIR=./integration-tests/db TRILIUM_INTEGRATION_TEST=memory vitest --root src/public/app",
+    "client:coverage": "cross-env TRILIUM_ENV=dev TRILIUM_DATA_DIR=./integration-tests/db TRILIUM_INTEGRATION_TEST=memory vitest --root src/public/app --coverage",
+    "test:playwright": "playwright test --workers 1",
+    "test:integration-edit-db": "cross-env TRILIUM_INTEGRATION_TEST=edit TRILIUM_PORT=8081 TRILIUM_ENV=dev TRILIUM_DATA_DIR=./integration-tests/db nodemon src/main.ts",
+    "test:integration-mem-db": "cross-env    nodemon src/main.ts",
+    "test:integration-mem-db-dev": "cross-env TRILIUM_INTEGRATION_TEST=memory TRILIUM_PORT=8082 TRILIUM_ENV=dev TRILIUM_DATA_DIR=./integration-tests/db nodemon src/main.ts",
+    "dev:watch-dist": "tsx ./bin/watch-dist.ts",
+    "dev:format-check": "eslint -c eslint.format.config.js .",
+    "dev:format-fix": "eslint -c eslint.format.config.js . --fix",
+    "dev:linter-check": "eslint .",
+    "dev:linter-fix": "eslint . --fix",    
+    "chore:generate-document": "cross-env nodemon ./bin/generate_document.ts 1000",
+    "chore:generate-openapi": "tsx bin/generate-openapi.js"
+  },
+  "devDependencies": {    
+    "@playwright/test": "1.53.1",
+    "@stylistic/eslint-plugin": "4.4.1",        
+    "@types/express": "5.0.3",    
+    "@types/node": "22.15.32",    
+    "@types/yargs": "17.0.33",
+    "@vitest/coverage-v8": "3.2.4",
+    "eslint": "9.29.0",
+    "eslint-plugin-simple-import-sort": "12.1.1",
+    "esm": "3.2.25",
+    "jsdoc": "4.0.4",
+    "lorem-ipsum": "2.0.8",    
+    "rcedit": "4.0.1",
+    "rimraf": "6.0.1",    
+    "tslib": "2.8.1",    
+    "typedoc": "0.28.5",
+    "typedoc-plugin-missing-exports": "4.0.0"
+  },
+  "optionalDependencies": {
+    "appdmg": "0.6.6"
+  }
+}

_regroup/typedoc.json

@@ -0,0 +1,15 @@
+{
+  "entryPoints": [
+    "src/services/backend_script_entrypoint.ts",
+    "src/public/app/services/frontend_script_entrypoint.ts"
+  ],
+  "plugin": [
+    "typedoc-plugin-missing-exports"
+  ],
+  "outputs": [
+    {
+      "name": "html",
+      "path": "./docs/Script API"
+    }
+  ]
+}

apps/client/.env

@@ -0,0 +1,4 @@
+# The development license key for premium CKEditor features.
+# Note: This key must only be used for the Trilium Notes project.
+# Expires on: 2025-09-13
+VITE_CKEDITOR_KEY=eyJhbGciOiJFUzI1NiJ9.eyJleHAiOjE3NTc3MjE1OTksImp0aSI6ImFiN2E0NjZmLWJlZGMtNDNiYy1iMzU4LTk0NGQ0YWJhY2I3ZiIsImRpc3RyaWJ1dGlvbkNoYW5uZWwiOlsic2giLCJkcnVwYWwiXSwid2hpdGVMYWJlbCI6dHJ1ZSwiZmVhdHVyZXMiOlsiRFJVUCIsIkNNVCIsIkRPIiwiRlAiLCJTQyIsIlRPQyIsIlRQTCIsIlBPRSIsIkNDIiwiTUYiLCJTRUUiLCJFQ0giLCJFSVMiXSwidmMiOiI1MzlkOWY5YyJ9.2rvKPql4hmukyXhEtWPZ8MLxKvzPIwzCdykO653g7IxRRZy2QJpeRszElZx9DakKYZKXekVRAwQKgHxwkgbE_w

apps/client/.env.production

@@ -0,0 +1 @@
+VITE_CKEDITOR_ENABLE_INSPECTOR=false

apps/client/.swcrc

@@ -0,0 +1,8 @@
+{
+  "jsc": {
+    "parser": {
+      "syntax": "typescript"
+    },
+    "target": "es2016"
+  }
+}

apps/client/eslint.config.mjs

@@ -0,0 +1,5 @@
+import baseConfig from "../../eslint.config.mjs";
+
+export default [
+    ...baseConfig
+];

apps/client/package.json

@@ -0,0 +1,84 @@
+{
+  "name": "@triliumnext/client",
+  "version": "0.95.0",
+  "description": "JQuery-based client for TriliumNext, used for both web and desktop (via Electron)",
+  "private": true,
+  "license": "AGPL-3.0-only",
+  "author": {
+    "name": "TriliumNext Notes Team",
+    "email": "contact@eliandoran.me",
+    "url": "https://github.com/TriliumNext/Notes"
+  },
+  "dependencies": {
+    "@eslint/js": "9.29.0",
+    "@excalidraw/excalidraw": "0.18.0",
+    "@fullcalendar/core": "6.1.17",
+    "@fullcalendar/daygrid": "6.1.17",
+    "@fullcalendar/interaction": "6.1.17",
+    "@fullcalendar/list": "6.1.17",
+    "@fullcalendar/multimonth": "6.1.17",
+    "@fullcalendar/timegrid": "6.1.17",
+    "@mermaid-js/layout-elk": "0.1.7",
+    "@mind-elixir/node-menu": "1.0.5",
+    "@popperjs/core": "2.11.8",
+    "@triliumnext/ckeditor5": "workspace:*",
+    "@triliumnext/codemirror": "workspace:*",
+    "@triliumnext/commons": "workspace:*",
+    "@triliumnext/highlightjs": "workspace:*",
+    "@triliumnext/share-theme": "workspace:*",
+    "autocomplete.js": "0.38.1",
+    "bootstrap": "5.3.7",
+    "boxicons": "2.1.4",
+    "dayjs": "1.11.13",
+    "dayjs-plugin-utc": "0.1.2",
+    "debounce": "2.2.0",
+    "draggabilly": "3.0.0",
+    "force-graph": "1.49.6",
+    "globals": "16.2.0",
+    "i18next": "25.2.1",
+    "i18next-http-backend": "3.0.2",
+    "jquery": "3.7.1",
+    "jquery-hotkeys": "0.2.2",
+    "jquery.fancytree": "2.38.5",
+    "jsplumb": "2.15.6",
+    "katex": "0.16.22",
+    "knockout": "3.5.1",
+    "leaflet": "1.9.4",
+    "leaflet-gpx": "2.2.0",
+    "mark.js": "8.11.1",
+    "marked": "15.0.12",
+    "mermaid": "11.6.0",
+    "mind-elixir": "4.6.1",
+    "normalize.css": "8.0.1",
+    "panzoom": "9.4.3",
+    "preact": "10.26.9",
+    "split.js": "1.6.5",
+    "svg-pan-zoom": "3.6.2",
+    "vanilla-js-wheel-zoom": "9.0.4"
+  },
+  "devDependencies": {
+    "@ckeditor/ckeditor5-inspector": "4.1.0",
+    "@types/bootstrap": "5.2.10",
+    "@types/jquery": "3.5.32",
+    "@types/leaflet": "1.9.18",
+    "@types/leaflet-gpx": "1.3.7",
+    "@types/mark.js": "8.11.12",
+    "copy-webpack-plugin": "13.0.0",
+    "happy-dom": "18.0.1",
+    "script-loader": "0.7.2",
+    "vite-plugin-static-copy": "3.0.2"
+  },
+  "nx": {
+    "name": "client",
+    "targets": {
+      "serve": {
+        "dependsOn": [
+          "^build"
+        ]
+      },
+      "circular-deps": {
+        "command": "pnpx dpdm -T {projectRoot}/src/**/*.ts --tree=false --warning=false --skip-dynamic-imports=circular"
+      }
+    }
+  }
+}

apps/client/src/asset_path.ts

@@ -0,0 +1,3 @@
+import packageJson from "../package.json" with { type: "json" };
+
+export default `assets/v${packageJson.version}`;

apps/client/src/components/app_context.ts

@@ -1,9 +1,8 @@
 import froca from "../services/froca.js";
-import bundleService from "../services/bundle.js";
 import RootCommandExecutor from "./root_command_executor.js";
 import Entrypoints, { type SqlExecuteResults } from "./entrypoints.js";
 import options from "../services/options.js";
-import utils from "../services/utils.js";
+import utils, { hasTouchBar } from "../services/utils.js";
 import zoomComponent from "./zoom.js";
 import TabManager from "./tab_manager.js";
 import Component from "./component.js";
@@ -22,9 +21,13 @@ import type LoadResults from "../services/load_results.js";
 import type { Attribute } from "../services/attribute_parser.js";
 import type NoteTreeWidget from "../widgets/note_tree.js";
 import type { default as NoteContext, GetTextEditorCallback } from "./note_context.js";
-import type { ContextMenuEvent } from "../menus/context_menu.js";
 import type TypeWidget from "../widgets/type_widgets/type_widget.js";
 import type EditableTextTypeWidget from "../widgets/type_widgets/editable_text.js";
+import type { NativeImage, TouchBar } from "electron";
+import TouchBarComponent from "./touch_bar.js";
+import type { CKTextEditor } from "@triliumnext/ckeditor5";
+import type CodeMirror from "@triliumnext/codemirror";
+import { StartupChecks } from "./startup_checks.js";
 
 interface Layout {
     getRootWidget: (appContext: AppContext) => RootWidget;
@@ -52,13 +55,13 @@ export interface ContextMenuCommandData extends CommandData {
     node: Fancytree.FancytreeNode;
     notePath?: string;
     noteId?: string;
-    selectedOrActiveBranchIds?: any; // TODO: Remove any once type is defined
-    selectedOrActiveNoteIds: any; // TODO: Remove  any once type is defined
+    selectedOrActiveBranchIds: string[];
+    selectedOrActiveNoteIds?: string[];
 }
 
 export interface NoteCommandData extends CommandData {
-    notePath?: string;
-    hoistedNoteId?: string;
+    notePath?: string | null;
+    hoistedNoteId?: string | null;
     viewScope?: ViewScope;
 }
 
@@ -66,6 +69,11 @@ export interface ExecuteCommandData<T> extends CommandData {
     resolve: (data: T) => void;
 }
 
+export interface NoteSwitchedContext {
+    noteContext: NoteContext;
+    notePath: string | null | undefined;
+}
+
 /**
  * The keys represent the different commands that can be triggered via {@link AppContext#triggerCommand} (first argument), and the values represent the data or arguments definition of the given command. All data for commands must extend {@link CommandData}.
  */
@@ -83,6 +91,8 @@ export type CommandMappings = {
     closeHlt: CommandData;
     showLaunchBarSubtree: CommandData;
     showRevisions: CommandData;
+    showLlmChat: CommandData;
+    createAiChat: CommandData;
     showOptions: CommandData & {
         section: string;
     };
@@ -118,18 +128,23 @@ export type CommandMappings = {
     openAboutDialog: CommandData;
     hideFloatingButtons: {};
     hideLeftPane: CommandData;
+    showCpuArchWarning: CommandData;
     showLeftPane: CommandData;
     hoistNote: CommandData & { noteId: string };
     leaveProtectedSession: CommandData;
     enterProtectedSession: CommandData;
-
+    noteContextReorder: CommandData & {
+        ntxIdsInOrder: string[];
+        oldMainNtxId?: string | null;
+        newMainNtxId?: string | null;
+    };
     openInTab: ContextMenuCommandData;
     openNoteInSplit: ContextMenuCommandData;
     toggleNoteHoisting: ContextMenuCommandData;
     insertNoteAfter: ContextMenuCommandData;
     insertChildNote: ContextMenuCommandData;
     delete: ContextMenuCommandData;
-    editNoteTitle: ContextMenuCommandData;
+    editNoteTitle: {};
     protectSubtree: ContextMenuCommandData;
     unprotectSubtree: ContextMenuCommandData;
     openBulkActionsDialog:
@@ -161,6 +176,8 @@ export type CommandMappings = {
     moveNoteDownInHierarchy: ContextMenuCommandData;
     selectAllNotesInParent: ContextMenuCommandData;
 
+    createNoteIntoInbox: CommandData;
+
     addNoteLauncher: ContextMenuCommandData;
     addScriptLauncher: ContextMenuCommandData;
     addWidgetLauncher: ContextMenuCommandData;
@@ -173,10 +190,10 @@ export type CommandMappings = {
         callback: (value: NoteDetailWidget | PromiseLike<NoteDetailWidget>) => void;
     };
     executeWithTextEditor: CommandData &
-        ExecuteCommandData<TextEditor> & {
-            callback?: GetTextEditorCallback;
-        };
-    executeWithCodeEditor: CommandData & ExecuteCommandData<null>;
+    ExecuteCommandData<CKTextEditor> & {
+        callback?: GetTextEditorCallback;
+    };
+    executeWithCodeEditor: CommandData & ExecuteCommandData<CodeMirror>;
     /**
      * Called upon when attempting to retrieve the content element of a {@link NoteContext}.
      * Generally should not be invoked manually, as it is used by {@link NoteContext.getContentElement}.
@@ -193,6 +210,8 @@ export type CommandMappings = {
     showPasswordNotSet: CommandData;
     showProtectedSessionPasswordDialog: CommandData;
     showUploadAttachmentsDialog: CommandData & { noteId: string };
+    showIncludeNoteDialog: CommandData & { textTypeWidget: EditableTextTypeWidget };
+    showAddLinkDialog: CommandData & { textTypeWidget: EditableTextTypeWidget, text: string };
     closeProtectedSessionPasswordDialog: CommandData;
     copyImageReferenceToClipboard: CommandData;
     copyImageToClipboard: CommandData;
@@ -238,6 +257,7 @@ export type CommandMappings = {
     scrollToEnd: CommandData;
     closeThisNoteSplit: CommandData;
     moveThisNoteSplit: CommandData & { isMovingLeft: boolean };
+    jumpToNote: CommandData;
 
     // Geomap
     deleteFromMap: { noteId: string };
@@ -252,11 +272,23 @@ export type CommandMappings = {
 
     refreshResults: {};
     refreshSearchDefinition: {};
+
+    geoMapCreateChildNote: CommandData;
+
+    buildTouchBar: CommandData & {
+        TouchBar: typeof TouchBar;
+        buildIcon(name: string): NativeImage;
+    };
+    refreshTouchBar: CommandData;
+    reloadTextEditor: CommandData;
 };
 
 type EventMappings = {
     initialRenderComplete: {};
     frocaReloaded: {};
+    setLeftPaneVisibility: {
+        leftPaneVisible: boolean | null;
+    }
     protectedSessionStarted: {};
     notesReloaded: {
         noteIds: string[];
@@ -292,20 +324,11 @@ type EventMappings = {
     beforeNoteContextRemove: {
         ntxIds: string[];
     };
-    noteSwitched: {
-        noteContext: NoteContext;
-        notePath?: string | null;
-    };
-    noteSwitchedAndActivatedEvent: {
-        noteContext: NoteContext;
-        notePath: string;
-    };
+    noteSwitched: NoteSwitchedContext;
+    noteSwitchedAndActivated: NoteSwitchedContext;
     setNoteContext: {
         noteContext: NoteContext;
     };
-    noteTypeMimeChangedEvent: {
-        noteId: string;
-    };
     reEvaluateHighlightsListWidgetVisibility: {
         noteId: string | undefined;
     };
@@ -326,14 +349,16 @@ type EventMappings = {
         noteId: string;
         ntxId: string | null;
     };
-    contextsReopenedEvent: {
-        mainNtxId: string;
+    contextsReopened: {
+        ntxId?: string;
+        mainNtxId: string | null;
         tabPosition: number;
+        afterNtxId?: string;
     };
     noteDetailRefreshed: {
         ntxId?: string | null;
     };
-    noteContextReorderEvent: {
+    noteContextReorder: {
         oldMainNtxId: string;
         newMainNtxId: string;
         ntxIdsInOrder: string[];
@@ -341,12 +366,11 @@ type EventMappings = {
     newNoteContextCreated: {
         noteContext: NoteContext;
     };
-    noteContextRemovedEvent: {
+    noteContextRemoved: {
         ntxIds: string[];
     };
-    exportSvg: {
-        ntxId: string | null | undefined;
-    };
+    exportSvg: { ntxId: string | null | undefined; };
+    exportPng: { ntxId: string | null | undefined; };
     geoMapCreateChildNote: {
         ntxId: string | null | undefined; // TODO: deduplicate ntxId
     };
@@ -362,12 +386,21 @@ type EventMappings = {
     relationMapResetPanZoom: { ntxId: string | null | undefined };
     relationMapResetZoomIn: { ntxId: string | null | undefined };
     relationMapResetZoomOut: { ntxId: string | null | undefined };
-    activeNoteChangedEvent: {};
+    activeNoteChanged: {};
     showAddLinkDialog: {
         textTypeWidget: EditableTextTypeWidget;
         text: string;
     };
-
+    showIncludeDialog: {
+        textTypeWidget: EditableTextTypeWidget;
+    };
+    openBulkActionsDialog: {
+        selectedOrActiveNoteIds: string[];
+    };
+    cloneNoteIdsTo: {
+        noteIds: string[];
+    };
+    refreshData: { ntxId: string | null | undefined };
 };
 
 export type EventListener<T extends EventNames> = {
@@ -397,7 +430,7 @@ type FilterByValueType<T, ValueType> = { [K in keyof T]: T[K] extends ValueType
  */
 export type FilteredCommandNames<T extends CommandData> = keyof Pick<CommandMappings, FilterByValueType<CommandMappings, T>>;
 
-class AppContext extends Component {
+export class AppContext extends Component {
     isMainWindow: boolean;
     components: Component[];
     beforeUnloadListeners: WeakRef<BeforeUploadListener>[];
@@ -436,13 +469,21 @@ class AppContext extends Component {
 
         this.tabManager.loadTabs();
 
+        const bundleService = (await import("../services/bundle.js")).default;
         setTimeout(() => bundleService.executeStartupBundles(), 2000);
     }
 
     initComponents() {
         this.tabManager = new TabManager();
 
-        this.components = [this.tabManager, new RootCommandExecutor(), new Entrypoints(), new MainTreeExecutors(), new ShortcutComponent()];
+        this.components = [
+            this.tabManager,
+            new RootCommandExecutor(),
+            new Entrypoints(),
+            new MainTreeExecutors(),
+            new ShortcutComponent(),
+            new StartupChecks()
+        ];
 
         if (utils.isMobile()) {
             this.components.push(new MobileScreenSwitcherExecutor());
@@ -455,6 +496,10 @@ class AppContext extends Component {
         if (utils.isElectron()) {
             this.child(zoomComponent);
         }
+
+        if (hasTouchBar) {
+            this.child(new TouchBarComponent());
+        }
     }
 
     renderWidgets() {

apps/client/src/components/entrypoints.ts

@@ -66,12 +66,13 @@ export default class Entrypoints extends Component {
     }
 
     async toggleNoteHoistingCommand({ noteId = appContext.tabManager.getActiveContextNoteId() }) {
-        if (!noteId) {
+        const activeNoteContext = appContext.tabManager.getActiveContext();
+
+        if (!activeNoteContext || !noteId) {
             return;
         }
 
         const noteToHoist = await froca.getNote(noteId);
-        const activeNoteContext = appContext.tabManager.getActiveContext();
 
         if (noteToHoist?.noteId === activeNoteContext.hoistedNoteId) {
             await activeNoteContext.unhoist();
@@ -83,6 +84,11 @@ export default class Entrypoints extends Component {
     async hoistNoteCommand({ noteId }: { noteId: string }) {
         const noteContext = appContext.tabManager.getActiveContext();
 
+        if (!noteContext) {
+            logError("hoistNoteCommand: noteContext is null");
+            return;
+        }
+
         if (noteContext.hoistedNoteId !== noteId) {
             await noteContext.setHoistedNoteId(noteId);
         }
@@ -174,7 +180,11 @@ export default class Entrypoints extends Component {
     }
 
     async runActiveNoteCommand() {
-        const { ntxId, note } = appContext.tabManager.getActiveContext();
+        const noteContext = appContext.tabManager.getActiveContext();
+        if (!noteContext) {
+            return;
+        }
+        const { ntxId, note } = noteContext;
 
         // ctrl+enter is also used elsewhere, so make sure we're running only when appropriate
         if (!note || note.type !== "code") {

apps/client/src/components/main_tree_executors.ts

@@ -0,0 +1,82 @@
+import appContext, { type EventData } from "./app_context.js";
+import noteCreateService from "../services/note_create.js";
+import treeService from "../services/tree.js";
+import hoistedNoteService from "../services/hoisted_note.js";
+import Component from "./component.js";
+
+/**
+ * This class contains command executors which logically belong to the NoteTree widget, but for better user experience,
+ * the keyboard shortcuts must be active on the whole screen and not just on the widget itself, so the executors
+ * must be at the root of the component tree.
+ */
+export default class MainTreeExecutors extends Component {
+    /**
+     * On mobile it will be `undefined`.
+     */
+    get tree() {
+        return appContext.noteTreeWidget;
+    }
+
+    async cloneNotesToCommand({ selectedOrActiveNoteIds }: EventData<"cloneNotesTo">) {
+        if (!selectedOrActiveNoteIds && this.tree) {
+            selectedOrActiveNoteIds = this.tree.getSelectedOrActiveNodes().map((node) => node.data.noteId);
+        }
+
+        if (!selectedOrActiveNoteIds) {
+            return;
+        }
+
+        this.triggerCommand("cloneNoteIdsTo", { noteIds: selectedOrActiveNoteIds });
+    }
+
+    async moveNotesToCommand({ selectedOrActiveBranchIds }: EventData<"moveNotesTo">) {
+        if (!selectedOrActiveBranchIds && this.tree) {
+            selectedOrActiveBranchIds = this.tree.getSelectedOrActiveNodes().map((node) => node.data.branchId);
+        }
+
+        if (!selectedOrActiveBranchIds) {
+            return;
+        }
+
+        this.triggerCommand("moveBranchIdsTo", { branchIds: selectedOrActiveBranchIds });
+    }
+
+    async createNoteIntoCommand() {
+        const activeNoteContext = appContext.tabManager.getActiveContext();
+
+        if (!activeNoteContext || !activeNoteContext.notePath || !activeNoteContext.note) {
+            return;
+        }
+
+        await noteCreateService.createNote(activeNoteContext.notePath, {
+            isProtected: activeNoteContext.note.isProtected,
+            saveSelection: false
+        });
+    }
+
+    async createNoteAfterCommand() {
+        if (!this.tree) {
+            return;
+        }
+
+        const node = this.tree.getActiveNode();
+
+        if (!node) {
+            return;
+        }
+
+        const parentNotePath = treeService.getNotePath(node.getParent());
+        const isProtected = treeService.getParentProtectedStatus(node);
+
+        if (node.data.noteId === "root" || node.data.noteId === hoistedNoteService.getHoistedNoteId()) {
+            return;
+        }
+
+        await noteCreateService.createNote(parentNotePath, {
+            target: "after",
+            targetBranchId: node.data.branchId,
+            isProtected: isProtected,
+            saveSelection: false
+        });
+    }
+}

apps/client/src/components/note_context.ts

@@ -10,13 +10,16 @@ import options from "../services/options.js";
 import type { ViewScope } from "../services/link.js";
 import type FNote from "../entities/fnote.js";
 import type TypeWidget from "../widgets/type_widgets/type_widget.js";
+import type { CKTextEditor } from "@triliumnext/ckeditor5";
+import type CodeMirror from "@triliumnext/codemirror";
+import { closeActiveDialog } from "../services/dialog.js";
 
 export interface SetNoteOpts {
     triggerSwitchEvent?: unknown;
     viewScope?: ViewScope;
 }
 
-export type GetTextEditorCallback = () => void;
+export type GetTextEditorCallback = (editor: CKTextEditor) => void;
 
 class NoteContext extends Component implements EventListener<"entitiesReloaded"> {
     ntxId: string | null;
@@ -81,7 +84,7 @@ class NoteContext extends Component implements EventListener<"entitiesReloaded">
 
         await this.triggerEvent("beforeNoteSwitch", { noteContext: this });
 
-        utils.closeActiveDialog();
+        closeActiveDialog();
 
         this.notePath = resolvedNotePath;
         this.viewScope = opts.viewScope;
@@ -157,6 +160,9 @@ class NoteContext extends Component implements EventListener<"entitiesReloaded">
     }
 
     saveToRecentNotes(resolvedNotePath: string) {
+        if (options.is("databaseReadonly")) {
+            return;
+        }
         setTimeout(async () => {
             // we include the note in the recent list only if the user stayed on the note at least 5 seconds
             if (resolvedNotePath && resolvedNotePath === this.notePath) {
@@ -252,6 +258,10 @@ class NoteContext extends Component implements EventListener<"entitiesReloaded">
             return false;
         }
 
+        if (options.is("databaseReadonly")) {
+            return true;
+        }
+
         if (this.note.isLabelTruthy("readOnly")) {
             return true;
         }
@@ -260,14 +270,32 @@ class NoteContext extends Component implements EventListener<"entitiesReloaded">
             return true;
         }
 
-        const blob = await this.note.getBlob();
-        if (!blob) {
-            return false;
+        // Store the initial decision about read-only status in the viewScope
+        // This will be "remembered" until the viewScope is refreshed
+        if (!this.viewScope) {
+            this.resetViewScope();
         }
 
-        const sizeLimit = this.note.type === "text" ? options.getInt("autoReadonlySizeText") : options.getInt("autoReadonlySizeCode");
+        const viewScope = this.viewScope!;
 
-        return sizeLimit && blob.contentLength > sizeLimit && !this.note.isLabelTruthy("autoReadOnlyDisabled");
+        if (viewScope.isReadOnly === undefined) {
+            const blob = await this.note.getBlob();
+            if (!blob) {
+                viewScope.isReadOnly = false;
+                return false;
+            }
+
+            const sizeLimit = this.note.type === "text"
+                ? options.getInt("autoReadonlySizeText")
+                : options.getInt("autoReadonlySizeCode");
+
+            viewScope.isReadOnly = Boolean(sizeLimit &&
+                blob.contentLength > sizeLimit &&
+                !this.note.isLabelTruthy("autoReadOnlyDisabled"));
+        }
+
+        // Return the cached decision, which won't change until viewScope is reset
+        return viewScope.isReadOnly || false;
     }
 
     async entitiesReloadedEvent({ loadResults }: EventData<"entitiesReloaded">) {
@@ -298,7 +326,7 @@ class NoteContext extends Component implements EventListener<"entitiesReloaded">
     }
 
     async getTextEditor(callback?: GetTextEditorCallback) {
-        return this.timeout<TextEditor>(
+        return this.timeout<CKTextEditor>(
             new Promise((resolve) =>
                 appContext.triggerCommand("executeWithTextEditor", {
                     callback,
@@ -311,7 +339,7 @@ class NoteContext extends Component implements EventListener<"entitiesReloaded">
 
     async getCodeEditor() {
         return this.timeout(
-            new Promise((resolve) =>
+            new Promise<CodeMirror>((resolve) =>
                 appContext.triggerCommand("executeWithCodeEditor", {
                     resolve,
                     ntxId: this.ntxId

apps/client/src/components/root_command_executor.ts

@@ -7,6 +7,9 @@ import protectedSessionService from "../services/protected_session.js";
 import options from "../services/options.js";
 import froca from "../services/froca.js";
 import utils from "../services/utils.js";
+import LlmChatPanel from "../widgets/llm_chat_panel.js";
+import toastService from "../services/toast.js";
+import noteCreateService from "../services/note_create.js";
 
 export default class RootCommandExecutor extends Component {
     editReadOnlyNoteCommand() {
@@ -75,15 +78,15 @@ export default class RootCommandExecutor extends Component {
     }
 
     hideLeftPaneCommand() {
-        options.save(`leftPaneVisible`, "false");
+        appContext.triggerEvent("setLeftPaneVisibility", { leftPaneVisible: false });
     }
 
     showLeftPaneCommand() {
-        options.save(`leftPaneVisible`, "true");
+        appContext.triggerEvent("setLeftPaneVisibility", { leftPaneVisible: true });
     }
 
     toggleLeftPaneCommand() {
-        options.toggle("leftPaneVisible");
+        appContext.triggerEvent("setLeftPaneVisibility", { leftPaneVisible: null });
     }
 
     async showBackendLogCommand() {
@@ -226,4 +229,35 @@ export default class RootCommandExecutor extends Component {
             appContext.tabManager.activateNoteContext(tab.ntxId);
         }
     }
+
+    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/startup_checks.ts

@@ -0,0 +1,26 @@
+import server from "../services/server";
+import Component from "./component";
+
+// TODO: Deduplicate.
+interface CpuArchResponse {
+    isCpuArchMismatch: boolean;
+}
+
+export class StartupChecks extends Component {
+
+    constructor() {
+        super();
+        this.checkCpuArchMismatch();
+    }
+
+    async checkCpuArchMismatch() {
+        try {
+            const response = await server.get("system-checks") as CpuArchResponse;
+            if (response.isCpuArchMismatch) {
+                this.triggerCommand("showCpuArchWarning", {});
+            }
+        } catch (error) {
+            console.warn("Could not check CPU arch status:", error);
+        }
+    }
+}

apps/client/src/components/tab_manager.ts

@@ -0,0 +1,711 @@
+import Component from "./component.js";
+import SpacedUpdate from "../services/spaced_update.js";
+import server from "../services/server.js";
+import options from "../services/options.js";
+import froca from "../services/froca.js";
+import treeService from "../services/tree.js";
+import NoteContext from "./note_context.js";
+import appContext from "./app_context.js";
+import Mutex from "../utils/mutex.js";
+import linkService from "../services/link.js";
+import type { EventData } from "./app_context.js";
+import type FNote from "../entities/fnote.js";
+
+interface TabState {
+    contexts: NoteContext[];
+    position: number;
+}
+
+interface NoteContextState {
+    ntxId: string;
+    mainNtxId: string | null;
+    notePath: string | null;
+    hoistedNoteId: string;
+    active: boolean;
+    viewScope: Record<string, any>;
+}
+
+export default class TabManager extends Component {
+    public children: NoteContext[];
+    public mutex: Mutex;
+    public activeNtxId: string | null;
+    public recentlyClosedTabs: TabState[];
+    public tabsUpdate: SpacedUpdate;
+
+    constructor() {
+        super();
+
+        this.children = [];
+        this.mutex = new Mutex();
+        this.activeNtxId = null;
+        this.recentlyClosedTabs = [];
+
+        this.tabsUpdate = new SpacedUpdate(async () => {
+            if (!appContext.isMainWindow) {
+                return;
+            }
+            if (options.is("databaseReadonly")) {
+                return;
+            }
+
+            const openNoteContexts = this.noteContexts
+                .map((nc) => nc.getPojoState())
+                .filter((t) => !!t);
+
+            await server.put("options", {
+                openNoteContexts: JSON.stringify(openNoteContexts)
+            });
+        });
+
+        appContext.addBeforeUnloadListener(this);
+    }
+
+    get noteContexts(): NoteContext[] {
+        return this.children;
+    }
+
+    get mainNoteContexts(): NoteContext[] {
+        return this.noteContexts.filter((nc) => !nc.mainNtxId);
+    }
+
+    async loadTabs() {
+        try {
+            const noteContextsToOpen = (appContext.isMainWindow && options.getJson("openNoteContexts")) || [];
+
+            // preload all notes at once
+            await froca.getNotes([...noteContextsToOpen.flatMap((tab: NoteContextState) =>
+                [treeService.getNoteIdFromUrl(tab.notePath), tab.hoistedNoteId])], true);
+
+            const filteredNoteContexts = noteContextsToOpen.filter((openTab: NoteContextState) => {
+                const noteId = treeService.getNoteIdFromUrl(openTab.notePath);
+                if (!noteId || !(noteId in froca.notes)) {
+                    // note doesn't exist so don't try to open tab for it
+                    return false;
+                }
+
+                if (!(openTab.hoistedNoteId in froca.notes)) {
+                    openTab.hoistedNoteId = "root";
+                }
+
+                return true;
+            });
+
+            // resolve before opened tabs can change this
+            const parsedFromUrl = linkService.parseNavigationStateFromUrl(window.location.href);
+
+            if (filteredNoteContexts.length === 0) {
+                parsedFromUrl.ntxId = parsedFromUrl.ntxId || NoteContext.generateNtxId(); // generate already here, so that we later know which one to activate
+
+                filteredNoteContexts.push({
+                    notePath: parsedFromUrl.notePath || "root",
+                    ntxId: parsedFromUrl.ntxId,
+                    active: true,
+                    hoistedNoteId: parsedFromUrl.hoistedNoteId || "root",
+                    viewScope: parsedFromUrl.viewScope || {}
+                });
+            } else if (!filteredNoteContexts.find((tab: NoteContextState) => tab.active)) {
+                filteredNoteContexts[0].active = true;
+            }
+
+            await this.tabsUpdate.allowUpdateWithoutChange(async () => {
+                for (const tab of filteredNoteContexts) {
+                    await this.openContextWithNote(tab.notePath, {
+                        activate: tab.active,
+                        ntxId: tab.ntxId,
+                        mainNtxId: tab.mainNtxId,
+                        hoistedNoteId: tab.hoistedNoteId,
+                        viewScope: tab.viewScope
+                    });
+                }
+            });
+
+            // 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) {
+                await appContext.tabManager.switchToNoteContext(
+                    parsedFromUrl.ntxId,
+                    parsedFromUrl.notePath,
+                    parsedFromUrl.viewScope,
+                    parsedFromUrl.hoistedNoteId
+                );
+            } else if (parsedFromUrl.searchString) {
+                await appContext.triggerCommand("searchNotes", {
+                    searchString: parsedFromUrl.searchString
+                });
+            }
+        } catch (e: unknown) {
+            if (e instanceof Error) {
+                logError(`Loading note contexts '${options.get("openNoteContexts")}' failed: ${e.message} ${e.stack}`);
+            } else {
+                logError(`Loading note contexts '${options.get("openNoteContexts")}' failed: ${String(e)}`);
+            }
+
+            // try to recover
+            await this.openEmptyTab();
+        }
+    }
+
+    noteSwitchedEvent({ noteContext }: EventData<"noteSwitched">) {
+        if (noteContext.isActive()) {
+            this.setCurrentNavigationStateToHash();
+        }
+
+        this.tabsUpdate.scheduleUpdate();
+    }
+
+    setCurrentNavigationStateToHash() {
+        const calculatedHash = this.calculateHash();
+
+        // update if it's the first history entry or there has been a change
+        if (window.history.length === 0 || calculatedHash !== window.location?.hash) {
+            // using pushState instead of directly modifying document.location because it does not trigger hashchange
+            window.history.pushState(null, "", calculatedHash);
+        }
+
+        const activeNoteContext = this.getActiveContext();
+        this.updateDocumentTitle(activeNoteContext);
+
+        this.triggerEvent("activeNoteChanged", {}); // trigger this even in on popstate event
+    }
+
+    calculateHash(): string {
+        const activeNoteContext = this.getActiveContext();
+        if (!activeNoteContext) {
+            return "";
+        }
+
+        return linkService.calculateHash({
+            notePath: activeNoteContext.notePath,
+            ntxId: activeNoteContext.ntxId,
+            hoistedNoteId: activeNoteContext.hoistedNoteId,
+            viewScope: activeNoteContext.viewScope
+        });
+    }
+
+    getNoteContexts(): NoteContext[] {
+        return this.noteContexts;
+    }
+
+    getMainNoteContexts(): NoteContext[] {
+        return this.noteContexts.filter((nc) => nc.isMainContext());
+    }
+
+    getNoteContextById(ntxId: string | null): NoteContext {
+        const noteContext = this.noteContexts.find((nc) => nc.ntxId === ntxId);
+
+        if (!noteContext) {
+            throw new Error(`Cannot find noteContext id='${ntxId}'`);
+        }
+
+        return noteContext;
+    }
+
+    getActiveContext(): NoteContext | null {
+        return this.activeNtxId ? this.getNoteContextById(this.activeNtxId) : null;
+    }
+
+    getActiveMainContext(): NoteContext | null {
+        return this.activeNtxId ? this.getNoteContextById(this.activeNtxId).getMainContext() : null;
+    }
+
+    getActiveContextNotePath(): string | null {
+        const activeContext = this.getActiveContext();
+        return activeContext?.notePath ?? null;
+    }
+
+    getActiveContextNote(): FNote | null {
+        const activeContext = this.getActiveContext();
+        return activeContext ? activeContext.note : null;
+    }
+
+    getActiveContextNoteId(): string | null {
+        const activeNote = this.getActiveContextNote();
+        return activeNote ? activeNote.noteId : null;
+    }
+
+    getActiveContextNoteType(): string | null {
+        const activeNote = this.getActiveContextNote();
+        return activeNote ? activeNote.type : null;
+    }
+
+    getActiveContextNoteMime(): string | null {
+        const activeNote = this.getActiveContextNote();
+        return activeNote ? activeNote.mime : null;
+    }
+
+    async switchToNoteContext(
+        ntxId: string | null,
+        notePath: string,
+        viewScope: Record<string, any> = {},
+        hoistedNoteId: string | null = null
+    ) {
+        const noteContext = this.noteContexts.find((nc) => nc.ntxId === ntxId) ||
+            await this.openEmptyTab();
+
+        await this.activateNoteContext(noteContext.ntxId);
+
+        if (hoistedNoteId) {
+            await noteContext.setHoistedNoteId(hoistedNoteId);
+        }
+
+        if (notePath) {
+            await noteContext.setNote(notePath, { viewScope });
+        }
+    }
+
+    async openAndActivateEmptyTab() {
+        const noteContext = await this.openEmptyTab();
+        await this.activateNoteContext(noteContext.ntxId);
+        noteContext.setEmpty();
+    }
+
+    async openEmptyTab(
+        ntxId: string | null = null,
+        hoistedNoteId: string = "root",
+        mainNtxId: string | null = null
+    ): Promise<NoteContext> {
+        const noteContext = new NoteContext(ntxId, hoistedNoteId, mainNtxId);
+
+        const existingNoteContext = this.children.find((nc) => nc.ntxId === noteContext.ntxId);
+
+        if (existingNoteContext) {
+            await existingNoteContext.setHoistedNoteId(hoistedNoteId);
+            return existingNoteContext;
+        }
+
+        this.child(noteContext);
+
+        await this.triggerEvent("newNoteContextCreated", { noteContext });
+
+        return noteContext;
+    }
+
+    async openInNewTab(targetNoteId: string, hoistedNoteId: string | null = null, activate: boolean = false) {
+        const noteContext = await this.openEmptyTab(null, hoistedNoteId || this.getActiveContext()?.hoistedNoteId);
+
+        await noteContext.setNote(targetNoteId);
+
+        if (activate && noteContext.notePath) {
+            this.activateNoteContext(noteContext.ntxId, false);
+            await this.triggerEvent("noteSwitchedAndActivated", {
+                noteContext,
+                notePath: noteContext.notePath
+            });
+        }
+    }
+
+    async openInSameTab(targetNoteId: string, hoistedNoteId: string | null = null) {
+        const activeContext = this.getActiveContext();
+        if (!activeContext) return;
+
+        await activeContext.setHoistedNoteId(hoistedNoteId || activeContext.hoistedNoteId);
+        await activeContext.setNote(targetNoteId);
+    }
+
+    async openTabWithNoteWithHoisting(
+        notePath: string,
+        opts: {
+            activate?: boolean | null;
+            ntxId?: string | null;
+            mainNtxId?: string | null;
+            hoistedNoteId?: string | null;
+            viewScope?: Record<string, any> | null;
+        } = {}
+    ): Promise<NoteContext> {
+        const noteContext = this.getActiveContext();
+        let hoistedNoteId = "root";
+
+        if (noteContext) {
+            const resolvedNotePath = await treeService.resolveNotePath(notePath, noteContext.hoistedNoteId);
+
+            if (resolvedNotePath?.includes(noteContext.hoistedNoteId) || resolvedNotePath?.includes("_hidden")) {
+                hoistedNoteId = noteContext.hoistedNoteId;
+            }
+        }
+
+        opts.hoistedNoteId = hoistedNoteId;
+
+        return this.openContextWithNote(notePath, opts);
+    }
+
+    async openContextWithNote(
+        notePath: string | null,
+        opts: {
+            activate?: boolean | null;
+            ntxId?: string | null;
+            mainNtxId?: string | null;
+            hoistedNoteId?: string | null;
+            viewScope?: Record<string, any> | null;
+        } = {}
+    ): Promise<NoteContext> {
+        const activate = !!opts.activate;
+        const ntxId = opts.ntxId || null;
+        const mainNtxId = opts.mainNtxId || null;
+        const hoistedNoteId = opts.hoistedNoteId || "root";
+        const viewScope = opts.viewScope || { viewMode: "default" };
+
+        const noteContext = await this.openEmptyTab(ntxId, hoistedNoteId, mainNtxId);
+        if (notePath) {
+            await noteContext.setNote(notePath, {
+                // if activate is false, then send normal noteSwitched event
+                triggerSwitchEvent: !activate,
+                viewScope: viewScope
+            });
+        }
+
+        if (activate && noteContext.notePath) {
+            this.activateNoteContext(noteContext.ntxId, false);
+
+            await this.triggerEvent("noteSwitchedAndActivated", {
+                noteContext,
+                notePath: noteContext.notePath // resolved note path
+            });
+        }
+
+        return noteContext;
+    }
+
+    async activateOrOpenNote(noteId: string) {
+        for (const noteContext of this.getNoteContexts()) {
+            if (noteContext.note && noteContext.note.noteId === noteId) {
+                this.activateNoteContext(noteContext.ntxId);
+                return;
+            }
+        }
+
+        // if no tab with this note has been found we'll create new tab
+        await this.openContextWithNote(noteId, { activate: true });
+    }
+
+    async activateNoteContext(ntxId: string | null, triggerEvent: boolean = true) {
+        if (!ntxId) {
+            logError("activateNoteContext: ntxId is null");
+            return;
+        }
+
+        if (ntxId === this.activeNtxId) {
+            return;
+        }
+
+        this.activeNtxId = ntxId;
+
+        if (triggerEvent) {
+            await this.triggerEvent("activeContextChanged", {
+                noteContext: this.getNoteContextById(ntxId)
+            });
+        }
+
+        this.tabsUpdate.scheduleUpdate();
+
+        this.setCurrentNavigationStateToHash();
+    }
+
+    async removeNoteContext(ntxId: string | null): Promise<boolean> {
+        // removing note context is an async process which can take some time, if users presses CTRL-W quickly, two
+        // close events could interleave which would then lead to attempting to activate already removed context.
+        return await this.mutex.runExclusively(async (): Promise<boolean> => {
+            let noteContextToRemove;
+
+            try {
+                noteContextToRemove = this.getNoteContextById(ntxId);
+            } catch {
+                // note context not found
+                return false;
+            }
+
+            if (noteContextToRemove.isMainContext()) {
+                const mainNoteContexts = this.getNoteContexts().filter((nc) => nc.isMainContext());
+
+                if (mainNoteContexts.length === 1) {
+                    if (noteContextToRemove.isEmpty()) {
+                        // this is already the empty note context, no point in closing it and replacing with another
+                        // empty tab
+                        return false;
+                    }
+
+                    await this.openEmptyTab();
+                }
+            }
+
+            // close dangling autocompletes after closing the tab
+            const $autocompleteEl = $(".aa-input");
+            if ("autocomplete" in $autocompleteEl) {
+                $autocompleteEl.autocomplete("close");
+            }
+
+            const noteContextsToRemove = noteContextToRemove.getSubContexts();
+            const ntxIdsToRemove = noteContextsToRemove.map((nc) => nc.ntxId);
+
+            await this.triggerEvent("beforeNoteContextRemove", { ntxIds: ntxIdsToRemove.filter((id) => id !== null) });
+
+            if (!noteContextToRemove.isMainContext()) {
+                const siblings = noteContextToRemove.getMainContext().getSubContexts();
+                const idx = siblings.findIndex((nc) => nc.ntxId === noteContextToRemove.ntxId);
+                const contextToActivateIdx = idx === siblings.length - 1 ? idx - 1 : idx + 1;
+                const contextToActivate = siblings[contextToActivateIdx];
+
+                await this.activateNoteContext(contextToActivate.ntxId);
+            } else if (this.mainNoteContexts.length <= 1) {
+                await this.openAndActivateEmptyTab();
+            } else if (ntxIdsToRemove.includes(this.activeNtxId)) {
+                const idx = this.mainNoteContexts.findIndex((nc) => nc.ntxId === noteContextToRemove.ntxId);
+
+                if (idx === this.mainNoteContexts.length - 1) {
+                    await this.activatePreviousTabCommand();
+                } else {
+                    await this.activateNextTabCommand();
+                }
+            }
+
+            this.removeNoteContexts(noteContextsToRemove);
+            return true;
+        });
+    }
+
+    removeNoteContexts(noteContextsToRemove: NoteContext[]) {
+        const ntxIdsToRemove = noteContextsToRemove.map((nc) => nc.ntxId);
+
+        const position = this.noteContexts.findIndex((nc) => ntxIdsToRemove.includes(nc.ntxId));
+
+        this.children = this.children.filter((nc) => !ntxIdsToRemove.includes(nc.ntxId));
+
+        this.addToRecentlyClosedTabs(noteContextsToRemove, position);
+
+        this.triggerEvent("noteContextRemoved", { ntxIds: ntxIdsToRemove.filter((id) => id !== null) });
+
+        this.tabsUpdate.scheduleUpdate();
+    }
+
+    addToRecentlyClosedTabs(noteContexts: NoteContext[], position: number) {
+        if (noteContexts.length === 1 && noteContexts[0].isEmpty()) {
+            return;
+        }
+
+        this.recentlyClosedTabs.push({ contexts: noteContexts, position: position });
+    }
+
+    tabReorderEvent({ ntxIdsInOrder }: { ntxIdsInOrder: string[] }) {
+        const order: Record<string, number> = {};
+
+        let i = 0;
+
+        for (const ntxId of ntxIdsInOrder) {
+            for (const noteContext of this.getNoteContextById(ntxId).getSubContexts()) {
+                if (noteContext.ntxId) {
+                    order[noteContext.ntxId] = i++;
+                }
+            }
+        }
+
+        this.children.sort((a, b) => {
+            if (!a.ntxId || !b.ntxId) return 0;
+            return (order[a.ntxId] ?? 0) < (order[b.ntxId] ?? 0) ? -1 : 1;
+        });
+
+        this.tabsUpdate.scheduleUpdate();
+    }
+
+    noteContextReorderEvent({
+        ntxIdsInOrder,
+        oldMainNtxId,
+        newMainNtxId
+    }: {
+        ntxIdsInOrder: string[];
+        oldMainNtxId?: string;
+        newMainNtxId?: string;
+    }) {
+        const order = Object.fromEntries(ntxIdsInOrder.map((v, i) => [v, i]));
+
+        this.children.sort((a, b) => {
+            if (!a.ntxId || !b.ntxId) return 0;
+            return (order[a.ntxId] ?? 0) < (order[b.ntxId] ?? 0) ? -1 : 1;
+        });
+
+        if (oldMainNtxId && newMainNtxId) {
+            this.children.forEach((c) => {
+                if (c.ntxId === newMainNtxId) {
+                    // new main context has null mainNtxId
+                    c.mainNtxId = null;
+                } else if (c.ntxId === oldMainNtxId || c.mainNtxId === oldMainNtxId) {
+                    // old main context or subcontexts all have the new mainNtxId
+                    c.mainNtxId = newMainNtxId;
+                }
+            });
+        }
+
+        this.tabsUpdate.scheduleUpdate();
+    }
+
+    async activateNextTabCommand() {
+        const activeMainNtxId = this.getActiveMainContext()?.ntxId;
+        if (!activeMainNtxId) return;
+
+        const oldIdx = this.mainNoteContexts.findIndex((nc) => nc.ntxId === activeMainNtxId);
+        const newActiveNtxId = this.mainNoteContexts[oldIdx === this.mainNoteContexts.length - 1 ? 0 : oldIdx + 1].ntxId;
+
+        await this.activateNoteContext(newActiveNtxId);
+    }
+
+    async activatePreviousTabCommand() {
+        const activeMainNtxId = this.getActiveMainContext()?.ntxId;
+        if (!activeMainNtxId) return;
+
+        const oldIdx = this.mainNoteContexts.findIndex((nc) => nc.ntxId === activeMainNtxId);
+        const newActiveNtxId = this.mainNoteContexts[oldIdx === 0 ? this.mainNoteContexts.length - 1 : oldIdx - 1].ntxId;
+
+        await this.activateNoteContext(newActiveNtxId);
+    }
+
+    async closeActiveTabCommand() {
+        await this.removeNoteContext(this.activeNtxId);
+    }
+
+    beforeUnloadEvent(): boolean {
+        this.tabsUpdate.updateNowIfNecessary();
+        return true; // don't block closing the tab, this metadata is not that important
+    }
+
+    openNewTabCommand() {
+        this.openAndActivateEmptyTab();
+    }
+
+    async closeAllTabsCommand() {
+        for (const ntxIdToRemove of this.mainNoteContexts.map((nc) => nc.ntxId)) {
+            await this.removeNoteContext(ntxIdToRemove);
+        }
+    }
+
+    async closeOtherTabsCommand({ ntxId }: { ntxId: string }) {
+        for (const ntxIdToRemove of this.mainNoteContexts.map((nc) => nc.ntxId)) {
+            if (ntxIdToRemove !== ntxId) {
+                await this.removeNoteContext(ntxIdToRemove);
+            }
+        }
+    }
+
+    async closeRightTabsCommand({ ntxId }: { ntxId: string }) {
+        const ntxIds = this.mainNoteContexts.map((nc) => nc.ntxId);
+        const index = ntxIds.indexOf(ntxId);
+
+        if (index !== -1) {
+            const idsToRemove = ntxIds.slice(index + 1);
+            for (const ntxIdToRemove of idsToRemove) {
+                await this.removeNoteContext(ntxIdToRemove);
+            }
+        }
+    }
+
+    async closeTabCommand({ ntxId }: { ntxId: string }) {
+        await this.removeNoteContext(ntxId);
+    }
+
+    async moveTabToNewWindowCommand({ ntxId }: { ntxId: string }) {
+        const { notePath, hoistedNoteId } = this.getNoteContextById(ntxId);
+
+        const removed = await this.removeNoteContext(ntxId);
+
+        if (removed) {
+            this.triggerCommand("openInWindow", { notePath, hoistedNoteId });
+        }
+    }
+
+    async copyTabToNewWindowCommand({ ntxId }: { ntxId: string }) {
+        const { notePath, hoistedNoteId } = this.getNoteContextById(ntxId);
+        this.triggerCommand("openInWindow", { notePath, hoistedNoteId });
+    }
+
+    async reopenLastTabCommand() {
+        const closeLastEmptyTab: NoteContext | undefined = await this.mutex.runExclusively(async () => {
+            let closeLastEmptyTab
+            if (this.recentlyClosedTabs.length === 0) {
+                return closeLastEmptyTab;
+            }
+
+            if (this.noteContexts.length === 1 && this.noteContexts[0].isEmpty()) {
+                // new empty tab is created after closing the last tab, this reverses the empty tab creation
+                closeLastEmptyTab = this.noteContexts[0];
+            }
+
+            const lastClosedTab = this.recentlyClosedTabs.pop();
+            if (!lastClosedTab) return closeLastEmptyTab;
+
+            const noteContexts = lastClosedTab.contexts;
+
+            for (const noteContext of noteContexts) {
+                this.child(noteContext);
+
+                await this.triggerEvent("newNoteContextCreated", { noteContext });
+            }
+
+            //  restore last position of contexts stored in tab manager
+            const ntxsInOrder = [
+                ...this.noteContexts.slice(0, lastClosedTab.position),
+                ...this.noteContexts.slice(-noteContexts.length),
+                ...this.noteContexts.slice(lastClosedTab.position, -noteContexts.length)
+            ];
+            this.noteContextReorderEvent({ ntxIdsInOrder: ntxsInOrder.map((nc) => nc.ntxId).filter((id) => id !== null) });
+
+            let mainNtx = noteContexts.find((nc) => nc.isMainContext());
+            if (mainNtx) {
+                // reopened a tab, need to reorder new tab widget in tab row
+                await this.triggerEvent("contextsReopened", {
+                    mainNtxId: mainNtx.ntxId,
+                    tabPosition: ntxsInOrder.filter((nc) => nc.isMainContext()).findIndex((nc) => nc.ntxId === mainNtx.ntxId)
+                });
+            } else {
+                // reopened a single split, need to reorder the pane widget in split note container
+                await this.triggerEvent("contextsReopened", {
+                    mainNtxId: ntxsInOrder[lastClosedTab.position].ntxId,
+                    // this is safe since lastClosedTab.position can never be 0 in this case
+                    tabPosition: lastClosedTab.position - 1
+                });
+            }
+
+            const noteContextToActivate = noteContexts.length === 1 ? noteContexts[0] : noteContexts.find((nc) => nc.isMainContext());
+            if (!noteContextToActivate) return closeLastEmptyTab;
+
+            await this.activateNoteContext(noteContextToActivate.ntxId);
+
+            await this.triggerEvent("noteSwitched", {
+                noteContext: noteContextToActivate,
+                notePath: noteContextToActivate.notePath
+            });
+            return closeLastEmptyTab;
+        });
+
+        if (closeLastEmptyTab) {
+            await this.removeNoteContext(closeLastEmptyTab.ntxId);
+        }
+    }
+
+    hoistedNoteChangedEvent() {
+        this.tabsUpdate.scheduleUpdate();
+    }
+
+    async updateDocumentTitle(activeNoteContext: NoteContext | null) {
+        if (!activeNoteContext) return;
+
+        const titleFragments = [
+            // it helps to navigate in history if note title is included in the title
+            await activeNoteContext.getNavigationTitle(),
+            "TriliumNext Notes"
+        ].filter(Boolean);
+
+        document.title = titleFragments.join(" - ");
+    }
+
+    async entitiesReloadedEvent({ loadResults }: EventData<"entitiesReloaded">) {
+        const activeContext = this.getActiveContext();
+
+        if (activeContext && loadResults.isNoteReloaded(activeContext.noteId)) {
+            await this.updateDocumentTitle(activeContext);
+        }
+    }
+
+    async frocaReloadedEvent() {
+        const activeContext = this.getActiveContext();
+        if (activeContext) {
+            await this.updateDocumentTitle(activeContext);
+        }
+    }
+}

apps/client/src/components/touch_bar.ts

@@ -0,0 +1,135 @@
+import utils from "../services/utils.js";
+import Component from "./component.js";
+import appContext from "./app_context.js";
+import type { TouchBarButton, TouchBarGroup, TouchBarSegmentedControl, TouchBarSpacer } from "@electron/remote";
+
+export type TouchBarItem = (TouchBarButton | TouchBarSpacer | TouchBarGroup | TouchBarSegmentedControl);
+
+export function buildSelectedBackgroundColor(isSelected: boolean) {
+    return isSelected ? "#757575" : undefined;
+}
+
+export default class TouchBarComponent extends Component {
+
+    nativeImage: typeof import("electron").nativeImage;
+    remote: typeof import("@electron/remote");
+    lastFocusedComponent?: Component;
+    private $activeModal?: JQuery<HTMLElement>;
+
+    constructor() {
+        super();
+        this.nativeImage = utils.dynamicRequire("electron").nativeImage;
+        this.remote = utils.dynamicRequire("@electron/remote") as typeof import("@electron/remote");
+        this.$widget = $("<div>");
+
+        $(window).on("focusin", async (e) => {
+            const $target = $(e.target);
+
+            this.$activeModal = $target.closest(".modal-dialog");
+            const parentComponentEl = $target.closest(".component");
+            this.lastFocusedComponent = appContext.getComponentByEl(parentComponentEl[0]);
+            this.#refreshTouchBar();
+        });
+    }
+
+    buildIcon(name: string) {
+        const sourceImage = this.nativeImage.createFromNamedImage(name, [-1, 0, 1]);
+        const { width, height } = sourceImage.getSize();
+        const newImage = this.nativeImage.createEmpty();
+        newImage.addRepresentation({
+            scaleFactor: 1,
+            width: width / 2,
+            height: height / 2,
+            buffer: sourceImage.resize({ height: height / 2 }).toBitmap()
+        });
+        newImage.addRepresentation({
+            scaleFactor: 2,
+            width: width,
+            height: height,
+            buffer: sourceImage.toBitmap()
+        });
+        return newImage;
+    }
+
+    #refreshTouchBar() {
+        const { TouchBar } = this.remote;
+        const parentComponent = this.lastFocusedComponent;
+        let touchBar: Electron.CrossProcessExports.TouchBar | null = null;
+
+        if (this.$activeModal?.length) {
+            touchBar = this.#buildModalTouchBar();
+        } else if (parentComponent) {
+            const items = parentComponent.triggerCommand("buildTouchBar", {
+                TouchBar,
+                buildIcon: this.buildIcon.bind(this)
+            }) as unknown as TouchBarItem[];
+            touchBar = this.#buildTouchBar(items);
+        }
+
+        if (touchBar) {
+            this.remote.getCurrentWindow().setTouchBar(touchBar);
+        }
+    }
+
+    #buildModalTouchBar() {
+        const { TouchBar } = this.remote;
+        const { TouchBarButton, TouchBarLabel, TouchBarSpacer } = this.remote.TouchBar;
+        const items: TouchBarItem[] = [];
+
+        // Look for the modal title.
+        const $title = this.$activeModal?.find(".modal-title");
+        if ($title?.length) {
+            items.push(new TouchBarLabel({ label: $title.text() }))
+        }
+
+        items.push(new TouchBarSpacer({ size: "flexible" }));
+
+        // Look for buttons in the modal.
+        const $buttons = this.$activeModal?.find(".modal-footer button");
+        for (const button of $buttons ?? []) {
+            items.push(new TouchBarButton({
+                label: button.innerText,
+                click: () => button.click(),
+                enabled: !button.hasAttribute("disabled")
+            }));
+        }
+
+        items.push(new TouchBarSpacer({ size: "flexible" }));
+        return new TouchBar({ items });
+    }
+
+    #buildTouchBar(componentSpecificItems?: TouchBarItem[]) {
+        const { TouchBar } = this.remote;
+        const { TouchBarButton, TouchBarSpacer, TouchBarGroup, TouchBarSegmentedControl, TouchBarOtherItemsProxy } = this.remote.TouchBar;
+
+        // Disregard recursive calls or empty results.
+        if (!componentSpecificItems || "then" in componentSpecificItems) {
+            componentSpecificItems = [];
+        }
+
+        const items = [
+            new TouchBarButton({
+                icon: this.buildIcon("NSTouchBarComposeTemplate"),
+                click: () => this.triggerCommand("createNoteIntoInbox")
+            }),
+            new TouchBarSpacer({ size: "small" }),
+            ...componentSpecificItems,
+            new TouchBarSpacer({ size: "flexible" }),
+            new TouchBarOtherItemsProxy(),
+            new TouchBarButton({
+                icon: this.buildIcon("NSTouchBarAddDetailTemplate"),
+                click: () => this.triggerCommand("jumpToNote")
+            })
+        ].flat();
+
+        console.log("Update ", items);
+        return new TouchBar({
+            items
+        });
+    }
+
+    refreshTouchBarEvent() {
+        this.#refreshTouchBar();
+    }
+
+}

apps/client/src/desktop.ts

@@ -8,9 +8,13 @@ import electronContextMenu from "./menus/electron_context_menu.js";
 import glob from "./services/glob.js";
 import { t } from "./services/i18n.js";
 import options from "./services/options.js";
+import server from "./services/server.js";
 import type ElectronRemote from "@electron/remote";
 import type Electron from "electron";
-import "../stylesheets/bootstrap.scss";
+import "./stylesheets/bootstrap.scss";
+import "boxicons/css/boxicons.min.css";
+import "jquery-hotkeys";
+import "autocomplete.js/index_jquery.js";
 
 await appContext.earlyInit();
 

apps/client/src/entities/fnote.ts

@@ -1,7 +1,6 @@
 import server from "../services/server.js";
 import noteAttributeCache from "../services/note_attribute_cache.js";
 import ws from "../services/ws.js";
-import froca from "../services/froca.js";
 import protectedSessionHolder from "../services/protected_session_holder.js";
 import cssClassManager from "../services/css_class_manager.js";
 import type { Froca } from "../services/froca-interface.js";
@@ -28,7 +27,8 @@ const NOTE_TYPE_ICONS = {
     doc: "bx bxs-file-doc",
     contentWidget: "bx bxs-widget",
     mindMap: "bx bx-sitemap",
-    geoMap: "bx bx-map-alt"
+    geoMap: "bx bx-map-alt",
+    aiChat: "bx bx-bot"
 };
 
 /**
@@ -36,7 +36,7 @@ const NOTE_TYPE_ICONS = {
  * 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" | "geoMap";
+export type NoteType = "file" | "image" | "search" | "noteMap" | "launcher" | "doc" | "contentWidget" | "text" | "relationMap" | "render" | "canvas" | "mermaid" | "book" | "webView" | "code" | "mindMap" | "geoMap" | "aiChat";
 
 export interface NotePathRecord {
     isArchived: boolean;
@@ -151,7 +151,7 @@ class FNote {
 
         for (const branchId of Object.values(this.childToBranch)) {
             const notePosition = this.froca.getBranch(branchId)?.notePosition;
-            if (notePosition) {
+            if (notePosition !== undefined) {
                 branchIdPos[branchId] = notePosition;
             }
         }
@@ -409,8 +409,8 @@ class FNote {
         const notePaths: NotePathRecord[] = this.getAllNotePaths().map((path) => ({
             notePath: path,
             isInHoistedSubTree: isHoistedRoot || path.includes(hoistedNoteId),
-            isArchived: path.some((noteId) => froca.notes[noteId].isArchived),
-            isSearch: path.some((noteId) => froca.notes[noteId].type === "search"),
+            isArchived: path.some((noteId) => this.froca.notes[noteId].isArchived),
+            isSearch: path.some((noteId) => this.froca.notes[noteId].type === "search"),
             isHidden: path.includes("_hidden")
         }));
 
@@ -788,7 +788,7 @@ class FNote {
      */
     async getRelationTargets(name: string) {
         const relations = this.getRelations(name);
-        const targets = [];
+        const targets: (FNote | null)[] = [];
 
         for (const relation of relations) {
             targets.push(await this.froca.getNote(relation.value));
@@ -952,6 +952,12 @@ class FNote {
         return null;
     }
 
+    /**
+     * Executes this {@link FNote} as a front-end or back-end script.
+     *
+     * @throws an {@link Error} if the note has an incorrect note type or MIME for execution.
+     * @returns a promise that resolves when the script has been run. Additionally, for front-end notes, the promise will contain the value that is returned by the script.
+     */
     async executeScript() {
         if (!this.isJavaScript()) {
             throw new Error(`Note ${this.noteId} is of type ${this.type} and mime ${this.mime} and thus cannot be executed`);
@@ -975,7 +981,7 @@ class FNote {
                 continue;
             }
 
-            const parentNote = froca.notes[parentNoteId];
+            const parentNote = this.froca.notes[parentNoteId];
 
             if (!parentNote || parentNote.type === "search") {
                 continue;

apps/client/src/fonts/Inter/OFL.txt

@@ -1,93 +1,93 @@
-Copyright 2020 The Inter Project Authors (https://github.com/rsms/inter)
-
-This Font Software is licensed under the SIL Open Font License, Version 1.1.
-This license is copied below, and is also available with a FAQ at:
-https://openfontlicense.org
-
-
------------------------------------------------------------
-SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
------------------------------------------------------------
-
-PREAMBLE
-The goals of the Open Font License (OFL) are to stimulate worldwide
-development of collaborative font projects, to support the font creation
-efforts of academic and linguistic communities, and to provide a free and
-open framework in which fonts may be shared and improved in partnership
-with others.
-
-The OFL allows the licensed fonts to be used, studied, modified and
-redistributed freely as long as they are not sold by themselves. The
-fonts, including any derivative works, can be bundled, embedded, 
-redistributed and/or sold with any software provided that any reserved
-names are not used by derivative works. The fonts and derivatives,
-however, cannot be released under any other type of license. The
-requirement for fonts to remain under this license does not apply
-to any document created using the fonts or their derivatives.
-
-DEFINITIONS
-"Font Software" refers to the set of files released by the Copyright
-Holder(s) under this license and clearly marked as such. This may
-include source files, build scripts and documentation.
-
-"Reserved Font Name" refers to any names specified as such after the
-copyright statement(s).
-
-"Original Version" refers to the collection of Font Software components as
-distributed by the Copyright Holder(s).
-
-"Modified Version" refers to any derivative made by adding to, deleting,
-or substituting -- in part or in whole -- any of the components of the
-Original Version, by changing formats or by porting the Font Software to a
-new environment.
-
-"Author" refers to any designer, engineer, programmer, technical
-writer or other person who contributed to the Font Software.
-
-PERMISSION & CONDITIONS
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of the Font Software, to use, study, copy, merge, embed, modify,
-redistribute, and sell modified and unmodified copies of the Font
-Software, subject to the following conditions:
-
-1) Neither the Font Software nor any of its individual components,
-in Original or Modified Versions, may be sold by itself.
-
-2) Original or Modified Versions of the Font Software may be bundled,
-redistributed and/or sold with any software, provided that each copy
-contains the above copyright notice and this license. These can be
-included either as stand-alone text files, human-readable headers or
-in the appropriate machine-readable metadata fields within text or
-binary files as long as those fields can be easily viewed by the user.
-
-3) No Modified Version of the Font Software may use the Reserved Font
-Name(s) unless explicit written permission is granted by the corresponding
-Copyright Holder. This restriction only applies to the primary font name as
-presented to the users.
-
-4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
-Software shall not be used to promote, endorse or advertise any
-Modified Version, except to acknowledge the contribution(s) of the
-Copyright Holder(s) and the Author(s) or with their explicit written
-permission.
-
-5) The Font Software, modified or unmodified, in part or in whole,
-must be distributed entirely under this license, and must not be
-distributed under any other license. The requirement for fonts to
-remain under this license does not apply to any document created
-using the Font Software.
-
-TERMINATION
-This license becomes null and void if any of the above conditions are
-not met.
-
-DISCLAIMER
-THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
-OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
-COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
-DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
-OTHER DEALINGS IN THE FONT SOFTWARE.
+Copyright 2020 The Inter Project Authors (https://github.com/rsms/inter)
+
+This Font Software is licensed under the SIL Open Font License, Version 1.1.
+This license is copied below, and is also available with a FAQ at:
+https://openfontlicense.org
+
+
+-----------------------------------------------------------
+SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
+-----------------------------------------------------------
+
+PREAMBLE
+The goals of the Open Font License (OFL) are to stimulate worldwide
+development of collaborative font projects, to support the font creation
+efforts of academic and linguistic communities, and to provide a free and
+open framework in which fonts may be shared and improved in partnership
+with others.
+
+The OFL allows the licensed fonts to be used, studied, modified and
+redistributed freely as long as they are not sold by themselves. The
+fonts, including any derivative works, can be bundled, embedded, 
+redistributed and/or sold with any software provided that any reserved
+names are not used by derivative works. The fonts and derivatives,
+however, cannot be released under any other type of license. The
+requirement for fonts to remain under this license does not apply
+to any document created using the fonts or their derivatives.
+
+DEFINITIONS
+"Font Software" refers to the set of files released by the Copyright
+Holder(s) under this license and clearly marked as such. This may
+include source files, build scripts and documentation.
+
+"Reserved Font Name" refers to any names specified as such after the
+copyright statement(s).
+
+"Original Version" refers to the collection of Font Software components as
+distributed by the Copyright Holder(s).
+
+"Modified Version" refers to any derivative made by adding to, deleting,
+or substituting -- in part or in whole -- any of the components of the
+Original Version, by changing formats or by porting the Font Software to a
+new environment.
+
+"Author" refers to any designer, engineer, programmer, technical
+writer or other person who contributed to the Font Software.
+
+PERMISSION & CONDITIONS
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Font Software, to use, study, copy, merge, embed, modify,
+redistribute, and sell modified and unmodified copies of the Font
+Software, subject to the following conditions:
+
+1) Neither the Font Software nor any of its individual components,
+in Original or Modified Versions, may be sold by itself.
+
+2) Original or Modified Versions of the Font Software may be bundled,
+redistributed and/or sold with any software, provided that each copy
+contains the above copyright notice and this license. These can be
+included either as stand-alone text files, human-readable headers or
+in the appropriate machine-readable metadata fields within text or
+binary files as long as those fields can be easily viewed by the user.
+
+3) No Modified Version of the Font Software may use the Reserved Font
+Name(s) unless explicit written permission is granted by the corresponding
+Copyright Holder. This restriction only applies to the primary font name as
+presented to the users.
+
+4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
+Software shall not be used to promote, endorse or advertise any
+Modified Version, except to acknowledge the contribution(s) of the
+Copyright Holder(s) and the Author(s) or with their explicit written
+permission.
+
+5) The Font Software, modified or unmodified, in part or in whole,
+must be distributed entirely under this license, and must not be
+distributed under any other license. The requirement for fonts to
+remain under this license does not apply to any document created
+using the Font Software.
+
+TERMINATION
+This license becomes null and void if any of the above conditions are
+not met.
+
+DISCLAIMER
+THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
+COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
+DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
+OTHER DEALINGS IN THE FONT SOFTWARE.