v2.0.5-rc (#41 )

Reviewed-on: #41
v2.0.4-rc (#37 )
2025-03-26 07:02:38 -05:00 · 2025-02-22 09:48:00 -06:00 · 2025-02-11 17:26:24 -06:00
257 changed files with 11055 additions and 2789 deletions
--- a/.cspell/words.txt
+++ b/.cspell/words.txt
@ -3,6 +3,7 @@ _mkgmtime
 _sh_denyno
 _sh_denyrd
 _sh_denyrw
+_spawnv
 aarch64
 advapi32
 armv8
@ -114,6 +115,7 @@ googletest
 gpath
 gtest_version
 has_setxattr
+hkey
 httpapi
 httplib
 icudata
@ -121,6 +123,7 @@ icui18n
 icuuc
 iostreams
 iphlpapi
+ipstream
 jthread
 libbitcoin
 libbitcoinsystem
@ -128,6 +131,7 @@ libcurl
 libdsm
 libevent
 libexample
+libexpat
 libfuse3
 libgmock
 libgtest
@ -140,10 +144,13 @@ libuuid
 libuuid_include_dirs
 libvlc
 linkflags
+localappdata
+lpbyte
 lptr
 lpwstr
 markdownlint
 mbig
+minio
 msvc
 msvcr120
 msys2
@ -151,8 +158,10 @@ mtune
 musl-libc
 nana
 ncrypt
+nlohmann
 nlohmann_json
 nmakeprg
+nohup
 nominmax
 ntstatus
 nullptr
@ -160,6 +169,7 @@ nuspell_version
 oleaut32
 openal_version
 openssldir
+pistream
 pkgconfig
 plarge_integer
 plex
@ -189,6 +199,7 @@ secp256k1
 secur32
 sfml_project
 shlwapi
+skynet
 source_subdir
 spdlog
 spdlog_project
@ -200,6 +211,7 @@ stduuid_project
 strequal
 ularge_integer
 uring
+url
 userenv
 utimens_impl
 utimensat
--- a/.gitattributes
+++ b/.gitattributes
@ -0,0 +1,4 @@
+*.tgz filter=lfs diff=lfs merge=lfs -text
+*.tar.gz filter=lfs diff=lfs merge=lfs -text
+*.tar.xz filter=lfs diff=lfs merge=lfs -text
+*.zip filter=lfs diff=lfs merge=lfs -text
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -1,13 +1,53 @@
 # Changelog

-## v2.0.3-rc
+## v2.0.5-rc

 ### Issues

-* ~~\#12 \[Unit Test\] Complete all providers unit tests~~
-* ~~\#20 Add support to evict open files~~
-* ~~\#21 \[Unit Test \] Complete WinFSP unit tests~~
-* ~~\#22 \[Unit Test\] Complete FUSE unit tests~~
+* \#39 Create management portal in Flutter
+
+### Changes from v2.0.4-rc
+
+* Continue documentation updates
+* Fixed `-status` command erasing active mount information
+* Fixed overlapping HTTP REST API port's
+* Refactored/fixed instance locking
+* Removed passwords and secret key values from API calls
+* Renamed setting `ApiAuth` to `ApiPassword`
+* Require `--name,-na` option for encryption provider
+
+## v2.0.4-rc
+
+### BREAKING CHANGES
+
+* `renterd` v2.0.0+ is now required. Prior versions will fail to mount.
+
+<!-- markdownlint-disable-next-line -->
+### Issues
+
+* \#35 [bug] Low frequency check is set to '0' instead of 1 hour by default
+* \#36 [bug] Max cache size bytes is set to '0' by default
+
+### Changes from v2.0.3-rc
+
+* Added Sia API version check prior to mounting
+* Added back `-cv` (check version) CLI option
+* Continue documentation updates
+* Fixed setting `ApiAuth` via `set_value_by_name`
+* Fixed setting `HostConfig.ApiUser` via `set_value_by_name`
+* Fixed setting `HostConfig.Path` via `set_value_by_name`
+* Fixed setting `HostConfig.Protocol` via `set_value_by_name`
+* Improved ring buffer read-ahead
+* Integrated `renterd` version 2.0.0
+* Prefer using local cache file when opening files
+* Refactored `app_config` unit tests
+* Refactored polling to be more accurate on scheduling tasks
+
+## v2.0.3-rc
+
+<!-- markdownlint-disable-next-line -->
+### Issues
+
 * \#28 \[bug\] Address slow directory responses in S3 mounts for deeply nested directories
 * \#29 \[bug\] S3 error responses are not being logged
 * \#30 \[bug\] Sia provider error responses are not logged
@ -16,6 +56,7 @@
 ### Changes from v2.0.2-rc

 * Always use direct for read-only providers
+* Fixed externally removed files not being processed during cleanup
 * Fixed http headers not being added for requests
 * Fixed incorrect `stat` values for remote mounts
 * Fixed invalid directory nullptr error on remote mounts
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -3,6 +3,10 @@ cmake_minimum_required(VERSION 3.27)
 cmake_policy(SET CMP0135 NEW)
 cmake_policy(SET CMP0144 NEW)

+if (NOT PROJECT_INTERFACE) 
+  message(FATAL_ERROR "Project must be compiled via 'make_win32.cmd'/'make_win32.sh' or 'make_unix.sh' build scripts. Invoking 'cmake' directly is not supported.")
+endif()
+
 project(${PROJECT_NAME}
  DESCRIPTION ${PROJECT_DESC}
  HOMEPAGE_URL ${PROJECT_URL}
@ -54,6 +58,10 @@ if(PROJECT_IS_MINGW)
  endif()
 endif()

+if (PROJECT_ENABLE_V2_ERRORS)
+  add_definitions(-DPROJECT_ENABLE_V2_ERRORS)
+endif()
+
 include(cmake/settings.cmake)

 include(cmake/flags.cmake)
@ -139,6 +147,7 @@ endif()
      -DPROJECT_COPYRIGHT=${PROJECT_COPYRIGHT}
      -DPROJECT_DESC=${PROJECT_DESC}
      -DPROJECT_DIST_DIR=${PROJECT_DIST_DIR}
+      -DPROJECT_ENABLE_V2_ERRORS=${PROJECT_ENABLE_V2_ERRORS}
      -DPROJECT_ENABLE_WIN32_LONG_PATH_NAMES=${PROJECT_ENABLE_WIN32_LONG_PATH_NAMES}
      -DPROJECT_ENABLE_BOOST=${PROJECT_ENABLE_BOOST}
      -DPROJECT_ENABLE_CPP_HTTPLIB=${PROJECT_ENABLE_CPP_HTTPLIB}
@ -158,6 +167,7 @@ endif()
      -DPROJECT_FUSE=${PROJECT_FUSE}
      -DPROJECT_FUSE_INCLUDE_DIRS=${PROJECT_FUSE_INCLUDE_DIRS}
      -DPROJECT_GIT_REV=${PROJECT_GIT_REV}
+      -DPROJECT_INTERFACE=1
      -DPROJECT_IS_ALPINE=${PROJECT_IS_ALPINE}
      -DPROJECT_IS_ARM64=${PROJECT_IS_ARM64}
      -DPROJECT_IS_MINGW=${PROJECT_IS_MINGW}
--- a/README.md
+++ b/README.md
@ -1,110 +1,456 @@
 # Repertory

-Repertory allows you to mount AWS S3 and Sia via FUSE on Linux ~~/OS X~~ or via WinFSP
+Repertory allows you to mount S3 and Sia via FUSE on Linux or via WinFSP
 on Windows.

+## Contents
+
+1. [Details and Features](#details-and-features)
+2. [Minimum Requirements](#minimum-requirements)
+   1. [Supported Operating Systems](#supported-operating-systems)
+3. [GUI](#gui)
+4. [Usage](#usage)
+   1. [Important Options](#important-options)
+   2. [Sia](#sia)
+      * [Sia Initial Configuration](#sia-initial-configuration)
+      * [Sia Mounting](#sia-mounting)
+      * [Sia Configuration File](#sia-configuration-file)
+   3. [S3](#s3)
+      * [S3 Initial Configuration](#s3-initial-configuration)
+      * [S3 Mounting](#s3-mounting)
+      * [S3 Configuration File](#s3-configuration-file)
+5. [Data Directories](#data-directories)
+   1. [Linux Directories](#linux-directories)
+   2. [Windows Directories](#windows-directories)
+6. [Remote Mounting](#remote-mounting)
+   1. [Server Setup](#server-setup)
+      * [Remote Mount Configuration File Section](#remote-mount-configuration-file-section)
+   2. [Client Setup](#client-setup)
+      * [Client Remote Mounting](#client-remote-mounting)
+      * [Remote Mount Configuration File](#remote-mount-configuration-file)
+7. [Compiling](#compiling)
+   1. [Linux Compilation](#linux-compilation)
+   2. [Windows Setup](#windows-compilation)
+8. [Credits](#credits)
+9. [Developer Public Key](#developer-public-key)
+10. [Consult the Wiki for additional information](https://git.fifthgrid.com/BlockStorage/repertory/wiki)
+
 ## Details and Features

 * Optimized for [Plex Media Server](https://www.plex.tv/)
-* Single application to mount AWS S3 and/or Sia
-* Remote mounting of Repertory instances on Linux ~~, OS X~~ and Windows
-  * Securely share your mounts over TCP/IP (`XChaCha20-Poly1305` stream cipher)
-* Cross-platform support (Linux 64-bit, Linux arm64/aarch64, ~~OS X,~~ Windows 64-bit)
+* Remote mounting of `repertory` instances on Linux and Windows
+  * Securely share your mounts over TCP/IP via `XChaCha20-Poly1305` with other systems on your network or over the internet.
+* Cross-platform support (Linux 64-bit, Linux arm64/aarch64, Windows 64-bit)
+* Optionally encrypt file names and file data via `XChaCha20-Poly1305` in S3 mounts

 ## Minimum Requirements

-* [Sia renterd](https://github.com/SiaFoundation/renterd/releases) v0.4.0+ for Sia support
-* Only 64-bit operating systems are supported
-  * By default, Linux requires `fusermount3`; otherwise, `repertory` must be manually compiled with `libfuse2` support
-  * ~~OS X requires the following dependency to be installed:~~
-    * ~~[FUSE for macOS v4.5.0](https://github.com/osxfuse/osxfuse/releases/download/macfuse-4.5.0/macfuse-4.5.0.dmg)~~
-  * Windows requires the following dependencies to be installed:
-    * [WinFSP 2023](https://github.com/winfsp/winfsp/releases/download/v2.0/winfsp-2.0.23075.msi)
+* [Sia renterd](https://github.com/SiaFoundation/renterd/releases) v2.0.0+ for Sia support
+* Linux requires `fusermount3`; otherwise, `repertory` must be manually compiled with `libfuse2` support
+* Windows requires the following dependencies to be installed:
+  * [WinFSP 2023](https://github.com/winfsp/winfsp/releases/download/v2.0/winfsp-2.0.23075.msi)

-## Supported Operating Systems
+### Supported Operating Systems
+
+Only 64-bit operating systems are supported

 * Linux `arm64/aarch64`
 * Linux `amd64`
-* ~~OS X Mojave and above~~
 * Windows 64-bit 10, 11

+## GUI
+
+As of `v2.0.5-rc`, mounts can be managed using the `Repertory Management Portal`.
+To launch the portal, execute the following command:
+
+* `repertory -ui`
+  * The default username is `repertory`
+  * The default password is `repertory`
+
+After first launch, `ui.json` will be created in the appropriate data directory.
+See [Data Directories](#data-directories).
+You should modify this file directly or use the portal to change the default
+username and password.
+
+### Screenshot
+ 
+<a href="https://ibb.co/fVyJqnbF"><img src="https://i.ibb.co/fVyJqnbF/repertory-portal.png" alt="repertory-portal" border="0"></a>
+
 ## Usage

-### Notable Options
+### Important Options

-* `-dc`
-  * Display mount configuration.
-  * For Sia, `--name` is optional
-  * For S3, the `-s3` option is required along with `--name`
 * `--help`
-  * Display all mount utility options.
+  * Display all mount utility options
+
+* `-f`
+  * Keep process in foreground on Linux.
+
 * `--name, -na [name]`
+  * Identifies a unique configuration name to support multiple mounts.
  * The `--name` option can be set to any valid value allowed as a file name for your filesystem.
  * For Sia, the bucket name will be set to the same value if it is empty in the configuration file.
    * If the `--name` option is not specified, `default` will be used.
  * For S3, the `--name` option is required and does not affect the bucket name.
-* `-set SiaConfig.Bucket`
-  * Set Sia bucket name for the mount.
-  * Can be used in combination with `--name` to target a unique configuration.
-* `-set S3Config.Bucket`
-  * S3 bucket name for the mount.
-  * Must be used in combination with `--name` to target a unique configuration.
-  * Must be used in combination with `-s3`.
+
+* `-dc`
+  * Display mount configuration
+  * For Sia, `--name` is optional
+  * For S3, the `-s3` option is required along with `--name`

 ### Sia

-* Linux
+#### Sia Initial Configuration
+
+* Required steps:
+  * Set the appropriate bucket name and `renterd` API password in `repertory` configuration:
+    * To use `default` as the bucket name and configuration name, you only need to set the `renterd` API password:
+      * `repertory -set HostConfig.ApiPassword '<my password>'`
+    * To specify a different bucket name while using `default` as the configuration name:
+      * `repertory -set HostConfig.ApiPassword '<my password>'`
+      * `repertory -set SiaConfig.Bucket '<my bucket>'`
+    * For all other configurations:
+      * `repertory --name '<my config name>' -set HostConfig.ApiPassword '<my password>'`
+      * `repertory --name '<my config name>' -set SiaConfig.Bucket '<my bucket name>'`
+
+* Optional steps:
+  * Set a user name used during `renterd` basic authentication:
+    * `repertory -set HostConfig.ApiUser '<my user>'`
+    * `repertory --name '<my config name>' -set HostConfig.ApiUser '<my user>'`
+  * Set a custom agent string (default `Sia-Agent`):
+    * `repertory -set HostConfig.AgentString '<my agent>'`
+    * `repertory --name '<my config name>' -set HostConfig.AgentString '<my agent>'`
+  * Set the host name or IP of the `renterd` instance (default `localhost`):
+    * `repertory -set HostConfig.HostNameOrIp '<my host name>'`
+    * `repertory --name '<my config name>' -set HostConfig.HostNameOrIp '<my host name>'`
+  * Set the `renterd` API port (default `9980`):
+    * `repertory -set HostConfig.ApiPort 9981`
+    * `repertory --name '<my config name>' -set HostConfig.ApiPort 9981`
+
+* To verify/view all configuration options:
+  * `repertory -dc`
+  * `repertory --name '<my config name>' -dc`
+    * Example:
+      * `repertory --name default -dc`
+
+#### Sia Mounting
+
+* Linux:
  * `repertory /mnt/location`
-  * `repertory --name default /mnt/location`
-* Windows
-  * `repertory.exe t:`
-  * `repertory.exe --name default t:`
+  * `repertory --name '<my config name>' /mnt/location`
+    * Example:
+      * `repertory --name default /mnt/location`
+
+* Windows:
+  * `repertory t:`
+  * `repertory --name '<my config name>' t:`
+    * Example:
+      * `repertory --name default t:`
+
+#### Sia Configuration File
+
+```json
+{
+  "ApiPassword": "<random generated rpc password>",
+  "ApiPort": 10000,
+  "ApiUser": "repertory",
+  "DatabaseType": "rocksdb",
+  "DownloadTimeoutSeconds": 30,
+  "EnableDownloadTimeout": true,
+  "EnableDriveEvents": false,
+  "EventLevel": "info",
+  "EvictionDelayMinutes": 1,
+  "EvictionUseAccessedTime": false,
+  "HighFreqIntervalSeconds": 30,
+  "HostConfig": {
+    "AgentString": "Sia-Agent",
+    "ApiPassword": "<renterd api password>",
+    "ApiPort": 9980,
+    "ApiUser": "",
+    "HostNameOrIp": "localhost",
+    "Path": "",
+    "Protocol": "http",
+    "TimeoutMs": 60000
+  },
+  "LowFreqIntervalSeconds": 3600,
+  "MaxCacheSizeBytes": 21474836480,
+  "MaxUploadCount": 5,
+  "MedFreqIntervalSeconds": 120,
+  "OnlineCheckRetrySeconds": 60,
+  "PreferredDownloadType": "default",
+  "RemoteMount": {
+    "ApiPort": 20000,
+    "ClientPoolSize": 20,
+    "Enable": false,
+    "EncryptionToken": ""
+  },
+  "RetryReadCount": 6,
+  "RingBufferFileSize": 512,
+  "SiaConfig": {
+    "Bucket": "default"
+  },
+  "TaskWaitMs": 100,
+  "Version": 1
+}
+```

 ### S3

-* Linux 
-  * `repertory --name storj -s3 /mnt/location`
-* Windows
-  * `repertory.exe --name storj -s3 t:`
+#### S3 Initial Configuration
+
+* Required steps:
+  * Set the appropriate base URL:
+    * `repertory -s3 --name '<my config name>' -set S3Config.URL '<my url>'`
+      * Example:
+        * `repertory -s3 --name minio -set S3Config.URL 'http://localhost:9000'`
+  * Set the appropriate bucket name:
+    * `repertory -s3 --name '<my config name>' -set S3Config.Bucket '<my bucket name>'`
+  * Set the appropriate access key:
+    * `repertory -s3 --name '<my config name>' -set S3Config.AccessKey '<my access key>'`
+  * Set the appropriate secret key:
+    * `repertory -s3 --name '<my config name>' -set S3Config.SecretKey '<my secret key>'`
+  * For Sia and most local S3 gateway instances, enable path style URL's:
+    * `repertory -s3 --name '<my config name>' -set S3Config.UsePathStyle true`
+
+* Optional steps:
+  * Set an appropriate region. Default is set to `any`:
+    * `repertory -s3 --name '<my config name>' -set S3Config.Region '<my region>'`
+  * Enable encrypted file names and file data. Set a strong, random encryption token and be sure to store it in a secure backup location:
+    * `repertory -s3 --name '<my config name>' -set S3Config.EncryptionToken '<my strong password>'`
+
+* To verify/view all configuration options:
+  * `repertory -s3 --name '<my config name>' -dc`
+    * Example:
+      * `repertory -s3 --name minio -dc`
+
+#### S3 Mounting
+
+* Linux:
+  * `repertory -s3 --name '<my config name>' /mnt/location`
+    * Example:
+      * `repertory -s3 --name minio /mnt/location`
+
+* Windows:
+  * `repertory -s3 --name '<my config name>' t:`
+    * Example:
+      * `repertory -s3 --name minio t:`
+
+#### S3 Configuration File
+
+```json
+{
+  "ApiPassword": "<random generated rpc password>",
+  "ApiPort": 10100,
+  "ApiUser": "repertory",
+  "DatabaseType": "rocksdb",
+  "DownloadTimeoutSeconds": 30,
+  "EnableDownloadTimeout": true,
+  "EnableDriveEvents": false,
+  "EventLevel": "info",
+  "EvictionDelayMinutes": 1,
+  "EvictionUseAccessedTime": false,
+  "HighFreqIntervalSeconds": 30,
+  "LowFreqIntervalSeconds": 3600,
+  "MaxCacheSizeBytes": 21474836480,
+  "MaxUploadCount": 5,
+  "MedFreqIntervalSeconds": 120,
+  "OnlineCheckRetrySeconds": 60,
+  "PreferredDownloadType": "default",
+  "RemoteMount": {
+    "ApiPort": 20100,
+    "ClientPoolSize": 20,
+    "Enable": false,
+    "EncryptionToken": ""
+  },
+  "RetryReadCount": 6,
+  "RingBufferFileSize": 512,
+  "S3Config": {
+    "AccessKey": "<my access key>",
+    "Bucket": "<my bucket name>",
+    "EncryptionToken": "",
+    "Region": "any",
+    "SecretKey": "<my secret key>",
+    "TimeoutMs": 60000,
+    "URL": "http://localhost:9000",
+    "UsePathStyle": true,
+    "UseRegionInURL": false
+  },
+  "TaskWaitMs": 100,
+  "Version": 1
+}
+```
+
+### Data Directories
+
+#### Linux Directories
+
+* `~/.local/repertory2/s3`
+* `~/.local/repertory2/sia`
+
+#### Windows Directories
+
+* `%LOCALAPPDATA%\repertory2\s3`
+* `%LOCALAPPDATA%\repertory2\sia`
+  * Examples:
+    * `C:\Users\Tom\AppData\Local\repertory2\s3`
+    * `C:\Users\Tom\AppData\Local\repertory2\sia`
+* IMPORTANT:
+  * It is highly recommended to exclude this folder from any anti-virus/anti-malware applications as severe performance issues may arise.
+  * Excluding the mounted drive letter is also highly recommended.
+
+## Remote Mounting
+
+`repertory` allows local mounts to be shared with other computers on your network
+or over the internet. This option is referred to as remote mounting.
+
+### Server Setup
+
+The following steps must be performed on the mount you wish to share with
+other systems. Changes to configuration will not take affect while a mount is
+active, so it is recommended to unmount beforehand.
+
+* Required steps:
+  * Enable remote mount:
+    * Sia
+      * `repertory -set RemoteMount.Enable true`
+      * `repertory --name '<my config name>' -set RemoteMount.Enable true`
+    * S3:
+      * `repertory -s3 --name '<my config name>' -set RemoteMount.Enable true`
+  * Set a secure encryption token:
+    * Sia:
+      * `repertory -set RemoteMount.EncryptionToken '<my secure password>'`
+      * `repertory --name '<my config name>' -set RemoteMount.EncryptionToken '<my secure password>'`
+    * S3:
+      * `repertory -s3 --name '<my config name>' -set RemoteMount.EncryptionToken '<my secure password>'`
+
+* Optional steps:
+  * Change the port clients will use to connect to your mount:
+    * Sia:
+      * `repertory -set RemoteMount.ApiPort 20000`
+      * `repertory --name '<my config name>' -set RemoteMount.ApiPort 20000`
+    * S3:
+      * `repertory -s3 --name '<my config name>' -set RemoteMount.ApiPort 20000`
+
+* IMPORTANT:
+  * Be sure to configure your firewall to allow incoming TCP connections on the port configured in `RemoteMount.ApiPort`.
+
+#### Remote Mount Configuration File Section
+
+```json
+{
+  ...
+  "RemoteMount": {
+    "ApiPort": 20000,
+    "ClientPoolSize": 20,
+    "Enable": true,
+    "EncryptionToken": "<my secure password>"
+  },
+  ...
+}
+```
+
+### Client Setup
+
+Client configuration is provider agnostic, so there's no need to specify `-s3`
+for S3 providers.
+
+* Required steps:
+  * Set the encryption token to the same value configured during server setup:
+    * `repertory -rm <host name or IP>:<port> -set RemoteConfig.EncryptionToken '<my secure password>'`
+      * Replace `<host name or IP>` with the host name or IP of the server
+      * Replace `<port>` with the value of `RemoteMount.ApiPort` used in the server configuration
+    * Example:
+      * `repertory -rm 192.168.1.10:20000 -set RemoteConfig.EncryptionToken '<my secure password>'`
+      * `repertory -rm my.host.com:20000 -set RemoteConfig.EncryptionToken '<my secure password>'`
+
+#### Client Remote Mounting
+
+* Linux:
+  * `repertory -rm <host name or IP>:<port> /mnt/location`
+    * Example:
+      * `repertory -rm 192.168.1.10:20000 /mnt/location`
+
+* Windows:
+  * `repertory -rm <host name or IP>:<port> t:`
+    * Example:
+      * `repertory -rm 192.168.1.10:20000 t:`
+
+#### Remote Mount Configuration File
+
+```json
+{
+  "ApiPassword": "<random generated rpc password>",
+  "ApiPort": 10010,
+  "ApiUser": "repertory",
+  "EnableDriveEvents": false,
+  "EventLevel": "info",
+  "RemoteConfig": {
+    "ApiPort": 20000,
+    "EncryptionToken": "<my secure password>",
+    "HostNameOrIp": "192.168.1.10",
+    "MaxConnections": 20,
+    "ReceiveTimeoutMs": 120000,
+    "SendTimeoutMs": 30000
+  },
+  "TaskWaitMs": 100,
+  "Version": 1
+}
+```

 ## Compiling

-* Successful compilation will result in all required files being placed in the `dist/` directory
-* Linux
+Successful compilation will result in all files required for execution to be placed
+in the `dist/` directory
+
+### Linux Compilation
+
+* Ensure `docker` is installed
+  * For x86_64:
+    * RelWithDebInfo: `scripts/make_unix.sh`
+    * Release: `scripts/make_unix.sh x86_64 Release`
+    * Debug: `scripts/make_unix.sh x86_64 Debug`
+
+  * For aarch64:
+    * RelWithDebInfo: `scripts/make_unix.sh aarch64`
+    * Release: `scripts/make_unix.sh aarch64 Release`
+    * Debug: `scripts/make_unix.sh aarch64 Debug`
+
+### Windows Compilation
+
+* OFFICIAL: Cross-compiling on Linux
  * Ensure `docker` is installed
-    * For x86_64:
-      * RelWithDebInfo: `scripts/make_unix.sh`
-      * Release: `scripts/make_unix.sh x86_64 Release`
-      * Debug: `scripts/make_unix.sh x86_64 Debug`
-    * For aarch64:
-      * RelWithDebInfo: `scripts/make_unix.sh aarch64`
-      * Release: `scripts/make_unix.sh aarch64 Release`
-      * Debug: `scripts/make_unix.sh aarch64 Debug`
-* Windows
-  * OFFICIAL: Cross-compiling on Linux
-    * Ensure `docker` is installed
-      * RelWithDebInfo: `scripts/make_win32.sh`
-      * Release: `scripts/make_win32.sh x86_64 Release`
-      * Debug: `scripts/make_win32.sh x86_64 Debug`
-  * UNOFFICIAL: Compiling on Windows
-    * Ensure latest [MSYS2](https://www.msys2.org/) is installed
-      * RelWithDebInfo: `scripts\make_win32.cmd`
-      * Release: `scripts\make_win32.cmd x86_64 Release`
-      * Debug: `scripts\make_win32.cmd x86_64 Debug`
+    * RelWithDebInfo: `scripts/make_win32.sh`
+    * Release: `scripts/make_win32.sh x86_64 Release`
+    * Debug: `scripts/make_win32.sh x86_64 Debug`
+
+* UNOFFICIAL: Compiling on Windows
+  * Ensure latest [MSYS2](https://www.msys2.org/) is installed
+    * RelWithDebInfo: `scripts\make_win32.cmd`
+    * Release: `scripts\make_win32.cmd x86_64 Release`
+    * Debug: `scripts\make_win32.cmd x86_64 Debug`

 ## Credits

+* [binutils](https://www.gnu.org/software/binutils/)
 * [boost c++ libraries](https://www.boost.org/)
 * [cpp-httplib](https://github.com/yhirose/cpp-httplib)
 * [curl](https://curl.haxx.se/)
-* ~~[FUSE for macOS](https://osxfuse.github.io/)~~
+* [docker](https://www.docker.com/)
 * [Google Test](https://github.com/google/googletest)
+* [ICU](https://icu.unicode.org/)
 * [JSON for Modern C++](https://github.com/nlohmann/json)
+* [libexpat](https://github.com/libexpat/libexpat)
 * [libfuse](https://github.com/libfuse/libfuse)
 * [libsodium](https://doc.libsodium.org/)
+* [mingw-w64](https://www.mingw-w64.org/)
+* [MSYS2](https://www.msys2.org)
 * [OpenSSL](https://www.openssl.org/)
+* [pkg-config](https://www.freedesktop.org/wiki/Software/pkg-config/)
+* [pugixml](https://pugixml.org/)
+* [RocksDB](https://rocksdb.org)
 * [ScPrime](https://scpri.me/)
 * [Sia Decentralized Cloud Storage](https://sia.tech/)
+* [spdlog](https://github.com/gabime/spdlog)
 * [SQLite](https://www.sqlite.org)
 * [stduuid](https://github.com/mariusbancila/stduuid)
 * [Storj](https://storj.io/)
--- a/cmake/hashes.cmake
+++ b/cmake/hashes.cmake
@ -1,20 +1,20 @@
 set(BINUTILS_HASH b53606f443ac8f01d1d5fc9c39497f2af322d99e14cea5c0b4b124d630379365)
 set(BOOST2_HASH 7bd7ddceec1a1dfdcbdb3e609b60d01739c38390a5f956385a12f3122049f0ca)
 set(BOOST_HASH f55c340aa49763b1925ccf02b2e83f35fdcf634c9d5164a2acb87540173c741d)
-set(CPP_HTTPLIB_HASH 405abd8170f2a446fc8612ac635d0db5947c0d2e156e32603403a4496255ff00)
-set(CURL_HASH 5a231145114589491fc52da118f9c7ef8abee885d1cb1ced99c7290e9a352f07)
+set(CPP_HTTPLIB_HASH c9b9e0524666e1cd088f0874c57c1ce7c0eaa8552f9f4e15c755d5201fc8c608)
+set(CURL_HASH 6edc063d1ebaf9cf3b3b46e9fef2f3cd8932694989ecd43d005d6e828426d09f)
 set(EXPAT_HASH 372b18f6527d162fa9658f1c74d22a37429b82d822f5a1e1fc7e00f6045a06a2)
 set(GCC_HASH 7d376d445f93126dc545e2c0086d0f647c3094aae081cdb78f42ce2bc25e7293)
-set(GTEST_HASH 7b42b4d6ed48810c5362c265a17faebe90dc2373c885e5216439d37927f02926)
+set(GTEST_HASH 78c676fc63881529bf97bf9d45948d905a66833fbfa5318ea2cd7478cb98f399)
 set(ICU_HASH a2c443404f00098e9e90acf29dc318e049d2dc78d9ae5f46efb261934a730ce2)
 set(JSON_HASH 0d8ef5af7f9794e3263480193c491549b2ba6cc74bb018906202ada498a79406)
 set(LIBSODIUM_HASH 8e5aeca07a723a27bbecc3beef14b0068d37e7fc0e97f51b3f1c82d2a58005c1)
-set(MINGW_HASH 30e5aad2c48dd318150f79cff47661232c4175876d6b4d6b270961cf2b49a48b)
-set(OPENSSL_HASH e15dda82fe2fe8139dc2ac21a36d4ca01d5313c75f99f46c4e8a27709b7294bf)
+set(MINGW_HASH cc41898aac4b6e8dd5cffd7331b9d9515b912df4420a3a612b5ea2955bbeed2f)
+set(OPENSSL_HASH 002a2d6b30b58bf4bea46c43bdd96365aaf8daa6c428782aa4feee06da197df3)
 set(PKG_CONFIG_HASH 6fc69c01688c9458a57eb9a1664c9aba372ccda420a02bf4429fe610e7e7d591)
-set(PUGIXML_HASH 2f10e276870c64b1db6809050a75e11a897a8d7456c4be5c6b2e35a11168a015)
-set(ROCKSDB_HASH 9b810c81731835fda0d4bbdb51d3199d901fa4395733ab63752d297da84c5a47)
-set(SPDLOG_HASH 9962648c9b4f1a7bbc76fd8d9172555bad1871fdb14ff4f842ef87949682caa5)
-set(SQLITE_HASH 77823cb110929c2bcb0f5d48e4833b5c59a8a6e40cdea3936b99e199dbbe5784)
+set(PUGIXML_HASH 655ade57fa703fb421c2eb9a0113b5064bddb145d415dd1f88c79353d90d511a)
+set(ROCKSDB_HASH fdccab16133c9d927a183c2648bcea8d956fb41eb1df2aacaa73eb0b95e43724)
+set(SPDLOG_HASH 25c843860f039a1600f232c6eb9e01e6627f7d030a2ae5e232bdd3c9205d26cc)
+set(SQLITE_HASH 6cebd1d8403fc58c30e93939b246f3e6e58d0765a5cd50546f16c00fd805d2c3)
 set(STDUUID_HASH b1176597e789531c38481acbbed2a6894ad419aab0979c10410d59eb0ebf40d3)
 set(ZLIB_HASH 17e88863f3600672ab49182f217281b6fc4d3c762bde361935e436a95214d05c)
--- a/cmake/libraries/boost.cmake
+++ b/cmake/libraries/boost.cmake
@ -120,11 +120,11 @@ if(PROJECT_ENABLE_BOOST)
          --with-libraries=atomic,chrono,date_time,filesystem,iostreams,locale,log,program_options,random,regex,serialization,system,test,thread
        BUILD_COMMAND
          ./b2
-          -j1
+          -j$ENV{CMAKE_BUILD_PARALLEL_LEVEL}
          ${BOOST_BUILD_ARGS}
        INSTALL_COMMAND
          ./b2
-          -j1
+          -j$ENV{CMAKE_BUILD_PARALLEL_LEVEL}
          ${BOOST_BUILD_ARGS}
          install
      )
--- a/cmake/libraries/cpp_httplib.cmake
+++ b/cmake/libraries/cpp_httplib.cmake
@ -15,10 +15,13 @@ if(PROJECT_ENABLE_CPP_HTTPLIB)
      CMAKE_ARGS ${PROJECT_EXTERNAL_CMAKE_FLAGS}
        -DBUILD_SHARED_LIBS=${PROJECT_BUILD_SHARED_LIBS}
        -DBUILD_STATIC_LIBS=ON
-        -DHTTPLIB_REQUIRE_OPENSSL=${PROJECT_ENABLE_OPENSSL}
-        -DHTTPLIB_REQUIRE_ZLIB=ON
        -DHTTPLIB_REQUIRE_BROTLI=OFF
+        -DHTTPLIB_REQUIRE_OPENSSL=ON
+        -DHTTPLIB_REQUIRE_ZLIB=ON
        -DHTTPLIB_TEST=OFF
+        -DHTTPLIB_USE_BROTLI_IF_AVAILABLE=OFF
+        -DHTTPLIB_USE_OPENSSL_IF_AVAILABLE=ON
+        -DHTTPLIB_USE_ZLIB_IF_AVAILABLE=ON
        -DOPENSSL_USE_STATIC_LIBS=${OPENSSL_USE_STATIC_LIBS}
    )

--- a/cmake/libraries/curl.cmake
+++ b/cmake/libraries/curl.cmake
@ -18,8 +18,9 @@ if(PROJECT_ENABLE_CURL)
      URL ${PROJECT_3RD_PARTY_DIR}/curl-${CURL_VERSION}.tar.gz
      URL_HASH SHA256=${CURL_HASH}
      LIST_SEPARATOR |
-      CMAKE_ARGS 
-        ${PROJECT_EXTERNAL_CMAKE_FLAGS}
+      BUILD_COMMAND 
+        ${CMAKE_COMMAND} --build . -- -j$ENV{CMAKE_BUILD_PARALLEL_LEVEL}
+      CMAKE_ARGS ${PROJECT_EXTERNAL_CMAKE_FLAGS}
        -DBUILD_CURL_EXE=OFF
        -DBUILD_LIBCURL_DOCS=OFF
        -DBUILD_MISC_DOCS=OFF
@ -28,6 +29,7 @@ if(PROJECT_ENABLE_CURL)
        -DBUILD_STATIC_LIBS=ON
        -DBUILD_STATIC_LIBS=ON
        -DBUILD_TESTING=OFF
+        -DCURL_BROTLI=OFF
        -DCURL_CA_BUNDLE=./cacert.pem
        -DCURL_CA_FALLBACK=ON
        -DCURL_DISABLE_LDAP=ON
--- a/cmake/libraries/rocksdb.cmake
+++ b/cmake/libraries/rocksdb.cmake
@ -9,6 +9,8 @@ if(PROJECT_ENABLE_ROCKSDB)
      URL ${PROJECT_3RD_PARTY_DIR}/rocksdb-${ROCKSDB_VERSION}.tar.gz
      URL_HASH SHA256=${ROCKSDB_HASH}
      LIST_SEPARATOR |
+      BUILD_COMMAND 
+        ${CMAKE_COMMAND} --build . -- -j$ENV{CMAKE_BUILD_PARALLEL_LEVEL}
      CMAKE_ARGS ${PROJECT_EXTERNAL_CMAKE_FLAGS}
        -DBUILD_SHARED_LIBS=OFF
        -DBUILD_STATIC_LIBS=ON
--- a/cmake/libraries/sqlite.cmake
+++ b/cmake/libraries/sqlite.cmake
@ -2,7 +2,7 @@ if(PROJECT_ENABLE_SQLITE)
  if(PROJECT_BUILD)
    add_definitions(-DPROJECT_ENABLE_SQLITE)
    if (PROJECT_IS_MINGW AND NOT PROJECT_IS_MINGW_UNIX)
-      pkg_check_modules(SQLITE3 REQUIRED sqlite3>=${SQLITE2_VERSION})
+      pkg_check_modules(SQLITE3 REQUIRED sqlite3)
      include_directories(SYSTEM BEFORE ${SQLITE3_INCLUDE_DIRS})
      link_libraries(${SQLITE3_LIBRARIES})
    else()
--- a/cmake/versions.cmake
+++ b/cmake/versions.cmake
@ -5,24 +5,24 @@ set(BOOST2_PATCH_VERSION 0)
 set(BOOST_MAJOR_VERSION 1)
 set(BOOST_MINOR_VERSION 87)
 set(BOOST_PATCH_VERSION 0)
-set(CPP_HTTPLIB_VERSION 0.18.1)
-set(CURL2_VERSION 8_11_0)
-set(CURL_VERSION 8.11.0)
+set(CPP_HTTPLIB_VERSION 0.19.0)
+set(CURL2_VERSION 8_12_1)
+set(CURL_VERSION 8.12.1)
 set(EXPAT2_VERSION 2_6_4)
 set(EXPAT_VERSION 2.6.4)
 set(GCC_VERSION 14.2.0)
-set(GTEST_VERSION 1.15.2)
+set(GTEST_VERSION 1.16.0)
 set(ICU_VERSION 76-1)
 set(JSON_VERSION 3.11.3)
 set(LIBSODIUM_VERSION 1.0.20)
 set(MESA_VERSION 23.3.3)
 set(MINGW_VERSION 12.0.0)
-set(OPENSSL_VERSION 3.4.0)
+set(OPENSSL_VERSION 3.4.1)
 set(PKG_CONFIG_VERSION 0.29.2)
-set(PUGIXML_VERSION 1.14)
-set(ROCKSDB_VERSION 9.7.4)
-set(SPDLOG_VERSION 1.15.0)
-set(SQLITE2_VERSION 3.46.1)
-set(SQLITE_VERSION 3460100)
+set(PUGIXML_VERSION 1.15)
+set(ROCKSDB_VERSION 9.10.0)
+set(SPDLOG_VERSION 1.15.1)
+set(SQLITE2_VERSION 3.49.1)
+set(SQLITE_VERSION 3490100)
 set(STDUUID_VERSION 1.2.3)
 set(ZLIB_VERSION 1.3.1)
--- a/config.sh
+++ b/config.sh
@ -10,7 +10,7 @@ PROJECT_DESC="Mount utility for Sia and S3"

 PROJECT_MAJOR_VERSION=2
 PROJECT_MINOR_VERSION=0
-PROJECT_REVISION_VERSION=3
+PROJECT_REVISION_VERSION=5
 PROJECT_RELEASE_NUM=0
 PROJECT_RELEASE_ITER=rc

@ -19,6 +19,8 @@ PROJECT_APP_LIST=(${PROJECT_NAME})
 PROJECT_PRIVATE_KEY=${DEVELOPER_PRIVATE_KEY}
 PROJECT_PUBLIC_KEY=${DEVELOPER_PUBLIC_KEY}

+PROJECT_FLUTTER_BASE_HREF="/ui/"
+
 PROJECT_ENABLE_WIN32_LONG_PATH_NAMES=OFF

 PROJECT_ENABLE_BACKWARD_CPP=OFF
--- a/docker/aarch64/alpine
+++ b/docker/aarch64/alpine
@ -1,4 +1,5 @@
-FROM         arm64v8/alpine:3.21.0
+#comment
+FROM         arm64v8/alpine:3.21.3
 MAINTAINER   Scott E. Graves <scott.e.graves@protonmail.com>
 CMD          bash

@ -30,6 +31,7 @@ RUN apk add \
  gflags \
  gflags-dev \
  git \
+  git-lfs \
  icu-dev \
  icu-libs \
  icu-static \
--- a/docker/x86_64/alpine
+++ b/docker/x86_64/alpine
@ -1,4 +1,5 @@
-FROM         alpine:3.21.0
+#comment
+FROM         alpine:3.21.3
 MAINTAINER   Scott E. Graves <scott.e.graves@protonmail.com>
 CMD          bash

@ -30,6 +31,7 @@ RUN apk add \
  gflags \
  gflags-dev \
  git \
+  git-lfs \
  icu-dev \
  icu-libs \
  icu-static \
--- a/docker/x86_64/flutter
+++ b/docker/x86_64/flutter
@ -0,0 +1,48 @@
+FROM debian:latest
+
+ARG UID=0
+ARG GID=0
+
+RUN apt-get update 
+RUN apt-get install -y \
+  bash \
+  curl \
+  fonts-droid-fallback \
+  gdb \
+  git \
+  lib32stdc++6 \
+  libgconf-2-4 \
+  libglu1-mesa \
+  libstdc++6 \
+  python3 \
+  unzip \
+  wget
+RUN apt-get clean
+
+RUN git clone https://github.com/flutter/flutter.git /flutter
+RUN git config --system --add safe.directory /flutter
+
+ENV PATH="/flutter/bin:/flutter/bin/cache/dart-sdk/bin:${PATH}"
+
+RUN flutter doctor -v
+RUN flutter channel master
+RUN flutter upgrade
+RUN flutter --disable-analytics
+
+RUN flutter config --no-analytics
+RUN flutter config --enable-web
+RUN flutter config --no-cli-animations
+
+RUN mkdir /nonexistent
+RUN chown -R $UID:$GID /nonexistent
+
+RUN mkdir /.config
+RUN chown -R $UID:$GID /.config
+
+RUN mkdir /.dart-tool
+RUN chown -R $UID:$GID /.dart-tool
+
+RUN mkdir /.pub-cache
+RUN chown -R $UID:$GID /.pub-cache
+
+RUN chown -R $UID:$GID /flutter
--- a/docker/x86_64/mingw64
+++ b/docker/x86_64/mingw64
@ -1,5 +1,5 @@
 #comment
-FROM alpine:3.21.0
+FROM alpine:3.21.3

 RUN apk update
 RUN apk upgrade
@ -18,6 +18,7 @@ RUN apk add \
  gcc \
  gettext \
  git \
+  git-lfs \
  gmp \
  gmp-dev \
  gperf \
@ -679,6 +680,7 @@ RUN if [ -f "/3rd_party/curl-${MY_CURL_VERSION}.tar.gz" ]; then \
        -DCMAKE_CXX_STANDARD=${MY_CXX_STANDARD} \
        -DCMAKE_INSTALL_PREFIX=${MY_MINGW_DIR} \
        -DCMAKE_TOOLCHAIN_FILE=${MY_TOOLCHAIN_FILE_CMAKE} \
+        -DCURL_BROTLI=OFF \
        -DCURL_CA_BUNDLE=./cacert.pem \
        -DCURL_CA_FALLBACK=ON \
        -DCURL_DISABLE_LDAP=ON \
@ -714,6 +716,9 @@ RUN if [ -f "/3rd_party/cpp-httplib-${MY_CPP_HTTPLIB_VERSION}.tar.gz" ]; then \
        -DHTTPLIB_REQUIRE_OPENSSL=ON \
        -DHTTPLIB_REQUIRE_ZLIB=ON \
        -DHTTPLIB_TEST=OFF \
+        -DHTTPLIB_USE_BROTLI_IF_AVAILABLE=OFF \
+        -DHTTPLIB_USE_OPENSSL_IF_AVAILABLE=YES \
+        -DHTTPLIB_USE_ZLIB_IF_AVAILABLE=ON \
      && make -j${MY_NUM_JOBS} \
      && make install \
      && cd ${MY_WORKDIR} \
--- a/repertory/librepertory/include/app_config.hpp
+++ b/repertory/librepertory/include/app_config.hpp
@ -31,26 +31,27 @@ private:
  static stop_type stop_requested;

 public:
-  [[nodiscard]] static auto
-  default_agent_name(const provider_type &prov) -> std::string;
+  [[nodiscard]] static auto default_agent_name(const provider_type &prov)
+      -> std::string;

-  [[nodiscard]] static auto
-  default_api_port(const provider_type &prov) -> std::uint16_t;
+  [[nodiscard]] static auto default_api_port(const provider_type &prov)
+      -> std::uint16_t;

-  [[nodiscard]] static auto
-  default_data_directory(const provider_type &prov) -> std::string;
+  [[nodiscard]] static auto default_data_directory(const provider_type &prov)
+      -> std::string;

-  [[nodiscard]] static auto
-  default_remote_api_port(const provider_type &prov) -> std::uint16_t;
+  [[nodiscard]] static auto default_remote_api_port(const provider_type &prov)
+      -> std::uint16_t;

-  [[nodiscard]] static auto
-  default_rpc_port(const provider_type &prov) -> std::uint16_t;
+  [[nodiscard]] static auto default_rpc_port() -> std::uint16_t;

-  [[nodiscard]] static auto
-  get_provider_display_name(const provider_type &prov) -> std::string;
+  [[nodiscard]] static auto get_provider_display_name(const provider_type &prov)
+      -> std::string;

-  [[nodiscard]] static auto
-  get_provider_name(const provider_type &prov) -> std::string;
+  [[nodiscard]] static auto get_provider_name(const provider_type &prov)
+      -> std::string;
+
+  [[nodiscard]] static auto get_root_data_directory() -> std::string;

 public:
  [[nodiscard]] static auto get_stop_requested() -> bool;
@ -71,7 +72,7 @@ public:

 private:
  provider_type prov_;
-  atomic<std::string> api_auth_;
+  atomic<std::string> api_password_;
  std::atomic<std::uint16_t> api_port_;
  atomic<std::string> api_user_;
  std::atomic<bool> config_changed_;
@ -91,7 +92,6 @@ private:
  std::atomic<std::uint8_t> max_upload_count_;
  std::atomic<std::uint16_t> med_freq_interval_secs_;
  std::atomic<std::uint16_t> online_check_retry_secs_;
-  std::atomic<std::uint16_t> orphaned_file_retention_days_;
  std::atomic<download_type> preferred_download_type_;
  std::atomic<std::uint16_t> retry_read_count_;
  std::atomic<std::uint16_t> ring_buffer_file_size_;
@ -122,7 +122,7 @@ private:
  auto set_value(dest &dst, const source &src) -> bool;

 public:
-  [[nodiscard]] auto get_api_auth() const -> std::string;
+  [[nodiscard]] auto get_api_password() const -> std::string;

  [[nodiscard]] auto get_api_port() const -> std::uint16_t;

@ -172,8 +172,6 @@ public:

  [[nodiscard]] auto get_online_check_retry_secs() const -> std::uint16_t;

-  [[nodiscard]] auto get_orphaned_file_retention_days() const -> std::uint16_t;
-
  [[nodiscard]] auto get_preferred_download_type() const -> download_type;

  [[nodiscard]] auto get_provider_type() const -> provider_type;
@ -192,14 +190,17 @@ public:

  [[nodiscard]] auto get_task_wait_ms() const -> std::uint16_t;

-  [[nodiscard]] auto
-  get_value_by_name(const std::string &name) const -> std::string;
+  [[nodiscard]] auto get_value_by_name(const std::string &name) const
+      -> std::string;
+
+  [[nodiscard]] auto get_raw_value_by_name(const std::string &name) const
+      -> std::string;

  [[nodiscard]] auto get_version() const -> std::uint64_t;

  void save();

-  void set_api_auth(const std::string &value);
+  void set_api_password(const std::string &value);

  void set_api_port(std::uint16_t value);

@ -239,8 +240,6 @@ public:

  void set_online_check_retry_secs(std::uint16_t value);

-  void set_orphaned_file_retention_days(std::uint16_t value);
-
  void set_preferred_download_type(const download_type &value);

  void set_remote_config(remote::remote_config value);
--- a/repertory/librepertory/include/common.hpp
+++ b/repertory/librepertory/include/common.hpp
@ -57,7 +57,7 @@ using json = nlohmann::json;
 inline constexpr const std::string_view REPERTORY = "repertory";
 inline constexpr const std::wstring_view REPERTORY_W = L"repertory";

-inline constexpr const std::uint64_t REPERTORY_CONFIG_VERSION = 0ULL;
+inline constexpr const std::uint64_t REPERTORY_CONFIG_VERSION = 2ULL;
 inline constexpr const std::string_view REPERTORY_DATA_NAME = "repertory2";
 inline constexpr const std::string_view REPERTORY_MIN_REMOTE_VERSION = "2.0.0";

@ -221,44 +221,25 @@ using WCHAR = wchar_t;

 #define MAX_PATH 260

-#define STATUS_SUCCESS                                                         \
-  std::uint32_t { 0U }
-#define STATUS_ACCESS_DENIED                                                   \
-  std::uint32_t { 0xC0000022L }
-#define STATUS_DEVICE_BUSY                                                     \
-  std::uint32_t { 0x80000011L }
-#define STATUS_DEVICE_INSUFFICIENT_RESOURCES                                   \
-  std::uint32_t { 0xC0000468L }
-#define STATUS_DIRECTORY_NOT_EMPTY                                             \
-  std::uint32_t { 0xC0000101L }
-#define STATUS_FILE_IS_A_DIRECTORY                                             \
-  std::uint32_t { 0xC00000BAL }
-#define STATUS_FILE_TOO_LARGE                                                  \
-  std::uint32_t { 0xC0000904L }
-#define STATUS_INSUFFICIENT_RESOURCES                                          \
-  std::uint32_t { 0xC000009AL }
-#define STATUS_INTERNAL_ERROR                                                  \
-  std::uint32_t { 0xC00000E5L }
-#define STATUS_INVALID_ADDRESS                                                 \
-  std::uint32_t { 0xC0000141L }
-#define STATUS_INVALID_HANDLE                                                  \
-  std::uint32_t { 0xC0000006L }
-#define STATUS_INVALID_IMAGE_FORMAT                                            \
-  std::uint32_t { 0xC000007BL }
-#define STATUS_INVALID_PARAMETER                                               \
-  std::uint32_t { 0xC000000DL }
-#define STATUS_NO_MEMORY                                                       \
-  std::uint32_t { 0xC0000017L }
-#define STATUS_NOT_IMPLEMENTED                                                 \
-  std::uint32_t { 0xC0000002L }
-#define STATUS_OBJECT_NAME_EXISTS                                              \
-  std::uint32_t { 0x40000000L }
-#define STATUS_OBJECT_NAME_NOT_FOUND                                           \
-  std::uint32_t { 0xC0000034L }
-#define STATUS_OBJECT_PATH_INVALID                                             \
-  std::uint32_t { 0xC0000039L }
-#define STATUS_UNEXPECTED_IO_ERROR                                             \
-  std::uint32_t { 0xC00000E9L }
+#define STATUS_SUCCESS std::uint32_t{0U}
+#define STATUS_ACCESS_DENIED std::uint32_t{0xC0000022L}
+#define STATUS_DEVICE_BUSY std::uint32_t{0x80000011L}
+#define STATUS_DEVICE_INSUFFICIENT_RESOURCES std::uint32_t{0xC0000468L}
+#define STATUS_DIRECTORY_NOT_EMPTY std::uint32_t{0xC0000101L}
+#define STATUS_FILE_IS_A_DIRECTORY std::uint32_t{0xC00000BAL}
+#define STATUS_FILE_TOO_LARGE std::uint32_t{0xC0000904L}
+#define STATUS_INSUFFICIENT_RESOURCES std::uint32_t{0xC000009AL}
+#define STATUS_INTERNAL_ERROR std::uint32_t{0xC00000E5L}
+#define STATUS_INVALID_ADDRESS std::uint32_t{0xC0000141L}
+#define STATUS_INVALID_HANDLE std::uint32_t{0xC0000006L}
+#define STATUS_INVALID_IMAGE_FORMAT std::uint32_t{0xC000007BL}
+#define STATUS_INVALID_PARAMETER std::uint32_t{0xC000000DL}
+#define STATUS_NO_MEMORY std::uint32_t{0xC0000017L}
+#define STATUS_NOT_IMPLEMENTED std::uint32_t{0xC0000002L}
+#define STATUS_OBJECT_NAME_EXISTS std::uint32_t{0x40000000L}
+#define STATUS_OBJECT_NAME_NOT_FOUND std::uint32_t{0xC0000034L}
+#define STATUS_OBJECT_PATH_INVALID std::uint32_t{0xC0000039L}
+#define STATUS_UNEXPECTED_IO_ERROR std::uint32_t{0xC00000E9L}

 #define CONVERT_STATUS_NOT_IMPLEMENTED(e)                                      \
  ((std::uint32_t(e) == STATUS_NOT_IMPLEMENTED) ? -ENOTSUP : e)
--- a/repertory/librepertory/include/drives/winfsp/remotewinfsp/remote_client.hpp
+++ b/repertory/librepertory/include/drives/winfsp/remotewinfsp/remote_client.hpp
@ -26,6 +26,7 @@
 #include "comm/packet/packet_client.hpp"
 #include "drives/remote/remote_open_file_table.hpp"
 #include "drives/winfsp/remotewinfsp/i_remote_instance.hpp"
+#include "types/remote.hpp"

 namespace repertory {
 class app_config;
--- a/repertory/librepertory/include/events/consumers/console_consumer.hpp
+++ b/repertory/librepertory/include/events/consumers/console_consumer.hpp
@ -37,7 +37,7 @@ public:
  ~console_consumer();

 private:
-  static void process_event2(const i_event &evt);
+  static void process_event(const i_event &evt);
 };
 } // namespace repertory

--- a/repertory/librepertory/include/events/consumers/logging_consumer.hpp
+++ b/repertory/librepertory/include/events/consumers/logging_consumer.hpp
@ -40,7 +40,7 @@ private:
                                                         5ULL};

 private:
-  static void process_event2(const i_event &evt);
+  static void process_event(const i_event &evt);
 };
 } // namespace repertory

--- a/repertory/librepertory/include/events/event_system.hpp
+++ b/repertory/librepertory/include/events/event_system.hpp
@ -127,14 +127,10 @@ private:                                                                       \

 #define E_CONSUMER_RELEASE() event_consumers_.clear()

-#define E_SUBSCRIBE(name, callback)                                            \
+#define E_SUBSCRIBE(event, callback)                                           \
  event_consumers_.emplace_back(std::make_shared<repertory::event_consumer>(   \
-      #name, [this](const i_event &evt) { callback(evt); }))
-
-#define E_SUBSCRIBE_EXACT(name, callback)                                      \
-  event_consumers_.emplace_back(std::make_shared<repertory::event_consumer>(   \
-      #name, [this](const i_event &evt) {                                      \
-        callback(dynamic_cast<const name &>(evt));                             \
+      event::name, [this](const i_event &evt) {                                \
+        callback(dynamic_cast<const event &>(evt));                            \
      }))

 #define E_SUBSCRIBE_ALL(callback)                                              \
--- a/repertory/librepertory/include/events/events.hpp
+++ b/repertory/librepertory/include/events/events.hpp
@ -1,120 +0,0 @@
-/*
-  Copyright <2018-2025> <scott.e.graves@protonmail.com>
-
-  Permission is hereby granted, free of charge, to any person obtaining a copy
-  of this software and associated documentation files (the "Software"), to deal
-  in the Software without restriction, including without limitation the rights
-  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-  copies of the Software, and to permit persons to whom the Software is
-  furnished to do so, subject to the following conditions:
-
-  The above copyright notice and this permission notice shall be included in all
-  copies or substantial portions of the Software.
-
-  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-  SOFTWARE.
-*/
-#ifndef REPERTORY_INCLUDE_EVENTS_EVENTS_HPP_
-#define REPERTORY_INCLUDE_EVENTS_EVENTS_HPP_
-#if 0
-
-#include "types/repertory.hpp"
-
-namespace repertory {
-// clang-format off
-E_SIMPLE2(download_restored, info,
-  std::string, api_path, ap, E_FROM_STRING,
-  std::string, dest_path, dest, E_FROM_STRING
-);
-
-E_SIMPLE3(download_restore_failed, error,
-  std::string, api_path, ap, E_FROM_STRING,
-  std::string, dest_path, dest, E_FROM_STRING,
-  std::string, error, err, E_FROM_STRING
-);
-
-E_SIMPLE3(download_resume_add_failed, error,
-  std::string, api_path, ap, E_FROM_STRING,
-  std::string, dest_path, dest, E_FROM_STRING,
-  std::string, error, err, E_FROM_STRING
-);
-
-E_SIMPLE2(download_resume_added, debug,
-  std::string, api_path, ap, E_FROM_STRING,
-  std::string, dest_path, dest, E_FROM_STRING
-);
-
-E_SIMPLE2(download_resume_removed, debug,
-  std::string, api_path, ap, E_FROM_STRING,
-  std::string, dest_path, dest, E_FROM_STRING
-);
-
-E_SIMPLE3(download_type_selected, debug,
-  std::string, api_path, ap, E_FROM_STRING,
-  std::string, source, src, E_FROM_STRING,
-  download_type, download_type, type, E_FROM_DOWNLOAD_TYPE
-);
-
-E_SIMPLE1(item_timeout, trace,
-  std::string, api_path, ap, E_FROM_STRING
-);
-
-E_SIMPLE2(invalid_cache_size, warn,
-  std::uint64_t, cache_size, sz, E_FROM_UINT64,
-  std::uint64_t, by, by, E_FROM_UINT64 
-);
-
-E_SIMPLE2(max_cache_size_reached, warn,
-  std::uint64_t, cache_size, sz, E_FROM_UINT64,
-  std::uint64_t, max_cache_size, max, E_FROM_UINT64 
-);
-
-E_SIMPLE2(packet_client_timeout, error,
-  std::string, event_name, en, E_FROM_STRING,
-  std::string, message, msg, E_FROM_STRING
-);
-
-//FUSE
-E_SIMPLE3(fuse_event, debug,
-  std::string, function, func, E_FROM_STRING,
-  std::string, api_path, ap, E_FROM_STRING,
-  int, result, res, E_FROM_INT32
-);
-
-E_SIMPLE1(fuse_args_parsed, info,
-  std::string, arguments, args, E_FROM_STRING
-);
-
-E_SIMPLE3(remote_fuse_server_event, debug,
-  std::string, function, func, E_FROM_STRING,
-  std::string, api_path, ap, E_FROM_STRING,
-  packet::error_type, result, res, E_FROM_INT32
-);
-
-//WINFSP
-E_SIMPLE3(winfsp_event, debug,
-  std::string, function, func, E_FROM_STRING,
-  std::string, api_path, ap, E_FROM_STRING,
-  NTSTATUS, result, res, E_FROM_INT32
-);
-E_SIMPLE(drive_stop_timed_out, info);
-E_SIMPLE3(remote_winfsp_client_event, debug,
-  std::string, function, func, E_FROM_STRING,
-  std::string, api_path, ap, E_FROM_STRING,
-  packet::error_type, result, res, E_FROM_INT32
-);
-E_SIMPLE3(remote_winfsp_server_event, debug,
-  std::string, function, FUNC, E_FROM_STRING,
-  std::string, api_path, AP, E_FROM_STRING,
-  packet::error_type, result, RES, E_FROM_INT32
-);
-// clang-format on
-} // namespace repertory
-
-#endif // 0
-#endif // REPERTORY_INCLUDE_EVENTS_EVENTS_HPP_
--- a/repertory/librepertory/include/events/types/curl_error.hpp
+++ b/repertory/librepertory/include/events/types/curl_error.hpp
@ -33,6 +33,7 @@ struct curl_error final : public i_event {
        function_name(std::string{function_name_}),
        url(std::move(url_)) {}

+  static constexpr const event_level level{event_level::error};
  static constexpr const std::string_view name{"curl_error"};

  CURLcode code{};
@ -40,7 +41,7 @@ struct curl_error final : public i_event {
  std::string url;

  [[nodiscard]] auto get_event_level() const -> event_level override {
-    return event_level::error;
+    return level;
  }

  [[nodiscard]] auto get_name() const -> std::string_view override {
--- a/repertory/librepertory/include/events/types/debug_log.hpp
+++ b/repertory/librepertory/include/events/types/debug_log.hpp
@ -31,13 +31,14 @@ struct debug_log final : public i_event {
  debug_log(std::string_view function_name_, std::string msg_)
      : function_name(std::string(function_name_)), msg(std::move(msg_)) {}

+  static constexpr const event_level level{event_level::debug};
  static constexpr const std::string_view name{"debug_log"};

  std::string function_name;
  std::string msg;

  [[nodiscard]] auto get_event_level() const -> event_level override {
-    return event_level::debug;
+    return level;
  }

  [[nodiscard]] auto get_name() const -> std::string_view override {
--- a/repertory/librepertory/include/events/types/directory_remove_failed.hpp
+++ b/repertory/librepertory/include/events/types/directory_remove_failed.hpp
@ -34,6 +34,7 @@ struct directory_remove_failed final : public i_event {
        error(error_),
        function_name(std::string(function_name_)) {}

+  static constexpr const event_level level{event_level::error};
  static constexpr const std::string_view name{"directory_remove_failed"};

  std::string api_path;
@ -41,7 +42,7 @@ struct directory_remove_failed final : public i_event {
  std::string function_name;

  [[nodiscard]] auto get_event_level() const -> event_level override {
-    return event_level::error;
+    return level;
  }

  [[nodiscard]] auto get_name() const -> std::string_view override {
--- a/repertory/librepertory/include/events/types/directory_removed.hpp
+++ b/repertory/librepertory/include/events/types/directory_removed.hpp
@ -32,13 +32,14 @@ struct directory_removed final : public i_event {
      : api_path(std::move(api_path_)),
        function_name(std::string(function_name_)) {}

+  static constexpr const event_level level{event_level::debug};
  static constexpr const std::string_view name{"directory_removed"};

  std::string api_path;
  std::string function_name;

  [[nodiscard]] auto get_event_level() const -> event_level override {
-    return event_level::debug;
+    return level;
  }

  [[nodiscard]] auto get_name() const -> std::string_view override {
--- a/repertory/librepertory/include/events/types/directory_removed_externally.hpp
+++ b/repertory/librepertory/include/events/types/directory_removed_externally.hpp
@ -35,6 +35,7 @@ struct directory_removed_externally final : public i_event {
        function_name(std::string(function_name_)),
        source_path(std::move(source_path_)) {}

+  static constexpr const event_level level{event_level::warn};
  static constexpr const std::string_view name{"directory_removed_externally"};

  std::string api_path;
@ -42,7 +43,7 @@ struct directory_removed_externally final : public i_event {
  std::string source_path;

  [[nodiscard]] auto get_event_level() const -> event_level override {
-    return event_level::warn;
+    return level;
  }

  [[nodiscard]] auto get_name() const -> std::string_view override {
--- a/repertory/librepertory/include/events/types/download_begin.hpp
+++ b/repertory/librepertory/include/events/types/download_begin.hpp
@ -34,6 +34,7 @@ struct download_begin final : public i_event {
        dest_path(std::move(dest_path_)),
        function_name(std::string(function_name_)) {}

+  static constexpr const event_level level{event_level::info};
  static constexpr const std::string_view name{"download_begin"};

  std::string api_path;
@ -41,7 +42,7 @@ struct download_begin final : public i_event {
  std::string function_name;

  [[nodiscard]] auto get_event_level() const -> event_level override {
-    return event_level::info;
+    return level;
  }

  [[nodiscard]] auto get_name() const -> std::string_view override {
--- a/repertory/librepertory/include/events/types/download_end.hpp
+++ b/repertory/librepertory/include/events/types/download_end.hpp
@ -35,6 +35,7 @@ struct download_end final : public i_event {
        error(error_),
        function_name(std::string(function_name_)) {}

+  static constexpr const event_level level{event_level::info};
  static constexpr const std::string_view name{"download_end"};

  std::string api_path;
@ -43,7 +44,7 @@ struct download_end final : public i_event {
  std::string function_name;

  [[nodiscard]] auto get_event_level() const -> event_level override {
-    return event_level::info;
+    return level;
  }

  [[nodiscard]] auto get_name() const -> std::string_view override {
--- a/repertory/librepertory/include/events/types/download_progress.hpp
+++ b/repertory/librepertory/include/events/types/download_progress.hpp
@ -35,6 +35,7 @@ struct download_progress final : public i_event {
        function_name(std::string(function_name_)),
        progress(progress_) {}

+  static constexpr const event_level level{event_level::info};
  static constexpr const std::string_view name{"download_progress"};

  std::string api_path;
@ -43,7 +44,7 @@ struct download_progress final : public i_event {
  double progress{};

  [[nodiscard]] auto get_event_level() const -> event_level override {
-    return event_level::info;
+    return level;
  }

  [[nodiscard]] auto get_name() const -> std::string_view override {
--- a/repertory/librepertory/include/events/types/download_restore_failed.hpp
+++ b/repertory/librepertory/include/events/types/download_restore_failed.hpp
@ -0,0 +1,81 @@
+/*
+  Copyright <2018-2025> <scott.e.graves@protonmail.com>
+
+  Permission is hereby granted, free of charge, to any person obtaining a copy
+  of this software and associated documentation files (the "Software"), to deal
+  in the Software without restriction, including without limitation the rights
+  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+  copies of the Software, and to permit persons to whom the Software is
+  furnished to do so, subject to the following conditions:
+
+  The above copyright notice and this permission notice shall be included in all
+  copies or substantial portions of the Software.
+
+  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+  SOFTWARE.
+*/
+#ifndef REPERTORY_INCLUDE_EVENTS_TYPES_DOWNLOAD_RESTORE_FAILED_HPP_
+#define REPERTORY_INCLUDE_EVENTS_TYPES_DOWNLOAD_RESTORE_FAILED_HPP_
+
+#include "events/i_event.hpp"
+#include "types/repertory.hpp"
+
+namespace repertory {
+struct download_restore_failed final : public i_event {
+  download_restore_failed() = default;
+  download_restore_failed(std::string api_path_, std::string dest_path_,
+                          std::string error_, std::string_view function_name_)
+      : api_path(std::move(api_path_)),
+        dest_path(std::move(dest_path_)),
+        error(std::move(error_)),
+        function_name(std::string(function_name_)) {}
+
+  static constexpr const event_level level{event_level::error};
+  static constexpr const std::string_view name{"download_restore_failed"};
+
+  std::string api_path;
+  std::string dest_path;
+  std::string error;
+  std::string function_name;
+
+  [[nodiscard]] auto get_event_level() const -> event_level override {
+    return level;
+  }
+
+  [[nodiscard]] auto get_name() const -> std::string_view override {
+    return name;
+  }
+
+  [[nodiscard]] auto get_single_line() const -> std::string override {
+    return fmt::format("{}|func|{}|ap|{}|dp|{}|error|{}", name, function_name,
+                       api_path, dest_path, error);
+  }
+};
+} // namespace repertory
+
+NLOHMANN_JSON_NAMESPACE_BEGIN
+template <> struct adl_serializer<repertory::download_restore_failed> {
+  static void to_json(json &data,
+                      const repertory::download_restore_failed &value) {
+    data["api_path"] = value.api_path;
+    data["dest_path"] = value.dest_path;
+    data["error"] = value.error;
+    data["function_name"] = value.function_name;
+  }
+
+  static void from_json(const json &data,
+                        repertory::download_restore_failed &value) {
+    data.at("api_path").get_to<std::string>(value.api_path);
+    data.at("dest_path").get_to<std::string>(value.dest_path);
+    data.at("error").get_to<std::string>(value.error);
+    data.at("function_name").get_to<std::string>(value.function_name);
+  }
+};
+NLOHMANN_JSON_NAMESPACE_END
+
+#endif // REPERTORY_INCLUDE_EVENTS_TYPES_DOWNLOAD_RESTORE_FAILED_HPP_
--- a/repertory/librepertory/include/events/types/download_restored.hpp
+++ b/repertory/librepertory/include/events/types/download_restored.hpp
@ -0,0 +1,75 @@
+/*
+  Copyright <2018-2025> <scott.e.graves@protonmail.com>
+
+  Permission is hereby granted, free of charge, to any person obtaining a copy
+  of this software and associated documentation files (the "Software"), to deal
+  in the Software without restriction, including without limitation the rights
+  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+  copies of the Software, and to permit persons to whom the Software is
+  furnished to do so, subject to the following conditions:
+
+  The above copyright notice and this permission notice shall be included in all
+  copies or substantial portions of the Software.
+
+  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+  SOFTWARE.
+*/
+#ifndef REPERTORY_INCLUDE_EVENTS_TYPES_DOWNLOAD_RESTORED_HPP_
+#define REPERTORY_INCLUDE_EVENTS_TYPES_DOWNLOAD_RESTORED_HPP_
+
+#include "events/i_event.hpp"
+#include "types/repertory.hpp"
+
+namespace repertory {
+struct download_restored final : public i_event {
+  download_restored() = default;
+  download_restored(std::string api_path_, std::string dest_path_,
+                    std::string_view function_name_)
+      : api_path(std::move(api_path_)),
+        dest_path(std::move(dest_path_)),
+        function_name(std::string(function_name_)) {}
+
+  static constexpr const event_level level{event_level::info};
+  static constexpr const std::string_view name{"download_restored"};
+
+  std::string api_path;
+  std::string dest_path;
+  std::string function_name;
+
+  [[nodiscard]] auto get_event_level() const -> event_level override {
+    return level;
+  }
+
+  [[nodiscard]] auto get_name() const -> std::string_view override {
+    return name;
+  }
+
+  [[nodiscard]] auto get_single_line() const -> std::string override {
+    return fmt::format("{}|func|{}|ap|{}|dp|{}", name, function_name, api_path,
+                       dest_path);
+  }
+};
+} // namespace repertory
+
+NLOHMANN_JSON_NAMESPACE_BEGIN
+template <> struct adl_serializer<repertory::download_restored> {
+  static void to_json(json &data, const repertory::download_restored &value) {
+    data["api_path"] = value.api_path;
+    data["dest_path"] = value.dest_path;
+    data["function_name"] = value.function_name;
+  }
+
+  static void from_json(const json &data, repertory::download_restored &value) {
+    data.at("api_path").get_to<std::string>(value.api_path);
+    data.at("dest_path").get_to<std::string>(value.dest_path);
+    data.at("function_name").get_to<std::string>(value.function_name);
+  }
+};
+NLOHMANN_JSON_NAMESPACE_END
+
+#endif // REPERTORY_INCLUDE_EVENTS_TYPES_DOWNLOAD_RESTORED_HPP_
--- a/repertory/librepertory/include/events/types/download_resume_add_failed.hpp
+++ b/repertory/librepertory/include/events/types/download_resume_add_failed.hpp
@ -0,0 +1,82 @@
+/*
+  Copyright <2018-2025> <scott.e.graves@protonmail.com>
+
+  Permission is hereby granted, free of charge, to any person obtaining a copy
+  of this software and associated documentation files (the "Software"), to deal
+  in the Software without restriction, including without limitation the rights
+  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+  copies of the Software, and to permit persons to whom the Software is
+  furnished to do so, subject to the following conditions:
+
+  The above copyright notice and this permission notice shall be included in all
+  copies or substantial portions of the Software.
+
+  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+  SOFTWARE.
+*/
+#ifndef REPERTORY_INCLUDE_EVENTS_TYPES_DOWNLOAD_RESUME_ADD_FAILED_HPP_
+#define REPERTORY_INCLUDE_EVENTS_TYPES_DOWNLOAD_RESUME_ADD_FAILED_HPP_
+
+#include "events/i_event.hpp"
+#include "types/repertory.hpp"
+
+namespace repertory {
+struct download_resume_add_failed final : public i_event {
+  download_resume_add_failed() = default;
+  download_resume_add_failed(std::string api_path_, std::string dest_path_,
+                             std::string error_,
+                             std::string_view function_name_)
+      : api_path(std::move(api_path_)),
+        dest_path(std::move(dest_path_)),
+        error(std::move(error_)),
+        function_name(std::string(function_name_)) {}
+
+  static constexpr const event_level level{event_level::error};
+  static constexpr const std::string_view name{"download_resume_add_failed"};
+
+  std::string api_path;
+  std::string dest_path;
+  std::string error;
+  std::string function_name;
+
+  [[nodiscard]] auto get_event_level() const -> event_level override {
+    return level;
+  }
+
+  [[nodiscard]] auto get_name() const -> std::string_view override {
+    return name;
+  }
+
+  [[nodiscard]] auto get_single_line() const -> std::string override {
+    return fmt::format("{}|func|{}|ap|{}|dp|{}|error|{}", name, function_name,
+                       api_path, dest_path, error);
+  }
+};
+} // namespace repertory
+
+NLOHMANN_JSON_NAMESPACE_BEGIN
+template <> struct adl_serializer<repertory::download_resume_add_failed> {
+  static void to_json(json &data,
+                      const repertory::download_resume_add_failed &value) {
+    data["api_path"] = value.api_path;
+    data["dest_path"] = value.dest_path;
+    data["error"] = value.error;
+    data["function_name"] = value.function_name;
+  }
+
+  static void from_json(const json &data,
+                        repertory::download_resume_add_failed &value) {
+    data.at("api_path").get_to<std::string>(value.api_path);
+    data.at("dest_path").get_to<std::string>(value.dest_path);
+    data.at("error").get_to<std::string>(value.error);
+    data.at("function_name").get_to<std::string>(value.function_name);
+  }
+};
+NLOHMANN_JSON_NAMESPACE_END
+
+#endif // REPERTORY_INCLUDE_EVENTS_TYPES_DOWNLOAD_RESUME_ADD_FAILED_HPP_
--- a/repertory/librepertory/include/events/types/download_resume_added.hpp
+++ b/repertory/librepertory/include/events/types/download_resume_added.hpp
@ -0,0 +1,77 @@
+/*
+  Copyright <2018-2025> <scott.e.graves@protonmail.com>
+
+  Permission is hereby granted, free of charge, to any person obtaining a copy
+  of this software and associated documentation files (the "Software"), to deal
+  in the Software without restriction, including without limitation the rights
+  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+  copies of the Software, and to permit persons to whom the Software is
+  furnished to do so, subject to the following conditions:
+
+  The above copyright notice and this permission notice shall be included in all
+  copies or substantial portions of the Software.
+
+  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+  SOFTWARE.
+*/
+#ifndef REPERTORY_INCLUDE_EVENTS_TYPES_DOWNLOAD_RESUME_ADDED_HPP_
+#define REPERTORY_INCLUDE_EVENTS_TYPES_DOWNLOAD_RESUME_ADDED_HPP_
+
+#include "events/i_event.hpp"
+#include "types/repertory.hpp"
+
+namespace repertory {
+struct download_resume_added final : public i_event {
+  download_resume_added() = default;
+  download_resume_added(std::string api_path_, std::string dest_path_,
+                        std::string_view function_name_)
+      : api_path(std::move(api_path_)),
+        dest_path(std::move(dest_path_)),
+        function_name(std::string(function_name_)) {}
+
+  static constexpr const event_level level{event_level::debug};
+  static constexpr const std::string_view name{"download_resume_added"};
+
+  std::string api_path;
+  std::string dest_path;
+  std::string function_name;
+
+  [[nodiscard]] auto get_event_level() const -> event_level override {
+    return level;
+  }
+
+  [[nodiscard]] auto get_name() const -> std::string_view override {
+    return name;
+  }
+
+  [[nodiscard]] auto get_single_line() const -> std::string override {
+    return fmt::format("{}|func|{}|ap|{}|dp|{}", name, function_name, api_path,
+                       dest_path);
+  }
+};
+} // namespace repertory
+
+NLOHMANN_JSON_NAMESPACE_BEGIN
+template <> struct adl_serializer<repertory::download_resume_added> {
+  static void to_json(json &data,
+                      const repertory::download_resume_added &value) {
+    data["api_path"] = value.api_path;
+    data["dest_path"] = value.dest_path;
+    data["function_name"] = value.function_name;
+  }
+
+  static void from_json(const json &data,
+                        repertory::download_resume_added &value) {
+    data.at("api_path").get_to<std::string>(value.api_path);
+    data.at("dest_path").get_to<std::string>(value.dest_path);
+    data.at("function_name").get_to<std::string>(value.function_name);
+  }
+};
+NLOHMANN_JSON_NAMESPACE_END
+
+#endif // REPERTORY_INCLUDE_EVENTS_TYPES_DOWNLOAD_RESUME_ADDED_HPP_
--- a/repertory/librepertory/include/events/types/download_resume_removed.hpp
+++ b/repertory/librepertory/include/events/types/download_resume_removed.hpp
@ -0,0 +1,77 @@
+/*
+  Copyright <2018-2025> <scott.e.graves@protonmail.com>
+
+  Permission is hereby granted, free of charge, to any person obtaining a copy
+  of this software and associated documentation files (the "Software"), to deal
+  in the Software without restriction, including without limitation the rights
+  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+  copies of the Software, and to permit persons to whom the Software is
+  furnished to do so, subject to the following conditions:
+
+  The above copyright notice and this permission notice shall be included in all
+  copies or substantial portions of the Software.
+
+  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+  SOFTWARE.
+*/
+#ifndef REPERTORY_INCLUDE_EVENTS_TYPES_DOWNLOAD_RESUME_REMOVED_HPP_
+#define REPERTORY_INCLUDE_EVENTS_TYPES_DOWNLOAD_RESUME_REMOVED_HPP_
+
+#include "events/i_event.hpp"
+#include "types/repertory.hpp"
+
+namespace repertory {
+struct download_resume_removed final : public i_event {
+  download_resume_removed() = default;
+  download_resume_removed(std::string api_path_, std::string dest_path_,
+                          std::string_view function_name_)
+      : api_path(std::move(api_path_)),
+        dest_path(std::move(dest_path_)),
+        function_name(std::string(function_name_)) {}
+
+  static constexpr const event_level level{event_level::debug};
+  static constexpr const std::string_view name{"download_resume_removed"};
+
+  std::string api_path;
+  std::string dest_path;
+  std::string function_name;
+
+  [[nodiscard]] auto get_event_level() const -> event_level override {
+    return level;
+  }
+
+  [[nodiscard]] auto get_name() const -> std::string_view override {
+    return name;
+  }
+
+  [[nodiscard]] auto get_single_line() const -> std::string override {
+    return fmt::format("{}|func|{}|ap|{}|dp|{}", name, function_name, api_path,
+                       dest_path);
+  }
+};
+} // namespace repertory
+
+NLOHMANN_JSON_NAMESPACE_BEGIN
+template <> struct adl_serializer<repertory::download_resume_removed> {
+  static void to_json(json &data,
+                      const repertory::download_resume_removed &value) {
+    data["api_path"] = value.api_path;
+    data["dest_path"] = value.dest_path;
+    data["function_name"] = value.function_name;
+  }
+
+  static void from_json(const json &data,
+                        repertory::download_resume_removed &value) {
+    data.at("api_path").get_to<std::string>(value.api_path);
+    data.at("dest_path").get_to<std::string>(value.dest_path);
+    data.at("function_name").get_to<std::string>(value.function_name);
+  }
+};
+NLOHMANN_JSON_NAMESPACE_END
+
+#endif // REPERTORY_INCLUDE_EVENTS_TYPES_DOWNLOAD_RESUME_REMOVED_HPP_
--- a/repertory/librepertory/include/events/types/download_type_selected.hpp
+++ b/repertory/librepertory/include/events/types/download_type_selected.hpp
@ -0,0 +1,82 @@
+/*
+  Copyright <2018-2025> <scott.e.graves@protonmail.com>
+
+  Permission is hereby granted, free of charge, to any person obtaining a copy
+  of this software and associated documentation files (the "Software"), to deal
+  in the Software without restriction, including without limitation the rights
+  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+  copies of the Software, and to permit persons to whom the Software is
+  furnished to do so, subject to the following conditions:
+
+  The above copyright notice and this permission notice shall be included in all
+  copies or substantial portions of the Software.
+
+  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+  SOFTWARE.
+*/
+#ifndef REPERTORY_INCLUDE_EVENTS_TYPES_DOWNLOAD_TYPE_SELECTED_HPP_
+#define REPERTORY_INCLUDE_EVENTS_TYPES_DOWNLOAD_TYPE_SELECTED_HPP_
+
+#include "events/i_event.hpp"
+#include "types/repertory.hpp"
+
+namespace repertory {
+struct download_type_selected final : public i_event {
+  download_type_selected() = default;
+  download_type_selected(std::string api_path_, std::string dest_path_,
+                         std::string_view function_name_, download_type type_)
+      : api_path(std::move(api_path_)),
+        dest_path(std::move(dest_path_)),
+        function_name(std::string(function_name_)),
+        type(type_) {}
+
+  static constexpr const event_level level{event_level::debug};
+  static constexpr const std::string_view name{"download_type_selected"};
+
+  std::string api_path;
+  std::string dest_path;
+  std::string function_name;
+  download_type type{};
+
+  [[nodiscard]] auto get_event_level() const -> event_level override {
+    return level;
+  }
+
+  [[nodiscard]] auto get_name() const -> std::string_view override {
+    return name;
+  }
+
+  [[nodiscard]] auto get_single_line() const -> std::string override {
+    return fmt::format("{}|func|{}|ap|{}|dp|{}|type|{}", name, function_name,
+                       api_path, dest_path, download_type_to_string(type));
+  }
+};
+} // namespace repertory
+
+NLOHMANN_JSON_NAMESPACE_BEGIN
+template <> struct adl_serializer<repertory::download_type_selected> {
+  static void to_json(json &data,
+                      const repertory::download_type_selected &value) {
+    data["api_path"] = value.api_path;
+    data["dest_path"] = value.dest_path;
+    data["function_name"] = value.function_name;
+    data["type"] = repertory::download_type_to_string(value.type);
+  }
+
+  static void from_json(const json &data,
+                        repertory::download_type_selected &value) {
+    data.at("api_path").get_to<std::string>(value.api_path);
+    data.at("dest_path").get_to<std::string>(value.dest_path);
+    data.at("function_name").get_to<std::string>(value.function_name);
+    value.type = repertory::download_type_from_string(
+        data.at("type").get<std::string>());
+  }
+};
+NLOHMANN_JSON_NAMESPACE_END
+
+#endif // REPERTORY_INCLUDE_EVENTS_TYPES_DOWNLOAD_TYPE_SELECTED_HPP_
--- a/repertory/librepertory/include/events/types/drive_mount_failed.hpp
+++ b/repertory/librepertory/include/events/types/drive_mount_failed.hpp
@ -29,20 +29,21 @@
 namespace repertory {
 struct drive_mount_failed final : public i_event {
  drive_mount_failed() = default;
-  drive_mount_failed(std::string_view function_name_,
-                     std::string mount_location_, NTSTATUS status_)
-      : function_name(std::string(function_name_)),
-        mount_location(std::move(mount_location_)),
-        status(status_) {}
+  drive_mount_failed(NTSTATUS error_, std::string_view function_name_,
+                     std::string mount_location_)
+      : error(error_),
+        function_name(std::string(function_name_)),
+        mount_location(std::move(mount_location_)) {}

+  static constexpr const event_level level{event_level::error};
  static constexpr const std::string_view name{"drive_mount_failed"};

+  NTSTATUS error{};
  std::string function_name;
  std::string mount_location;
-  NTSTATUS status{};

  [[nodiscard]] auto get_event_level() const -> event_level override {
-    return event_level::error;
+    return level;
  }

  [[nodiscard]] auto get_name() const -> std::string_view override {
@ -51,7 +52,7 @@ struct drive_mount_failed final : public i_event {

  [[nodiscard]] auto get_single_line() const -> std::string override {
    return fmt::format("{}|func|{}|location|{}|status|{}", name, function_name,
-                       mount_location, status);
+                       mount_location, error);
  }
 };
 } // namespace repertory
@ -59,16 +60,16 @@ struct drive_mount_failed final : public i_event {
 NLOHMANN_JSON_NAMESPACE_BEGIN
 template <> struct adl_serializer<repertory::drive_mount_failed> {
  static void to_json(json &data, const repertory::drive_mount_failed &value) {
+    data["error"] = value.error;
    data["function_name"] = value.function_name;
    data["mount_location"] = value.mount_location;
-    data["status"] = value.status;
  }

  static void from_json(const json &data,
                        repertory::drive_mount_failed &value) {
+    data.at("error").get_to<NTSTATUS>(value.error);
    data.at("function_name").get_to<std::string>(value.function_name);
    data.at("mount_location").get_to<std::string>(value.mount_location);
-    data.at("status").get_to<NTSTATUS>(value.status);
  }
 };
 NLOHMANN_JSON_NAMESPACE_END
--- a/repertory/librepertory/include/events/types/drive_mount_result.hpp
+++ b/repertory/librepertory/include/events/types/drive_mount_result.hpp
@ -34,6 +34,7 @@ struct drive_mount_result final : public i_event {
        mount_location(std::move(mount_location_)),
        result(std::move(result_)) {}

+  static constexpr const event_level level{event_level::info};
  static constexpr const std::string_view name{"drive_mount_result"};

  std::string function_name;
@ -41,7 +42,7 @@ struct drive_mount_result final : public i_event {
  std::string result;

  [[nodiscard]] auto get_event_level() const -> event_level override {
-    return event_level::info;
+    return level;
  }

  [[nodiscard]] auto get_name() const -> std::string_view override {
--- a/repertory/librepertory/include/events/types/drive_mounted.hpp
+++ b/repertory/librepertory/include/events/types/drive_mounted.hpp
@ -32,13 +32,14 @@ struct drive_mounted final : public i_event {
      : function_name(std::string(function_name_)),
        mount_location(std::move(mount_location_)) {}

+  static constexpr const event_level level{event_level::info};
  static constexpr const std::string_view name{"drive_mounted"};

  std::string function_name;
  std::string mount_location;

  [[nodiscard]] auto get_event_level() const -> event_level override {
-    return event_level::info;
+    return level;
  }

  [[nodiscard]] auto get_name() const -> std::string_view override {
--- a/repertory/librepertory/include/events/types/drive_stop_timed_out.hpp
+++ b/repertory/librepertory/include/events/types/drive_stop_timed_out.hpp
@ -0,0 +1,67 @@
+/*
+  Copyright <2018-2025> <scott.e.graves@protonmail.com>
+
+  Permission is hereby granted, free of charge, to any person obtaining a copy
+  of this software and associated documentation files (the "Software"), to deal
+  in the Software without restriction, including without limitation the rights
+  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+  copies of the Software, and to permit persons to whom the Software is
+  furnished to do so, subject to the following conditions:
+
+  The above copyright notice and this permission notice shall be included in all
+  copies or substantial portions of the Software.
+
+  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+  SOFTWARE.
+*/
+#ifndef REPERTORY_INCLUDE_EVENTS_TYPES_DRIVE_STOP_TIMED_OUT_HPP_
+#define REPERTORY_INCLUDE_EVENTS_TYPES_DRIVE_STOP_TIMED_OUT_HPP_
+
+#include "events/i_event.hpp"
+#include "types/repertory.hpp"
+
+namespace repertory {
+struct drive_stop_timed_out final : public i_event {
+  drive_stop_timed_out() = default;
+  drive_stop_timed_out(std::string_view function_name_)
+      : function_name(std::string(function_name_)) {}
+
+  static constexpr const event_level level{event_level::warn};
+  static constexpr const std::string_view name{"drive_stop_timed_out"};
+
+  std::string function_name;
+
+  [[nodiscard]] auto get_event_level() const -> event_level override {
+    return level;
+  }
+
+  [[nodiscard]] auto get_name() const -> std::string_view override {
+    return name;
+  }
+
+  [[nodiscard]] auto get_single_line() const -> std::string override {
+    return fmt::format("{}|func|{}", name, function_name);
+  }
+};
+} // namespace repertory
+
+NLOHMANN_JSON_NAMESPACE_BEGIN
+template <> struct adl_serializer<repertory::drive_stop_timed_out> {
+  static void to_json(json &data,
+                      const repertory::drive_stop_timed_out &value) {
+    data["function_name"] = value.function_name;
+  }
+
+  static void from_json(const json &data,
+                        repertory::drive_stop_timed_out &value) {
+    data.at("function_name").get_to<std::string>(value.function_name);
+  }
+};
+NLOHMANN_JSON_NAMESPACE_END
+
+#endif // REPERTORY_INCLUDE_EVENTS_TYPES_DRIVE_STOP_TIMED_OUT_HPP_
--- a/repertory/librepertory/include/events/types/drive_unmount_pending.hpp
+++ b/repertory/librepertory/include/events/types/drive_unmount_pending.hpp
@ -33,13 +33,14 @@ struct drive_unmount_pending final : public i_event {
      : function_name(std::string(function_name_)),
        mount_location(std::move(mount_location_)) {}

+  static constexpr const event_level level{event_level::info};
  static constexpr const std::string_view name{"drive_unmount_pending"};

  std::string function_name;
  std::string mount_location;

  [[nodiscard]] auto get_event_level() const -> event_level override {
-    return event_level::info;
+    return level;
  }

  [[nodiscard]] auto get_name() const -> std::string_view override {
--- a/repertory/librepertory/include/events/types/drive_unmounted.hpp
+++ b/repertory/librepertory/include/events/types/drive_unmounted.hpp
@ -32,13 +32,14 @@ struct drive_unmounted final : public i_event {
      : function_name(std::string(function_name_)),
        mount_location(std::move(mount_location_)) {}

+  static constexpr const event_level level{event_level::info};
  static constexpr const std::string_view name{"drive_unmounted"};

  std::string function_name;
  std::string mount_location;

  [[nodiscard]] auto get_event_level() const -> event_level override {
-    return event_level::info;
+    return level;
  }

  [[nodiscard]] auto get_name() const -> std::string_view override {
--- a/repertory/librepertory/include/events/types/event_level_changed.hpp
+++ b/repertory/librepertory/include/events/types/event_level_changed.hpp
@ -28,16 +28,17 @@
 namespace repertory {
 struct event_level_changed final : public i_event {
  event_level_changed() = default;
-  event_level_changed(std::string_view function_name_, event_level level_)
-      : function_name(std::string(function_name_)), level(level_) {}
+  event_level_changed(std::string_view function_name_, event_level new_level_)
+      : function_name(std::string(function_name_)), new_level(new_level_) {}

+  static constexpr const event_level level{event_level::info};
  static constexpr const std::string_view name{"event_level_changed"};

  std::string function_name;
-  event_level level{};
+  event_level new_level{};

  [[nodiscard]] auto get_event_level() const -> event_level override {
-    return event_level::info;
+    return level;
  }

  [[nodiscard]] auto get_name() const -> std::string_view override {
@ -46,7 +47,7 @@ struct event_level_changed final : public i_event {

  [[nodiscard]] auto get_single_line() const -> std::string override {
    return fmt::format("{}|func|{}|level|{}", name, function_name,
-                       event_level_to_string(level));
+                       event_level_to_string(new_level));
  }
 };
 } // namespace repertory
@ -54,14 +55,14 @@ struct event_level_changed final : public i_event {
 NLOHMANN_JSON_NAMESPACE_BEGIN
 template <> struct adl_serializer<repertory::event_level_changed> {
  static void to_json(json &data, const repertory::event_level_changed &value) {
-    data["event_level"] = repertory::event_level_to_string(value.level);
+    data["new_level"] = repertory::event_level_to_string(value.new_level);
    data["function_name"] = value.function_name;
  }

  static void from_json(const json &data,
                        repertory::event_level_changed &value) {
-    value.level = repertory::event_level_from_string(
-        data.at("event_level").get<std::string>());
+    value.new_level = repertory::event_level_from_string(
+        data.at("new_level").get<std::string>());
    data.at("function_name").get_to<std::string>(value.function_name);
  }
 };
--- a/repertory/librepertory/include/events/types/file_pinned.hpp
+++ b/repertory/librepertory/include/events/types/file_pinned.hpp
@ -32,13 +32,14 @@ struct file_pinned final : public i_event {
      : api_path(std::move(api_path_)),
        function_name(std::string(function_name_)) {}

+  static constexpr const event_level level{event_level::info};
  static constexpr const std::string_view name{"file_pinned"};

  std::string api_path;
  std::string function_name;

  [[nodiscard]] auto get_event_level() const -> event_level override {
-    return event_level::info;
+    return level;
  }

  [[nodiscard]] auto get_name() const -> std::string_view override {
--- a/repertory/librepertory/include/events/types/file_remove_failed.hpp
+++ b/repertory/librepertory/include/events/types/file_remove_failed.hpp
@ -34,6 +34,7 @@ struct file_remove_failed final : public i_event {
        error(error_),
        function_name(std::string(function_name_)) {}

+  static constexpr const event_level level{event_level::error};
  static constexpr const std::string_view name{"file_remove_failed"};

  std::string api_path;
@ -41,7 +42,7 @@ struct file_remove_failed final : public i_event {
  std::string function_name;

  [[nodiscard]] auto get_event_level() const -> event_level override {
-    return event_level::error;
+    return level;
  }

  [[nodiscard]] auto get_name() const -> std::string_view override {
--- a/repertory/librepertory/include/events/types/file_removed.hpp
+++ b/repertory/librepertory/include/events/types/file_removed.hpp
@ -32,13 +32,14 @@ struct file_removed final : public i_event {
      : api_path(std::move(api_path_)),
        function_name(std::string(function_name_)) {}

+  static constexpr const event_level level{event_level::debug};
  static constexpr const std::string_view name{"file_removed"};

  std::string api_path;
  std::string function_name;

  [[nodiscard]] auto get_event_level() const -> event_level override {
-    return event_level::debug;
+    return level;
  }

  [[nodiscard]] auto get_name() const -> std::string_view override {
--- a/repertory/librepertory/include/events/types/file_removed_externally.hpp
+++ b/repertory/librepertory/include/events/types/file_removed_externally.hpp
@ -35,6 +35,7 @@ struct file_removed_externally final : public i_event {
        function_name(std::string(function_name_)),
        source_path(std::move(source_path_)) {}

+  static constexpr const event_level level{event_level::warn};
  static constexpr const std::string_view name{"file_removed_externally"};

  std::string api_path;
@ -42,7 +43,7 @@ struct file_removed_externally final : public i_event {
  std::string source_path;

  [[nodiscard]] auto get_event_level() const -> event_level override {
-    return event_level::warn;
+    return level;
  }

  [[nodiscard]] auto get_name() const -> std::string_view override {
--- a/repertory/librepertory/include/events/types/file_unpinned.hpp
+++ b/repertory/librepertory/include/events/types/file_unpinned.hpp
@ -32,13 +32,14 @@ struct file_unpinned final : public i_event {
      : api_path(std::move(api_path_)),
        function_name(std::string(function_name_)) {}

+  static constexpr const event_level level{event_level::info};
  static constexpr const std::string_view name{"file_unpinned"};

  std::string api_path;
  std::string function_name;

  [[nodiscard]] auto get_event_level() const -> event_level override {
-    return event_level::info;
+    return level;
  }

  [[nodiscard]] auto get_name() const -> std::string_view override {
--- a/repertory/librepertory/include/events/types/file_upload_completed.hpp
+++ b/repertory/librepertory/include/events/types/file_upload_completed.hpp
@ -37,6 +37,7 @@ struct file_upload_completed final : public i_event {
        function_name(std::string(function_name_)),
        source_path(std::move(source_path_)) {}

+  static constexpr const event_level level{event_level::info};
  static constexpr const std::string_view name{"file_upload_completed"};

  std::string api_path;
@ -46,7 +47,7 @@ struct file_upload_completed final : public i_event {
  std::string source_path;

  [[nodiscard]] auto get_event_level() const -> event_level override {
-    return event_level::info;
+    return level;
  }

  [[nodiscard]] auto get_name() const -> std::string_view override {
--- a/repertory/librepertory/include/events/types/file_upload_failed.hpp
+++ b/repertory/librepertory/include/events/types/file_upload_failed.hpp
@ -35,6 +35,7 @@ struct file_upload_failed final : public i_event {
        function_name(std::string(function_name_)),
        source_path(std::move(source_path_)) {}

+  static constexpr const event_level level{event_level::warn};
  static constexpr const std::string_view name{"file_upload_failed"};

  std::string api_path;
@ -43,7 +44,7 @@ struct file_upload_failed final : public i_event {
  std::string source_path;

  [[nodiscard]] auto get_event_level() const -> event_level override {
-    return event_level::warn;
+    return level;
  }

  [[nodiscard]] auto get_name() const -> std::string_view override {
--- a/repertory/librepertory/include/events/types/file_upload_not_found.hpp
+++ b/repertory/librepertory/include/events/types/file_upload_not_found.hpp
@ -34,6 +34,7 @@ struct file_upload_not_found final : public i_event {
        function_name(std::string(function_name_)),
        source_path(std::move(source_path_)) {}

+  static constexpr const event_level level{event_level::warn};
  static constexpr const std::string_view name{"file_upload_not_found"};

  std::string api_path;
@ -41,7 +42,7 @@ struct file_upload_not_found final : public i_event {
  std::string source_path;

  [[nodiscard]] auto get_event_level() const -> event_level override {
-    return event_level::warn;
+    return level;
  }

  [[nodiscard]] auto get_name() const -> std::string_view override {
--- a/repertory/librepertory/include/events/types/file_upload_queued.hpp
+++ b/repertory/librepertory/include/events/types/file_upload_queued.hpp
@ -34,6 +34,7 @@ struct file_upload_queued final : public i_event {
        function_name(std::string(function_name_)),
        source_path(std::move(source_path_)) {}

+  static constexpr const event_level level{event_level::info};
  static constexpr const std::string_view name{"file_upload_queued"};

  std::string api_path;
@ -41,7 +42,7 @@ struct file_upload_queued final : public i_event {
  std::string source_path;

  [[nodiscard]] auto get_event_level() const -> event_level override {
-    return event_level::info;
+    return level;
  }

  [[nodiscard]] auto get_name() const -> std::string_view override {
--- a/repertory/librepertory/include/events/types/file_upload_removed.hpp
+++ b/repertory/librepertory/include/events/types/file_upload_removed.hpp
@ -32,13 +32,14 @@ struct file_upload_removed final : public i_event {
      : api_path(std::move(api_path_)),
        function_name(std::string(function_name_)) {}

+  static constexpr const event_level level{event_level::debug};
  static constexpr const std::string_view name{"file_upload_removed"};

  std::string api_path;
  std::string function_name;

  [[nodiscard]] auto get_event_level() const -> event_level override {
-    return event_level::debug;
+    return level;
  }

  [[nodiscard]] auto get_name() const -> std::string_view override {
--- a/repertory/librepertory/include/events/types/file_upload_retry.hpp
+++ b/repertory/librepertory/include/events/types/file_upload_retry.hpp
@ -28,22 +28,23 @@
 namespace repertory {
 struct file_upload_retry final : public i_event {
  file_upload_retry() = default;
-  file_upload_retry(std::string api_path_, std::string error_,
+  file_upload_retry(std::string api_path_, api_error error_,
                    std::string_view function_name_, std::string source_path_)
      : api_path(std::move(api_path_)),
        error(std::move(error_)),
        function_name(std::string(function_name_)),
        source_path(std::move(source_path_)) {}

+  static constexpr const event_level level{event_level::warn};
  static constexpr const std::string_view name{"file_upload_retry"};

  std::string api_path;
-  std::string error;
+  api_error error{};
  std::string function_name;
  std::string source_path;

  [[nodiscard]] auto get_event_level() const -> event_level override {
-    return event_level::warn;
+    return level;
  }

  [[nodiscard]] auto get_name() const -> std::string_view override {
@ -51,8 +52,8 @@ struct file_upload_retry final : public i_event {
  }

  [[nodiscard]] auto get_single_line() const -> std::string override {
-    return fmt::format("{}|func|{}|ap|{}|error|{}|sp|{}", name, function_name,
-                       api_path, error, source_path);
+    return fmt::format("{}|func|{}|ap|{}|sp|{}|error|{}", name, function_name,
+                       api_path, source_path, api_error_to_string(error));
  }
 };
 } // namespace repertory
@ -61,14 +62,15 @@ NLOHMANN_JSON_NAMESPACE_BEGIN
 template <> struct adl_serializer<repertory::file_upload_retry> {
  static void to_json(json &data, const repertory::file_upload_retry &value) {
    data["api_path"] = value.api_path;
-    data["error"] = value.error;
+    data["error"] = repertory::api_error_to_string(value.error);
    data["function_name"] = value.function_name;
    data["source_path"] = value.source_path;
  }

  static void from_json(const json &data, repertory::file_upload_retry &value) {
    data.at("api_path").get_to<std::string>(value.api_path);
-    data.at("error").get_to<std::string>(value.error);
+    value.error =
+        repertory::api_error_from_string(data.at("error").get<std::string>());
    data.at("function_name").get_to<std::string>(value.function_name);
    data.at("source_path").get_to<std::string>(value.source_path);
  }
--- a/repertory/librepertory/include/events/types/filesystem_item_added.hpp
+++ b/repertory/librepertory/include/events/types/filesystem_item_added.hpp
@ -35,6 +35,7 @@ struct filesystem_item_added final : public i_event {
        directory(directory_),
        function_name(std::string(function_name_)) {}

+  static constexpr const event_level level{event_level::debug};
  static constexpr const std::string_view name{"filesystem_item_added"};

  std::string api_parent;
@ -43,7 +44,7 @@ struct filesystem_item_added final : public i_event {
  std::string function_name;

  [[nodiscard]] auto get_event_level() const -> event_level override {
-    return event_level::debug;
+    return level;
  }

  [[nodiscard]] auto get_name() const -> std::string_view override {
--- a/repertory/librepertory/include/events/types/filesystem_item_closed.hpp
+++ b/repertory/librepertory/include/events/types/filesystem_item_closed.hpp
@ -37,6 +37,7 @@ struct filesystem_item_closed final : public i_event {
        function_name(std::string(function_name_)),
        source_path(std::move(source_path_)) {}

+  static constexpr const event_level level{event_level::trace};
  static constexpr const std::string_view name{"filesystem_item_closed"};

  std::string api_path;
@ -46,7 +47,7 @@ struct filesystem_item_closed final : public i_event {
  std::string source_path;

  [[nodiscard]] auto get_event_level() const -> event_level override {
-    return event_level::trace;
+    return level;
  }

  [[nodiscard]] auto get_name() const -> std::string_view override {
--- a/repertory/librepertory/include/events/types/filesystem_item_evicted.hpp
+++ b/repertory/librepertory/include/events/types/filesystem_item_evicted.hpp
@ -35,6 +35,7 @@ struct filesystem_item_evicted final : public i_event {
        function_name(std::string(function_name_)),
        source_path(std::move(source_path_)) {}

+  static constexpr const event_level level{event_level::debug};
  static constexpr const std::string_view name{"filesystem_item_evicted"};

  std::string api_path;
@ -42,7 +43,7 @@ struct filesystem_item_evicted final : public i_event {
  std::string source_path;

  [[nodiscard]] auto get_event_level() const -> event_level override {
-    return event_level::debug;
+    return level;
  }

  [[nodiscard]] auto get_name() const -> std::string_view override {
--- a/repertory/librepertory/include/events/types/filesystem_item_handle_closed.hpp
+++ b/repertory/librepertory/include/events/types/filesystem_item_handle_closed.hpp
@ -39,6 +39,7 @@ struct filesystem_item_handle_closed final : public i_event {
        handle(handle_),
        source_path(std::move(source_path_)) {}

+  static constexpr const event_level level{event_level::trace};
  static constexpr const std::string_view name{"filesystem_item_handle_closed"};

  std::string api_path;
@ -49,7 +50,7 @@ struct filesystem_item_handle_closed final : public i_event {
  std::string source_path;

  [[nodiscard]] auto get_event_level() const -> event_level override {
-    return event_level::trace;
+    return level;
  }

  [[nodiscard]] auto get_name() const -> std::string_view override {
--- a/repertory/librepertory/include/events/types/filesystem_item_handle_opened.hpp
+++ b/repertory/librepertory/include/events/types/filesystem_item_handle_opened.hpp
@ -37,6 +37,7 @@ struct filesystem_item_handle_opened final : public i_event {
        handle(handle_),
        source_path(std::move(source_path_)) {}

+  static constexpr const event_level level{event_level::trace};
  static constexpr const std::string_view name{"filesystem_item_handle_opened"};

  std::string api_path;
@ -46,7 +47,7 @@ struct filesystem_item_handle_opened final : public i_event {
  std::string source_path;

  [[nodiscard]] auto get_event_level() const -> event_level override {
-    return event_level::trace;
+    return level;
  }

  [[nodiscard]] auto get_name() const -> std::string_view override {
--- a/repertory/librepertory/include/events/types/filesystem_item_opened.hpp
+++ b/repertory/librepertory/include/events/types/filesystem_item_opened.hpp
@ -36,6 +36,7 @@ struct filesystem_item_opened final : public i_event {
        function_name(std::string(function_name_)),
        source_path(std::move(source_path_)) {}

+  static constexpr const event_level level{event_level::trace};
  static constexpr const std::string_view name{"filesystem_item_opened"};

  std::string api_path;
@ -44,7 +45,7 @@ struct filesystem_item_opened final : public i_event {
  std::string source_path;

  [[nodiscard]] auto get_event_level() const -> event_level override {
-    return event_level::trace;
+    return level;
  }

  [[nodiscard]] auto get_name() const -> std::string_view override {
--- a/repertory/librepertory/include/events/types/fuse_args_parsed.hpp
+++ b/repertory/librepertory/include/events/types/fuse_args_parsed.hpp
@ -0,0 +1,70 @@
+/*
+  Copyright <2018-2025> <scott.e.graves@protonmail.com>
+
+  Permission is hereby granted, free of charge, to any person obtaining a copy
+  of this software and associated documentation files (the "Software"), to deal
+  in the Software without restriction, including without limitation the rights
+  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+  copies of the Software, and to permit persons to whom the Software is
+  furnished to do so, subject to the following conditions:
+
+  The above copyright notice and this permission notice shall be included in all
+  copies or substantial portions of the Software.
+
+  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+  SOFTWARE.
+*/
+#ifndef REPERTORY_INCLUDE_EVENTS_TYPES_FUSE_ARGS_PARSED_HPP_
+#define REPERTORY_INCLUDE_EVENTS_TYPES_FUSE_ARGS_PARSED_HPP_
+#if !defined(_WIN32)
+
+#include "events/i_event.hpp"
+#include "types/repertory.hpp"
+
+namespace repertory {
+struct fuse_args_parsed final : public i_event {
+  fuse_args_parsed() = default;
+  fuse_args_parsed(std::string_view args_, std::string_view function_name_)
+      : args(std::move(args_)), function_name(std::string{function_name_}) {}
+
+  static constexpr const event_level level{event_level::info};
+  static constexpr const std::string_view name{"fuse_args_parsed"};
+
+  std::string args;
+  std::string function_name;
+
+  [[nodiscard]] auto get_event_level() const -> event_level override {
+    return level;
+  }
+
+  [[nodiscard]] auto get_name() const -> std::string_view override {
+    return name;
+  }
+
+  [[nodiscard]] auto get_single_line() const -> std::string override {
+    return fmt::format("{}|func|{}|args|{}", name, function_name, args);
+  }
+};
+} // namespace repertory
+
+NLOHMANN_JSON_NAMESPACE_BEGIN
+template <> struct adl_serializer<repertory::fuse_args_parsed> {
+  static void to_json(json &data, const repertory::fuse_args_parsed &value) {
+    data["args"] = value.args;
+    data["function_name"] = value.function_name;
+  }
+
+  static void from_json(const json &data, repertory::fuse_args_parsed &value) {
+    data.at("args").get_to<std::string>(value.args);
+    data.at("function_name").get_to<std::string>(value.function_name);
+  }
+};
+NLOHMANN_JSON_NAMESPACE_END
+
+#endif // !defined(_WIN32)
+#endif // REPERTORY_INCLUDE_EVENTS_TYPES_FUSE_ARGS_PARSED_HPP_
--- a/repertory/librepertory/include/events/types/fuse_event.hpp
+++ b/repertory/librepertory/include/events/types/fuse_event.hpp
@ -0,0 +1,77 @@
+/*
+  Copyright <2018-2025> <scott.e.graves@protonmail.com>
+
+  Permission is hereby granted, free of charge, to any person obtaining a copy
+  of this software and associated documentation files (the "Software"), to deal
+  in the Software without restriction, including without limitation the rights
+  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+  copies of the Software, and to permit persons to whom the Software is
+  furnished to do so, subject to the following conditions:
+
+  The above copyright notice and this permission notice shall be included in all
+  copies or substantial portions of the Software.
+
+  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+  SOFTWARE.
+*/
+#ifndef REPERTORY_INCLUDE_EVENTS_TYPES_FUSE_EVENT_HPP_
+#define REPERTORY_INCLUDE_EVENTS_TYPES_FUSE_EVENT_HPP_
+#if !defined(_WIN32)
+
+#include "events/i_event.hpp"
+#include "types/repertory.hpp"
+
+namespace repertory {
+struct fuse_event final : public i_event {
+  fuse_event() = default;
+  fuse_event(std::string_view api_path_, std::int32_t error_,
+             std::string_view function_name_)
+      : api_path(std::string{api_path_}),
+        error(error_),
+        function_name(std::string{function_name_}) {}
+
+  static constexpr const event_level level{event_level::debug};
+  static constexpr const std::string_view name{"fuse_event"};
+
+  std::string api_path;
+  std::int32_t error{};
+  std::string function_name;
+
+  [[nodiscard]] auto get_event_level() const -> event_level override {
+    return level;
+  }
+
+  [[nodiscard]] auto get_name() const -> std::string_view override {
+    return name;
+  }
+
+  [[nodiscard]] auto get_single_line() const -> std::string override {
+    return fmt::format("{}|func|{}|ap|{}|error|{}", name, function_name,
+                       api_path, error);
+  }
+};
+} // namespace repertory
+
+NLOHMANN_JSON_NAMESPACE_BEGIN
+template <> struct adl_serializer<repertory::fuse_event> {
+  static void to_json(json &data, const repertory::fuse_event &value) {
+    data["api_path"] = value.api_path;
+    data["error"] = value.error;
+    data["function_name"] = value.function_name;
+  }
+
+  static void from_json(const json &data, repertory::fuse_event &value) {
+    data.at("api_path").get_to<std::string>(value.api_path);
+    data.at("error").get_to<std::int32_t>(value.error);
+    data.at("function_name").get_to<std::string>(value.function_name);
+  }
+};
+NLOHMANN_JSON_NAMESPACE_END
+
+#endif // !defined(_WIN32)
+#endif // REPERTORY_INCLUDE_EVENTS_TYPES_FUSE_EVENT_HPP_
--- a/repertory/librepertory/include/events/types/invalid_cache_size.hpp
+++ b/repertory/librepertory/include/events/types/invalid_cache_size.hpp
@ -0,0 +1,76 @@
+/*
+  Copyright <2018-2025> <scott.e.graves@protonmail.com>
+
+  Permission is hereby granted, free of charge, to any person obtaining a copy
+  of this software and associated documentation files (the "Software"), to deal
+  in the Software without restriction, including without limitation the rights
+  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+  copies of the Software, and to permit persons to whom the Software is
+  furnished to do so, subject to the following conditions:
+
+  The above copyright notice and this permission notice shall be included in all
+  copies or substantial portions of the Software.
+
+  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+  SOFTWARE.
+*/
+#ifndef REPERTORY_INCLUDE_EVENTS_TYPES_INVALID_CACHE_SIZE_HPP_
+#define REPERTORY_INCLUDE_EVENTS_TYPES_INVALID_CACHE_SIZE_HPP_
+
+#include "events/i_event.hpp"
+#include "types/repertory.hpp"
+
+namespace repertory {
+struct invalid_cache_size final : public i_event {
+  invalid_cache_size() = default;
+  invalid_cache_size(std::uint64_t cache_size_, std::string_view function_name_,
+                     std::uint64_t invalid_size_)
+      : cache_size(cache_size_),
+        function_name(std::string{function_name_}),
+        invalid_size(invalid_size_) {}
+
+  static constexpr const event_level level{event_level::warn};
+  static constexpr const std::string_view name{"invalid_cache_size"};
+
+  std::uint64_t cache_size{};
+  std::string function_name;
+  std::uint64_t invalid_size{};
+
+  [[nodiscard]] auto get_event_level() const -> event_level override {
+    return level;
+  }
+
+  [[nodiscard]] auto get_name() const -> std::string_view override {
+    return name;
+  }
+
+  [[nodiscard]] auto get_single_line() const -> std::string override {
+    return fmt::format("{}|func|{}|size|{}|by|{}", name, function_name,
+                       cache_size, invalid_size);
+  }
+};
+} // namespace repertory
+
+NLOHMANN_JSON_NAMESPACE_BEGIN
+template <> struct adl_serializer<repertory::invalid_cache_size> {
+  static void to_json(json &data, const repertory::invalid_cache_size &value) {
+    data["cache_size"] = value.cache_size;
+    data["function_name"] = value.function_name;
+    data["invalid_size"] = value.invalid_size;
+  }
+
+  static void from_json(const json &data,
+                        repertory::invalid_cache_size &value) {
+    data.at("cache_size").get_to<std::uint64_t>(value.cache_size);
+    data.at("function_name").get_to<std::string>(value.function_name);
+    data.at("invalid_size").get_to<std::uint64_t>(value.invalid_size);
+  }
+};
+NLOHMANN_JSON_NAMESPACE_END
+
+#endif // REPERTORY_INCLUDE_EVENTS_TYPES_INVALID_CACHE_SIZE_HPP_
--- a/repertory/librepertory/include/events/types/item_timeout.hpp
+++ b/repertory/librepertory/include/events/types/item_timeout.hpp
@ -0,0 +1,69 @@
+/*
+  Copyright <2018-2025> <scott.e.graves@protonmail.com>
+
+  Permission is hereby granted, free of charge, to any person obtaining a copy
+  of this software and associated documentation files (the "Software"), to deal
+  in the Software without restriction, including without limitation the rights
+  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+  copies of the Software, and to permit persons to whom the Software is
+  furnished to do so, subject to the following conditions:
+
+  The above copyright notice and this permission notice shall be included in all
+  copies or substantial portions of the Software.
+
+  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+  SOFTWARE.
+*/
+#ifndef REPERTORY_INCLUDE_EVENTS_TYPES_ITEM_TIMEOUT_HPP_
+#define REPERTORY_INCLUDE_EVENTS_TYPES_ITEM_TIMEOUT_HPP_
+
+#include "events/i_event.hpp"
+#include "types/repertory.hpp"
+
+namespace repertory {
+struct item_timeout final : public i_event {
+  item_timeout() = default;
+  item_timeout(std::string api_path_, std::string_view function_name_)
+      : api_path(std::move(api_path_)),
+        function_name(std::string(function_name_)) {}
+
+  static constexpr const event_level level{event_level::trace};
+  static constexpr const std::string_view name{"item_timeout"};
+
+  std::string api_path;
+  std::string function_name;
+
+  [[nodiscard]] auto get_event_level() const -> event_level override {
+    return level;
+  }
+
+  [[nodiscard]] auto get_name() const -> std::string_view override {
+    return name;
+  }
+
+  [[nodiscard]] auto get_single_line() const -> std::string override {
+    return fmt::format("{}|func|{}|ap|{}", name, function_name, api_path);
+  }
+};
+} // namespace repertory
+
+NLOHMANN_JSON_NAMESPACE_BEGIN
+template <> struct adl_serializer<repertory::item_timeout> {
+  static void to_json(json &data, const repertory::item_timeout &value) {
+    data["api_path"] = value.api_path;
+    data["function_name"] = value.function_name;
+  }
+
+  static void from_json(const json &data, repertory::item_timeout &value) {
+    data.at("api_path").get_to<std::string>(value.api_path);
+    data.at("function_name").get_to<std::string>(value.function_name);
+  }
+};
+NLOHMANN_JSON_NAMESPACE_END
+
+#endif // REPERTORY_INCLUDE_EVENTS_TYPES_ITEM_TIMEOUT_HPP_
--- a/repertory/librepertory/include/events/types/max_cache_size_reached.hpp
+++ b/repertory/librepertory/include/events/types/max_cache_size_reached.hpp
@ -0,0 +1,78 @@
+/*
+  Copyright <2018-2025> <scott.e.graves@protonmail.com>
+
+  Permission is hereby granted, free of charge, to any person obtaining a copy
+  of this software and associated documentation files (the "Software"), to deal
+  in the Software without restriction, including without limitation the rights
+  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+  copies of the Software, and to permit persons to whom the Software is
+  furnished to do so, subject to the following conditions:
+
+  The above copyright notice and this permission notice shall be included in all
+  copies or substantial portions of the Software.
+
+  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+  SOFTWARE.
+*/
+#ifndef REPERTORY_INCLUDE_EVENTS_TYPES_MAX_CACHE_SIZE_REACHED_HPP_
+#define REPERTORY_INCLUDE_EVENTS_TYPES_MAX_CACHE_SIZE_REACHED_HPP_
+
+#include "events/i_event.hpp"
+#include "types/repertory.hpp"
+
+namespace repertory {
+struct max_cache_size_reached final : public i_event {
+  max_cache_size_reached() = default;
+  max_cache_size_reached(std::uint64_t cache_size_,
+                         std::string_view function_name_,
+                         std::uint64_t max_cache_size_)
+      : cache_size(cache_size_),
+        function_name(std::string{function_name_}),
+        max_cache_size(max_cache_size_) {}
+
+  static constexpr const event_level level{event_level::warn};
+  static constexpr const std::string_view name{"max_cache_size_reached"};
+
+  std::uint64_t cache_size{};
+  std::string function_name;
+  std::uint64_t max_cache_size{};
+
+  [[nodiscard]] auto get_event_level() const -> event_level override {
+    return level;
+  }
+
+  [[nodiscard]] auto get_name() const -> std::string_view override {
+    return name;
+  }
+
+  [[nodiscard]] auto get_single_line() const -> std::string override {
+    return fmt::format("{}|func|{}|size|{}|max|{}", name, function_name,
+                       cache_size, max_cache_size);
+  }
+};
+} // namespace repertory
+
+NLOHMANN_JSON_NAMESPACE_BEGIN
+template <> struct adl_serializer<repertory::max_cache_size_reached> {
+  static void to_json(json &data,
+                      const repertory::max_cache_size_reached &value) {
+    data["cache_size"] = value.cache_size;
+    data["function_name"] = value.function_name;
+    data["max_cache_size"] = value.max_cache_size;
+  }
+
+  static void from_json(const json &data,
+                        repertory::max_cache_size_reached &value) {
+    data.at("cache_size").get_to<std::uint64_t>(value.cache_size);
+    data.at("function_name").get_to<std::string>(value.function_name);
+    data.at("max_cache_size").get_to<std::uint64_t>(value.max_cache_size);
+  }
+};
+NLOHMANN_JSON_NAMESPACE_END
+
+#endif // REPERTORY_INCLUDE_EVENTS_TYPES_MAX_CACHE_SIZE_REACHED_HPP_
--- a/repertory/librepertory/include/events/types/orphaned_file_detected.hpp
+++ b/repertory/librepertory/include/events/types/orphaned_file_detected.hpp
@ -33,13 +33,14 @@ struct orphaned_file_detected final : public i_event {
      : function_name(std::string(function_name_)),
        source_path(std::move(source_path_)) {}

+  static constexpr const event_level level{event_level::warn};
  static constexpr const std::string_view name{"orphaned_file_detected"};

  std::string function_name;
  std::string source_path;

  [[nodiscard]] auto get_event_level() const -> event_level override {
-    return event_level::info;
+    return level;
  }

  [[nodiscard]] auto get_name() const -> std::string_view override {
--- a/repertory/librepertory/include/events/types/orphaned_file_processing_failed.hpp
+++ b/repertory/librepertory/include/events/types/orphaned_file_processing_failed.hpp
@ -36,8 +36,10 @@ struct orphaned_file_processing_failed final : public i_event {
        function_name(std::string(function_name_)),
        source_path(std::move(source_path_)) {}

+  static constexpr const event_level level{event_level::error};
  static constexpr const std::string_view name{
-      "orphaned_file_processing_failed"};
+      "orphaned_file_processing_failed",
+  };

  std::string dest_path;
  std::string error;
@ -45,7 +47,7 @@ struct orphaned_file_processing_failed final : public i_event {
  std::string source_path;

  [[nodiscard]] auto get_event_level() const -> event_level override {
-    return event_level::info;
+    return level;
  }

  [[nodiscard]] auto get_name() const -> std::string_view override {
--- a/repertory/librepertory/include/events/types/orphaned_source_file_detected.hpp
+++ b/repertory/librepertory/include/events/types/orphaned_source_file_detected.hpp
@ -33,13 +33,14 @@ struct orphaned_source_file_detected final : public i_event {
      : function_name(std::string(function_name_)),
        source_path(std::move(source_path_)) {}

+  static constexpr const event_level level{event_level::warn};
  static constexpr const std::string_view name{"orphaned_source_file_detected"};

  std::string function_name;
  std::string source_path;

  [[nodiscard]] auto get_event_level() const -> event_level override {
-    return event_level::info;
+    return level;
  }

  [[nodiscard]] auto get_name() const -> std::string_view override {
--- a/repertory/librepertory/include/events/types/orphaned_source_file_removed.hpp
+++ b/repertory/librepertory/include/events/types/orphaned_source_file_removed.hpp
@ -33,13 +33,14 @@ struct orphaned_source_file_removed final : public i_event {
      : function_name(std::string(function_name_)),
        source_path(std::move(source_path_)) {}

+  static constexpr const event_level level{event_level::warn};
  static constexpr const std::string_view name{"orphaned_source_file_removed"};

  std::string function_name;
  std::string source_path;

  [[nodiscard]] auto get_event_level() const -> event_level override {
-    return event_level::info;
+    return level;
  }

  [[nodiscard]] auto get_name() const -> std::string_view override {
--- a/repertory/librepertory/include/events/types/packet_client_timeout.hpp
+++ b/repertory/librepertory/include/events/types/packet_client_timeout.hpp
@ -0,0 +1,77 @@
+/*
+  Copyright <2018-2025> <scott.e.graves@protonmail.com>
+
+  Permission is hereby granted, free of charge, to any person obtaining a copy
+  of this software and associated documentation files (the "Software"), to deal
+  in the Software without restriction, including without limitation the rights
+  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+  copies of the Software, and to permit persons to whom the Software is
+  furnished to do so, subject to the following conditions:
+
+  The above copyright notice and this permission notice shall be included in all
+  copies or substantial portions of the Software.
+
+  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+  SOFTWARE.
+*/
+#ifndef REPERTORY_INCLUDE_EVENTS_TYPES_PACKET_CLIENT_TIMEOUT_HPP_
+#define REPERTORY_INCLUDE_EVENTS_TYPES_PACKET_CLIENT_TIMEOUT_HPP_
+
+#include "events/i_event.hpp"
+#include "types/repertory.hpp"
+
+namespace repertory {
+struct packet_client_timeout final : public i_event {
+  packet_client_timeout() = default;
+  packet_client_timeout(std::string event_name_,
+                        std::string_view function_name_, std::string msg_)
+      : event_name(std::move(event_name_)),
+        function_name(std::string(function_name_)),
+        msg(std::move(msg_)) {}
+
+  static constexpr const event_level level{event_level::warn};
+  static constexpr const std::string_view name{"packet_client_timeout"};
+
+  std::string event_name;
+  std::string function_name;
+  std::string msg;
+
+  [[nodiscard]] auto get_event_level() const -> event_level override {
+    return level;
+  }
+
+  [[nodiscard]] auto get_name() const -> std::string_view override {
+    return name;
+  }
+
+  [[nodiscard]] auto get_single_line() const -> std::string override {
+    return fmt::format("{}|func|{}|event|{}|msg|{}", name, function_name,
+                       event_name, msg);
+  }
+};
+} // namespace repertory
+
+NLOHMANN_JSON_NAMESPACE_BEGIN
+template <> struct adl_serializer<repertory::packet_client_timeout> {
+  static void to_json(json &data,
+                      const repertory::packet_client_timeout &value) {
+    data["event_name"] = value.event_name;
+    data["function_name"] = value.function_name;
+    data["msg"] = value.msg;
+  }
+
+  static void from_json(const json &data,
+                        repertory::packet_client_timeout &value) {
+    data.at("event_name").get_to<std::string>(value.event_name);
+    data.at("function_name").get_to<std::string>(value.function_name);
+    data.at("msg").get_to<std::string>(value.msg);
+  }
+};
+NLOHMANN_JSON_NAMESPACE_END
+
+#endif // REPERTORY_INCLUDE_EVENTS_TYPES_PACKET_CLIENT_TIMEOUT_HPP_
--- a/repertory/librepertory/include/events/types/polling_item_begin.hpp
+++ b/repertory/librepertory/include/events/types/polling_item_begin.hpp
@ -32,13 +32,14 @@ struct polling_item_begin final : public i_event {
      : function_name(std::string(function_name_)),
        item_name(std::move(item_name_)) {}

+  static constexpr const event_level level{event_level::debug};
  static constexpr const std::string_view name{"polling_item_begin"};

  std::string function_name;
  std::string item_name;

  [[nodiscard]] auto get_event_level() const -> event_level override {
-    return event_level::debug;
+    return level;
  }

  [[nodiscard]] auto get_name() const -> std::string_view override {
--- a/repertory/librepertory/include/events/types/polling_item_end.hpp
+++ b/repertory/librepertory/include/events/types/polling_item_end.hpp
@ -32,13 +32,14 @@ struct polling_item_end final : public i_event {
      : function_name(std::string(function_name_)),
        item_name(std::move(item_name_)) {}

+  static constexpr const event_level level{event_level::debug};
  static constexpr const std::string_view name{"polling_item_end"};

  std::string function_name;
  std::string item_name;

  [[nodiscard]] auto get_event_level() const -> event_level override {
-    return event_level::debug;
+    return level;
  }

  [[nodiscard]] auto get_name() const -> std::string_view override {
--- a/repertory/librepertory/include/events/types/provider_invalid_version.hpp
+++ b/repertory/librepertory/include/events/types/provider_invalid_version.hpp
@ -0,0 +1,78 @@
+/*
+  Copyright <2018-2025> <scott.e.graves@protonmail.com>
+
+  Permission is hereby granted, free of charge, to any person obtaining a copy
+  of this software and associated documentation files (the "Software"), to deal
+  in the Software without restriction, including without limitation the rights
+  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+  copies of the Software, and to permit persons to whom the Software is
+  furnished to do so, subject to the following conditions:
+
+  The above copyright notice and this permission notice shall be included in all
+  copies or substantial portions of the Software.
+
+  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+  SOFTWARE.
+*/
+#ifndef REPERTORY_INCLUDE_EVENTS_TYPES_PRODIVER_INVALID_VERSION_HPP_
+#define REPERTORY_INCLUDE_EVENTS_TYPES_PRODIVER_INVALID_VERSION_HPP_
+
+#include "events/i_event.hpp"
+#include "types/repertory.hpp"
+
+namespace repertory {
+struct provider_invalid_version final : public i_event {
+  provider_invalid_version() = default;
+  provider_invalid_version(std::string_view function_name_,
+                           std::string required_version_,
+                           std::string returned_version_)
+      : function_name(std::string(function_name_)),
+        required_version(std::move(required_version_)),
+        returned_version(std::move(returned_version_)) {}
+
+  static constexpr const event_level level{event_level::error};
+  static constexpr const std::string_view name{"provider_invalid_version"};
+
+  std::string function_name;
+  std::string required_version;
+  std::string returned_version;
+
+  [[nodiscard]] auto get_event_level() const -> event_level override {
+    return level;
+  }
+
+  [[nodiscard]] auto get_name() const -> std::string_view override {
+    return name;
+  }
+
+  [[nodiscard]] auto get_single_line() const -> std::string override {
+    return fmt::format("{}|func|{}|required|{}|returned|{}", name,
+                       function_name, required_version, returned_version);
+  }
+};
+} // namespace repertory
+
+NLOHMANN_JSON_NAMESPACE_BEGIN
+template <> struct adl_serializer<repertory::provider_invalid_version> {
+  static void to_json(json &data,
+                      const repertory::provider_invalid_version &value) {
+    data["function_name"] = value.function_name;
+    data["required_version"] = value.required_version;
+    data["returned_version"] = value.returned_version;
+  }
+
+  static void from_json(const json &data,
+                        repertory::provider_invalid_version &value) {
+    data.at("function_name").get_to(value.function_name);
+    data.at("required_version").get_to(value.required_version);
+    data.at("returned_version").get_to(value.returned_version);
+  }
+};
+NLOHMANN_JSON_NAMESPACE_END
+
+#endif // REPERTORY_INCLUDE_EVENTS_TYPES_PRODIVER_INVALID_VERSION_HPP_
--- a/repertory/librepertory/include/events/types/provider_offline.hpp
+++ b/repertory/librepertory/include/events/types/provider_offline.hpp
@ -34,6 +34,7 @@ struct provider_offline final : public i_event {
        host_name_or_ip(std::move(host_name_or_ip_)),
        port(port_) {}

+  static constexpr const event_level level{event_level::warn};
  static constexpr const std::string_view name{"provider_offline"};

  std::string function_name;
@ -41,7 +42,7 @@ struct provider_offline final : public i_event {
  std::uint16_t port{};

  [[nodiscard]] auto get_event_level() const -> event_level override {
-    return event_level::debug;
+    return level;
  }

  [[nodiscard]] auto get_name() const -> std::string_view override {
--- a/repertory/librepertory/include/events/types/provider_upload_begin.hpp
+++ b/repertory/librepertory/include/events/types/provider_upload_begin.hpp
@ -34,6 +34,7 @@ struct provider_upload_begin final : public i_event {
        function_name(std::string(function_name_)),
        source_path(std::move(source_path_)) {}

+  static constexpr const event_level level{event_level::info};
  static constexpr const std::string_view name{"provider_upload_begin"};

  std::string api_path;
@ -41,7 +42,7 @@ struct provider_upload_begin final : public i_event {
  std::string source_path;

  [[nodiscard]] auto get_event_level() const -> event_level override {
-    return event_level::warn;
+    return level;
  }

  [[nodiscard]] auto get_name() const -> std::string_view override {
--- a/repertory/librepertory/include/events/types/provider_upload_end.hpp
+++ b/repertory/librepertory/include/events/types/provider_upload_end.hpp
@ -35,6 +35,7 @@ struct provider_upload_end final : public i_event {
        function_name(std::string(function_name_)),
        source_path(std::move(source_path_)) {}

+  static constexpr const event_level level{event_level::info};
  static constexpr const std::string_view name{"provider_upload_end"};

  std::string api_path;
@ -43,7 +44,7 @@ struct provider_upload_end final : public i_event {
  std::string source_path;

  [[nodiscard]] auto get_event_level() const -> event_level override {
-    return event_level::info;
+    return level;
  }

  [[nodiscard]] auto get_name() const -> std::string_view override {
--- a/repertory/librepertory/include/events/types/remote_server_event.hpp
+++ b/repertory/librepertory/include/events/types/remote_server_event.hpp
@ -0,0 +1,77 @@
+/*
+  Copyright <2018-2025> <scott.e.graves@protonmail.com>
+
+  Permission is hereby granted, free of charge, to any person obtaining a copy
+  of this software and associated documentation files (the "Software"), to deal
+  in the Software without restriction, including without limitation the rights
+  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+  copies of the Software, and to permit persons to whom the Software is
+  furnished to do so, subject to the following conditions:
+
+  The above copyright notice and this permission notice shall be included in all
+  copies or substantial portions of the Software.
+
+  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+  SOFTWARE.
+*/
+#ifndef REPERTORY_INCLUDE_EVENTS_TYPES_REMOTE_SERVER_EVENT_HPP_
+#define REPERTORY_INCLUDE_EVENTS_TYPES_REMOTE_SERVER_EVENT_HPP_
+
+#include "comm/packet/packet.hpp"
+#include "events/i_event.hpp"
+#include "types/repertory.hpp"
+
+namespace repertory {
+struct remote_server_event final : public i_event {
+  remote_server_event() = default;
+  remote_server_event(std::string api_path_, packet::error_type error_,
+                      std::string_view function_name_)
+      : api_path(std::move(api_path_)),
+        error(error_),
+        function_name(std::string{function_name_}) {}
+
+  static constexpr const event_level level{event_level::debug};
+  static constexpr const std::string_view name{"remote_server_event"};
+
+  std::string api_path;
+  packet::error_type error{};
+  std::string function_name;
+
+  [[nodiscard]] auto get_event_level() const -> event_level override {
+    return level;
+  }
+
+  [[nodiscard]] auto get_name() const -> std::string_view override {
+    return name;
+  }
+
+  [[nodiscard]] auto get_single_line() const -> std::string override {
+    return fmt::format("{}|func|{}|ap|{}|error|{}", name, function_name,
+                       api_path, error);
+  }
+};
+} // namespace repertory
+
+NLOHMANN_JSON_NAMESPACE_BEGIN
+template <> struct adl_serializer<repertory::remote_server_event> {
+  static void to_json(json &data, const repertory::remote_server_event &value) {
+    data["api_path"] = value.api_path;
+    data["error"] = value.error;
+    data["function_name"] = value.function_name;
+  }
+
+  static void from_json(const json &data,
+                        repertory::remote_server_event &value) {
+    data.at("api_path").get_to<std::string>(value.api_path);
+    data.at("error").get_to<repertory::packet::error_type>(value.error);
+    data.at("function_name").get_to<std::string>(value.function_name);
+  }
+};
+NLOHMANN_JSON_NAMESPACE_END
+
+#endif // REPERTORY_INCLUDE_EVENTS_TYPES_REMOTE_SERVER_EVENT_HPP_
--- a/repertory/librepertory/include/events/types/repertory_exception.hpp
+++ b/repertory/librepertory/include/events/types/repertory_exception.hpp
@ -31,13 +31,14 @@ struct repertory_exception final : public i_event {
  repertory_exception(std::string_view function_name_, std::string msg_)
      : function_name(std::string(function_name_)), msg(std::move(msg_)) {}

+  static constexpr const event_level level{event_level::error};
  static constexpr const std::string_view name{"repertory_exception"};

  std::string function_name;
  std::string msg;

  [[nodiscard]] auto get_event_level() const -> event_level override {
-    return event_level::error;
+    return level;
  }

  [[nodiscard]] auto get_name() const -> std::string_view override {
--- a/repertory/librepertory/include/events/types/service_start_begin.hpp
+++ b/repertory/librepertory/include/events/types/service_start_begin.hpp
@ -33,13 +33,14 @@ struct service_start_begin final : public i_event {
      : function_name(std::string(function_name_)),
        service_name(std::move(service_name_)) {}

+  static constexpr const event_level level{event_level::debug};
  static constexpr const std::string_view name{"service_start_begin"};

  std::string function_name;
  std::string service_name;

  [[nodiscard]] auto get_event_level() const -> event_level override {
-    return event_level::debug;
+    return level;
  }

  [[nodiscard]] auto get_name() const -> std::string_view override {
--- a/repertory/librepertory/include/events/types/service_start_end.hpp
+++ b/repertory/librepertory/include/events/types/service_start_end.hpp
@ -32,13 +32,14 @@ struct service_start_end final : public i_event {
      : function_name(std::string(function_name_)),
        service_name(std::move(service_name_)) {}

+  static constexpr const event_level level{event_level::debug};
  static constexpr const std::string_view name{"service_start_end"};

  std::string function_name;
  std::string service_name;

  [[nodiscard]] auto get_event_level() const -> event_level override {
-    return event_level::debug;
+    return level;
  }

  [[nodiscard]] auto get_name() const -> std::string_view override {
--- a/repertory/librepertory/include/events/types/service_stop_begin.hpp
+++ b/repertory/librepertory/include/events/types/service_stop_begin.hpp
@ -32,13 +32,14 @@ struct service_stop_begin final : public i_event {
      : function_name(std::string(function_name_)),
        service_name(std::move(service_name_)) {}

+  static constexpr const event_level level{event_level::debug};
  static constexpr const std::string_view name{"service_stop_begin"};

  std::string function_name;
  std::string service_name;

  [[nodiscard]] auto get_event_level() const -> event_level override {
-    return event_level::debug;
+    return level;
  }

  [[nodiscard]] auto get_name() const -> std::string_view override {
--- a/repertory/librepertory/include/events/types/service_stop_end.hpp
+++ b/repertory/librepertory/include/events/types/service_stop_end.hpp
@ -32,13 +32,14 @@ struct service_stop_end final : public i_event {
      : function_name(std::string(function_name_)),
        service_name(std::move(service_name_)) {}

+  static constexpr const event_level level{event_level::debug};
  static constexpr const std::string_view name{"service_stop_end"};

  std::string function_name;
  std::string service_name;

  [[nodiscard]] auto get_event_level() const -> event_level override {
-    return event_level::debug;
+    return level;
  }

  [[nodiscard]] auto get_name() const -> std::string_view override {
--- a/repertory/librepertory/include/events/types/unmount_requested.hpp
+++ b/repertory/librepertory/include/events/types/unmount_requested.hpp
@ -31,12 +31,13 @@ struct unmount_requested final : public i_event {
  unmount_requested(std::string_view function_name_)
      : function_name(std::string(function_name_)) {}

+  static constexpr const event_level level{event_level::info};
  static constexpr const std::string_view name{"unmount_requested"};

  std::string function_name;

  [[nodiscard]] auto get_event_level() const -> event_level override {
-    return event_level::info;
+    return level;
  }

  [[nodiscard]] auto get_name() const -> std::string_view override {
--- a/repertory/librepertory/include/events/types/unmount_result.hpp
+++ b/repertory/librepertory/include/events/types/unmount_result.hpp
@ -35,6 +35,7 @@ struct unmount_result final : public i_event {
        mount_location(std::move(mount_location_)),
        result(result_) {}

+  static constexpr const event_level level{event_level::info};
  static constexpr const std::string_view name{"unmount_result"};

  std::string function_name;
@ -42,7 +43,7 @@ struct unmount_result final : public i_event {
  std::int32_t result{};

  [[nodiscard]] auto get_event_level() const -> event_level override {
-    return event_level::info;
+    return level;
  }

  [[nodiscard]] auto get_name() const -> std::string_view override {
--- a/repertory/librepertory/include/events/types/winfsp_event.hpp
+++ b/repertory/librepertory/include/events/types/winfsp_event.hpp
@ -0,0 +1,77 @@
+/*
+  Copyright <2018-2025> <scott.e.graves@protonmail.com>
+
+  Permission is hereby granted, free of charge, to any person obtaining a copy
+  of this software and associated documentation files (the "Software"), to deal
+  in the Software without restriction, including without limitation the rights
+  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+  copies of the Software, and to permit persons to whom the Software is
+  furnished to do so, subject to the following conditions:
+
+  The above copyright notice and this permission notice shall be included in all
+  copies or substantial portions of the Software.
+
+  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+  SOFTWARE.
+*/
+#ifndef REPERTORY_INCLUDE_EVENTS_TYPES_WINFSP_EVENT_HPP_
+#define REPERTORY_INCLUDE_EVENTS_TYPES_WINFSP_EVENT_HPP_
+#if defined(_WIN32)
+
+#include "events/i_event.hpp"
+#include "types/repertory.hpp"
+
+namespace repertory {
+struct winfsp_event final : public i_event {
+  winfsp_event() = default;
+  winfsp_event(std::string api_path_, NTSTATUS error_,
+               std::string_view function_name_)
+      : api_path(std::move(api_path_)),
+        error(error_),
+        function_name(std::string{function_name_}) {}
+
+  static constexpr const event_level level{event_level::debug};
+  static constexpr const std::string_view name{"winfsp_event"};
+
+  std::string api_path;
+  NTSTATUS error{};
+  std::string function_name;
+
+  [[nodiscard]] auto get_event_level() const -> event_level override {
+    return level;
+  }
+
+  [[nodiscard]] auto get_name() const -> std::string_view override {
+    return name;
+  }
+
+  [[nodiscard]] auto get_single_line() const -> std::string override {
+    return fmt::format("{}|func|{}|ap|{}|error|{}", name, function_name,
+                       api_path, error);
+  }
+};
+} // namespace repertory
+
+NLOHMANN_JSON_NAMESPACE_BEGIN
+template <> struct adl_serializer<repertory::winfsp_event> {
+  static void to_json(json &data, const repertory::winfsp_event &value) {
+    data["api_path"] = value.api_path;
+    data["error"] = value.error;
+    data["function_name"] = value.function_name;
+  }
+
+  static void from_json(const json &data, repertory::winfsp_event &value) {
+    data.at("api_path").get_to<std::string>(value.api_path);
+    data.at("error").get_to<NTSTATUS>(value.error);
+    data.at("function_name").get_to<std::string>(value.function_name);
+  }
+};
+NLOHMANN_JSON_NAMESPACE_END
+
+#endif // defined(_WIN32)
+#endif // REPERTORY_INCLUDE_EVENTS_TYPES_WINFSP_EVENT_HPP_
--- a/repertory/librepertory/include/platform/platform.hpp
+++ b/repertory/librepertory/include/platform/platform.hpp
@ -22,6 +22,13 @@
 #ifndef REPERTORY_INCLUDE_PLATFORM_PLATFORM_HPP_
 #define REPERTORY_INCLUDE_PLATFORM_PLATFORM_HPP_

+#include "types/repertory.hpp"
+
+namespace repertory {
+[[nodiscard]] auto create_lock_id(provider_type prov,
+                                  std::string_view unique_id)->std::string;
+}
+
 #if defined(_WIN32)
 #include "platform/win32_platform.hpp"
 #include "utils/windows.hpp"
--- a/repertory/librepertory/include/platform/unix_platform.hpp
+++ b/repertory/librepertory/include/platform/unix_platform.hpp
@ -30,38 +30,45 @@ class i_provider;

 class lock_data final {
 public:
-  explicit lock_data(const provider_type &pt, std::string unique_id /*= ""*/);
+  lock_data(provider_type prov, std::string_view unique_id);

-  lock_data();
+  lock_data(const lock_data &) = delete;
+  lock_data(lock_data &&) = delete;
+
+  auto operator=(const lock_data &) -> lock_data & = delete;
+  auto operator=(lock_data &&) -> lock_data & = delete;

  ~lock_data();

 private:
-  const provider_type pt_;
-  const std::string unique_id_;
-  const std::string mutex_id_;
-  int lock_fd_;
-  int lock_status_ = EWOULDBLOCK;
+  std::string mutex_id_;
+
+private:
+  int handle_{};
+  int lock_status_{EWOULDBLOCK};

 private:
  [[nodiscard]] static auto get_state_directory() -> std::string;

-  [[nodiscard]] static auto get_lock_data_file() -> std::string;
+  [[nodiscard]] auto get_lock_data_file() const -> std::string;

-  [[nodiscard]] auto get_lock_file() -> std::string;
+  [[nodiscard]] auto get_lock_file() const -> std::string;

 private:
-  [[nodiscard]] static auto
-  wait_for_lock(int fd, std::uint8_t retry_count = 30u) -> int;
+  [[nodiscard]] static auto wait_for_lock(int handle,
+                                          std::uint8_t retry_count = 30U)
+      -> int;

 public:
  [[nodiscard]] auto get_mount_state(json &mount_state) -> bool;

-  [[nodiscard]] auto grab_lock(std::uint8_t retry_count = 30u) -> lock_result;
+  [[nodiscard]] auto grab_lock(std::uint8_t retry_count = 30U) -> lock_result;
+
+  void release();

  [[nodiscard]] auto set_mount_state(bool active,
-                                     const std::string &mount_location,
-                                     int pid) -> bool;
+                                     std::string_view mount_location, int pid)
+      -> bool;
 };

 [[nodiscard]] auto create_meta_attributes(
@ -76,5 +83,5 @@ public:
                                         const api_file &file) -> api_error;
 } // namespace repertory

-#endif // _WIN32
+#endif // !defined(_WIN32)
 #endif // REPERTORY_INCLUDE_PLATFORM_UNIXPLATFORM_HPP_
--- a/repertory/librepertory/include/platform/win32_platform.hpp
+++ b/repertory/librepertory/include/platform/win32_platform.hpp
@ -23,7 +23,6 @@
 #define REPERTORY_INCLUDE_PLATFORM_WINPLATFORM_HPP_
 #if defined(_WIN32)

-#include "app_config.hpp"
 #include "types/repertory.hpp"

 namespace repertory {
@ -31,43 +30,32 @@ class i_provider;

 class lock_data final {
 public:
-  explicit lock_data(const provider_type &pt, std::string unique_id /*= ""*/)
-      : pt_(pt),
-        unique_id_(std::move(unique_id)),
-        mutex_id_("repertory_" + app_config::get_provider_name(pt) + "_" +
-                  unique_id_),
-        mutex_handle_(::CreateMutex(nullptr, FALSE, &mutex_id_[0u])) {}
+  explicit lock_data(provider_type prov, std::string unique_id);
+  lock_data(const lock_data &) = delete;
+  lock_data(lock_data &&) = delete;

-  lock_data()
-      : pt_(provider_type::sia),
-        unique_id_(""),
-        mutex_id_(""),
-        mutex_handle_(INVALID_HANDLE_VALUE) {}
+  ~lock_data();

-  ~lock_data() { release(); }
+  auto operator=(const lock_data &) -> lock_data & = delete;
+  auto operator=(lock_data &&) -> lock_data & = delete;

 private:
-  const provider_type pt_;
-  const std::string unique_id_;
-  const std::string mutex_id_;
-  HANDLE mutex_handle_;
-  DWORD mutex_state_ = WAIT_FAILED;
+  std::string mutex_id_;
+  HANDLE mutex_handle_{INVALID_HANDLE_VALUE};
+  DWORD mutex_state_{WAIT_FAILED};
+
+  [[nodiscard]] auto get_current_mount_state(json &mount_state) -> bool;

 public:
-  [[nodiscard]] auto get_mount_state(const provider_type &pt,
-                                     json &mount_state) -> bool;
-
  [[nodiscard]] auto get_mount_state(json &mount_state) -> bool;

-  [[nodiscard]] auto get_unique_id() const -> std::string { return unique_id_; }
-
-  [[nodiscard]] auto grab_lock(std::uint8_t retry_count = 30) -> lock_result;
+  [[nodiscard]] auto grab_lock(std::uint8_t retry_count = 30U) -> lock_result;

  void release();

  [[nodiscard]] auto set_mount_state(bool active,
-                                     const std::string &mount_location,
-                                     const std::int64_t &pid) -> bool;
+                                     std::string_view mount_location,
+                                     std::int64_t pid) -> bool;
 };

 [[nodiscard]] auto create_meta_attributes(
--- a/repertory/librepertory/include/providers/encrypt/encrypt_provider.hpp
+++ b/repertory/librepertory/include/providers/encrypt/encrypt_provider.hpp
@ -85,6 +85,13 @@ private:
  void remove_deleted_files(stop_type &stop_requested);

 public:
+  [[nodiscard]] auto check_version(std::string &required_version,
+                                   std::string &returned_version) const
+      -> bool override {
+    required_version = returned_version = "";
+    return true;
+  }
+
  [[nodiscard]] auto create_directory(const std::string &api_path,
                                      api_meta_map &meta) -> api_error override;

--- a/repertory/librepertory/include/providers/i_provider.hpp
+++ b/repertory/librepertory/include/providers/i_provider.hpp
@ -31,6 +31,10 @@ class i_provider {
  INTERFACE_SETUP(i_provider);

 public:
+  [[nodiscard]] virtual auto check_version(std::string &required_version,
+                                           std::string &returned_version) const
+      -> bool = 0;
+
  [[nodiscard]] virtual auto create_directory(const std::string &api_path,
                                              api_meta_map &meta)
      -> api_error = 0;
--- a/repertory/librepertory/include/providers/s3/s3_provider.hpp
+++ b/repertory/librepertory/include/providers/s3/s3_provider.hpp
@ -113,6 +113,13 @@ protected:
      -> api_error override;

 public:
+  [[nodiscard]] auto check_version(std::string &required_version,
+                                   std::string &returned_version) const
+      -> bool override {
+    required_version = returned_version = "";
+    return true;
+  }
+
  [[nodiscard]] static auto convert_api_date(std::string_view date)
      -> std::uint64_t;

--- a/repertory/librepertory/include/providers/sia/sia_provider.hpp
+++ b/repertory/librepertory/include/providers/sia/sia_provider.hpp
@ -80,6 +80,10 @@ protected:
      -> api_error override;

 public:
+  [[nodiscard]] auto check_version(std::string &required_version,
+                                   std::string &returned_version) const
+      -> bool override;
+
  [[nodiscard]] auto get_directory_item_count(const std::string &api_path) const
      -> std::uint64_t override;

--- a/repertory/librepertory/include/rpc/client/client.hpp
+++ b/repertory/librepertory/include/rpc/client/client.hpp
@ -31,34 +31,34 @@ public:

 private:
  const rpc_host_info host_info_;
-  std::atomic<std::uint32_t> request_id_;
+  std::atomic<std::uint32_t> request_id_{0U};

 public:
  [[nodiscard]] auto get_drive_information() -> rpc_response;

  [[nodiscard]] auto get_config() -> rpc_response;

-  [[nodiscard]] auto
-  get_config_value_by_name(const std::string &name) -> rpc_response;
+  [[nodiscard]] auto get_config_value_by_name(const std::string &name)
+      -> rpc_response;

-  [[nodiscard]] auto
-  get_directory_items(const std::string &api_path) -> rpc_response;
+  [[nodiscard]] auto get_directory_items(const std::string &api_path)
+      -> rpc_response;

  [[nodiscard]] auto get_open_files() -> rpc_response;

  [[nodiscard]] auto get_pinned_files() -> rpc_response;

-  [[nodiscard]] auto pin_file(const std::string &api_file) -> rpc_response;
+  [[nodiscard]] auto pin_file(const std::string &api_path) -> rpc_response;

-  [[nodiscard]] auto pinned_status(const std::string &api_file) -> rpc_response;
+  [[nodiscard]] auto pinned_status(const std::string &api_path) -> rpc_response;

-  [[nodiscard]] auto
-  set_config_value_by_name(const std::string &name,
-                           const std::string &value) -> rpc_response;
+  [[nodiscard]] auto set_config_value_by_name(const std::string &name,
+                                              const std::string &value)
+      -> rpc_response;

  [[nodiscard]] auto unmount() -> rpc_response;

-  [[nodiscard]] auto unpin_file(const std::string &api_file) -> rpc_response;
+  [[nodiscard]] auto unpin_file(const std::string &api_path) -> rpc_response;
 };
 } // namespace repertory

--- a/repertory/librepertory/include/rpc/common.hpp
+++ b/repertory/librepertory/include/rpc/common.hpp
@ -0,0 +1,82 @@
+/*
+  Copyright <2018-2025> <scott.e.graves@protonmail.com>
+
+  Permission is hereby granted, free of charge, to any person obtaining a copy
+  of this software and associated documentation files (the "Software"), to deal
+  in the Software without restriction, including without limitation the rights
+  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+  copies of the Software, and to permit persons to whom the Software is
+  furnished to do so, subject to the following conditions:
+
+  The above copyright notice and this permission notice shall be included in all
+  copies or substantial portions of the Software.
+
+  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+  SOFTWARE.
+*/
+#ifndef REPERTORY_INCLUDE_RPC_COMMON_HPP_
+#define REPERTORY_INCLUDE_RPC_COMMON_HPP_
+
+#include "utils/base64.hpp"
+#include "utils/error_utils.hpp"
+#include "utils/string.hpp"
+
+namespace repertory::rpc {
+[[nodiscard]] auto check_authorization(const auto &cfg,
+                                       const httplib::Request &req) -> bool {
+  REPERTORY_USES_FUNCTION_NAME();
+
+  if (cfg.get_api_password().empty() || cfg.get_api_user().empty()) {
+    utils::error::raise_error(function_name,
+                              "authorization user or password is not set");
+    return false;
+  }
+
+  auto authorization = req.get_header_value("Authorization");
+  if (authorization.empty()) {
+    utils::error::raise_error(function_name,
+                              "'Authorization' header is not set");
+    return false;
+  }
+
+  auto auth_parts = utils::string::split(authorization, ' ', true);
+  if (auth_parts.empty()) {
+    utils::error::raise_error(function_name, "'Authorization' header is empty");
+    return false;
+  }
+
+  auto auth_type = auth_parts[0U];
+  if (auth_type != "Basic") {
+    utils::error::raise_error(function_name,
+                              "authorization type is not 'Basic'");
+    return false;
+  }
+
+  auto data = macaron::Base64::Decode(authorization.substr(6U));
+  auto auth_str = std::string(data.begin(), data.end());
+
+  auto auth = utils::string::split(auth_str, ':', false);
+  if (auth.size() < 2U) {
+    utils::error::raise_error(function_name, "authorization data is not valid");
+    return false;
+  }
+
+  auto user = auth.at(0U);
+  auth.erase(auth.begin());
+
+  auto pwd = utils::string::join(auth, ':');
+  if ((user != cfg.get_api_user()) || (pwd != cfg.get_api_password())) {
+    utils::error::raise_error(function_name, "authorization failed");
+    return false;
+  }
+
+  return true;
+}
+} // namespace repertory::rpc
+
+#endif // REPERTORY_INCLUDE_RPC_COMMON_HPP_
--- a/repertory/librepertory/include/rpc/server/server.hpp
+++ b/repertory/librepertory/include/rpc/server/server.hpp
@ -40,8 +40,6 @@ private:
  std::mutex start_stop_mutex_;

 private:
-  [[nodiscard]] auto check_authorization(const httplib::Request &req) -> bool;
-
  void handle_get_config(const httplib::Request &req, httplib::Response &res);

  void handle_get_config_value_by_name(const httplib::Request &req,
--- a/repertory/librepertory/include/types/repertory.hpp
+++ b/repertory/librepertory/include/types/repertory.hpp
@ -23,30 +23,29 @@
 #define REPERTORY_INCLUDE_TYPES_REPERTORY_HPP_

 namespace repertory {
-constexpr const auto default_api_auth_size{48U};
-constexpr const auto default_download_timeout_ces{30U};
+constexpr const auto default_api_password_size{48U};
+constexpr const auto default_download_timeout_secs{30U};
 constexpr const auto default_eviction_delay_mins{1U};
-constexpr const auto default_high_freq_interval_secs{30U};
-constexpr const auto default_low_freq_interval_secs{0U * 60U};
+constexpr const auto default_high_freq_interval_secs{std::uint16_t{30U}};
+constexpr const auto default_low_freq_interval_secs{std::uint16_t(60U * 60U)};
 constexpr const auto default_max_cache_size_bytes{
-    std::uint64_t(20UL * 1024UL * 1024UL * 1024UL),
+    std::uint64_t(20ULL * 1024ULL * 1024ULL * 1024ULL),
 };
 constexpr const auto default_max_upload_count{5U};
-constexpr const auto default_med_freq_interval_secs{2U * 60U};
+constexpr const auto default_med_freq_interval_secs{std::uint16_t{2U * 60U}};
 constexpr const auto default_online_check_retry_secs{60U};
-constexpr const auto default_orphaned_file_retention_days{15U};
 constexpr const auto default_retry_read_count{6U};
 constexpr const auto default_ring_buffer_file_size{512U};
 constexpr const auto default_task_wait_ms{100U};
 constexpr const auto default_timeout_ms{60000U};
-constexpr const auto max_orphaned_file_retention_days{std::uint16_t(31U)};
+constexpr const auto default_ui_mgmt_port{std::uint16_t{30000U}};
 constexpr const auto max_ring_buffer_file_size{std::uint16_t(1024U)};
 constexpr const auto max_s3_object_name_length{1024U};
 constexpr const auto min_cache_size_bytes{
-    std::uint64_t(100UL * 1024UL * 1024UL)};
+    std::uint64_t(100ULL * 1024ULL * 1024ULL),
+};
 constexpr const auto min_download_timeout_secs{std::uint8_t(5U)};
 constexpr const auto min_online_check_retry_secs{std::uint16_t(15U)};
-constexpr const auto min_orphaned_file_retention_days{std::uint16_t(1U)};
 constexpr const auto min_retry_read_count{std::uint16_t(2U)};
 constexpr const auto min_ring_buffer_file_size{std::uint16_t(64U)};
 constexpr const auto min_task_wait_ms{std::uint16_t(50U)};
@ -282,6 +281,8 @@ enum class exit_code : std::int32_t {
  pin_failed = -16,
  unpin_failed = -17,
  init_failed = -18,
+  ui_mount_failed = -19,
+  exception = -20,
 };

 enum http_error_codes : std::int32_t {
@ -306,6 +307,18 @@ enum class provider_type : std::size_t {
  unknown,
 };

+[[nodiscard]] auto
+provider_type_from_string(std::string_view type,
+                          provider_type default_type = provider_type::unknown)
+    -> provider_type;
+
+[[nodiscard]] auto provider_type_to_string(provider_type type) -> std::string;
+
+void clean_json_config(provider_type prov, nlohmann::json &data);
+
+[[nodiscard]] auto clean_json_value(std::string_view name,
+                                    std::string_view data) -> std::string;
+
 #if defined(_WIN32)
 struct open_file_data final {
  PVOID directory_buffer{nullptr};
@ -332,7 +345,6 @@ struct directory_item final {
  bool directory{false};
  std::uint64_t size{};
  api_meta_map meta;
-  bool resolved{false};
 };

 struct encrypt_config final {
@ -455,7 +467,6 @@ using meta_provider_callback = std::function<void(directory_item &)>;

 inline constexpr const auto JSON_ACCESS_KEY{"AccessKey"};
 inline constexpr const auto JSON_AGENT_STRING{"AgentString"};
-inline constexpr const auto JSON_API_AUTH{"ApiAuth"};
 inline constexpr const auto JSON_API_PARENT{"ApiParent"};
 inline constexpr const auto JSON_API_PASSWORD{"ApiPassword"};
 inline constexpr const auto JSON_API_PATH{"ApiPath"};
@ -490,10 +501,9 @@ inline constexpr const auto JSON_MAX_UPLOAD_COUNT{"MaxUploadCount"};
 inline constexpr const auto JSON_MED_FREQ_INTERVAL_SECS{
    "MedFreqIntervalSeconds"};
 inline constexpr const auto JSON_META{"Meta"};
+inline constexpr const auto JSON_MOUNT_LOCATIONS{"MountLocations"};
 inline constexpr const auto JSON_ONLINE_CHECK_RETRY_SECS{
    "OnlineCheckRetrySeconds"};
-inline constexpr const auto JSON_ORPHANED_FILE_RETENTION_DAYS{
-    "OrphanedFileRetentionDays"};
 inline constexpr const auto JSON_PATH{"Path"};
 inline constexpr const auto JSON_PREFERRED_DOWNLOAD_TYPE{
    "PreferredDownloadType"};
@ -618,6 +628,16 @@ template <typename data_t> struct adl_serializer<repertory::atomic<data_t>> {
  }
 };

+template <> struct adl_serializer<std::atomic<std::uint64_t>> {
+  static void to_json(json &data, const std::atomic<std::uint64_t> &value) {
+    data = value.load();
+  }
+
+  static void from_json(const json &data, std::atomic<std::uint64_t> &value) {
+    value.store(data.get<std::uint64_t>());
+  }
+};
+
 template <typename primitive_t>
 struct adl_serializer<std::atomic<primitive_t>> {
  static void to_json(json &data, const std::atomic<primitive_t> &value) {
@ -641,6 +661,18 @@ template <> struct adl_serializer<std::atomic<repertory::database_type>> {
  }
 };

+template <> struct adl_serializer<std::atomic<repertory::event_level>> {
+  static void to_json(json &data,
+                      const std::atomic<repertory::event_level> &value) {
+    data = repertory::event_level_to_string(value.load());
+  }
+
+  static void from_json(const json &data,
+                        std::atomic<repertory::event_level> &value) {
+    value.store(repertory::event_level_from_string(data.get<std::string>()));
+  }
+};
+
 template <> struct adl_serializer<std::atomic<repertory::download_type>> {
  static void to_json(json &data,
                      const std::atomic<repertory::download_type> &value) {
@ -673,15 +705,13 @@ template <> struct adl_serializer<repertory::download_type> {
  }
 };

-template <> struct adl_serializer<std::atomic<repertory::event_level>> {
-  static void to_json(json &data,
-                      const std::atomic<repertory::event_level> &value) {
-    data = repertory::event_level_to_string(value.load());
+template <> struct adl_serializer<repertory::event_level> {
+  static void to_json(json &data, const repertory::event_level &value) {
+    data = repertory::event_level_to_string(value);
  }

-  static void from_json(const json &data,
-                        std::atomic<repertory::event_level> &value) {
-    value.store(repertory::event_level_from_string(data.get<std::string>()));
+  static void from_json(const json &data, repertory::event_level &value) {
+    value = repertory::event_level_from_string(data.get<std::string>());
  }
 };
 NLOHMANN_JSON_NAMESPACE_END
--- a/repertory/librepertory/include/utils/cli_utils.hpp
+++ b/repertory/librepertory/include/utils/cli_utils.hpp
@ -49,6 +49,8 @@ static const option password_option = {"-pw", "--password"};
 static const option remote_mount_option = {"-rm", "--remote_mount"};
 static const option set_option = {"-set", "--set"};
 static const option status_option = {"-status", "--status"};
+static const option ui_option = {"-ui", "--ui"};
+static const option ui_port_option = {"-up", "--ui_port"};
 static const option unmount_option = {"-unmount", "--unmount"};
 static const option unpin_file_option = {"-uf", "--unpin_file"};
 static const option user_option = {"-us", "--user"};
@ -75,6 +77,8 @@ static const std::vector<option> option_list = {
    remote_mount_option,
    set_option,
    status_option,
+    ui_option,
+    ui_port_option,
    unmount_option,
    unpin_file_option,
    user_option,
@ -87,26 +91,27 @@ void get_api_authentication_data(std::string &user, std::string &password,
                                 std::uint16_t &port, const provider_type &prov,
                                 const std::string &data_directory);

-[[nodiscard]] auto
-get_provider_type_from_args(std::vector<const char *> args) -> provider_type;
+[[nodiscard]] auto get_provider_type_from_args(std::vector<const char *> args)
+    -> provider_type;

 [[nodiscard]] auto has_option(std::vector<const char *> args,
                              const std::string &option_name) -> bool;

-[[nodiscard]] auto has_option(std::vector<const char *> args,
-                              const option &opt) -> bool;
+[[nodiscard]] auto has_option(std::vector<const char *> args, const option &opt)
+    -> bool;

 [[nodiscard]] auto parse_option(std::vector<const char *> args,
                                const std::string &option_name,
                                std::uint8_t count) -> std::vector<std::string>;

 [[nodiscard]] auto parse_string_option(std::vector<const char *> args,
-                                       const option &opt,
-                                       std::string &value) -> exit_code;
+                                       const option &opt, std::string &value)
+    -> exit_code;

-[[nodiscard]] auto
-parse_drive_options(std::vector<const char *> args, provider_type &prov,
-                    std::string &data_directory) -> std::vector<std::string>;
+[[nodiscard]] auto parse_drive_options(std::vector<const char *> args,
+                                       provider_type &prov,
+                                       std::string &data_directory)
+    -> std::vector<std::string>;
 } // namespace repertory::utils::cli

 #endif // REPERTORY_INCLUDE_UTILS_CLI_UTILS_HPP_
--- a/repertory/librepertory/include/utils/timeout.hpp
+++ b/repertory/librepertory/include/utils/timeout.hpp
@ -32,13 +32,13 @@ public:

 public:
  timeout(std::function<void()> timeout_callback,
-          const std::chrono::system_clock::duration &duration = 10s);
+          std::chrono::system_clock::duration duration);

  ~timeout() { disable(); }

 private:
  std::atomic<bool> timeout_killed_;
-  std::unique_ptr<std::thread> timeout_thread_;
+  std::unique_ptr<std::thread> timeout_thread_{nullptr};
  std::mutex timeout_mutex_;
  std::condition_variable timeout_notify_;

--- a/Show More
+++ b/Show More