Prepared test release v26.5.4 (#759 )

Prepared release v26.5.3 (#758 )
Migrated to axum (#757 )
2026-05-13 15:44:12 +00:00 · 2026-05-13 14:03:36 +02:00 · 2026-05-13 11:58:16 +02:00 · 2026-05-12 20:31:08 +02:00 · 2026-05-08 13:28:18 +02:00 · 2026-05-08 09:32:20 +02:00
34 changed files with 3060 additions and 2570 deletions
--- a/.github/workflows/build-and-release.yml
+++ b/.github/workflows/build-and-release.yml
@ -220,29 +220,29 @@ jobs:
            rust_target: 'aarch64-apple-darwin'
            dotnet_runtime: 'osx-arm64'
            dotnet_name_postfix: '-aarch64-apple-darwin'
-            tauri_bundle: 'dmg,updater'
+            tauri_bundle: 'dmg,app,updater'
            tauri_bundle_pr: 'dmg'

          - platform: 'macos-latest' # for Intel-based macOS
            rust_target: 'x86_64-apple-darwin'
            dotnet_runtime: 'osx-x64'
            dotnet_name_postfix: '-x86_64-apple-darwin'
-            tauri_bundle: 'dmg,updater'
+            tauri_bundle: 'dmg,app,updater'
            tauri_bundle_pr: 'dmg'

          - platform: 'ubuntu-22.04' # for x86-based Linux
            rust_target: 'x86_64-unknown-linux-gnu'
            dotnet_runtime: 'linux-x64'
            dotnet_name_postfix: '-x86_64-unknown-linux-gnu'
-            tauri_bundle: 'appimage,deb,updater'
-            tauri_bundle_pr: 'appimage,deb'
+            tauri_bundle: 'appimage,updater'
+            tauri_bundle_pr: 'appimage'
            
          - platform: 'ubuntu-22.04-arm' # for ARM-based Linux
            rust_target: 'aarch64-unknown-linux-gnu'
            dotnet_runtime: 'linux-arm64'
            dotnet_name_postfix: '-aarch64-unknown-linux-gnu'
-            tauri_bundle: 'appimage,deb,updater'
-            tauri_bundle_pr: 'appimage,deb'
+            tauri_bundle: 'appimage,updater'
+            tauri_bundle_pr: 'appimage'

          - platform: 'windows-latest' # for x86-based Windows
            rust_target: 'x86_64-pc-windows-msvc'
@ -704,37 +704,47 @@ jobs:
        if: matrix.platform == 'ubuntu-22.04' && contains(matrix.rust_target, 'x86_64')
        run: |
          sudo apt-get update
-          sudo apt-get install -y libwebkit2gtk-4.0-dev libappindicator3-dev librsvg2-dev patchelf libfuse2
+          sudo apt-get install -y libwebkit2gtk-4.1-dev libayatana-appindicator3-dev librsvg2-dev patchelf libfuse2 xdg-utils
          
      - name: Setup dependencies (Ubuntu-specific, ARM)
        if: matrix.platform == 'ubuntu-22.04-arm' && contains(matrix.rust_target, 'aarch64')
        run: |
          sudo apt-get update
-          sudo apt-get install -y libwebkit2gtk-4.0-dev libappindicator3-dev librsvg2-dev patchelf libfuse2
+          sudo apt-get install -y libwebkit2gtk-4.1-dev libayatana-appindicator3-dev librsvg2-dev patchelf libfuse2 xdg-utils
          
      - name: Setup Tauri (Unix)
        if: matrix.platform != 'windows-latest'
        run: |
-          if ! cargo tauri --version > /dev/null 2>&1; then
-            cargo install --version 1.6.2 tauri-cli
+          if ! cargo tauri --version 2>/dev/null | grep -Eq '^tauri-cli 2\.'; then
+            cargo install tauri-cli --version "^2.11.0" --locked --force
          else
-            echo "Tauri is already installed"
+            echo "Tauri CLI v2 is already installed"
          fi
          
      - name: Setup Tauri (Windows)
        if: matrix.platform == 'windows-latest'
        run: |
-          if (-not (cargo tauri --version 2>$null)) {
-            cargo install --version 1.6.2 tauri-cli
+          $tauriVersion = cargo tauri --version 2>$null
+          if (-not $tauriVersion -or $tauriVersion -notmatch '^tauri-cli 2\.') {
+            cargo install tauri-cli --version "^2.11.0" --locked --force
          } else {
-            Write-Output "Tauri is already installed"
+            Write-Output "Tauri CLI v2 is already installed"
          }
          
      - name: Delete previous artifact, which may exist due to caching (macOS)
        if: startsWith(matrix.platform, 'macos')
        run: |
-          rm -f runtime/target/${{ matrix.rust_target }}/release/bundle/dmg/MindWork AI Studio_*.dmg
-          rm -f runtime/target/${{ matrix.rust_target }}/release/bundle/macos/MindWork AI Studio.app.tar.gz*
+          dmg_dir="runtime/target/${{ matrix.rust_target }}/release/bundle/dmg"
+          macos_dir="runtime/target/${{ matrix.rust_target }}/release/bundle/macos"
+
+          if [ -d "$dmg_dir" ]; then
+            find "$dmg_dir" -maxdepth 1 -name 'MindWork AI Studio_*.dmg' -delete
+          fi
+
+          if [ -d "$macos_dir" ]; then
+            find "$macos_dir" -maxdepth 1 -name '*.app' -exec rm -rf {} +
+            find "$macos_dir" -maxdepth 1 -name '*.app.tar.gz*' -delete
+          fi

      - name: Delete previous artifact, which may exist due to caching (Windows - MSI)
        if: startsWith(matrix.platform, 'windows') && contains(matrix.tauri_bundle, 'msi')
@ -748,16 +758,11 @@ jobs:
          rm -Force "runtime/target/${{ matrix.rust_target }}/release/bundle/nsis/MindWork AI Studio_*.exe" -ErrorAction SilentlyContinue
          rm -Force "runtime/target/${{ matrix.rust_target }}/release/bundle/nsis/MindWork AI Studio*nsis.zip*" -ErrorAction SilentlyContinue
          
-      - name: Delete previous artifact, which may exist due to caching (Linux - Debian Package)
-        if: startsWith(matrix.platform, 'ubuntu') && contains(matrix.tauri_bundle, 'deb')
-        run: |
-          rm -f runtime/target/${{ matrix.rust_target }}/release/bundle/deb/mind-work-ai-studio_*.deb
-      
      - name: Delete previous artifact, which may exist due to caching (Linux - AppImage)
        if: startsWith(matrix.platform, 'ubuntu') && contains(matrix.tauri_bundle, 'appimage')
        run: |
-          rm -f runtime/target/${{ matrix.rust_target }}/release/bundle/appimage/mind-work-ai-studio_*.AppImage
-          rm -f runtime/target/${{ matrix.rust_target }}/release/bundle/appimage/mind-work-ai-studio*AppImage.tar.gz*
+          rm -f runtime/target/${{ matrix.rust_target }}/release/bundle/appimage/*.AppImage
+          rm -f runtime/target/${{ matrix.rust_target }}/release/bundle/appimage/*.AppImage.tar.gz*
      
      - name: Build Tauri project (Unix)
        if: matrix.platform != 'windows-latest'
@ -771,12 +776,22 @@ jobs:
            echo "Running PR test build without updater bundle signing"
            bundles="${{ matrix.tauri_bundle_pr }}"
          else
-            export TAURI_PRIVATE_KEY="$PRIVATE_PUBLISH_KEY"
-            export TAURI_KEY_PASSWORD="$PRIVATE_PUBLISH_KEY_PASSWORD"
+            export TAURI_SIGNING_PRIVATE_KEY="$PRIVATE_PUBLISH_KEY"
+            export TAURI_SIGNING_PRIVATE_KEY_PASSWORD="$PRIVATE_PUBLISH_KEY_PASSWORD"
          fi

          cd runtime
          cargo tauri build --target ${{ matrix.rust_target }} --bundles "$bundles"
+
+          if [ "${{ needs.determine_run_mode.outputs.is_pr_build }}" != "true" ] && [[ "${{ matrix.platform }}" == macos* ]]; then
+            app_update_archive_count=$(find target/${{ matrix.rust_target }}/release/bundle/macos -maxdepth 1 -name '*.app.tar.gz' | wc -l)
+            app_update_signature_count=$(find target/${{ matrix.rust_target }}/release/bundle/macos -maxdepth 1 -name '*.app.tar.gz.sig' | wc -l)
+
+            if [ "$app_update_archive_count" -eq 0 ] || [ "$app_update_signature_count" -eq 0 ]; then
+              echo "Expected macOS updater artifacts were not generated."
+              exit 1
+            fi
+          fi
          
      - name: Build Tauri project (Windows)
        if: matrix.platform == 'windows-latest'
@ -790,8 +805,8 @@ jobs:
            Write-Output "Running PR test build without updater bundle signing"
            $bundles = "${{ matrix.tauri_bundle_pr }}"
          } else {
-            $env:TAURI_PRIVATE_KEY="$env:PRIVATE_PUBLISH_KEY"
-            $env:TAURI_KEY_PASSWORD="$env:PRIVATE_PUBLISH_KEY_PASSWORD"
+            $env:TAURI_SIGNING_PRIVATE_KEY="$env:PRIVATE_PUBLISH_KEY"
+            $env:TAURI_SIGNING_PRIVATE_KEY_PASSWORD="$env:PRIVATE_PUBLISH_KEY_PASSWORD"
          }

          cd runtime
@ -804,7 +819,7 @@ jobs:
          name: MindWork AI Studio (macOS ${{ matrix.dotnet_runtime }})
          path: |
            runtime/target/${{ matrix.rust_target }}/release/bundle/dmg/MindWork AI Studio_*.dmg
-            runtime/target/${{ matrix.rust_target }}/release/bundle/macos/MindWork AI Studio.app.tar.gz*
+            runtime/target/${{ matrix.rust_target }}/release/bundle/macos/*.app.tar.gz*
          if-no-files-found: error
          retention-days: ${{ fromJSON(needs.determine_run_mode.outputs.artifact_retention_days) }}
          
@ -830,24 +845,14 @@ jobs:
          if-no-files-found: error
          retention-days: ${{ fromJSON(needs.determine_run_mode.outputs.artifact_retention_days) }}
          
-      - name: Upload artifact (Linux - Debian Package)
-        if: startsWith(matrix.platform, 'ubuntu') && contains(matrix.tauri_bundle, 'deb')
-        uses: actions/upload-artifact@v4
-        with:
-          name: MindWork AI Studio (Linux - deb ${{ matrix.dotnet_runtime }})
-          path: |
-            runtime/target/${{ matrix.rust_target }}/release/bundle/deb/mind-work-ai-studio_*.deb
-          if-no-files-found: error
-          retention-days: ${{ fromJSON(needs.determine_run_mode.outputs.artifact_retention_days) }}
-          
      - name: Upload artifact (Linux - AppImage)
        if: startsWith(matrix.platform, 'ubuntu') && contains(matrix.tauri_bundle, 'appimage')
        uses: actions/upload-artifact@v4
        with:
          name: MindWork AI Studio (Linux - AppImage ${{ matrix.dotnet_runtime }})
          path: |
-            runtime/target/${{ matrix.rust_target }}/release/bundle/appimage/mind-work-ai-studio_*.AppImage
-            runtime/target/${{ matrix.rust_target }}/release/bundle/appimage/mind-work-ai-studio*AppImage.tar.gz*
+            runtime/target/${{ matrix.rust_target }}/release/bundle/appimage/*.AppImage
+            runtime/target/${{ matrix.rust_target }}/release/bundle/appimage/*.AppImage.tar.gz*
          if-no-files-found: error
          retention-days: ${{ fromJSON(needs.determine_run_mode.outputs.artifact_retention_days) }}
        
@ -883,14 +888,14 @@ jobs:
          # Find and process files in the artifacts directory:
          find "$GITHUB_WORKSPACE/artifacts" -type f | while read -r FILE; do
          
-            if [[ "$FILE" == *"osx-x64"* && "$FILE" == *".tar.gz" ]]; then
-              TARGET_NAME="MindWork AI Studio_x64.app.tar.gz"
-            elif [[ "$FILE" == *"osx-x64"* && "$FILE" == *".tar.gz.sig" ]]; then
+            if [[ "$FILE" == *"osx-x64"* && "$FILE" == *".tar.gz.sig" ]]; then
              TARGET_NAME="MindWork AI Studio_x64.app.tar.gz.sig"
-            elif [[ "$FILE" == *"osx-arm64"* && "$FILE" == *".tar.gz" ]]; then
-              TARGET_NAME="MindWork AI Studio_aarch64.app.tar.gz"
+            elif [[ "$FILE" == *"osx-x64"* && "$FILE" == *".tar.gz" ]]; then
+              TARGET_NAME="MindWork AI Studio_x64.app.tar.gz"
            elif [[ "$FILE" == *"osx-arm64"* && "$FILE" == *".tar.gz.sig" ]]; then
              TARGET_NAME="MindWork AI Studio_aarch64.app.tar.gz.sig"
+            elif [[ "$FILE" == *"osx-arm64"* && "$FILE" == *".tar.gz" ]]; then
+              TARGET_NAME="MindWork AI Studio_aarch64.app.tar.gz"
            else
              TARGET_NAME="$(basename "$FILE")"
              TARGET_NAME=$(echo "$TARGET_NAME" | sed "s/_${VERSION}//")
@ -941,9 +946,9 @@ jobs:
              platform="linux-x86_64"
            elif [[ "$sig_file" == *"aarch64.AppImage"* ]]; then
              platform="linux-aarch64"
-            elif [[ "$sig_file" == *"x64-setup.nsis"* ]]; then
+            elif [[ "$sig_file" == *"x64-setup"* ]]; then
              platform="windows-x86_64"
-            elif [[ "$sig_file" == *"arm64-setup.nsis"* ]]; then
+            elif [[ "$sig_file" == *"arm64-setup"* ]]; then
              platform="windows-aarch64"
            else
              echo "Platform not recognized: '$sig_file'"
@ -1007,6 +1012,13 @@ jobs:
            exit 1
          fi

+          for platform in darwin-aarch64 darwin-x86_64 linux-aarch64 linux-x86_64 windows-aarch64 windows-x86_64; do
+            if ! jq -e --arg platform "$platform" '.platforms[$platform]' $GITHUB_WORKSPACE/release/assets/latest.json > /dev/null; then
+              echo "The generated latest.json is missing platform '$platform'."
+              exit 1
+            fi
+          done
+
      - name: Show all release assets
        run: ls -Rlhat $GITHUB_WORKSPACE/release/assets

--- a/.gitignore
+++ b/.gitignore
@ -169,3 +169,6 @@ orleans.codegen.cs

 # Ignore GitHub Copilot migration files:
 **/copilot.data.migration.*.xml
+
+# Tauri generated schemas/manifests
+/runtime/gen/
--- a/app/Build/Commands/UpdateMetadataCommands.cs
+++ b/app/Build/Commands/UpdateMetadataCommands.cs
@ -245,7 +245,7 @@ public sealed partial class UpdateMetadataCommands
        Console.WriteLine("- Start building the Rust runtime ...");
        
        var pathRuntime = Environment.GetRustRuntimeDirectory();
-        var rustBuildOutput = await this.ReadCommandOutput(pathRuntime, "cargo", "tauri build --bundles none", true);
+        var rustBuildOutput = await this.ReadCommandOutput(pathRuntime, "cargo", "tauri build --no-bundle", true);
        var rustBuildOutputLines = rustBuildOutput.Split([global::System.Environment.NewLine], StringSplitOptions.RemoveEmptyEntries);
        var foundRustIssue = false;
        foreach (var buildOutputLine in rustBuildOutputLines)
--- a/Studio/Assistants/I18N/allTexts.lua
+++ b/Studio/Assistants/I18N/allTexts.lua
@ -6028,9 +6028,6 @@ UI_TEXT_CONTENT["AISTUDIO::PAGES::INFORMATION::T1924365263"] = "This library is
 -- Encryption secret: is configured
 UI_TEXT_CONTENT["AISTUDIO::PAGES::INFORMATION::T1931141322"] = "Encryption secret: is configured"

-- We use Rocket to implement the runtime API. This is necessary because the runtime must be able to communicate with the user interface (IPC). Rocket is a great framework for implementing web APIs in Rust.
-UI_TEXT_CONTENT["AISTUDIO::PAGES::INFORMATION::T1943216839"] = "We use Rocket to implement the runtime API. This is necessary because the runtime must be able to communicate with the user interface (IPC). Rocket is a great framework for implementing web APIs in Rust."
-
 -- Copies the following to the clipboard
 UI_TEXT_CONTENT["AISTUDIO::PAGES::INFORMATION::T2029659664"] = "Copies the following to the clipboard"

@ -6133,6 +6130,12 @@ UI_TEXT_CONTENT["AISTUDIO::PAGES::INFORMATION::T3178730036"] = "Have feature ide
 -- Hide Details
 UI_TEXT_CONTENT["AISTUDIO::PAGES::INFORMATION::T3183837919"] = "Hide Details"

+-- Axum server runs the internal axum service over a secure local connection. This helps AI Studio protect the communication between the Rust runtime and the user interface.
+UI_TEXT_CONTENT["AISTUDIO::PAGES::INFORMATION::T3208719461"] = "Axum server runs the internal axum service over a secure local connection. This helps AI Studio protect the communication between the Rust runtime and the user interface."
+
+-- Rustls helps secure the internal connection between the app's user interface and the Rust runtime. This protects the local communication that AI Studio needs while it is running.
+UI_TEXT_CONTENT["AISTUDIO::PAGES::INFORMATION::T3239817808"] = "Rustls helps secure the internal connection between the app's user interface and the Rust runtime. This protects the local communication that AI Studio needs while it is running."
+
 -- Update Pandoc
 UI_TEXT_CONTENT["AISTUDIO::PAGES::INFORMATION::T3249965383"] = "Update Pandoc"

@ -6226,6 +6229,9 @@ UI_TEXT_CONTENT["AISTUDIO::PAGES::INFORMATION::T836298648"] = "Provided by confi
 -- We use this library to be able to read PowerPoint files. This allows us to insert content from slides into prompts and take PowerPoint files into account in RAG processes. We thank Nils Kruthoff for his work on this Rust crate.
 UI_TEXT_CONTENT["AISTUDIO::PAGES::INFORMATION::T855925638"] = "We use this library to be able to read PowerPoint files. This allows us to insert content from slides into prompts and take PowerPoint files into account in RAG processes. We thank Nils Kruthoff for his work on this Rust crate."

+-- Axum is used to provide the small internal service that connects the Rust runtime with the app's user interface. This lets both parts of AI Studio exchange information while the app is running.
+UI_TEXT_CONTENT["AISTUDIO::PAGES::INFORMATION::T864851737"] = "Axum is used to provide the small internal service that connects the Rust runtime with the app's user interface. This lets both parts of AI Studio exchange information while the app is running."
+
 -- For some data transfers, we need to encode the data in base64. This Rust library is great for this purpose.
 UI_TEXT_CONTENT["AISTUDIO::PAGES::INFORMATION::T870640199"] = "For some data transfers, we need to encode the data in base64. This Rust library is great for this purpose."

--- a/Studio/Components/Changelog.Logs.cs
+++ b/Studio/Components/Changelog.Logs.cs
@ -13,6 +13,9 @@ public partial class Changelog
    
    public static readonly Log[] LOGS = 
    [
+        new (239, "v26.5.4, build 239 (2026-05-13 11:58 UTC)", "v26.5.4.md"),
+        new (238, "v26.5.3, build 238 (2026-05-13 09:50 UTC)", "v26.5.3.md"),
+        new (237, "v26.5.2, build 237 (2026-05-06 16:38 UTC)", "v26.5.2.md"),
        new (236, "v26.5.1, build 236 (2026-05-06 13:06 UTC)", "v26.5.1.md"),
        new (235, "v26.4.1, build 235 (2026-04-17 17:25 UTC)", "v26.4.1.md"),
        new (234, "v26.2.2, build 234 (2026-02-22 14:16 UTC)", "v26.2.2.md"),
--- a/Studio/Pages/Information.razor
+++ b/Studio/Pages/Information.razor
@ -279,7 +279,9 @@
                    <ThirdPartyComponent Name="Rust" Developer="Graydon Hoare, Rust Foundation, Rust developers & Open Source Community" LicenseName="MIT" LicenseUrl="https://github.com/rust-lang/rust/blob/master/LICENSE-MIT" RepositoryUrl="https://github.com/rust-lang/rust" UseCase="@T("The .NET backend cannot be started as a desktop app. Therefore, I use a second backend in Rust, which I call runtime. With Rust as the runtime, Tauri can be used to realize a typical desktop app. Thanks to Rust, this app can be offered for Windows, macOS, and Linux desktops. Rust is a great language for developing safe and high-performance software.")"/>
                    <ThirdPartyComponent Name="Tauri" Developer="Daniel Thompson-Yvetot, Lucas Nogueira, Tensor, Boscop, Serge Zaitsev, George Burton & Open Source Community" LicenseName="MIT" LicenseUrl="https://github.com/tauri-apps/tauri/blob/dev/LICENSE_MIT" RepositoryUrl="https://github.com/tauri-apps/tauri" UseCase="@T("Tauri is used to host the Blazor user interface. It is a great project that allows the creation of desktop applications using web technologies. I love Tauri!")"/>
                    <ThirdPartyComponent Name="Qdrant" Developer="Andrey Vasnetsov, Tim Visée, Arnaud Gourlay, Luis Cossío, Ivan Pleshkov, Roman Titov, xzfc, JojiiOfficial & Open Source Community" LicenseName="Apache-2.0" LicenseUrl="https://github.com/qdrant/qdrant/blob/master/LICENSE" RepositoryUrl="https://github.com/qdrant/qdrant" UseCase="@T("Qdrant is a vector database and vector similarity search engine. We use it to realize local RAG—retrieval-augmented generation—within AI Studio. Thanks for the effort and great work that has been and is being put into Qdrant.")"/>
-                    <ThirdPartyComponent Name="Rocket" Developer="Sergio Benitez & Open Source Community" LicenseName="MIT" LicenseUrl="https://github.com/rwf2/Rocket/blob/master/LICENSE-MIT" RepositoryUrl="https://github.com/rwf2/Rocket" UseCase="@T("We use Rocket to implement the runtime API. This is necessary because the runtime must be able to communicate with the user interface (IPC). Rocket is a great framework for implementing web APIs in Rust.")"/>
+                    <ThirdPartyComponent Name="axum" Developer="David Pedersen, Jonas Platte, tottoto, David Mládek, Yann Simon, Tobias Bieniek, Open Source Community & Tokio Project" LicenseName="MIT" LicenseUrl="https://github.com/tokio-rs/axum/blob/main/LICENSE" RepositoryUrl="https://github.com/tokio-rs/axum" UseCase="@T("Axum is used to provide the small internal service that connects the Rust runtime with the app's user interface. This lets both parts of AI Studio exchange information while the app is running.")"/>
+                    <ThirdPartyComponent Name="axum-server" Developer="Eray Karatay, Adi Salimgereyev, daxpedda & Open Source Community" LicenseName="MIT" LicenseUrl="https://github.com/programatik29/axum-server/blob/master/LICENSE" RepositoryUrl="https://github.com/programatik29/axum-server" UseCase="@T("Axum server runs the internal axum service over a secure local connection. This helps AI Studio protect the communication between the Rust runtime and the user interface.")"/>
+                    <ThirdPartyComponent Name="Rustls" Developer="Joe Birr-Pixton, Dirkjan Ochtman, Daniel McCarney, Brian Smith, Jacob Hoffman-Andrews, Jorge Aparicio & Open Source Community" LicenseName="MIT" LicenseUrl="https://github.com/rustls/rustls/blob/main/LICENSE-MIT" RepositoryUrl="https://github.com/rustls/rustls" UseCase="@T("Rustls helps secure the internal connection between the app's user interface and the Rust runtime. This protects the local communication that AI Studio needs while it is running.")"/>
                    <ThirdPartyComponent Name="serde" Developer="Erick Tryzelaar, David Tolnay & Open Source Community" LicenseName="MIT" LicenseUrl="https://github.com/serde-rs/serde/blob/master/LICENSE-MIT" RepositoryUrl="https://github.com/serde-rs/serde" UseCase="@T("Now we have multiple systems, some developed in .NET and others in Rust. The data format JSON is responsible for translating data between both worlds (called data serialization and deserialization). Serde takes on this task in the Rust world. The counterpart in the .NET world is an integral part of .NET and is located in System.Text.Json.")"/>
                    <ThirdPartyComponent Name="strum_macros" Developer="Peter Glotfelty & Open Source Community" LicenseName="MIT" LicenseUrl="https://github.com/Peternator7/strum/blob/master/LICENSE" RepositoryUrl="https://github.com/Peternator7/strum" UseCase="@T("This crate provides derive macros for Rust enums, which we use to reduce boilerplate when implementing string conversions and metadata for runtime types. This is helpful for the communication between our Rust and .NET systems.")"/>
                    <ThirdPartyComponent Name="keyring" Developer="Walther Chen, Daniel Brotsky & Open Source Community" LicenseName="MIT" LicenseUrl="https://github.com/hwchen/keyring-rs/blob/master/LICENSE-MIT" RepositoryUrl="https://github.com/hwchen/keyring-rs" UseCase="@T("In order to use any LLM, each user must store their so-called API key for each LLM provider. This key must be kept secure, similar to a password. The safest way to do this is offered by operating systems like macOS, Windows, and Linux: They have mechanisms to store such data, if available, on special security hardware. Since this is currently not possible in .NET, we use this Rust library.")"/>
@ -312,4 +314,4 @@
            </ExpansionPanel>
        </MudExpansionPanels>
    </InnerScrolling>
-</div>
+</div>
--- a/Studio/Plugins/languages/de-de-43065dbc-78d0-45b7-92be-f14c2926e2dc/plugin.lua
+++ b/Studio/Plugins/languages/de-de-43065dbc-78d0-45b7-92be-f14c2926e2dc/plugin.lua
@ -6030,9 +6030,6 @@ UI_TEXT_CONTENT["AISTUDIO::PAGES::INFORMATION::T1924365263"] = "Diese Bibliothek
 -- Encryption secret: is configured
 UI_TEXT_CONTENT["AISTUDIO::PAGES::INFORMATION::T1931141322"] = "Geheimnis für die Verschlüsselung: ist konfiguriert"

-- We use Rocket to implement the runtime API. This is necessary because the runtime must be able to communicate with the user interface (IPC). Rocket is a great framework for implementing web APIs in Rust.
-UI_TEXT_CONTENT["AISTUDIO::PAGES::INFORMATION::T1943216839"] = "Wir verwenden Rocket zur Implementierung der Runtime-API. Dies ist notwendig, da die Runtime mit der Benutzeroberfläche (IPC) kommunizieren muss. Rocket ist ein ausgezeichnetes Framework zur Umsetzung von Web-APIs in Rust."
-
 -- Copies the following to the clipboard
 UI_TEXT_CONTENT["AISTUDIO::PAGES::INFORMATION::T2029659664"] = "Kopiert Folgendes in die Zwischenablage"

@ -6135,6 +6132,12 @@ UI_TEXT_CONTENT["AISTUDIO::PAGES::INFORMATION::T3178730036"] = "Haben Sie Ideen
 -- Hide Details
 UI_TEXT_CONTENT["AISTUDIO::PAGES::INFORMATION::T3183837919"] = "Details ausblenden"

+-- Axum server runs the internal axum service over a secure local connection. This helps AI Studio protect the communication between the Rust runtime and the user interface.
+UI_TEXT_CONTENT["AISTUDIO::PAGES::INFORMATION::T3208719461"] = "Der Axum-Server führt den internen Axum-Dienst über eine sichere lokale Verbindung aus. Dadurch kann AI Studio die Kommunikation zwischen der Rust-Laufzeitumgebung und der Benutzeroberfläche schützen."
+
+-- Rustls helps secure the internal connection between the app's user interface and the Rust runtime. This protects the local communication that AI Studio needs while it is running.
+UI_TEXT_CONTENT["AISTUDIO::PAGES::INFORMATION::T3239817808"] = "Rustls hilft dabei, die interne Verbindung zwischen der Benutzeroberfläche der App und der Rust-Laufzeitumgebung abzusichern. Dadurch wird die lokale Kommunikation geschützt, die AI Studio während der Ausführung benötigt."
+
 -- Update Pandoc
 UI_TEXT_CONTENT["AISTUDIO::PAGES::INFORMATION::T3249965383"] = "Pandoc aktualisieren"

@ -6228,6 +6231,9 @@ UI_TEXT_CONTENT["AISTUDIO::PAGES::INFORMATION::T836298648"] = "Bereitgestellt vo
 -- We use this library to be able to read PowerPoint files. This allows us to insert content from slides into prompts and take PowerPoint files into account in RAG processes. We thank Nils Kruthoff for his work on this Rust crate.
 UI_TEXT_CONTENT["AISTUDIO::PAGES::INFORMATION::T855925638"] = "Wir verwenden diese Bibliothek, um PowerPoint-Dateien lesen zu können. So ist es möglich, Inhalte aus Folien in Prompts einzufügen und PowerPoint-Dateien in RAG-Prozessen zu berücksichtigen. Wir danken Nils Kruthoff für seine Arbeit an diesem Rust-Crate."

+-- Axum is used to provide the small internal service that connects the Rust runtime with the app's user interface. This lets both parts of AI Studio exchange information while the app is running.
+UI_TEXT_CONTENT["AISTUDIO::PAGES::INFORMATION::T864851737"] = "Axum wird verwendet, um den kleinen internen Dienst bereitzustellen, der die Rust-Laufzeitumgebung mit der Benutzeroberfläche der App verbindet. So können beide Teile von AI Studio Informationen austauschen, während die App läuft."
+
 -- For some data transfers, we need to encode the data in base64. This Rust library is great for this purpose.
 UI_TEXT_CONTENT["AISTUDIO::PAGES::INFORMATION::T870640199"] = "Für einige Datenübertragungen müssen wir die Daten in Base64 kodieren. Diese Rust-Bibliothek eignet sich dafür hervorragend."

--- a/Studio/Plugins/languages/en-us-97dfb1ba-50c4-4440-8dfa-6575daf543c8/plugin.lua
+++ b/Studio/Plugins/languages/en-us-97dfb1ba-50c4-4440-8dfa-6575daf543c8/plugin.lua
@ -6030,9 +6030,6 @@ UI_TEXT_CONTENT["AISTUDIO::PAGES::INFORMATION::T1924365263"] = "This library is
 -- Encryption secret: is configured
 UI_TEXT_CONTENT["AISTUDIO::PAGES::INFORMATION::T1931141322"] = "Encryption secret: is configured"

-- We use Rocket to implement the runtime API. This is necessary because the runtime must be able to communicate with the user interface (IPC). Rocket is a great framework for implementing web APIs in Rust.
-UI_TEXT_CONTENT["AISTUDIO::PAGES::INFORMATION::T1943216839"] = "We use Rocket to implement the runtime API. This is necessary because the runtime must be able to communicate with the user interface (IPC). Rocket is a great framework for implementing web APIs in Rust."
-
 -- Copies the following to the clipboard
 UI_TEXT_CONTENT["AISTUDIO::PAGES::INFORMATION::T2029659664"] = "Copies the following to the clipboard"

@ -6135,6 +6132,12 @@ UI_TEXT_CONTENT["AISTUDIO::PAGES::INFORMATION::T3178730036"] = "Have feature ide
 -- Hide Details
 UI_TEXT_CONTENT["AISTUDIO::PAGES::INFORMATION::T3183837919"] = "Hide Details"

+-- Axum server runs the internal axum service over a secure local connection. This helps AI Studio protect the communication between the Rust runtime and the user interface.
+UI_TEXT_CONTENT["AISTUDIO::PAGES::INFORMATION::T3208719461"] = "Axum server runs the internal axum service over a secure local connection. This helps AI Studio protect the communication between the Rust runtime and the user interface."
+
+-- Rustls helps secure the internal connection between the app's user interface and the Rust runtime. This protects the local communication that AI Studio needs while it is running.
+UI_TEXT_CONTENT["AISTUDIO::PAGES::INFORMATION::T3239817808"] = "Rustls helps secure the internal connection between the app's user interface and the Rust runtime. This protects the local communication that AI Studio needs while it is running."
+
 -- Update Pandoc
 UI_TEXT_CONTENT["AISTUDIO::PAGES::INFORMATION::T3249965383"] = "Update Pandoc"

@ -6228,6 +6231,9 @@ UI_TEXT_CONTENT["AISTUDIO::PAGES::INFORMATION::T836298648"] = "Provided by confi
 -- We use this library to be able to read PowerPoint files. This allows us to insert content from slides into prompts and take PowerPoint files into account in RAG processes. We thank Nils Kruthoff for his work on this Rust crate.
 UI_TEXT_CONTENT["AISTUDIO::PAGES::INFORMATION::T855925638"] = "We use this library to be able to read PowerPoint files. This allows us to insert content from slides into prompts and take PowerPoint files into account in RAG processes. We thank Nils Kruthoff for his work on this Rust crate."

+-- Axum is used to provide the small internal service that connects the Rust runtime with the app's user interface. This lets both parts of AI Studio exchange information while the app is running.
+UI_TEXT_CONTENT["AISTUDIO::PAGES::INFORMATION::T864851737"] = "Axum is used to provide the small internal service that connects the Rust runtime with the app's user interface. This lets both parts of AI Studio exchange information while the app is running."
+
 -- For some data transfers, we need to encode the data in base64. This Rust library is great for this purpose.
 UI_TEXT_CONTENT["AISTUDIO::PAGES::INFORMATION::T870640199"] = "For some data transfers, we need to encode the data in base64. This Rust library is great for this purpose."

--- a/Studio/Tools/Services/RustService.FileSystem.cs
+++ b/Studio/Tools/Services/RustService.FileSystem.cs
@ -7,7 +7,8 @@ public sealed partial class RustService
    public async Task<DirectorySelectionResponse> SelectDirectory(string title, string? initialDirectory = null)
    {
        PreviousDirectory? previousDirectory = initialDirectory is null ? null : new (initialDirectory);
-        var result = await this.http.PostAsJsonAsync($"/select/directory?title={title}", previousDirectory, this.jsonRustSerializerOptions);
+        var encodedTitle = Uri.EscapeDataString(title);
+        var result = await this.http.PostAsJsonAsync($"/select/directory?title={encodedTitle}", previousDirectory, this.jsonRustSerializerOptions);
        if (!result.IsSuccessStatusCode)
        {
            this.logger!.LogError($"Failed to select a directory: '{result.StatusCode}'");
--- a/Studio/Tools/Services/RustService.Retrieval.cs
+++ b/Studio/Tools/Services/RustService.Retrieval.cs
@ -13,7 +13,16 @@ public sealed partial class RustService
        var response = await this.http.SendAsync(request, HttpCompletionOption.ResponseHeadersRead);

        if (!response.IsSuccessStatusCode)
+        {
+            var responseBody = await response.Content.ReadAsStringAsync();
+            this.logger?.LogError(
+                "Failed to read arbitrary file data from Rust runtime. Status: {StatusCode}, reason: '{ReasonPhrase}', path: '{Path}', body: '{Body}'",
+                response.StatusCode,
+                response.ReasonPhrase,
+                path,
+                responseBody);
            return string.Empty;
+        }

        var resultBuilder = new StringBuilder();

--- a/Studio/wwwroot/changelog/v26.5.2.md
+++ b/Studio/wwwroot/changelog/v26.5.2.md
@ -1 +1,2 @@
-# v26.5.2, build 237 (2026-05-xx xx:xx UTC)
+# v26.5.2, build 237 (2026-05-06 16:38 UTC)
+- Updated the underlying Tauri framework from version 1 to the latest version 2. Please do not install this prerelease manually. Production versions such as v26.4.1 will ignore this update. We are using this prerelease to test the clean update path for the migration from the Tauri v1 framework to the Tauri v2 framework. After a successful test, this prerelease will be removed.
--- a/Studio/wwwroot/changelog/v26.5.3.md
+++ b/Studio/wwwroot/changelog/v26.5.3.md
@ -0,0 +1,2 @@
+# v26.5.3, build 238 (2026-05-13 09:50 UTC)
+- Migrated away from Rocket to Axum for our internal IPC API. Please do not install this prerelease manually. Production versions, such as v26.4.1, will ignore this update. We are using this prerelease to test the clean update path. After a successful test, this prerelease will be removed.
--- a/Studio/wwwroot/changelog/v26.5.4.md
+++ b/Studio/wwwroot/changelog/v26.5.4.md
@ -0,0 +1,2 @@
+# v26.5.4, build 239 (2026-05-13 11:58 UTC)
+- Migrated away from Rocket to Axum for our internal IPC API. Please do not install this prerelease manually. Production versions, such as v26.4.1, will ignore this update. We are using this prerelease to test the clean update path. After a successful test, this prerelease will be removed.
--- a/Studio/wwwroot/changelog/v26.5.5.md
+++ b/Studio/wwwroot/changelog/v26.5.5.md
@ -0,0 +1 @@
+# v26.5.5, build 240 (2026-05-xx xx:xx UTC)
--- a/metadata.txt
+++ b/metadata.txt
@ -1,12 +1,12 @@
-26.5.1
-2026-05-06 13:06:02 UTC
-236
+26.5.4
+2026-05-13 11:58:02 UTC
+239
 9.0.116 (commit fb4af7e1b3)
 9.0.15 (commit 4250c8399a)
-1.93.1 (commit 01f6ddf75)
+1.95.0 (commit 59807616e)
 8.15.0
-1.8.3
-ece329140e4, release
+2.11.1
+0089849e0c3, release
 osx-arm64
 144.0.7543.0
 1.17.1
--- a/runtime/Cargo.lock
+++ b/runtime/Cargo.lock
--- a/runtime/Cargo.toml
+++ b/runtime/Cargo.toml
@ -1,16 +1,19 @@
 [package]
 name = "mindwork-ai-studio"
-version = "26.5.1"
-edition = "2021"
+version = "26.5.4"
+edition = "2024"
 description = "MindWork AI Studio"
 authors = ["Thorsten Sommer"]

 [build-dependencies]
-tauri-build = { version = "1.5.6", features = [] }
+tauri-build = { version = "2.6.1", features = [] }

 [dependencies]
-tauri = { version = "1.8.3", features = [ "http-all", "updater", "shell-sidecar", "shell-open", "dialog", "global-shortcut"] }
-tauri-plugin-window-state = { git = "https://github.com/tauri-apps/plugins-workspace", branch = "v1" }
+tauri = { version = "2.11.1", features = [] }
+tauri-plugin-window-state = { version = "2.4.1" }
+tauri-plugin-shell = "2.3.5"
+tauri-plugin-dialog = "2.7.1"
+tauri-plugin-opener = "2.5.4"
 serde = { version = "1.0.228", features = ["derive"] }
 serde_json = "1.0.149"
 keyring = { version = "3.6.2", features = ["apple-native", "windows-native", "sync-secret-service"] }
@ -22,7 +25,9 @@ async-stream = "0.3.6"
 flexi_logger = "0.31.8"
 log = { version = "0.4.29", features = ["kv"] }
 once_cell = "1.21.4"
-rocket = { version = "0.5.1", features = ["json", "tls"] }
+axum = { version = "0.8.9", features = ["http2", "json", "query", "tokio"] }
+axum-server = { version = "0.8.0", features = ["tls-rustls"] }
+rustls = { version = "0.23.28", default-features = false, features = ["aws_lc_rs"] }
 rand = "0.10.1"
 rand_chacha = "0.10.0"
 base64 = "0.22.1"
@ -32,7 +37,7 @@ pbkdf2 = "0.12.2"
 hmac = "0.12.1"
 sha2 = "0.10.8"
 rcgen = { version = "0.14.7", features = ["pem"] }
-file-format = "0.28.0"
+file-format = "0.29.0"
 calamine = "0.34.0"
 pdfium-render = "0.8.37"
 sys-locale = "0.3.2"
@ -43,19 +48,18 @@ strum_macros = "0.28.0"
 sysinfo = "0.38.4"

 # Fixes security vulnerability downstream, where the upstream is not fixed yet:
-time = "0.3.47" # -> Rocket
 bytes = "1.11.1" # -> almost every dependency
-tar = "0.4.45" # -> Tauri v1

 [target.'cfg(target_os = "linux")'.dependencies]
 # See issue https://github.com/tauri-apps/tauri/issues/4470
 reqwest = { version = "0.13.2", features = ["native-tls-vendored"] }

-# Fixes security vulnerability downstream, where the upstream is not fixed yet:
-openssl = "0.10.76" # -> reqwest, Tauri v1
-
 [target.'cfg(target_os = "windows")'.dependencies]
 windows-registry = "0.6.1"

+[target.'cfg(not(any(target_os = "android", target_os = "ios")))'.dependencies]
+tauri-plugin-global-shortcut = "2"
+tauri-plugin-updater = "2.10.0"
+
 [features]
 custom-protocol = ["tauri/custom-protocol"]
--- a/runtime/build.rs
+++ b/runtime/build.rs
@ -53,6 +53,18 @@ fn update_cargo_toml(cargo_path: &str, version: &str) {
    let cargo_toml_lines = cargo_toml.lines();
    let mut new_cargo_toml = String::new();

+    // Return early when the version already matches to avoid unnecessary rewrites.
+    let current_version = cargo_toml.lines().find_map(|line| {
+        let trimmed = line.trim_start();
+        let rest = trimmed.strip_prefix("\"version\": ")?;
+        let quoted = rest.strip_prefix('"')?;
+        let end_idx = quoted.find('"')?;
+        Some(&quoted[..end_idx])
+    });
+    if current_version == Some(version) {
+        return;
+    }
+
    for line in cargo_toml_lines {
        if line.starts_with("version = ") {
            new_cargo_toml.push_str(&format!("version = \"{version}\""));
@ -67,6 +79,19 @@ fn update_cargo_toml(cargo_path: &str, version: &str) {

 fn update_tauri_conf(tauri_conf_path: &str, version: &str) {
    let tauri_conf = std::fs::read_to_string(tauri_conf_path).unwrap();
+
+    // Return early when the version already matches to avoid unnecessary rewrites.
+    let current_version = tauri_conf.lines().find_map(|line| {
+        let trimmed = line.trim_start();
+        let rest = trimmed.strip_prefix("\"version\": ")?;
+        let quoted = rest.strip_prefix('"')?;
+        let end_idx = quoted.find('"')?;
+        Some(&quoted[..end_idx])
+    });
+    if current_version == Some(version) {
+        return;
+    }
+
    let tauri_conf_lines = tauri_conf.lines();
    let mut new_tauri_conf = String::new();

@ -75,7 +100,7 @@ fn update_tauri_conf(tauri_conf_path: &str, version: &str) {
        //  "version": "0.1.0-alpha.0"
        // Please notice, that the version number line might have a leading tab, etc.
        if line.contains("\"version\": ") {
-            new_tauri_conf.push_str(&format!("\t\"version\": \"{version}\""));
+            new_tauri_conf.push_str(&format!("  \"version\": \"{version}\","));
        } else {
            new_tauri_conf.push_str(line);
        }
--- a/runtime/capabilities/default.json
+++ b/runtime/capabilities/default.json
@ -0,0 +1,34 @@
+{
+  "$schema": "../gen/schemas/desktop-schema.json",
+  "identifier": "default",
+  "description": "Default capability for MindWork AI Studio",
+  "remote": {
+    "urls": [
+      "http://localhost:*"
+    ]
+  },
+  "windows": [
+    "main"
+  ],
+  "permissions": [
+    "core:default",
+    "updater:default",
+    "opener:default",
+    "shell:allow-open",
+    {
+      "identifier": "shell:allow-spawn",
+      "allow": [
+        {
+          "name": "mindworkAIStudioServer",
+          "sidecar": true,
+          "args": true
+        },
+        {
+          "name": "qdrant",
+          "sidecar": true,
+          "args": true
+        }
+      ]
+    }
+  ]
+}
--- a/runtime/src/app_window.rs
+++ b/runtime/src/app_window.rs
@ -1,17 +1,23 @@
 use std::collections::HashMap;
+use std::convert::Infallible;
 use std::sync::Mutex;
 use std::time::Duration;
+use async_stream::stream;
+use axum::body::Body;
+use axum::http::header::CONTENT_TYPE;
+use axum::response::{IntoResponse, Response};
+use axum::Json;
+use bytes::Bytes;
 use log::{debug, error, info, trace, warn};
 use once_cell::sync::Lazy;
-use rocket::{get, post};
-use rocket::response::stream::TextStream;
-use rocket::serde::json::Json;
-use rocket::serde::Serialize;
-use serde::Deserialize;
+use serde::{Deserialize, Serialize};
 use strum_macros::Display;
-use tauri::updater::UpdateResponse;
-use tauri::{FileDropEvent, GlobalShortcutManager, UpdaterEvent, RunEvent, Manager, PathResolver, Window, WindowEvent, generate_context};
-use tauri::api::dialog::blocking::FileDialogBuilder;
+use tauri::{DragDropEvent,RunEvent, Manager, WindowEvent, generate_context};
+use tauri::path::PathResolver;
+use tauri::WebviewWindow;
+use tauri_plugin_updater::{UpdaterExt, Update};
+use tauri_plugin_global_shortcut::GlobalShortcutExt;
+use tauri_plugin_opener::OpenerExt;
 use tokio::sync::broadcast;
 use tokio::time;
 use crate::api_token::APIToken;
@ -24,10 +30,10 @@ use crate::qdrant::{cleanup_qdrant, start_qdrant_server, stop_qdrant_server};
 use crate::dotnet::create_startup_env_file;

 /// The Tauri main window.
-static MAIN_WINDOW: Lazy<Mutex<Option<Window>>> = Lazy::new(|| Mutex::new(None));
+pub static MAIN_WINDOW: Lazy<Mutex<Option<WebviewWindow>>> = Lazy::new(|| Mutex::new(None));

 /// The update response coming from the Tauri updater.
-static CHECK_UPDATE_RESPONSE: Lazy<Mutex<Option<UpdateResponse<tauri::Wry>>>> = Lazy::new(|| Mutex::new(None));
+static CHECK_UPDATE_RESPONSE: Lazy<Mutex<Option<Update>>> = Lazy::new(|| Mutex::new(None));

 /// The event broadcast sender for Tauri events.
 static EVENT_BROADCAST: Lazy<Mutex<Option<broadcast::Sender<Event>>>> = Lazy::new(|| Mutex::new(None));
@ -35,6 +41,9 @@ static EVENT_BROADCAST: Lazy<Mutex<Option<broadcast::Sender<Event>>>> = Lazy::ne
 /// Stores the currently registered global shortcuts (name -> shortcut string).
 static REGISTERED_SHORTCUTS: Lazy<Mutex<HashMap<Shortcut, String>>> = Lazy::new(|| Mutex::new(HashMap::new()));

+/// Stores the localhost origin of the Blazor app after the .NET server is ready.
+static APPROVED_APP_URL: Lazy<Mutex<Option<tauri::Url>>> = Lazy::new(|| Mutex::new(None));
+
 /// Enum identifying global keyboard shortcuts.
 #[derive(Debug, Clone, Copy, PartialEq, Eq, Hash, Serialize, Deserialize, Display)]
 #[strum(serialize_all = "SCREAMING_SNAKE_CASE")]
@ -76,10 +85,34 @@ pub fn start_tauri() {
    });

    let app = tauri::Builder::default()
+        .plugin(tauri_plugin_dialog::init())
+        .plugin(tauri_plugin_shell::init())
+        .plugin(tauri_plugin_opener::init())
+        .plugin(
+            tauri::plugin::Builder::<tauri::Wry, ()>::new("external-link-handler")
+                .on_navigation(|webview, url| {
+                    if !should_open_in_system_browser(webview, url) {
+                        return true;
+                    }
+
+                    match webview.app_handle().opener().open_url(url.as_str(), None::<&str>) {
+                        Ok(_) => {
+                            info!(Source = "Tauri"; "Opening external URL in system browser: {url}");
+                        },
+                        Err(error) => {
+                            error!(Source = "Tauri"; "Failed to open external URL '{url}' in system browser: {error}");
+                        },
+                    }
+                    false
+                })
+                .build(),
+        )
+        .plugin(tauri_plugin_global_shortcut::Builder::new().build())
+        .plugin(tauri_plugin_updater::Builder::new().build())
        .setup(move |app| {

            // Get the main window:
-            let window = app.get_window("main").expect("Failed to get main window.");
+            let window = app.get_webview_window("main").expect("Failed to get main window.");

            // Register a callback for window events, such as file drops. We have to use
            // this handler in addition to the app event handler, because file drop events
@ -100,27 +133,27 @@ pub fn start_tauri() {
            *MAIN_WINDOW.lock().unwrap() = Some(window);

            info!(Source = "Bootloader Tauri"; "Setup is running.");
-            let data_path = app.path_resolver().app_local_data_dir().unwrap();
+            let data_path = app.path().app_local_data_dir().unwrap();
            let data_path = data_path.join("data");

            // Get and store the data and config directories:
            DATA_DIRECTORY.set(data_path.to_str().unwrap().to_string()).map_err(|_| error!("Was not able to set the data directory.")).unwrap();
-            CONFIG_DIRECTORY.set(app.path_resolver().app_config_dir().unwrap().to_str().unwrap().to_string()).map_err(|_| error!("Was not able to set the config directory.")).unwrap();
+            CONFIG_DIRECTORY.set(app.path().app_config_dir().unwrap().to_str().unwrap().to_string()).map_err(|_| error!("Was not able to set the config directory.")).unwrap();

            if is_dev() {
                #[cfg(debug_assertions)]
                create_startup_env_file();
            } else {
                cleanup_dotnet_server();
-                start_dotnet_server();
+                start_dotnet_server(app.handle().clone());
            }

            cleanup_qdrant();
-            start_qdrant_server(app.path_resolver());
+            start_qdrant_server(app.handle().clone());

            info!(Source = "Bootloader Tauri"; "Reconfigure the file logger to use the app data directory {data_path:?}");
            switch_to_file_logging(data_path).map_err(|e| error!("Failed to switch logging to file: {e}")).unwrap();
-            set_pdfium_path(app.path_resolver());
+            set_pdfium_path(app.path());

            Ok(())
        })
@ -129,7 +162,7 @@ pub fn start_tauri() {
        .expect("Error while running Tauri application");

    // The app event handler:
-    app.run(|app_handle, event| {
+    app.run(|_app_handle, event| {
        if !matches!(event, RunEvent::MainEventsCleared) {
            debug!(Source = "Tauri"; "Tauri event received: location=app event handler   , event={event:?}");
        }
@ -149,54 +182,6 @@ pub fn start_tauri() {
                }
            }

-            RunEvent::Updater(updater_event) => {
-                match updater_event {
-                    UpdaterEvent::UpdateAvailable { body, date, version } => {
-                        let body_len = body.len();
-                        info!(Source = "Tauri"; "Updater: update available: body size={body_len} time={date:?} version={version}");
-                    }
-
-                    UpdaterEvent::Pending => {
-                        info!(Source = "Tauri"; "Updater: update is pending!");
-                    }
-
-                    UpdaterEvent::DownloadProgress { chunk_length, content_length: _ } => {
-                        trace!(Source = "Tauri"; "Updater: downloading chunk of {chunk_length} bytes");
-                    }
-
-                    UpdaterEvent::Downloaded => {
-                        info!(Source = "Tauri"; "Updater: update has been downloaded!");
-                        warn!(Source = "Tauri"; "Try to stop the .NET server now...");
-
-                        if is_prod() {
-                            stop_dotnet_server();
-                            stop_qdrant_server();
-                        } else {
-                            warn!(Source = "Tauri"; "Development environment detected; do not stop the .NET server.");
-                        }
-                    }
-
-                    UpdaterEvent::Updated => {
-                        info!(Source = "Tauri"; "Updater: app has been updated");
-                        warn!(Source = "Tauri"; "Try to restart the app now...");
-
-                        if is_prod() {
-                            app_handle.restart();
-                        } else {
-                            warn!(Source = "Tauri"; "Development environment detected; do not restart the app.");
-                        }
-                    }
-
-                    UpdaterEvent::AlreadyUpToDate => {
-                        info!(Source = "Tauri"; "Updater: app is already up to date");
-                    }
-
-                    UpdaterEvent::Error(error) => {
-                        warn!(Source = "Tauri"; "Updater: failed to update: {error}");
-                    }
-                }
-            }
-
            RunEvent::ExitRequested { .. } => {
                warn!(Source = "Tauri"; "Run event: exit was requested.");
                stop_qdrant_server();
@ -217,13 +202,64 @@ pub fn start_tauri() {
    warn!(Source = "Tauri"; "Tauri app was stopped.");
 }

+fn is_local_host(host: Option<&str>) -> bool {
+    matches!(host, Some("localhost") | Some("127.0.0.1") | Some("::1") | Some("[::1]"))
+}
+
+fn is_tauri_asset_host(host: Option<&str>) -> bool {
+    matches!(host, Some("tauri.localhost"))
+}
+
+fn is_tauri_asset_url(url: &tauri::Url) -> bool {
+    matches!(url.scheme(), "http" | "https") && is_tauri_asset_host(url.host_str())
+}
+
+fn is_local_http_url(url: &tauri::Url) -> bool {
+    matches!(url.scheme(), "http" | "https") && is_local_host(url.host_str())
+}
+
+fn same_origin(left: &tauri::Url, right: &tauri::Url) -> bool {
+    left.scheme() == right.scheme()
+        && left.host_str() == right.host_str()
+        && left.port_or_known_default() == right.port_or_known_default()
+}
+
+fn should_open_in_system_browser<R: tauri::Runtime>(webview: &tauri::Webview<R>, url: &tauri::Url) -> bool {
+    match url.scheme() {
+        "mailto" | "tel" => return true,
+        "http" | "https" => {},
+        _ => return false,
+    }
+
+    if is_tauri_asset_url(url) {
+        return false;
+    }
+
+    if let Some(approved_app_url) = APPROVED_APP_URL.lock().unwrap().as_ref() {
+        if same_origin(approved_app_url, url) {
+            return false;
+        }
+
+        if is_local_http_url(url) {
+            return true;
+        }
+    }
+
+    if let Ok(current_url) = webview.url() {
+        if same_origin(&current_url, url) {
+            return false;
+        }
+    }
+
+    !is_local_host(url.host_str())
+}
+
 /// Our event API endpoint for Tauri events. We try to send an endless stream of events to the client.
 /// If no events are available for a certain time, we send a ping event to keep the connection alive.
 /// When the client disconnects, the stream is closed. But we try to not lose events in between.
 /// The client is expected to reconnect automatically when the connection is closed and continue
 /// listening for events.
-#[get("/events")]
-pub async fn get_event_stream(_token: APIToken) -> TextStream![String] {
+pub async fn get_event_stream(_token: APIToken) -> Response {
    // Get the lock to the event broadcast sender:
    let event_broadcast_lock = EVENT_BROADCAST.lock().unwrap();

@ -235,8 +271,7 @@ pub async fn get_event_stream(_token: APIToken) -> TextStream![String] {
    // Drop the lock to allow other access to the sender:
    drop(event_broadcast_lock);

-    // Create the event stream:
-    TextStream! {
+    let stream = stream! {
        loop {
            // Wait at most 3 seconds for an event:
            match time::timeout(Duration::from_secs(3), event_receiver.recv()).await {
@ -247,11 +282,11 @@ pub async fn get_event_stream(_token: APIToken) -> TextStream![String] {
                    // is serialized as a single line so that the client can parse it
                    // correctly:
                    let event_json = serde_json::to_string(&event).unwrap();
-                    yield event_json;
+                    yield Ok::<Bytes, Infallible>(Bytes::from(event_json));

                    // The client expects a newline after each event because we are using
                    // a method to read the stream line-by-line:
-                    yield "\n".to_string();
+                    yield Ok::<Bytes, Infallible>(Bytes::from("\n"));
                },

                // Case: we lagged behind and missed some events
@ -271,15 +306,17 @@ pub async fn get_event_stream(_token: APIToken) -> TextStream![String] {

                    // Again, we have to serialize the event as a single line:
                    let event_json = serde_json::to_string(&ping_event).unwrap();
-                    yield event_json;
+                    yield Ok::<Bytes, Infallible>(Bytes::from(event_json));

                    // The client expects a newline after each event because we are using
                    // a method to read the stream line-by-line:
-                    yield "\n".to_string();
+                    yield Ok::<Bytes, Infallible>(Bytes::from("\n"));
                },
            }
        }
-    }
+    };
+
+    ([(CONTENT_TYPE, "application/jsonl")], Body::from_stream(stream)).into_response()
 }

 /// Data structure representing a Tauri event for our event API.
@ -303,23 +340,21 @@ impl Event {
    /// Creates an Event instance from a Tauri WindowEvent.
    pub fn from_window_event(window_event: &WindowEvent) -> Self {
        match window_event {
-            WindowEvent::FileDrop(drop_event) => {
+            WindowEvent::DragDrop(drop_event) => {
                match drop_event {
-                    FileDropEvent::Hovered(files) => Event::new(TauriEventType::FileDropHovered,
-                                                                files.iter().map(|f| f.to_string_lossy().to_string()).collect(),
+                    DragDropEvent::Enter { paths, .. } => Event::new(
+                        TauriEventType::FileDropHovered,
+                        paths.iter().map(|p| p.display().to_string()).collect(),
                    ),

-                    FileDropEvent::Dropped(files) => Event::new(TauriEventType::FileDropDropped,
-                                                                files.iter().map(|f| f.to_string_lossy().to_string()).collect(),
+                    DragDropEvent::Drop { paths, .. } => Event::new(
+                        TauriEventType::FileDropDropped,
+                        paths.iter().map(|p| p.display().to_string()).collect(),
                    ),

-                    FileDropEvent::Cancelled => Event::new(TauriEventType::FileDropCanceled,
-                                                           Vec::new(),
-                    ),
+                    DragDropEvent::Leave => Event::new(TauriEventType::FileDropCanceled, Vec::new()),

-                    _ => Event::new(TauriEventType::Unknown,
-                                    Vec::new(),
-                    ),
+                    _ => Event::new(TauriEventType::Unknown, Vec::new()),
                }
            },

@ -380,6 +415,12 @@ pub async fn change_location_to(url: &str) {
        }
    }

+    if let Ok(parsed_url) = tauri::Url::parse(url) {
+        if is_local_http_url(&parsed_url) {
+            *APPROVED_APP_URL.lock().unwrap() = Some(parsed_url);
+        }
+    }
+
    let js_location_change = format!("window.location = '{url}';");
    let main_window = main_window_spawn_clone.lock().unwrap();
    let location_change_result = main_window.as_ref().unwrap().eval(js_location_change.as_str());
@ -390,7 +431,6 @@ pub async fn change_location_to(url: &str) {
 }

 /// Checks for updates.
-#[get("/updates/check")]
 pub async fn check_for_update(_token: APIToken) -> Json<CheckUpdateResponse> {
    if is_dev() {
        warn!(Source = "Updater"; "The app is running in development mode; skipping update check.");
@ -402,46 +442,67 @@ pub async fn check_for_update(_token: APIToken) -> Json<CheckUpdateResponse> {
        });
    }

-    let app_handle = MAIN_WINDOW.lock().unwrap().as_ref().unwrap().app_handle();
-    let response = app_handle.updater().check().await;
-    match response {
-        Ok(update_response) => match update_response.is_update_available() {
-            true => {
-                *CHECK_UPDATE_RESPONSE.lock().unwrap() = Some(update_response.clone());
-                let new_version = update_response.latest_version();
-                info!(Source = "Updater"; "An update to version '{new_version}' is available.");
-                let changelog = update_response.body();
-                Json(CheckUpdateResponse {
-                    update_is_available: true,
-                    error: false,
-                    new_version: new_version.to_string(),
-                    changelog: match changelog {
-                        Some(c) => c.to_string(),
-                        None => String::from(""),
-                    },
-                })
-            },
-
-            false => {
-                info!(Source = "Updater"; "No updates are available.");
-                Json(CheckUpdateResponse {
+    let app_handle = {
+        let main_window = MAIN_WINDOW.lock().unwrap();
+        match main_window.as_ref() {
+            Some(window) => window.app_handle().clone(),
+            None => {
+                error!(Source = "Updater"; "Cannot check updates: main window not available.");
+                return Json(CheckUpdateResponse {
                    update_is_available: false,
-                    error: false,
+                    error: true,
                    new_version: String::from(""),
                    changelog: String::from(""),
-                })
-            },
-        },
-
+                });
+            }
+        }
+    };
+    let response = match app_handle.updater() {
+        Ok(updater) => updater.check().await,
        Err(e) => {
-            warn!(Source = "Updater"; "Failed to check for updates: {e}.");
+            warn!(Source = "Updater"; "Failed to get updater instance: {e}");
+            return Json(CheckUpdateResponse {
+                update_is_available: false,
+                error: true,
+                new_version: String::from(""),
+                changelog: String::from(""),
+            });
+        }
+    };
+
+    match response {
+        Ok(Some(update)) => {
+            let body_len = update.body.as_ref().map_or(0, |body| body.len());
+            let date = update.date;
+            let new_version = update.version.clone();
+            info!(Source = "Tauri"; "Updater: update available: body size={body_len} time={date:?} version={new_version}");
+            let changelog = update.body.clone().unwrap_or_default();
+            *CHECK_UPDATE_RESPONSE.lock().unwrap() = Some(update);
+            Json(CheckUpdateResponse {
+                update_is_available: true,
+                error: false,
+                new_version,
+                changelog,
+            })
+        }
+        Ok(None) => {
+            info!(Source = "Tauri"; "Updater: app is already up to date");
+            Json(CheckUpdateResponse {
+                update_is_available: false,
+                error: false,
+                new_version: String::from(""),
+                changelog: String::from(""),
+            })
+        }
+        Err(e) => {
+            warn!(Source = "Tauri"; "Updater: failed to update: {e}");
            Json(CheckUpdateResponse {
                update_is_available: false,
                error: true,
                new_version: String::from(""),
                changelog: String::from(""),
            })
-        },
+        }
    }
 }

@ -455,7 +516,6 @@ pub struct CheckUpdateResponse {
 }

 /// Installs the update.
-#[get("/updates/install")]
 pub async fn install_update(_token: APIToken) {
    if is_dev() {
        warn!(Source = "Updater"; "The app is running in development mode; skipping update installation.");
@ -463,9 +523,51 @@ pub async fn install_update(_token: APIToken) {
    }

    let cloned_response_option = CHECK_UPDATE_RESPONSE.lock().unwrap().clone();
+    let app_handle = MAIN_WINDOW
+        .lock()
+        .unwrap()
+        .as_ref()
+        .map(|window| window.app_handle().clone());
+
    match cloned_response_option {
        Some(update_response) => {
-            update_response.download_and_install().await.unwrap();
+            info!(Source = "Tauri"; "Updater: update is pending!");
+            let result = update_response.download_and_install(
+                |chunk_length, _content_length| {
+                    trace!(Source = "Tauri"; "Updater: downloading chunk of {chunk_length} bytes");
+                },
+                || {
+                    info!(Source = "Tauri"; "Updater: update has been downloaded!");
+                    warn!(Source = "Tauri"; "Try to stop the .NET server now...");
+
+                    if is_prod() {
+                        stop_dotnet_server();
+                        stop_qdrant_server();
+                    } else {
+                        warn!(Source = "Tauri"; "Development environment detected; do not stop the .NET server.");
+                    }
+                },
+            ).await;
+
+            match result {
+                Ok(_) => {
+                    info!(Source = "Tauri"; "Updater: app has been updated");
+                    warn!(Source = "Tauri"; "Try to restart the app now...");
+
+                    if is_prod() {
+                        if let Some(handle) = app_handle {
+                            handle.restart();
+                        } else {
+                            warn!(Source = "Tauri"; "Cannot restart after update: main window not available.");
+                        }
+                    } else {
+                        warn!(Source = "Tauri"; "Development environment detected; do not restart the app.");
+                    }
+                }
+                Err(e) => {
+                    warn!(Source = "Tauri"; "Updater: failed to update: {e}");
+                }
+            }
        },

        None => {
@ -474,269 +576,6 @@ pub async fn install_update(_token: APIToken) {
    }
 }

-/// Let the user select a directory.
-#[post("/select/directory?<title>", data = "<previous_directory>")]
-pub fn select_directory(
-    _token: APIToken,
-    title: &str,
-    previous_directory: Option<Json<PreviousDirectory>>,
-) -> Json<DirectorySelectionResponse> {
-    let folder_path = match previous_directory {
-        Some(previous) => {
-            let previous_path = previous.path.as_str();
-            create_file_dialog()
-                .set_title(title)
-                .set_directory(previous_path)
-                .pick_folder()
-        },
-
-        None => create_file_dialog().set_title(title).pick_folder(),
-    };
-
-    match folder_path {
-        Some(path) => {
-            info!("User selected directory: {path:?}");
-            Json(DirectorySelectionResponse {
-                user_cancelled: false,
-                selected_directory: path.to_str().unwrap().to_string(),
-            })
-        },
-
-        None => {
-            info!("User cancelled directory selection.");
-            Json(DirectorySelectionResponse {
-                user_cancelled: true,
-                selected_directory: String::from(""),
-            })
-        },
-    }
-}
-
-#[derive(Clone, Deserialize)]
-pub struct PreviousDirectory {
-    path: String,
-}
-
-#[derive(Clone, Deserialize)]
-pub struct FileTypeFilter {
-    filter_name: String,
-    filter_extensions: Vec<String>,
-}
-
-#[derive(Clone, Deserialize)]
-pub struct SelectFileOptions {
-    title: String,
-    previous_file: Option<PreviousFile>,
-    filter: Option<FileTypeFilter>,
-}
-
-#[derive(Clone, Deserialize)]
-pub struct SaveFileOptions {
-    title: String,
-    name_file: Option<PreviousFile>,
-    filter: Option<FileTypeFilter>,
-}
-
-#[derive(Serialize)]
-pub struct DirectorySelectionResponse {
-    user_cancelled: bool,
-    selected_directory: String,
-}
-
-/// Let the user select a file.
-#[post("/select/file", data = "<payload>")]
-pub fn select_file(
-    _token: APIToken,
-    payload: Json<SelectFileOptions>,
-) -> Json<FileSelectionResponse> {
-    // Create a new file dialog builder:
-    let file_dialog = create_file_dialog();
-
-    // Set the title of the file dialog:
-    let file_dialog = file_dialog.set_title(&payload.title);
-
-    // Set the file type filter if provided:
-    let file_dialog = apply_filter(file_dialog, &payload.filter);
-
-    // Set the previous file path if provided:
-    let file_dialog = match &payload.previous_file {
-        Some(previous) => {
-            let previous_path = previous.file_path.as_str();
-            file_dialog.set_directory(previous_path)
-        },
-
-        None => file_dialog,
-    };
-
-    // Show the file dialog and get the selected file path:
-    let file_path = file_dialog.pick_file();
-    match file_path {
-        Some(path) => {
-            info!("User selected file: {path:?}");
-            Json(FileSelectionResponse {
-                user_cancelled: false,
-                selected_file_path: path.to_str().unwrap().to_string(),
-            })
-        },
-
-        None => {
-            info!("User cancelled file selection.");
-            Json(FileSelectionResponse {
-                user_cancelled: true,
-                selected_file_path: String::from(""),
-            })
-        },
-    }
-}
-
-/// Let the user select some files.
-#[post("/select/files", data = "<payload>")]
-pub fn select_files(
-    _token: APIToken,
-    payload: Json<SelectFileOptions>,
-) -> Json<FilesSelectionResponse> {
-    // Create a new file dialog builder:
-    let file_dialog = create_file_dialog();
-
-    // Set the title of the file dialog:
-    let file_dialog = file_dialog.set_title(&payload.title);
-
-    // Set the file type filter if provided:
-    let file_dialog = apply_filter(file_dialog, &payload.filter);
-
-    // Set the previous file path if provided:
-    let file_dialog = match &payload.previous_file {
-        Some(previous) => {
-            let previous_path = previous.file_path.as_str();
-            file_dialog.set_directory(previous_path)
-        },
-
-        None => file_dialog,
-    };
-
-    // Show the file dialog and get the selected file path:
-    let file_paths = file_dialog.pick_files();
-    match file_paths {
-        Some(paths) => {
-            info!("User selected {} files.", paths.len());
-            Json(FilesSelectionResponse {
-                user_cancelled: false,
-                selected_file_paths: paths
-                    .iter()
-                    .map(|p| p.to_str().unwrap().to_string())
-                    .collect(),
-            })
-        }
-
-        None => {
-            info!("User cancelled file selection.");
-            Json(FilesSelectionResponse {
-                user_cancelled: true,
-                selected_file_paths: Vec::new(),
-            })
-        },
-    }
-}
-
-#[post("/save/file", data = "<payload>")]
-pub fn save_file(_token: APIToken, payload: Json<SaveFileOptions>) -> Json<FileSaveResponse> {
-    // Create a new file dialog builder:
-    let file_dialog = create_file_dialog();
-
-    // Set the title of the file dialog:
-    let file_dialog = file_dialog.set_title(&payload.title);
-
-    // Set the file type filter if provided:
-    let file_dialog = apply_filter(file_dialog, &payload.filter);
-
-    // Set the previous file path if provided:
-    let file_dialog = match &payload.name_file {
-        Some(previous) => {
-            let previous_path = previous.file_path.as_str();
-            file_dialog.set_directory(previous_path)
-        },
-
-        None => file_dialog,
-    };
-
-    // Displays the file dialogue box and select the file:
-    let file_path = file_dialog.save_file();
-    match file_path {
-        Some(path) => {
-            info!("User selected file for writing operation: {path:?}");
-            Json(FileSaveResponse {
-                user_cancelled: false,
-                save_file_path: path.to_str().unwrap().to_string(),
-            })
-        },
-
-        None => {
-            info!("User cancelled file selection.");
-            Json(FileSaveResponse {
-                user_cancelled: true,
-                save_file_path: String::from(""),
-            })
-        },
-    }
-}
-
-#[derive(Clone, Deserialize)]
-pub struct PreviousFile {
-    file_path: String,
-}
-
-/// Creates a file dialog builder and assigns the main window as parent where supported.
-fn create_file_dialog() -> FileDialogBuilder {
-    let file_dialog = FileDialogBuilder::new();
-
-    #[cfg(any(windows, target_os = "macos"))]
-    {
-        let main_window_lock = MAIN_WINDOW.lock().unwrap();
-        match main_window_lock.as_ref() {
-            Some(window) => file_dialog.set_parent(window),
-            None => {
-                warn!(Source = "Tauri"; "Cannot assign parent window to file dialog: main window not available.");
-                file_dialog
-            }
-        }
-    }
-
-    #[cfg(not(any(windows, target_os = "macos")))]
-    {
-        file_dialog
-    }
-}
-
-/// Applies an optional file type filter to a FileDialogBuilder.
-fn apply_filter(file_dialog: FileDialogBuilder, filter: &Option<FileTypeFilter>) -> FileDialogBuilder {
-    match filter {
-        Some(f) => file_dialog.add_filter(
-            &f.filter_name,
-            &f.filter_extensions.iter().map(|s| s.as_str()).collect::<Vec<&str>>(),
-        ),
-
-        None => file_dialog,
-    }
-}
-
-#[derive(Serialize)]
-pub struct FileSelectionResponse {
-    user_cancelled: bool,
-    selected_file_path: String,
-}
-
-#[derive(Serialize)]
-pub struct FilesSelectionResponse {
-    user_cancelled: bool,
-    selected_file_paths: Vec<String>,
-}
-
-#[derive(Serialize)]
-pub struct FileSaveResponse {
-    user_cancelled: bool,
-    save_file_path: String,
-}
-
 /// Request payload for registering a global shortcut.
 #[derive(Clone, Deserialize)]
 pub struct RegisterShortcutRequest {
@ -765,47 +604,41 @@ pub struct AppExitResponse {
 /// Internal helper function to register a shortcut with its callback.
 /// This is used by both `register_shortcut` and `resume_shortcuts` to
 /// avoid code duplication.
-fn register_shortcut_with_callback(
-    shortcut_manager: &mut impl GlobalShortcutManager,
+fn register_shortcut_with_callback<R: tauri::Runtime>(
+    app_handle: &tauri::AppHandle<R>,
    shortcut: &str,
    shortcut_id: Shortcut,
    event_sender: broadcast::Sender<Event>,
-) -> Result<(), tauri::Error> {
-    //
-    // Match the shortcut registration to transform the Tauri result into the Rust result:
-    //
-    match shortcut_manager.register(shortcut, move || {
+) -> Result<(), tauri_plugin_global_shortcut::Error> {
+    let shortcut_manager = app_handle.global_shortcut();
+    shortcut_manager.on_shortcut(shortcut, move |_app, _shortcut, _event| {
        info!(Source = "Tauri"; "Global shortcut triggered for '{}'.", shortcut_id);
        let event = Event::new(TauriEventType::GlobalShortcutPressed, vec![shortcut_id.to_string()]);
        let sender = event_sender.clone();
        tauri::async_runtime::spawn(async move {
-            match sender.send(event) {
-                Ok(_) => {}
-                Err(error) => error!(Source = "Tauri"; "Failed to send global shortcut event: {error}"),
+            if let Err(error) = sender.send(event) {
+                error!(Source = "Tauri"; "Failed to send global shortcut event: {error}");
            }
        });
-    }) {
-        Ok(_) => Ok(()),
-        Err(e) => Err(e.into()),
-    }
+    })
 }

 /// Requests a controlled shutdown of the entire desktop application.
-#[post("/app/exit")]
-pub fn exit_app(_token: APIToken) -> Json<AppExitResponse> {
-    let main_window_lock = MAIN_WINDOW.lock().unwrap();
-    let main_window = match main_window_lock.as_ref() {
-        Some(window) => window,
-        None => {
-            error!(Source = "Tauri"; "Cannot exit app: main window not available.");
-            return Json(AppExitResponse {
-                success: false,
-                error_message: "Main window not available".to_string(),
-            });
+pub async fn exit_app(_token: APIToken) -> Json<AppExitResponse> {
+    let app_handle = {
+        let main_window_lock = MAIN_WINDOW.lock().unwrap();
+        match main_window_lock.as_ref() {
+            Some(window) => window.app_handle().clone(),
+            None => {
+                error!(Source = "Tauri"; "Cannot exit app: main window not available.");
+                return Json(AppExitResponse {
+                    success: false,
+                    error_message: "Main window not available".to_string(),
+                });
+            }
        }
    };

-    let app_handle = main_window.app_handle();
    info!(Source = "Tauri"; "Controlled app exit was requested by the UI.");
    tauri::async_runtime::spawn(async move {
        time::sleep(Duration::from_millis(50)).await;
@ -820,8 +653,7 @@ pub fn exit_app(_token: APIToken) -> Json<AppExitResponse> {

 /// Registers or updates a global shortcut. If the shortcut string is empty,
 /// the existing shortcut for that name will be unregistered.
-#[post("/shortcuts/register", data = "<payload>")]
-pub fn register_shortcut(_token: APIToken, payload: Json<RegisterShortcutRequest>) -> Json<ShortcutResponse> {
+pub async fn register_shortcut(_token: APIToken, payload: Json<RegisterShortcutRequest>) -> Json<ShortcutResponse> {
    let id = payload.id;
    let new_shortcut = payload.shortcut.clone();

@ -848,7 +680,8 @@ pub fn register_shortcut(_token: APIToken, payload: Json<RegisterShortcutRequest
        }
    };

-    let mut shortcut_manager = main_window.app_handle().global_shortcut_manager();
+    let app_handle = main_window.app_handle();
+    let shortcut_manager = app_handle.global_shortcut();
    let mut registered_shortcuts = REGISTERED_SHORTCUTS.lock().unwrap();

    // Unregister the old shortcut if one exists for this name:
@ -887,7 +720,7 @@ pub fn register_shortcut(_token: APIToken, payload: Json<RegisterShortcutRequest
    drop(event_broadcast_lock);

    // Register the new shortcut:
-    match register_shortcut_with_callback(&mut shortcut_manager, &new_shortcut, id, event_sender) {
+    match register_shortcut_with_callback(app_handle, &new_shortcut, id, event_sender) {
        Ok(_) => {
            info!(Source = "Tauri"; "Global shortcut '{new_shortcut}' registered successfully for '{}'.", id);
            registered_shortcuts.insert(id, new_shortcut);
@ -927,8 +760,7 @@ pub struct ShortcutValidationResponse {
 /// Validates a shortcut string without registering it.
 /// Checks if the shortcut syntax is valid and if it
 /// conflicts with existing shortcuts.
-#[post("/shortcuts/validate", data = "<payload>")]
-pub fn validate_shortcut(_token: APIToken, payload: Json<ValidateShortcutRequest>) -> Json<ShortcutValidationResponse> {
+pub async fn validate_shortcut(_token: APIToken, payload: Json<ValidateShortcutRequest>) -> Json<ShortcutValidationResponse> {
    let shortcut = payload.shortcut.clone();

    // Empty shortcuts are always valid (means "disabled"):
@ -982,8 +814,7 @@ pub fn validate_shortcut(_token: APIToken, payload: Json<ValidateShortcutRequest
 /// The shortcuts remain in our internal map, so they can be re-registered on resume.
 /// This is useful when opening a dialog to configure shortcuts, so the user can
 /// press the current shortcut to re-enter it without triggering the action.
-#[post("/shortcuts/suspend")]
-pub fn suspend_shortcuts(_token: APIToken) -> Json<ShortcutResponse> {
+pub async fn suspend_shortcuts(_token: APIToken) -> Json<ShortcutResponse> {
    // Get the main window to access the global shortcut manager:
    let main_window_lock = MAIN_WINDOW.lock().unwrap();
    let main_window = match main_window_lock.as_ref() {
@ -997,7 +828,8 @@ pub fn suspend_shortcuts(_token: APIToken) -> Json<ShortcutResponse> {
        }
    };

-    let mut shortcut_manager = main_window.app_handle().global_shortcut_manager();
+    let app_handle = main_window.app_handle();
+    let shortcut_manager = app_handle.global_shortcut();
    let registered_shortcuts = REGISTERED_SHORTCUTS.lock().unwrap();

    // Unregister all shortcuts from the OS (but keep them in our map):
@ -1018,8 +850,7 @@ pub fn suspend_shortcuts(_token: APIToken) -> Json<ShortcutResponse> {
 }

 /// Resumes shortcut processing by re-registering all shortcuts with the OS.
-#[post("/shortcuts/resume")]
-pub fn resume_shortcuts(_token: APIToken) -> Json<ShortcutResponse> {
+pub async fn resume_shortcuts(_token: APIToken) -> Json<ShortcutResponse> {
    // Get the main window to access the global shortcut manager:
    let main_window_lock = MAIN_WINDOW.lock().unwrap();
    let main_window = match main_window_lock.as_ref() {
@ -1033,7 +864,7 @@ pub fn resume_shortcuts(_token: APIToken) -> Json<ShortcutResponse> {
        }
    };

-    let mut shortcut_manager = main_window.app_handle().global_shortcut_manager();
+    let app_handle = main_window.app_handle();
    let registered_shortcuts = REGISTERED_SHORTCUTS.lock().unwrap();

    // Get the event broadcast sender for the shortcut callbacks:
@ -1058,7 +889,7 @@ pub fn resume_shortcuts(_token: APIToken) -> Json<ShortcutResponse> {
            continue;
        }

-        match register_shortcut_with_callback(&mut shortcut_manager, shortcut, *shortcut_id, event_sender.clone()) {
+        match register_shortcut_with_callback(&app_handle, shortcut, *shortcut_id, event_sender.clone()) {
            Ok(_) => {
                info!(Source = "Tauri"; "Re-registered shortcut '{shortcut}' for '{}'.", shortcut_id);
                success_count += 1;
@ -1119,15 +950,61 @@ fn validate_shortcut_syntax(shortcut: &str) -> bool {
    has_key
 }

-fn set_pdfium_path(path_resolver: PathResolver) {
-    let pdfium_relative_source_path = String::from("resources/libraries/");
-    let pdfium_source_path = path_resolver.resolve_resource(pdfium_relative_source_path);
-    if pdfium_source_path.is_none() {
-        error!(Source = "Bootloader Tauri"; "Failed to set the PDFium library path.");
-        return;
+fn set_pdfium_path<R: tauri::Runtime>(path_resolver: &PathResolver<R>) {
+    let resource_dir = match path_resolver.resource_dir() {
+        Ok(path) => path,
+        Err(error) => {
+            error!(Source = "Bootloader Tauri"; "Failed to resolve resource dir: {error}");
+            return;
+        }
+    };
+
+    let candidate_paths = [
+        resource_dir.join("resources").join("libraries"),
+        resource_dir.join("libraries"),
+    ];
+
+    let pdfium_source_path = candidate_paths
+        .iter()
+        .find(|path| path.exists())
+        .map(|path| path.to_string_lossy().to_string());
+
+    match pdfium_source_path {
+        Some(path) => {
+            *PDFIUM_LIB_PATH.lock().unwrap() = Some(path);
+        }
+        None => {
+            error!(Source = "Bootloader Tauri"; "Failed to set the PDFium library path.");
+        }
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn tauri_localhost_is_tauri_asset_url() {
+        let https_url = tauri::Url::parse("https://tauri.localhost/index.html").unwrap();
+        let http_url = tauri::Url::parse("http://tauri.localhost/index.html").unwrap();
+
+        assert!(is_tauri_asset_url(&https_url));
+        assert!(is_tauri_asset_url(&http_url));
    }

-    let pdfium_source_path = pdfium_source_path.unwrap();
-    let pdfium_source_path = pdfium_source_path.to_str().unwrap().to_string();
-    *PDFIUM_LIB_PATH.lock().unwrap() = Some(pdfium_source_path.clone());
-}
+    #[test]
+    fn localhost_app_url_is_not_tauri_asset_url() {
+        let url = tauri::Url::parse("http://localhost:12345/").unwrap();
+
+        assert!(!is_tauri_asset_url(&url));
+        assert!(is_local_http_url(&url));
+    }
+
+    #[test]
+    fn external_url_is_not_internal_url() {
+        let url = tauri::Url::parse("https://example.com/").unwrap();
+
+        assert!(!is_tauri_asset_url(&url));
+        assert!(!is_local_http_url(&url));
+    }
+}
--- a/runtime/src/clipboard.rs
+++ b/runtime/src/clipboard.rs
@ -1,14 +1,13 @@
 use arboard::Clipboard;
 use log::{debug, error};
-use rocket::post;
-use rocket::serde::json::Json;
+use axum::Json;
 use serde::Serialize;
 use crate::api_token::APIToken;
 use crate::encryption::{EncryptedText, ENCRYPTION};

 /// Sets the clipboard text to the provided encrypted text.
-#[post("/clipboard/set", data = "<encrypted_text>")]
-pub fn set_clipboard(_token: APIToken, encrypted_text: EncryptedText) -> Json<SetClipboardResponse> {
+pub async fn set_clipboard(_token: APIToken, encrypted_text: String) -> Json<SetClipboardResponse> {
+    let encrypted_text = EncryptedText::new(encrypted_text);

    // Decrypt this text first:
    let decrypted_text = match ENCRYPTION.decrypt(&encrypted_text) {
--- a/runtime/src/dotnet.rs
+++ b/runtime/src/dotnet.rs
@ -5,9 +5,9 @@ use base64::Engine;
 use base64::prelude::BASE64_STANDARD;
 use log::{error, info, warn};
 use once_cell::sync::Lazy;
-use rocket::get;
-use tauri::api::process::{Command, CommandChild, CommandEvent};
 use tauri::Url;
+use tauri_plugin_shell::process::{CommandChild, CommandEvent};
+use tauri_plugin_shell::ShellExt;
 use crate::api_token::APIToken;
 use crate::runtime_api_token::API_TOKEN;
 use crate::app_window::change_location_to;
@ -88,8 +88,7 @@ fn sanitize_stdout_line(line: &str) -> String {

 /// Returns the desired port of the .NET server. Our .NET app calls this endpoint to get
 /// the port where the .NET server should listen to.
-#[get("/system/dotnet/port")]
-pub fn dotnet_port(_token: APIToken) -> String {
+pub async fn dotnet_port(_token: APIToken) -> String {
    let dotnet_server_port = *DOTNET_SERVER_PORT;
    format!("{dotnet_server_port}")
 }
@ -130,14 +129,14 @@ pub fn create_startup_env_file() {
 }

 /// Starts the .NET server in a separate process.
-pub fn start_dotnet_server() {
+pub fn start_dotnet_server<R: tauri::Runtime>(app_handle: tauri::AppHandle<R>) {

    // Get the secret password & salt and convert it to a base64 string:
    let secret_password = BASE64_STANDARD.encode(ENCRYPTION.secret_password);
    let secret_key_salt = BASE64_STANDARD.encode(ENCRYPTION.secret_key_salt);
    let api_port = *API_SERVER_PORT;

-    let dotnet_server_environment = HashMap::from_iter([
+    let dotnet_server_environment: HashMap<String, String> = HashMap::from_iter([
        (String::from("AI_STUDIO_SECRET_PASSWORD"), secret_password),
        (String::from("AI_STUDIO_SECRET_KEY_SALT"), secret_key_salt),
        (String::from("AI_STUDIO_CERTIFICATE_FINGERPRINT"), CERTIFICATE_FINGERPRINT.get().unwrap().to_string()),
@ -148,11 +147,13 @@ pub fn start_dotnet_server() {
    info!("Try to start the .NET server...");
    let server_spawn_clone = DOTNET_SERVER.clone();
    tauri::async_runtime::spawn(async move {
-        let (mut rx, child) = Command::new_sidecar("mindworkAIStudioServer")
-                .expect("Failed to create sidecar")
-                .envs(dotnet_server_environment)
-                .spawn()
-                .expect("Failed to spawn .NET server process.");
+        let shell = app_handle.shell();
+        let (mut rx, child) = shell
+            .sidecar("mindworkAIStudioServer")
+            .expect("Failed to create sidecar")
+            .envs(dotnet_server_environment)
+            .spawn()
+            .expect("Failed to spawn .NET server process.");
        let server_pid = child.pid();
        info!(Source = "Bootloader .NET"; "The .NET server process started with PID={server_pid}.");
        log_potential_stale_process(Path::new(DATA_DIRECTORY.get().unwrap()).join(PID_FILE_NAME), server_pid, SIDECAR_TYPE);
@ -163,17 +164,19 @@ pub fn start_dotnet_server() {
        // Log the output of the .NET server:
        // NOTE: Log events are sent via structured HTTP API calls.
        // This loop serves for fundamental output (e.g., startup errors).
-        while let Some(CommandEvent::Stdout(line)) = rx.recv().await {
-            let line = sanitize_stdout_line(line.trim_end());
-            if !line.trim().is_empty() {
-                info!(Source = ".NET Server (stdout)"; "{line}");
+        while let Some(event) = rx.recv().await {
+            if let CommandEvent::Stdout(line) = event {
+                let line_utf8 = String::from_utf8_lossy(&line).to_string();
+                let line = sanitize_stdout_line(line_utf8.trim_end());
+                if !line.trim().is_empty() {
+                    info!(Source = ".NET Server (stdout)"; "{line}");
+                }
            }
        }
    });
 }

 /// This endpoint is called by the .NET server to signal that the server is ready.
-#[get("/system/dotnet/ready")]
 pub async fn dotnet_ready(_token: APIToken) {

    // We create a manual scope for the lock to be released as soon as possible.
--- a/runtime/src/encryption.rs
+++ b/runtime/src/encryption.rs
@ -9,19 +9,13 @@ use once_cell::sync::Lazy;
 use pbkdf2::pbkdf2;
 use rand::rngs::SysRng;
 use rand::{Rng, SeedableRng};
-use rocket::{data, Data, Request};
-use rocket::data::ToByteUnit;
-use rocket::http::Status;
-use rocket::serde::{Deserialize, Serialize};
+use serde::{Deserialize, Serialize};
 use sha2::Sha512;
-use tokio::io::AsyncReadExt;

 type Aes256CbcEnc = cbc::Encryptor<aes::Aes256>;

 type Aes256CbcDec = cbc::Decryptor<aes::Aes256>;

-type DataOutcome<'r, T> = data::Outcome<'r, T>;
-
 /// The encryption instance used for the IPC channel.
 pub static ENCRYPTION: Lazy<Encryption> = Lazy::new(|| {
    //
@ -170,27 +164,4 @@ impl fmt::Display for EncryptedText {
    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
        write!(f, "**********")
    }
-}
-
-/// Use Case: When we receive encrypted text from the client as body (e.g., in a POST request).
-/// We must interpret the body as EncryptedText.
-#[rocket::async_trait]
-impl<'r> data::FromData<'r> for EncryptedText {
-    type Error = String;
-    
-    /// Parses the data as EncryptedText.
-    async fn from_data(req: &'r Request<'_>, data: Data<'r>) -> DataOutcome<'r, Self> {
-        let content_type = req.content_type();
-        if content_type.map_or(true, |ct| !ct.is_text()) {
-            return DataOutcome::Forward((data, Status::Ok));
-        }
-
-        let mut stream = data.open(2.mebibytes());
-        let mut body = String::new();
-        if let Err(e) = stream.read_to_string(&mut body).await {
-            return DataOutcome::Error((Status::InternalServerError, format!("Failed to read data: {}", e)));
-        }
-
-        DataOutcome::Success(EncryptedText(body))
-    }
 }
--- a/runtime/src/environment.rs
+++ b/runtime/src/environment.rs
@ -1,7 +1,6 @@
 use crate::api_token::APIToken;
+use axum::Json;
 use log::{debug, info, warn};
-use rocket::get;
-use rocket::serde::json::Json;
 use serde::Serialize;
 use std::collections::{HashMap, HashSet};
 use std::env;
@ -29,8 +28,7 @@ pub static CONFIG_DIRECTORY: OnceLock<String> = OnceLock::new();
 static USER_LANGUAGE: OnceLock<String> = OnceLock::new();

 /// Returns the config directory.
-#[get("/system/directories/config")]
-pub fn get_config_directory(_token: APIToken) -> String {
+pub async fn get_config_directory(_token: APIToken) -> String {
    match CONFIG_DIRECTORY.get() {
        Some(config_directory) => config_directory.clone(),
        None => String::from(""),
@ -38,8 +36,7 @@ pub fn get_config_directory(_token: APIToken) -> String {
 }

 /// Returns the data directory.
-#[get("/system/directories/data")]
-pub fn get_data_directory(_token: APIToken) -> String {
+pub async fn get_data_directory(_token: APIToken) -> String {
    match DATA_DIRECTORY.get() {
        Some(data_directory) => data_directory.clone(),
        None => String::from(""),
@ -150,8 +147,7 @@ fn detect_user_language() -> (String, LanguageDetectionSource) {
    )
 }

-#[get("/system/language")]
-pub fn read_user_language(_token: APIToken) -> String {
+pub async fn read_user_language(_token: APIToken) -> String {
    USER_LANGUAGE
        .get_or_init(|| {
            let (user_language, source) = detect_user_language();
@ -194,8 +190,7 @@ struct EnterpriseSourceData {
    encryption_secret: String,
 }

-#[get("/system/enterprise/config/id")]
-pub fn read_enterprise_env_config_id(_token: APIToken) -> String {
+pub async fn read_enterprise_env_config_id(_token: APIToken) -> String {
    debug!("Trying to read the effective enterprise configuration ID.");
    resolve_effective_enterprise_config_source()
        .configs
@ -205,8 +200,7 @@ pub fn read_enterprise_env_config_id(_token: APIToken) -> String {
        .unwrap_or_default()
 }

-#[get("/system/enterprise/config/server")]
-pub fn read_enterprise_env_config_server_url(_token: APIToken) -> String {
+pub async fn read_enterprise_env_config_server_url(_token: APIToken) -> String {
    debug!("Trying to read the effective enterprise configuration server URL.");
    resolve_effective_enterprise_config_source()
        .configs
@ -216,15 +210,13 @@ pub fn read_enterprise_env_config_server_url(_token: APIToken) -> String {
        .unwrap_or_default()
 }

-#[get("/system/enterprise/config/encryption_secret")]
-pub fn read_enterprise_env_config_encryption_secret(_token: APIToken) -> String {
+pub async fn read_enterprise_env_config_encryption_secret(_token: APIToken) -> String {
    debug!("Trying to read the effective enterprise configuration encryption secret.");
    resolve_effective_enterprise_secret_source().encryption_secret
 }

 /// Returns all enterprise configurations from the effective source.
-#[get("/system/enterprise/configs")]
-pub fn read_enterprise_configs(_token: APIToken) -> Json<Vec<EnterpriseConfig>> {
+pub async fn read_enterprise_configs(_token: APIToken) -> Json<Vec<EnterpriseConfig>> {
    info!("Trying to read the effective enterprise configurations.");
    Json(resolve_effective_enterprise_config_source().configs)
 }
--- a/runtime/src/file_actions.rs
+++ b/runtime/src/file_actions.rs
@ -0,0 +1,299 @@
+use log::{error, info};
+use axum::extract::Query;
+use axum::Json;
+use serde::{Deserialize, Serialize};
+use tauri_plugin_dialog::{DialogExt, FileDialogBuilder};
+use crate::api_token::APIToken;
+use crate::app_window::MAIN_WINDOW;
+
+#[derive(Clone, Deserialize)]
+pub struct PreviousDirectory {
+    path: String,
+}
+
+#[derive(Deserialize)]
+pub struct SelectDirectoryQuery {
+    title: String,
+}
+
+#[derive(Clone, Deserialize)]
+pub struct FileTypeFilter {
+    filter_name: String,
+    filter_extensions: Vec<String>,
+}
+
+#[derive(Clone, Deserialize)]
+pub struct SelectFileOptions {
+    title: String,
+    previous_file: Option<PreviousFile>,
+    filter: Option<FileTypeFilter>,
+}
+
+#[derive(Clone, Deserialize)]
+pub struct SaveFileOptions {
+    title: String,
+    name_file: Option<PreviousFile>,
+    filter: Option<FileTypeFilter>,
+}
+
+#[derive(Serialize)]
+pub struct DirectorySelectionResponse {
+    user_cancelled: bool,
+    selected_directory: String,
+}
+
+#[derive(Serialize)]
+pub struct FileSelectionResponse {
+    user_cancelled: bool,
+    selected_file_path: String,
+}
+
+#[derive(Serialize)]
+pub struct FilesSelectionResponse {
+    user_cancelled: bool,
+    selected_file_paths: Vec<String>,
+}
+
+#[derive(Serialize)]
+pub struct FileSaveResponse {
+    user_cancelled: bool,
+    save_file_path: String,
+}
+
+#[derive(Clone, Deserialize)]
+pub struct PreviousFile {
+    file_path: String,
+}
+
+/// Let the user select a directory.
+pub async fn select_directory(
+    _token: APIToken,
+    Query(query): Query<SelectDirectoryQuery>,
+    previous_directory: Option<Json<PreviousDirectory>>,
+) -> Json<DirectorySelectionResponse> {
+    let main_window_lock = MAIN_WINDOW.lock().unwrap();
+    let main_window = match main_window_lock.as_ref() {
+        Some(window) => window,
+        None => {
+            error!(Source = "Tauri"; "Cannot open directory dialog: main window not available.");
+            return Json(DirectorySelectionResponse {
+                user_cancelled: true,
+                selected_directory: String::from(""),
+            });
+        }
+    };
+
+    let mut dialog = main_window.dialog().file().set_parent(main_window).set_title(&query.title);
+    if let Some(previous) = previous_directory {
+        dialog = dialog.set_directory(previous.path.clone());
+    }
+
+    drop(main_window_lock);
+
+    let folder_path = dialog.blocking_pick_folder();
+    match folder_path {
+        Some(path) => {
+            match path.into_path() {
+                Ok(pb) => {
+                    info!("User selected directory: {pb:?}");
+                    Json(DirectorySelectionResponse {
+                        user_cancelled: false,
+                        selected_directory: pb.to_string_lossy().to_string(),
+                    })
+                }
+                Err(e) => {
+                    error!(Source = "Tauri"; "Failed to convert directory path: {e}");
+                    Json(DirectorySelectionResponse {
+                        user_cancelled: true,
+                        selected_directory: String::new(),
+                    })
+                }
+            }
+        },
+
+        None => {
+            info!("User cancelled directory selection.");
+            Json(DirectorySelectionResponse {
+                user_cancelled: true,
+                selected_directory: String::from(""),
+            })
+        },
+    }
+}
+
+/// Let the user select a file.
+pub async fn select_file(
+    _token: APIToken,
+    payload: Json<SelectFileOptions>,
+) -> Json<FileSelectionResponse> {
+    // Create a new file dialog builder:
+    let file_dialog = MAIN_WINDOW
+        .lock()
+        .unwrap()
+        .as_ref()
+        .map(|w| w.dialog().file().set_parent(w).set_title(&payload.title));
+
+    let Some(mut file_dialog) = file_dialog else {
+        error!(Source = "Tauri"; "Cannot open file dialog: main window not available.");
+        return Json(FileSelectionResponse {
+            user_cancelled: true,
+            selected_file_path: String::from(""),
+        });
+    };
+
+    // Set the file type filter if provided:
+    file_dialog = apply_filter(file_dialog, &payload.filter);
+
+    // Set the previous file path if provided:
+    if let Some(previous) = &payload.previous_file {
+        let previous_path = previous.file_path.as_str();
+        file_dialog = file_dialog.set_directory(previous_path);
+    }
+
+    // Show the file dialog and get the selected file path:
+    let file_path = file_dialog.blocking_pick_file();
+    match file_path {
+        Some(path) => match path.into_path() {
+            Ok(pb) => {
+                info!("User selected file: {pb:?}");
+                Json(FileSelectionResponse {
+                    user_cancelled: false,
+                    selected_file_path: pb.to_string_lossy().to_string(),
+                })
+            }
+            Err(e) => {
+                error!(Source = "Tauri"; "Failed to convert file path: {e}");
+                Json(FileSelectionResponse {
+                    user_cancelled: true,
+                    selected_file_path: String::new(),
+                })
+            }
+        },
+
+        None => {
+            info!("User cancelled file selection.");
+            Json(FileSelectionResponse {
+                user_cancelled: true,
+                selected_file_path: String::from(""),
+            })
+        },
+    }
+}
+
+/// Let the user select some files.
+pub async fn select_files(
+    _token: APIToken,
+    payload: Json<SelectFileOptions>,
+) -> Json<FilesSelectionResponse> {
+    // Create a new file dialog builder:
+    let file_dialog = MAIN_WINDOW
+        .lock()
+        .unwrap()
+        .as_ref()
+        .map(|w| w.dialog().file().set_parent(w).set_title(&payload.title));
+
+    let Some(mut file_dialog) = file_dialog else {
+        error!(Source = "Tauri"; "Cannot open file dialog: main window not available.");
+        return Json(FilesSelectionResponse {
+            user_cancelled: true,
+            selected_file_paths: Vec::new(),
+        });
+    };
+
+    // Set the file type filter if provided:
+    file_dialog = apply_filter(file_dialog, &payload.filter);
+
+    // Set the previous file path if provided:
+    if let Some(previous) = &payload.previous_file {
+        let previous_path = previous.file_path.as_str();
+        file_dialog = file_dialog.set_directory(previous_path);
+    }
+
+    // Show the file dialog and get the selected file path:
+    let file_paths = file_dialog.blocking_pick_files();
+    match file_paths {
+        Some(paths) => {
+            let converted: Vec<String> = paths.into_iter().filter_map(|p| p.into_path().ok()).map(|pb| pb.to_string_lossy().to_string()).collect();
+            info!("User selected {} files.", converted.len());
+            Json(FilesSelectionResponse {
+                user_cancelled: false,
+                selected_file_paths: converted,
+            })
+        }
+
+        None => {
+            info!("User cancelled file selection.");
+            Json(FilesSelectionResponse {
+                user_cancelled: true,
+                selected_file_paths: Vec::new(),
+            })
+        },
+    }
+}
+
+pub async fn save_file(_token: APIToken, payload: Json<SaveFileOptions>) -> Json<FileSaveResponse> {
+    // Create a new file dialog builder:
+    let file_dialog = MAIN_WINDOW
+        .lock()
+        .unwrap()
+        .as_ref()
+        .map(|w| w.dialog().file().set_parent(w).set_title(&payload.title));
+
+    let Some(mut file_dialog) = file_dialog else {
+        error!(Source = "Tauri"; "Cannot open save dialog: main window not available.");
+        return Json(FileSaveResponse {
+            user_cancelled: true,
+            save_file_path: String::from(""),
+        });
+    };
+
+    // Set the file type filter if provided:
+    file_dialog = apply_filter(file_dialog, &payload.filter);
+
+    // Set the previous file path if provided:
+    if let Some(previous) = &payload.name_file {
+        let previous_path = previous.file_path.as_str();
+        file_dialog = file_dialog.set_directory(previous_path);
+    }
+
+    // Displays the file dialogue box and select the file:
+    let file_path = file_dialog.blocking_save_file();
+    match file_path {
+        Some(path) => match path.into_path() {
+            Ok(pb) => {
+                info!("User selected file for writing operation: {pb:?}");
+                Json(FileSaveResponse {
+                    user_cancelled: false,
+                    save_file_path: pb.to_string_lossy().to_string(),
+                })
+            }
+            Err(e) => {
+                error!(Source = "Tauri"; "Failed to convert save file path: {e}");
+                Json(FileSaveResponse {
+                    user_cancelled: true,
+                    save_file_path: String::new(),
+                })
+            }
+        },
+
+        None => {
+            info!("User cancelled file selection.");
+            Json(FileSaveResponse {
+                user_cancelled: true,
+                save_file_path: String::from(""),
+            })
+        },
+    }
+}
+
+/// Applies an optional file type filter to a FileDialogBuilder.
+fn apply_filter<R: tauri::Runtime>(file_dialog: FileDialogBuilder<R>, filter: &Option<FileTypeFilter>) -> FileDialogBuilder<R> {
+    match filter {
+        Some(f) => file_dialog.add_filter(
+            &f.filter_name,
+            &f.filter_extensions.iter().map(|s| s.as_str()).collect::<Vec<&str>>(),
+        ),
+
+        None => file_dialog,
+    }
+}
--- a/runtime/src/file_data.rs
+++ b/runtime/src/file_data.rs
@ -1,22 +1,24 @@
 use std::cmp::min;
+use std::convert::Infallible;
 use crate::api_token::APIToken;
 use crate::pandoc::PandocProcessBuilder;
 use crate::pdfium::PdfiumInit;
 use async_stream::stream;
+use axum::extract::Query;
+use axum::extract::rejection::QueryRejection;
+use axum::response::sse::{Event, Sse};
 use base64::{engine::general_purpose, Engine as _};
 use calamine::{open_workbook_auto, Reader};
 use file_format::{FileFormat, Kind};
 use futures::{Stream, StreamExt};
 use pdfium_render::prelude::Pdfium;
 use pptx_to_md::{ImageHandlingMode, ParserConfig, PptxContainer};
-use rocket::get;
-use rocket::response::stream::{Event, EventStream};
-use rocket::serde::Serialize;
-use rocket::tokio::select;
-use rocket::Shutdown;
+use serde::{Deserialize, Deserializer, Serialize};
+use serde::de::{Error as SerdeError, Visitor};
 use std::path::Path;
 use std::pin::Pin;
-use log::{debug, error};
+use std::fmt;
+use log::{debug, error, warn};
 use tokio::io::AsyncBufReadExt;
 use tokio::sync::mpsc;
 use tokio_stream::wrappers::ReceiverStream;
@ -82,39 +84,95 @@ const IMAGE_SEGMENT_SIZE_IN_CHARS: usize = 8_192; // equivalent to ~ 5500 token
 type Result<T> = std::result::Result<T, Box<dyn std::error::Error + Send + Sync>>;
 type ChunkStream = Pin<Box<dyn Stream<Item = Result<Chunk>> + Send>>;

-#[get("/retrieval/fs/extract?<path>&<stream_id>&<extract_images>")]
-pub async fn extract_data(_token: APIToken, path: String, stream_id: String, extract_images: bool, mut end: Shutdown) -> EventStream![] {
-    EventStream! {
-        let stream_result = stream_data(&path, extract_images).await;
-        let id_ref = &stream_id;
-        
-        match stream_result {
-            Ok(mut stream) => {
-                loop {
-                    let chunk = select! {
-                        chunk = stream.next() => match chunk {
-                            Some(Ok(mut chunk)) => {
-                                chunk.set_stream_id(id_ref);
-                                chunk
-                            },
-                            Some(Err(e)) => {
-                                yield Event::json(&format!("Error: {e}"));
-                                break;
-                            },
-                            None => break,
-                        },
-                        _ = &mut end => break,
-                    };
-                    
-                    yield Event::json(&chunk);
-                }
-            },
+#[derive(Deserialize)]
+pub struct ExtractDataQuery {
+    path: String,
+    stream_id: String,
+    #[serde(deserialize_with = "deserialize_bool_case_insensitive")]
+    extract_images: bool,
+}

-            Err(e) => {
-                yield Event::json(&format!("Error starting stream: {e}"));
+fn deserialize_bool_case_insensitive<'de, D>(deserializer: D) -> std::result::Result<bool, D::Error>
+where
+    D: Deserializer<'de>,
+{
+    struct BoolVisitor;
+
+    impl<'de> Visitor<'de> for BoolVisitor {
+        type Value = bool;
+
+        fn expecting(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
+            formatter.write_str("a boolean value")
+        }
+
+        fn visit_bool<E>(self, value: bool) -> std::result::Result<Self::Value, E> {
+            Ok(value)
+        }
+
+        fn visit_str<E>(self, value: &str) -> std::result::Result<Self::Value, E>
+        where
+            E: SerdeError,
+        {
+            match value.to_ascii_lowercase().as_str() {
+                "true" | "1" => Ok(true),
+                "false" | "0" => Ok(false),
+                _ => Err(E::invalid_value(serde::de::Unexpected::Str(value), &self)),
            }
        }
    }
+
+    deserializer.deserialize_any(BoolVisitor)
+}
+
+pub async fn extract_data(
+    _token: APIToken,
+    query: std::result::Result<Query<ExtractDataQuery>, QueryRejection>,
+) -> Sse<impl Stream<Item = std::result::Result<Event, Infallible>>> {
+    let query = match query {
+        Ok(Query(query)) => Ok(query),
+        Err(e) => {
+            let message = format!("Invalid query for '/retrieval/fs/extract': {e}");
+            warn!("{message}");
+            Err(message)
+        },
+    };
+
+    let stream = stream! {
+        match query {
+            Ok(query) => {
+                let stream_result = stream_data(&query.path, query.extract_images).await;
+                let id_ref = &query.stream_id;
+
+                match stream_result {
+                    Ok(mut stream) => {
+                        while let Some(chunk) = stream.next().await {
+                            match chunk {
+                                Ok(mut chunk) => {
+                                    chunk.set_stream_id(id_ref);
+                                    yield Ok(Event::default().json_data(&chunk).unwrap_or_else(|e| Event::default().data(format!("Error: {e}"))));
+                                },
+
+                                Err(e) => {
+                                    yield Ok(Event::default().json_data(format!("Error: {e}")).unwrap_or_else(|_| Event::default().data(format!("Error: {e}"))));
+                                    break;
+                                },
+                            }
+                        }
+                    },
+
+                    Err(e) => {
+                        yield Ok(Event::default().json_data(format!("Error starting stream: {e}")).unwrap_or_else(|_| Event::default().data(format!("Error starting stream: {e}"))));
+                    }
+                };
+            },
+
+            Err(e) => {
+                yield Ok(Event::default().json_data(format!("Error starting stream: {e}")).unwrap_or_else(|_| Event::default().data(format!("Error starting stream: {e}"))));
+            },
+        }
+    };
+
+    Sse::new(stream)
 }

 async fn stream_data(file_path: &str, extract_images: bool) -> Result<ChunkStream> {
--- a/runtime/src/lib.rs
+++ b/runtime/src/lib.rs
@ -17,4 +17,5 @@ pub mod qdrant;
 pub mod certificate_factory;
 pub mod runtime_api_token;
 pub mod stale_process_cleanup;
-mod sidecar_types;
+mod sidecar_types;
+mod file_actions;
--- a/runtime/src/log.rs
+++ b/runtime/src/log.rs
@ -8,9 +8,8 @@ use flexi_logger::{DeferredNow, Duplicate, FileSpec, Logger, LoggerHandle};
 use flexi_logger::writers::FileLogWriter;
 use log::{kv, Level};
 use log::kv::{Key, Value, VisitSource};
-use rocket::{get, post};
-use rocket::serde::json::Json;
-use rocket::serde::{Deserialize, Serialize};
+use axum::Json;
+use serde::{Deserialize, Serialize};
 use crate::api_token::APIToken;
 use crate::environment::is_dev;

@ -34,14 +33,17 @@ pub fn init_logging() {
        false => log_config.push_str("info, "),
    };

-    // Set the log level for the Rocket library:
-    log_config.push_str("rocket=info, ");
-
-    // Set the log level for the Rocket server:
-    log_config.push_str("rocket::server=warn, ");
-
-    // Set the log level for the Reqwest library:
-    log_config.push_str("reqwest::async_impl::client=info");
+    // Keep noisy HTTP/TLS internals at info level even in development builds:
+    log_config.push_str("h2=info, ");
+    log_config.push_str("hyper=info, ");
+    log_config.push_str("hyper_util=info, ");
+    log_config.push_str("axum=info, ");
+    log_config.push_str("axum_server=info, ");
+    log_config.push_str("tower=info, ");
+    log_config.push_str("tower_http=info, ");
+    log_config.push_str("rustls=info, ");
+    log_config.push_str("tokio_rustls=info, ");
+    log_config.push_str("reqwest=info");

    // Configure the initial filename. On Unix systems, the file should start
    // with a dot to be hidden.
@ -224,7 +226,6 @@ fn file_logger_format(
    write!(w, "{}", &record.args())
 }

-#[get("/log/paths")]
 pub async fn get_log_paths(_token: APIToken) -> Json<LogPathsResponse> {
    Json(LogPathsResponse {
        log_startup_path: LOG_STARTUP_PATH.get().expect("No startup log path was set").clone(),
@ -269,9 +270,7 @@ fn log_with_level(
 }

 /// Logs an event from the .NET server.
-#[post("/log/event", data = "<event>")]
-pub fn log_event(_token: APIToken, event: Json<LogEvent>) -> Json<LogEventResponse> {
-    let event = event.into_inner();
+pub async fn log_event(_token: APIToken, Json(event): Json<LogEvent>) -> Json<LogEventResponse> {
    let level = parse_dotnet_log_level(&event.level);
    let message = event.message.as_str();
    let category = event.category.as_str();
--- a/runtime/src/main.rs
+++ b/runtime/src/main.rs
@ -1,7 +1,6 @@
 // Prevents an additional console window on Windows in release, DO NOT REMOVE!!
 #![cfg_attr(not(debug_assertions), windows_subsystem = "windows")]

-extern crate rocket;
 extern crate core;

 use log::{info, warn};
@ -12,7 +11,6 @@ use mindwork_ai_studio::log::init_logging;
 use mindwork_ai_studio::metadata::MetaData;
 use mindwork_ai_studio::runtime_api::start_runtime_api;

-
 #[tokio::main]
 async fn main() {
    let metadata = MetaData::init_from_string(include_str!("../../metadata.txt"));
--- a/runtime/src/qdrant.rs
+++ b/runtime/src/qdrant.rs
@ -7,18 +7,19 @@ use std::path::Path;
 use std::sync::{Arc, Mutex, OnceLock};
 use log::{debug, error, info, warn};
 use once_cell::sync::Lazy;
-use rocket::get;
-use rocket::serde::json::Json;
-use rocket::serde::Serialize;
-use tauri::api::process::{Command, CommandChild, CommandEvent};
+use axum::Json;
+use serde::Serialize;
 use crate::api_token::{APIToken};
 use crate::environment::{is_dev, DATA_DIRECTORY};
 use crate::certificate_factory::generate_certificate;
 use std::path::PathBuf;
-use tauri::PathResolver;
+use tauri::Manager;
+use tauri::path::BaseDirectory;
 use tempfile::{TempDir, Builder};
 use crate::stale_process_cleanup::{kill_stale_process, log_potential_stale_process};
 use crate::sidecar_types::SidecarType;
+use tauri_plugin_shell::process::{CommandChild, CommandEvent};
+use tauri_plugin_shell::ShellExt;

 // Qdrant server process started in a separate process and can communicate
 // via HTTP or gRPC with the .NET server and the runtime process
@ -68,8 +69,7 @@ pub struct ProvideQdrantInfo {
    unavailable_reason: Option<String>,
 }

-#[get("/system/qdrant/info")]
-pub fn qdrant_port(_token: APIToken) -> Json<ProvideQdrantInfo> {
+pub async fn qdrant_port(_token: APIToken) -> Json<ProvideQdrantInfo> {
    let status = QDRANT_STATUS.lock().unwrap();
    let is_available = status.is_available;
    let unavailable_reason = status.unavailable_reason.clone();
@ -98,7 +98,7 @@ pub fn qdrant_port(_token: APIToken) -> Json<ProvideQdrantInfo> {
 }

 /// Starts the Qdrant server in a separate process.
-pub fn start_qdrant_server(path_resolver: PathResolver){
+pub fn start_qdrant_server<R: tauri::Runtime>(app_handle: tauri::AppHandle<R>){
    let path = qdrant_base_path();
    if !path.exists() {
        if let Err(e) = fs::create_dir_all(&path){
@ -121,7 +121,7 @@ pub fn start_qdrant_server(path_resolver: PathResolver){
    let snapshot_path = path.join("snapshots").to_string_lossy().to_string();
    let init_path = path.join(".qdrant-initialized").to_string_lossy().to_string();
    
-    let qdrant_server_environment = HashMap::from_iter([
+    let qdrant_server_environment: HashMap<String, String> = HashMap::from_iter([
        (String::from("QDRANT__SERVICE__HTTP_PORT"), QDRANT_SERVER_PORT_HTTP.to_string()),
        (String::from("QDRANT__SERVICE__GRPC_PORT"), QDRANT_SERVER_PORT_GRPC.to_string()),
        (String::from("QDRANT_INIT_FILE_PATH"), init_path),
@ -135,9 +135,9 @@ pub fn start_qdrant_server(path_resolver: PathResolver){
    
    let server_spawn_clone = QDRANT_SERVER.clone();
    let qdrant_relative_source_path = "resources/databases/qdrant/config.yaml";
-    let qdrant_source_path = match path_resolver.resolve_resource(qdrant_relative_source_path) {
-        Some(path) => path,
-        None => {
+    let qdrant_source_path = match app_handle.path().resolve(qdrant_relative_source_path, BaseDirectory::Resource) {
+        Ok(path) => path,
+        Err(_) => {
            let reason = format!("The Qdrant config resource '{qdrant_relative_source_path}' could not be resolved.");
            error!(Source = "Qdrant"; "{reason} Starting the app without Qdrant.");
            set_qdrant_unavailable(reason);
@ -147,7 +147,9 @@ pub fn start_qdrant_server(path_resolver: PathResolver){

    let qdrant_source_path_display = qdrant_source_path.to_string_lossy().to_string();
    tauri::async_runtime::spawn(async move {
-        let sidecar = match Command::new_sidecar("qdrant") {
+        let shell = app_handle.shell();
+
+        let sidecar = match shell.sidecar("qdrant") {
            Ok(sidecar) => sidecar,
            Err(e) => {
                let reason = format!("Failed to create sidecar for Qdrant: {e}");
@ -183,7 +185,8 @@ pub fn start_qdrant_server(path_resolver: PathResolver){
        while let Some(event) = rx.recv().await {
            match event {
                CommandEvent::Stdout(line) => {
-                    let line = line.trim_end();
+                    let line_utf8 = String::from_utf8_lossy(&line).to_string();
+                    let line = line_utf8.trim_end();
                    if line.contains("INFO") || line.contains("info") {
                        info!(Source = "Qdrant Server"; "{line}");
                    } else if line.contains("WARN") || line.contains("warning") {
@ -196,7 +199,8 @@ pub fn start_qdrant_server(path_resolver: PathResolver){
                },
            
                CommandEvent::Stderr(line) => {
-                    error!(Source = "Qdrant Server (stderr)"; "{line}");
+                    let line_utf8 = String::from_utf8_lossy(&line).to_string();
+                    error!(Source = "Qdrant Server (stderr)"; "{line_utf8}");
                },
            
                _ => {}
--- a/runtime/src/runtime_api.rs
+++ b/runtime/src/runtime_api.rs
@ -1,12 +1,16 @@
 use log::info;
 use once_cell::sync::Lazy;
-use rocket::config::Shutdown;
-use rocket::figment::Figment;
-use rocket::routes;
+use axum::routing::{get, post};
+use axum::Router;
+use axum_server::tls_rustls::RustlsConfig;
+use std::net::SocketAddr;
+use std::sync::Once;
 use crate::runtime_certificate::{CERTIFICATE, CERTIFICATE_PRIVATE_KEY};
 use crate::environment::is_dev;
 use crate::network::get_available_port;

+static RUSTLS_CRYPTO_PROVIDER_INIT: Once = Once::new();
+
 /// The port used for the runtime API server. In the development environment, we use a fixed
 /// port, in the production environment we use the next available port. This differentiation
 /// is necessary because we cannot communicate the port to the .NET server in the development
@ -24,109 +28,55 @@ pub static API_SERVER_PORT: Lazy<u16> = Lazy::new(|| {
 pub fn start_runtime_api() {
    let api_port = *API_SERVER_PORT;
    info!("Try to start the API server on 'http://localhost:{api_port}'...");
-    
-    // Get the shutdown configuration:
-    let shutdown = create_shutdown();

-    // Configure the runtime API server:
-    let figment = Figment::from(rocket::Config::release_default())
+    let app = Router::new()
+        .route("/system/dotnet/port", get(crate::dotnet::dotnet_port))
+        .route("/system/dotnet/ready", get(crate::dotnet::dotnet_ready))
+        .route("/system/qdrant/info", get(crate::qdrant::qdrant_port))
+        .route("/clipboard/set", post(crate::clipboard::set_clipboard))
+        .route("/events", get(crate::app_window::get_event_stream))
+        .route("/updates/check", get(crate::app_window::check_for_update))
+        .route("/updates/install", get(crate::app_window::install_update))
+        .route("/app/exit", post(crate::app_window::exit_app))
+        .route("/select/directory", post(crate::file_actions::select_directory))
+        .route("/select/file", post(crate::file_actions::select_file))
+        .route("/select/files", post(crate::file_actions::select_files))
+        .route("/save/file", post(crate::file_actions::save_file))
+        .route("/secrets/get", post(crate::secret::get_secret))
+        .route("/secrets/store", post(crate::secret::store_secret))
+        .route("/secrets/delete", post(crate::secret::delete_secret))
+        .route("/system/directories/config", get(crate::environment::get_config_directory))
+        .route("/system/directories/data", get(crate::environment::get_data_directory))
+        .route("/system/language", get(crate::environment::read_user_language))
+        .route("/system/enterprise/config/id", get(crate::environment::read_enterprise_env_config_id))
+        .route("/system/enterprise/config/server", get(crate::environment::read_enterprise_env_config_server_url))
+        .route("/system/enterprise/config/encryption_secret", get(crate::environment::read_enterprise_env_config_encryption_secret))
+        .route("/system/enterprise/configs", get(crate::environment::read_enterprise_configs))
+        .route("/retrieval/fs/extract", get(crate::file_data::extract_data))
+        .route("/log/paths", get(crate::log::get_log_paths))
+        .route("/log/event", post(crate::log::log_event))
+        .route("/shortcuts/register", post(crate::app_window::register_shortcut))
+        .route("/shortcuts/validate", post(crate::app_window::validate_shortcut))
+        .route("/shortcuts/suspend", post(crate::app_window::suspend_shortcuts))
+        .route("/shortcuts/resume", post(crate::app_window::resume_shortcuts));

-        // We use the next available port which was determined before:
-        .merge(("port", api_port))
-
-        // The runtime API server should be accessible only from the local machine:
-        .merge(("address", "127.0.0.1"))
-
-        // We do not want to use the Ctrl+C signal to stop the server:
-        .merge(("ctrlc", false))
-
-        // Set a name for the server:
-        .merge(("ident", "AI Studio Runtime API"))
-
-        // Set the maximum number of workers and blocking threads:
-        .merge(("workers", 3))
-        .merge(("max_blocking", 12))
-
-        // No colors and emojis in the log output:
-        .merge(("cli_colors", false))
-
-        // Read the TLS certificate and key from the generated certificate data in-memory:
-        .merge(("tls.certs", CERTIFICATE.get().unwrap()))
-        .merge(("tls.key", CERTIFICATE_PRIVATE_KEY.get().unwrap()))
-
-        // Set the shutdown configuration:
-        .merge(("shutdown", shutdown));
-
-    //
-    // Start the runtime API server in a separate thread. This is necessary
-    // because the server is blocking, and we need to run the Tauri app in
-    // parallel:
-    //
    tauri::async_runtime::spawn(async move {
-        rocket::custom(figment)
-            .mount("/", routes![
-                crate::dotnet::dotnet_port,
-                crate::dotnet::dotnet_ready,
-                crate::qdrant::qdrant_port,
-                crate::clipboard::set_clipboard,
-                crate::app_window::get_event_stream,
-                crate::app_window::check_for_update,
-                crate::app_window::install_update,
-                crate::app_window::select_directory,
-                crate::app_window::select_file,
-                crate::app_window::select_files,
-                crate::app_window::save_file,
-                crate::app_window::exit_app,
-                crate::secret::get_secret,
-                crate::secret::store_secret,
-                crate::secret::delete_secret,
-                crate::environment::get_data_directory,
-                crate::environment::get_config_directory,
-                crate::environment::read_user_language,
-                crate::environment::read_enterprise_env_config_id,
-                crate::environment::read_enterprise_env_config_server_url,
-                crate::environment::read_enterprise_env_config_encryption_secret,
-                crate::environment::read_enterprise_configs,
-                crate::file_data::extract_data,
-                crate::log::get_log_paths,
-                crate::log::log_event,
-                crate::app_window::register_shortcut,
-                crate::app_window::validate_shortcut,
-                crate::app_window::suspend_shortcuts,
-                crate::app_window::resume_shortcuts,
-            ])
-            .ignite().await.unwrap()
-            .launch().await.unwrap();
+        install_rustls_crypto_provider();
+
+        let cert = CERTIFICATE.get().unwrap().clone();
+        let key = CERTIFICATE_PRIVATE_KEY.get().unwrap().clone();
+        let tls_config = RustlsConfig::from_pem(cert, key).await.unwrap();
+        let addr = SocketAddr::from(([127, 0, 0, 1], api_port));
+
+        axum_server::bind_rustls(addr, tls_config)
+            .serve(app.into_make_service())
+            .await
+            .unwrap();
    });
 }

-fn create_shutdown() -> Shutdown {
-    //
-    // Create a shutdown configuration, depending on the operating system:
-    //
-    #[cfg(unix)]
-    {
-        use std::collections::HashSet;
-        let mut shutdown = Shutdown {
-            // We do not want to use the Ctrl+C signal to stop the server:
-            ctrlc: false,
-
-            // Everything else is set to default for now:
-            ..Shutdown::default()
-        };
-
-        shutdown.signals = HashSet::new();
-        shutdown
-    }
-
-    #[cfg(windows)]
-    {
-        Shutdown {
-            // We do not want to use the Ctrl+C signal to stop the server:
-            ctrlc: false,
-
-            // Everything else is set to default for now:
-            ..Shutdown::default()
-        }
-    }
+fn install_rustls_crypto_provider() {
+    RUSTLS_CRYPTO_PROVIDER_INIT.call_once(|| {
+        let _ = rustls::crypto::aws_lc_rs::default_provider().install_default();
+    });
 }
--- a/runtime/src/runtime_api_token.rs
+++ b/runtime/src/runtime_api_token.rs
@ -1,33 +1,29 @@
 use once_cell::sync::Lazy;
-use rocket::http::Status;
-use rocket::Request;
-use rocket::request::FromRequest;
+use axum::extract::FromRequestParts;
+use axum::http::request::Parts;
+use axum::http::StatusCode;
 use crate::api_token::{generate_api_token, APIToken};

-pub static API_TOKEN: Lazy<APIToken> = Lazy::new(|| generate_api_token());
+pub static API_TOKEN: Lazy<APIToken> = Lazy::new(generate_api_token);

-/// The request outcome type used to handle API token requests.
-type RequestOutcome<R, T> = rocket::request::Outcome<R, T>;
+impl<S> FromRequestParts<S> for APIToken
+where
+    S: Send + Sync,
+{
+    type Rejection = StatusCode;

-/// The request outcome implementation for the API token.
-#[rocket::async_trait]
-impl<'r> FromRequest<'r> for APIToken {
-    type Error = APITokenError;
-
-    /// Handles the API token requests.
-    async fn from_request(request: &'r Request<'_>) -> RequestOutcome<Self, Self::Error> {
-        let token = request.headers().get_one("token");
-        match token {
+    async fn from_request_parts(parts: &mut Parts, _state: &S) -> Result<Self, Self::Rejection> {
+        match parts.headers.get("token").and_then(|value| value.to_str().ok()) {
            Some(token) => {
                let received_token = APIToken::from_hex_text(token);
                if API_TOKEN.validate(&received_token) {
-                    RequestOutcome::Success(received_token)
+                    Ok(received_token)
                } else {
-                    RequestOutcome::Error((Status::Unauthorized, APITokenError::Invalid))
+                    Err(StatusCode::UNAUTHORIZED)
                }
            }

-            None => RequestOutcome::Error((Status::Unauthorized, APITokenError::Missing)),
+            None => Err(StatusCode::UNAUTHORIZED),
        }
    }
 }
--- a/runtime/src/secret.rs
+++ b/runtime/src/secret.rs
@ -1,15 +1,13 @@
 use keyring::Entry;
 use log::{error, info, warn};
-use rocket::post;
-use rocket::serde::json::Json;
+use axum::Json;
 use serde::{Deserialize, Serialize};
 use keyring::error::Error::NoEntry;
 use crate::api_token::APIToken;
 use crate::encryption::{EncryptedText, ENCRYPTION};

 /// Stores a secret in the secret store using the operating system's keyring.
-#[post("/secrets/store", data = "<request>")]
-pub fn store_secret(_token: APIToken, request: Json<StoreSecret>) -> Json<StoreSecretResponse> {
+pub async fn store_secret(_token: APIToken, request: Json<StoreSecret>) -> Json<StoreSecretResponse> {
    let user_name = request.user_name.as_str();
    let decrypted_text = match ENCRYPTION.decrypt(&request.secret) {
        Ok(text) => text,
@ -60,8 +58,7 @@ pub struct StoreSecretResponse {
 }

 /// Retrieves a secret from the secret store using the operating system's keyring.
-#[post("/secrets/get", data = "<request>")]
-pub fn get_secret(_token: APIToken, request: Json<RequestSecret>) -> Json<RequestedSecret> {
+pub async fn get_secret(_token: APIToken, request: Json<RequestSecret>) -> Json<RequestedSecret> {
    let user_name = request.user_name.as_str();
    let service = format!("mindwork-ai-studio::{}", request.destination);
    let entry = Entry::new(service.as_str(), user_name).unwrap();
@ -121,8 +118,7 @@ pub struct RequestedSecret {
 }

 /// Deletes a secret from the secret store using the operating system's keyring.
-#[post("/secrets/delete", data = "<request>")]
-pub fn delete_secret(_token: APIToken, request: Json<RequestSecret>) -> Json<DeleteSecretResponse> {
+pub async fn delete_secret(_token: APIToken, request: Json<RequestSecret>) -> Json<DeleteSecretResponse> {
    let user_name = request.user_name.as_str();
    let service = format!("mindwork-ai-studio::{}", request.destination);
    let entry = Entry::new(service.as_str(), user_name).unwrap();
--- a/runtime/tauri.conf.json
+++ b/runtime/tauri.conf.json
@ -1,44 +1,57 @@
 {
+  "productName": "MindWork AI Studio",
+  "mainBinaryName": "MindWork AI Studio",
+  "version": "26.5.4",
+  "identifier": "com.github.mindwork-ai.ai-studio",
+  
  "build": {
-    "devPath": "ui/",
-    "distDir": "ui/",
-    "withGlobalTauri": false
+    "frontendDist": "ui/"
  },
-  "package": {
-    "productName": "MindWork AI Studio",
-	"version": "26.5.1"
-  },
-  "tauri": {
-    "allowlist": {
-      "all": false,
-      "shell": {
-        "sidecar": true,
-        "all": false,
-        "open": true,
-        "scope": [
-          {
-            "name": "../app/MindWork AI Studio/bin/dist/mindworkAIStudioServer",
-            "sidecar": true,
-            "args": true
-          },
-          {
-            "name": "target/databases/qdrant/qdrant",
-            "sidecar": true,
-            "args": true
-          }
-        ]
-      },
-      "http" : {
-        "all": true,
-        "request": true,
-        "scope": [
-          "http://localhost"
-        ]
-      },
-      "fs": {
-        "scope": ["$RESOURCE/resources/*"]
-      }
+  
+  "bundle": {
+    "active": true,
+    "targets": [
+      "appimage",
+      "app",
+      "dmg",
+      "nsis"
+    ],
+    "icon": [
+      "icons/32x32.png",
+      "icons/128x128.png",
+      "icons/128x128@2x.png",
+      "icons/icon.icns",
+      "icons/icon.ico"
+    ],
+    "externalBin": [
+      "../app/MindWork AI Studio/bin/dist/mindworkAIStudioServer",
+      "target/databases/qdrant/qdrant"
+    ],
+    "resources": [
+      "resources/databases/qdrant/config.yaml",
+      "resources/libraries/*"
+    ],
+    "macOS": {
+      "exceptionDomain": "localhost"
    },
+    "createUpdaterArtifacts": "v1Compatible"
+  },
+  
+  "plugins": {
+    "updater": {
+      "windows": {
+        "installMode": "passive"
+      },
+      "endpoints": [
+        "https://github.com/MindWorkAI/AI-Studio/releases/download/v26.5.4/latest.json"
+      ],
+      "pubkey": "dW50cnVzdGVkIGNvbW1lbnQ6IG1pbmlzaWduIHB1YmxpYyBrZXk6IDM3MzE4MTM4RTNDMkM0NEQKUldSTnhNTGpPSUV4TjFkczFxRFJOZWgydzFQN1dmaFlKbXhJS1YyR1RKS1RnR09jYUpMaGsrWXYK"
+    }
+  },
+  
+  "app": {
+    "withGlobalTauri": false,
+    
    "windows": [
      {
        "fullscreen": false,
@ -46,51 +59,13 @@
        "title": "MindWork AI Studio",
        "width": 1920,
        "height": 1080,
-        "fileDropEnabled": true
+        "dragDropEnabled": true,
+        "useHttpsScheme": true
      }
    ],
+    
    "security": {
-      "csp": null,
-      "dangerousRemoteDomainIpcAccess": [
-        {
-          "domain": "localhost",
-          "windows": ["main"],
-          "enableTauriAPI": true
-        }
-      ]
-    },
-    "bundle": {
-      "active": true,
-      "targets": "all",
-      "identifier": "com.github.mindwork-ai.ai-studio",
-      "externalBin": [
-        "../app/MindWork AI Studio/bin/dist/mindworkAIStudioServer",
-        "target/databases/qdrant/qdrant"
-      ],
-      "resources": [
-        "resources/**"
-      ],
-      "macOS": {
-        "exceptionDomain": "localhost"
-      },
-      "icon": [
-        "icons/32x32.png",
-        "icons/128x128.png",
-        "icons/128x128@2x.png",
-        "icons/icon.icns",
-        "icons/icon.ico"
-      ]
-    },
-    "updater": {
-      "active": true,
-      "endpoints": [
-        "https://github.com/MindWorkAI/AI-Studio/releases/download/v26.5.2/latest.json"
-      ],
-      "dialog": false,
-      "windows": {
-        "installMode": "passive"
-      },
-      "pubkey": "dW50cnVzdGVkIGNvbW1lbnQ6IG1pbmlzaWduIHB1YmxpYyBrZXk6IDM3MzE4MTM4RTNDMkM0NEQKUldSTnhNTGpPSUV4TjFkczFxRFJOZWgydzFQN1dmaFlKbXhJS1YyR1RKS1RnR09jYUpMaGsrWXYK"
+      "csp": null
    }
  }
 }
Author	SHA1	Message	Date
Thorsten Sommer	3360c2fa29	Prepared test release v26.5.4 (#759 )	2026-05-13 14:03:36 +02:00
Thorsten Sommer	0089849e0c	Prepared release v26.5.3 (#758 )	2026-05-13 11:58:16 +02:00
Thorsten Sommer	d69eab8807	Migrated to axum (#757 ) Some checks are pending Build and Release / Determine run mode (push) Waiting to run Details Build and Release / Read metadata (push) Blocked by required conditions Details Build and Release / Build app (${{ matrix.dotnet_runtime }}) (-aarch64-apple-darwin, osx-arm64, macos-latest, aarch64-apple-darwin, dmg,app,updater, dmg) (push) Blocked by required conditions Details Build and Release / Prepare & create release (push) Blocked by required conditions Details Build and Release / Build app (${{ matrix.dotnet_runtime }}) (-aarch64-pc-windows-msvc.exe, win-arm64, windows-latest, aarch64-pc-windows-msvc, nsis,updater, nsis) (push) Blocked by required conditions Details Build and Release / Build app (${{ matrix.dotnet_runtime }}) (-aarch64-unknown-linux-gnu, linux-arm64, ubuntu-22.04-arm, aarch64-unknown-linux-gnu, appimage,updater, appimage) (push) Blocked by required conditions Details Build and Release / Build app (${{ matrix.dotnet_runtime }}) (-x86_64-apple-darwin, osx-x64, macos-latest, x86_64-apple-darwin, dmg,app,updater, dmg) (push) Blocked by required conditions Details Build and Release / Build app (${{ matrix.dotnet_runtime }}) (-x86_64-pc-windows-msvc.exe, win-x64, windows-latest, x86_64-pc-windows-msvc, nsis,updater, nsis) (push) Blocked by required conditions Details Build and Release / Build app (${{ matrix.dotnet_runtime }}) (-x86_64-unknown-linux-gnu, linux-x64, ubuntu-22.04, x86_64-unknown-linux-gnu, appimage,updater, appimage) (push) Blocked by required conditions Details Build and Release / Publish release (push) Blocked by required conditions Details	2026-05-12 20:31:08 +02:00
Thorsten Sommer	f69186f7a9	Fixed navigation logic for Windows builds (#755 ) Some checks failed Build and Release / Determine run mode (push) Has been cancelled Details Build and Release / Build app (${{ matrix.dotnet_runtime }}) (-x86_64-apple-darwin, osx-x64, macos-latest, x86_64-apple-darwin, dmg,app,updater, dmg) (push) Has been cancelled Details Build and Release / Build app (${{ matrix.dotnet_runtime }}) (-x86_64-pc-windows-msvc.exe, win-x64, windows-latest, x86_64-pc-windows-msvc, nsis,updater, nsis) (push) Has been cancelled Details Build and Release / Build app (${{ matrix.dotnet_runtime }}) (-x86_64-unknown-linux-gnu, linux-x64, ubuntu-22.04, x86_64-unknown-linux-gnu, appimage,updater, appimage) (push) Has been cancelled Details Build and Release / Prepare & create release (push) Has been cancelled Details Build and Release / Read metadata (push) Has been cancelled Details Build and Release / Build app (${{ matrix.dotnet_runtime }}) (-aarch64-apple-darwin, osx-arm64, macos-latest, aarch64-apple-darwin, dmg,app,updater, dmg) (push) Has been cancelled Details Build and Release / Build app (${{ matrix.dotnet_runtime }}) (-aarch64-pc-windows-msvc.exe, win-arm64, windows-latest, aarch64-pc-windows-msvc, nsis,updater, nsis) (push) Has been cancelled Details Build and Release / Build app (${{ matrix.dotnet_runtime }}) (-aarch64-unknown-linux-gnu, linux-arm64, ubuntu-22.04-arm, aarch64-unknown-linux-gnu, appimage,updater, appimage) (push) Has been cancelled Details Build and Release / Publish release (push) Has been cancelled Details	2026-05-08 13:28:18 +02:00
Thorsten Sommer	eb9c6be16e	Fixed macOS artifact handling (#754 ) Some checks are pending Build and Release / Determine run mode (push) Waiting to run Details Build and Release / Read metadata (push) Blocked by required conditions Details Build and Release / Build app (${{ matrix.dotnet_runtime }}) (-aarch64-apple-darwin, osx-arm64, macos-latest, aarch64-apple-darwin, dmg,app,updater, dmg) (push) Blocked by required conditions Details Build and Release / Build app (${{ matrix.dotnet_runtime }}) (-aarch64-pc-windows-msvc.exe, win-arm64, windows-latest, aarch64-pc-windows-msvc, nsis,updater, nsis) (push) Blocked by required conditions Details Build and Release / Build app (${{ matrix.dotnet_runtime }}) (-aarch64-unknown-linux-gnu, linux-arm64, ubuntu-22.04-arm, aarch64-unknown-linux-gnu, appimage,updater, appimage) (push) Blocked by required conditions Details Build and Release / Build app (${{ matrix.dotnet_runtime }}) (-x86_64-apple-darwin, osx-x64, macos-latest, x86_64-apple-darwin, dmg,app,updater, dmg) (push) Blocked by required conditions Details Build and Release / Build app (${{ matrix.dotnet_runtime }}) (-x86_64-pc-windows-msvc.exe, win-x64, windows-latest, x86_64-pc-windows-msvc, nsis,updater, nsis) (push) Blocked by required conditions Details Build and Release / Build app (${{ matrix.dotnet_runtime }}) (-x86_64-unknown-linux-gnu, linux-x64, ubuntu-22.04, x86_64-unknown-linux-gnu, appimage,updater, appimage) (push) Blocked by required conditions Details Build and Release / Prepare & create release (push) Blocked by required conditions Details Build and Release / Publish release (push) Blocked by required conditions Details	2026-05-08 09:32:20 +02:00
Thorsten Sommer	da4d44461f	Fixed macOS artifact handling & added platform checks (#753 ) Some checks are pending Build and Release / Determine run mode (push) Waiting to run Details Build and Release / Read metadata (push) Blocked by required conditions Details Build and Release / Build app (${{ matrix.dotnet_runtime }}) (-aarch64-apple-darwin, osx-arm64, macos-latest, aarch64-apple-darwin, dmg,updater, dmg) (push) Blocked by required conditions Details Build and Release / Build app (${{ matrix.dotnet_runtime }}) (-aarch64-pc-windows-msvc.exe, win-arm64, windows-latest, aarch64-pc-windows-msvc, nsis,updater, nsis) (push) Blocked by required conditions Details Build and Release / Build app (${{ matrix.dotnet_runtime }}) (-aarch64-unknown-linux-gnu, linux-arm64, ubuntu-22.04-arm, aarch64-unknown-linux-gnu, appimage,updater, appimage) (push) Blocked by required conditions Details Build and Release / Build app (${{ matrix.dotnet_runtime }}) (-x86_64-apple-darwin, osx-x64, macos-latest, x86_64-apple-darwin, dmg,updater, dmg) (push) Blocked by required conditions Details Build and Release / Build app (${{ matrix.dotnet_runtime }}) (-x86_64-pc-windows-msvc.exe, win-x64, windows-latest, x86_64-pc-windows-msvc, nsis,updater, nsis) (push) Blocked by required conditions Details Build and Release / Build app (${{ matrix.dotnet_runtime }}) (-x86_64-unknown-linux-gnu, linux-x64, ubuntu-22.04, x86_64-unknown-linux-gnu, appimage,updater, appimage) (push) Blocked by required conditions Details Build and Release / Prepare & create release (push) Blocked by required conditions Details Build and Release / Publish release (push) Blocked by required conditions Details	2026-05-07 21:22:52 +02:00
Thorsten Sommer	666956a7e4	Removed support for deb release targets (#752 ) Some checks are pending Build and Release / Determine run mode (push) Waiting to run Details Build and Release / Read metadata (push) Blocked by required conditions Details Build and Release / Build app (${{ matrix.dotnet_runtime }}) (-aarch64-apple-darwin, osx-arm64, macos-latest, aarch64-apple-darwin, dmg,updater, dmg) (push) Blocked by required conditions Details Build and Release / Build app (${{ matrix.dotnet_runtime }}) (-aarch64-pc-windows-msvc.exe, win-arm64, windows-latest, aarch64-pc-windows-msvc, nsis,updater, nsis) (push) Blocked by required conditions Details Build and Release / Build app (${{ matrix.dotnet_runtime }}) (-aarch64-unknown-linux-gnu, linux-arm64, ubuntu-22.04-arm, aarch64-unknown-linux-gnu, appimage,updater, appimage) (push) Blocked by required conditions Details Build and Release / Build app (${{ matrix.dotnet_runtime }}) (-x86_64-apple-darwin, osx-x64, macos-latest, x86_64-apple-darwin, dmg,updater, dmg) (push) Blocked by required conditions Details Build and Release / Build app (${{ matrix.dotnet_runtime }}) (-x86_64-pc-windows-msvc.exe, win-x64, windows-latest, x86_64-pc-windows-msvc, nsis,updater, nsis) (push) Blocked by required conditions Details Build and Release / Build app (${{ matrix.dotnet_runtime }}) (-x86_64-unknown-linux-gnu, linux-x64, ubuntu-22.04, x86_64-unknown-linux-gnu, appimage,updater, appimage) (push) Blocked by required conditions Details Build and Release / Prepare & create release (push) Blocked by required conditions Details Build and Release / Publish release (push) Blocked by required conditions Details	2026-05-06 19:40:54 +02:00
Thorsten Sommer	db4382d673	Updated CI/CD pipeline (#751 ) Some checks are pending Build and Release / Determine run mode (push) Waiting to run Details Build and Release / Read metadata (push) Blocked by required conditions Details Build and Release / Build app (${{ matrix.dotnet_runtime }}) (-aarch64-apple-darwin, osx-arm64, macos-latest, aarch64-apple-darwin, dmg,updater, dmg) (push) Blocked by required conditions Details Build and Release / Build app (${{ matrix.dotnet_runtime }}) (-aarch64-pc-windows-msvc.exe, win-arm64, windows-latest, aarch64-pc-windows-msvc, nsis,updater, nsis) (push) Blocked by required conditions Details Build and Release / Build app (${{ matrix.dotnet_runtime }}) (-aarch64-unknown-linux-gnu, linux-arm64, ubuntu-22.04-arm, aarch64-unknown-linux-gnu, appimage,deb,updater, appimage,deb) (push) Blocked by required conditions Details Build and Release / Build app (${{ matrix.dotnet_runtime }}) (-x86_64-apple-darwin, osx-x64, macos-latest, x86_64-apple-darwin, dmg,updater, dmg) (push) Blocked by required conditions Details Build and Release / Build app (${{ matrix.dotnet_runtime }}) (-x86_64-pc-windows-msvc.exe, win-x64, windows-latest, x86_64-pc-windows-msvc, nsis,updater, nsis) (push) Blocked by required conditions Details Build and Release / Build app (${{ matrix.dotnet_runtime }}) (-x86_64-unknown-linux-gnu, linux-x64, ubuntu-22.04, x86_64-unknown-linux-gnu, appimage,deb,updater, appimage,deb) (push) Blocked by required conditions Details Build and Release / Prepare & create release (push) Blocked by required conditions Details Build and Release / Publish release (push) Blocked by required conditions Details	2026-05-06 19:12:19 +02:00
Paul Koudelka	6ee5a1945b	Upgrade to Tauri v2 (#693 ) Some checks are pending Build and Release / Build app (${{ matrix.dotnet_runtime }}) (-x86_64-apple-darwin, osx-x64, macos-latest, x86_64-apple-darwin, dmg,updater, dmg) (push) Blocked by required conditions Details Build and Release / Build app (${{ matrix.dotnet_runtime }}) (-x86_64-pc-windows-msvc.exe, win-x64, windows-latest, x86_64-pc-windows-msvc, nsis,updater, nsis) (push) Blocked by required conditions Details Build and Release / Build app (${{ matrix.dotnet_runtime }}) (-x86_64-unknown-linux-gnu, linux-x64, ubuntu-22.04, x86_64-unknown-linux-gnu, appimage,deb,updater, appimage,deb) (push) Blocked by required conditions Details Build and Release / Prepare & create release (push) Blocked by required conditions Details Build and Release / Determine run mode (push) Waiting to run Details Build and Release / Read metadata (push) Blocked by required conditions Details Build and Release / Build app (${{ matrix.dotnet_runtime }}) (-aarch64-apple-darwin, osx-arm64, macos-latest, aarch64-apple-darwin, dmg,updater, dmg) (push) Blocked by required conditions Details Build and Release / Build app (${{ matrix.dotnet_runtime }}) (-aarch64-pc-windows-msvc.exe, win-arm64, windows-latest, aarch64-pc-windows-msvc, nsis,updater, nsis) (push) Blocked by required conditions Details Build and Release / Build app (${{ matrix.dotnet_runtime }}) (-aarch64-unknown-linux-gnu, linux-arm64, ubuntu-22.04-arm, aarch64-unknown-linux-gnu, appimage,deb,updater, appimage,deb) (push) Blocked by required conditions Details Build and Release / Publish release (push) Blocked by required conditions Details Co-authored-by: Thorsten Sommer <SommerEngineering@users.noreply.github.com>	2026-05-06 18:45:50 +02:00