v2.0.4-rc (#37 )

# Changelog ## v2.0.4-rc ### BREAKING CHANGES * `renterd` v2.0.0+ is now required. Prior versions will fail to mount. ### 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 Reviewed-on: #37
v2.0.3-rc (#32 )
2025-02-22 09:48:00 -06:00 · 2025-02-11 17:26:24 -06:00
172 changed files with 4849 additions and 2263 deletions
--- a/.cspell/words.txt
+++ b/.cspell/words.txt
@@ -128,6 +128,7 @@ libcurl
 libdsm
 libevent
 libexample
+libexpat
 libfuse3
 libgmock
 libgtest
@@ -140,10 +141,12 @@ libuuid
 libuuid_include_dirs
 libvlc
 linkflags
+localappdata
 lptr
 lpwstr
 markdownlint
 mbig
+minio
 msvc
 msvcr120
 msys2
@@ -189,6 +192,7 @@ secp256k1
 secur32
 sfml_project
 shlwapi
+skynet
 source_subdir
 spdlog
 spdlog_project
@@ -200,6 +204,7 @@ stduuid_project
 strequal
 ularge_integer
 uring
+url
 userenv
 utimens_impl
 utimensat
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,13 +1,36 @@
 # Changelog

-## v2.0.3-rc
+## v2.0.4-rc
+
+### BREAKING CHANGES
+
+* `renterd` v2.0.0+ is now required. Prior versions will fail to mount.

 ### 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~~
+* \#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 +39,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,23 +1,22 @@
 # 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.

 ## 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)
+* Single application to mount S3 and/or Sia
+* 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
+* [Sia renterd](https://github.com/SiaFoundation/renterd/releases) v2.0.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)

@@ -25,47 +24,103 @@ on Windows.

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

 ## Usage

+### Sia
+
+* Initial Configuration
+  * Sia steps:
+    * Set the appropriate bucket name and `renterd` API password in `repertory` configuration:
+      * To use `default` as the bucket name and configuration name:
+        * `repertory -set HostConfig.ApiPassword '<my password>'`
+      * To use a different bucket name with `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>'`
+  * To verify/view all configuration options:
+    * `repertory -dc`
+    * `repertory --name '<my config name>' -dc`
+      * Example:
+        * `repertory --name default -dc`
+* Mounting on Linux:
+  * `repertory /mnt/location`
+  * `repertory --name '<my config name>' /mnt/location`
+    * Example:
+      * `repertory --name default /mnt/location`
+* Mounting on Windows:
+  * `repertory t:`
+  * `repertory --name '<my config name>' t:`
+    * Example:
+      * `repertory --name default t:`
+
+### S3
+
+* Initial Configuration
+  * S3 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`
+* Mounting on Linux:
+  * `repertory -s3 --name '<my config name>' /mnt/location`
+    * Example:
+      * `repertory -s3 --name minio /mnt/location`
+* Mounting on Windows:
+  * `repertory -s3 --name '<my config name>' t:`
+    * Example:
+      * `repertory -s3 --name minio t:`
+
 ### Notable 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
 * `--name, -na [name]`
  * 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
+### Data Directories

 * Linux
-  * `repertory /mnt/location`
-  * `repertory --name default /mnt/location`
+  * `~/.local/repertory2`
 * Windows
-  * `repertory.exe t:`
-  * `repertory.exe --name default t:`
+  * `%LOCALAPPDATA%\repertory2`
+    * Example:
+      * `C:\Users\Tom\AppData\Local\repertory2`
+    * 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.

-### S3
+## Remote Mounting

-* Linux 
-  * `repertory --name storj -s3 /mnt/location`
-* Windows
-  * `repertory.exe --name storj -s3 t:`
+`Repertory` allows local mounts to be shared with other computers on your network.
+This option is referred to as remote mounting. Instructions TBD.

 ## Compiling

@@ -94,17 +149,26 @@ on Windows.

 ## 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/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=4
 PROJECT_RELEASE_NUM=0
 PROJECT_RELEASE_ITER=rc

--- 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

--- 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

--- 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
--- a/repertory/librepertory/include/app_config.hpp
+++ b/repertory/librepertory/include/app_config.hpp
@@ -22,7 +22,6 @@
 #ifndef REPERTORY_INCLUDE_APP_CONFIG_HPP_
 #define REPERTORY_INCLUDE_APP_CONFIG_HPP_

-#include "events/event.hpp"
 #include "types/remote.hpp"
 #include "types/repertory.hpp"

@@ -92,7 +91,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_;
@@ -173,8 +171,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;
@@ -196,6 +192,9 @@ public:
  [[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();
@@ -240,8 +239,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/comm/curl/curl_comm.hpp
+++ b/repertory/librepertory/include/comm/curl/curl_comm.hpp
@@ -25,7 +25,7 @@
 #include "app_config.hpp"
 #include "comm/curl/multi_request.hpp"
 #include "comm/i_http_comm.hpp"
-#include "events/event_system2.hpp"
+#include "events/event_system.hpp"
 #include "events/types/curl_error.hpp"
 #include "utils/encryption.hpp"

@@ -225,7 +225,7 @@ public:
    }

    if (curl_code != CURLE_OK) {
-      event_system2::instance().raise<curl_error>(curl_code, function_name,
+      event_system::instance().raise<curl_error>(curl_code, function_name,
                                                  url);
      return false;
    }
--- 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 = 1ULL;
 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/fuse/fuse_base.hpp
+++ b/repertory/librepertory/include/drives/fuse/fuse_base.hpp
@@ -23,15 +23,15 @@
 #define REPERTORY_INCLUDE_DRIVES_FUSE_FUSE_BASE_HPP_
 #if !defined(_WIN32)

-#include "events/event_system2.hpp"
-#include "utils/path.hpp"
+#include "events/event_system.hpp"
+#include "types/repertory.hpp"

 namespace repertory {
 class app_config;
 class i_provider;

 class fuse_base {
-  E_CONSUMER2();
+  E_CONSUMER();

 public:
  explicit fuse_base(app_config &config);
@@ -51,8 +51,8 @@ private:
  std::string mount_location_;

 protected:
-  bool atime_enabled_ = true;
-  bool console_enabled_ = false;
+  bool atime_enabled_{true};
+  bool console_enabled_{false};
  std::optional<gid_t> forced_gid_;
  std::optional<uid_t> forced_uid_;
  std::optional<mode_t> forced_umask_;
@@ -61,7 +61,7 @@ private:
  static auto instance() -> fuse_base &;

 private:
-  struct fuse_operations fuse_ops_{};
+  struct fuse_operations fuse_ops_ {};

 private:
  [[nodiscard]] auto
@@ -78,9 +78,9 @@ private:
  static void execute_void_callback(std::string_view function_name,
                                    const std::function<void()> &cb);

-  static auto execute_void_pointer_callback(std::string_view function_name,
-                                            const std::function<void *()> &cb)
-      -> void *;
+  static auto
+  execute_void_pointer_callback(std::string_view function_name,
+                                const std::function<void *()> &cb) -> void *;

  void raise_fuse_event(std::string_view function_name,
                        std::string_view api_path, int ret,
@@ -104,8 +104,8 @@ private:
  [[nodiscard]] static auto chown_(const char *path, uid_t uid, gid_t gid,
                                   struct fuse_file_info *fi) -> int;
 #else
-  [[nodiscard]] static auto chown_(const char *path, uid_t uid, gid_t gid)
-      -> int;
+  [[nodiscard]] static auto chown_(const char *path, uid_t uid,
+                                   gid_t gid) -> int;
 #endif

  [[nodiscard]] static auto create_(const char *path, mode_t mode,
@@ -114,8 +114,8 @@ private:
  static void destroy_(void *ptr);

  [[nodiscard]] static auto fallocate_(const char *path, int mode, off_t offset,
-                                       off_t length, struct fuse_file_info *fi)
-      -> int;
+                                       off_t length,
+                                       struct fuse_file_info *fi) -> int;

 #if FUSE_USE_VERSION < 30
  [[nodiscard]] static auto fgetattr_(const char *path, struct stat *st,
@@ -156,8 +156,8 @@ private:

  [[nodiscard]] static auto mkdir_(const char *path, mode_t mode) -> int;

-  [[nodiscard]] static auto open_(const char *path, struct fuse_file_info *fi)
-      -> int;
+  [[nodiscard]] static auto open_(const char *path,
+                                  struct fuse_file_info *fi) -> int;

  [[nodiscard]] static auto opendir_(const char *path,
                                     struct fuse_file_info *fi) -> int;
@@ -174,8 +174,8 @@ private:
 #else
  [[nodiscard]] static auto readdir_(const char *path, void *buf,
                                     fuse_fill_dir_t fuse_fill_dir,
-                                     off_t offset, struct fuse_file_info *fi)
-      -> int;
+                                     off_t offset,
+                                     struct fuse_file_info *fi) -> int;
 #endif

  [[nodiscard]] static auto release_(const char *path,
@@ -207,8 +207,8 @@ private:
  [[nodiscard]] static auto listxattr_(const char *path, char *buffer,
                                       size_t size) -> int;

-  [[nodiscard]] static auto removexattr_(const char *path, const char *name)
-      -> int;
+  [[nodiscard]] static auto removexattr_(const char *path,
+                                         const char *name) -> int;

 #if defined(__APPLE__)
  [[nodiscard]] static auto setxattr_(const char *path, const char *name,
@@ -217,18 +217,17 @@ private:

 #else  // __APPLE__
  [[nodiscard]] static auto setxattr_(const char *path, const char *name,
-                                      const char *value, size_t size, int flags)
-      -> int;
+                                      const char *value, size_t size,
+                                      int flags) -> int;
 #endif // __APPLE__
 #endif // HAS_SETXATTR

 #if defined(__APPLE__)
-  [[nodiscard]] static auto setattr_x_(const char *path, struct setattr_x *attr)
-      -> int;
+  [[nodiscard]] static auto setattr_x_(const char *path,
+                                       struct setattr_x *attr) -> int;

-  [[nodiscard]] static auto setbkuptime_(const char *path,
-                                         const struct timespec *bkuptime)
-      -> int;
+  [[nodiscard]] static auto
+  setbkuptime_(const char *path, const struct timespec *bkuptime) -> int;

  [[nodiscard]] static auto setchgtime_(const char *path,
                                        const struct timespec *chgtime) -> int;
@@ -238,12 +237,12 @@ private:

  [[nodiscard]] static auto setvolname_(const char *volname) -> int;

-  [[nodiscard]] static auto statfs_x_(const char *path, struct statfs *stbuf)
-      -> int;
+  [[nodiscard]] static auto statfs_x_(const char *path,
+                                      struct statfs *stbuf) -> int;

 #else  // __APPLE__
-  [[nodiscard]] static auto statfs_(const char *path, struct statvfs *stbuf)
-      -> int;
+  [[nodiscard]] static auto statfs_(const char *path,
+                                    struct statvfs *stbuf) -> int;
 #endif // __APPLE__

 #if FUSE_USE_VERSION >= 30
@@ -269,8 +268,8 @@ private:
                                   struct fuse_file_info *fi) -> int;

 protected:
-  [[nodiscard]] virtual auto access_impl(std::string /*api_path*/, int /*mask*/)
-      -> api_error {
+  [[nodiscard]] virtual auto access_impl(std::string /*api_path*/,
+                                         int /*mask*/) -> api_error {
    return api_error::not_implemented;
  }

@@ -282,10 +281,9 @@ protected:
 #endif // __APPLE__

 #if FUSE_USE_VERSION >= 30
-  [[nodiscard]] virtual auto chmod_impl(std::string /*api_path*/,
-                                        mode_t /*mode*/,
-                                        struct fuse_file_info * /*fi*/)
-      -> api_error {
+  [[nodiscard]] virtual auto
+  chmod_impl(std::string /*api_path*/, mode_t /*mode*/,
+             struct fuse_file_info * /*fi*/) -> api_error {
    return api_error::not_implemented;
  }
 #else
@@ -296,10 +294,9 @@ protected:
 #endif

 #if FUSE_USE_VERSION >= 30
-  [[nodiscard]] virtual auto chown_impl(std::string /*api_path*/, uid_t /*uid*/,
-                                        gid_t /*gid*/,
-                                        struct fuse_file_info * /*fi*/)
-      -> api_error {
+  [[nodiscard]] virtual auto
+  chown_impl(std::string /*api_path*/, uid_t /*uid*/, gid_t /*gid*/,
+             struct fuse_file_info * /*fi*/) -> api_error {
    return api_error::not_implemented;
  }
 #else
@@ -309,10 +306,9 @@ protected:
  }
 #endif

-  [[nodiscard]] virtual auto create_impl(std::string /*api_path*/,
-                                         mode_t /*mode*/,
-                                         struct fuse_file_info * /*fi*/)
-      -> api_error {
+  [[nodiscard]] virtual auto
+  create_impl(std::string /*api_path*/, mode_t /*mode*/,
+              struct fuse_file_info * /*fi*/) -> api_error {
    return api_error::not_implemented;
  }

@@ -320,48 +316,43 @@ protected:

  [[nodiscard]] virtual auto
  fallocate_impl(std::string /*api_path*/, int /*mode*/, off_t /*offset*/,
-                 off_t /*length*/, struct fuse_file_info * /*fi*/)
-      -> api_error {
+                 off_t /*length*/,
+                 struct fuse_file_info * /*fi*/) -> api_error {
    return api_error::not_implemented;
  }

-  [[nodiscard]] virtual auto fgetattr_impl(std::string /*api_path*/,
-                                           struct stat * /*st*/,
-                                           struct fuse_file_info * /*fi*/)
-      -> api_error {
+  [[nodiscard]] virtual auto
+  fgetattr_impl(std::string /*api_path*/, struct stat * /*st*/,
+                struct fuse_file_info * /*fi*/) -> api_error {
    return api_error::not_implemented;
  }

 #if defined(__APPLE__)
-  [[nodiscard]] virtual auto fsetattr_x_impl(std::string /*api_path*/,
-                                             struct setattr_x * /*attr*/,
-                                             struct fuse_file_info * /*fi*/)
-      -> api_error {
+  [[nodiscard]] virtual auto
+  fsetattr_x_impl(std::string /*api_path*/, struct setattr_x * /*attr*/,
+                  struct fuse_file_info * /*fi*/) -> api_error {
    return api_error::not_implemented;
  }
 #endif // __APPLE__

-  [[nodiscard]] virtual auto fsync_impl(std::string /*api_path*/,
-                                        int /*datasync*/,
-                                        struct fuse_file_info * /*fi*/)
-      -> api_error {
+  [[nodiscard]] virtual auto
+  fsync_impl(std::string /*api_path*/, int /*datasync*/,
+             struct fuse_file_info * /*fi*/) -> api_error {
    return api_error::not_implemented;
  }

 #if FUSE_USE_VERSION < 30
-  [[nodiscard]] virtual auto ftruncate_impl(std::string /*api_path*/,
-                                            off_t /*size*/,
-                                            struct fuse_file_info * /*fi*/)
-      -> api_error {
+  [[nodiscard]] virtual auto
+  ftruncate_impl(std::string /*api_path*/, off_t /*size*/,
+                 struct fuse_file_info * /*fi*/) -> api_error {
    return api_error::not_implemented;
  }
 #endif

 #if FUSE_USE_VERSION >= 30
-  [[nodiscard]] virtual auto getattr_impl(std::string /*api_path*/,
-                                          struct stat * /*st*/,
-                                          struct fuse_file_info * /*fi*/)
-      -> api_error {
+  [[nodiscard]] virtual auto
+  getattr_impl(std::string /*api_path*/, struct stat * /*st*/,
+               struct fuse_file_info * /*fi*/) -> api_error {
    return api_error::not_implemented;
  }
 #else
@@ -372,17 +363,16 @@ protected:
 #endif

 #if defined(__APPLE__)
-  [[nodiscard]] virtual auto getxtimes_impl(std::string /*api_path*/,
-                                            struct timespec * /*bkuptime*/,
-                                            struct timespec * /*crtime*/)
-      -> api_error {
+  [[nodiscard]] virtual auto
+  getxtimes_impl(std::string /*api_path*/, struct timespec * /*bkuptime*/,
+                 struct timespec * /*crtime*/) -> api_error {
    return api_error::not_implemented;
  }
 #endif // __APPLE__

 #if FUSE_USE_VERSION >= 30
-  virtual auto init_impl(struct fuse_conn_info *conn, struct fuse_config *cfg)
-      -> void *;
+  virtual auto init_impl(struct fuse_conn_info *conn,
+                         struct fuse_config *cfg) -> void *;
 #else
  virtual auto init_impl(struct fuse_conn_info *conn) -> void *;
 #endif
@@ -392,15 +382,15 @@ protected:
    return api_error::not_implemented;
  }

-  [[nodiscard]] virtual auto open_impl(std::string /*api_path*/,
-                                       struct fuse_file_info * /*fi*/)
-      -> api_error {
+  [[nodiscard]] virtual auto
+  open_impl(std::string /*api_path*/,
+            struct fuse_file_info * /*fi*/) -> api_error {
    return api_error::not_implemented;
  }

-  [[nodiscard]] virtual auto opendir_impl(std::string /*api_path*/,
-                                          struct fuse_file_info * /*fi*/)
-      -> api_error {
+  [[nodiscard]] virtual auto
+  opendir_impl(std::string /*api_path*/,
+               struct fuse_file_info * /*fi*/) -> api_error {
    return api_error::not_implemented;
  }

@@ -415,8 +405,8 @@ protected:
  [[nodiscard]] virtual auto
  readdir_impl(std::string /*api_path*/, void * /*buf*/,
               fuse_fill_dir_t /*fuse_fill_dir*/, off_t /*offset*/,
-               struct fuse_file_info * /*fi*/, fuse_readdir_flags /*flags*/)
-      -> api_error {
+               struct fuse_file_info * /*fi*/,
+               fuse_readdir_flags /*flags*/) -> api_error {
    return api_error::not_implemented;
  }
 #else
@@ -428,15 +418,15 @@ protected:
  }
 #endif

-  [[nodiscard]] virtual auto release_impl(std::string /*api_path*/,
-                                          struct fuse_file_info * /*fi*/)
-      -> api_error {
+  [[nodiscard]] virtual auto
+  release_impl(std::string /*api_path*/,
+               struct fuse_file_info * /*fi*/) -> api_error {
    return api_error::not_implemented;
  }

-  [[nodiscard]] virtual auto releasedir_impl(std::string /*api_path*/,
-                                             struct fuse_file_info * /*fi*/)
-      -> api_error {
+  [[nodiscard]] virtual auto
+  releasedir_impl(std::string /*api_path*/,
+                  struct fuse_file_info * /*fi*/) -> api_error {
    return api_error::not_implemented;
  }

@@ -447,9 +437,9 @@ protected:
    return api_error::not_implemented;
  }
 #else
-  [[nodiscard]] virtual auto rename_impl(std::string /*from_api_path*/,
-                                         std::string /*to_api_path*/)
-      -> api_error {
+  [[nodiscard]] virtual auto
+  rename_impl(std::string /*from_api_path*/,
+              std::string /*to_api_path*/) -> api_error {
    return api_error::not_implemented;
  }
 #endif
@@ -469,8 +459,8 @@ protected:
 #else  // __APPLE__
  [[nodiscard]] virtual auto
  getxattr_impl(std::string /*api_path*/, const char * /*name*/,
-                char * /*value*/, size_t /*size*/, int & /*attribute_size*/)
-      -> api_error {
+                char * /*value*/, size_t /*size*/,
+                int & /*attribute_size*/) -> api_error {
    return api_error::not_implemented;
  }
 #endif // __APPLE__
@@ -481,9 +471,9 @@ protected:
    return api_error::not_implemented;
  }

-  [[nodiscard]] virtual auto removexattr_impl(std::string /*api_path*/,
-                                              const char * /*name*/)
-      -> api_error {
+  [[nodiscard]] virtual auto
+  removexattr_impl(std::string /*api_path*/,
+                   const char * /*name*/) -> api_error {
    return api_error::not_implemented;
  }

@@ -496,19 +486,20 @@ protected:
    return api_error::not_implemented;
  }
 #else  // __APPLE__
-  [[nodiscard]] virtual auto
-  setxattr_impl(std::string /*api_path*/, const char * /*name*/,
-                const char * /*value*/, size_t /*size*/, int /*flags*/)
-      -> api_error {
+  [[nodiscard]] virtual auto setxattr_impl(std::string /*api_path*/,
+                                           const char * /*name*/,
+                                           const char * /*value*/,
+                                           size_t /*size*/,
+                                           int /*flags*/) -> api_error {
    return api_error::not_implemented;
  }
 #endif // __APPLE__
 #endif // HAS_SETXATTR

 #if defined(__APPLE__)
-  [[nodiscard]] virtual auto setattr_x_impl(std::string /*api_path*/,
-                                            struct setattr_x * /*attr*/)
-      -> api_error {
+  [[nodiscard]] virtual auto
+  setattr_x_impl(std::string /*api_path*/,
+                 struct setattr_x * /*attr*/) -> api_error {
    return api_error::not_implemented;
  }

@@ -519,40 +510,39 @@ protected:
  }

  [[nodiscard]] virtual auto
-  setchgtime_impl(std::string /*api_path*/, const struct timespec * /*chgtime*/)
-      -> api_error {
+  setchgtime_impl(std::string /*api_path*/,
+                  const struct timespec * /*chgtime*/) -> api_error {
    return api_error::not_implemented;
  }

-  [[nodiscard]] virtual auto setcrtime_impl(std::string /*api_path*/,
-                                            const struct timespec * /*crtime*/)
-      -> api_error {
+  [[nodiscard]] virtual auto
+  setcrtime_impl(std::string /*api_path*/,
+                 const struct timespec * /*crtime*/) -> api_error {
    return api_error::not_implemented;
  }

-  [[nodiscard]] virtual auto setvolname_impl(const char * /*volname*/)
-      -> api_error {
+  [[nodiscard]] virtual auto
+  setvolname_impl(const char * /*volname*/) -> api_error {
    return api_error::not_implemented;
  }

-  [[nodiscard]] virtual auto statfs_x_impl(std::string /*api_path*/,
-                                           struct statfs * /*stbuf*/)
-      -> api_error {
+  [[nodiscard]] virtual auto
+  statfs_x_impl(std::string /*api_path*/,
+                struct statfs * /*stbuf*/) -> api_error {
    return api_error::not_implemented;
  }
 #else  // __APPLE__
-  [[nodiscard]] virtual auto statfs_impl(std::string /*api_path*/,
-                                         struct statvfs * /*stbuf*/)
-      -> api_error {
+  [[nodiscard]] virtual auto
+  statfs_impl(std::string /*api_path*/,
+              struct statvfs * /*stbuf*/) -> api_error {
    return api_error::not_implemented;
  }
 #endif // __APPLE__

 #if FUSE_USE_VERSION >= 30
-  [[nodiscard]] virtual auto truncate_impl(std::string /*api_path*/,
-                                           off_t /*size*/,
-                                           struct fuse_file_info * /*fi*/)
-      -> api_error {
+  [[nodiscard]] virtual auto
+  truncate_impl(std::string /*api_path*/, off_t /*size*/,
+                struct fuse_file_info * /*fi*/) -> api_error {
    return api_error::not_implemented;
  }
 #else
@@ -562,22 +552,21 @@ protected:
  }
 #endif

-  [[nodiscard]] virtual auto unlink_impl(std::string /*api_path*/)
-      -> api_error {
+  [[nodiscard]] virtual auto
+  unlink_impl(std::string /*api_path*/) -> api_error {
    return api_error::not_implemented;
  }

 #if FUSE_USE_VERSION >= 30
-  [[nodiscard]] virtual auto utimens_impl(std::string /*api_path*/,
-                                          const struct timespec /*tv*/[2],
-                                          struct fuse_file_info * /*fi*/)
-      -> api_error {
+  [[nodiscard]] virtual auto
+  utimens_impl(std::string /*api_path*/, const struct timespec /*tv*/[2],
+               struct fuse_file_info * /*fi*/) -> api_error {
    return api_error::not_implemented;
  }
 #else
-  [[nodiscard]] virtual auto utimens_impl(std::string /*api_path*/,
-                                          const struct timespec /*tv*/[2])
-      -> api_error {
+  [[nodiscard]] virtual auto
+  utimens_impl(std::string /*api_path*/,
+               const struct timespec /*tv*/[2]) -> api_error {
    return api_error::not_implemented;
  }
 #endif
@@ -585,8 +574,8 @@ protected:
  [[nodiscard]] virtual auto
  write_impl(std::string /*api_path*/, const char * /*buffer*/,
             size_t /*write_size*/, off_t /*write_offset*/,
-             struct fuse_file_info * /*fi*/, std::size_t & /*bytes_written*/)
-      -> api_error {
+             struct fuse_file_info * /*fi*/,
+             std::size_t & /*bytes_written*/) -> api_error {
    return api_error::not_implemented;
  }

--- a/repertory/librepertory/include/drives/fuse/remotefuse/remote_client.hpp
+++ b/repertory/librepertory/include/drives/fuse/remotefuse/remote_client.hpp
@@ -24,7 +24,7 @@

 #include "comm/packet/packet_client.hpp"
 #include "drives/fuse/remotefuse/i_remote_instance.hpp"
-#include "events/event_system2.hpp"
+#include "events/event_system.hpp"
 #include "types/remote.hpp"

 namespace repertory {
--- a/repertory/librepertory/include/drives/fuse/remotefuse/remote_fuse_drive.hpp
+++ b/repertory/librepertory/include/drives/fuse/remotefuse/remote_fuse_drive.hpp
@@ -25,7 +25,7 @@

 #include "drives/fuse/fuse_base.hpp"
 #include "drives/fuse/remotefuse/i_remote_instance.hpp"
-#include "events/event_system2.hpp"
+#include "events/event_system.hpp"

 namespace repertory {
 class app_config;
--- a/repertory/librepertory/include/drives/remote/remote_server_base.hpp
+++ b/repertory/librepertory/include/drives/remote/remote_server_base.hpp
@@ -29,7 +29,7 @@
 #include "drives/fuse/remotefuse/i_remote_instance.hpp"
 #include "drives/remote/remote_open_file_table.hpp"
 #include "drives/winfsp/remotewinfsp/i_remote_instance.hpp"
-#include "events/event_system2.hpp"
+#include "events/event_system.hpp"
 #include "events/types/service_start_begin.hpp"
 #include "events/types/service_start_end.hpp"
 #include "events/types/service_stop_begin.hpp"
@@ -58,7 +58,10 @@ public:
        drive_(drv),
        mount_location_(std::move(mount_location)),
        client_pool_(config.get_remote_mount().client_pool_size) {
-    event_system2::instance().raise<service_start_begin>("remote_server_base");
+    REPERTORY_USES_FUNCTION_NAME();
+
+    event_system::instance().raise<service_start_begin>(function_name,
+                                                        "remote_server_base");
    handler_lookup_.insert(
        {"::winfsp_can_delete",
         [this](std::uint32_t, const std::string &, std::uint64_t,
@@ -1375,14 +1378,19 @@ public:
                                       method, request, response,
                                       message_complete);
        });
-    event_system2::instance().raise<service_start_end>("remote_server_base");
+    event_system::instance().raise<service_start_end>(function_name,
+                                                      "remote_server_base");
  }

  ~remote_server_base() override {
-    event_system2::instance().raise<service_stop_begin>("remote_server_base");
+    REPERTORY_USES_FUNCTION_NAME();
+
+    event_system::instance().raise<service_stop_begin>(function_name,
+                                                       "remote_server_base");
    client_pool_.shutdown();
    packet_server_.reset();
-    event_system2::instance().raise<service_stop_end>("remote_server_base");
+    event_system::instance().raise<service_stop_end>(function_name,
+                                                     "remote_server_base");
  }

 public:
--- 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/drives/winfsp/remotewinfsp/remote_winfsp_drive.hpp
+++ b/repertory/librepertory/include/drives/winfsp/remotewinfsp/remote_winfsp_drive.hpp
@@ -24,7 +24,7 @@
 #if defined(_WIN32)

 #include "drives/winfsp/remotewinfsp/i_remote_instance.hpp"
-#include "events/event_system2.hpp"
+#include "events/event_system.hpp"

 namespace repertory {
 class app_config;
@@ -32,13 +32,13 @@ class lock_data;
 class server;
 namespace remote_winfsp {
 class remote_winfsp_drive final : public virtual FileSystemBase {
-  E_CONSUMER2();
+  E_CONSUMER();

 public:
  remote_winfsp_drive(app_config &config, remote_instance_factory factory,
                      lock_data &lock);

-  ~remote_winfsp_drive() override { E_CONSUMER2_RELEASE(); }
+  ~remote_winfsp_drive() override { E_CONSUMER_RELEASE(); }

 public:
  class winfsp_service : virtual public Service {
--- a/repertory/librepertory/include/drives/winfsp/winfsp_drive.hpp
+++ b/repertory/librepertory/include/drives/winfsp/winfsp_drive.hpp
@@ -26,7 +26,7 @@
 #include "drives/eviction.hpp"
 #include "drives/winfsp/i_winfsp_drive.hpp"
 #include "drives/winfsp/remotewinfsp/remote_server.hpp"
-#include "events/event_system2.hpp"
+#include "events/event_system.hpp"
 #include "file_manager/file_manager.hpp"
 #include "rpc/server/full_server.hpp"

@@ -37,12 +37,12 @@ class i_provider;

 class winfsp_drive final : public virtual i_winfsp_drive,
                           public virtual FileSystemBase {
-  E_CONSUMER2();
+  E_CONSUMER();

 public:
  winfsp_drive(app_config &config, lock_data &lockData, i_provider &provider);

-  ~winfsp_drive() override { E_CONSUMER2_RELEASE(); }
+  ~winfsp_drive() override { E_CONSUMER_RELEASE(); }

 private:
  class winfsp_service final : virtual public Service {
--- a/repertory/librepertory/include/events/consumers/console_consumer.hpp
+++ b/repertory/librepertory/include/events/consumers/console_consumer.hpp
@@ -22,12 +22,12 @@
 #ifndef REPERTORY_INCLUDE_EVENTS_CONSUMERS_CONSOLE_CONSUMER_HPP_
 #define REPERTORY_INCLUDE_EVENTS_CONSUMERS_CONSOLE_CONSUMER_HPP_

-#include "events/event_system2.hpp"
+#include "events/event_system.hpp"
 #include "types/repertory.hpp"

 namespace repertory {
 class console_consumer final {
-  E_CONSUMER2();
+  E_CONSUMER();

 public:
  console_consumer();
@@ -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
@@ -22,12 +22,12 @@
 #ifndef REPERTORY_INCLUDE_EVENTS_CONSUMERS_LOGGING_CONSUMER_HPP_
 #define REPERTORY_INCLUDE_EVENTS_CONSUMERS_LOGGING_CONSUMER_HPP_

-#include "events/event_system2.hpp"
+#include "events/event_system.hpp"
 #include "types/repertory.hpp"

 namespace repertory {
 class logging_consumer final {
-  E_CONSUMER2();
+  E_CONSUMER();

 public:
  logging_consumer(event_level level, std::string log_directory);
@@ -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_system2.hpp
+++ b/repertory/librepertory/include/events/event_system2.hpp
@@ -19,13 +19,13 @@
  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  SOFTWARE.
 */
-#ifndef REPERTORY_INCLUDE_EVENTS_EVENT_SYSTEM2_HPP_
-#define REPERTORY_INCLUDE_EVENTS_EVENT_SYSTEM2_HPP_
+#ifndef REPERTORY_INCLUDE_EVENTS_EVENT_SYSTEM_HPP_
+#define REPERTORY_INCLUDE_EVENTS_EVENT_SYSTEM_HPP_

 namespace repertory {
 class i_event;

-class event_system2 final {
+class event_system final {
 private:
  static constexpr const std::uint8_t max_queue_retry{
      30U,
@@ -40,37 +40,37 @@ private:
  };

 public:
-  event_system2(const event_system2 &) = delete;
-  event_system2(event_system2 &&) = delete;
-  auto operator=(const event_system2 &) -> event_system2 & = delete;
-  auto operator=(event_system2 &&) -> event_system2 & = delete;
+  event_system(const event_system &) = delete;
+  event_system(event_system &&) = delete;
+  auto operator=(const event_system &) -> event_system & = delete;
+  auto operator=(event_system &&) -> event_system & = delete;

 protected:
-  event_system2() = default;
+  event_system() = default;

-  ~event_system2() { stop(); }
+  ~event_system() { stop(); }

 public:
-  class event_consumer2 final {
+  class event_consumer final {
  public:
-    explicit event_consumer2(std::function<void(const i_event &)> callback)
+    explicit event_consumer(std::function<void(const i_event &)> callback)
        : callback_(std::move(callback)) {
-      event_system2::instance().attach(this);
+      event_system::instance().attach(this);
    }

-    event_consumer2(std::string_view event_name,
-                    std::function<void(const i_event &)> callback)
+    event_consumer(std::string_view event_name,
+                   std::function<void(const i_event &)> callback)
        : callback_(std::move(callback)) {
-      event_system2::instance().attach(event_name, this);
+      event_system::instance().attach(event_name, this);
    }

-    ~event_consumer2() { event_system2::instance().release(this); }
+    ~event_consumer() { event_system::instance().release(this); }

  public:
-    event_consumer2(const event_consumer2 &) = delete;
-    event_consumer2(event_consumer2 &&) = delete;
-    auto operator=(const event_consumer2 &) -> event_consumer2 & = delete;
-    auto operator=(event_consumer2 &&) -> event_consumer2 & = delete;
+    event_consumer(const event_consumer &) = delete;
+    event_consumer(event_consumer &&) = delete;
+    auto operator=(const event_consumer &) -> event_consumer & = delete;
+    auto operator=(event_consumer &&) -> event_consumer & = delete;

  private:
    std::function<void(const i_event &)> callback_;
@@ -80,13 +80,13 @@ public:
  };

 private:
-  static event_system2 instance_;
+  static event_system instance_;

 public:
-  [[nodiscard]] static auto instance() -> event_system2 &;
+  [[nodiscard]] static auto instance() -> event_system &;

 private:
-  std::unordered_map<std::string, std::deque<event_consumer2 *>>
+  std::unordered_map<std::string, std::deque<event_consumer *>>
      event_consumers_;
  std::recursive_mutex consumer_mutex_;
  std::vector<std::shared_ptr<i_event>> event_list_;
@@ -104,43 +104,38 @@ private:
  void queue_event(std::shared_ptr<i_event> evt);

 public:
-  void attach(event_consumer2 *consumer);
+  void attach(event_consumer *consumer);

-  void attach(std::string_view event_name, event_consumer2 *consumer);
+  void attach(std::string_view event_name, event_consumer *consumer);

  template <typename evt_t, typename... arg_t> void raise(arg_t &&...args) {
    queue_event(std::make_shared<evt_t>(std::forward<arg_t>(args)...));
  }

-  void release(event_consumer2 *consumer);
+  void release(event_consumer *consumer);

  void start();

  void stop();
 };

-using event_consumer2 = event_system2::event_consumer2;
-using event_consumer = event_system2::event_consumer2;
+using event_consumer = event_system::event_consumer;

-#define E_CONSUMER2()                                                          \
+#define E_CONSUMER()                                                           \
 private:                                                                       \
-  std::vector<std::shared_ptr<repertory::event_consumer2>> event_consumers2_
+  std::vector<std::shared_ptr<repertory::event_consumer>> event_consumers_

-#define E_CONSUMER2_RELEASE() event_consumers2_.clear()
+#define E_CONSUMER_RELEASE() event_consumers_.clear()

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

-#define E_SUBSCRIBE2_ALL(callback)                                             \
-  event_consumers2_.emplace_back(std::make_shared<repertory::event_consumer2>( \
+#define E_SUBSCRIBE_ALL(callback)                                              \
+  event_consumers_.emplace_back(std::make_shared<repertory::event_consumer>(   \
      [this](const i_event &evt) { callback(evt); }))
 } // namespace repertory

-#endif // REPERTORY_INCLUDE_EVENTS_EVENT_SYSTEM2_HPP_
+#endif // REPERTORY_INCLUDE_EVENTS_EVENT_SYSTEM_HPP_
--- a/repertory/librepertory/include/events/events.hpp
+++ b/repertory/librepertory/include/events/events.hpp
@@ -1,105 +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_
-
-#include "events/event_system.hpp"
-#include "types/repertory.hpp"
-#include "utils/utils.hpp"
-
-namespace repertory {
-// clang-format off
-E_SIMPLE(unmount_requested, info);
-#if !defined(_WIN32)
-E_SIMPLE2(unmount_result, info,
-  std::string, location, loc, E_FROM_STRING,
-  std::string, result, res, E_FROM_STRING
-);
-#endif
-
-E_SIMPLE2(download_begin, info,
-  std::string, api_path, ap, E_FROM_STRING,
-  std::string, dest_path, dest, E_FROM_STRING
-);
-
-E_SIMPLE3(download_end, info,
-  std::string, api_path, ap, E_FROM_STRING,
-  std::string, dest_path, dest, E_FROM_STRING,
-  api_error, result, result, E_FROM_API_FILE_ERROR
-);
-
-E_SIMPLE3(download_progress, info,
-  std::string, api_path, ap, E_FROM_STRING,
-  std::string, dest_path, dest, E_FROM_STRING,
-  double, progress, prog, E_FROM_DOUBLE_PRECISE
-);
-
-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_SIMPLE1(item_timeout, trace,
-  std::string, api_path, ap, 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_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
-);
-// clang-format on
-} // namespace repertory
-
-#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
@@ -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_BEGIN_HPP_
+#define REPERTORY_INCLUDE_EVENTS_TYPES_DOWNLOAD_BEGIN_HPP_
+
+#include "events/i_event.hpp"
+#include "types/repertory.hpp"
+
+namespace repertory {
+struct download_begin final : public i_event {
+  download_begin() = default;
+  download_begin(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_begin"};
+
+  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_begin> {
+  static void to_json(json &data, const repertory::download_begin &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_begin &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_BEGIN_HPP_
--- a/repertory/librepertory/include/events/types/download_end.hpp
+++ b/repertory/librepertory/include/events/types/download_end.hpp
@@ -0,0 +1,80 @@
+/*
+  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_END_HPP_
+#define REPERTORY_INCLUDE_EVENTS_TYPES_DOWNLOAD_END_HPP_
+
+#include "events/i_event.hpp"
+#include "types/repertory.hpp"
+
+namespace repertory {
+struct download_end final : public i_event {
+  download_end() = default;
+  download_end(std::string api_path_, std::string dest_path_, api_error error_,
+               std::string_view function_name_)
+      : api_path(std::move(api_path_)),
+        dest_path(std::move(dest_path_)),
+        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;
+  std::string dest_path;
+  api_error 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, api_error_to_string(error));
+  }
+};
+} // namespace repertory
+
+NLOHMANN_JSON_NAMESPACE_BEGIN
+template <> struct adl_serializer<repertory::download_end> {
+  static void to_json(json &data, const repertory::download_end &value) {
+    data["api_path"] = value.api_path;
+    data["dest_path"] = value.dest_path;
+    data["error"] = repertory::api_error_to_string(value.error);
+    data["function_name"] = value.function_name;
+  }
+
+  static void from_json(const json &data, repertory::download_end &value) {
+    data.at("api_path").get_to<std::string>(value.api_path);
+    data.at("dest_path").get_to<std::string>(value.dest_path);
+    value.error =
+        repertory::api_error_from_string(data.at("error").get<std::string>());
+    data.at("function_name").get_to<std::string>(value.function_name);
+  }
+};
+NLOHMANN_JSON_NAMESPACE_END
+
+#endif // REPERTORY_INCLUDE_EVENTS_TYPES_DOWNLOAD_END_HPP_
--- a/repertory/librepertory/include/events/types/download_progress.hpp
+++ b/repertory/librepertory/include/events/types/download_progress.hpp
@@ -0,0 +1,79 @@
+/*
+  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_PROGRESS_HPP_
+#define REPERTORY_INCLUDE_EVENTS_TYPES_DOWNLOAD_PROGRESS_HPP_
+
+#include "events/i_event.hpp"
+#include "types/repertory.hpp"
+
+namespace repertory {
+struct download_progress final : public i_event {
+  download_progress() = default;
+  download_progress(std::string api_path_, std::string dest_path_,
+                    std::string_view function_name_, double progress_)
+      : api_path(std::move(api_path_)),
+        dest_path(std::move(dest_path_)),
+        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;
+  std::string dest_path;
+  std::string function_name;
+  double progress{};
+
+  [[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|{}|prog|{}", name, function_name,
+                       api_path, dest_path, progress);
+  }
+};
+} // namespace repertory
+
+NLOHMANN_JSON_NAMESPACE_BEGIN
+template <> struct adl_serializer<repertory::download_progress> {
+  static void to_json(json &data, const repertory::download_progress &value) {
+    data["api_path"] = value.api_path;
+    data["dest_path"] = value.dest_path;
+    data["function_name"] = value.function_name;
+    data["progress"] = value.progress;
+  }
+
+  static void from_json(const json &data, repertory::download_progress &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);
+    data.at("progress").get_to<double>(value.progress);
+  }
+};
+NLOHMANN_JSON_NAMESPACE_END
+
+#endif // REPERTORY_INCLUDE_EVENTS_TYPES_DOWNLOAD_PROGRESS_HPP_
--- 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
@@ -0,0 +1,65 @@
+/*
+  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_UNMOUNT_REQUESTED_HPP_
+#define REPERTORY_INCLUDE_EVENTS_TYPES_UNMOUNT_REQUESTED_HPP_
+
+#include "events/i_event.hpp"
+#include "types/repertory.hpp"
+
+namespace repertory {
+struct unmount_requested final : public i_event {
+  unmount_requested() = default;
+  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 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::unmount_requested> {
+  static void to_json(json &data, const repertory::unmount_requested &value) {
+    data["function_name"] = value.function_name;
+  }
+
+  static void from_json(const json &data, repertory::unmount_requested &value) {
+    data.at("function_name").get_to<std::string>(value.function_name);
+  }
+};
+NLOHMANN_JSON_NAMESPACE_END
+
+#endif // REPERTORY_INCLUDE_EVENTS_TYPES_UNMOUNT_REQUESTED_HPP_
--- a/repertory/librepertory/include/events/types/unmount_result.hpp
+++ b/repertory/librepertory/include/events/types/unmount_result.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_UNMOUNT_RESULT_HPP_
+#define REPERTORY_INCLUDE_EVENTS_TYPES_UNMOUNT_RESULT_HPP_
+#if !defined(_WIN32)
+
+#include "events/i_event.hpp"
+#include "types/repertory.hpp"
+
+namespace repertory {
+struct unmount_result final : public i_event {
+  unmount_result() = default;
+  unmount_result(std::string_view function_name_, std::string mount_location_,
+                 std::int32_t result_)
+      : function_name(std::string(function_name_)),
+        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;
+  std::string mount_location;
+  std::int32_t result{};
+
+  [[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|{}|location|{}|result|{}", name, function_name,
+                       mount_location, result);
+  }
+};
+} // namespace repertory
+
+NLOHMANN_JSON_NAMESPACE_BEGIN
+template <> struct adl_serializer<repertory::unmount_result> {
+  static void to_json(json &data, const repertory::unmount_result &value) {
+    data["function_name"] = value.function_name;
+    data["mount_location"] = value.mount_location;
+    data["result"] = value.result;
+  }
+
+  static void from_json(const json &data, repertory::unmount_result &value) {
+    data.at("function_name").get_to<std::string>(value.function_name);
+    data.at("mount_location").get_to<std::string>(value.mount_location);
+    data.at("result").get_to<std::int32_t>(value.result);
+  }
+};
+NLOHMANN_JSON_NAMESPACE_END
+
+#endif // defined(_WIN32)
+#endif // REPERTORY_INCLUDE_EVENTS_TYPES_UNMOUNT_RESULT_HPP_
--- 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/file_manager/file_manager.hpp
+++ b/repertory/librepertory/include/file_manager/file_manager.hpp
@@ -23,7 +23,7 @@
 #define REPERTORY_INCLUDE_FILE_MANAGER_FILE_MANAGER_HPP_

 #include "db/i_file_mgr_db.hpp"
-#include "events/event_system2.hpp"
+#include "events/event_system.hpp"
 #include "events/types/file_upload_completed.hpp"
 #include "file_manager/i_file_manager.hpp"
 #include "file_manager/i_open_file.hpp"
@@ -37,7 +37,7 @@ class app_config;
 class i_provider;

 class file_manager final : public i_file_manager, public i_upload_manager {
-  E_CONSUMER2();
+  E_CONSUMER();

 private:
  static constexpr const std::chrono::seconds queue_wait_secs{
--- 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,18 +31,18 @@ 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;

@@ -52,9 +52,9 @@ public:

  [[nodiscard]] auto pinned_status(const std::string &api_file) -> 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;

--- a/repertory/librepertory/include/types/repertory.hpp
+++ b/repertory/librepertory/include/types/repertory.hpp
@@ -24,29 +24,27 @@

 namespace repertory {
 constexpr const auto default_api_auth_size{48U};
-constexpr const auto default_download_timeout_ces{30U};
+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 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)};
@@ -332,7 +330,6 @@ struct directory_item final {
  bool directory{false};
  std::uint64_t size{};
  api_meta_map meta;
-  bool resolved{false};
 };

 struct encrypt_config final {
@@ -492,8 +489,6 @@ inline constexpr const auto JSON_MED_FREQ_INTERVAL_SECS{
 inline constexpr const auto JSON_META{"Meta"};
 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 +613,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 +646,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 +690,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/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/repertory/librepertory/src/app_config.cpp
+++ b/repertory/librepertory/src/app_config.cpp
@@ -21,7 +21,7 @@
 */
 #include "app_config.hpp"

-#include "events/event_system2.hpp"
+#include "events/event_system.hpp"
 #include "events/types/event_level_changed.hpp"
 #include "file_manager/cache_size_mgr.hpp"
 #include "platform/platform.hpp"
@@ -70,7 +70,7 @@ app_config::app_config(const provider_type &prov,
      api_port_(default_rpc_port(prov)),
      api_user_(std::string{REPERTORY}),
      config_changed_(false),
-      download_timeout_secs_(default_download_timeout_ces),
+      download_timeout_secs_(default_download_timeout_secs),
      enable_download_timeout_(true),
      enable_drive_events_(false),
 #if defined(_WIN32)
@@ -85,7 +85,6 @@ app_config::app_config(const provider_type &prov,
      max_upload_count_(default_max_upload_count),
      med_freq_interval_secs_(default_med_freq_interval_secs),
      online_check_retry_secs_(default_online_check_retry_secs),
-      orphaned_file_retention_days_(default_orphaned_file_retention_days),
      preferred_download_type_(download_type::default_),
      retry_read_count_(default_retry_read_count),
      ring_buffer_file_size_(default_ring_buffer_file_size),
@@ -166,8 +165,14 @@ app_config::app_config(const provider_type &prov,
       [this]() { return get_host_config().api_password; }},
      {fmt::format("{}.{}", JSON_HOST_CONFIG, JSON_API_PORT),
       [this]() { return std::to_string(get_host_config().api_port); }},
+      {fmt::format("{}.{}", JSON_HOST_CONFIG, JSON_API_USER),
+       [this]() { return get_host_config().api_user; }},
      {fmt::format("{}.{}", JSON_HOST_CONFIG, JSON_HOST_NAME_OR_IP),
       [this]() { return get_host_config().host_name_or_ip; }},
+      {fmt::format("{}.{}", JSON_HOST_CONFIG, JSON_PATH),
+       [this]() { return get_host_config().path; }},
+      {fmt::format("{}.{}", JSON_HOST_CONFIG, JSON_PROTOCOL),
+       [this]() { return get_host_config().protocol; }},
      {fmt::format("{}.{}", JSON_HOST_CONFIG, JSON_TIMEOUT_MS),
       [this]() { return std::to_string(get_host_config().timeout_ms); }},
      {JSON_LOW_FREQ_INTERVAL_SECS,
@@ -180,8 +185,6 @@ app_config::app_config(const provider_type &prov,
       [this]() { return std::to_string(get_med_frequency_interval_secs()); }},
      {JSON_ONLINE_CHECK_RETRY_SECS,
       [this]() { return std::to_string(get_online_check_retry_secs()); }},
-      {JSON_ORPHANED_FILE_RETENTION_DAYS,
-       [this]() { return std::to_string(get_orphaned_file_retention_days()); }},
      {JSON_PREFERRED_DOWNLOAD_TYPE,
       [this]() {
         return download_type_to_string(get_preferred_download_type());
@@ -250,7 +253,7 @@ app_config::app_config(const provider_type &prov,

  value_set_lookup_ = {
      {
-          JSON_API_PATH,
+          JSON_API_AUTH,
          [this](const std::string &value) {
            set_api_auth(value);
            return get_api_auth();
@@ -349,7 +352,7 @@ app_config::app_config(const provider_type &prov,
      {
          JSON_HIGH_FREQ_INTERVAL_SECS,
          [this](const std::string &value) {
-            set_high_frequency_interval_secs(utils::string::to_uint8(value));
+            set_high_frequency_interval_secs(utils::string::to_uint16(value));
            return std::to_string(get_high_frequency_interval_secs());
          },
      },
@@ -380,6 +383,15 @@ app_config::app_config(const provider_type &prov,
            return std::to_string(get_host_config().api_port);
          },
      },
+      {
+          fmt::format("{}.{}", JSON_HOST_CONFIG, JSON_API_USER),
+          [this](const std::string &value) {
+            auto cfg = get_host_config();
+            cfg.api_user = value;
+            set_host_config(cfg);
+            return get_host_config().api_user;
+          },
+      },
      {
          fmt::format("{}.{}", JSON_HOST_CONFIG, JSON_HOST_NAME_OR_IP),
          [this](const std::string &value) {
@@ -389,6 +401,24 @@ app_config::app_config(const provider_type &prov,
            return get_host_config().host_name_or_ip;
          },
      },
+      {
+          fmt::format("{}.{}", JSON_HOST_CONFIG, JSON_PATH),
+          [this](const std::string &value) {
+            auto cfg = get_host_config();
+            cfg.path = value;
+            set_host_config(cfg);
+            return get_host_config().path;
+          },
+      },
+      {
+          fmt::format("{}.{}", JSON_HOST_CONFIG, JSON_PROTOCOL),
+          [this](const std::string &value) {
+            auto cfg = get_host_config();
+            cfg.protocol = value;
+            set_host_config(cfg);
+            return get_host_config().protocol;
+          },
+      },
      {
          fmt::format("{}.{}", JSON_HOST_CONFIG, JSON_TIMEOUT_MS),
          [this](const std::string &value) {
@@ -401,14 +431,14 @@ app_config::app_config(const provider_type &prov,
      {
          JSON_LOW_FREQ_INTERVAL_SECS,
          [this](const std::string &value) {
-            set_low_frequency_interval_secs(utils::string::to_uint8(value));
+            set_low_frequency_interval_secs(utils::string::to_uint16(value));
            return std::to_string(get_low_frequency_interval_secs());
          },
      },
      {
          JSON_MED_FREQ_INTERVAL_SECS,
          [this](const std::string &value) {
-            set_med_frequency_interval_secs(utils::string::to_uint8(value));
+            set_med_frequency_interval_secs(utils::string::to_uint16(value));
            return std::to_string(get_med_frequency_interval_secs());
          },
      },
@@ -433,13 +463,6 @@ app_config::app_config(const provider_type &prov,
            return std::to_string(get_online_check_retry_secs());
          },
      },
-      {
-          JSON_ORPHANED_FILE_RETENTION_DAYS,
-          [this](const std::string &value) {
-            set_orphaned_file_retention_days(utils::string::to_uint16(value));
-            return std::to_string(get_orphaned_file_retention_days());
-          },
-      },
      {
          JSON_PREFERRED_DOWNLOAD_TYPE,
          [this](const std::string &value) {
@@ -812,7 +835,6 @@ auto app_config::get_json() const -> json {
      {JSON_MAX_UPLOAD_COUNT, max_upload_count_},
      {JSON_MED_FREQ_INTERVAL_SECS, med_freq_interval_secs_},
      {JSON_ONLINE_CHECK_RETRY_SECS, online_check_retry_secs_},
-      {JSON_ORPHANED_FILE_RETENTION_DAYS, orphaned_file_retention_days_},
      {JSON_PREFERRED_DOWNLOAD_TYPE, preferred_download_type_},
      {JSON_REMOTE_CONFIG, remote_config_},
      {JSON_REMOTE_MOUNT, remote_mount_},
@@ -834,7 +856,6 @@ auto app_config::get_json() const -> json {
    ret.erase(JSON_MAX_CACHE_SIZE_BYTES);
    ret.erase(JSON_MAX_UPLOAD_COUNT);
    ret.erase(JSON_ONLINE_CHECK_RETRY_SECS);
-    ret.erase(JSON_ORPHANED_FILE_RETENTION_DAYS);
    ret.erase(JSON_PREFERRED_DOWNLOAD_TYPE);
    ret.erase(JSON_REMOTE_CONFIG);
    ret.erase(JSON_RETRY_READ_COUNT);
@@ -856,7 +877,6 @@ auto app_config::get_json() const -> json {
    ret.erase(JSON_MAX_UPLOAD_COUNT);
    ret.erase(JSON_MED_FREQ_INTERVAL_SECS);
    ret.erase(JSON_ONLINE_CHECK_RETRY_SECS);
-    ret.erase(JSON_ORPHANED_FILE_RETENTION_DAYS);
    ret.erase(JSON_PREFERRED_DOWNLOAD_TYPE);
    ret.erase(JSON_REMOTE_MOUNT);
    ret.erase(JSON_RETRY_READ_COUNT);
@@ -912,12 +932,6 @@ auto app_config::get_online_check_retry_secs() const -> std::uint16_t {
  return std::max(min_online_check_retry_secs, online_check_retry_secs_.load());
 }

-auto app_config::get_orphaned_file_retention_days() const -> std::uint16_t {
-  return std::min(max_orphaned_file_retention_days,
-                  std::max(min_orphaned_file_retention_days,
-                           orphaned_file_retention_days_.load()));
-}
-
 auto app_config::get_preferred_download_type() const -> download_type {
  return preferred_download_type_;
 }
@@ -1053,8 +1067,6 @@ auto app_config::load() -> bool {
              med_freq_interval_secs_, found);
    get_value(json_document, JSON_ONLINE_CHECK_RETRY_SECS,
              online_check_retry_secs_, found);
-    get_value(json_document, JSON_ORPHANED_FILE_RETENTION_DAYS,
-              orphaned_file_retention_days_, found);
    get_value(json_document, JSON_PREFERRED_DOWNLOAD_TYPE,
              preferred_download_type_, found);
    get_value(json_document, JSON_REMOTE_CONFIG, remote_config_, found);
@@ -1069,10 +1081,17 @@ auto app_config::load() -> bool {
    std::uint64_t version{};
    get_value(json_document, JSON_VERSION, version, found);

-    // Handle configuration defaults for new config versions
    if (version != REPERTORY_CONFIG_VERSION) {
      version_ = REPERTORY_CONFIG_VERSION;
-      // TODO upgrade future version
+      if (version_ == 1U) {
+        if (low_freq_interval_secs_ == 0UL) {
+          set_value(low_freq_interval_secs_, default_low_freq_interval_secs);
+        }
+
+        if (max_cache_size_bytes_ == 0UL) {
+          set_value(max_cache_size_bytes_, default_max_cache_size_bytes);
+        }
+      }
      found = false;
    }

@@ -1149,7 +1168,7 @@ void app_config::set_event_level(const event_level &value) {
  REPERTORY_USES_FUNCTION_NAME();

  if (set_value(event_level_, value)) {
-    event_system2::instance().raise<event_level_changed>(function_name, value);
+    event_system::instance().raise<event_level_changed>(function_name, value);
  }
 }

@@ -1199,10 +1218,6 @@ void app_config::set_online_check_retry_secs(std::uint16_t value) {
  set_value(online_check_retry_secs_, value);
 }

-void app_config::set_orphaned_file_retention_days(std::uint16_t value) {
-  set_value(orphaned_file_retention_days_, value);
-}
-
 void app_config::set_preferred_download_type(const download_type &value) {
  set_value(preferred_download_type_, value);
 }
--- a/repertory/librepertory/src/comm/packet/client_pool.cpp
+++ b/repertory/librepertory/src/comm/packet/client_pool.cpp
@@ -21,7 +21,7 @@
 */
 #include "comm/packet/client_pool.hpp"

-#include "events/event_system2.hpp"
+#include "events/event_system.hpp"
 #include "events/types/service_start_begin.hpp"
 #include "events/types/service_start_end.hpp"
 #include "events/types/service_stop_begin.hpp"
@@ -46,7 +46,8 @@ void client_pool::pool::execute(
 client_pool::pool::pool(std::uint8_t pool_size) {
  REPERTORY_USES_FUNCTION_NAME();

-  event_system2::instance().raise<service_start_begin>("client_pool");
+  event_system::instance().raise<service_start_begin>(function_name,
+                                                      "client_pool");

  for (std::uint8_t i = 0U; i < pool_size; i++) {
    pool_queues_.emplace_back(std::make_unique<work_queue>());
@@ -109,7 +110,8 @@ client_pool::pool::pool(std::uint8_t pool_size) {
    });
  }

-  event_system2::instance().raise<service_start_end>("client_pool");
+  event_system::instance().raise<service_start_end>(function_name,
+                                                    "client_pool");
 }

 void client_pool::pool::shutdown() {
@@ -151,11 +153,14 @@ void client_pool::remove_client(const std::string &client_id) {
 }

 void client_pool::shutdown() {
+  REPERTORY_USES_FUNCTION_NAME();
+
  if (shutdown_) {
    return;
  }

-  event_system2::instance().raise<service_stop_begin>("client_pool");
+  event_system::instance().raise<service_stop_begin>(function_name,
+                                                     "client_pool");
  unique_mutex_lock pool_lock(pool_mutex_);
  if (not shutdown_) {
    shutdown_ = true;
@@ -165,6 +170,7 @@ void client_pool::shutdown() {
    pool_lookup_.clear();
  }
  pool_lock.unlock();
-  event_system2::instance().raise<service_stop_end>("client_pool");
+  event_system::instance().raise<service_stop_end>(function_name,
+                                                   "client_pool");
 }
 } // namespace repertory
--- a/repertory/librepertory/src/comm/packet/packet_client.cpp
+++ b/repertory/librepertory/src/comm/packet/packet_client.cpp
@@ -21,7 +21,8 @@
 */
 #include "comm/packet/packet_client.hpp"

-#include "events/event_system2.hpp"
+#include "events/event_system.hpp"
+#include "events/types/packet_client_timeout.hpp"
 #include "platform/platform.hpp"
 #include "types/repertory.hpp"
 #include "utils/collection.hpp"
@@ -31,13 +32,6 @@
 #include "version.hpp"

 namespace repertory {
-// clang-format off
-E_SIMPLE2(packet_client_timeout, error,
-  std::string, event_name, en, E_FROM_STRING,
-  std::string, message, msg, E_FROM_STRING
-);
-// clang-format on
-
 packet_client::packet_client(remote::remote_config cfg)
    : cfg_(std::move(cfg)), unique_id_(utils::create_uuid_string()) {}

@@ -190,8 +184,8 @@ auto packet_client::send(std::string_view method, packet &request,

        timeout request_timeout(
            [method, current_client]() {
-              event_system2::instance().raise<packet_client_timeout>(
-                  "request", std::string{method});
+              event_system::instance().raise<packet_client_timeout>(
+                  "request", function_name, std::string{method});
              packet_client::close(*current_client);
            },
            std::chrono::milliseconds(cfg_.send_timeout_ms));
@@ -212,8 +206,8 @@ auto packet_client::send(std::string_view method, packet &request,

        timeout response_timeout(
            [method, current_client]() {
-              event_system2::instance().raise<packet_client_timeout>(
-                  "response", std::string{method});
+              event_system::instance().raise<packet_client_timeout>(
+                  "response", function_name, std::string{method});
              packet_client::close(*current_client);
            },
            std::chrono::milliseconds(cfg_.recv_timeout_ms));
--- a/repertory/librepertory/src/comm/packet/packet_server.cpp
+++ b/repertory/librepertory/src/comm/packet/packet_server.cpp
@@ -22,7 +22,7 @@
 #include "comm/packet/packet_server.hpp"

 #include "comm/packet/packet.hpp"
-#include "events/event_system2.hpp"
+#include "events/event_system.hpp"
 #include "events/types/service_start_begin.hpp"
 #include "events/types/service_start_end.hpp"
 #include "events/types/service_stop_begin.hpp"
@@ -40,13 +40,20 @@ packet_server::packet_server(std::uint16_t port, std::string token,
    : encryption_token_(std::move(token)),
      closed_(std::move(closed)),
      message_handler_(std::move(message_handler)) {
-  event_system2::instance().raise<service_start_begin>("packet_server");
+  REPERTORY_USES_FUNCTION_NAME();
+
+  event_system::instance().raise<service_start_begin>(function_name,
+                                                      "packet_server");
  initialize(port, pool_size);
-  event_system2::instance().raise<service_start_end>("packet_server");
+  event_system::instance().raise<service_start_end>(function_name,
+                                                    "packet_server");
 }

 packet_server::~packet_server() {
-  event_system2::instance().raise<service_stop_begin>("packet_server");
+  REPERTORY_USES_FUNCTION_NAME();
+
+  event_system::instance().raise<service_stop_begin>(function_name,
+                                                     "packet_server");
  std::thread([this]() {
    for (std::size_t i = 0U; i < service_threads_.size(); i++) {
      io_context_.stop();
@@ -55,7 +62,8 @@ packet_server::~packet_server() {

  server_thread_->join();
  server_thread_.reset();
-  event_system2::instance().raise<service_stop_end>("packet_server");
+  event_system::instance().raise<service_stop_end>(function_name,
+                                                   "packet_server");
 }

 void packet_server::add_client(connection &conn, const std::string &client_id) {
--- a/repertory/librepertory/src/db/impl/rdb_file_db.cpp
+++ b/repertory/librepertory/src/db/impl/rdb_file_db.cpp
@@ -191,6 +191,10 @@ void rdb_file_db::enumerate_item_list(
      list.clear();
    }
  }
+
+  if (not list.empty()) {
+    callback(list);
+  }
 }

 auto rdb_file_db::get_api_path(const std::string &source_path,
@@ -203,9 +207,8 @@ auto rdb_file_db::get_api_path(const std::string &source_path,
  });
 }

-auto rdb_file_db::get_directory_api_path(const std::string &source_path,
-                                         std::string &api_path) const
-    -> api_error {
+auto rdb_file_db::get_directory_api_path(
+    const std::string &source_path, std::string &api_path) const -> api_error {
  REPERTORY_USES_FUNCTION_NAME();

  auto result = perform_action(function_name, [&]() -> rocksdb::Status {
@@ -228,9 +231,8 @@ auto rdb_file_db::get_directory_api_path(const std::string &source_path,
                                             : result;
 }

-auto rdb_file_db::get_directory_source_path(const std::string &api_path,
-                                            std::string &source_path) const
-    -> api_error {
+auto rdb_file_db::get_directory_source_path(
+    const std::string &api_path, std::string &source_path) const -> api_error {
  REPERTORY_USES_FUNCTION_NAME();

  auto result = perform_action(function_name, [&]() -> rocksdb::Status {
@@ -291,9 +293,8 @@ auto rdb_file_db::get_file_data(const std::string &api_path,
  return result;
 }

-auto rdb_file_db::get_file_source_path(const std::string &api_path,
-                                       std::string &source_path) const
-    -> api_error {
+auto rdb_file_db::get_file_source_path(
+    const std::string &api_path, std::string &source_path) const -> api_error {
  REPERTORY_USES_FUNCTION_NAME();

  auto result = perform_action(function_name, [&]() -> rocksdb::Status {
--- a/repertory/librepertory/src/db/impl/rdb_meta_db.cpp
+++ b/repertory/librepertory/src/db/impl/rdb_meta_db.cpp
@@ -81,6 +81,10 @@ void rdb_meta_db::enumerate_api_path_list(
    callback(list);
    list.clear();
  }
+
+  if (not list.empty()) {
+    callback(list);
+  }
 }

 auto rdb_meta_db::get_api_path(const std::string &source_path,
@@ -314,10 +318,9 @@ void rdb_meta_db::remove_api_path(const std::string &api_path) {
  }
 }

-auto rdb_meta_db::remove_api_path(const std::string &api_path,
-                                  const std::string &source_path,
-                                  rocksdb::Transaction *txn)
-    -> rocksdb::Status {
+auto rdb_meta_db::remove_api_path(
+    const std::string &api_path, const std::string &source_path,
+    rocksdb::Transaction *txn) -> rocksdb::Status {
  auto txn_res = txn->Delete(pinned_family_, api_path);
  if (not txn_res.ok()) {
    return txn_res;
--- a/repertory/librepertory/src/db/impl/sqlite_file_db.cpp
+++ b/repertory/librepertory/src/db/impl/sqlite_file_db.cpp
@@ -65,9 +65,8 @@ sqlite_file_db::sqlite_file_db(const app_config &cfg) {

 sqlite_file_db::~sqlite_file_db() { db_.reset(); }

-auto sqlite_file_db::add_directory(const std::string &api_path,
-                                   const std::string &source_path)
-    -> api_error {
+auto sqlite_file_db::add_directory(
+    const std::string &api_path, const std::string &source_path) -> api_error {
  REPERTORY_USES_FUNCTION_NAME();

  auto result = utils::db::sqlite::db_insert{*db_, file_table}
@@ -158,6 +157,10 @@ void sqlite_file_db::enumerate_item_list(
      list.clear();
    }
  }
+
+  if (not list.empty()) {
+    callback(list);
+  }
 }

 auto sqlite_file_db::get_api_path(const std::string &source_path,
@@ -179,9 +182,8 @@ auto sqlite_file_db::get_api_path(const std::string &source_path,
  return api_error::item_not_found;
 }

-auto sqlite_file_db::get_directory_api_path(const std::string &source_path,
-                                            std::string &api_path) const
-    -> api_error {
+auto sqlite_file_db::get_directory_api_path(
+    const std::string &source_path, std::string &api_path) const -> api_error {
  auto result = utils::db::sqlite::db_select{*db_, file_table}
                    .column("api_path")
                    .where("source_path")
@@ -202,9 +204,8 @@ auto sqlite_file_db::get_directory_api_path(const std::string &source_path,
  return api_error::directory_not_found;
 }

-auto sqlite_file_db::get_directory_source_path(const std::string &api_path,
-                                               std::string &source_path) const
-    -> api_error {
+auto sqlite_file_db::get_directory_source_path(
+    const std::string &api_path, std::string &source_path) const -> api_error {
  auto result = utils::db::sqlite::db_select{*db_, file_table}
                    .column("source_path")
                    .where("api_path")
@@ -225,9 +226,8 @@ auto sqlite_file_db::get_directory_source_path(const std::string &api_path,
  return api_error::directory_not_found;
 }

-auto sqlite_file_db::get_file_api_path(const std::string &source_path,
-                                       std::string &api_path) const
-    -> api_error {
+auto sqlite_file_db::get_file_api_path(
+    const std::string &source_path, std::string &api_path) const -> api_error {
  auto result = utils::db::sqlite::db_select{*db_, file_table}
                    .column("api_path")
                    .where("source_path")
@@ -286,9 +286,8 @@ auto sqlite_file_db::get_file_data(const std::string &api_path,
  return api_error::item_not_found;
 }

-auto sqlite_file_db::get_file_source_path(const std::string &api_path,
-                                          std::string &source_path) const
-    -> api_error {
+auto sqlite_file_db::get_file_source_path(
+    const std::string &api_path, std::string &source_path) const -> api_error {
  auto result = utils::db::sqlite::db_select{*db_, file_table}
                    .column("source_path")
                    .where("api_path")
@@ -330,9 +329,8 @@ auto sqlite_file_db::get_item_list(stop_type_callback stop_requested_cb) const
  return ret;
 }

-auto sqlite_file_db::get_source_path(const std::string &api_path,
-                                     std::string &source_path) const
-    -> api_error {
+auto sqlite_file_db::get_source_path(
+    const std::string &api_path, std::string &source_path) const -> api_error {
  auto result = utils::db::sqlite::db_select{*db_, file_table}
                    .column("source_path")
                    .where("api_path")
--- a/Show More
+++ b/Show More